bump mail

Check 810a50d for the rationale.

.gitignore

@@ -1,22 +1,27 @@
-# Don't put *.swp, *.bak, etc here; those belong in a global ~/.gitignore.
-# Check out http://help.github.com/ignore-files/ for how to set that up.
-
-debug.log
+pkg
+.bundle
+Gemfile.lock
 .Gemfile
-/.bundle
-/.ruby-version
-/pkg
-/dist
-/doc/rdoc
-/*/doc
-/*/test/tmp
-/activerecord/sqlnet.log
-/activemodel/test/fixtures/fixture_database.sqlite3
-/activesupport/test/fixtures/isolation_test
-/railties/test/500.html
-/railties/test/fixtures/tmp
-/railties/test/initializer/root/log
-/railties/doc
-/railties/guides/output
-/railties/tmp
-/RDOC_MAIN.rdoc
+debug.log
+doc/rdoc
+activemodel/doc
+activeresource/doc
+activerecord/doc
+activerecord/sqlnet.log
+actionpack/doc
+actionmailer/doc
+activesupport/doc
+activesupport/test/tmp
+activemodel/test/fixtures/fixture_database.sqlite3
+actionpack/test/tmp
+activesupport/test/fixtures/isolation_test
+dist
+railties/test/500.html
+railties/test/fixtures/tmp
+railties/test/initializer/root/log
+railties/doc
+railties/guides/output
+railties/tmp
+.rvmrc
+.rbenv-version
+RDOC_MAIN.rdoc

.travis.yml

@@ -1,11 +1,8 @@
 script: 'ci/travis.rb'
-before_install:
-  - gem install bundler
 rvm:
   - 1.8.7
   - 1.9.2
   - 1.9.3
-  - 2.0.0
 env:
   - "GEM=railties"
   - "GEM=ap,am,amo,ares,as"
@@ -24,5 +21,5 @@ notifications:
     on_success: change
     on_failure: always
     rooms:
-      - secure: "YA1alef1ESHWGFNVwvmVGCkMe4cUy4j+UcNvMUESraceiAfVyRMAovlQBGs6\n9kBRm7DHYBUXYC2ABQoJbQRLDr/1B5JPf/M8+Qd7BKu8tcDC03U01SMHFLpO\naOs/HLXcDxtnnpL07tGVsm0zhMc5N8tq4/L3SHxK7Vi+TacwQzI="
+      - secure: "CGWvthGkBKNnTnk9YSmf9AXKoiRI33fCl5D3jU4nx3cOPu6kv2R9nMjt9EAo\nOuS4Q85qNSf4VNQ2cUPNiNYSWQ+XiTfivKvDUw/QW9r1FejYyeWarMsSBWA+\n0fADjF1M2dkDIVLgYPfwoXEv7l+j654F1KLKB69F0F/netwP9CQ="
 bundler_args: --path vendor/bundle

Gemfile

@@ -1,64 +1,89 @@
-source 'https://rubygems.org'
+source "http://rubygems.org"
 
 gemspec
 
 if ENV['AREL']
-  gem 'arel', :path => ENV['AREL']
-else
-  gem 'arel'
-end
-
-gem 'bcrypt-ruby', '~> 3.0.0'
-gem 'jquery-rails'
-
-if ENV['JOURNEY']
-  gem 'journey', :path => ENV['JOURNEY']
-else
-  gem 'journey'
+  gem "arel", :path => ENV['AREL']
 end
 
+gem "bcrypt-ruby", "~> 3.0.0"
+gem "jquery-rails"
 # This needs to be with require false to avoid
 # it being automatically loaded by sprockets
-gem 'uglifier', '>= 1.0.3', :require => false
+gem "uglifier", ">= 1.0.3", :require => false
 
-# execjs >= 2.1.0 doesn't work with Ruby 1.8
-gem 'execjs', '< 2.1.0'
-
-gem 'rake', '>= 0.8.7'
-gem 'mocha', '~> 0.14', :require => false
+gem "rake", ">= 0.8.7"
+gem "mocha", "0.10.5"
 
 group :doc do
   # 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',  :git => 'git://github.com/fxn/sdoc.git'
-  gem 'RedCloth', '~> 4.2'
-  gem 'w3c_validators'
+  gem "sdoc",  :git => 'git://github.com/fxn/sdoc.git'
+  gem "RedCloth", "~> 4.2" if RUBY_VERSION < "1.9.3"
+  gem "w3c_validators"
 end
+
 # AS
-gem 'memcache-client', '>= 1.8.5'
+gem "memcache-client", ">= 1.8.5"
+
+platforms :mri_18 do
+  gem "system_timer"
+  gem "json"
+end
 
 # Add your own local bundler stuff
-instance_eval File.read '.Gemfile' if File.exists? '.Gemfile'
+instance_eval File.read ".Gemfile" if File.exists? ".Gemfile"
 
 platforms :mri do
   group :test do
-    gem 'ruby-prof', '~> 0.11.2' if RUBY_VERSION < '2.0'
+    gem 'ruby-prof', '~> 0.11.2'
   end
 end
 
 platforms :ruby do
-  gem 'yajl-ruby'
-  gem 'nokogiri', '>= 1.4.5', '< 1.6'
+  if ENV["RB_FSEVENT"]
+    gem "rb-fsevent"
+  end
+  gem "json"
+  gem "yajl-ruby"
+  gem "nokogiri", ">= 1.4.4"
 
   # AR
-  gem 'sqlite3', '~> 1.3.5'
+  gem "sqlite3", "~> 1.3.4"
 
   group :db do
-    gem 'pg', '>= 0.11.0'
-    gem 'mysql', '>= 2.8.1'
-    gem 'mysql2', '>= 0.3.10'
+    gem "pg", ">= 0.11.0"
+    gem "mysql", ">= 2.8.1"
+    gem "mysql2", ">= 0.3.10"
+  end
+end
+
+platforms :jruby do
+  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"
+
+  group :db do
+    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"
+  end
+  if 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"
   end
 end
 

Gemfile.lock

@@ -1,131 +0,0 @@
-GIT
-  remote: git://github.com/fxn/sdoc.git
-  revision: 9977ca4ecf83a76d637861f79319b11830d51de5
-  specs:
-    sdoc (0.3.19)
-      json (>= 1.1.3)
-      rdoc (~> 3.10)
-
-PATH
-  remote: .
-  specs:
-    actionmailer (3.2.19)
-      actionpack (= 3.2.19)
-      mail (~> 2.5.4)
-    actionpack (3.2.19)
-      activemodel (= 3.2.19)
-      activesupport (= 3.2.19)
-      builder (~> 3.2)
-      erubis (~> 2.7.0)
-      journey (~> 1.0.4)
-      rack (~> 1.4.5)
-      rack-cache (~> 1.2)
-      rack-test (~> 0.6.1)
-    activemodel (3.2.19)
-      activesupport (= 3.2.19)
-      builder (~> 3.2)
-    activerecord (3.2.19)
-      activemodel (= 3.2.19)
-      activesupport (= 3.2.19)
-      arel (~> 3.0.2)
-      tzinfo (~> 0.3.29)
-    activeresource (3.2.19)
-      activemodel (= 3.2.19)
-      activesupport (= 3.2.19)
-    activesupport (3.2.19)
-      i18n (~> 0.6, >= 0.6.4)
-      multi_json (~> 1.0)
-    rails (3.2.19)
-      actionmailer (= 3.2.19)
-      actionpack (= 3.2.19)
-      activerecord (= 3.2.19)
-      activeresource (= 3.2.19)
-      activesupport (= 3.2.19)
-      bundler (~> 1.0)
-      railties (= 3.2.19)
-    railties (3.2.19)
-      actionpack (= 3.2.19)
-      activesupport (= 3.2.19)
-      rack-ssl (~> 1.3.2)
-      rake (>= 0.8.7)
-      rdoc (~> 3.4)
-      thor (>= 0.14.6, < 2.0)
-
-GEM
-  remote: https://rubygems.org/
-  specs:
-    RedCloth (4.2.9)
-    arel (3.0.3)
-    bcrypt-ruby (3.0.1)
-    benchmark-ips (1.2.0)
-    builder (3.2.2)
-    erubis (2.7.0)
-    execjs (2.0.2)
-    i18n (0.6.11)
-    journey (1.0.4)
-    jquery-rails (3.1.0)
-      railties (>= 3.0, < 5.0)
-      thor (>= 0.14, < 2.0)
-    json (1.8.1)
-    mail (2.5.4)
-      mime-types (~> 1.16)
-      treetop (~> 1.4.8)
-    memcache-client (1.8.5)
-    metaclass (0.0.4)
-    mime-types (1.25.1)
-    mocha (0.14.0)
-      metaclass (~> 0.0.1)
-    multi_json (1.10.1)
-    mysql (2.9.1)
-    mysql2 (0.3.15)
-    nokogiri (1.5.11)
-    pg (0.17.1)
-    polyglot (0.3.5)
-    rack (1.4.5)
-    rack-cache (1.2)
-      rack (>= 0.4)
-    rack-ssl (1.3.4)
-      rack
-    rack-test (0.6.2)
-      rack (>= 1.0)
-    rake (10.2.2)
-    rdoc (3.12.2)
-      json (~> 1.4)
-    sqlite3 (1.3.9)
-    thor (0.19.1)
-    treetop (1.4.15)
-      polyglot
-      polyglot (>= 0.3.1)
-    tzinfo (0.3.41)
-    uglifier (2.5.0)
-      execjs (>= 0.3.0)
-      json (>= 1.8.0)
-    w3c_validators (1.2)
-      json
-      nokogiri
-    yajl-ruby (1.2.0)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  RedCloth (~> 4.2)
-  arel
-  bcrypt-ruby (~> 3.0.0)
-  benchmark-ips
-  execjs (< 2.1.0)
-  journey
-  jquery-rails
-  memcache-client (>= 1.8.5)
-  mocha (~> 0.14)
-  mysql (>= 2.8.1)
-  mysql2 (>= 0.3.10)
-  nokogiri (>= 1.4.5, < 1.6)
-  pg (>= 0.11.0)
-  rails!
-  rake (>= 0.8.7)
-  sdoc!
-  sqlite3 (~> 1.3.5)
-  uglifier (>= 1.0.3)
-  w3c_validators
-  yajl-ruby

RAILS_VERSION

@@ -1 +1 @@
-3.2.19.github2
+3.1.8

README.rdoc

@@ -18,7 +18,7 @@ you to present the data from database rows as objects and embellish these data o
 with business logic methods. Although most Rails models are backed by a database, models 
 can also be ordinary Ruby classes, or Ruby classes that implement a set of interfaces as
 provided by the ActiveModel module. You can read more about Active Record in its
-{README}[link:/rails/rails/blob/master/activerecord/README.rdoc].
+{README}[link:files/activerecord/README_rdoc.html].
 
 The Controller layer is responsible for handling incoming HTTP requests and providing a 
 suitable response. Usually this means returning \HTML, but Rails controllers can also
@@ -29,7 +29,7 @@ In Rails, the Controller and View layers are handled together by Action Pack.
 These two layers are bundled in a single package due to their heavy interdependence. 
 This is unlike the relationship between Active Record and Action Pack which are
 independent. Each of these packages can be used independently outside of Rails. You 
-can read more about Action Pack in its {README}[link:/rails/rails/blob/master/actionpack/README.rdoc].
+can read more about Action Pack in its {README}[link:files/actionpack/README_rdoc.html].
 
 == Getting Started
 
@@ -61,17 +61,13 @@ can read more about Action Pack in its {README}[link:/rails/rails/blob/master/ac
 * The {Ruby on Rails Guides}[http://guides.rubyonrails.org].
 * The {API Documentation}[http://api.rubyonrails.org].
 
+
 == Contributing
 
 We encourage you to contribute to Ruby on Rails! Please check out the {Contributing to Rails
 guide}[http://edgeguides.rubyonrails.org/contributing_to_ruby_on_rails.html] for guidelines about how
 to proceed. {Join us}[http://contributors.rubyonrails.org]!
 
-== 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.
-

RELEASING_RAILS.rdoc

@@ -1,238 +0,0 @@
-= Releasing Rails
-
-In this document, we'll cover the steps necessary to release Rails.  Each
-section contains steps to take during that time before the release.  The times
-suggested in each header are just that: suggestions.  However, they should
-really be considered as minimums.
-
-== 10 Days before release
-
-Today is mostly coordination tasks.  Here are the things you must do today:
-
-=== Is the CI green?  If not, make it green. (See "Fixing the CI")
-
-Do not release with a Red CI.  You can find the CI status here:
-
-  http://travis-ci.org/#!/rails/rails
-
-=== Is Sam Ruby happy?  If not, make him happy.
-
-Sam Ruby keeps a test suite that makes sure the code samples in his book (Agile
-Web Development with Rails) all work.  These are valuable integration tests
-for Rails.  You can check the status of his tests here:
-
-  http://intertwingly.net/projects/dashboard.html
-
-Do not release with Red AWDwR tests.
-
-=== Are the postgres tests green? If not, make them green
-
-Currently Travis CI doesn't run the Active Record postgres tests. They are
-working to resolve this, but in the mean time, it is crucial to ensure that
-the tests are still green before release.
-
-=== 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.
-Contact the authors of those particular gems and work out a release date that
-suits them.
-
-=== Contact the security team (either Koz or tenderlove)
-
-Let them know of your plans to release.  There may be security issues to be
-addressed, and that can impact your release date.
-
-=== Notify implementors.
-
-Ruby implementors have high stakes in making sure Rails works.  Be kind and
-give them a heads up that Rails will be released soonish.
-
-Send an email just giving a heads up about the upcoming release to these
-lists:
-
-* team@jruby.org
-* community@rubini.us
-* rubyonrails-core@googlegroups.com
-
-Implementors will love you and help you.
-
-== 3 Days before release
-
-This is when you should release the release candidate.  Here are your tasks
-for today:
-
-=== Is the CI green?  If not, make it green.
-
-=== Is Sam Ruby happy?  If not, make him happy.
-
-=== Are the postgres tests green? If not, make them green
-
-=== Contact the security team.  CVE emails must be sent on this day.
-
-=== Create a release branch.
-
-From the stable branch, create a release branch.  For example, if you're
-releasing Rails 3.0.10, do this:
-
-    [aaron@higgins rails (3-0-stable)]$ git checkout -b 3-0-10
-    Switched to a new branch '3-0-10'
-    [aaron@higgins rails (3-0-10)]$
-
-=== Update each CHANGELOG.
-
-Many times commits are made without the CHANGELOG being updated.  You should
-review the commits since the last release, and fill in any missing information
-for each CHANGELOG.
-
-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
-to use Ruby 1.8 when releasing.
-
-Run `rake release`.  This will populate the gemspecs with data from
-RAILS_VERSION, commit the changes, tag it, and push the gems to rubygems.org.
-Here are the commands that `rake release` should use, so you can understand
-what to do in case anything goes wrong:
-
-    $ rake all:build
-    $ git commit -am'updating RAILS_VERSION'
-    $ git tag -m'tagging rc release' v3.0.10.rc1
-    $ git push
-    $ git push --tags
-    $ for i in $(ls dist); do gem push $i; done
-
-=== 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
-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
-issues with the release candidate to the rails-core mailing list.
-
-IMPORTANT: If any users experience regressions when using the release
-candidate, you *must* postpone the release.  Bugfix releases *should not*
-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
-blog.
-
-* http://weblog.rubyonrails.org
-
-=== 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
-the RC.
-
-If any regressions are found, fix the regressions and repeat the release
-candidate process.  We will not release the final until 72 hours after the
-last release candidate has been pushed.  This means that if users find
-regressions, the scheduled release date must be postponed.
-
-When you fix the regressions, do not create a new branch.  Fix them on the
-stable branch, then cherry pick the commit to your release branch.  No other
-commits should be added to the release branch besides regression fixing commits.
-
-== Day of release
-
-Many of these steps are the same as for the release candidate, so if you need
-more explanation on a particular step, so the RC steps.
-
-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
-
-Email the security announce list once for each vulnerability fixed.
-
-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
-
-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,
-so we need to give them the security fixes in patch form.
-
-* Blog announcements
-* Twitter announcements
-* Merge the release branch to the stable branch.
-* Drink beer (or other cocktail)
-
-== Misc
-
-=== Fixing the CI
-
-There are two simple steps for fixing the CI:
-
-1. Identify the problem
-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).

Rakefile

@@ -75,12 +75,7 @@ RDoc::Task.new do |rdoc|
     # since no autolinking happens there and RDoc displays the backslash
     # otherwise.
     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 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.*}, '')
+    rdoc_main.gsub!(%r{link:blob/master/(\w+)/README\.rdoc}, "link:files/\\1/README_rdoc.html")
 
     File.open(RDOC_MAIN, 'w') do |f|
       f.write(rdoc_main)
@@ -94,7 +89,7 @@ RDoc::Task.new do |rdoc|
 
   rdoc.options << '-f' << 'sdoc'
   rdoc.options << '-T' << 'rails'
-  rdoc.options << '-e' << 'UTF-8'
+  rdoc.options << '-c' << 'utf-8'
   rdoc.options << '-g' # SDoc flag, link methods to GitHub
   rdoc.options << '-m' << RDOC_MAIN
 
@@ -190,7 +185,7 @@ end
 #
 desc 'Publishes docs, run this AFTER a new stable tag has been pushed'
 task :publish_docs do
-  Net::HTTP.new('api.rubyonrails.org', 8080).start do |http|
+  Net::HTTP.new('rails-hooks.hashref.com').start do |http|
     request  = Net::HTTP::Post.new('/rails-master-hook')
     response = http.request(request)
     puts response.body

actionmailer/CHANGELOG.md

@@ -1,123 +1,26 @@
-## Rails 3.2.19 (Jul 2, 2014) ##
-
-* No changes.
-
-
-## Rails 3.2.18 (May 6, 2014) ##
-
-* No changes.
-
-
-## Rails 3.2.17 (Feb 18, 2014) ##
-
-* No changes.
-
-
-## Rails 3.2.16 (Dec 3, 2013) ##
-
-* No changes.
-
-
-## Rails 3.2.15 (Oct 16, 2013) ##
+## Rails 3.1.8 (Aug 9, 2012)
 
 *   No changes.
 
-## Rails 3.2.14 (Jul 22, 2013) ##
+## Rails 3.1.7 (Jul 26, 2012)
 
 *   No changes.
 
-
-## Rails 3.2.13 (Mar 18, 2013) ##
+## Rails 3.1.6 (Jun 12, 2012)
 
 *   No changes.
 
+## Rails 3.1.5 (May 31, 2012) ##
 
-## Rails 3.2.12 (Feb 11, 2013) ##
+*   Increase minimum version of mail.
 
-*   No changes.
+## Rails 3.1.1 (October 7, 2011) ##
+
+*   No changes
 
 
-## Rails 3.2.11 (Jan 8, 2013) ##
+## Rails 3.1.0 (August 30, 2011) ##
 
-*   No changes.
+*   No changes
 
-
-## Rails 3.2.10 (Jan 2, 2013) ##
-
-*   No changes.
-
-
-## Rails 3.2.9 (Nov 12, 2012) ##
-
-*   The return value from mailer methods is no longer relevant. This fixes a bug,
-    which was introduced with 3.2.9.
-    Backport #8450
-    Fix #8448
-
-        class ExampleMailer < ActionMailer::Base
-          # in 3.2.9, returning a falsy value from a mailer action, prevented the email from beeing sent.
-          # With 3.2.10 the return value is no longer relevant. If you call mail() the email will be sent.
-          def nil_returning_mailer_action
-            mail()
-            nil
-          end
-        end
-
-    *Yves Senn*
-
-
-## Rails 3.2.9 (Nov 12, 2012) ##
-
-*   Do not render views when mail() isn't called.
-    Fix #7761
-
-    *Yves Senn*
-
-
-## 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*
-
-Please check [3-1-stable](https://github.com/rails/rails/blob/3-1-stable/actionmailer/CHANGELOG.md) for previous changes.
+Please check [3-0-stable](https://github.com/rails/rails/blob/3-0-stable/actionmailer/CHANGELOG) for previous changes.

actionmailer/README.rdoc

@@ -137,13 +137,13 @@ The Base class has the full list of configuration options. Here's an example:
 
 == Download and installation
 
-The latest version of Action Mailer can be installed with RubyGems:
+The latest version of Action Mailer can be installed with Rubygems:
 
   % [sudo] gem install actionmailer
 
 Source code can be downloaded as part of the Rails project on GitHub
 
-* https://github.com/rails/rails/tree/3-2-stable/actionmailer
+* https://github.com/rails/rails/tree/master/actionmailer
 
 
 == License
@@ -155,7 +155,7 @@ Action Mailer is released under the MIT license.
 
 API documentation is at
 
-* http://api.rubyonrails.org
+* http://api.rubyonrails.com
 
 Bug reports and feature requests can be filed with the rest for the Ruby on Rails project here:
 

actionmailer/actionmailer.gemspec

@@ -6,9 +6,6 @@ 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.license = 'MIT'
-
   s.required_ruby_version = '>= 1.8.7'
 
   s.author            = 'David Heinemeier Hansson'
@@ -20,5 +17,5 @@ Gem::Specification.new do |s|
   s.requirements << 'none'
 
   s.add_dependency('actionpack',  version)
-  s.add_dependency('mail',        '~> 2.5.4')
+  s.add_dependency('mail',        '~> 2.5')
 end

actionmailer/lib/action_mailer.rb

@@ -40,10 +40,12 @@ require 'active_support/lazy_load_hooks'
 module ActionMailer
   extend ::ActiveSupport::Autoload
 
+  autoload :AdvAttrAccessor
   autoload :Collector
   autoload :Base
   autoload :DeliveryMethods
   autoload :MailHelper
+  autoload :OldApi
   autoload :TestCase
   autoload :TestHelper
 end

actionmailer/lib/action_mailer/adv_attr_accessor.rb

@@ -0,0 +1,28 @@
+module ActionMailer
+  module AdvAttrAccessor #:nodoc:
+    def adv_attr_accessor(name, deprecation=nil)
+      ivar = "@#{name}"
+      deprecation ||= "Please pass :#{name} as hash key to mail() instead"
+
+      class_eval <<-ACCESSORS, __FILE__, __LINE__ + 1
+        def #{name}=(value)
+          ActiveSupport::Deprecation.warn "#{name}= is deprecated. #{deprecation}"
+          #{ivar} = value
+        end
+
+        def #{name}(*args)
+          raise ArgumentError, "expected 0 or 1 parameters" unless args.length <= 1
+          if args.empty?
+            ActiveSupport::Deprecation.warn "#{name}() is deprecated and will be removed in future versions."
+            #{ivar} if instance_variable_names.include?(#{ivar.inspect})
+          else
+            ActiveSupport::Deprecation.warn "#{name}(value) is deprecated. #{deprecation}"
+            #{ivar} = args.first
+          end
+        end
+      ACCESSORS
+
+      self.protected_instance_variables << ivar if self.respond_to?(:protected_instance_variables)
+    end
+  end
+end

actionmailer/lib/action_mailer/base.rb

@@ -1,11 +1,11 @@
 require 'mail'
+require 'action_mailer/tmail_compat'
 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:
@@ -23,16 +23,16 @@ module ActionMailer #:nodoc:
   #
   # Examples:
   #
-  #   class Notifier < ActionMailer::Base
-  #     default :from => 'no-reply@example.com',
+  #  class Notifier < ActionMailer::Base
+  #    default :from => 'no-reply@example.com',
   #            :return_path => 'system@example.com'
   #
-  #     def welcome(recipient)
-  #       @account = recipient
-  #       mail(:to => recipient.email_address_with_name,
-  #            :bcc => ["bcc@example.com", "Order Watcher <watcher@example.com>"])
-  #     end
-  #   end
+  #    def welcome(recipient)
+  #      @account = recipient
+  #      mail(:to => recipient.email_address_with_name,
+  #           :bcc => ["bcc@example.com", "Order Watcher <watcher@example.com>"])
+  #      end
+  #    end
   #
   # Within the mailer method, you have access to the following methods:
   #
@@ -123,8 +123,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,10 +132,13 @@ 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
-  # 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.
+  # Setting <tt>ActionMailer::Base.default_url_options</tt> directly is now deprecated, use the configuration
+  # option mentioned above to set the default host.
+  #
+  # If you do decide to set a default <tt>:host</tt> for your mailers you want to use the
+  # <tt>:only_path => false</tt> option when using <tt>url_for</tt>. This will ensure that absolute URLs are
+  # generated because the <tt>url_for</tt> view helper will, by default, generate relative URLs when a
+  # <tt>:host</tt> option isn't explicitly provided.
   #
   # = Sending mail
   #
@@ -150,8 +153,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:
@@ -214,15 +217,15 @@ module ActionMailer #:nodoc:
   #
   # = Observing and Intercepting Mails
   #
-  # Action Mailer provides hooks into the Mail observer and interceptor methods. These allow you to
-  # register classes that are called during the mail delivery life cycle.
+  # Action Mailer provides hooks into the Mail observer and interceptor methods.  These allow you to
+  # register objects that are called during the mail delivery life cycle.
   #
-  # An observer class must implement the <tt>:delivered_email(message)</tt> method which will be
+  # An observer object must implement the <tt>:delivered_email(message)</tt> method which will be
   # called once for every email sent after the email has been sent.
   #
-  # An interceptor class must implement the <tt>:delivering_email(message)</tt> method which will be
+  # An interceptor object must implement the <tt>:delivering_email(message)</tt> method which will be
   # called before the email is sent, allowing you to make modifications to the email before it hits
-  # the delivery agents. Your class should make any needed modifications directly to the passed
+  # the delivery agents.  Your object should make any needed modifications directly to the passed
   # in Mail::Message instance.
   #
   # = Default Hash
@@ -295,9 +298,9 @@ module ActionMailer #:nodoc:
   #     information and a cryptographic Message Digest 5 algorithm to hash important information)
   #   * <tt>:enable_starttls_auto</tt> - When set to true, detects if STARTTLS is enabled in your SMTP server
   #     and starts to use it.
-  #   * <tt>:openssl_verify_mode</tt> - When using TLS, you can set how OpenSSL checks the certificate. This is
-  #     really useful if you need to validate a self-signed and/or a wildcard certificate. You can use the name
-  #     of an OpenSSL verify constant ('none', 'peer', 'client_once','fail_if_no_peer_cert') or directly the
+  #   * <tt>:openssl_verify_mode</tt> - When using TLS, you can set how OpenSSL checks the certificate. This is 
+  #     really useful if you need to validate a self-signed and/or a wildcard certificate. You can use the name 
+  #     of an OpenSSL verify constant ('none', 'peer', 'client_once','fail_if_no_peer_cert') or directly the 
   #     constant  (OpenSSL::SSL::VERIFY_NONE, OpenSSL::SSL::VERIFY_PEER,...).
   #
   # * <tt>sendmail_settings</tt> - Allows you to override options for the <tt>:sendmail</tt> delivery method.
@@ -313,16 +316,29 @@ 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 eg. MyOwnDeliveryMethodClass.new.  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
-  #   call <tt>.deliver</tt> on an mail message or on an Action Mailer method. This is on by default but can
+  #   call <tt>.deliver</tt> on an mail message or on an Action Mailer method.  This is on by default but can
   #   be turned off to aid in functional testing.
   #
   # * <tt>deliveries</tt> - Keeps an array of all the emails sent out through the Action Mailer with
   #   <tt>delivery_method :test</tt>. Most useful for unit and functional testing.
   #
+  # * <tt>default_charset</tt> - This is now deprecated, use the +default+ method above to
+  #   set the default +:charset+.
+  #
+  # * <tt>default_content_type</tt> - This is now deprecated, use the +default+ method above
+  #   to set the default +:content_type+.
+  #
+  # * <tt>default_mime_version</tt> - This is now deprecated, use the +default+ method above
+  #   to set the default +:mime_version+.
+  #
+  # * <tt>default_implicit_parts_order</tt> - This is now deprecated, use the +default+ method above
+  #   to set the default +:parts_order+.  Parts Order is used when a message is built implicitly
+  #   (i.e. multiple parts are assembled from templates which specify the content type in their
+  #   filenames) this variable controls how the parts are ordered.
   class Base < AbstractController::Base
     include DeliveryMethods
     abstract!
@@ -337,6 +353,7 @@ module ActionMailer #:nodoc:
     self.protected_instance_variables = %w(@_action_has_layout)
 
     helper  ActionMailer::MailHelper
+    include ActionMailer::OldApi
 
     private_class_method :new #:nodoc:
 
@@ -376,7 +393,7 @@ module ActionMailer #:nodoc:
       end
 
       def mailer_name
-        @mailer_name ||= anonymous? ? "anonymous" : name.underscore
+        @mailer_name ||= name.underscore
       end
       attr_writer :mailer_name
       alias :controller_path :mailer_name
@@ -448,24 +465,13 @@ module ActionMailer #:nodoc:
     # method, for instance).
     def initialize(method_name=nil, *args)
       super()
-      @mail_was_called = false
       @_message = Mail.new
       process(method_name, *args) if method_name
     end
 
     def process(*args) #:nodoc:
       lookup_context.skip_default_locale!
-
       super
-      @_message = NullMail.new unless @mail_was_called
-    end
-
-    class NullMail #:nodoc:
-      def body; '' end
-
-      def method_missing(*args)
-        nil
-      end
     end
 
     def mailer_name
@@ -536,7 +542,7 @@ module ActionMailer #:nodoc:
     #
     # * <tt>:subject</tt> - The subject of the message, if this is omitted, Action Mailer will
     #   ask the Rails I18n class for a translated <tt>:subject</tt> in the scope of
-    #   <tt>[mailer_scope, action_name]</tt> or if this is missing, will translate the
+    #   <tt>[:actionmailer, mailer_scope, action_name]</tt> or if this is missing, will translate the
     #   humanized version of the <tt>action_name</tt>
     # * <tt>:to</tt> - Who the message is destined for, can be a string of addresses, or an array
     #   of addresses.
@@ -562,8 +568,8 @@ module ActionMailer #:nodoc:
     # method.
     #
     # When a <tt>:return_path</tt> is specified as header, that value will be used as the 'envelope from'
-    # address for the Mail message. Setting this is useful when you want delivery notifications
-    # sent to a different address than the one in <tt>:from</tt>. Mail will actually use the
+    # address for the Mail message.  Setting this is useful when you want delivery notifications
+    # sent to a different address than the one in <tt>:from</tt>.  Mail will actually use the
     # <tt>:return_path</tt> in preference to the <tt>:sender</tt> in preference to the <tt>:from</tt>
     # field for the 'envelope from' value.
     #
@@ -615,9 +621,8 @@ module ActionMailer #:nodoc:
     #   end
     #
     def mail(headers={}, &block)
-      # Guard flag to prevent both the old and the new API from firing.
-      # On master this flag was renamed to `@_mail_was_called`.
-      # On master there is only one API and this flag is no longer used as a guard.
+      # 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
 
@@ -746,4 +751,3 @@ module ActionMailer #:nodoc:
     ActiveSupport.run_load_hooks(:action_mailer, self)
   end
 end
-

actionmailer/lib/action_mailer/collector.rb

@@ -22,9 +22,9 @@ module ActionMailer #:nodoc:
 
     def custom(mime, options={})
       options.reverse_merge!(:content_type => mime.to_s)
-      @context.formats = [mime.to_sym]
+      @context.freeze_formats([mime.to_sym])
       options[:body] = block_given? ? yield : @default_render.call
       @responses << options
     end
   end
-end
+end

actionmailer/lib/action_mailer/log_subscriber.rb

@@ -4,12 +4,12 @@ module ActionMailer
   class LogSubscriber < ActiveSupport::LogSubscriber
     def deliver(event)
       recipients = Array.wrap(event.payload[:to]).join(', ')
-      info("\nSent mail to #{recipients} (#{format_duration(event.duration)})")
+      info("\nSent mail to #{recipients} (%1.fms)" % event.duration)
       debug(event.payload[:mail])
     end
 
     def receive(event)
-      info("\nReceived mail (#{format_duration(event.duration)})")
+      info("\nReceived mail (%.1fms)" % event.duration)
       debug(event.payload[:mail])
     end
 
@@ -19,4 +19,4 @@ module ActionMailer
   end
 end
 
-ActionMailer::LogSubscriber.attach_to :action_mailer
+ActionMailer::LogSubscriber.attach_to :action_mailer

actionmailer/lib/action_mailer/old_api.rb

@@ -0,0 +1,255 @@
+require 'active_support/concern'
+require 'active_support/core_ext/object/try'
+require 'active_support/core_ext/object/blank'
+
+module ActionMailer
+  module OldApi #:nodoc:
+    extend ActiveSupport::Concern
+
+    included do
+      extend ActionMailer::AdvAttrAccessor
+      self.protected_instance_variables.concat %w(@parts @mail_was_called @headers)
+
+      # Specify the BCC addresses for the message
+      adv_attr_accessor :bcc
+
+      # Specify the CC addresses for the message.
+      adv_attr_accessor :cc
+
+      # Specify the charset to use for the message. This defaults to the
+      # +default_charset+ specified for ActionMailer::Base.
+      adv_attr_accessor :charset
+
+      # Specify the content type for the message. This defaults to <tt>text/plain</tt>
+      # in most cases, but can be automatically set in some situations.
+      adv_attr_accessor :content_type
+
+      # Specify the from address for the message.
+      adv_attr_accessor :from
+
+      # Specify the address (if different than the "from" address) to direct
+      # replies to this message.
+      adv_attr_accessor :reply_to
+
+      # Specify the order in which parts should be sorted, based on content-type.
+      # This defaults to the value for the +default_implicit_parts_order+.
+      adv_attr_accessor :implicit_parts_order
+
+      # Defaults to "1.0", but may be explicitly given if needed.
+      adv_attr_accessor :mime_version
+
+      # The recipient addresses for the message, either as a string (for a single
+      # address) or an array (for multiple addresses).
+      adv_attr_accessor :recipients, "Please pass :to as hash key to mail() instead"
+
+      # The date on which the message was sent. If not set (the default), the
+      # header will be set by the delivery agent.
+      adv_attr_accessor :sent_on, "Please pass :date as hash key to mail() instead"
+
+      # Specify the subject of the message.
+      adv_attr_accessor :subject
+
+      # Specify the template name to use for current message. This is the "base"
+      # template name, without the extension or directory, and may be used to
+      # have multiple mailer methods share the same template.
+      adv_attr_accessor :template, "Please pass :template_name or :template_path as hash key to mail() instead"
+
+      # Define the body of the message. This is either a Hash (in which case it
+      # specifies the variables to pass to the template when it is rendered),
+      # or a string, in which case it specifies the actual text of the message.
+      adv_attr_accessor :body
+    end
+
+    def process(method_name, *args)
+      initialize_defaults(method_name)
+      super
+      unless @mail_was_called
+        create_parts
+        create_mail
+      end
+      @_message
+    end
+
+    # Add a part to a multipart message, with the given content-type. The
+    # part itself is yielded to the block so that other properties (charset,
+    # body, headers, etc.) can be set on it.
+    def part(params)
+      ActiveSupport::Deprecation.warn "part() is deprecated and will be removed in future versions. " <<
+        "Please pass a block to mail() instead."
+      params = {:content_type => params} if String === params
+
+      if custom_headers = params.delete(:headers)
+        params.merge!(custom_headers)
+      end
+
+      part = Mail::Part.new(params)
+
+      yield part if block_given?
+      @parts << part
+    end
+
+    # Add an attachment to a multipart message. This is simply a part with the
+    # content-disposition set to "attachment".
+    def attachment(params, &block)
+      ActiveSupport::Deprecation.warn "attachment() is deprecated and will be removed in future versions. " <<
+        "Please use the attachments[] API instead."
+      params = { :content_type => params } if String === params
+
+      params[:content] ||= params.delete(:data) || params.delete(:body)
+
+      if params[:filename]
+        params = normalize_file_hash(params)
+      else
+        params = normalize_nonfile_hash(params)
+      end
+
+      part(params, &block)
+    end
+
+  protected
+
+    def normalize_nonfile_hash(params)
+      content_disposition = "attachment;"
+
+      mime_type = params.delete(:mime_type)
+
+      if content_type = params.delete(:content_type)
+        content_type = "#{mime_type || content_type};"
+      end
+
+      params[:body] = params.delete(:data) if params[:data]
+
+      { :content_type => content_type,
+        :content_disposition => content_disposition }.merge(params)
+    end
+
+    def normalize_file_hash(params)
+      filename = File.basename(params.delete(:filename))
+      content_disposition = "attachment; filename=\"#{File.basename(filename)}\""
+
+      mime_type = params.delete(:mime_type)
+
+      if (content_type = params.delete(:content_type)) && (content_type !~ /filename=/)
+        content_type = "#{mime_type || content_type}; filename=\"#{filename}\""
+      end
+
+      params[:body] = params.delete(:data) if params[:data]
+
+      { :content_type => content_type,
+        :content_disposition => content_disposition }.merge(params)
+    end
+
+    def create_mail
+      m = @_message
+
+      set_fields!({:subject => @subject, :to => @recipients, :from => @from,
+                   :bcc => @bcc, :cc => @cc, :reply_to => @reply_to}, @charset)
+
+      m.mime_version = @mime_version    if @mime_version
+      m.date         = @sent_on.to_time rescue @sent_on if @sent_on
+
+      @headers.each { |k, v| m[k] = v }
+
+      real_content_type, ctype_attrs = parse_content_type
+      main_type, sub_type = split_content_type(real_content_type)
+
+      if @parts.size == 1 && @parts.first.parts.empty?
+        m.content_type([main_type, sub_type, ctype_attrs])
+        m.body = @parts.first.body.encoded
+      else
+        @parts.each do |p|
+          m.add_part(p)
+        end
+
+        m.body.set_sort_order(@implicit_parts_order)
+        m.body.sort_parts!
+
+        if real_content_type =~ /multipart/
+          ctype_attrs.delete "charset"
+          m.content_type([main_type, sub_type, ctype_attrs])
+        end
+      end
+
+      wrap_delivery_behavior!
+      m.content_transfer_encoding = '8bit' unless m.body.only_us_ascii?
+
+      @_message
+    end
+
+    # Set up the default values for the various instance variables of this
+    # mailer. Subclasses may override this method to provide different
+    # defaults.
+    def initialize_defaults(method_name)
+      @charset              ||= self.class.default[:charset].try(:dup)
+      @content_type         ||= self.class.default[:content_type].try(:dup)
+      @implicit_parts_order ||= self.class.default[:parts_order].try(:dup)
+      @mime_version         ||= self.class.default[:mime_version].try(:dup)
+
+      @cc, @bcc, @reply_to, @subject, @from, @recipients = nil, nil, nil, nil, nil, nil
+
+      @mailer_name   ||= self.class.mailer_name.dup
+      @template      ||= method_name
+      @mail_was_called = false
+
+      @parts   ||= []
+      @headers ||= {}
+      @sent_on ||= Time.now
+      @body ||= {}
+    end
+
+    def create_parts
+      if String === @body
+        @parts.unshift create_inline_part(@body)
+      elsif @parts.empty? || @parts.all? { |p| p.content_disposition =~ /^attachment/ }
+        lookup_context.find_all(@template, [@mailer_name]).each do |template|
+          self.formats = template.formats
+          @parts << create_inline_part(render(:template => template), template.mime_type)
+        end
+
+        if @parts.size > 1
+          @content_type = "multipart/alternative" if @content_type !~ /^multipart/
+        end
+
+        # If this is a multipart e-mail add the mime_version if it is not
+        # already set.
+        @mime_version ||= "1.0" unless @parts.empty?
+      end
+    end
+
+    def create_inline_part(body, mime_type=nil)
+      ct = mime_type || "text/plain"
+      main_type, sub_type = split_content_type(ct.to_s)
+
+      Mail::Part.new(
+        :content_type => [main_type, sub_type, {:charset => charset}],
+        :content_disposition => "inline",
+        :body => body
+      )
+    end
+
+    def set_fields!(headers, charset) #:nodoc:
+      m = @_message
+      m.charset = charset
+      m.subject  ||= headers.delete(:subject)  if headers[:subject]
+      m.to       ||= headers.delete(:to)       if headers[:to]
+      m.from     ||= headers.delete(:from)     if headers[:from]
+      m.cc       ||= headers.delete(:cc)       if headers[:cc]
+      m.bcc      ||= headers.delete(:bcc)      if headers[:bcc]
+      m.reply_to ||= headers.delete(:reply_to) if headers[:reply_to]
+    end
+
+    def split_content_type(ct)
+      ct.to_s.split("/")
+    end
+
+    def parse_content_type
+      if @content_type.blank?
+        [ nil, {} ]
+      else
+        ctype, *attrs = @content_type.split(/;\s*/)
+        attrs = Hash[attrs.map { |attr| attr.split(/=/, 2) }]
+        [ctype, {"charset" => @charset}.merge!(attrs)]
+      end
+    end
+  end
+end

actionmailer/lib/action_mailer/railtie.rb

@@ -19,9 +19,8 @@ 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.relative_url_root   ||= app.config.relative_url_root
+      options.asset_path      ||= app.config.asset_path
+      options.asset_host      ||= app.config.asset_host
 
       ActiveSupport.on_load(:action_mailer) do
         include AbstractController::UrlFor

actionmailer/lib/action_mailer/test_case.rb

@@ -15,22 +15,9 @@ 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
-          when String, Symbol
-            self._mailer_class = mailer.to_s.camelize.constantize
-          when Module
-            self._mailer_class = mailer
-          else
-            raise NonInferrableMailerError.new(mailer)
-          end
+          self._mailer_class = mailer
         end
 
         def mailer_class
@@ -48,6 +35,8 @@ module ActionMailer
         end
       end
 
+      module InstanceMethods
+
       protected
 
         def initialize_test_deliveries
@@ -75,8 +64,16 @@ 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

actionmailer/lib/action_mailer/tmail_compat.rb

@@ -0,0 +1,37 @@
+module Mail
+  class Message
+
+    def set_content_type(*args)
+      message = 'Message#set_content_type is deprecated, please just call ' <<
+                'Message#content_type with the same arguments'
+      ActiveSupport::Deprecation.warn(message, caller[0,2])
+      content_type(*args)
+    end
+
+    alias :old_transfer_encoding :transfer_encoding
+    def transfer_encoding(value = nil)
+      if value
+        message = 'Message#transfer_encoding is deprecated, ' <<
+                  'please call Message#content_transfer_encoding with the same arguments'
+        ActiveSupport::Deprecation.warn(message, caller[0,2])
+        content_transfer_encoding(value)
+      else
+        old_transfer_encoding
+      end
+    end
+
+    def transfer_encoding=(value)
+      message = 'Message#transfer_encoding= is deprecated, ' <<
+                'please call Message#content_transfer_encoding= with the same arguments'
+      ActiveSupport::Deprecation.warn(message, caller[0,2])
+      self.content_transfer_encoding = value
+    end
+
+    def original_filename
+      message = 'Message#original_filename is deprecated, please call Message#filename'
+      ActiveSupport::Deprecation.warn(message, caller[0,2])
+      filename
+    end
+
+  end
+end

actionmailer/lib/action_mailer/version.rb

@@ -1,8 +1,8 @@
 module ActionMailer
   module VERSION #:nodoc:
     MAJOR = 3
-    MINOR = 2
-    TINY  = 19
+    MINOR = 1
+    TINY  = 8
     PRE   = nil
 
     STRING = [MAJOR, MINOR, TINY, PRE].compact.join('.')

actionmailer/test/base_test.rb

@@ -471,18 +471,6 @@ class BaseTest < ActiveSupport::TestCase
     assert_equal(%{<img alt="Dummy" src="http://local.com/images/dummy.png" />}, mail.body.to_s.strip)
   end
 
-  test 'the view is not rendered when mail was never called' do
-    mail = BaseMailer.without_mail_call
-    assert_equal('', mail.body.to_s.strip)
-    mail.deliver
-  end
-
-  test 'the return value of mailer methods is not relevant' do
-    mail = BaseMailer.with_nil_as_return_value
-    assert_equal('Welcome', mail.body.to_s.strip)
-    mail.deliver
-  end
-
   # Before and After hooks
 
   class MyObserver
@@ -574,19 +562,6 @@ class BaseTest < ActiveSupport::TestCase
     assert_equal ["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
-
   protected
 
     # Execute the block setting the given values and restoring old values after

actionmailer/test/fixtures/anonymous/welcome.erb

@@ -1 +0,0 @@
-Anonymous mailer body

actionmailer/test/fixtures/base_mailer/without_mail_call.erb

@@ -1 +0,0 @@
-<% raise 'the template should not be rendered' %>

actionmailer/test/log_subscriber_test.rb

@@ -1,5 +1,4 @@
 require "abstract_unit"
-require 'mailers/base_mailer'
 require "active_support/log_subscriber/test_helper"
 require "action_mailer/log_subscriber"
 
@@ -12,6 +11,13 @@ class AMLogSubscriberTest < ActionMailer::TestCase
   end
 
   class TestMailer < ActionMailer::Base
+    def basic
+      recipients "somewhere@example.com"
+      subject    "basic"
+      from       "basic@example.com"
+      body       "Hello world"
+    end
+
     def receive(mail)
       # Do nothing
     end
@@ -22,12 +28,12 @@ class AMLogSubscriberTest < ActionMailer::TestCase
   end
 
   def test_deliver_is_notified
-    BaseMailer.welcome.deliver
+    TestMailer.basic.deliver
     wait
     assert_equal(1, @logger.logged(:info).size)
-    assert_match(/Sent mail to system@test.lindsaar.net/, @logger.logged(:info).first)
+    assert_match(/Sent mail to somewhere@example.com/, @logger.logged(:info).first)
     assert_equal(1, @logger.logged(:debug).size)
-    assert_match(/Welcome/, @logger.logged(:debug).first)
+    assert_match(/Hello world/, @logger.logged(:debug).first)
   end
 
   def test_receive_is_notified

actionmailer/test/mailers/base_mailer.rb

@@ -38,7 +38,7 @@ class BaseMailer < ActionMailer::Base
   end
 
   def attachment_with_hash
-    attachments['invoice.jpg'] = { :data => ::Base64.encode64("\312\213\254\232)b"),
+    attachments['invoice.jpg'] = { :data => "\312\213\254\232)b",
                                    :mime_type => "image/x-jpg",
                                    :transfer_encoding => "base64" }
     mail
@@ -113,14 +113,6 @@ class BaseMailer < ActionMailer::Base
   end
 
   def email_with_translations
-    mail :body => render("email_with_translations", :formats => [:html])
-  end
-
-  def without_mail_call
-  end
-
-  def with_nil_as_return_value(hash = {})
-    mail(:template_name => "welcome")
-    nil
+    mail :body => render("email_with_translations.html")
   end
 end

actionmailer/test/old_base/adv_attr_test.rb

@@ -0,0 +1,41 @@
+require 'abstract_unit'
+require 'action_mailer/adv_attr_accessor'
+
+class AdvAttrTest < ActiveSupport::TestCase
+  class Person
+    cattr_reader :protected_instance_variables
+    @@protected_instance_variables = []
+
+    extend ActionMailer::AdvAttrAccessor
+    adv_attr_accessor :name
+  end
+
+  def setup
+    ActiveSupport::Deprecation.silenced = true
+    @person = Person.new
+  end
+
+  def teardown
+    ActiveSupport::Deprecation.silenced = false
+  end
+
+  def test_adv_attr
+    assert_nil @person.name
+    @person.name 'Bob'
+    assert_equal 'Bob', @person.name
+  end
+
+  def test_adv_attr_writer
+    assert_nil @person.name
+    @person.name = 'Bob'
+    assert_equal 'Bob', @person.name
+  end
+
+  def test_raise_an_error_with_multiple_args
+    assert_raise(ArgumentError) { @person.name('x', 'y') }
+  end
+
+  def test_ivar_is_added_to_protected_instnace_variables
+    assert Person.protected_instance_variables.include?('@name')
+  end
+end

actionmailer/test/old_base/mail_render_test.rb

@@ -0,0 +1,134 @@
+require 'abstract_unit'
+
+class RenderMailer < ActionMailer::Base
+  def inline_template
+    recipients 'test@localhost'
+    subject    "using helpers"
+    from       "tester@example.com"
+
+    @world = "Earth"
+    body       render(:inline => "Hello, <%= @world %>")
+  end
+
+  def file_template
+    recipients 'test@localhost'
+    subject    "using helpers"
+    from       "tester@example.com"
+
+    @recipient = 'test@localhost'
+    body       render(:file => "templates/signed_up")
+  end
+
+  def no_instance_variable
+    recipients 'test@localhost'
+    subject    "No Instance Variable"
+    from       "tester@example.com"
+
+    silence_warnings do
+      body render(:inline => "Look, subject.nil? is <%= @subject.nil? %>!")
+    end
+  end
+
+  def multipart_alternative
+    recipients 'test@localhost'
+    subject    'multipart/alternative'
+    from       'tester@example.com'
+
+    build_multipart_message(:foo => "bar")
+  end
+
+  private
+    def build_multipart_message(assigns = {})
+      content_type "multipart/alternative"
+
+      part "text/plain" do |p|
+        p.body = build_body_part('plain', assigns, :layout => false)
+      end
+
+      part "text/html" do |p|
+        p.body = build_body_part('html', assigns)
+      end
+    end
+
+    def build_body_part(content_type, assigns, options = {})
+      ActiveSupport::Deprecation.silence do
+        render "#{template}.#{content_type}", :body => assigns
+      end
+    end
+end
+
+class FirstMailer < ActionMailer::Base
+  def share
+    recipients 'test@localhost'
+    subject    "using helpers"
+    from       "tester@example.com"
+  end
+end
+
+class SecondMailer < ActionMailer::Base
+  def share
+    recipients 'test@localhost'
+    subject    "using helpers"
+    from       "tester@example.com"
+  end
+end
+
+# CHANGED: Those tests were changed because body returns an object now
+# Instead of mail.body.strip, we should mail.body.to_s.strip
+class RenderHelperTest < Test::Unit::TestCase
+  def setup
+    set_delivery_method :test
+    ActionMailer::Base.perform_deliveries = true
+    ActionMailer::Base.deliveries.clear
+    ActiveSupport::Deprecation.silenced = true
+
+    @recipient = 'test@localhost'
+  end
+
+  def teardown
+    ActiveSupport::Deprecation.silenced = false
+    restore_delivery_method
+  end
+
+  def test_inline_template
+    mail = RenderMailer.inline_template
+    assert_equal "Hello, Earth", mail.body.to_s.strip
+  end
+
+  def test_file_template
+    mail = RenderMailer.file_template
+    assert_equal "Hello there,\n\nMr. test@localhost", mail.body.to_s.strip
+  end
+
+  def test_no_instance_variable
+    mail = RenderMailer.no_instance_variable.deliver
+    assert_equal "Look, subject.nil? is true!", mail.body.to_s.strip
+  end
+end
+
+class FirstSecondHelperTest < Test::Unit::TestCase
+  def setup
+    set_delivery_method :test
+    ActiveSupport::Deprecation.silenced = true
+    ActionMailer::Base.perform_deliveries = true
+    ActionMailer::Base.deliveries.clear
+
+    @recipient = 'test@localhost'
+  end
+
+  def teardown
+    ActiveSupport::Deprecation.silenced = false
+    restore_delivery_method
+  end
+
+  def test_ordering
+    mail = FirstMailer.share
+    assert_equal "first mail", mail.body.to_s.strip
+    mail = SecondMailer.share
+    assert_equal "second mail", mail.body.to_s.strip
+    mail = FirstMailer.share
+    assert_equal "first mail", mail.body.to_s.strip
+    mail = SecondMailer.share
+    assert_equal "second mail", mail.body.to_s.strip
+  end
+end

actionmailer/test/old_base/tmail_compat_test.rb

@@ -0,0 +1,42 @@
+require 'abstract_unit'
+
+class TmailCompatTest < ActiveSupport::TestCase
+  def setup
+    @silence = ActiveSupport::Deprecation.silenced
+    ActiveSupport::Deprecation.silenced = false
+  end
+
+  def teardown
+    ActiveSupport::Deprecation.silenced = @silence
+  end
+
+  def test_set_content_type_raises_deprecation_warning
+    mail = Mail.new
+    assert_deprecated do
+      assert_nothing_raised do
+        mail.set_content_type "text/plain"
+      end
+    end
+    assert_equal mail.mime_type, "text/plain"
+  end
+
+  def test_transfer_encoding_raises_deprecation_warning
+    mail = Mail.new
+    assert_deprecated do
+      assert_nothing_raised do
+        mail.transfer_encoding "base64"
+      end
+    end
+    assert_equal mail.content_transfer_encoding, "base64"
+  end
+
+  def test_transfer_encoding_setter_raises_deprecation_warning
+    mail = Mail.new
+    assert_deprecated do
+      assert_nothing_raised do
+        mail.transfer_encoding = "base64"
+      end
+    end
+    assert_equal mail.content_transfer_encoding, "base64"
+  end
+end

actionmailer/test/test_test.rb

@@ -1,28 +0,0 @@
-require 'abstract_unit'
-
-class TestTestMailer < ActionMailer::Base
-end
-
-class CrazyNameMailerTest < ActionMailer::TestCase
-  tests TestTestMailer
-
-  def test_set_mailer_class_manual
-    assert_equal TestTestMailer, self.class.mailer_class
-  end
-end
-
-class CrazySymbolNameMailerTest < ActionMailer::TestCase
-  tests :test_test_mailer
-
-  def test_set_mailer_class_manual_using_symbol
-    assert_equal TestTestMailer, self.class.mailer_class
-  end
-end
-
-class CrazyStringNameMailerTest < ActionMailer::TestCase
-  tests 'test_test_mailer'
-
-  def test_set_mailer_class_manual_using_string
-    assert_equal TestTestMailer, self.class.mailer_class
-  end
-end

actionpack/README.rdoc

@@ -218,7 +218,7 @@ A short rundown of some of the major features:
 
       def show
         # the output of the method will be cached as
-        # ActionController::Base.page_cache_directory + "/weblog/show.html"
+        # ActionController::Base.page_cache_directory + "/weblog/show/n.html"
         # and the web server will pick it up without even hitting Rails
       end
 
@@ -283,7 +283,7 @@ methods:
 
 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).
+request from the web-server (like to be Apache).
 
 And the templates look like this:
 
@@ -316,13 +316,13 @@ an URL such as /weblog/5 (where 5 is the id of the post).
 
 == Download and installation
 
-The latest version of Action Pack can be installed with RubyGems:
+The latest version of Action Pack can be installed with Rubygems:
 
   % [sudo] gem install actionpack
 
 Source code can be downloaded as part of the Rails project on GitHub
 
-* https://github.com/rails/rails/tree/3-2-stable/actionpack
+* https://github.com/rails/rails/tree/master/actionpack
 
 
 == License
@@ -334,7 +334,7 @@ Action Pack is released under the MIT license.
 
 API documentation is at
 
-* http://api.rubyonrails.org
+* http://api.rubyonrails.com
 
 Bug reports and feature requests can be filed with the rest for the Ruby on Rails project here:
 

actionpack/RUNNING_UNIT_TESTS

@@ -18,7 +18,7 @@ which can be further narrowed down to one test:
 
 == Dependency on Active Record and database setup
 
-Test cases in the test/active_record/ directory depend on having
+Test cases in the test/controller/active_record/ directory depend on having
 activerecord and sqlite installed. If Active Record is not in
 actionpack/../activerecord directory, or the sqlite rubygem is not installed,
 these tests are skipped.

actionpack/Rakefile

@@ -26,11 +26,6 @@ namespace :test do
   Rake::TestTask.new(:isolated) do |t|
     t.pattern = 'test/ts_isolated.rb'
   end
-
-  Rake::TestTask.new(:template) do |t|
-    t.libs << 'test'
-    t.pattern = 'test/template/**/*.rb'
-  end
 end
 
 desc 'ActiveRecord Integration Tests'

actionpack/actionpack.gemspec

@@ -6,9 +6,6 @@ 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.license = 'MIT'
-
   s.required_ruby_version = '>= 1.8.7'
 
   s.author            = 'David Heinemeier Hansson'
@@ -23,9 +20,11 @@ Gem::Specification.new do |s|
   s.add_dependency('activemodel',   version)
   s.add_dependency('rack-cache',    '~> 1.2')
   s.add_dependency('builder',       '~> 3.2')
-  s.add_dependency('rack',          '~> 1.4.5')
+  s.add_dependency('i18n',          '~> 0.6')
+  s.add_dependency('rack',          '~> 1.4.1')
   s.add_dependency('rack-test',     '~> 0.6.1')
-  s.add_dependency('journey',       '~> 1.0.4')
+  s.add_dependency('rack-mount',    '~> 0.8.2')
+  s.add_dependency('sprockets',     '~> 2.10')
   s.add_dependency('erubis',        '~> 2.7.0')
 
   s.add_development_dependency('tzinfo', '~> 0.3.29')

actionpack/examples/performance.rb

@@ -1,185 +0,0 @@
-ENV['RAILS_ENV'] ||= 'production'
-
-require File.expand_path('../../../load_paths', __FILE__)
-require 'action_pack'
-require 'action_controller'
-require 'action_view'
-require 'active_model'
-require 'benchmark'
-
-MyHash = Class.new(Hash)
-
-Hash.class_eval do
-  extend ActiveModel::Naming
-  include ActiveModel::Conversion
-end
-
-class Runner
-  def initialize(app, output)
-    @app, @output = app, output
-  end
-
-  def puts(*)
-    super if @output
-  end
-
-  def call(env)
-    env['n'].to_i.times { @app.call(env) }
-    @app.call(env).tap { |response| report(env, response) }
-  end
-
-  def report(env, response)
-    return unless ENV["DEBUG"]
-    out = env['rack.errors']
-    out.puts response[0], response[1].to_yaml, '---'
-    response[2].each { |part| out.puts part }
-    out.puts '---'
-  end
-
-  def self.puts(*)
-    super if @output
-  end
-
-  def self.print(*)
-    super if @output
-  end
-
-  def self.app_and_env_for(action, n)
-    env = Rack::MockRequest.env_for("/")
-    env.merge!('n' => n, 'rack.input' => StringIO.new(''), 'rack.errors' => $stdout)
-    app = lambda { |env| BasePostController.action(action).call(env) }
-    return app, env
-  end
-
-  $ran = []
-
-  def self.run(action, n, output = true)
-    print "."
-    STDOUT.flush
-    @output = output
-    label = action.to_s
-    app, env = app_and_env_for(action, n)
-    t = Benchmark.realtime { new(app, output).call(env) }
-    $ran << [label, (t * 1000).to_i.to_s] if output
-  end
-
-  def self.done
-    puts
-    header, content = "", ""
-    $ran.each do |k,v|
-      size = [k.size, v.size].max + 1
-      header << format("%#{size}s", k)
-      content << format("%#{size}s", v)
-    end
-    puts header
-    puts content
-  end
-end
-
-ActionController::Base.logger = nil
-ActionController::Base.config.compile_methods!
-ActionView::Resolver.caching = ENV["RAILS_ENV"] == "production"
-
-class BasePostController < ActionController::Base
-  append_view_path "#{File.dirname(__FILE__)}/views"
-
-  def overhead
-    self.response_body = ''
-  end
-
-  def index
-    render :text => ''
-  end
-
-  $OBJECT = {:name => "Hello my name is omg", :address => "333 omg"}
-
-  def partial
-    render :partial => "/collection", :object => $OBJECT
-  end
-
-  def partial_10
-    render :partial => "/ten_partials"
-  end
-
-  def partial_100
-    render :partial => "/hundred_partials"
-  end
-
-  $COLLECTION1 = []
-  10.times do |i|
-    $COLLECTION1 << { :name => "Hello my name is omg", :address => "333 omg" }
-  end
-
-  def coll_10
-    render :partial => "/collection", :collection => $COLLECTION1
-  end
-
-  $COLLECTION2 = []
-  100.times do |i|
-    $COLLECTION2 << { :name => "Hello my name is omg", :address => "333 omg" }
-  end
-
-  def coll_100
-    render :partial => "/collection", :collection => $COLLECTION2
-  end
-
-  def uniq_100
-    render :partial => $COLLECTION2
-  end
-
-  $COLLECTION3 = []
-  50.times do |i|
-    $COLLECTION3 << {:name => "Hello my name is omg", :address => "333 omg"}
-    $COLLECTION3 << MyHash.new(:name => "Hello my name is omg", :address => "333 omg")
-  end
-
-  def diff_100
-    render :partial => $COLLECTION3
-  end
-
-  def template_1
-    render :template => "template"
-  end
-
-  module Foo
-    def omg
-      "omg"
-    end
-  end
-
-  helper Foo
-end
-
-N = (ENV['N'] || 1000).to_i
-# ActionController::Base.use_accept_header = false
-
-def run_all!(times, verbose)
-  Runner.run(:overhead, times, verbose)
-  Runner.run(:index,       times, verbose)
-  Runner.run(:template_1,  times, verbose)
-  Runner.run(:partial,     times, verbose)
-  Runner.run(:partial_10,  times, verbose)
-  Runner.run(:coll_10,     times, verbose)
-  Runner.run(:partial_100, times, verbose)
-  Runner.run(:coll_100,    times, verbose)
-  Runner.run(:uniq_100,    times, verbose)
-  Runner.run(:diff_100,    times, verbose)
-end
-
-unless ENV["PROFILE"]
-  run_all!(1, false)
-
-  (ENV["M"] || 1).to_i.times do
-    $ran = []
-    run_all!(N, true)
-    Runner.done
-  end
-else
-  Runner.run(ENV["PROFILE"].to_sym, 1, false)
-  require "ruby-prof"
-  RubyProf.start
-  Runner.run(ENV["PROFILE"].to_sym, N, true)
-  result = RubyProf.stop
-  printer = RubyProf::CallStackPrinter.new(result)
-  printer.print(File.open("output.html", "w"))
-end

actionpack/examples/views/_collection.erb

@@ -1,3 +0,0 @@
-<%= collection[:name] %>
-<%= collection[:address] %>
-<%= omg %>

actionpack/examples/views/_hello.erb

@@ -1 +0,0 @@
-Hello

actionpack/examples/views/_hundred_partials.erb

@@ -1,3 +0,0 @@
-<% 100.times do %>
-  <%= render :partial => "/collection", :object => $OBJECT %>
-<% end %>

actionpack/examples/views/_partial.erb

@@ -1,10 +0,0 @@
-<%= "Hello" %>
-<%= "Hello" %>
-<%= "Hello" %>
-<%= "Hello" %>
-<%= "Hello" %>
-<%= "Hello" %>
-<%= "Hello" %>
-<%= "Hello" %>
-<%= "Hello" %>
-<%= "Hello" %>

actionpack/examples/views/_ten_partials.erb

@@ -1,10 +0,0 @@
-<%= render :partial => '/collection', :object => $OBJECT %>
-<%= render :partial => '/collection', :object => $OBJECT %>
-<%= render :partial => '/collection', :object => $OBJECT %>
-<%= render :partial => '/collection', :object => $OBJECT %>
-<%= render :partial => '/collection', :object => $OBJECT %>
-<%= render :partial => '/collection', :object => $OBJECT %>
-<%= render :partial => '/collection', :object => $OBJECT %>
-<%= render :partial => '/collection', :object => $OBJECT %>
-<%= render :partial => '/collection', :object => $OBJECT %>
-<%= render :partial => '/collection', :object => $OBJECT %>

actionpack/examples/views/hashes/_hash.erb

@@ -1,3 +0,0 @@
-<%= hash[:name] %>
-<%= hash[:address] %>
-<%= omg %>

actionpack/examples/views/my_hashes/_my_hash.erb

@@ -1,3 +0,0 @@
-<%= my_hash[:name] %>
-<%= my_hash[:address] %>
-<%= omg %>

actionpack/examples/views/template.html.erb

@@ -1 +0,0 @@
-Hello

actionpack/lib/abstract_controller/asset_paths.rb

@@ -4,7 +4,7 @@ module AbstractController
 
     included do
       config_accessor :asset_host, :asset_path, :assets_dir, :javascripts_dir,
-        :stylesheets_dir, :default_asset_host_protocol, :relative_url_root
+        :stylesheets_dir, :default_asset_host_protocol
     end
   end
 end

actionpack/lib/abstract_controller/base.rb

@@ -10,7 +10,7 @@ module AbstractController
   # <tt>AbstractController::Base</tt> is a low-level API. Nobody should be
   # using it directly, and subclasses (like ActionController::Base) are
   # expected to provide their own +render+ method, since rendering means
-  # different things depending on the context.
+  # different things depending on the context.  
   class Base
     attr_internal :response_body
     attr_internal :action_name
@@ -112,7 +112,7 @@ module AbstractController
     def process(action, *args)
       @_action_name = action_name = action.to_s
 
-      unless action_name = _find_action_name(action_name)
+      unless action_name = method_for_action(action_name)
         raise ActionNotFound, "The action '#{action}' could not be found for #{self.class.name}"
       end
 
@@ -138,7 +138,7 @@ module AbstractController
     # available action consider actions that are also available
     # through other means, for example, implicit render ones.
     def available_action?(action_name)
-      _find_action_name(action_name).present?
+      method_for_action(action_name).present?
     end
 
     private
@@ -181,23 +181,6 @@ module AbstractController
         action_missing(@_action_name, *args)
       end
 
-      # Takes an action name and returns the name of the method that will
-      # handle the action.
-      #
-      # It checks if the action name is valid and returns false otherwise.
-      #
-      # See method_for_action for more information.
-      #
-      # ==== Parameters
-      # * <tt>action_name</tt> - An action name to find a method name for
-      #
-      # ==== Returns
-      # * <tt>string</tt> - The name of the method that handles the action
-      # * false           - No valid method name could be found. Raise ActionNotFound.
-      def _find_action_name(action_name)
-        _valid_action_name?(action_name) && method_for_action(action_name)
-      end
-
       # Takes an action name and returns the name of the method that will
       # handle the action. In normal cases, this method returns the same
       # name as it receives. By default, if #method_for_action receives
@@ -220,16 +203,11 @@ module AbstractController
       #
       # ==== Returns
       # * <tt>string</tt> - The name of the method that handles the action
-      # * <tt>nil</tt>    - No method name could be found.
+      # * <tt>nil</tt>    - No method name could be found. Raise ActionNotFound.
       def method_for_action(action_name)
         if action_method?(action_name) then action_name
         elsif respond_to?(:action_missing, true) then "_handle_action_missing"
         end
       end
-
-      # Checks if the action name is valid and returns false otherwise.
-      def _valid_action_name?(action_name)
-        action_name.to_s !~ Regexp.new(File::SEPARATOR)
-      end
   end
 end

actionpack/lib/abstract_controller/callbacks.rb

@@ -75,122 +75,38 @@ module AbstractController
         end
       end
 
-      ##
-      # :method: before_filter
-      #
-      # :call-seq: before_filter(names, block)
-      #
-      # Append a before filter. See _insert_callbacks for parameter details.
-
-      ##
-      # :method: prepend_before_filter
-      #
-      # :call-seq: prepend_before_filter(names, block)
-      #
-      # Prepend a before filter. See _insert_callbacks for parameter details.
-
-      ##
-      # :method: skip_before_filter
-      #
-      # :call-seq: skip_before_filter(names, block)
-      #
-      # Skip a before filter. See _insert_callbacks for parameter details.
-
-      ##
-      # :method: append_before_filter
-      #
-      # :call-seq: append_before_filter(names, block)
-      #
-      # Append a before filter. See _insert_callbacks for parameter details.
-
-      ##
-      # :method: after_filter
-      #
-      # :call-seq: after_filter(names, block)
-      #
-      # Append an after filter. See _insert_callbacks for parameter details.
-
-      ##
-      # :method: prepend_after_filter
-      #
-      # :call-seq: prepend_after_filter(names, block)
-      #
-      # Prepend an after filter. See _insert_callbacks for parameter details.
-
-      ##
-      # :method: skip_after_filter
-      #
-      # :call-seq: skip_after_filter(names, block)
-      #
-      # Skip an after filter. See _insert_callbacks for parameter details.
-
-      ##
-      # :method: append_after_filter
-      #
-      # :call-seq: append_after_filter(names, block)
-      #
-      # Append an after filter. See _insert_callbacks for parameter details.
-
-      ##
-      # :method: around_filter
-      #
-      # :call-seq: around_filter(names, block)
-      #
-      # Append an around filter. See _insert_callbacks for parameter details.
-
-      ##
-      # :method: prepend_around_filter
-      #
-      # :call-seq: prepend_around_filter(names, block)
-      #
-      # Prepend an around filter. See _insert_callbacks for parameter details.
-
-      ##
-      # :method: skip_around_filter
-      #
-      # :call-seq: skip_around_filter(names, block)
-      #
-      # Skip an around filter. See _insert_callbacks for parameter details.
-
-      ##
-      # :method: append_around_filter
-      #
-      # :call-seq: append_around_filter(names, block)
-      #
-      # Append an around filter. See _insert_callbacks for parameter details.
-
       # set up before_filter, prepend_before_filter, skip_before_filter, etc.
       # for each of before, after, and around.
       [:before, :after, :around].each do |filter|
         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)
+            _insert_callbacks(names, blk) do |name, options|
+              options[:if] = (Array.wrap(options[:if]) << "!halted") if #{filter == :after}
+              set_callback(:process_action, :#{filter}, name, options)
+            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
+          def prepend_#{filter}_filter(*names, &blk)
+            _insert_callbacks(names, blk) do |name, options|
+              options[:if] = (Array.wrap(options[:if]) << "!halted") if #{filter == :after}
+              set_callback(:process_action, :#{filter}, name, options.merge(:prepend => true))
+            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, &blk)
+            _insert_callbacks(names, blk) do |name, options|
+              skip_callback(:process_action, :#{filter}, name, options)
+            end
+          end
 
           # *_filter is the same as append_*_filter
-          alias_method :append_#{filter}_filter, :#{filter}_filter  # alias_method :append_before_filter, :before_filter
+          alias_method :append_#{filter}_filter, :#{filter}_filter
         RUBY_EVAL
       end
     end

actionpack/lib/abstract_controller/helpers.rb

@@ -67,7 +67,7 @@ module AbstractController
       #   helper FooHelper # => includes FooHelper
       #
       # When the argument is a string or symbol, the method will provide the "_helper" suffix, require the file
-      # and include the module in the template class. The second form illustrates how to include custom helpers
+      # and include the module in the template class.  The second form illustrates how to include custom helpers
       # when working with namespaced controllers, or other cases where the file containing the helper definition is not
       # in one of Rails' standard load paths:
       #   helper :foo             # => requires 'foo_helper' and includes FooHelper

actionpack/lib/abstract_controller/layouts.rb

@@ -66,40 +66,27 @@ module AbstractController
   # == Inheritance Examples
   #
   #   class BankController < ActionController::Base
-  #     # bank.html.erb exists
-  #
-  #   class ExchangeController < BankController
-  #     # exchange.html.erb exists
-  #
-  #   class CurrencyController < BankController
+  #     layout "bank_standard"
   #
   #   class InformationController < BankController
-  #     layout "information"
   #
-  #   class TellerController < InformationController
+  #   class TellerController < BankController
   #     # teller.html.erb exists
   #
-  #   class EmployeeController < InformationController
-  #     # employee.html.erb exists
-  #     layout nil
+  #   class TillController < TellerController
   #
   #   class VaultController < BankController
   #     layout :access_level_layout
   #
-  #   class TillController < BankController
-  #     layout false
+  #   class EmployeeController < BankController
+  #     layout nil
   #
-  # In these examples, we have three implicit lookup scenrios:
-  # * 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.
+  # 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.
   # * The VaultController chooses a layout dynamically by calling the <tt>access_level_layout</tt> method.
-  # * The TillController does not use a layout at all.
+  # * The EmployeeController does not use a layout at all.
   #
   # == Types of layouts
   #
@@ -139,22 +126,6 @@ module AbstractController
   # 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.
   #
-  # 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
   #
   # If you have a layout that by default is applied to all the actions of a controller, you still have the option of rendering
@@ -197,12 +168,11 @@ module AbstractController
     included do
       class_attribute :_layout_conditions
       remove_possible_method :_layout_conditions
+      delegate :_layout_conditions, :to => :'self.class'
       self._layout_conditions = {}
       _write_layout_method
     end
 
-    delegate :_layout_conditions, :to => "self.class"
-
     module ClassMethods
       def inherited(klass)
         super
@@ -218,7 +188,7 @@ module AbstractController
         #
         # ==== Returns
         # * <tt> Boolean</tt> - True if the action has a layout, false otherwise.
-        def conditional_layout?
+        def action_has_layout?
           return unless super
 
           conditions = _layout_conditions
@@ -237,10 +207,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.
@@ -254,7 +224,7 @@ module AbstractController
         conditions.each {|k, v| conditions[k] = Array(v).map {|a| a.to_s} }
         self._layout_conditions = conditions
 
-        @_layout = layout
+        @_layout = layout || false # Converts nil to false
         _write_layout_method
       end
 
@@ -274,71 +244,43 @@ module AbstractController
       def _write_layout_method
         remove_possible_method(:_layout)
 
-        prefixes    = _implied_layout_name =~ /\blayouts/ ? [] : ["layouts"]
-        name_clause = if name
-          <<-RUBY
-            lookup_context.find_all("#{_implied_layout_name}", #{prefixes.inspect}).first || super
-          RUBY
-        end
-
-        if defined?(@_layout)
-          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 " \
-                      "should have returned a String, false, or nil"
-                  end
+        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|
+                unless layout.is_a?(String) || !layout
+                  raise ArgumentError, "Your layout method :#{@_layout} returned \#{layout}. It " \
+                    "should have returned a String, false, or nil"
                 end
-              RUBY
-            when Proc
-              define_method :_layout_from_proc, &@_layout
-              "_layout_from_proc(self)"
-            when false
-              nil
-            when true
-              raise ArgumentError, "Layouts must be specified as a String, Symbol, false, or nil"
-            when nil
-              name_clause
+              end
             end
-        else
-          # Add a deprecation if the parent layout was explicitly set and the child
-          # still does a dynamic lookup. In next Rails release, we should @_layout
-          # to be inheritable so we can skip the child lookup if the parent explicitly
-          # set the layout.
-          parent   = self.superclass.instance_eval { @_layout if defined?(@_layout) }
-          @_layout = nil
-          inspect  = parent.is_a?(Proc) ? parent.inspect : parent
+          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"]
 
-          layout_definition = if parent.nil?
-              name_clause
-            elsif name
-              <<-RUBY
-                if template = lookup_context.find_all("#{_implied_layout_name}", #{prefixes.inspect}).first
-                  ActiveSupport::Deprecation.warn 'Layout found at "#{_implied_layout_name}" for #{name} but parent controller ' \
-                    'set layout to #{inspect.inspect}. Please explicitly set your layout to "#{_implied_layout_name}" ' \
-                    'or set it to nil to force a dynamic lookup.'
-                  template
+            self.class_eval <<-RUBY, __FILE__, __LINE__ + 1
+              def _layout
+                if template_exists?("#{_implied_layout_name}", #{_prefixes.inspect})
+                  "#{_implied_layout_name}"
                 else
                   super
                 end
-              RUBY
-            end
-        end
-
-        self.class_eval <<-RUBY, __FILE__, __LINE__ + 1
-          def _layout
-            if conditional_layout?
-              #{layout_definition}
-            else
-              #{name_clause}
-            end
+              end
+            RUBY
           end
-          private :_layout
-        RUBY
+        end
+        self.class_eval { private :_layout }
       end
     end
 
@@ -347,7 +289,8 @@ module AbstractController
 
       if _include_layout?(options)
         layout = options.key?(:layout) ? options.delete(:layout) : :default
-        options[:layout] = _layout_for_option(layout)
+        value = _layout_for_option(layout)
+        options[:layout] = (value =~ /\blayouts/ ? value : "layouts/#{value}") if value
       end
     end
 
@@ -362,10 +305,6 @@ module AbstractController
       @_action_has_layout
     end
 
-    def conditional_layout?
-      true
-    end
-
   private
 
     # This will be overwritten by _write_layout_method
@@ -377,10 +316,9 @@ module AbstractController
     # * <tt>name</tt> - The name of the template
     def _layout_for_option(name)
       case name
-      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 String     then name
+      when true       then _default_layout(true)
+      when :default   then _default_layout(false)
       when false, nil then nil
       else
         raise ArgumentError,
@@ -388,10 +326,6 @@ module AbstractController
       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.
     #
@@ -403,17 +337,17 @@ module AbstractController
     # * <tt>template</tt> - The template object for the default layout (or nil)
     def _default_layout(require_layout = false)
       begin
-        value = _layout if action_has_layout?
+        layout_name = _layout if action_has_layout?
       rescue NameError => e
         raise e, "Could not render layout: #{e.message}"
       end
 
-      if require_layout && action_has_layout? && !value
+      if require_layout && action_has_layout? && !layout_name
         raise ArgumentError,
           "There was no default layout for #{self.class} in #{view_paths.inspect}"
       end
 
-      _normalize_layout(value)
+      layout_name
     end
 
     def _include_layout?(options)

actionpack/lib/abstract_controller/logger.rb

@@ -7,7 +7,7 @@ module AbstractController
 
     included do
       config_accessor :logger
-      include ActiveSupport::Benchmarkable
+      extend ActiveSupport::Benchmarkable
     end
   end
 end

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_routes_url_helpers) }
-              klass.send(:include, namespace.railtie_routes_url_helpers)
+            if namespace = klass.parents.detect {|m| m.respond_to?(:_railtie) }
+              klass.send(:include, namespace._railtie.routes.url_helpers)
             else
               klass.send(:include, routes.url_helpers)
             end

actionpack/lib/abstract_controller/rendering.rb

@@ -35,7 +35,7 @@ module AbstractController
     include AbstractController::ViewPaths
 
     included do
-      class_attribute :protected_instance_variables
+      config_accessor :protected_instance_variables, :instance_reader => false
       self.protected_instance_variables = []
     end
 
@@ -59,8 +59,19 @@ module AbstractController
 
     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
+      @_view_context_class || self.class.view_context_class
+    end
+
+    def initialize(*)
+      @_view_context_class = nil
+      super
     end
 
     # An instance of a view class. The default view class is ActionView::Base
@@ -106,7 +117,6 @@ 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
 

actionpack/lib/abstract_controller/view_paths.rb

@@ -1,5 +1,3 @@
-require 'action_view/base'
-
 module AbstractController
   module ViewPaths
     extend ActiveSupport::Concern
@@ -10,7 +8,7 @@ module AbstractController
       self._view_paths.freeze
     end
 
-    delegate :template_exists?, :view_paths, :formats, :formats=,
+    delegate :find_template, :template_exists?, :view_paths, :formats, :formats=,
              :locale, :locale=, :to => :lookup_context
 
     module ClassMethods
@@ -65,7 +63,7 @@ module AbstractController
       #   the default view path. You may also provide a custom view path
       #   (see ActionView::PathSet for more information)
       def append_view_path(path)
-        self._view_paths = view_paths + Array(path)
+        self.view_paths = view_paths.dup + Array(path)
       end
 
       # Prepend a path to the list of view paths for this controller.
@@ -75,7 +73,7 @@ module AbstractController
       #   the default view path. You may also provide a custom view path
       #   (see ActionView::PathSet for more information)
       def prepend_view_path(path)
-        self._view_paths = ActionView::PathSet.new(Array(path) + view_paths)
+        self.view_paths = Array(path) + view_paths.dup
       end
 
       # A list of all of the default view paths for this controller.
@@ -89,7 +87,8 @@ 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::Base.process_view_paths(paths)
+        self._view_paths.freeze
       end
     end
   end

actionpack/lib/action_controller.rb

@@ -47,6 +47,21 @@ module ActionController
 
   eager_autoload do
     autoload :RecordIdentifier
+
+    # TODO: Don't autoload exceptions, setup explicit
+    # requires for files that need them
+    autoload_at "action_controller/metal/exceptions" do
+      autoload :ActionControllerError
+      autoload :RenderError
+      autoload :RoutingError
+      autoload :MethodNotAllowed
+      autoload :NotImplemented
+      autoload :UnknownController
+      autoload :MissingFile
+      autoload :RenderError
+      autoload :SessionOverflowError
+      autoload :UnknownHttpMethod
+    end
   end
 end
 

actionpack/lib/action_controller/base.rb

@@ -121,7 +121,7 @@ module ActionController
   #
   #   def search
   #     @results = Search.find(params[:query])
-  #     case @results.count
+  #     case @results
   #       when 0 then render :action => "no_results"
   #       when 1 then render :action => "show"
   #       when 2..10 then render :action => "show_many"
@@ -192,6 +192,7 @@ module ActionController
       Renderers::All,
       ConditionalGet,
       RackDelegation,
+      SessionManagement,
       Caching,
       MimeResponds,
       ImplicitRender,

actionpack/lib/action_controller/caching.rb

@@ -24,6 +24,7 @@ module ActionController #:nodoc:
   #
   #   config.action_controller.cache_store = :memory_store
   #   config.action_controller.cache_store = :file_store, "/path/to/cache/directory"
+  #   config.action_controller.cache_store = :drb_store, "druby://localhost:9192"
   #   config.action_controller.cache_store = :mem_cache_store, "localhost"
   #   config.action_controller.cache_store = :mem_cache_store, Memcached::Rails.new("localhost:11211")
   #   config.action_controller.cache_store = MyOwnStore.new("parameter")
@@ -55,9 +56,6 @@ module ActionController #:nodoc:
       end
     end
 
-    include RackDelegation
-    include AbstractController::Callbacks
-
     include ConfigMethods
     include Pages, Actions, Fragments
     include Sweeping if defined?(ActiveRecord)

actionpack/lib/action_controller/caching/actions.rb

@@ -38,9 +38,9 @@ module ActionController #:nodoc:
     # <tt>:action => 'lists'</tt> is not the same as
     # <tt>:action => 'list', :format => :xml</tt>.
     #
-    # 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
+    # You can set 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
     # multiple possible routes that should be cached differently. If a
     # block is given, it is called with the current controller instance.
     #
@@ -102,10 +102,8 @@ module ActionController #:nodoc:
       end
 
       def _save_fragment(name, options)
-        content = ""
-        response_body.each do |parts|
-          content << parts
-        end
+        content = response_body
+        content = content.join if content.is_a?(Array)
 
         if caching_allowed?
           write_fragment(name, content, options)
@@ -118,8 +116,9 @@ module ActionController #:nodoc:
       def expire_action(options = {})
         return unless cache_configured?
 
-        if options.is_a?(Hash) && options[:action].is_a?(Array)
-          options[:action].each {|action| expire_action(options.merge(:action => action)) }
+        actions = options[:action]
+        if actions.is_a?(Array)
+          actions.each {|action| expire_action(options.merge(:action => action)) }
         else
           expire_fragment(ActionCachePath.new(self, options, false).path)
         end

actionpack/lib/action_controller/caching/fragments.rb

@@ -12,13 +12,13 @@ module ActionController #:nodoc:
     #
     #   <% cache do %>
     #     All the topics in the system:
-    #     <%= render :partial => "topic", :collection => Topic.all %>
+    #     <%= render :partial => "topic", :collection => Topic.find(: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 
@@ -109,6 +109,7 @@ module ActionController #:nodoc:
       def expire_fragment(key, options = nil)
         return unless cache_configured?
         key = fragment_cache_key(key) unless key.is_a?(Regexp)
+        message = nil
 
         instrument_fragment_cache :expire_fragment, key do
           if key.is_a?(Regexp)

actionpack/lib/action_controller/caching/pages.rb

@@ -16,10 +16,9 @@ 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
-    # 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.
+    # This will generate cache files such as <tt>weblog/show/5.html</tt> and <tt>weblog/new.html</tt>,
+    # which match the URLs used to trigger the dynamic generation. This is how the web server is able
+    # pick up a cache file when it exists and otherwise let the request pass on to Action Pack to generate it.
     #
     # Expiration of the cache is handled by deleting the cached file, which results in a lazy regeneration approach where the cache
     # is not restored before another hit is made against it. The API for doing so mimics the options from +url_for+ and friends:
@@ -38,25 +37,23 @@ 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.
-        class_attribute :page_cache_directory
+        config_accessor :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.
-        class_attribute :page_cache_extension
+        config_accessor :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
@@ -68,31 +65,24 @@ 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:
         #   cache_page "I'm the cached content", "/lists/show"
-        def cache_page(content, path, extension = nil, gzip = Zlib::BEST_COMPRESSION)
+        def cache_page(content, path, extension = nil)
           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.
         #
-        # You can also pass a :gzip option to override the class configuration one.
-        #
         # Usage:
         #
         #   # cache the index action
@@ -100,28 +90,10 @@ module ActionController #:nodoc:
         #
         #   # cache the index action except for JSON requests
         #   caches_page :index, :if => Proc.new { |c| !c.request.format.json? }
-        #
-        #   # don't gzip images
-        #   caches_page :image, :gzip => false
         def caches_page(*actions)
           return unless perform_caching
           options = actions.extract_options!
-
-          gzip_level = options.fetch(:gzip, page_cache_compression)
-          gzip_level = case gzip_level
-          when Symbol
-            Zlib.const_get(gzip_level.to_s.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
+          after_filter({:only => actions}.merge(options)) { |c| c.cache_page }
         end
 
         private
@@ -149,7 +121,7 @@ module ActionController #:nodoc:
 
         if options.is_a?(Hash)
           if options[:action].is_a?(Array)
-            options[:action].each do |action|
+            options[:action].dup.each do |action|
               self.class.expire_page(url_for(options.merge(:only_path => true, :action => action)))
             end
           else
@@ -160,10 +132,10 @@ module ActionController #:nodoc:
         end
       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:
+      # 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 requested url is used. Example:
       #   cache_page "I'm the cached content", :controller => "lists", :action => "show"
-      def cache_page(content = nil, options = nil, gzip = Zlib::BEST_COMPRESSION)
+      def cache_page(content = nil, options = nil)
         return unless self.class.perform_caching && caching_allowed?
 
         path = case options
@@ -179,7 +151,7 @@ module ActionController #:nodoc:
           extension = ".#{type_symbol}"
         end
 
-        self.class.cache_page(content || response.body, path, extension, gzip)
+        self.class.cache_page(content || response.body, path, extension)
       end
 
     end

actionpack/lib/action_controller/caching/sweeping.rb

@@ -88,7 +88,7 @@ module ActionController #:nodoc:
           end
 
           def method_missing(method, *arguments, &block)
-            return unless @controller
+            return if @controller.nil?
             @controller.__send__(method, *arguments, &block)
           end
       end

actionpack/lib/action_controller/log_subscriber.rb

@@ -10,7 +10,7 @@ module ActionController
       format  = payload[:format]
       format  = format.to_s.upcase if format.is_a?(Symbol)
 
-      info "Processing by #{payload[:controller]}##{payload[:action]} as #{format}"
+      info "  Processing by #{payload[:controller]}##{payload[:action]} as #{format}"
       info "  Parameters: #{params.inspect}" unless params.empty?
     end
 
@@ -20,21 +20,18 @@ module ActionController
 
       status = payload[:status]
       if status.nil? && payload[:exception].present?
-        exception_class_name = payload[:exception].first
-        status = ActionDispatch::ExceptionWrapper.status_code_for_exception(exception_class_name)
-      end
-      message = "Completed #{status} #{Rack::Utils::HTTP_STATUS_CODES[status]} in #{format_duration(event.duration)}"
+        status = Rack::Utils.status_code(ActionDispatch::ShowExceptions.rescue_responses[payload[:exception].first]) rescue nil 
+      end 
+      message = "Completed #{status} #{Rack::Utils::HTTP_STATUS_CODES[status]} in %.0fms" % event.duration
       message << " (#{additions.join(" | ")})" unless additions.blank?
 
       info(message)
     end
 
-    def halted_callback(event)
-      info "Filter chain halted as #{event.payload[:filter]} rendered or redirected"
-    end
-
     def send_file(event)
-      info("Sent file #{event.payload[:path]} (#{format_duration(event.duration)})")
+      message = "Sent file %s"
+      message << " (%.1fms)"
+      info(message % [event.payload[:path], event.duration])
     end
 
     def redirect_to(event)
@@ -42,7 +39,7 @@ module ActionController
     end
 
     def send_data(event)
-      info("Sent data #{event.payload[:filename]}  (#{format_duration(event.duration)})")
+      info("Sent data %s (%.1fms)" % [event.payload[:filename], event.duration])
     end
 
     %w(write_fragment read_fragment exist_fragment?
@@ -51,8 +48,7 @@ module ActionController
         def #{method}(event)
           key_or_path = event.payload[:key] || event.payload[:path]
           human_name  = #{method.to_s.humanize.inspect}
-          duration = format_duration(event.duration)
-          info("\#{human_name} \#{key_or_path} \#{duration}")
+          info("\#{human_name} \#{key_or_path} \#{"(%.1fms)" % event.duration}")
         end
       METHOD
     end
@@ -63,4 +59,4 @@ module ActionController
   end
 end
 
-ActionController::LogSubscriber.attach_to :action_controller
+ActionController::LogSubscriber.attach_to :action_controller

actionpack/lib/action_controller/metal.rb

@@ -182,20 +182,10 @@ module ActionController
     end
 
     def response_body=(val)
-      body = if val.is_a?(String)
-        [val]
-      elsif val.nil? || val.respond_to?(:each)
-        val
-      else
-        [val]
-      end
+      body = val.nil? ? nil : (val.respond_to?(:each) ? val : [val])
       super body
     end
 
-    def performed?
-      response_body
-    end
-
     def dispatch(name, request) #:nodoc:
       @_request = request
       @_env = request.env

actionpack/lib/action_controller/metal/compatibility.rb

@@ -1,22 +1,21 @@
-require 'active_support/deprecation'
-
 module ActionController
   module Compatibility
     extend ActiveSupport::Concern
 
+    class ::ActionController::ActionControllerError < StandardError #:nodoc:
+    end
+
     # Temporary hax
     included do
-      ::ActionController::UnknownAction = ActiveSupport::Deprecation::DeprecatedConstantProxy.new('ActionController::UnknownAction', '::AbstractController::ActionNotFound')
-      ::ActionController::DoubleRenderError = ActiveSupport::Deprecation::DeprecatedConstantProxy.new('ActionController::DoubleRenderError', '::AbstractController::DoubleRenderError')
+      ::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']
 
-      def self.default_charset=(new_charset)
-        ActiveSupport::Deprecation.warn "Setting default charset at controller level" \
-          " is deprecated, please use `config.action_dispatch.default_charset` instead", caller
-        ActionDispatch::Response.default_charset = new_charset
+      class << self
+        delegate :default_charset=, :to => "ActionDispatch::Response"
       end
 
       self.protected_instance_variables = %w(
@@ -25,19 +24,13 @@ module ActionController
       )
 
       def rescue_action(env)
-        ActiveSupport::Deprecation.warn "Calling `rescue_action` is deprecated and will be removed in Rails 4.0.", caller
         raise env["action_dispatch.rescue.exception"]
       end
     end
 
     # For old tests
-    def initialize_template_class(*)
-      ActiveSupport::Deprecation.warn "Calling `initialize_template_class` is deprecated and has no effect anymore.", caller
-    end
-
-    def assign_shortcuts(*)
-      ActiveSupport::Deprecation.warn "Calling `assign_shortcuts` is deprecated and has no effect anymore.", caller
-    end
+    def initialize_template_class(*) end
+    def assign_shortcuts(*) end
 
     def _normalize_options(options)
       options[:text] = nil if options.delete(:nothing) == true
@@ -51,15 +44,15 @@ module ActionController
     end
 
     def _handle_method_missing
-      ActiveSupport::Deprecation.warn "Using `method_missing` to handle non" \
-        " existing actions is deprecated and will be removed in Rails 4.0, " \
-        " please use `action_missing` instead.", caller
       method_missing(@_action_name.to_sym)
     end
 
     def method_for_action(action_name)
-      super || ((self.class.public_method_defined?(:method_missing) ||
-        self.class.protected_method_defined?(:method_missing)) && "_handle_method_missing")
+      super || (respond_to?(:method_missing) && "_handle_method_missing")
+    end
+
+    def performed?
+      response_body
     end
   end
 end

actionpack/lib/action_controller/metal/conditional_get.rb

@@ -23,27 +23,8 @@ 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.
     #
-    # 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
+    def fresh_when(options)
+      options.assert_valid_keys(:etag, :last_modified, :public)
 
       response.etag          = options[:etag]          if options[:etag]
       response.last_modified = options[:last_modified] if options[:last_modified]
@@ -74,34 +55,8 @@ module ActionController
     #       end
     #     end
     #   end
-    #
-    # 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)
+    def stale?(options)
+      fresh_when(options)
       !request.fresh?(response)
     end
 

actionpack/lib/action_controller/metal/data_streaming.rb

@@ -1,5 +1,4 @@
 require 'active_support/core_ext/file/path'
-require 'action_controller/metal/exceptions'
 
 module ActionController #:nodoc:
   # Methods for sending arbitrary data and for streaming files to the browser,
@@ -27,11 +26,8 @@ module ActionController #:nodoc:
       # Options:
       # * <tt>:filename</tt> - suggests a filename for the browser to use.
       #   Defaults to <tt>File.basename(path)</tt>.
-      # * <tt>:type</tt> - specifies an HTTP content type.
-      #   You can specify either a string or a symbol for a registered type register with
-      #   <tt>Mime::Type.register</tt>, for example :json
-      #   If omitted, type will be guessed from the file extension specified in <tt>:filename</tt>.
-      #   If no content type is registered for the extension, default type 'application/octet-stream' will be used.
+      # * <tt>:type</tt> - specifies an HTTP content type. Defaults to 'application/octet-stream'. You can specify
+      #   either a string or a symbol for a registered type register with <tt>Mime::Type.register</tt>, for example :json
       # * <tt>:disposition</tt> - specifies whether the file will be shown inline or downloaded.
       #   Valid values are 'inline' and 'attachment' (default).
       # * <tt>:status</tt> - specifies the status code to send with the response. Defaults to 200.
@@ -41,7 +37,7 @@ module ActionController #:nodoc:
       #
       # The default Content-Type and Content-Disposition headers are
       # set to download arbitrary binary files in as many browsers as
-      # possible. IE versions 4, 5, 5.5, and 6 are all known to have
+      # possible.  IE versions 4, 5, 5.5, and 6 are all known to have
       # a variety of quirks (especially when downloading over SSL).
       #
       # Simple download:
@@ -62,8 +58,8 @@ module ActionController #:nodoc:
       #
       # Also be aware that the document may be cached by proxies and browsers.
       # The Pragma and Cache-Control headers declare how the file may be cached
-      # by intermediaries. They default to require clients to validate with
-      # the server before releasing cached responses. See
+      # by intermediaries.  They default to require clients to validate with
+      # the server before releasing cached responses.  See
       # http://www.mnot.net/cache_docs/ for an overview of web caching and
       # http://www.w3.org/Protocols/rfc2616/rfc2616-sec14.html#sec14.9
       # for the Cache-Control header spec.
@@ -75,27 +71,7 @@ module ActionController #:nodoc:
 
         self.status = options[:status] || 200
         self.content_type = options[:content_type] if options.key?(:content_type)
-        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
+        self.response_body = File.open(path, "rb")
       end
 
       # Sends the given binary data to the browser. This method is similar to
@@ -108,8 +84,6 @@ module ActionController #:nodoc:
       # * <tt>:filename</tt> - suggests a filename for the browser to use.
       # * <tt>:type</tt> - specifies an HTTP content type. Defaults to 'application/octet-stream'. You can specify
       #   either a string or a symbol for a registered type register with <tt>Mime::Type.register</tt>, for example :json
-      #   If omitted, type will be guessed from the file extension specified in <tt>:filename</tt>.
-      #   If no content type is registered for the extension, default type 'application/octet-stream' will be used.
       # * <tt>:disposition</tt> - specifies whether the file will be shown inline or downloaded.
       #   Valid values are 'inline' and 'attachment' (default).
       # * <tt>:status</tt> - specifies the status code to send with the response. Defaults to 200.
@@ -134,14 +108,12 @@ module ActionController #:nodoc:
 
     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].to_s
+        disposition = options[:disposition]
         disposition += %(; filename="#{options[:filename]}") if options[:filename]
 
         content_type = options[:type]
@@ -151,10 +123,6 @@ module ActionController #:nodoc:
           raise ArgumentError, "Unknown MIME type #{options[:type]}" unless extension
           self.content_type = extension
         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
-          end
           self.content_type = content_type
         end
 

actionpack/lib/action_controller/metal/force_ssl.rb

@@ -1,12 +1,12 @@
 module ActionController
-  # This module provides a method which will redirect browser to use HTTPS
+  # This module provides a method which will redirects browser to use HTTPS
   # protocol. This will ensure that user's sensitive information will be
   # transferred safely over the internet. You _should_ always force browser
   # to use HTTPS when you're transferring sensitive information such as
   # user authentication, account information, or credit card information.
   #
-  # Note that if you are really concerned about your application security,
-  # you might consider using +config.force_ssl+ in your config file instead.
+  # Note that if you really concern about your application safety, you might
+  # consider using +config.force_ssl+ in your configuration config file instead.
   # That will ensure all the data transferred via HTTPS protocol and prevent
   # user from getting session hijacked when accessing the site under unsecured
   # HTTP protocol.
@@ -22,18 +22,14 @@ module ActionController
       #
       # ==== Options
       # * <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
       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_options.merge!(:params => request.query_parameters)
-            redirect_to redirect_options
+            redirect_to :protocol => 'https://', :status => :moved_permanently
           end
         end
       end
     end
   end
-end
+end

actionpack/lib/action_controller/metal/head.rb

@@ -20,7 +20,6 @@ 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
@@ -28,7 +27,7 @@ module ActionController
 
       self.status = status
       self.location = url_for(location) if location
-      self.content_type = content_type || (Mime[formats.first] if formats)
+      self.content_type = Mime[formats.first] if formats
       self.response_body = " "
     end
   end

actionpack/lib/action_controller/metal/helpers.rb

@@ -7,12 +7,9 @@ module ActionController
   # by default.
   #
   # In addition to using the standard template helpers provided, creating custom helpers to
-  # extract complicated logic or reusable functionality is strongly encouraged. By default, each controller
-  # will include all helpers.
-  #
-  # In previous versions of \Rails the controller will include a helper whose
-  # name matches that of the controller, e.g., <tt>MyController</tt> will automatically
-  # include <tt>MyHelper</tt>. To return old behavior set +config.action_controller.include_all_helpers+ to +false+.
+  # extract complicated logic or reusable functionality is strongly encouraged. By default, the controller will
+  # include a helper whose name matches that of the controller, e.g., <tt>MyController</tt> will automatically
+  # include <tt>MyHelper</tt>.
   #
   # Additional helpers can be specified using the +helper+ class method in ActionController::Base or any
   # controller which inherits from it.
@@ -32,7 +29,7 @@ module ActionController
   #   class EventsController < ActionController::Base
   #     helper FormattedTimeHelper
   #     def index
-  #       @events = Event.all
+  #       @events = Event.find(:all)
   #     end
   #   end
   #
@@ -56,7 +53,7 @@ module ActionController
     include AbstractController::Helpers
 
     included do
-      class_attribute :helpers_path, :include_all_helpers
+      config_accessor :helpers_path, :include_all_helpers
       self.helpers_path ||= []
       self.include_all_helpers = true
     end

actionpack/lib/action_controller/metal/hide_actions.rb

@@ -27,14 +27,20 @@ module ActionController
         self.hidden_actions = hidden_actions.dup.merge(args.map(&:to_s)).freeze
       end
 
+      def inherited(klass)
+        klass.class_eval { @visible_actions = {} }
+        super
+      end
+
       def visible_action?(action_name)
-        not hidden_actions.include?(action_name)
+        return @visible_actions[action_name] if @visible_actions.key?(action_name)
+        @visible_actions[action_name] = !hidden_actions.include?(action_name)
       end
 
       # Overrides AbstractController::Base#action_methods to remove any methods
       # that are listed as hidden methods.
       def action_methods
-        @action_methods ||= Set.new(super.reject { |name| hidden_actions.include?(name) }).freeze
+        @action_methods ||= Set.new(super.reject { |name| hidden_actions.include?(name) })
       end
     end
   end

actionpack/lib/action_controller/metal/http_authentication.rb

@@ -67,7 +67,7 @@ module ActionController
     #   class PostsController < ApplicationController
     #     REALM = "SuperSecret"
     #     USERS = {"dhh" => "secret", #plain text password
-    #              "dap" => Digest::MD5.hexdigest(["dap",REALM,"secret"].join(":"))}  #ha1 digest password
+    #              "dap" => Digest::MD5.hexdigest(["dap",REALM,"secret"].join(":"))  #ha1 digest password
     #
     #     before_filter :authenticate, :except => [:index]
     #
@@ -141,11 +141,11 @@ module ActionController
       end
 
       def decode_credentials(request)
-        ::Base64.decode64(request.authorization.split(' ', 2).last || '')
+        ActiveSupport::Base64.decode64(request.authorization.split(' ', 2).last || '')
       end
 
       def encode_credentials(user_name, password)
-        "Basic #{::Base64.strict_encode64("#{user_name}:#{password}")}"
+        "Basic #{ActiveSupport::Base64.encode64s("#{user_name}:#{password}")}"
       end
 
       def authentication_request(controller, realm)
@@ -289,7 +289,7 @@ module ActionController
         t = time.to_i
         hashed = [t, secret_key]
         digest = ::Digest::MD5.hexdigest(hashed.join(":"))
-        ::Base64.encode64("#{t}:#{digest}").gsub("\n", '')
+        ActiveSupport::Base64.encode64("#{t}:#{digest}").gsub("\n", '')
       end
 
       # Might want a shorter timeout depending on whether the request
@@ -298,7 +298,7 @@ module ActionController
       # 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 = ::Base64.decode64(value).split(":").first.to_i
+        t = ActiveSupport::Base64.decode64(value).split(":").first.to_i
         nonce(secret_key, t) == value && (t - Time.now.to_i).abs <= seconds_to_timeout
       end
 
@@ -403,7 +403,7 @@ module ActionController
       # 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
+      # login_procedure - Proc to call if a token is present.  The Proc should
       #                   take 2 arguments:
       #                     authenticate(controller) { |token, options| ... }
       #
@@ -416,7 +416,7 @@ module ActionController
         end
       end
 
-      # Parses the token and options out of the token authorization header. If
+      # Parses the token and options out of the token authorization header.  If
       # the header looks like this:
       #   Authorization: Token token="abc", nonce="def"
       # Then the returned token is "abc", and the options is {:nonce => "def"}
@@ -426,7 +426,7 @@ module ActionController
       # Returns an Array of [String, Hash] if a token is present.
       # Returns nil if no token is found.
       def token_and_options(request)
-        if request.authorization.to_s[/^Token (.*)/]
+        if header = request.authorization.to_s[/^Token (.*)/]
           values = Hash[$1.split(',').map do |value|
             value.strip!                      # remove any spaces between commas and values
             key, value = value.split(/\=\"?/) # split key=value pairs

actionpack/lib/action_controller/metal/instrumentation.rb

@@ -58,18 +58,13 @@ module ActionController
     def redirect_to(*args)
       ActiveSupport::Notifications.instrument("redirect_to.action_controller") do |payload|
         result = super
-        payload[:status]   = response.status
-        payload[:location] = response.location
+        payload[:status]   = self.status
+        payload[:location] = self.location
         result
       end
     end
 
-  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
+  protected
 
     # A hook which allows you to clean up any time taken into account in
     # views wrongly, like database querying time.
@@ -102,4 +97,4 @@ module ActionController
       end
     end
   end
-end
+end

actionpack/lib/action_controller/metal/mime_responds.rb

@@ -42,8 +42,8 @@ module ActionController #:nodoc:
       def respond_to(*mimes)
         options = mimes.extract_options!
 
-        only_actions   = Array(options.delete(:only)).map(&:to_s)
-        except_actions = Array(options.delete(:except)).map(&:to_s)
+        only_actions   = Array(options.delete(:only))
+        except_actions = Array(options.delete(:except))
 
         new = mimes_for_respond_to.dup
         mimes.each do |mime|
@@ -182,7 +182,7 @@ module ActionController #:nodoc:
     #
     #     def index
     #       @people = Person.all
-    #       respond_with(@people)
+    #       respond_with(@person)
     #     end
     #   end
     #
@@ -191,9 +191,8 @@ module ActionController #:nodoc:
     def respond_to(*mimes, &block)
       raise ArgumentError, "respond_to takes either types or a block, never both" if mimes.any? && block_given?
 
-      if collector = retrieve_collector_from_mimes(mimes, &block)
-        response = collector.response
-        response ? response.call : default_render({})
+      if response = retrieve_response_from_mimes(mimes, &block)
+        response.call(nil)
       end
     end
 
@@ -233,9 +232,9 @@ module ActionController #:nodoc:
       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 collector = retrieve_collector_from_mimes(&block)
+      if response = retrieve_response_from_mimes(&block)
         options = resources.size == 1 ? {} : resources.extract_options!
-        options[:default_response] = collector.response
+        options.merge!(:default_response => response)
         (options.delete(:responder) || self.class.responder).call(self, resources, options)
       end
     end
@@ -246,7 +245,7 @@ module ActionController #:nodoc:
     # current action.
     #
     def collect_mimes_from_class_level #:nodoc:
-      action = action_name.to_s
+      action = action_name.to_sym
 
       self.class.mimes_for_respond_to.keys.select do |mime|
         config = self.class.mimes_for_respond_to[mime]
@@ -264,17 +263,15 @@ module ActionController #:nodoc:
     # Collects mimes and return the response for the negotiated format. Returns
     # nil if :not_acceptable was sent to the client.
     #
-    def retrieve_collector_from_mimes(mimes=nil, &block) #:nodoc:
+    def retrieve_response_from_mimes(mimes=nil, &block) #:nodoc:
       mimes ||= collect_mimes_from_class_level
-      collector = Collector.new(mimes)
+      collector = Collector.new(mimes) { |options| default_render(options || {}) }
       block.call(collector) if block_given?
-      format = collector.negotiate_format(request)
 
-      if format
+      if format = request.negotiate_mime(collector.order)
         self.content_type ||= format.to_s
-        lookup_context.formats = [format.to_sym]
-        lookup_context.rendered_format = lookup_context.formats.first
-        collector
+        lookup_context.freeze_formats([format.to_sym])
+        collector.response_for(format)
       else
         head :not_acceptable
         nil
@@ -283,10 +280,10 @@ module ActionController #:nodoc:
 
     class Collector #:nodoc:
       include AbstractController::Collector
-      attr_accessor :order, :format
+      attr_accessor :order
 
-      def initialize(mimes)
-        @order, @responses = [], {}
+      def initialize(mimes, &block)
+        @order, @responses, @default_response = [], {}, block
         mimes.each { |mime| send(mime) }
       end
 
@@ -305,12 +302,8 @@ module ActionController #:nodoc:
         @responses[mime_type] ||= block
       end
 
-      def response
-        @responses[format] || @responses[Mime::ALL]
-      end
-
-      def negotiate_format(request)
-        @format = request.negotiate_mime(order)
+      def response_for(mime)
+        @responses[mime] || @responses[Mime::ALL] || @default_response
       end
     end
   end

actionpack/lib/action_controller/metal/params_wrapper.rb

@@ -43,11 +43,6 @@ 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
   # the method instead. The +ParamsWrapper+ will actually try to determine the
@@ -146,16 +141,19 @@ 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$/, '').classify
+
+        model_name = self.name.sub(/Controller$/, '').singularize
 
         begin
-          if model_klass = model_name.safe_constantize
-            model_klass
-          else
+          model_klass = model_name.constantize
+        rescue NameError, ArgumentError => e
+          if e.message =~ /is not missing constant|uninitialized constant #{model_name}/
             namespaces = model_name.split("::")
             namespaces.delete_at(-2)
             break if namespaces.last == model_name
             model_name = namespaces.join("::")
+          else
+            raise
           end
         end until model_klass
 
@@ -167,10 +165,7 @@ module ActionController
 
         unless options[:include] || options[:exclude]
           model ||= _default_wrap_model
-          role = options.has_key?(:as) ? options[: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?
+          if model.respond_to?(:attribute_names) && model.attribute_names.present?
             options[:include] = model.attribute_names
           end
         end
@@ -194,8 +189,7 @@ module ActionController
     def process_action(*args)
       if _wrapper_enabled?
         wrapped_hash = _wrap_parameters request.request_parameters
-        wrapped_keys = request.request_parameters.keys
-        wrapped_filtered_hash = _wrap_parameters request.filtered_parameters.slice(*wrapped_keys)
+        wrapped_filtered_hash = _wrap_parameters request.filtered_parameters
 
         # This will make the wrapped hash accessible from controller and view
         request.parameters.merge! wrapped_hash

actionpack/lib/action_controller/metal/redirecting.rb

@@ -18,7 +18,7 @@ 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>) or a protocol relative reference (like <tt>//</tt>) - Is passed straight through as the target for redirection.
+    # * <tt>String</tt> starting with <tt>protocol://</tt> (like <tt>http://</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.
@@ -45,16 +45,6 @@ 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.
-    #
-    # Examples:
-    #   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.
     #
@@ -64,10 +54,10 @@ module ActionController
     #   redirect_to post_url(@post), :status => 301, :flash => { :updated_post_id => @post.id }
     #   redirect_to { :action=>'atom' }, :alert => "Something serious happened"
     #
-    # When using <tt>redirect_to :back</tt>, if there is no referrer, ActionController::RedirectBackError will be raised. You may specify some fallback
-    # behavior for this case by rescuing ActionController::RedirectBackError.
+    # When using <tt>redirect_to :back</tt>, if there is no referrer, RedirectBackError will be raised. You may specify some fallback
+    # behavior for this case by rescuing RedirectBackError.
     def redirect_to(options = {}, response_status = {}) #:doc:
-      raise ActionControllerError.new("Cannot redirect to nil!") unless options
+      raise ActionControllerError.new("Cannot redirect to nil!") if options.nil?
       raise AbstractController::DoubleRenderError if response_body
 
       self.status        = _extract_redirect_to_status(options, response_status)
@@ -77,7 +67,7 @@ module ActionController
 
     private
       def _extract_redirect_to_status(options, response_status)
-        if options.is_a?(Hash) && options.key?(:status)
+        status = if options.is_a?(Hash) && options.key?(:status)
           Rack::Utils.status_code(options.delete(:status))
         elsif response_status.key?(:status)
           Rack::Utils.status_code(response_status[:status])
@@ -91,8 +81,7 @@ 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 (":").
-        # The protocol relative scheme starts with a double slash "//"
-        when %r{^(\w[\w+.-]*:|//).*}
+        when %r{^\w[\w+.-]*:.*}
           options
         when String
           request.protocol + request.host_with_port + options

actionpack/lib/action_controller/metal/renderers.rb

@@ -1,6 +1,5 @@
 require 'active_support/core_ext/class/attribute'
 require 'active_support/core_ext/object/blank'
-require 'set'
 
 module ActionController
   # See <tt>Renderers.add</tt>
@@ -13,13 +12,16 @@ module ActionController
 
     included do
       class_attribute :_renderers
-      self._renderers = Set.new.freeze
+      self._renderers = {}.freeze
     end
 
     module ClassMethods
       def use_renderers(*args)
-        renderers = _renderers + args
-        self._renderers = renderers.freeze
+        new = _renderers.dup
+        args.each do |key|
+          new[key] = RENDERERS[key]
+        end
+        self._renderers = new.freeze
       end
       alias use_renderer use_renderers
     end
@@ -29,10 +31,10 @@ module ActionController
     end
 
     def _handle_render_options(options)
-      _renderers.each do |name|
-        if options.key?(name)
+      _renderers.each do |name, value|
+        if options.key?(name.to_sym)
           _process_options(options)
-          return send("_render_option_#{name}", options.delete(name), options)
+          return send("_render_option_#{name}", options.delete(name.to_sym), options)
         end
       end
       nil
@@ -40,7 +42,7 @@ module ActionController
 
     # Hash of available renderers, mapping a renderer name to its proc.
     # Default keys are :json, :js, :xml.
-    RENDERERS = Set.new
+    RENDERERS = {}
 
     # Adds a new renderer to call within controller actions.
     # A renderer is invoked by passing its name as an option to
@@ -77,7 +79,7 @@ module ActionController
     # <tt>ActionController::MimeResponds#respond_with</tt>
     def self.add(key, &block)
       define_method("_render_option_#{key}", &block)
-      RENDERERS << key.to_sym
+      RENDERERS[key] = block
     end
 
     module All

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[lookup_context.rendered_format].to_s
+      self.content_type ||= Mime[formats.first].to_s
       response_body
     end
 

actionpack/lib/action_controller/metal/request_forgery_protection.rb

@@ -1,5 +1,4 @@
 require 'active_support/core_ext/class/attribute'
-require 'action_controller/metal/exceptions'
 
 module ActionController #:nodoc:
   class InvalidAuthenticityToken < ActionControllerError #:nodoc:
@@ -74,7 +73,7 @@ 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.debug "WARNING: Can't verify CSRF token authenticity" if logger
           handle_unverified_request
         end
       end

actionpack/lib/action_controller/metal/rescue.rb

@@ -1,7 +1,4 @@
 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
@@ -15,20 +12,10 @@ 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

actionpack/lib/action_controller/metal/responder.rb

@@ -9,7 +9,7 @@ module ActionController #:nodoc:
   #     respond_to :html, :xml, :json
   #
   #     def index
-  #       @people = Person.all
+  #       @people = Person.find(:all)
   #       respond_with(@people)
   #     end
   #   end
@@ -84,8 +84,8 @@ module ActionController #:nodoc:
   #
   # === Custom options
   #
-  # <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
+  # <code>respond_with</code> also allow you to pass options that are forwarded
+  # to the underlying render call. Those options are only applied success
   # scenarios. For instance, you can do the following in the create method above:
   #
   #   def create
@@ -95,7 +95,7 @@ module ActionController #:nodoc:
   #     respond_with(@project, @task, :status => 201)
   #   end
   #
-  # This will return status 201 if the task was saved successfully. If not,
+  # This will return status 201 if the task was saved with success. 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>:
@@ -172,7 +172,7 @@ module ActionController #:nodoc:
     # responds to :to_format and display it.
     #
     def to_format
-      if get? || !has_errors? || response_overridden?
+      if get? || !has_errors?
         default_render
       else
         display_errors
@@ -202,8 +202,10 @@ module ActionController #:nodoc:
         display resource
       elsif post?
         display resource, :status => :created, :location => api_location
+      elsif has_empty_resource_definition?
+        display empty_resource, :status => :ok
       else
-        head :no_content
+        head :ok
       end
     end
 
@@ -222,15 +224,11 @@ module ActionController #:nodoc:
     alias :navigation_location :resource_location
     alias :api_location :resource_location
 
-    # If a response block was given, use it, otherwise call render on
+    # If a given response block was given, use it, otherwise call render on
     # controller.
     #
     def default_render
-      if @default_response
-        @default_response.call(options)
-      else
-        controller.default_render(options)
-      end
+      @default_response.call(options)
     end
 
     # Display is just a shortcut to render a resource with the current format.
@@ -255,7 +253,7 @@ module ActionController #:nodoc:
     end
 
     def display_errors
-      controller.render format => resource_errors, :status => :unprocessable_entity
+      controller.render format => resource.errors, :status => :unprocessable_entity
     end
 
     # Check whether the resource has errors.
@@ -271,16 +269,22 @@ module ActionController #:nodoc:
       @action ||= ACTIONS_FOR_VERBS[request.request_method_symbol]
     end
 
-    def resource_errors
-      respond_to?("#{format}_resource_errors", true) ? send("#{format}_resource_errors") : resource.errors
+    # Check whether resource needs a specific definition of empty resource to be valid
+    #
+    def has_empty_resource_definition?
+      respond_to?("empty_#{format}_resource", true)
     end
 
-    def json_resource_errors
-      {:errors => resource.errors}
+    # Delegate to proper empty resource method
+    #
+    def empty_resource
+      send("empty_#{format}_resource")
     end
 
-    def response_overridden?
-      @default_response.present?
+    # Return a valid empty JSON resource
+    #
+    def empty_json_resource
+      "{}"
     end
   end
 end

actionpack/lib/action_controller/metal/session_management.rb

@@ -2,11 +2,6 @@ module ActionController #:nodoc:
   module SessionManagement #:nodoc:
     extend ActiveSupport::Concern
 
-    included do
-      ActiveSupport::Deprecation.warn "ActionController::SessionManagement " \
-       "is deprecated because it has no contents since Rails 3.1", caller
-    end
-
     module ClassMethods
 
     end

actionpack/lib/action_controller/metal/streaming.rb

@@ -200,9 +200,34 @@ module ActionController #:nodoc:
     extend ActiveSupport::Concern
 
     include AbstractController::Rendering
+    attr_internal :stream
+
+    module ClassMethods
+      # Render streaming templates. It accepts :only, :except, :if and :unless as options
+      # to specify when to stream, as in ActionController filters.
+      def stream(options={})
+        ActiveSupport::Deprecation.warn "stream class method is deprecated. Please give the :stream option to render instead"
+        if defined?(Fiber)
+          before_filter :_stream_filter, options
+        else
+          raise "You cannot use streaming if Fiber is not available."
+        end
+      end
+    end
 
     protected
 
+    # Mark following render calls as streaming.
+    def _stream_filter #:nodoc:
+      self.stream = true
+    end
+
+    # Consider the stream option when normalazing options.
+    def _normalize_options(options) #:nodoc:
+      super
+      options[:stream] = self.stream unless options.key?(:stream)
+    end
+
     # Set proper cache control and transfer encoding when streaming
     def _process_options(options) #:nodoc:
       super

actionpack/lib/action_controller/railtie.rb

@@ -17,14 +17,11 @@ module ActionController
       ActiveSupport.on_load(:action_controller) { self.cache_store ||= RAILS_CACHE }
     end
 
-    initializer "action_controller.assets_config", :group => :all do |app|
-      app.config.action_controller.assets_dir ||= app.config.paths["public"].first
-    end
-
     initializer "action_controller.set_configs" do |app|
       paths   = app.config.paths
       options = app.config.action_controller
 
+      options.assets_dir           ||= paths["public"].first
       options.javascripts_dir      ||= paths["public/javascripts"].first
       options.stylesheets_dir      ||= paths["public/stylesheets"].first
       options.page_cache_directory ||= paths["public"].first
@@ -32,7 +29,6 @@ module ActionController
       # make sure 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

actionpack/lib/action_controller/railties/paths.rb

@@ -6,14 +6,13 @@ module ActionController
           define_method(:inherited) do |klass|
             super(klass)
 
-            if namespace = klass.parents.detect { |m| m.respond_to?(:railtie_helpers_paths) }
-              paths = namespace.railtie_helpers_paths
+            if namespace = klass.parents.detect {|m| m.respond_to?(:_railtie) }
+              paths = namespace._railtie.paths["app/helpers"].existent
             else
-              paths = app.helpers_paths
+              paths = app.config.helpers_paths
             end
 
             klass.helpers_path = paths
-
             if klass.superclass == ActionController::Base && ActionController::Base.include_all_helpers
               klass.helper :all
             end

actionpack/lib/action_controller/record_identifier.rb

@@ -14,9 +14,9 @@ module ActionController
   #   <% end %>                  </div>
   #
   #   # controller
-  #   def update
+  #   def destroy
   #     post = Post.find(params[:id])
-  #     post.update_attributes(params[:post])
+  #     post.destroy
   #
   #     redirect_to(post) # Calls polymorphic_url(post) which in turn calls post_url(post)
   #   end
@@ -40,7 +40,7 @@ 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 = ActiveModel::Naming.singular(record_or_class)
       prefix ? "#{prefix}#{JOIN}#{singular}" : singular
     end
 
@@ -67,7 +67,7 @@ module ActionController
     # This can be overwritten to customize the default generated string representation if desired.
     # If you need to read back a key from a dom_id in order to query for the underlying database record,
     # you should write a helper like 'person_record_from_dom_id' that will extract the key either based
-    # on the default implementation (which just joins all key attributes with '_') or on your own
+    # on the default implementation (which just joins all key attributes with '-') or on your own
     # overwritten version of the method. By default, this implementation passes the key string through a
     # 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.

actionpack/lib/action_controller/test_case.rb

@@ -20,12 +20,7 @@ module ActionController
 
       ActiveSupport::Notifications.subscribe("render_template.action_view") do |name, start, finish, id, payload|
         path = payload[:layout]
-        if path
-          @layouts[path] += 1
-          if path =~ /^layouts\/(.*)/
-            @layouts[$1] += 1
-          end
-        end
+        @layouts[path] += 1
       end
 
       ActiveSupport::Notifications.subscribe("!render_template.action_view") do |name, start, finish, id, payload|
@@ -61,15 +56,6 @@ module ActionController
     #   # assert that the "new" view template was rendered
     #   assert_template "new"
     #
-    #   # 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
     #
@@ -84,8 +70,6 @@ module ActionController
     #
     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
@@ -95,38 +79,18 @@ module ActionController
                 "expecting <?> but rendering with <?>",
                 options, rendered.keys.join(', '))
         assert_block(msg) do
-          if options
-            rendered.any? { |t,num| t.match(options) }
-          else
+          if options.nil?
             @templates.blank?
+          else
+            rendered.any? { |t,num| t.match(options) }
           end
         end
       when Hash
-        if options.key?(:layout)
-          expected_layout = options[:layout]
-          msg = build_message(message,
-                  "expecting layout <?> but action rendered <?>",
-                  expected_layout, @layouts.keys)
-
-          case expected_layout
-          when String, Symbol
-            assert(@layouts.keys.include?(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]
-            if defined?(@locals)
-              actual_locals = @locals[expected_partial.to_s.sub(/^_/,'')]
-              expected_locals.each_pair do |k,v|
-                assert_equal(v, actual_locals[k])
-              end
-            else
-              warn "the :locals option to #assert_template is only supported in a ActionView::TestCase"
+            actual_locals = @locals[expected_partial.to_s.sub(/^_/,'')]
+            expected_locals.each_pair do |k,v|
+              assert_equal(v, actual_locals[k])
             end
           elsif expected_count = options[:count]
             actual_count = @partials[expected_partial]
@@ -134,13 +98,26 @@ module ActionController
                     "expecting ? to be rendered ? time(s) but rendered ? 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 <?>",
                     options[:partial], @partials.keys)
             assert(@partials.include?(expected_partial), msg)
           end
-        elsif options.key?(:partial)
+        else
           assert @partials.empty?,
             "Expected no partials to be rendered"
         end
@@ -204,6 +181,10 @@ module ActionController
     end
 
     def recycle!
+      write_cookies!
+      @env.delete('HTTP_COOKIE') if @cookies.blank?
+      @env.delete('action_dispatch.cookies')
+      @cookies = nil
       @formats = nil
       @env.delete_if { |k, v| k =~ /^(action_dispatch|rack)\.request/ }
       @env.delete_if { |k, v| k =~ /^action_dispatch\.rescue/ }
@@ -211,14 +192,6 @@ module ActionController
       @method = @request_method = nil
       @fullpath = @ip = @remote_ip = @protocol = nil
       @env['action_dispatch.request.query_parameters'] = {}
-      @set_cookies ||= {}
-      @set_cookies.update(Hash[cookie_jar.instance_variable_get("@set_cookies").map{ |k,o| [k,o[:value]] }])
-      deleted_cookies = cookie_jar.instance_variable_get("@delete_cookies")
-      @set_cookies.reject!{ |k,v| deleted_cookies.include?(k) }
-      cookie_jar.update(rack_cookies)
-      cookie_jar.update(cookies)
-      cookie_jar.update(@set_cookies)
-      cookie_jar.recycle!
     end
   end
 
@@ -239,7 +212,7 @@ module ActionController
     DEFAULT_OPTIONS = Rack::Session::Abstract::ID::DEFAULT_OPTIONS
 
     def initialize(session = {})
-      super(nil, nil)
+      @env, @by = nil, nil
       replace(session.stringify_keys)
       @loaded = true
     end
@@ -325,26 +298,27 @@ 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 <tt>assigns[:person]</tt> won't work, but <tt>assigns["person"]</tt> will. To
+  # For historic reasons, the assigns hash uses string-based keys. So assigns[:person] won't work, but assigns["person"] will. To
   # appease our yearning for symbols, though, an alternative accessor has been devised using a method call instead of index referencing.
-  # So <tt>assigns(:person)</tt> will work just like <tt>assigns["person"]</tt>, but again, <tt>assigns[:person]</tt> will not work.
+  # So assigns(:person) will work just like assigns["person"], but again, assigns[:person] will not work.
   #
-  # On top of the collections, you have the complete url that a given action redirected to available in <tt>redirect_to_url</tt>.
+  # On top of the collections, you have the complete url that a given action redirected to available in redirect_to_url.
   #
   # 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.
   #
-  # == Manipulating session and cookie variables
+  # == Manipulating the request collections
   #
-  # Sometimes you need to set up the session and cookie variables for a test.
-  # To do this just assign a value to the session or cookie collection:
+  # The collections described above link to the response, so you can test if what the actions were expected to do happened. But
+  # sometimes you also want to manipulate these collections in the incoming request. This is really only relevant for sessions
+  # and cookies, though. For sessions, you just do:
   #
-  #   session[:key] = "value"
-  #   cookies[:key] = "value"
+  #   @request.session[:key] = "value"
+  #   @request.cookies[:key] = "value"
   #
-  # To clear the cookies for a test just clear the cookie collection:
+  # To clear the cookies for a test just clear the request's cookies hash:
   #
-  #   cookies.clear
+  #   @request.cookies.clear
   #
   # == \Testing named routes
   #
@@ -362,21 +336,9 @@ 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:
-        #
-        #   tests WidgetController
-        #   tests :widget
-        #   tests 'widget'
-        #
+        # Expects +controller_class+ as a constant. Example: <tt>tests WidgetController</tt>.
         def tests(controller_class)
-          case controller_class
-          when String, Symbol
-            self.controller_class = "#{controller_class.to_s.underscore}_controller".camelize.constantize
-          when Class
-            self.controller_class = controller_class
-          else
-            raise ArgumentError, "controller class must be a String, Symbol, or Class"
-          end
+          self.controller_class = controller_class
         end
 
         def controller_class=(new_class)
@@ -393,7 +355,9 @@ module ActionController
         end
 
         def determine_default_controller_class(name)
-          name.sub(/Test$/, '').safe_constantize
+          name.sub(/Test$/, '').constantize
+        rescue NameError
+          nil
         end
 
         def prepare_controller_class(new_class)
@@ -443,7 +407,7 @@ 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, ActionDispatch::Http::UploadedFile
+        when Rack::Test::UploadedFile
           hash_or_array_or_value
         else
           hash_or_array_or_value.to_param
@@ -475,13 +439,12 @@ module ActionController
         parameters ||= {}
         controller_class_name = @controller.class.anonymous? ?
           "anonymous_controller" :
-          @controller.class.controller_path
+          @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["flash"] = @request.flash.update(flash || {})
-        @request.session["flash"].sweep
 
         @controller.request = @request
         build_request_uri(action, parameters)
@@ -490,6 +453,7 @@ module ActionController
         @controller.process_with_new_base_test(@request, @response)
         @assigns = @controller.respond_to?(:view_assigns) ? @controller.view_assigns : {}
         @request.session.delete('flash') if @request.session['flash'].blank?
+        @request.cookies.merge!(@response.cookies)
         @response
       end
 
@@ -509,6 +473,11 @@ module ActionController
         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
+      end
+
       included do
         include ActionController::TemplateAssertions
         include ActionDispatch::Assertions

actionpack/lib/action_controller/vendor/html-scanner/html/sanitizer.rb

@@ -66,7 +66,7 @@ module HTML
 
     # A regular expression of the valid characters used to separate protocols like
     # the ':' in 'http://foo.com'
-    self.protocol_separator     = /:|(&#0*58)|(&#x70)|(&#x0*3a)|(%|%)3A/i
+    self.protocol_separator     = /:|(&#0*58)|(&#x70)|(%|%)3A/
 
     # Specifies a Set of HTML attributes that can have URIs.
     self.uri_attributes         = Set.new(%w(href src cite action longdesc xlink:href lowsrc))
@@ -104,14 +104,14 @@ module HTML
     # Specifies the default Set of allowed shorthand css properties for the #sanitize and #sanitize_css helpers.
     self.shorthand_css_properties = Set.new(%w(background border margin padding))
 
-    # Sanitizes a block of css code. Used by #sanitize when it comes across a style attribute
+    # Sanitizes a block of css code.  Used by #sanitize when it comes across a style attribute
     def sanitize_css(style)
       # disallow urls
       style = style.to_s.gsub(/url\s*\(\s*[^\s)]+?\s*\)\s*/, ' ')
 
       # gauntlet
-      if style !~ /\A([:,;#%.\sa-zA-Z0-9!]|\w-\w|\'[\s\w]+\'|\"[\s\w]+\"|\([\d,\s]+\))*\z/ ||
-          style !~ /\A(\s*[-\w]+\s*:\s*[^:;]*(;|$)\s*)*\z/
+      if style !~ /^([:,;#%.\sa-zA-Z0-9!]|\w-\w|\'[\s\w]+\'|\"[\s\w]+\"|\([\d,\s]+\))*$/ ||
+          style !~ /^(\s*[-\w]+\s*:\s*[^:;]*(;|$)\s*)*$/
         return ''
       end
 
@@ -122,7 +122,7 @@ module HTML
         elsif shorthand_css_properties.include?(prop.split('-')[0].downcase)
           unless val.split().any? do |keyword|
             !allowed_css_keywords.include?(keyword) &&
-              keyword !~ /\A(#[0-9a-f]+|rgb\(\d+%?,\d*%?,?\d*%?\)?|\d{0,2}\.?\d{0,2}(cm|em|ex|in|mm|pc|pt|px|%|,|\))?)\z/
+              keyword !~ /^(#[0-9a-f]+|rgb\(\d+%?,\d*%?,?\d*%?\)?|\d{0,2}\.?\d{0,2}(cm|em|ex|in|mm|pc|pt|px|%|,|\))?)$/
           end
             clean << prop + ': ' + val + ';'
           end
@@ -171,7 +171,7 @@ module HTML
 
     def contains_bad_protocols?(attr_name, value)
       uri_attributes.include?(attr_name) &&
-      (value =~ /(^[^\/:]*):|(&#0*58)|(&#x70)|(&#x0*3a)|(%|&#37;)3A/i && !allowed_protocols.include?(value.split(protocol_separator).first.downcase.strip))
+      (value =~ /(^[^\/:]*):|(&#0*58)|(&#x70)|(%|&#37;)3A/ && !allowed_protocols.include?(value.split(protocol_separator).first.downcase))
     end
   end
 end

actionpack/lib/action_dispatch.rb

@@ -47,16 +47,12 @@ module ActionDispatch
   end
 
   autoload_under 'middleware' do
-    autoload :RequestId
     autoload :BestStandardsSupport
     autoload :Callbacks
     autoload :Cookies
-    autoload :DebugExceptions
-    autoload :ExceptionWrapper
     autoload :Flash
     autoload :Head
     autoload :ParamsParser
-    autoload :PublicExceptions
     autoload :Reloader
     autoload :RemoteIp
     autoload :Rescue
@@ -64,6 +60,7 @@ module ActionDispatch
     autoload :Static
   end
 
+  autoload :ClosedError, 'action_dispatch/middleware/closed_error'
   autoload :MiddlewareStack, 'action_dispatch/middleware/stack'
   autoload :Routing
 
@@ -85,7 +82,6 @@ module ActionDispatch
     autoload :AbstractStore, 'action_dispatch/middleware/session/abstract_store'
     autoload :CookieStore,   'action_dispatch/middleware/session/cookie_store'
     autoload :MemCacheStore, 'action_dispatch/middleware/session/mem_cache_store'
-    autoload :CacheStore,    'action_dispatch/middleware/session/cache_store'
   end
 
   autoload_under 'testing' do

actionpack/lib/action_dispatch/http/cache.rb

@@ -4,18 +4,14 @@ 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)
@@ -47,35 +43,31 @@ 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 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
 
-        LAST_MODIFIED = "Last-Modified".freeze
-        ETAG          = "ETag".freeze
-        CACHE_CONTROL = "Cache-Control".freeze
-
         def prepare_cache_control!
           @cache_control = {}
-          @etag = self[ETAG]
+          @etag = self["ETag"]
 
-          if cache_control = self[CACHE_CONTROL]
+          if cache_control = self["Cache-Control"]
             cache_control.split(/,\s*/).each do |segment|
               first, last = segment.split("=")
               @cache_control[first.to_sym] = last || true
@@ -89,32 +81,28 @@ module ActionDispatch
           end
         end
 
-        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
+        DEFAULT_CACHE_CONTROL = "max-age=0, private, must-revalidate"
 
         def set_conditional_cache_control!
-          return if self[CACHE_CONTROL].present?
+          return if self["Cache-Control"].present?
 
           control = @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"
           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

actionpack/lib/action_dispatch/http/filter_parameters.rb

@@ -26,6 +26,8 @@ module ActionDispatch
     module FilterParameters
       extend ActiveSupport::Concern
 
+      @@parameter_filter_for  = {}
+
       # Return a hash of parameters with all sensitive data replaced.
       def filtered_parameters
         @filtered_parameters ||= parameter_filter.filter(parameters)
@@ -52,7 +54,7 @@ module ActionDispatch
       end
 
       def parameter_filter_for(filters)
-        ParameterFilter.new(filters)
+        @@parameter_filter_for[filters] ||= ParameterFilter.new(filters)
       end
 
       KV_RE   = '[^&;=]+'

actionpack/lib/action_dispatch/http/headers.rb

@@ -1,10 +1,11 @@
+require 'active_support/memoizable'
+
 module ActionDispatch
   module Http
     class Headers < ::Hash
-      @@env_cache = Hash.new { |h,k| h[k] = "HTTP_#{k.upcase.gsub(/-/, '_')}" }
+      extend ActiveSupport::Memoizable
 
       def initialize(*args)
-
         if args.size == 1 && args[0].is_a?(Hash)
           super()
           update(args[0])
@@ -24,8 +25,9 @@ module ActionDispatch
       private
         # Converts a HTTP header name to an environment variable name.
         def env_name(header_name)
-          @@env_cache[header_name]
+          "HTTP_#{header_name.upcase.gsub(/-/, '_')}"
         end
+        memoize :env_name
     end
   end
 end

actionpack/lib/action_dispatch/http/mime_negotiation.rb

@@ -98,8 +98,7 @@ module ActionDispatch
       BROWSER_LIKE_ACCEPTS = /,\s*\*\/\*|\*\/\*\s*,/
 
       def valid_accept_header
-        (xhr? && (accept.present? || content_mime_type)) ||
-          (accept.present? && accept !~ BROWSER_LIKE_ACCEPTS)
+        xhr? || (accept && accept !~ BROWSER_LIKE_ACCEPTS)
       end
 
       def use_accept_header

actionpack/lib/action_dispatch/http/mime_type.rb

@@ -47,7 +47,7 @@ module Mime
     cattr_reader :html_types
 
     # These are the content types which browsers can generate without using ajax, flash, etc
-    # i.e. following a link, getting an image or posting a form. CSRF protection
+    # i.e. following a link, getting an image or posting a form.  CSRF protection
     # only needs to protect against these types.
     @@browser_generated_types = Set.new [:html, :url_encoded_form, :multipart_form, :text]
     cattr_reader :browser_generated_types
@@ -82,7 +82,6 @@ module Mime
     class << self
 
       TRAILING_STAR_REGEXP = /(text|application)\/\*/
-      Q_SEPARATOR_REGEXP = /;\s*q=/
 
       def lookup(string)
         LOOKUP[string]
@@ -104,12 +103,11 @@ module Mime
         SET << Mime.const_get(symbol.to_s.upcase)
 
         ([string] + mime_type_synonyms).each { |str| LOOKUP[str] = SET.last } unless skip_lookup
-        ([symbol] + extension_synonyms).each { |ext| EXTENSION_LOOKUP[ext.to_s] = SET.last }
+        ([symbol.to_s] + extension_synonyms).each { |ext| EXTENSION_LOOKUP[ext] = SET.last }
       end
 
       def parse(accept_header)
         if accept_header !~ /,/
-          accept_header = accept_header.split(Q_SEPARATOR_REGEXP).first
           if accept_header =~ TRAILING_STAR_REGEXP
             parse_data_with_trailing_star($1)
           else
@@ -119,7 +117,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(Q_SEPARATOR_REGEXP)
+            params, q = header.split(/;\s*q=/)
             if params.present?
               params.strip!
 
@@ -248,7 +246,7 @@ module Mime
       end
     end
 
-    # Returns true if Action Pack should check requests using this Mime Type for possible request forgery. See
+    # Returns true if Action Pack should check requests using this Mime Type for possible request forgery.  See
     # ActionController::RequestForgeryProtection.
     def verify_request?
       @@browser_generated_types.include?(to_sym)
@@ -258,10 +256,6 @@ module Mime
       @@html_types.include?(to_sym) || @string =~ /html/
     end
 
-    def respond_to?(method, include_private = false) #:nodoc:
-      super || method.to_s =~ /(\w+)\?$/
-    end
-
     private
       def method_missing(method, *args)
         if method.to_s =~ /(\w+)\?$/

actionpack/lib/action_dispatch/http/mime_types.rb

@@ -7,15 +7,6 @@ Mime::Type.register "text/javascript", :js, %w( application/javascript applicati
 Mime::Type.register "text/css", :css
 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/gif", :gif, [], %w(gif)
-Mime::Type.register "image/bmp", :bmp, [], %w(bmp)
-Mime::Type.register "image/tiff", :tiff, [], %w(tif tiff)
-
-Mime::Type.register "video/mpeg", :mpeg, [], %w(mpg mpeg mpe)
-
 Mime::Type.register "application/xml", :xml, %w( text/xml application/x-xml )
 Mime::Type.register "application/rss+xml", :rss
 Mime::Type.register "application/atom+xml", :atom
@@ -28,8 +19,5 @@ Mime::Type.register "application/x-www-form-urlencoded", :url_encoded_form
 # http://www.json.org/JSONRequest.html
 Mime::Type.register "application/json", :json, %w( text/x-json application/jsonrequest )
 
-Mime::Type.register "application/pdf", :pdf, [], %w(pdf)
-Mime::Type.register "application/zip", :zip, [], %w(zip)
-
 # Create Mime::ALL but do not add it to the SET.
 Mime::ALL = Mime::Type.new("*/*", :all, [])

actionpack/lib/action_dispatch/http/parameter_filter.rb

@@ -20,8 +20,6 @@ module ActionDispatch
         @filters.present?
       end
 
-      FILTERED = '[FILTERED]'.freeze
-
       def compiled_filter
         @compiled_filter ||= begin
           regexps, blocks = compile_filter
@@ -31,7 +29,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)

actionpack/lib/action_dispatch/http/request.rb

@@ -2,11 +2,11 @@ require 'tempfile'
 require 'stringio'
 require 'strscan'
 
+require 'active_support/core_ext/module/deprecation'
 require 'active_support/core_ext/hash/indifferent_access'
 require 'active_support/core_ext/string/access'
 require 'active_support/inflector'
 require 'action_dispatch/http/headers'
-require 'action_controller/metal/exceptions'
 
 module ActionDispatch
   class Request < Rack::Request
@@ -26,7 +26,7 @@ module ActionDispatch
         HTTP_ACCEPT HTTP_ACCEPT_CHARSET HTTP_ACCEPT_ENCODING
         HTTP_ACCEPT_LANGUAGE HTTP_CACHE_CONTROL HTTP_FROM
         HTTP_NEGOTIATE HTTP_PRAGMA ].freeze
-
+      
     ENV_METHODS.each do |env|
       class_eval <<-METHOD, __FILE__, __LINE__ + 1
         def #{env.sub(/^HTTP_/n, '').downcase}  # def accept_charset
@@ -35,6 +35,14 @@ module ActionDispatch
       METHOD
     end
 
+    def self.new(env)
+      if request = env["action_dispatch.request"] && request.instance_of?(self)
+        return request
+      end
+
+      super
+    end
+
     def key?(key)
       @env.key?(key)
     end
@@ -56,12 +64,7 @@ module ActionDispatch
     RFC5789 = %w(PATCH)
 
     HTTP_METHODS = RFC2616 + RFC2518 + RFC3253 + RFC3648 + RFC3744 + RFC5323 + RFC5789
-    HTTP_METHOD_LOOKUP = {}
-
-    # Populate the HTTP method lookup cache
-    HTTP_METHODS.each do |method|
-      HTTP_METHOD_LOOKUP[method] = method.underscore.to_sym
-    end
+    HTTP_METHOD_LOOKUP = Hash.new { |h, m| h[m] = m.underscore.to_sym if HTTP_METHODS.include?(m) }
 
     # Returns the HTTP \method that the application should see.
     # In the case where the \method was overridden by a middleware
@@ -91,31 +94,31 @@ module ActionDispatch
     end
 
     # Is this a GET (or HEAD) request?
-    # Equivalent to <tt>request.request_method_symbol == :get</tt>.
+    # Equivalent to <tt>request.request_method == :get</tt>.
     def get?
       HTTP_METHOD_LOOKUP[request_method] == :get
     end
 
     # Is this a POST request?
-    # Equivalent to <tt>request.request_method_symbol == :post</tt>.
+    # Equivalent to <tt>request.request_method == :post</tt>.
     def post?
       HTTP_METHOD_LOOKUP[request_method] == :post
     end
 
     # Is this a PUT request?
-    # Equivalent to <tt>request.request_method_symbol == :put</tt>.
+    # Equivalent to <tt>request.request_method == :put</tt>.
     def put?
       HTTP_METHOD_LOOKUP[request_method] == :put
     end
 
     # Is this a DELETE request?
-    # Equivalent to <tt>request.request_method_symbol == :delete</tt>.
+    # Equivalent to <tt>request.request_method == :delete</tt>.
     def delete?
       HTTP_METHOD_LOOKUP[request_method] == :delete
     end
 
     # Is this a HEAD request?
-    # Equivalent to <tt>request.method_symbol == :head</tt>.
+    # Equivalent to <tt>request.method == :head</tt>.
     def head?
       HTTP_METHOD_LOOKUP[method] == :head
     end
@@ -139,6 +142,11 @@ module ActionDispatch
       base_url + original_fullpath
     end
 
+    def forgery_whitelisted?
+      get?
+    end
+    deprecate :forgery_whitelisted? => "it is just an alias for 'get?' now, update your code"
+
     def media_type
       content_mime_type.to_s
     end
@@ -160,21 +168,28 @@ module ActionDispatch
       @ip ||= super
     end
 
-    # Originating IP address, usually set by the RemoteIp middleware.
+    # 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.
     def remote_ip
       @remote_ip ||= (@env["action_dispatch.remote_ip"] || ip).to_s
     end
 
-    # Returns the unique request id, which is based off either the X-Request-Id header that can
-    # be generated by a firewall, load balancer, or web server or by the RequestId middleware
-    # (which sets the action_dispatch.request_id environment variable).
-    #
-    # This unique ID is useful for tracing a request from end-to-end as part of logging or debugging.
-    # This relies on the rack variable set by the ActionDispatch::RequestId middleware.
-    def uuid
-      @uuid ||= env["action_dispatch.request_id"]
-    end
-
     # Returns the lowercase name of the HTTP server software.
     def server_software
       (@env['SERVER_SOFTWARE'] && /^([a-zA-Z]+)/ =~ @env['SERVER_SOFTWARE']) ? $1.downcase : nil
@@ -184,9 +199,8 @@ module ActionDispatch
     # work with raw requests directly.
     def raw_post
       unless @env.include? 'RAW_POST_DATA'
-        raw_post_body = body
-        @env['RAW_POST_DATA'] = raw_post_body.read(@env['CONTENT_LENGTH'].to_i)
-        raw_post_body.rewind if raw_post_body.respond_to?(:rewind)
+        @env['RAW_POST_DATA'] = body.read(@env['CONTENT_LENGTH'].to_i)
+        body.rewind if body.respond_to?(:rewind)
       end
       @env['RAW_POST_DATA']
     end
@@ -228,13 +242,13 @@ module ActionDispatch
 
     # Override Rack's GET method to support indifferent access
     def GET
-      @env["action_dispatch.request.query_parameters"] ||= deep_munge(normalize_parameters(super) || {})
+      @env["action_dispatch.request.query_parameters"] ||= (normalize_parameters(super) || {})
     end
     alias :query_parameters :GET
 
     # Override Rack's POST method to support indifferent access
     def POST
-      @env["action_dispatch.request.request_parameters"] ||= deep_munge(normalize_parameters(super) || {})
+      @env["action_dispatch.request.request_parameters"] ||= (normalize_parameters(super) || {})
     end
     alias :request_parameters :POST
 
@@ -253,14 +267,18 @@ module ActionDispatch
       LOCALHOST.any? { |local_ip| local_ip === remote_addr && local_ip === remote_ip }
     end
 
+    protected
+
     # Remove nils from the params hash
     def deep_munge(hash)
-      hash.each do |k, v|
+      keys = hash.keys.find_all { |k| hash[k] == [nil] }
+      keys.each { |k| hash[k] = nil }
+
+      hash.each_value do |v|
         case v
         when Array
           v.grep(Hash) { |x| deep_munge(x) }
           v.compact!
-          hash[k] = nil if v.empty?
         when Hash
           deep_munge(v)
         end
@@ -269,8 +287,6 @@ module ActionDispatch
       hash
     end
 
-    protected
-
     def parse_query(qs)
       deep_munge(super)
     end

actionpack/lib/action_dispatch/http/response.rb

@@ -33,8 +33,7 @@ module ActionDispatch # :nodoc:
   #    end
   #  end
   class Response
-    attr_accessor :request, :header
-    attr_reader :status
+    attr_accessor :request, :header, :status
     attr_writer :sending_file
 
     alias_method :headers=, :header=
@@ -53,10 +52,8 @@ module ActionDispatch # :nodoc:
     # information.
     attr_accessor :charset, :content_type
 
-    CONTENT_TYPE = "Content-Type".freeze
-    SET_COOKIE   = "Set-Cookie".freeze
-    LOCATION     = "Location".freeze
- 
+    CONTENT_TYPE = "Content-Type"
+
     cattr_accessor(:default_charset) { "utf-8" }
 
     include Rack::Response::Helpers
@@ -68,10 +65,10 @@ module ActionDispatch # :nodoc:
       @sending_file = false
       @blank = false
 
-      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 || self.class.default_charset
+        @charset = charset || "UTF-8"
       end
 
       prepare_cache_control!
@@ -118,9 +115,32 @@ module ActionDispatch # :nodoc:
 
     EMPTY = " "
 
+    class BodyBuster #:nodoc:
+      def initialize(response)
+        @response = response
+        @body = ""
+      end
+
+      def bust(body)
+        body.call(@response, self)
+        body.close if body.respond_to?(:close)
+        @body
+      end
+
+      def write(string)
+        @body << string.to_s
+      end
+    end
+
     def body=(body)
       @blank = true if body == EMPTY
 
+      if body.respond_to?(:call)
+        ActiveSupport::Deprecation.warn "Setting a Proc or an object that responds to call " \
+          "in response_body is no longer supported", caller
+        body = BodyBuster.new(self).bust(body)
+      end
+
       # 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).
@@ -144,12 +164,12 @@ 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
@@ -160,10 +180,10 @@ module ActionDispatch # :nodoc:
       assign_default_content_type_and_charset!
       handle_conditional_get!
 
-      @header[SET_COOKIE] = @header[SET_COOKIE].join("\n") if @header[SET_COOKIE].respond_to?(:join)
+      @header["Set-Cookie"] = @header["Set-Cookie"].join("\n") if @header["Set-Cookie"].respond_to?(:join)
 
       if [204, 304].include?(@status)
-        @header.delete CONTENT_TYPE
+        @header.delete "Content-Type"
         [@status, @header, []]
       else
         [@status, @header, self]
@@ -177,7 +197,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

actionpack/lib/action_dispatch/http/upload.rb

@@ -11,15 +11,26 @@ module ActionDispatch
         raise(ArgumentError, ':tempfile is required') unless @tempfile
       end
 
+      def open
+        @tempfile.open
+      end
+
+      def path
+        @tempfile.path
+      end
+
       def read(*args)
         @tempfile.read(*args)
       end
 
-      # Delegate these methods to the tempfile.
-      [:open, :path, :rewind, :size].each do |method|
-        class_eval "def #{method}; @tempfile.#{method}; end"
+      def rewind
+        @tempfile.rewind
       end
 
+      def size
+        @tempfile.size
+      end
+      
       private
       def encode_filename(filename)
         # Encode the filename in the utf8 encoding, unless it is nil or we're in 1.8

actionpack/lib/action_dispatch/http/url.rb

@@ -43,13 +43,9 @@ module ActionDispatch
           params = options[:params] || {}
           params.reject! {|k,v| v.to_param.nil? }
 
-          if options[:trailing_slash] && !path.ends_with?('/')
-            rewritten_url << path.sub(/(\?|\z)/) { "/" + $& }
-          else
-            rewritten_url << path
-          end
+          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 << "##{Rack::Mount::Utils.escape_uri(options[:anchor].to_param.to_s)}" if options[:anchor]
           rewritten_url
         end
 

actionpack/lib/action_dispatch/middleware/best_standards_support.rb

@@ -15,15 +15,7 @@ module ActionDispatch
 
     def call(env)
       status, headers, body = @app.call(env)
-
-      if headers["X-UA-Compatible"] && @header
-        unless headers["X-UA-Compatible"][@header]
-          headers["X-UA-Compatible"] << "," << @header.to_s
-        end
-      else
-        headers["X-UA-Compatible"] = @header
-      end
-
+      headers["X-UA-Compatible"] = @header
       [status, headers, body]
     end
   end